Merge remote-tracking branch 'upstream/stable' into stable-catalyst-v1.27

petersistrom · petersistrom · commit 599e94e3b93d · 2024-10-14T16:42:48.000+11:00
diff --git a/amd/build/communicator.min.js b/amd/build/communicator.min.js
diff --git a/amd/build/communicator.min.js.map b/amd/build/communicator.min.js.map
diff --git a/amd/build/contenthubregistration.min.js b/amd/build/contenthubregistration.min.js
diff --git a/amd/build/contenthubregistration.min.js.map b/amd/build/contenthubregistration.min.js.map
diff --git a/amd/src/embed.js b/amd/src/embed.js
@@ -94,4 +94,4 @@ define(['jquery', 'mod_hvp/communicator'], function($, H5PEmbedCommunicator) {
         });
     });
 
-});
+});
diff --git a/editor b/editor
@@ -1 +1 @@
-Subproject commit 53dc7bdc57b17f5a0d55a8871a36d1b1bd631e70
+Subproject commit 80b3b281ee9d064b563f242e8ee7a0026b5bf205
diff --git a/lang/en/hvp.php b/lang/en/hvp.php
@@ -499,6 +499,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.';
diff --git a/library b/library
@@ -1 +1 @@
-Subproject commit f3579c0d28205bf34490ee151c07d43a2ffc3507
+Subproject commit c9a4e03ff6bb488893d35a289dab247df73c6662
diff --git a/locallib.php b/locallib.php
@@ -242,9 +242,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',
diff --git a/reporting b/reporting
@@ -1 +1 @@
-Subproject commit 0968db5d36b7ed5e19eff63ec06c36d75593044c
+Subproject commit 82b8b8187ac456b644f3b328a3b9a91489a3a551
diff --git a/settings.php b/settings.php
@@ -134,6 +134,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'),
diff --git a/version.php b/version.php
@@ -23,9 +23,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023122501;
+$plugin->version   = 2024091200;
 $plugin->requires  = 2013051403;
 $plugin->cron      = 0;
 $plugin->component = 'mod_hvp';
 $plugin->maturity  = MATURITY_STABLE;
-$plugin->release   = '1.26.1';
+$plugin->release   = '1.27.0';

-Original file line number
+Diff line change
         });
     });
 -});
 +});