summaryrefslogtreecommitdiffstats
path: root/settings/users.php
diff options
context:
space:
mode:
Diffstat (limited to 'settings/users.php')
-rw-r--r--settings/users.php15
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 ) {