diff --git a/html/index.php b/html/index.php
index 16e0c94beed5f4894395637e31082c630b3286d4..9877161c96ac60495c7d8eba693a47098718cca0 100644 (file)
--- a/html/index.php
+++ b/html/index.php
/* 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", "");
}
/* 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 */
}
/* 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");
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&reset=1");
exit;
}
}
/* 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 */
$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']);