From 1e9f2810615f7b375e3133a9f8fbdbc767513978 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Wed, 2 Nov 2022 08:09:14 +0000
Subject: [PATCH] prevent php8-warnings, refs #1733
Merge request studip/studip!1128
---
app/controllers/admin/statusgroups.php | 2 +-
app/controllers/course/members.php | 2 +-
app/controllers/course/messenger.php | 2 +-
app/controllers/course/statusgroups.php | 16 +++++---
app/controllers/course/wizard.php | 4 +-
app/controllers/jsupdater.php | 37 ++++++++++--------
app/controllers/messages.php | 1 +
app/controllers/module/module.php | 3 +-
app/controllers/oer/admin.php | 3 +-
app/controllers/profile.php | 2 +-
app/controllers/shared/contacts.php | 6 ++-
.../studiengaenge/shared_version.php | 2 +
.../studiengaenge/studiengangteile.php | 5 ++-
app/views/admin/plugin/search.php | 2 +-
app/views/course/dates/index.php | 1 +
app/views/course/forum/index/_threads.php | 3 +-
app/views/course/forum/index/index.php | 2 +-
app/views/course/plus/index.php | 8 ++--
app/views/course/statusgroups/_member.php | 2 +-
app/views/course/statusgroups/getgroup.php | 10 ++---
.../steps/basicdata/index_studygroup.php | 8 ++--
app/views/files/_fileref_tr.php | 2 +-
app/views/files/_files_thead.php | 2 +-
app/views/module/module/modulteil_lvg.php | 1 -
app/views/settings/statusgruppen/index.php | 4 +-
app/views/shared/filter.php | 10 ++---
lib/classes/ForumActivity.php | 6 +--
.../coursewizardsteps/BasicDataWizardStep.php | 34 ++++++++---------
.../globalsearch/GlobalSearchCourses.php | 6 ++-
.../globalsearch/GlobalSearchCourseware.php | 2 +-
.../globalsearch/GlobalSearchMyCourses.php | 6 ++-
.../sidebar/SemesterSelectorWidget.php | 3 +-
lib/extern/lib/ExternConfig.class.php | 7 +++-
lib/extern/lib/ExternModule.class.php | 8 ++--
lib/filesystem/FileManager.php | 2 +-
lib/functions.php | 4 +-
lib/migrations/Migrator.php | 2 +-
lib/models/Folder.php | 38 +++++++++++--------
lib/models/OERHost.php | 4 +-
lib/wiki.inc.php | 1 +
templates/wiki/show.php | 2 +-
41 files changed, 153 insertions(+), 112 deletions(-)
diff --git a/app/controllers/admin/statusgroups.php b/app/controllers/admin/statusgroups.php
index aee95f93088..a75d97e3e52 100644
--- a/app/controllers/admin/statusgroups.php
+++ b/app/controllers/admin/statusgroups.php
@@ -61,7 +61,7 @@ class Admin_StatusgroupsController extends AuthenticatedController
{
$lockrule = LockRules::getObjectRule(Context::getId());
$this->is_locked = LockRules::Check(Context::getId(), 'groups');
- if ($lockrule->description && $this->is_locked) {
+ if ($lockrule && $lockrule->description && $this->is_locked) {
PageLayout::postMessage(MessageBox::info(formatLinks($lockrule->description)));
}
// Setup sidebar.
diff --git a/app/controllers/course/members.php b/app/controllers/course/members.php
index 09ed96c255f..16c59a3ed27 100644
--- a/app/controllers/course/members.php
+++ b/app/controllers/course/members.php
@@ -177,7 +177,7 @@ class Course_MembersController extends AuthenticatedController
PageLayout::postMessage(MessageBox::info(formatLinks($lockdata['description'])));
}
}
-
+ $this->to_waitlist_actions = false;
// Check for waitlist availability (influences available actions)
// People can be moved to waitlist if waitlist available and no automatic moving up.
if (!$sem->admission_disable_waitlist && $sem->admission_disable_waitlist_move
diff --git a/app/controllers/course/messenger.php b/app/controllers/course/messenger.php
index c00581ee60c..981a06fd978 100644
--- a/app/controllers/course/messenger.php
+++ b/app/controllers/course/messenger.php
@@ -39,7 +39,7 @@ class Course_MessengerController extends AuthenticatedController
$this->thread->markAsRead();
$this->thread_data = $this->thread->getJSONData();
-
+ $_SESSION['already_asked_for_avatar'] = false;
if (!Avatar::getAvatar($GLOBALS['user']->id)->is_customized() && !$_SESSION['already_asked_for_avatar']) {
$_SESSION['already_asked_for_avatar'] = true;
PageLayout::postInfo(sprintf(_("Wollen Sie ein Avatar-Bild nutzen? %sLaden Sie jetzt ein Bild hoch%s."), '<a href="'.URLHelper::getURL("dispatch.php/avatar/update/user/".$GLOBALS['user']->id).'" data-dialog>', '</a>'));
diff --git a/app/controllers/course/statusgroups.php b/app/controllers/course/statusgroups.php
index 46618e2fe47..e0ed12e65a4 100644
--- a/app/controllers/course/statusgroups.php
+++ b/app/controllers/course/statusgroups.php
@@ -137,13 +137,16 @@ class Course_StatusgroupsController extends AuthenticatedController
}
}
$groupdata['load'] = true;
+ } else {
+ $groupdata['load'] = false;
}
if (!$this->is_tutor && $g->userMayJoin($GLOBALS['user']->id)) {
- $groupdata['joinable'] = true;
$joinable = true;
+ } else {
+ $joinable = false;
}
-
+ $groupdata['joinable'] = $joinable;
$this->groups[] = $groupdata;
}
@@ -161,8 +164,8 @@ class Course_StatusgroupsController extends AuthenticatedController
"SELECT `statusgruppe_id` FROM `statusgruppen` WHERE `range_id` = ?",
[$this->course_id])
]);
- $ungrouped_count = $ungrouped_count[0];
- if ($ungrouped_count > 0) {
+ $this->ungrouped_count = $ungrouped_count[0];
+ if ($this->ungrouped_count > 0) {
// Create dummy entry for "no group" users.
$no_group = new StdClass();
$no_group->id = 'nogroup';
@@ -172,7 +175,7 @@ class Course_StatusgroupsController extends AuthenticatedController
$groupdata = [
'group' => $no_group,
- 'membercount' => $ungrouped_count,
+ 'membercount' => $this->ungrouped_count,
'joinable' => false,
'invisible_users' => 0,
'members' => []
@@ -214,6 +217,8 @@ class Course_StatusgroupsController extends AuthenticatedController
}
}
$this->groups[] = $groupdata;
+ } else {
+ $this->nogroupmembers = [];
}
// Prepare search object for MultiPersonSearch.
@@ -300,6 +305,7 @@ class Course_StatusgroupsController extends AuthenticatedController
*/
public function getgroup_action($group_id)
{
+ $this->sort_by = '';
if ($group_id != 'nogroup') {
$this->group = Statusgruppen::find($group_id);
$this->members = [];
diff --git a/app/controllers/course/wizard.php b/app/controllers/course/wizard.php
index 840761ccec0..fed36cc1a34 100644
--- a/app/controllers/course/wizard.php
+++ b/app/controllers/course/wizard.php
@@ -419,9 +419,9 @@ class Course_WizardController extends AuthenticatedController
private function getValues($classname='')
{
if ($classname) {
- return $_SESSION['coursewizard'][$this->temp_id][$classname] ?: [];
+ return $_SESSION['coursewizard'][$this->temp_id][$classname] ?? [];
} else {
- return $_SESSION['coursewizard'][$this->temp_id] ?: [];
+ return $_SESSION['coursewizard'][$this->temp_id] ?? [];
}
}
diff --git a/app/controllers/jsupdater.php b/app/controllers/jsupdater.php
index 18d84b25386..a706337d65e 100644
--- a/app/controllers/jsupdater.php
+++ b/app/controllers/jsupdater.php
@@ -125,15 +125,15 @@ class JsupdaterController extends AuthenticatedController
private function getBlubberUpdates($pageInfo)
{
$data = [];
- if (is_array($pageInfo['blubber']['threads']) && count($pageInfo['blubber']['threads'])) {
- $blubber_data = array();
+ if (isset($pageInfo['blubber']['threads']) && is_array($pageInfo['blubber']['threads'])) {
+ $blubber_data = [];
foreach ($pageInfo['blubber']['threads'] as $thread_id) {
$thread = new BlubberThread($thread_id);
if ($thread->isReadable()) {
- $comments = BlubberComment::findBySQL("thread_id = :thread_id AND chdate >= :time ORDER BY mkdate ASC", array(
- 'thread_id' => $thread_id,
- 'time' => UpdateInformation::getTimestamp()
- ));
+ $comments = BlubberComment::findBySQL(
+ "thread_id = :thread_id AND chdate >= :time ORDER BY mkdate ASC",
+ ['thread_id' => $thread_id, 'time' => UpdateInformation::getTimestamp()]
+ );
foreach ($comments as $comment) {
$blubber_data[$thread_id][] = $comment->getJSONdata();
}
@@ -161,14 +161,14 @@ class JsupdaterController extends AuthenticatedController
if (mb_stripos(Request::get("page"), "dispatch.php/blubber") !== false) {
//collect updated threads for the widget
$threads = BlubberThread::findMyGlobalThreads(30, UpdateInformation::getTimestamp());
- $thread_widget_data = array();
+ $thread_widget_data = [];
foreach ($threads as $thread) {
- $thread_widget_data[] = array(
+ $thread_widget_data[] = [
'thread_id' => $thread->getId(),
'avatar' => $thread->getAvatar(),
'name' => $thread->getName(),
'timestamp' => (int) $thread->getLatestActivity()
- );
+ ];
}
if (count($thread_widget_data)) {
$data['updateThreadWidget'] = $thread_widget_data;
@@ -233,20 +233,27 @@ class JsupdaterController extends AuthenticatedController
private function getQuestionnaireUpdates($pageInfo)
{
+ if (
+ !isset($pageInfo['questionnaire']['questionnaire_ids'])
+ || !is_array($pageInfo['questionnaire']['questionnaire_ids'])
+ ) {
+ return [];
+ }
+
$data = [];
- if (is_array($pageInfo['questionnaire']['questionnaire_ids'])) {
- foreach ($pageInfo['questionnaire']['questionnaire_ids'] as $questionnaireId) {
- $questionnaire = new Questionnaire($questionnaireId);
+ Questionnaire::findEachMany(
+ function (Questionnaire $questionnaire) use ($pageInfo, &$data) {
if ($questionnaire->latestAnswerTimestamp() > $pageInfo['questionnaire']['last_update']) {
$template = $this->get_template_factory()->open("questionnaire/evaluate");
$template->set_layout(null);
$template->set_attribute("questionnaire", $questionnaire);
- $data[$questionnaire->getId()] = [
+ $data[$questionnaire->id] = [
'html' => $template->render()
];
}
- }
- }
+ },
+ $pageInfo['questionnaire']['questionnaire_ids']
+ );
return $data;
}
diff --git a/app/controllers/messages.php b/app/controllers/messages.php
index c4fd07bb4af..38f0d23704c 100644
--- a/app/controllers/messages.php
+++ b/app/controllers/messages.php
@@ -184,6 +184,7 @@ class MessagesController extends AuthenticatedController {
PageLayout::setTitle(_('Neue Nachricht schreiben'));
$this->to = [];
+ $this->answer_to = null;
$this->default_message = new Message();
$this->default_attachments = [];
diff --git a/app/controllers/module/module.php b/app/controllers/module/module.php
index 74415ba81b4..996ec7651a4 100644
--- a/app/controllers/module/module.php
+++ b/app/controllers/module/module.php
@@ -854,7 +854,7 @@ class Module_ModuleController extends MVVController
$this->modulteil_id = $this->modulteil->getId();
$this->search_lvgruppe($this->modulteil->getId());
if (Request::isXhr()) {
- $this->render_template('module/module/modulteil_lvg', null);
+ $this->render_template('module/module/modulteil_lvg');
} else {
$this->modul = Modul::get($this->modulteil->modul_id);
$this->modul_id = $this->modul->getId();
@@ -1037,6 +1037,7 @@ class Module_ModuleController extends MVVController
public function details_action($modul_id, $modulteil_id = null)
{
+ $this->institut_id = null;
$this->modul = Modul::get($modul_id);
$this->modul_id = $this->modul->isNew() ? null : $this->modul->getId();
if ($modulteil_id) {
diff --git a/app/controllers/oer/admin.php b/app/controllers/oer/admin.php
index cdb16c92dda..1a1939fe33a 100644
--- a/app/controllers/oer/admin.php
+++ b/app/controllers/oer/admin.php
@@ -93,9 +93,8 @@ class Oer_AdminController extends AuthenticatedController
{
$data = $host->askKnownHosts();
$added = 0;
- if ($data['hosts']) {
+ if (!empty($data['hosts'])) {
foreach ($data['hosts'] as $host_data) {
-
$host = OERHost::findOneByUrl($host_data['url']);
if (!$host) {
$host = new OERHost();
diff --git a/app/controllers/profile.php b/app/controllers/profile.php
index cd2994f9379..74e0b436c57 100644
--- a/app/controllers/profile.php
+++ b/app/controllers/profile.php
@@ -240,7 +240,7 @@ class ProfileController extends AuthenticatedController
//The profile avatar, profile visits and profile score
//shall be visible in the sidebar. Therefore we must construct
//a generic WidgetElement object and its HTML in here.
-
+ $kings = [];
if (Config::Get()->SCORE_ENABLE) {
if ($this->current_user->user_id === $GLOBALS['user']->id || $this->current_user->score) {
$kings = $this->current_user->getStudipKingIcon();
diff --git a/app/controllers/shared/contacts.php b/app/controllers/shared/contacts.php
index fb43669a135..6d9e58a9131 100644
--- a/app/controllers/shared/contacts.php
+++ b/app/controllers/shared/contacts.php
@@ -432,7 +432,7 @@ class Shared_ContactsController extends MVVController
public function add_ansprechpartner_action($origin = 'index', $range_type = null, $range_id = null, $user_id = null, $category = null)
{
PageLayout::setTitle(_('Ansprechpartner zuordnen'));
-
+ $contact_range = null;
$this->extcontact_search_obj = new SQLSearch("SELECT extern_contact_id, mvv_extern_contacts.name "
. "FROM mvv_extern_contacts "
. "WHERE mvv_extern_contacts.name LIKE :input "
@@ -528,6 +528,10 @@ class Shared_ContactsController extends MVVController
$this->ansp_kat = $contact_range->category;
$this->ansp_name = $contact_range->contact->getContactName();
} else {
+ $this->ansp_status = '';
+ $this->ansp_altmail = '';
+ $this->ansp_typ = '';
+ $this->ansp_kat = '';
$this->ansp_name = '';
}
diff --git a/app/controllers/studiengaenge/shared_version.php b/app/controllers/studiengaenge/shared_version.php
index 91869ca28e5..696fac081a7 100644
--- a/app/controllers/studiengaenge/shared_version.php
+++ b/app/controllers/studiengaenge/shared_version.php
@@ -355,6 +355,7 @@ abstract class SharedVersionController extends MVVController
public function abschnitte_action($version_id)
{
+ $this->abschnitt_id = null;
$this->abschnitte($version_id);
if (Request::isXhr()) {
$this->render_template('studiengaenge/versionen/abschnitte');
@@ -673,6 +674,7 @@ abstract class SharedVersionController extends MVVController
public function details_abschnitt_action($abschnitt_id, $modul_id = null)
{
+ $this->modul_id = $modul_id;
$this->abschnitt = StgteilAbschnitt::find($abschnitt_id);
if (!$this->abschnitt) {
PageLayout::postError(_('Unbekannter Abschnitt'));
diff --git a/app/controllers/studiengaenge/studiengangteile.php b/app/controllers/studiengaenge/studiengangteile.php
index 18d122ed09d..0fddd44d1cf 100644
--- a/app/controllers/studiengaenge/studiengangteile.php
+++ b/app/controllers/studiengaenge/studiengangteile.php
@@ -35,10 +35,11 @@ class Studiengaenge_StudiengangteileController extends SharedVersionController
$search_result = $this->getSearchResult('StudiengangTeil');
$this->sortby = $this->sortby ?: 'fach_name,zusatz,kp';
$this->order = $this->order ?: 'ASC';
-
+ $this->stgteil_id = null;
//get data
if (count($search_result)) {
$filter['stgteil_id'] = $search_result;
+ $this->stgteil_id = $search_result;
$this->stgteile = StudiengangTeil::getAllEnriched(
$this->sortby, $this->order,
$filter, self::$items_per_page,
@@ -176,7 +177,7 @@ class Studiengaenge_StudiengangteileController extends SharedVersionController
{
$this->stgteil = StudiengangTeil::find($stgteil_id);
$this->versionen = StgteilVersion::findByStgteil($stgteil_id);
-
+ $this->version_id = null;
if (count($this->versionen)) {
$this->stgteil_id = $stgteil_id;
if (!Request::isXhr()) {
diff --git a/app/views/admin/plugin/search.php b/app/views/admin/plugin/search.php
index ef79ae13b48..d88dc25887f 100644
--- a/app/views/admin/plugin/search.php
+++ b/app/views/admin/plugin/search.php
@@ -32,7 +32,7 @@
<td class="plugin_image">
<? if ($plugin['image']): ?>
<a href="<?= htmlReady($plugin['image']) ?>"
- data-lightbox="<?= htmlReady($plugin['displayname']) ?>"
+ data-lightbox="<?= htmlReady($plugin['displayname']?? '') ?>"
data-title="<?= htmlReady($name) ?>">
<img src="<?= htmlReady($plugin['image']) ?>" class="plugin_preview">
</a>
diff --git a/app/views/course/dates/index.php b/app/views/course/dates/index.php
index 2e2617e7fec..b3624ec0b53 100644
--- a/app/views/course/dates/index.php
+++ b/app/views/course/dates/index.php
@@ -48,6 +48,7 @@
<tbody>
<?php
// print dates
+ $is_next_date = null;
foreach ($dates as $key => $date) {
$dateSemester = Semester::findByTimestamp($date['date']);
if ($dateSemester && $semester->getId() === $dateSemester->getId()) {
diff --git a/app/views/course/forum/index/_threads.php b/app/views/course/forum/index/_threads.php
index 1445d876cbe..d2fad260fdd 100644
--- a/app/views/course/forum/index/_threads.php
+++ b/app/views/course/forum/index/_threads.php
@@ -98,8 +98,9 @@
<td class="actions">
<?= ActionMenu::get()
+ ->condition(isset($entry['last_posting']))
->addLink(
- $controller->url_for("course/forum/index/index/{$entry['last_posting']['topic_id']}#{$entry['last_posting']['topic_id']}"),
+ isset($entry['last_posting']) ? $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 2f887359368..6c321a5c90a 100644
--- a/app/views/course/forum/index/index.php
+++ b/app/views/course/forum/index/index.php
@@ -138,7 +138,7 @@ $pagechooser = null;
'num_postings' => $number_of_entries,
'perPage' => ForumEntry::POSTINGS_PER_PAGE,
'pagelink' => str_replace('%%s', '%s', str_replace('%', '%%', $controller->url_for('course/forum/index/goto_page/'. $topic_id .'/'. $section
- .'/%s/?searchfor=' . $searchfor . (!empty($options) ? '&'. http_build_query($options) : '' ))))
+ .'/%s/?searchfor=' . ($searchfor ?? '') . (!empty($options) ? '&'. http_build_query($options) : '' ))))
]); ?>
<? endif ?>
<?= $link ?? '' ?>
diff --git a/app/views/course/plus/index.php b/app/views/course/plus/index.php
index a034f5790f7..adf58b2ee1a 100644
--- a/app/views/course/plus/index.php
+++ b/app/views/course/plus/index.php
@@ -13,7 +13,7 @@ use Studip\Button;
?>
-<form action="<?= URLHelper::getLink($save_url) ?>" method="post" class="default">
+<form action="<?= URLHelper::getLink() ?>" method="post" class="default">
<?= CSRFProtection::tokenTag() ?>
<input name="uebernehmen" value="1" type="hidden">
<table class="default nohover plus">
@@ -53,7 +53,7 @@ use Studip\Button;
?>
<tr id="<?= htmlReady($anchor); ?>"
- class="<?= $visibility; ?> <?= $pre_check != null ? ' quiet' : '' ?>">
+ class="<?= $visibility; ?>">
<td class="element" colspan=3>
<div class="plus_basic">
@@ -137,7 +137,7 @@ use Studip\Button;
<div class="screenshot_holder">
<? if (isset($info['screenshot']) || isset($info['screenshots'])) :
if (isset($info['screenshots'])) {
- $title = $info['screenshots']['pictures'][0]['title'];
+ $title = $info['screenshots']['pictures'][0]['title']??'';
$source = $info['screenshots']['path'] . '/' . $info['screenshots']['pictures'][0]['source'];
} else {
$fileext = pathinfo($info['screenshot'], PATHINFO_EXTENSION);
@@ -169,7 +169,7 @@ use Studip\Button;
<? for ($i = $cstart; $i < $counter; $i++) :?>
<?
if (isset($info['screenshots'])) {
- $title = $info['screenshots']['pictures'][$i]['title'];
+ $title = $info['screenshots']['pictures'][$i]['title']?? '';
$source = $info['screenshots']['path'] . '/' . $info['screenshots']['pictures'][$i]['source'];
} else {
$fileext = pathinfo($info['additionalscreenshots'][$i], PATHINFO_EXTENSION);
diff --git a/app/views/course/statusgroups/_member.php b/app/views/course/statusgroups/_member.php
index d436178ce0f..7c39a77a14a 100644
--- a/app/views/course/statusgroups/_member.php
+++ b/app/views/course/statusgroups/_member.php
@@ -17,7 +17,7 @@
'title' => $user_fullname,
]) ?>
<?= htmlReady($user_fullname) ?>
- <?php if ($user_id == $m->user_id && $m->visible == 'no') : ?>
+ <?php if ($GLOBALS['user']->id !== $m->user_id && $m->visible == 'no') : ?>
(<?= _('unsichtbar') ?>)
<?php endif ?>
</a>
diff --git a/app/views/course/statusgroups/getgroup.php b/app/views/course/statusgroups/getgroup.php
index 426fca4c6ee..ac790b35dc4 100644
--- a/app/views/course/statusgroups/getgroup.php
+++ b/app/views/course/statusgroups/getgroup.php
@@ -67,11 +67,11 @@
</tr>
</thead>
<tbody>
- <? $i = 1; foreach ($members as $m) : ?>
- <?= $this->render_partial(
- 'course/statusgroups/_member',
- ['m' => $m, 'i' => $i++, 'is_tutor' => $is_tutor, 'is_locked' => $is_locked]) ?>
- <? endforeach ?>
+ <? $i = 1; foreach ($members as $m) : ?>
+ <?= $this->render_partial(
+ 'course/statusgroups/_member',
+ ['m' => $m, 'i' => $i++, 'is_tutor' => $is_tutor, 'is_locked' => $is_locked]) ?>
+ <? endforeach ?>
</tbody>
<tfoot>
<tr>
diff --git a/app/views/course/wizard/steps/basicdata/index_studygroup.php b/app/views/course/wizard/steps/basicdata/index_studygroup.php
index 5d7dc443322..a1e1e74b7f6 100644
--- a/app/views/course/wizard/steps/basicdata/index_studygroup.php
+++ b/app/views/course/wizard/steps/basicdata/index_studygroup.php
@@ -23,7 +23,7 @@
</select>
</label>
<? else : ?>
- <? $type = array_shift(array_values($types)) ?>
+ <? $type = array_values($types)[0]; ?>
<input type="hidden" name="coursetype" value="<?= htmlReady($type[0]['id']) ?>">
<? endif ?>
@@ -40,16 +40,16 @@
<select name="access" id="wizard-access">
<option value="all"
- <?= $values['access'] == 'all' ? 'selected' : ''?>>
+ <? if (isset($values['access']) && $values['access'] === 'all') echo 'selected'; ?>>
<?= _('offen für alle') ?>
</option>
<option value="invite"
- <?= $values['access'] == 'invite' ? 'selected' : ''?>>
+ <? if (isset($values['access']) && $values['access'] === 'invite') echo 'selected'; ?>>
<?= _('auf Anfrage') ?>
</option>
<?php if (Config::get()->STUDYGROUPS_INVISIBLE_ALLOWED) : ?>
<option value="invisible"
- <?= $values['access'] == 'invisible' ? 'selected' : ''?>>
+ <? if (isset($values['access']) && $values['access'] === 'invisible') echo 'selected'; ?>>
<?= _('unsichtbar') ?>
</option>
<?php endif ?>
diff --git a/app/views/files/_fileref_tr.php b/app/views/files/_fileref_tr.php
index 7ab64a7f8f4..2b1a6b6b56e 100644
--- a/app/views/files/_fileref_tr.php
+++ b/app/views/files/_fileref_tr.php
@@ -50,7 +50,7 @@ if ($file->isDownloadable($GLOBALS['user']->id)) {
<?= relSize($size, false) ?>
<? endif ?>
</td>
- <? if ($show_downloads) : ?>
+ <? if (!empty($show_downloads)) : ?>
<? $downloads = $file->getDownloads() ?>
<td data-sort-value="<?= htmlReady($downloads) ?>" class="responsive-hidden">
<?= htmlReady($downloads) ?>
diff --git a/app/views/files/_files_thead.php b/app/views/files/_files_thead.php
index a6024e97dc8..fabfa3c668a 100644
--- a/app/views/files/_files_thead.php
+++ b/app/views/files/_files_thead.php
@@ -31,7 +31,7 @@
<th data-sort="htmldata"><?= _('Typ') ?></th>
<th data-sort="text"><?= _('Name') ?></th>
<th data-sort="htmldata" class="responsive-hidden"><?= _('Größe') ?></th>
- <? if ($show_downloads) : ?>
+ <? if (!empty($show_downloads)) : ?>
<th data-sort="htmldata" class="responsive-hidden"><?= _('Downloads') ?></th>
<? endif ?>
<th data-sort="text" class="responsive-hidden"><?= _('Autor/-in') ?></th>
diff --git a/app/views/module/module/modulteil_lvg.php b/app/views/module/module/modulteil_lvg.php
index e13ec5b09a3..3bb50140ae1 100644
--- a/app/views/module/module/modulteil_lvg.php
+++ b/app/views/module/module/modulteil_lvg.php
@@ -51,7 +51,6 @@
<td colspan="2">
<form action="<?= $controller->action_link('add_lvgruppe/' . $modulteil->id) ?>" method="post">
<?= CSRFProtection::tokenTag(); ?>
- <input type="hidden" name="security_token" value="<?= $security_token ?>">
<div style="float: left; padding-right: 10px;"><?= _('LV-Gruppe hinzufügen:') ?></div>
<?= $search->render(); ?>
<?= Icon::create('search', Icon::ROLE_CLICKABLE , ['title' => _('LV-Gruppe suchen'), 'name' => 'search_stgteil', 'data-qs_name' => $search->getId(), 'data-qs_id' => $qs_search_id, 'data-qs_submit' => 'no', 'class' => 'mvv-qs-button'])->asInput(); ?>
diff --git a/app/views/settings/statusgruppen/index.php b/app/views/settings/statusgruppen/index.php
index 708bb89f372..bef23e0db3a 100644
--- a/app/views/settings/statusgruppen/index.php
+++ b/app/views/settings/statusgruppen/index.php
@@ -87,11 +87,13 @@
<? endif; ?>
</nav>
</header>
+
<section>
<?= $this->render_partial('settings/statusgruppen/modify', [
'followers' => $role_count < $max_roles,
'inst_id' => $inst_id,
'role_id' => $role_id,
+ 'institute' => Institute::find($inst_id),
'datafields' => $institute['datafields'][$role_id],
'role' => $role['role'],
]) ?>
@@ -104,7 +106,7 @@
</section>
<? if ($GLOBALS['perm']->have_perm('admin') && !$locked): ?>
- <?= $this->render_partial('settings/statusgruppen/assign', compact('subview_id', 'admin_insts', 'sub_admin_insts')) ?>
+ <?= $this->render_partial('settings/statusgruppen/assign', compact('admin_insts')) ?>
<? endif; ?>
<? endif; ?>
diff --git a/app/views/shared/filter.php b/app/views/shared/filter.php
index 6869faf2df2..6674ef3de37 100644
--- a/app/views/shared/filter.php
+++ b/app/views/shared/filter.php
@@ -43,12 +43,12 @@
<select name="status_filter" class="sidebar-selectlist submit-upon-select">
<option value=""><?= _('Alle') ?></option>
<? foreach ($status_array as $key => $stat) : ?>
- <? if ($status[$key]['count_objects']) : ?>
+ <? if (isset($status[$key]['count_objects'])) : ?>
<option value="<?= $key ?>"
- <?= ($key == $selected_status ? ' selected' : '') ?>><?= htmlReady($stat['name']) . ' (' . ($status[$key] ? $status[$key]['count_objects'] : '0') . ')' ?></option>
+ <?= ($key === $selected_status ? ' selected' : '') ?>><?= htmlReady($stat['name']) . ' (' . ($status[$key] ? $status[$key]['count_objects'] : '0') . ')' ?></option>
<? endif; ?>
<? endforeach; ?>
- <? if ($status['__undefined__']) : ?>
+ <? if (isset($status['__undefined__'])) : ?>
<option value="__undefined__"<?= $selected_status == '__undefined__' ? ' selected' : '' ?>><?= _('nicht angegeben') . ' (' . ($stat['count_objects'] ?? '0') . ')' ?></option>
<? endif; ?>
</select>
@@ -61,7 +61,7 @@
<option value=""><?= _('Alle') ?></option>
<? foreach ($kategorien as $kategorie) : ?>
<option value="<?= $kategorie->id ?>"
- <? if ($kategorie->id === $selected_kategorie || (isset($abschluesse) && $abschluesse[$selected_abschluss]->kategorie_id == $kategorie->id)) : ?> selected<? endif; ?>>
+ <? if ($kategorie->id === $selected_kategorie || (isset($abschluesse) && isset($abschluesse[$selected_abschluss]) && $abschluesse[$selected_abschluss]->kategorie_id == $kategorie->id)) : ?> selected<? endif; ?>>
<?= htmlReady($kategorie->name) . ' (' . $kategorie->count_objects . ')' ?>
</option>
<? endforeach; ?>
@@ -108,7 +108,7 @@
<? $perm_institutes = MvvPerm::getOwnInstitutes() ?>
<? if ($perm_institutes !== false) : ?>
<label>
- <?= $fachbereich_caption ?: _('Fachbereiche') ?>:<br>
+ <?= _('Fachbereiche') ?>:<br>
<select name="fachbereich_filter" class="sidebar-selectlist nested-select institute-list submit-upon-select">
<option value=""><?= _('Alle') ?></option>
<? foreach ($fachbereiche as $fachbereich) : ?>
diff --git a/lib/classes/ForumActivity.php b/lib/classes/ForumActivity.php
index 20ebeb699ed..0e8b3deb964 100644
--- a/lib/classes/ForumActivity.php
+++ b/lib/classes/ForumActivity.php
@@ -22,10 +22,10 @@ class ForumActivity
*/
public static function newEntry($event, $topic_id, $post)
{
- $verb = $post['depth'] == 3 ? 'answered' : 'created';
+ $verb = $post['depth'] === 3 ? 'answered' : 'created';
- if ($verb == 'created') {
- if ($post['depth'] == 1) {
+ if ($verb === 'created') {
+ if (isset($post['depth']) && (int)$post['depth'] === 1) {
$summary = _('%s hat im Forum der Veranstaltung "%s" einen Bereich erstellt.');
} else {
$summary = _('%s hat im Forum der Veranstaltung "%s" ein Thema erstellt.');
diff --git a/lib/classes/coursewizardsteps/BasicDataWizardStep.php b/lib/classes/coursewizardsteps/BasicDataWizardStep.php
index b616757fccc..35431302bd2 100644
--- a/lib/classes/coursewizardsteps/BasicDataWizardStep.php
+++ b/lib/classes/coursewizardsteps/BasicDataWizardStep.php
@@ -67,7 +67,7 @@ class BasicDataWizardStep implements CourseWizardStep
}
$tpl->set_attribute('types', $typestruct);
// Select a default type if none is given.
- if (!$values['coursetype']) {
+ if (empty($values['coursetype'])) {
if ($GLOBALS['user']->cfg->MY_COURSES_TYPE_FILTER && Request::isXhr()) {
$values['coursetype'] = $GLOBALS['user']->cfg->MY_COURSES_TYPE_FILTER;
} else {
@@ -90,7 +90,7 @@ class BasicDataWizardStep implements CourseWizardStep
$semesters[] = $s;
}
}
- if (!$values['start_time']) {
+ if (empty($values['start_time'])) {
$values['start_time'] = Semester::findDefault()->beginn;
}
if ($values['studygroup'] && (!count($typestruct) || !$values['institute']) ) {
@@ -123,7 +123,7 @@ class BasicDataWizardStep implements CourseWizardStep
// Get all allowed home institutes (my own).
$institutes = Institute::getMyInstitutes();
- if ($values['studygroup'] || count($institutes) > 0) {
+ if (!empty($values['studygroup']) || count($institutes) > 0) {
$tpl->set_attribute('institutes', $institutes);
if (!$values['institute']) {
if ($GLOBALS['user']->cfg->MY_INSTITUTES_DEFAULT && Request::isXhr()) {
@@ -151,10 +151,10 @@ class BasicDataWizardStep implements CourseWizardStep
// QuickSearch for participating institutes.
// No JS: Keep search value and results for displaying in search select box.
- if ($values['part_inst_id']) {
+ if (!empty($values['part_inst_id'])) {
Request::getInstance()->offsetSet('part_inst_id', $values['part_inst_id']);
}
- if ($values['part_inst_id_parameter']) {
+ if (!empty($values['part_inst_id_parameter'])) {
Request::getInstance()->offsetSet('part_inst_id_parameter', $values['part_inst_id_parameter']);
}
$instsearch = new StandardSearch('Institut_id',
@@ -165,16 +165,16 @@ class BasicDataWizardStep implements CourseWizardStep
->withButton(['search_button_name' => 'search_part_inst', 'reset_button_name' => 'reset_instsearch'])
->fireJSFunctionOnSelect('STUDIP.CourseWizard.addParticipatingInst')
->render());
- if (!$values['participating']) {
+ if (empty($values['participating'])) {
$values['participating'] = [];
}
// Quicksearch for lecturers.
// No JS: Keep search value and results for displaying in search select box.
- if ($values['lecturer_id']) {
+ if (!empty($values['lecturer_id'])) {
Request::getInstance()->offsetSet('lecturer_id', $values['lecturer_id']);
}
- if ($values['lecturer_id_parameter']) {
+ if (!empty($values['lecturer_id_parameter'])) {
Request::getInstance()->offsetSet('lecturer_id_parameter', $values['lecturer_id_parameter']);
}
@@ -206,22 +206,20 @@ class BasicDataWizardStep implements CourseWizardStep
array_flip(Deputy::findDeputies($GLOBALS['user']->cfg->ADMIN_COURSES_TEACHERFILTER)->pluck('user_id')));
}
}
- if (!$values['lecturers']) {
+ if (empty($values['lecturers'])) {
$values['lecturers'] = [];
}
- if ($deputies && !$values['deputies']) {
+ if ($deputies && empty($values['deputies'])) {
$values['deputies'] = [];
}
-
-
// Quicksearch for deputies if applicable.
if ($deputies) {
// No JS: Keep search value and results for displaying in search select box.
- if ($values['deputy_id']) {
+ if (!empty($values['deputy_id'])) {
Request::getInstance()->offsetSet('deputy_id', $values['deputy_id']);
}
- if ($values['deputy_id_parameter']) {
+ if (!empty($values['deputy_id_parameter'])) {
Request::getInstance()->offsetSet('deputy_id_parameter', $values['deputy_id_parameter']);
}
$deputysearch = new PermissionSearch('user',
@@ -236,7 +234,7 @@ class BasicDataWizardStep implements CourseWizardStep
->render());
}
- if (!$values['tutors']) {
+ if (empty($values['tutors'])) {
$values['tutors'] = [];
}
@@ -248,7 +246,7 @@ class BasicDataWizardStep implements CourseWizardStep
$tpl->set_attribute('tsearch', $tsearch);
$tpl->set_attribute('values', $values);
// AJAX URL needed for default deputy checking.
- $tpl->set_attribute('ajax_url', $values['ajax_url'] ?: URLHelper::getLink('dispatch.php/course/wizard/ajax'));
+ $tpl->set_attribute('ajax_url', $values['ajax_url'] ?? URLHelper::getLink('dispatch.php/course/wizard/ajax'));
$tpl->set_attribute('default_deputies_enabled',
($deputies && Config::get()->DEPUTIES_DEFAULTENTRY_ENABLE) ? 1 : 0);
@@ -594,9 +592,9 @@ class BasicDataWizardStep implements CourseWizardStep
foreach ($indices as $index) {
// There are values given => create an I18NString
- if ($values[$index]) {
+ if (!empty($values[$index])) {
- $values[$index] = new I18NString($values[$index], $values[$index . '_i18n']);
+ $values[$index] = new I18NString($values[$index], $values[$index . '_i18n'] ?? []);
// Current index is not set (yet), create an empty I18NString
} else {
diff --git a/lib/classes/globalsearch/GlobalSearchCourses.php b/lib/classes/globalsearch/GlobalSearchCourses.php
index 5914cfc6d14..ed124da3208 100644
--- a/lib/classes/globalsearch/GlobalSearchCourses.php
+++ b/lib/classes/globalsearch/GlobalSearchCourses.php
@@ -81,7 +81,11 @@ class GlobalSearchCourses extends GlobalSearchModule implements GlobalSearchFull
if ($filter['semester'] === 'future') {
$semester = Semester::findCurrent();
$next_semester = Semester::findNext();
- $semester_ids = array_filter([$semester->id, $next_semester->id]);
+
+ $semester_ids = [$semester->id];
+ if ($next_semester) {
+ $semester_ids[] = $next_semester->id;
+ }
} else {
$semester = Semester::findByTimestamp($filter['semester']);
$semester_ids = [$semester->id];
diff --git a/lib/classes/globalsearch/GlobalSearchCourseware.php b/lib/classes/globalsearch/GlobalSearchCourseware.php
index 6a0b22c1391..24658f182e0 100644
--- a/lib/classes/globalsearch/GlobalSearchCourseware.php
+++ b/lib/classes/globalsearch/GlobalSearchCourseware.php
@@ -40,7 +40,7 @@ class GlobalSearchCourseware extends GlobalSearchModule implements GlobalSearchF
}
$query = DBManager::get()->quote("%{$search}%");
- if ($filter['rangeId']) {
+ if (!empty($filter['rangeId'])) {
$range_id = $filter['rangeId'];
$sql = "(SELECT `cw_structural_elements` . `id` AS id, CONCAT('', 'cw_structural_elements') AS type
FROM `cw_structural_elements`
diff --git a/lib/classes/globalsearch/GlobalSearchMyCourses.php b/lib/classes/globalsearch/GlobalSearchMyCourses.php
index 10d7be49d0e..acafde59d43 100644
--- a/lib/classes/globalsearch/GlobalSearchMyCourses.php
+++ b/lib/classes/globalsearch/GlobalSearchMyCourses.php
@@ -55,7 +55,11 @@ class GlobalSearchMyCourses extends GlobalSearchModule
if ($filter['semester'] === 'future') {
$semester = Semester::findCurrent();
$next_semester = Semester::findNext();
- $semester_ids = array_filter([$semester->id, $next_semester->id]);
+
+ $semester_ids = [$semester->id];
+ if ($next_semester) {
+ $semester_ids[] = $next_semester->id;
+ }
} else {
$semester = Semester::findByTimestamp($filter['semester']);
$semester_ids = [$semester->id];
diff --git a/lib/classes/sidebar/SemesterSelectorWidget.php b/lib/classes/sidebar/SemesterSelectorWidget.php
index 1a246cca1c2..64229e70799 100644
--- a/lib/classes/sidebar/SemesterSelectorWidget.php
+++ b/lib/classes/sidebar/SemesterSelectorWidget.php
@@ -71,7 +71,7 @@ class SemesterSelectorWidget extends SelectWidget
{
$current_id = Request::get($this->template_variables['name']);
if (!$current_id) {
- if ($this->template_variables['value']) {
+ if (!empty($this->template_variables['value'])) {
$current_id = $this->template_variables['value'];
} elseif (!$this->include_all) {
$current_id = Semester::findCurrent()->id;
@@ -83,7 +83,6 @@ class SemesterSelectorWidget extends SelectWidget
$this->addElement($element);
}
- $semesters = [];
if ($this->semester_range_begin && $this->semester_range_end) {
$semesters = Semester::findBySql(
'`beginn` BETWEEN :begin AND :end
diff --git a/lib/extern/lib/ExternConfig.class.php b/lib/extern/lib/ExternConfig.class.php
index 4c34625d380..85c7fad6ac5 100644
--- a/lib/extern/lib/ExternConfig.class.php
+++ b/lib/extern/lib/ExternConfig.class.php
@@ -155,7 +155,10 @@ class ExternConfig
public function getValue ($element_name, $attribute)
{
- return $this->config[$element_name][$attribute];
+ if (!isset($this->config[$element_name])) {
+ return null;
+ }
+ return $this->config[$element_name][$attribute]?? null;
}
public function setValue ($element_name, $attribute, $value)
@@ -280,7 +283,7 @@ class ExternConfig
$config_name = $config_name_prefix . $config_name_suffix;
$all_config_names = "";
- if (is_array($configurations[$this->module_name]) && count($configurations[$this->module_name])) {
+ if (!empty($configurations[$this->module_name]) && count($configurations[$this->module_name])) {
foreach ($configurations[$this->module_name] as $configuration) {
$all_config_names .= $configuration['name'];
}
diff --git a/lib/extern/lib/ExternModule.class.php b/lib/extern/lib/ExternModule.class.php
index 04871a50573..9b9d55ba919 100644
--- a/lib/extern/lib/ExternModule.class.php
+++ b/lib/extern/lib/ExternModule.class.php
@@ -373,9 +373,11 @@ class ExternModule {
$datafields_config = [];
}
$datafields = get_generic_datafields($object_type);
- foreach ((array) $datafields['ids'] as $df) {
- if (!in_array($df, $datafields_config)) {
- $datafields_config[] = $df;
+ if (!empty($datafields['ids'])) {
+ foreach ((array) $datafields['ids'] as $df) {
+ if (!in_array($df, $datafields_config)) {
+ $datafields_config[] = $df;
+ }
}
}
$this->config->setValue($element_name, 'genericdatafields', $datafields_config);
diff --git a/lib/filesystem/FileManager.php b/lib/filesystem/FileManager.php
index f5b3391b05a..d124384c02f 100644
--- a/lib/filesystem/FileManager.php
+++ b/lib/filesystem/FileManager.php
@@ -1617,7 +1617,7 @@ class FileManager
}
}
} else {
- $header['filename'] = basename($url_parts['path']);
+ $header['filename'] = basename($url_parts['path'] ?? '');
}
// Weg über einen Locationheader:
diff --git a/lib/functions.php b/lib/functions.php
index baa77962ab3..b084200620d 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -375,8 +375,8 @@ function get_username($user_id = "")
static $cache = [];
global $auth;
- if (!$user_id || $user_id == $auth->auth['uid']) {
- return $auth->auth['uname'];
+ if (!$user_id || $user_id === $auth->auth['uid']) {
+ return $auth->auth['uname'] ?? '';
}
if (!isset($cache[$user_id])) {
diff --git a/lib/migrations/Migrator.php b/lib/migrations/Migrator.php
index d0888f99cd9..07caa90baa6 100644
--- a/lib/migrations/Migrator.php
+++ b/lib/migrations/Migrator.php
@@ -431,7 +431,7 @@ class Migrator
{
$matches = [];
preg_match('/\b([0-9.]+)_([_a-z0-9]*)\.php$/', $migration_file, $matches);
- return [$matches[1], $matches[2]];
+ return [$matches[1]?? null, $matches[2]?? null];
}
/**
diff --git a/lib/models/Folder.php b/lib/models/Folder.php
index fcf4d984988..d1d778a75d5 100644
--- a/lib/models/Folder.php
+++ b/lib/models/Folder.php
@@ -194,15 +194,18 @@ class Folder extends SimpleORMap implements FeedbackRange
*/
public static function findByTopic_id($topic_id)
{
- $seminar_id = CourseTopic::find($topic_id)->seminar_id;
- $topic_folders = self::findBySQL(
- "folder_type = 'CourseTopicFolder' AND range_id = ? AND range_type = 'course'",
- [$seminar_id]
- );
+ $course_topic = CourseTopic::find($topic_id);
$ret = [];
- foreach ($topic_folders as $key => $folder) {
- if ($folder['data_content']['topic_id'] === $topic_id) {
- $ret[] = $folder;
+ if ($course_topic) {
+ $topic_folders = self::findBySQL(
+ "folder_type = 'CourseTopicFolder' AND range_id = ? AND range_type = 'course'",
+ [$course_topic->seminar_id]
+ );
+
+ foreach ($topic_folders as $folder) {
+ if ($folder['data_content']['topic_id'] === $topic_id) {
+ $ret[] = $folder;
+ }
}
}
return $ret;
@@ -218,15 +221,18 @@ class Folder extends SimpleORMap implements FeedbackRange
*/
public static function findByTermin_id($termin_id)
{
- $seminar_id = CourseDate::find($termin_id)->range_id;
- $date_folders = self::findBySQL(
- "folder_type = 'CourseDateFolder' AND range_id = ? AND range_type = 'course'",
- [$seminar_id]
- );
+ $course_date = CourseDate::find($termin_id);
$ret = [];
- foreach ($date_folders as $key => $folder) {
- if ($folder['data_content']['termin_id'] === $termin_id) {
- $ret[] = $folder;
+ if ($course_date) {
+ $date_folders = self::findBySQL(
+ "folder_type = 'CourseDateFolder' AND range_id = ? AND range_type = 'course'",
+ [$course_date->range_id]
+ );
+
+ foreach ($date_folders as $folder) {
+ if ($folder['data_content']['termin_id'] === $termin_id) {
+ $ret[] = $folder;
+ }
}
}
return $ret;
diff --git a/lib/models/OERHost.php b/lib/models/OERHost.php
index 1c7c01e9acf..b323602ba2f 100644
--- a/lib/models/OERHost.php
+++ b/lib/models/OERHost.php
@@ -120,9 +120,9 @@ class OERHost extends OERIdentity
public function askKnownHosts()
{
$endpoint_url = $this['url']."fetch_known_hosts"
- ."?from=".urlencode($GLOBALS['oer_PREFERRED_URI'] ?: $GLOBALS['ABSOLUTE_URI_STUDIP']."dispatch.php/oer/endpoints/");
+ ."?from=".urlencode(!empty($GLOBALS['oer_PREFERRED_URI']) ?: $GLOBALS['ABSOLUTE_URI_STUDIP']."dispatch.php/oer/endpoints/");
$output = @file_get_contents($endpoint_url);
- if ($output) {
+ if (!empty($output)) {
$output = json_decode($output, true);
foreach ((array) $output['hosts'] as $host_data) {
$host = OERHost::findOneByUrl($host_data['url']);
diff --git a/lib/wiki.inc.php b/lib/wiki.inc.php
index 09397b05e84..e5a0ff4d3a2 100644
--- a/lib/wiki.inc.php
+++ b/lib/wiki.inc.php
@@ -1648,6 +1648,7 @@ function showDiffs($keyword, $versions_since)
$lastversion = $version['version'];
$zusatz = getZusatz($version);
+ $content = '';
foreach ($versions as $version) {
$content .= '<tr>';
$current = $version['body'];
diff --git a/templates/wiki/show.php b/templates/wiki/show.php
index 08463e4a9e4..37134482038 100644
--- a/templates/wiki/show.php
+++ b/templates/wiki/show.php
@@ -1,4 +1,4 @@
-<?= $contentbar ?>
+<?= $contentbar ?? '' ?>
<article class="studip wiki" id="main_content" role="main">
<section>
<? if ($wikipage->keyword == 'WikiWikiWeb' && $wikipage->isNew()): ?>
--
GitLab