Added rfc2307bis

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 37bb18559fe92bbad0af21f040345d7dc6d03a49..0231b466d5d150360bb138113cdcf9dd139ff659 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -329,8 +329,15 @@
                        groups="{$cv.groupou}"
                        gidbase="{$cv.uidbase}"
                        uidbase="{$cv.uidbase}"
+{if $cv.rfc2307bis}
+                       rfc2307bis="true"
+{else}
+                       rfc2307bis="false"
+{/if}
 {if $cv.include_personal_title}
                        include_personal_title="true"
+{else}
+                       include_personal_title="false"
 {/if}
 {if $cv.optional.notifydir_active }
                        notifydir="{$cv.optional.notifydir}"

diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc
index 6531f36859060297949bf38f57c7e3b6df2d2619..5d4fbc3dc48b0ffdc532853b7e7cc6179099ee25 100644 (file)
--- a/setup/class_setupStep_Config1.inc
+++ b/setup/class_setupStep_Config1.inc
@@ -40,6 +40,7 @@ class Step_Config1 extends setup_step
   var $errorlvl   = FALSE;
 
   var $include_personal_title = FALSE;
+  var $rfc2307bis             = FALSE;
 
   var $pwd_rules  = array("pwminlen" => 6, 
                           "pwminlen_active" => FALSE,
@@ -55,7 +56,7 @@ class Step_Config1 extends setup_step
 
   var $crypt_methods  = array();
 
-  var $attributes = array("peopleou","groupou","peopledn","uidbase","encryption","theme","errorlvl",
+  var $attributes = array("peopleou","groupou","peopledn","uidbase","encryption","theme","errorlvl","rfc2307bis",
                           "base_hook","base_hook_active","account_expiration","strict","include_personal_title");
 
   function Step_Config1()

diff --git a/setup/setup_config1.tpl b/setup/setup_config1.tpl
index d5a372fc595fd7725a96876d150af1b216b307e9..5154da1a2597f81907c48c7b965bbdc557e3b590 100644 (file)
--- a/setup/setup_config1.tpl
+++ b/setup/setup_config1.tpl
@@ -63,6 +63,17 @@
         </div>
     </div>
 
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}rfc2307bis compliant groups{/t}
+        </div>
+        <div class='step4_value'>
+            <select name="rfc2307bis" size="1" title="">
+            {html_options options=$bool selected=$rfc2307bis}
+            </select>
+        </div>
+    </div>
+
        <div class='step4_container'>
         <div class='step4_name'>
             {t}Relaxed naming policies{/t}