From 851333edabc4de549098d646494a2d74ae13609b Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Mon, 28 Sep 2020 15:35:11 +0200 Subject: [PATCH] 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(-) diff --git a/lib/private/Collaboration/Collaborators/UserPlugin.php b/lib/private/Collaboration/Collaborators/UserPlugin.php index 13e914367d..2d21c6a16f 100644 --- a/lib/private/Collaboration/Collaborators/UserPlugin.php +++ b/lib/private/Collaboration/Collaborators/UserPlugin.php @@ -147,9 +147,9 @@ class UserPlugin implements ISearchPlugin { if ( - strtolower($uid) === $lowerSearch || + $lowerSearch !== '' && (strtolower($uid) === $lowerSearch || strtolower($userDisplayName) === $lowerSearch || - strtolower($userEmail) === $lowerSearch + strtolower($userEmail) === $lowerSearch) ) { if (strtolower($uid) === $lowerSearch) { $foundUserById = true;