Reenabled forward button on last setup step.

If forward button is clicked and the configuration file exists, go to gosa login mask.

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

diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index fabac97a9ef526c2198f9767d737ab23e6794079..700ea7761d84047d0aa46178782eedcf07b323e6 100644 (file)
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -252,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);

diff --git a/setup/class_setupStep_Finish.inc b/setup/class_setupStep_Finish.inc
index b37ba728bd16310eeed1cfb5f8094cd0c1ed248f..579ce622688083a4465bd8a7b6e8da1b23446777 100644 (file)
--- a/setup/class_setupStep_Finish.inc
+++ b/setup/class_setupStep_Finish.inc
@@ -61,7 +61,7 @@ class Step_Finish extends setup_step
     $exists = file_exists(CONFIG_DIR."/".CONFIG_FILE); 
 
     /* Redirect to GOsa login */
-    if(isset($_POST['use_gosa'])){
+    if(isset($_POST['next']) && $exists){
       session_destroy();
       header("Location: index.php");
       exit();

diff --git a/setup/class_setupStep_Ldap.inc b/setup/class_setupStep_Ldap.inc
index 6c4a1ab9e36eac31f5036e3bb7af395ad27b1a21..211e8191e206dd894db2db0ac12a2e861f221cbf 100644 (file)
--- a/setup/class_setupStep_Ldap.inc
+++ b/setup/class_setupStep_Ldap.inc
@@ -43,9 +43,6 @@ class Step_Ldap extends setup_step
   function Step_Ldap()
   {
     $this->update_strings();
-
-    
-  
   }