Fixed setup step 6. some posts were not captured

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

diff --git a/setup/class_setup.inc b/setup/class_setup.inc
index 2ec1fd83b6ff953de3946c1beb0fd07d6181dc00..c2223069d374f6aec54cdd4d2476803da4f4f0a2 100644 (file)
--- a/setup/class_setup.inc
+++ b/setup/class_setup.inc
@@ -101,6 +101,10 @@ class setup
   
     $step = -1;
 
+    if(isset($_POST['setup_goto_step'])){
+      $step= $_POST['setup_goto_step'];
+    }
+
     if(isset($_GET['step'])){
       $step = $_GET['step'];
     }elseif(isset($_POST['next'])){
@@ -109,10 +113,6 @@ class setup
       $step = $this->i_current - 1;
     }
   
-    if(isset($_POST['setup_goto_step'])){
-      $step= $_POST['setup_goto_step'];
-    }
-
     $once = true;
     foreach($_POST as $name => $value){
       if(preg_match("/^step_[0-9]*$/",$name) && $once ){

diff --git a/setup/class_setupStep6.inc b/setup/class_setupStep6.inc
index f7e0d54ec1e1078f6d25087dbbadcec7071a6eb6..754f9ff7f0b15b8210e4097a1c1d9ee9bfeded5b 100644 (file)
--- a/setup/class_setupStep6.inc
+++ b/setup/class_setupStep6.inc
@@ -90,6 +90,24 @@ class setup_step_6 extends setup_step
         }
       }
 
+      if(isset($_POST['minid_active'])){
+        $this->generic_settings['minid_active'] = TRUE;
+        if(isset($_POST['minid'])){
+          $this->generic_settings['minid'] = $_POST['minid'];
+        }
+      }else{
+        $this->generic_settings['minid_active'] = FALSE;
+      }
+
+      if(isset($_POST['wws_ou_active'])){
+        $this->generic_settings['wws_ou_active'] = TRUE;
+        if(isset($_POST['wws_ou'])){
+          $this->generic_settings['wws_ou'] = $_POST['wws_ou'];
+        }
+      }else{
+        $this->generic_settings['wws_ou_active'] = FALSE;
+      }
+
       /* Generic settings */
       if(isset($_POST['idgen_active'])){
         $this->generic_settings['idgen_active'] = TRUE;

diff --git a/setup/setup_step6.tpl b/setup/setup_step6.tpl
index 734e0c00e6cf8966a8563264ba30ca6fc26a4cb9..d67f255b9c2bc60775a393f89e4e3b5a3f84b22f 100644 (file)
--- a/setup/setup_step6.tpl
+++ b/setup/setup_step6.tpl
@@ -76,7 +76,7 @@
             {t}Windows workstation ou{/t}
         </div>
         <div class='step4_value'>
-            {if $generic_settings.minid_active == FALSE}
+            {if $generic_settings.wws_ou_active == FALSE}
                 <input type='checkbox' value='1' name='wws_ou_active'
                     onClick='changeState("wws_ou");'>
                 <input style='width:90%' id='wws_ou' name='wws_ou' type='text' value='{$generic_settings.wws_ou}' disabled>