';
$paddedurl = str_pad($originalurl, 6000, 'z');
$validpaddedurl = 'Some text.
-
+
';
$validpaddedurl = str_pad($validpaddedurl, 6000 + (strlen($validpaddedurl) - strlen($originalurl)), 'z');
diff --git a/media/player/youtube/classes/plugin.php b/media/player/youtube/classes/plugin.php
index 10216231903..acc71f488d5 100644
--- a/media/player/youtube/classes/plugin.php
+++ b/media/player/youtube/classes/plugin.php
@@ -62,6 +62,8 @@ class media_youtube_plugin extends core_media_player_external {
}
protected function embed_external(moodle_url $url, $name, $width, $height, $options) {
+ global $OUTPUT;
+ $nocookie = get_config('media_youtube', 'nocookie');
$info = trim($name ?? '');
if (empty($info) or strpos($info, 'http') === 0) {
@@ -71,40 +73,60 @@ class media_youtube_plugin extends core_media_player_external {
self::pick_video_size($width, $height);
- if ($this->isplaylist) {
+ // Template context.
+ $context = [
+ 'width' => $width,
+ 'height' => $height,
+ 'title' => $info
+ ];
+ if ($this->isplaylist) {
$site = $this->matches[1];
$playlist = $this->matches[3];
- return <<
-
-
-OET;
- } else {
+ $params = ['list' => $playlist];
+ // Handle no cookie option.
+ if (!$nocookie) {
+ $embedurl = new moodle_url("https://$site/embed/videoseries", $params);
+ } else {
+ $embedurl = new moodle_url('https://www.youtube-nocookie.com/embed/videoseries', $params );
+ }
+ $context['embedurl'] = $embedurl->out(false);
+
+ // Return the rendered template.
+ return $OUTPUT->render_from_template('media_youtube/embed', $context);
+
+ } else {
$videoid = end($this->matches);
- $params = '';
+ $params = [];
$start = self::get_start_time($url);
if ($start > 0) {
- $params .= "start=$start&";
+ $params['start'] = $start;
}
$listid = $url->param('list');
// Check for non-empty but valid playlist ID.
if (!empty($listid) && !preg_match('/[^a-zA-Z0-9\-_]/', $listid)) {
// This video is part of a playlist, and we want to embed it as such.
- $params .= "list=$listid&";
+ $params['list'] = $listid;
}
- return <<
-
-
-OET;
+ // Add parameters to object to be passed to the mustache template.
+ $params['rel'] = 0;
+ $params['wmode'] = 'transparent';
+
+ // Handle no cookie option.
+ if (!$nocookie) {
+ $embedurl = new moodle_url('https://www.youtube.com/embed/' . $videoid, $params );
+ } else {
+ $embedurl = new moodle_url('https://www.youtube-nocookie.com/embed/' . $videoid, $params );
+ }
+
+ $context['embedurl'] = $embedurl->out(false);
+
+ // Return the rendered template.
+ return $OUTPUT->render_from_template('media_youtube/embed', $context);
}
}
diff --git a/media/player/youtube/lang/en/media_youtube.php b/media/player/youtube/lang/en/media_youtube.php
index 486292ce4bf..f8834fcdedd 100644
--- a/media/player/youtube/lang/en/media_youtube.php
+++ b/media/player/youtube/lang/en/media_youtube.php
@@ -27,3 +27,5 @@ $string['pluginname_help'] = 'The video-sharing website youtube.com. Video and p
$string['privacy:metadata'] = 'The Youtube media plugin does not store any personal data.';
$string['supportsvideo'] = 'YouTube videos';
$string['supportsplaylist'] = 'YouTube playlists';
+$string['nocookie'] = 'Use no cookie domain';
+$string['nocookie_desc'] = 'Use youtube-nocookie.com domain for embedding videos. This reduces the number of third party cookies used in embedding. This domain is also not blocked by some adblockers.';
diff --git a/media/player/youtube/settings.php b/media/player/youtube/settings.php
new file mode 100644
index 00000000000..a92da22053f
--- /dev/null
+++ b/media/player/youtube/settings.php
@@ -0,0 +1,36 @@
+.
+
+/**
+ * Settings file for plugin 'media_youtube'
+ *
+ * @package media_youtube
+ * @copyright 2023 Matt Porritt fulltree) {
+ // Add the settings page.
+ $settings->add(new admin_setting_heading('media_youtube_settings',
+ get_string('pluginname', 'media_youtube'),
+ get_string('pluginname_help', 'media_youtube')));
+ // Add a settings checkbox to enable or disable no cookie YouTube links.
+ $settings->add(new admin_setting_configcheckbox('media_youtube/nocookie',
+ new lang_string('nocookie', 'media_youtube'),
+ new lang_string('nocookie_desc', 'media_youtube'), 0));
+}
diff --git a/media/player/youtube/templates/embed.mustache b/media/player/youtube/templates/embed.mustache
new file mode 100644
index 00000000000..ca49c401996
--- /dev/null
+++ b/media/player/youtube/templates/embed.mustache
@@ -0,0 +1,41 @@
+{{!
+ This file is part of Moodle - http://moodle.org/
+
+ Moodle is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Moodle is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Moodle. If not, see