diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-03-29 23:20:03 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-03-29 23:20:03 +0200 |
| commit | 90286353e24738006128b1801c55483d2103e6ae (patch) | |
| tree | 869ece50a1b45b6d99d399890743e2cfb3c78d22 /apps/files_sharing/ajax/userautocomplete.php | |
| parent | 536a3ecb428b9450a188de4a0fcca2f9be6318f3 (diff) | |
| parent | f74d11c0c3c4a3bcd733499edd63f8e31389a3a3 (diff) | |
| download | nextcloud-server-90286353e24738006128b1801c55483d2103e6ae.tar.gz nextcloud-server-90286353e24738006128b1801c55483d2103e6ae.zip | |
Merge branch 'master' into sabredav_1.6
Diffstat (limited to 'apps/files_sharing/ajax/userautocomplete.php')
| -rw-r--r-- | apps/files_sharing/ajax/userautocomplete.php | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/apps/files_sharing/ajax/userautocomplete.php b/apps/files_sharing/ajax/userautocomplete.php index 9d971fb62af..38b673ee51b 100644 --- a/apps/files_sharing/ajax/userautocomplete.php +++ b/apps/files_sharing/ajax/userautocomplete.php @@ -7,21 +7,23 @@ OC_JSON::checkLoggedIn(); OC_JSON::checkAppEnabled('files_sharing'); $users = array(); -$ocusers = OC_User::getUsers(); +$groups = array(); $self = OC_User::getUser(); -$groups = OC_Group::getUserGroups($self); +$userGroups = OC_Group::getUserGroups($self); $users[] = "<optgroup label='Users'>"; -foreach ($ocusers as $user) { - if ($user != $self) { - $users[] = "<option value='".$user."'>".$user."</option>"; +$groups[] = "<optgroup label='Groups'>"; +foreach ($userGroups as $group) { + $groupUsers = OC_Group::usersInGroup($group); + foreach ($groupUsers as $user) { + if ($user != $self) { + $users[] = "<option value='".$user."'>".$user."</option>"; + } } + $groups[] = "<option value='".$group."'>".$group."</option>"; } $users[] = "</optgroup>"; -$users[] = "<optgroup label='Groups'>"; -foreach ($groups as $group) { - $users[] = "<option value='".$group."'>".$group."</option>"; -} -$users[] = "</optgroup>"; +$groups[] = "</optgroup>"; +$users = array_merge($users, $groups); OC_JSON::encodedPrint($users); ?> |