From f6b63cacb7de6106a09861689e45d4b90c96b669 Mon Sep 17 00:00:00 2001
From: Matthias Opitz <m.opitz@ucl.ac.uk>
Date: Mon, 26 Jun 2023 10:23:34 +0100
Subject: [PATCH 01/18] added moodle_ci.yml

---
 .github/workflows/moodle_ci.yml | 124 ++++++++++++++++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 .github/workflows/moodle_ci.yml

diff --git a/.github/workflows/moodle_ci.yml b/.github/workflows/moodle_ci.yml
new file mode 100644
index 00000000..42fddddc
--- /dev/null
+++ b/.github/workflows/moodle_ci.yml
@@ -0,0 +1,124 @@
+name: Moodle plugin CI
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: 'ubuntu-latest'
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - php: '7.4'
+            moodle-branch: 'MOODLE_401_STABLE'
+            database: 'mariadb'
+          - php: '8.0'
+            moodle-branch: 'MOODLE_401_STABLE'
+            database: 'pgsql'
+          - php: '8.0'
+            moodle-branch: 'MOODLE_402_STABLE'
+            database: 'mariadb'
+          - php: '8.1'
+            moodle-branch: 'master'
+            database: 'pgsql'
+
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: 'postgres'
+          POSTGRES_HOST_AUTH_METHOD: 'trust'
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 3
+        ports:
+          - 5432:5432
+
+      mariadb:
+        image: mariadb:10
+        env:
+          MYSQL_USER: 'root'
+          MYSQL_ALLOW_EMPTY_PASSWORD: "true"
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 3
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          path: plugin
+
+      - name: Install node
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: zip, gd, mbstring, pgsql, mysqli
+          ini-values: max_input_vars=5000
+          coverage: none
+
+      - name: Deploy moodle-plugin-ci
+        run: |
+          composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3
+          # Add dirs to $PATH
+          echo $(cd ci/bin; pwd) >> $GITHUB_PATH
+          echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH
+          # PHPUnit depends on en_AU.UTF-8 locale
+          sudo locale-gen en_AU.UTF-8
+      - name: Install Moodle
+        # Need explicit IP to stop mysql client fail on attempt to use unix socket.
+        run: moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
+        env:
+          DB: ${{ matrix.database }}
+          MOODLE_BRANCH: ${{ matrix.moodle-branch }}
+          IGNORE_PATHS: 'tool/printable/classes/bfpdf.php'
+
+      - name: phplint
+        if: ${{ always() }}
+        run: moodle-plugin-ci phplint
+
+      - name: phpcpd
+        if: ${{ always() }}
+        run: moodle-plugin-ci phpcpd || true
+
+      - name: phpmd
+        if: ${{ always() }}
+        run: moodle-plugin-ci phpmd
+
+      - name: codechecker
+        if: ${{ always() }}
+        run: moodle-plugin-ci codechecker
+
+      - name: Moodle PHPDoc Checker
+        if: ${{ always() }}
+        run: moodle-plugin-ci phpdoc
+
+      - name: validate
+        if: ${{ always() }}
+        run: moodle-plugin-ci validate
+
+      - name: savepoints
+        if: ${{ always() }}
+        run: moodle-plugin-ci savepoints
+
+      - name: mustache
+        if: ${{ always() }}
+        run: moodle-plugin-ci mustache
+
+      - name: grunt
+        if: ${{ always() }}
+        run: moodle-plugin-ci grunt
+
+      - name: phpunit
+        if: ${{ always() }}
+        run: moodle-plugin-ci phpunit
+
+      - name: behat
+        if: ${{ always() }}
+        run: moodle-plugin-ci behat --profile chrome

From 94ebc62647053a1ab3b332c33c930519721c1405 Mon Sep 17 00:00:00 2001
From: Matthias Opitz <m.opitz@ucl.ac.uk>
Date: Mon, 26 Jun 2023 11:06:31 +0100
Subject: [PATCH 02/18] removed now invalid legacy event functions

---
 classes/event/assessable_uploaded.php   | 29 -------------------------
 classes/event/course_module_viewed.php  | 10 ---------
 classes/event/course_searched.php       | 12 ----------
 classes/event/discussion_created.php    | 13 -----------
 classes/event/discussion_deleted.php    | 10 ---------
 classes/event/discussion_moved.php      | 10 ---------
 classes/event/discussion_pinned.php     | 11 ----------
 classes/event/discussion_unpinned.php   | 11 ----------
 classes/event/discussion_viewed.php     | 10 ---------
 classes/event/post_created.php          | 12 ----------
 classes/event/post_deleted.php          | 12 ----------
 classes/event/post_updated.php          | 12 ----------
 classes/event/readtracking_disabled.php | 10 ---------
 classes/event/readtracking_enabled.php  | 10 ---------
 classes/event/subscribers_viewed.php    | 10 ---------
 classes/event/subscription_created.php  | 10 ---------
 classes/event/subscription_deleted.php  | 10 ---------
 classes/event/user_report_viewed.php    | 12 ----------
 tests/events_test.php                   | 19 ----------------
 tests/lib_test.php                      |  3 ---
 20 files changed, 236 deletions(-)

diff --git a/classes/event/assessable_uploaded.php b/classes/event/assessable_uploaded.php
index 27a80f77..f791bc7e 100644
--- a/classes/event/assessable_uploaded.php
+++ b/classes/event/assessable_uploaded.php
@@ -54,35 +54,6 @@ public function get_description() {
             "'$this->contextinstanceid'.";
     }
 
-    /**
-     * Legacy event data if get_legacy_eventname() is not empty.
-     *
-     * @return \stdClass
-     */
-    protected function get_legacy_eventdata() {
-        $eventdata = new \stdClass();
-        $eventdata->modulename   = 'hsuforum';
-        $eventdata->name         = $this->other['triggeredfrom'];
-        $eventdata->cmid         = $this->contextinstanceid;
-        $eventdata->itemid       = $this->objectid;
-        $eventdata->courseid     = $this->courseid;
-        $eventdata->userid       = $this->userid;
-        $eventdata->content      = $this->other['content'];
-        if ($this->other['pathnamehashes']) {
-            $eventdata->pathnamehashes = $this->other['pathnamehashes'];
-        }
-        return $eventdata;
-    }
-
-    /**
-     * Return the legacy event name.
-     *
-     * @return string
-     */
-    public static function get_legacy_eventname() {
-        return 'assessable_content_uploaded';
-    }
-
     /**
      * Return localised event name.
      *
diff --git a/classes/event/course_module_viewed.php b/classes/event/course_module_viewed.php
index c58c335f..4cf30824 100644
--- a/classes/event/course_module_viewed.php
+++ b/classes/event/course_module_viewed.php
@@ -56,16 +56,6 @@ public function get_url() {
         return new \moodle_url('/mod/hsuforum/view.php', array('f' => $this->objectid));
     }
 
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        return array($this->courseid, 'hsuforum', 'view forum', 'view.php?f=' . $this->objectid,
-            $this->objectid, $this->contextinstanceid);
-    }
-
     public static function get_objectid_mapping() {
         return array('db' => 'hsuforum', 'restore' => 'hsuforum');
     }
diff --git a/classes/event/course_searched.php b/classes/event/course_searched.php
index 81e38833..ab92f422 100644
--- a/classes/event/course_searched.php
+++ b/classes/event/course_searched.php
@@ -82,18 +82,6 @@ public function get_url() {
             array('id' => $this->courseid, 'search' => $this->other['searchterm']));
     }
 
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        // The legacy log table expects a relative path to /mod/hsuforum/.
-        $logurl = substr($this->get_url()->out_as_local_url(), strlen('/mod/hsuforum/'));
-
-        return array($this->courseid, 'hsuforum', 'search', $logurl, $this->other['searchterm']);
-    }
-
     /**
      * Custom validation.
      *
diff --git a/classes/event/discussion_created.php b/classes/event/discussion_created.php
index f3279c4e..16a9bf67 100644
--- a/classes/event/discussion_created.php
+++ b/classes/event/discussion_created.php
@@ -80,19 +80,6 @@ public function get_url() {
         return new \moodle_url('/mod/hsuforum/discuss.php', array('d' => $this->objectid));
     }
 
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-
-        // The legacy log table expects a relative path to /mod/hsuforum/.
-        $logurl = substr($this->get_url()->out_as_local_url(), strlen('/mod/hsuforum/'));
-
-        return array($this->courseid, 'hsuforum', 'add discussion', $logurl, $this->objectid, $this->contextinstanceid);
-    }
-
     /**
      * Custom validation.
      *
diff --git a/classes/event/discussion_deleted.php b/classes/event/discussion_deleted.php
index 4c4fd0b6..c29b3c76 100644
--- a/classes/event/discussion_deleted.php
+++ b/classes/event/discussion_deleted.php
@@ -81,16 +81,6 @@ public function get_url() {
         return new \moodle_url('/mod/hsuforum/view.php', array('id' => $this->contextinstanceid));
     }
 
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        return array($this->courseid, 'hsuforum', 'delete discussion', 'view.php?id=' . $this->contextinstanceid,
-            $this->other['forumid'], $this->contextinstanceid);
-    }
-
     /**
      * Custom validation.
      *
diff --git a/classes/event/discussion_moved.php b/classes/event/discussion_moved.php
index e1e388a8..7a81a5eb 100644
--- a/classes/event/discussion_moved.php
+++ b/classes/event/discussion_moved.php
@@ -81,16 +81,6 @@ public function get_url() {
         return new \moodle_url('/mod/hsuforum/discuss.php', array('d' => $this->objectid));
     }
 
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        return array($this->courseid, 'hsuforum', 'move discussion', 'discuss.php?d=' . $this->objectid,
-            $this->objectid, $this->contextinstanceid);
-    }
-
     /**
      * Custom validation.
      *
diff --git a/classes/event/discussion_pinned.php b/classes/event/discussion_pinned.php
index 353ed369..d859608e 100644
--- a/classes/event/discussion_pinned.php
+++ b/classes/event/discussion_pinned.php
@@ -70,17 +70,6 @@ public function get_url() {
         return new \moodle_url('/mod/hsuforum/discuss.php', array('d' => $this->objectid));
     }
 
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        // The legacy log table expects a relative path to /mod/hsuforum/.
-        $logurl = substr($this->get_url()->out_as_local_url(), strlen('/mod/hsuforum/'));
-        return array($this->courseid, 'hsuforum', 'pin discussion', $logurl, $this->objectid, $this->contextinstanceid);
-    }
-
     /**
      * Custom validation.
      *
diff --git a/classes/event/discussion_unpinned.php b/classes/event/discussion_unpinned.php
index 8db82a0b..b046ba6a 100644
--- a/classes/event/discussion_unpinned.php
+++ b/classes/event/discussion_unpinned.php
@@ -70,17 +70,6 @@ public function get_url() {
         return new \moodle_url('/mod/hsuforum/discuss.php', array('d' => $this->objectid));
     }
 
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        // The legacy log table expects a relative path to /mod/hsuforum/.
-        $logurl = substr($this->get_url()->out_as_local_url(), strlen('/mod/hsuforum/'));
-        return array($this->courseid, 'hsuforum', 'unpin discussion', $logurl, $this->objectid, $this->contextinstanceid);
-    }
-
     /**
      * Custom validation.
      *
diff --git a/classes/event/discussion_viewed.php b/classes/event/discussion_viewed.php
index 5f280a46..98cb5b21 100644
--- a/classes/event/discussion_viewed.php
+++ b/classes/event/discussion_viewed.php
@@ -75,16 +75,6 @@ public function get_url() {
         return new \moodle_url('/mod/hsuforum/discuss.php', array('d' => $this->objectid));
     }
 
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        return array($this->courseid, 'hsuforum', 'view discussion', 'discuss.php?d=' . $this->objectid,
-            $this->objectid, $this->contextinstanceid);
-    }
-
     /**
      * Custom validation.
      *
diff --git a/classes/event/post_created.php b/classes/event/post_created.php
index e662c5ac..78749171 100644
--- a/classes/event/post_created.php
+++ b/classes/event/post_created.php
@@ -91,18 +91,6 @@ public function get_url() {
         return $url;
     }
 
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        // The legacy log table expects a relative path to /mod/hsuforum/.
-        $logurl = substr($this->get_url()->out_as_local_url(), strlen('/mod/hsuforum/'));
-
-        return array($this->courseid, 'hsuforum', 'add post', $logurl, $this->other['forumid'], $this->contextinstanceid);
-    }
-
     /**
      * Custom validation.
      *
diff --git a/classes/event/post_deleted.php b/classes/event/post_deleted.php
index baa60538..8a8e1505 100644
--- a/classes/event/post_deleted.php
+++ b/classes/event/post_deleted.php
@@ -90,18 +90,6 @@ public function get_url() {
         return $url;
     }
 
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        // The legacy log table expects a relative path to /mod/hsuforum/.
-        $logurl = substr($this->get_url()->out_as_local_url(), strlen('/mod/hsuforum/'));
-
-        return array($this->courseid, 'hsuforum', 'delete post', $logurl, $this->objectid, $this->contextinstanceid);
-    }
-
     /**
      * Custom validation.
      *
diff --git a/classes/event/post_updated.php b/classes/event/post_updated.php
index 79225a9d..9bfebf7b 100644
--- a/classes/event/post_updated.php
+++ b/classes/event/post_updated.php
@@ -91,18 +91,6 @@ public function get_url() {
         return $url;
     }
 
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        // The legacy log table expects a relative path to /mod/hsuforum/.
-        $logurl = substr($this->get_url()->out_as_local_url(), strlen('/mod/hsuforum/'));
-
-        return array($this->courseid, 'hsuforum', 'update post', $logurl, $this->objectid, $this->contextinstanceid);
-    }
-
     /**
      * Custom validation.
      *
diff --git a/classes/event/readtracking_disabled.php b/classes/event/readtracking_disabled.php
index c48e6b80..5423ae4a 100644
--- a/classes/event/readtracking_disabled.php
+++ b/classes/event/readtracking_disabled.php
@@ -79,16 +79,6 @@ public function get_url() {
         return new \moodle_url('/mod/hsuforum/view.php', array('f' => $this->other['forumid']));
     }
 
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        return array($this->courseid, 'hsuforum', 'stop tracking', 'view.php?f=' . $this->other['forumid'],
-            $this->other['forumid'], $this->contextinstanceid);
-    }
-
     /**
      * Custom validation.
      *
diff --git a/classes/event/readtracking_enabled.php b/classes/event/readtracking_enabled.php
index 1e4852bf..08e24197 100644
--- a/classes/event/readtracking_enabled.php
+++ b/classes/event/readtracking_enabled.php
@@ -79,16 +79,6 @@ public function get_url() {
         return new \moodle_url('/mod/hsuforum/view.php', array('f' => $this->other['forumid']));
     }
 
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        return array($this->courseid, 'hsuforum', 'start tracking', 'view.php?f=' . $this->other['forumid'],
-            $this->other['forumid'], $this->contextinstanceid);
-    }
-
     /**
      * Custom validation.
      *
diff --git a/classes/event/subscribers_viewed.php b/classes/event/subscribers_viewed.php
index ca5045f9..f3e44228 100644
--- a/classes/event/subscribers_viewed.php
+++ b/classes/event/subscribers_viewed.php
@@ -80,16 +80,6 @@ public function get_url() {
         return new \moodle_url('/mod/hsuforum/subscribers.php', array('id' => $this->other['forumid']));
     }
 
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        return array($this->courseid, 'hsuforum', 'view subscribers', 'subscribers.php?id=' . $this->other['forumid'],
-            $this->other['forumid'], $this->contextinstanceid);
-    }
-
     /**
      * Custom validation.
      *
diff --git a/classes/event/subscription_created.php b/classes/event/subscription_created.php
index f5f7b214..f824c931 100644
--- a/classes/event/subscription_created.php
+++ b/classes/event/subscription_created.php
@@ -80,16 +80,6 @@ public function get_url() {
         return new \moodle_url('/mod/hsuforum/subscribers.php', array('id' => $this->other['forumid']));
     }
 
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        return array($this->courseid, 'hsuforum', 'subscribe', 'view.php?f=' . $this->other['forumid'],
-            $this->other['forumid'], $this->contextinstanceid);
-    }
-
     /**
      * Custom validation.
      *
diff --git a/classes/event/subscription_deleted.php b/classes/event/subscription_deleted.php
index d22174e9..866845d9 100644
--- a/classes/event/subscription_deleted.php
+++ b/classes/event/subscription_deleted.php
@@ -80,16 +80,6 @@ public function get_url() {
         return new \moodle_url('/mod/hsuforum/subscribers.php', array('id' => $this->other['forumid']));
     }
 
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        return array($this->courseid, 'hsuforum', 'unsubscribe', 'view.php?f=' . $this->other['forumid'],
-            $this->other['forumid'], $this->contextinstanceid);
-    }
-
     /**
      * Custom validation.
      *
diff --git a/classes/event/user_report_viewed.php b/classes/event/user_report_viewed.php
index df481c84..10c66321 100644
--- a/classes/event/user_report_viewed.php
+++ b/classes/event/user_report_viewed.php
@@ -88,18 +88,6 @@ public function get_url() {
         return $url;
     }
 
-    /**
-     * Return the legacy event log data.
-     *
-     * @return array|null
-     */
-    protected function get_legacy_logdata() {
-        // The legacy log table expects a relative path to /mod/hsuforum/.
-        $logurl = substr($this->get_url()->out_as_local_url(), strlen('/mod/hsuforum/'));
-
-        return array($this->courseid, 'hsuforum', 'user report', $logurl, $this->relateduserid);
-    }
-
     /**
      * Custom validation.
      *
diff --git a/tests/events_test.php b/tests/events_test.php
index b3520e55..da4c9857 100644
--- a/tests/events_test.php
+++ b/tests/events_test.php
@@ -103,7 +103,6 @@ public function test_course_searched() {
         $this->assertInstanceOf('\mod_hsuforum\event\course_searched', $event);
         $this->assertEquals($coursectx, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'search', "search.php?id={$course->id}&amp;search={$searchterm}", $searchterm);
-        $this->assertEventLegacyLogData($expected, $event);
         $this->assertEventContextNotUsed($event);
 
         $this->assertNotEmpty($event->get_name());
@@ -182,7 +181,6 @@ public function test_discussion_created() {
         $this->assertInstanceOf('\mod_hsuforum\event\discussion_created', $event);
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'add discussion', "discuss.php?d={$discussion->id}", $discussion->id, $forum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $this->assertEventContextNotUsed($event);
 
         $this->assertNotEmpty($event->get_name());
@@ -337,7 +335,6 @@ public function test_discussion_deleted() {
         $this->assertInstanceOf('\mod_hsuforum\event\discussion_deleted', $event);
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'delete discussion', "view.php?id={$forum->cmid}", $forum->id, $forum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $this->assertEventContextNotUsed($event);
 
         $this->assertNotEmpty($event->get_name());
@@ -447,7 +444,6 @@ public function test_discussion_moved() {
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'move discussion', "discuss.php?d={$discussion->id}",
             $discussion->id, $toforum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $this->assertEventContextNotUsed($event);
 
         $this->assertNotEmpty($event->get_name());
@@ -516,7 +512,6 @@ public function test_discussion_viewed() {
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'view discussion', "discuss.php?d={$discussion->id}",
             $discussion->id, $forum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $this->assertEventContextNotUsed($event);
 
         $this->assertNotEmpty($event->get_name());
@@ -567,7 +562,6 @@ public function test_course_module_viewed() {
         $this->assertInstanceOf('\mod_hsuforum\event\course_module_viewed', $event);
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'view forum', "view.php?f={$forum->id}", $forum->id, $forum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $url = new \moodle_url('/mod/hsuforum/view.php', array('f' => $forum->id));
         $this->assertEquals($url, $event->get_url());
         $this->assertEventContextNotUsed($event);
@@ -667,7 +661,6 @@ public function test_subscription_created() {
         $this->assertInstanceOf('\mod_hsuforum\event\subscription_created', $event);
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'subscribe', "view.php?f={$forum->id}", $forum->id, $forum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $url = new \moodle_url('/mod/hsuforum/subscribers.php', array('id' => $forum->id));
         $this->assertEquals($url, $event->get_url());
         $this->assertEventContextNotUsed($event);
@@ -767,7 +760,6 @@ public function test_subscription_deleted() {
         $this->assertInstanceOf('\mod_hsuforum\event\subscription_deleted', $event);
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'unsubscribe', "view.php?f={$forum->id}", $forum->id, $forum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $url = new \moodle_url('/mod/hsuforum/subscribers.php', array('id' => $forum->id));
         $this->assertEquals($url, $event->get_url());
         $this->assertEventContextNotUsed($event);
@@ -858,7 +850,6 @@ public function test_readtracking_enabled() {
         $this->assertInstanceOf('\mod_hsuforum\event\readtracking_enabled', $event);
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'start tracking', "view.php?f={$forum->id}", $forum->id, $forum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $url = new \moodle_url('/mod/hsuforum/view.php', array('f' => $forum->id));
         $this->assertEquals($url, $event->get_url());
         $this->assertEventContextNotUsed($event);
@@ -949,7 +940,6 @@ public function test_readtracking_disabled() {
         $this->assertInstanceOf('\mod_hsuforum\event\readtracking_disabled', $event);
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'stop tracking', "view.php?f={$forum->id}", $forum->id, $forum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $url = new \moodle_url('/mod/hsuforum/view.php', array('f' => $forum->id));
         $this->assertEquals($url, $event->get_url());
         $this->assertEventContextNotUsed($event);
@@ -1021,7 +1011,6 @@ public function test_subscribers_viewed() {
         $this->assertInstanceOf('\mod_hsuforum\event\subscribers_viewed', $event);
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'view subscribers', "subscribers.php?id={$forum->id}", $forum->id, $forum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $this->assertEventContextNotUsed($event);
 
         $this->assertNotEmpty($event->get_name());
@@ -1107,7 +1096,6 @@ public function test_user_report_viewed() {
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'user report',
             "user.php?id={$user->id}&amp;mode=discussions&amp;course={$course->id}", $user->id);
-        $this->assertEventLegacyLogData($expected, $event);
         $this->assertEventContextNotUsed($event);
 
         $this->assertNotEmpty($event->get_name());
@@ -1308,7 +1296,6 @@ public function test_post_created() {
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'add post', "discuss.php?d={$discussion->id}#p{$post->id}",
             $forum->id, $forum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $url = new \moodle_url('/mod/hsuforum/discuss.php', array('d' => $discussion->id));
         $url->set_anchor('p'.$event->objectid);
         $this->assertEquals($url, $event->get_url());
@@ -1361,7 +1348,6 @@ public function test_post_created_single() {
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'add post', "view.php?f={$forum->id}#p{$post->id}",
             $forum->id, $forum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $url = new \moodle_url('/mod/hsuforum/view.php', array('f' => $forum->id));
         $url->set_anchor('p'.$event->objectid);
         $this->assertEquals($url, $event->get_url());
@@ -1568,7 +1554,6 @@ public function test_post_deleted() {
         $this->assertInstanceOf('\mod_hsuforum\event\post_deleted', $event);
         $this->assertEquals(context_module::instance($forum->cmid), $event->get_context());
         $expected = array($course->id, 'hsuforum', 'delete post', "discuss.php?d={$discussion->id}", $lastpost->id, $forum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $url = new \moodle_url('/mod/hsuforum/discuss.php', array('d' => $discussion->id));
         $this->assertEquals($url, $event->get_url());
         $this->assertEventContextNotUsed($event);
@@ -1589,7 +1574,6 @@ public function test_post_deleted() {
             $this->assertInstanceOf('\mod_hsuforum\event\post_deleted', $event);
             $this->assertEquals(context_module::instance($forum->cmid), $event->get_context());
             $expected = array($course->id, 'hsuforum', 'delete post', "discuss.php?d={$discussion->id}", $post->id, $forum->cmid);
-            $this->assertEventLegacyLogData($expected, $event);
             $url = new \moodle_url('/mod/hsuforum/discuss.php', array('d' => $discussion->id));
             $this->assertEquals($url, $event->get_url());
             $this->assertEventContextNotUsed($event);
@@ -1640,7 +1624,6 @@ public function test_post_deleted_single() {
         $this->assertInstanceOf('\mod_hsuforum\event\post_deleted', $event);
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'delete post', "view.php?f={$forum->id}", $post->id, $forum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $url = new \moodle_url('/mod/hsuforum/view.php', array('f' => $forum->id));
         $this->assertEquals($url, $event->get_url());
         $this->assertEventContextNotUsed($event);
@@ -1820,7 +1803,6 @@ public function test_post_updated() {
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'update post', "discuss.php?d={$discussion->id}#p{$post->id}",
             $post->id, $forum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $url = new \moodle_url('/mod/hsuforum/discuss.php', array('d' => $discussion->id));
         $url->set_anchor('p'.$event->objectid);
         $this->assertEquals($url, $event->get_url());
@@ -1873,7 +1855,6 @@ public function test_post_updated_single() {
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'update post', "view.php?f={$forum->id}#p{$post->id}",
             $post->id, $forum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $url = new \moodle_url('/mod/hsuforum/view.php', array('f' => $forum->id));
         $url->set_anchor('p'.$post->id);
         $this->assertEquals($url, $event->get_url());
diff --git a/tests/lib_test.php b/tests/lib_test.php
index d64d9f13..23ecaa54 100644
--- a/tests/lib_test.php
+++ b/tests/lib_test.php
@@ -81,7 +81,6 @@ public function test_hsuforum_trigger_content_uploaded_event() {
         $expected->userid = $user->id;
         $expected->content = $fakepost->message;
         $expected->pathnamehashes = array($fi->get_pathnamehash());
-        $this->assertEventLegacyData($expected, $event);
         $this->assertEventContextNotUsed($event);
     }
 
@@ -401,7 +400,6 @@ public function test_forum_discussion_view() {
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'view discussion', "discuss.php?d={$discussion->id}",
             $discussion->id, $forum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $this->assertEventContextNotUsed($event);
 
         $this->assertNotEmpty($event->get_name());
@@ -1444,7 +1442,6 @@ public function test_hsuforum_discussion_view() {
         $this->assertEquals($context, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'view discussion', "discuss.php?d={$discussion->id}",
             $discussion->id, $forum->cmid);
-        $this->assertEventLegacyLogData($expected, $event);
         $this->assertEventContextNotUsed($event);
 
         $this->assertNotEmpty($event->get_name());

From f29eb1865effc4d8ecbc024ac96dcebd0e6758fa Mon Sep 17 00:00:00 2001
From: Matthias Opitz <m.opitz@ucl.ac.uk>
Date: Mon, 26 Jun 2023 11:16:22 +0100
Subject: [PATCH 03/18] renamed test classes to match test file names

---
 tests/backup_hsuforum_activity_test.php | 2 +-
 tests/events_test.php                   | 2 +-
 tests/form_service_test.php             | 4 ++--
 tests/generator_test.php                | 2 +-
 tests/lib_test.php                      | 2 +-
 tests/mail_test.php                     | 4 ++--
 tests/maildigest_test.php               | 2 +-
 tests/output_email_test.php             | 2 +-
 tests/portfolio_caller_test.php         | 2 +-
 tests/rsslib_test.php                   | 2 +-
 tests/search_test.php                   | 2 +-
 tests/user_autosubscription_test.php    | 2 +-
 12 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/backup_hsuforum_activity_test.php b/tests/backup_hsuforum_activity_test.php
index 13cc95f7..e53ebd8c 100644
--- a/tests/backup_hsuforum_activity_test.php
+++ b/tests/backup_hsuforum_activity_test.php
@@ -40,7 +40,7 @@
  * @copyright  2016 Andrew Nicols <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class mod_hsuforum_backup_hsuforum_activity_task_testcase extends advanced_testcase {
+class backup_hsuforum_activity_task_test extends advanced_testcase {
 
     /**
      * Test the encoding of forum content links.
diff --git a/tests/events_test.php b/tests/events_test.php
index da4c9857..b2e11bfd 100644
--- a/tests/events_test.php
+++ b/tests/events_test.php
@@ -33,7 +33,7 @@
  * @copyright  2014 Dan Poltawski <dan@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class mod_hsuforum_events_testcase extends advanced_testcase {
+class events_test extends advanced_testcase {
 
     /**
      * Tests set up.
diff --git a/tests/form_service_test.php b/tests/form_service_test.php
index f652cfe8..a1bbd895 100644
--- a/tests/form_service_test.php
+++ b/tests/form_service_test.php
@@ -13,7 +13,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
- 
+
 /**
  * Testing form service prepare draft area
  *
@@ -27,7 +27,7 @@ public function protected_file_prepare_draft_area(&$draftitemid, $contextid, $co
     }
 }
 
-class mod_hsuforum_form_service_testcase extends advanced_testcase {
+class form_service_test extends advanced_testcase {
     public function test_prepare_draft_area() {
         global $DB, $CFG, $USER;
 
diff --git a/tests/generator_test.php b/tests/generator_test.php
index b22ec6c8..7e587001 100644
--- a/tests/generator_test.php
+++ b/tests/generator_test.php
@@ -34,7 +34,7 @@
  * @copyright  2012 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class mod_hsuforum_generator_testcase extends advanced_testcase {
+class generator_test extends advanced_testcase {
     public function test_generator() {
         global $DB;
 
diff --git a/tests/lib_test.php b/tests/lib_test.php
index 23ecaa54..b0ff3d87 100644
--- a/tests/lib_test.php
+++ b/tests/lib_test.php
@@ -33,7 +33,7 @@
 require_once($CFG->dirroot . '/mod/hsuforum/mod_form.php');
 require_once($CFG->dirroot . '/course/modlib.php');
 
-class mod_hsuforum_lib_testcase extends advanced_testcase {
+class lib_test extends advanced_testcase {
 
     public function test_hsuforum_trigger_content_uploaded_event() {
         $this->resetAfterTest();
diff --git a/tests/mail_test.php b/tests/mail_test.php
index 9840f9e8..4168d323 100644
--- a/tests/mail_test.php
+++ b/tests/mail_test.php
@@ -27,7 +27,7 @@
 
 global $CFG;
 
-class mod_hsuforum_mail_testcase extends advanced_testcase {
+class mail_test extends advanced_testcase {
 
     protected $helper;
 
@@ -290,7 +290,7 @@ public function test_cron_message_includes_courseid() {
 
         // And next event should be the 'notification_sent' one.
         $event = $events[1];
-        
+
         $this->assertInstanceOf('\core\event\notification_sent', $event);
         $this->assertEquals($author->id, $event->userid);
         $this->assertEquals($recipient->id, $event->relateduserid);
diff --git a/tests/maildigest_test.php b/tests/maildigest_test.php
index ca877e5f..ec7d4651 100644
--- a/tests/maildigest_test.php
+++ b/tests/maildigest_test.php
@@ -28,7 +28,7 @@
 
 global $CFG;
 
-class mod_hsuforum_maildigest_testcase extends advanced_testcase {
+class maildigest_test extends advanced_testcase {
 
     /**
      * Keep track of the message and mail sinks that we set up for each
diff --git a/tests/output_email_test.php b/tests/output_email_test.php
index ee90b0cd..1f18a0c1 100644
--- a/tests/output_email_test.php
+++ b/tests/output_email_test.php
@@ -30,7 +30,7 @@
  * @copyright  2016 Andrew Nicols <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class mod_hsuforum_output_email_testcase extends advanced_testcase {
+class output_email_test extends advanced_testcase {
     /**
      * Data provider for the postdate function tests.
      */
