Prevent error messages when username is not member of group

diff --git a/auth/ldap/lib.php b/auth/ldap/lib.php
index 00d95b0025c04c8f3f1fbb2ef90f923e964f6423..abbfb73739233b9ffd42d0348c8388953519aa2e 100644 (file)
--- a/auth/ldap/lib.php
+++ b/auth/ldap/lib.php
@@ -1040,12 +1040,16 @@ function auth_ldap_isgroupmember ($username='', $groupdns='') {
     if ($CFG->ldap_memberattribute_isdn) {
         $username=auth_ldap_find_userdn($ldapconnection, $username);
     }
+    if (! $username ) {
+        return $result;
+    }
 
     $groups = explode(";",$groupdns);
-
+    
     foreach ($groups as $group){
+        //echo "Checking group $group for member $username\n";
         $search = @ldap_read($ldapconnection, $group,  '('.$CFG->ldap_memberattribute.'='.$username.')', array($CFG->ldap_memberattribute));
-        if ($search) {$info = auth_ldap_get_entries($ldapconnection, $search);
+        if (ldap_count_entries($ldapconnection, $search)) {$info = auth_ldap_get_entries($ldapconnection, $search);
         
             if (count($info) > 0 ) {
                 // user is member of group