Merge pull request #80 from catalyst/enable-release

CI cleanup and enable release

.github/workflows/ci.yml

@@ -8,4 +8,3 @@ jobs:
     uses: catalyst/catalyst-moodle-workflows/.github/workflows/ci.yml@main
     with:
       disable_behat: true
-      disable_release: true

README.md

@@ -61,7 +61,8 @@ Branches
 
 | Moodle verion     | Branch                | PHP       |
 | ----------------- | --------------------- | --------  |
-| Moodle 3.3 to 3.7 | master                | 7.2       |
+| Moodle 4.1+       | MOODLE_401_STABLE     | 7.4       |
+| Moodle 3.3 to 4.0 | master                | 7.2       |
 | Moodle 2.7        | MOODLE_27_STABLE      | 5.5       |
 
 Performance impact

classes/helper.php

@@ -46,7 +46,7 @@ public static function enable_csp_header() {
         global $USER, $COURSE;
 
         $settings = get_config('local_csp');
-        if (self::$bootstrapped or empty($settings->csp_header_enable)) {
+        if (self::$bootstrapped || empty($settings->csp_header_enable)) {
             return;
         }
         self::$bootstrapped = true;
@@ -66,6 +66,10 @@ public static function enable_csp_header() {
         }
     }
 
+    /**
+     * Enables feature policy
+     * @return void
+     */
     public static function enable_feature_policy() {
         $settings = get_config('local_csp');
         if (empty($settings->feature_policy_enable)) {

classes/privacy/provider.php

@@ -26,7 +26,7 @@
 
 /**
  * Class provider
- * @package local_csp\privacy
+ * @package local_csp
  */
 class provider implements
     \core_privacy\local\metadata\null_provider {

classes/table/csp_report.php

@@ -35,7 +35,7 @@
  * - Convert unix timestamp columns to human time.
  * - Adds a button to delete a record.
  *
- * @package local_csp\table
+ * @package local_csp
  * @copyright Catalyst IT
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -238,6 +238,12 @@ protected function col_highestviolaters($record) {
         return $return;
     }
 
+    /**
+     * Gets the 3 highest violater courses for each blockedURI
+     *
+     * @param \stdClass $record fieldset object of db table
+     * @return string details of the highest violating courses
+     */
     protected function col_courses($record) {
         global $DB;
 

db/access.php

@@ -19,6 +19,8 @@
  * Plugin capabilities
  *
  * @package local_csp
+ * @copyright 2022 Catalyst IT
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();

db/upgrade.php

@@ -23,6 +23,12 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+/**
+ * Function to upgrade local_csp.
+ *
+ * @param int $oldversion the version we are upgrading from
+ * @return bool result
+ */
 function xmldb_local_csp_upgrade($oldversion) {
     global $DB;
     $dbman = $DB->get_manager();

templates/notification.mustache

@@ -14,7 +14,19 @@
     You should have received a copy of the GNU General Public License
     along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 }}
+{{!
+    @template local_csp/notification
+
+    Inputs for optional notification.
 
+    Example context (json):
+    {
+        "header": "Header",
+        "start": "Start",
+        "sourcesText": "Sources",
+        "events": []
+    }
+}}
 <h4>{{header}}</h4>
 <p>{{start}}</p>
 <p>{{sourcesText}}</p>

version.php

@@ -25,9 +25,9 @@
 
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version = 2022060300;
-$plugin->release = 2020070300;
+$plugin->version = 2024031400;
+$plugin->release = 2024031400;
 $plugin->requires = 2015051100;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->component = 'local_csp';
-$plugin->supported = [34, 401];
+$plugin->supported = [401, 403];