|
@@ -73,20 +73,19 @@ class UserPlugin implements ISearchPlugin {
|
|
|
$users = [];
|
|
|
$hasMoreResults = false;
|
|
|
|
|
|
- $userGroups = [];
|
|
|
+ $currentUserGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
|
|
|
if ($this->shareWithGroupOnly) {
|
|
|
// Search in all the groups this user is part of
|
|
|
- $userGroups = $this->groupManager->getUserGroups($this->userSession->getUser());
|
|
|
- foreach ($userGroups as $userGroup) {
|
|
|
- $usersInGroup = $userGroup->searchDisplayName($search, $limit, $offset);
|
|
|
- foreach ($usersInGroup as $user) {
|
|
|
- $users[$user->getUID()] = $user;
|
|
|
+ foreach ($currentUserGroups as $userGroupId) {
|
|
|
+ $usersInGroup = $this->groupManager->displayNamesInGroup($userGroupId, $search, $limit, $offset);
|
|
|
+ foreach ($usersInGroup as $userId => $displayName) {
|
|
|
+ $userId = (string) $userId;
|
|
|
+ $users[$userId] = $this->userManager->get($userId);
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
// Search in all users
|
|
|
$usersTmp = $this->userManager->searchDisplayName($search, $limit, $offset);
|
|
|
- $currentUserGroups = $this->groupManager->getUserGroupIds($this->userSession->getUser());
|
|
|
foreach ($usersTmp as $user) {
|
|
|
if ($user->isEnabled()) { // Don't keep deactivated users
|
|
|
$users[$user->getUID()] = $user;
|
|
@@ -155,9 +154,6 @@ class UserPlugin implements ISearchPlugin {
|
|
|
|
|
|
if ($this->shareWithGroupOnly) {
|
|
|
// Only add, if we have a common group
|
|
|
- $userGroupIds = array_map(function (IGroup $group) {
|
|
|
- return $group->getGID();
|
|
|
- }, $userGroups);
|
|
|
$commonGroups = array_intersect($userGroupIds, $this->groupManager->getUserGroupIds($user));
|
|
|
$addUser = !empty($commonGroups);
|
|
|
}
|