From e6c75aa9741ca1deab7a77f32e087adcd3bf246a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 21 Jul 2014 11:20:55 +0200 Subject: [PATCH] Fix username for subadmins and only send subadmin groups Fix #9748 --- settings/ajax/userlist.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php index 2bf40686b87..a99c221beb8 100644 --- a/settings/ajax/userlist.php +++ b/settings/ajax/userlist.php @@ -76,10 +76,13 @@ if (OC_User::isAdminUser(OC_User::getUser())) { $batch = OC_Group::usersInGroups($groups, $pattern, $limit, $offset); foreach ($batch as $uid) { $user = $userManager->get($uid); + + // Only add the groups, this user is a subadmin of + $userGroups = array_intersect(OC_Group::getUserGroups($uid), OC_SubAdmin::getSubAdminsGroups(OC_User::getUser())); $users[] = array( - 'name' => $user, + 'name' => $uid, 'displayname' => $user->getDisplayName(), - 'groups' => join(', ', OC_Group::getUserGroups($uid)), + 'groups' => join(', ', $userGroups), 'quota' => OC_Preferences::getValue($uid, 'files', 'quota', 'default'), 'storageLocation' => $user->getHome(), 'lastLogin' => $user->getLastLogin(), -- 2.39.5