Skip to content

Commit

Permalink
Merge pull request #398 from kaltura/MOODLE_311_DEV_ILMS_540
Browse files Browse the repository at this point in the history 
Moodle 311 dev ilms 540
  • Loading branch information
@roileviK
roileviK authored Jun 5, 2023
2 parents 7ebc9b7 + a36683f commit cafcfb7
Show file tree
Hide file tree
Showing 20 changed files with 73 additions and 71 deletions.
8 changes: 4 additions & 4 deletions blocks/kalturamediagallery/version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@

defined('MOODLE_INTERNAL') || die();

$plugin->version = 2021051703;
$plugin->release = 'Kaltura release 4.3.2';
$plugin->version = 2021051704;
$plugin->release = 'Kaltura release 4.4.4';
$plugin->requires = 2018120300;
$plugin->component = 'block_kalturamediagallery';
$plugin->dependencies = array(
'local_kaltura' => 2021051703,
'local_kalturamediagallery' => 2021051703
'local_kaltura' => 2021051704,
'local_kalturamediagallery' => 2021051704
);
2 changes: 1 addition & 1 deletion filter/kaltura/filter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ function filter_kaltura_callback($link) {
'height' => $height,
'class' => 'kaltura-player-iframe',
'allowfullscreen' => 'true',
'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;',
'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *; display-capture *;',
'src' => $url->out(false),
'frameborder' => '0'
));
Expand Down
6 changes: 3 additions & 3 deletions filter/kaltura/version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
*/
defined('MOODLE_INTERNAL') || die();

$plugin->version = 2021051703; //version date YYYYMMDDXX 10 represent 3.0 for future option to moodle use 2 digit version
$plugin->version = 2021051704; //version date YYYYMMDDXX 10 represent 3.0 for future option to moodle use 2 digit version
$plugin->component = 'filter_kaltura';
$plugin->release = 'Kaltura release 4.3.2';
$plugin->release = 'Kaltura release 4.4.4';
$plugin->requires = 2018120300;
$plugin->maturity = MATURITY_STABLE;
$plugin->dependencies = array(
'local_kaltura' => 2021051703
'local_kaltura' => 2021051704
);
2 changes: 1 addition & 1 deletion lib/editor/atto/plugins/kalturamedia/ltibrowse_container.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
$ltibrowseUrl = new moodle_url('ltibrowse.php', $params);
?>

<iframe allow="autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;" id="kafIframe" src="<?php echo $ltibrowseUrl->out(); ?>" width="100%" height="600" style="border: 0;" allowfullscreen>
<iframe allow="autoplay *; fullscreen *; encrypted-media *; camera *; microphone *; display-capture *;" id="kafIframe" src="<?php echo $ltibrowseUrl->out(); ?>" width="100%" height="600" style="border: 0;" allowfullscreen>
</iframe>
<script>
var buttonJs = window.opener.buttonJs;
Expand Down
6 changes: 3 additions & 3 deletions lib/editor/atto/plugins/kalturamedia/version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@

defined('MOODLE_INTERNAL') || die();

$plugin->version = 2021051703; // The current plugin version (Date: YYYYMMDDXX).
$plugin->release = 'Kaltura release 4.3.2';
$plugin->version = 2021051704; // The current plugin version (Date: YYYYMMDDXX).
$plugin->release = 'Kaltura release 4.4.4';
$plugin->requires = 2018120300; // Requires this Moodle version.
$plugin->component = 'atto_kalturamedia'; // Full name of the plugin (used for diagnostics).
$plugin->dependencies = array(
'local_kaltura' => 2021051703
'local_kaltura' => 2021051704
);
6 changes: 3 additions & 3 deletions lib/editor/tinymce/plugins/kalturamedia/version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

defined('MOODLE_INTERNAL') || die();

