diff options
| author | Owen Winkler <epithet@gmail.com> | 2013-08-15 14:19:40 +0400 |
|---|---|---|
| committer | Owen Winkler <epithet@gmail.com> | 2013-08-15 14:19:40 +0400 |
| commit | cd7e57e8ec64ffef8faec750ebffbdc6138ec9a0 (patch) | |
| tree | f567c89a4f75d9ebdf25dc9f6a508af3993460f1 /settings/users.php | |
| parent | 75e9015b5445e957f2454373bed67dac1741b5cb (diff) | |
Use JSON to send/receive group data.
Squashed commits from PR #4364 for master.
Diffstat (limited to 'settings/users.php')
| -rw-r--r-- | settings/users.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/settings/users.php b/settings/users.php index ba79ae93b28..213d1eecfda 100644 --- a/settings/users.php +++ b/settings/users.php @@ -54,15 +54,16 @@ foreach($accessibleusers as $uid => $displayName) { $name = $displayName; if ( $displayName !== $uid ) { $name = $name . ' ('.$uid.')'; - } - + } + $users[] = array( "name" => $uid, - "displayName" => $displayName, - "groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($uid)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/), - 'quota'=>$quota, - 'isQuotaUserDefined'=>$isQuotaUserDefined, - 'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($uid))); + "displayName" => $displayName, + "groups" => OC_Group::getUserGroups($uid), + 'quota' => $quota, + 'isQuotaUserDefined' => $isQuotaUserDefined, + 'subadmin' => OC_SubAdmin::getSubAdminsGroups($uid), + ); } foreach( $accessiblegroups as $i ) { |