Changeset 27768

Timestamp:

02/09/10 00:56:13 (1 month ago)

Author:

Nathan.Vonnahme

Message:

recursive bug fix from trunk

Files:

• plugins/bhLDAPAuthPlugin/branches/1.1/lib (modified) (1 prop)
• plugins/bhLDAPAuthPlugin/branches/1.1/lib/adLDAP.php (modified) (1 diff)
• plugins/bhLDAPAuthPlugin/branches/1.1/lib/bhLDAP.php (modified) (1 diff)

plugins/bhLDAPAuthPlugin/branches/1.1/lib/adLDAP.php

@@ -299 +299 @@
-    }
-        }
-
-      }
+
+      $new_groups=array_diff($more_groups,$ret_groups);
-      $ret_groups = array_unique(array_merge($ret_groups,$more_groups)); // Add the groups to the main list
-      $new_groups=array_diff($more_groups,$ret_groups);
-    }
-    return ($ret_groups);

plugins/bhLDAPAuthPlugin/branches/1.1/lib/bhLDAP.php

@@ -81 +81 @@
-      self::debug("checking recursive group memberships");
-      foreach ($groups as $id => $group_name){
+  self::debug("recursing down into $group_name");
-  $extra_groups=@$ldap->recursive_groups($group_name);
-  $groups=array_unique(array_merge($groups,$extra_groups));