Added additional check to delete block

[gosa.git] / setup / class_setup.inc

diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index d1d73fb8ae7c778ea78f4777e4f28c33eac36707..753751c52537d7e43e28845244038b07f8eea244 100644 (file)
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -18,8 +18,10 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+
 require_once("class_setupStep.inc");
 
+
 class setup 
 {
   var $i_steps  = 9;  // Number of setup steps 
@@ -41,6 +43,7 @@ class setup
     $this->o_steps[$i++] = new Step_Config2();
     $this->o_steps[$i++] = new Step_Config3();
     $this->o_steps[$i++] = new Step_Migrate();
+    $this->o_steps[$i++] = new Step_Feedback();
     $this->o_steps[$i++] = new Step_Finish();
     $this->i_steps = $i-1;
 
@@ -52,19 +55,19 @@ class setup
     }
     
     foreach($this->o_steps as $key => $step){
-      $this->o_steps[$key]->parent = $this;
+      $this->o_steps[$key]->parent = &$this;
     }
   }
 
-
   function execute()
   {
     /* Display phpinfo() dialog when $_GET['info'] is set,
      *  but only do this, if user is allowed to use the setup.
      * If setupStep_Welcome is_completed, we are allowed to view those infos-
      */
-    if(isset($_GET['info']) && get_class($this->o_steps[1]) == "Step_Welcome" && $this->o_steps[1]->is_completed()){
+    if(isset($_GET['info']) &&  preg_match("/Step_Welcome/i",get_class($this->o_steps[1])) && $this->o_steps[1]->is_completed()){
       phpinfo();
+      exit();
     }
 
     /* display step error msgs */
@@ -283,6 +286,17 @@ class setup
     }
     return(false);
   }
+
+  function step_name_to_id($name)
+  {
+    foreach($this->o_steps as $id => $class){
+      if(get_class($class) == $name){
+        return($id);
+      }
+    }
+    return(0);
+  }
+  
 }