From 90ada48fb04ebcacee431cdfb78f0a63d594ed09 Mon Sep 17 00:00:00 2001 From: David Siegfried Date: Tue, 15 Nov 2022 11:35:36 +0000 Subject: prevent php8-warnings, closes #1770 Closes #1770 Merge request studip/studip!1148 --- app/controllers/admission/courseset.php | 70 +++++++++++++--------- app/controllers/admission/rule.php | 4 +- app/controllers/course/forum/index.php | 3 + app/controllers/course/room_requests.php | 16 ++--- app/controllers/resources/room_request.php | 10 ++-- app/controllers/tour.php | 2 +- app/controllers/userfilter/field.php | 4 +- app/controllers/userfilter/filter.php | 5 +- app/views/admission/courseset/configure.php | 8 ++- .../admission/courseset/configure_courses.php | 32 +++++----- app/views/admission/courseset/institutes.php | 14 +++-- app/views/course/details/index.php | 2 +- app/views/course/forum/index/_threads.php | 2 +- app/views/course/forum/index/index.php | 16 ++--- app/views/course/room_requests/request_summary.php | 2 +- app/views/resources/building/_add_edit_form.php | 7 ++- app/views/userfilter/field/configure.php | 6 +- .../ConditionalAdmission.class.php | 28 ++++----- .../CourseMemberAdmission.class.php | 9 +-- .../ParticipantRestrictedAdmission.class.php | 45 +++++++------- lib/classes/RangeTreeObject.class.php | 2 +- lib/classes/Request.class.php | 2 +- lib/classes/StudipSemSearchHelper.class.php | 13 ++-- lib/classes/TreeAbstract.class.php | 2 +- lib/classes/admission/AdmissionRule.class.php | 39 ++++++------ lib/classes/sidebar/SearchWidget.php | 4 +- lib/export/export_studipdata_func.inc.php | 15 +++-- lib/models/resources/ResourceRequest.class.php | 11 ++-- lib/plugins/engine/PluginManager.class.php | 2 +- 29 files changed, 207 insertions(+), 168 deletions(-) diff --git a/app/controllers/admission/courseset.php b/app/controllers/admission/courseset.php index a37ce7d..11b0672 100644 --- a/app/controllers/admission/courseset.php +++ b/app/controllers/admission/courseset.php @@ -42,11 +42,13 @@ class Admission_CoursesetController extends AuthenticatedController $views = new ActionsWidget(); $views->addLink( _('Anmeldeset anlegen'), - $this->url_for('admission/courseset/configure'), - Icon::create('add', 'clickable') - )->setActive($action == 'configure'); + $this->configureURL(), + Icon::create('add') + )->setActive($action === 'configure'); Sidebar::Get()->addWidget($views); - + if (!isset($this->instant_course_set_view)) { + $this->instant_course_set_view = false; + } } /** @@ -129,16 +131,18 @@ class Admission_CoursesetController extends AuthenticatedController : null; }, $this->coursesets)); if (count($not_distributed_coursesets)) { - PageLayout::postMessage(MessageBox::info( - _("Es existieren Anmeldesets, die zum Zeitpunkt der Platzverteilung nicht gelost wurden. Stellen Sie sicher, dass der Cronjob \"Losverfahren überprüfen\" ausgeführt wird."), - array_unique($not_distributed_coursesets))); + PageLayout::postInfo( + _('"Es existieren Anmeldesets, die zum Zeitpunkt der Platzverteilung nicht gelost wurden. Stellen Sie sicher, dass der Cronjob "Losverfahren überprüfen" ausgeführt wird."'), + array_unique($not_distributed_coursesets)); } } /** * Configure a new or existing course set. */ - public function configure_action($coursesetId='') { + public function configure_action($coursesetId = '') + { + $this->courseset = null; if ($GLOBALS['perm']->have_perm('root')) { if ($coursesetId) { // Load course set data. @@ -162,7 +166,7 @@ class Admission_CoursesetController extends AuthenticatedController $this->selectedSemester = $_SESSION['_default_sem'] ?: Semester::findCurrent()->semester_id; } Config::get()->AJAX_AUTOCOMPLETE_DISABLED = false; - $this->instSearch = QuickSearch::get("institute_id", new StandardSearch("Institut_id")) + $this->instSearch = QuickSearch::get('institute_id', new StandardSearch('Institut_id')) ->withoutButton() ->render(); } else { @@ -264,7 +268,8 @@ class Admission_CoursesetController extends AuthenticatedController * @param String $coursesetId the course set to save or empty if it is a * new course set */ - public function save_action($coursesetId='') { + public function save_action($coursesetId = '') + { if (!Request::submitted('submit') || !Request::get('name') || !$this->instant_course_set_view && !Request::getArray('institutes')) { $this->flash['name'] = Request::get('name'); $this->flash['institutes'] = Request::getArray('institutes'); @@ -310,7 +315,7 @@ class Admission_CoursesetController extends AuthenticatedController if (Request::option('semester')) { $_SESSION['_default_sem'] = Request::option('semester'); } - PageLayout::postMessage(MessageBox::success(sprintf(_("Das Anmeldeset: %s wurde gespeichert"), htmlReady($courseset->getName())))); + PageLayout::postSuccess(sprintf(_('Das Anmeldeset: %s wurde gespeichert'), htmlReady($courseset->getName()))); if ($this->instant_course_set_view) { $this->redirect($this->url_for('course/admission')); } else { @@ -343,11 +348,11 @@ class Admission_CoursesetController extends AuthenticatedController * from * @see CoursesetModel::getInstCourses */ - public function instcourses_action($coursesetId='') { + public function instcourses_action($coursesetId = '') + { CSRFProtection::verifyUnsafeRequest(); $this->selectedCourses = []; //autoload - $courseset = new CourseSet(); if ($coursesetId && !Request::getArray('courses')) { $courseset = new CourseSet($coursesetId); $this->selectedCourses = $courseset->getCourses(); @@ -361,7 +366,8 @@ class Admission_CoursesetController extends AuthenticatedController /** * Fetches available institutes for the current user. */ - public function institutes_action() { + public function institutes_action() + { CSRFProtection::verifyUnsafeRequest(); $this->myInstitutes = Institute::getMyInstitutes(); $this->selectedInstitutes = []; @@ -369,7 +375,7 @@ class Admission_CoursesetController extends AuthenticatedController $this->selectedInstitutes[$institute] = new Institute($institute); } Config::get()->AJAX_AUTOCOMPLETE_DISABLED = false; - $this->instSearch = QuickSearch::get("institute_id", new StandardSearch("Institut_id")) + $this->instSearch = QuickSearch::get('institute_id', new StandardSearch('Institut_id')) ->withOutButton() ->render(); } @@ -398,6 +404,9 @@ class Admission_CoursesetController extends AuthenticatedController $all_members = array_merge($all_members, $course->admission_applicants->findBy('status', words('accepted awaiting'))->pluck('user_id')); $all_members = array_unique($all_members); foreach ($all_members as $one) { + if (!isset($multi_members[$one])) { + $multi_members[$one] = 0; + } $multi_members[$one]++; } $distinct_members = array_unique(array_merge($distinct_members, $all_members)); @@ -456,12 +465,12 @@ class Admission_CoursesetController extends AuthenticatedController foreach (array_keys($participants) as $one) { $multi_members[$one][] = $course->name . ($course->veranstaltungsnummer ? '|'. $course->veranstaltungsnummer : ''); } - foreach ($participants as $user_id => $part) { + foreach ($participants as $part) { $liste[] = [$part['username'], $part['vorname'], $part['nachname'], $part['email'], $course->name . ($course->veranstaltungsnummer ? '|'. $course->veranstaltungsnummer : '') , $part['status']]; } } if ($csv == 'download_all_members') { - $captions = [_("Username"), _("Vorname"), _("Nachname"), _("E-Mail"), _("Veranstaltung"), _("Status")]; + $captions = [_('Username'), _('Vorname'), _('Nachname'), _('E-Mail'), _('Veranstaltung'), _('Status')]; if (count($liste)) { $tmpname = md5(uniqid('tmp')); if (array_to_csv($liste, $GLOBALS['TMP_PATH'].'/'.$tmpname, $captions)) { @@ -488,9 +497,9 @@ class Admission_CoursesetController extends AuthenticatedController $max_count[] = count($courses); $c++; } - $captions = [_("Nutzername"), _("Vorname"), _("Nachname"), _("E-Mail")]; + $captions = [_('Nutzername'), _('Vorname'), _('Nachname'), _('E-Mail')]; foreach (range(1,max($max_count)) as $num) { - $captions[] = _("Veranstaltung") . ' ' . $num; + $captions[] = _('Veranstaltung') . ' ' . $num; } if (count($liste)) { $tmpname = md5(uniqid('tmp')); @@ -535,7 +544,7 @@ class Admission_CoursesetController extends AuthenticatedController } } if ($ok) { - PageLayout::postMessage(MessageBox::success(_("Die zugeordneten Veranstaltungen wurden konfiguriert."))); + PageLayout::postSuccess(_('Die zugeordneten Veranstaltungen wurden konfiguriert.')); } $this->redirect($this->url_for('admission/courseset/configure/' . $courseset->getId())); return; @@ -586,7 +595,6 @@ class Admission_CoursesetController extends AuthenticatedController ); }; foreach ($users as $user) { - $row = []; $app_courses = $applicants[$user->id]; asort($app_courses); @@ -638,7 +646,7 @@ class Admission_CoursesetController extends AuthenticatedController )); } - function copy_action($set_id) + public function copy_action($set_id) { $courseset = new CourseSet($set_id); $cloned_courseset = clone $courseset; @@ -650,10 +658,16 @@ class Admission_CoursesetController extends AuthenticatedController $rule->setDistributionTime(strtotime('+1 month 23:59')); $rule->store(); $cloned_courseset->setAlgorithmRun(false); - PageLayout::postMessage(MessageBox::info(sprintf(_("Bitte passen Sie das Datum der automatischen Platzverteilung an, es wurde automatisch auf %s festgelegt!"), strftime('%x %X', $rule->getDistributiontime())))); + PageLayout::postInfo(sprintf( + _('Bitte passen Sie das Datum der automatischen Platzverteilung an, es wurde automatisch auf %s festgelegt!'), + strftime('%x %X', $rule->getDistributiontime()) + )); } } else if ($rule->getEndTime() && $rule->getEndTime() < time()) { - PageLayout::postMessage(MessageBox::info(sprintf(_("Der Gültigkeitszeitraum der Regel %s endet in der Vergangenheit!"), htmlReady($rule->getName())))); + PageLayout::postInfo(sprintf( + _('Der Gültigkeitszeitraum der Regel %s endet in der Vergangenheit!'), + htmlReady($rule->getName()) + )); } } $this->redirect(URLHelper::getURL('dispatch.php/admission/courseset/configure/' . @@ -665,10 +679,8 @@ class Admission_CoursesetController extends AuthenticatedController * * @param String $seminare_condition SQL condition */ - function get_courses($seminare_condition) + public function get_courses($seminare_condition) { - global $perm, $user; - list($institut_id, $all) = explode('_', $this->current_institut_id); // Prepare count statements $query = "SELECT count(*) @@ -691,7 +703,7 @@ class Admission_CoursesetController extends AuthenticatedController INNER JOIN courseset_rule csr ON csr.set_id=seminar_courseset.set_id AND csr.type='ParticipantRestrictedAdmission' INNER JOIN seminare ON seminar_courseset.seminar_id=seminare.seminar_id "; - if ($institut_id == 'all' && $perm->have_perm('root')) { + if ($institut_id === 'all' && $GLOBALS['perm']->have_perm('root')) { $sql .= "WHERE 1 {$seminare_condition} "; } elseif ($all == 'all') { $sql .= "INNER JOIN Institute USING (Institut_id) @@ -707,7 +719,7 @@ class Admission_CoursesetController extends AuthenticatedController $statement = DBManager::get()->prepare($sql); $statement->execute($parameters); - + $ret = []; while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { $seminar_id = $row['seminar_id']; $ret[$seminar_id] = $row; diff --git a/app/controllers/admission/rule.php b/app/controllers/admission/rule.php index 205e1a0..a8fd05e 100644 --- a/app/controllers/admission/rule.php +++ b/app/controllers/admission/rule.php @@ -96,13 +96,13 @@ class Admission_RuleController extends AuthenticatedController $this->rule = new $ruleType($ruleId); $requestData = Request::getInstance(); // Check for start and end date and parse the String values to timestamps. - if ($requestData['start_date'] ) { + if (!empty($requestData['start_date'])) { $parsed = date_parse($requestData['start_date']); $timestamp = mktime($parsed['hour'], $parsed['minute'], 0, $parsed['month'], $parsed['day'], $parsed['year']); $requestData['start_time'] = $timestamp; } - if ($requestData['end_date'] ) { + if (!empty($requestData['end_date'])) { $parsed = date_parse($requestData['end_date']); $timestamp = mktime($parsed['hour'], $parsed['minute'], 0, $parsed['month'], $parsed['day'], $parsed['year']); diff --git a/app/controllers/course/forum/index.php b/app/controllers/course/forum/index.php index 02e2e9a..9748461 100644 --- a/app/controllers/course/forum/index.php +++ b/app/controllers/course/forum/index.php @@ -121,6 +121,9 @@ class Course_Forum_IndexController extends ForumController if (!empty($list['list'])) { // append the remaining entries to the standard category + if (!isset($new_list[$this->getId()])) { + $new_list[$this->getId()] = []; + } $new_list[$this->getId()] = array_merge((array)$new_list[$this->getId()], $list['list']); } diff --git a/app/controllers/course/room_requests.php b/app/controllers/course/room_requests.php index 1cc3796..9a46948 100644 --- a/app/controllers/course/room_requests.php +++ b/app/controllers/course/room_requests.php @@ -151,10 +151,10 @@ class Course_RoomRequestsController extends AuthenticatedController { $result = null; if ($request_id) { - if (!$_SESSION['course_room_request']) { + if (!isset($_SESSION['course_room_request'])) { $_SESSION['course_room_request'] = []; } - if (!$_SESSION['course_room_request'][$request_id]) { + if (!isset($_SESSION['course_room_request'][$request_id])) { $_SESSION['course_room_request'][$request_id] = []; } $result =& $_SESSION['course_room_request'][$request_id]; @@ -235,14 +235,14 @@ class Course_RoomRequestsController extends AuthenticatedController } if ($step >= 3) { if ($this->category) { - $this->selected_properties = $session_data['selected_properties']; + $this->selected_properties = $session_data['selected_properties'] ?? []; } } if ($step >= 4) { - $this->seats = $session_data['selected_properties']['seats']; - $this->comment = $session_data['comment']; - $this->reply_lecturers = $session_data['reply_lecturers']; - $this->preparation_time = $session_data['preparation_time']; + $this->seats = $session_data['selected_properties']['seats'] ?? '0'; + $this->comment = $session_data['comment']?? ''; + $this->reply_lecturers = $session_data['reply_lecturers'] ?? ''; + $this->preparation_time = $session_data['preparation_time'] ?? ''; } } @@ -814,7 +814,7 @@ class Course_RoomRequestsController extends AuthenticatedController $this->request = RoomRequest::find($this->request_id); $selected_room = null; $this->seats = null; - if (($this->request instanceof RoomRequest) && !$session_data['request_id']) { + if (($this->request instanceof RoomRequest) && !isset($session_data['request_id'])) { //It is an existing request that hasn't been modified yet. //Load its data directly. if ($this->request->resource_id) { diff --git a/app/controllers/resources/room_request.php b/app/controllers/resources/room_request.php index 050cf17..300078e 100644 --- a/app/controllers/resources/room_request.php +++ b/app/controllers/resources/room_request.php @@ -382,7 +382,7 @@ class Resources_RoomRequestController extends AuthenticatedController } } } - array_unique($interval_weekdays); + $interval_weekdays = array_unique($interval_weekdays); //We have all relevant weekdays and can now check //if the time interval lies in one of the relevant weekdays: foreach ($interval_weekdays as $iwd) { @@ -397,12 +397,12 @@ class Resources_RoomRequestController extends AuthenticatedController } } } - if ($this->filter['get_only_request_ids']) { + if (!empty($this->filter['get_only_request_ids'])) { return array_keys($result); } } else { $result = $requests; - if ($this->filter['get_only_request_ids']) { + if (!empty($this->filter['get_only_request_ids'])) { return SimpleCollection::createFromArray($requests)->pluck('id'); } } @@ -800,8 +800,8 @@ class Resources_RoomRequestController extends AuthenticatedController ); $this->requests = $requests; $this->page = $page; - $this->sort_order = $this->filter['sort_order']; - $this->sort_var = $this->filter['sorting']; + $this->sort_order = $this->filter['sort_order'] ?? ''; + $this->sort_var = $this->filter['sorting']?? ''; $this->request_status = $this->filter['request_status'] ?? ''; } diff --git a/app/controllers/tour.php b/app/controllers/tour.php index 54dfeff..a288ab2 100644 --- a/app/controllers/tour.php +++ b/app/controllers/tour.php @@ -89,7 +89,7 @@ class TourController extends AuthenticatedController } $data['route_step_nr'] = $first_step; $next_first_step = $first_step; - while ($this->route === $this->tour->steps[$next_first_step - 1]->route) { + while (isset($this->tour->steps[$next_first_step - 1]) && $this->route === $this->tour->steps[$next_first_step - 1]->route) { $data['data'][] = [ 'step_nr' => $this->tour->steps[$next_first_step - 1]->step, 'element' => $this->tour->steps[$next_first_step - 1]->css_selector, diff --git a/app/controllers/userfilter/field.php b/app/controllers/userfilter/field.php index 85dd0be..937f520 100644 --- a/app/controllers/userfilter/field.php +++ b/app/controllers/userfilter/field.php @@ -37,8 +37,10 @@ class Userfilter_FieldController extends AuthenticatedController { $this->conditionFields = UserFilterField::getAvailableFilterFields(); if ($className = Request::option('fieldtype')) { - list($fieldType, $param) = explode('_', $className); $this->className = $className; + $parts = explode('_', $className); + $fieldType = $parts[0]; + $param = $parts[1] ?? null; $this->field = new $fieldType($param); } } diff --git a/app/controllers/userfilter/filter.php b/app/controllers/userfilter/filter.php index 5987b69..87a7d87 100644 --- a/app/controllers/userfilter/filter.php +++ b/app/controllers/userfilter/filter.php @@ -54,11 +54,12 @@ class Userfilter_FilterController extends AuthenticatedController $fields = Request::getArray('field'); $compareOps = Request::getArray('compare_operator'); $values = Request::getArray('value'); - $data = []; for ($i=0 ; $iconditionFields[$current]) { - list($fieldType, $param) = explode('_', $current); + $parts = explode('_', $current); + $fieldType = $parts[0]; + $param = $parts[1] ?? null; $field = new $fieldType($param); $field->setCompareOperator($compareOps[$i]); $field->setValue($values[$i]); diff --git a/app/views/admission/courseset/configure.php b/app/views/admission/courseset/configure.php index 0a632f9..99919ef 100644 --- a/app/views/admission/courseset/configure.php +++ b/app/views/admission/courseset/configure.php @@ -109,8 +109,12 @@ if ($flash['error']) {
diff --git a/app/views/admission/courseset/configure_courses.php b/app/views/admission/courseset/configure_courses.php index 6048724..e80e621 100644 --- a/app/views/admission/courseset/configure_courses.php +++ b/app/views/admission/courseset/configure_courses.php @@ -2,20 +2,20 @@ - - - - - + + + + + - + - - + + - - - + + + @@ -34,7 +34,7 @@ - +
type="text" size="2" name="configure_courses_turnout[id?>]" value="admission_turnout ?>"> getNumParticipants() ?>id]['c'],$applications[$course->id]['h']) ?>id]['c'] ?? 0 , $applications[$course->id]['h'] ?? 0) ?> type="checkbox" name="configure_courses_disable_waitlist[id?>]" value="1" admission_disable_waitlist ? '' : 'checked' ?> @@ -64,7 +64,7 @@ "> - asImg()?> + @@ -72,13 +72,13 @@ "> - asImg()?> +
- - url_for('admission/courseset/configure_courses/' . $set_id .'/csv')) ?> + + url_for('admission/courseset/configure_courses/' . $set_id .'/csv')) ?>
diff --git a/app/views/admission/courseset/institutes.php b/app/views/admission/courseset/institutes.php index 865e61e..c22f21f 100644 --- a/app/views/admission/courseset/institutes.php +++ b/app/views/admission/courseset/institutes.php @@ -1,6 +1,9 @@ - _('Einrichtung hinzufügen')])->asImg(16, ["alt" => _('Einrichtung hinzufügen'), "onclick" => "STUDIP.Admission.updateInstitutes($('input[name=\"institute_id\"]').val(), '".$controller->url_for('admission/courseset/institutes',$courseset?$courseset->getId():'')."', '".$controller->url_for('admission/courseset/instcourses',$courseset?$courseset->getId():'')."', 'add')"]) ?> +asImg([ + 'title' => _('Einrichtung hinzufügen'), + 'onclick' => "STUDIP.Admission.updateInstitutes($('input[name=\"institute_id\"]').val(), '" . $controller->url_for('admission/courseset/institutes', !empty($courseset) ? $courseset->getId() : '') . "', '" . $controller->url_for('admission/courseset/instcourses', !empty($courseset) ? $courseset->getId() : '') . "', 'add')", +]) ?> - _("Suche starten")])->asImg()?> + _("Suche starten")]) ?>
    orderBy('Name') as $institute => $data) { ?> @@ -9,9 +12,12 @@ - _('Einrichtung entfernen')])->asImg(16, ["onclick" => "STUDIP.Admission.updateInstitutes('".$institute."', '".$controller->url_for('admission/courseset/institutes',$institute)."', '".$controller->url_for('admission/courseset/instcourses',$institute)."', 'delete')"]); ?> + asImg([ + 'title' => _('Einrichtung entfernen'), + 'onclick' => "STUDIP.Admission.updateInstitutes('{$institute}', '" . $controller->url_for('admission/courseset/institutes',$institute) . "', '" . $controller->url_for('admission/courseset/instcourses',$institute)."', 'delete')" + ]); ?> -
