diff options
| author | Joas Schilling <coding@schilljs.com> | 2018-02-13 17:32:58 +0100 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2018-03-06 12:20:24 +0100 |
| commit | 18968e84fc8467c2940642bff2faea17c4e6ef96 (patch) | |
| tree | c1aa599f9a5d4d3dc7becf5acde903d3532f2837 /lib | |
| parent | 242f0c0b5a79d6f24a01989980a93f8b8bb09ad0 (diff) | |
| download | nextcloud-server-18968e84fc8467c2940642bff2faea17c4e6ef96.tar.gz nextcloud-server-18968e84fc8467c2940642bff2faea17c4e6ef96.zip | |
Filter out the current user when searching for emails too
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Collaboration/Collaborators/MailPlugin.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/private/Collaboration/Collaborators/MailPlugin.php b/lib/private/Collaboration/Collaborators/MailPlugin.php index 99629f213e1..b4964825182 100644 --- a/lib/private/Collaboration/Collaborators/MailPlugin.php +++ b/lib/private/Collaboration/Collaborators/MailPlugin.php @@ -28,9 +28,11 @@ use OCP\Collaboration\Collaborators\ISearchPlugin; use OCP\Collaboration\Collaborators\ISearchResult; use OCP\Collaboration\Collaborators\SearchResultType; use OCP\Contacts\IManager; +use OCP\Federation\ICloudId; use OCP\Federation\ICloudIdManager; use OCP\IConfig; use OCP\IGroupManager; +use OCP\IUser; use OCP\IUserSession; use OCP\Share; @@ -112,7 +114,7 @@ class MailPlugin implements ISearchPlugin { continue; } - if (!$searchResult->hasResult($userType, $cloud->getUser())) { + if (!$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) { $singleResult = [[ 'label' => $contact['FN'] . " ($emailAddress)", 'value' => [ @@ -133,7 +135,7 @@ class MailPlugin implements ISearchPlugin { continue; } - if (!$searchResult->hasResult($userType, $cloud->getUser())) { + if (!$this->isCurrentUser($cloud) && !$searchResult->hasResult($userType, $cloud->getUser())) { $singleResult = [[ 'label' => $contact['FN'] . " ($emailAddress)", 'value' => [ @@ -191,4 +193,9 @@ class MailPlugin implements ISearchPlugin { return true; } + + public function isCurrentUser(ICloudId $cloud): bool { + $currentUser = $this->userSession->getUser(); + return $currentUser instanceof IUser ? $currentUser->getUID() === $cloud->getUser() : false; + } } |