Updated German Translation.

[gosa.git] / html / index.php

diff --git a/html/index.php b/html/index.php
index fcfe3445bbe75a9809a6779621bc9b9dd07d3af1..e3e87e6dadb6da018115bbd878a8fa16c855b31b 100644 (file)
--- a/html/index.php
+++ b/html/index.php
@@ -28,6 +28,11 @@ header("Content-type: text/html; charset=UTF-8");
 session_start ();
 $username= "";
 
+/* Reset errors */
+$_SESSION['errors']             = "";
+$_SESSION['errorsAlreadyPosted']= array();
+$_SESSION['LastError']          = "";
+
 /* Check if we need to run setup */
 if (!file_exists(CONFIG_DIR."/gosa.conf")){
   header("location:setup.php");
@@ -44,7 +49,7 @@ if(isset($_POST['javascript']) && $_POST['javascript'] == "true") {
   $_SESSION['js']= FALSE;
 }
 
-/* Check if gosa.conf is accessable */
+/* Check if gosa.conf is accessible */
 if (!is_readable(CONFIG_DIR."/gosa.conf")){
   print_red(sprintf(_("GOsa configuration %s/gosa.conf is not readable. Aborted."), CONFIG_DIR));
   echo $_SESSION['errors'];
@@ -68,7 +73,7 @@ $smarty->assign ('nextfield', 'username');
 
 /* Check for compile directory */
 if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
-  print_red(sprintf(_("Directory '%s' specified as compile directory is not accessable!"),
+  print_red(sprintf(_("Directory '%s' specified as compile directory is not accessible!"),
         $smarty->compile_dir));
   echo $_SESSION['errors'];
   exit();
@@ -103,15 +108,15 @@ if ($_SERVER["REQUEST_METHOD"] != "POST"){
 
 /* Check for SSL connection */
 $ssl= "";
-if (!isset($HTTP_SERVER_VARS['HTTPS']) ||
-    !stristr($HTTP_SERVER_VARS['HTTPS'], "on")) {
+if (!isset($_SERVER['HTTPS']) ||
+    !stristr($_SERVER['HTTPS'], "on")) {
 
-  if (empty($HTTP_SERVER_VARS['REQUEST_URI'])) {
-    $ssl= "https://".$HTTP_SERVER_VARS['HTTP_HOST'].
-      $HTTP_SERVER_VARS['PATH_INFO'];
+  if (empty($_SERVER['REQUEST_URI'])) {
+    $ssl= "https://".$_SERVER['HTTP_HOST'].
+      $_SERVER['PATH_INFO'];
   } else {
-    $ssl= "https://".$HTTP_SERVER_VARS['HTTP_HOST'].
-      $HTTP_SERVER_VARS['REQUEST_URI'];
+    $ssl= "https://".$_SERVER['HTTP_HOST'].
+      $_SERVER['REQUEST_URI'];
   }
 }
 
@@ -127,6 +132,11 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){
   /* Reset error messages */
   $message= "";
 
+  /* Destroy old sessions, they cause a successfull login to relog again ...*/
+  if(isset($_SESSION['_LAST_PAGE_REQUEST'])){
+    $_SESSION['_LAST_PAGE_REQUEST'] = time();
+  }
+
   $server= validate($_POST["server"]);
   $config->set_current($server);
 
@@ -140,25 +150,29 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){
   }
 
   /* Check for schema file presence */
-  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."));
-    echo $_SESSION['errors'];
-    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']."<br>"._("Your ldap setup contains old schema definitions. Please re-run the setup."));
-        print $_SESSION['errors'];
-        exit();
+  if(!isset($config->data['MAIN']['SCHEMA_CHECK'])){
+    $config->data['MAIN']['SCHEMA_CHECK'] = "true";
+  }
+  if(isset($config->data['MAIN']['SCHEMA_CHECK'])&&preg_match("/true/i",$config->data['MAIN']['SCHEMA_CHECK'])){
+    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."));
+      echo $_SESSION['errors'];
+      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']."<br>"._("Your ldap setup contains old schema definitions. Please re-run the setup."));
+          print $_SESSION['errors'];
+          exit();
+        }
       }
     }
   }
-
   /* Check for locking area */
-  $ldap->cat($config->current['CONFIG']);
+  $ldap->cat($config->current['CONFIG'], array("dn"));
   $attrs= $ldap->fetch();
   if (!count ($attrs)){
     $ldap->cd($config->current['BASE']);
@@ -199,6 +213,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){
 
       /* Let GOsa trigger a new connection for each POST, save
          config to session. */
+      $config->get_departments();
+      $config->make_idepartments();
       $_SESSION['config']= $config;
 
       /* Go to main page */
@@ -220,6 +236,7 @@ $smarty->assign ('directory_img', get_template_path('images/ldapserver.png'));
 if (!isset($message)){
   $message= "";
 }
+
 $smarty->assign ("message", $message);
 
 /* Displasy SSL mode warning? */
@@ -229,6 +246,10 @@ if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){
   $smarty->assign ("ssl", "");
 }
 
+/* Translation of cookie-warning. Whether to display it, is determined by JavaScript */
+$smarty->assign ("cookies", "<b>"._("Warning").":</b> "._("Your browser has cookies disabled. Please enable cookies and reload this page before logging in!"));
+
+
 /* Generate server list */
 $servers= array();
 if (isset($_POST['server'])){