wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use Group methods for searching, fixes #4201

Browse source
This commit is contained in:
Arthur Schiwon 2013-08-21 13:15:31 +02:00
parent ab1f78eac3
commit 22e1f73d5e
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/ajax/share.php
View file

@ -181,10 +181,10 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
// }
// }
// }
$groups = OC_Group::getGroups($_GET['search']);
if ($sharePolicy == 'groups_only') {
$groups = OC_Group::getUserGroups(OC_User::getUser());
} else {
$groups = OC_Group::getGroups();
$usergroups = OC_Group::getUserGroups(OC_User::getUser());
$groups = array_intersect($groups, $usergroups);
}
$count = 0;
$users = array();
@ -219,11 +219,10 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
foreach ($groups as $group) {
if ($count < 15) {
if (stripos($group, $_GET['search']) !== false
&& (!isset($_GET['itemShares'])
if (!isset($_GET['itemShares'])
|| !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])
|| !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP]))) {
|| !in_array($group, $_GET['itemShares'][OCP\Share::SHARE_TYPE_GROUP])) {
$shareWith[] = array(
'label' => $group.' ('.$l->t('group').')',
'value' => array(