Merge remote-tracking branch 'upstream/stable' into stable-catalyst

classes/editor_framework.php

@@ -138,7 +138,8 @@ public function getLibraries($libraries = null) {
                     $library->title = $details->title;
                     $library->runnable = $details->runnable;
                     $library->restricted = $superuser ? false : ($details->restricted === '1' ? true : false);
-                    $library->metadataSettings = json_decode($details->metadata_settings);
+                    $library->metadataSettings =
+                        is_string($details->metadata_settings) ? json_decode($details->metadata_settings) : null;
                     $librarieswithdetails[] = $library;
                 }
             }

classes/framework.php

@@ -1604,13 +1604,13 @@ public function getNumNotFiltered() {
      * Implements getNumContent().
      */
     // @codingStandardsIgnoreLine
-    public function getNumContent($libraryid, $skip = NULL) {
+    public function getNumContent($libraryid, $skip = NULL, $lastid = 0) {
         global $DB;
         $skipquery = empty($skip) ? '' : " AND id NOT IN ($skip)";
 
         return (int) $DB->get_field_sql(
-                "SELECT COUNT(id) FROM {hvp} WHERE main_library_id = ?{$skipquery}",
-                array($libraryid));
+                "SELECT COUNT(id) FROM {hvp} WHERE main_library_id = ? AND id > ?{$skipquery}",
+                array($libraryid, $lastid));
     }
 
     /**

classes/task/look_for_updates.php

@@ -13,18 +13,11 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-/**
- * Defines the task which looks for H5P updates.
- *
- * @package    mod_hvp
- * @copyright  2016 Joubel AS <contact@joubel.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
 
 namespace mod_hvp\task;
 
 /**
- * The mod_hvp look for updates task class
+ * Defines the task which looks for H5P updates.
  *
  * @package    mod_hvp
  * @copyright  2016 Joubel AS <contact@joubel.com>
@@ -36,10 +29,44 @@ public function get_name() {
     }
 
     public function execute() {
-        // Check to make sure external communications hasn't been disabled.
-        if (get_config('mod_hvp', 'hub_is_enabled') || get_config('mod_hvp', 'send_usage_statistics')) {
-            $core = \mod_hvp\framework::instance();
-            $core->fetchLibrariesMetadata();
+        // Check to make sure external communications have not been disabled.
+        if (!get_config('mod_hvp', 'hub_is_enabled') && !get_config('mod_hvp', 'send_usage_statistics')) {
+            mtrace(get_string('lookforupdatesskippeddisabledlog', 'mod_hvp'));
+            return;
+        }
+
+        $core = \mod_hvp\framework::instance();
+        $result = $core->fetchLibrariesMetadata();
+
+        if ($result === false) {
+            mtrace(get_string('fetchlibrariesmetadatafailedlog', 'mod_hvp'));
+        } else if (is_object($result)) {
+            $librariescount = 0;
+            if (isset($result->libraries) && is_array($result->libraries)) {
+                $librariescount = count($result->libraries);
+            }
+            mtrace(get_string('fetchlibrariesmetadatasuccesslog', 'mod_hvp', $librariescount));
+        } else {
+            mtrace(get_string('fetchlibrariesmetadataunexpectedlog', 'mod_hvp'));
+        }
+
+        $errors = \mod_hvp\framework::messages('error');
+        foreach ($errors as $error) {
+            $code = $error->code ?? 'N/A';
+            $text = $error->message ?? 'N/A';
+            mtrace(get_string('fetchlibrariesmetadataerrorlog', 'mod_hvp', (object) [
+                'code' => $code,
+                'message' => $text,
+            ]));
+        }
+
+        $infos = \mod_hvp\framework::messages('info');
+        foreach ($infos as $info) {
+            mtrace(get_string('fetchlibrariesmetadatainfolog', 'mod_hvp', $info));
+        }
+
+        if ($result === false) {
+            throw new \moodle_exception('fetchlibrariesmetadatafailed', 'mod_hvp');
         }
     }
 }

editor.css

@@ -0,0 +1,4 @@
+#fgroup_id_h5peditor {
+    z-index: 1;
+    position: relative;
+}

lang/en/hvp.php

@@ -58,6 +58,13 @@
 $string['noh5ps'] = 'There\'s no interactive content available for this course.';
 
 $string['lookforupdates'] = 'Look for H5P updates';
+$string['fetchlibrariesmetadatafailed'] = 'Failed to fetch H5P libraries metadata.';
+$string['fetchlibrariesmetadatafailedlog'] = 'Fetching H5P content types from the Hub failed.';
+$string['fetchlibrariesmetadatasuccesslog'] = 'H5P Hub request completed successfully ({$a} content types in the response).';
+$string['fetchlibrariesmetadataunexpectedlog'] = 'H5P Hub request returned an unexpected response.';
+$string['fetchlibrariesmetadataerrorlog'] = 'H5P Hub error: [code: {$a->code}, message: {$a->message}]';
+$string['fetchlibrariesmetadatainfolog'] = 'H5P Hub notice: {$a}';
+$string['lookforupdatesskippeddisabledlog'] = 'Task skipped: both H5P Hub and usage statistics are disabled.';
 $string['updatelibraries'] = 'Update All Libraries';
 $string['removetmpfiles'] = 'Remove old H5P temporary files';
 $string['removeoldlogentries'] = 'Remove old H5P log entries';

lib.php

@@ -59,8 +59,6 @@ function hvp_supports($feature) {
             return true;
         case FEATURE_GROUPINGS:
             return true;
-        case FEATURE_GROUPMEMBERSONLY:
-            return true;
         case FEATURE_MOD_INTRO:
             return true;
         case FEATURE_COMPLETION_TRACKS_VIEWS:

library_list.php

@@ -28,6 +28,8 @@
 // No guest autologin.
 require_login(0, false);
 
+$fixsubcontent = optional_param('fix_subcontent', false, PARAM_BOOL); // Special fix to re-run upgrade for subcontent only
+
 $pageurl = new moodle_url('/mod/hvp/library_list.php');
 $PAGE->set_url($pageurl);
 
@@ -70,11 +72,13 @@
 $i = 0;
 foreach ($libraries as $versions) {
     foreach ($versions as $library) {
+        $numContent = $core->h5pF->getNumContent($library->id);
         $usage = $core->h5pF->getLibraryUsage($library->id, $numnotfiltered ? true : false);
         if ($library->runnable) {
             $upgrades = $core->getUpgrades($library, $versions);
-            $upgradeurl = empty($upgrades) ? false : (new moodle_url('/mod/hvp/upgrade_content_page.php', array(
-                'library_id' => $library->id
+            $upgradeurl = ($fixsubcontent ? empty($numContent) : empty($upgrades)) ? false : (new moodle_url('/mod/hvp/upgrade_content_page.php', array(
+                'library_id' => $library->id,
+                'fix_subcontent' => $fixsubcontent
             )))->out(false);
 
             $restricted = (isset($library->restricted) && $library->restricted == 1 ? true : false);
@@ -94,7 +98,7 @@
             'title' => $library->title . ' (' . \H5PCore::libraryVersion($library) . ')',
             'restricted' => $restricted,
             'restrictedUrl' => $restrictedurl,
-            'numContent' => $core->h5pF->getNumContent($library->id),
+            'numContent' => $numContent,
             'numContentDependencies' => $usage['content'] === -1 ? '' : $usage['content'],
             'numLibraryDependencies' => $usage['libraries'],
             'upgradeUrl' => $upgradeurl,

locallib.php

@@ -235,6 +235,7 @@ function hvp_add_editor_assets($id = null, $mformid = null) {
     $PAGE->requires->js('/mod/hvp/editor/scripts/h5peditor-editor.js', true);
     $PAGE->requires->js('/mod/hvp/editor/scripts/h5peditor-init.js', true);
     $PAGE->requires->js('/mod/hvp/editor.js', true);
+    $PAGE->requires->css('/mod/hvp/editor.css', true);
 
     // Add translations.
     $language = \mod_hvp\framework::get_language();
@@ -316,6 +317,7 @@ function hvp_admin_add_generic_css_and_js($page, $settings = null) {
         'deleteLibrary' => '',
         'upgradeLibrary' => get_string('upgradelibrarycontent', 'hvp')
     );
+    $settings['extraTableClasses'] = 'table-reboot';
 
     $page->requires->data_for_js('H5PAdminIntegration', $settings, true);
     $page->requires->css(generate_css_url('/mod/hvp/library/styles/h5p.css'));
@@ -416,9 +418,10 @@ function hvp_content_upgrade_progress($libraryid) {
     } else {
         $out->skipped = array();
     }
+    $lastid = optional_param('lastId', 0, PARAM_INT);
 
     // Get number of contents for this library.
-    $out->left = $interface->getNumContent($libraryid, $skipped);
+    $out->left = $interface->getNumContent($libraryid, $skipped, $lastid);
 
     if ($out->left) {
         $skipquery = empty($skipped) ? '' : " AND id NOT IN ($skipped)";
@@ -430,8 +433,9 @@ function hvp_content_upgrade_progress($libraryid) {
                     a11y_title
                FROM {hvp}
               WHERE main_library_id = ?
+                AND id > ?
                     {$skipquery}
-           ORDER BY name ASC", array($libraryid), 0 , 40
+           ORDER BY id ASC", array($libraryid, $lastid), 0 , 40
         );
 
         foreach ($results as $content) {
@@ -471,7 +475,7 @@ function hvp_get_library_upgrade_info($name, $major, $minor) {
         $response->upgradesScript = "{$basepath}pluginfile.php/{$context->id}/mod_hvp/libraries/{$libraryfoldername}/upgrades.js";
     }
     $response->semantics = $core->loadLibrarySemantics($name, $major, $minor);
-    
+
     return $response;
 }
 

tests/look_for_updates_test.php

@@ -0,0 +1,110 @@
+<?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/>.
+
+namespace mod_hvp;
+
+/**
+ * Unit tests for look_for_updates scheduled task.
+ *
+ * @package    mod_hvp
+ * @copyright  2026
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers     \mod_hvp\task\look_for_updates
+ */
+final class look_for_updates_test extends \advanced_testcase {
+    /**
+     * Verifies
+     * - that the task exits early exactly when both hub_is_enabled and send_usage_statistics_setting are disabled
+     * - that the task does proper error handling and logging
+     *
+     * @dataProvider execute_provider
+     * @param int $hubisenabled Hub setting value.
+     * @param int $sendusagestatistics Usage statistics setting value.
+     * @param bool $expectearlyexit Whether execute() is expected to return via early-exit.
+     */
+    public function test_execute(
+        int $hubisenabled,
+        int $sendusagestatistics,
+        bool $expectearlyexit
+    ): void {
+        $this->resetAfterTest();
+
+        set_config('hub_is_enabled', $hubisenabled, 'mod_hvp');
+        set_config('send_usage_statistics', $sendusagestatistics, 'mod_hvp');
+        // Keep site unregistered so all non-early-exit paths fail deterministically at registration.
+        set_config('site_uuid', '', 'mod_hvp');
+
+        if ($hubisenabled || $sendusagestatistics) {
+            // Force deterministic no-network behavior for all non-early-exit cases.
+            \curl::mock_response('');
+        }
+
+        $task = new \mod_hvp\task\look_for_updates();
+
+        ob_start();
+        try {
+            $task->execute();
+            $output = ob_get_clean();
+            if (!$expectearlyexit) {
+                $this->fail('Expected moodle_exception for failed metadata fetch. Output: ' . $output);
+            }
+        } catch (\moodle_exception $exception) {
+            $output = ob_get_clean();
+            if ($expectearlyexit) {
+                $this->fail('Did not expect moodle_exception. Got: ' . $exception->errorcode);
+            }
+            $this->assertEquals('fetchlibrariesmetadatafailed', $exception->errorcode);
+        }
+
+        if ($expectearlyexit) {
+            $this->assertStringContainsString(get_string('lookforupdatesskippeddisabledlog', 'mod_hvp'), $output);
+        } else {
+            $this->assertStringContainsString(get_string('fetchlibrariesmetadatafailedlog', 'mod_hvp'), $output);
+            $this->assertStringContainsString('registration-failed-hub-disabled', $output);
+            $this->assertStringNotContainsString(get_string('lookforupdatesskippeddisabledlog', 'mod_hvp'), $output);
+        }
+    }
+
+    /**
+     * Data provider for test_execute_setting_combinations.
+     *
+     * @return array
+     */
+    public static function execute_provider(): array {
+        return [
+            'both_disabled' => [
+                'hubisenabled' => 0,
+                'sendusagestatistics' => 0,
+                'expectearlyexit' => true,
+            ],
+            'hub_enabled_only' => [
+                'hubisenabled' => 1,
+                'sendusagestatistics' => 0,
+                'expectearlyexit' => false,
+            ],
+            'usage_statistics_enabled_only' => [
+                'hubisenabled' => 0,
+                'sendusagestatistics' => 1,
+                'expectearlyexit' => false,
+            ],
+            'both_enabled' => [
+                'hubisenabled' => 1,
+                'sendusagestatistics' => 1,
+                'expectearlyexit' => false,
+            ],
+        ];
+    }
+}

upgrade_content_page.php

@@ -29,6 +29,7 @@
 require_login(0, false);
 
 $libraryid = required_param('library_id', PARAM_INT);
+$fixsubcontent = optional_param('fix_subcontent', false, PARAM_BOOL); // Special fix to re-run upgrade for subcontent only
 $pageurl = new moodle_url('/mod/hvp/upgrade_content_page.php', array('library_id' => $libraryid));
 $PAGE->set_url($pageurl);
 admin_externalpage_setup('h5plibraries');
@@ -73,7 +74,7 @@
             'errorTooHighVersion' => get_string('upgradeerrortoohighversion', 'hvp'),
             'errorNotSupported' => get_string('upgradeerrornotsupported', 'hvp'),
             'done' => get_string('upgradedone', 'hvp', $numcontents) .
-                      ' <a href="' . (new moodle_url('/mod/hvp/library_list.php'))->out(false) . '">' .
+                      ' <a href="' . (new moodle_url('/mod/hvp/library_list.php', array('fix_subcontent' => $fixsubcontent)))->out(false) . '">' .
                       get_string('upgradereturn', 'hvp') . '</a>',
             'library' => array(
                 'name' => $library->name,
@@ -83,13 +84,14 @@
                                  array('action' => 'getlibrarydataforupgrade')))->out(false) . '&library=',
             'scriptBaseUrl' => (new moodle_url('/lib/javascript.php/' . get_jsrev() . '/mod/hvp/library/js'))->out(false),
             'buster' => '',
-            'versions' => $upgrades,
+            'versions' => $fixsubcontent ? [$libraryid => \H5PCore::libraryVersion($versions[$libraryid])] : $upgrades,
             'contents' => $numcontents,
             'buttonLabel' => get_string('upgradebuttonlabel', 'hvp'),
             'infoUrl' => (new moodle_url('/mod/hvp/ajax.php', array('action' => 'libraryupgradeprogress',
                           'library_id' => $libraryid)))->out(false),
             'total' => $numcontents,
-            'token' => \H5PCore::createToken('contentupgrade')
+            'token' => \H5PCore::createToken('contentupgrade'),
+            'fixSubcontent' => !!$fixsubcontent,
         )
     );
 

version.php

@@ -23,10 +23,10 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2026062501;
+$plugin->version   = 2026090101;
 $plugin->requires  = 2022112800; // 4.1.0
 $plugin->cron      = 0;
 $plugin->component = 'mod_hvp';
 $plugin->maturity  = MATURITY_STABLE;
 $plugin->supported = [401, 404];
-$plugin->release   = '1.28.2';
+$plugin->release   = '1.28.4';