archive/nextcloud_server
0
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2025-03-13 07:53:51 +00:00
Code Issues Projects Releases Wiki Activity

Only limit search in the system address book

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2021-12-08 16:59:32 +01:00
parent 84d37143b0
commit 0f1670be8a
No known key found for this signature in database
GPG key ID: 7076EA9751AACDDA
3 changed files with 18 additions and 4 deletions
lib
private
Collaboration/Collaborators
MailPlugin.php
ContactsManager.php
public/Contacts
IManager.php

3
lib/private/Collaboration/Collaborators/MailPlugin.php
View file

@ -107,7 +107,8 @@ class MailPlugin implements ISearchPlugin {
[
'limit' => $limit,
'offset' => $offset,
'wildcard' => $this->shareeEnumeration,
'enumeration' => $this->shareeEnumeration,
'fullmatch' => $this->shareeEnumerationFullMatch,
]
);
$lowerSearch = strtolower($search);

16
lib/private/ContactsManager.php
View file

@ -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();

3
lib/public/Contacts/IManager.php
View file

@ -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
*/