Moved strict to step1

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index b3618e93308c3259b8e5133cb959ac17ba9f1c65..98837ef31a7a2b6284ac8e5cbc83bb8f5b24f152 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -271,10 +271,10 @@
 {else}
                schema_check="false"
 {/if}
-{if $cv.optional.enableCopyPaste}
-               enableCopyPaste="true" 
+{if $cv.generic_settings.enableCopyPaste}
+               enableCopyPaste="true"
 {else}
-               enableCopyPaste="false" 
+               enableCopyPaste="false"
 {/if}
 {if $cv.optional.forceglobals}
                forceglobals="true"

diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc
index 6a5e8e2ea06b5cab11d89d302bf0684b96fee19a..f51e9cab9e842713e1896ebb3bd59dfe44631355 100644 (file)
--- a/setup/class_setupStep_Config1.inc
+++ b/setup/class_setupStep_Config1.inc
@@ -27,6 +27,9 @@ class Step_Config1 extends setup_step
   var $groupou    =  "ou=groups";
   var $peopledn   = "cn";
   var $uidbase    = 1000;
+
+  var $strict     = TRUE;
+
   var $header_image = "images/ldapserver.png";
   var $account_expiration  =FALSE;
   var $base_hook         = "/usr/bin/sudo myscript"; 
@@ -51,7 +54,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","account_expiration");
+                          "base_hook","base_hook_active","account_expiration","strict");
 
   function Step_Config1()
   {

diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index 78d6094567a199d6093f78612d7cdac1417374c1..8f3e499a73b0f7d0c1fc6b0aaf3f983a02b972f3 100644 (file)
--- a/setup/class_setupStep_Config2.inc
+++ b/setup/class_setupStep_Config2.inc
@@ -24,7 +24,6 @@ class Step_Config2 extends setup_step
 {
   var $governmentmode = FALSE;
   var $sambaidmapping = FALSE;
-  var $strict         = TRUE;
   var $header_image = "images/ldapserver.png";
 
   var $cyrusunixstyle = FALSE;
@@ -47,7 +46,7 @@ class Step_Config2 extends setup_step
                                   "samba_rid"        => 1000,
                                   "samba_rid_active" => FALSE); 
 
-  var $attributes = array("strict","governmentmode","sambaidmapping","cyrusunixstyle","mail");
+  var $attributes = array("governmentmode","sambaidmapping","cyrusunixstyle","mail");
 
   function Step_Config2()
   {

diff --git a/setup/setup_config1.tpl b/setup/setup_config1.tpl
index 17bd18c6bf38d6af657fb89926220b553916adca..695259da553c9a1b4dc5eaf25b56624b7169bde4 100644 (file)
--- a/setup/setup_config1.tpl
+++ b/setup/setup_config1.tpl
@@ -52,6 +52,17 @@
         </div>
     </div>
 
+       <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Relaxed naming policies{/t}
+        </div>
+        <div class='step4_value'>
+            <select name="strict" size="1" title="">
+            {html_options options=$bool selected=$strict}
+            </select>
+        </div>
+    </div>
+
        <div class='step4_container'>
         <div class='step4_name'>
             {t}Automatic uids{/t}

diff --git a/setup/setup_config2.tpl b/setup/setup_config2.tpl
index 49a3e01a3dd162588ce7ca7549d50531004bd265..0d47fe43a4e225c523951c4e482cd74d592b0c75 100644 (file)
--- a/setup/setup_config2.tpl
+++ b/setup/setup_config2.tpl
@@ -70,17 +70,6 @@
             </select>
         </div>
     </div>
-       
-    <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Relaxed naming policies{/t}
-        </div>
-        <div class='step4_value'>
-            <select name="strict" size="1" title="">
-                       {html_options options=$bool selected=$strict}
-            </select>
-        </div>
-    </div>
 
     <div class='step4_container'>
         <div class='step4_name'>