diff options
| author | Côme Chilliet <come.chilliet@nextcloud.com> | 2024-05-16 16:55:47 +0200 |
|---|---|---|
| committer | Côme Chilliet <come.chilliet@nextcloud.com> | 2024-05-27 14:58:49 +0200 |
| commit | 27e6f27b7c8f290051aeaa1d77f3fe71b54826e1 (patch) | |
| tree | a664893cbdcb494aa895b82df0b200c3ed370c61 | |
| parent | 29e7294d9b1befae2c46ceee9b3613dc62dacfcb (diff) | |
| download | nextcloud-server-27e6f27b7c8f290051aeaa1d77f3fe71b54826e1.tar.gz nextcloud-server-27e6f27b7c8f290051aeaa1d77f3fe71b54826e1.zip | |
fix: Also search in email field for disabled users
To match what is done for Database backend for enabled users
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
| -rw-r--r-- | apps/user_ldap/lib/User_Proxy.php | 3 | ||||
| -rw-r--r-- | 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 cf58548f883..f0d5c7c1e4a 100644 --- a/lib/private/User/Manager.php +++ b/lib/private/User/Manager.php @@ -356,7 +356,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, ); } |