sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Filter contacts from the local system addressbook - remote share with local users is not allowed

remotes/origin/comments-markallread-dav
Thomas Müller 2016-02-02 11:24:26 +07:00
parent 22de25c382
commit dfb88612af
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/dav/lib/carddav/addressbookimpl.php
Unescape Escape View File

@ -214,6 +214,10 @@ class AddressBookImpl implements IAddressBook {
foreach ($vCard->children as $property) {
$result[$property->name] = $property->getValue();
}
if ($this->addressBookInfo['principaluri'] === 'principals/system/system' &&
$this->addressBookInfo['uri'] === 'system') {
$result['isLocalSystemBook'] = true;
}
return $result;
}
}

3
apps/files_sharing/api/sharees.php
Unescape Escape View File

@ -270,6 +270,9 @@ class Sharees {
$addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN']);
$foundRemoteById = false;
foreach ($addressBookContacts as $contact) {
if (isset($contact['isLocalSystemBook'])) {
continue;
}
if (isset($contact['CLOUD'])) {
$cloudIds = $contact['CLOUD'];
if (!is_array($cloudIds)) {