removed SUB_LIST_SUPPORT flag.

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

diff --git a/gosa-core/FAQ b/gosa-core/FAQ
index ab626976ab7e14ad84550f61a9d5d3c62a7fef3b..94fade525929693bbc23ff4ea1d16a0de6e7e0df 100644 (file)
--- a/gosa-core/FAQ
+++ b/gosa-core/FAQ
@@ -399,12 +399,3 @@ Q: GOsa only shows 300 entries at a time. Is this normal?
 A: There's a default sizelimit. You can set the "sizelimit" option in your
    gosa.conf's  location section to a higher value to get rid of it.
 
-Q: The object listing is very slow when 'Search in subtrees' is active. 
-   Can I speed things up?
-
-A: There is a special handling for huge ldap servers, you can activate it by setting 
-   the sub_list_support to "true" in the location section of your gosa.conf.
-
-   <location name=...
-       sub_list_support="true"
-   ...>

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 18fb22802b347598fb3075797e21a4083a3ffba7..e28c1b27ad9fc333ac93bd825a3a7209849f5a10 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -468,11 +468,6 @@
                        groups="{$cv.groupou}"
                        gidbase="{$cv.uidbase}"
                        uidbase="{$cv.uidbase}"
-{if $cv.optional.sub_list_support}
-                       sub_list_support="true"
-{else}
-                       sub_list_support="false"
-{/if}
 {if $cv.optional.login_attribute}
                        login_attribute="{$cv.optional.login_attribute}"
 {else}

diff --git a/gosa-core/include/functions.inc b/gosa-core/include/functions.inc
index 9880ab91c17219f08e1556e5ad1cc6bbd7f6b0dc..50313c42db409f5b177a5b86620e24d77d28489e 100644 (file)
--- a/gosa-core/include/functions.inc
+++ b/gosa-core/include/functions.inc
@@ -805,8 +805,7 @@ function get_sub_list($filter, $category,$sub_deps, $base= "", $attributes= arra
    *  if there is a sub department specified.
    * If not, fall back to old method, get_list().
    */
-  $sub_enabled = isset($config->current['SUB_LIST_SUPPORT']) && preg_match("/true/i",$config->current['SUB_LIST_SUPPORT']);
-  if((!count($sub_bases) && !count($departments)) || !$sub_enabled){
+  if(!count($sub_bases) && !count($departments)){
     
     /* Log this fall back, it may be an unpredicted behaviour.
      */

diff --git a/gosa-core/setup/class_setupStep_Config3.inc b/gosa-core/setup/class_setupStep_Config3.inc
index e747258ff61af9e83e805a8202bc399dc7f08f98..deda8d3d48db885a54fa407aed433c856d773582 100644 (file)
--- a/gosa-core/setup/class_setupStep_Config3.inc
+++ b/gosa-core/setup/class_setupStep_Config3.inc
@@ -36,7 +36,6 @@ class Step_Config3 extends setup_step
               "forceglobals" => true,
               "forcessl" => false,
               "ldapstats" => false,
-              "sub_list_support" => false,
               "warnssl" => true,
               "user_filter_cookie" => true,
               "ppd_path" => "/var/spool/ppd/",
@@ -107,7 +106,7 @@ class Step_Config3 extends setup_step
         }
       }
       
-      foreach(array("login_attribute","list_summary","strict_units","snmpcommunity","noprimarygroup","forceglobals","forcessl","ldapstats","user_filter_cookie","warnssl","compile","debuglevel","session_lifetime","sub_list_support") as $name){
+      foreach(array("login_attribute","list_summary","strict_units","snmpcommunity","noprimarygroup","forceglobals","forcessl","ldapstats","user_filter_cookie","warnssl","compile","debuglevel","session_lifetime") as $name){
         if(isset($_POST[$name])){
           $this->optional[$name] = get_post($name);
         }

diff --git a/gosa-core/setup/setup_config3.tpl b/gosa-core/setup/setup_config3.tpl
index d450f994c9722771167e06c702f515f08a374e36..012915a342725ce088a0e82f48c33bd38427b8ae 100644 (file)
--- a/gosa-core/setup/setup_config3.tpl
+++ b/gosa-core/setup/setup_config3.tpl
@@ -169,19 +169,6 @@
         </div>
     </div>
 
-       <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Special search method for huge ldap servers.{/t}
-        </div>
-        <div class='step4_value'>
-
-            <select name="sub_list_support" size="1" title="">
-                {html_options options=$bool selected=$optional.sub_list_support}
-            </select>
-        </div>
-    </div>
-
-
     <p><b>{t}Login and session{/t}</b></p>
     <div class='step4_container'>
         <div class='step4_name'>