diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2012-04-23 21:11:54 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2012-04-25 20:35:30 +0200 |
| commit | 0933b5e7abf894620615abb3c0dbf9bb841c80fd (patch) | |
| tree | 3122005b2491036e2134984e620e495b04711296 /apps/user_ldap/group_ldap.php | |
| parent | a82d709f87a852dd6b2501c581d50d32f5cf2f0d (diff) | |
| download | nextcloud-server-0933b5e7abf894620615abb3c0dbf9bb841c80fd.tar.gz nextcloud-server-0933b5e7abf894620615abb3c0dbf9bb841c80fd.zip | |
use uniquemember instead of deprecated memberuid to identify LDAP group members. Attention: not every method is adjusted yet, so it breaks some things.
Diffstat (limited to 'apps/user_ldap/group_ldap.php')
| -rw-r--r-- | apps/user_ldap/group_ldap.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php index fe0789cdeb7..df82162a67f 100644 --- a/apps/user_ldap/group_ldap.php +++ b/apps/user_ldap/group_ldap.php @@ -25,12 +25,10 @@ class OC_GROUP_LDAP extends OC_Group_Backend { // //group specific settings protected $ldapGroupFilter; protected $ldapGroupDisplayName; - protected $ldapGroupMemberAttr; public function __construct() { $this->ldapGroupFilter = OC_Appconfig::getValue('user_ldap', 'ldap_group_filter', '(objectClass=posixGroup)'); $this->ldapGroupDisplayName = OC_Appconfig::getValue('user_ldap', 'ldap_group_display_name', 'cn'); - $this->ldapGroupMemberAttr = OC_Appconfig::getValue('user_ldap', 'ldap_group_member_attr', 'memberUid'); } /** @@ -83,7 +81,17 @@ class OC_GROUP_LDAP extends OC_Group_Backend { $this->ldapGroupDisplayName.'='.$gid )); - return $this->retrieveList($filter, $this->ldapGroupMemberAttr, false); + $userDNs = $this->retrieveList($filter, LDAP_GROUP_MEMBER_ASSOC_ATTR, false); + $users = array(); + $attr = OC_LDAP::conf('ldapUserDisplayName'); + foreach($userDNs as $dn) { + $uid = OC_LDAP::readAttribute($dn, $attr); + if($uid) { +// if(($uid = OC_LDAP::readAttribute($dn, $attr)) != false){ + $users[] = $uid; + } + } + return $users; } /** |