From 2762f0fdb366a1446acecb9c0140d0f20ef01a76 Mon Sep 17 00:00:00 2001 From: duergner Date: Sun, 18 May 2003 18:59:02 +0000 Subject: [PATCH] Some bugs corrected --- lam/templates/login.php | 49 ++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/lam/templates/login.php b/lam/templates/login.php index ba6b00f8..838e24cb 100644 --- a/lam/templates/login.php +++ b/lam/templates/login.php @@ -43,7 +43,6 @@ function display_LoginPage($config_object) $_SESSION["language"] = $config_object->get_defaultLanguage(); // loading available languages from language.conf file - $languagefile = "../config/language.conf"; if(is_file($languagefile) == True) { @@ -87,7 +86,7 @@ function display_LoginPage($config_object) -

+

@@ -99,7 +98,7 @@ function display_LoginPage($config_object)


-

"; +

"; echo _("Enter Username and Password for Account:"); echo "

"; @@ -186,19 +185,11 @@ function display_LoginPage($config_object)


- +
- - - - - - @@ -215,25 +206,33 @@ if($_POST['action'] == "checklogin") include_once("../lib/ldap.inc"); // Include ldap.php which provides Ldap class $ldap = new Ldap($_SESSION['config']); //$config); // Create new Ldap object - $result = $ldap->connect($_POST['username'],$_POST['passwd']); // Connect to LDAP server for verifing username/password - if($result == True) // Username/password correct. Do some configuration and load main frame. + if($_POST['passwd'] == "") { - $_SESSION["language"] = $_POST["language"]; // Write selected language in session - session_register("ldap"); // Register $ldap object in session - - include("./main.php"); // Load main frame + $error_message = _("Empty Password submitted. Try again."); + display_LoginPage($_SESSION['config']); // Empty password submitted. Return to login page. } else { - if($ldap->server) + $result = $ldap->connect($_POST['username'],$_POST['passwd']); // Connect to LDAP server for verifing username/password + if($result == True) // Username/password correct. Do some configuration and load main frame. { - $error_message = _("Wrong Password/Username combination. Try again."); - display_LoginPage($_SESSION['config']); // Username/password invalid. Return to login page. + $_SESSION["language"] = $_POST["language"]; // Write selected language in session + session_register("ldap"); // Register $ldap object in session + + include("./main.php"); // Load main frame } else { - $error_message = _("Cannot connect to specified LDAP-Server. Try again."); - display_LoginPage($_SESSION['config']); // Username/password invalid. Return to login page. + if($ldap->server) + { + $error_message = _("Wrong Password/Username combination. Try again."); + display_LoginPage($_SESSION['config']); // Username/password invalid. Return to login page. + } + else + { + $error_message = _("Cannot connect to specified LDAP-Server. Try again."); + display_LoginPage($_SESSION['config']); // Username/password invalid. Return to login page. + } } } }
"; - echo _("You are connecting to the server specified below:"); - echo " -

- ServerURL: "; + echo _("You are connecting to ServerURL: "); + echo " "; echo $config_object->get_ServerURL(); echo "