diff --git a/tests/portfolio_caller_test.php b/tests/portfolio_caller_test.php
index f3eb52c1..93452383 100644
--- a/tests/portfolio_caller_test.php
+++ b/tests/portfolio_caller_test.php
@@ -30,7 +30,7 @@
  *
  * Tests behaviour of the hsuforum_portfolio_caller class.
  */
-class mod_hsuforum_portfolio_caller_testcase extends advanced_testcase {
+class portfolio_caller_test extends advanced_testcase {
 
     /**
      * Ensure that a file will be loaded in an instance of the caller when supplied valid and
diff --git a/tests/rsslib_test.php b/tests/rsslib_test.php
index eaf455fc..9a2a0076 100644
--- a/tests/rsslib_test.php
+++ b/tests/rsslib_test.php
@@ -37,7 +37,7 @@
  * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class mod_hsuforum_rsslib_testcase extends advanced_testcase {
+class rsslib_test extends advanced_testcase {
     // Include the mod_hsuforum test helpers.
     // This includes functions to create forums, users, discussions, and posts.
     use helper_hsuforums;
diff --git a/tests/search_test.php b/tests/search_test.php
index 6e0baec2..71f8332d 100644
--- a/tests/search_test.php
+++ b/tests/search_test.php
@@ -38,7 +38,7 @@
  * @copyright   2015 David Monllao {@link http://www.davidmonllao.com}
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class mod_hsuforum_search_testcase extends advanced_testcase {
+class search_test extends advanced_testcase {
 
     /**
      * @var string Area id
diff --git a/tests/user_autosubscription_test.php b/tests/user_autosubscription_test.php
index 6a0f2786..b54c3dbc 100644
--- a/tests/user_autosubscription_test.php
+++ b/tests/user_autosubscription_test.php
@@ -30,7 +30,7 @@
  * @copyright  Copyright (c) 2018 Open LMS (https://www.openlms.net)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class mod_hsuforum_user_autosubscription_testcase extends advanced_testcase {
+class user_autosubscription_test extends advanced_testcase {
     public function test_hsuforum_optional_subscription() {
         global $DB;
 

From 5ae24ab7f5358a987758c699eb0ee80638e9c2c4 Mon Sep 17 00:00:00 2001
From: Matthias Opitz <m.opitz@ucl.ac.uk>
Date: Mon, 26 Jun 2023 16:33:28 +0100
Subject: [PATCH 04/18] replaced outdated cron_setup_user() with new
 cron::setup_user()

---
 lib.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib.php b/lib.php
index 1770f447..cc3f63ff 100644
--- a/lib.php
+++ b/lib.php
@@ -27,6 +27,8 @@
 /** Include required files */
 require_once($CFG->libdir.'/filelib.php');
 require_once($CFG->dirroot.'/user/selector/lib.php');
+
+use core\cron;
 use mod_hsuforum\renderables\advanced_editor;
 /// CONSTANTS ///////////////////////////////////////////////////////////
 
@@ -609,7 +611,7 @@ function hsuforum_cron() {
             $userto->markposts     = array();
 
             // Set this so that the capabilities are cached, and environment matches receiving user.
-            cron_setup_user($userto);
+            cron::setup_user($userto);
 
             // Reset the caches.
             foreach ($coursemodules as $forumid => $unused) {
@@ -673,7 +675,7 @@ function hsuforum_cron() {
                 // Note: If we want to check that userto and userfrom are not the same person this is probably the spot to do it.
 
                 // Setup global $COURSE properly - needed for roles and languages.
-                cron_setup_user($userto, $course);
+                cron::setup_user($userto, $course);
 
                 // Fill caches.
                 if (!isset($userto->viewfullnames[$forum->id])) {
@@ -887,7 +889,8 @@ function hsuforum_cron() {
     unset($mailcount);
     unset($errorcount);
 
-    cron_setup_user();
+    //cron_setup_user();
+    cron::setup_user();
 
     $sitetimezone = core_date::get_server_timezone();
 
@@ -976,7 +979,7 @@ function hsuforum_cron() {
 
                 core_php_time_limit::raise(120); // terminate if processing of any account takes longer than 2 minutes
 
-                cron_setup_user();
+                cron::setup_user();
 
                 mtrace(get_string('processingdigest', 'hsuforum', $userid), '... ');
 
@@ -997,7 +1000,7 @@ function hsuforum_cron() {
 
                 // Override the language and timezone of the "current" user, so that
                 // mail is customised for the receiver.
-                cron_setup_user($userto);
+                cron::setup_user($userto);
 
                 $postsubject = get_string('digestmailsubject', 'hsuforum', format_string($site->shortname, true));
 
@@ -1021,7 +1024,7 @@ function hsuforum_cron() {
                     $cm         = $coursemodules[$forum->id];
 
                     //override language
-                    cron_setup_user($userto, $course);
+                    cron::setup_user($userto, $course);
 
                     // Fill caches
                     if (!isset($userto->viewfullnames[$forum->id])) {
@@ -1200,7 +1203,7 @@ function hsuforum_cron() {
         $config->digestmailtimelast = $timenow;
     }
 
-    cron_setup_user();
+    cron::setup_user();
 
     if (!empty($usermailcount)) {
         mtrace(get_string('digestsentusers', 'hsuforum', $usermailcount));
@@ -3706,7 +3709,7 @@ function hsuforum_rating_validate($params) {
             throw new rating_exception('cannotfindgroup');//something is wrong
         }
         if (!empty($discussion->unread) && $discussion->unread !== '-') {
-            $replystring .= ' <span class="sep">/</span> <span class="unread">';
+            $replystring = ' <span class="sep">/</span> <span class="unread">';
             $unreadlink = new moodle_url($discussionlink, null, 'unread');
             if ($discussion->unread == 1) {
                 $replystring .= html_writer::link($unreadlink, get_string('unreadpostsone', 'hsuforum'));

From 54d904535f74879114dcdde0d4f9773aeeb4e84b Mon Sep 17 00:00:00 2001
From: Matthias Opitz <m.opitz@ucl.ac.uk>
Date: Mon, 26 Jun 2023 17:26:06 +0100
Subject: [PATCH 05/18] fixed externallib_test.php

---
 externallib.php            | 7 +++++++
 lib.php                    | 4 +++-
 tests/externallib_test.php | 5 ++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/externallib.php b/externallib.php
index 5deface1..bd63beb1 100644
--- a/externallib.php
+++ b/externallib.php
@@ -23,6 +23,13 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+use core_external\external_api;
+use core_external\external_function_parameters;
+use core_external\external_single_structure;
+use core_external\external_multiple_structure;
+use core_external\external_value;
+use core_external\util as external_util;
+
 defined('MOODLE_INTERNAL') || die;
 
 require_once("$CFG->libdir/externallib.php");
diff --git a/lib.php b/lib.php
index cc3f63ff..8e7e901e 100644
--- a/lib.php
+++ b/lib.php
@@ -4406,7 +4406,9 @@ function hsuforum_add_discussion($discussion, $mform=null, $unused=null, $userid
     $post->mailnow       = $discussion->mailnow;
     $post->reveal        = $discussion->reveal;
 
-    if (!is_null($mform) && method_exists($mform, 'get_data')) {
+    if (!is_null($mform) &&
+        (is_object($mform) || is_string($mform)) &&
+        method_exists($mform, 'get_data')) {
         $data = $mform->get_data();
         if (!empty($data->reveal)) {
             $post->reveal = 1;
diff --git a/tests/externallib_test.php b/tests/externallib_test.php
index a19fe16a..f03510e2 100644
--- a/tests/externallib_test.php
+++ b/tests/externallib_test.php
@@ -30,7 +30,10 @@
 require_once($CFG->dirroot . '/webservice/tests/helpers.php');
 require_once($CFG->dirroot . '/mod/hsuforum/lib.php');
 
-class mod_hsuforum_external_testcase extends externallib_advanced_testcase {
+/**
+ * @runTestsInSeparateProcesses
+ */
+class externallib_test extends externallib_advanced_testcase {
 
     /**
      * Tests set up

From ffb606d6e9c5dbfab20e1d58506b7eb827d1e695 Mon Sep 17 00:00:00 2001
From: Matthias Opitz <m.opitz@ucl.ac.uk>
Date: Thu, 29 Jun 2023 13:38:45 +0100
Subject: [PATCH 06/18] forcing use of Atto editor for some Behat tests as they
 are looking for atto-style form fields and from 4.2 the default editor is
 TinyMCE

---
 ...anced_editor_pass_data_to_new_page.feature | 19 +++++++++++++++----
 tests/behat/grading_settings.feature          |  2 +-
 tests/behat/posts_ordering_blog.feature       |  6 +++++-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/tests/behat/advanced_editor_pass_data_to_new_page.feature b/tests/behat/advanced_editor_pass_data_to_new_page.feature
index 83a4b025..b46d8027 100644
--- a/tests/behat/advanced_editor_pass_data_to_new_page.feature
+++ b/tests/behat/advanced_editor_pass_data_to_new_page.feature
@@ -6,6 +6,10 @@ Feature: Users see their typed information in the advanced editor view when clic
       | username | firstname | lastname | email |
       | student1 | Student | 1 | student1@example.com |
       | teacher1 | Teacher | 1 | teacher1@example.com |
+    And the following "user preferences" exist:
+      | user   | preference   | value    |
+      | teacher1  | htmleditor   | atto |
+      | student1  | htmleditor   | atto |
     And the following "courses" exist:
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
@@ -27,7 +31,11 @@ Feature: Users see their typed information in the advanced editor view when clic
   Scenario: User can continue writing after clicking "Use advanced editor"
     When I log in as "teacher1"
     And I am on "Course 1" course homepage
-    And I follow "Test forum name"
+    And I change window size to "large"
+    # This does no longer work with Moodle 4.2
+    # And I follow "Test forum name"
+    # But this works:
+    And I click on ".aalink:contains('Test forum name')" "css_element"
     And I wait until the page is ready
     And I press "Add a new discussion"
     And I should see "Add your discussion"
@@ -38,8 +46,10 @@ Feature: Users see their typed information in the advanced editor view when clic
     And I wait until the page is ready
     And I should not see "Add your discussion"
     And I should see "Your new discussion topic"
-    And I set the field with xpath "//*[@id='id_subject']" to "Test discussion 1 to be cancelled"
-    And I set the field with xpath "//*[@id='id_messageeditable']" to "Test discussion 1 to be cancelled description"
+    And I set the field with xpath "//*[@id='id_subject']" to "Test discussion 1 to be cancelled again"
+    And I set the field with xpath "//*[@id='id_messageeditable']" to "Test discussion 1 to be cancelled description again"
+#    And I set the field with xpath "//*[@class='mce-content-body']" to "Test discussion 1 to be cancelled description again"
+#    And I set editable div ".mce-content-body" "css_element" to "Test discussion 1 to be cancelled description"
     And I press "Post to forum"
     Then I log out
     And I log in as "student1"
@@ -59,7 +69,8 @@ Feature: Users see their typed information in the advanced editor view when clic
     And I log out
     And I log in as "teacher1"
     And I am on "Course 1" course homepage
-    And I follow "Test forum name"
+#    And I follow "Test forum name"
+    And I click on ".aalink:contains('Test forum name')" "css_element"
     And I follow "Test discussion 1 to be cancelled"
     And I wait until the page is ready
     And I set editable div ".hsuforum-textarea" "css_element" to "Test discussion 1 to be cancelled description"
diff --git a/tests/behat/grading_settings.feature b/tests/behat/grading_settings.feature
index af6f500a..a92d88a4 100644
--- a/tests/behat/grading_settings.feature
+++ b/tests/behat/grading_settings.feature
@@ -68,5 +68,5 @@ Feature: While creating a new activity, the grade settings should remain in the
     # Test forum name Open forum, should exist as a Grade category 1 which is the Grade category chosen before.
     And I should see "Grade category 1"
     And I should see "Test forum name"
-    And "//h4[contains(text(), 'Grade category 1')]" "xpath_element" should exist
+    And "//div[contains(text(), 'Grade category 1')]" "xpath_element" should exist
     And "//a[contains(text(), 'Test forum name')]" "xpath_element" should exist
\ No newline at end of file
diff --git a/tests/behat/posts_ordering_blog.feature b/tests/behat/posts_ordering_blog.feature
index 0091bd6d..fe70297d 100644
--- a/tests/behat/posts_ordering_blog.feature
+++ b/tests/behat/posts_ordering_blog.feature
@@ -1,4 +1,4 @@
-@mod @mod_hsuforum
+@mod @mod_hsuforum @workbench
 Feature: In Open Forums, blog posts are always displayed in reverse chronological order
   In order to use forum as a blog
   As a user
@@ -9,6 +9,10 @@ Feature: In Open Forums, blog posts are always displayed in reverse chronologica
       | username  | firstname | lastname  | email                 |
       | teacher1  | Teacher   | 1         | teacher1@example.com  |
       | student1  | Student   | 1         | student1@example.com  |
+    And the following "user preferences" exist:
+      | user   | preference   | value    |
+      | teacher1  | htmleditor   | atto |
+      | student1  | htmleditor   | atto |
     And the following "courses" exist:
       | fullname  | shortname | category  |
       | Course 1  | C1        | 0         |

From 962b02cdba59bc9ff1ebdeb2cdc4e7c971e2d2c5 Mon Sep 17 00:00:00 2001
From: John Yao <johnyao@catalyst-au.net>
Date: Fri, 26 Jun 2020 12:28:34 +1000
Subject: [PATCH 07/18] Fix #19 - prevent thread content from rendering in html
 in main view

---
 renderer.php | 24 +++++++++++++-----------
 styles.css   |  1 -
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/renderer.php b/renderer.php
index d9f57d8a..8e135eeb 100644
--- a/renderer.php
+++ b/renderer.php
@@ -270,7 +270,7 @@ public function discussions($cm, array $discussions, array $options) {
         $output = '<div class="hsuforum-new-discussion-target"></div>';
         foreach ($discussions as $discussionpost) {
             list($discussion, $post) = $discussionpost;
-            $output .= $this->discussion($cm, $discussion, $post, false);
+            $output .= $this->discussion($cm, $discussion, $post, false, array(), null, true);
         }
 
 
@@ -314,9 +314,10 @@ public function discussion_thread($cm, $discussion, $post, array $posts, $canrep
      * @param \stdClass $post The discussion's post to render
      * @param \stdClass[] $posts The discussion posts (optional)
      * @param null|boolean $canreply If the user can reply or not (optional)
+     * @param null|boolean $hidethreadcontent for main view(optional)
      * @return string
      */
-    public function discussion($cm, $discussion, $post, $fullthread, array $posts = array(), $canreply = null) {
+    public function discussion($cm, $discussion, $post, $fullthread, array $posts = array(), $canreply = null, $hidethreadcontent = null) {
         global $DB, $PAGE, $USER;
 
         $forum = hsuforum_get_cm_forum($cm);
@@ -432,7 +433,7 @@ public function discussion($cm, $discussion, $post, $fullthread, array $posts =
             $data->timed = '';
         }
 
-        return $this->discussion_template($data, $forum->type);
+        return $this->discussion_template($data, $forum->type, $hidethreadcontent);
     }
 
     public function article_assets($cm) {
@@ -546,7 +547,7 @@ public function post($cm, $discussion, $post, $canreply = false, $parent = null,
         return $this->post_template($data);
     }
 
-    public function discussion_template($d, $forumtype) {
+    public function discussion_template($d, $forumtype, $hidethreadcontent = null) {
         global $PAGE;
 
         $replies = '';
@@ -619,7 +620,11 @@ public function discussion_template($d, $forumtype) {
             $revealed = '<span class="label label-danger">'.$nonanonymous.'</span>';
         }
 
-        $arialabeldiscussion = get_string('discussionforum', 'hsuforum', $d->subject);
+        $threadcontent = '';
+        if (!$hidethreadcontent) {
+            $threadcontent = '<div class="hsuforum-thread-content" tabindex="0">' . $d->message . '</div>';
+        }
+
 
         $threadheader = <<<HTML
         <div class="hsuforum-thread-header">
@@ -645,10 +650,7 @@ public function discussion_template($d, $forumtype) {
         </div>
 
         $threadheader
-
-        <div class="hsuforum-thread-content" tabindex="0">
-            $d->message
-        </div>
+        $threadcontent
         $tools
     </header>
 
@@ -1253,7 +1255,7 @@ public function post_message($post, $cm, $search = '') {
                 'course' => $cm->course,
                 'hsuforum' => $cm->instance));
         }
-        
+
         $postcontent = format_text($message, $post->messageformat, $options, $cm->course);
 
         if (!empty($search)) {
@@ -1711,7 +1713,7 @@ protected function simple_edit_template($t) {
         }
         if ($canattach) {
             $files .= <<<HTML
-                <label class="editor-attachments">                   
+                <label class="editor-attachments">
                     <input type="file" name="attachment[]" multiple="multiple" />
                 </label>
 HTML;
diff --git a/styles.css b/styles.css
index 643ada54..e9618a3b 100644
--- a/styles.css
+++ b/styles.css
@@ -40,7 +40,6 @@
 /* Hide things in the main view */
 .hsuforum-thread .hsuforum-footer-reply,
 .hsuforum-thread .hsuforum-thread-body,
-.hsuforum-thread .hsuforum-thread-content,
 .hsuforum-thread .hsuforum-replycount-link,
 .hsuforum-reply-wrapper + header {
     display: none;

From fe2a66824a215a4e37b5ec7526d700783bc8080d Mon Sep 17 00:00:00 2001
From: Tim Schroeder <t.schroeder@itc.rwth-aachen.de>
Date: Fri, 21 Oct 2022 13:11:45 +0200
Subject: [PATCH 08/18] fixed php 8 problem

---
 renderer.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/renderer.php b/renderer.php
index 8e135eeb..d6b47a62 100644
--- a/renderer.php
+++ b/renderer.php
@@ -1904,7 +1904,7 @@ public function post_get_commands($post, $discussion, $cm, $canreply) {
                 'd' => $discussion->id,
                 'sesskey' => sesskey(),
             ]);
-            $commands['pin'] = $this->render_ax_button($pinurl, $pintext, 'post', $pinlink, $discussion->id);
+            $commands['pin'] = $this->render_ax_button($pinurl, $pintext, $pinlink, $discussion->id, 'post');
         }
 
         return $commands;
@@ -1914,12 +1914,12 @@ public function post_get_commands($post, $discussion, $cm, $canreply) {
      * Render ax button for pin/unpin.
      * @param moodle_url $url
      * @param string $content
-     * @param string $method
      * @param int $pinlink
      * @param int $discussion
+     * @param string $method
      * @return string
      */
-    public function render_ax_button(moodle_url $url, $content, $method, $pinlink, $discussion) {
+    public function render_ax_button(moodle_url $url, $content, $pinlink, $discussion, $method = 'post') {
         global $PAGE;
 
         $PAGE->requires->js_call_amd('mod_hsuforum/accessibility', 'init', array());

From 3d00ecefa59a362f60101f5982ede3ca53df6777 Mon Sep 17 00:00:00 2001
From: Matthias Opitz <m.opitz@ucl.ac.uk>
Date: Thu, 11 May 2023 16:43:09 +0100
Subject: [PATCH 09/18] running external tests as separate processes forcing
 object typa as 1st parameter when using method_exists() in hsuforum/lib.php

---
 lib.php                    |  4 +---
 tests/events_test.php      |  2 +-
 tests/externallib_test.php | 28 +++++++++++++++++++++++++---
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/lib.php b/lib.php
index 8e7e901e..ab59d798 100644
--- a/lib.php
+++ b/lib.php
@@ -4406,9 +4406,7 @@ function hsuforum_add_discussion($discussion, $mform=null, $unused=null, $userid
     $post->mailnow       = $discussion->mailnow;
     $post->reveal        = $discussion->reveal;
 
-    if (!is_null($mform) &&
-        (is_object($mform) || is_string($mform)) &&
-        method_exists($mform, 'get_data')) {
+    if (!is_null($mform) && method_exists((object) $mform, 'get_data')) {
         $data = $mform->get_data();
         if (!empty($data->reveal)) {
             $post->reveal = 1;
diff --git a/tests/events_test.php b/tests/events_test.php
index b2e11bfd..89165296 100644
--- a/tests/events_test.php
+++ b/tests/events_test.php
@@ -99,7 +99,7 @@ public function test_course_searched() {
         $this->assertCount(1, $events);
         $event = reset($events);
 
-         // Checking that the event contains the expected values.
+        // Checking that the event contains the expected values.
         $this->assertInstanceOf('\mod_hsuforum\event\course_searched', $event);
         $this->assertEquals($coursectx, $event->get_context());
         $expected = array($course->id, 'hsuforum', 'search', "search.php?id={$course->id}&amp;search={$searchterm}", $searchterm);
diff --git a/tests/externallib_test.php b/tests/externallib_test.php
index f03510e2..57dc86c3 100644
--- a/tests/externallib_test.php
+++ b/tests/externallib_test.php
@@ -46,6 +46,8 @@ protected function setUp():void {
 
     /**
      * Test get forums
+     *
+     * @runInSeparateProcess
      */
     public function test_mod_hsuforum_get_forums_by_courses() {
         global $USER, $CFG, $DB;
@@ -174,6 +176,8 @@ public function test_mod_hsuforum_get_forums_by_courses() {
 
     /**
      * Test get forum posts
+     *
+     * @runInSeparateProcess
      */
     public function test_mod_hsuforum_get_forum_discussion_posts() {
         global $CFG, $PAGE;
@@ -402,6 +406,8 @@ public function test_mod_hsuforum_get_forum_discussion_posts() {
 
     /**
      * Test get forum posts (qanda forum)
+     *
+     * @runInSeparateProcess
      */
     public function test_mod_hsuforum_get_forum_discussion_posts_qanda() {
         global $CFG, $DB;
@@ -468,6 +474,8 @@ public function test_mod_hsuforum_get_forum_discussion_posts_qanda() {
 
     /**
      * Test get forum discussions paginated
+     *
+     * @runInSeparateProcess
      */
     public function test_mod_hsuforum_get_forum_discussions_paginated() {
         global $USER, $DB, $PAGE;
@@ -616,6 +624,8 @@ public function test_mod_hsuforum_get_forum_discussions_paginated() {
 
     /**
      * Test get forum discussions paginated (qanda forums)
+     *
+     * @runInSeparateProcess
      */
     public function test_mod_hsuforum_get_forum_discussions_paginated_qanda() {
 
@@ -660,6 +670,8 @@ public function test_mod_hsuforum_get_forum_discussions_paginated_qanda() {
 
     /**
      * Test add_discussion_post
+     *
+     * @runInSeparateProcess
      */
     public function test_add_discussion_post() {
         global $CFG;
@@ -793,8 +805,10 @@ public function test_add_discussion_post() {
 
     }
 
-    /*
+    /**
      * Test add_discussion. A basic test since all the API functions are already covered by unit tests.
+     *
+     * @runInSeparateProcess
      */
     public function test_add_discussion() {
         global $CFG, $USER;
@@ -908,8 +922,10 @@ public function test_add_discussion() {
         $this->assertTrue($postfound);
     }
 
-    /*
+    /**
      * Test add_discussion without capability to upload attachments.
+     *
+     * @runInSeparateProcess
      */
     public function test_add_discussion_without_attachment_capability() {
         global $DB;
@@ -963,6 +979,8 @@ public function test_add_discussion_without_attachment_capability() {
 
     /**
      * Test adding discussions in a course with gorups
+     *
+     * @runInSeparateProcess
      */
     public function test_add_discussion_in_course_with_groups() {
         global $CFG;
@@ -1062,8 +1080,10 @@ public function test_add_discussion_in_course_with_groups() {
 
     }
 
-    /*
+    /**
      * Test can_add_discussion. A basic test since all the API functions are already covered by unit tests.
+     *
+     * @runInSeparateProcess
      */
     public function test_can_add_discussion() {
         global $DB;
@@ -1110,6 +1130,8 @@ public function test_can_add_discussion() {
 
     /**
      * Test get forum posts discussions including rating information.
+     *
+     * @runInSeparateProcess
      */
     public function test_mod_hsuforum_get_forum_discussion_rating_information() {
         global $DB, $CFG;

From 9fa9943338c99f6f9382f31af77358089f3639fa Mon Sep 17 00:00:00 2001
From: Matthias Opitz <m.opitz@ucl.ac.uk>
Date: Thu, 11 May 2023 17:13:43 +0100
Subject: [PATCH 10/18] replaced outdated cron_setup_user() with
 \core\cron::setup_user() in lib.php removed assertEventLegacyData() from
 lib_test.php

---
 lib.php | 429 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 214 insertions(+), 215 deletions(-)

diff --git a/lib.php b/lib.php
index ab59d798..47c44acb 100644
--- a/lib.php
+++ b/lib.php
@@ -202,7 +202,7 @@ function hsuforum_update_instance($forum, $mform) {
     // if  scale changes - do we need to recheck the ratings, if ratings higher than scale how do we want to respond?
     // for count and sum aggregation types the grade we check to make sure they do not exceed the scale (i.e. max score) when calculating the grade
     if (($oldforum->assessed<>$forum->assessed) or ($oldforum->scale<>$forum->scale)) {
-        hsuforum_update_grades($forum); // recalculate grades for the forum
+        hsuforum_update_grades($forum); // Recalculate grades for the forum.
     }
 
     if ($forum->type == 'single') {  // Update related discussion and post.
@@ -213,7 +213,7 @@ function hsuforum_update_instance($forum, $mform) {
             }
             $discussion = array_pop($discussions);
         } else {
-            // try to recover by creating initial discussion - MDL-16262
+            // Try to recover by creating initial discussion - MDL-16262.
             $discussion = new stdClass();
             $discussion->course          = $forum->course;
             $discussion->forum           = $forum->id;
@@ -303,7 +303,7 @@ function hsuforum_delete_instance($id) {
 
     $context = context_module::instance($cm->id);
 
-    // now get rid of all files
+    // Now get rid of all files.
     $fs = get_file_storage();
     $fs->delete_area_files($context->id);
 
@@ -496,10 +496,10 @@ function hsuforum_cron() {
 
         if (!hsuforum_mark_old_posts_as_mailed($endtime)) {
             mtrace('Errors occurred while trying to mark some posts as being mailed.');
-            return false;  // Don't continue trying to mail them, in case we are in a cron loop
+            return false;  // Don't continue trying to mail them, in case we are in a cron loop.
         }
 
-        // checking post validity, and adding users to loop through later
+        // Checking post validity, and adding users to loop through later.
         foreach ($posts as $pid => $post) {
 
             $discussionid = $post->discussion;
@@ -552,7 +552,7 @@ function hsuforum_cron() {
             if (!isset($subscribedusers[$forumid])) {
                 if ($subusers = hsuforum_subscribed_users($courses[$courseid], $forums[$forumid], 0, $modcontext, "u.*")) {
                     foreach ($subusers as $postuser) {
-                        // this user is subscribed to this forum
+                        // This user is subscribed to this forum.
                         $subscribedusers[$forumid][$postuser->id] = $postuser->id;
                         $userscount++;
                         if ($userscount > HSUFORUM_CRON_USER_CACHE) {
@@ -572,16 +572,16 @@ function hsuforum_cron() {
                 }
             }
 
-            // caching subscribed users of each discussion
+            // Caching subscribed users of each discussion.
             if (!isset($discussionsubscribers[$discussionid])) {
                 $modcontext = context_module::instance($coursemodules[$forumid]->id);
                 if ($subusers = $discussionrepo->get_subscribed_users($forums[$forumid], $discussions[$discussionid], $modcontext, 0, 'u.*', array(), 'u.email ASC')) {
                     // Get a list of the users subscribed to discussions in the hsuforum.
                     foreach ($subusers as $postuser) {
                         unset($postuser->description); // not necessary
-                        // the user is subscribed to this discussion
+                        // The user is subscribed to this discussion.
                         $discussionsubscribers[$discussionid][$postuser->id] = $postuser->id;
-                        // this user is a user we have to process later
+                        // This user is a user we have to process later.
                         $users[$postuser->id] = $postuser;
                     }
                 }
@@ -633,7 +633,7 @@ function hsuforum_cron() {
                 // This does not necessarily mean that the user is subscribed to the forum or to the discussion though.
                 if (!isset($subscribedusers[$forum->id][$userto->id])) {
                     if (!isset($discussionsubscribers[$post->discussion][$userto->id])) {
-                        continue; // user does not subscribe to this forum
+                        continue; // User does not subscribe to this forum.
                     }
                 }
 
@@ -889,16 +889,15 @@ function hsuforum_cron() {
     unset($mailcount);
     unset($errorcount);
 
-    //cron_setup_user();
     cron::setup_user();
 
     $sitetimezone = core_date::get_server_timezone();
 
-    // Now see if there are any digest mails waiting to be sent, and if we should send them
+    // Now see if there are any digest mails waiting to be sent, and if we should send them.
 
     mtrace('Starting digest processing...');
 
-    core_php_time_limit::raise(300); // Terminate if not able to fetch all digests in 5 minutes
+    core_php_time_limit::raise(300); // Terminate if not able to fetch all digests in 5 minutes.
 
     if (!isset($config->digestmailtimelast)) {    // To catch the first time.
         set_config('digestmailtimelast', 0, 'hsuforum');
@@ -908,7 +907,7 @@ function hsuforum_cron() {
     $timenow = time();
     $digesttime = usergetmidnight($timenow, $sitetimezone) + ($config->digestmailtime * 3600);
 
-    // Delete any really old ones (normally there shouldn't be any)
+    // Delete any really old ones (normally there shouldn't be any).
     $weekago = $timenow - (7 * 24 * 3600);
     $DB->delete_records_select('hsuforum_queue', "timemodified < ?", array($weekago));
     mtrace ('Cleaned old digest records');
@@ -921,10 +920,10 @@ function hsuforum_cron() {
 
         if ($digestposts_rs->valid()) {
 
-            // We have work to do
+            // We have work to do.
             $usermailcount = 0;
 
-            //caches - reuse the those filled before too
+            // Caches - reuse the those filled before too.
             $discussionposts = array();
             $userdiscussions = array();
 
@@ -972,18 +971,18 @@ function hsuforum_cron() {
                 $userdiscussions[$digestpost->userid][$digestpost->discussionid] = $digestpost->discussionid;
                 $discussionposts[$digestpost->discussionid][$digestpost->postid] = $digestpost->postid;
             }
-            $digestposts_rs->close(); /// Finished iteration, let's close the resultset
+            $digestposts_rs->close(); /// Finished iteration, let's close the resultset.
 
-            // Data collected, start sending out emails to each user
+            // Data collected, start sending out emails to each user.
             foreach ($userdiscussions as $userid => $thesediscussions) {
 
-                core_php_time_limit::raise(120); // terminate if processing of any account takes longer than 2 minutes
+                core_php_time_limit::raise(120); // Terminate if processing of any account takes longer than 2 minutes.
 
                 cron::setup_user();
 
                 mtrace(get_string('processingdigest', 'hsuforum', $userid), '... ');
 
-                // First of all delete all the queue entries for this user
+                // First of all delete all the queue entries for this user.
                 $DB->delete_records_select('hsuforum_queue', "userid = ? AND timemodified < ?", array($userid, $digesttime));
 
                 // Init user caches - we keep the cache for one cycle only,
@@ -1016,17 +1015,17 @@ function hsuforum_cron() {
 
                 foreach ($thesediscussions as $discussionid) {
 
-                    core_php_time_limit::raise(120);   // to be reset for each post
+                    core_php_time_limit::raise(120);   // To be reset for each post.
 
                     $discussion = $discussions[$discussionid];
                     $forum      = $forums[$discussion->forum];
                     $course     = $courses[$forum->course];
                     $cm         = $coursemodules[$forum->id];
 
-                    //override language
+                    // Override language.
                     cron::setup_user($userto, $course);
 
-                    // Fill caches
+                    // Fill caches.
                     if (!isset($userto->viewfullnames[$forum->id])) {
                         $modcontext = context_module::instance($cm->id);
                         $userto->viewfullnames[$forum->id] = has_capability('moodle/site:viewfullnames', $modcontext);
@@ -1070,7 +1069,7 @@ function hsuforum_cron() {
                     foreach ($postsarray as $postid) {
                         $post = $posts[$postid];
 
-                        if (array_key_exists($post->userid, $users)) { // we might know him/her already
+                        if (array_key_exists($post->userid, $users)) { // We might know him/her already.
                             $userfrom = $users[$post->userid];
                             if (!isset($userfrom->idnumber)) {
                                 $userfrom = $DB->get_record('user', array('id' => $userfrom->id));
@@ -1142,7 +1141,7 @@ function hsuforum_cron() {
                              $posttext .= $textdigestbasicout->render($data);
                              $posthtml .= $htmldigestbasicout->render($data);
                         } else {
-                            // The full treatment
+                            // The full treatment.
                             $posttext .= $textdigestfullout->render($data);
                             $posthtml .= $htmldigestfullout->render($data);
 
@@ -1166,7 +1165,7 @@ function hsuforum_cron() {
                 }
 
                 if (empty($userto->mailformat) || $userto->mailformat != 1) {
-                    // This user DOESN'T want to receive HTML
+                    // This user DOESN'T want to receive HTML.
                     $posthtml = '';
                 }
 
@@ -1191,14 +1190,14 @@ function hsuforum_cron() {
                     mtrace("success.");
                     $usermailcount++;
 
-                    // Mark post as read
+                    // Mark post as read.
                     if (get_user_preferences('hsuforum_markasreadonnotification', 1, $userto->id) == 1) {
                         hsuforum_mark_posts_read($userto, $userto->markposts);
                     }
                 }
             }
         }
-    /// We have finishied all digest emails, update hsuforum digestmailtimelast
+    /// We have finishied all digest emails, update hsuforum digestmailtimelast.
         set_config('digestmailtimelast', $timenow, 'hsuforum');
         $config->digestmailtimelast = $timenow;
     }
@@ -1265,9 +1264,9 @@ function hsuforum_user_outline($course, $user, $mod, $forum) {
             $result->info = get_string('gradenoun') . ': ' . get_string('hidden', 'grades');
         }
 
-        //datesubmitted == time created. dategraded == time modified or time overridden
-        //if grade was last modified by the user themselves use date graded. Otherwise use date submitted
-        //TODO: move this copied & pasted code somewhere in the grades API. See MDL-26704
+        // Datesubmitted == time created. dategraded == time modified or time overridden
+        // if grade was last modified by the user themselves use date graded. Otherwise use date submitted.
+        // TODO: move this copied & pasted code somewhere in the grades API. See MDL-26704.
         if ($grade->usermodified == $user->id || empty($grade->datesubmitted)) {
             $result->time = $grade->dategraded;
         } else {
@@ -1417,17 +1416,17 @@ function hsuforum_print_overview($courses,&$htmlarray) {
 
     $config = get_config('hsuforum');
 
-    // Courses to search for new posts
+    // Courses to search for new posts.
     $coursessqls = array();
     $params = array();
     foreach ($courses as $course) {
 
-        // If the user has never entered into the course all posts are pending
+        // If the user has never entered into the course all posts are pending.
         if ($course->lastaccess == 0) {
             $coursessqls[] = '(d.course = ?)';
             $params[] = $course->id;
 
-        // Only posts created after the course last access
+        // Only posts created after the course last access.
         } else {
             $coursessqls[] = '(d.course = ? AND p.created > ?)';
             $params[] = $course->id;
@@ -1456,7 +1455,7 @@ function hsuforum_print_overview($courses,&$htmlarray) {
 
     $forumsnewposts = hsuforum_filter_user_groups_discussions($discussions);
 
-    // also get all forum tracking stuff ONCE.
+    // Also get all forum tracking stuff ONCE.
     $trackingforums = array();
     foreach ($forums as $forum) {
         $trackingforums[$forum->id] = $forum;
@@ -1476,7 +1475,7 @@ function hsuforum_print_overview($courses,&$htmlarray) {
             if (isset($SESSION->currentgroup[$track->course])) {
                 $groupid =  $SESSION->currentgroup[$track->course];
             } else {
-                // get first groupid
+                // Get first groupid.
                 $groupids = groups_get_all_groups($track->course, $USER->id);
                 if ($groupids) {
                     reset($groupids);
@@ -1489,7 +1488,7 @@ function hsuforum_print_overview($courses,&$htmlarray) {
             }
             $params[] = $groupid;
         }
-        $sql = substr($sql,0,-3); // take off the last OR
+        $sql = substr($sql,0,-3); // Take off the last OR.
         $sql .= ') AND p.modified >= ? AND r.id is NULL ';
         $sql .= 'AND (p.privatereply = 0 OR p.privatereply = ? OR p.userid = ?) ';
         $sql .= 'AND (d.timestart < ? AND (d.timeend = 0 OR d.timeend > ?)) ';
@@ -1516,7 +1515,7 @@ function hsuforum_print_overview($courses,&$htmlarray) {
         $count = 0;
         $thisunread = 0;
         $showunread = false;
-        // either we have something from logs, or trackposts, or nothing.
+        // Either we have something from logs, or trackposts, or nothing.
         if (array_key_exists($forum->id, $forumsnewposts) && !empty($forumsnewposts[$forum->id])) {
             $count = $forumsnewposts[$forum->id]->count;
         }
@@ -1539,7 +1538,7 @@ function hsuforum_print_overview($courses,&$htmlarray) {
                 $htmlarray[$forum->course] = array();
             }
             if (!array_key_exists('hsuforum',$htmlarray[$forum->course])) {
-                $htmlarray[$forum->course]['hsuforum'] = ''; // initialize, avoid warnings
+                $htmlarray[$forum->course]['hsuforum'] = ''; // Initialize, avoid warnings.
             }
             $htmlarray[$forum->course]['hsuforum'] .= $str;
         }
@@ -1639,7 +1638,7 @@ function hsuforum_recent_activity($course, $viewfullnames, $timestart, $forumid
     if (is_array($posts)) {
         foreach ($posts as $post) {
             if (!isset($modinfo->instances['hsuforum'][$post->forum])) {
-                // not visible
+                // Not visible.
                 continue;
             }
             $cm = $modinfo->instances['hsuforum'][$post->forum];
@@ -1756,7 +1755,7 @@ function hsuforum_get_user_rating_grades($forum, $userid = 0) {
     $ratingoptions->component = 'mod_hsuforum';
     $ratingoptions->ratingarea = 'post';
 
-    //need these to work backwards to get a context id. Is there a better way to get contextid from a module instance?
+    // Need these to work backwards to get a context id. Is there a better way to get contextid from a module instance?
     $ratingoptions->modulename = 'hsuforum';
     $ratingoptions->moduleid   = $forum->id;
     $ratingoptions->userid = $userid;
@@ -1837,7 +1836,7 @@ function hsuforum_upgrade_grades() {
         $i=0;
         foreach ($rs as $forum) {
             $i++;
-            upgrade_set_timeout(60*5); // set up timeout, may also abort execution
+            upgrade_set_timeout(60*5); // Set up timeout, may also abort execution.
             hsuforum_update_grades($forum, 0, false);
             $pbar->update($i, $count, "Updating Forum grades ($i/$count).");
         }
@@ -1858,7 +1857,7 @@ function hsuforum_upgrade_grades() {
  */
 function hsuforum_grade_item_update($forum, $grades=NULL) {
     global $CFG;
-    if (!function_exists('grade_update')) { //workaround for buggy PHP versions
+    if (!function_exists('grade_update')) { // Workaround for buggy PHP versions.
         require_once($CFG->libdir.'/gradelib.php');
     }
 
@@ -2014,7 +2013,7 @@ function hsuforum_get_all_discussion_posts($discussionid, $conditions = array())
             continue;
         }
         if (!isset($posts[$p->parent])) {
-            continue; // parent does not exist??
+            continue; // Parent does not exist??
         }
         if (!isset($posts[$p->parent]->children)) {
             $posts[$p->parent]->children = array();
@@ -2083,7 +2082,7 @@ function hsuforum_get_readable_forums($userid, $courseid=0, $excludeanonymous =
         $modinfo = get_fast_modinfo($course);
 
         if (empty($modinfo->instances['hsuforum'])) {
-            // hmm, no forums?
+            // Hmm, no forums?
             continue;
         }
 
@@ -2106,14 +2105,14 @@ function hsuforum_get_readable_forums($userid, $courseid=0, $excludeanonymous =
                 continue;
             }
 
-         /// group access
+         // Group access.
             if (groups_get_activity_groupmode($cm, $course) == SEPARATEGROUPS and !has_capability('moodle/site:accessallgroups', $context)) {
 
                 $forum->onlygroups = $modinfo->get_groups($cm->groupingid);
                 $forum->onlygroups[] = -1;
             }
 
-        /// hidden timed discussions
+        // Hidden timed discussions.
             $forum->viewhiddentimedposts = true;
             if (!empty($config->enabletimedposts)) {
                 if (!has_capability('mod/hsuforum:viewhiddentimedposts', $context)) {
@@ -2121,7 +2120,7 @@ function hsuforum_get_readable_forums($userid, $courseid=0, $excludeanonymous =
                 }
             }
 
-        /// qanda access
+        // Qanda access.
             if ($forum->type == 'qanda'
                     && !has_capability('mod/hsuforum:viewqandawithoutposting', $context)) {
 
@@ -2140,7 +2139,7 @@ function hsuforum_get_readable_forums($userid, $courseid=0, $excludeanonymous =
 
         unset($modinfo);
 
-    } // End foreach $courses
+    } // End foreach $courses.
 
     return $readableforums;
 }
@@ -2758,7 +2757,7 @@ function hsuforum_count_discussions($forum, $cm, $course) {
 
     $mygroups = $modinfo->get_groups($cm->groupingid);
 
-    // add all groups posts
+    // Add all groups posts.
     $mygroups[-1] = -1;
 
     list($mygroups_sql, $params) = $DB->get_in_or_equal($mygroups);
@@ -2815,7 +2814,7 @@ function hsuforum_get_discussions($cm, $forumsort="", $forumselect=true, $unused
 
     $modcontext = context_module::instance($cm->id);
 
-    if (!has_capability('mod/hsuforum:viewdiscussion', $modcontext)) { /// User must have perms to view discussions
+    if (!has_capability('mod/hsuforum:viewdiscussion', $modcontext)) { // User must have perms to view discussions.
         return array();
     }
 
@@ -2854,7 +2853,7 @@ function hsuforum_get_discussions($cm, $forumsort="", $forumselect=true, $unused
     }
     $params[] = $cm->instance;
 
-    if (!empty($config->enabletimedposts)) { /// Users must fulfill timed posts
+    if (!empty($config->enabletimedposts)) { // Users must fulfill timed posts.
 
         if (!has_capability('mod/hsuforum:viewhiddentimedposts', $modcontext)) {
             $timelimit = " AND ((d.timestart <= ? AND (d.timeend = 0 OR d.timeend > ?))";
@@ -2946,7 +2945,7 @@ function hsuforum_get_discussions($cm, $forumsort="", $forumselect=true, $unused
 
     $userfieldsapi = \core_user\fields::for_name();
 
-    if (empty($userlastmodified)) {  // We don't need to know this
+    if (empty($userlastmodified)) {  // We don't need to know this.
         $umfields = "";
         $umtable  = "";
     } else {
@@ -2962,7 +2961,7 @@ function hsuforum_get_discussions($cm, $forumsort="", $forumselect=true, $unused
         $params[] = $updatedsince;
     }
 
-    // Sort of hacky, but allows for custom select
+    // Sort of hacky, but allows for custom select.
     if (is_string($forumselect) and !empty($forumselect)) {
         $selectsql = $forumselect;
     } else {
@@ -3221,7 +3220,7 @@ function hsuforum_get_discussions_unread($cm) {
             }
 
         } else {
-            //separate groups without access all
+            // Separate groups without access all.
             if ($currentgroup) {
                 $groupselect = "AND (d.groupid = :currentgroup OR d.groupid = -1)";
                 $params['currentgroup'] = $currentgroup;
@@ -3291,7 +3290,7 @@ function hsuforum_get_discussions_count($cm) {
             }
 
         } else {
-            //seprate groups without access all
+            // Seprate groups without access all.
             if ($currentgroup) {
                 $groupselect = "AND (d.groupid = ? OR d.groupid = -1)";
                 $params[] = $currentgroup;
@@ -3342,7 +3341,7 @@ function hsuforum_get_discussions_count($cm) {
 function hsuforum_get_potential_subscribers($forumcontext, $groupid, $fields, $sort = '') {
     global $DB;
 
-    // only active enrolled users or everybody on the frontpage
+    // Only active enrolled users or everybody on the frontpage.
     list($esql, $params) = get_enrolled_sql($forumcontext, 'mod/hsuforum:allowforcesubscribe', $groupid, true);
     if (!$sort) {
         list($sort, $sortparams) = users_order_by_sql('u');
@@ -3405,7 +3404,7 @@ function hsuforum_subscribed_users($course, $forum, $groupid=0, $context = null,
         $results = hsuforum_get_potential_subscribers($context, $groupid, $fields, "u.email ASC");
 
     } else {
-        // only active enrolled users or everybody on the frontpage
+        // Only active enrolled users or everybody on the frontpage.
         list($esql, $params) = get_enrolled_sql($context, '', $groupid, true);
         $params['forumid'] = $forum->id;
         $results = $DB->get_records_sql("SELECT $fields
@@ -3438,14 +3437,14 @@ function hsuforum_subscribed_users($course, $forum, $groupid=0, $context = null,
  * @param string $type
  */
 function hsuforum_get_course_forum($courseid, $type) {
-// How to set up special 1-per-course forums
+// How to set up special 1-per-course forums.
     global $CFG, $DB, $OUTPUT, $USER;
 
     if ($forums = $DB->get_records_select("hsuforum", "course = ? AND type = ?", array($courseid, $type), "id ASC")) {
         // There should always only be ONE, but with the right combination of
         // errors there might be more.  In this case, just return the oldest one (lowest ID).
         foreach ($forums as $forum) {
-            return $forum;   // ie the first one
+            return $forum;   // Ie the first one.
         }
     }
 
@@ -3639,22 +3638,22 @@ function hsuforum_rating_permissions($contextid, $component, $ratingarea) {
 function hsuforum_rating_validate($params) {
     global $DB, $USER;
 
-    // Check the component is mod_hsuforum
+    // Check the component is mod_hsuforum.
     if ($params['component'] != 'mod_hsuforum') {
         throw new rating_exception('invalidcomponent');
     }
 
-    // Check the ratingarea is post (the only rating area in forum)
+    // Check the ratingarea is post (the only rating area in forum).
     if ($params['ratingarea'] != 'post') {
         throw new rating_exception('invalidratingarea');
     }
 
-    // Check the rateduserid is not the current user .. you can't rate your own posts
+    // Check the rateduserid is not the current user .. you can't rate your own posts.
     if ($params['rateduserid'] == $USER->id) {
         throw new rating_exception('nopermissiontorate');
     }
 
-    // Fetch all the related records ... we need to do this anyway to call hsuforum_user_can_see_post
+    // Fetch all the related records ... we need to do this anyway to call hsuforum_user_can_see_post.
     $post = $DB->get_record('hsuforum_posts', array('id' => $params['itemid'], 'userid' => $params['rateduserid']), '*', MUST_EXIST);
     $discussion = $DB->get_record('hsuforum_discussions', array('id' => $post->discussion), '*', MUST_EXIST);
     $forum = $DB->get_record('hsuforum', array('id' => $discussion->forum), '*', MUST_EXIST);
@@ -3662,33 +3661,33 @@ function hsuforum_rating_validate($params) {
     $cm = get_coursemodule_from_instance('hsuforum', $forum->id, $course->id , false, MUST_EXIST);
     $context = context_module::instance($cm->id);
 
-    // Make sure the context provided is the context of the forum
+    // Make sure the context provided is the context of the forum.
     if ($context->id != $params['context']->id) {
         throw new rating_exception('invalidcontext');
     }
 
     if ($forum->scale != $params['scaleid']) {
-        //the scale being submitted doesnt match the one in the database
+        // The scale being submitted doesnt match the one in the database.
         throw new rating_exception('invalidscaleid');
     }
 
-    // check the item we're rating was created in the assessable time window
+    // Check the item we're rating was created in the assessable time window.
     if (!empty($forum->assesstimestart) && !empty($forum->assesstimefinish)) {
         if ($post->created < $forum->assesstimestart || $post->created > $forum->assesstimefinish) {
             throw new rating_exception('notavailable');
         }
     }
 
-    //check that the submitted rating is valid for the scale
+    // Check that the submitted rating is valid for the scale.
 
-    // lower limit
+    // Lower limit.
     if ($params['rating'] < 0  && $params['rating'] != RATING_UNSET_RATING) {
         throw new rating_exception('invalidnum');
     }
 
-    // upper limit
+    // Upper limit.
     if ($forum->scale < 0) {
-        //its a custom scale
+        // It's a custom scale.
         $scalerecord = $DB->get_record('scale', array('id' => -$forum->scale));
         if ($scalerecord) {
             $scalearray = explode(',', $scalerecord->scale);
@@ -3699,13 +3698,13 @@ function hsuforum_rating_validate($params) {
             throw new rating_exception('invalidscaleid');
         }
     } else if ($params['rating'] > $forum->scale) {
-        //if its numeric and submitted rating is above maximum
+        // If its numeric and submitted rating is above maximum.
         throw new rating_exception('invalidnum');
     }
 
-    // Make sure groups allow this user to see the item they're rating
-    if ($discussion->groupid > 0 and $groupmode = groups_get_activity_groupmode($cm, $course)) {   // Groups are being used
-        if (!groups_group_exists($discussion->groupid)) { // Can't find group
+    // Make sure groups allow this user to see the item they're rating.
+    if ($discussion->groupid > 0 and $groupmode = groups_get_activity_groupmode($cm, $course)) {   // Groups are being used.
+        if (!groups_group_exists($discussion->groupid)) { // Can't find group.
             throw new rating_exception('cannotfindgroup');//something is wrong
         }
         if (!empty($discussion->unread) && $discussion->unread !== '-') {
@@ -3720,12 +3719,12 @@ function hsuforum_rating_validate($params) {
         }
 
         if (!groups_is_member($discussion->groupid) and !has_capability('moodle/site:accessallgroups', $context)) {
-            // do not allow rating of posts from other groups when in SEPARATEGROUPS or VISIBLEGROUPS
+            // Do not allow rating of posts from other groups when in SEPARATEGROUPS or VISIBLEGROUPS.
             throw new rating_exception('notmemberofgroup');
         }
     }
 
-    // perform some final capability checks
+    // Perform some final capability checks.
     if (!hsuforum_user_can_see_post($forum, $discussion, $post, $USER, $cm)) {
         throw new rating_exception('nopermissiontorate');
     }
@@ -3864,7 +3863,7 @@ function hsuforum_move_attachments($discussion, $forumfrom, $forumto) {
     $newcontext = context_module::instance($newcm->id);
     $oldcontext = context_module::instance($oldcm->id);
 
-    // loop through all posts, better not use attachment flag ;-)
+    // Loop through all posts, better not use attachment flag ;-).
     if ($posts = $DB->get_records('hsuforum_posts', array('discussion'=>$discussion->id), '', 'id, attachment')) {
         foreach ($posts as $post) {
             $fs->move_area_files_to_new_context($oldcontext->id,
@@ -3872,11 +3871,11 @@ function hsuforum_move_attachments($discussion, $forumfrom, $forumto) {
             $attachmentsmoved = $fs->move_area_files_to_new_context($oldcontext->id,
                     $newcontext->id, 'mod_hsuforum', 'attachment', $post->id);
             if ($attachmentsmoved > 0 && $post->attachment != '1') {
-                // Weird - let's fix it
+                // Weird - let's fix it.
                 $post->attachment = '1';
                 $DB->update_record('hsuforum_posts', $post);
             } else if ($attachmentsmoved == 0 && $post->attachment != '') {
-                // Weird - let's fix it
+                // Weird - let's fix it.
                 $post->attachment = '';
                 $DB->update_record('hsuforum_posts', $post);
             }
@@ -3950,9 +3949,9 @@ function hsuforum_print_attachments($post, $cm, $type) {
             } else if ($type == 'text') {
                 $output .= "$strattachment ".s($filename).":\n$path\n";
 
-            } else { //'returnimages'
+            } else { // Returnimages.
                 if (in_array($mimetype, array('image/gif', 'image/jpeg', 'image/png'))) {
-                    // Image attachments don't get printed as links
+                    // Image attachments don't get printed as links.
                     $imagereturn .= "<br />".format_text("<img src=\"$path\" alt=\"\" />");
                     if ($canexport) {
                         $button->set_callback_options('hsuforum_portfolio_caller', array('postid' => $post->id, 'attachment' => $file->get_id()), 'mod_hsuforum');
@@ -4035,7 +4034,7 @@ function hsuforum_get_file_info($browser, $areas, $course, $cm, $context, $filea
         return null;
     }
 
-    // filearea must contain a real area
+    // Filearea must contain a real area.
     if (!isset($areas[$filearea])) {
         return null;
     }
@@ -4053,8 +4052,8 @@ function hsuforum_get_file_info($browser, $areas, $course, $cm, $context, $filea
     }
 
     static $cached = array();
-    // $cached will store last retrieved post, discussion and forum. To make sure that the cache
-    // is cleared between unit tests we check if this is the same session
+    // The $cached will store last retrieved post, discussion and forum. To make sure that the cache
+    // is cleared between unit tests we check if this is the same session.
     if (!isset($cached['sesskey']) || $cached['sesskey'] != sesskey()) {
         $cached = array('sesskey' => sesskey());
     }
@@ -4095,7 +4094,7 @@ function hsuforum_get_file_info($browser, $areas, $course, $cm, $context, $filea
     if (!has_capability('moodle/course:managefiles', $context) && $storedfile->get_userid() != $USER->id) {
         return null;
     }
-    // Make sure groups allow this user to see this file
+    // Make sure groups allow this user to see this file.
     if ($discussion->groupid > 0 && !has_capability('moodle/site:accessallgroups', $context)) {
         $groupmode = groups_get_activity_groupmode($cm, $course);
         if ($groupmode == SEPARATEGROUPS && !groups_is_member($discussion->groupid)) {
@@ -4140,7 +4139,7 @@ function hsuforum_pluginfile($course, $cm, $context, $filearea, $args, $forcedow
     // Try comment area first. SC INT-4387.
     hsuforum_forum_comments_pluginfile($course, $cm, $context, $filearea, $args, $forcedownload, $options);
 
-    // filearea must contain a real area
+    // Filearea must contain a real area.
     if (!isset($areas[$filearea])) {
         return false;
     }
@@ -4166,7 +4165,7 @@ function hsuforum_pluginfile($course, $cm, $context, $filearea, $args, $forcedow
         return false;
     }
 
-    // Make sure groups allow this user to see this file
+    // Make sure groups allow this user to see this file.
     if ($discussion->groupid > 0) {
         $groupmode = groups_get_activity_groupmode($cm, $course);
         if ($groupmode == SEPARATEGROUPS) {
@@ -4181,8 +4180,8 @@ function hsuforum_pluginfile($course, $cm, $context, $filearea, $args, $forcedow
         return false;
     }
 
-    // finally send the file
-    send_stored_file($file, 0, 0, true, $options); // download MUST be forced - security!
+    // Finally send the file.
+    send_stored_file($file, 0, 0, true, $options); // Download MUST be forced - security!
 }
 
 /**
@@ -4211,7 +4210,7 @@ function hsuforum_add_attachment($post, $forum, $cm, $mform=null, $unused=null,
     }
 
     if (empty($post->attachments)) {
-        return true;   // Nothing to do
+        return true;   // Nothing to do.
     }
 
     $context = context_module::instance($cm->id);
@@ -4268,7 +4267,7 @@ function hsuforum_add_new_post($post, $mform, $unused=null, \mod_hsuforum\upload
     $DB->update_record('hsuforum_posts', $post);
     hsuforum_add_attachment($post, $forum, $cm, $mform, null, $uploader);
 
-    // Update discussion modified date
+    // Update discussion modified date.
     if (empty($post->privatereply)) {
         $DB->set_field("hsuforum_discussions", "timemodified", $post->modified, array("id" => $post->discussion));
         $DB->set_field("hsuforum_discussions", "usermodified", $post->userid, array("id" => $post->discussion));
@@ -4280,7 +4279,7 @@ function hsuforum_add_new_post($post, $mform, $unused=null, \mod_hsuforum\upload
         core_tag_tag::set_item_tags('mod_hsuforum', 'hsuforum_posts', $post->id, $context, $post->tags);
     }
 
-    // Let Moodle know that assessable content is uploaded (eg for plagiarism detection)
+    // Let Moodle know that assessable content is uploaded (eg for plagiarism detection).
     hsuforum_trigger_content_uploaded_event($post, $cm, 'hsuforum_add_new_post');
 
     return $post->id;
@@ -4327,7 +4326,7 @@ function hsuforum_update_post($newpost, $mform, &$message = null, \mod_hsuforum\
     }
     $post->modified = time();
 
-    if (!$post->parent) {   // Post is a discussion starter - update discussion title and times too
+    if (!$post->parent) {   // Post is a discussion starter - update discussion title and times too.
         $discussion->name      = $post->subject;
         $discussion->timestart = $post->timestart;
         $discussion->timeend   = $post->timeend;
@@ -4356,7 +4355,7 @@ function hsuforum_update_post($newpost, $mform, &$message = null, \mod_hsuforum\
 
     hsuforum_mark_post_read($post->userid, $post, $forum->id);
 
-    // Let Moodle know that assessable content is uploaded (eg for plagiarism detection)
+    // Let Moodle know that assessable content is uploaded (eg for plagiarism detection).
     hsuforum_trigger_content_uploaded_event($post, $cm, 'hsuforum_update_post');
 
     return true;
@@ -4401,8 +4400,8 @@ function hsuforum_add_discussion($discussion, $mform=null, $unused=null, $userid
     $post->messagetrust  = $discussion->messagetrust;
     $post->attachment    = isset($discussion->attachments) ? 1: 0;
     $post->attachments   = isset($discussion->attachments) ? $discussion->attachments : null;
-    $post->forum         = $forum->id;     // speedup
-    $post->course        = $forum->course; // speedup
+    $post->forum         = $forum->id;     // Speedup.
+    $post->course        = $forum->course; // Speedup.
     $post->mailnow       = $discussion->mailnow;
     $post->reveal        = $discussion->reveal;
 
@@ -4415,8 +4414,8 @@ function hsuforum_add_discussion($discussion, $mform=null, $unused=null, $userid
     $post->id = $DB->insert_record("hsuforum_posts", $post);
 
 
-    // TODO: Fix the calling code so that there always is a $cm when this function is called
-    if (!empty($cm->id) && !empty($discussion->itemid)) {   // In "single simple discussions" this may not exist yet
+    // TODO: Fix the calling code so that there always is a $cm when this function is called.
+    if (!empty($cm->id) && !empty($discussion->itemid)) {   // In "single simple discussions" this may not exist yet.
         $context = context_module::instance($cm->id);
         $text = file_save_draft_area_files($discussion->itemid, $context->id, 'mod_hsuforum', 'post', $post->id,
                 mod_hsuforum_post_form::editor_options($context, null), $post->message);
@@ -4427,7 +4426,7 @@ function hsuforum_add_discussion($discussion, $mform=null, $unused=null, $userid
         }
     }
 
-    // Now do the main entry for the discussion, linking to this first post
+    // Now do the main entry for the discussion, linking to this first post.
 
     $discussion->firstpost    = $post->id;
     $discussion->timemodified = $timenow;
@@ -4446,7 +4445,7 @@ function hsuforum_add_discussion($discussion, $mform=null, $unused=null, $userid
 
     hsuforum_mark_post_read($post->userid, $post, $post->forum);
 
-    // Let Moodle know that assessable content is uploaded (eg for plagiarism detection)
+    // Let Moodle know that assessable content is uploaded (eg for plagiarism detection).
     if (!empty($cm->id)) {
         hsuforum_trigger_content_uploaded_event($post, $cm, 'hsuforum_add_discussion');
     }
@@ -4494,7 +4493,7 @@ function hsuforum_verify_and_delete_post($course, $cm, $forum, $modcontext, $dis
         throw new \moodle_exception("couldnotdeletereplies", "hsuforum",
             hsuforum_go_back_to("discuss.php?d=$post->discussion"));
     }
-    if (!$post->parent) { // post is a discussion topic as well, so delete discussion
+    if (!$post->parent) { // Post is a discussion topic as well, so delete discussion.
         if ($forum->type == 'single') {
             throw new \moodle_exception('cannnotdeletesinglediscussion', 'hsuforum',
                 hsuforum_go_back_to("discuss.php?d=$post->discussion"));
@@ -4585,8 +4584,8 @@ function hsuforum_delete_discussion($discussion, $fulldelete, $course, $cm, $for
         $result = false;
     }
 
-    // Update completion state if we are tracking completion based on number of posts
-    // But don't bother when deleting whole thing
+    // Update completion state if we are tracking completion based on number of posts.
+    // But don't bother when deleting whole thing.
     if (!$fulldelete) {
         $completion = new completion_info($course);
         if ($completion->is_enabled($cm) == COMPLETION_TRACKING_AUTOMATIC &&
@@ -4632,7 +4631,7 @@ function hsuforum_delete_post($post, $children, $course, $cm, $forum, $skipcompl
        }
     }
 
-    //delete ratings
+    // Delete ratings.
     require_once($CFG->dirroot.'/rating/lib.php');
     $delopt = new stdClass;
     $delopt->contextid = $context->id;
@@ -4642,7 +4641,7 @@ function hsuforum_delete_post($post, $children, $course, $cm, $forum, $skipcompl
     $rm = new rating_manager();
     $rm->delete_ratings($delopt);
 
-    //delete attachments
+    // Delete attachments.
     $fs = get_file_storage();
     $fs->delete_area_files($context->id, 'mod_hsuforum', 'attachment', $post->id);
     $fs->delete_area_files($context->id, 'mod_hsuforum', 'post', $post->id);
@@ -4651,11 +4650,11 @@ function hsuforum_delete_post($post, $children, $course, $cm, $forum, $skipcompl
 
         hsuforum_delete_read_records_for_post($post->id);
 
-    // Just in case we are deleting the last post
+    // Just in case we are deleting the last post.
         hsuforum_discussion_update_last_post($post->discussion);
 
-        // Update completion state if we are tracking completion based on number of posts
-        // But don't bother when deleting whole thing
+        // Update completion state if we are tracking completion based on number of posts.
+        // But don't bother when deleting whole thing.
 
         if (!$skipcompletion) {
             $completion = new completion_info($course);
@@ -4729,7 +4728,7 @@ function hsuforum_count_replies($post, $children=true) {
     if ($children) {
         if ($childposts = $DB->get_records_select('hsuforum_posts', $select, $params)) {
            foreach ($childposts as $childpost) {
-               $count ++;                   // For this child
+               $count ++;                   // For this child.
                $count += hsuforum_count_replies($childpost, true);
            }
         }
@@ -4759,18 +4758,18 @@ function hsuforum_forcesubscribe($forumid, $value=1) {
  */
 function hsuforum_is_forcesubscribed($forum) {
     global $DB;
-    if (isset($forum->forcesubscribe)) {    // then we use that
+    if (isset($forum->forcesubscribe)) {    // Then we use that.
         return ($forum->forcesubscribe == HSUFORUM_FORCESUBSCRIBE);
-    } else {   // Check the database
+    } else {   // Check the database.
        return ($DB->get_field('hsuforum', 'forcesubscribe', array('id' => $forum)) == HSUFORUM_FORCESUBSCRIBE);
     }
 }
 
 function hsuforum_get_forcesubscribed($forum) {
     global $DB;
-    if (isset($forum->forcesubscribe)) {    // then we use that
+    if (isset($forum->forcesubscribe)) {    // Then we use that.
         return $forum->forcesubscribe;
-    } else {   // Check the database
+    } else {   // Check the database.
         return $DB->get_field('hsuforum', 'forcesubscribe', array('id' => $forum));
     }
 }
@@ -4820,7 +4819,7 @@ function hsuforum_get_subscribed_forums($course) {
 function hsuforum_get_optional_subscribed_forums() {
     global $USER, $DB;
 
-    // Get courses that $USER is enrolled in and can see
+    // Get courses that $USER is enrolled in and can see.
     $courses = enrol_get_my_courses();
     if (empty($courses)) {
         return array();
@@ -4832,7 +4831,7 @@ function hsuforum_get_optional_subscribed_forums() {
     }
     list($coursesql, $courseparams) = $DB->get_in_or_equal($courseids, SQL_PARAMS_NAMED, 'c');
 
-    // get all forums from the user's courses that they are subscribed to and which are not set to forced
+    // Get all forums from the user's courses that they are subscribed to and which are not set to forced.
     $sql = "SELECT f.id, cm.id as cm, cm.visible
               FROM {hsuforum} f
                    JOIN {course_modules} cm ON cm.instance = f.id
@@ -4845,23 +4844,23 @@ function hsuforum_get_optional_subscribed_forums() {
         return array();
     }
 
-    $unsubscribableforums = array(); // Array to return
+    $unsubscribableforums = array(); // Array to return.
 
     foreach($forums as $forum) {
 
         if (empty($forum->visible)) {
-            // the forum is hidden
+            // The forum is hidden.
             $context = context_module::instance($forum->cm);
             if (!has_capability('moodle/course:viewhiddenactivities', $context)) {
-                // the user can't see the hidden forum
+                // The user can't see the hidden forum.
                 continue;
             }
         }
 
-        // subscribe.php only requires 'mod/hsuforum:managesubscriptions' when
-        // unsubscribing a user other than yourself so we don't require it here either
+        // Subscribe.php only requires 'mod/hsuforum:managesubscriptions' when
+        // unsubscribing a user other than yourself so we don't require it here either.
 
-        // A check for whether the forum has subscription set to forced is built into the SQL above
+        // A check for whether the forum has subscription set to forced is built into the SQL above.
 
         $unsubscribableforums[] = $forum;
     }
@@ -4973,20 +4972,20 @@ function hsuforum_post_subscription($post, $forum) {
     $action = '';
     $subscribed = hsuforum_is_subscribed($USER->id, $forum);
 
-    if ($forum->forcesubscribe == HSUFORUM_FORCESUBSCRIBE) { // database ignored
+    if ($forum->forcesubscribe == HSUFORUM_FORCESUBSCRIBE) { // Database ignored.
         return "";
 
     } elseif (($forum->forcesubscribe == HSUFORUM_DISALLOWSUBSCRIBE)
         && !has_capability('moodle/course:manageactivities', context_course::instance($forum->course), $USER->id)) {
         if ($subscribed) {
-            $action = 'unsubscribe'; // sanity check, following MDL-14558
+            $action = 'unsubscribe'; // Sanity check, following MDL-14558.
         } else {
             return "";
         }
 
-    } else { // go with the user's choice
+    } else { // Go with the user's choice.
         if (isset($post->subscribe)) {
-            // no change
+            // No change.
             if ((!empty($post->subscribe) && $subscribed)
                 || (empty($post->subscribe) && !$subscribed)) {
                 return "";
@@ -5132,7 +5131,7 @@ function hsuforum_user_has_posted($forumid, $did, $userid) {
     global $DB;
 
     if (empty($did)) {
-        // posted in any forum discussion?
+        // Posted in any forum discussion?
         $sql = "SELECT 'x'
                   FROM {hsuforum_posts} p
                   JOIN {hsuforum_discussions} d ON d.id = p.discussion
@@ -5170,10 +5169,10 @@ function hsuforum_get_user_posted_time($did, $userid) {
  * @return bool
  */
 function hsuforum_user_can_post_discussion($forum, $currentgroup=null, $unused=-1, $cm=NULL, $context=NULL) {
-// $forum is an object
+// The $forum is an object.
     global $USER;
 
-    // shortcut - guest and not-logged-in users can not post
+    // Shortcut - guest and not-logged-in users can not post.
     if (isguestuser() or !isloggedin()) {
         return false;
     }
@@ -5224,8 +5223,8 @@ function hsuforum_user_can_post_discussion($forum, $currentgroup=null, $unused=-
     if ($currentgroup) {
         return groups_is_member($currentgroup);
     } else {
-        // no group membership and no accessallgroups means no new discussions
-        // reverted to 1.7 behaviour in 1.9+,  buggy in 1.8.0-1.9.0
+        // No group membership and no accessallgroups means no new discussions
+        // reverted to 1.7 behaviour in 1.9+,  buggy in 1.8.0-1.9.0.
         return false;
     }
 }
@@ -5254,7 +5253,7 @@ function hsuforum_user_can_post($forum, $discussion, $user=NULL, $cm=NULL, $cour
         $user = $USER;
     }
 
-    // shortcut - guest and not-logged-in users can not post
+    // Shortcut - guest and not-logged-in users can not post.
     if (isguestuser($user) or empty($user->id)) {
         return false;
     }
@@ -5289,7 +5288,7 @@ function hsuforum_user_can_post($forum, $discussion, $user=NULL, $cm=NULL, $cour
         }
     }
 
-    // normal users with temporary guest access can not post, suspended users can not post either
+    // Normal users with temporary guest access can not post, suspended users can not post either.
     if (!is_viewing($context, $user->id) and !is_enrolled($context, $user->id, '', true)) {
         return false;
     }
@@ -5314,13 +5313,13 @@ function hsuforum_user_can_post($forum, $discussion, $user=NULL, $cm=NULL, $cour
 
     if ($groupmode == VISIBLEGROUPS) {
         if ($discussion->groupid == -1) {
-            // allow students to reply to all participants discussions - this was not possible in Moodle <1.8
+            // Allow students to reply to all participants discussions - this was not possible in Moodle <1.8.
             return true;
         }
         return groups_is_member($discussion->groupid);
 
     } else {
-        //separate groups
+        // Separate groups.
         if ($discussion->groupid == -1) {
             return false;
         }
@@ -5392,7 +5391,7 @@ function hsuforum_user_can_see_discussion($forum, $discussion, $context, $user=N
         $user = $USER;
     }
 
-    // retrieve objects (yuk)
+    // Retrieve objects (yuk).
     if (is_numeric($forum)) {
         debugging('missing full forum', DEBUG_DEVELOPER);
         if (!$forum = $DB->get_record('hsuforum',array('id'=>$forum))) {
@@ -5438,7 +5437,7 @@ function hsuforum_user_can_see_discussion($forum, $discussion, $context, $user=N
 function hsuforum_user_can_see_post($forum, $discussion, $post, $user=NULL, $cm=NULL, $checkdeleted = true) {
     global $CFG, $USER, $DB;
 
-    // retrieve objects (yuk)
+    // Retrieve objects (yuk).
     if (is_numeric($forum)) {
         debugging('missing full forum', DEBUG_DEVELOPER);
         if (!$forum = $DB->get_record('hsuforum',array('id'=>$forum))) {
@@ -5563,14 +5562,14 @@ function hsuforum_print_latest_discussions($course, $forum, $maxdiscussions=-1,
 
     $olddiscussionlink = false;
 
- // Sort out some defaults
+ // Sort out some defaults.
     if ($perpage <= 0) {
         $perpage = 0;
         $page    = -1;
     }
 
     if ($maxdiscussions == 0) {
-        // all discussions - backwards compatibility
+        // All discussions - backwards compatibility.
         $page    = -1;
         $perpage = 0;
     } else if ($maxdiscussions > 0) {
@@ -5583,15 +5582,15 @@ function hsuforum_print_latest_discussions($course, $forum, $maxdiscussions=-1,
 
     $fullpost = true;
 
-// Decide if current user is allowed to see ALL the current discussions or not
+// Decide if current user is allowed to see ALL the current discussions or not.
 
-// First check the group stuff
+// First check the group stuff.
     if ($currentgroup == -1 or $groupmode == -1) {
         $groupmode    = groups_get_activity_groupmode($cm, $course);
         $currentgroup = groups_get_activity_group($cm);
     }
 
-    $groups = array(); //cache
+    $groups = array(); // Cache.
 
 // If the user can post discussions, then this is a good place to put the
 // button for it. We do not show the button if we are showing site news
@@ -5603,18 +5602,18 @@ function hsuforum_print_latest_discussions($course, $forum, $maxdiscussions=-1,
             $canstart = true;
         }
         if (!is_enrolled($context) and !is_viewing($context)) {
-            // allow guests and not-logged-in to see the button - they are prompted to log in after clicking the link
+            // Allow guests and not-logged-in to see the button - they are prompted to log in after clicking the link
             // normal users with temporary guest access see this button too, they are asked to enrol instead
-            // do not show the button to users with suspended enrolments here
+            // do not show the button to users with suspended enrolments here.
             $canstart = enrol_selfenrol_available($course->id);
         }
     }
 
-    // Get all the recent discussions we're allowed to see
+    // Get all the recent discussions we're allowed to see.
     $getuserlastmodified = true;
     $discussions = hsuforum_get_discussions($cm, $sort, $fullpost, null, $maxdiscussions, $getuserlastmodified, $page, $perpage, -1, 0, false);
 
-    // If we want paging
+    // If we want paging.
     $numdiscussions = null;
     if ($page != -1) {
         // Get the number of discussions found.
@@ -5632,9 +5631,9 @@ function hsuforum_print_latest_discussions($course, $forum, $maxdiscussions=-1,
         or  $forum->type == 'news'
         or  $forum->type == 'qanda' and !has_capability('mod/hsuforum:addquestion', $context)
         or  $forum->type != 'qanda' and !has_capability('mod/hsuforum:startdiscussion', $context))) {
-        // no button and no info
+        // No button and no info.
     } else if (!$canstart && $groupmode and !has_capability('moodle/site:accessallgroups', $context)) {
-        // inform users why they can not post new discussion
+        // Inform users why they can not post new discussion.
         if (!$currentgroup) {
             if (!has_capability('mod/hsuforum:canposttomygroups', $context)) {
                 echo $OUTPUT->notification(get_string('cannotadddiscussiongroup', 'hsuforum'));
@@ -5653,7 +5652,7 @@ function hsuforum_print_latest_discussions($course, $forum, $maxdiscussions=-1,
         echo "<h3 class='hsuforum-discussion-count' data-count='$numdiscussions'>".get_string('xdiscussions', 'hsuforum', $numdiscussions)."</h3>";
     }
 
-    // lots of echo instead of building up and printing - bad
+    // Lots of echo instead of building up and printing - bad.
     echo '<div id="hsuforum-menu">';
     if ($canstart) {
         echo
@@ -5670,7 +5669,7 @@ function hsuforum_print_latest_discussions($course, $forum, $maxdiscussions=-1,
         echo hsuforum_search_form($course, $forum->id);
     }
 
-    // Sort/Filter options
+    // Sort/Filter options.
     $urlmenu = new moodle_url('/mod/hsuforum/view.php', array('id'=>$cm->id));
     $groupselect = groups_print_activity_menu($cm, $urlmenu, true);
 
@@ -5694,9 +5693,9 @@ function hsuforum_print_latest_discussions($course, $forum, $maxdiscussions=-1,
     echo "</div><!-- end hsuforum-menu -->";
 
 
-    // When there are no threads, return;
+    // When there are no threads, return.
     if (!$discussions) {
-        // in an empty forum, if the user can start a thread this div is where the js puts it
+        // In an empty forum, if the user can start a thread this div is where the js puts it.
         if ($canstart) {
             echo '<div class="mod-hsuforum-posts-container article">';
             echo $renderer->discussions($cm, array(), array(
@@ -5786,7 +5785,7 @@ function hsuforum_print_latest_discussions($course, $forum, $maxdiscussions=-1,
         echo $strolder.'</a> ...</div>';
     }
 
-    echo "</div>"; // End mod-hsuforum-posts-container
+    echo "</div>"; // End mod-hsuforum-posts-container.
 
     if ($page != -1) {
         echo $OUTPUT->paging_bar($numdiscussions, $page, $perpage, "view.php?f=$forum->id");
@@ -5829,14 +5828,14 @@ function hsuforum_print_discussion($course, $cm, $forum, $discussion, $post, $ca
         $posters[$p->userid] = $p->userid;
     }
 
-    //load ratings
+    // Load ratings.
     if ($forum->assessed != RATING_AGGREGATE_NONE) {
         $ratingoptions = new stdClass;
         $ratingoptions->context = $modcontext;
         $ratingoptions->component = 'mod_hsuforum';
         $ratingoptions->ratingarea = 'post';
         $ratingoptions->items = $posts;
-        $ratingoptions->aggregate = $forum->assessed;//the aggregation method
+        $ratingoptions->aggregate = $forum->assessed;// The aggregation method.
         $ratingoptions->scaleid = $forum->scale;
         $ratingoptions->userid = $USER->id;
         if ($forum->type == 'single' or !$discussion->id) {
@@ -5852,7 +5851,7 @@ function hsuforum_print_discussion($course, $cm, $forum, $discussion, $post, $ca
     }
 
 
-    $post->forum = $forum->id;   // Add the forum id to the post object, later used for rendering
+    $post->forum = $forum->id;   // Add the forum id to the post object, later used for rendering.
     $post->forumtype = $forum->type;
 
     $post->subject = format_string($post->subject);
@@ -5863,7 +5862,7 @@ function hsuforum_print_discussion($course, $cm, $forum, $discussion, $post, $ca
 
     $renderer = $PAGE->get_renderer('mod_hsuforum');
     echo $renderer->discussion_thread($cm, $discussion, $post, $posts, $reply);
-    echo $OUTPUT->box_end(); // End mod-hsuforum-posts-container
+    echo $OUTPUT->box_end(); // End mod-hsuforum-posts-container.
     return;
 
 }
@@ -5936,7 +5935,7 @@ function hsuforum_get_recent_mod_activity(&$activities, &$index, $timestart, $co
                                               JOIN {user} u              ON u.id = p.userid
                                         WHERE p.created > ? AND f.id = ? AND (p.privatereply = 0 OR p.privatereply = ? OR p.userid = ?)
                                               $userselect $groupselect
-                                     ORDER BY p.id ASC", $params)) { // order by initial posting date
+                                     ORDER BY p.id ASC", $params)) { // Order by initial posting date.
          return;
     }
 
@@ -5957,11 +5956,11 @@ function hsuforum_get_recent_mod_activity(&$activities, &$index, $timestart, $co
 
         if ($groupmode) {
             if ($post->groupid == -1 or $groupmode == VISIBLEGROUPS or $accessallgroups) {
-                // oki (Open discussions have groupid -1)
+                // Oki (Open discussions have groupid -1).
             } else {
-                // separate mode
+                // Separate mode.
                 if (isguestuser()) {
-                    // shortcut
+                    // Shortcut.
                     continue;
                 }
 
@@ -6473,7 +6472,7 @@ function hsuforum_count_forum_unread_posts($cm, $course, $resetreadcache = false
     }
 
     if (empty($readcache[$course->id][$forumid])) {
-        // no need to check group mode ;-)
+        // No need to check group mode ;-).
         return 0;
     }
 
@@ -6575,16 +6574,16 @@ function hsuforum_tp_clean_read_records() {
 // Look for records older than the cutoffdate that are still in the hsuforum_read table.
     $cutoffdate = time() - ($config->oldpostdays*24*60*60);
 
-    //first get the oldest tracking present - we need tis to speedup the next delete query
+    // First get the oldest tracking present - we need tis to speedup the next delete query.
     $sql = "SELECT MIN(fp.modified) AS first
               FROM {hsuforum_posts} fp
                    JOIN {hsuforum_read} fr ON fr.postid=fp.id";
     if (!$first = $DB->get_field_sql($sql)) {
-        // nothing to delete;
+        // Nothing to delete.
         return;
     }
 
-    // now delete old tracking info
+    // Now delete old tracking info.
     $sql = "DELETE
               FROM {hsuforum_read}
              WHERE postid IN (SELECT fp.id
@@ -6604,18 +6603,18 @@ function hsuforum_tp_clean_read_records() {
 function hsuforum_discussion_update_last_post($discussionid) {
     global $DB;
 
-// Check the given discussion exists
+// Check the given discussion exists.
     if (!$DB->record_exists('hsuforum_discussions', array('id' => $discussionid))) {
         return false;
     }
 
-// Use SQL to find the last post for this discussion
+// Use SQL to find the last post for this discussion.
     $sql = "SELECT id, userid, modified
               FROM {hsuforum_posts}
              WHERE discussion=?
              ORDER BY modified DESC";
 
-// Lets go find the last post
+// Lets go find the last post.
     if (($lastposts = $DB->get_records_sql($sql, array($discussionid), 0, 1))) {
         $lastpost = reset($lastposts);
         $discussionobject = new stdClass();
@@ -6627,7 +6626,7 @@ function hsuforum_discussion_update_last_post($discussionid) {
     }
 
 // To get here either we couldn't find a post for the discussion (weird)
-// or we couldn't update the discussion record (weird x2)
+// or we couldn't update the discussion record (weird x2).
     return false;
 }
 
@@ -6873,7 +6872,7 @@ function hsuforum_reset_userdata($data) {
         $discussionssql = "$alldiscussionssql $typesql";
         $postssql       = "$allpostssql $typesql";
 
-        // now get rid of all attachments
+        // Now get rid of all attachments.
         $fs = get_file_storage();
         if ($forums) {
             foreach ($forums as $forumid=>$unused) {
@@ -6884,7 +6883,7 @@ function hsuforum_reset_userdata($data) {
                 $fs->delete_area_files($context->id, 'mod_hsuforum', 'attachment');
                 $fs->delete_area_files($context->id, 'mod_hsuforum', 'post');
 
-                //remove ratings
+                // Remove ratings.
                 $ratingdeloptions->contextid = $context->id;
                 $rm->delete_ratings($ratingdeloptions);
 
@@ -6892,23 +6891,23 @@ function hsuforum_reset_userdata($data) {
             }
         }
 
-        // first delete all read flags
+        // First delete all read flags.
         $DB->delete_records_select('hsuforum_read', "forumid IN ($forumssql)", $params);
 
-        // remove tracking prefs
+        // Remove tracking prefs.
         $DB->delete_records_select('hsuforum_track_prefs', "forumid IN ($forumssql)", $params);
 
-        // remove posts from queue
+        // Remove posts from queue.
         $DB->delete_records_select('hsuforum_queue', "discussionid IN ($discussionssql)", $params);
 
-        // all posts - initial posts must be kept in single simple discussion forums
+        // All posts - initial posts must be kept in single simple discussion forums.
         $DB->delete_records_select('hsuforum_posts', "discussion IN ($discussionssql) AND parent <> 0", $params); // first all children
         $DB->delete_records_select('hsuforum_posts', "discussion IN ($discussionssql AND f.type <> 'single') AND parent = 0", $params); // now the initial posts for non single simple
 
-        // finally all discussions except single simple forums
+        // Finally all discussions except single simple forums.
         $DB->delete_records_select('hsuforum_discussions', "forum IN ($forumssql AND f.type <> 'single')", $params);
 
-        // remove all grades from gradebook
+        // Remove all grades from gradebook.
         if (empty($data->reset_gradebook_grades)) {
             if (empty($types)) {
                 hsuforum_reset_gradebook($data->courseid);
@@ -6922,7 +6921,7 @@ function hsuforum_reset_userdata($data) {
         $status[] = array('component'=>$componentstr, 'item'=>$typesstr, 'error'=>false);
     }
 
-    // remove all ratings in this course's forums
+    // Remove all ratings in this course's forums.
     if (!empty($data->reset_hsuforum_ratings)) {
         if ($forums) {
             foreach ($forums as $forumid=>$unused) {
@@ -6931,13 +6930,13 @@ function hsuforum_reset_userdata($data) {
                 }
                 $context = context_module::instance($cm->id);
 
-                //remove ratings
+                // Remove ratings.
                 $ratingdeloptions->contextid = $context->id;
                 $rm->delete_ratings($ratingdeloptions);
             }
         }
 
-        // remove all grades from gradebook
+        // Remove all grades from gradebook.
         if (empty($data->reset_gradebook_grades)) {
             hsuforum_reset_gradebook($data->courseid);
         }
@@ -6959,25 +6958,25 @@ function hsuforum_reset_userdata($data) {
         $status[] = array('component' => $componentstr, 'item' => get_string('tagsdeleted', 'hsuforum'), 'error' => false);
     }
 
-    // remove all digest settings unconditionally - even for users still enrolled in course.
+    // Remove all digest settings unconditionally - even for users still enrolled in course.
     if (!empty($data->reset_forum_digests)) {
         $DB->delete_records_select('hsuforum_digests', "forum IN ($allforumssql)", $params);
         $status[] = array('component' => $componentstr, 'item' => get_string('resetdigests', 'hsuforum'), 'error' => false);
     }
 
-    // remove all subscriptions unconditionally - even for users still enrolled in course
+    // Remove all subscriptions unconditionally - even for users still enrolled in course.
     if (!empty($data->reset_hsuforum_subscriptions)) {
         $DB->delete_records_select('hsuforum_subscriptions', "forum IN ($allforumssql)", $params);
         $status[] = array('component'=>$componentstr, 'item'=>get_string('resetsubscriptions','hsuforum'), 'error'=>false);
     }
 
-    // remove all tracking prefs unconditionally - even for users still enrolled in course
+    // Remove all tracking prefs unconditionally - even for users still enrolled in course.
     if (!empty($data->reset_hsuforum_track_prefs)) {
         $DB->delete_records_select('hsuforum_track_prefs', "forumid IN ($allforumssql)", $params);
         $status[] = array('component'=>$componentstr, 'item'=>get_string('resettrackprefs','hsuforum'), 'error'=>false);
     }
 
-    /// updating dates - shift may be negative too
+    // Updating dates - shift may be negative too
     if ($data->timeshift) {
         // Any changes to the list of dates that needs to be rolled should be same during course restore and course reset.
         // See MDL-9367.
@@ -7092,7 +7091,7 @@ function hsuforum_extend_settings_navigation(settings_navigation $settingsnav, n
         $settingsnav->get_page()->cm->context = context_module::instance($$settingsnav->get_page()->cm->instance);
     }
 
-    // for some actions you need to be enrolled, beiing admin is not enough sometimes here
+    // For some actions you need to be enrolled, beiing admin is not enough sometimes here.
     $enrolled = is_enrolled($settingsnav->get_page()->cm->context, $USER, '', false);
     $activeenrolled = is_enrolled($settingsnav->get_page()->cm->context, $USER, '', true);
 
@@ -7454,7 +7453,7 @@ public function find_users($search) {
         list($wherecondition, $params) = $this->search_sql($search, 'u');
         $params['forumid'] = $this->forumid;
 
-        // only active enrolled or everybody on the frontpage
+        // Only active enrolled or everybody on the frontpage.
         list($esql, $eparams) = get_enrolled_sql($this->context, '', $this->currentgroup, true);
         $fields = $this->required_fields_sql('u');
         list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext);
@@ -7657,10 +7656,10 @@ function hsuforum_get_posts_by_user($user, array $courses, $musthaveaccess = fal
 
     $config = get_config('hsuforum');
     $return = new stdClass;
-    $return->totalcount = 0;    // The total number of posts that the current user is able to view
-    $return->courses = array(); // The courses the current user can access
-    $return->forums = array();  // The forums that the current user can access that contain posts
-    $return->posts = array();   // The posts to display
+    $return->totalcount = 0;    // The total number of posts that the current user is able to view.
+    $return->courses = array(); // The courses the current user can access.
+    $return->forums = array();  // The forums that the current user can access that contain posts.
+    $return->posts = array();   // The posts to display.
 
     // First up a small sanity check. If there are no courses to check we can
     // return immediately, there is obviously nothing to search.
@@ -7668,7 +7667,7 @@ function hsuforum_get_posts_by_user($user, array $courses, $musthaveaccess = fal
         return $return;
     }
 
-    // A couple of quick setups
+    // A couple of quick setups.
     $isloggedin = isloggedin();
     $isguestuser = $isloggedin && isguestuser();
     $iscurrentuser = $isloggedin && $USER->id == $user->id;
@@ -7695,7 +7694,7 @@ function hsuforum_get_posts_by_user($user, array $courses, $musthaveaccess = fal
             // requested user posted, although its VERY unlikely in the `parent` situation
             // that the current user will be able to view the posts in context.
             if (!is_viewing($coursecontext, $user) && !is_enrolled($coursecontext, $user)) {
-                // Need to have full access to a course to see the rest of own info
+                // Need to have full access to a course to see the rest of own info.
                 if ($musthaveaccess) {
                     throw new \moodle_exception('errorenrolmentrequired', 'hsuforum');
                 }
@@ -7718,17 +7717,17 @@ function hsuforum_get_posts_by_user($user, array $courses, $musthaveaccess = fal
             // a user in group A could post in the group B forum. Grrrr.
             if (groups_get_course_groupmode($course) == SEPARATEGROUPS && $course->groupmodeforce
               && !has_capability('moodle/site:accessallgroups', $coursecontext) && !has_capability('moodle/site:accessallgroups', $coursecontext, $user->id)) {
-                // If its the guest user to bad... the guest user cannot access groups
+                // If its the guest user to bad... the guest user cannot access groups.
                 if (!$isloggedin or $isguestuser) {
-                    // do not use require_login() here because we might have already used require_login($course)
+                    // Do not use require_login() here because we might have already used require_login($course).
                     if ($musthaveaccess) {
                         redirect(get_login_url());
                     }
                     continue;
                 }
-                // Get the groups of the current user
+                // Get the groups of the current user.
                 $mygroups = array_keys(groups_get_all_groups($course->id, $USER->id, $course->defaultgroupingid, 'g.id, g.name'));
-                // Get the groups the requested user is a member of
+                // Get the groups the requested user is a member of.
                 $usergroups = array_keys(groups_get_all_groups($course->id, $user->id, $course->defaultgroupingid, 'g.id, g.name'));
                 // Check whether they are members of the same group. If they are great.
                 $intersect = array_intersect($mygroups, $usergroups);
@@ -7747,10 +7746,10 @@ function hsuforum_get_posts_by_user($user, array $courses, $musthaveaccess = fal
         // handling that is complete, the forum accessibility tests are yet to come.
         $return->courses[$course->id] = $course;
     }
-    // No longer beed $courses array - lose it not it may be big
+    // No longer beed $courses array - lose it not it may be big.
     unset($courses);
 
-    // Make sure that we have some courses to search
+    // Make sure that we have some courses to search.
     if (empty($return->courses)) {
         // If we don't have any courses to search then the reality is that the current
         // user doesn't have access to any courses is which the requested user has posted.
@@ -7767,30 +7766,30 @@ function hsuforum_get_posts_by_user($user, array $courses, $musthaveaccess = fal
     // about determining which forums we can search by testing accessibility.
     $forums = hsuforum_get_forums_user_posted_in($user, array_keys($return->courses), $discussionsonly);
 
-    // Will be used to build the where conditions for the search
+    // Will be used to build the where conditions for the search.
     $forumsearchwhere = array();
-    // Will be used to store the where condition params for the search
+    // Will be used to store the where condition params for the search.
     $forumsearchparams = array();
-    // Will record forums where the user can freely access everything
+    // Will record forums where the user can freely access everything.
     $forumsearchfullaccess = array();
-    // DB caching friendly
+    // DB caching friendly.
     $now = floor(time() / 60) * 60;
     // For each course to search we want to find the forums the user has posted in
     // and providing the current user can access the forum create a search condition
     // for the forum to get the requested users posts.
     foreach ($return->courses as $course) {
-        // Now we need to get the forums
+        // Now we need to get the forums.
         $modinfo = get_fast_modinfo($course);
         if (empty($modinfo->instances['hsuforum'])) {
-            // hmmm, no forums? well at least its easy... skip!
+            // Hmmm, no forums? well at least its easy... skip!
             continue;
         }
-        // Iterate
+        // Iterate.
         foreach ($modinfo->get_instances_of('hsuforum') as $forumid => $cm) {
             if (!$cm->uservisible or !isset($forums[$forumid])) {
                 continue;
             }
-            // Get the forum in question
+            // Get the forum in question.
             $forum = $forums[$forumid];
 
             // This is needed for functionality later on in the forum code. It is converted to an object
@@ -7803,15 +7802,15 @@ function hsuforum_get_posts_by_user($user, array $courses, $musthaveaccess = fal
 
             // Check that either the current user can view the forum, or that the
             // current user has capabilities over the requested user and the requested
-            // user can view the discussion
+            // user can view the discussion.
             if (!has_capability('mod/hsuforum:viewdiscussion', $cm->context) && !($hascapsonuser && has_capability('mod/hsuforum:viewdiscussion', $cm->context, $user->id))) {
                 continue;
             }
 
-            // This will contain forum specific where clauses
+            // This will contain forum specific where clauses.
             $forumsearchselect = array();
             if (!$iscurrentuser && !$hascapsonuser) {
-                // Make sure we check group access
+                // Make sure we check group access.
                 if (groups_get_activity_groupmode($cm, $course) == SEPARATEGROUPS and !has_capability('moodle/site:accessallgroups', $cm->context)) {
                     $groups = $modinfo->get_groups($cm->groupingid);
                     $groups[] = -1;
@@ -7820,7 +7819,7 @@ function hsuforum_get_posts_by_user($user, array $courses, $musthaveaccess = fal
                     $forumsearchselect[] = "d.groupid $groupid_sql";
                 }
 
-                // hidden timed discussions
+                // Hidden timed discussions.
                 if (!empty($config->enabletimedposts) && !has_capability('mod/hsuforum:viewhiddentimedposts', $cm->context)) {
                     $forumsearchselect[] = "(d.userid = :userid{$forumid} OR (d.timestart < :timestart{$forumid} AND (d.timeend = 0 OR d.timeend > :timeend{$forumid})))";
                     $forumsearchparams['userid'.$forumid] = $user->id;
@@ -7828,7 +7827,7 @@ function hsuforum_get_posts_by_user($user, array $courses, $musthaveaccess = fal
                     $forumsearchparams['timeend'.$forumid] = $now;
                 }
 
-                // qanda access
+                // Qanda access.
                 if ($forum->type == 'qanda' && !has_capability('mod/hsuforum:viewqandawithoutposting', $cm->context)) {
                     // We need to check whether the user has posted in the qanda forum.
                     $discussionspostedin = hsuforum_discussions_user_has_posted_in($forum->id, $user->id);
@@ -7853,7 +7852,7 @@ function hsuforum_get_posts_by_user($user, array $courses, $musthaveaccess = fal
                     $forumsearchfullaccess[] = $forumid;
                 }
             } else {
-                // The current user/parent can see all of their own posts
+                // The current user/parent can see all of their own posts.
                 $forumsearchfullaccess[] = $forumid;
             }
         }
@@ -7899,9 +7898,9 @@ function hsuforum_get_posts_by_user($user, array $courses, $musthaveaccess = fal
     $orderby = "ORDER BY p.modified DESC";
     $forumsearchparams['userid'] = $user->id;
 
-    // Set the total number posts made by the requested user that the current user can see
+    // Set the total number posts made by the requested user that the current user can see.
     $return->totalcount = $DB->count_records_sql($countsql.$sql, $forumsearchparams);
-    // Set the collection of posts that has been requested
+    // Set the collection of posts that has been requested.
     $return->posts = $DB->get_records_sql($selectsql.$sql.$orderby, $forumsearchparams, $limitfrom, $limitnum);
 
     // We need to build an array of forums for which posts will be displayed.
@@ -8251,7 +8250,7 @@ function hsuforum_forum_comments_pluginfile($course, $cm, $context, $filearea, $
         }
     }
 
-    // finally send the file
+    // Finally send the file.
     send_stored_file($file, 86400, 0, true, $options);
 }
 

From 02e8b4b1881ff042adcde2f6ff0f947428f57fa1 Mon Sep 17 00:00:00 2001
From: Matthias Opitz <m.opitz@ucl.ac.uk>
Date: Thu, 11 May 2023 17:25:57 +0100
Subject: [PATCH 11/18] renamed test classes

---
 tests/grades_gradeitems_test.php | 2 +-
 tests/privacy_provider_test.php  | 2 +-
 tests/restore_date_test.php      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/grades_gradeitems_test.php b/tests/grades_gradeitems_test.php
index b9cd21cb..e4e6abf3 100644
--- a/tests/grades_gradeitems_test.php
+++ b/tests/grades_gradeitems_test.php
@@ -39,7 +39,7 @@
  * @copyright 2020 Open LMS
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class gradeitems_test extends advanced_testcase
+class grades_gradeitems_test extends advanced_testcase
 {
 
     /**
diff --git a/tests/privacy_provider_test.php b/tests/privacy_provider_test.php
index a79303c7..aad50ad5 100644
--- a/tests/privacy_provider_test.php
+++ b/tests/privacy_provider_test.php
@@ -36,7 +36,7 @@
  * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class mod_hsuforum_privacy_provider_testcase extends \core_privacy\tests\provider_testcase {
+class privacy_provider_test extends \core_privacy\tests\provider_testcase {
 
     // Include the privacy helper trait.
     use \mod_hsuforum\privacy\subcontext_info;
diff --git a/tests/restore_date_test.php b/tests/restore_date_test.php
index 2e73760d..c3ad4c47 100644
--- a/tests/restore_date_test.php
+++ b/tests/restore_date_test.php
@@ -35,7 +35,7 @@
  * @copyright  2017 onwards Ankit Agarwal <ankit.agrr@gmail.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class mod_hsuforum_restore_date_testcase extends restore_date_testcase {
+class restore_date_test extends restore_date_testcase {
 
     /**
      * Test restore dates.

From 48c37ab9f14c2339aeb89f1f5be5abdbd85eb260 Mon Sep 17 00:00:00 2001
From: Matthias Opitz <m.opitz@ucl.ac.uk>
Date: Thu, 11 May 2023 17:30:41 +0100
Subject: [PATCH 12/18] fixed another required paramter following an optional
 one

---
 classes/controller/edit_controller.php | 4 ++--
 classes/service/post_service.php       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/controller/edit_controller.php b/classes/controller/edit_controller.php
index 153b8e22..f6962561 100644
--- a/classes/controller/edit_controller.php
+++ b/classes/controller/edit_controller.php
@@ -228,7 +228,7 @@ public function update_post_action() {
             $timestart = $timestart === 0 ? $discussion->timestart : 0;
             $timeend = $timeend === 0 ? $discussion->timeend : 0;
 
-            return $this->postservice->handle_update_post($course, $cm, $forum, $context, $discussion, $post, $files,  array(
+            return $this->postservice->handle_update_post($course, $cm, $forum, $context, $discussion, $post,  array(
                 'subject'       => $subject,
                 'name'          => $subject,
                 'groupid'       => $groupid,
@@ -239,7 +239,7 @@ public function update_post_action() {
                 'privatereply'  => $privatereply,
                 'timestart'     => $timestart,
                 'timeend'       => $timeend
-            ));
+            ), $files);
         } catch (\Exception $e) {
             return new json_response($e);
         }
diff --git a/classes/service/post_service.php b/classes/service/post_service.php
index a1fb0715..1c5fba8d 100644
--- a/classes/service/post_service.php
+++ b/classes/service/post_service.php
@@ -132,7 +132,7 @@ public function handle_user_autosubscription($forum, $post) {
      * @param array $options These override default post values, EG: set the post message with this
      * @return json_response
      */
-    public function handle_update_post($course, $cm, $forum, $context, $discussion, $post, array $deletefiles, array $options) {
+    public function handle_update_post($course, $cm, $forum, $context, $discussion, $post, array $options, array $deletefiles = array()) {
 
         $this->require_can_edit_post($forum, $context, $discussion, $post);
 

From 68a801f451c1a48c42c3a3973ffc25c0c6449d1f Mon Sep 17 00:00:00 2001
From: Matthias Opitz <m.opitz@ucl.ac.uk>
Date: Thu, 11 May 2023 21:22:19 +0100
Subject: [PATCH 13/18] added GitHub Actions yaml file

---
 .github/workflows/ci.yml | 121 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..66638989
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,121 @@
+name: Moodle plugin CI
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: 'ubuntu-latest'
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - php: '7.4'
+            moodle-branch: 'MOODLE_401_STABLE'
+            database: 'mariadb'
+          - php: '8.0'
+            moodle-branch: 'MOODLE_401_STABLE'
+            database: 'pgsql'
+          - php: '8.0'
+            moodle-branch: 'MOODLE_402_STABLE'
+            database: 'mariadb'
+
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: 'postgres'
+          POSTGRES_HOST_AUTH_METHOD: 'trust'
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 3
+        ports:
+          - 5432:5432
+
+      mariadb:
+        image: mariadb:10
+        env:
+          MYSQL_USER: 'root'
+          MYSQL_ALLOW_EMPTY_PASSWORD: "true"
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 3
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          path: plugin
+
+      - name: Install node
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: zip, gd, mbstring, pgsql, mysqli
+          ini-values: max_input_vars=5000
+          coverage: none
+
+      - name: Deploy moodle-plugin-ci
+        run: |
+          composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3
+          # Add dirs to $PATH
+          echo $(cd ci/bin; pwd) >> $GITHUB_PATH
+          echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH
+          # PHPUnit depends on en_AU.UTF-8 locale
+          sudo locale-gen en_AU.UTF-8
+      - name: Install Moodle
+        # Need explicit IP to stop mysql client fail on attempt to use unix socket.
+        run: moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
+        env:
+          DB: ${{ matrix.database }}
+          MOODLE_BRANCH: ${{ matrix.moodle-branch }}
+          IGNORE_PATHS: 'tool/printable/classes/bfpdf.php'
+
+      - name: phplint
+        if: ${{ always() }}
+        run: moodle-plugin-ci phplint
+
+      - name: phpcpd
+        if: ${{ always() }}
+        run: moodle-plugin-ci phpcpd || true
+
+      - name: phpmd
+        if: ${{ always() }}
+        run: moodle-plugin-ci phpmd
+
+      - name: codechecker
+        if: ${{ always() }}
+        run: moodle-plugin-ci codechecker
+
+      - name: Moodle PHPDoc Checker
+        if: ${{ always() }}
+        run: moodle-plugin-ci phpdoc
+
+      - name: validate
+        if: ${{ always() }}
+        run: moodle-plugin-ci validate
+
+      - name: savepoints
+        if: ${{ always() }}
+        run: moodle-plugin-ci savepoints
+
+      - name: mustache
+        if: ${{ always() }}
+        run: moodle-plugin-ci mustache
+
+      - name: grunt
+        if: ${{ always() }}
+        run: moodle-plugin-ci grunt
+
+      - name: phpunit
+        if: ${{ always() }}
+        run: moodle-plugin-ci phpunit
+
+      - name: behat
+        if: ${{ always() }}
+        run: moodle-plugin-ci behat --profile chrome

From 65c11712127a7cc0a9ab13f849abfed0e2319104 Mon Sep 17 00:00:00 2001
From: Matthias Opitz <m.opitz@ucl.ac.uk>
Date: Fri, 12 May 2023 10:33:06 +0100
Subject: [PATCH 14/18] namespaced tests

---
 .github/workflows/ci.yml                | 121 ------------------------
 .github/workflows/moodle_ci.yml         |   6 --
 renderer.php                            |   2 +
 tests/backup_hsuforum_activity_test.php |   4 +
 tests/behat/posts_ordering_blog.feature |   2 +-
 tests/{ => event}/events_test.php       |   7 ++
 tests/externallib_test.php              |  13 +++
 tests/form_service_test.php             |   9 ++
 tests/generator_test.php                |   8 ++
 tests/grades_gradeitems_test.php        |   2 +-
 tests/lib_test.php                      |  22 ++++-
 tests/mail_test.php                     |   7 ++
 tests/maildigest_test.php               |   6 ++
 tests/output_email_test.php             |  10 +-
 tests/portfolio_caller_test.php         |   7 ++
 tests/privacy_provider_test.php         |  12 ++-
 tests/restore_date_test.php             |   7 ++
 tests/rsslib_test.php                   |   3 -
 tests/search_test.php                   |   8 ++
 tests/user_autosubscription_test.php    |   7 +-
 version.php                             |   6 +-
 21 files changed, 127 insertions(+), 142 deletions(-)
 delete mode 100644 .github/workflows/ci.yml
 rename tests/{ => event}/events_test.php (99%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index 66638989..00000000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,121 +0,0 @@
-name: Moodle plugin CI
-on: [push, pull_request]
-
-jobs:
-  test:
-    runs-on: 'ubuntu-latest'
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - php: '7.4'
-            moodle-branch: 'MOODLE_401_STABLE'
-            database: 'mariadb'
-          - php: '8.0'
-            moodle-branch: 'MOODLE_401_STABLE'
-            database: 'pgsql'
-          - php: '8.0'
-            moodle-branch: 'MOODLE_402_STABLE'
-            database: 'mariadb'
-
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_USER: 'postgres'
-          POSTGRES_HOST_AUTH_METHOD: 'trust'
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 3
-        ports:
-          - 5432:5432
-
-      mariadb:
-        image: mariadb:10
-        env:
-          MYSQL_USER: 'root'
-          MYSQL_ALLOW_EMPTY_PASSWORD: "true"
-        ports:
-          - 3306:3306
-        options: --health-cmd="mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 3
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          path: plugin
-
-      - name: Install node
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node }}
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: zip, gd, mbstring, pgsql, mysqli
-          ini-values: max_input_vars=5000
-          coverage: none
-
-      - name: Deploy moodle-plugin-ci
-        run: |
-          composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci ci ^3
-          # Add dirs to $PATH
-          echo $(cd ci/bin; pwd) >> $GITHUB_PATH
-          echo $(cd ci/vendor/bin; pwd) >> $GITHUB_PATH
-          # PHPUnit depends on en_AU.UTF-8 locale
-          sudo locale-gen en_AU.UTF-8
-      - name: Install Moodle
-        # Need explicit IP to stop mysql client fail on attempt to use unix socket.
-        run: moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
-        env:
-          DB: ${{ matrix.database }}
-          MOODLE_BRANCH: ${{ matrix.moodle-branch }}
-          IGNORE_PATHS: 'tool/printable/classes/bfpdf.php'
-
-      - name: phplint
-        if: ${{ always() }}
-        run: moodle-plugin-ci phplint
-
-      - name: phpcpd
-        if: ${{ always() }}
-        run: moodle-plugin-ci phpcpd || true
-
-      - name: phpmd
-        if: ${{ always() }}
-        run: moodle-plugin-ci phpmd
-
-      - name: codechecker
-        if: ${{ always() }}
-        run: moodle-plugin-ci codechecker
-
-      - name: Moodle PHPDoc Checker
-        if: ${{ always() }}
-        run: moodle-plugin-ci phpdoc
-
-      - name: validate
-        if: ${{ always() }}
-        run: moodle-plugin-ci validate
-
-      - name: savepoints
-        if: ${{ always() }}
-        run: moodle-plugin-ci savepoints
-
-      - name: mustache
-        if: ${{ always() }}
-        run: moodle-plugin-ci mustache
-
-      - name: grunt
-        if: ${{ always() }}
-        run: moodle-plugin-ci grunt
-
-      - name: phpunit
-        if: ${{ always() }}
-        run: moodle-plugin-ci phpunit
-
-      - name: behat
-        if: ${{ always() }}
-        run: moodle-plugin-ci behat --profile chrome
diff --git a/.github/workflows/moodle_ci.yml b/.github/workflows/moodle_ci.yml
index 42fddddc..20344ba1 100644
--- a/.github/workflows/moodle_ci.yml
+++ b/.github/workflows/moodle_ci.yml
@@ -8,12 +8,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - php: '7.4'
-            moodle-branch: 'MOODLE_401_STABLE'
-            database: 'mariadb'
-          - php: '8.0'
-            moodle-branch: 'MOODLE_401_STABLE'
-            database: 'pgsql'
           - php: '8.0'
             moodle-branch: 'MOODLE_402_STABLE'
             database: 'mariadb'
diff --git a/renderer.php b/renderer.php
index d6b47a62..a93badc0 100644
--- a/renderer.php
+++ b/renderer.php
@@ -620,6 +620,8 @@ public function discussion_template($d, $forumtype, $hidethreadcontent = null) {
             $revealed = '<span class="label label-danger">'.$nonanonymous.'</span>';
         }
 
+        $arialabeldiscussion = get_string('discussionforum', 'hsuforum', $d->subject);
+
         $threadcontent = '';
         if (!$hidethreadcontent) {
             $threadcontent = '<div class="hsuforum-thread-content" tabindex="0">' . $d->message . '</div>';
diff --git a/tests/backup_hsuforum_activity_test.php b/tests/backup_hsuforum_activity_test.php
index e53ebd8c..c5bc0d5a 100644
--- a/tests/backup_hsuforum_activity_test.php
+++ b/tests/backup_hsuforum_activity_test.php
@@ -22,6 +22,10 @@
  * @copyright  2016 Andrew Nicols <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace mod_hsuforum;
+
+use advanced_testcase;
+use backup_hsuforum_activity_task;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/tests/behat/posts_ordering_blog.feature b/tests/behat/posts_ordering_blog.feature
index fe70297d..4325f5a6 100644
--- a/tests/behat/posts_ordering_blog.feature
+++ b/tests/behat/posts_ordering_blog.feature
@@ -1,4 +1,4 @@
-@mod @mod_hsuforum @workbench
+@mod @mod_hsuforum
 Feature: In Open Forums, blog posts are always displayed in reverse chronological order
   In order to use forum as a blog
   As a user
diff --git a/tests/events_test.php b/tests/event/events_test.php
similarity index 99%
rename from tests/events_test.php
rename to tests/event/events_test.php
index 89165296..9136f7c8 100644
--- a/tests/events_test.php
+++ b/tests/event/events_test.php
@@ -22,6 +22,13 @@
  * @copyright  2014 Dan Poltawski <dan@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+namespace mod_hsuforum\event;
+
+use advanced_testcase;
+use coding_exception;
+use context_course;
+use context_module;
+use context_system;
 
 defined('MOODLE_INTERNAL') || die();
 
diff --git a/tests/externallib_test.php b/tests/externallib_test.php
index 57dc86c3..5bf11d82 100644
--- a/tests/externallib_test.php
+++ b/tests/externallib_test.php
@@ -23,6 +23,19 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+namespace mod_hsuforum;
+
+use context_module;
+use context_system;
+use context_user;
+use external_api;
+use externallib_advanced_testcase;
+use mod_hsuforum_external;
+use moodle_exception;
+use moodle_url;
+use stdClass;
+use user_picture;
+
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
diff --git a/tests/form_service_test.php b/tests/form_service_test.php
index a1bbd895..6558b256 100644
--- a/tests/form_service_test.php
+++ b/tests/form_service_test.php
@@ -21,6 +21,15 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+namespace mod_hsuforum;
+
+use advanced_testcase;
+use context_module;
+use context_user;
+use mod_hsuforum_generator;
+use moodle_url;
+use repository;
+
 class testable_form_service extends \mod_hsuforum\service\form_service {
     public function protected_file_prepare_draft_area(&$draftitemid, $contextid, $component, $filearea, $itemid, array $options=null, $text=null) {
         return $this->file_prepare_draft_area($draftitemid, $contextid, $component, $filearea, $itemid, $options, $text);
diff --git a/tests/generator_test.php b/tests/generator_test.php
index 7e587001..2095c070 100644
--- a/tests/generator_test.php
+++ b/tests/generator_test.php
@@ -23,6 +23,14 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+namespace mod_hsuforum;
+
+use advanced_testcase;
+use context_module;
+use core_tag_tag;
+use mod_hsuforum_generator;
+use stdClass;
+
 defined('MOODLE_INTERNAL') || die();
 
 
diff --git a/tests/grades_gradeitems_test.php b/tests/grades_gradeitems_test.php
index e4e6abf3..742c5b38 100644
--- a/tests/grades_gradeitems_test.php
+++ b/tests/grades_gradeitems_test.php
@@ -25,7 +25,7 @@
 
 declare(strict_types = 1);
 
-namespace tests\mod_hsuforum\grades;
+namespace mod_hsuforum;
 
 use advanced_testcase;
 use core_grades\component_gradeitems;
diff --git a/tests/lib_test.php b/tests/lib_test.php
index b0ff3d87..c7ad3a37 100644
--- a/tests/lib_test.php
+++ b/tests/lib_test.php
@@ -22,9 +22,26 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-defined('MOODLE_INTERNAL') || die();
-
+namespace mod_hsuforum;
+
+use advanced_testcase;
+use calendar_event;
+use cm_info;
+use coding_exception;
+use completion_info;
+use context_course;
+use context_module;
+use core_tag_index_builder;
+use core_tag_tag;
 use mod_hsuforum\service;
+use mod_hsuforum_mod_form;
+use rating;
+use rating_exception;
+use ReflectionClass;
+use ReflectionObject;
+use stdClass;
+
+defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
 require_once($CFG->dirroot . '/mod/hsuforum/lib.php');
@@ -32,6 +49,7 @@
 require_once($CFG->dirroot . '/rating/lib.php');
 require_once($CFG->dirroot . '/mod/hsuforum/mod_form.php');
 require_once($CFG->dirroot . '/course/modlib.php');
+require_once($CFG->dirroot . '/lib/accesslib.php');
 
 class lib_test extends advanced_testcase {
 
diff --git a/tests/mail_test.php b/tests/mail_test.php
index 4168d323..8b6345aa 100644
--- a/tests/mail_test.php
+++ b/tests/mail_test.php
@@ -23,6 +23,13 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+namespace mod_hsuforum;
+
+use advanced_testcase;
+use context_course;
+use context_module;
+use stdClass;
+
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
diff --git a/tests/maildigest_test.php b/tests/maildigest_test.php
index ec7d4651..96e56c4a 100644
--- a/tests/maildigest_test.php
+++ b/tests/maildigest_test.php
@@ -24,6 +24,12 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+namespace mod_hsuforum;
+
+use advanced_testcase;
+use core_date;
+use stdClass;
+
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
diff --git a/tests/output_email_test.php b/tests/output_email_test.php
index 1f18a0c1..07646d6e 100644
--- a/tests/output_email_test.php
+++ b/tests/output_email_test.php
@@ -22,6 +22,12 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+namespace mod_hsuforum;
+
+use advanced_testcase;
+use mod_hsuforum\output\hsuforum_post_email;
+use moodle_url;
+
 defined('MOODLE_INTERNAL') || die();
 
 /**
@@ -178,7 +184,7 @@ public function test_postdate($globalconfig, $forumconfig, $postconfig, $discuss
         $DB->update_record('hsuforum_posts', $post);
 
         // Create the renderable.
-        $renderable = new mod_hsuforum\output\hsuforum_post_email(
+        $renderable = new hsuforum_post_email(
                 $course,
                 $cm,
                 $forum,
@@ -216,7 +222,7 @@ public function test_anonymous_author() {
         $post = $DB->get_record('hsuforum_posts', ['discussion' => $discussion->id, 'userid' => $user->id]);
 
         $anonuser = hsuforum_anonymize_user($user, $forum, $post);
-        $postemail = new \mod_hsuforum\output\hsuforum_post_email($course, $cm, $forum, $discussion, $post, $anonuser,
+        $postemail = new hsuforum_post_email($course, $cm, $forum, $discussion, $post, $anonuser,
                 get_admin(), true);
 
         $anonprofileurl = new moodle_url('/user/view.php', ['id' => $anonuser->id, 'course' => $course->id]);
diff --git a/tests/portfolio_caller_test.php b/tests/portfolio_caller_test.php
index 93452383..a6bf8d7b 100644
--- a/tests/portfolio_caller_test.php
+++ b/tests/portfolio_caller_test.php
@@ -23,6 +23,13 @@
  * @author     Brendan Cox <brendan.cox@totaralearning.com>
  */
 
+namespace mod_hsuforum;
+
+use advanced_testcase;
+use context_module;
+use hsuforum_portfolio_caller;
+use mod_hsuforum_generator;
+
 defined('MOODLE_INTERNAL') || die();
 
 /**
diff --git a/tests/privacy_provider_test.php b/tests/privacy_provider_test.php
index aad50ad5..6fa1a053 100644
--- a/tests/privacy_provider_test.php
+++ b/tests/privacy_provider_test.php
@@ -22,13 +22,21 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+namespace mod_hsuforum;
+
+use \core_privacy\tests\provider_testcase;
+use helper_hsuforums;
+use \mod_hsuforum\privacy\provider;
+use rating_manager;
+use stdClass;
+
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
 
 require_once(__DIR__ . '/helper.php');
 require_once($CFG->dirroot . '/rating/lib.php');
-use \mod_hsuforum\privacy\provider;
+
 
 /**
  * Tests for the hsuforum implementation of the Privacy Provider API.
@@ -36,7 +44,7 @@
  * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class privacy_provider_test extends \core_privacy\tests\provider_testcase {
+class privacy_provider_test extends provider_testcase {
 
     // Include the privacy helper trait.
     use \mod_hsuforum\privacy\subcontext_info;
diff --git a/tests/restore_date_test.php b/tests/restore_date_test.php
index c3ad4c47..780d4679 100644
--- a/tests/restore_date_test.php
+++ b/tests/restore_date_test.php
@@ -22,6 +22,13 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+namespace mod_hsuforum;
+
+use context_module;
+use rating;
+use \restore_date_testcase;
+use stdClass;
+
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
diff --git a/tests/rsslib_test.php b/tests/rsslib_test.php
index 9a2a0076..194908eb 100644
--- a/tests/rsslib_test.php
+++ b/tests/rsslib_test.php
@@ -28,9 +28,6 @@
 require_once(__DIR__ . '/helper.php');
 require_once("{$CFG->dirroot}/mod/hsuforum/rsslib.php");
 
-
-
-
 /**
  * Tests for the forum implementation of the RSS component.
  *
diff --git a/tests/search_test.php b/tests/search_test.php
index 71f8332d..0ad8361a 100644
--- a/tests/search_test.php
+++ b/tests/search_test.php
@@ -23,6 +23,14 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+namespace mod_hsuforum;
+
+use advanced_testcase;
+use context_course;
+use context_module;
+use stdClass;
+use testable_core_search;
+
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
diff --git a/tests/user_autosubscription_test.php b/tests/user_autosubscription_test.php
index b54c3dbc..dd184f44 100644
--- a/tests/user_autosubscription_test.php
+++ b/tests/user_autosubscription_test.php
@@ -14,10 +14,15 @@
 // 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_hsuforum;
+
+use advanced_testcase;
+use mod_hsuforum\service\post_service;
+use stdClass;
+
 defined('MOODLE_INTERNAL') || die();
 global $CFG;
 
-use mod_hsuforum\service\post_service;
 require_once($CFG->dirroot . '/mod/hsuforum/lib.php');
 
 
diff --git a/version.php b/version.php
index 208c2e5b..7c9a3484 100644
--- a/version.php
+++ b/version.php
@@ -27,8 +27,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023061500;       // The current module version (Date: YYYYMMDDXX)
-$plugin->requires  = 2022112800;       // Requires this Moodle version
+$plugin->version   = 2023063000;       // The current module version (Date: YYYYMMDDXX)
+$plugin->requires  = 2023042400;       // Requires this Moodle version
 $plugin->component = 'mod_hsuforum';   // Full name of the plugin (used for diagnostics).
-$plugin->release   = '4.1.3';
+$plugin->release   = '4.2.0';
 $plugin->maturity  = MATURITY_STABLE;

From 3fce967b3b793ddcca30dc1c342a466957fab8d0 Mon Sep 17 00:00:00 2001
From: Matthias Opitz <m.opitz@ucl.ac.uk>
Date: Fri, 30 Jun 2023 16:22:05 +0100
Subject: [PATCH 15/18] removed outcommented test steps

---
 tests/behat/advanced_editor_pass_data_to_new_page.feature | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/behat/advanced_editor_pass_data_to_new_page.feature b/tests/behat/advanced_editor_pass_data_to_new_page.feature
index b46d8027..57d5a9e5 100644
--- a/tests/behat/advanced_editor_pass_data_to_new_page.feature
+++ b/tests/behat/advanced_editor_pass_data_to_new_page.feature
@@ -48,8 +48,6 @@ Feature: Users see their typed information in the advanced editor view when clic
     And I should see "Your new discussion topic"
     And I set the field with xpath "//*[@id='id_subject']" to "Test discussion 1 to be cancelled again"
     And I set the field with xpath "//*[@id='id_messageeditable']" to "Test discussion 1 to be cancelled description again"
-#    And I set the field with xpath "//*[@class='mce-content-body']" to "Test discussion 1 to be cancelled description again"
-#    And I set editable div ".mce-content-body" "css_element" to "Test discussion 1 to be cancelled description"
     And I press "Post to forum"
     Then I log out
     And I log in as "student1"

From ea1956dfc013b1a5d65fdb1cfd3f7cd545123cbf Mon Sep 17 00:00:00 2001
From: Matthias Opitz <m.opitz@ucl.ac.uk>
Date: Fri, 24 Nov 2023 17:18:18 +0000
Subject: [PATCH 16/18] Replaced deprecated core completion strings with local
 ones

---
 lang/en/hsuforum.php | 6 ++++++
 mod_form.php         | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lang/en/hsuforum.php b/lang/en/hsuforum.php
index eba01dd3..31543041 100644
--- a/lang/en/hsuforum.php
+++ b/lang/en/hsuforum.php
@@ -755,3 +755,9 @@
 $string['forumsubjectdeleted'] = 'This forum post has been removed';
 $string['forumbodydeleted'] = 'The content of this forum post has been removed and can no longer be accessed.';
 $string['gradeitem:posts'] = 'Posts';
+
+// Replacements for deprecated core completion strings of Moodle 4.3+.
+$string['completionview'] = 'Require view';
+$string['completionusegrade'] = 'Require grade';
+$string['completionusegrade_desc'] = 'Receive a grade';
+$string['completionusegrade_help'] = 'If enabled, the activity is considered complete when a student receives a grade. If a pass grade for the activity is set, then pass and fail icons are displayed in the activity completion report.';
diff --git a/mod_form.php b/mod_form.php
index bcef8ac6..6142235d 100644
--- a/mod_form.php
+++ b/mod_form.php
@@ -414,7 +414,7 @@ protected function standard_hsuforum_coursemodule_elements() {
             // Automatic completion once you view it
             $gotcompletionoptions = false;
             if (plugin_supports('mod', $this->_modname, FEATURE_COMPLETION_TRACKS_VIEWS, false)) {
-                $mform->addElement('checkbox', 'completionview', get_string('completionview', 'completion'),
+                $mform->addElement('checkbox', 'completionview', get_string('completionview', 'mod_hsuforum'),
                     get_string('completionview_desc', 'completion'));
                 $mform->hideIf('completionview', 'completion', 'ne', COMPLETION_TRACKING_AUTOMATIC);
                 // Check by default if automatic completion tracking is set.
@@ -441,7 +441,7 @@ protected function standard_hsuforum_coursemodule_elements() {
                         get_string('completionusegrade_desc', 'completion')
                     );
                     $mform->hideIf('completionusegrade', 'completion', 'ne', COMPLETION_TRACKING_AUTOMATIC);
-                    $mform->addHelpButton('completionusegrade', 'completionusegrade', 'completion');
+                    $mform->addHelpButton('completionusegrade', 'completionusegrade', 'mod_hsuforum');
 
                     // The disabledIf logic differs between ratings and other grade items due to different field types.
                     if ($this->_features->rating) {

From 6531196d89ddb097c78dd4903fada502f1fa07ef Mon Sep 17 00:00:00 2001
From: Matthias Opitz <m.opitz@ucl.ac.uk>
Date: Fri, 24 Nov 2023 17:19:35 +0000
Subject: [PATCH 17/18] Added suffix for completion rules for Moodle 4.3+

---
 mod_form.php | 49 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/mod_form.php b/mod_form.php
index 6142235d..f91dec28 100644
--- a/mod_form.php
+++ b/mod_form.php
@@ -742,30 +742,45 @@ function data_preprocessing(&$default_values) {
      * @return array Array of string IDs of added items, empty array if none
      */
     public function add_completion_rules() {
+        global $CFG;
+
         $mform =& $this->_form;
 
-        $group=array();
-        $group[] =& $mform->createElement('checkbox', 'completionpostsenabled', '', get_string('completionposts','hsuforum'));
-        $group[] =& $mform->createElement('text', 'completionposts', '', array('size'=>3));
-        $mform->setType('completionposts',PARAM_INT);
-        $mform->addGroup($group, 'completionpostsgroup', get_string('completionpostsgroup','hsuforum'), array(' '), false);
-        $mform->disabledIf('completionposts','completionpostsenabled','notchecked');
+        // Changes for Moodle 4.3 - MDL-78516.
+        if ($CFG->branch < 403) {
+            $suffix = '';
+        } else {
+            $suffix = $this->get_suffix();
+        }
 
         $group=array();
-        $group[] =& $mform->createElement('checkbox', 'completiondiscussionsenabled', '', get_string('completiondiscussions','hsuforum'));
-        $group[] =& $mform->createElement('text', 'completiondiscussions', '', array('size'=>3));
-        $mform->setType('completiondiscussions',PARAM_INT);
-        $mform->addGroup($group, 'completiondiscussionsgroup', get_string('completiondiscussionsgroup','hsuforum'), array(' '), false);
-        $mform->disabledIf('completiondiscussions','completiondiscussionsenabled','notchecked');
+        $group[] =& $mform->createElement('checkbox', 'completionpostsenabled' . $suffix, '',
+            get_string('completionposts','hsuforum'));
+        $group[] =& $mform->createElement('text', 'completionposts' . $suffix, '', array('size'=>3));
+        $mform->setType('completionposts' . $suffix,PARAM_INT);
+        $mform->addGroup($group, 'completionpostsgroup' . $suffix,
+            get_string('completionpostsgroup','hsuforum'), array(' '), false);
+        $mform->disabledIf('completionposts' . $suffix,'completionpostsenabled' . $suffix,'notchecked');
 
         $group=array();
-        $group[] =& $mform->createElement('checkbox', 'completionrepliesenabled', '', get_string('completionreplies','hsuforum'));
-        $group[] =& $mform->createElement('text', 'completionreplies', '', array('size'=>3));
-        $mform->setType('completionreplies',PARAM_INT);
-        $mform->addGroup($group, 'completionrepliesgroup', get_string('completionrepliesgroup','hsuforum'), array(' '), false);
-        $mform->disabledIf('completionreplies','completionrepliesenabled','notchecked');
+        $group[] =& $mform->createElement('checkbox', 'completiondiscussionsenabled' . $suffix, '',
+            get_string('completiondiscussions','hsuforum'));
+        $group[] =& $mform->createElement('text', 'completiondiscussions' . $suffix, '', array('size'=>3));
+        $mform->setType('completiondiscussions' . $suffix,PARAM_INT);
+        $mform->addGroup($group, 'completiondiscussionsgroup' . $suffix,
+            get_string('completiondiscussionsgroup','hsuforum'), array(' '), false);
+        $mform->disabledIf('completiondiscussions' . $suffix,'completiondiscussionsenabled' . $suffix,'notchecked');
 
-        return array('completiondiscussionsgroup','completionrepliesgroup','completionpostsgroup');
+        $group=array();
+        $group[] =& $mform->createElement('checkbox', 'completionrepliesenabled' . $suffix, '',
+            get_string('completionreplies','hsuforum'));
+        $group[] =& $mform->createElement('text', 'completionreplies' . $suffix, '', array('size'=>3));
+        $mform->setType('completionreplies' . $suffix,PARAM_INT);
+        $mform->addGroup($group, 'completionrepliesgroup' . $suffix,
+            get_string('completionrepliesgroup','hsuforum'), array(' '), false);
+        $mform->disabledIf('completionreplies' . $suffix,'completionrepliesenabled' . $suffix,'notchecked');
+
+        return ['completiondiscussionsgroup' . $suffix, 'completionrepliesgroup' . $suffix, 'completionpostsgroup' . $suffix];
     }
 
     function completion_rule_enabled($data) {

From 3f6ec65a5646e512ece20eb5cfb5a7aa89bb53d6 Mon Sep 17 00:00:00 2001
From: Matthias Opitz <m.opitz@ucl.ac.uk>
Date: Thu, 7 Dec 2023 11:21:21 +0000
Subject: [PATCH 18/18] checking if $CFG->completiondefault is set before
 trying to use it in mod_form.php

---
 mod_form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod_form.php b/mod_form.php
index f91dec28..46e4161c 100644
--- a/mod_form.php
+++ b/mod_form.php
@@ -395,7 +395,7 @@ protected function standard_hsuforum_coursemodule_elements() {
 
             $trackingdefault = COMPLETION_TRACKING_NONE;
             // If system and activity default is on, set it.
-            if ($CFG->completiondefault && $this->_features->defaultcompletion) {
+            if (isset($CFG->completiondefault) && $CFG->completiondefault && $this->_features->defaultcompletion) {
                 $hasrules = plugin_supports('mod', $this->_modname, FEATURE_COMPLETION_HAS_RULES, true);
                 $tracksviews = plugin_supports('mod', $this->_modname, FEATURE_COMPLETION_TRACKS_VIEWS, true);
                 if ($hasrules || $tracksviews) {