Skip to content
Snippets Groups Projects
Commit 5e45e451 authored by David Siegfried's avatar David Siegfried
Browse files

prevent php8-warnings, closes #2597

Closes #2597

Merge request studip/studip!1751
parent 05659454
No related branches found
No related tags found
No related merge requests found
...@@ -26,16 +26,19 @@ class MultipersonsearchController extends AuthenticatedController ...@@ -26,16 +26,19 @@ class MultipersonsearchController extends AuthenticatedController
$searchterm = preg_replace('/\s+/u', ' ', $searchterm); $searchterm = preg_replace('/\s+/u', ' ', $searchterm);
$result = []; $result = [];
$alreadyMember = [];
// execute searchobject if searchterm is at least 3 chars long // execute searchobject if searchterm is at least 3 chars long
if (mb_strlen($searchterm) >= 3) { if (mb_strlen($searchterm) >= 3) {
$mp = MultiPersonSearch::load($name); $mp = MultiPersonSearch::load($name);
$searchObject = $mp->getSearchObject(); $searchObject = $mp->getSearchObject();
if (isset($searchObject)) {
$result = array_map(function ($r) { $result = array_map(function ($r) {
return $r['user_id']; return $r['user_id'];
}, $searchObject->getResults($searchterm, [], 50)); }, $searchObject->getResults($searchterm, [], 50));
$result = User::findFullMany($result, 'ORDER BY Nachname ASC, Vorname ASC'); $result = User::findFullMany($result, 'ORDER BY Nachname ASC, Vorname ASC');
$alreadyMember = $mp->getDefaultSelectedUsersIDs(); $alreadyMember = $mp->getDefaultSelectedUsersIDs();
} }
}
$output = []; $output = [];
foreach ($result as $user) { foreach ($result as $user) {
...@@ -122,6 +125,7 @@ class MultipersonsearchController extends AuthenticatedController ...@@ -122,6 +125,7 @@ class MultipersonsearchController extends AuthenticatedController
$this->selectableUsers = []; $this->selectableUsers = [];
$this->selectedUsers = []; $this->selectedUsers = [];
$this->alreadyMemberUsers = [];
$this->search = Request::get("freesearch"); $this->search = Request::get("freesearch");
$this->additionHTML = $mp->getAdditionHTML(); $this->additionHTML = $mp->getAdditionHTML();
$previousSelectableUsers = json_decode(Request::get('search_persons_selectable_hidden'), true); $previousSelectableUsers = json_decode(Request::get('search_persons_selectable_hidden'), true);
...@@ -252,17 +256,20 @@ class MultipersonsearchController extends AuthenticatedController ...@@ -252,17 +256,20 @@ class MultipersonsearchController extends AuthenticatedController
$searchterm = preg_replace('/\s+/u', ' ', $searchterm); $searchterm = preg_replace('/\s+/u', ' ', $searchterm);
$result = []; $result = [];
$alreadyMember = [];
// execute searchobject if searchterm is at least 3 chars long // execute searchobject if searchterm is at least 3 chars long
if (mb_strlen($searchterm) >= 3) { if (mb_strlen($searchterm) >= 3) {
$mp = MultiPersonSearch::load($name); $mp = MultiPersonSearch::load($name);
$mp->setSearchObject(new StandardSearch('user_id')); $mp->setSearchObject(new StandardSearch('user_id'));
$searchObject = $mp->getSearchObject(); $searchObject = $mp->getSearchObject();
if (isset($searchObject)) {
$result = array_map(function ($r) { $result = array_map(function ($r) {
return $r['user_id']; return $r['user_id'];
}, $searchObject->getResults($searchterm, [], 50)); }, $searchObject->getResults($searchterm, [], 50));
$result = User::findFullMany($result, 'ORDER BY Nachname ASC, Vorname ASC'); $result = User::findFullMany($result, 'ORDER BY Nachname ASC, Vorname ASC');
$alreadyMember = $mp->getDefaultSelectedUsersIDs(); $alreadyMember = $mp->getDefaultSelectedUsersIDs();
} }
}
$output = []; $output = [];
foreach ($result as $user) { foreach ($result as $user) {
...@@ -270,7 +277,7 @@ class MultipersonsearchController extends AuthenticatedController ...@@ -270,7 +277,7 @@ class MultipersonsearchController extends AuthenticatedController
'id' => $user->id, 'id' => $user->id,
'avatar' => Avatar::getAvatar($user->id)->getURL(Avatar::SMALL), 'avatar' => Avatar::getAvatar($user->id)->getURL(Avatar::SMALL),
'text' => "{$user->nachname}, {$user->vorname} -- {$user->perms} ({$user->username})", 'text' => "{$user->nachname}, {$user->vorname} -- {$user->perms} ({$user->username})",
'selected' => $alreadyMember === null ? false : in_array($user->id, $alreadyMember), 'selected' => in_array($user->id, $alreadyMember),
'nachname' => $user->nachname, 'nachname' => $user->nachname,
'vorname' => $user->vorname, 'vorname' => $user->vorname,
'username' => $user->username, 'username' => $user->username,
...@@ -279,6 +286,4 @@ class MultipersonsearchController extends AuthenticatedController ...@@ -279,6 +286,4 @@ class MultipersonsearchController extends AuthenticatedController
} }
$this->render_json($output); $this->render_json($output);
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment