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 ...@@ -48,7 +48,11 @@ class Admin_CourseplanningController extends AuthenticatedController
$stgteil = StudiengangTeil::find($GLOBALS['user']->cfg->MY_COURSES_SELECTED_STGTEIL); $stgteil = StudiengangTeil::find($GLOBALS['user']->cfg->MY_COURSES_SELECTED_STGTEIL);
$plan_title .= ' - ' . $stgteil->getDisplayName(); $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; $plan_title .= ' - ' . $this->semester->name;
} }
return $plan_title; return $plan_title;
...@@ -838,45 +842,43 @@ class Admin_CourseplanningController extends AuthenticatedController ...@@ -838,45 +842,43 @@ class Admin_CourseplanningController extends AuthenticatedController
$sem_types = SemType::getTypes(); $sem_types = SemType::getTypes();
} }
$seminars = array_map('reset', $courses); $seminars = array_map('current', $courses);
if (!empty($seminars)) { foreach ($seminars as $seminar_id => $seminar) {
foreach ($seminars as $seminar_id => $seminar) { $seminars[$seminar_id]['seminar_id'] = $seminar_id;
$seminars[$seminar_id]['seminar_id'] = $seminar_id; $seminars[$seminar_id]['obj_type'] = 'sem';
$seminars[$seminar_id]['obj_type'] = 'sem'; $dozenten = $this->getTeacher($seminar_id);
$dozenten = $this->getTeacher($seminar_id); $seminars[$seminar_id]['dozenten'] = $dozenten;
$seminars[$seminar_id]['dozenten'] = $dozenten;
if (in_array('contents', $params['view_filter'])) {
if (in_array('contents', $params['view_filter'])) { $tools = new SimpleCollection(ToolActivation::findbyRange_id($seminar_id, "ORDER BY position"));
$tools = new SimpleCollection(ToolActivation::findbyRange_id($seminar_id, "ORDER BY position")); $visit_data = get_objects_visits([$seminar_id], 0, null, null, $tools->pluck('plugin_id'));
$visit_data = get_objects_visits([$seminar_id], 0, null, null, $tools->pluck('plugin_id')); $seminars[$seminar_id]['tools'] = $tools;
$seminars[$seminar_id]['tools'] = $tools; $seminars[$seminar_id]['visitdate'] = $visit_data[$seminar_id][0]['visitdate'];
$seminars[$seminar_id]['visitdate'] = $visit_data[$seminar_id][0]['visitdate']; $seminars[$seminar_id]['last_visitdate'] = $visit_data[$seminar_id][0]['last_visitdate'];
$seminars[$seminar_id]['last_visitdate'] = $visit_data[$seminar_id][0]['last_visitdate']; $seminars[$seminar_id]['sem_class'] = $sem_types[$seminar['status']]->getClass();
$seminars[$seminar_id]['sem_class'] = $sem_types[$seminar['status']]->getClass(); $seminars[$seminar_id]['navigation'] = MyRealmModel::getAdditionalNavigations(
$seminars[$seminar_id]['navigation'] = MyRealmModel::getAdditionalNavigations( $seminar_id,
$seminar_id, $seminars[$seminar_id],
$seminars[$seminar_id], $seminars[$seminar_id]['sem_class'],
$seminars[$seminar_id]['sem_class'], $GLOBALS['user']->id,
$GLOBALS['user']->id, $visit_data[$seminar_id]
$visit_data[$seminar_id] );
); }
} //add last activity column:
//add last activity column: if (in_array('last_activity', $params['view_filter'])) {
if (in_array('last_activity', $params['view_filter'])) { $seminars[$seminar_id]['last_activity'] = lastActivity($seminar_id);
$seminars[$seminar_id]['last_activity'] = lastActivity($seminar_id); }
} if ($this->selected_action == 17) {
if ($this->selected_action == 17) { $seminars[$seminar_id]['admission_locked'] = false;
$seminars[$seminar_id]['admission_locked'] = false; if ($seminar['course_set']) {
if ($seminar['course_set']) { $set = new CourseSet($seminar['course_set']);
$set = new CourseSet($seminar['course_set']); if (!is_null($set) && $set->hasAdmissionRule('LockedAdmission')) {
if (!is_null($set) && $set->hasAdmissionRule('LockedAdmission')) { $seminars[$seminar_id]['admission_locked'] = 'locked';
$seminars[$seminar_id]['admission_locked'] = 'locked'; } else {
} else { $seminars[$seminar_id]['admission_locked'] = 'disable';
$seminars[$seminar_id]['admission_locked'] = 'disable';
}
unset($set);
} }
unset($set);
} }
} }
} }
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<?= htmlReady($consumer->title) ?> <?= htmlReady($consumer->title) ?>
<? endif; ?> <? endif; ?>
</td> </td>
<td><?= $types[$consumer->type] ?: '&nbsp;' ?></td> <td><?= $types[$consumer->type] ?? '&nbsp;' ?></td>
<td> <td>
<a href="mailto:<?= htmlReady($consumer->email) ?>"> <a href="mailto:<?= htmlReady($consumer->email) ?>">
<?= htmlReady($consumer->contact) ?> <?= htmlReady($consumer->contact) ?>
......
...@@ -181,7 +181,7 @@ class I18NString implements JsonSerializable ...@@ -181,7 +181,7 @@ class I18NString implements JsonSerializable
*/ */
public function translation($lang) public function translation($lang)
{ {
return $this->toArray()[$lang]; return $this->toArray()[$lang] ?? '';
} }
/** /**
......
...@@ -609,7 +609,7 @@ class InstituteCalendarHelper ...@@ -609,7 +609,7 @@ class InstituteCalendarHelper
$rooms = []; $rooms = [];
foreach ($cycle_date->getAllDates() as $course_date) { foreach ($cycle_date->getAllDates() as $course_date) {
$room = $course_date->getRoom(); $room = $course_date->getRoom();
if ($room->id) { if ($room) {
$rooms[$room->id] = $room->name; $rooms[$room->id] = $room->name;
} }
} }
......
...@@ -29,7 +29,7 @@ class BasicDataWizardStep implements CourseWizardStep ...@@ -29,7 +29,7 @@ class BasicDataWizardStep implements CourseWizardStep
{ {
// Load template from step template directory. // Load template from step template directory.
$factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH'] . '/app/views/course/wizard/steps'); $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'); $tpl = $factory->open('basicdata/index_studygroup');
$values[__CLASS__]['lecturers'][$GLOBALS['user']->id] = 1; $values[__CLASS__]['lecturers'][$GLOBALS['user']->id] = 1;
} else { } else {
...@@ -45,13 +45,13 @@ class BasicDataWizardStep implements CourseWizardStep ...@@ -45,13 +45,13 @@ class BasicDataWizardStep implements CourseWizardStep
protected function setupTemplateAttributes($tpl, $values, $stepnumber, $temp_id) protected function setupTemplateAttributes($tpl, $values, $stepnumber, $temp_id)
{ {
// We only need our own stored values here. // We only need our own stored values here.
$values = $values[__CLASS__]; $values = $values[__CLASS__] ?? [];
// Get all available course types and their categories. // Get all available course types and their categories.
$typestruct = []; $typestruct = [];
foreach (SemType::getTypes() as $type) { foreach (SemType::getTypes() as $type) {
$class = $type->getClass(); $class = $type->getClass();
// Creates a studygroup. // Creates a studygroup.
if ($values['studygroup']) { if (!empty($values['studygroup'])) {
// Get all studygroup types. // Get all studygroup types.
if ($class['studygroup_mode']) { if ($class['studygroup_mode']) {
$typestruct[$class['name']][] = $type; $typestruct[$class['name']][] = $type;
......
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