diff --git a/lam/HISTORY b/lam/HISTORY index 61369113..1b7e727b 100644 --- a/lam/HISTORY +++ b/lam/HISTORY @@ -1,3 +1,7 @@ +December 2017 + - PHP 5.6 and Internet Explorer 11 or later required + + September 2017 6.1 - Automatically trim input fields to avoid trailing/leading spaces - LAM Pro: diff --git a/lam/README b/lam/README index dc464041..70ffbc7d 100644 --- a/lam/README +++ b/lam/README @@ -15,7 +15,7 @@ LAM - Readme https://www.ldap-account-manager.org/ - Copyright (C) 2003 - 2016 Roland Gruber + Copyright (C) 2003 - 2017 Roland Gruber Installation and documentation: Please see the LAM manual in docs/manual/index.html. diff --git a/lam/copyright b/lam/copyright index 347933ee..7e0b2832 100644 --- a/lam/copyright +++ b/lam/copyright @@ -1,4 +1,4 @@ -This software is copyright (c) 2003 - 2016 by Roland Gruber +This software is copyright (c) 2003 - 2017 by Roland Gruber If you purchased a copy of LDAP Account Manager Pro then the following files are licensed under the conditions which you accepted at purchase diff --git a/lam/docs/manual-sources/chapter-installation.xml b/lam/docs/manual-sources/chapter-installation.xml index 0f19a5dd..bf3187f3 100644 --- a/lam/docs/manual-sources/chapter-installation.xml +++ b/lam/docs/manual-sources/chapter-installation.xml @@ -15,7 +15,7 @@ Apache/Nginx webserver (SSL recommended) with PHP module (PHP - (>= 5.4.0) with ldap, gettext, xml, openssl and optional + (>= 5.6.0) with ldap, gettext, xml, openssl and optional OpenSSL) @@ -44,7 +44,7 @@ - Internet Explorer 9 (compatibility + Internet Explorer 11 (compatibility mode turned off) diff --git a/lam/docs/manual-sources/overview.xml b/lam/docs/manual-sources/overview.xml index 60180fd4..2b17385d 100644 --- a/lam/docs/manual-sources/overview.xml +++ b/lam/docs/manual-sources/overview.xml @@ -63,7 +63,7 @@ - PHP (>= 5.4.0) + PHP (>= 5.6.0) @@ -85,7 +85,7 @@ - Internet Explorer 9 (compatibility mode + Internet Explorer 11 (compatibility mode turned off) diff --git a/lam/lib/account.inc b/lam/lib/account.inc index f6634089..83474914 100644 --- a/lam/lib/account.inc +++ b/lam/lib/account.inc @@ -460,10 +460,6 @@ function get_preg($argument, $regexp) { $language = $_SESSION['language']; $language2 = explode ('.', $language); setlocale(LC_ALL, $language2[0]); - // workaround for buggy PHP with Turkish - if (($language == 'tr_TR.utf8') && (version_compare(phpversion(), '5.5') < 0)) { - setlocale(LC_CTYPE, 'en_GB'); - } // First we check "positive" cases $pregexpr = ''; switch ($regexp) { @@ -592,10 +588,6 @@ function get_preg($argument, $regexp) { if (preg_match($pregexpr, $argument)) { /* Bug in php preg_match doesn't work correct with utf8 */ setlocale(LC_ALL, $language); - // workaround for buggy PHP with Turkish - if (($language == 'tr_TR.utf8') && (version_compare(phpversion(), '5.5') < 0)) { - setlocale(LC_CTYPE, 'en_GB'); - } return true; } // Now we check "negative" cases, characters which are not allowed @@ -615,18 +607,10 @@ function get_preg($argument, $regexp) { if (!preg_match($pregexpr, $argument)) { /* Bug in php preg_match doesn't work correct with utf8 */ setlocale(LC_ALL, $language); - // workaround for buggy PHP with Turkish - if (($language == 'tr_TR.utf8') && (version_compare(phpversion(), '5.5') < 0)) { - setlocale(LC_CTYPE, 'en_GB'); - } return true; } /* Bug in php preg_match doesn't work correct with utf8 */ setlocale(LC_ALL, $language); - // workaround for buggy PHP with Turkish - if (($language == 'tr_TR.utf8') && (version_compare(phpversion(), '5.5') < 0)) { - setlocale(LC_CTYPE, 'en_GB'); - } return false; } diff --git a/lam/lib/checkEnvironment.inc b/lam/lib/checkEnvironment.inc index 2ab0f06c..020dde0b 100644 --- a/lam/lib/checkEnvironment.inc +++ b/lam/lib/checkEnvironment.inc @@ -36,8 +36,8 @@ include_once("../lib/status.inc"); /** config */ include_once("../lib/config.inc"); -// check if PHP >= 5.4.0 -if (version_compare(phpversion(), '5.4.0') < 0) { +// check if PHP >= 5.6.0 +if (version_compare(phpversion(), '5.6.0') < 0) { echo "\n\n"; echo "\n\n"; echo "\n"; @@ -47,7 +47,7 @@ if (version_compare(phpversion(), '5.4.0') < 0) { echo "\n"; echo "LDAP Account Manager\n"; echo "\n"; - StatusMessage("ERROR", "LAM needs a PHP 5 version which is greater or equal than 5.4.0.", "Please upgrade your PHP installation. The found version is " . phpversion()); + StatusMessage("ERROR", "LAM needs a PHP 5 version which is greater or equal than 5.6.0.", "Please upgrade your PHP installation. The found version is " . phpversion()); echo "

"; echo ""; exit(); diff --git a/lam/lib/config.inc b/lam/lib/config.inc index 98109259..432fb52a 100644 --- a/lam/lib/config.inc +++ b/lam/lib/config.inc @@ -73,10 +73,6 @@ function setlanguage() { } putenv("LANG=" . $code); // e.g. LANG=de_DE setlocale(LC_ALL, $code); // set LC_ALL - // workaround for buggy PHP with Turkish - if (($code == 'tr_TR.utf8') && (version_compare(phpversion(), '5.5') < 0)) { - setlocale(LC_CTYPE, 'en_GB'); - } $locdir = substr(__FILE__, 0, strlen(__FILE__) - 15) . "/locale"; // set path to translations bindtextdomain("messages", $locdir); bind_textdomain_codeset("messages", $encoding); diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc index 456e734c..4dc1213e 100644 --- a/lam/lib/modules/posixAccount.inc +++ b/lam/lib/modules/posixAccount.inc @@ -186,10 +186,8 @@ class posixAccount extends baseModule implements passwordService { $loginShellsHelp = new htmlHelpLink('loginShells', get_class($this)); $loginShellsHelp->alignment = htmlElement::ALIGN_TOP; $selfServiceContainer->addElement($loginShellsHelp, true); - if (version_compare(phpversion(), '5.4.26') >= 0) { - $selfServiceContainer->addElement(new htmlTableExtendedInputCheckbox('posixAccount_useOldPwd', false, _('Password change with old password'))); - $selfServiceContainer->addElement(new htmlHelpLink('useOldPwd', get_class($this)), true); - } + $selfServiceContainer->addElement(new htmlTableExtendedInputCheckbox('posixAccount_useOldPwd', false, _('Password change with old password'))); + $selfServiceContainer->addElement(new htmlHelpLink('useOldPwd', get_class($this)), true); $return['selfServiceSettings'] = $selfServiceContainer; } // profile checks