diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-11 16:24:50 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-11 16:25:28 -0400 |
| commit | 651245effac83f8f3859e94a4c70bba96ffd40eb (patch) | |
| tree | d0196e7586ae8da3c3b2c3ffddb5aef054cd5159 /settings | |
| parent | a1c88a3e39695a463ff7d0dda74dbdbb59d86f5c (diff) | |
| download | nextcloud-server-651245effac83f8f3859e94a4c70bba96ffd40eb.tar.gz nextcloud-server-651245effac83f8f3859e94a4c70bba96ffd40eb.zip | |
Use limit and offset for subadmin users
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/ajax/userlist.php | 4 | ||||
| -rw-r--r-- | settings/users.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php index a73b6996243..b89b8c55ef0 100644 --- a/settings/ajax/userlist.php +++ b/settings/ajax/userlist.php @@ -33,11 +33,11 @@ $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' => implode(', ',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); + $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')); } diff --git a/settings/users.php b/settings/users.php index 5651826a6dd..6f39059757a 100644 --- a/settings/users.php +++ b/settings/users.php @@ -26,7 +26,7 @@ if($isadmin){ $subadmins = OC_SubAdmin::getAllSubAdmins(); }else{ $accessiblegroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()); - $accessibleusers = OC_Group::usersInGroups($accessiblegroups); + $accessibleusers = OC_Group::usersInGroups($accessiblegroups, '', 30); $subadmins = false; } |