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

diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index a51d922c5..700ea7761 100644
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -40,7 +40,9 @@ class setup
     $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)){
@@ -57,6 +59,12 @@ class setup
 
   function execute()
   {
+    /* 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();
@@ -236,7 +244,7 @@ class setup
     if($this->o_steps[$this->i_current]->dialog){
       $str ="";
     }else{
-      $str ="";
+      $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")."'>";
@@ -244,11 +252,7 @@ class setup
         $str .= "<input type='button' name='last' value='"._("Back")."' disabled>";
       }
       $str.= "&nbsp;";
-      if(isset($this->o_steps[$this->i_current + 1])){
         $str .= "<input type='submit' name='next' value='"._("Continue")."'>";
-      }else{
-        $str .= "<input type='button' value='"._("Continue")."' disabled>";
-      }
       $str .="</div>";
     }
     return($str);