diff options
| author | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2025-04-01 09:07:31 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2025-04-01 11:29:23 +0200 |
| commit | 4f51dbd6d94bdce0f3de04d8a7c45a5dc6dc708e (patch) | |
| tree | ea524b2f416ac68c2af5166bccd159c520132d5c /app | |
| parent | 91586ec7429cab5713303544b3923d43b492e90f (diff) | |
prevent php8 warnings, fixes #5441
Closes #5441
Merge request studip/studip!4084
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/search/studiengaenge.php | 2 | ||||
| -rw-r--r-- | app/views/admission/institute-select.php | 10 | ||||
| -rw-r--r-- | app/views/settings/statusgruppen/_optgroup.php | 2 | ||||
| -rw-r--r-- | app/views/settings/statusgruppen/_options.php | 10 | ||||
| -rw-r--r-- | app/views/shared/download/mhb.php | 15 | ||||
| -rw-r--r-- | app/views/shared/modul/_modullvs.php | 4 |
6 files changed, 19 insertions, 24 deletions
diff --git a/app/controllers/search/studiengaenge.php b/app/controllers/search/studiengaenge.php index e353437..fcd77fa 100644 --- a/app/controllers/search/studiengaenge.php +++ b/app/controllers/search/studiengaenge.php @@ -524,7 +524,7 @@ class Search_StudiengaengeController extends MVVController foreach ($this->semesters as $sem) { $options[$sem['semester_id']] = $sem['name']; } - $widget->setOptions($options, $this->active_sem->id); + $widget->setOptions($options, $this->active_sem->id ?? null); $widget->setMaxLength(100); $sidebar->addWidget($widget, 'sem_filter'); } diff --git a/app/views/admission/institute-select.php b/app/views/admission/institute-select.php index 7453b5e..ed2df3f 100644 --- a/app/views/admission/institute-select.php +++ b/app/views/admission/institute-select.php @@ -13,10 +13,12 @@ <?= htmlReady(my_substr($institute["name"] . ' (' . $institute["count"] . ')',0,100));?> </option> <? if ($institute['is_fak'] === 'all') : ?> - <? $num_inst = $institute['num_inst']; for ($i = 0; $i < $num_inst; ++$i) : ?> - <? - $institute = next($institutes); - $institut_id = key($institutes); + <? $num_inst = $institute['num_inst']; + for ($i = 0; $i < $num_inst; ++$i): + $institute = next($institutes); + $institut_id = key($institutes); + + if (!$institute) continue; ?> <option value="<?= $institut_id?>" <?=($current_institut_id == $institut_id ? 'selected' : '')?> class="nested-item"> <?= htmlReady(my_substr($institute['name'] . ' (' . $institute['count'] . ')',0,100));?> diff --git a/app/views/settings/statusgruppen/_optgroup.php b/app/views/settings/statusgruppen/_optgroup.php index 2bd3be9..1aabdaa 100644 --- a/app/views/settings/statusgruppen/_optgroup.php +++ b/app/views/settings/statusgruppen/_optgroup.php @@ -4,7 +4,7 @@ <optgroup label="<?= htmlReady(mb_substr($row['Name'], 0, 70)) ?>"> <?= $this->render_partial('settings/statusgruppen/_options', ['data' => $row['groups']]) ?> </optgroup> -<? if ($row['sub']): ?> +<? if (!empty($row['sub'])): ?> <?= $this->render_partial('settings/statusgruppen/_optgroup', ['data' => $row['sub']]) ?> <? endif; ?> <? endforeach; ?> diff --git a/app/views/settings/statusgruppen/_options.php b/app/views/settings/statusgruppen/_options.php index 1115564..6f66b03 100644 --- a/app/views/settings/statusgruppen/_options.php +++ b/app/views/settings/statusgruppen/_options.php @@ -1,5 +1,11 @@ -<? if (!$data) return; ?> - +<?php +if (!$data) { + return; +} +if (!isset($level)) { + $level = 0; +} +?> <? foreach ($data as $id => $row): ?> <option value="<?= $id ?>" <? if ($row['user_there']) echo 'disabled'; ?>> <? for ($i = 1; $i <= $level; $i++): ?> diff --git a/app/views/shared/download/mhb.php b/app/views/shared/download/mhb.php index 59a45f8..3b5057b 100644 --- a/app/views/shared/download/mhb.php +++ b/app/views/shared/download/mhb.php @@ -43,20 +43,7 @@ </h3>
<h5 style="text-align: right"><?= sprintf(_('Datum %s'), strftime('%x', time()))?></h5>
<? else: ?>
- <h3>Modules for
- <? if (!is_null($StgteilVersion->studiengangteil->fach->name)
- && strlen($StgteilVersion->studiengangteil->fach->name) > 0) : ?>
- <?= htmlReady($StgteilVersion->studiengangteil->fach->name) ?>
- <? if (count($StgteilVersion->studiengangteil->studiengang) > 0) : ?>
- <? if (!is_null($StgteilVersion->studiengangteil->studiengang->zusatz)
- && strlen($StgteilVersion->studiengangteil->studiengang->zusatz) > 0) : ?>
- <?= htmlReady($StgteilVersion->studiengangteil->studiengang->zusatz) ?>
- <? endif; ?>
- <? endif; ?>
- <? else : ?>
- <?= $StgteilVersion->studiengangteil->getDisplayName() ?>
- <? endif; ?>
- </h3>
+ <h3>Modules for <?= $StgteilVersion->studiengangteil->getDisplayName() ?></h3>
<h6 style="text-align: right">Date <?= strftime('%x', time())?></h6>
<? endif; ?>
<? foreach($module as $part_id => $values) : ?>
diff --git a/app/views/shared/modul/_modullvs.php b/app/views/shared/modul/_modullvs.php index fb62dc8..c2fc775 100644 --- a/app/views/shared/modul/_modullvs.php +++ b/app/views/shared/modul/_modullvs.php @@ -39,7 +39,7 @@ <? if (!empty($show_synopse)) : ?> <tr data-mvv-id="<?= $modulTeil->getId(); ?>" data-mvv-type="modulteil"> <td data-mvv-field="mvv_modulteil.nummer mvv_modulteil.num_bezeichnung"><strong><?= htmlReady($name_kurz) ?></strong></td> - <td data-mvv-field="mvv_modulteil.lernlehrform"><?= $GLOBALS['MVV_MODULTEIL']['LERNLEHRFORM']['values'][$modulTeil->lernlehrform]['name'] ?></td> + <td data-mvv-field="mvv_modulteil.lernlehrform"><?= $GLOBALS['MVV_MODULTEIL']['LERNLEHRFORM']['values'][$modulTeil->lernlehrform]['name'] ?? '' ?></td> <td data-mvv-field="mvv_modulteil_deskriptor.bezeichnung"><?= htmlReady($modulTeilDeskriptor->bezeichnung) ?></td> <td style="text-align: right;" data-mvv-field="mvv_modulteil.sws"><?= htmlReady($modulTeil->sws) ?: '' ?></td> <td style="text-align: right;" data-mvv-field="mvv_modulteil.wl_praesenz mvv_modulteil_deskriptor.kommentar_wl_praesenz"><?= $modulTeil->wl_praesenz ?> <?= MVVController::trim($modulTeilDeskriptor->kommentar_wl_praesenz) ? sprintf(' (%s)', formatReady($modulTeilDeskriptor->kommentar_wl_praesenz)) : '' ?></td> @@ -51,7 +51,7 @@ <? else : ?> <tr data-mvv-id="<?= $modulTeil->getId(); ?>" data-mvv-type="modulteil"> <td data-mvv-field="mvv_modulteil.nummer mvv_modulteil.num_bezeichnung"><strong><?= htmlReady($name_kurz) ?></strong></td> - <td data-mvv-field="mvv_modulteil.lernlehrform"><?= $GLOBALS['MVV_MODULTEIL']['LERNLEHRFORM']['values'][$modulTeil->lernlehrform]['name'] ?></td> + <td data-mvv-field="mvv_modulteil.lernlehrform"><?= $GLOBALS['MVV_MODULTEIL']['LERNLEHRFORM']['values'][$modulTeil->lernlehrform]['name'] ?? '' ?></td> <td data-mvv-field="mvv_modulteil_deskriptor.bezeichnung"><?= htmlReady($modulTeilDeskriptor->bezeichnung) ?></td> <td style="text-align: right;" data-mvv-field="mvv_modulteil.sws"><?= htmlReady($modulTeil->sws) ?: '' ?></td> <td style="text-align: right;" data-mvv-field="mvv_modulteil.wl_praesenz mvv_modulteil_deskriptor.kommentar_wl_praesenz"><?= $modulTeil->wl_praesenz ?> <?= MVVController::trim($modulTeilDeskriptor->kommentar_wl_praesenz) ? tooltipIcon(formatReady($modulTeilDeskriptor->kommentar_wl_praesenz)) : '' ?></td> |
