Merge branch '86bwwnb0j-MOODLE42'

Lesterhuis-Training-en-Consultancy · Mar 24, 2024 · 88227d8 · 88227d8
2 parents af79e16 + 6fa16bd
commit 88227d8
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,6 +35,9 @@ Types of changes
 * **Fixed** for any bug fixes.
 * **Security** in case of vulnerabilities.
 
+## Version (4.2.0) - 2024-03-05
+- Refactored and upgraded for Moodle 4.2
+
 ## Version (4.1.2) - 2023-03-19
 
 ##### Updated

diff --git a/block_quickcourselist.php b/block_quickcourselist.php
@@ -20,7 +20,7 @@
  * @package     block_quickcourselist
  * @author      Mark Johnson <[email protected]> v2.0
  * @author      Onno Schuit v2.1 commissioned by Lesterhuis Training en Consultancy
- * @author      Luuk Verhoeven v3.8 to 3.10.1 commissioned by Lesterhuis Training en Consultancy
+ * @author      Luuk Verhoeven v3.8 to 4.2.0 commissioned by Lesterhuis Training en Consultancy
  * @author      Gemma Lesterhuis v3.10.2 commissioned by Lesterhuis Training en Consultancy
  * @copyright   2010 Tauntons College, UK v2.0 and Lesterhuis Training en Consultancy v2.1 and further
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later till v2.1, for other versions Freeware
@@ -34,11 +34,11 @@
  *
  * @author      Mark Johnson <[email protected]> v2.0
  * @author      Onno Schuit v2.1 commissioned by Lesterhuis Training en Consultancy
