From 5fc46cd5163989ff75317b32cd9dcedc9e7e3e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?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=UTF-8 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 0dd62ccce8f..96cd7b47637 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 a316708ddef..96c77b22f76 100644 --- a/lib/private/User/Manager.php +++ b/lib/private/User/Manager.php @@ -355,7 +355,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, ); }