From 39a9361539ae78e6e5ea855e70d3d0f689d45635 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 8 Nov 2022 15:30:54 +0000
Subject: [PATCH] trim values for search, fixes #1765
Closes #1765
Merge request studip/studip!1142
---
app/controllers/admin/user.php | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/app/controllers/admin/user.php b/app/controllers/admin/user.php
index ab9f23bc77b..20fff6cba7e 100644
--- a/app/controllers/admin/user.php
+++ b/app/controllers/admin/user.php
@@ -112,8 +112,10 @@ class Admin_UserController extends AuthenticatedController
$this->order = $this->order == 'desc' ? 'asc' : 'desc';
}
- $request['vorname'] = $request['vorname'] ?: null;
- $request['nachname'] = $request['nachname'] ?: null;
+ $request['username'] = $this->getStringValueFromRequest($request, 'username');
+ $request['email'] = $this->getStringValueFromRequest($request, 'email');
+ $request['vorname'] = $this->getStringValueFromRequest($request, 'vorname');
+ $request['nachname'] = $this->getStringValueFromRequest($request, 'nachname');
$request['inaktiv'] = $inaktiv;
$request['datafields'] = $search_datafields;
$request['sort'] = $this->sortby;
@@ -213,6 +215,15 @@ class Admin_UserController extends AuthenticatedController
}
}
+ private function getStringValueFromRequest(array $request, string $key): ?string
+ {
+ if (!isset($request[$key])) {
+ return null;
+ }
+
+ return trim($request[$key]) ?: null;
+ }
+
/**
* Bulk action (delete users or send message to all)
*/
--
GitLab