diff --git a/html/index.php b/html/index.php
index 3cd6509f0fff8aecc67a961d68269b652a1fc6ad..1fdcf4bb3b91d101f6385ad10e4d0de6828ffd21 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", "");
}
$_SESSION['LastError'] = "";
/* Check if we need to run setup */
-if (!file_exists(CONFIG_DIR."/gosa.conf")){
+if (!file_exists(CONFIG_DIR."/gosa.conf-trunk")){
header("location:setup.php");
exit();
}
}
/* 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(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'])){
+ $recursive = (isset($config->current['RECURSIVE']) && $config->current['RECURSIVE'] == "true");
+ $tls = (isset($config->current['TLS']) && $config->current['TLS'] == "true");
+
+ if(!is_schema_readable($config->current['SERVER'], $config->current['ADMIN'], $config->current['PASSWORD'], $recursive, $tls)){
+
print_red(_("GOsa cannot retrieve information about the installed schema files. Please make sure, that this is possible."));
- $smarty->display(get_template_path('headers.tpl'));
- echo "<body>".$_SESSION['errors']."</body></html>";
- exit();
+ displayLogin();
+ exit() ;
}else{
- $str = (schema_check($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'],0,TRUE));
+ $str = (schema_check($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'], $recursive, $tls, 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."));
- $smarty->display(get_template_path('headers.tpl'));
- echo "<body>".$_SESSION['errors']."</body></html>";
- exit();
+ displayLogin();
+ exit() ;
}
}
}
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']);