From fb966b49b5d17b43b163da82ac4901dd054b23cd Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Mon, 28 Sep 2020 15:35:11 +0200 Subject: Do not match sharees on an empty email address When asking for sharees we compare not only UID and displayname but also the email address. And if that matches we return the sharee as an exact match. This logic had a flaw as in that it also matched the empty string to users with no email address. This is most noticeable when you disable sharee enumeration and open the ownership transfer dialog. It suggested other users of the instance before. This has stopped now. Signed-off-by: Christoph Wurst --- lib/private/Collaboration/Collaborators/UserPlugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/private/Collaboration/Collaborators/UserPlugin.php b/lib/private/Collaboration/Collaborators/UserPlugin.php index c92f7bb0b6e..1d6e0fc0c06 100644 --- a/lib/private/Collaboration/Collaborators/UserPlugin.php +++ b/lib/private/Collaboration/Collaborators/UserPlugin.php @@ -101,9 +101,9 @@ class UserPlugin implements ISearchPlugin { $userEmail = $user->getEMailAddress(); $uid = (string) $uid; if ( - strtolower($uid) === $lowerSearch || + $lowerSearch !== '' && (strtolower($uid) === $lowerSearch || strtolower($userDisplayName) === $lowerSearch || - strtolower($userEmail) === $lowerSearch + strtolower($userEmail) === $lowerSearch) ) { if (strtolower($uid) === $lowerSearch) { $foundUserById = true; -- cgit v1.2.3