From 3016ac08d999e6d298bb95d5b79b93d38f0c1c3a Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 14 Dec 2006 05:17:57 +0000 Subject: [PATCH] Fiyes broken login if schema files are not readable. Fixed alignment of gosa error window git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@5387 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/index.php | 6 ++---- ihtml/themes/default/login.tpl | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/html/index.php b/html/index.php index d1bf44570..160fd7b5f 100644 --- a/html/index.php +++ b/html/index.php @@ -217,8 +217,7 @@ 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'].""; + displayLogin(); exit(); }else{ $str = (schema_check($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'],0,TRUE)); @@ -226,8 +225,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){ 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'].""; + 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 @@