diff options
author | Maksim Sukharev <antreesy.web@gmail.com> | 2024-09-28 18:46:16 +0200 |
---|---|---|
committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2024-09-30 10:10:37 +0000 |
commit | b4f28b3c9e2567feec7635a6f429fd8c3056eb49 (patch) | |
tree | df1016b55a2fece73e7600ce8fc8bb58b3fbaa4f | |
parent | 31212bb1ff1b5abd8a6df586d50f3b4144fb0d3f (diff) | |
download | nextcloud-server-b4f28b3c9e2567feec7635a6f429fd8c3056eb49.tar.gz nextcloud-server-b4f28b3c9e2567feec7635a6f429fd8c3056eb49.zip |
fix: correctly count disabled users for subadminsbackport/48437/stable28
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
-rw-r--r-- | apps/settings/lib/Controller/UsersController.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php index f80b45c2b40..e517e519593 100644 --- a/apps/settings/lib/Controller/UsersController.php +++ b/apps/settings/lib/Controller/UsersController.php @@ -214,13 +214,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)) { @@ -229,7 +229,7 @@ class UsersController extends Controller { } } $userCount += $this->userManager->countUsersOfGroups($groupsInfo->getGroups()); - $disabledUsers = $this->userManager->countDisabledUsersOfGroups($groupsNames); + $disabledUsers = $this->userManager->countDisabledUsersOfGroups($groupsIds); } $userCount -= $disabledUsers; |