aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaksim Sukharev <antreesy.web@gmail.com>2024-09-28 18:46:16 +0200
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2024-09-30 10:10:22 +0000
commit962a9716438109875b46bebb4bb73d4f6a387a3c (patch)
treeb0e3270a48f8eb60ef20de611cb7385de929df0d
parent6949e21c097d19d965901271dc5aece4401168e5 (diff)
downloadnextcloud-server-962a9716438109875b46bebb4bb73d4f6a387a3c.tar.gz
nextcloud-server-962a9716438109875b46bebb4bb73d4f6a387a3c.zip
fix: correctly count disabled users for subadminsbackport/48437/stable30
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
-rw-r--r--apps/settings/lib/Controller/UsersController.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php
index b677147b162..42e42f52b9f 100644
--- a/apps/settings/lib/Controller/UsersController.php
+++ b/apps/settings/lib/Controller/UsersController.php
@@ -147,13 +147,13 @@ class UsersController extends Controller {
}, 0);
} else {
// User is subadmin !
- // Map group list to names to retrieve the countDisabledUsersOfGroups
+ // Map group list to ids to retrieve the countDisabledUsersOfGroups
$userGroups = $this->groupManager->getUserGroups($user);
- $groupsNames = [];
+ $groupsIds = [];
foreach ($groups as $key => $group) {
// $userCount += (int)$group['usercount'];
- $groupsNames[] = $group['name'];
+ $groupsIds[] = $group['id'];
// we prevent subadmins from looking up themselves
// so we lower the count of the groups he belongs to
if (array_key_exists($group['id'], $userGroups)) {
@@ -163,7 +163,7 @@ class UsersController extends Controller {
}
$userCount += $this->userManager->countUsersOfGroups($groupsInfo->getGroups());
- $disabledUsers = $this->userManager->countDisabledUsersOfGroups($groupsNames);
+ $disabledUsers = $this->userManager->countDisabledUsersOfGroups($groupsIds);
}
$userCount -= $disabledUsers;