From 6af3add7fd4bd4dea650df83b52c607e63612c9d Mon Sep 17 00:00:00 2001
From: ferishili <zamanifarbod2@gmail.com>
Date: Tue, 14 Jan 2025 12:46:20 +0100
Subject: [PATCH 01/14] coding style fixes

---
 ajax.php                              |  2 +-
 classes/local/opencast_manager.php    | 10 +++++-----
 classes/local/theme_manager.php       |  6 +++---
 classes/local/video_manager.php       | 12 ++++++------
 classes/privacy/provider.php          |  2 +-
 lib.php                               |  6 +++---
 settings.php                          |  4 ++--
 tests/behat/behat_local_och5pcore.php |  4 ++--
 version.php                           |  2 +-
 9 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/ajax.php b/ajax.php
index e9378ef..89f044c 100755
--- a/ajax.php
+++ b/ajax.php
@@ -76,7 +76,7 @@
     die;
 }
 
-$data = array();
+$data = [];
 
 switch ($action) {
     case 'courseVideos':
diff --git a/classes/local/opencast_manager.php b/classes/local/opencast_manager.php
index c249587..0ed6ee3 100644
--- a/classes/local/opencast_manager.php
+++ b/classes/local/opencast_manager.php
@@ -27,7 +27,7 @@
 
 use tool_opencast\local\api;
 use block_opencast\local\apibridge;
-use \tool_opencast\local\settings_api;
+use tool_opencast\local\settings_api;
 use oauth_helper;
 use moodle_exception;
 
@@ -138,7 +138,7 @@ public static function get_episode_tracks($identifier) {
         }
 
         // Initialise the sorted videos array.
-        $sortedvideos = array();
+        $sortedvideos = [];
 
         foreach ($videotracks as $videotrack) {
 
@@ -271,11 +271,11 @@ public static function generate_lti_params($courseid, $endpoint) {
         }
         $endpoint .= '/lti';
 
-        $helper = new oauth_helper(array('oauth_consumer_key'    => $consumerkey,
-                                        'oauth_consumer_secret' => $consumersecret));
+        $helper = new oauth_helper(['oauth_consumer_key'    => $consumerkey,
+                                        'oauth_consumer_secret' => $consumersecret]);
 
         // Set all necessary parameters.
-        $params = array();
+        $params = [];
         $params['oauth_version'] = '1.0';
         $params['oauth_nonce'] = $helper->get_nonce();
         $params['oauth_timestamp'] = $helper->get_timestamp();
diff --git a/classes/local/theme_manager.php b/classes/local/theme_manager.php
index 0a93737..d7af21c 100644
--- a/classes/local/theme_manager.php
+++ b/classes/local/theme_manager.php
@@ -52,7 +52,7 @@ public static function extend_themes($themes) {
         global $CFG;
 
         // Initialise the extended themes array list.
-        $extendedthemes = array();
+        $extendedthemes = [];
 
         // Gather all required contents.
         $renderercontent = file_get_contents($CFG->dirroot . '/local/och5pcore/lib/extension_contents/renderer_content.txt');
@@ -143,7 +143,7 @@ public static function extend_themes($themes) {
      */
     public static function remove_themes_extension($themes) {
         // Initialise the list of themes failed to remove extension.
-        $failedtoremoveextension = array();
+        $failedtoremoveextension = [];
 
         foreach ($themes as $themename) {
             // Get the directory of the theme.
@@ -214,7 +214,7 @@ public static function cleaup_themes_extension() {
         // We define the clean-up flags here.
         // Start and End of a flag help to locate the codes better.
         $cleanupflags = [
-            ['start' => '//#och5p_core', 'end' => '//#end_och5p_core']
+            ['start' => '//#och5p_core', 'end' => '//#end_och5p_core'],
         ];
 
         foreach ($installedthemes as $themename => $themedir) {
diff --git a/classes/local/video_manager.php b/classes/local/video_manager.php
index 2888f5e..2cbb3cb 100644
--- a/classes/local/video_manager.php
+++ b/classes/local/video_manager.php
@@ -54,7 +54,7 @@ public static function prepare_course_videos($courseid) {
         }
 
         // Initialise options array with an empty option.
-        $options = array('<option value="">-</option>');
+        $options = ['<option value="">-</option>'];
 
         // Loop through videos if there is any.
         foreach ($coursevideos->videos as $video) {
@@ -77,11 +77,11 @@ public static function get_video_flavors_with_qualities($identifier) {
         $sortedvideos = opencast_manager::get_episode_tracks($identifier);
 
         // Initialise options array with an empty option tag.
-        $options = array('<option value="">-</option>');
+        $options = ['<option value="">-</option>'];
 
         foreach ($sortedvideos as $flavor => $qualities) {
             // Extract type and mime from the item.
-            $obj = array();
+            $obj = [];
             $obj['type'] = ((strpos($flavor, 'presenter/delivery') !== false) ?
                 get_string('flavor:presenter', 'local_och5pcore') :
                 get_string('flavor:presentation', 'local_och5pcore'));
@@ -92,8 +92,8 @@ public static function get_video_flavors_with_qualities($identifier) {
             $optiontext = "{$obj['type']} ({$obj['mime']})";
 
             // Extract and place the qualities.
-            $optionvalue = array();
-            $qualitiesarray = array();
+            $optionvalue = [];
+            $qualitiesarray = [];
             foreach ($qualities as $quality => $video) {
                 $qualitydatastring = '{"quality": "' . $quality . '", "url": "' . $video['url'] .
                     '", "mime": "' . $match[1] . '", "id": "' . $video['id'] .
@@ -130,7 +130,7 @@ public static function get_course_lists() {
         // Get the enrolled courses.
         $courses = enrol_get_my_courses();
         // Initialise options array with an empty option tag.
-        $options = array('<option value="">-</option>');
+        $options = ['<option value="">-</option>'];
         foreach ($courses as $course) {
             $context = \context_course::instance($course->id);
             if (!is_null($context) && has_capability('block/opencast:viewunpublishedvideos', $context)) {
diff --git a/classes/privacy/provider.php b/classes/privacy/provider.php
index c8adad2..ac5ebe6 100644
--- a/classes/privacy/provider.php
+++ b/classes/privacy/provider.php
@@ -41,7 +41,7 @@ class provider implements \core_privacy\local\metadata\null_provider {
      *
      * @return  string
      */
-    public static function get_reason() : string {
+    public static function get_reason(): string {
         return 'privacy:metadata';
     }
 }
diff --git a/lib.php b/lib.php
index 255c17a..029687b 100755
--- a/lib.php
+++ b/lib.php
@@ -33,9 +33,9 @@ function local_och5pcore_extend_themes() {
     $returnurl = new moodle_url('/admin/settings.php?section=local_och5pcore_settings');
 
     $config = get_config('local_och5pcore', 'extended_themes');
-    $selectedthemes = !empty($config) ? explode(',', $config) : array();
+    $selectedthemes = !empty($config) ? explode(',', $config) : [];
 
-    $installedthemes = core_component::get_plugin_list('theme');
+    $installedthemes = \core\component::get_plugin_list('theme');
 
     $unselectedthemes = array_diff(array_keys($installedthemes), $selectedthemes);
 
@@ -43,7 +43,7 @@ function local_och5pcore_extend_themes() {
         $extendedthemes = theme_manager::extend_themes($selectedthemes);
 
         if ($diffs = array_diff($selectedthemes, $extendedthemes)) {
-            $themenames = array();
+            $themenames = [];
             foreach ($diffs as $diff) {
                 $themenames[] = ucfirst(str_replace('_', ' ', $diff));
             }
diff --git a/settings.php b/settings.php
index 61155ff..91108b7 100755
--- a/settings.php
+++ b/settings.php
@@ -41,7 +41,7 @@
             get_string('setting_extended_themes_header', 'local_och5pcore'),
         ''));
 
-    $availablethemes = array();
+    $availablethemes = [];
 
     foreach (\core_component::get_plugin_list('theme') as $name => $dir) {
         $availablethemes[$name] = ucfirst(str_replace('_', ' ', $name));
@@ -51,7 +51,7 @@
         'local_och5pcore/extended_themes',
         get_string('setting_extended_themes', 'local_och5pcore'),
         get_string('setting_extended_themes_desc', 'local_och5pcore'),
-        array(),
+        [],
         $availablethemes
     );
 
diff --git a/tests/behat/behat_local_och5pcore.php b/tests/behat/behat_local_och5pcore.php
index 6e6b142..d88982c 100644
--- a/tests/behat/behat_local_och5pcore.php
+++ b/tests/behat/behat_local_och5pcore.php
@@ -59,7 +59,7 @@ public function breakpoint_in_och5pcore() {
      * @Given /^I setup the opencast video block for the course with och5pcore$/
      */
     public function i_setup_the_opencast_video_block_for_the_course_with_och5pcore() {
-        $courses = core_course_category::search_courses(array('search' => 'Course 1'));
+        $courses = core_course_category::search_courses(['search' => 'Course 1']);
 
         // When we are using stable.opencast.org, the series Blender Foundation Productions with id: ID-blender-foundation,
         // is by default avaialble. Therefore, and as for make things simpler, we use this series in our course.
@@ -84,7 +84,7 @@ public function i_get_the_latest_h5p_content_types() {
             'minorVersion' => 26,
             'patchVersion' => 6,
             'example' => "https://h5p.org/interactive-video",
-            'tutorial' => "https://h5p.org/tutorial-interactive-video"
+            'tutorial' => "https://h5p.org/tutorial-interactive-video",
         ];
         $res = $core->fetch_content_type($library);
     }
diff --git a/version.php b/version.php
index 26a844b..dab9ed9 100755
--- a/version.php
+++ b/version.php
@@ -32,5 +32,5 @@
 $plugin->requires = 2020110900; // Only Moodle v3.10 and above.
 $plugin->dependencies = [
     'tool_opencast' => 2023030100,
-    'block_opencast' => 2023030100
+    'block_opencast' => 2023030100,
 ];

From 9425132b156e01755e55c0f5c7dc8bcc74f8b7f1 Mon Sep 17 00:00:00 2001
From: ferishili <zamanifarbod2@gmail.com>
Date: Tue, 14 Jan 2025 12:46:33 +0100
Subject: [PATCH 02/14] lang string sorting

---
 lang/en/local_och5pcore.php | 38 ++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lang/en/local_och5pcore.php b/lang/en/local_och5pcore.php
index 3051a14..96c3f5f 100755
--- a/lang/en/local_och5pcore.php
+++ b/lang/en/local_och5pcore.php
@@ -24,32 +24,32 @@
  */
 defined('MOODLE_INTERNAL') || die;
 
+$string['behat_error_unabletofind_element'] = 'Unable to locate element in the page';
+$string['extended_error'] = 'Unable to extend theme(s): %s';
+$string['flavor:presentation'] = 'Presentation';
+$string['flavor:presenter'] = 'Presenter';
+$string['header_text'] = 'Opencast Videos';
+$string['invalidtoken_error'] = 'Invalid token - token not found';
+$string['label_course'] = 'Select a course';
+$string['label_video_file'] = 'Select a video file';
+$string['label_video_flavor'] = 'Select the video\'s flavor and quality';
+$string['no_action_error'] = 'Undefined action.';
+$string['no_admin_user_error'] = 'Only admins can access this feature.';
+$string['no_lti_config_error'] = 'Unable to perform Opencast LTI authentication in H5P';
+$string['no_tracks_error'] = 'Invalid video data.';
+$string['no_view_error'] = 'The opencast view capability is not granted.';
 $string['pluginname'] = 'H5P Opencast Extension (Core)';
-$string['setting_extended_themes_header'] = 'Themes';
+$string['privacy:metadata'] = 'The H5P Opencast Extension (Core) only works as an integration of Opencast into H5P and store no user data.';
+$string['search_episode_error'] = 'Unable to get video data from opencast.';
 $string['setting_extended_themes'] = 'Available themes to extend';
 $string['setting_extended_themes_desc'] = 'Select the themes that should be extended to show Opencast Videos in H5P Interactive videos. Hold down the Ctrl key to select multiple themes. Unselecting a theme will remove the previous extension.';
-$string['setting_lti_header'] = 'LTI Configuration';
-$string['setting_lti_header_desc'] = 'When "Securing Static Files" in Opencast configuration is enabled, it is necessary to use LTI authentication.';
+$string['setting_extended_themes_header'] = 'Themes';
 $string['setting_lti_consumerkey'] = 'LTI Consumer key';
 $string['setting_lti_consumerkey_desc'] = 'LTI Consumer key for the opencast.';
 $string['setting_lti_consumersecret'] = 'LTI Consumer Secret';
 $string['setting_lti_consumersecret_desc'] = 'LTI Consumer Secret for the opencast.';
-$string['extended_error'] = 'Unable to extend theme(s): %s';
+$string['setting_lti_header'] = 'LTI Configuration';
+$string['setting_lti_header_desc'] = 'When "Securing Static Files" in Opencast configuration is enabled, it is necessary to use LTI authentication.';
 $string['unextended_error'] = 'Unable to unextend theme(s): %s';
-$string['flavor:presenter'] = 'Presenter';
-$string['flavor:presentation'] = 'Presentation';
 $string['video_course_error'] = 'An error occured while obtaining Opencast course videos.';
-$string['search_episode_error'] = 'Unable to get video data from opencast.';
-$string['no_tracks_error'] = 'Invalid video data.';
-$string['no_admin_user_error'] = 'Only admins can access this feature.';
-$string['no_action_error'] = 'Undefined action.';
-$string['no_view_error'] = 'The opencast view capability is not granted.';
-$string['no_lti_config_error'] = 'Unable to perform Opencast LTI authentication in H5P';
-$string['invalidtoken_error'] = 'Invalid token - token not found';
-$string['privacy:metadata'] = 'The H5P Opencast Extension (Core) only works as an integration of Opencast into H5P and store no user data.';
-$string['label_video_file'] = 'Select a video file';
-$string['label_video_flavor'] = 'Select the video\'s flavor and quality';
-$string['label_course'] = 'Select a course';
-$string['header_text'] = 'Opencast Videos';
-$string['behat_error_unabletofind_element'] = 'Unable to locate element in the page';
 

From d0f058078c151113a083b48b2c3794ea8c8373c8 Mon Sep 17 00:00:00 2001
From: ferishili <zamanifarbod2@gmail.com>
Date: Tue, 14 Jan 2025 12:48:13 +0100
Subject: [PATCH 03/14] core\component instead of core_component

---
 classes/local/theme_manager.php | 8 +++-----
 db/uninstall.php                | 2 +-
 settings.php                    | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/classes/local/theme_manager.php b/classes/local/theme_manager.php
index d7af21c..2d9444f 100644
--- a/classes/local/theme_manager.php
+++ b/classes/local/theme_manager.php
@@ -25,8 +25,6 @@
 
 namespace local_och5pcore\local;
 
-use core_component;
-
 /**
  * Theme Manager class contains all related functions to extend and unextend the themes.
  *
@@ -68,7 +66,7 @@ public static function extend_themes($themes) {
         foreach ($themes as $themename) {
 
             // Get the directory of the theme.
-            $dir = core_component::get_plugin_directory('theme', $themename);
+            $dir = \core\component::get_plugin_directory('theme', $themename);
 
             // Replace the renderer class name with the theme name in the renderer content.
             $renderercontent = str_replace('local_och5pcore_h5p_renderer',
@@ -147,7 +145,7 @@ public static function remove_themes_extension($themes) {
 
         foreach ($themes as $themename) {
             // Get the directory of the theme.
-            $dir = core_component::get_plugin_directory('theme', $themename);
+            $dir = \core\component::get_plugin_directory('theme', $themename);
 
             // Step 1: remove extension from theme renderers file.
             // If the theme has the renderer file.
@@ -210,7 +208,7 @@ public static function remove_themes_extension($themes) {
      */
     public static function cleaup_themes_extension() {
         // Get the installed themes.
-        $installedthemes = core_component::get_plugin_list('theme');
+        $installedthemes = \core\component::get_plugin_list('theme');
         // We define the clean-up flags here.
         // Start and End of a flag help to locate the codes better.
         $cleanupflags = [
diff --git a/db/uninstall.php b/db/uninstall.php
index 6d46995..b1097f7 100755
--- a/db/uninstall.php
+++ b/db/uninstall.php
@@ -30,7 +30,7 @@
  */
 function xmldb_local_och5pcore_uninstall() {
 
-    $themes = core_component::get_plugin_list('theme');
+    $themes = \core\component::get_plugin_list('theme');
     if (count($themes) > 0) {
         theme_manager::remove_themes_extension(array_keys($themes));
     }
diff --git a/settings.php b/settings.php
index 91108b7..761cde9 100755
--- a/settings.php
+++ b/settings.php
@@ -43,7 +43,7 @@
 
     $availablethemes = [];
 
-    foreach (\core_component::get_plugin_list('theme') as $name => $dir) {
+    foreach (\core\component::get_plugin_list('theme') as $name => $dir) {
         $availablethemes[$name] = ucfirst(str_replace('_', ' ', $name));
     }
 

From df1c41be4a2417f1229e44d5c50cdb16cbb0c2b2 Mon Sep 17 00:00:00 2001
From: ferishili <zamanifarbod2@gmail.com>
Date: Tue, 14 Jan 2025 12:52:51 +0100
Subject: [PATCH 04/14] remove using unnecessary namespaces

---
 ajax.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ajax.php b/ajax.php
index 89f044c..3871850 100755
--- a/ajax.php
+++ b/ajax.php
@@ -26,8 +26,6 @@
 use local_och5pcore\local\video_manager;
 use local_och5pcore\local\opencast_manager;
 use core_h5p\factory;
-use moodle_exception;
-use context_course;
 
 define('AJAX_SCRIPT', true);
 require(__DIR__ . '/../../config.php');

From 4e4b34aadd9803a11c0d19b879152485fc102ab8 Mon Sep 17 00:00:00 2001
From: ferishili <zamanifarbod2@gmail.com>
Date: Tue, 14 Jan 2025 14:50:42 +0100
Subject: [PATCH 05/14] js cleanup

---
 lib/js/H5PEditor.AV.js | 103 +++++++++++++++++++++--------------------
 lib/js/H5PRunLTI.js    |   3 +-
 2 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/lib/js/H5PEditor.AV.js b/lib/js/H5PEditor.AV.js
index 1ed27e0..cf60307 100755
--- a/lib/js/H5PEditor.AV.js
+++ b/lib/js/H5PEditor.AV.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
 (function ($) {
 
     if (window.H5PEditor === undefined) {
@@ -39,12 +40,12 @@
             return returnArray;
         } else {
             return urlParams.get(params);
-        }        
+        }
     }
 
     function getOpencastActionUrl(action) {
         var contextid = getUrlParamValues('contextid');
-        
+
         var ocAjaxPath = H5PEditor.ajaxPath.replace('/h5p', '/local/och5pcore');
 
         var OCActionUrl = ocAjaxPath + action;
@@ -86,7 +87,7 @@
 
         return result;
     }
-    
+
     function getCourseVideosInsertDropdown() {
         var action = getUrlParamValues('contextid') == 1 ? 'courseList' : 'courseVideos';
         var dropdownContent = opencastAjaxCallSync(action);
@@ -124,13 +125,13 @@
                                 '<select id="h5p-oc-video-quality" class="h5peditor-select h5p-oc-videos-quality"></select>' +
                             '</div>' +
                         '</div>' +
-                        '<div class="h5p-oc-search-error"></div>' + 
+                        '<div class="h5p-oc-search-error"></div>' +
                     '</div>'+
                 '</div>';
     }
 
     H5PEditor.AV.createAdd = function (type, id, hasDescription) {
-        var InsertContent = 
+        var InsertContent =
         '<div class="h5p-dialog-box">' +
         H5PEditor.AV.createTabContent('BasicFileUpload', type) +
         '</div>' +
@@ -158,7 +159,7 @@
         '</div>' +
         '</div></div>';
     };
-    
+
     /**
     * Append widget to given wrapper.
     *
@@ -167,36 +168,36 @@
     H5PEditor.AV.prototype.appendTo = function ($wrapper) {
         var self = this;
         const id = ns.getNextFieldId(this.field);
-        
+
         var imageHtml =
         '<ul class="file list-unstyled"></ul>' +
         (self.field.widgetExtensions ? H5PEditor.AV.createTabbedAdd(self.field.type, self.field.widgetExtensions, id, self.field.description !== undefined) : H5PEditor.AV.createAdd(self.field.type, id, self.field.description !== undefined))
-        
+
         if (!this.field.disableCopyright) {
             imageHtml += '<a class="h5p-copyright-button" href="#">' + H5PEditor.t('core', 'editCopyright') + '</a>';
         }
-        
+
         imageHtml += '<div class="h5p-editor-dialog">' +
         '<a href="#" class="h5p-close" title="' + H5PEditor.t('core', 'close') + '"></a>' +
         '</div>';
-        
+
         var html = H5PEditor.createFieldMarkup(this.field, imageHtml, id);
         var $container = $(html).appendTo($wrapper);
-        
+
         this.$files = $container.children('.file');
         this.$add = $container.children('.h5p-add-file').click(function () {
             self.$addDialog.addClass('h5p-open');
         });
-        
+
         // Tabs that are hard-coded into this widget. Any other tab must be an extension.
         const TABS = {
             UPLOAD: 0,
             INPUT: 1
         };
-        
+
         // The current active tab
         let activeTab = TABS.UPLOAD;
-        
+
         /**
         * @param {number} tab
         * @return {boolean}
@@ -204,7 +205,7 @@
         const isExtension = function (tab) {
             return tab > TABS.INPUT; // Always last tab
         };
-        
+
         /**
         * Toggle the currently active tab.
         */
@@ -213,16 +214,16 @@
             if (isExtension(activeTab)) {
                 tabInstances[activeTab].pause();
             }
-            
+
             // Update tab
             this.parentElement.querySelector('.selected').classList.remove('selected');
             this.classList.add('selected');
-            
+
             // Update tab panel
             const el = document.getElementById(this.getAttribute('aria-controls'));
             el.parentElement.querySelector('.av-tabpanel:not([hidden])').setAttribute('hidden', '');
             el.removeAttribute('hidden');
-            
+
             // Set active tab index
             for (let i = 0; i < el.parentElement.children.length; i++) {
                 if (el.parentElement.children[i] === el) {
@@ -230,7 +231,7 @@
                     break;
                 }
             }
-            
+
             // Toggle insert button disabled
             if (activeTab === TABS.UPLOAD) {
                 self.$insertButton[0].disabled = true;
@@ -242,7 +243,7 @@
                 self.$insertButton[0].disabled = !tabInstances[activeTab].hasMedia();
             }
         }
-        
+
         /**
         * Switch focus between the buttons in the tablist
         */
@@ -253,7 +254,7 @@
                 el.focus();
             }
         }
-        
+
         // Register event listeners to tab DOM elements
         $container.find('.av-tab').click(toggleTab).keydown(function (e) {
             if (e.which === 13 || e.which === 32) { // Enter or Space
@@ -269,15 +270,15 @@
                 e.preventDefault();
             }
         });
-        
+
         this.$addDialog = this.$add.next().children().first();
-        
+
         // Prepare to add the extra tab instances
         const tabInstances = [null, null]; // Add nulls for hard-coded tabs
         self.tabInstances = tabInstances;
-        
+
         if (self.field.widgetExtensions) {
-            
+
             /**
             * @param {string} type Constructor name scoped inside this widget
             * @param {number} index
@@ -292,7 +293,7 @@
                 });
                 tabInstances.push(tabInstance);
             }
-            
+
             // Append extra tabs
             for (let i = 0; i < self.field.widgetExtensions.length; i++) {
                 if (H5PEditor.AV[self.field.widgetExtensions[i]]) {
@@ -300,13 +301,13 @@
                 }
             }
         }
-        
+
         var $url = this.$url = this.$addDialog.find('.h5p-file-url');
         this.$addDialog.find('.h5p-cancel').click(function () {
             self.updateIndex = undefined;
             self.closeDialog();
         });
-        
+
         this.$addDialog.find('.h5p-file-drop-upload')
         .addClass('has-advanced-upload')
         .on('drag dragstart dragend dragover dragenter dragleave drop', function (e) {
@@ -417,13 +418,13 @@
                     self.useUrl(url);
                 }
             }
-            
+
             self.closeDialog();
         });
-        
-        
+
+
         this.$errors = $container.children('.h5p-errors');
-        
+
         if (this.params !== undefined) {
             for (var i = 0; i < this.params.length; i++) {
                 this.addFile(i);
@@ -432,17 +433,17 @@
         else {
             $container.find('.h5p-copyright-button').addClass('hidden');
         }
-        
+
         var $dialog = $container.find('.h5p-editor-dialog');
         $container.find('.h5p-copyright-button').add($dialog.find('.h5p-close')).click(function () {
             $dialog.toggleClass('h5p-open');
             return false;
         });
-        
+
         ns.File.addCopyright(self, $dialog, function (field, value) {
             self.setCopyright(value);
         });
-        
+
     };
 
     /**
@@ -491,7 +492,7 @@
                 }
             }
         }
-        
+
         var file = {
             path: url,
             mime: this.field.type + '/' + (mime ? mime : 'unknown'),
@@ -514,7 +515,7 @@
         var index = (this.updateIndex !== undefined ? this.updateIndex : this.params.length);
         this.params[index] = file;
         this.addFile(index);
-        
+
         for (i = 0; i < this.changes.length; i++) {
             this.changes[i](file);
         }
@@ -538,7 +539,7 @@
             return provider.name === 'YouTube';
         })[0].regexp;
         var isYoutube = file.path && file.path.match(youtubeRegex);
-        
+
         var isOpencast = (file.id && file.org && file.org == 'opencast') ? true : false;
 
         if (!isOpencast) { //double check on edit part...
@@ -552,7 +553,7 @@
                 }
             });
         }
-        
+
 
         // Only allow single source if YouTube
         if (isYoutube) {
@@ -572,14 +573,14 @@
 
         this.$add.toggleClass('hidden', !!isYoutube);
         // this.$add.toggleClass('hidden', !!isOpencast);
-        
+
         // If updating remove and recreate element
         if (that.updateIndex !== undefined) {
             var $oldFile = this.$files.children(':eq(' + index + ')');
             $oldFile.remove();
             this.updateIndex = undefined;
         }
-        
+
         // Create file with customizable quality if enabled and not youtube
         if ((this.field.enableCustomQualityLabel === true && !isYoutube) || isOpencast) {
             var thumbnail_mimetype = isOpencast ?  'Opencast' : file.mime.split('/')[1];
@@ -604,7 +605,7 @@
             '</div>' +
             '</li>';
         }
-        
+
         // Insert file element in appropriate order
         var $file = $(fileHtml);
         if (index >= that.$files.children().length) {
@@ -613,9 +614,9 @@
         else {
             $file.insertBefore(that.$files.children().eq(index));
         }
-        
+
         this.$add.parent().find('.h5p-copyright-button').removeClass('hidden');
-        
+
         // Handle thumbnail click
         $file
         .children('.h5p-thumbnail')
@@ -626,7 +627,7 @@
             if (isOpencast) {
 
                 /* It will create confusion since several qualities will be added to the file list automatically
-                    therefore, it will be prevented to edit opencast videos 
+                    therefore, it will be prevented to edit opencast videos
                 */
                 return;
             } else {
@@ -634,7 +635,7 @@
             }
             that.updateIndex = index;
         });
-        
+
         // Handle remove button click
         $file
         .find('.h5p-remove')
@@ -642,23 +643,23 @@
             if (that.$add.is(':visible')) {
                 confirmRemovalDialog.show($file.offset().top);
             }
-            
+
             return false;
         });
-        
+
         // on input update
         $file
         .find('input')
         .change(function () {
             file.metadata = { qualityName: $(this).val() };
         });
-        
+
         // Create remove file dialog
         var confirmRemovalDialog = new H5P.ConfirmationDialog({
             headerText: H5PEditor.t('core', 'removeFile'),
             dialogText: H5PEditor.t('core', 'confirmRemoval', {':type': 'file'})
         }).appendTo(document.body);
-        
+
         // Remove file on confirmation
         confirmRemovalDialog.on('confirmed', function () {
             that.removeFileWithElement($file);
@@ -667,5 +668,5 @@
             }
         });
     };
-    
+
 })(H5P.jQuery);
diff --git a/lib/js/H5PRunLTI.js b/lib/js/H5PRunLTI.js
index b38cb48..393c867 100644
--- a/lib/js/H5PRunLTI.js
+++ b/lib/js/H5PRunLTI.js
@@ -1,3 +1,4 @@
+/* eslint-disable */
 (function ($) {
     runLti();
 
@@ -17,7 +18,7 @@
     }
 
     function performLti(formName, ltiParams) {
-        
+
         var endpoint = ltiParams.endpoint;
         delete ltiParams.endpoint;
         var ltiLaunchForm = H5P.jQuery('<form action="' + endpoint + '" id="' + formName +

From 7ea58d823be53d5319a36cb1efdf0ed4f42307a2 Mon Sep 17 00:00:00 2001
From: ferishili <zamanifarbod2@gmail.com>
Date: Wed, 15 Jan 2025 09:54:00 +0100
Subject: [PATCH 06/14] upgrade to use lti credentials from tool plugin

---
 classes/local/opencast_manager.php            | 54 ++++++++++++++++--
 db/upgrade.php                                | 56 +++++++++++++++++++
 lang/en/local_och5pcore.php                   |  4 ++
 lib/js/H5PRunLTI.js                           |  4 +-
 settings.php                                  | 29 +++++++---
 tests/behat/local_och5pcore_add_video.feature |  5 +-
 6 files changed, 134 insertions(+), 18 deletions(-)
 create mode 100644 db/upgrade.php

diff --git a/classes/local/opencast_manager.php b/classes/local/opencast_manager.php
index 0ed6ee3..eb80856 100644
--- a/classes/local/opencast_manager.php
+++ b/classes/local/opencast_manager.php
@@ -220,24 +220,30 @@ public static function get_opencast_search_service_api_instance($returnbaseurl =
 
     /**
      * Gets LTI parameters to perform the LTI authentication.
+     * It only support the default opencast instance.
      *
      * @param int $courseid id of the course.
      * @return array lti parameters.
      */
     public static function get_lti_params($courseid) {
+        // Check if it is configured to use LTI.
+        $uselti = get_config('local_och5pcore', 'uselti');
+        if (!$uselti) {
+            return [];
+        }
         $params = [];
         // Get the endpoint url of the default oc instance.
         $defaultocinstanceid = settings_api::get_default_ocinstance()->id;
         $mainltiendpoint = settings_api::get_apiurl($defaultocinstanceid);
         // Generate lti params for the main oc instance.
-        $params['main'] = self::generate_lti_params($courseid, $mainltiendpoint);
+        $params['main'] = self::generate_lti_params($defaultocinstanceid, $courseid, $mainltiendpoint);
         // Get the endpoint url of the search node instance.
         $searchnodeltiendpoint = self::get_opencast_search_service_api_instance(true);
 
         // Check if the opencast uses different nodes.
         if ($mainltiendpoint != $searchnodeltiendpoint) {
             // Generate lti params for the search node.
-            $params['search'] = self::generate_lti_params($courseid, $searchnodeltiendpoint);
+            $params['search'] = self::generate_lti_params($defaultocinstanceid, $courseid, $searchnodeltiendpoint);
         }
 
         return $params;
@@ -246,19 +252,21 @@ public static function get_lti_params($courseid) {
     /**
      * generate LTI parameters to perform the LTI authentication.
      *
+     * @param int $ocinstanceid opencast instance id.
      * @param int $courseid id of the course.
      * @param string $endpoint the lti endpoint.
      * @return array lti parameters.
      */
-    public static function generate_lti_params($courseid, $endpoint) {
+    public static function generate_lti_params($ocinstanceid, $courseid, $endpoint) {
         global $CFG, $USER;
 
         // Get the course object.
         $course = get_course($courseid);
 
         // Get configured consumerkey and consumersecret.
-        $consumerkey = get_config('local_och5pcore', 'lticonsumerkey');
-        $consumersecret = get_config('local_och5pcore', 'lticonsumersecret');
+        $lticredentials = self::get_lti_credentials($ocinstanceid);
+        $consumerkey = $lticredentials['consumerkey'];
+        $consumersecret = $lticredentials['consumersecret'];
 
         // Check if all requirements are correctly configured.
         if (empty($consumerkey) || empty($consumersecret) || empty($endpoint)) {
@@ -321,4 +329,40 @@ public static function generate_lti_params($courseid, $endpoint) {
         $params['endpoint'] = $endpoint;
         return $params;
     }
+
+    /**
+     * Checks if LTI credentials are configured for a given Opencast instance.
+     *
+     * This function verifies whether both the LTI consumer key and consumer secret
+     * are set for the specified Opencast instance.
+     *
+     * @param int $ocinstanceid The ID of the Opencast instance to check, default 0 falls back to default instance id.
+     *
+     * @return bool Returns true if both LTI consumer key and secret are configured,
+     *              false otherwise.
+     */
+    public static function is_lti_credentials_configured(int $ocinstanceid = 0) {
+        if (empty($ocinstanceid)) {
+            $ocinstanceid = settings_api::get_default_ocinstance()->id;
+        }
+        $lticredentials = self::get_lti_credentials($ocinstanceid);
+        return !empty($lticredentials['consumerkey']) && !empty($lticredentials['consumersecret']);
+    }
+
+    /**
+     * Retrieves the LTI consumer key and consumer secret for a given Opencast instance ID.
+     *
+     * @param int $ocinstanceid The ID of the Opencast instance, default 0 falls back to default instance id.
+     *
+     * @return array An associative array containing the 'consumerkey' and 'consumersecret' for the given Opencast instance.
+     *               If the credentials are not found, an empty array is returned.
+     */
+    public static function get_lti_credentials(int $ocinstanceid = 0) {
+        if (empty($ocinstanceid)) {
+            $ocinstanceid = settings_api::get_default_ocinstance()->id;
+        }
+        $lticonsumerkey = settings_api::get_lticonsumerkey($ocinstanceid);
+        $lticonsumersecret = settings_api::get_lticonsumersecret($ocinstanceid);
+        return ['consumerkey' => $lticonsumerkey, 'consumersecret' => $lticonsumersecret];
+    }
 }
diff --git a/db/upgrade.php b/db/upgrade.php
new file mode 100644
index 0000000..bf12441
--- /dev/null
+++ b/db/upgrade.php
@@ -0,0 +1,56 @@
+<?php
+// 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 <http://www.gnu.org/licenses/>.
+
+/**
+ * Local och5pcore upgrade.
+ *
+ * @package    local_och5pcore
+ * @copyright  2025 Farbod Zamani Boroujeni, ELAN e.V.
+ * @author     Farbod Zamani Boroujeni <zamani@elan-ev.de>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+use local_och5pcore\local\opencast_manager;
+
+/**
+ * Local och5pcore upgrade.
+ *
+ * @package    local_och5pcore
+ * @copyright  2025 Farbod Zamani Boroujeni, ELAN e.V.
+ * @author     Farbod Zamani Boroujeni <zamani@elan-ev.de>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+function xmldb_local_och5pcore_upgrade($oldversion) {
+
+    if ($oldversion < 2023042802) {
+
+        // Remove old LTI configurations of the plugin and bring the tool_opencast LTI configuration in the game.
+        $hasconfiguredlti = opencast_manager::is_lti_credentials_configured();
+
+        // Set the uselti configuration to use the LTI configuration from tool_opencast.
+        set_config('uselti', $hasconfiguredlti, 'local_och5pcore');
+
+        // Remove the old LTI configurations.
+        unset_config('lticonsumerkey', 'local_och5pcore');
+        unset_config('lticonsumersecret', 'local_och5pcore');
+
+        // OCH5PCore savepoint reached.
+        upgrade_plugin_savepoint(true, 2023042802, 'local', 'och5pcore');
+    }
+
+    return true;
+}
diff --git a/lang/en/local_och5pcore.php b/lang/en/local_och5pcore.php
index 96c3f5f..948a389 100755
--- a/lang/en/local_och5pcore.php
+++ b/lang/en/local_och5pcore.php
@@ -50,6 +50,10 @@
 $string['setting_lti_consumersecret_desc'] = 'LTI Consumer Secret for the opencast.';
 $string['setting_lti_header'] = 'LTI Configuration';
 $string['setting_lti_header_desc'] = 'When "Securing Static Files" in Opencast configuration is enabled, it is necessary to use LTI authentication.';
+$string['setting_uselti'] = 'Enable LTI authentication';
+$string['setting_uselti_desc'] = 'When enabled, selected Opencast videos will be delivered through LTI authentication. This is typically used alongside Secure Static Files in Opencast for enhanced security.';
+$string['setting_uselti_nolti_desc'] = 'To enable LTI Authentication for Opencast, you must configure the required credentials (Consumer Key and Consumer Secret) for the default instance in Opencast API plugin. Please do so via this link: {$a}';
+$string['setting_uselti_tool_opencast_link_name'] = 'Opencast API Settings';
 $string['unextended_error'] = 'Unable to unextend theme(s): %s';
 $string['video_course_error'] = 'An error occured while obtaining Opencast course videos.';
 
diff --git a/lib/js/H5PRunLTI.js b/lib/js/H5PRunLTI.js
index 393c867..18456f7 100644
--- a/lib/js/H5PRunLTI.js
+++ b/lib/js/H5PRunLTI.js
@@ -4,14 +4,14 @@
 
     function runLti() {
         var opencastLtiParams = opencastLTIParamsAjaxCallSync();
-        var ltiParams = opencastLtiParams.main;
+        var ltiParams = opencastLtiParams?.main ?? null;
         // Does not perform the LTI, in case the ltiParams is not configured in the admin or there is some error!
         if (ltiParams == null || !ltiParams) {
             return;
         }
         performLti('ltiLaunchForm', ltiParams);
 
-        var searchNodeLtiParams = opencastLtiParams.search ? opencastLtiParams.search : null;
+        var searchNodeLtiParams = opencastLtiParams?.search ?? null;
         if (searchNodeLtiParams) {
             performLti('searchNodeLtiLaunchForm', searchNodeLtiParams);
         }
diff --git a/settings.php b/settings.php
index 761cde9..50e054c 100755
--- a/settings.php
+++ b/settings.php
@@ -65,15 +65,26 @@
             get_string('setting_lti_header_desc', 'local_och5pcore')
         ));
 
-    $lticonsumerkeysetting = new admin_setting_configtext('local_och5pcore/lticonsumerkey',
-        get_string('setting_lti_consumerkey', 'local_och5pcore'),
-        get_string('setting_lti_consumerkey_desc', 'local_och5pcore'), '');
-    $settings->add($lticonsumerkeysetting);
-
-    $lticonsumersecretsetting = new admin_setting_configpasswordunmask('local_och5pcore/lticonsumersecret',
-        get_string('setting_lti_consumersecret', 'local_och5pcore'),
-        get_string('setting_lti_consumersecret_desc', 'local_och5pcore'), '');
-    $settings->add($lticonsumersecretsetting);
+    // Make sure the lti credentials are set before offering any settings!
+    $hasconfiguredlti = opencast_manager::is_lti_credentials_configured();
+
+    // Providing use lti option, when the consumer key and secret are configured in tool_opencast.
+    if ($hasconfiguredlti) {
+        $settings->add(new admin_setting_configcheckbox('local_och5pcore/uselti',
+            get_string('setting_uselti', 'local_och5pcore'),
+            get_string('setting_uselti_desc', 'local_och5pcore'), 0));
+    } else {
+        // Otherwise, we will inform the admin about this setting with extra info to configure this if needed.
+        $path = '/admin/category.php?category=tool_opencast';
+        $toolopencasturl = new \moodle_url($path);
+        $link = \html_writer::link($toolopencasturl,
+            get_string('setting_uselti_tool_opencast_link_name', 'local_och5pcore'), ['target' => '_blank']);
+        $description = get_string('setting_uselti_nolti_desc', 'local_och5pcore', $link);
+        $settings->add(
+            new admin_setting_configempty('local_och5pcore/uselti',
+                get_string('setting_uselti', 'local_och5pcore'),
+                $description));
+    }
 
     $ADMIN->add('localplugins', $settings);
 }
diff --git a/tests/behat/local_och5pcore_add_video.feature b/tests/behat/local_och5pcore_add_video.feature
index ce981cc..003b52a 100644
--- a/tests/behat/local_och5pcore_add_video.feature
+++ b/tests/behat/local_och5pcore_add_video.feature
@@ -18,8 +18,9 @@ Feature: Add Opencast Video into H5P Core
       | apiusername_1       | admin                                                         | tool_opencast   |
       | apipassword_1       | opencast                                                      | tool_opencast   |
       | ocinstances         | [{"id":1,"name":"Default","isvisible":true,"isdefault":true}] | tool_opencast   |
-      | lticonsumerkey      | CONSUMERKEY                                                   | local_och5pcore |
-      | lticonsumersecret   | CONSUMERSECRET                                                | local_och5pcore |
+      | lticonsumerkey_1    | CONSUMERKEY                                                   | tool_opencast   |
+      | lticonsumersecret_1 | CONSUMERSECRET                                                | tool_opencast   |
+      | uselti             | 1                                                             | local_och5pcore |
     And I log in as "admin"
     And I setup the opencast video block for the course with och5pcore
     And I get the latest h5p content types

From ce99a4468992c4269e57a512d9492a2bec3874a5 Mon Sep 17 00:00:00 2001
From: ferishili <zamanifarbod2@gmail.com>
Date: Wed, 15 Jan 2025 10:56:57 +0100
Subject: [PATCH 07/14] using opencast api from tool (OC PHP LIB), Opencast 16
 compatibility

---
 classes/local/opencast_manager.php | 63 ++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/classes/local/opencast_manager.php b/classes/local/opencast_manager.php
index eb80856..16cb468 100644
--- a/classes/local/opencast_manager.php
+++ b/classes/local/opencast_manager.php
@@ -25,6 +25,7 @@
 
 namespace local_och5pcore\local;
 
+use tool_opencast\exception\opencast_api_response_exception;
 use tool_opencast\local\api;
 use block_opencast\local\apibridge;
 use tool_opencast\local\settings_api;
@@ -102,22 +103,34 @@ public static function get_episode_tracks($identifier) {
         // Get tool_opencast api instance for search service.
         $api = self::get_opencast_search_service_api_instance();
 
-        // Prepare the endpoint url.
-        $url = '/search/episode.json?id=' . $identifier;
-
-        // Make the get request.
-        $searchresult = json_decode($api->oc_get($url), true);
-
-        // If something went wrong, we return moodle_exception.
-        if ($api->get_http_code() != 200) {
-            throw new moodle_exception('search_episode_error', 'local_och5pcore');
+        // Prepare params for search.
+        $params = [
+            'id' => $identifier,
+        ];
+        // Perform the search call.
+        $response = $api->opencastapi->search->getEpisodes($params);
+        $code = $response['code'];
+
+        // Make sure everything is good.
+        if ($code != 200) {
+            throw new opencast_api_response_exception($response);
         }
 
-        // Extract the tracks from mediapackage.
+        // Parse the response body to work with arrays, which is easier.
+        $searchresult = json_decode(json_encode($response['body']), true);
+
+        // Extract the tracks from mediapackage, for Opencast < 16.
         $tracks = (isset($searchresult['search-results']['result']) ?
             $searchresult['search-results']['result']['mediapackage']['media']['track'] :
             null);
 
+        // Opencast >= 16 support.
+        if (empty($tracks)) {
+            $tracks = (isset($searchresult['result'][0]) ?
+                $searchresult['result'][0]['mediapackage']['media']['track'] :
+                null);
+        }
+
         // If tracks does not exists, we return moodle_exception.
         if (!$tracks) {
             throw new moodle_exception('no_tracks_error', 'local_och5pcore');
@@ -178,26 +191,34 @@ public static function get_opencast_search_service_api_instance($returnbaseurl =
         // Get api instance from tool_opencast.
         $api = api::get_instance();
 
-        // Services endpoint initialization.
-        $servicesurl = '/services/services.json';
+        // Get the search service data.
+        $response = $api->opencastapi->services->getServiceJSON('org.opencastproject.search');
+        $code = $response['code'];
 
-        // Make a get call to default oc instance to receive services.
-        $result = json_decode($api->oc_get($servicesurl), true);
+        // Make sure everything goes fine.
+        if ($code != 200 && $code != 404) {
+            throw new opencast_api_response_exception($response);
+        }
+
+        // If it could not find the search service, we return the the api instance.
+        if ($code == 404) {
+            return $api;
+        }
+        // Get the services object from the get call.
+        $servicesobj = $response['body'];
 
         // Check if the get call returns any services, if not we return the default oc instance api.
-        if (!isset($result['services']['service']) || empty($result['services']['service'])) {
+        if (!property_exists($servicesobj, 'services') || !property_exists($servicesobj->services, 'service')
+            || empty($servicesobj->services->service)) {
             return $api;
         }
 
-        // Get the services array from the get call.
-        $services = $result['services']['service'];
-        // Get the index of the search service.
-        $searchserviceindex = array_search('/search', array_column($services, 'path'));
-        // Extract the search service array, if exists.
-        $searchservice = (isset($services[$searchserviceindex])) ? $services[$searchserviceindex] : null;
+        // Parse the service object to array, which is easier to use!
+        $searchservice = (array) $servicesobj->services->service;
 
         // Check if the search service is active and online to make calls.
         if (!empty($searchservice) && $searchservice['active'] && $searchservice['online']) {
+            // We are working with default opencast instance for now.
             $defaultocinstanceid = settings_api::get_default_ocinstance()->id;
             // Initialize the custom configs with the search service's host.
             $customconfigs = [

From 923347176a4754183deb83103a7f54e1ae00d18d Mon Sep 17 00:00:00 2001
From: ferishili <zamanifarbod2@gmail.com>
Date: Wed, 15 Jan 2025 17:10:51 +0100
Subject: [PATCH 08/14] upgrade behat test

---
 classes/local/opencast_manager.php            |  6 +++--
 tests/behat/behat_local_och5pcore.php         |  4 +--
 tests/behat/local_och5pcore_add_video.feature | 26 +++++++------------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/classes/local/opencast_manager.php b/classes/local/opencast_manager.php
index 16cb468..951799d 100644
--- a/classes/local/opencast_manager.php
+++ b/classes/local/opencast_manager.php
@@ -25,9 +25,9 @@
 
 namespace local_och5pcore\local;
 
+use block_opencast\local\apibridge;
 use tool_opencast\exception\opencast_api_response_exception;
 use tool_opencast\local\api;
-use block_opencast\local\apibridge;
 use tool_opencast\local\settings_api;
 use oauth_helper;
 use moodle_exception;
@@ -168,7 +168,9 @@ public static function get_episode_tracks($identifier) {
                         $quality = str_replace('-quality', '', $tag);
                     }
                 }
-            } else if (isset($videotrack['video']) && isset($videotrack['video']['resolution'])) {
+            }
+
+            if (empty($quality) && isset($videotrack['video']) && isset($videotrack['video']['resolution'])) {
                 $quality = $videotrack['video']['resolution'];
             }
 
diff --git a/tests/behat/behat_local_och5pcore.php b/tests/behat/behat_local_och5pcore.php
index d88982c..d1a56bd 100644
--- a/tests/behat/behat_local_och5pcore.php
+++ b/tests/behat/behat_local_och5pcore.php
@@ -81,8 +81,8 @@ public function i_get_the_latest_h5p_content_types() {
         $library = [
             'machineName' => "H5P.InteractiveVideo",
             'majorVersion' => 1,
-            'minorVersion' => 26,
-            'patchVersion' => 6,
+            'minorVersion' => 27,
+            'patchVersion' => 9,
             'example' => "https://h5p.org/interactive-video",
             'tutorial' => "https://h5p.org/tutorial-interactive-video",
         ];
diff --git a/tests/behat/local_och5pcore_add_video.feature b/tests/behat/local_och5pcore_add_video.feature
index 003b52a..ff811cc 100644
--- a/tests/behat/local_och5pcore_add_video.feature
+++ b/tests/behat/local_och5pcore_add_video.feature
@@ -20,31 +20,25 @@ Feature: Add Opencast Video into H5P Core
       | ocinstances         | [{"id":1,"name":"Default","isvisible":true,"isdefault":true}] | tool_opencast   |
       | lticonsumerkey_1    | CONSUMERKEY                                                   | tool_opencast   |
       | lticonsumersecret_1 | CONSUMERSECRET                                                | tool_opencast   |
-      | uselti             | 1                                                             | local_och5pcore |
+      | uselti              | 1                                                             | local_och5pcore |
     And I log in as "admin"
     And I setup the opencast video block for the course with och5pcore
     And I get the latest h5p content types
     And I navigate to "Plugins > Local plugins > H5P Opencast Extension (Core)" in site administration
-    Then I should see "Boost"
     And I set the following fields to these values:
       | Available themes to extend  | Boost           |
     And I press "Save changes"
     Then I should see "Changes saved"
     # Content bank accessibility is different in Moodle version < 4.0, therefore, we need a unified way "via Navigation block"
+    And I am on "Course 1" course homepage with editing mode on
     And the following config values are set as admin:
       | unaddableblocks | | theme_boost|
-    And I am on site homepage
-    And I turn editing mode on
     And I add the "Navigation" block if not present
     And I configure the "Navigation" block
-    And I set the following fields to these values:
-      | Page contexts | Display throughout the entire site |
-    And I press "Save changes"
-    And I am on "Course 1" course homepage with editing mode on
-    And I configure the "Navigation" block
     And I set the following fields to these values:
       | Display on page types | Any type of course main page |
     And I press "Save changes"
+    And I add the "Opencast Videos" block
     And I log out
 
   @javascript @_switch_iframe
@@ -54,19 +48,18 @@ Feature: Add Opencast Video into H5P Core
     # it won't see some of the flags and texts to validate.
     And I change window size to "1366x968"
     And I am on "Course 1" course homepage with editing mode on
-    And I add the "Navigation" block if not present
-    And I add the "Opencast Videos" block
     And I expand "Site pages" node
     And I click on "Content bank" "link"
     Then I should see "Add"
     When I click on "Add" "button"
     And I click on "Interactive Video" "link"
-    Then I should see "Adding a new H5P interactive content"
+    And I wait until the page is ready
+    Then I should see "New H5P interactive content"
     And I scroll to "iframe.h5p-editor-iframe" in och5pcore
     And I switch to "h5p-editor-iframe" class iframe
-    And I click on ".shepherd-cancel-link" "css_element"
+    And I wait "5" seconds
     And I set the field "Title" to "Test Opencast Video"
-    And I scroll to "div.h5p-add-file" in och5pcore
+    And I scroll to ".h5peditor .h5peditor-panes .video" in och5pcore
     When I click on ".h5p-add-file[title='Add file']" "css_element"
     Then I should see "Opencast Videos"
     And I set the field "Select a video file" to "Spring"
@@ -74,10 +67,9 @@ Feature: Add Opencast Video into H5P Core
     And I switch to the main frame
     When I click on "Save" "button"
     And I wait until the page is ready
-    Then I should see "Test Opencast Video"
+    Then I should see "Content created."
     And I should see "Edit"
     And I switch to "h5p-player" class iframe
-    And I switch to "h5p-iframe" class iframe
     And I should see "Interactive Video"
     And I switch to the main frame
     When I click on "Edit" "link"
@@ -104,7 +96,7 @@ Feature: Add Opencast Video into H5P Core
     And I should see "Interactive Video"
     And I switch to the main frame
     And I am on "Course 1" course homepage
-    And I add a "H5P" to section "1"
+    And I add a "H5P" to section "1" using the activity chooser
     Then I set the field "Name" to "H5P with Opencast Video"
     And I click on "Add..." "button" in the "Package file" "form_row"
     And I select "Content bank" repository in file picker

From a22427123afa3c4bc56e473e188403b94370b28c Mon Sep 17 00:00:00 2001
From: ferishili <zamanifarbod2@gmail.com>
Date: Wed, 15 Jan 2025 17:13:50 +0100
Subject: [PATCH 09/14] bring new moodle ci

---
 .github/workflows/config.json     |  11 ++
 .github/workflows/config_all.json |  15 +++
 .github/workflows/moodle-ci.yml   | 184 ++----------------------------
 3 files changed, 36 insertions(+), 174 deletions(-)
 create mode 100644 .github/workflows/config.json
 create mode 100644 .github/workflows/config_all.json

diff --git a/.github/workflows/config.json b/.github/workflows/config.json
new file mode 100644
index 0000000..2cd169b
--- /dev/null
+++ b/.github/workflows/config.json
@@ -0,0 +1,11 @@
+{
+  "main-moodle": "MOODLE_405_STABLE",
+  "main-php": "8.3",
+  "main-oc": "16.7",
+  "ocs": [],
+  "main-db": "mariadb",
+  "moodle-php": {
+    "MOODLE_405_STABLE": ["8.1", "8.2"]
+  },
+  "moodle-plugin-ci": "4.4.5"
+}
diff --git a/.github/workflows/config_all.json b/.github/workflows/config_all.json
new file mode 100644
index 0000000..9627724
--- /dev/null
+++ b/.github/workflows/config_all.json
@@ -0,0 +1,15 @@
+{
+  "main-moodle": "MOODLE_405_STABLE",
+  "main-php": "8.3",
+  "main-oc": "16.7",
+  "ocs": [],
+  "main-db": "mariadb",
+  "moodle-php": {
+    "MOODLE_401_STABLE": ["7.4", "8.0", "8.1"],
+    "MOODLE_402_STABLE": ["8.0", "8.1", "8.2"],
+    "MOODLE_403_STABLE": ["8.0", "8.1", "8.2"],
+    "MOODLE_404_STABLE": ["8.1", "8.2", "8.3"],
+    "MOODLE_405_STABLE": ["8.1", "8.2", "8.3"]
+  },
+  "moodle-plugin-ci": "4.4.5"
+}
diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml
index 9bd6cd8..67ef793 100644
--- a/.github/workflows/moodle-ci.yml
+++ b/.github/workflows/moodle-ci.yml
@@ -1,179 +1,15 @@
 name: Moodle Plugin CI
 
-on: [push, pull_request]
+########################################################################################################################
 
-jobs:
-  static:
-    runs-on: ubuntu-latest
-    name: static on (${{ matrix.moodle-branch }}/${{ matrix.php }}/${{ matrix.database }})
-
-    services:
-      postgres:
-        image: postgres:14
-        env:
-          POSTGRES_USER: 'postgres'
-          POSTGRES_HOST_AUTH_METHOD: 'trust'
-        ports:
-          - 5432:5432
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php: ['7.4']
-        moodle-branch: ['MOODLE_400_STABLE']
-        database: [pgsql]
-
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v3
-        with:
-          path: plugin
-
-      - name: Setup PHP ${{ matrix.php }}
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: ${{ matrix.extensions }}
-          ini-values: max_input_vars=5000
-          coverage: none
-
-      - name: npm cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.npm
-          key: node-${{ matrix.php }}-${{ matrix.moodle-branch }}-${{ matrix.database }}-cache
-          restore-keys: |
-            node-${{ matrix.php }}-${{ matrix.moodle-branch }}-${{ matrix.database }}-cache
-
-      - name: Initialise moodle-plugin-ci
-        run: composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3
-
-      - name: Export moodle-plugin-ci pathes
-        run: |
-          echo $(cd ci/bin; pwd) >> $GITHUB_PATH
-          echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH
-          sudo locale-gen en_AU.UTF-8
-          echo "NVM_DIR=$HOME/.nvm" >> $GITHUB_ENV
-
-      - name: Install moodle-plugin-ci
-        run: |
-          moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
-        env:
-          DB: ${{ matrix.database }}
-          MOODLE_BRANCH: ${{ matrix.moodle-branch }}
-
-      - name: PHP Lint
-        if: ${{ always() }}
-        run: moodle-plugin-ci phplint
-
-      - name: PHP Copy/Paste Detector
-        continue-on-error: true # This step will show errors but will not fail
-        if: ${{ always() }}
-        run: moodle-plugin-ci phpcpd
-
-      - name: PHP Mess Detector
-        continue-on-error: true # This step will show errors but will not fail
-        if: ${{ always() }}
-        run: moodle-plugin-ci phpmd
-
-      - name: Moodle Code Checker
-        if: ${{ always() }}
-        run: moodle-plugin-ci phpcs --max-warnings 0
+on: [ push, pull_request ]
 
-      - name: Moodle PHPDoc Checker
-        if: ${{ always() }}
-        run: moodle-plugin-ci phpdoc
+########################################################################################################################
 
-      - name: Validating
-        if: ${{ always() }}
-        run: moodle-plugin-ci validate
-
-      - name: Check upgrade savepoints
-        if: ${{ always() }}
-        run: moodle-plugin-ci savepoints
-
-      - name: Mustache Lint
-        if: ${{ always() }}
-        run: moodle-plugin-ci mustache
-
-      - name: Grunt
-        if: ${{ always() }}
-        run: moodle-plugin-ci grunt --max-lint-warnings 0
-
-  tests:
-    runs-on: ubuntu-latest
-    needs: static
-    name: test (${{ matrix.moodle-branch }}/${{ matrix.php }}/${{ matrix.database }})
-    services:
-      postgres:
-        image: postgres:14
-        env:
-          POSTGRES_USER: 'postgres'
-          POSTGRES_HOST_AUTH_METHOD: 'trust'
-        ports:
-          - 5432:5432
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3
-      mariadb:
-        image: mariadb:10
-        env:
-          MYSQL_USER: 'root'
-          MYSQL_ALLOW_EMPTY_PASSWORD: "true"
-          MYSQL_CHARACTER_SET_SERVER: "utf8mb4"
-          MYSQL_COLLATION_SERVER: "utf8mb4_unicode_ci"
-
-        ports:
-          - 3306:3306
-        options: --health-cmd="mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 3
-    strategy:
-      fail-fast: false
-      matrix:
-        php: ['7.4', '8.0'] # by the time of writtig this 8.1 is not yet supported by block_opencast
-        moodle-branch: ['MOODLE_310_STABLE', 'MOODLE_311_STABLE', 'MOODLE_400_STABLE', 'MOODLE_401_STABLE']
-        database: ['mariadb', 'pgsql']
-        exclude:
-          - moodle-branch: 'MOODLE_310_STABLE'
-            php: '8.0'
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v3
-        with:
-          path: plugin
-
-      - name: Setup PHP ${{ matrix.php }}
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          ini-values: max_input_vars=5000
-          coverage: none
-
-      - name: npm cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.npm
-          key: node-${{ matrix.php }}-${{ matrix.moodle-branch }}-${{ matrix.database }}-cache
-          restore-keys: |
-            node-${{ matrix.php }}-${{ matrix.moodle-branch }}-${{ matrix.database }}-cache
-
-      - name: Initialise moodle-plugin-ci
-        run: composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3
-
-      - name: Export moodle-plugin-ci pathes
-        run: |
-          echo $(cd ci/bin; pwd) >> $GITHUB_PATH
-          echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH
-          sudo locale-gen en_AU.UTF-8
-          echo "NVM_DIR=$HOME/.nvm" >> $GITHUB_ENV
-
-      - name: Install moodle-plugin-ci
-        run: |
-          moodle-plugin-ci add-plugin --branch master Opencast-Moodle/moodle-tool_opencast
-          moodle-plugin-ci add-plugin --branch master Opencast-Moodle/moodle-block_opencast
-          moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
-        env:
-          DB: ${{ matrix.database }}
-          MOODLE_BRANCH: ${{ matrix.moodle-branch }}
-
-      - name: Behat features
-        if: ${{ always() }}
-        run: moodle-plugin-ci behat --auto-rerun 0
\ No newline at end of file
+jobs:
+  call-moodle-ci-workflow:
+    uses: Opencast-Moodle/moodle-workflows-opencast/.github/workflows/moodle-ci.yml@main
+    with:
+      requires-tool-plugin: true
+      branch-tool-plugin: main
+      branch-opencast-docker-default: 16.7

From 7ebfa75858ae255dd844d4fae32da6a2b29f5e22 Mon Sep 17 00:00:00 2001
From: ferishili <zamanifarbod2@gmail.com>
Date: Wed, 15 Jan 2025 17:16:11 +0100
Subject: [PATCH 10/14] update changelog

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5a03eb..0f11bcf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,3 +22,12 @@
 - Compatibility for Moodle v4.0 and v4.1 and Moodle Opencast Plugins v4.0-r1
 - Added support for privacy policy (null)
 - Improved UI/UX by adding clearer labels for the dropdowns
+
+### v4.5-r1
+- new moodle coding styles! e.g. array() to [], lang sorting, etc.
+- core namespace changes: core_component to \core\component
+- use LTI credentials from Opencast API tool plugin!
+- Use the opencast API library instead of pure curl calls if necessary!
+- Support for OC 16 more in the area of either eliminating the use of search endpoint or making it (backward) compatible.
+- Upgrade behat test!
+- Use the latest moodle ci workflows!

From e996d1910a487582600bfed7b4be2319f03971c0 Mon Sep 17 00:00:00 2001
From: ferishili <zamanifarbod2@gmail.com>
Date: Wed, 15 Jan 2025 17:20:47 +0100
Subject: [PATCH 11/14] doc checker fix

---
 db/upgrade.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/db/upgrade.php b/db/upgrade.php
index bf12441..e915b89 100644
--- a/db/upgrade.php
+++ b/db/upgrade.php
@@ -34,6 +34,12 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+/**
+ * Function to upgrade local_och5pcore.
+ *
+ * @param int $oldversion the version we are upgrading from.
+ * @return bool result
+ */
 function xmldb_local_och5pcore_upgrade($oldversion) {
 
     if ($oldversion < 2023042802) {

From b16a6f7850acb577429046a117733be095c8f115 Mon Sep 17 00:00:00 2001
From: ferishili <zamanifarbod2@gmail.com>
Date: Wed, 15 Jan 2025 17:23:32 +0100
Subject: [PATCH 12/14] bumping version

---
 version.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/version.php b/version.php
index dab9ed9..a1cf6aa 100755
--- a/version.php
+++ b/version.php
@@ -26,11 +26,12 @@
 
 // Defining this plug-in metadata.
 $plugin->component = 'local_och5pcore';
-$plugin->release = '3.0-r1';
-$plugin->version = 2023042800;
+$plugin->release = '4.5-r1';
+$plugin->version = 2025011500;
+$plugin->requires = 2024100700; // Requires Moodle 4.5+.
+$plugin->supported = [405, 405];
 $plugin->maturity = MATURITY_STABLE;
-$plugin->requires = 2020110900; // Only Moodle v3.10 and above.
 $plugin->dependencies = [
-    'tool_opencast' => 2023030100,
-    'block_opencast' => 2023030100,
+    'tool_opencast' => 2024111102,
+    'block_opencast' => 2024111102,
 ];

From 60b6f388dc413fb6a71228c57b3164a0cc37361c Mon Sep 17 00:00:00 2001
From: ferishili <zamanifarbod2@gmail.com>
Date: Wed, 15 Jan 2025 17:24:08 +0100
Subject: [PATCH 13/14] add block plugin in ci

---
 .github/workflows/moodle-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml
index 67ef793..1654e49 100644
--- a/.github/workflows/moodle-ci.yml
+++ b/.github/workflows/moodle-ci.yml
@@ -11,5 +11,7 @@ jobs:
     uses: Opencast-Moodle/moodle-workflows-opencast/.github/workflows/moodle-ci.yml@main
     with:
       requires-tool-plugin: true
+      requires-block-plugin: true
       branch-tool-plugin: main
+      branch-block-plugin: main
       branch-opencast-docker-default: 16.7

From 776794054d5f02536b9863ab22dd46a6fe2d2b37 Mon Sep 17 00:00:00 2001
From: ferishili <zamanifarbod2@gmail.com>
Date: Thu, 16 Jan 2025 12:18:56 +0100
Subject: [PATCH 14/14] make sure behat test works

---
 tests/behat/local_och5pcore_add_video.feature | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/tests/behat/local_och5pcore_add_video.feature b/tests/behat/local_och5pcore_add_video.feature
index ff811cc..f8884dd 100644
--- a/tests/behat/local_och5pcore_add_video.feature
+++ b/tests/behat/local_och5pcore_add_video.feature
@@ -14,31 +14,38 @@ Feature: Add Opencast Video into H5P Core
       | student1 | C1     | student        |
     And the following config values are set as admin:
       | config              | value                                                         | plugin          |
-      | apiurl_1            | https://stable.opencast.org                                   | tool_opencast   |
+      | ocinstances         | [{"id":1,"name":"Default","isvisible":true,"isdefault":true}] | tool_opencast   |
+      ### NOTE: As we want to perform LTI and it is only possible when the opencast server has this PR: https://github.com/elan-ev/opencast_nginx/pull/5 patched (Partitioned Cookies),
+      ### therefore we use develop.opencast.org for now, which it is the only one that has this available at the time of this upgrade!
+      | apiurl_1            | https://develop.opencast.org                                  | tool_opencast   |
       | apiusername_1       | admin                                                         | tool_opencast   |
       | apipassword_1       | opencast                                                      | tool_opencast   |
-      | ocinstances         | [{"id":1,"name":"Default","isvisible":true,"isdefault":true}] | tool_opencast   |
       | lticonsumerkey_1    | CONSUMERKEY                                                   | tool_opencast   |
       | lticonsumersecret_1 | CONSUMERSECRET                                                | tool_opencast   |
+      | apitimeout_1        | 0                                                             | tool_opencast   |
+      | apiconnecttimeout_1 | 0                                                             | tool_opencast   |
+      | workflow_roles_1    | republish-metadata                                            | block_opencast  |
+      | aclcontrolafter_1   | 1                                                             | block_opencast  |
       | uselti              | 1                                                             | local_och5pcore |
     And I log in as "admin"
-    And I setup the opencast video block for the course with och5pcore
     And I get the latest h5p content types
     And I navigate to "Plugins > Local plugins > H5P Opencast Extension (Core)" in site administration
     And I set the following fields to these values:
       | Available themes to extend  | Boost           |
     And I press "Save changes"
     Then I should see "Changes saved"
-    # Content bank accessibility is different in Moodle version < 4.0, therefore, we need a unified way "via Navigation block"
-    And I am on "Course 1" course homepage with editing mode on
     And the following config values are set as admin:
       | unaddableblocks | | theme_boost|
+    And I am on site homepage
+    And I turn editing mode on
     And I add the "Navigation" block if not present
     And I configure the "Navigation" block
     And I set the following fields to these values:
-      | Display on page types | Any type of course main page |
+      | Page contexts | Display throughout the entire site |
     And I press "Save changes"
+    And I am on "Course 1" course homepage with editing mode on
     And I add the "Opencast Videos" block
+    And I setup the opencast video block for the course with och5pcore
     And I log out
 
   @javascript @_switch_iframe
@@ -70,6 +77,7 @@ Feature: Add Opencast Video into H5P Core
     Then I should see "Content created."
     And I should see "Edit"
     And I switch to "h5p-player" class iframe
+    And I switch to "h5p-iframe" class iframe
     And I should see "Interactive Video"
     And I switch to the main frame
     When I click on "Edit" "link"