Filter contacts from the local system addressbook - remote share with local users...

diff --git a/apps/dav/lib/carddav/addressbookimpl.php b/apps/dav/lib/carddav/addressbookimpl.php
index 734e68f207c9da40123f4d1cbbf5dbdc8917ef33..1d7b55c1a5d3a8c72acd005270f438f0bc572e7a 100644 (file)
--- a/apps/dav/lib/carddav/addressbookimpl.php
+++ b/apps/dav/lib/carddav/addressbookimpl.php
@@ -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;
        }
 }

diff --git a/apps/files_sharing/api/sharees.php b/apps/files_sharing/api/sharees.php
index c6bef8d784de5f06339946387941db1340b53826..85cea2e423825f6af043538757294e2ed88686f4 100644 (file)
--- a/apps/files_sharing/api/sharees.php
+++ b/apps/files_sharing/api/sharees.php
@@ -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)) {