summaryrefslogtreecommitdiffstats
path: root/settings/ajax/userlist.php
diff options
context:
space:
mode:
Diffstat (limited to 'settings/ajax/userlist.php')
-rw-r--r--settings/ajax/userlist.php11
1 files changed, 9 insertions, 2 deletions
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index b89b8c55ef0..840b6d72dc7 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -33,13 +33,20 @@ $users = array();
if (OC_Group::inGroup(OC_User::getUser(), 'admin')) {
$batch = OC_User::getUsers('', 10, $offset);
foreach ($batch as $user) {
- $users[] = array('name' => $user, 'groups' => join(', ', OC_Group::getUserGroups($user)), 'subadmin' => join(', ',OC_SubAdmin::getSubAdminsGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
+ $users[] = array(
+ 'name' => $user,
+ 'groups' => join(', ', OC_Group::getUserGroups($user)),
+ 'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($user)),
+ 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
}
} else {
$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
$batch = OC_Group::usersInGroups($groups, '', 10, $offset);
foreach ($batch as $user) {
- $users[] = array('name' => $user, 'groups' => join(', ', OC_Group::getUserGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
+ $users[] = array(
+ 'name' => $user,
+ 'groups' => join(', ', OC_Group::getUserGroups($user)),
+ 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
}
}
OC_JSON::success(array('data' => $users)); \ No newline at end of file