From eed4045d2dafc6a041e2292b0549bc54bd9f3991 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 14 Dec 2006 05:09:44 +0000 Subject: [PATCH] Fixed some error message for login. -If "schema files are not readable error" occurs the login was ugly broken. The alignment of the error messages in login was right. Now they are centered again. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5386 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/index.php | 10 ++++------ ihtml/themes/default/login.tpl | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/html/index.php b/html/index.php index 9877161c9..583f78f88 100644 --- a/html/index.php +++ b/html/index.php @@ -221,18 +221,16 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){ require_once("functions_setup.inc"); if(!is_schema_readable($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'])){ print_red(_("GOsa cannot retrieve information about the installed schema files. Please make sure, that this is possible.")); - $smarty->display(get_template_path('headers.tpl')); - echo "".$_SESSION['errors'].""; - exit(); + displayLogin(); + exit() ; }else{ $str = (schema_check($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'],0,TRUE)); $checkarr = array(); foreach($str as $tr){ if(isset($tr['needonstartup'])){ print_red($tr['msg']."
"._("Your ldap setup contains old schema definitions. Please re-run the setup.")); - $smarty->display(get_template_path('headers.tpl')); - echo "".$_SESSION['errors'].""; - exit(); + displayLogin(); + exit() ; } } } diff --git a/ihtml/themes/default/login.tpl b/ihtml/themes/default/login.tpl index 9dd1f0233..531119dfb 100644 --- a/ihtml/themes/default/login.tpl +++ b/ihtml/themes/default/login.tpl @@ -1,6 +1,7 @@ {* GOsa login - smarty template *} {$php_errors} +{$errors}

@@ -21,7 +22,6 @@