$plugin->version = 2021051703;
$plugin->release = 'Kaltura release 4.3.2';
$plugin->version = 2021051704;
$plugin->release = 'Kaltura release 4.4.4';
// Required Moodle version.
$plugin->requires = 2018120300;
// Full name of the plugin (used for diagnostics).
$plugin->component = 'tinymce_kalturamedia';
$plugin->dependencies = array(
'local_kaltura' => 2021051703
'local_kaltura' => 2021051704
);
52 changes: 27 additions & 25 deletions local/kaltura/version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,38 +25,40 @@
die('Direct access to this script is forbidden.');
}

$plugin->version = 2021051703;
$plugin->version = 2021051704;
$plugin->component = 'local_kaltura';
$plugin->release = 'Kaltura release 4.3.2';
$plugin->release = 'Kaltura release 4.4.4';
$plugin->requires = 2018120300;
$plugin->maturity = MATURITY_STABLE;

global $DB;
try {
global $DB;

$localKalturaPluginVersionRecord = $DB->get_records_select('config_plugins', "plugin = 'local_kaltura' AND name = 'version'");
$localKalturaPluginVersionRecord = $DB->get_records_select('config_plugins', "plugin = 'local_kaltura' AND name = 'version'");

$kalturaPluginVersion = "";
if ($localKalturaPluginVersionRecord) {
$localKalturaPluginVersionRecordValue = array_pop($localKalturaPluginVersionRecord);
$kalturaPluginVersion = $localKalturaPluginVersionRecordValue->value;
}
$kalturaPluginVersion = "";
if ($localKalturaPluginVersionRecord) {
$localKalturaPluginVersionRecordValue = array_pop($localKalturaPluginVersionRecord);
$kalturaPluginVersion = $localKalturaPluginVersionRecordValue->value;
}

$updatedVersion = null;
if ($kalturaPluginVersion == 20210620311) {
$updatedVersion = 2021051700;
}
else if ($kalturaPluginVersion == 20201215310 || $kalturaPluginVersion == 20210620310) {
$updatedVersion = 2020110900;
}
else if ($kalturaPluginVersion == 2020070539 || $kalturaPluginVersion == 2020121539 || $kalturaPluginVersion == 2021062039) {
$updatedVersion = 2020061500;
}
$updatedVersion = null;
if ($kalturaPluginVersion == 20210620311) {
$updatedVersion = 2021051700;
}
else if ($kalturaPluginVersion == 20201215310 || $kalturaPluginVersion == 20210620310) {
$updatedVersion = 2020110900;
}
else if ($kalturaPluginVersion == 2020070539 || $kalturaPluginVersion == 2020121539 || $kalturaPluginVersion == 2021062039) {
$updatedVersion = 2020061500;
}

if (!empty($updatedVersion)) {
$pluginsRecords = $DB->get_records_select('config_plugins', "plugin in ('local_kaltura', 'local_kalturamediagallery', 'local_mymedia', 'atto_kalturamedia','block_kalturamediagallery','filter_kaltura','tinymce_kalturamedia','mod_kalvidassign','mod_kalvidres') AND name = 'version' AND value = '$kalturaPluginVersion'");
if (!empty($updatedVersion)) {
$pluginsRecords = $DB->get_records_select('config_plugins', "plugin in ('local_kaltura', 'local_kalturamediagallery', 'local_mymedia', 'atto_kalturamedia','block_kalturamediagallery','filter_kaltura','tinymce_kalturamedia','mod_kalvidassign','mod_kalvidres') AND name = 'version' AND value = '$kalturaPluginVersion'");

foreach ($pluginsRecords as $record) {
$record->value = $updatedVersion;
$DB->update_record('config_plugins', $record);
foreach ($pluginsRecords as $record) {
$record->value = $updatedVersion;
$DB->update_record('config_plugins', $record);
}
}
}
} catch (Exception $e) {}
12 changes: 6 additions & 6 deletions .../build/moodle-local_kaltura-ltitinymcepanel/moodle-local_kaltura-ltitinymcepanel-debug.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
YUI.add('moodle-local_kaltura-ltitinymcepanel', function (Y, NAME) {

YUI.add('moodle-local_kaltura-ltitinymcepanel', function (Y, NAME) {

// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -74,7 +74,7 @@ Y.extend(LTITINYMCEPANEL, Y.Base, {
this.contextid = Y.one('#lti_launch_context_id').get('value');
}

var content = '<iframe id="lti_view_element" height="'+iframeheight+'px" width="100%" src="'+url+'&amp;contextid='+this.contextid+'" allow="autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;"></iframe>';
var content = '<iframe id="lti_view_element" height="'+iframeheight+'px" width="100%" src="'+url+'&amp;contextid='+this.contextid+'" allow="autoplay *; fullscreen *; encrypted-media *; camera *; microphone *; display-capture *;"></iframe>';
Y.one('#'+iframeid).setContent(content);
},

Expand Down Expand Up @@ -128,6 +128,6 @@ M.local_kaltura = M.local_kaltura || {};
M.local_kaltura.init = function(params) {
return new LTITINYMCEPANEL(params);
};


}, '@VERSION@', {"requires": ["base", "node", "panel", "node-event-simulate"]});


}, '@VERSION@', {"requires": ["base", "node", "panel", "node-event-simulate"]});
2 changes: 1 addition & 1 deletion ...ui/build/moodle-local_kaltura-ltitinymcepanel/moodle-local_kaltura-ltitinymcepanel-min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions ...ra/yui/build/moodle-local_kaltura-ltitinymcepanel/moodle-local_kaltura-ltitinymcepanel.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
YUI.add('moodle-local_kaltura-ltitinymcepanel', function (Y, NAME) {

YUI.add('moodle-local_kaltura-ltitinymcepanel', function (Y, NAME) {

// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
Expand Down Expand Up @@ -74,7 +74,7 @@ Y.extend(LTITINYMCEPANEL, Y.Base, {
this.contextid = Y.one('#lti_launch_context_id').get('value');
}

var content = '<iframe id="lti_view_element" height="'+iframeheight+'px" width="100%" src="'+url+'&amp;contextid='+this.contextid+'" allow="autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;"></iframe>';
var content = '<iframe id="lti_view_element" height="'+iframeheight+'px" width="100%" src="'+url+'&amp;contextid='+this.contextid+'" allow="autoplay *; fullscreen *; encrypted-media *; camera *; microphone *; display-capture *;"></iframe>';
Y.one('#'+iframeid).setContent(content);
},

Expand Down Expand Up @@ -128,6 +128,6 @@ M.local_kaltura = M.local_kaltura || {};
M.local_kaltura.init = function(params) {
return new LTITINYMCEPANEL(params);
};


}, '@VERSION@', {"requires": ["base", "node", "panel", "node-event-simulate"]});


}, '@VERSION@', {"requires": ["base", "node", "panel", "node-event-simulate"]});
2 changes: 1 addition & 1 deletion local/kaltura/yui/src/ltitinymcepanel/js/ltitinymcepanel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Y.extend(LTITINYMCEPANEL, Y.Base, {
this.contextid = Y.one('#lti_launch_context_id').get('value');
}

var content = '<iframe id="lti_view_element" height="'+iframeheight+'px" width="100%" src="'+url+'&amp;contextid='+this.contextid+'" allow="autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;"></iframe>';
var content = '<iframe id="lti_view_element" height="'+iframeheight+'px" width="100%" src="'+url+'&amp;contextid='+this.contextid+'" allow="autoplay *; fullscreen *; encrypted-media *; camera *; microphone *; display-capture *;"></iframe>';
Y.one('#'+iframeid).setContent(content);
},

