aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan-Hendrik Willms <tleilax+studip@gmail.com>2025-02-04 12:13:16 +0000
committerJan-Hendrik Willms <tleilax+studip@gmail.com>2025-02-04 12:13:16 +0000
commite66f6ea0812529be0b41662a0ecd67be70e8ed05 (patch)
treed5d2c9028e11776d1e81991c893d03983c7b35fd
parentcc3f93aa5c0c0fd28ffde4eb700670c42c2e1101 (diff)
prevent more php8 warnings, fixes #5216
Closes #5216 Merge request studip/studip!3909
-rw-r--r--app/controllers/module/module.php2
-rw-r--r--app/controllers/studiengaenge/shared_version.php2
-rw-r--r--app/views/shared/modul/_modullvs.php2
-rw-r--r--app/views/studiengaenge/studiengangteile/index.php2
-rw-r--r--app/views/studiengaenge/versionen/abschnitte.php2
-rw-r--r--app/views/studiengaenge/versionen/details_abschnitt.php2
-rw-r--r--lib/classes/exportdocument/ExportPDF.php4
-rw-r--r--templates/blubber/_tagcloud.php11
8 files changed, 17 insertions, 10 deletions
diff --git a/app/controllers/module/module.php b/app/controllers/module/module.php
index 7b862d4..cbcba00 100644
--- a/app/controllers/module/module.php
+++ b/app/controllers/module/module.php
@@ -1335,7 +1335,7 @@ class Module_ModuleController extends MVVController
$this->reset_page();
// responsible Institutes
$this->filter['mvv_modul_inst.gruppe'] = 'hauptverantwortlich';
- if (!$this->filter['mvv_modul_inst.institut_id']) {
+ if (empty($this->filter['mvv_modul_inst.institut_id'])) {
// only institutes the user has an assigned MVV role
$this->filter['mvv_modul_inst.institut_id'] = MvvPerm::getOwnInstitutes();
}
diff --git a/app/controllers/studiengaenge/shared_version.php b/app/controllers/studiengaenge/shared_version.php
index 98d09a9..1607ce7 100644
--- a/app/controllers/studiengaenge/shared_version.php
+++ b/app/controllers/studiengaenge/shared_version.php
@@ -554,7 +554,7 @@ abstract class SharedVersionController extends MVVController
$status = Request::optionArray('status');
$is_modified = false;
foreach (array_keys(Request::intArray('fachsemester')) as $i) {
- if ($fachsem[$i]) {
+ if (isset($fachsem[$i])) {
$fachsem[$i]->differenzierung = $status[$i];
$is_modified = $fachsem[$i]->isDirty();
$fachsem[$i]->store();
diff --git a/app/views/shared/modul/_modullvs.php b/app/views/shared/modul/_modullvs.php
index 07c6c17..fb62dc8 100644
--- a/app/views/shared/modul/_modullvs.php
+++ b/app/views/shared/modul/_modullvs.php
@@ -18,7 +18,7 @@
<? $modulSumme = 0; ?>
<? $nummer_modulteil = 1; ?>
<? foreach ($modul->modulteile as $modulTeil): ?>
- <? $modulTeilDeskriptor = $modulTeil->getDeskriptor($display_language);
+ <? $modulTeilDeskriptor = $modulTeil->getDeskriptor($display_language ?? null);
// Für die Kenntlichmachung der Modulteile in Listen die Nummer des
// Modulteils und den ausgewählten Namen verwenden.
// Ist keine Nummer vorhanden, dann Durchnummerieren und Standard-
diff --git a/app/views/studiengaenge/studiengangteile/index.php b/app/views/studiengaenge/studiengangteile/index.php
index 306f1c7..8cfa8c5 100644
--- a/app/views/studiengaenge/studiengangteile/index.php
+++ b/app/views/studiengaenge/studiengangteile/index.php
@@ -26,7 +26,7 @@
</thead>
<? if ($count) : ?>
<? foreach ($stgteile as $stgteil): ?>
- <tbody class="<?php if (!$stgteil->count_versionen) echo 'empty' ?> <?= $stgteil_id === $stgteil->id ? 'not-collapsed' : 'collapsed' ?>">
+ <tbody class="<?php if (!$stgteil->count_versionen) echo 'empty' ?> <?= isset($stgteil_id) && $stgteil_id === $stgteil->id ? 'not-collapsed' : 'collapsed' ?>">
<tr class="header-row">
<td class="toggle-indicator">
<? if ($stgteil->count_versionen) : ?>
diff --git a/app/views/studiengaenge/versionen/abschnitte.php b/app/views/studiengaenge/versionen/abschnitte.php
index d4decdd..79d3b5a 100644
--- a/app/views/studiengaenge/versionen/abschnitte.php
+++ b/app/views/studiengaenge/versionen/abschnitte.php
@@ -16,7 +16,7 @@
</colgroup>
<? foreach ($abschnitte as $abschnitt) : ?>
<tbody id="<?= $abschnitt->id ?>"
- class="<?= ($abschnitt_id === $abschnitt->id ? 'not-collapsed' : 'collapsed') ?><?= MvvPerm::haveFieldPermPosition($abschnitt, MvvPerm::PERM_WRITE) ? ' sort_items' : '' ?>">
+ class="<?= isset($abschnitt_id) && $abschnitt_id === $abschnitt->id ? 'not-collapsed' : 'collapsed' ?><?= MvvPerm::haveFieldPermPosition($abschnitt, MvvPerm::PERM_WRITE) ? ' sort_items' : '' ?>">
<tr class="header-row sort_item" id="abschnittt_<?= $abschnitt->id ?>">
<td class="toggle-indicator">
<a class="mvv-load-in-new-row"
diff --git a/app/views/studiengaenge/versionen/details_abschnitt.php b/app/views/studiengaenge/versionen/details_abschnitt.php
index 79f8da7..ed2f293 100644
--- a/app/views/studiengaenge/versionen/details_abschnitt.php
+++ b/app/views/studiengaenge/versionen/details_abschnitt.php
@@ -18,7 +18,7 @@
<col style="width: 1%">
</colgroup>
<? foreach ($assignments as $assignment) : ?>
- <tbody class="<?= count($assignment->modul->modulteile) ? '' : 'empty' ?> <?= ($modul_id == $assignment->modul->id ? 'not-collapsed' : 'collapsed') ?><?= MvvPerm::haveFieldPermPosition($assignment, MvvPerm::PERM_WRITE) ? ' sort_items' : '' ?>" id="<?= $assignment->id ?>">
+ <tbody class="<?= count($assignment->modul->modulteile) ? '' : 'empty' ?> <?= isset($modul_id) && $modul_id == $assignment->modul->id ? 'not-collapsed' : 'collapsed' ?><?= MvvPerm::haveFieldPermPosition($assignment, MvvPerm::PERM_WRITE) ? ' sort_items' : '' ?>" id="<?= $assignment->id ?>">
<tr id="modul_<?= $assignment->modul->id ?>" class="header-row sort_item">
<td class="toggle-indicator">
<? if (count($assignment->modul->modulteile)) : ?>
diff --git a/lib/classes/exportdocument/ExportPDF.php b/lib/classes/exportdocument/ExportPDF.php
index 1b2ec77..d9f57f9 100644
--- a/lib/classes/exportdocument/ExportPDF.php
+++ b/lib/classes/exportdocument/ExportPDF.php
@@ -13,7 +13,9 @@
* @category Stud.IP
*/
-define('K_PATH_IMAGES', $GLOBALS['STUDIP_BASE_PATH'] . '/public/assets/images/');
+if (!defined('K_PATH_IMAGES')) {
+ define('K_PATH_IMAGES', $GLOBALS['STUDIP_BASE_PATH'] . '/public/assets/images/');
+}
/**
* Class to create an PDF by putting in Stud.IP-formatted code.
diff --git a/templates/blubber/_tagcloud.php b/templates/blubber/_tagcloud.php
index 9147c3f..bbca6d0 100644
--- a/templates/blubber/_tagcloud.php
+++ b/templates/blubber/_tagcloud.php
@@ -1,7 +1,12 @@
-<? if (count($hashtags)) : ?>
+<?php
+/**
+ * @var array<string, int> $hashtags
+ */
+?>
+<? if (count($hashtags) > 0) : ?>
<div class="indented new_section">
<ol class="tagcloud">
- <? $highest_ranking = array_pop(array_reverse($hashtags)) ?>
+ <? $highest_ranking = max($hashtags); ?>
<? foreach ($hashtags as $tag => $count) : ?>
<?php $size = floor($count / $highest_ranking * 10) > 0 ? floor($count / $highest_ranking * 10) : 1 ?>
<li class="size<?= (int) $size ?>">
@@ -14,4 +19,4 @@
<? endforeach ?>
</ol>
</div>
-<? endif ?> \ No newline at end of file
+<? endif ?>