remove uselessly used parameter, read all user attributes also when looking up users in groups
This commit is contained in:
parent
82f8374f63
commit
133e3fe89d
|
@ -553,6 +553,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
|
||||||
|
|
||||||
$groupUsers = array();
|
$groupUsers = array();
|
||||||
$isMemberUid = (strtolower($this->access->connection->ldapGroupMemberAssocAttr) === 'memberuid');
|
$isMemberUid = (strtolower($this->access->connection->ldapGroupMemberAssocAttr) === 'memberuid');
|
||||||
|
$attrs = $this->access->userManager->getAttributes(true);
|
||||||
foreach($members as $member) {
|
foreach($members as $member) {
|
||||||
if($isMemberUid) {
|
if($isMemberUid) {
|
||||||
//we got uids, need to get their DNs to 'translate' them to user names
|
//we got uids, need to get their DNs to 'translate' them to user names
|
||||||
|
@ -560,11 +561,11 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
|
||||||
str_replace('%uid', $member, $this->access->connection->ldapLoginFilter),
|
str_replace('%uid', $member, $this->access->connection->ldapLoginFilter),
|
||||||
$this->access->getFilterPartForUserSearch($search)
|
$this->access->getFilterPartForUserSearch($search)
|
||||||
));
|
));
|
||||||
$ldap_users = $this->access->fetchListOfUsers($filter, 'dn');
|
$ldap_users = $this->access->fetchListOfUsers($filter, $attrs, 1);
|
||||||
if(count($ldap_users) < 1) {
|
if(count($ldap_users) < 1) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
$groupUsers[] = $this->access->dn2username($ldap_users[0]);
|
$groupUsers[] = $this->access->dn2username($ldap_users[0]['dn'][0]);
|
||||||
} else {
|
} else {
|
||||||
//we got DNs, check if we need to filter by search or we can give back all of them
|
//we got DNs, check if we need to filter by search or we can give back all of them
|
||||||
if(!empty($search)) {
|
if(!empty($search)) {
|
||||||
|
|
|
@ -706,9 +706,8 @@ class Access extends LDAPUtility implements user\IUserTools {
|
||||||
* @param array $ldapRecords
|
* @param array $ldapRecords
|
||||||
*/
|
*/
|
||||||
public function batchApplyUserAttributes(array $ldapRecords){
|
public function batchApplyUserAttributes(array $ldapRecords){
|
||||||
$displayNameAttribute = strtolower($this->connection->ldapUserDisplayName);
|
|
||||||
foreach($ldapRecords as $userRecord) {
|
foreach($ldapRecords as $userRecord) {
|
||||||
$ocName = $this->dn2ocname($userRecord['dn'][0], $userRecord[$displayNameAttribute]);
|
$ocName = $this->dn2ocname($userRecord['dn'][0]);
|
||||||
$this->cacheUserExists($ocName);
|
$this->cacheUserExists($ocName);
|
||||||
$user = $this->userManager->get($ocName);
|
$user = $this->userManager->get($ocName);
|
||||||
if($user instanceof OfflineUser) {
|
if($user instanceof OfflineUser) {
|
||||||
|
|
Loading…
Reference in New Issue