Expand Down
6 changes: 3 additions & 3 deletions local/kalturamediagallery/version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
die('Direct access to this script is forbidden.');
}

$plugin->version = 2021051703;
$plugin->version = 2021051704;
$plugin->component = 'local_kalturamediagallery';
$plugin->release = 'Kaltura release 4.3.2';
$plugin->release = 'Kaltura release 4.4.4';
$plugin->requires = 2018120300;
$plugin->maturity = MATURITY_STABLE;
$plugin->dependencies = array(
'local_kaltura' => 2021051703
'local_kaltura' => 2021051704
);
2 changes: 1 addition & 1 deletion local/mymedia/mymedia.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
'width' => '100%',
'allowfullscreen' => 'true',
'src' => 'lti_launch.php',
'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;',
'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *; display-capture *;',
);
echo html_writer::tag('iframe', '', $attr);

Expand Down
6 changes: 3 additions & 3 deletions local/mymedia/version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
die('Direct access to this script is forbidden.');
}

$plugin->version = 2021051703;
$plugin->version = 2021051704;
$plugin->component = 'local_mymedia';
$plugin->release = 'Kaltura release 4.3.2';
$plugin->release = 'Kaltura release 4.4.4';
$plugin->requires = 2018120300;
$plugin->maturity = MATURITY_STABLE;
$plugin->dependencies = array(
'local_kaltura' => 2021051703
'local_kaltura' => 2021051704
);
2 changes: 1 addition & 1 deletion mod/kalvidassign/renderer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@ public function display_video_container_markup($submission, $courseid, $cmid) {
'class' => 'kaltura-player-iframe',
'src' => ($url instanceof moodle_url) ? $url->out(false) : '',
'allowfullscreen' => 'true',
'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;',
'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *; display-capture *;',
'height' => '100%',
'width' => !empty($submission->width) ? $submission->width : ''
);
Expand Down
2 changes: 1 addition & 1 deletion mod/kalvidassign/single_submission_form.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public function definition() {
'height' => $submission->height,
'width' => $submission->width,
'allowfullscreen' => 'true',
'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;',
'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *; display-capture *;',
);
$mform->addElement('html', html_writer::tag('iframe', '', $attr));
}
Expand Down
6 changes: 3 additions & 3 deletions mod/kalvidassign/version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
die('Direct access to this script is forbidden.');
}