- * @author      Luuk Verhoeven v3.8 to 3.10.1 commissioned by Lesterhuis Training en Consultancy
+ * @author      Luuk Verhoeven v3.8 to 4.2.0 commissioned by Lesterhuis Training en Consultancy
  * @author      Gemma Lesterhuis v3.10.2 commissioned by Lesterhuis Training en Consultancy
  * @copyright   2010 Tauntons College, UK v2.0 and Lesterhuis Training en Consultancy v2.1 and further
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later till v2.1, for other versions Freeware
- *               https://ltnc.nl/ltc-plugin-freeware-licentie
+ *              https://ltnc.nl/ltc-plugin-freeware-licentie
  */
 class block_quickcourselist extends block_base {
 
@@ -67,7 +67,7 @@ private static function get_sql_like_fields(): string {
      *
      * @return void
      */
-    public function init() {
+    public function init(): void {
         $this->content_type = BLOCK_TYPE_TEXT;
         $this->globalconf = get_config('block_quickcourselist');
 
@@ -104,7 +104,6 @@ public function has_config(): bool {
     /**
      * Displays the form for searching courses, and the results if a search as been submitted
      *
-     * @access public
      * @return object
      */
     public function get_content() {

diff --git a/db/access.php b/db/access.php
@@ -20,12 +20,13 @@
  * @package     block_quickcourselist
  * @author      Mark Johnson <[email protected]> v2.0
  * @author      Onno Schuit v2.1 commissioned by Lesterhuis Training en Consultancy
- * @author      Luuk Verhoeven v3.8 to 3.10.1 commissioned by Lesterhuis Training en Consultancy
+ * @author      Luuk Verhoeven v3.8 to 4.2.0 commissioned by Lesterhuis Training en Consultancy
  * @author      Gemma Lesterhuis v3.10.2 commissioned by Lesterhuis Training en Consultancy
  * @copyright   2010 Tauntons College, UK v2.0 and Lesterhuis Training en Consultancy v2.1 and further
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later till v2.1, for other versions Freeware
  *              https://ltnc.nl/ltc-plugin-freeware-licentie
  */
+
 defined('MOODLE_INTERNAL') || die;
 
 $capabilities = [

diff --git a/lang/de/block_quickcourselist.php b/lang/de/block_quickcourselist.php
@@ -17,12 +17,13 @@
 /**
  * Defines lang strings for Quick Course List
  *
- * @package     blocks
+ * @package     block_quickcourselist
  * @subpackage  quickcourselist
  * @author      Alexander Kiy <[email protected]>
  * @copyright   2013 University of Potsdam, GER
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
+
 defined('MOODLE_INTERNAL') || die;
 
 $string['blockname'] = 'Kurssuche';

diff --git a/lang/en/block_quickcourselist.php b/lang/en/block_quickcourselist.php
@@ -20,12 +20,13 @@
  * @package     block_quickcourselist
  * @author      Mark Johnson <[email protected]> v2.0
  * @author      Onno Schuit v2.1 commissioned by Lesterhuis Training en Consultancy
- * @author      Luuk Verhoeven v3.8 to 3.10.1 commissioned by Lesterhuis Training en Consultancy
+ * @author      Luuk Verhoeven v3.8 to 4.2.0 commissioned by Lesterhuis Training en Consultancy
  * @author      Gemma Lesterhuis v3.10.2 commissioned by Lesterhuis Training en Consultancy
  * @copyright   2010 Tauntons College, UK v2.0 and Lesterhuis Training en Consultancy v2.1 and further
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later till v2.1, for other versions Freeware
  *              https://ltnc.nl/ltc-plugin-freeware-licentie
  */
+
 defined('MOODLE_INTERNAL') || die;
 
 $string['blockname'] = 'Quick Course List';

diff --git a/lang/nl/block_quickcourselist.php b/lang/nl/block_quickcourselist.php
@@ -22,6 +22,7 @@
  * @copyright   Lesterhuis Training en Consultancy
  * @license     https://ltnc.nl/ltc-plugin-freeware-licentie
  */
+
 defined('MOODLE_INTERNAL') || die;
 
 $string['blockname'] = 'Cursus snelzoeken';

diff --git a/quickcourselist.php b/quickcourselist.php
@@ -20,7 +20,7 @@
  * @package     block_quickcourselist
  * @author      Mark Johnson <[email protected]> v2.0
  * @author      Onno Schuit v2.1 commissioned by Lesterhuis Training en Consultancy
- * @author      Luuk Verhoeven v3.8 to 3.10.1 commissioned by Lesterhuis Training en Consultancy
+ * @author      Luuk Verhoeven v3.8 to 4.2 commissioned by Lesterhuis Training en Consultancy
  * @author      Gemma Lesterhuis v3.10.2 commissioned by Lesterhuis Training en Consultancy
  * @copyright   2010 Tauntons College, UK v2.0 and Lesterhuis Training en Consultancy v2.1 and further
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later till v2.1, for other versions Freeware
@@ -30,7 +30,8 @@
 require_once('../../config.php');
 defined('MOODLE_INTERNAL') || die;
 
-// TODO should be rewritten to use Moodle's external API
+// TODO should be rewritten to use Moodle's external API.
+
 require_login();
 require_once($CFG->dirroot . '/blocks/moodleblock.class.php');
 require_once($CFG->dirroot . '/blocks/quickcourselist/block_quickcourselist.php');

diff --git a/settings.php b/settings.php
@@ -20,7 +20,7 @@
  * @package     block_quickcourselist
  * @author      Mark Johnson <[email protected]> v2.0
  * @author      Onno Schuit v2.1 commissioned by Lesterhuis Training en Consultancy
- * @author      Luuk Verhoeven v3.8 to 3.10.1 commissioned by Lesterhuis Training en Consultancy
+ * @author      Luuk Verhoeven v3.8 to 4.2.0 commissioned by Lesterhuis Training en Consultancy
  * @author      Gemma Lesterhuis v3.10.2 commissioned by Lesterhuis Training en Consultancy
  * @copyright   2010 Tauntons College, UK v2.0 and Lesterhuis Training en Consultancy v2.1 and further
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later till v2.1, for other versions Freeware
@@ -29,10 +29,16 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+global $ADMIN;
+
 if ($ADMIN->fulltree) {
 
     $settings->add(
-        new admin_setting_heading('block_quickcourselist/displaymode', get_string('displaymode', 'block_quickcourselist'), '')
+        new admin_setting_heading(
+            'block_quickcourselist/displaymode',
+            get_string('displaymode', 'block_quickcourselist'),
+            ''
+        )
     );
 
     // Possible display modes.

diff --git a/version.php b/version.php
@@ -20,17 +20,18 @@
  * @package     block_quickcourselist
  * @author      Mark Johnson <[email protected]> v2.0
  * @author      Onno Schuit v2.1 commissioned by Lesterhuis Training en Consultancy
- * @author      Luuk Verhoeven v3.8 to 3.10.1 commissioned by Lesterhuis Training en Consultancy
+ * @author      Luuk Verhoeven v3.8 to 4.2.0 commissioned by Lesterhuis Training en Consultancy
  * @author      Gemma Lesterhuis v3.10.2 commissioned by Lesterhuis Training en Consultancy
  * @copyright   2010 Tauntons College, UK v2.0 and Lesterhuis Training en Consultancy v2.1 and further
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later till v2.1, for other versions Freeware
  *              https://ltnc.nl/ltc-plugin-freeware-licentie
  */
+
 defined('MOODLE_INTERNAL') || die;
 
-$plugin->version = 2023111600;
+$plugin->version = 2024030500;
 $plugin->requires = 2014051200;
 $plugin->component = 'block_quickcourselist';
 $plugin->maturity = MATURITY_STABLE;
-$plugin->release = '4.1.2';
-$plugin->supported = [39, 401];
+$plugin->release = '4.2.0';
+$plugin->supported = [39, 402];