From 3c2af95108ee87edfe96a5518e9f9cebfbdaa414 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 11 May 2012 19:21:02 +0200
Subject: [PATCH] LDAP: offer only ownCloud-enabled users for sharing
---
apps/user_ldap/group_ldap.php | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 168476a78e..01aa2220df 100755
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -121,8 +121,9 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
}
$result = array();
+ $isMemberUid = (strtolower($this->ldapGroupMemberAssocAttr) == 'memberuid');
foreach($members as $member) {
- if(strtolower($this->ldapGroupMemberAssocAttr) == 'memberuid') {
+ if($isMemberUid) {
$filter = str_replace('%uid', $member, OC_LDAP::conf('ldapLoginFilter'));
$ldap_users = OC_LDAP::fetchListOfUsers($filter, 'dn');
if(count($ldap_users) < 1) {
@@ -130,9 +131,12 @@ class OC_GROUP_LDAP extends OC_Group_Backend {
}
$result[] = OC_LDAP::dn2username($ldap_users[0]);
continue;
+ } else {
+ $result[] = OC_LDAP::dn2username($member);
}
- //de-facto else
- $result[] = OC_LDAP::dn2username($member);
+ }
+ if(!$isMemberUid) {
+ $result = array_intersect($result, OCP\User::getUsers());
}
return array_unique($result, SORT_LOCALE_STRING);
}
--
GitLab