From 99bcd10222eada6276f8c44519c3862812c47e64 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Fri, 8 Mar 2024 08:46:26 +0000
Subject: [PATCH] fixes #3781
Closes #3781
Merge request studip/studip!2655
---
app/controllers/course/lti.php | 2 +-
app/controllers/registration.php | 2 --
lib/classes/LtiLink.php | 2 +-
lib/classes/forms/Form.php | 5 ++++-
vendor/email_message/smtp_message.php | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/app/controllers/course/lti.php b/app/controllers/course/lti.php
index 7f182922ed1..e0ca2cf2912 100644
--- a/app/controllers/course/lti.php
+++ b/app/controllers/course/lti.php
@@ -295,7 +295,7 @@ class Course_LtiController extends StudipController
$lti_data->title = (string) $item['title'];
$lti_data->description = Studip\Markup::purifyHtml(Studip\Markup::markAsHtml($item['text']));
$lti_data->tool_id = $tool_id;
- $lti_data->launch_url = (string) $item['url'];
+ $lti_data->launch_url = (string) ($item['url'] ?? '');
$options = [];
if (is_array($item['custom'])) {
$custom_parameters = '';
diff --git a/app/controllers/registration.php b/app/controllers/registration.php
index 378918bbabe..4c550ceae8d 100644
--- a/app/controllers/registration.php
+++ b/app/controllers/registration.php
@@ -133,8 +133,6 @@ class RegistrationController extends AuthenticatedController
$GLOBALS['auth']->auth['auth_plugin'] = $new_user['auth_plugin'];
$GLOBALS['auth']->auth_set_user_settings($new_user->user_id);
$GLOBALS['auth']->auth['uid'] = $new_user['user_id'];
- $GLOBALS['auth']->auth['exp'] = time() + (60 * $GLOBALS['auth']->lifetime);
- $GLOBALS['auth']->auth['refresh'] = time() + (60 * $GLOBALS['auth']->refresh);
Seminar_Register_Auth::sendValidationMail($new_user);
diff --git a/lib/classes/LtiLink.php b/lib/classes/LtiLink.php
index 33e70a92f67..801b6c0035c 100644
--- a/lib/classes/LtiLink.php
+++ b/lib/classes/LtiLink.php
@@ -208,7 +208,7 @@ class LtiLink
{
$name = strtolower(preg_replace('/\W/', '_', $name));
$value = preg_replace_callback('/\$([\w.]*\w)/', function($matches) {
- return $this->variables[$matches[1]] ?: $matches[0];
+ return $this->variables[$matches[1]] ?? $matches[0];
}, $value);
$this->addLaunchParameter('custom_' . $name, $value);
diff --git a/lib/classes/forms/Form.php b/lib/classes/forms/Form.php
index 4e384b11a6d..fa0422e1a92 100644
--- a/lib/classes/forms/Form.php
+++ b/lib/classes/forms/Form.php
@@ -527,7 +527,10 @@ class Form extends Part
return function ($value) use ($context, $input) {
if ($context && !$value && $value !== null) {
$metadata = $context->getTableMetadata();
- if ($metadata['fields'][$input->getName()]['null'] === 'YES') {
+ if (
+ isset($metadata['fields'][$input->getName()]['null'])
+ && $metadata['fields'][$input->getName()]['null'] === 'YES'
+ ) {
//sets the value to null if this is a feasible db value for this field:
$value = null;
}
diff --git a/vendor/email_message/smtp_message.php b/vendor/email_message/smtp_message.php
index 3d3b365e0da..b043a4a8a40 100644
--- a/vendor/email_message/smtp_message.php
+++ b/vendor/email_message/smtp_message.php
@@ -699,7 +699,7 @@ class smtp_message_class extends email_message_class
$message_id_set=1;
break;
}
- if(strcmp($error,""))
+ if(strcmp($error ?? null,""))
return($this->ResetConnection($error));
if(strtolower($header_name)=="bcc")
continue;
--
GitLab