From 086864d456cb0e1bab8d3394ca9aa3b8b9eddaed Mon Sep 17 00:00:00 2001 From: Jan-Hendrik Willms Date: Tue, 9 Apr 2024 14:44:19 +0000 Subject: fixes #3978 Closes #3978 Merge request studip/studip!2828 --- lib/classes/ModulesNotification.class.php | 19 ++++++++++--------- templates/mail/notification_html.php | 2 +- templates/mail/notification_text.php | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/classes/ModulesNotification.class.php b/lib/classes/ModulesNotification.class.php index 3ee6642..f414071 100644 --- a/lib/classes/ModulesNotification.class.php +++ b/lib/classes/ModulesNotification.class.php @@ -126,7 +126,8 @@ class ModulesNotification $navigation = MyRealmModel::getAdditionalNavigations($seminar_id, $s_data, null, $user_id, $visit_data[$seminar_id]); $n_data = []; foreach ($this->registered_notification_modules as $id => $m_data) { - if (in_array($id, $s_data['notification']) + if ( + in_array($id, $s_data['notification']) && isset($navigation[$id]) && $navigation[$id]->getImage() && $navigation[$id]->getImage()->getRole() === Icon::ROLE_ATTENTION @@ -168,14 +169,14 @@ class ModulesNotification $base_url = URLHelper::setBaseURL(''); URLHelper::setBaseURl($base_url); if ($nav instanceof Navigation && $nav->isVisible(true)) { - $url = 'seminar_main.php?again=yes&auswahl=' . $seminar_id . '&redirect_to=' . strtr($nav->getURL(), '?', '&'); - $icon = $nav->getImage(); - $text = $nav->getTitle(); - if (!$text) { - $text = $this->registered_notification_modules[$id]['name']; - } - $text .= ' - ' . $nav->getLinkAttributes()['title']; - return compact('text', 'url', 'icon', 'seminar_id'); + $url = 'seminar_main.php?again=yes&auswahl=' . $seminar_id . '&redirect_to=' . strtr($nav->getURL(), '?', '&'); + $icon = $nav->getImage(); + $text = $nav->getTitle(); + if (!$text) { + $text = $this->registered_notification_modules[$id]['name']; } + $text .= ' - ' . $nav->getLinkAttributes()['title']; + return compact('text', 'url', 'icon', 'seminar_id'); + } } } diff --git a/templates/mail/notification_html.php b/templates/mail/notification_html.php index 48f4cef..d046cb2 100644 --- a/templates/mail/notification_html.php +++ b/templates/mail/notification_html.php @@ -94,7 +94,7 @@ $data) : ?> - + semester_text) ? ' ('.$semester.')' : '') ?> diff --git a/templates/mail/notification_text.php b/templates/mail/notification_text.php index bac0d5e..47b8a4a 100644 --- a/templates/mail/notification_text.php +++ b/templates/mail/notification_text.php @@ -14,7 +14,7 @@ $data) : ?> - 'yes', 'sso' => $sso, 'auswahl' => $data[0]['range_id']]) ?> + 'yes', 'sso' => $sso, 'auswahl' => $data[0]['seminar_id']]) ?> -- cgit v1.0