Added dummy step.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5951 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/html/setup.php b/html/setup.php
index 1f3796712c58d912a3aa9f2be8c2fb69b775a972..dc02aad3d231852c85340cb030b6fb9fd1e56b77 100644 (file)
--- a/html/setup.php
+++ b/html/setup.php
@@ -34,6 +34,7 @@ require_once("../setup/class_setupStep4.inc");
 require_once("../setup/class_setupStep5.inc");
 require_once("../setup/class_setupStep6.inc");
 require_once("../setup/class_setupStep7.inc");
+require_once("../setup/class_setupStep8.inc");
 
 
 /* Set header */

diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index f59d5f68bd0f93cdc040017aed37f9b79a63d285..297f956950d6c5ba343c532d540abe4272d557b6 100644 (file)
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -23,7 +23,7 @@ require_once("class_setupStep.inc");
 class setup 
 {
 
-  var $i_steps  = 7;  // Number of setup steps 
+  var $i_steps  = 8;  // Number of setup steps 
   var $i_current= 1;  // Current step
   var $i_last   = 1;  // Last setup step;
   var $o_steps  = array(); 
@@ -32,7 +32,22 @@ class setup
 
   function setup()
   {
-    for($i = 1 ; $i <= $this->i_steps; $i ++ ){
+    
+    $this->o_steps[1] = new setup_step_1();
+    $this->o_steps[2] = new setup_step_2();
+    $this->o_steps[3] = new setup_step_3();
+    $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();
+
+    foreach($this->o_steps as $key => $step){
+      $this->o_steps[$key]->parent = $this;
+    }
+
+/*
+    for($i = 1 ; $i <= $this->i_steps; $ii ++ ){
       $class= "setup_step_".$i;
     
       if(class_exists($class)){
@@ -43,6 +58,7 @@ class setup
       }
       $this->o_steps[$i]->parent = $this;
     }
+*/
   }
 
   function execute()
@@ -91,6 +107,9 @@ class setup
         if($this->o_steps[$i]->is_completed()){
           if(isset($this->o_steps[($i+1)])){
             $this->o_steps[($i+1)]->set_enabled();
+          }else{
+            $this->o_steps[($i+1)]->set_enabled(false);
+          
           }
         }
       }

diff --git a/setup/class_setupStep.inc b/setup/class_setupStep.inc
index 6cfe60ce2f0d5257960170528e063c0f3cfd5ad0..cbbb73926bd165345ca3b290e1b3cbc2267a421d 100644 (file)
--- a/setup/class_setupStep.inc
+++ b/setup/class_setupStep.inc
@@ -36,6 +36,10 @@ class setup_step
   {
   }
 
+  function execute()
+  { 
+  }
+
   function save_object()
   {
     /* Do not call plugin::save_object. This causes acl trouble  */

diff --git a/setup/class_setupStep7.inc b/setup/class_setupStep7.inc
index f93af3cec511880e435faf39d2ecdde20dc1cbbb..0c962e7b61df7534f2edf544cc4d15e1eb7da9fe 100644 (file)
--- a/setup/class_setupStep7.inc
+++ b/setup/class_setupStep7.inc
@@ -46,6 +46,12 @@ class setup_step_7 extends setup_step
       }
     }
 
+    if($failed_checks == 0){
+      $this->is_completed = TRUE;
+    }else{
+      $this->is_completed = FALSE;
+    }
+
     $smarty = get_smarty();
     $smarty->assign("display_type",$this->display_type);
     $smarty->assign("schema_readable",$this->schema_readable);
@@ -93,15 +99,6 @@ class setup_step_7 extends setup_step
       return (array(array("msg" => _("Can't get schema information from server. No schema check possible!"), "status" => FALSE)));
     }
 
-
-    $checks["gosaObject"]["VERSION"]  = "2.4";
-    $checks["gosaObject"]["FILE"]     = "gosa+samba3.schema/gosa.schema";
-    $checks["gosaObject"]["CLASS"]    = array("gosaObject");
-    $checks["gosaObject"]["STATUS"]   = FALSE;
-    $checks["gosaObject"]["MUST"]     = FALSE;
-    $checks["gosaObject"]["MSG"]      = ""; // The error message to display
-    $checks["gosaObject"]["INFO"]     = _("GOsa object is used to store acls.");
-
     /* This is the default block used for each entry. 
      *  to avoid unset indexes. 
      */
@@ -116,7 +113,7 @@ class setup_step_7 extends setup_step
 
     /* The gosa base schema */
     $checks['gosaObject'] = $def_check;
-    $checks['gosaObject']['REQUIRED_VERSION'] = "2.4";
+    $checks['gosaObject']['REQUIRED_VERSION'] = "22.4";
     $checks['gosaObject']['SCHEMA_FILES']     = array("gosa+samba3.schema","gosa.schema");
     $checks['gosaObject']['CLASSES_REQUIRED'] = array("gosaObject");
     $checks['gosaObject']['IS_MUST_HAVE']     = TRUE;