diff --git a/html/index.php b/html/index.php
index 43514623b2be9bb87bb675e9ff953bc0dcb75d9e..ece9138c5cc7fd7b518881d782280babedddb260 100644 (file)
--- a/html/index.php
+++ b/html/index.php
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");
$_SESSION['js']= FALSE;
}
-/* Check if gosa.conf is accessable */
+/* Check if gosa.conf is accessible */
if (!is_readable(CONFIG_DIR."/gosa.conf")){
- print_red(sprintf(_("GOsa configuration %s/gosa.conf is not readable. Aborted."), CONFIG_DIR));
- echo $_SESSION['errors'];
+ echo sprintf(_("GOsa configuration %s/gosa.conf is not readable. Aborted."), CONFIG_DIR);
exit();
}
/* Check for compile directory */
if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
- print_red(sprintf(_("Directory '%s' specified as compile directory is not accessable!"),
- $smarty->compile_dir));
- echo $_SESSION['errors'];
+ echo sprintf(_("Directory '%s' specified as compile directory is not accessible!"),
+ $smarty->compile_dir);
exit();
}
/* 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'];
}
}
}
/* Check for schema file presence */
- if( ((isset($config->data['MAIN']['SCHEMA_CHECK']))&&(preg_match("/true/i",$config->data['MAIN']['SCHEMA_CHECK'])))
- ||
- (!isset($config->data['MAIN']['SCHEMA_CHECK']))){
+ if(!isset($config->data['MAIN']['SCHEMA_CHECK'])){
+ $config->data['MAIN']['SCHEMA_CHECK'] = "true";
+ }
+ 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'])){
print_red(_("GOsa cannot retrieve information about the installed schema files. Please make sure, that this is possible."));
}
}
/* 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']);
/* 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 */
if (!isset($message)){
$message= "";
}
+
$smarty->assign ("message", $message);
/* Displasy SSL mode warning? */
$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!"));
+
+
/* Generate server list */
$servers= array();
if (isset($_POST['server'])){