X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=html%2Fsetup.php;h=787d709dfd5de0fa7832cda4f74e80aa401bdcc7;hb=2c0515a09cbb244ec32757b8372f7e55830a67e3;hp=4517c23f8a6cb67c3a7bcf99830a45c6b274e06b;hpb=e299f0ca47a924516f2afbe4e922f2418b75315c;p=gosa.git

diff --git a/html/setup.php b/html/setup.php
index 4517c23f8..787d709df 100644
--- a/html/setup.php
+++ b/html/setup.php
@@ -22,10 +22,21 @@
 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");
-require_once ("setup_checks.inc");
+require_once ("functions_setup.inc");
 
 // Save the Post Data (back and forward button)
 foreach ($_POST as $key => $val){
@@ -47,7 +58,15 @@ if (!file_exists(CONFIG_TEMPLATE_DIR."/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;
 }
@@ -64,7 +83,7 @@ $smarty->compile_dir= '/var/spool/gosa';
 
 /* 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();
 }