Merge branch 'work-3.0.5.4p3' of git.ispconfig.org:pixcept/ispconfig3-mods ...

Till Brehm

2014-08-14 a93bfca5eaaf8884da7d03c675fcc87b842909d9

Merge branch 'work-3.0.5.4p3' of git.ispconfig.org:pixcept/ispconfig3-mods into work-3.0.5.4p3

 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