From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 19 Apr 2007 12:30:32 +0000 (+0000)
Subject: Added rfc2307bis
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=69f6153561388c25120b722edc2374742b0550e2;p=gosa.git

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 37bb18559..0231b466d 100644
--- 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 6531f3685..5d4fbc3dc 100644
--- 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 d5a372fc5..5154da1a2 100644
--- 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}