$plugin->version = 2021051703;
$plugin->version = 2021051704;
$plugin->component = 'mod_kalvidassign';
$plugin->release = 'Kaltura release 4.3.2';
$plugin->release = 'Kaltura release 4.4.4';
$plugin->requires = 2018120300;
$plugin->cron = 0;
$plugin->maturity = MATURITY_STABLE;
$plugin->dependencies = array(
'local_kaltura' => 2021051703,
'local_kaltura' => 2021051704,
);
2 changes: 1 addition & 1 deletion mod/kalvidres/mod_form.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ private function get_iframe_video_preview_markup($hide = true) {
'height' => $height,
'width' => $width,
'allowfullscreen' => 'true',
'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;',
'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *; display-capture *;',
);

if ($hide) {
Expand Down
2 changes: 1 addition & 1 deletion mod/kalvidres/renderer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public function display_iframe($kalvidres, $courseid) {
'width' => $kalvidres->width,
'src' => $url->out(false),
'allowfullscreen' => 'true',
'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;',
'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *; display-capture *;',
);

$iframe = html_writer::tag('iframe', '', $attr);
Expand Down
6 changes: 3 additions & 3 deletions mod/kalvidres/version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
die('Direct access to this script is forbidden.');
}

$plugin->version = 2021051703;
$plugin->version = 2021051704;
$plugin->component = 'mod_kalvidres';
$plugin->release = 'Kaltura release 4.3.2';
$plugin->release = 'Kaltura release 4.4.4';
$plugin->requires = 2018120300;
$plugin->cron = 0;
$plugin->maturity = MATURITY_STABLE;
$plugin->dependencies = array(
'local_kaltura' => 2021051703
'local_kaltura' => 2021051704
);

0 comments on commit cafcfb7

Please sign in to comment.