Skip to content
Snippets Groups Projects
Commit 1f3ccb77 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms Committed by David Siegfried
Browse files

prevent php8 warnings, fixes #2222

Closes #2222

Merge request studip/studip!1454
parent f3fe3fb3
No related branches found
No related tags found
No related merge requests found
<?php
/**
* @var Course_WizardController $controller
* @var string $content
* @var string $temp_id
* @var int $stepnumber
* @var bool $first_step
* @var bool|null $dialog
*/
?>
<? if ($content) : ?> <? if ($content) : ?>
<form class="default course-wizard-step-<?= $stepnumber ?>" action="<?= $controller->url_for('course/wizard/process', $stepnumber, $temp_id) ?>" method="post" data-secure> <form class="default course-wizard-step-<?= $stepnumber ?>" action="<?= $controller->link_for('course/wizard/process', $stepnumber, $temp_id) ?>" method="post" data-secure>
<fieldset> <fieldset>
<?= $content ?> <?= $content ?>
</fieldset> </fieldset>
...@@ -10,13 +20,13 @@ ...@@ -10,13 +20,13 @@
<?= Studip\Button::create( <?= Studip\Button::create(
_('Zurück'), _('Zurück'),
'back', 'back',
$dialog ? ['data-dialog' => 'size=50%'] : [] !empty($dialog) ? ['data-dialog' => 'size=50%'] : []
) ?> ) ?>
<? endif; ?> <? endif; ?>
<?= Studip\Button::create( <?= Studip\Button::create(
_('Weiter'), _('Weiter'),
'next', 'next',
$dialog ? ['data-dialog' => 'size=50%'] : [] !empty($dialog) ? ['data-dialog' => 'size=50%'] : []
) ?> ) ?>
</footer> </footer>
</form> </form>
......
...@@ -193,24 +193,28 @@ class BasicDataWizardStep implements CourseWizardStep ...@@ -193,24 +193,28 @@ class BasicDataWizardStep implements CourseWizardStep
&& $GLOBALS['perm']->have_perm('dozent') && $GLOBALS['perm']->have_perm('dozent')
&& !$GLOBALS['perm']->have_perm('admin') && !$GLOBALS['perm']->have_perm('admin')
) { ) {
$values['lecturers'][$GLOBALS['user']->id] = true; $values['lecturers'] = [$GLOBALS['user']->id => true];
// Remove from deputies if set. // Remove from deputies if set.
if ($deputies && $values['deputies'][$GLOBALS['user']->id]) { if ($deputies && isset($values['deputies'][$GLOBALS['user']->id])) {
unset($values['deputies'][$GLOBALS['user']->id]); unset($values['deputies'][$GLOBALS['user']->id]);
} }
// Add your own default deputies if applicable. // Add your own default deputies if applicable.
if ($deputies && Config::get()->DEPUTIES_DEFAULTENTRY_ENABLE) { if ($deputies && Config::get()->DEPUTIES_DEFAULTENTRY_ENABLE) {
$values['deputies'] = array_merge($values['deputies'] ?: [], $values['deputies'] = array_merge(
array_flip(Deputy::findDeputies($GLOBALS['user']->id)->pluck('user_id'))); $values['deputies'] ?? [],
array_flip(Deputy::findDeputies($GLOBALS['user']->id)->pluck('user_id'))
);
} }
} }
// Add lecturer from my courses filter. // Add lecturer from my courses filter.
if ($GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER && !$values['lecturers'] && Request::isXhr()) { if ($GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER && empty($values['lecturers']) && Request::isXhr()) {
$values['lecturers'][$GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER] = true; $values['lecturers'] = [$GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER => true];
// Add this lecturer's default deputies if applicable. // Add this lecturer's default deputies if applicable.
if ($deputies && Config::get()->DEPUTIES_DEFAULTENTRY_ENABLE) { if ($deputies && Config::get()->DEPUTIES_DEFAULTENTRY_ENABLE) {
$values['deputies'] = array_merge($values['deputies'] ?: [], $values['deputies'] = array_merge(
array_flip(Deputy::findDeputies($GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER)->pluck('user_id'))); $values['deputies'] ?? [],
array_flip(Deputy::findDeputies($GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER)->pluck('user_id'))
);
} }
} }
if (empty($values['lecturers'])) { if (empty($values['lecturers'])) {
......
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