X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=html%2Findex.php;h=9877161c96ac60495c7d8eba693a47098718cca0;hb=b4e48f233213b645e1d293c88a5c3fcf32b3a67f;hp=16e0c94beed5f4894395637e31082c630b3286d4;hpb=8f22c32dd778e20d5df1eaf7bf6a81412ac493b7;p=gosa.git

diff --git a/html/index.php b/html/index.php
index 16e0c94be..9877161c9 100644
--- a/html/index.php
+++ b/html/index.php
@@ -46,7 +46,7 @@ function displayLogin()
 
     /* Displasy SSL mode warning? */
     if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){
-      $smarty->assign ("ssl", "<b>"._("Warning").":</b> "._("Session will not be encrypted.")." <a style=\"color:red;\" href=\"$ssl\"><b>"._("Enter SSL session")."</b></a>!");
+      $smarty->assign ("ssl", "<b>"._("Warning").":<\/b> "._("Session will not be encrypted.")." <a style=\"color:red;\" href=\"$ssl\"><b>"._("Enter SSL session")."<\/b></a>!");
     } else {
       $smarty->assign ("ssl", "");
     }
@@ -85,6 +85,14 @@ function displayLogin()
 /* Set error handler to own one, initialize time calculation
    and start session. */
 session_start ();
+
+/* Destroy old session if exists. 
+    Else you will get your old session back, if you not logged out correctly. */
+if(is_array($_SESSION) && count($_SESSION)){
+  session_destroy();
+  session_start();
+}
+
 $username= "";
 
 /* Reset errors */
@@ -115,7 +123,7 @@ if (!is_readable(CONFIG_DIR."/gosa.conf")){
 }
 
 /* Parse configuration file */
-$config= new config(CONFIG_DIR."/gosa.conf", $BASE_DIR);
+$config= new config(CONFIG_DIR."/gosa.conf-trunk", $BASE_DIR);
 $_SESSION['DEBUGLEVEL']= $config->data['MAIN']['DEBUGLEVEL'];
 if ($_SERVER["REQUEST_METHOD"] != "POST"){
   @DEBUG (DEBUG_CONFIG, __LINE__, __FUNCTION__, __FILE__, $config->data, "config");
@@ -291,7 +299,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){
               if (preg_match("/\bpassword\b/i",$value)){
                 $plug=$key;
                 gosa_log ("User \"$username\" password forced to change");
-                header ("Location: main.php?plug=$plug&reset=1");
+                header ("Location: main.php?plug=$plug&amp;reset=1");
                 exit;
               }
             }
@@ -328,13 +336,13 @@ $smarty->assign ("message", $message);
 
 /* Displasy SSL mode warning? */
 if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){
-  $smarty->assign ("ssl", "<b>"._("Warning").":</b> "._("Session will not be encrypted.")." <a style=\"color:red;\" href=\"$ssl\"><b>"._("Enter SSL session")."</b></a>!");
+  $smarty->assign ("ssl", "<b>"._("Warning").":<\/b> "._("Session will not be encrypted.")." <a style=\"color:red;\" href=\"$ssl\"><b>"._("Enter SSL session")."<\/b></a>!");
 } else {
   $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!"));
+$smarty->assign ("cookies", "<b>"._("Warning").":<\/b> "._("Your browser has cookies disabled. Please enable cookies and reload this page before logging in!"));
 
 
 /* Generate server list */
@@ -351,7 +359,6 @@ $smarty->assign ("server_options", $servers);
 $smarty->assign ("server_id", $selected);
 
 /* show login screen */
-$smarty->display (get_template_path('headers.tpl'));
 $smarty->assign ("PHPSESSID", session_id());
 if (isset($_SESSION['errors'])){
   $smarty->assign("errors", $_SESSION['errors']);