From 8044edf30977149a1ad1ae3cdd4d3e1485fb4060 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=B4me=20Chilliet?= Date: Thu, 16 May 2024 16:55:47 +0200 Subject: [PATCH] fix: Also search in email field for disabled users MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit To match what is done for Database backend for enabled users Signed-off-by: Côme Chilliet --- apps/user_ldap/lib/User_Proxy.php | 3 ++- lib/private/User/Manager.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/user_ldap/lib/User_Proxy.php b/apps/user_ldap/lib/User_Proxy.php index 5f17548fac7..becdc1b4918 100644 --- a/apps/user_ldap/lib/User_Proxy.php +++ b/apps/user_ldap/lib/User_Proxy.php @@ -471,7 +471,8 @@ class User_Proxy extends Proxy implements IUserBackend, UserInterface, IUserLDAP fn (OfflineUser $user): bool => mb_stripos($user->getOCName(), $search) !== false || mb_stripos($user->getUID(), $search) !== false || - mb_stripos($user->getDisplayName(), $search) !== false, + mb_stripos($user->getDisplayName(), $search) !== false || + mb_stripos($user->getEmail(), $search) !== false, ); } return array_map( diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php index 8234f505a47..c55854358cf 100644 --- a/lib/private/User/Manager.php +++ b/lib/private/User/Manager.php @@ -347,7 +347,8 @@ class Manager extends PublicEmitter implements IUserManager { $users, fn (IUser $user): bool => mb_stripos($user->getUID(), $search) !== false || - mb_stripos($user->getDisplayName(), $search) !== false, + mb_stripos($user->getDisplayName(), $search) !== false || + mb_stripos($user->getEMailAddress() ?? '', $search) !== false, ); } -- 2.39.5