Merge pull request #45370 from nextcloud/feat/add-back-search-in-disabled-users

feat: Add back searching in disabled user list

3 files changed, 15 insertions, 4 deletions

diff --git a/lib/private/User/Manager.php b/lib/private/User/Manager.php
index c7611da382d..c55854358cf 100644
--- a/lib/private/User/Manager.php
+++ b/lib/private/User/Manager.php
@@ -333,7 +333,7 @@ class Manager extends PublicEmitter implements IUserManager {
 	/**
 	 * @return IUser[]
 	 */
-	public function getDisabledUsers(?int $limit = null, int $offset = 0): array {
+	public function getDisabledUsers(?int $limit = null, int $offset = 0, string $search = ''): array {
 		$users = $this->config->getUsersForUserValue('core', 'enabled', 'false');
 		$users = array_combine(
 			$users,
@@ -342,6 +342,15 @@ class Manager extends PublicEmitter implements IUserManager {
 				$users
 			)
 		);
+		if ($search !== '') {
+			$users = array_filter(
+				$users,
+				fn (IUser $user): bool =>
+					mb_stripos($user->getUID(), $search) !== false ||
+					mb_stripos($user->getDisplayName(), $search) !== false ||
+					mb_stripos($user->getEMailAddress() ?? '', $search) !== false,
+			);
+		}
 
 		$tempLimit = ($limit === null ? null : $limit + $offset);
 		foreach ($this->backends as $backend) {
@@ -349,7 +358,7 @@ class Manager extends PublicEmitter implements IUserManager {
 				break;
 			}
 			if ($backend instanceof IProvideEnabledStateBackend) {
-				$backendUsers = $backend->getDisabledUserList(($tempLimit === null ? null : $tempLimit - count($users)));
+				$backendUsers = $backend->getDisabledUserList(($tempLimit === null ? null : $tempLimit - count($users)), 0, $search);
 				foreach ($backendUsers as $uid) {
 					$users[$uid] = new LazyUser($uid, $this, null, $backend);
 				}
diff --git a/lib/public/IUserManager.php b/lib/public/IUserManager.php
index 0a94c5ad928..94ab487d318 100644
--- a/lib/public/IUserManager.php
+++ b/lib/public/IUserManager.php
@@ -142,8 +142,9 @@ interface IUserManager {
 	/**
 	 * @return IUser[]
 	 * @since 28.0.0
+	 * @since 30.0.0 $search parameter added
 	 */
-	public function getDisabledUsers(?int $limit = null, int $offset = 0): array;
+	public function getDisabledUsers(?int $limit = null, int $offset = 0, string $search = ''): array;
 
 	/**
 	 * Search known users (from phonebook sync) by displayName
diff --git a/lib/public/User/Backend/IProvideEnabledStateBackend.php b/lib/public/User/Backend/IProvideEnabledStateBackend.php
index f12d99fd1a6..3fd517048fb 100644
--- a/lib/public/User/Backend/IProvideEnabledStateBackend.php
+++ b/lib/public/User/Backend/IProvideEnabledStateBackend.php
@@ -49,8 +49,9 @@ interface IProvideEnabledStateBackend {
 	 * Get the list of disabled users, to merge with the ones disabled in database
 	 *
 	 * @since 28.0.0
+	 * @since 30.0.0 $search parameter added
 	 *
 	 * @return string[]
 	 */
-	public function getDisabledUserList(?int $limit = null, int $offset = 0): array;
+	public function getDisabledUserList(?int $limit = null, int $offset = 0, string $search = ''): array;
 }