diff --git a/lib/classes/ModulesNotification.class.php b/lib/classes/ModulesNotification.class.php index 324b5c5d61ade3d8d3a7569c94a5540fdffa3292..239317a009807670f11f185c7f7002a16fe5be4d 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 @@ -165,14 +166,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 5060fb7452de147f04fe33d0201851b6019783e1..202a85722ba34fbff14c2101ba85b17e66712b10 100644 --- a/templates/mail/notification_html.php +++ b/templates/mail/notification_html.php @@ -22,7 +22,7 @@ <? foreach ($news as $sem_titel => $data) : ?> <tr class="table_header_bold"> <td colspan="2" style="font-weight: bold;"> - <a href="<?= URLHelper::getLink('seminar_main.php', ['again' => 'yes', 'sso' => $sso, 'auswahl' => $data[0]['range_id']]) ?>"> + <a href="<?= URLHelper::getLink('seminar_main.php', ['again' => 'yes', 'sso' => $sso, 'auswahl' => $data[0]['seminar_id']]) ?>"> <?= htmlReady($sem_titel) ?> <?= (($semester = get_semester($data[0]['range_id'])) ? ' ('.$semester.')' : '') ?> </a> diff --git a/templates/mail/notification_text.php b/templates/mail/notification_text.php index bac0d5ede2e8846feaa8300ee7d2e565f07901e8..47b8a4aaf85eb1c4658ca2e6ffe035f5c7b3c509 100644 --- a/templates/mail/notification_text.php +++ b/templates/mail/notification_text.php @@ -14,7 +14,7 @@ <? foreach ($news as $sem_titel => $data) : ?> <?= sprintf(_("In der Veranstaltung \"%s\" gibt es folgende Neuigkeiten:"), $sem_titel) ?> -<?= URLHelper::getURL('seminar_main.php', ['again' => 'yes', 'sso' => $sso, 'auswahl' => $data[0]['range_id']]) ?> +<?= URLHelper::getURL('seminar_main.php', ['again' => 'yes', 'sso' => $sso, 'auswahl' => $data[0]['seminar_id']]) ?> <? foreach ($data as $module) : ?>