- Support AD's objectClass=group

git-svn-id: https://svn.roundcube.net/trunk@5853 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 4 insertions, 2 deletions

diff --git a/roundcubemail/program/include/rcube_ldap.php b/roundcubemail/program/include/rcube_ldap.php
index c3893d84c..70ae263ad 100644
--- a/roundcubemail/program/include/rcube_ldap.php
+++ b/roundcubemail/program/include/rcube_ldap.php
@@ -554,7 +554,7 @@ class rcube_ldap extends rcube_addressbook
             $entries = @ldap_get_entries($this->conn, $result);
         }
 
-        for ($i=0; $i < $entries["count"]; $i++)
+        for ($i=0; $i < $entries['count']; $i++)
         {
             $entry = $entries[$i];
 
@@ -564,6 +564,7 @@ class rcube_ldap extends rcube_addressbook
             foreach ((array)$entry['objectclass'] as $objectclass)
             {
                 switch (strtolower($objectclass)) {
+                    case "group":
                     case "groupofnames":
                     case "kolabgroupofnames":
                         $group_members = array_merge($group_members, $this->_list_group_members($dn, $entry, 'member', $count));
@@ -577,7 +578,7 @@ class rcube_ldap extends rcube_addressbook
                         break;
                 }
             }
-            
+
             if ($this->prop['sizelimit'] && count($group_members) > $this->prop['sizelimit'])
               break;
         }
@@ -1538,6 +1539,7 @@ class rcube_ldap extends rcube_addressbook
             // check objectClass attributes of group and act accordingly
             for ($j=0; $j < $ldap_data[$i]['objectclass']['count']; $j++) {
                 switch (strtolower($ldap_data[$i]['objectclass'][$j])) {
+                    case 'group':
                     case 'groupofnames':
                     case 'kolabgroupofnames':
                         $groups[$group_id]['member_attr'] = 'member';