replace own lti settings with tool lti settings

Author: Tamara Gunkel

engageredirect.php

@@ -55,15 +55,15 @@
 
 $url = $endpoint . '/play/' . $identifier;
 
-if (empty(get_config('block_opencast', 'engagelticonsumerkey_' . $ocinstanceid))) {
+if (empty(get_config('tool_opencast', 'lticonsumerkey_' . $ocinstanceid))) {
     redirect($url);
 }
 
 $ltiendpoint = rtrim($endpoint, '/') . '/lti';
 
 // Create parameters.
-$consumerkey = get_config('block_opencast', 'engagelticonsumerkey_' . $ocinstanceid);
-$consumersecret = get_config('block_opencast', 'engagelticonsumersecret_' . $ocinstanceid);
+$consumerkey = get_config('tool_opencast', 'lticonsumerkey_' . $ocinstanceid);
+$consumersecret = get_config('tool_opencast', 'lticonsumersecret_' . $ocinstanceid);
 $params = \block_opencast\local\lti_helper::create_lti_parameters($consumerkey, $consumersecret, $ltiendpoint, $url);
 
 $renderer = $PAGE->get_renderer('block_opencast');

index.php

@@ -231,7 +231,7 @@
         }
 
         // If LTI credentials are given, use LTI. If not, directly forward to Opencast studio.
