Use Group methods for searching, fixes #4201

diff --git a/core/ajax/share.php b/core/ajax/share.php
index d3c6a8456a60422c204e7668e0d0c784d8a97d44..648f0a71bd44da7c93fbaccb88388c7db92aac99 100644 (file)
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -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(