Added patch to trunk

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

diff --git a/plugins/admin/ogroups/class_ogroup.inc b/plugins/admin/ogroups/class_ogroup.inc
index 6d51281be825dd86dd73c3b1f3c93f870af80187..6add554439bbe6f3e92cd7b35abcc6019b525818 100644 (file)
--- a/plugins/admin/ogroups/class_ogroup.inc
+++ b/plugins/admin/ogroups/class_ogroup.inc
@@ -25,7 +25,7 @@ class ogroup extends plugin
   var $gosaGroupObjects= "";
   var $department= "";
   var $objects= array();
-  var $allobjects= array();
+  var $objcache= array();
   var $memberList= array();
   var $member= array();
   var $orig_dn= "";
@@ -92,7 +92,7 @@ class ogroup extends plugin
   function AddDelMembership($NewMember = false){
 
     if($NewMember){
-      $this->memberList[$NewMember]= $this->allobjects[$NewMember];
+      $this->memberList[$NewMember]= $this->objcache[$NewMember];
       $this->member[$NewMember]= $NewMember;
       unset ($this->objects[$NewMember]);
       uasort ($this->memberList, 'sort_list');
@@ -435,46 +435,6 @@ class ogroup extends plugin
     uasort ($this->objects, 'sort_list');
     reset ($this->objects);
 
-    /*###########
-      Get a list with all possible objects, to detect objects which doesn't exists anymore ... 
-      ###########*/
-
-    /* Only do this, if this wasn't already done */
-    if(count($this->allobjects) == 0){
-      $ldap->cd ($this->config->current['BASE']);
-      $filter="(objectClass=gosaAccount)".        
-              "(objectClass=posixGroup)".
-              "(objectClass=gosaApplication)".
-              "(objectClass=gosaDepartment)".
-              "(objectClass=goServer)".
-              "(objectClass=gotoWorkstation)".
-              "(objectClass=gotoTerminal)".
-              "(objectClass=gotoPrinter)".
-              "(objectClass=goFonHardware)";
-      $regex= "*";
-
-      $ldap->search ("(&(|$filter)(|(uid=$regex)(cn=$regex)(ou=$regex)))", array("dn", "cn", "ou", "description", "objectClass", "sn", "givenName", "uid"));
-      while ($attrs= $ldap->fetch()){
-
-        $type= $this->getObjectType($attrs);
-        $name= $this->getObjectName($attrs);
-
-        if (isset($attrs["description"][0])){
-          $this->allobjects[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
-        } elseif (isset($attrs["uid"][0])) {
-          $this->allobjects[$attrs["dn"]]= array("text" => "$name [".$attrs["uid"][0]."]", "type" => "$type");
-        } else {
-          $this->allobjects[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
-        }
-        $this->allobjects[$attrs["dn"]]['objectClass']  = $attrs['objectClass'];
-        if(isset($attrs['uid'])){
-          $this->allobjects[$attrs["dn"]]['uid']          = $attrs['uid'];
-        }
-      }
-      uasort ($this->allobjects, 'sort_list');
-      reset ($this->allobjects);
-    }      
-
     
     /*###########
       Build member list and try to detect obsolete entries 
@@ -485,61 +445,46 @@ class ogroup extends plugin
     /* Walk through all single member entry */
     foreach($this->member as $dn){
 
-      /* Object in object list? */
-      if (isset($this->allobjects[$dn])){
-        
-        /* Add this entry to member list, its dn is in allobjects
-            this means it still exists 
-         */
-        $this->memberList[$dn]= $this->allobjects[$dn];
-
-        /* Remove this from selectable entries */
-        if (isset ($this->objects[$dn])){
-          unset ($this->objects[$dn]);
-        }
+      /* The dn for the current member can't be resolved 
+         it seams that this entry was removed 
+       */ 
+      /* Try to resolv the entry again, if it still fails, display error msg */
+      $ldap->cat($dn, array("cn", "sn", "givenName", "ou", "description", "objectClass"));
 
-      
-      } else {
+      /* It has failed, add entry with type flag I (Invalid)*/
+      if ($ldap->error != "Success"){
+        $this->memberList[$dn]= array('text' => _("Non existing dn:")." ".@LDAP::fix($dn),"type" => "I");
 
-        /* The dn for the current member can't be resolved 
-            it seams that this entry was removed 
-         */ 
-        /* Try to resolv the entry again, if it still fails, display error msg */
-        $ldap->cat($dn, array("cn", "sn", "givenName", "ou", "description", "objectClass"));
+      } else {
 
-        /* It has failed, add entry with type flag I (Invalid)*/
-        if ($ldap->error != "success"){
-          $this->memberList[$dn]= array('text' => _("Non existing dn:")." ".@LDAP::fix($dn),"type" => "I");
+        /* Append this entry to our all object list */
 
-        } else {
-          
-          /* Append this entry to our all object list */
-    
-          /* Fetch object */
-          $attrs= $ldap->fetch();
+        /* Fetch object */
+        $attrs= $ldap->fetch();
 
-          $type= $this->getObjectType($attrs);
-          $name= $this->getObjectName($attrs);
+        $type= $this->getObjectType($attrs);
+        $name= $this->getObjectName($attrs);
 
-          if (isset($attrs["description"][0])){
-            $this->allobjects[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
-          } elseif (isset($attrs["uid"][0])) {
-            $this->allobjects[$attrs["dn"]]= array("text" => "$name [".$attrs["uid"][0]."]", "type" => "$type");
-          } else {
-            $this->allobjects[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
-          }
-          $this->allobjects[$attrs["dn"]]['objectClass']  = $attrs['objectClass'];
-          if(isset($attrs['uid'])){
-            $this->allobjects[$attrs["dn"]]['uid']          = $attrs['uid'];
-          }
+        if (isset($attrs["description"][0])){
+          $this->objcache[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
+        } elseif (isset($attrs["uid"][0])) {
+          $this->objcache[$attrs["dn"]]= array("text" => "$name [".$attrs["uid"][0]."]", "type" => "$type");
+        } else {
+          $this->objcache[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
+        }
+        $this->objcache[$attrs["dn"]]['objectClass']  = $attrs['objectClass'];
+        if(isset($attrs['uid'])){
+          $this->objcache[$attrs["dn"]]['uid']          = $attrs['uid'];
+        }
 
-          /* Fill array */
-          if (isset($attrs["description"][0])){
-            $this->objects[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
-          } else {
-            $this->objects[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
-          }
+        /* Fill array */
+        if (isset($attrs["description"][0])){
+          $this->objects[$attrs["dn"]]= array("text" => "$name [".$attrs["description"][0]."]", "type" => "$type");
+        } else {
+          $this->objects[$attrs["dn"]]= array("text" => "$name", "type" => "$type");
         }
+
+        $this->memberList[$dn]= $this->objects[$attrs["dn"]];
       }
     }
     uasort ($this->memberList, 'sort_list');