-        if (empty(get_config('block_opencast', 'lticonsumerkey_' . $ocinstanceid))) {
+        if (empty(get_config('tool_opencast', 'lticonsumerkey_' . $ocinstanceid))) {
             if (empty(get_config('block_opencast', 'opencast_studio_baseurl_' . $ocinstanceid))) {
                 $endpoint = \tool_opencast\local\settings_api::get_apiurl($ocinstanceid);
             } else {

lang/en/block_opencast.php

@@ -270,10 +270,6 @@
 $string['engageredirect'] = 'Redirect to engage player';
 $string['engageurl'] = 'URL of the Opencast Engage server';
 $string['engageurl_desc'] = 'If empty, the video titles in the overview are not linked to the engage player.';
-$string['engagelticonsumerkey'] = 'LTI Consumer key to access video';
-$string['engagelticonsumerkey_desc'] = 'LTI Consumer key to access videos in the engage player.';
-$string['engagelticonsumersecret'] = 'LTI Consumer secret to access video';
-$string['engagelticonsumersecret_desc'] = 'LTI Consumer secret to access videos in the engage player.';
 $string['expirydate'] = 'Expiry Date';
 $string['exists_catalogname'] = 'The field is already existed';
 $string['enablechunkupload'] = 'Enable Chunkupload';
@@ -452,10 +448,6 @@
 $string['linkedinblock'] = 'Linked in block';
 $string['loading'] = 'Loading...';
 $string['ltimodule_settings'] = 'LTI module features';
-$string['lticonsumerkey'] = 'Consumer key';
-$string['lticonsumerkey_desc'] = 'LTI Consumer key for the opencast studio integration. If the integration is enabled but no key is set, the link without LTI authentication will be shown.';
-$string['lticonsumersecret'] = 'Consumer secret';
-$string['lticonsumersecret_desc'] = 'LTI Consumer secret for the opencast studio integration.';
 $string['license'] = 'License';
 $string['location'] = 'Location';
 
@@ -706,10 +698,6 @@
 $string['editorbaseurl_desc'] = 'The base URL to be used to call the Opencast Editor, the base url of the opencast instance is used if empty.';
 $string['editorendpointurl'] = 'Opencast Editor Endpoint';
 $string['editorendpointurl_desc'] = 'The editor endpoint to access the editor. The mediapackage ID will be added at the end of the url.';
-$string['editorlticonsumerkey'] = 'Opencast Editor Consumer key';
-$string['editorlticonsumerkey_desc'] = 'LTI Consumer key for the opencast editor integration.';
-$string['editorlticonsumersecret'] = 'Opencast Editor Consumer secret';
-$string['editorlticonsumersecret_desc'] = 'LTI Consumer secret for the opencast editor integration.';
 
 // Strings fot new opencast studio settings.
 $string['opencaststudionewtab'] = 'Redirect to Studio in a new tab';

recordvideo.php

@@ -118,8 +118,8 @@
 $customtool = '/studio?' . implode('&', $customtoolparams);
 // Create parameters.
 
-$consumerkey = get_config('block_opencast', 'lticonsumerkey_' . $ocinstanceid);
-$consumersecret = get_config('block_opencast', 'lticonsumersecret_' . $ocinstanceid);
+$consumerkey = get_config('tool_opencast', 'lticonsumerkey_' . $ocinstanceid);
+$consumersecret = get_config('tool_opencast', 'lticonsumersecret_' . $ocinstanceid);
 $params = \block_opencast\local\lti_helper::create_lti_parameters($consumerkey, $consumersecret, $ltiendpoint, $customtool);
 
 $renderer = $PAGE->get_renderer('block_opencast');

renderer.php

@@ -452,7 +452,7 @@ public function render_block_content($courseid, $videodata, $ocinstance, $render
                     $target = '_blank';
                 }
                 // If LTI credentials are given, use LTI. If not, directly forward to Opencast studio.
-                if (empty(get_config('block_opencast', 'lticonsumerkey_' . $ocinstance->id))) {
+                if (empty(get_config('tool_opencast', 'lticonsumerkey_' . $ocinstance->id))) {
                     if (empty(get_config('block_opencast', 'opencast_studio_baseurl_' . $ocinstance->id))) {
                         $endpoint = \tool_opencast\local\settings_api::get_apiurl($ocinstance->id);
                     } else {

settings.php

@@ -446,16 +446,6 @@
                     get_string('opencaststudiobaseurl', 'block_opencast'),
                     get_string('opencaststudiobaseurl_desc', 'block_opencast'), ''));
 
-            $additionalsettings->add(
-                new admin_setting_configtext('block_opencast/lticonsumerkey_' . $instance->id,
-                    get_string('lticonsumerkey', 'block_opencast'),
-                    get_string('lticonsumerkey_desc', 'block_opencast'), ""));
-
-            $additionalsettings->add(
-                new admin_setting_configpasswordunmask('block_opencast/lticonsumersecret_' . $instance->id,
-                    get_string('lticonsumersecret', 'block_opencast'),
-                    get_string('lticonsumersecret_desc', 'block_opencast'), ""));
-
             // Studio redirect button settings.
             $additionalsettings->add(
                 new admin_setting_configcheckbox('block_opencast/show_opencast_studio_return_btn_' . $instance->id,
@@ -498,18 +488,6 @@
                     get_string('editorendpointurl', 'block_opencast'),
                     get_string('editorendpointurl_desc', 'block_opencast'), "/editor-ui/index.html?mediaPackageId="));
 
-            // LTI Consumer Key for the editor alone.
-            $additionalsettings->add(
-                new admin_setting_configtext('block_opencast/editorlticonsumerkey_' . $instance->id,
-                    get_string('editorlticonsumerkey', 'block_opencast'),
-                    get_string('editorlticonsumerkey_desc', 'block_opencast'), ""));
-
-            // LTI Consumer Secret for the editor alone.
-            $additionalsettings->add(
-                new admin_setting_configpasswordunmask('block_opencast/editorlticonsumersecret_' . $instance->id,
-                    get_string('editorlticonsumersecret', 'block_opencast'),
-                    get_string('editorlticonsumersecret_desc', 'block_opencast'), ""));
-
             // Opencast Video Player in additional feature settings.
             $additionalsettings->add(
                 new admin_setting_heading('block_opencast/opencast_access_video_' . $instance->id,
@@ -522,18 +500,6 @@
                     get_string('engageurl', 'block_opencast'),
                     get_string('engageurl_desc', 'block_opencast'), ""));
 
-            // LTI Consumer Key for the video player.
-            $additionalsettings->add(
-                new admin_setting_configtext('block_opencast/engagelticonsumerkey_' . $instance->id,
-                    get_string('engagelticonsumerkey', 'block_opencast'),
-                    get_string('engagelticonsumerkey_desc', 'block_opencast'), ""));
-
-            // LTI Consumer Secret for the video player.
-            $additionalsettings->add(
-                new admin_setting_configpasswordunmask('block_opencast/engagelticonsumersecret_' . $instance->id,
-                    get_string('engagelticonsumersecret', 'block_opencast'),
-                    get_string('engagelticonsumersecret_desc', 'block_opencast'), ""));
-
             // Notifications in additional features settings.
             $additionalsettings->add(
                 new admin_setting_heading('block_opencast/notifications_' . $instance->id,

version.php

@@ -23,9 +23,9 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2022022201;
+$plugin->version = 2022030800;
 $plugin->requires = 2017111300;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->release = 'v3.11-r7';
 $plugin->component = 'block_opencast';
-$plugin->dependencies = array('tool_opencast' => 2021120100);
+$plugin->dependencies = array('tool_opencast' => 2022021000);

videoeditor.php

@@ -67,7 +67,7 @@
     $editorbaseurl = 'http://' . $editorbaseurl;
 }
 
-if (empty(get_config('block_opencast', 'editorlticonsumerkey_' . $ocinstanceid))) {
+if (empty(get_config('tool_opencast', 'lticonsumerkey_' . $ocinstanceid))) {
     redirect($editorbaseurl . $editorendpoint);
 }
 
@@ -83,8 +83,8 @@
 }
 
 // Create parameters.
-$consumerkey = get_config('block_opencast', 'editorlticonsumerkey_' . $ocinstanceid);
-$consumersecret = get_config('block_opencast', 'editorlticonsumersecret_' . $ocinstanceid);
+$consumerkey = get_config('tool_opencast', 'lticonsumerkey_' . $ocinstanceid);
+$consumersecret = get_config('tool_opencast', 'lticonsumersecret_' . $ocinstanceid);
 $params = \block_opencast\local\lti_helper::create_lti_parameters($consumerkey, $consumersecret, $ltiendpoint, $editorendpoint);
 
 $renderer = $PAGE->get_renderer('block_opencast');