Added new constant named CONFIG_FILE.

[gosa.git] / setup / class_setup.inc

diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index c2223069d374f6aec54cdd4d2476803da4f4f0a2..83311ed2f9dec5e12d61ae8a6a58242b77112090 100644 (file)
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -22,7 +22,7 @@ require_once("class_setupStep.inc");
 
 class setup 
 {
-  var $i_steps  = 8;  // Number of setup steps 
+  var $i_steps  = 9;  // Number of setup steps 
   var $i_current= 1;  // Current step
   var $i_last   = 1;  // Last setup step;
   var $o_steps  = array(); 
@@ -37,9 +37,17 @@ class setup
     $this->o_steps[4] = new setup_step_4();
     $this->o_steps[5] = new setup_step_5();
     $this->o_steps[6] = new setup_step_6();
-    $this->o_steps[7] = new setup_step_7();
-    $this->o_steps[8] = new setup_step_8();
-
+    $this->o_steps[7] = new setup_step_6a();
+    $this->o_steps[8] = new setup_step_7();
+    $this->o_steps[9] = new setup_step_8();
+
+    /* Ensure that setup is not reachable if gosa.conf (CONFIG_FILE) */
+    if(file_exists(CONFIG_DIR."/".CONFIG_FILE)){
+      session_destroy();
+      header("Location: index.php")    ;
+      exit();
+    }
+    
     foreach($this->o_steps as $key => $step){
       $this->o_steps[$key]->parent = $this;
     }
@@ -149,6 +157,8 @@ class setup
     $str = "";
     foreach($this->o_steps as $key => $step){
 
+      $step -> update_strings();
+
       $s_title    = $step -> get_title();
       $s_info     = $step -> get_small_info();
       $b_active   = $step -> is_active();