Merge pull request #65 from catalyst/upstream-merge

Upstream merge

Author: matthewhilton

amd/build/communicator.min.js

@@ -500,6 +500,8 @@
 $string['contenthub:licenseagreementtitle'] = 'End User License Agreement (EULA)';
 $string['contenthub:licenseagreementdescription'] = 'Please read the following agreement before proceeding with the ';
 $string['contenthub:licenseagreementmaintext'] = 'TODO';
+$string['contenthubsearchenable'] = 'Enable shared content in H5P Hub';
+$string['contenthubsearchdescription'] = 'Find and download shared content from H5P Hub.';
 $string['contenthub:register'] = 'Register an account on the H5P Hub <a href="{$a}">here</a>';
 $string['contenthub:changesettings'] = 'Change account settings <a href="{$a}">here</a>';
 $string['contenthub:nopermissions'] = 'You do not have permission to register the site with the content hub.';

amd/build/communicator.min.js.map

@@ -247,9 +247,7 @@ function hvp_add_editor_assets($id = null, $mformid = null) {
     $editorajaxtoken = \H5PCore::createToken('editorajax');
 
     $interface = \mod_hvp\framework::instance('interface');
-    $siteuuid = $interface->getOption('site_uuid', null);
-    $secret   = $interface->getOption('hub_secret', null);
-    $enablecontenthub = !empty($siteuuid) && !empty($secret);
+    $enablecontenthub = ($interface->getOption('hub_is_enabled', null) ? $interface->getOption('h5p_search_content_hub', null) : "0") === "1";
 
     $settings['editor'] = array(
       'filesPath' => $filespathbase . 'editor',

amd/build/contenthubregistration.min.js

@@ -136,6 +136,14 @@
         ''
     ));
 
+    // Content Hub on by default for all users
+    $settings->add(
+        new admin_setting_configcheckbox(
+            'mod_hvp/h5p_search_content_hub', 
+            get_string('contenthubsearchenable', 'hvp'),
+            get_string('contenthubsearchdescription', 'hvp'), 1));
+    
+    // Register on the Content Hub to allow uploading content
     $settings->add(new admin_setting_html(
         'mod_hvp/content_hub_settings_box',
         get_string('contenthub:settings:box', 'hvp'),

amd/build/contenthubregistration.min.js.map

@@ -23,10 +23,10 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023122503;
+$plugin->version   = 2024112100;
 $plugin->requires  = 2013051403;
 $plugin->cron      = 0;
 $plugin->component = 'mod_hvp';
 $plugin->maturity  = MATURITY_STABLE;
-$plugin->release   = '1.26.1';
 $plugin->supported = [400, 404];
+$plugin->release   = '1.27.1';