Merge branch 'kaltura:MOODLE_311_DEV' into MOODLE_311_DEV_offset-issue

kaltura · Aug 22, 2022 · 39cc2d8 · 39cc2d8
2 parents d13b8b1 + 7ebc9b7
commit 39cc2d8
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 32 deletions.
diff --git a/blocks/kalturamediagallery/version.php b/blocks/kalturamediagallery/version.php
@@ -14,11 +14,11 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2021051701;
-$plugin->release = 'Kaltura release 4.3.1';
+$plugin->version   = 2021051703;
+$plugin->release = 'Kaltura release 4.3.2';
 $plugin->requires  = 2018120300;
 $plugin->component = 'block_kalturamediagallery';
 $plugin->dependencies = array(
-    'local_kaltura' => 2021051701,
-    'local_kalturamediagallery' => 2021051701
+    'local_kaltura' => 2021051703,
+    'local_kalturamediagallery' => 2021051703
 );
diff --git a/filter/kaltura/version.php b/filter/kaltura/version.php
@@ -24,11 +24,11 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2021051701; //version date YYYYMMDDXX 10 represent 3.0 for future option to moodle use 2 digit version
+$plugin->version = 2021051703; //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.1';
+$plugin->release = 'Kaltura release 4.3.2';
 $plugin->requires = 2018120300;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'local_kaltura' => 2021051701
+    'local_kaltura' => 2021051703
 );
diff --git a/incrementVersion.sh b/incrementVersion.sh
@@ -4,7 +4,7 @@ EXPECTED_ARGS=4
 
 if [ $# -ne $EXPECTED_ARGS ]; then
 	echo "Missing arguments!"
-	printf "Usage: \n \t$0 {existing build number} {new biuld number} {existing release number} {new release number}\n\n"
+	printf "Usage: \n \t$0 {existing build number} {new build number} {existing release number} {new release number}\n\n"
 	printf "IMPORTANT - the version number should follow these rules - YYYYMMDDII\n"
         printf "WHERE: YYYMMDD should be the release date of the major Moodle version for the current branch (e.g. for 3.10 it should be 20201109) and the II should be the build number for the plugin for that version\n"
         printf "For example, let's assume the next 3.12 release of moodle happens at 2025/12/01 and then we release a plugin compatible with that version, the version number should be set to 2025120100, and the second version of the plugin for 3.12 should have 2025120101\n"

diff --git a/lib/editor/atto/plugins/kalturamedia/version.php b/lib/editor/atto/plugins/kalturamedia/version.php
@@ -24,10 +24,10 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2021051701;        // The current plugin version (Date: YYYYMMDDXX).
-$plugin->release = 'Kaltura release 4.3.1';
+$plugin->version   = 2021051703;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->release = 'Kaltura release 4.3.2';
 $plugin->requires  = 2018120300;        // Requires this Moodle version.
 $plugin->component = 'atto_kalturamedia';  // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = array(
-    'local_kaltura' => 2021051701
+    'local_kaltura' => 2021051703
 );
diff --git a/lib/editor/tinymce/plugins/kalturamedia/version.php b/lib/editor/tinymce/plugins/kalturamedia/version.php
@@ -23,12 +23,12 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2021051701;
-$plugin->release = 'Kaltura release 4.3.1';
+$plugin->version   = 2021051703;
+$plugin->release = 'Kaltura release 4.3.2';
 // Required Moodle version.
 $plugin->requires  = 2018120300;
 // Full name of the plugin (used for diagnostics).
 $plugin->component = 'tinymce_kalturamedia';
 $plugin->dependencies = array(
-    'local_kaltura' => 2021051701
+    'local_kaltura' => 2021051703
 );
diff --git a/local/kaltura/version.php b/local/kaltura/version.php
@@ -25,9 +25,9 @@
     die('Direct access to this script is forbidden.');
 }
 
-$plugin->version = 2021051701;
+$plugin->version = 2021051703;
 $plugin->component = 'local_kaltura';
-$plugin->release = 'Kaltura release 4.3.1';
+$plugin->release = 'Kaltura release 4.3.2';
 $plugin->requires = 2018120300;
 $plugin->maturity = MATURITY_STABLE;
 
@@ -53,10 +53,10 @@
 }
 
 if (!empty($updatedVersion)) {
-    $pluginsRecords = $DB->get_records_select('config_plugins', "name = 'version' AND value = '$kalturaPluginVersion'");
+    $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);
     }
-}
+}
diff --git a/local/kalturamediagallery/index.php b/local/kalturamediagallery/index.php
@@ -57,7 +57,7 @@
     'width' => '100%',
     'allowfullscreen' => 'true',
     'src' => 'lti_launch.php?courseid='.$courseid,
-    'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *;',
+    'allow' => 'autoplay *; fullscreen *; encrypted-media *; camera *; microphone *; display-capture *;',
 );
 echo html_writer::tag('iframe', '', $attr);
 
@@ -70,4 +70,4 @@
 $PAGE->requires->yui_module('moodle-local_kaltura-lticontainer', 'M.local_kaltura.init', array($params), null, true);
 $PAGE->requires->js(new moodle_url('/local/kaltura/js/kea_resize.js'));
 
-echo $OUTPUT->footer();
+echo $OUTPUT->footer();
diff --git a/local/kalturamediagallery/version.php b/local/kalturamediagallery/version.php
@@ -26,11 +26,11 @@
     die('Direct access to this script is forbidden.');
 }
 
-$plugin->version = 2021051701;
+$plugin->version = 2021051703;
 $plugin->component = 'local_kalturamediagallery';
-$plugin->release = 'Kaltura release 4.3.1';
+$plugin->release = 'Kaltura release 4.3.2';
 $plugin->requires = 2018120300;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'local_kaltura' => 2021051701
+    'local_kaltura' => 2021051703
 );
diff --git a/local/mymedia/version.php b/local/mymedia/version.php
@@ -25,11 +25,11 @@
     die('Direct access to this script is forbidden.');
 }
 
-$plugin->version = 2021051701;
+$plugin->version = 2021051703;
 $plugin->component = 'local_mymedia';
-$plugin->release = 'Kaltura release 4.3.1';
+$plugin->release = 'Kaltura release 4.3.2';
 $plugin->requires = 2018120300;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'local_kaltura' => 2021051701
+    'local_kaltura' => 2021051703
 );
diff --git a/mod/kalvidassign/version.php b/mod/kalvidassign/version.php
@@ -25,12 +25,12 @@
     die('Direct access to this script is forbidden.');
 }
 
-$plugin->version = 2021051701;
+$plugin->version = 2021051703;
 $plugin->component  = 'mod_kalvidassign';
-$plugin->release    = 'Kaltura release 4.3.1';
+$plugin->release    = 'Kaltura release 4.3.2';
 $plugin->requires = 2018120300;
 $plugin->cron       = 0;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'local_kaltura' => 2021051701,
+    'local_kaltura' => 2021051703,
 );
diff --git a/mod/kalvidres/version.php b/mod/kalvidres/version.php
@@ -25,12 +25,12 @@
     die('Direct access to this script is forbidden.');
 }
 
-$plugin->version = 2021051701;
+$plugin->version = 2021051703;
 $plugin->component  = 'mod_kalvidres';
-$plugin->release    = 'Kaltura release 4.3.1';
+$plugin->release    = 'Kaltura release 4.3.2';
 $plugin->requires = 2018120300;
 $plugin->cron       = 0;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'local_kaltura' => 2021051701
+    'local_kaltura' => 2021051703
 );