From ec318155278066032616aa33c1407403eae8f88d Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Thu, 16 Mar 2023 10:10:09 +0000
Subject: [PATCH] fixes #2380
Closes #2380
Merge request studip/studip!1572
---
app/controllers/blubber.php | 5 ++++-
app/views/course/scm/edit.php | 2 +-
app/views/files/_fileref_tr.php | 2 +-
lib/models/OpenGraphURL.class.php | 6 +++++-
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/app/controllers/blubber.php b/app/controllers/blubber.php
index 06390970c5e..d89916ccabd 100644
--- a/app/controllers/blubber.php
+++ b/app/controllers/blubber.php
@@ -57,7 +57,10 @@ class BlubberController extends AuthenticatedController
);
}
- if (!Avatar::getAvatar($GLOBALS['user']->id)->is_customized() && !$_SESSION['already_asked_for_avatar']) {
+ if (
+ empty($_SESSION['already_asked_for_avatar'])
+ && !Avatar::getAvatar($GLOBALS['user']->id)->is_customized()
+ ) {
$_SESSION['already_asked_for_avatar'] = true;
PageLayout::postInfo(sprintf(
_('Wollen Sie ein Avatar-Bild nutzen? %sLaden Sie jetzt ein Bild hoch%s.'),
diff --git a/app/views/course/scm/edit.php b/app/views/course/scm/edit.php
index ca46f649c88..87ad30f046e 100644
--- a/app/views/course/scm/edit.php
+++ b/app/views/course/scm/edit.php
@@ -52,7 +52,7 @@
<footer data-dialog-button>
<?= Studip\Button::createAccept(_('Speichern'), 'submit') ?>
- <? if ($first_entry): ?>
+ <? if (!empty($first_entry)): ?>
<?= Studip\LinkButton::createCancel(_('Abbrechen'), URLHelper::getLink('seminar_main.php')) ?>
<? else: ?>
<?= Studip\LinkButton::createCancel(_('Abbrechen'), $controller->url_for('course/scm/' . $scm->id)) ?>
diff --git a/app/views/files/_fileref_tr.php b/app/views/files/_fileref_tr.php
index ea831589799..f282f7924f1 100644
--- a/app/views/files/_fileref_tr.php
+++ b/app/views/files/_fileref_tr.php
@@ -11,7 +11,7 @@ if ($file->isDownloadable($GLOBALS['user']->id)) {
<?= !empty($table_id) ? 'id="' . htmlReady("fileref_{$table_id}_{$file->getId()}") . '"' : '' ?>
role="row"
data-permissions="<?= implode($permissions) ?>">
- <? if ($show_bulk_checkboxes) : ?>
+ <? if (!empty($show_bulk_checkboxes)) : ?>
<td>
<? if ($file->isDownloadable($GLOBALS['user']->id)) : ?>
<input type="checkbox"
diff --git a/lib/models/OpenGraphURL.class.php b/lib/models/OpenGraphURL.class.php
index a1d4c721003..62eecc45145 100644
--- a/lib/models/OpenGraphURL.class.php
+++ b/lib/models/OpenGraphURL.class.php
@@ -305,7 +305,11 @@ class OpenGraphURL extends SimpleORMap
}
}
}
- if ($_SERVER['HTTPS'] === 'on' && count($secure_media) > 0) {
+ if (
+ isset($_SERVER['HTTPS'])
+ && $_SERVER['HTTPS'] === 'on'
+ && count($secure_media) > 0
+ ) {
foreach ($secure_media as $index => $url) {
$files[] = [$url, $media_types[$index]];
}
--
GitLab