\ No newline at end of file + diff --git a/app/views/course/details/index.php b/app/views/course/details/index.php index 0e82494..2e3a1a9 100644 --- a/app/views/course/details/index.php +++ b/app/views/course/details/index.php @@ -315,7 +315,7 @@
getDatesTemplate( 'dates/seminar_html_location', - ['ort' => $course->ort, 'disable_list_shrinking' => true] + ['ort' => $course->ort, 'disable_list_shrinking' => true, 'show_room' => false] ) ?>
diff --git a/app/views/course/forum/index/_threads.php b/app/views/course/forum/index/_threads.php index d2fad26..f09cee2 100644 --- a/app/views/course/forum/index/_threads.php +++ b/app/views/course/forum/index/_threads.php @@ -100,7 +100,7 @@ condition(isset($entry['last_posting'])) ->addLink( - isset($entry['last_posting']) ? $controller->url_for("course/forum/index/index/{$entry['last_posting']['topic_id']}#{$entry['last_posting']['topic_id']}") : '#no_posting', + isset($entry['last_posting']['topic_id']) ? $controller->url_for("course/forum/index/index/{$entry['last_posting']['topic_id']}#{$entry['last_posting']['topic_id']}") : '#no_posting', _('Zur letzten Antwort'), Icon::create('forum'), ['class' => 'hidden-small-up'] diff --git a/app/views/course/forum/index/index.php b/app/views/course/forum/index/index.php index 6c321a5..a39d3a3 100644 --- a/app/views/course/forum/index/index.php +++ b/app/views/course/forum/index/index.php @@ -41,7 +41,7 @@ if ($section == 'index') { $abo_url = $controller->url_for('course/forum/index/abo/' . $constraint['topic_id']); endif; - $actions->addLink($abo_text, $abo_url, Icon::create('link-intern', 'clickable')); + $actions->addLink($abo_text, $abo_url, Icon::create('link-intern')); } if (ForumPerm::has('close_thread', $seminar_id) && $constraint['depth'] > 1) { @@ -51,7 +51,7 @@ if ($section == 'index') { $close = new LinkElement( _('Thema schließen'), $close_url, - Icon::create('lock-locked', 'clickable'), + Icon::create('lock-locked'), [ 'onclick' => 'STUDIP.Forum.closeThreadFromThread(\'' . $constraint['topic_id'] . '\', ' . ForumHelpers::getPage() . '); return false;', @@ -65,7 +65,7 @@ if ($section == 'index') { $open = new LinkElement( _('Thema öffnen'), $open_url, - Icon::create('lock-unlocked', 'clickable'), + Icon::create('lock-unlocked'), [ 'onclick' => 'STUDIP.Forum.openThreadFromThread(\'' . $constraint['topic_id'] . '\', ' . ForumHelpers::getPage() . '); return false;', @@ -83,7 +83,7 @@ if ($section == 'index') { $emphasize = new LinkElement( _('Thema hervorheben'), $emphasize_url, - Icon::create('staple', 'clickable'), + Icon::create('staple'), [ 'onclick' => 'STUDIP.Forum.makeThreadStickyFromThread(\'' . $constraint['topic_id'] . '\', ' . ForumHelpers::getPage() . '); return false;', @@ -97,7 +97,7 @@ if ($section == 'index') { $emphasize = new LinkElement( _('Hervorhebung aufheben'), $unemphasize_url, - Icon::create('staple', 'clickable'), + Icon::create('staple'), [ 'onclick' => 'STUDIP.Forum.makeThreadUnstickyFromThread(\'' . $constraint['topic_id'] . '\', ' . ForumHelpers::getPage() . '); return false;', @@ -109,7 +109,7 @@ if ($section == 'index') { } if ($constraint['depth'] == 0 && ForumPerm::has('add_category', $seminar_id)) { - $actions->addLink(_('Neue Kategorie erstellen'), "#create", Icon::create('link-intern', 'clickable')); + $actions->addLink(_('Neue Kategorie erstellen'), "#create", Icon::create('link-intern')); } } @@ -119,7 +119,7 @@ if ($section === 'index' && ForumPerm::has('pdfexport', $seminar_id)) { $export = new ExportWidget(); $export->addLink(_('Beiträge als PDF exportieren'), $controller->url_for('course/forum/index/pdfexport/' . $constraint['topic_id']), - Icon::create('file-pdf', 'clickable')); + Icon::create('file-pdf')); $sidebar->addWidget($export); } @@ -243,7 +243,7 @@ $pagechooser = null; seminar_id)) - || ($constraint['depth'] >= 1 && ForumPerm::has('add_entry', $seminar_id)) ): ?> + || (isset($constraint['depth']) && $constraint['depth'] >= 1 && ForumPerm::has('add_entry', $seminar_id)) ): ?> render_partial('course/forum/index/_new_entry') ?> diff --git a/app/views/course/room_requests/request_summary.php b/app/views/course/room_requests/request_summary.php index 8f8c703..4108deb 100644 --- a/app/views/course/room_requests/request_summary.php +++ b/app/views/course/room_requests/request_summary.php @@ -10,7 +10,7 @@
- + + render_partial( '../../templates/resources/position_attribute_form_part.php', [ 'property_name' => 'geo_coordinates', - 'latitude' => $latitude, - 'longitude' => $longitude, - 'altitude' => $altitude + 'latitude' => $latitude ?? null, + 'longitude' => $longitude ?? null, + 'altitude' => $altitude ?? null ] ) ?>
diff --git a/app/views/userfilter/field/configure.php b/app/views/userfilter/field/configure.php index e41c782..d50d39a 100644 --- a/app/views/userfilter/field/configure.php +++ b/app/views/userfilter/field/configure.php @@ -1,4 +1,4 @@ - + getValidCompareOperators()) > 1) : ?> - ' . _("und") . '' : '')?> + ' . _("und") . '' : '')?>