Merge pull request #13512 from owncloud/kill-ancient-code
kill ancient code
This commit is contained in:
commit
02848a5021
|
@ -236,23 +236,6 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
|
||||||
if (isset($_GET['search'])) {
|
if (isset($_GET['search'])) {
|
||||||
$shareWithinGroupOnly = OC\Share\Share::shareWithGroupMembersOnly();
|
$shareWithinGroupOnly = OC\Share\Share::shareWithGroupMembersOnly();
|
||||||
$shareWith = array();
|
$shareWith = array();
|
||||||
// if (OC_App::isEnabled('contacts')) {
|
|
||||||
// // TODO Add function to contacts to only get the 'fullname' column to improve performance
|
|
||||||
// $ids = OC_Contacts_Addressbook::activeIds();
|
|
||||||
// foreach ($ids as $id) {
|
|
||||||
// $vcards = OC_Contacts_VCard::all($id);
|
|
||||||
// foreach ($vcards as $vcard) {
|
|
||||||
// $contact = $vcard['fullname'];
|
|
||||||
// if (stripos($contact, $_GET['search']) !== false
|
|
||||||
// && (!isset($_GET['itemShares'])
|
|
||||||
// || !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT])
|
|
||||||
// || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT])
|
|
||||||
// || !in_array($contact, $_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]))) {
|
|
||||||
// $shareWith[] = array('label' => $contact, 'value' => array('shareType' => 5, 'shareWith' => $vcard['id']));
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
$groups = OC_Group::getGroups($_GET['search']);
|
$groups = OC_Group::getGroups($_GET['search']);
|
||||||
if ($shareWithinGroupOnly) {
|
if ($shareWithinGroupOnly) {
|
||||||
$usergroups = OC_Group::getUserGroups(OC_User::getUser());
|
$usergroups = OC_Group::getUserGroups(OC_User::getUser());
|
||||||
|
|
Loading…
Reference in New Issue