From 9c711551eae81c5c9914fb785b00869b31c70f83 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 19 Apr 2007 13:21:07 +0000
Subject: [PATCH] Moved rfc2307bis to ldap setup

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6134 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 setup/class_setupStep_Config1.inc |  3 +--
 setup/class_setupStep_Ldap.inc    |  8 ++++++--
 setup/setup_config1.tpl           | 11 -----------
 setup/setup_ldap.tpl              | 12 ++++++++++++
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc
index dd2182b2f..8d4cf4f96 100644
--- a/setup/class_setupStep_Config1.inc
+++ b/setup/class_setupStep_Config1.inc
@@ -40,7 +40,6 @@ 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,
@@ -56,7 +55,7 @@ class Step_Config1 extends setup_step
 
   var $crypt_methods  = array();
 
-  var $attributes = array("peopleou","groupou","peopledn","uidbase","encryption","theme","errorlvl","rfc2307bis","krbsasl",
+  var $attributes = array("peopleou","groupou","peopledn","uidbase","encryption","theme","errorlvl","krbsasl",
                           "base_hook","base_hook_active","account_expiration","strict","include_personal_title");
 
   function Step_Config1()
diff --git a/setup/class_setupStep_Ldap.inc b/setup/class_setupStep_Ldap.inc
index 4fb1ebe6c..6c4a1ab9e 100644
--- a/setup/class_setupStep_Ldap.inc
+++ b/setup/class_setupStep_Ldap.inc
@@ -35,13 +35,17 @@ class Step_Ldap extends setup_step
   var $resolve_user   = FALSE;
   var $tls            = FALSE;
 
-  var $attributes = array("connection","location","admin","password","base","tls");
-  var $header_image= "images/proxy.png";
+  var $rfc2307bis             = FALSE;
+  var $attributes = array("connection","location","admin","password","base","tls","rfc2307bis");
 
+  var $header_image= "images/proxy.png";
 
   function Step_Ldap()
   {
     $this->update_strings();
+
+    
+  
   }
 
   
diff --git a/setup/setup_config1.tpl b/setup/setup_config1.tpl
index 0a117c7ac..2f59baca0 100644
--- a/setup/setup_config1.tpl
+++ b/setup/setup_config1.tpl
@@ -63,17 +63,6 @@
         </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}
diff --git a/setup/setup_ldap.tpl b/setup/setup_ldap.tpl
index 289a0f35a..3917f2263 100644
--- a/setup/setup_ldap.tpl
+++ b/setup/setup_ldap.tpl
@@ -102,6 +102,18 @@
         </div>
     </div>
 	{/if}
+
+    <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>
 <!-- Place cursor -->
 <script language="JavaScript" type="text/javascript">
-- 
2.30.2