Added include_personal_title option to step 1

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 0232dd5b2f9aa73388c1c4ca09678e745386f071..37bb18559fe92bbad0af21f040345d7dc6d03a49 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -329,6 +329,9 @@
                        groups="{$cv.groupou}"
                        gidbase="{$cv.uidbase}"
                        uidbase="{$cv.uidbase}"
+{if $cv.include_personal_title}
+                       include_personal_title="true"
+{/if}
 {if $cv.optional.notifydir_active }
                        notifydir="{$cv.optional.notifydir}"
 {/if}

diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc
index f51e9cab9e842713e1896ebb3bd59dfe44631355..6531f36859060297949bf38f57c7e3b6df2d2619 100644 (file)
--- a/setup/class_setupStep_Config1.inc
+++ b/setup/class_setupStep_Config1.inc
@@ -39,6 +39,8 @@ class Step_Config1 extends setup_step
   var $theme      = "default"; 
   var $errorlvl   = FALSE;
 
+  var $include_personal_title = FALSE;
+
   var $pwd_rules  = array("pwminlen" => 6, 
                           "pwminlen_active" => FALSE,
                           "pwdiffer" => 5,
@@ -54,7 +56,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","strict");
+                          "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 695259da553c9a1b4dc5eaf25b56624b7169bde4..d5a372fc595fd7725a96876d150af1b216b307e9 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}Personal title in user dn{/t}
+        </div>
+        <div class='step4_value'>
+            <select name="include_personal_title" size="1" title="">
+            {html_options options=$bool selected=$include_personal_title}
+            </select>
+        </div>
+    </div>
+
        <div class='step4_container'>
         <div class='step4_name'>
             {t}Relaxed naming policies{/t}