WR490984: General fixes.

Author: michaelkcatalyst

classes/event/collector_plugin_disabled.php

@@ -0,0 +1,45 @@
+<?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 tool_cloudmetrics\event;
+
+use core\event\base;
+
+/**
+ * Collector plugin was disabled
+ *
+ * @package   tool_cloudmetrics
+ * @copyright 2026 onwards Catalyst IT EU {@link https://catalyst-eu.net}
+ * @author    Michael Kotlyar <michael.kotlyar@catalyst-eu.net>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class collector_plugin_disabled extends base {
+    #[\Override]
+    public function init() {
+        $this->data['edulevel'] = self::LEVEL_OTHER;
+        $this->data['crud'] = 'u';
+    }
+
+    #[\Override]
+    public static function get_name() {
+        return get_string('eventcollectorplugindisabled', 'tool_cloudmetrics');
+    }
+
+    #[\Override]
+    public function get_description() {
+        return 'User ' .  $this->data['userid']  . ' disabled collector plugin ' . $this->data['other']['pluginname'];
+    }
+}

classes/event/collector_plugin_enabled.php

@@ -0,0 +1,45 @@
+<?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 tool_cloudmetrics\event;
+
+use core\event\base;
+
+/**
+ * Collector plugin was enabled
+ *
+ * @package   tool_cloudmetrics
+ * @copyright 2026 onwards Catalyst IT EU {@link https://catalyst-eu.net}
+ * @author    Michael Kotlyar <michael.kotlyar@catalyst-eu.net>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class collector_plugin_enabled extends base {
+    #[\Override]
+    public function init() {
+        $this->data['edulevel'] = self::LEVEL_OTHER;
+        $this->data['crud'] = 'u';
+    }
+
+    #[\Override]
+    public static function get_name() {
+        return get_string('eventcollectorpluginenabled', 'tool_cloudmetrics');
+    }
+
+    #[\Override]
+    public function get_description() {
+        return 'User ' .  $this->data['userid']  . ' enabled collector plugin ' . $this->data['other']['pluginname'];
+    }
+}

classes/metric/base.php

@@ -89,7 +89,7 @@ abstract public function get_frequency_default(): int;
      * @param int $freq
      */
     public function set_frequency(int $freq) {
-        set_config($this->get_name() . '_frequency', $freq, 'tool_cloudmetrics');
+        set_config($this->get_name() . '_frequency', $freq, 'tool_cloudmetrics', true);
     }
 
     /**

classes/metric/manager.php

@@ -102,7 +102,7 @@ public static function get_metrics(bool $enabledonly = true): array {
             'dailyusers' => new daily_users_metric(),
             'yearlyactiveusers' => new yearly_active_users_metric(),
         ];
-        if (defined('PHPUNIT_TEST')) {
+        if (defined('PHPUNIT_TEST') && PHPUNIT_TEST) {
             // Add testing metrics to the list.
             $metrics['foobar'] = new test_metric();
         }

collector/database/backfill.php

@@ -74,9 +74,8 @@
     $range = $collector->get_metric_range($metricname);
     $freqretrieved = $collector->get_last_backfilled_frequency($metricname);
     if (!empty($range)) {
-        ['mintime' => $mintmptmp, 'maxtime' => $maxtmpstmp] = $range;
-        $backfilledfrom = userdate($mintmptmp, get_string('strftimedatetime', 'cltr_database'), $CFG->timezone);
-        $backfilledto = userdate($maxtmpstmp, get_string('strftimedatetime', 'cltr_database'), $CFG->timezone);
+        $backfilledfrom = userdate($range['mintime'], get_string('strftimedatetime', 'cltr_database'), $CFG->timezone);
+        $backfilledto = userdate($range['maxtime'], get_string('strftimedatetime', 'cltr_database'), $CFG->timezone);
         $backfilledinterval = (int)$freqretrieved;
 
         // Add a comment about different frequencies.

collector/database/chart.php

@@ -111,6 +111,9 @@
         $graphperiodsec = \cltr_database\lib::period_from_interval($metrics[$displayedmetrics[0]]);
     }
 } else {
+    require_login(null, false);
+    require_capability('moodle/site:config', context_system::instance());
+    require_sesskey();
     set_config('chart_period', $graphperiodsec, 'cltr_database');
     \core_plugin_manager::reset_caches();
 }

collector/database/classes/form/metric_backfill_form.php

@@ -47,9 +47,12 @@ public function definition() {
             }
         }
         $mform->addElement('select', 'periodretrieval', get_string('period_select', 'tool_cloudmetrics'), $periods);
+        $mform->setType('periodretrieval', PARAM_INT);
+
         $mform->addElement('hidden', 'metric', $metric);
         $mform->setType('metric', PARAM_ALPHANUMEXT);
-        $this->add_action_buttons(false, 'Backfill data');
+
+        $this->add_action_buttons(false, get_string('backfilldata', 'tool_cloudmetrics'));
     }
 
     /**
@@ -59,6 +62,14 @@ public function definition() {
      * @param array $files
      */
     public function validation($data, $files) {
-        return [];
+        $errors = [];
+
+        // Ensure `periodretrieval` is a valid option.
+        $allowed = array_keys($this->_customdata[1] ?? []);
+        if (!in_array((int) ($data['periodretrieval'] ?? null), $allowed, false)) {
+            $errors['periodretrieval'] = get_string('invaliddata', 'error');
+        }
+
+        return $errors;
     }
 }

collectors.php

@@ -49,9 +49,17 @@
 switch ($action) {
     case 'disable':
         $plugins[$name]->set_enabled(false);
+        \tool_cloudmetrics\event\collector_plugin_disabled::create([
+            'context' => $syscontext,
+            'other' => ['pluginname' => $name],
+        ])->trigger();
         break;
     case 'enable':
         $plugins[$name]->set_enabled(true);
+        \tool_cloudmetrics\event\collector_plugin_enabled::create([
+            'context' => $syscontext,
+            'other' => ['pluginname' => $name],
+        ])->trigger();
         break;
 }
 redirect($return);

lang/en/tool_cloudmetrics.php

@@ -125,8 +125,13 @@
 
 // Backfill progress.
 $string['backfillcomplete'] = 'Backfilling data for {$a} complete.';
+$string['backfilldata'] = 'Backfill data';
 $string['backfillsaving'] = 'Saving metric items for {$a}.';
 $string['backfillgenerating'] = 'Generating metric items for {$a}.';
 
 // Groups.
 $string['user_activity'] = 'User activity';
+
+// Event logs.
+$string['eventcollectorplugindisabled'] = 'Collector plugin disabled';
+$string['eventcollectorpluginenabled'] = 'Collector plugin enabled';

templates/chart_page.mustache

@@ -65,7 +65,7 @@
 <br>
 {{{chart}}}
 {{#backfillable}}
-    <a href="{{{backfillurl}}}">
+    <a href="{{backfillurl}}">
         {{#str}} return_to_backfill, tool_cloudmetrics, {{metriclabeltolower}} {{/str}}
     </a>
 {{/backfillable}}