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

prevent php-warnings on members.php, fixes #4533

Closes #4533

Merge request studip/studip!3328
parent 8830544b
No related branches found
No related tags found
No related merge requests found
...@@ -1155,7 +1155,7 @@ class Course_MembersController extends AuthenticatedController ...@@ -1155,7 +1155,7 @@ class Course_MembersController extends AuthenticatedController
// insert admission user to autorlist // insert admission user to autorlist
$msgs = $this->setMemberStatus($users, $status, $next_status, 'upgrade'); $msgs = $this->setMemberStatus($users, $status, $next_status, 'upgrade');
if ($msgs['success']) { if (!empty($msgs['success'])) {
PageLayout::postSuccess(sprintf( PageLayout::postSuccess(sprintf(
_('Das Hochstufen auf den Status %s von %s wurde erfolgreich durchgeführt'), _('Das Hochstufen auf den Status %s von %s wurde erfolgreich durchgeführt'),
htmlReady($this->decoratedStatusGroups[$next_status]), htmlReady($this->decoratedStatusGroups[$next_status]),
...@@ -1163,7 +1163,7 @@ class Course_MembersController extends AuthenticatedController ...@@ -1163,7 +1163,7 @@ class Course_MembersController extends AuthenticatedController
)); ));
} }
if ($msgs['no_tutor']) { if (!empty($msgs['no_tutor'])) {
PageLayout::postError(sprintf( PageLayout::postError(sprintf(
_('Das Hochstufen auf den Status %s von %s konnte nicht durchgeführt werden, weil die globale Rechtestufe "tutor" fehlt.') . ' ' . _('Bitte wenden Sie sich an den Support.'), _('Das Hochstufen auf den Status %s von %s konnte nicht durchgeführt werden, weil die globale Rechtestufe "tutor" fehlt.') . ' ' . _('Bitte wenden Sie sich an den Support.'),
htmlReady($this->decoratedStatusGroups[$next_status]), htmlReady($this->decoratedStatusGroups[$next_status]),
...@@ -1208,7 +1208,7 @@ class Course_MembersController extends AuthenticatedController ...@@ -1208,7 +1208,7 @@ class Course_MembersController extends AuthenticatedController
if (!empty($users)) { if (!empty($users)) {
$msgs = $this->setMemberStatus($users, $status, $next_status, 'downgrade'); $msgs = $this->setMemberStatus($users, $status, $next_status, 'downgrade');
if ($msgs['success']) { if (!empty($msgs['success'])) {
PageLayout::postSuccess(sprintf( PageLayout::postSuccess(sprintf(
_('Der/die %s %s wurde auf den Status %s heruntergestuft.'), _('Der/die %s %s wurde auf den Status %s heruntergestuft.'),
htmlReady($this->decoratedStatusGroups[$status]), htmlReady($this->decoratedStatusGroups[$status]),
...@@ -1948,12 +1948,15 @@ class Course_MembersController extends AuthenticatedController ...@@ -1948,12 +1948,15 @@ class Course_MembersController extends AuthenticatedController
} }
} }
private function setMemberStatus($members, $status, $next_status, $direction) private function setMemberStatus($members, $status, $next_status, $direction): array
{ {
$msgs = []; $msgs = [
'success' => [],
'no_tutor' => []
];
foreach ($members as $user_id) { foreach ($members as $user_id) {
$temp_user = User::find($user_id); $temp_user = User::find($user_id);
if ($next_status == 'tutor' && !$GLOBALS['perm']->have_perm('tutor', $user_id)) { if ($next_status === 'tutor' && !$GLOBALS['perm']->have_perm('tutor', $user_id)) {
$msgs['no_tutor'][$user_id] = $temp_user->getFullName(); $msgs['no_tutor'][$user_id] = $temp_user->getFullName();
} else { } else {
if ($temp_user) { if ($temp_user) {
...@@ -1994,11 +1997,7 @@ class Course_MembersController extends AuthenticatedController ...@@ -1994,11 +1997,7 @@ class Course_MembersController extends AuthenticatedController
} }
} }
if (!empty($msgs)) { return $msgs;
return $msgs;
} else {
return false;
}
} }
public function addMember(string $user_id, bool $accepted = false, bool $consider_contingent = null, &$msg = []): bool public function addMember(string $user_id, bool $accepted = false, bool $consider_contingent = null, &$msg = []): bool
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment