diff options
| -rw-r--r-- | lib/private/Collaboration/Collaborators/MailPlugin.php | 3 | ||||
| -rw-r--r-- | lib/private/ContactsManager.php | 16 | ||||
| -rw-r--r-- | lib/public/Contacts/IManager.php | 3 |
3 files changed, 18 insertions, 4 deletions
diff --git a/lib/private/Collaboration/Collaborators/MailPlugin.php b/lib/private/Collaboration/Collaborators/MailPlugin.php index 59861247ced..7c245c4f9c4 100644 --- a/lib/private/Collaboration/Collaborators/MailPlugin.php +++ b/lib/private/Collaboration/Collaborators/MailPlugin.php @@ -107,7 +107,8 @@ class MailPlugin implements ISearchPlugin { [ 'limit' => $limit, 'offset' => $offset, - 'wildcard' => $this->shareeEnumeration, + 'enumeration' => $this->shareeEnumeration, + 'fullmatch' => $this->shareeEnumerationFullMatch, ] ); $lowerSearch = strtolower($search); diff --git a/lib/private/ContactsManager.php b/lib/private/ContactsManager.php index 7bdb8293857..557cf98c66b 100644 --- a/lib/private/ContactsManager.php +++ b/lib/private/ContactsManager.php @@ -42,14 +42,26 @@ class ContactsManager implements IManager { * - 'escape_like_param' - If set to false wildcards _ and % are not escaped * - 'limit' - Set a numeric limit for the search results * - 'offset' - Set the offset for the limited search results - * - 'wildcard' - Whether the search should use wildcards + * - 'enumeration' - Whether user enumeration on system address book is allowed + * - 'fullmatch' - Whether matching on full detail in system address book is allowed * @return array an array of contacts which are arrays of key-value-pairs */ public function search($pattern, $searchProperties = [], $options = []) { $this->loadAddressBooks(); $result = []; foreach ($this->addressBooks as $addressBook) { - $r = $addressBook->search($pattern, $searchProperties, $options); + $searchOptions = $options; + + if ($addressBook->isSystemAddressBook()) { + $fullMatch = !\array_key_exists('fullmatch', $options) || $options['fullmatch'] !== false; + if (!$fullMatch) { + // Neither full match is allowed, so skip the system address book + continue; + } + $searchOptions['wildcard'] = !\array_key_exists('enumeration', $options) || $options['enumeration'] !== false; + } + + $r = $addressBook->search($pattern, $searchProperties, $searchOptions); $contacts = []; foreach ($r as $c) { $c['addressbook-key'] = $addressBook->getKey(); diff --git a/lib/public/Contacts/IManager.php b/lib/public/Contacts/IManager.php index 6bf569e9bbd..6d5f318cfa8 100644 --- a/lib/public/Contacts/IManager.php +++ b/lib/public/Contacts/IManager.php @@ -93,7 +93,8 @@ interface IManager { * - 'escape_like_param' - If set to false wildcards _ and % are not escaped * - 'limit' - Set a numeric limit for the search results * - 'offset' - Set the offset for the limited search results - * - 'wildcard' - Whether the search should use wildcards + * - 'enumeration' - Whether user enumeration on system address book is allowed + * - 'fullmatch' - Whether matching on full detail in system addresss book is allowed * @return array an array of contacts which are arrays of key-value-pairs * @since 6.0.0 */ |