diff --git a/html/setup.php b/html/setup.php
index 4517c23f8a6cb67c3a7bcf99830a45c6b274e06b..787d709dfd5de0fa7832cda4f74e80aa401bdcc7 100644 (file)
--- a/html/setup.php
+++ b/html/setup.php
session_start();
$_SESSION['DEBUGLEVEL']= 1;
session_start();
$_SESSION['DEBUGLEVEL']= 1;
+
+if (!isset($_GET['js']) && !isset($_SESSION['js'])){
+ echo '<script language="JavaScript" type="text/javascript">';
+ echo ' location = "index.php?js=true";';
+ echo '</script>';
+
+ $_SESSION['js']= FALSE;
+} else {
+ $_SESSION['js']= TRUE;
+}
+
/* Load required includes */
require_once ("../include/php_setup.inc");
require_once ("functions.inc");
/* Load required includes */
require_once ("../include/php_setup.inc");
require_once ("functions.inc");
-require_once ("setup_checks.inc");
+require_once ("functions_setup.inc");
// Save the Post Data (back and forward button)
foreach ($_POST as $key => $val){
// Save the Post Data (back and forward button)
foreach ($_POST as $key => $val){
$_SESSION['errors']= "";
// Print out gosa.conf
$_SESSION['errors']= "";
// Print out gosa.conf
-if ((isset($_SESSION['classes']) && isset($_SESSION['ldapconf']) && (isset($_POST['getconf']) || isset($_GET['getconfig']) ))){
+//if(isset($_SESSION['classes'])) print "\$_SESSION['classes']=ok";
+//if(isset($_SESSION['ldapconf'])) print "\$_SESSION['ldapconf']=ok";
+//if(isset($_POST['getconf'])) print "\$_POST['getconf']=ok";
+
+if ((
+ isset($_SESSION['classes']) &&
+ isset($_SESSION['ldapconf']) &&
+ (
+ isset($_POST['getconf']) || isset($_GET['getconfig']) ))){
echo parse_contrib_conf();
exit;
}
echo parse_contrib_conf();
exit;
}
/* Check for compile directory */
if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
/* Check for compile directory */
if (!(is_dir($smarty->compile_dir) && is_writable($smarty->compile_dir))){
- print_red(_("Directory '%s' specified as smarty compile directory is not accessable, check existence and rigths of this directory!"), $smarty->compile_dir);
+ print_red(_("Directory '%s' specified as smarty compile directory is not accessible, please check existence and rights of this directory!"), $smarty->compile_dir);
echo $_SESSION['errors'];
exit();
}
echo $_SESSION['errors'];
exit();
}