From 95d5dbe7f1a5e958b530bdc8852ab19ed69fe42e Mon Sep 17 00:00:00 2001 From: roileviK Date: Mon, 5 Jun 2023 11:47:58 +0300 Subject: [PATCH 1/6] ILMS-547 wrap in try catch to not crash new installations when no db is found --- local/kaltura/version.php | 46 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/local/kaltura/version.php b/local/kaltura/version.php index 46896df6..3eec5ff2 100644 --- a/local/kaltura/version.php +++ b/local/kaltura/version.php @@ -31,32 +31,32 @@ $plugin->requires = 2022112800; $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) {} From e3c7e5b6006f9cc803760108d95463a7b006db45 Mon Sep 17 00:00:00 2001 From: roileviK Date: Mon, 5 Jun 2023 11:50:52 +0300 Subject: [PATCH 2/6] ILMS-544 add display-capture to allow express capture screen share --- filter/kaltura/filter.php | 2 +- .../plugins/kalturamedia/ltibrowse_container.php | 2 +- .../moodle-local_kaltura-ltitinymcepanel-debug.js | 12 ++++++------ .../moodle-local_kaltura-ltitinymcepanel-min.js | 2 +- .../moodle-local_kaltura-ltitinymcepanel.js | 12 ++++++------ .../yui/src/ltitinymcepanel/js/ltitinymcepanel.js | 2 +- local/mymedia/mymedia.php | 2 +- mod/kalvidassign/renderer.php | 2 +- mod/kalvidassign/single_submission_form.php | 2 +- mod/kalvidres/mod_form.php | 2 +- mod/kalvidres/renderer.php | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/filter/kaltura/filter.php b/filter/kaltura/filter.php index a78209a7..8c4c1565 100644 --- a/filter/kaltura/filter.php +++ b/filter/kaltura/filter.php @@ -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' )); diff --git a/lib/editor/atto/plugins/kalturamedia/ltibrowse_container.php b/lib/editor/atto/plugins/kalturamedia/ltibrowse_container.php index b00b9900..eede4901 100644 --- a/lib/editor/atto/plugins/kalturamedia/ltibrowse_container.php +++ b/lib/editor/atto/plugins/kalturamedia/ltibrowse_container.php @@ -10,7 +10,7 @@ $ltibrowseUrl = new moodle_url('ltibrowse.php', $params); ?> -