diff --git a/lam/HISTORY b/lam/HISTORY index 8d1b4ad3..476c321f 100644 --- a/lam/HISTORY +++ b/lam/HISTORY @@ -1,5 +1,7 @@ March 2018 6.3 - Server profile: added option if referential integrity overlay is active to sip cleanup actions + - Bugs: + -> Login page not working when no server profile exists (44) - LAM Pro: -> Support custom structural object classes with new custom type -> Support dynamic lists diff --git a/lam/templates/login.php b/lam/templates/login.php index 1d9c63cd..27ef1959 100644 --- a/lam/templates/login.php +++ b/lam/templates/login.php @@ -170,12 +170,12 @@ $_SESSION['header'] .= "\n encryptSession == 'true')) { @@ -489,7 +489,7 @@ if(isset($_POST['checklogin'])) { if($_POST['passwd'] == "") { logNewMessage(LOG_DEBUG, "Empty password for login"); $error_message = _("Empty password submitted. Please try again."); - display_LoginPage($_SESSION['config'], $_SESSION["cfgMain"], $licenseValidator, $error_message); // Empty password submitted. Return to login page. + display_LoginPage($licenseValidator, $error_message); // Empty password submitted. Return to login page. exit(); } $username = $_POST['username']; @@ -547,7 +547,7 @@ if(isset($_POST['checklogin'])) { $error_message = $searchError; logNewMessage(LOG_ERR, 'User ' . $username . ' (' . $clientSource . ') failed to log in. ' . $searchError . ''); $searchLDAP->close(); - display_LoginPage($_SESSION['config'], $_SESSION["cfgMain"], $licenseValidator, $error_message); + display_LoginPage($licenseValidator, $error_message); exit(); } $searchLDAP->close(); @@ -600,11 +600,11 @@ if(isset($_POST['checklogin'])) { $error_message = _("LDAP error, server says:") . "\n
($result) " . ldap_err2str($result); logNewMessage(LOG_ERR, 'User ' . $username . ' (' . $clientSource . ') failed to log in (LDAP error: ' . ldap_err2str($result) . ').'); } - display_LoginPage($_SESSION['config'], $_SESSION["cfgMain"], $licenseValidator, $error_message); + display_LoginPage($licenseValidator, $error_message); exit(); } } //displays the login window -display_LoginPage($_SESSION["config"], $_SESSION["cfgMain"], $licenseValidator, $error_message); +display_LoginPage($licenseValidator, $error_message); ?>