Added strict_units flag to setup

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index bdd67a00a04b8a9122e02aebebfbc681b87a0b9e..44541fd3d15d06b614ff63efa81996eb6e859ce8 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -299,6 +299,11 @@
 {/if}
 {if $cv.optional.auto_network_hook_active}
                auto_network_hook="{$cv.optional.auto_network_hook} "
+{/if}
+{if $cv.optional.strict_units}
+               strict_units="true"
+{else}
+               strict_units="false"
 {/if}
                lang="{$cv.lang_selected}"
                theme="{$cv.theme}"

diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc
index 846868ffb49a33463c8440affe3602892e229e46..93a3656cd6803ef625e2bda625bfee88d1583836 100644 (file)
--- a/setup/class_setupStep_Config3.inc
+++ b/setup/class_setupStep_Config3.inc
@@ -24,6 +24,7 @@ class Step_Config3 extends setup_step
 {
   var $optional = array(
               "enableCopyPaste" => false,
+              "strict_units" => false,
               "forceglobals" => true,
               "forcessl" => false,
               "warnssl" => true,
@@ -77,9 +78,7 @@ class Step_Config3 extends setup_step
   {
     $smarty = get_smarty();
     $smarty->assign("bool",array(FALSE => _("No"), TRUE => _("Yes")));
-
     $smarty->assign("optional", $this->optional);
-
     foreach($this->attributes as $attr){
       $smarty->assign($attr,$this->$attr);
     }
@@ -102,7 +101,7 @@ class Step_Config3 extends setup_step
         }
       }
       
-      foreach(array("noprimarygroup","enableCopyPaste","forceglobals","forcessl","warnssl","compile","debuglevel","session_lifetime","smbhash") as $name){
+      foreach(array("strict_units","noprimarygroup","enableCopyPaste","forceglobals","forcessl","warnssl","compile","debuglevel","session_lifetime","smbhash") as $name){
         if(isset($_POST[$name])){
           $this->optional[$name] = stripslashes($_POST[$name]);
         }

diff --git a/setup/setup_config2.tpl b/setup/setup_config2.tpl
index 76f2aacf060a5eb3cf1366c35e998262ec20a283..b7810aae54307affd45606f4921bbba65d573629 100644 (file)
--- a/setup/setup_config2.tpl
+++ b/setup/setup_config2.tpl
@@ -113,7 +113,7 @@
 
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}Strict units{/t}
+            {t}Relaxed naming policies{/t}
         </div>
         <div class='step4_value'>
             <select name="strict" size="1" title="">

diff --git a/setup/setup_config3.tpl b/setup/setup_config3.tpl
index cef0383b868c863c6b2b5a114f9c1fa975b36159..630d8eecfe8a31bec567337b0e30b5af9c6b5cf3 100644 (file)
--- a/setup/setup_config3.tpl
+++ b/setup/setup_config3.tpl
@@ -93,6 +93,22 @@
         </div>
     </div>
 
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Strict units{/t}
+        </div>
+        <div class='step4_value'>
+       
+            <select name="strict_units" size="1" title="">
+               {html_options options=$bool selected=$optional.strict_units}
+            </select>
+        </div>
+        <div class='step4_status'>
+            {t}Infos in FAQ{/t}&nbsp;
+            <img class='center'  alt='!' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
+        </div>
+    </div>
+
     <div class='step4_container'>
         <div class='step4_name'>
             {t}PPd path{/t}