From a93bfca5eaaf8884da7d03c675fcc87b842909d9 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Thu, 14 Aug 2014 06:46:25 -0400
Subject: [PATCH] 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 | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index 951dbaf..48d3af6 100644
--- a/interface/web/login/index.php
+++ b/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
--
Gitblit v1.9.1