Moved account_expiration from step2 to step1

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

diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc
index 10e7806698d5bd8543dcf153be3e5477fdcb3bdb..6a5e8e2ea06b5cab11d89d302bf0684b96fee19a 100644 (file)
--- a/setup/class_setupStep_Config1.inc
+++ b/setup/class_setupStep_Config1.inc
@@ -28,7 +28,7 @@ class Step_Config1 extends setup_step
   var $peopledn   = "cn";
   var $uidbase    = 1000;
   var $header_image = "images/ldapserver.png";
-
+  var $account_expiration  =FALSE;
   var $base_hook         = "/usr/bin/sudo myscript"; 
   var $base_hook_active  = FALSE; 
 
@@ -51,7 +51,7 @@ class Step_Config1 extends setup_step
   var $crypt_methods  = array();
 
   var $attributes = array("peopleou","groupou","peopledn","uidbase","encryption","theme","errorlvl",
-                          "base_hook","base_hook_active");
+                          "base_hook","base_hook_active","account_expiration");
 
   function Step_Config1()
   {

diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index 259e10430917b74aa82d4f6a25d36fddf14938a1..5023cec51060cd006607ca6e4702cad409baf3ea 100644 (file)
--- a/setup/class_setupStep_Config2.inc
+++ b/setup/class_setupStep_Config2.inc
@@ -25,7 +25,6 @@ class Step_Config2 extends setup_step
   var $governmentmode = FALSE;
   var $sambaidmapping = FALSE;
   var $strict         = TRUE;
-  var $account_expiration  =FALSE;
   var $header_image = "images/ldapserver.png";
 
   var $cyrusunixstyle = FALSE;
@@ -48,7 +47,7 @@ class Step_Config2 extends setup_step
                                   "samba_rid"        => 1000,
                                   "samba_rid_active" => FALSE); 
 
-  var $attributes = array("strict","governmentmode","sambaidmapping","account_expiration","cyrusunixstyle","mail");
+  var $attributes = array("strict","governmentmode","sambaidmapping","cyrusunixstyle","mail");
 
   function Step_Config2()
   {

diff --git a/setup/setup_config1.tpl b/setup/setup_config1.tpl
index e61893bfd8f1770d27851d51587fd1882f862f90..4a658a4630bcc5b2485bc851b05bd5b3aba981a5 100644 (file)
--- a/setup/setup_config1.tpl
+++ b/setup/setup_config1.tpl
@@ -166,6 +166,18 @@
             {/if}
         </div>
     </div>
+                 <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Use account expiration{/t}
+        </div>
+        <div class='step4_value'>
+            <select name="account_expiration" size="1" title="">
+            {html_options options=$bool selected=$account_expiration}
+            </select>
+        </div>
+    </div>
+
+
 <input type='hidden' value='1' name='step5_posted'>
 <!--
          {t}GOsa supports several encryption types for your passwords. Normally this is adjustable via user templates, but you can specify a default method to be used here, too.{/t}

diff --git a/setup/setup_config2.tpl b/setup/setup_config2.tpl
index c30887d790ebbeba49f3737f5777ba72bf362018..7e0079264a0f4ccf40e001ebe26dbc04c515b502 100644 (file)
--- a/setup/setup_config2.tpl
+++ b/setup/setup_config2.tpl
@@ -81,19 +81,6 @@
         </div>
     </div>
 
-    <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Use account expiration{/t}
-        </div>
-        <div class='step4_value'>
-            <select name="account_expiration" size="1" title="">
-                       {html_options options=$bool selected=$account_expiration}
-            </select>
-        </div>
-    </div>
-
-
-
     <p><b>{t}Mail settings{/t}</b></p>
 
     <div class='step4_container'>