From 930bebbafeb70b813ee83afec9c434838f056413 Mon Sep 17 00:00:00 2001 From: David Siegfried Date: Fri, 3 Mar 2023 21:27:11 +0000 Subject: prevent php-warnings, closes #2256 Closes #2256 Merge request studip/studip!1486 --- app/controllers/course/lti.php | 11 +++++------ app/controllers/course/scm.php | 9 +++++++-- app/views/course/feedback/index_for.php | 2 +- app/views/course/lti/edit.php | 26 +++++++++++++------------- app/views/course/scm/index.php | 8 ++++---- lib/classes/ForumActivity.php | 6 +++--- lib/classes/LtiLink.php | 17 ++++++++++++----- public/wiki.php | 21 +++++++++++---------- 8 files changed, 56 insertions(+), 44 deletions(-) diff --git a/app/controllers/course/lti.php b/app/controllers/course/lti.php index 2183aae..7ed8586 100644 --- a/app/controllers/course/lti.php +++ b/app/controllers/course/lti.php @@ -242,8 +242,8 @@ class Course_LtiController extends StudipController ]); foreach ($custom_parameters as $param) { - list($key, $value) = explode('=', $param, 2); - if (isset($value)) { + if (strpos($param, '=') !== false) { + list($key, $value) = explode('=', $param, 2); $lti_link->addCustomParameter(trim($key), trim($value)); } } @@ -291,13 +291,12 @@ class Course_LtiController extends StudipController $lti_data->description = Studip\Markup::purifyHtml(Studip\Markup::markAsHtml($item['text'])); $lti_data->tool_id = $tool_id; $lti_data->launch_url = (string) $item['url']; - $custom_parameters = ''; $options = []; if (is_array($item['custom'])) { + $custom_parameters = ''; foreach ($item['custom'] as $key => $value) { $custom_parameters .= $key . '=' . $value . "\n"; } - $options['custom_parameters'] = $custom_parameters; } @@ -352,8 +351,8 @@ class Course_LtiController extends StudipController ]); foreach ($custom_parameters as $param) { - list($key, $value) = explode('=', $param, 2); - if (isset($value)) { + if (strpos($param, '=') !== false) { + list($key, $value) = explode('=', $param, 2); $lti_link->addCustomParameter(trim($key), trim($value)); } } diff --git a/app/controllers/course/scm.php b/app/controllers/course/scm.php index c7a011a..66af981 100644 --- a/app/controllers/course/scm.php +++ b/app/controllers/course/scm.php @@ -103,8 +103,13 @@ class Course_ScmController extends AuthenticatedController )->includeTicket('studip_ticket'); } - $this->set_title($this->scm->tab_name ?: _('Informationen')); - Navigation::activateItem('/course/scm/' . $this->scm->id); + if (isset($this->scm)) { + $this->set_title($this->scm->tab_name); + Navigation::activateItem('/course/scm/' . $this->scm->id); + } else { + $this->set_title(_('Informationen')); + Navigation::activateItem('/course/scm'); + } } /** diff --git a/app/views/course/feedback/index_for.php b/app/views/course/feedback/index_for.php index d2e82e6..2bd665d 100644 --- a/app/views/course/feedback/index_for.php +++ b/app/views/course/feedback/index_for.php @@ -8,7 +8,7 @@