From f9d42cd8630f66dd38780a9b53af9c3989a8978a Mon Sep 17 00:00:00 2001
From: Tobias Reischmann <tobias.reischmann@wi.uni-muenster.de>
Date: Thu, 5 Jul 2018 10:16:09 +0200
Subject: [PATCH] Fixed error thrown when engageurl empty
---
filter.php | 6 +++++-
lib.php | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/filter.php b/filter.php
index 8f6e253..a1e68c0 100644
--- a/filter.php
+++ b/filter.php
@@ -72,8 +72,12 @@ class filter_opencast extends moodle_text_filter {
} else if ($video) {
$video = false;
if (substr($match, 0, 7) === "<source") {
- // Get baseurl.
+
+ // Get baseurl either from engageurl setting or from opencast tool.
$baseurl = get_config('filter_opencast', 'engageurl');
+ if (empty($baseurl)) {
+ $baseurl = get_config('tool_opencast', 'apiurl');
+ }
// Check if video is from opencast.
if (strpos($match, $baseurl) === false) {
diff --git a/lib.php b/lib.php
index 7af946c..9250ca5 100644
--- a/lib.php
+++ b/lib.php
@@ -32,8 +32,12 @@ require_once($CFG->dirroot . '/lib/oauthlib.php');
function filter_opencast_login() {
global $PAGE;
- // Get url of opencast engage server.
+ // Get baseurl for the endpoint either from engageurl setting or from opencast tool.
$endpoint = get_config('filter_opencast', 'engageurl');
+ if (empty($endpoint)) {
+ $endpoint = get_config('tool_opencast', 'apiurl');
+ }
+
if (strpos($endpoint, 'http') !== 0) {
$endpoint = 'http://' . $endpoint;
}
--
GitLab