Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into ...

Till Brehm

2014-08-25 4db6b4febf26bfa987ef741b0271ee44e5fb462e

 interface/web/login/index.php

@@ -200,6 +200,13 @@
                           if(crypt(stripslashes($passwort), $salt) != $saved_password) {
                              $user = false;
                           }
                        } elseif(substr($saved_password, 0, 3) == '$5$') {
                           //* The password is crypt-sha256 encrypted
                           $salt = '$5$'.substr($saved_password, 3, 16).'$';

                           if(crypt(stripslashes($passwort), $salt) != $saved_password) {
                              $user = false;
                           }
                        } else {

                           //* The password is md5 encrypted