Disabled single

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

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index 963db36b3a45a2f95323c9076920585580c89ab0..bbe1c17948e94aad56f5d7975f9d5f96641765a1 100644 (file)
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -216,8 +216,13 @@ class config  {
 
   function get_ldap_link($sizelimit= FALSE)
   {
-    if($this->ldap === NULL || !is_resource($this->ldap->cid)){
 
+# REuse last ldap valid handle again.
+# DISABLED due to unpredictable results.
+
+#
+#    if($this->ldap === NULL || !is_resource($this->ldap->cid)){
+#
       /* Build new connection */
       $this->ldap= ldap_init ($this->current['SERVER'], $this->current['BASE'],
           $this->current['ADMIN'], $this->current['PASSWORD']);
@@ -246,7 +251,7 @@ class config  {
       } else {
         $this->ldap->referrals= $this->current['REFERRAL'];
       }
-    }
+#    }
     return ($this->ldap);
   }
 

diff --git a/gosa-core/include/class_ldap.inc b/gosa-core/include/class_ldap.inc
index 4e2de421e0088d5595281e6e3cb442d8ecb9f2f6..93686b6e63476d594db051f1edf22eb8e005d9ac 100644 (file)
--- a/gosa-core/include/class_ldap.inc
+++ b/gosa-core/include/class_ldap.inc
@@ -201,30 +201,30 @@ class LDAP{
   }
 
   
-  /* Checks if there is still unfetched data 
-   */
-  function checkResult()
-  {
-    /* Check if we have started a search before  */
-    if($this->start != 0 && $this->re){
-      
-      /* Check if there are still unfetched elements */
-      if(is_resource(@ldap_next_entry($this->cid, $this->re))){
-        new log("debug","LDAP:: CAT/SEARCH/FETCH","A new search was initiated while an older search wasn't fetched completely.");
-        msg_dialog::display(_("Debug"),"A new search was initiated while an older search wasn't fetched completely.",ERROR_DIALOG);
-        trigger_error("A new search was initiated while an older search wasn't fetched completely.");
-      }
-    }
-  }
-
+# /* Checks if there is still unfetched data 
+#  */
+# function checkResult()
+# {
+#   /* Check if we have started a search before  */
+#   if($this->start != 0 && $this->re){
+#     
+#     /* Check if there are still unfetched elements */
+#     if(is_resource(@ldap_next_entry($this->cid, $this->re))){
+#       new log("debug","LDAP:: CAT/SEARCH/FETCH","A new search was initiated while an older search wasn't fetched completely.");
+#       msg_dialog::display(_("Debug"),"A new search was initiated while an older search wasn't fetched completely.",ERROR_DIALOG);
+#       trigger_error("A new search was initiated while an older search wasn't fetched completely.");
+#     }
+#   }
+# }
+#
   function search($filter, $attrs= array())
   {
     if($this->hascon){
       if ($this->reconnect) $this->connect();
 
-      /* Check if there are still unfetched objects from last search 
-       */
-      $this->checkResult();
+#      /* Check if there are still unfetched objects from last search 
+#       */
+#      $this->checkResult();
 
       $start = microtime();
       $this->clearResult();
@@ -254,9 +254,9 @@ class LDAP{
     if($this->hascon){
       if ($this->reconnect) $this->connect();
 
-      /* Check if there are still unfetched objects from last search 
-       */
-      $this->checkResult();
+#      /* Check if there are still unfetched objects from last search 
+#       */
+#      $this->checkResult();
 
       $this->clearResult();
       if ($basedn == "")
@@ -292,9 +292,9 @@ class LDAP{
     if($this->hascon){
       if ($this->reconnect) $this->connect();
 
-      /* Check if there are still unfetched objects from last search 
-       */
-      $this->checkResult();
+#      /* Check if there are still unfetched objects from last search 
+#       */
+#      $this->checkResult();
 
       $this->clearResult();
       $filter = "(objectclass=*)";