From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 1 May 2020 14:27:44 +0000 (+0200)
Subject: Properly search for users when limittogroups is enabled
X-Git-Tag: v20.0.0beta2~35^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=51922caa5f5c3c4a7bc446b1cfc5348451f0ad62;p=nextcloud-server.git

Properly search for users when limittogroups is enabled

Searching just for the uid is not enough.
This makes sure this done properly again now.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---

diff --git a/lib/private/Collaboration/Collaborators/UserPlugin.php b/lib/private/Collaboration/Collaborators/UserPlugin.php
index 72368e50521..0a603448525 100644
--- a/lib/private/Collaboration/Collaborators/UserPlugin.php
+++ b/lib/private/Collaboration/Collaborators/UserPlugin.php
@@ -95,7 +95,15 @@ class UserPlugin implements ISearchPlugin {
 				$usersInGroup = $this->groupManager->displayNamesInGroup($userGroupId, $search, $limit, $offset);
 				foreach ($usersInGroup as $userId => $displayName) {
 					$userId = (string) $userId;
-					$users[$userId] = $this->userManager->get($userId);
+					$user = $this->userManager->get($userId);
+					if (!$user->isEnabled()) {
+						// Ignore disabled users
+						continue;
+					}
+					$users[$userId] = $user;
+				}
+				if (count($usersInGroup) >= $limit) {
+					$hasMoreResults = true;
 				}
 			}
 		} else {