From 08d02aa1fe9bd0d1e7862137b7f1ff98dcbf66d2 Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms Date: Tue, 7 May 2024 13:51:48 +0000 Subject: fixes #4128 Closes #4128 Merge request studip/studip!2971 --- app/controllers/lvgruppen/lvgruppen.php | 21 ++++++++++++--------- app/controllers/module/module.php | 2 +- app/controllers/resources/ajax.php | 2 +- app/controllers/room_management/planning.php | 8 ++++---- app/controllers/search/studiengaenge.php | 2 +- app/controllers/shared/contacts.php | 4 ++-- app/views/course/wizard/steps/lvgroups/_node.php | 2 +- app/views/fachabschluss/abschluesse/index.php | 2 +- app/views/fachabschluss/faecher/fachbereiche.php | 4 ++-- app/views/lvgruppen/lvgruppen/details.php | 2 +- app/views/materialien/files/add_dokument.php | 6 +++--- app/views/questionnaire/assign.php | 16 ++++++++-------- app/views/resources/_common/_grouped_room_list.php | 2 +- app/views/shared/contacts/add_ranges_to_contact.php | 4 ++-- app/views/shared/contacts/details.php | 2 +- app/views/shared/contacts/range.php | 2 +- lib/classes/MVV.class.php | 2 +- .../coursewizardsteps/BasicDataWizardStep.php | 5 ++++- 18 files changed, 47 insertions(+), 41 deletions(-) diff --git a/app/controllers/lvgruppen/lvgruppen.php b/app/controllers/lvgruppen/lvgruppen.php index 5bac0fd..8562836 100644 --- a/app/controllers/lvgruppen/lvgruppen.php +++ b/app/controllers/lvgruppen/lvgruppen.php @@ -149,10 +149,12 @@ class Lvgruppen_LvgruppenController extends MVVController $semester = Semester::find($this->semester_filter); if ($semester && $semester->isCurrent()) { $this->next_sem = Semester::findNext(); - $this->display_semesters[] = $this->next_sem; - $this->courses = array_merge($this->courses, - $this->lvgruppe->getAllAssignedCourses(false, $this->next_sem->id) - ); + if ($this->next_sem) { + $this->display_semesters[] = $this->next_sem; + $this->courses = array_merge($this->courses, + $this->lvgruppe->getAllAssignedCourses(false, $this->next_sem->id) + ); + } } $this->current_sem = $semester; $this->display_semesters[] = $semester; @@ -451,7 +453,7 @@ class Lvgruppen_LvgruppenController extends MVVController ); $widget->class = 'nested-select'; $widget->addElement( - new SelectElement('select-none', _('Alle'), $selected_abschlussh === '') + new SelectElement('select-none', _('Alle'), $selected_abschluss === '') ); $abschluesse = Abschluss::findBySQL(' 1 ORDER BY `name`'); foreach ($abschluesse as $abschluss) { @@ -533,11 +535,12 @@ class Lvgruppen_LvgruppenController extends MVVController private function set_trails_filter($start, $end) { // show only pathes with modules valid in the selected semester - ModuleManagementModelTreeItem::setObjectFilter('Modulteil', + ModuleManagementModelTreeItem::setObjectFilter( + Modulteil::class, function ($mt) use ($start, $end) { - $modul_start = Semester::find($mt->modul->start)->beginn ?: 0; - $modul_end = Semester::find($mt->modul->end)->ende ?: PHP_INT_MAX; - return ($modul_start <= $end && $modul_end >= $start); + $modul_start = Semester::find($mt->modul->start)->beginn ?? 0; + $modul_end = Semester::find($mt->modul->end)->ende ?? PHP_INT_MAX; + return $modul_start <= $end && $modul_end >= $start; } ); } diff --git a/app/controllers/module/module.php b/app/controllers/module/module.php index 2f6ba4c..e57156f 100644 --- a/app/controllers/module/module.php +++ b/app/controllers/module/module.php @@ -53,7 +53,7 @@ class Module_ModuleController extends MVVController if (count($search_result) > 0) { $module_ids = $search_result; } else { - if ($_SESSION['mvv_filter_module_fach_id']) { + if (!empty($_SESSION['mvv_filter_module_fach_id'])) { $module_ids = $this->findModuleIdsByFach($_SESSION['mvv_filter_module_fach_id']); } if (!empty($_SESSION['mvv_filter_module_abschluss_id'])) { diff --git a/app/controllers/resources/ajax.php b/app/controllers/resources/ajax.php index 6ff3942..998acaf 100644 --- a/app/controllers/resources/ajax.php +++ b/app/controllers/resources/ajax.php @@ -190,7 +190,7 @@ class Resources_AjaxController extends AuthenticatedController 'resource_id' => $resource->id ]; if (!$display_all_requests) { - $requests_sql .= "AND user_id = :user_id "; + $requests_sql .= " AND user_id = :user_id "; $requests_sql_params['user_id'] = $current_user->id; } diff --git a/app/controllers/room_management/planning.php b/app/controllers/room_management/planning.php index c450c64..1484bbb 100644 --- a/app/controllers/room_management/planning.php +++ b/app/controllers/room_management/planning.php @@ -38,7 +38,7 @@ class RoomManagement_PlanningController extends AuthenticatedController if ($selected_clipboard_id) { $_SESSION['selected_clipboard_id'] = $selected_clipboard_id; } else { - $selected_clipboard_id = $_SESSION['selected_clipboard_id']; + $selected_clipboard_id = $_SESSION['selected_clipboard_id'] ?? null; } $this->display_all_requests = Request::get('display_all_requests'); @@ -282,7 +282,7 @@ class RoomManagement_PlanningController extends AuthenticatedController if ($selected_clipboard_id) { $_SESSION['selected_clipboard_id'] = $selected_clipboard_id; } else { - $selected_clipboard_id = $_SESSION['selected_clipboard_id']; + $selected_clipboard_id = $_SESSION['selected_clipboard_id'] ?? null; } $this->display_all_requests = Request::get('display_all_requests'); @@ -411,7 +411,7 @@ class RoomManagement_PlanningController extends AuthenticatedController } //Check if a clipboard is selected: - $selected_clipboard_id = $_SESSION['selected_clipboard_id']; + $selected_clipboard_id = $_SESSION['selected_clipboard_id'] ?? null; $rooms = []; if ($selected_clipboard_id) { $clipboard = Clipboard::find($selected_clipboard_id); @@ -1075,7 +1075,7 @@ class RoomManagement_PlanningController extends AuthenticatedController if ($selected_clipboard_id) { $_SESSION['selected_clipboard_id'] = $selected_clipboard_id; } else { - $selected_clipboard_id = $_SESSION['selected_clipboard_id']; + $selected_clipboard_id = $_SESSION['selected_clipboard_id'] ?? null; } //Get the selected date or use the current date, if none specified: diff --git a/app/controllers/search/studiengaenge.php b/app/controllers/search/studiengaenge.php index a075ce9..ae27106 100644 --- a/app/controllers/search/studiengaenge.php +++ b/app/controllers/search/studiengaenge.php @@ -228,7 +228,7 @@ class Search_StudiengaengeController extends MVVController } else { $this->active_sem = Semester::find($this->sessGet('selected_semester', Semester::findCurrent()->id)); } - $this->active_sem = $this->semesters[$this->active_sem->id] ? $this->active_sem : null; + $this->active_sem = !empty($this->semesters[$this->active_sem->id]) ? $this->active_sem : null; if (!$this->active_sem && count($this->semesters)) { $active_sem = reset($this->semesters); $this->active_sem = Semester::find($active_sem['semester_id']); diff --git a/app/controllers/shared/contacts.php b/app/controllers/shared/contacts.php index 98670f4..62dd7a8 100644 --- a/app/controllers/shared/contacts.php +++ b/app/controllers/shared/contacts.php @@ -725,7 +725,7 @@ class Shared_ContactsController extends MVVController $this->mvvcontact_id = $user_id; $this->selected_sem_end = $this->filter['end_sem.ende']; - $this->selected_inst = $this->filter['mvv_studiengang.institut_id']; + $this->selected_inst = $this->filter['mvv_studiengang.institut_id'] ?? null; if (Request::submitted('store')) { $selected = Request::getArray('ranges'); @@ -871,7 +871,7 @@ class Shared_ContactsController extends MVVController )); $filter = [ 'mvv_modul.stat' => $stat, - 'mvv_modul_inst.institut_id' => $this->filter['mvv_modul_inst.institut_id'], + 'mvv_modul_inst.institut_id' => $this->filter['mvv_modul_inst.institut_id'] ?? '', 'start_sem.beginn' => $this->filter['start_sem.beginn'], 'end_sem.ende' => $this->filter['end_sem.ende'] ]; diff --git a/app/views/course/wizard/steps/lvgroups/_node.php b/app/views/course/wizard/steps/lvgroups/_node.php index 8b159bd..78db2f1 100644 --- a/app/views/course/wizard/steps/lvgroups/_node.php +++ b/app/views/course/wizard/steps/lvgroups/_node.php @@ -1,4 +1,4 @@ -id, $search_result)) : ?> +id, $search_result)) : ?> id . '-' . $pos_id; ?>
    • diff --git a/app/views/fachabschluss/abschluesse/index.php b/app/views/fachabschluss/abschluesse/index.php index 6750a76..2b39000 100644 --- a/app/views/fachabschluss/abschluesse/index.php +++ b/app/views/fachabschluss/abschluesse/index.php @@ -14,7 +14,7 @@ - + count_faecher) : ?> diff --git a/app/views/fachabschluss/faecher/fachbereiche.php b/app/views/fachabschluss/faecher/fachbereiche.php index 5a4f6f1..844440c 100644 --- a/app/views/fachabschluss/faecher/fachbereiche.php +++ b/app/views/fachabschluss/faecher/fachbereiche.php @@ -10,7 +10,7 @@ - + - + render_partial('fachabschluss/faecher/details_fachbereich', compact('fach')) ?> diff --git a/app/views/lvgruppen/lvgruppen/details.php b/app/views/lvgruppen/lvgruppen/details.php index 073d552..6a9c3af 100644 --- a/app/views/lvgruppen/lvgruppen/details.php +++ b/app/views/lvgruppen/lvgruppen/details.php @@ -92,7 +92,7 @@