Code

Fiyes broken login if schema files are not readable.
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 14 Dec 2006 05:17:57 +0000 (05:17 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 14 Dec 2006 05:17:57 +0000 (05:17 +0000)
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
ihtml/themes/default/login.tpl

index d1bf4457018b576c603a6cea50527785ba0c3030..160fd7b5f5d91847d37eed308d8c0616b1e8d838 100644 (file)
@@ -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 "<body>".$_SESSION['errors']."</body></html>";
+      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']."<br>"._("Your ldap setup contains old schema definitions. Please re-run the setup."));
-          $smarty->display(get_template_path('headers.tpl'));
-          echo "<body>".$_SESSION['errors']."</body></html>";
+          displayLogin();
           exit();
         }
       }
index 9dd1f0233090f6fcbcb8d888c86ebc7479aeaa80..531119dfbae09a0742a4f6a315b25e8c2381cc42 100644 (file)
@@ -1,6 +1,7 @@
 <body style="background-color: #8B858B;background-image:none;">
 {* GOsa login - smarty template *}
 {$php_errors}
+{$errors}
 
 <!-- Spacer for some browsers -->
 <div class='gosaLoginSpacer'></div>
@@ -21,7 +22,6 @@
  
     <!-- Formular data, containing a table to center fields -->
     <form action='index.php' method='post' name='mainform' onSubmit='js_check(this);return true;'>
-     {$errors}
      <table summary="" style='vertical-align:middle; text-align:left;' cellspacing='7' align='center'>
       <tr>
         <td>