Skip to content
Snippets Groups Projects
Commit 057418dd authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

prevent php8 warnings (sixth batch of changes), re #2193

Merge request studip/studip!1430
parent 0cdfc050
No related branches found
No related tags found
1 merge request!4Draft: Icon creation
......@@ -48,7 +48,11 @@ class Admin_CourseplanningController extends AuthenticatedController
$stgteil = StudiengangTeil::find($GLOBALS['user']->cfg->MY_COURSES_SELECTED_STGTEIL);
$plan_title .= ' - ' . $stgteil->getDisplayName();
}
if ($GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE && $GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE != 'all') {
if (
isset($this->semester)
&& $GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE
&& $GLOBALS['user']->cfg->MY_COURSES_SELECTED_CYCLE !== 'all'
) {
$plan_title .= ' - ' . $this->semester->name;
}
return $plan_title;
......@@ -838,9 +842,8 @@ class Admin_CourseplanningController extends AuthenticatedController
$sem_types = SemType::getTypes();
}
$seminars = array_map('reset', $courses);
$seminars = array_map('current', $courses);
if (!empty($seminars)) {
foreach ($seminars as $seminar_id => $seminar) {
$seminars[$seminar_id]['seminar_id'] = $seminar_id;
$seminars[$seminar_id]['obj_type'] = 'sem';
......@@ -879,7 +882,6 @@ class Admin_CourseplanningController extends AuthenticatedController
}
}
}
}
return $seminars;
}
......
......@@ -36,7 +36,7 @@
<?= htmlReady($consumer->title) ?>
<? endif; ?>
</td>
<td><?= $types[$consumer->type] ?: '&nbsp;' ?></td>
<td><?= $types[$consumer->type] ?? '&nbsp;' ?></td>
<td>
<a href="mailto:<?= htmlReady($consumer->email) ?>">
<?= htmlReady($consumer->contact) ?>
......
......@@ -181,7 +181,7 @@ class I18NString implements JsonSerializable
*/
public function translation($lang)
{
return $this->toArray()[$lang];
return $this->toArray()[$lang] ?? '';
}
/**
......
......@@ -609,7 +609,7 @@ class InstituteCalendarHelper
$rooms = [];
foreach ($cycle_date->getAllDates() as $course_date) {
$room = $course_date->getRoom();
if ($room->id) {
if ($room) {
$rooms[$room->id] = $room->name;
}
}
......
......@@ -29,7 +29,7 @@ class BasicDataWizardStep implements CourseWizardStep
{
// Load template from step template directory.
$factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/app/views/course/wizard/steps');
if ($values[__CLASS__]['studygroup']) {
if (!empty($values[__CLASS__]['studygroup'])) {
$tpl = $factory->open('basicdata/index_studygroup');
$values[__CLASS__]['lecturers'][$GLOBALS['user']->id] = 1;
} else {
......@@ -45,13 +45,13 @@ class BasicDataWizardStep implements CourseWizardStep
protected function setupTemplateAttributes($tpl, $values, $stepnumber, $temp_id)
{
// We only need our own stored values here.
$values = $values[__CLASS__];
$values = $values[__CLASS__] ?? [];
// Get all available course types and their categories.
$typestruct = [];
foreach (SemType::getTypes() as $type) {
$class = $type->getClass();
// Creates a studygroup.
if ($values['studygroup']) {
if (!empty($values['studygroup'])) {
// Get all studygroup types.
if ($class['studygroup_mode']) {
$typestruct[$class['name']][] = $type;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment