From 4b9b11e232a2433b874918de48c2089837ed0dee Mon Sep 17 00:00:00 2001 From: Daniel Thies Date: Fri, 17 May 2024 13:24:31 -0500 Subject: [PATCH] MED-100: Fix Video Time resource url --- source/videotime/classes/form/edit_resource.php | 4 +++- source/videotime/lib.php | 3 +-- source/vimeo/classes/output/video.php | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/videotime/classes/form/edit_resource.php b/source/videotime/classes/form/edit_resource.php index d7c69d0..be83e6a 100644 --- a/source/videotime/classes/form/edit_resource.php +++ b/source/videotime/classes/form/edit_resource.php @@ -137,11 +137,13 @@ public function definition_after_data() { if ($record) { $resource = new media_resource($record); + $videourl = $resource->video_url($OUTPUT); + $content = [ 'poster' => $resource->image_url($OUTPUT), 'elementid' => 'video-' . uniqid(), 'instance' => json_encode([ - 'vimeo_url' => $resource->video_url($OUTPUT), + 'vimeo_url' => $videourl, 'controls' => true, 'responsive' => true, 'playsinline' => false, diff --git a/source/videotime/lib.php b/source/videotime/lib.php index d9dddbb..1c2b51d 100644 --- a/source/videotime/lib.php +++ b/source/videotime/lib.php @@ -45,11 +45,11 @@ function mediatimesrc_videotime_pluginfile($course, $cm, $context, $filearea, $a if ( in_array($filearea, [ + 'posterimage', 'videofile', ]) ) { $itemid = array_shift($args); - $contenthash = array_shift($args); $relativepath = implode('/', $args); @@ -59,7 +59,6 @@ function mediatimesrc_videotime_pluginfile($course, $cm, $context, $filearea, $a if ( (!$file = $fs->get_file_by_hash(sha1($fullpath))) || $file->is_directory() - || $file->get_contenthash() != $contenthash ) { return false; } diff --git a/source/vimeo/classes/output/video.php b/source/vimeo/classes/output/video.php index cf089ed..7b5a455 100644 --- a/source/vimeo/classes/output/video.php +++ b/source/vimeo/classes/output/video.php @@ -57,7 +57,6 @@ public function __construct(stdClass $content) { */ public function export_for_template(renderer_base $output) { global $DB, $USER; - $api = new \mediatimesrc_vimeo\api(); $context = \context_system::instance(); return [