Moved conferences from base to ,ou=conferences,ou=asterisk,ou=configs,ou=systems,

[gosa.git] / html / index.php

diff --git a/html/index.php b/html/index.php
index 77404340400739526f78c3d742ceb680665d58af..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");
@@ -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'];
   }
 }
 
@@ -167,7 +172,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){
     }
   }
   /* 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']);
@@ -208,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 */