Added LDAP stats option

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 507e7e76c962e20049ec3bec148d579f5a927cce..a610525d3bda63f6a62a7cf05d103b80adce1f5c 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -288,6 +288,11 @@
 {else}
                forcessl="false"
 {/if}
+{if $cv.optional.ldapstats}
+               ldapstats="true"
+{else}
+               ldapstats="false"
+{/if}
 {if $cv.optional.warnssl}
                warnssl="true"
 {else}

diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc
index 365a66ffe9644995900158865b4692ab4a8a1d94..ab31a3f3f3e2c72bf006c2069d0b7a0922eda0ea 100644 (file)
--- a/setup/class_setupStep_Config3.inc
+++ b/setup/class_setupStep_Config3.inc
@@ -27,6 +27,7 @@ class Step_Config3 extends setup_step
               "strict_units" => false,
               "forceglobals" => true,
               "forcessl" => false,
+              "ldapstats" => false,
               "warnssl" => true,
               "ppd_path" => "/var/spool/ppd/",
               "ppd_path_active" => FALSE,
@@ -88,7 +89,7 @@ class Step_Config3 extends setup_step
         }
       }
       
-      foreach(array("strict_units","noprimarygroup","forceglobals","forcessl","warnssl","compile","debuglevel","session_lifetime") as $name){
+      foreach(array("strict_units","noprimarygroup","forceglobals","forcessl","ldapstats","warnssl","compile","debuglevel","session_lifetime") as $name){
         if(isset($_POST[$name])){
           $this->optional[$name] = stripslashes($_POST[$name]);
         }

diff --git a/setup/setup_config3.tpl b/setup/setup_config3.tpl
index 89b7f9999e7fe12f6b6fd054743ee75148dda847..06fa3355894ce81d87225c2be1f4a2ed696f8faa 100644 (file)
--- a/setup/setup_config3.tpl
+++ b/setup/setup_config3.tpl
@@ -189,6 +189,18 @@
         </div>
     </div>
 
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Log LDAP statistics{/t}
+        </div>
+        <div class='step4_value'>
+       
+            <select name="ldapstats" size="1" title="">
+               {html_options options=$bool selected=$optional.ldapstats}
+            </select>
+        </div>
+    </div>
+
     <div class='step4_container'>
         <div class='step4_name'>
             {t}Debug level{/t}

diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index 9032bdcd78f2c24aa89cd45f0670cb437cf39519..36c66ebef67258e76579bcc2bdaca907498ef14b 100644 (file)
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -1,6 +1,5 @@
 <div>
     <div class='default'>
-        <p><b>{t}Migration dialog{/t}</b></p>
-               Nothing yet
-       </div>
+        <p><b>{t}This one is empty, currently.{/t}</b></p>
+    </div>
 </div>