X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Findex.php;h=ebae5e52f7393fd19fcd7bf03632e85fdbd6fac5;hb=dc9477682ce4fc03b5623c39bab13f981eaf3c32;hp=d66647ea36dc69bd50cf649ca2c33886786afa69;hpb=176bea18084ece1d0886627e4d0a64d9e4c5ec89;p=gosa.git diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php index d66647ea3..ebae5e52f 100644 --- a/gosa-core/html/index.php +++ b/gosa-core/html/index.php @@ -90,7 +90,8 @@ function displayLogin() $smarty->assign("php_errors", ""); } $smarty->assign("msg_dialogs", msg_dialog::get_dialogs()); - $smarty->assign("iePngWorkaround", $config->get_cfg_value("iePngWorkaround", FALSE)); + $smarty->assign("iePngWorkaround", $config->get_cfg_value("iePngWorkaround","false" ) == "true"); + $smarty->assign("usePrototype", "false"); $smarty->display (get_template_path('headers.tpl')); $smarty->assign("version",get_gosa_version()); $smarty->display(get_template_path('login.tpl')); @@ -256,10 +257,6 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces } /* Check for schema file presence */ - #TODO: these three lines should go to the class_config.inc, shouldn't they? - if(!isset($config->data['MAIN']['SCHEMACHECK'])){ - $config->data['MAIN']['SCHEMACHECK'] = "true"; - } if ($config->get_cfg_value("schemaCheck") == "true"){ $recursive = ($config->get_cfg_value("ldapFollowReferrals") == "true"); $tls = ($config->get_cfg_value("ldapTLS") == "true"); @@ -298,7 +295,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces $ok= true; if (!$htaccess_authenticated){ $username= $_POST["username"]; - if (!ereg("^[@A-Za-z0-9_.-]+$", $username)){ + if (!preg_match("/^[@A-Za-z0-9_.-]+$/", $username)){ $message= _("Please specify a valid username!"); $ok= false; } elseif (mb_strlen($_POST["password"], 'UTF-8') == 0){ @@ -323,7 +320,8 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces if ($ui === NULL || !$ui){ $message= _("Please check the username/password combination."); $smarty->assign ('nextfield', 'password'); - new log("security","login","",array(),"Authentication failed for user \"$username\"") ; + session::global_set('config',$config); + new log("security","login","",array(),"Authentication failed for user \"$username\""); } else { /* Remove all locks of this user */ del_user_locks($ui->dn);