Skip to content

Also array_slice wide email matches of local users #8596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 2 commits into from
Mar 6, 2018
Merged

Also array_slice wide email matches of local users #8596

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12420ae
Also array_slice wide email matches of local users
nickvergessen Mar 1, 2018
e05f338
Add the users result only when non empty so tests stay the same
nickvergessen Mar 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions lib/private/Collaboration/Collaborators/MailPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdM
* @since 13.0.0
*/
public function search($search, $limit, $offset, ISearchResult $searchResult) {
$result = ['wide' => [], 'exact' => []];
$result = $userResults = ['wide' => [], 'exact' => []];
$userType = new SearchResultType('users');
$emailType = new SearchResultType('emails');

Expand Down Expand Up @@ -136,14 +136,13 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
}

if (!$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) {
$singleResult = [[
$userResults['wide'][] = [
'label' => $contact['FN'] . " ($emailAddress)",
'value' => [
'shareType' => Share::SHARE_TYPE_USER,
'shareWith' => $cloud->getUser(),
]],
],
];
$searchResult->addResultSet($userType, $singleResult, []);
}
}
continue;
Expand Down Expand Up @@ -175,10 +174,13 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {

if (!$this->shareeEnumeration) {
$result['wide'] = [];
$userResults['wide'] = [];
Copy link
Member Author

@nickvergessen nickvergessen Mar 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PS: also enumeration was possible before, pretty bad...

} else {
$result['wide'] = array_slice($result['wide'], $offset, $limit);
$userResults['wide'] = array_slice($userResults['wide'], $offset, $limit);
}


if (!$searchResult->hasExactIdMatch($emailType) && filter_var($search, FILTER_VALIDATE_EMAIL)) {
$result['exact'][] = [
'label' => $search,
Expand All @@ -189,6 +191,9 @@ public function search($search, $limit, $offset, ISearchResult $searchResult) {
];
}

if (!empty($userResults['wide'])) {
$searchResult->addResultSet($userType, $userResults['wide'], []);
}
$searchResult->addResultSet($emailType, $result['wide'], $result['exact']);

return true;
Expand Down