diff --git a/lam/HISTORY b/lam/HISTORY index 24272bb6..996a9a2c 100644 --- a/lam/HISTORY +++ b/lam/HISTORY @@ -1,10 +1,13 @@ March 2015 - - templates for server profiles + - Requires PHP 5.3.2 or higher + - Templates for server profiles - Unix/Personal: support SASL as password hash type - PDF export: added option to print primary group members - Use HTTP_X_REAL_IP/HTTP_X_FORWARDED_FOR to log IP addresses (RFE 120) - LAM Pro: -> Personal: support image file size limit and cropping (requires php-imagick) in self service + - fixed bugs: + -> Self Service shows password reuse error after password change was required 16.12.2014 4.8 diff --git a/lam/lib/account.inc b/lam/lib/account.inc index 31e561cb..3ff38d07 100644 --- a/lam/lib/account.inc +++ b/lam/lib/account.inc @@ -186,10 +186,6 @@ function pwd_hash($password, $enabled = true, $hashType = 'SSHA') { * @return array hash types */ function getSupportedHashTypes() { - if (version_compare(phpversion(), '5.3.2') < 0) { - // CRYPT-SHA512 requires PHP 5.3.2 or higher - return array('CRYPT', 'SHA', 'SSHA', 'MD5', 'SMD5', 'PLAIN', 'SASL'); - } return array('CRYPT', 'CRYPT-SHA512', 'SHA', 'SSHA', 'MD5', 'SMD5', 'PLAIN', 'SASL'); } diff --git a/lam/lib/checkEnvironment.inc b/lam/lib/checkEnvironment.inc index 1b4012af..5b9daf21 100644 --- a/lam/lib/checkEnvironment.inc +++ b/lam/lib/checkEnvironment.inc @@ -3,7 +3,7 @@ $Id$ This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) - Copyright (C) 2010 - 2013 Roland Gruber + Copyright (C) 2010 - 2015 Roland Gruber This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -37,7 +37,7 @@ include_once("../lib/status.inc"); include_once("../lib/config.inc"); // check if PHP >= 5.2.4 -if (version_compare(phpversion(), '5.2.4') < 0) { +if (version_compare(phpversion(), '5.3.2') < 0) { echo "\n\n"; echo "\n\n"; echo "\n";