diff options
| author | Joas Schilling <coding@schilljs.com> | 2018-02-06 18:11:44 +0100 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2018-02-20 17:47:54 +0100 |
| commit | d63caf5829fd3f69f5b42a75cc50bf2fc267582b (patch) | |
| tree | dc84cc7d84b9538703a6327de214a250ed395e7a /lib | |
| parent | a3de507b7626919a42ef6a86d94af30b0f04f3a9 (diff) | |
| download | nextcloud-server-d63caf5829fd3f69f5b42a75cc50bf2fc267582b.tar.gz nextcloud-server-d63caf5829fd3f69f5b42a75cc50bf2fc267582b.zip | |
Better result handling of email search
1. Local users should not be returned when searching for empty string
2. The limit of the response should be respected
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Collaboration/Collaborators/MailPlugin.php | 2 | ||||
| -rw-r--r-- | lib/private/Collaboration/Collaborators/RemotePlugin.php | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/private/Collaboration/Collaborators/MailPlugin.php b/lib/private/Collaboration/Collaborators/MailPlugin.php index 2e946c4a872..99629f213e1 100644 --- a/lib/private/Collaboration/Collaborators/MailPlugin.php +++ b/lib/private/Collaboration/Collaborators/MailPlugin.php @@ -173,6 +173,8 @@ class MailPlugin implements ISearchPlugin { if (!$this->shareeEnumeration) { $result['wide'] = []; + } else { + $result['wide'] = array_slice($result['wide'], $offset, $limit); } if (!$searchResult->hasExactIdMatch($emailType) && filter_var($search, FILTER_VALIDATE_EMAIL)) { diff --git a/lib/private/Collaboration/Collaborators/RemotePlugin.php b/lib/private/Collaboration/Collaborators/RemotePlugin.php index b17a64e4ff1..e0f5298f83b 100644 --- a/lib/private/Collaboration/Collaborators/RemotePlugin.php +++ b/lib/private/Collaboration/Collaborators/RemotePlugin.php @@ -102,6 +102,8 @@ class RemotePlugin implements ISearchPlugin { if (!$this->shareeEnumeration) { $result['wide'] = []; + } else { + $result['wide'] = array_slice($result['wide'], $offset, $limit); } if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) { |