X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=setup%2Fclass_setup.inc;h=700ea7761d84047d0aa46178782eedcf07b323e6;hb=68503ecbb4d310b61ef8f1f32003fc739bacb237;hp=4b9af867d5d8ebc1df6984739bbdcc9d58a1bfdd;hpb=1b56a087aa6e173e82bb349e5dd3121d8010a7e4;p=gosa.git

diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index 4b9af867d..700ea7761 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -30,16 +30,19 @@ class setup
 
   function setup()
   {
-    
-    $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_6a();
-    $this->o_steps[8] = new setup_step_7();
-    $this->o_steps[9] = new setup_step_8();
+    $i = 1; 
+    $this->o_steps[$i++] = new Step_Welcome();
+    $this->o_steps[$i++] = new Step_Language();
+    $this->o_steps[$i++] = new Step_Checks();
+    $this->o_steps[$i++] = new Step_License();
+    $this->o_steps[$i++] = new Step_Ldap();
+    $this->o_steps[$i++] = new Step_Schema();
+    $this->o_steps[$i++] = new Step_Config1();
+    $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_Finish();
+    $this->i_steps = $i-1;
 
     /* Ensure that setup is not reachable if gosa.conf (CONFIG_FILE) */
     if(file_exists(CONFIG_DIR."/".CONFIG_FILE)){
@@ -56,7 +59,12 @@ class setup
 
   function execute()
   {
-    $smarty = get_smarty();
+    /* display step error msgs */
+    $msgs = $this->o_steps[$this->i_current]->check();
+    foreach($msgs as $msg){
+      print_red($msg);
+    }
+
     $this->o_steps[$this->i_last]->set_active(FALSE);
     $this->o_steps[$this->i_current]->set_active();
     $content = $this->o_steps[$this->i_current]->execute();
@@ -92,7 +100,7 @@ class setup
     }
 
     /* Check if step was selected */
-    if(isset($_GET['step']) || isset($_POST['next']) || isset($_POST['last']) || isset($_POST['setup_goto_step'])){
+    if(isset($_GET['step']) || isset($_POST['next']) || isset($_POST['last'])){
 
       /* check if current setup step is completed now 
           and activate the next step if possible */
@@ -106,7 +114,15 @@ class setup
         }
       }
     }
-  
+ 
+    /* Disable all following steps, if one step isn't compelted right now .*/
+    for($i = 1 ; $i <= $this->i_steps ; $i ++ ){
+      if($this->o_steps[$i]->is_completed()){
+      }else{
+        $this->disable_steps_from($i+1);
+      }
+    }
+ 
     $step = -1;
 
     if(isset($_POST['setup_goto_step'])){
@@ -163,27 +179,33 @@ class setup
       $s_info     = $step -> get_small_info();
       $b_active   = $step -> is_active();
       $b_enabled  = $step -> is_enabled();
+      $b_completed= $step -> is_completed();
+
+      if($b_completed){
+        $s = "<img src='images/true.png' alt='"._("Completed")."' class='center'>&nbsp;"; 
+      }else{
+        $s = "<img src='images/empty.png' alt=' ' class='center'>&nbsp;";
+      }
 
       if($_SESSION['js']){
 
         $str .="<div >";
+    
         if($b_enabled){
           if($b_active){
             $str .= "<div class='navigation_element_active'>";
-            $str .= "<div onClick='document.mainform.setup_goto_step.value=\"$key\";document.mainform.submit();'
-              class='navigation_title_active'>".$s_title."</div>";
-            $str .= "<div onClick='document.mainform.setup_goto_step.value=\"$key\";document.mainform.submit();'
-              class='navigation_info'>".$s_info."</div>";
+            $str .= "<div class='navigation_title_active'>".$s.$s_title."</div>";
+            $str .= "<div class='navigation_info'>".$s_info."</div>";
             $str .= "</div>";
           }else{
             $str .= "<div class='navigation_element'>";
             $str .= "<div onClick='document.mainform.setup_goto_step.value=\"$key\";document.mainform.submit();'
-              class='navigation_title_inactive'>".$s_title."</div>";
+              class='navigation_title_inactive'>".$s.$s_title."</div>";
             $str .= "</div>";
           }
         }else{
           $str .= "<div class='navigation_element'>";
-          $str .= "<div class='navigation_title_disabled'>".$s_title."</div>";
+          $str .= "<div class='navigation_title_disabled'>".$s.$s_title."</div>";
           $str .= "</div>";
         }
         $str .= "</div>" ;
@@ -193,7 +215,7 @@ class setup
           if($b_active){
             $str .= "<div class='navigation_element_active'>";
             $str .= "<input style='text-align: left; color: #00008F; font-weight: bold; width:100%;' 
-                        type='submit' value='".$s_title."' name='step_".$key."'>";
+                        type='button' value='".$s_title."' name='step_".$key."'>";
             $str .= "</div>";
           }else{
             $str .= "<div class='navigation_element'>";
@@ -216,16 +238,23 @@ class setup
 
   function get_bottom_html()
   {
-    $str ="";
-    $str.="   <div style='text-align:right;float:top;'>";
-    if(isset($this->o_steps[$this->i_current -1]) && $this->o_steps[$this->i_current -1]->is_enabled()){
-      $str .= "<input type='submit' name='last' value='"._("Backward")."'>";
+    /* Skip adding forward/backward button,   
+     *  if the currently opened step is a sub dialog 
+     */
+    if($this->o_steps[$this->i_current]->dialog){
+      $str ="";
     }else{
-      $str .= "<input type='button' name='last' value='"._("Backward")."' disabled>";
+      $str ="<p class='seperator' style='margin-bottom:10px;'>&nbsp;</p>";
+      $str.="   <div style='text-align:right;float:top;'>";
+      if(isset($this->o_steps[$this->i_current -1]) && $this->o_steps[$this->i_current -1]->is_enabled()){
+        $str .= "<input type='submit' name='last' value='"._("Back")."'>";
+      }else{
+        $str .= "<input type='button' name='last' value='"._("Back")."' disabled>";
+      }
+      $str.= "&nbsp;";
+        $str .= "<input type='submit' name='next' value='"._("Continue")."'>";
+      $str .="</div>";
     }
-
-    $str .= "<input type='submit' name='next' value='"._("Forward")."'>";
-    $str .="</div>";
     return($str);
   }