Skip to content

Properly search for users when limittogroups is enabled #20772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 2 commits into from
Aug 21, 2020
Merged

Properly search for users when limittogroups is enabled #20772

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51922ca
Properly search for users when limittogroups is enabled
rullzer May 1, 2020
a0cbf16
In case the group backend returns $limit or more results it is expect…
MorrisJobke Aug 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
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 <[email protected]>
  • Loading branch information
@rullzer @MorrisJobke
rullzer authored and MorrisJobke committed Aug 21, 2020
commit 51922caa5f5c3c4a7bc446b1cfc5348451f0ad62
10 changes: 9 additions & 1 deletion lib/private/Collaboration/Collaborators/UserPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,15 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
$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 {
Expand Down