X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=html%2Findex.php;h=9877161c96ac60495c7d8eba693a47098718cca0;hb=b4e48f233213b645e1d293c88a5c3fcf32b3a67f;hp=3cd6509f0fff8aecc67a961d68269b652a1fc6ad;hpb=8b1df8b92b5d5529b7023497024b10d67bab276e;p=gosa.git
diff --git a/html/index.php b/html/index.php
index 3cd6509f0..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", ""._("Warning").": "._("Session will not be encrypted.")." "._("Enter SSL session")."!");
+ $smarty->assign ("ssl", ""._("Warning").":<\/b> "._("Session will not be encrypted.")." "._("Enter SSL session")."<\/b>!");
} else {
$smarty->assign ("ssl", "");
}
@@ -123,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");
@@ -299,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&reset=1");
exit;
}
}
@@ -336,13 +336,13 @@ $smarty->assign ("message", $message);
/* Displasy SSL mode warning? */
if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){
- $smarty->assign ("ssl", ""._("Warning").": "._("Session will not be encrypted.")." "._("Enter SSL session")."!");
+ $smarty->assign ("ssl", ""._("Warning").":<\/b> "._("Session will not be encrypted.")." "._("Enter SSL session")."<\/b>!");
} else {
$smarty->assign ("ssl", "");
}
/* Translation of cookie-warning. Whether to display it, is determined by JavaScript */
-$smarty->assign ("cookies", ""._("Warning").": "._("Your browser has cookies disabled. Please enable cookies and reload this page before logging in!"));
+$smarty->assign ("cookies", ""._("Warning").":<\/b> "._("Your browser has cookies disabled. Please enable cookies and reload this page before logging in!"));
/* Generate server list */
@@ -359,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']);