From: paca70 <paca70>
Date: Mon, 8 Nov 2004 10:55:57 +0000 (+0000)
Subject: Prevent error messages when username is not member of group
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=52192a5ce7637c9bb2ceaf21271798e11d80b2b3;p=moodle.git

Prevent error messages when username is not member of group
---

diff --git a/auth/ldap/lib.php b/auth/ldap/lib.php
index 00d95b0025..abbfb73739 100644
--- 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