From 9619ef932c006dc2f8bc909596fc0b6b3ac8dde3 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 22 Feb 2008 14:24:12 +0000
Subject: [PATCH] removed SUB_LIST_SUPPORT flag.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9082 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/FAQ                               |  9 ---------
 gosa-core/contrib/gosa.conf                 |  5 -----
 gosa-core/include/functions.inc             |  3 +--
 gosa-core/setup/class_setupStep_Config3.inc |  3 +--
 gosa-core/setup/setup_config3.tpl           | 13 -------------
 5 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/gosa-core/FAQ b/gosa-core/FAQ
index ab626976a..94fade525 100644
--- 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 18fb22802..e28c1b27a 100644
--- 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 9880ab91c..50313c42d 100644
--- 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 e747258ff..deda8d3d4 100644
--- 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 d450f994c..012915a34 100644
--- 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'>
-- 
2.30.2