diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-31 13:06:32 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-07-31 13:06:32 -0400 |
| commit | 8d01e1a3555e303deed72636d0d7fabce447cf1c (patch) | |
| tree | bbe64b4f39efeec034e1255f5b05cd87dcc47448 /core/ajax | |
| parent | 8729119d4baa6a9c7f27314b175b67dc3693ebdd (diff) | |
| download | nextcloud-server-8d01e1a3555e303deed72636d0d7fabce447cf1c.tar.gz nextcloud-server-8d01e1a3555e303deed72636d0d7fabce447cf1c.zip | |
Don't show self or already shared with users and groups in the share with search
Diffstat (limited to 'core/ajax')
| -rw-r--r-- | core/ajax/share.php | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/core/ajax/share.php b/core/ajax/share.php index 3d3436c71fb..c613baa7f5e 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -66,14 +66,37 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['item'] break; case 'getShareWith': if (isset($_GET['search'])) { + // TODO Include contacts $shareWith = array(); - $users = OC_User::getUsers($_GET['search'], 4); - foreach ($users as $user) { - $shareWith[] = array('label' => $user, 'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER, 'shareWith' => $user)); + $count = 0; + $users = array(); + $limit = 0; + $offset = 0; + while ($count < 4 && count($users) == $limit) { + $limit = 4 - $count; + $users = OC_User::getUsers($_GET['search'], $limit, $offset); + $offset += $limit; + foreach ($users as $user) { + if ((!isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]) || !in_array($user, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])) && $user != OC_User::getUser()) { + $shareWith[] = array('label' => $user, 'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER, 'shareWith' => $user)); + $count++; + } + } } - $groups = OC_Group::getGroups($_GET['search'], 4); - foreach ($groups as $group) { - $shareWith[] = array('label' => $group.' (group)', 'value' => array('shareType' => OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => $group)); + $count = 0; + $groups = array(); + $limit = 0; + $offset = 0; + while ($count < 4 && count($groups) == $limit) { + $limit = 4 - $count; + $groups = OC_Group::getGroups($_GET['search'], $limit, $offset); + $offset += $limit; + foreach ($groups as $group) { + if (!isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]) || !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])) { + $shareWith[] = array('label' => $group.' (group)', 'value' => array('shareType' => OCP\Share::SHARE_TYPE_GROUP, 'shareWith' => $group)); + $count++; + } + } } OC_JSON::success(array('data' => $shareWith)); } |