Author: Nathan.Vonnahme
Date: 2010-02-05 22:22:59 +0100 (Fri, 05 Feb 2010)
New Revision: 27611

Modified:
   plugins/bhLDAPAuthPlugin/branches/1.0/lib/bhLDAP.php
Log:
1_0 branch needed additional fixes from 1_1 & later

Modified: plugins/bhLDAPAuthPlugin/branches/1.0/lib/bhLDAP.php
===================================================================
--- plugins/bhLDAPAuthPlugin/branches/1.0/lib/bhLDAP.php        2010-02-05 
21:14:53 UTC (rev 27610)
+++ plugins/bhLDAPAuthPlugin/branches/1.0/lib/bhLDAP.php        2010-02-05 
21:22:59 UTC (rev 27611)
@@ -55,9 +55,22 @@
   }
 
  # this works around a PHP_NOTICE error in adLDAP's user_groups function
-  public static function getUserGroups ($username) {
+  public static function getUserGroups ($username, $recursive=NULL) {
     $ldap = self::getLDAP();
 
+
+
+   self::debugDump($ldap->_recursive_groups, "_recursive_groups setting");
+   self::debugDump($recursive, "passed in \$recursive var");
+
+
+    if ( $recursive === NULL ) { 
+      //use the default option if they haven't set it
+      self::debug("using recursive option (".$ldap->_recursive_groups.") from 
config file or default config");
+      $recursive=$ldap->_recursive_groups; 
+    } 
+    self::debug("getting group memberships for $username");
+
     $filter="samaccountname=".$username;
     $fields=array("memberof");
     $sr=ldap_search($ldap->_conn,$ldap->_base_dn,$filter,$fields);

-- 
You received this message because you are subscribed to the Google Groups 
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/symfony-svn?hl=en.

Reply via email to