From cde433c26a3f36edb960d4c92f9650738a238fd4 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 24 Apr 2024 16:03:06 +0800
Subject: [PATCH 001/119] MDL-81647 core: Replace partial with a more
 lightweight version

---
 lib/moodlelib.php                    |  53 +++-------
 lib/tests/moodlelib_partial_test.php | 138 +++++++++++++++++++++++++++
 2 files changed, 149 insertions(+), 42 deletions(-)
 create mode 100644 lib/tests/moodlelib_partial_test.php

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 7e0b0d9513441..2cec4fc8ebe51 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -10016,9 +10016,11 @@ function check_consecutive_identical_characters($password, $maxchars) {
 
 /**
  * Helper function to do partial function binding.
- * so we can use it for preg_replace_callback, for example
- * this works with php functions, user functions, static methods and class methods
- * it returns you a callback that you can pass on like so:
+ *
+ * This is useful for cases such as preg_replace_callback where you may want to partially bind values.
+ *
+ * The use of named arguments is recommended for clarity.
+ * Please note that providing arguments in a different order may have mixed results for built-in functions.
  *
  * $callback = partial('somefunction', $arg1, $arg2);
  *     or
@@ -10029,45 +10031,12 @@ function check_consecutive_identical_characters($password, $maxchars) {
  *
  * and then the arguments that are passed through at calltime are appended to the argument list.
  *
- * @param mixed $function a php callback
- * @param mixed $arg1,... $argv arguments to partially bind with
- * @return array Array callback
- */
-function partial() {
-    if (!class_exists('partial')) {
-        /**
-         * Used to manage function binding.
-         * @copyright  2009 Penny Leach
-         * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
-         */
-        class partial{
-            /** @var array */
-            public $values = array();
-            /** @var string The function to call as a callback. */
-            public $func;
-            /**
-             * Constructor
-             * @param string $func
-             * @param array $args
-             */
-            public function __construct($func, $args) {
-                $this->values = $args;
-                $this->func = $func;
-            }
-            /**
-             * Calls the callback function.
-             * @return mixed
-             */
-            public function method() {
-                $args = func_get_args();
-                return call_user_func_array($this->func, array_merge($this->values, $args));
-            }
-        }
-    }
-    $args = func_get_args();
-    $func = array_shift($args);
-    $p = new partial($func, $args);
-    return array($p, 'method');
+ * @param callable $function a php callback
+ * @param mixed ...$initialargs The arguments to provide for the initial bind
+ * @return callable
+ */
+function partial(callable $callable, ...$initialargs): callable {
+    return fn (...$args) => $callable(...$initialargs, ...$args);
 }
 
 /**
diff --git a/lib/tests/moodlelib_partial_test.php b/lib/tests/moodlelib_partial_test.php
new file mode 100644
index 0000000000000..ec0c3d9ea8f72
--- /dev/null
+++ b/lib/tests/moodlelib_partial_test.php
@@ -0,0 +1,138 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core;
+
+/**
+ * Unit tests for partial() in moodlelib.php.
+ *
+ * @package   core
+ * @category  test
+ * @copyright 2024 Andrew Lyons <andrew@nicols.co.uk>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers ::partial
+ */
+final class moodlelib_partial_test extends \advanced_testcase {
+    /**
+     * Test that arguments to partial can be passed as anticipated.
+     *
+     * @param callable $callable The callable to partially apply.
+     * @param array $initialargs The initial arguments to pass to the callable.
+     * @param array $calledargs The arguments to pass to the partially applied callable.
+     * @param mixed $expected The expected return value.
+     * @dataProvider partial_args_provider
+     */
+    public function test_partial_args(
+        callable $callable,
+        array $initialargs,
+        array $calledargs,
+        mixed $expected,
+    ): void {
+        $this->assertEquals($expected, partial($callable, ...$initialargs)(...$calledargs));
+    }
+
+    /**
+     * An example static method as part of the testcase.
+     *
+     * @param string $foo The first argument.
+     * @param string $bar The second argument.
+     * @param string $baz The third argument.
+     * @param string $bum The fourth argument.
+     */
+    public static function example_static_method(
+        $foo,
+        $bar,
+        $baz,
+        $bum
+    ): string {
+        return implode('/', [$foo, $bar, $baz, $bum]);
+    }
+
+    /**
+     * An example method as part of the testcase.
+     *
+     * @param string $foo The first argument.
+     * @param string $bar The second argument.
+     * @param string $baz The third argument.
+     * @param string $bum The fourth argument.
+     */
+    public function example_instance_method(
+        $foo,
+        $bar,
+        $baz,
+        $bum
+    ): string {
+        return implode('/', [$foo, $bar, $baz, $bum]);
+    }
+
+    /**
+     * Data provider for test_partial_args.
+     *
+     * @return array
+     */
+    public static function partial_args_provider(): array {
+        return [
+            'Using positional args' => [
+                'str_contains',
+                ['foobar'],
+                ['foo'],
+                true,
+            ],
+            'Using positional args swapped' => [
+                'str_contains',
+                ['foo'],
+                ['foobar'],
+                false,
+            ],
+            'Using named args' => [
+                'str_contains',
+                ['needle' => 'foo'],
+                ['haystack' => 'foobar'],
+                true,
+            ],
+            'Using named args on callable args only' => [
+                'str_contains',
+                ['foobar'],
+                ['needle' => 'foo'],
+                true,
+            ],
+            'Using named args on initial args only - instance method' => [
+                [new self(), 'example_instance_method'],
+                ['foo' => 'foo'],
+                ['bar', 'baz', 'bum'],
+                'foo/bar/baz/bum',
+            ],
+            'Using named args on called args only - instance method' => [
+                [new self(), 'example_instance_method'],
+                ['foo'],
+                ['bar' => 'bar', 'baz' => 'baz', 'bum' => 'bum'],
+                'foo/bar/baz/bum',
+            ],
+            'Using named args on initial args only - static method' => [
+                [self::class, 'example_static_method'],
+                ['foo' => 'foo'],
+                ['bar', 'baz', 'bum'],
+                'foo/bar/baz/bum',
+            ],
+            'Using named args on called args only - static method' => [
+                [self::class, 'example_static_method'],
+                ['foo'],
+                ['bar' => 'bar', 'baz' => 'baz', 'bum' => 'bum'],
+                'foo/bar/baz/bum',
+            ],
+        ];
+    }
+}

From 6d34386ca9d2763c50e5d78e1d257293ed454d83 Mon Sep 17 00:00:00 2001
From: hieuvu <hieuvu@nashtechglobal.com>
Date: Mon, 11 Mar 2024 11:03:07 +0700
Subject: [PATCH 002/119] MDL-78662 core_question: Create utility function to
 format question.

---
 question/engine/lib.php                      | 14 ++++++++++
 question/engine/tests/questionutils_test.php | 28 ++++++++++++++++++++
 question/upgrade.txt                         |  3 +++
 3 files changed, 45 insertions(+)

diff --git a/question/engine/lib.php b/question/engine/lib.php
index a181a51b90b63..35d13a9022218 100644
--- a/question/engine/lib.php
+++ b/question/engine/lib.php
@@ -1134,6 +1134,20 @@ public static function get_editor_options($context) {
 
         return $editoroptions;
     }
+
+    /**
+     * Format question fragment string and apply filtering,
+     *
+     * @param string $text current text that we want to be apply filters.
+     * @param context $context of the page question are in.
+     * @return string  result has been modified by filters.
+     */
+    public static function format_question_fragment(string $text, context $context): string {
+        global $PAGE;
+        $filtermanager = \filter_manager::instance();
+        $filtermanager->setup_page_for_filters($PAGE, $context);
+        return $filtermanager->filter_string($text, $context);
+    }
 }
 
 
diff --git a/question/engine/tests/questionutils_test.php b/question/engine/tests/questionutils_test.php
index cb8fa7e327012..02d0b4041fe27 100644
--- a/question/engine/tests/questionutils_test.php
+++ b/question/engine/tests/questionutils_test.php
@@ -226,4 +226,32 @@ public function test_clean_param_mark() {
         $this->assertSame(-1.5, question_utils::clean_param_mark('-1.5'));
         $this->assertSame(-1.5, question_utils::clean_param_mark('-1,5'));
     }
+
+    /**
+     * Test the content is being filtered by filters.
+     *
+     * @covers ::format_question_fragment
+     */
+    public function test_format_question_fragment(): void {
+        global $CFG;
+        require_once($CFG->libdir . '/filterlib.php');
+        $this->resetAfterTest();
+        // Set few filters on.
+        filter_set_global_state('multilang', TEXTFILTER_ON);
+        filter_set_global_state('mathjaxloader', TEXTFILTER_ON);
+        filter_set_applies_to_strings('multilang', 1);
+        filter_set_applies_to_strings('mathjaxloader', 1);
+
+        $systemcontext = \context_system::instance();
+        $input = 'Some inline math \\( y = x^2 \\) and multi lang with html tag
+        <span lang="en" class="multilang"><b>English</b></span><span lang="fr" class="multilang">Français</span>';
+
+        $expected = question_utils::format_question_fragment($input, $systemcontext);
+
+        // The data should only be filtered by mathjax and multi lang filter. HTML tags should not be affeacted.
+        $this->assertStringContainsString('<span class="filter_mathjaxloader_equation">Some inline math', $expected);
+        $this->assertStringContainsString('<span class="nolink">\( y = x^2 \)</span>', $expected);
+        $this->assertStringNotContainsString('<span lang="en" class="multilang">', $expected);
+        $this->assertStringContainsString('<b>English</b>', $expected);
+    }
 }
diff --git a/question/upgrade.txt b/question/upgrade.txt
index b2a9d4281c81a..f6e59be6b413d 100644
--- a/question/upgrade.txt
+++ b/question/upgrade.txt
@@ -83,6 +83,9 @@ This files describes API changes for code that uses the question API.
   .question-bank-table. This applies to the same styles to preview on the qbank_columnsortorder admin screen. It is important
   that the styles match on these pages so that the defaults have the expected result in the question bank.
 
+10) A new utility function format_question_fragment is created.
+    format_question_fragment is added so that question content can filter base on filters.
+
 === 4.2 ===
 
 1) The question/qengine.js has been deprecated. We create core_question/question_engine

From f1044b45bd1b07147ae97c8174bf1007b2877453 Mon Sep 17 00:00:00 2001
From: hieuvu <hieuvu@nashtechglobal.com>
Date: Mon, 11 Mar 2024 11:05:26 +0700
Subject: [PATCH 003/119] MDL-78662 ddimageortext: Allow answer to support
 filter dynamic content.

---
 .../ddimageortext/amd/build/question.min.js   |   2 +-
 .../amd/build/question.min.js.map             |   2 +-
 .../type/ddimageortext/amd/src/question.js    | 110 +++++++++++++++---
 question/type/ddimageortext/rendererbase.php  |   2 +-
 question/type/ddimageortext/styles.css        |   4 +
 .../ddimageortext/tests/behat/preview.feature |  14 ++-
 question/type/ddimageortext/tests/helper.php  |  50 +++++++-
 7 files changed, 163 insertions(+), 21 deletions(-)

diff --git a/question/type/ddimageortext/amd/build/question.min.js b/question/type/ddimageortext/amd/build/question.min.js
index 9c293a384c9ef..94ab303b95cf9 100644
--- a/question/type/ddimageortext/amd/build/question.min.js
+++ b/question/type/ddimageortext/amd/build/question.min.js
@@ -5,6 +5,6 @@
  * @copyright  2018 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-define("qtype_ddimageortext/question",["jquery","core/dragdrop","core/key_codes","core_form/changechecker"],(function($,dragDrop,keys,FormChangeChecker){function DragDropOntoImageQuestion(containerId,readOnly,places){this.containerId=containerId,this.questionAnswer={},M.util.js_pending("qtype_ddimageortext-init-"+this.containerId),this.places=places,this.allImagesLoaded=!1,this.imageLoadingTimeoutId=null,this.isPrinting=!1,readOnly&&this.getRoot().addClass("qtype_ddimageortext-readonly");var thisQ=this;this.getNotYetLoadedImages().one("load",(function(){thisQ.waitForAllImagesToBeLoaded()})),this.waitForAllImagesToBeLoaded()}DragDropOntoImageQuestion.prototype.waitForAllImagesToBeLoaded=function(){var thisQ=this;this.allImagesLoaded||(null!==this.imageLoadingTimeoutId&&clearTimeout(this.imageLoadingTimeoutId),this.getNotYetLoadedImages().length>0?this.imageLoadingTimeoutId=setTimeout((function(){thisQ.waitForAllImagesToBeLoaded()}),100):(this.allImagesLoaded=!0,thisQ.setupQuestion()))},DragDropOntoImageQuestion.prototype.getNotYetLoadedImages=function(){var thisQ=this;return this.getRoot().find(".ddarea img").not((function(i,imgNode){return thisQ.imageIsLoaded(imgNode)}))},DragDropOntoImageQuestion.prototype.imageIsLoaded=function(imgElement){return imgElement.complete&&0!==imgElement.naturalHeight},DragDropOntoImageQuestion.prototype.setupQuestion=function(){this.resizeAllDragsAndDrops(),this.cloneDrags(),this.positionDragsAndDrops(),M.util.js_complete("qtype_ddimageortext-init-"+this.containerId)},DragDropOntoImageQuestion.prototype.resizeAllDragsAndDrops=function(){var thisQ=this;this.getRoot().find(".draghomes > div").each((function(i,node){thisQ.resizeAllDragsAndDropsInGroup(thisQ.getClassnameNumericSuffix($(node),"dragitemgroup"))}))},DragDropOntoImageQuestion.prototype.resizeAllDragsAndDropsInGroup=function(group){var root=this.getRoot(),dragHomes=root.find(".dragitemgroup"+group+" .draghome"),maxWidth=0,maxHeight=0;for(var i in dragHomes.each((function(i,drag){maxWidth=Math.max(maxWidth,Math.ceil(drag.offsetWidth)),maxHeight=Math.max(maxHeight,Math.ceil(drag.offsetHeight))})),maxWidth+=10,maxHeight+=10,dragHomes.each((function(i,drag){var left=Math.round((maxWidth-drag.offsetWidth)/2),top=Math.floor((maxHeight-drag.offsetHeight)/2);$(drag).css({"padding-left":left+"px","padding-right":maxWidth-drag.offsetWidth-left+"px","padding-top":top+"px","padding-bottom":maxHeight-drag.offsetHeight-top+"px"})})),this.places)if(this.places.hasOwnProperty(i)){var place=this.places[i],label=place.text;parseInt(place.group)===group&&(""===label&&(label=M.util.get_string("blank","qtype_ddimageortext")),root.find(".dropzones").append('<div class="dropzone active group'+place.group+" place"+i+'" tabindex="0"><span class="accesshide">'+label+"</span>&nbsp;</div>"),root.find(".dropzone.place"+i).width(maxWidth-2).height(maxHeight-2))}},DragDropOntoImageQuestion.prototype.cloneDrags=function(){var thisQ=this;thisQ.getRoot().find(".draghome").each((function(index,dragHome){var drag=$(dragHome),placeHolder=drag.clone();placeHolder.removeClass(),placeHolder.addClass("draghome choice"+thisQ.getChoice(drag)+" group"+thisQ.getGroup(drag)+" dragplaceholder"),drag.before(placeHolder)}))},DragDropOntoImageQuestion.prototype.cloneDragsForOneChoice=function(dragHome){if(dragHome.hasClass("infinite"))for(var noOfDrags=this.noOfDropsInGroup(this.getGroup(dragHome)),i=0;i<noOfDrags;i++)this.cloneDrag(dragHome);else this.cloneDrag(dragHome)},DragDropOntoImageQuestion.prototype.cloneDrag=function(dragHome){var drag=dragHome.clone();drag.removeClass("draghome").addClass("drag unplaced moodle-has-zindex").offset(dragHome.offset()),this.getRoot().find(".dragitems").append(drag)},DragDropOntoImageQuestion.prototype.positionDragsAndDrops=function(){var thisQ=this,root=this.getRoot(),bgRatio=this.bgRatio();root.find(".ddarea .dropzone").each((function(i,dropNode){var drop=$(dropNode),place=thisQ.places[thisQ.getPlace(drop)];drop.css("left",parseInt(place.xy[0])*bgRatio).css("top",parseInt(place.xy[1])*bgRatio),drop.data("originX",parseInt(place.xy[0])).data("originY",parseInt(place.xy[1])),thisQ.handleElementScale(drop,"left top")})),root.find(".draghome").not(".dragplaceholder").each((function(i,dragNode){var drag=$(dragNode),currentPlace=thisQ.getClassnameNumericSuffix(drag,"inplace");drag.addClass("unplaced").removeClass("placed"),drag.removeAttr("tabindex"),null!==currentPlace&&drag.removeClass("inplace"+currentPlace)})),root.find("input.placeinput").each((function(i,inputNode){var input=$(inputNode),choice=input.val();if(!(0===choice.length||choice.length>0&&"0"===choice)){var place=thisQ.getPlace(input),unplacedDrag=thisQ.getUnplacedChoice(thisQ.getGroup(input),choice),hiddenDrag=thisQ.getDragClone(unplacedDrag);if(hiddenDrag.length)if(unplacedDrag.hasClass("infinite")){var noOfDrags=thisQ.noOfDropsInGroup(thisQ.getGroup(unplacedDrag));if(thisQ.getInfiniteDragClones(unplacedDrag,!1).length<noOfDrags){var cloneDrag=unplacedDrag.clone();cloneDrag.removeClass("beingdragged"),cloneDrag.removeAttr("tabindex"),hiddenDrag.after(cloneDrag),questionManager.addEventHandlersToDrag(cloneDrag)}else hiddenDrag.addClass("active")}else hiddenDrag.addClass("active");var drop=root.find(".dropzone.place"+place);thisQ.sendDragToDrop(unplacedDrag,drop)}})),thisQ.questionAnswer=thisQ.getQuestionAnsweredValues()},DragDropOntoImageQuestion.prototype.getQuestionAnsweredValues=function(){let result={};return this.getRoot().find("input.placeinput").each(((i,inputNode)=>{result[inputNode.id]=inputNode.value})),result},DragDropOntoImageQuestion.prototype.isQuestionInteracted=function(){const oldAnswer=this.questionAnswer,newAnswer=this.getQuestionAnsweredValues();let isInteracted=!1;return JSON.stringify(newAnswer)!==JSON.stringify(oldAnswer)?(isInteracted=!0,isInteracted):(Object.keys(newAnswer).forEach((key=>{newAnswer[key]!==oldAnswer[key]&&(isInteracted=!0)})),isInteracted)},DragDropOntoImageQuestion.prototype.handleDragStart=function(e){var thisQ=this,drag=$(e.target).closest(".draghome"),newIndex=this.calculateZIndex()+2;if(dragDrop.prepare(e).start&&!drag.hasClass("beingdragged")){drag.addClass("beingdragged").css("transform","").css("z-index",newIndex);var currentPlace=this.getClassnameNumericSuffix(drag,"inplace");if(null!==currentPlace){this.setInputValue(currentPlace,0),drag.removeClass("inplace"+currentPlace);var hiddenDrop=thisQ.getDrop(drag,currentPlace);hiddenDrop.length&&(hiddenDrop.addClass("active"),drag.offset(hiddenDrop.offset()))}else{var hiddenDrag=thisQ.getDragClone(drag);if(hiddenDrag.length)if(drag.hasClass("infinite")){var noOfDrags=this.noOfDropsInGroup(thisQ.getGroup(drag));if(this.getInfiniteDragClones(drag,!1).length<noOfDrags){var cloneDrag=drag.clone();cloneDrag.removeClass("beingdragged"),cloneDrag.removeAttr("tabindex"),hiddenDrag.after(cloneDrag),questionManager.addEventHandlersToDrag(cloneDrag),drag.offset(cloneDrag.offset())}else hiddenDrag.addClass("active"),drag.offset(hiddenDrag.offset())}else hiddenDrag.addClass("active"),drag.offset(hiddenDrag.offset())}dragDrop.start(e,drag,(function(x,y,drag){thisQ.dragMove(x,y,drag)}),(function(x,y,drag){thisQ.dragEnd(x,y,drag)}))}},DragDropOntoImageQuestion.prototype.dragMove=function(pageX,pageY,drag){var thisQ=this,highlighted=!1;this.getRoot().find(".dropzone.group"+this.getGroup(drag)).each((function(i,dropNode){var drop=$(dropNode);thisQ.isPointInDrop(pageX,pageY,drop)&&!highlighted?(highlighted=!0,drop.addClass("valid-drag-over-drop")):drop.removeClass("valid-drag-over-drop")})),this.getRoot().find(".draghome.placed.group"+this.getGroup(drag)).not(".beingdragged").each((function(i,dropNode){var drop=$(dropNode);!thisQ.isPointInDrop(pageX,pageY,drop)||highlighted||thisQ.isDragSameAsDrop(drag,drop)?drop.removeClass("valid-drag-over-drop"):(highlighted=!0,drop.addClass("valid-drag-over-drop"))}))},DragDropOntoImageQuestion.prototype.dragEnd=function(pageX,pageY,drag){var thisQ=this,root=this.getRoot(),placed=!1;root.find(".dropzone.group"+this.getGroup(drag)).each((function(i,dropNode){var drop=$(dropNode);return!thisQ.isPointInDrop(pageX,pageY,drop)||(drop.removeClass("valid-drag-over-drop"),thisQ.sendDragToDrop(drag,drop),placed=!0,!1)})),placed||root.find(".draghome.placed.group"+this.getGroup(drag)).not(".beingdragged").each((function(i,placedNode){var placedDrag=$(placedNode);if(!thisQ.isPointInDrop(pageX,pageY,placedDrag)||thisQ.isDragSameAsDrop(drag,placedDrag))return!0;placedDrag.removeClass("valid-drag-over-drop");var currentPlace=thisQ.getClassnameNumericSuffix(placedDrag,"inplace"),drop=thisQ.getDrop(drag,currentPlace);return thisQ.sendDragToDrop(drag,drop),placed=!0,!1})),placed||this.sendDragHome(drag)},DragDropOntoImageQuestion.prototype.sendDragToDrop=function(drag,drop){var oldDrag=this.getCurrentDragInPlace(this.getPlace(drop));if(0!==oldDrag.length){oldDrag.addClass("beingdragged"),oldDrag.offset(oldDrag.offset());var currentPlace=this.getClassnameNumericSuffix(oldDrag,"inplace");this.getDrop(oldDrag,currentPlace).addClass("active"),this.sendDragHome(oldDrag)}0===drag.length?(this.setInputValue(this.getPlace(drop),0),drop.data("isfocus")&&drop.focus()):(this.setInputValue(this.getPlace(drop),this.getChoice(drag)),drag.removeClass("unplaced").addClass("placed inplace"+this.getPlace(drop)),drag.attr("tabindex",0),this.animateTo(drag,drop))},DragDropOntoImageQuestion.prototype.sendDragHome=function(drag){var currentPlace=this.getClassnameNumericSuffix(drag,"inplace");null!==currentPlace&&drag.removeClass("inplace"+currentPlace),drag.data("unplaced",!0),this.animateTo(drag,this.getDragHome(this.getGroup(drag),this.getChoice(drag)))},DragDropOntoImageQuestion.prototype.handleKeyPress=function(e){var drop=$(e.target).closest(".dropzone");if(0===drop.length){var placedDrag=$(e.target),currentPlace=this.getClassnameNumericSuffix(placedDrag,"inplace");null!==currentPlace&&(drop=this.getDrop(placedDrag,currentPlace))}var currentDrag=this.getCurrentDragInPlace(this.getPlace(drop)),nextDrag=$();switch(e.keyCode){case keys.space:case keys.arrowRight:case keys.arrowDown:nextDrag=this.getNextDrag(this.getGroup(drop),currentDrag);break;case keys.arrowLeft:case keys.arrowUp:nextDrag=this.getPreviousDrag(this.getGroup(drop),currentDrag);break;case keys.escape:questionManager.isKeyboardNavigation=!1;break;default:return void(questionManager.isKeyboardNavigation=!1)}if(nextDrag.length){nextDrag.data("isfocus",!0),nextDrag.addClass("beingdragged");var hiddenDrag=this.getDragClone(nextDrag);if(hiddenDrag.length)if(nextDrag.hasClass("infinite")){var noOfDrags=this.noOfDropsInGroup(this.getGroup(nextDrag));if(this.getInfiniteDragClones(nextDrag,!1).length<noOfDrags){var cloneDrag=nextDrag.clone();cloneDrag.removeClass("beingdragged"),cloneDrag.removeAttr("tabindex"),hiddenDrag.after(cloneDrag),questionManager.addEventHandlersToDrag(cloneDrag),nextDrag.offset(cloneDrag.offset())}else hiddenDrag.addClass("active"),nextDrag.offset(hiddenDrag.offset())}else hiddenDrag.addClass("active"),nextDrag.offset(hiddenDrag.offset())}else drop.data("isfocus",!0);e.preventDefault(),this.sendDragToDrop(nextDrag,drop)},DragDropOntoImageQuestion.prototype.getNextDrag=function(group,drag){var choice,numChoices=this.noOfChoicesInGroup(group);choice=0===drag.length?1:this.getChoice(drag)+1;for(var next=this.getUnplacedChoice(group,choice);0===next.length&&choice<numChoices;)choice++,next=this.getUnplacedChoice(group,choice);return next},DragDropOntoImageQuestion.prototype.getPreviousDrag=function(group,drag){var choice;choice=0===drag.length?this.noOfChoicesInGroup(group):this.getChoice(drag)-1;for(var previous=this.getUnplacedChoice(group,choice);0===previous.length&&choice>1;)choice--,previous=this.getUnplacedChoice(group,choice);return previous},DragDropOntoImageQuestion.prototype.animateTo=function(drag,target){var currentPos=drag.offset(),targetPos=target.offset(),thisQ=this;M.util.js_pending("qtype_ddimageortext-animate-"+thisQ.containerId),drag.animate({left:parseInt(drag.css("left"))+targetPos.left-currentPos.left,top:parseInt(drag.css("top"))+targetPos.top-currentPos.top},{duration:"fast",done:function(){$("body").trigger("qtype_ddimageortext-dragmoved",[drag,target,thisQ]),M.util.js_complete("qtype_ddimageortext-animate-"+thisQ.containerId)}})},DragDropOntoImageQuestion.prototype.isPointInDrop=function(pageX,pageY,drop){var position=drop.offset();return drop.hasClass("draghome")?pageX>=position.left&&pageX<position.left+drop.outerWidth()&&pageY>=position.top&&pageY<position.top+drop.outerHeight():pageX>=position.left&&pageX<position.left+drop.width()&&pageY>=position.top&&pageY<position.top+drop.height()},DragDropOntoImageQuestion.prototype.setInputValue=function(place,choice){this.getRoot().find("input.placeinput.place"+place).val(choice)},DragDropOntoImageQuestion.prototype.getRoot=function(){return $(document.getElementById(this.containerId))},DragDropOntoImageQuestion.prototype.bgImage=function(){return this.getRoot().find("img.dropbackground")},DragDropOntoImageQuestion.prototype.getDragHome=function(group,choice){return this.getRoot().find(".draghome.dragplaceholder.group"+group+".choice"+choice).is(":visible")?this.getRoot().find(".draghome.dragplaceholder.group"+group+".choice"+choice):this.getRoot().find(".dragitemgroup"+group+" .draghome.infinite.choice"+choice+".group"+group)},DragDropOntoImageQuestion.prototype.getUnplacedChoice=function(group,choice){return this.getRoot().find(".ddarea .draghome.group"+group+".choice"+choice+".unplaced").slice(0,1)},DragDropOntoImageQuestion.prototype.getCurrentDragInPlace=function(place){return this.getRoot().find(".ddarea .draghome.inplace"+place)},DragDropOntoImageQuestion.prototype.noOfDropsInGroup=function(group){return this.getRoot().find(".dropzone.group"+group).length},DragDropOntoImageQuestion.prototype.noOfChoicesInGroup=function(group){return this.getRoot().find(".dragitemgroup"+group+" .draghome").length},DragDropOntoImageQuestion.prototype.getClassnameNumericSuffix=function(node,prefix){var classes=node.attr("class");if(""!==classes)for(var classesArr=classes.split(" "),index=0;index<classesArr.length;index++){if(new RegExp("^"+prefix+"([0-9])+$").test(classesArr[index])){var match=new RegExp("([0-9])+$").exec(classesArr[index]);return Number(match[0])}}return null},DragDropOntoImageQuestion.prototype.getChoice=function(drag){return this.getClassnameNumericSuffix(drag,"choice")},DragDropOntoImageQuestion.prototype.getGroup=function(node){return this.getClassnameNumericSuffix(node,"group")},DragDropOntoImageQuestion.prototype.getPlace=function(node){return this.getClassnameNumericSuffix(node,"place")},DragDropOntoImageQuestion.prototype.getDragClone=function(drag){return this.getRoot().find(".dragitemgroup"+this.getGroup(drag)+" .draghome.choice"+this.getChoice(drag)+".group"+this.getGroup(drag)+".dragplaceholder")},DragDropOntoImageQuestion.prototype.getInfiniteDragClones=function(drag,inHome){return inHome?this.getRoot().find(".dragitemgroup"+this.getGroup(drag)+" .draghome.choice"+this.getChoice(drag)+".group"+this.getGroup(drag)+".infinite").not(".dragplaceholder"):this.getRoot().find(".draghome.choice"+this.getChoice(drag)+".group"+this.getGroup(drag)+".infinite").not(".dragplaceholder")},DragDropOntoImageQuestion.prototype.getDrop=function(drag,currentPlace){return this.getRoot().find(".dropzone.group"+this.getGroup(drag)+".place"+currentPlace)},DragDropOntoImageQuestion.prototype.handleResize=function(){var thisQ=this,bgRatio=this.bgRatio();this.isPrinting&&(bgRatio=1),this.getRoot().find(".ddarea .dropzone").each((function(i,dropNode){$(dropNode).css("left",parseInt($(dropNode).data("originX"))*parseFloat(bgRatio)).css("top",parseInt($(dropNode).data("originY"))*parseFloat(bgRatio)),thisQ.handleElementScale(dropNode,"left top")})),this.getRoot().find("div.droparea .draghome").not(".beingdragged").each((function(key,drag){$(drag).css("left",parseFloat($(drag).data("originX"))*parseFloat(bgRatio)).css("top",parseFloat($(drag).data("originY"))*parseFloat(bgRatio)),thisQ.handleElementScale(drag,"left top")}))},DragDropOntoImageQuestion.prototype.bgRatio=function(){var bgImg=this.bgImage(),bgImgNaturalWidth=bgImg.get(0).naturalWidth;return bgImg.width()/bgImgNaturalWidth},DragDropOntoImageQuestion.prototype.handleElementScale=function(element,type){var bgRatio=parseFloat(this.bgRatio());this.isPrinting&&(bgRatio=1),$(element).css({"-webkit-transform":"scale("+bgRatio+")","-moz-transform":"scale("+bgRatio+")","-ms-transform":"scale("+bgRatio+")","-o-transform":"scale("+bgRatio+")",transform:"scale("+bgRatio+")","transform-origin":type})},DragDropOntoImageQuestion.prototype.calculateZIndex=function(){var zIndex=0;return this.getRoot().find(".ddarea .dropzone, div.droparea .draghome").each((function(i,dropNode){var itemZIndex=(dropNode=$(dropNode)).css("z-index")?parseInt(dropNode.css("z-index")):0;itemZIndex>zIndex&&(zIndex=itemZIndex)})),zIndex},DragDropOntoImageQuestion.prototype.isDragSameAsDrop=function(drag,drop){return this.getChoice(drag)===this.getChoice(drop)&&this.getGroup(drag)===this.getGroup(drop)};var questionManager={eventHandlersInitialised:!1,dragEventHandlersInitialised:{},isPrinting:!1,isKeyboardNavigation:!1,questions:{},init:function(containerId,readOnly,places){if(questionManager.questions[containerId]=new DragDropOntoImageQuestion(containerId,readOnly,places),questionManager.eventHandlersInitialised||(questionManager.setupEventHandlers(),questionManager.eventHandlersInitialised=!0),!questionManager.dragEventHandlersInitialised.hasOwnProperty(containerId)){questionManager.dragEventHandlersInitialised[containerId]=!0;var questionContainer=document.getElementById(containerId);questionContainer.classList.contains("ddimageortext")&&!questionContainer.classList.contains("qtype_ddimageortext-readonly")&&questionManager.addEventHandlersToDrag($(questionContainer).find(".draghome"))}},setupEventHandlers:function(){$("body").on("keydown",".que.ddimageortext:not(.qtype_ddimageortext-readonly) .dropzones .dropzone",questionManager.handleKeyPress).on("keydown",".que.ddimageortext:not(.qtype_ddimageortext-readonly) .draghome.placed:not(.beingdragged)",questionManager.handleKeyPress).on("qtype_ddimageortext-dragmoved",questionManager.handleDragMoved),$(window).on("resize",(function(){questionManager.handleWindowResize(!1)})),window.addEventListener("beforeprint",(function(){questionManager.isPrinting=!0,questionManager.handleWindowResize(questionManager.isPrinting)})),window.addEventListener("afterprint",(function(){questionManager.isPrinting=!1,questionManager.handleWindowResize(questionManager.isPrinting)})),setTimeout((function(){questionManager.fixLayoutIfThingsMoved()}),100)},addEventHandlersToDrag:function(element){element.unbind("mousedown touchstart"),element.on("mousedown touchstart",questionManager.handleDragStart)},handleDragStart:function(e){e.preventDefault();var question=questionManager.getQuestionForEvent(e);question&&question.handleDragStart(e)},handleKeyPress:function(e){if(!questionManager.isKeyboardNavigation){questionManager.isKeyboardNavigation=!0;var question=questionManager.getQuestionForEvent(e);question&&question.handleKeyPress(e)}},handleWindowResize:function(isPrinting){for(var containerId in questionManager.questions)questionManager.questions.hasOwnProperty(containerId)&&(questionManager.questions[containerId].isPrinting=isPrinting,questionManager.questions[containerId].handleResize())},fixLayoutIfThingsMoved:function(){this.handleWindowResize(questionManager.isPrinting),setTimeout((function(){questionManager.fixLayoutIfThingsMoved(questionManager.isPrinting)}),100)},handleDragMoved:function(e,drag,target,thisQ){drag.removeClass("beingdragged").css("z-index",""),drag.css("top",target.position().top).css("left",target.position().left),target.after(drag),target.removeClass("active"),void 0!==drag.data("unplaced")&&!0===drag.data("unplaced")?(drag.removeClass("placed").addClass("unplaced"),drag.removeAttr("tabindex"),drag.removeData("unplaced"),drag.css("top","").css("left","").css("transform",""),drag.hasClass("infinite")&&thisQ.getInfiniteDragClones(drag,!0).length>1&&thisQ.getInfiniteDragClones(drag,!0).first().remove()):(drag.data("originX",target.data("originX")).data("originY",target.data("originY")),thisQ.handleElementScale(drag,"left top")),void 0!==drag.data("isfocus")&&!0===drag.data("isfocus")&&(drag.focus(),drag.removeData("isfocus")),void 0!==target.data("isfocus")&&!0===target.data("isfocus")&&target.removeData("isfocus"),questionManager.isKeyboardNavigation&&(questionManager.isKeyboardNavigation=!1),thisQ.isQuestionInteracted()&&(questionManager.handleFormDirty(),thisQ.questionAnswer=thisQ.getQuestionAnsweredValues())},getQuestionForEvent:function(e){var containerId=$(e.currentTarget).closest(".que.ddimageortext").attr("id");return questionManager.questions[containerId]},handleFormDirty:function(){const responseForm=document.getElementById("responseform");FormChangeChecker.markFormAsDirty(responseForm)}};return{init:questionManager.init}}));
+define("qtype_ddimageortext/question",["jquery","core/dragdrop","core/key_codes","core_form/changechecker","core_filters/events"],(function($,dragDrop,keys,FormChangeChecker,filterEvent){function DragDropOntoImageQuestion(containerId,readOnly,places){this.containerId=containerId,this.questionAnswer={},this.questionDragDropWidthHeight=[],M.util.js_pending("qtype_ddimageortext-init-"+this.containerId),this.places=places,this.allImagesLoaded=!1,this.imageLoadingTimeoutId=null,this.isPrinting=!1,readOnly&&this.getRoot().addClass("qtype_ddimageortext-readonly");var thisQ=this;this.getNotYetLoadedImages().one("load",(function(){thisQ.waitForAllImagesToBeLoaded()})),this.waitForAllImagesToBeLoaded()}DragDropOntoImageQuestion.prototype.changeAllDragsAndDropsToFilteredContent=function(filteredElement){let currentFilteredItem=$(filteredElement);const parentIsDD=currentFilteredItem.parent().closest("div").hasClass("placed")||currentFilteredItem.parent().hasClass("draghome"),isDD=currentFilteredItem.hasClass("placed")||currentFilteredItem.hasClass("draghome");if(!parentIsDD&&!isDD)return;if(parentIsDD&&(currentFilteredItem=currentFilteredItem.parent().closest("div")),this.getRoot().find(currentFilteredItem).length<=0)return;const group=this.getGroup(currentFilteredItem),choice=this.getChoice(currentFilteredItem);let listOfModifiedDragDrop=[];this.getRoot().find(".group"+group+".choice"+choice).each((function(i,node){if($(node).get(0)===currentFilteredItem.get(0))return;const originalClass=$(node).attr("class"),originalStyle=$(node).attr("style"),filteredDragDropClone=currentFilteredItem.clone();questionManager.addEventHandlersToDrag(filteredDragDropClone),filteredDragDropClone.attr("class",originalClass),filteredDragDropClone.attr("style",originalStyle),$(node).before(filteredDragDropClone),listOfModifiedDragDrop.push(node)})),listOfModifiedDragDrop.forEach((function(node){$(node).remove()}));const currentHeight=currentFilteredItem.height(),currentWidth=currentFilteredItem.width();currentFilteredItem.height("auto"),currentFilteredItem.width("auto"),filteredElement.offsetWidth&&filteredElement.offsetHeight||filteredElement.classList.add("d-block"),this.questionDragDropWidthHeight[group].maxWidth<Math.ceil(filteredElement.offsetWidth)||this.questionDragDropWidthHeight[group].maxHeight<Math.ceil(0+filteredElement.offsetHeight)?(filteredElement.classList.remove("d-block"),this.resizeAllDragsAndDropsInGroup(group)):(currentFilteredItem.height(currentHeight),currentFilteredItem.width(currentWidth)),filteredElement.classList.remove("d-block")},DragDropOntoImageQuestion.prototype.waitForAllImagesToBeLoaded=function(){var thisQ=this;this.allImagesLoaded||(null!==this.imageLoadingTimeoutId&&clearTimeout(this.imageLoadingTimeoutId),this.getNotYetLoadedImages().length>0?this.imageLoadingTimeoutId=setTimeout((function(){thisQ.waitForAllImagesToBeLoaded()}),100):(this.allImagesLoaded=!0,thisQ.setupQuestion(),document.addEventListener(filterEvent.eventTypes.filterContentRenderingComplete,(elements=>{elements.detail.nodes.forEach((element=>{thisQ.changeAllDragsAndDropsToFilteredContent(element)}))}))))},DragDropOntoImageQuestion.prototype.getNotYetLoadedImages=function(){var thisQ=this;return this.getRoot().find(".ddarea img").not((function(i,imgNode){return thisQ.imageIsLoaded(imgNode)}))},DragDropOntoImageQuestion.prototype.imageIsLoaded=function(imgElement){return imgElement.complete&&0!==imgElement.naturalHeight},DragDropOntoImageQuestion.prototype.setupQuestion=function(){this.resizeAllDragsAndDrops(),this.cloneDrags(),this.positionDragsAndDrops(),M.util.js_complete("qtype_ddimageortext-init-"+this.containerId)},DragDropOntoImageQuestion.prototype.resizeAllDragsAndDrops=function(){var thisQ=this;this.getRoot().find(".draghomes > div").each((function(i,node){thisQ.resizeAllDragsAndDropsInGroup(thisQ.getClassnameNumericSuffix($(node),"dragitemgroup"))}))},DragDropOntoImageQuestion.prototype.resizeAllDragsAndDropsInGroup=function(group){var root=this.getRoot(),dragHomes=root.find(".draghome.group"+group),maxWidth=0,maxHeight=0;for(var i in dragHomes.each((function(i,drag){maxWidth=Math.max(maxWidth,Math.ceil(drag.offsetWidth)),maxHeight=Math.max(maxHeight,Math.ceil(drag.offsetHeight))})),maxWidth+=10,maxHeight+=10,this.questionDragDropWidthHeight[group]={maxWidth:maxWidth,maxHeight:maxHeight},dragHomes.each((function(i,drag){$(drag).width(maxWidth).height(maxHeight).css("lineHeight",maxHeight+"px")})),this.places)if(this.places.hasOwnProperty(i)){var place=this.places[i],label=place.text;parseInt(place.group)===group&&(""===label&&(label=M.util.get_string("blank","qtype_ddimageortext")),0===root.find(".dropzones .dropzone.group"+place.group+".place"+i).length&&root.find(".dropzones").append('<div class="dropzone active group'+place.group+" place"+i+'" tabindex="0"><span class="accesshide">'+label+"</span>&nbsp;</div>"),root.find(".dropzone.place"+i).width(maxWidth-2).height(maxHeight-2))}},DragDropOntoImageQuestion.prototype.cloneDrags=function(){var thisQ=this;thisQ.getRoot().find(".draghome").each((function(index,dragHome){var drag=$(dragHome),placeHolder=drag.clone();placeHolder.removeClass(),placeHolder.addClass("draghome choice"+thisQ.getChoice(drag)+" group"+thisQ.getGroup(drag)+" dragplaceholder"),drag.before(placeHolder)}))},DragDropOntoImageQuestion.prototype.cloneDragsForOneChoice=function(dragHome){if(dragHome.hasClass("infinite"))for(var noOfDrags=this.noOfDropsInGroup(this.getGroup(dragHome)),i=0;i<noOfDrags;i++)this.cloneDrag(dragHome);else this.cloneDrag(dragHome)},DragDropOntoImageQuestion.prototype.cloneDrag=function(dragHome){var drag=dragHome.clone();drag.removeClass("draghome").addClass("drag unplaced moodle-has-zindex").offset(dragHome.offset()),this.getRoot().find(".dragitems").append(drag)},DragDropOntoImageQuestion.prototype.positionDragsAndDrops=function(){var thisQ=this,root=this.getRoot(),bgRatio=this.bgRatio();root.find(".ddarea .dropzone").each((function(i,dropNode){var drop=$(dropNode),place=thisQ.places[thisQ.getPlace(drop)];drop.css("left",parseInt(place.xy[0])*bgRatio).css("top",parseInt(place.xy[1])*bgRatio),drop.data("originX",parseInt(place.xy[0])).data("originY",parseInt(place.xy[1])),thisQ.handleElementScale(drop,"left top")})),root.find(".draghome").not(".dragplaceholder").each((function(i,dragNode){var drag=$(dragNode),currentPlace=thisQ.getClassnameNumericSuffix(drag,"inplace");drag.addClass("unplaced").removeClass("placed"),drag.removeAttr("tabindex"),null!==currentPlace&&drag.removeClass("inplace"+currentPlace)})),root.find("input.placeinput").each((function(i,inputNode){var input=$(inputNode),choice=input.val();if(!(0===choice.length||choice.length>0&&"0"===choice)){var place=thisQ.getPlace(input),unplacedDrag=thisQ.getUnplacedChoice(thisQ.getGroup(input),choice),hiddenDrag=thisQ.getDragClone(unplacedDrag);if(hiddenDrag.length)if(unplacedDrag.hasClass("infinite")){var noOfDrags=thisQ.noOfDropsInGroup(thisQ.getGroup(unplacedDrag));if(thisQ.getInfiniteDragClones(unplacedDrag,!1).length<noOfDrags){var cloneDrag=unplacedDrag.clone();cloneDrag.removeClass("beingdragged"),cloneDrag.removeAttr("tabindex"),hiddenDrag.after(cloneDrag),questionManager.addEventHandlersToDrag(cloneDrag)}else hiddenDrag.addClass("active")}else hiddenDrag.addClass("active");var drop=root.find(".dropzone.place"+place);thisQ.sendDragToDrop(unplacedDrag,drop)}})),thisQ.questionAnswer=thisQ.getQuestionAnsweredValues()},DragDropOntoImageQuestion.prototype.getQuestionAnsweredValues=function(){let result={};return this.getRoot().find("input.placeinput").each(((i,inputNode)=>{result[inputNode.id]=inputNode.value})),result},DragDropOntoImageQuestion.prototype.isQuestionInteracted=function(){const oldAnswer=this.questionAnswer,newAnswer=this.getQuestionAnsweredValues();let isInteracted=!1;return JSON.stringify(newAnswer)!==JSON.stringify(oldAnswer)?(isInteracted=!0,isInteracted):(Object.keys(newAnswer).forEach((key=>{newAnswer[key]!==oldAnswer[key]&&(isInteracted=!0)})),isInteracted)},DragDropOntoImageQuestion.prototype.handleDragStart=function(e){var thisQ=this,drag=$(e.target).closest(".draghome"),newIndex=this.calculateZIndex()+2;if(dragDrop.prepare(e).start&&!drag.hasClass("beingdragged")){drag.addClass("beingdragged").css("transform","").css("z-index",newIndex);var currentPlace=this.getClassnameNumericSuffix(drag,"inplace");if(null!==currentPlace){this.setInputValue(currentPlace,0),drag.removeClass("inplace"+currentPlace);var hiddenDrop=thisQ.getDrop(drag,currentPlace);hiddenDrop.length&&(hiddenDrop.addClass("active"),drag.offset(hiddenDrop.offset()))}else{var hiddenDrag=thisQ.getDragClone(drag);if(hiddenDrag.length)if(drag.hasClass("infinite")){var noOfDrags=this.noOfDropsInGroup(thisQ.getGroup(drag));if(this.getInfiniteDragClones(drag,!1).length<noOfDrags){var cloneDrag=drag.clone();cloneDrag.removeClass("beingdragged"),cloneDrag.removeAttr("tabindex"),hiddenDrag.after(cloneDrag),questionManager.addEventHandlersToDrag(cloneDrag),drag.offset(cloneDrag.offset())}else hiddenDrag.addClass("active"),drag.offset(hiddenDrag.offset())}else hiddenDrag.addClass("active"),drag.offset(hiddenDrag.offset())}dragDrop.start(e,drag,(function(x,y,drag){thisQ.dragMove(x,y,drag)}),(function(x,y,drag){thisQ.dragEnd(x,y,drag)}))}},DragDropOntoImageQuestion.prototype.dragMove=function(pageX,pageY,drag){var thisQ=this,highlighted=!1;this.getRoot().find(".dropzone.group"+this.getGroup(drag)).each((function(i,dropNode){var drop=$(dropNode);thisQ.isPointInDrop(pageX,pageY,drop)&&!highlighted?(highlighted=!0,drop.addClass("valid-drag-over-drop")):drop.removeClass("valid-drag-over-drop")})),this.getRoot().find(".draghome.placed.group"+this.getGroup(drag)).not(".beingdragged").each((function(i,dropNode){var drop=$(dropNode);!thisQ.isPointInDrop(pageX,pageY,drop)||highlighted||thisQ.isDragSameAsDrop(drag,drop)?drop.removeClass("valid-drag-over-drop"):(highlighted=!0,drop.addClass("valid-drag-over-drop"))}))},DragDropOntoImageQuestion.prototype.dragEnd=function(pageX,pageY,drag){var thisQ=this,root=this.getRoot(),placed=!1;root.find(".dropzone.group"+this.getGroup(drag)).each((function(i,dropNode){var drop=$(dropNode);return!thisQ.isPointInDrop(pageX,pageY,drop)||(drop.removeClass("valid-drag-over-drop"),thisQ.sendDragToDrop(drag,drop),placed=!0,!1)})),placed||root.find(".draghome.placed.group"+this.getGroup(drag)).not(".beingdragged").each((function(i,placedNode){var placedDrag=$(placedNode);if(!thisQ.isPointInDrop(pageX,pageY,placedDrag)||thisQ.isDragSameAsDrop(drag,placedDrag))return!0;placedDrag.removeClass("valid-drag-over-drop");var currentPlace=thisQ.getClassnameNumericSuffix(placedDrag,"inplace"),drop=thisQ.getDrop(drag,currentPlace);return thisQ.sendDragToDrop(drag,drop),placed=!0,!1})),placed||this.sendDragHome(drag)},DragDropOntoImageQuestion.prototype.sendDragToDrop=function(drag,drop){var oldDrag=this.getCurrentDragInPlace(this.getPlace(drop));if(0!==oldDrag.length){oldDrag.addClass("beingdragged"),oldDrag.offset(oldDrag.offset());var currentPlace=this.getClassnameNumericSuffix(oldDrag,"inplace");this.getDrop(oldDrag,currentPlace).addClass("active"),this.sendDragHome(oldDrag)}0===drag.length?(this.setInputValue(this.getPlace(drop),0),drop.data("isfocus")&&drop.focus()):(this.setInputValue(this.getPlace(drop),this.getChoice(drag)),drag.removeClass("unplaced").addClass("placed inplace"+this.getPlace(drop)),drag.attr("tabindex",0),this.animateTo(drag,drop))},DragDropOntoImageQuestion.prototype.sendDragHome=function(drag){var currentPlace=this.getClassnameNumericSuffix(drag,"inplace");null!==currentPlace&&drag.removeClass("inplace"+currentPlace),drag.data("unplaced",!0),this.animateTo(drag,this.getDragHome(this.getGroup(drag),this.getChoice(drag)))},DragDropOntoImageQuestion.prototype.handleKeyPress=function(e){var drop=$(e.target).closest(".dropzone");if(0===drop.length){var placedDrag=$(e.target),currentPlace=this.getClassnameNumericSuffix(placedDrag,"inplace");null!==currentPlace&&(drop=this.getDrop(placedDrag,currentPlace))}var currentDrag=this.getCurrentDragInPlace(this.getPlace(drop)),nextDrag=$();switch(e.keyCode){case keys.space:case keys.arrowRight:case keys.arrowDown:nextDrag=this.getNextDrag(this.getGroup(drop),currentDrag);break;case keys.arrowLeft:case keys.arrowUp:nextDrag=this.getPreviousDrag(this.getGroup(drop),currentDrag);break;case keys.escape:questionManager.isKeyboardNavigation=!1;break;default:return void(questionManager.isKeyboardNavigation=!1)}if(nextDrag.length){nextDrag.data("isfocus",!0),nextDrag.addClass("beingdragged");var hiddenDrag=this.getDragClone(nextDrag);if(hiddenDrag.length)if(nextDrag.hasClass("infinite")){var noOfDrags=this.noOfDropsInGroup(this.getGroup(nextDrag));if(this.getInfiniteDragClones(nextDrag,!1).length<noOfDrags){var cloneDrag=nextDrag.clone();cloneDrag.removeClass("beingdragged"),cloneDrag.removeAttr("tabindex"),hiddenDrag.after(cloneDrag),questionManager.addEventHandlersToDrag(cloneDrag),nextDrag.offset(cloneDrag.offset())}else hiddenDrag.addClass("active"),nextDrag.offset(hiddenDrag.offset())}else hiddenDrag.addClass("active"),nextDrag.offset(hiddenDrag.offset())}else drop.data("isfocus",!0);e.preventDefault(),this.sendDragToDrop(nextDrag,drop)},DragDropOntoImageQuestion.prototype.getNextDrag=function(group,drag){var choice,numChoices=this.noOfChoicesInGroup(group);choice=0===drag.length?1:this.getChoice(drag)+1;for(var next=this.getUnplacedChoice(group,choice);0===next.length&&choice<numChoices;)choice++,next=this.getUnplacedChoice(group,choice);return next},DragDropOntoImageQuestion.prototype.getPreviousDrag=function(group,drag){var choice;choice=0===drag.length?this.noOfChoicesInGroup(group):this.getChoice(drag)-1;for(var previous=this.getUnplacedChoice(group,choice);0===previous.length&&choice>1;)choice--,previous=this.getUnplacedChoice(group,choice);return previous},DragDropOntoImageQuestion.prototype.animateTo=function(drag,target){var currentPos=drag.offset(),targetPos=target.offset(),thisQ=this;M.util.js_pending("qtype_ddimageortext-animate-"+thisQ.containerId),drag.animate({left:parseInt(drag.css("left"))+targetPos.left-currentPos.left,top:parseInt(drag.css("top"))+targetPos.top-currentPos.top},{duration:"fast",done:function(){$("body").trigger("qtype_ddimageortext-dragmoved",[drag,target,thisQ]),M.util.js_complete("qtype_ddimageortext-animate-"+thisQ.containerId)}})},DragDropOntoImageQuestion.prototype.isPointInDrop=function(pageX,pageY,drop){var position=drop.offset();return drop.hasClass("draghome")?pageX>=position.left&&pageX<position.left+drop.outerWidth()&&pageY>=position.top&&pageY<position.top+drop.outerHeight():pageX>=position.left&&pageX<position.left+drop.width()&&pageY>=position.top&&pageY<position.top+drop.height()},DragDropOntoImageQuestion.prototype.setInputValue=function(place,choice){this.getRoot().find("input.placeinput.place"+place).val(choice)},DragDropOntoImageQuestion.prototype.getRoot=function(){return $(document.getElementById(this.containerId))},DragDropOntoImageQuestion.prototype.bgImage=function(){return this.getRoot().find("img.dropbackground")},DragDropOntoImageQuestion.prototype.getDragHome=function(group,choice){return this.getRoot().find(".draghome.dragplaceholder.group"+group+".choice"+choice).is(":visible")?this.getRoot().find(".draghome.dragplaceholder.group"+group+".choice"+choice):this.getRoot().find(".dragitemgroup"+group+" .draghome.infinite.choice"+choice+".group"+group)},DragDropOntoImageQuestion.prototype.getUnplacedChoice=function(group,choice){return this.getRoot().find(".ddarea .draghome.group"+group+".choice"+choice+".unplaced").slice(0,1)},DragDropOntoImageQuestion.prototype.getCurrentDragInPlace=function(place){return this.getRoot().find(".ddarea .draghome.inplace"+place)},DragDropOntoImageQuestion.prototype.noOfDropsInGroup=function(group){return this.getRoot().find(".dropzone.group"+group).length},DragDropOntoImageQuestion.prototype.noOfChoicesInGroup=function(group){return this.getRoot().find(".dragitemgroup"+group+" .draghome").length},DragDropOntoImageQuestion.prototype.getClassnameNumericSuffix=function(node,prefix){var classes=node.attr("class");if(""!==classes)for(var classesArr=classes.split(" "),index=0;index<classesArr.length;index++){if(new RegExp("^"+prefix+"([0-9])+$").test(classesArr[index])){var match=new RegExp("([0-9])+$").exec(classesArr[index]);return Number(match[0])}}return null},DragDropOntoImageQuestion.prototype.getChoice=function(drag){return this.getClassnameNumericSuffix(drag,"choice")},DragDropOntoImageQuestion.prototype.getGroup=function(node){return this.getClassnameNumericSuffix(node,"group")},DragDropOntoImageQuestion.prototype.getPlace=function(node){return this.getClassnameNumericSuffix(node,"place")},DragDropOntoImageQuestion.prototype.getDragClone=function(drag){return this.getRoot().find(".dragitemgroup"+this.getGroup(drag)+" .draghome.choice"+this.getChoice(drag)+".group"+this.getGroup(drag)+".dragplaceholder")},DragDropOntoImageQuestion.prototype.getInfiniteDragClones=function(drag,inHome){return inHome?this.getRoot().find(".dragitemgroup"+this.getGroup(drag)+" .draghome.choice"+this.getChoice(drag)+".group"+this.getGroup(drag)+".infinite").not(".dragplaceholder"):this.getRoot().find(".draghome.choice"+this.getChoice(drag)+".group"+this.getGroup(drag)+".infinite").not(".dragplaceholder")},DragDropOntoImageQuestion.prototype.getDrop=function(drag,currentPlace){return this.getRoot().find(".dropzone.group"+this.getGroup(drag)+".place"+currentPlace)},DragDropOntoImageQuestion.prototype.handleResize=function(){var thisQ=this,bgRatio=this.bgRatio();this.isPrinting&&(bgRatio=1),this.getRoot().find(".ddarea .dropzone").each((function(i,dropNode){$(dropNode).css("left",parseInt($(dropNode).data("originX"))*parseFloat(bgRatio)).css("top",parseInt($(dropNode).data("originY"))*parseFloat(bgRatio)),thisQ.handleElementScale(dropNode,"left top")})),this.getRoot().find("div.droparea .draghome").not(".beingdragged").each((function(key,drag){$(drag).css("left",parseFloat($(drag).data("originX"))*parseFloat(bgRatio)).css("top",parseFloat($(drag).data("originY"))*parseFloat(bgRatio)),thisQ.handleElementScale(drag,"left top")}))},DragDropOntoImageQuestion.prototype.bgRatio=function(){var bgImg=this.bgImage(),bgImgNaturalWidth=bgImg.get(0).naturalWidth;return bgImg.width()/bgImgNaturalWidth},DragDropOntoImageQuestion.prototype.handleElementScale=function(element,type){var bgRatio=parseFloat(this.bgRatio());this.isPrinting&&(bgRatio=1),$(element).css({"-webkit-transform":"scale("+bgRatio+")","-moz-transform":"scale("+bgRatio+")","-ms-transform":"scale("+bgRatio+")","-o-transform":"scale("+bgRatio+")",transform:"scale("+bgRatio+")","transform-origin":type})},DragDropOntoImageQuestion.prototype.calculateZIndex=function(){var zIndex=0;return this.getRoot().find(".ddarea .dropzone, div.droparea .draghome").each((function(i,dropNode){var itemZIndex=(dropNode=$(dropNode)).css("z-index")?parseInt(dropNode.css("z-index")):0;itemZIndex>zIndex&&(zIndex=itemZIndex)})),zIndex},DragDropOntoImageQuestion.prototype.isDragSameAsDrop=function(drag,drop){return this.getChoice(drag)===this.getChoice(drop)&&this.getGroup(drag)===this.getGroup(drop)};var questionManager={eventHandlersInitialised:!1,dragEventHandlersInitialised:{},isPrinting:!1,isKeyboardNavigation:!1,questions:{},init:function(containerId,readOnly,places){if(questionManager.questions[containerId]=new DragDropOntoImageQuestion(containerId,readOnly,places),questionManager.eventHandlersInitialised||(questionManager.setupEventHandlers(),questionManager.eventHandlersInitialised=!0),!questionManager.dragEventHandlersInitialised.hasOwnProperty(containerId)){questionManager.dragEventHandlersInitialised[containerId]=!0;var questionContainer=document.getElementById(containerId);questionContainer.classList.contains("ddimageortext")&&!questionContainer.classList.contains("qtype_ddimageortext-readonly")&&questionManager.addEventHandlersToDrag($(questionContainer).find(".draghome"))}},setupEventHandlers:function(){$("body").on("keydown",".que.ddimageortext:not(.qtype_ddimageortext-readonly) .dropzones .dropzone",questionManager.handleKeyPress).on("keydown",".que.ddimageortext:not(.qtype_ddimageortext-readonly) .draghome.placed:not(.beingdragged)",questionManager.handleKeyPress).on("qtype_ddimageortext-dragmoved",questionManager.handleDragMoved),$(window).on("resize",(function(){questionManager.handleWindowResize(!1)})),window.addEventListener("beforeprint",(function(){questionManager.isPrinting=!0,questionManager.handleWindowResize(questionManager.isPrinting)})),window.addEventListener("afterprint",(function(){questionManager.isPrinting=!1,questionManager.handleWindowResize(questionManager.isPrinting)})),setTimeout((function(){questionManager.fixLayoutIfThingsMoved()}),100)},addEventHandlersToDrag:function(element){element.unbind("mousedown touchstart"),element.on("mousedown touchstart",questionManager.handleDragStart)},handleDragStart:function(e){e.preventDefault();var question=questionManager.getQuestionForEvent(e);question&&question.handleDragStart(e)},handleKeyPress:function(e){if(!questionManager.isKeyboardNavigation){questionManager.isKeyboardNavigation=!0;var question=questionManager.getQuestionForEvent(e);question&&question.handleKeyPress(e)}},handleWindowResize:function(isPrinting){for(var containerId in questionManager.questions)questionManager.questions.hasOwnProperty(containerId)&&(questionManager.questions[containerId].isPrinting=isPrinting,questionManager.questions[containerId].handleResize())},fixLayoutIfThingsMoved:function(){this.handleWindowResize(questionManager.isPrinting),setTimeout((function(){questionManager.fixLayoutIfThingsMoved(questionManager.isPrinting)}),100)},handleDragMoved:function(e,drag,target,thisQ){drag.removeClass("beingdragged").css("z-index",""),drag.css("top",target.position().top).css("left",target.position().left),target.after(drag),target.removeClass("active"),void 0!==drag.data("unplaced")&&!0===drag.data("unplaced")?(drag.removeClass("placed").addClass("unplaced"),drag.removeAttr("tabindex"),drag.removeData("unplaced"),drag.css("top","").css("left","").css("transform",""),drag.hasClass("infinite")&&thisQ.getInfiniteDragClones(drag,!0).length>1&&thisQ.getInfiniteDragClones(drag,!0).first().remove()):(drag.data("originX",target.data("originX")).data("originY",target.data("originY")),thisQ.handleElementScale(drag,"left top")),void 0!==drag.data("isfocus")&&!0===drag.data("isfocus")&&(drag.focus(),drag.removeData("isfocus")),void 0!==target.data("isfocus")&&!0===target.data("isfocus")&&target.removeData("isfocus"),questionManager.isKeyboardNavigation&&(questionManager.isKeyboardNavigation=!1),thisQ.isQuestionInteracted()&&(questionManager.handleFormDirty(),thisQ.questionAnswer=thisQ.getQuestionAnsweredValues())},getQuestionForEvent:function(e){var containerId=$(e.currentTarget).closest(".que.ddimageortext").attr("id");return questionManager.questions[containerId]},handleFormDirty:function(){const responseForm=document.getElementById("responseform");FormChangeChecker.markFormAsDirty(responseForm)}};return{init:questionManager.init}}));
 
 //# sourceMappingURL=question.min.js.map
\ No newline at end of file
diff --git a/question/type/ddimageortext/amd/build/question.min.js.map b/question/type/ddimageortext/amd/build/question.min.js.map
index a0bf39e5fbb71..9b89c089dc447 100644
--- a/question/type/ddimageortext/amd/build/question.min.js.map
+++ b/question/type/ddimageortext/amd/build/question.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"question.min.js","sources":["../src/question.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/*\n * JavaScript to allow dragging options to slots (using mouse down or touch) or tab through slots using keyboard.\n *\n * @module     qtype_ddimageortext/question\n * @copyright  2018 The Open University\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\ndefine([\n    'jquery',\n    'core/dragdrop',\n    'core/key_codes',\n    'core_form/changechecker'\n], function(\n    $,\n    dragDrop,\n    keys,\n    FormChangeChecker\n) {\n\n    \"use strict\";\n\n    /**\n     * Initialise one drag-drop onto image question.\n     *\n     * @param {String} containerId id of the outer div for this question.\n     * @param {boolean} readOnly whether the question is being displayed read-only.\n     * @param {Array} places Information about the drop places.\n     * @constructor\n     */\n    function DragDropOntoImageQuestion(containerId, readOnly, places) {\n        this.containerId = containerId;\n        this.questionAnswer = {};\n        M.util.js_pending('qtype_ddimageortext-init-' + this.containerId);\n        this.places = places;\n        this.allImagesLoaded = false;\n        this.imageLoadingTimeoutId = null;\n        this.isPrinting = false;\n        if (readOnly) {\n            this.getRoot().addClass('qtype_ddimageortext-readonly');\n        }\n\n        var thisQ = this;\n        this.getNotYetLoadedImages().one('load', function() {\n            thisQ.waitForAllImagesToBeLoaded();\n        });\n        this.waitForAllImagesToBeLoaded();\n    }\n\n    /**\n     * Waits until all images are loaded before calling setupQuestion().\n     *\n     * This function is called from the onLoad of each image, and also polls with\n     * a time-out, because image on-loads are allegedly unreliable.\n     */\n    DragDropOntoImageQuestion.prototype.waitForAllImagesToBeLoaded = function() {\n        var thisQ = this;\n\n        // This method may get called multiple times (via image on-loads or timeouts.\n        // If we are already done, don't do it again.\n        if (this.allImagesLoaded) {\n            return;\n        }\n\n        // Clear any current timeout, if set.\n        if (this.imageLoadingTimeoutId !== null) {\n            clearTimeout(this.imageLoadingTimeoutId);\n        }\n\n        // If we have not yet loaded all images, set a timeout to\n        // call ourselves again, since apparently images on-load\n        // events are flakey.\n        if (this.getNotYetLoadedImages().length > 0) {\n            this.imageLoadingTimeoutId = setTimeout(function() {\n                thisQ.waitForAllImagesToBeLoaded();\n            }, 100);\n            return;\n        }\n\n        // We now have all images. Carry on, but only after giving the layout a chance to settle down.\n        this.allImagesLoaded = true;\n        thisQ.setupQuestion();\n    };\n\n    /**\n     * Get any of the images in the drag-drop area that are not yet fully loaded.\n     *\n     * @returns {jQuery} those images.\n     */\n    DragDropOntoImageQuestion.prototype.getNotYetLoadedImages = function() {\n        var thisQ = this;\n        return this.getRoot().find('.ddarea img').not(function(i, imgNode) {\n            return thisQ.imageIsLoaded(imgNode);\n        });\n    };\n\n    /**\n     * Check if an image has loaded without errors.\n     *\n     * @param {HTMLImageElement} imgElement an image.\n     * @returns {boolean} true if this image has loaded without errors.\n     */\n    DragDropOntoImageQuestion.prototype.imageIsLoaded = function(imgElement) {\n        return imgElement.complete && imgElement.naturalHeight !== 0;\n    };\n\n    /**\n     * Set up the question, once all images have been loaded.\n     */\n    DragDropOntoImageQuestion.prototype.setupQuestion = function() {\n        this.resizeAllDragsAndDrops();\n        this.cloneDrags();\n        this.positionDragsAndDrops();\n        M.util.js_complete('qtype_ddimageortext-init-' + this.containerId);\n    };\n\n    /**\n     * In each group, resize all the items to be the same size.\n     */\n    DragDropOntoImageQuestion.prototype.resizeAllDragsAndDrops = function() {\n        var thisQ = this;\n        this.getRoot().find('.draghomes > div').each(function(i, node) {\n            thisQ.resizeAllDragsAndDropsInGroup(\n                    thisQ.getClassnameNumericSuffix($(node), 'dragitemgroup'));\n        });\n    };\n\n    /**\n     * In a given group, set all the drags and drops to be the same size.\n     *\n     * @param {int} group the group number.\n     */\n    DragDropOntoImageQuestion.prototype.resizeAllDragsAndDropsInGroup = function(group) {\n        var root = this.getRoot(),\n            dragHomes = root.find('.dragitemgroup' + group + ' .draghome'),\n            maxWidth = 0,\n            maxHeight = 0;\n\n        // Find the maximum size of any drag in this groups.\n        dragHomes.each(function(i, drag) {\n            maxWidth = Math.max(maxWidth, Math.ceil(drag.offsetWidth));\n            maxHeight = Math.max(maxHeight, Math.ceil(drag.offsetHeight));\n        });\n\n        // The size we will want to set is a bit bigger than this.\n        maxWidth += 10;\n        maxHeight += 10;\n\n        // Set each drag home to that size.\n        dragHomes.each(function(i, drag) {\n            var left = Math.round((maxWidth - drag.offsetWidth) / 2),\n                top = Math.floor((maxHeight - drag.offsetHeight) / 2);\n            // Set top and left padding so the item is centred.\n            $(drag).css({\n                'padding-left': left + 'px',\n                'padding-right': (maxWidth - drag.offsetWidth - left) + 'px',\n                'padding-top': top + 'px',\n                'padding-bottom': (maxHeight - drag.offsetHeight - top) + 'px'\n            });\n        });\n\n        // Create the drops and make them the right size.\n        for (var i in this.places) {\n            if (!this.places.hasOwnProperty((i))) {\n                continue;\n            }\n            var place = this.places[i],\n                label = place.text;\n            if (parseInt(place.group) !== group) {\n                continue;\n            }\n            if (label === '') {\n                label = M.util.get_string('blank', 'qtype_ddimageortext');\n            }\n            root.find('.dropzones').append('<div class=\"dropzone active group' + place.group +\n                            ' place' + i + '\" tabindex=\"0\">' +\n                    '<span class=\"accesshide\">' + label + '</span>&nbsp;</div>');\n            root.find('.dropzone.place' + i).width(maxWidth - 2).height(maxHeight - 2);\n        }\n    };\n\n    /**\n     * Invisible 'drag homes' are output by the renderer. These have the same properties\n     * as the drag items but are invisible. We clone these invisible elements to make the\n     * actual drag items.\n     */\n    DragDropOntoImageQuestion.prototype.cloneDrags = function() {\n        var thisQ = this;\n        thisQ.getRoot().find('.draghome').each(function(index, dragHome) {\n            var drag = $(dragHome);\n            var placeHolder = drag.clone();\n            placeHolder.removeClass();\n            placeHolder.addClass('draghome choice' +\n                thisQ.getChoice(drag) + ' group' +\n                thisQ.getGroup(drag) + ' dragplaceholder');\n            drag.before(placeHolder);\n        });\n    };\n\n    /**\n     * Clone drag item for one choice.\n     *\n     * @param {jQuery} dragHome the drag home to clone.\n     */\n    DragDropOntoImageQuestion.prototype.cloneDragsForOneChoice = function(dragHome) {\n        if (dragHome.hasClass('infinite')) {\n            var noOfDrags = this.noOfDropsInGroup(this.getGroup(dragHome));\n            for (var i = 0; i < noOfDrags; i++) {\n                this.cloneDrag(dragHome);\n            }\n        } else {\n            this.cloneDrag(dragHome);\n        }\n    };\n\n    /**\n     * Clone drag item.\n     *\n     * @param {jQuery} dragHome\n     */\n    DragDropOntoImageQuestion.prototype.cloneDrag = function(dragHome) {\n        var drag = dragHome.clone();\n        drag.removeClass('draghome')\n            .addClass('drag unplaced moodle-has-zindex')\n            .offset(dragHome.offset());\n        this.getRoot().find('.dragitems').append(drag);\n    };\n\n    /**\n     * Update the position of drags.\n     */\n    DragDropOntoImageQuestion.prototype.positionDragsAndDrops = function() {\n        var thisQ = this,\n            root = this.getRoot(),\n            bgRatio = this.bgRatio();\n\n        // Move the drops into position.\n        root.find('.ddarea .dropzone').each(function(i, dropNode) {\n            var drop = $(dropNode),\n                place = thisQ.places[thisQ.getPlace(drop)];\n            // The xy values come from PHP as strings, so we need parseInt to stop JS doing string concatenation.\n            drop.css('left', parseInt(place.xy[0]) * bgRatio)\n                .css('top', parseInt(place.xy[1]) * bgRatio);\n            drop.data('originX', parseInt(place.xy[0]))\n                .data('originY', parseInt(place.xy[1]));\n            thisQ.handleElementScale(drop, 'left top');\n        });\n\n        // First move all items back home.\n        root.find('.draghome').not('.dragplaceholder').each(function(i, dragNode) {\n            var drag = $(dragNode),\n                currentPlace = thisQ.getClassnameNumericSuffix(drag, 'inplace');\n            drag.addClass('unplaced')\n                .removeClass('placed');\n            drag.removeAttr('tabindex');\n            if (currentPlace !== null) {\n                drag.removeClass('inplace' + currentPlace);\n            }\n        });\n\n        // Then place the ones that should be placed.\n        root.find('input.placeinput').each(function(i, inputNode) {\n            var input = $(inputNode),\n                choice = input.val();\n            if (choice.length === 0 || (choice.length > 0 && choice === '0')) {\n                // No item in this place.\n                return;\n            }\n\n            var place = thisQ.getPlace(input);\n            // Get the unplaced drag.\n            var unplacedDrag = thisQ.getUnplacedChoice(thisQ.getGroup(input), choice);\n            // Get the clone of the drag.\n            var hiddenDrag = thisQ.getDragClone(unplacedDrag);\n            if (hiddenDrag.length) {\n                if (unplacedDrag.hasClass('infinite')) {\n                    var noOfDrags = thisQ.noOfDropsInGroup(thisQ.getGroup(unplacedDrag));\n                    var cloneDrags = thisQ.getInfiniteDragClones(unplacedDrag, false);\n                    if (cloneDrags.length < noOfDrags) {\n                        var cloneDrag = unplacedDrag.clone();\n                        cloneDrag.removeClass('beingdragged');\n                        cloneDrag.removeAttr('tabindex');\n                        hiddenDrag.after(cloneDrag);\n                        // Sometimes, for the question that has a lot of input groups and unlimited draggable items,\n                        // this 'clone' process takes longer than usual, so the questionManager.init() method\n                        // will not add the eventHandler for this cloned drag.\n                        // We need to make sure to add the eventHandler for the cloned drag too.\n                        questionManager.addEventHandlersToDrag(cloneDrag);\n                    } else {\n                        hiddenDrag.addClass('active');\n                    }\n                } else {\n                    hiddenDrag.addClass('active');\n                }\n            }\n\n            // Send the drag to drop.\n            var drop = root.find('.dropzone.place' + place);\n            thisQ.sendDragToDrop(unplacedDrag, drop);\n        });\n\n        // Save the question answer.\n        thisQ.questionAnswer = thisQ.getQuestionAnsweredValues();\n    };\n\n    /**\n     * Get the question answered values.\n     *\n     * @return {Object} Contain key-value with key is the input id and value is the input value.\n     */\n    DragDropOntoImageQuestion.prototype.getQuestionAnsweredValues = function() {\n        let result = {};\n        this.getRoot().find('input.placeinput').each((i, inputNode) => {\n            result[inputNode.id] = inputNode.value;\n        });\n\n        return result;\n    };\n\n    /**\n     * Check if the question is being interacted or not.\n     *\n     * @return {boolean} Return true if the user has changed the question-answer.\n     */\n    DragDropOntoImageQuestion.prototype.isQuestionInteracted = function() {\n        const oldAnswer = this.questionAnswer;\n        const newAnswer = this.getQuestionAnsweredValues();\n        let isInteracted = false;\n\n        // First, check both answers have the same structure or not.\n        if (JSON.stringify(newAnswer) !== JSON.stringify(oldAnswer)) {\n            isInteracted = true;\n            return isInteracted;\n        }\n        // Check the values.\n        Object.keys(newAnswer).forEach(key => {\n            if (newAnswer[key] !== oldAnswer[key]) {\n                isInteracted = true;\n            }\n        });\n\n        return isInteracted;\n    };\n\n    /**\n     * Handles the start of dragging an item.\n     *\n     * @param {Event} e the touch start or mouse down event.\n     */\n    DragDropOntoImageQuestion.prototype.handleDragStart = function(e) {\n        var thisQ = this,\n            drag = $(e.target).closest('.draghome'),\n            currentIndex = this.calculateZIndex(),\n            newIndex = currentIndex + 2;\n\n        var info = dragDrop.prepare(e);\n        if (!info.start || drag.hasClass('beingdragged')) {\n            return;\n        }\n\n        drag.addClass('beingdragged').css('transform', '').css('z-index', newIndex);\n        var currentPlace = this.getClassnameNumericSuffix(drag, 'inplace');\n        if (currentPlace !== null) {\n            this.setInputValue(currentPlace, 0);\n            drag.removeClass('inplace' + currentPlace);\n            var hiddenDrop = thisQ.getDrop(drag, currentPlace);\n            if (hiddenDrop.length) {\n                hiddenDrop.addClass('active');\n                drag.offset(hiddenDrop.offset());\n            }\n        } else {\n            var hiddenDrag = thisQ.getDragClone(drag);\n            if (hiddenDrag.length) {\n                if (drag.hasClass('infinite')) {\n                    var noOfDrags = this.noOfDropsInGroup(thisQ.getGroup(drag));\n                    var cloneDrags = this.getInfiniteDragClones(drag, false);\n                    if (cloneDrags.length < noOfDrags) {\n                        var cloneDrag = drag.clone();\n                        cloneDrag.removeClass('beingdragged');\n                        cloneDrag.removeAttr('tabindex');\n                        hiddenDrag.after(cloneDrag);\n                        questionManager.addEventHandlersToDrag(cloneDrag);\n                        drag.offset(cloneDrag.offset());\n                    } else {\n                        hiddenDrag.addClass('active');\n                        drag.offset(hiddenDrag.offset());\n                    }\n                } else {\n                    hiddenDrag.addClass('active');\n                    drag.offset(hiddenDrag.offset());\n                }\n            }\n        }\n\n        dragDrop.start(e, drag, function(x, y, drag) {\n            thisQ.dragMove(x, y, drag);\n        }, function(x, y, drag) {\n            thisQ.dragEnd(x, y, drag);\n        });\n    };\n\n    /**\n     * Called whenever the currently dragged items moves.\n     *\n     * @param {Number} pageX the x position.\n     * @param {Number} pageY the y position.\n     * @param {jQuery} drag the item being moved.\n     */\n    DragDropOntoImageQuestion.prototype.dragMove = function(pageX, pageY, drag) {\n        var thisQ = this,\n            highlighted = false;\n        this.getRoot().find('.dropzone.group' + this.getGroup(drag)).each(function(i, dropNode) {\n            var drop = $(dropNode);\n            if (thisQ.isPointInDrop(pageX, pageY, drop) && !highlighted) {\n                highlighted = true;\n                drop.addClass('valid-drag-over-drop');\n            } else {\n                drop.removeClass('valid-drag-over-drop');\n            }\n        });\n        this.getRoot().find('.draghome.placed.group' + this.getGroup(drag)).not('.beingdragged').each(function(i, dropNode) {\n            var drop = $(dropNode);\n            if (thisQ.isPointInDrop(pageX, pageY, drop) && !highlighted && !thisQ.isDragSameAsDrop(drag, drop)) {\n                highlighted = true;\n                drop.addClass('valid-drag-over-drop');\n            } else {\n                drop.removeClass('valid-drag-over-drop');\n            }\n        });\n    };\n\n    /**\n     * Called when user drops a drag item.\n     *\n     * @param {Number} pageX the x position.\n     * @param {Number} pageY the y position.\n     * @param {jQuery} drag the item being moved.\n     */\n    DragDropOntoImageQuestion.prototype.dragEnd = function(pageX, pageY, drag) {\n        var thisQ = this,\n            root = this.getRoot(),\n            placed = false;\n\n        // Looking for drag that was dropped on a dropzone.\n        root.find('.dropzone.group' + this.getGroup(drag)).each(function(i, dropNode) {\n            var drop = $(dropNode);\n            if (!thisQ.isPointInDrop(pageX, pageY, drop)) {\n                // Not this drop.\n                return true;\n            }\n\n            // Now put this drag into the drop.\n            drop.removeClass('valid-drag-over-drop');\n            thisQ.sendDragToDrop(drag, drop);\n            placed = true;\n            return false; // Stop the each() here.\n        });\n\n        if (!placed) {\n            // Looking for drag that was dropped on a placed drag.\n            root.find('.draghome.placed.group' + this.getGroup(drag)).not('.beingdragged').each(function(i, placedNode) {\n                var placedDrag = $(placedNode);\n                if (!thisQ.isPointInDrop(pageX, pageY, placedDrag) || thisQ.isDragSameAsDrop(drag, placedDrag)) {\n                    // Not this placed drag.\n                    return true;\n                }\n\n                // Now put this drag into the drop.\n                placedDrag.removeClass('valid-drag-over-drop');\n                var currentPlace = thisQ.getClassnameNumericSuffix(placedDrag, 'inplace');\n                var drop = thisQ.getDrop(drag, currentPlace);\n                thisQ.sendDragToDrop(drag, drop);\n                placed = true;\n                return false; // Stop the each() here.\n            });\n        }\n\n        if (!placed) {\n            this.sendDragHome(drag);\n        }\n    };\n\n    /**\n     * Animate a drag item into a given place (or back home).\n     *\n     * @param {jQuery|null} drag the item to place. If null, clear the place.\n     * @param {jQuery} drop the place to put it.\n     */\n    DragDropOntoImageQuestion.prototype.sendDragToDrop = function(drag, drop) {\n        // Is there already a drag in this drop? if so, evict it.\n        var oldDrag = this.getCurrentDragInPlace(this.getPlace(drop));\n        if (oldDrag.length !== 0) {\n            oldDrag.addClass('beingdragged');\n            oldDrag.offset(oldDrag.offset());\n            var currentPlace = this.getClassnameNumericSuffix(oldDrag, 'inplace');\n            var hiddenDrop = this.getDrop(oldDrag, currentPlace);\n            hiddenDrop.addClass('active');\n            this.sendDragHome(oldDrag);\n        }\n\n        if (drag.length === 0) {\n            this.setInputValue(this.getPlace(drop), 0);\n            if (drop.data('isfocus')) {\n                drop.focus();\n            }\n        } else {\n            this.setInputValue(this.getPlace(drop), this.getChoice(drag));\n            drag.removeClass('unplaced')\n                .addClass('placed inplace' + this.getPlace(drop));\n            drag.attr('tabindex', 0);\n            this.animateTo(drag, drop);\n        }\n    };\n\n    /**\n     * Animate a drag back to its home.\n     *\n     * @param {jQuery} drag the item being moved.\n     */\n    DragDropOntoImageQuestion.prototype.sendDragHome = function(drag) {\n        var currentPlace = this.getClassnameNumericSuffix(drag, 'inplace');\n        if (currentPlace !== null) {\n            drag.removeClass('inplace' + currentPlace);\n        }\n        drag.data('unplaced', true);\n\n        this.animateTo(drag, this.getDragHome(this.getGroup(drag), this.getChoice(drag)));\n    };\n\n    /**\n     * Handles keyboard events on drops.\n     *\n     * Drops are focusable. Once focused, right/down/space switches to the next choice, and\n     * left/up switches to the previous. Escape clear.\n     *\n     * @param {KeyboardEvent} e\n     */\n    DragDropOntoImageQuestion.prototype.handleKeyPress = function(e) {\n        var drop = $(e.target).closest('.dropzone');\n        if (drop.length === 0) {\n            var placedDrag = $(e.target);\n            var currentPlace = this.getClassnameNumericSuffix(placedDrag, 'inplace');\n            if (currentPlace !== null) {\n                drop = this.getDrop(placedDrag, currentPlace);\n            }\n        }\n        var currentDrag = this.getCurrentDragInPlace(this.getPlace(drop)),\n            nextDrag = $();\n\n        switch (e.keyCode) {\n            case keys.space:\n            case keys.arrowRight:\n            case keys.arrowDown:\n                nextDrag = this.getNextDrag(this.getGroup(drop), currentDrag);\n                break;\n\n            case keys.arrowLeft:\n            case keys.arrowUp:\n                nextDrag = this.getPreviousDrag(this.getGroup(drop), currentDrag);\n                break;\n\n            case keys.escape:\n                questionManager.isKeyboardNavigation = false;\n                break;\n\n            default:\n                questionManager.isKeyboardNavigation = false;\n                return; // To avoid the preventDefault below.\n        }\n\n        if (nextDrag.length) {\n            nextDrag.data('isfocus', true);\n            nextDrag.addClass('beingdragged');\n            var hiddenDrag = this.getDragClone(nextDrag);\n            if (hiddenDrag.length) {\n                if (nextDrag.hasClass('infinite')) {\n                    var noOfDrags = this.noOfDropsInGroup(this.getGroup(nextDrag));\n                    var cloneDrags = this.getInfiniteDragClones(nextDrag, false);\n                    if (cloneDrags.length < noOfDrags) {\n                        var cloneDrag = nextDrag.clone();\n                        cloneDrag.removeClass('beingdragged');\n                        cloneDrag.removeAttr('tabindex');\n                        hiddenDrag.after(cloneDrag);\n                        questionManager.addEventHandlersToDrag(cloneDrag);\n                        nextDrag.offset(cloneDrag.offset());\n                    } else {\n                        hiddenDrag.addClass('active');\n                        nextDrag.offset(hiddenDrag.offset());\n                    }\n                } else {\n                    hiddenDrag.addClass('active');\n                    nextDrag.offset(hiddenDrag.offset());\n                }\n            }\n        } else {\n            drop.data('isfocus', true);\n        }\n\n        e.preventDefault();\n        this.sendDragToDrop(nextDrag, drop);\n    };\n\n    /**\n     * Choose the next drag in a group.\n     *\n     * @param {int} group which group.\n     * @param {jQuery} drag current choice (empty jQuery if there isn't one).\n     * @return {jQuery} the next drag in that group, or null if there wasn't one.\n     */\n    DragDropOntoImageQuestion.prototype.getNextDrag = function(group, drag) {\n        var choice,\n            numChoices = this.noOfChoicesInGroup(group);\n\n        if (drag.length === 0) {\n            choice = 1; // Was empty, so we want to select the first choice.\n        } else {\n            choice = this.getChoice(drag) + 1;\n        }\n\n        var next = this.getUnplacedChoice(group, choice);\n        while (next.length === 0 && choice < numChoices) {\n            choice++;\n            next = this.getUnplacedChoice(group, choice);\n        }\n\n        return next;\n    };\n\n    /**\n     * Choose the previous drag in a group.\n     *\n     * @param {int} group which group.\n     * @param {jQuery} drag current choice (empty jQuery if there isn't one).\n     * @return {jQuery} the next drag in that group, or null if there wasn't one.\n     */\n    DragDropOntoImageQuestion.prototype.getPreviousDrag = function(group, drag) {\n        var choice;\n\n        if (drag.length === 0) {\n            choice = this.noOfChoicesInGroup(group);\n        } else {\n            choice = this.getChoice(drag) - 1;\n        }\n\n        var previous = this.getUnplacedChoice(group, choice);\n        while (previous.length === 0 && choice > 1) {\n            choice--;\n            previous = this.getUnplacedChoice(group, choice);\n        }\n\n        // Does this choice exist?\n        return previous;\n    };\n\n    /**\n     * Animate an object to the given destination.\n     *\n     * @param {jQuery} drag the element to be animated.\n     * @param {jQuery} target element marking the place to move it to.\n     */\n    DragDropOntoImageQuestion.prototype.animateTo = function(drag, target) {\n        var currentPos = drag.offset(),\n            targetPos = target.offset(),\n            thisQ = this;\n\n        M.util.js_pending('qtype_ddimageortext-animate-' + thisQ.containerId);\n        // Animate works in terms of CSS position, whereas locating an object\n        // on the page works best with jQuery offset() function. So, to get\n        // the right target position, we work out the required change in\n        // offset() and then add that to the current CSS position.\n        drag.animate(\n            {\n                left: parseInt(drag.css('left')) + targetPos.left - currentPos.left,\n                top: parseInt(drag.css('top')) + targetPos.top - currentPos.top\n            },\n            {\n                duration: 'fast',\n                done: function() {\n                    $('body').trigger('qtype_ddimageortext-dragmoved', [drag, target, thisQ]);\n                    M.util.js_complete('qtype_ddimageortext-animate-' + thisQ.containerId);\n                }\n            }\n        );\n    };\n\n    /**\n     * Detect if a point is inside a given DOM node.\n     *\n     * @param {Number} pageX the x position.\n     * @param {Number} pageY the y position.\n     * @param {jQuery} drop the node to check (typically a drop).\n     * @return {boolean} whether the point is inside the node.\n     */\n    DragDropOntoImageQuestion.prototype.isPointInDrop = function(pageX, pageY, drop) {\n        var position = drop.offset();\n        if (drop.hasClass('draghome')) {\n            return pageX >= position.left && pageX < position.left + drop.outerWidth()\n                && pageY >= position.top && pageY < position.top + drop.outerHeight();\n        }\n        return pageX >= position.left && pageX < position.left + drop.width()\n            && pageY >= position.top && pageY < position.top + drop.height();\n    };\n\n    /**\n     * Set the value of the hidden input for a place, to record what is currently there.\n     *\n     * @param {int} place which place to set the input value for.\n     * @param {int} choice the value to set.\n     */\n    DragDropOntoImageQuestion.prototype.setInputValue = function(place, choice) {\n        this.getRoot().find('input.placeinput.place' + place).val(choice);\n    };\n\n    /**\n     * Get the outer div for this question.\n     *\n     * @returns {jQuery} containing that div.\n     */\n    DragDropOntoImageQuestion.prototype.getRoot = function() {\n        return $(document.getElementById(this.containerId));\n    };\n\n    /**\n     * Get the img that is the background image.\n     * @returns {jQuery} containing that img.\n     */\n    DragDropOntoImageQuestion.prototype.bgImage = function() {\n        return this.getRoot().find('img.dropbackground');\n    };\n\n    /**\n     * Get drag home for a given choice.\n     *\n     * @param {int} group the group.\n     * @param {int} choice the choice number.\n     * @returns {jQuery} containing that div.\n     */\n    DragDropOntoImageQuestion.prototype.getDragHome = function(group, choice) {\n        if (!this.getRoot().find('.draghome.dragplaceholder.group' + group + '.choice' + choice).is(':visible')) {\n            return this.getRoot().find('.dragitemgroup' + group +\n                ' .draghome.infinite' +\n                '.choice' + choice +\n                '.group' + group);\n        }\n        return this.getRoot().find('.draghome.dragplaceholder.group' + group + '.choice' + choice);\n    };\n\n    /**\n     * Get an unplaced choice for a particular group.\n     *\n     * @param {int} group the group.\n     * @param {int} choice the choice number.\n     * @returns {jQuery} jQuery wrapping the unplaced choice. If there isn't one, the jQuery will be empty.\n     */\n    DragDropOntoImageQuestion.prototype.getUnplacedChoice = function(group, choice) {\n        return this.getRoot().find('.ddarea .draghome.group' + group + '.choice' + choice + '.unplaced').slice(0, 1);\n    };\n\n    /**\n     * Get the drag that is currently in a given place.\n     *\n     * @param {int} place the place number.\n     * @return {jQuery} the current drag (or an empty jQuery if none).\n     */\n    DragDropOntoImageQuestion.prototype.getCurrentDragInPlace = function(place) {\n        return this.getRoot().find('.ddarea .draghome.inplace' + place);\n    };\n\n    /**\n     * Return the number of blanks in a given group.\n     *\n     * @param {int} group the group number.\n     * @returns {int} the number of drops.\n     */\n    DragDropOntoImageQuestion.prototype.noOfDropsInGroup = function(group) {\n        return this.getRoot().find('.dropzone.group' + group).length;\n    };\n\n    /**\n     * Return the number of choices in a given group.\n     *\n     * @param {int} group the group number.\n     * @returns {int} the number of choices.\n     */\n    DragDropOntoImageQuestion.prototype.noOfChoicesInGroup = function(group) {\n        return this.getRoot().find('.dragitemgroup' + group + ' .draghome').length;\n    };\n\n    /**\n     * Return the number at the end of the CSS class name with the given prefix.\n     *\n     * @param {jQuery} node\n     * @param {String} prefix name prefix\n     * @returns {Number|null} the suffix if found, else null.\n     */\n    DragDropOntoImageQuestion.prototype.getClassnameNumericSuffix = function(node, prefix) {\n        var classes = node.attr('class');\n        if (classes !== '') {\n            var classesArr = classes.split(' ');\n            for (var index = 0; index < classesArr.length; index++) {\n                var patt1 = new RegExp('^' + prefix + '([0-9])+$');\n                if (patt1.test(classesArr[index])) {\n                    var patt2 = new RegExp('([0-9])+$');\n                    var match = patt2.exec(classesArr[index]);\n                    return Number(match[0]);\n                }\n            }\n        }\n        return null;\n    };\n\n    /**\n     * Get the choice number of a drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @returns {Number} the choice number.\n     */\n    DragDropOntoImageQuestion.prototype.getChoice = function(drag) {\n        return this.getClassnameNumericSuffix(drag, 'choice');\n    };\n\n    /**\n     * Given a DOM node that is significant to this question\n     * (drag, drop, ...) get the group it belongs to.\n     *\n     * @param {jQuery} node a DOM node.\n     * @returns {Number} the group it belongs to.\n     */\n    DragDropOntoImageQuestion.prototype.getGroup = function(node) {\n        return this.getClassnameNumericSuffix(node, 'group');\n    };\n\n    /**\n     * Get the place number of a drop, or its corresponding hidden input.\n     *\n     * @param {jQuery} node the DOM node.\n     * @returns {Number} the place number.\n     */\n    DragDropOntoImageQuestion.prototype.getPlace = function(node) {\n        return this.getClassnameNumericSuffix(node, 'place');\n    };\n\n    /**\n     * Get drag clone for a given drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @returns {jQuery} the drag's clone.\n     */\n    DragDropOntoImageQuestion.prototype.getDragClone = function(drag) {\n        return this.getRoot().find('.dragitemgroup' +\n            this.getGroup(drag) +\n            ' .draghome' +\n            '.choice' + this.getChoice(drag) +\n            '.group' + this.getGroup(drag) +\n            '.dragplaceholder');\n    };\n\n    /**\n     * Get infinite drag clones for given drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @param {Boolean} inHome in the home area or not.\n     * @returns {jQuery} the drag's clones.\n     */\n    DragDropOntoImageQuestion.prototype.getInfiniteDragClones = function(drag, inHome) {\n        if (inHome) {\n            return this.getRoot().find('.dragitemgroup' +\n                this.getGroup(drag) +\n                ' .draghome' +\n                '.choice' + this.getChoice(drag) +\n                '.group' + this.getGroup(drag) +\n                '.infinite').not('.dragplaceholder');\n        }\n        return this.getRoot().find('.draghome' +\n            '.choice' + this.getChoice(drag) +\n            '.group' + this.getGroup(drag) +\n            '.infinite').not('.dragplaceholder');\n    };\n\n    /**\n     * Get drop for a given drag and place.\n     *\n     * @param {jQuery} drag the drag.\n     * @param {Integer} currentPlace the current place of drag.\n     * @returns {jQuery} the drop's clone.\n     */\n    DragDropOntoImageQuestion.prototype.getDrop = function(drag, currentPlace) {\n        return this.getRoot().find('.dropzone.group' + this.getGroup(drag) + '.place' + currentPlace);\n    };\n\n    /**\n     * Handle when the window is resized.\n     */\n    DragDropOntoImageQuestion.prototype.handleResize = function() {\n        var thisQ = this,\n            bgRatio = this.bgRatio();\n        if (this.isPrinting) {\n            bgRatio = 1;\n        }\n\n        this.getRoot().find('.ddarea .dropzone').each(function(i, dropNode) {\n            $(dropNode)\n                .css('left', parseInt($(dropNode).data('originX')) * parseFloat(bgRatio))\n                .css('top', parseInt($(dropNode).data('originY')) * parseFloat(bgRatio));\n            thisQ.handleElementScale(dropNode, 'left top');\n        });\n\n        this.getRoot().find('div.droparea .draghome').not('.beingdragged').each(function(key, drag) {\n            $(drag)\n                .css('left', parseFloat($(drag).data('originX')) * parseFloat(bgRatio))\n                .css('top', parseFloat($(drag).data('originY')) * parseFloat(bgRatio));\n            thisQ.handleElementScale(drag, 'left top');\n        });\n    };\n\n    /**\n     * Return the background ratio.\n     *\n     * @returns {number} Background ratio.\n     */\n    DragDropOntoImageQuestion.prototype.bgRatio = function() {\n        var bgImg = this.bgImage();\n        var bgImgNaturalWidth = bgImg.get(0).naturalWidth;\n        var bgImgClientWidth = bgImg.width();\n\n        return bgImgClientWidth / bgImgNaturalWidth;\n    };\n\n    /**\n     * Scale the drag if needed.\n     *\n     * @param {jQuery} element the item to place.\n     * @param {String} type scaling type\n     */\n    DragDropOntoImageQuestion.prototype.handleElementScale = function(element, type) {\n        var bgRatio = parseFloat(this.bgRatio());\n        if (this.isPrinting) {\n            bgRatio = 1;\n        }\n        $(element).css({\n            '-webkit-transform': 'scale(' + bgRatio + ')',\n            '-moz-transform': 'scale(' + bgRatio + ')',\n            '-ms-transform': 'scale(' + bgRatio + ')',\n            '-o-transform': 'scale(' + bgRatio + ')',\n            'transform': 'scale(' + bgRatio + ')',\n            'transform-origin': type\n        });\n    };\n\n    /**\n     * Calculate z-index value.\n     *\n     * @returns {number} z-index value\n     */\n    DragDropOntoImageQuestion.prototype.calculateZIndex = function() {\n        var zIndex = 0;\n        this.getRoot().find('.ddarea .dropzone, div.droparea .draghome').each(function(i, dropNode) {\n            dropNode = $(dropNode);\n            // Note that webkit browsers won't return the z-index value from the CSS stylesheet\n            // if the element doesn't have a position specified. Instead it'll return \"auto\".\n            var itemZIndex = dropNode.css('z-index') ? parseInt(dropNode.css('z-index')) : 0;\n\n            if (itemZIndex > zIndex) {\n                zIndex = itemZIndex;\n            }\n        });\n\n        return zIndex;\n    };\n\n    /**\n     * Check that the drag is drop to it's clone.\n     *\n     * @param {jQuery} drag The drag.\n     * @param {jQuery} drop The drop.\n     * @returns {boolean}\n     */\n    DragDropOntoImageQuestion.prototype.isDragSameAsDrop = function(drag, drop) {\n        return this.getChoice(drag) === this.getChoice(drop) && this.getGroup(drag) === this.getGroup(drop);\n    };\n\n    /**\n     * Singleton object that handles all the DragDropOntoImageQuestions\n     * on the page, and deals with event dispatching.\n     * @type {Object}\n     */\n    var questionManager = {\n\n        /**\n         * {boolean} ensures that the event handlers are only initialised once per page.\n         */\n        eventHandlersInitialised: false,\n\n        /**\n         * {Object} ensures that the drag event handlers are only initialised once per question,\n         * indexed by containerId (id on the .que div).\n         */\n        dragEventHandlersInitialised: {},\n\n        /**\n         * {boolean} is printing or not.\n         */\n        isPrinting: false,\n\n        /**\n         * {boolean} is keyboard navigation or not.\n         */\n        isKeyboardNavigation: false,\n\n        /**\n         * {Object} all the questions on this page, indexed by containerId (id on the .que div).\n         */\n        questions: {}, // An object containing all the information about each question on the page.\n\n        /**\n         * Initialise one question.\n         *\n         * @method\n         * @param {String} containerId the id of the div.que that contains this question.\n         * @param {boolean} readOnly whether the question is read-only.\n         * @param {Array} places data.\n         */\n        init: function(containerId, readOnly, places) {\n            questionManager.questions[containerId] =\n                new DragDropOntoImageQuestion(containerId, readOnly, places);\n            if (!questionManager.eventHandlersInitialised) {\n                questionManager.setupEventHandlers();\n                questionManager.eventHandlersInitialised = true;\n            }\n            if (!questionManager.dragEventHandlersInitialised.hasOwnProperty(containerId)) {\n                questionManager.dragEventHandlersInitialised[containerId] = true;\n                // We do not use the body event here to prevent the other event on Mobile device, such as scroll event.\n                var questionContainer = document.getElementById(containerId);\n                if (questionContainer.classList.contains('ddimageortext') &&\n                    !questionContainer.classList.contains('qtype_ddimageortext-readonly')) {\n                    // TODO: Convert all the jQuery selectors and events to native Javascript.\n                    questionManager.addEventHandlersToDrag($(questionContainer).find('.draghome'));\n                }\n            }\n        },\n\n        /**\n         * Set up the event handlers that make this question type work. (Done once per page.)\n         */\n        setupEventHandlers: function() {\n            $('body')\n                .on('keydown',\n                    '.que.ddimageortext:not(.qtype_ddimageortext-readonly) .dropzones .dropzone',\n                    questionManager.handleKeyPress)\n                .on('keydown',\n                    '.que.ddimageortext:not(.qtype_ddimageortext-readonly) .draghome.placed:not(.beingdragged)',\n                    questionManager.handleKeyPress)\n                .on('qtype_ddimageortext-dragmoved', questionManager.handleDragMoved);\n            $(window).on('resize', function() {\n                questionManager.handleWindowResize(false);\n            });\n            window.addEventListener('beforeprint', function() {\n                questionManager.isPrinting = true;\n                questionManager.handleWindowResize(questionManager.isPrinting);\n            });\n            window.addEventListener('afterprint', function() {\n                questionManager.isPrinting = false;\n                questionManager.handleWindowResize(questionManager.isPrinting);\n            });\n            setTimeout(function() {\n                questionManager.fixLayoutIfThingsMoved();\n            }, 100);\n        },\n\n        /**\n         * Binding the drag/touch event again for newly created element.\n         *\n         * @param {jQuery} element Element to bind the event\n         */\n        addEventHandlersToDrag: function(element) {\n            // Unbind all the mousedown and touchstart events to prevent double binding.\n            element.unbind('mousedown touchstart');\n            element.on('mousedown touchstart', questionManager.handleDragStart);\n        },\n\n        /**\n         * Handle mouse down / touch start events on drags.\n         * @param {Event} e the DOM event.\n         */\n        handleDragStart: function(e) {\n            e.preventDefault();\n            var question = questionManager.getQuestionForEvent(e);\n            if (question) {\n                question.handleDragStart(e);\n            }\n        },\n\n        /**\n         * Handle key down / press events on drags.\n         * @param {KeyboardEvent} e\n         */\n        handleKeyPress: function(e) {\n            if (questionManager.isKeyboardNavigation) {\n                return;\n            }\n            questionManager.isKeyboardNavigation = true;\n            var question = questionManager.getQuestionForEvent(e);\n            if (question) {\n                question.handleKeyPress(e);\n            }\n        },\n\n        /**\n         * Handle when the window is resized.\n         * @param {boolean} isPrinting\n         */\n        handleWindowResize: function(isPrinting) {\n            for (var containerId in questionManager.questions) {\n                if (questionManager.questions.hasOwnProperty(containerId)) {\n                    questionManager.questions[containerId].isPrinting = isPrinting;\n                    questionManager.questions[containerId].handleResize();\n                }\n            }\n        },\n\n        /**\n         * Sometimes, despite our best efforts, things change in a way that cannot\n         * be specifically caught (e.g. dock expanding or collapsing in Boost).\n         * Therefore, we need to periodically check everything is in the right position.\n         */\n        fixLayoutIfThingsMoved: function() {\n            this.handleWindowResize(questionManager.isPrinting);\n            // We use setTimeout after finishing work, rather than setInterval,\n            // in case positioning things is slow. We want 100 ms gap\n            // between executions, not what setInterval does.\n            setTimeout(function() {\n                questionManager.fixLayoutIfThingsMoved(questionManager.isPrinting);\n            }, 100);\n        },\n\n        /**\n         * Handle when drag moved.\n         *\n         * @param {Event} e the event.\n         * @param {jQuery} drag the drag\n         * @param {jQuery} target the target\n         * @param {DragDropOntoImageQuestion} thisQ the question.\n         */\n        handleDragMoved: function(e, drag, target, thisQ) {\n            drag.removeClass('beingdragged').css('z-index', '');\n            drag.css('top', target.position().top).css('left', target.position().left);\n            target.after(drag);\n            target.removeClass('active');\n            if (typeof drag.data('unplaced') !== 'undefined' && drag.data('unplaced') === true) {\n                drag.removeClass('placed').addClass('unplaced');\n                drag.removeAttr('tabindex');\n                drag.removeData('unplaced');\n                drag.css('top', '')\n                    .css('left', '')\n                    .css('transform', '');\n                if (drag.hasClass('infinite') && thisQ.getInfiniteDragClones(drag, true).length > 1) {\n                    thisQ.getInfiniteDragClones(drag, true).first().remove();\n                }\n            } else {\n                drag.data('originX', target.data('originX')).data('originY', target.data('originY'));\n                thisQ.handleElementScale(drag, 'left top');\n            }\n            if (typeof drag.data('isfocus') !== 'undefined' && drag.data('isfocus') === true) {\n                drag.focus();\n                drag.removeData('isfocus');\n            }\n            if (typeof target.data('isfocus') !== 'undefined' && target.data('isfocus') === true) {\n                target.removeData('isfocus');\n            }\n            if (questionManager.isKeyboardNavigation) {\n                questionManager.isKeyboardNavigation = false;\n            }\n            if (thisQ.isQuestionInteracted()) {\n                // The user has interacted with the draggable items. We need to mark the form as dirty.\n                questionManager.handleFormDirty();\n                // Save the new answered value.\n                thisQ.questionAnswer = thisQ.getQuestionAnsweredValues();\n            }\n        },\n\n        /**\n         * Given an event, work out which question it effects.\n         * @param {Event} e the event.\n         * @returns {DragDropOntoImageQuestion|undefined} The question, or undefined.\n         */\n        getQuestionForEvent: function(e) {\n            var containerId = $(e.currentTarget).closest('.que.ddimageortext').attr('id');\n            return questionManager.questions[containerId];\n        },\n\n        /**\n         * Handle when the form is dirty.\n         */\n        handleFormDirty: function() {\n            const responseForm = document.getElementById('responseform');\n            FormChangeChecker.markFormAsDirty(responseForm);\n        }\n    };\n\n    /**\n     * @alias module:qtype_ddimageortext/question\n     */\n    return {\n        init: questionManager.init\n    };\n});\n"],"names":["define","$","dragDrop","keys","FormChangeChecker","DragDropOntoImageQuestion","containerId","readOnly","places","questionAnswer","M","util","js_pending","this","allImagesLoaded","imageLoadingTimeoutId","isPrinting","getRoot","addClass","thisQ","getNotYetLoadedImages","one","waitForAllImagesToBeLoaded","prototype","clearTimeout","length","setTimeout","setupQuestion","find","not","i","imgNode","imageIsLoaded","imgElement","complete","naturalHeight","resizeAllDragsAndDrops","cloneDrags","positionDragsAndDrops","js_complete","each","node","resizeAllDragsAndDropsInGroup","getClassnameNumericSuffix","group","root","dragHomes","maxWidth","maxHeight","drag","Math","max","ceil","offsetWidth","offsetHeight","left","round","top","floor","css","hasOwnProperty","place","label","text","parseInt","get_string","append","width","height","index","dragHome","placeHolder","clone","removeClass","getChoice","getGroup","before","cloneDragsForOneChoice","hasClass","noOfDrags","noOfDropsInGroup","cloneDrag","offset","bgRatio","dropNode","drop","getPlace","xy","data","handleElementScale","dragNode","currentPlace","removeAttr","inputNode","input","choice","val","unplacedDrag","getUnplacedChoice","hiddenDrag","getDragClone","getInfiniteDragClones","after","questionManager","addEventHandlersToDrag","sendDragToDrop","getQuestionAnsweredValues","result","id","value","isQuestionInteracted","oldAnswer","newAnswer","isInteracted","JSON","stringify","Object","forEach","key","handleDragStart","e","target","closest","newIndex","calculateZIndex","prepare","start","setInputValue","hiddenDrop","getDrop","x","y","dragMove","dragEnd","pageX","pageY","highlighted","isPointInDrop","isDragSameAsDrop","placed","placedNode","placedDrag","sendDragHome","oldDrag","getCurrentDragInPlace","focus","attr","animateTo","getDragHome","handleKeyPress","currentDrag","nextDrag","keyCode","space","arrowRight","arrowDown","getNextDrag","arrowLeft","arrowUp","getPreviousDrag","escape","isKeyboardNavigation","preventDefault","numChoices","noOfChoicesInGroup","next","previous","currentPos","targetPos","animate","duration","done","trigger","position","outerWidth","outerHeight","document","getElementById","bgImage","is","slice","prefix","classes","classesArr","split","RegExp","test","match","exec","Number","inHome","handleResize","parseFloat","bgImg","bgImgNaturalWidth","get","naturalWidth","element","type","zIndex","itemZIndex","eventHandlersInitialised","dragEventHandlersInitialised","questions","init","setupEventHandlers","questionContainer","classList","contains","on","handleDragMoved","window","handleWindowResize","addEventListener","fixLayoutIfThingsMoved","unbind","question","getQuestionForEvent","removeData","first","remove","handleFormDirty","currentTarget","responseForm","markFormAsDirty"],"mappings":";;;;;;;AAsBAA,sCAAO,CACH,SACA,gBACA,iBACA,4BACD,SACCC,EACAC,SACAC,KACAC,4BAaSC,0BAA0BC,YAAaC,SAAUC,aACjDF,YAAcA,iBACdG,eAAiB,GACtBC,EAAEC,KAAKC,WAAW,4BAA8BC,KAAKP,kBAChDE,OAASA,YACTM,iBAAkB,OAClBC,sBAAwB,UACxBC,YAAa,EACdT,eACKU,UAAUC,SAAS,oCAGxBC,MAAQN,UACPO,wBAAwBC,IAAI,QAAQ,WACrCF,MAAMG,qCAELA,6BASTjB,0BAA0BkB,UAAUD,2BAA6B,eACzDH,MAAQN,KAIRA,KAAKC,kBAK0B,OAA/BD,KAAKE,uBACLS,aAAaX,KAAKE,uBAMlBF,KAAKO,wBAAwBK,OAAS,OACjCV,sBAAwBW,YAAW,WACpCP,MAAMG,+BACP,WAKFR,iBAAkB,EACvBK,MAAMQ,mBAQVtB,0BAA0BkB,UAAUH,sBAAwB,eACpDD,MAAQN,YACLA,KAAKI,UAAUW,KAAK,eAAeC,KAAI,SAASC,EAAGC,gBAC/CZ,MAAMa,cAAcD,aAUnC1B,0BAA0BkB,UAAUS,cAAgB,SAASC,mBAClDA,WAAWC,UAAyC,IAA7BD,WAAWE,eAM7C9B,0BAA0BkB,UAAUI,cAAgB,gBAC3CS,8BACAC,kBACAC,wBACL5B,EAAEC,KAAK4B,YAAY,4BAA8B1B,KAAKP,cAM1DD,0BAA0BkB,UAAUa,uBAAyB,eACrDjB,MAAQN,UACPI,UAAUW,KAAK,oBAAoBY,MAAK,SAASV,EAAGW,MACrDtB,MAAMuB,8BACEvB,MAAMwB,0BAA0B1C,EAAEwC,MAAO,sBASzDpC,0BAA0BkB,UAAUmB,8BAAgC,SAASE,WACrEC,KAAOhC,KAAKI,UACZ6B,UAAYD,KAAKjB,KAAK,iBAAmBgB,MAAQ,cACjDG,SAAW,EACXC,UAAY,MA0BX,IAAIlB,KAvBTgB,UAAUN,MAAK,SAASV,EAAGmB,MACvBF,SAAWG,KAAKC,IAAIJ,SAAUG,KAAKE,KAAKH,KAAKI,cAC7CL,UAAYE,KAAKC,IAAIH,UAAWE,KAAKE,KAAKH,KAAKK,kBAInDP,UAAY,GACZC,WAAa,GAGbF,UAAUN,MAAK,SAASV,EAAGmB,UACnBM,KAAOL,KAAKM,OAAOT,SAAWE,KAAKI,aAAe,GAClDI,IAAMP,KAAKQ,OAAOV,UAAYC,KAAKK,cAAgB,GAEvDrD,EAAEgD,MAAMU,IAAI,gBACQJ,KAAO,qBACLR,SAAWE,KAAKI,YAAcE,KAAQ,mBACzCE,IAAM,sBACFT,UAAYC,KAAKK,aAAeG,IAAO,UAKpD5C,KAAKL,UACVK,KAAKL,OAAOoD,eAAgB9B,QAG7B+B,MAAQhD,KAAKL,OAAOsB,GACpBgC,MAAQD,MAAME,KACdC,SAASH,MAAMjB,SAAWA,QAGhB,KAAVkB,QACAA,MAAQpD,EAAEC,KAAKsD,WAAW,QAAS,wBAEvCpB,KAAKjB,KAAK,cAAcsC,OAAO,oCAAsCL,MAAMjB,MAC3D,SAAWd,EADI,2CAEOgC,MAAQ,uBAC9CjB,KAAKjB,KAAK,kBAAoBE,GAAGqC,MAAMpB,SAAW,GAAGqB,OAAOpB,UAAY,MAShF3C,0BAA0BkB,UAAUc,WAAa,eACzClB,MAAQN,KACZM,MAAMF,UAAUW,KAAK,aAAaY,MAAK,SAAS6B,MAAOC,cAC/CrB,KAAOhD,EAAEqE,UACTC,YAActB,KAAKuB,QACvBD,YAAYE,cACZF,YAAYrD,SAAS,kBACjBC,MAAMuD,UAAUzB,MAAQ,SACxB9B,MAAMwD,SAAS1B,MAAQ,oBAC3BA,KAAK2B,OAAOL,iBASpBlE,0BAA0BkB,UAAUsD,uBAAyB,SAASP,aAC9DA,SAASQ,SAAS,oBACdC,UAAYlE,KAAKmE,iBAAiBnE,KAAK8D,SAASL,WAC3CxC,EAAI,EAAGA,EAAIiD,UAAWjD,SACtBmD,UAAUX,oBAGdW,UAAUX,WASvBjE,0BAA0BkB,UAAU0D,UAAY,SAASX,cACjDrB,KAAOqB,SAASE,QACpBvB,KAAKwB,YAAY,YACZvD,SAAS,mCACTgE,OAAOZ,SAASY,eAChBjE,UAAUW,KAAK,cAAcsC,OAAOjB,OAM7C5C,0BAA0BkB,UAAUe,sBAAwB,eACpDnB,MAAQN,KACRgC,KAAOhC,KAAKI,UACZkE,QAAUtE,KAAKsE,UAGnBtC,KAAKjB,KAAK,qBAAqBY,MAAK,SAASV,EAAGsD,cACxCC,KAAOpF,EAAEmF,UACTvB,MAAQ1C,MAAMX,OAAOW,MAAMmE,SAASD,OAExCA,KAAK1B,IAAI,OAAQK,SAASH,MAAM0B,GAAG,IAAMJ,SACpCxB,IAAI,MAAOK,SAASH,MAAM0B,GAAG,IAAMJ,SACxCE,KAAKG,KAAK,UAAWxB,SAASH,MAAM0B,GAAG,KAClCC,KAAK,UAAWxB,SAASH,MAAM0B,GAAG,KACvCpE,MAAMsE,mBAAmBJ,KAAM,eAInCxC,KAAKjB,KAAK,aAAaC,IAAI,oBAAoBW,MAAK,SAASV,EAAG4D,cACxDzC,KAAOhD,EAAEyF,UACTC,aAAexE,MAAMwB,0BAA0BM,KAAM,WACzDA,KAAK/B,SAAS,YACTuD,YAAY,UACjBxB,KAAK2C,WAAW,YACK,OAAjBD,cACA1C,KAAKwB,YAAY,UAAYkB,iBAKrC9C,KAAKjB,KAAK,oBAAoBY,MAAK,SAASV,EAAG+D,eACvCC,MAAQ7F,EAAE4F,WACVE,OAASD,MAAME,WACG,IAAlBD,OAAOtE,QAAiBsE,OAAOtE,OAAS,GAAgB,MAAXsE,aAK7ClC,MAAQ1C,MAAMmE,SAASQ,OAEvBG,aAAe9E,MAAM+E,kBAAkB/E,MAAMwD,SAASmB,OAAQC,QAE9DI,WAAahF,MAAMiF,aAAaH,iBAChCE,WAAW1E,UACPwE,aAAanB,SAAS,YAAa,KAC/BC,UAAY5D,MAAM6D,iBAAiB7D,MAAMwD,SAASsB,kBACrC9E,MAAMkF,sBAAsBJ,cAAc,GAC5CxE,OAASsD,UAAW,KAC3BE,UAAYgB,aAAazB,QAC7BS,UAAUR,YAAY,gBACtBQ,UAAUW,WAAW,YACrBO,WAAWG,MAAMrB,WAKjBsB,gBAAgBC,uBAAuBvB,gBAEvCkB,WAAWjF,SAAS,eAGxBiF,WAAWjF,SAAS,cAKxBmE,KAAOxC,KAAKjB,KAAK,kBAAoBiC,OACzC1C,MAAMsF,eAAeR,aAAcZ,UAIvClE,MAAMV,eAAiBU,MAAMuF,6BAQjCrG,0BAA0BkB,UAAUmF,0BAA4B,eACxDC,OAAS,eACR1F,UAAUW,KAAK,oBAAoBY,MAAK,CAACV,EAAG+D,aAC7Cc,OAAOd,UAAUe,IAAMf,UAAUgB,SAG9BF,QAQXtG,0BAA0BkB,UAAUuF,qBAAuB,iBACjDC,UAAYlG,KAAKJ,eACjBuG,UAAYnG,KAAK6F,gCACnBO,cAAe,SAGfC,KAAKC,UAAUH,aAAeE,KAAKC,UAAUJ,YAC7CE,cAAe,EACRA,eAGXG,OAAOjH,KAAK6G,WAAWK,SAAQC,MACvBN,UAAUM,OAASP,UAAUO,OAC7BL,cAAe,MAIhBA,eAQX5G,0BAA0BkB,UAAUgG,gBAAkB,SAASC,OACvDrG,MAAQN,KACRoC,KAAOhD,EAAEuH,EAAEC,QAAQC,QAAQ,aAE3BC,SADe9G,KAAK+G,kBACM,KAEnB1H,SAAS2H,QAAQL,GAClBM,QAAS7E,KAAK6B,SAAS,iBAIjC7B,KAAK/B,SAAS,gBAAgByC,IAAI,YAAa,IAAIA,IAAI,UAAWgE,cAC9DhC,aAAe9E,KAAK8B,0BAA0BM,KAAM,cACnC,OAAjB0C,aAAuB,MAClBoC,cAAcpC,aAAc,GACjC1C,KAAKwB,YAAY,UAAYkB,kBACzBqC,WAAa7G,MAAM8G,QAAQhF,KAAM0C,cACjCqC,WAAWvG,SACXuG,WAAW9G,SAAS,UACpB+B,KAAKiC,OAAO8C,WAAW9C,eAExB,KACCiB,WAAahF,MAAMiF,aAAanD,SAChCkD,WAAW1E,UACPwB,KAAK6B,SAAS,YAAa,KACvBC,UAAYlE,KAAKmE,iBAAiB7D,MAAMwD,SAAS1B,UACpCpC,KAAKwF,sBAAsBpD,MAAM,GACnCxB,OAASsD,UAAW,KAC3BE,UAAYhC,KAAKuB,QACrBS,UAAUR,YAAY,gBACtBQ,UAAUW,WAAW,YACrBO,WAAWG,MAAMrB,WACjBsB,gBAAgBC,uBAAuBvB,WACvChC,KAAKiC,OAAOD,UAAUC,eAEtBiB,WAAWjF,SAAS,UACpB+B,KAAKiC,OAAOiB,WAAWjB,eAG3BiB,WAAWjF,SAAS,UACpB+B,KAAKiC,OAAOiB,WAAWjB,UAKnChF,SAAS4H,MAAMN,EAAGvE,MAAM,SAASiF,EAAGC,EAAGlF,MACnC9B,MAAMiH,SAASF,EAAGC,EAAGlF,SACtB,SAASiF,EAAGC,EAAGlF,MACd9B,MAAMkH,QAAQH,EAAGC,EAAGlF,WAW5B5C,0BAA0BkB,UAAU6G,SAAW,SAASE,MAAOC,MAAOtF,UAC9D9B,MAAQN,KACR2H,aAAc,OACbvH,UAAUW,KAAK,kBAAoBf,KAAK8D,SAAS1B,OAAOT,MAAK,SAASV,EAAGsD,cACtEC,KAAOpF,EAAEmF,UACTjE,MAAMsH,cAAcH,MAAOC,MAAOlD,QAAUmD,aAC5CA,aAAc,EACdnD,KAAKnE,SAAS,yBAEdmE,KAAKZ,YAAY,gCAGpBxD,UAAUW,KAAK,yBAA2Bf,KAAK8D,SAAS1B,OAAOpB,IAAI,iBAAiBW,MAAK,SAASV,EAAGsD,cAClGC,KAAOpF,EAAEmF,WACTjE,MAAMsH,cAAcH,MAAOC,MAAOlD,OAAUmD,aAAgBrH,MAAMuH,iBAAiBzF,KAAMoC,MAIzFA,KAAKZ,YAAY,yBAHjB+D,aAAc,EACdnD,KAAKnE,SAAS,6BAc1Bb,0BAA0BkB,UAAU8G,QAAU,SAASC,MAAOC,MAAOtF,UAC7D9B,MAAQN,KACRgC,KAAOhC,KAAKI,UACZ0H,QAAS,EAGb9F,KAAKjB,KAAK,kBAAoBf,KAAK8D,SAAS1B,OAAOT,MAAK,SAASV,EAAGsD,cAC5DC,KAAOpF,EAAEmF,iBACRjE,MAAMsH,cAAcH,MAAOC,MAAOlD,QAMvCA,KAAKZ,YAAY,wBACjBtD,MAAMsF,eAAexD,KAAMoC,MAC3BsD,QAAS,GACF,MAGNA,QAED9F,KAAKjB,KAAK,yBAA2Bf,KAAK8D,SAAS1B,OAAOpB,IAAI,iBAAiBW,MAAK,SAASV,EAAG8G,gBACxFC,WAAa5I,EAAE2I,gBACdzH,MAAMsH,cAAcH,MAAOC,MAAOM,aAAe1H,MAAMuH,iBAAiBzF,KAAM4F,mBAExE,EAIXA,WAAWpE,YAAY,4BACnBkB,aAAexE,MAAMwB,0BAA0BkG,WAAY,WAC3DxD,KAAOlE,MAAM8G,QAAQhF,KAAM0C,qBAC/BxE,MAAMsF,eAAexD,KAAMoC,MAC3BsD,QAAS,GACF,KAIVA,aACIG,aAAa7F,OAU1B5C,0BAA0BkB,UAAUkF,eAAiB,SAASxD,KAAMoC,UAE5D0D,QAAUlI,KAAKmI,sBAAsBnI,KAAKyE,SAASD,UAChC,IAAnB0D,QAAQtH,OAAc,CACtBsH,QAAQ7H,SAAS,gBACjB6H,QAAQ7D,OAAO6D,QAAQ7D,cACnBS,aAAe9E,KAAK8B,0BAA0BoG,QAAS,WAC1ClI,KAAKoH,QAAQc,QAASpD,cAC5BzE,SAAS,eACf4H,aAAaC,SAGF,IAAhB9F,KAAKxB,aACAsG,cAAclH,KAAKyE,SAASD,MAAO,GACpCA,KAAKG,KAAK,YACVH,KAAK4D,eAGJlB,cAAclH,KAAKyE,SAASD,MAAOxE,KAAK6D,UAAUzB,OACvDA,KAAKwB,YAAY,YACZvD,SAAS,iBAAmBL,KAAKyE,SAASD,OAC/CpC,KAAKiG,KAAK,WAAY,QACjBC,UAAUlG,KAAMoC,QAS7BhF,0BAA0BkB,UAAUuH,aAAe,SAAS7F,UACpD0C,aAAe9E,KAAK8B,0BAA0BM,KAAM,WACnC,OAAjB0C,cACA1C,KAAKwB,YAAY,UAAYkB,cAEjC1C,KAAKuC,KAAK,YAAY,QAEjB2D,UAAUlG,KAAMpC,KAAKuI,YAAYvI,KAAK8D,SAAS1B,MAAOpC,KAAK6D,UAAUzB,SAW9E5C,0BAA0BkB,UAAU8H,eAAiB,SAAS7B,OACtDnC,KAAOpF,EAAEuH,EAAEC,QAAQC,QAAQ,gBACX,IAAhBrC,KAAK5D,OAAc,KACfoH,WAAa5I,EAAEuH,EAAEC,QACjB9B,aAAe9E,KAAK8B,0BAA0BkG,WAAY,WACzC,OAAjBlD,eACAN,KAAOxE,KAAKoH,QAAQY,WAAYlD,mBAGpC2D,YAAczI,KAAKmI,sBAAsBnI,KAAKyE,SAASD,OACvDkE,SAAWtJ,WAEPuH,EAAEgC,cACDrJ,KAAKsJ,WACLtJ,KAAKuJ,gBACLvJ,KAAKwJ,UACNJ,SAAW1I,KAAK+I,YAAY/I,KAAK8D,SAASU,MAAOiE,wBAGhDnJ,KAAK0J,eACL1J,KAAK2J,QACNP,SAAW1I,KAAKkJ,gBAAgBlJ,KAAK8D,SAASU,MAAOiE,wBAGpDnJ,KAAK6J,OACNzD,gBAAgB0D,sBAAuB,4BAIvC1D,gBAAgB0D,sBAAuB,MAI3CV,SAAS9H,OAAQ,CACjB8H,SAAS/D,KAAK,WAAW,GACzB+D,SAASrI,SAAS,oBACdiF,WAAatF,KAAKuF,aAAamD,aAC/BpD,WAAW1E,UACP8H,SAASzE,SAAS,YAAa,KAC3BC,UAAYlE,KAAKmE,iBAAiBnE,KAAK8D,SAAS4E,cACnC1I,KAAKwF,sBAAsBkD,UAAU,GACvC9H,OAASsD,UAAW,KAC3BE,UAAYsE,SAAS/E,QACzBS,UAAUR,YAAY,gBACtBQ,UAAUW,WAAW,YACrBO,WAAWG,MAAMrB,WACjBsB,gBAAgBC,uBAAuBvB,WACvCsE,SAASrE,OAAOD,UAAUC,eAE1BiB,WAAWjF,SAAS,UACpBqI,SAASrE,OAAOiB,WAAWjB,eAG/BiB,WAAWjF,SAAS,UACpBqI,SAASrE,OAAOiB,WAAWjB,eAInCG,KAAKG,KAAK,WAAW,GAGzBgC,EAAE0C,sBACGzD,eAAe8C,SAAUlE,OAUlChF,0BAA0BkB,UAAUqI,YAAc,SAAShH,MAAOK,UAC1D8C,OACAoE,WAAatJ,KAAKuJ,mBAAmBxH,OAGrCmD,OADgB,IAAhB9C,KAAKxB,OACI,EAEAZ,KAAK6D,UAAUzB,MAAQ,UAGhCoH,KAAOxJ,KAAKqF,kBAAkBtD,MAAOmD,QAClB,IAAhBsE,KAAK5I,QAAgBsE,OAASoE,YACjCpE,SACAsE,KAAOxJ,KAAKqF,kBAAkBtD,MAAOmD,eAGlCsE,MAUXhK,0BAA0BkB,UAAUwI,gBAAkB,SAASnH,MAAOK,UAC9D8C,OAGAA,OADgB,IAAhB9C,KAAKxB,OACIZ,KAAKuJ,mBAAmBxH,OAExB/B,KAAK6D,UAAUzB,MAAQ,UAGhCqH,SAAWzJ,KAAKqF,kBAAkBtD,MAAOmD,QAClB,IAApBuE,SAAS7I,QAAgBsE,OAAS,GACrCA,SACAuE,SAAWzJ,KAAKqF,kBAAkBtD,MAAOmD,eAItCuE,UASXjK,0BAA0BkB,UAAU4H,UAAY,SAASlG,KAAMwE,YACvD8C,WAAatH,KAAKiC,SAClBsF,UAAY/C,OAAOvC,SACnB/D,MAAQN,KAEZH,EAAEC,KAAKC,WAAW,+BAAiCO,MAAMb,aAKzD2C,KAAKwH,QACD,CACIlH,KAAMS,SAASf,KAAKU,IAAI,SAAW6G,UAAUjH,KAAOgH,WAAWhH,KAC/DE,IAAKO,SAASf,KAAKU,IAAI,QAAU6G,UAAU/G,IAAM8G,WAAW9G,KAEhE,CACIiH,SAAU,OACVC,KAAM,WACF1K,EAAE,QAAQ2K,QAAQ,gCAAiC,CAAC3H,KAAMwE,OAAQtG,QAClET,EAAEC,KAAK4B,YAAY,+BAAiCpB,MAAMb,iBAc1ED,0BAA0BkB,UAAUkH,cAAgB,SAASH,MAAOC,MAAOlD,UACnEwF,SAAWxF,KAAKH,gBAChBG,KAAKP,SAAS,YACPwD,OAASuC,SAAStH,MAAQ+E,MAAQuC,SAAStH,KAAO8B,KAAKyF,cACvDvC,OAASsC,SAASpH,KAAO8E,MAAQsC,SAASpH,IAAM4B,KAAK0F,cAEzDzC,OAASuC,SAAStH,MAAQ+E,MAAQuC,SAAStH,KAAO8B,KAAKlB,SACvDoE,OAASsC,SAASpH,KAAO8E,MAAQsC,SAASpH,IAAM4B,KAAKjB,UAShE/D,0BAA0BkB,UAAUwG,cAAgB,SAASlE,MAAOkC,aAC3D9E,UAAUW,KAAK,yBAA2BiC,OAAOmC,IAAID,SAQ9D1F,0BAA0BkB,UAAUN,QAAU,kBACnChB,EAAE+K,SAASC,eAAepK,KAAKP,eAO1CD,0BAA0BkB,UAAU2J,QAAU,kBACnCrK,KAAKI,UAAUW,KAAK,uBAU/BvB,0BAA0BkB,UAAU6H,YAAc,SAASxG,MAAOmD,eACzDlF,KAAKI,UAAUW,KAAK,kCAAoCgB,MAAQ,UAAYmD,QAAQoF,GAAG,YAMrFtK,KAAKI,UAAUW,KAAK,kCAAoCgB,MAAQ,UAAYmD,QALxElF,KAAKI,UAAUW,KAAK,iBAAmBgB,MAAnB,6BAEXmD,OACZ,SAAWnD,QAYvBvC,0BAA0BkB,UAAU2E,kBAAoB,SAAStD,MAAOmD,eAC7DlF,KAAKI,UAAUW,KAAK,0BAA4BgB,MAAQ,UAAYmD,OAAS,aAAaqF,MAAM,EAAG,IAS9G/K,0BAA0BkB,UAAUyH,sBAAwB,SAASnF,cAC1DhD,KAAKI,UAAUW,KAAK,4BAA8BiC,QAS7DxD,0BAA0BkB,UAAUyD,iBAAmB,SAASpC,cACrD/B,KAAKI,UAAUW,KAAK,kBAAoBgB,OAAOnB,QAS1DpB,0BAA0BkB,UAAU6I,mBAAqB,SAASxH,cACvD/B,KAAKI,UAAUW,KAAK,iBAAmBgB,MAAQ,cAAcnB,QAUxEpB,0BAA0BkB,UAAUoB,0BAA4B,SAASF,KAAM4I,YACvEC,QAAU7I,KAAKyG,KAAK,YACR,KAAZoC,gBACIC,WAAaD,QAAQE,MAAM,KACtBnH,MAAQ,EAAGA,MAAQkH,WAAW9J,OAAQ4C,QAAS,IACxC,IAAIoH,OAAO,IAAMJ,OAAS,aAC5BK,KAAKH,WAAWlH,QAAS,KAE3BsH,MADQ,IAAIF,OAAO,aACLG,KAAKL,WAAWlH,eAC3BwH,OAAOF,MAAM,YAIzB,MASXtL,0BAA0BkB,UAAUmD,UAAY,SAASzB,aAC9CpC,KAAK8B,0BAA0BM,KAAM,WAUhD5C,0BAA0BkB,UAAUoD,SAAW,SAASlC,aAC7C5B,KAAK8B,0BAA0BF,KAAM,UAShDpC,0BAA0BkB,UAAU+D,SAAW,SAAS7C,aAC7C5B,KAAK8B,0BAA0BF,KAAM,UAShDpC,0BAA0BkB,UAAU6E,aAAe,SAASnD,aACjDpC,KAAKI,UAAUW,KAAK,iBACvBf,KAAK8D,SAAS1B,MADS,oBAGXpC,KAAK6D,UAAUzB,MAC3B,SAAWpC,KAAK8D,SAAS1B,MACzB,qBAUR5C,0BAA0BkB,UAAU8E,sBAAwB,SAASpD,KAAM6I,eACnEA,OACOjL,KAAKI,UAAUW,KAAK,iBACvBf,KAAK8D,SAAS1B,MADS,oBAGXpC,KAAK6D,UAAUzB,MAC3B,SAAWpC,KAAK8D,SAAS1B,MACzB,aAAapB,IAAI,oBAElBhB,KAAKI,UAAUW,KAAK,mBACXf,KAAK6D,UAAUzB,MAC3B,SAAWpC,KAAK8D,SAAS1B,MACzB,aAAapB,IAAI,qBAUzBxB,0BAA0BkB,UAAU0G,QAAU,SAAShF,KAAM0C,qBAClD9E,KAAKI,UAAUW,KAAK,kBAAoBf,KAAK8D,SAAS1B,MAAQ,SAAW0C,eAMpFtF,0BAA0BkB,UAAUwK,aAAe,eAC3C5K,MAAQN,KACRsE,QAAUtE,KAAKsE,UACftE,KAAKG,aACLmE,QAAU,QAGTlE,UAAUW,KAAK,qBAAqBY,MAAK,SAASV,EAAGsD,UACtDnF,EAAEmF,UACGzB,IAAI,OAAQK,SAAS/D,EAAEmF,UAAUI,KAAK,YAAcwG,WAAW7G,UAC/DxB,IAAI,MAAOK,SAAS/D,EAAEmF,UAAUI,KAAK,YAAcwG,WAAW7G,UACnEhE,MAAMsE,mBAAmBL,SAAU,oBAGlCnE,UAAUW,KAAK,0BAA0BC,IAAI,iBAAiBW,MAAK,SAAS8E,IAAKrE,MAClFhD,EAAEgD,MACGU,IAAI,OAAQqI,WAAW/L,EAAEgD,MAAMuC,KAAK,YAAcwG,WAAW7G,UAC7DxB,IAAI,MAAOqI,WAAW/L,EAAEgD,MAAMuC,KAAK,YAAcwG,WAAW7G,UACjEhE,MAAMsE,mBAAmBxC,KAAM,gBASvC5C,0BAA0BkB,UAAU4D,QAAU,eACtC8G,MAAQpL,KAAKqK,UACbgB,kBAAoBD,MAAME,IAAI,GAAGC,oBACdH,MAAM9H,QAEH+H,mBAS9B7L,0BAA0BkB,UAAUkE,mBAAqB,SAAS4G,QAASC,UACnEnH,QAAU6G,WAAWnL,KAAKsE,WAC1BtE,KAAKG,aACLmE,QAAU,GAEdlF,EAAEoM,SAAS1I,IAAI,qBACU,SAAWwB,QAAU,qBACxB,SAAWA,QAAU,oBACtB,SAAWA,QAAU,mBACtB,SAAWA,QAAU,cACxB,SAAWA,QAAU,uBACdmH,QAS5BjM,0BAA0BkB,UAAUqG,gBAAkB,eAC9C2E,OAAS,cACRtL,UAAUW,KAAK,6CAA6CY,MAAK,SAASV,EAAGsD,cAI1EoH,YAHJpH,SAAWnF,EAAEmF,WAGazB,IAAI,WAAaK,SAASoB,SAASzB,IAAI,YAAc,EAE3E6I,WAAaD,SACbA,OAASC,eAIVD,QAUXlM,0BAA0BkB,UAAUmH,iBAAmB,SAASzF,KAAMoC,aAC3DxE,KAAK6D,UAAUzB,QAAUpC,KAAK6D,UAAUW,OAASxE,KAAK8D,SAAS1B,QAAUpC,KAAK8D,SAASU,WAQ9FkB,gBAAkB,CAKlBkG,0BAA0B,EAM1BC,6BAA8B,GAK9B1L,YAAY,EAKZiJ,sBAAsB,EAKtB0C,UAAW,GAUXC,KAAM,SAAStM,YAAaC,SAAUC,WAClC+F,gBAAgBoG,UAAUrM,aACtB,IAAID,0BAA0BC,YAAaC,SAAUC,QACpD+F,gBAAgBkG,2BACjBlG,gBAAgBsG,qBAChBtG,gBAAgBkG,0BAA2B,IAE1ClG,gBAAgBmG,6BAA6B9I,eAAetD,aAAc,CAC3EiG,gBAAgBmG,6BAA6BpM,cAAe,MAExDwM,kBAAoB9B,SAASC,eAAe3K,aAC5CwM,kBAAkBC,UAAUC,SAAS,mBACpCF,kBAAkBC,UAAUC,SAAS,iCAEtCzG,gBAAgBC,uBAAuBvG,EAAE6M,mBAAmBlL,KAAK,gBAQ7EiL,mBAAoB,WAChB5M,EAAE,QACGgN,GAAG,UACA,6EACA1G,gBAAgB8C,gBACnB4D,GAAG,UACA,4FACA1G,gBAAgB8C,gBACnB4D,GAAG,gCAAiC1G,gBAAgB2G,iBACzDjN,EAAEkN,QAAQF,GAAG,UAAU,WACnB1G,gBAAgB6G,oBAAmB,MAEvCD,OAAOE,iBAAiB,eAAe,WACnC9G,gBAAgBvF,YAAa,EAC7BuF,gBAAgB6G,mBAAmB7G,gBAAgBvF,eAEvDmM,OAAOE,iBAAiB,cAAc,WAClC9G,gBAAgBvF,YAAa,EAC7BuF,gBAAgB6G,mBAAmB7G,gBAAgBvF,eAEvDU,YAAW,WACP6E,gBAAgB+G,2BACjB,MAQP9G,uBAAwB,SAAS6F,SAE7BA,QAAQkB,OAAO,wBACflB,QAAQY,GAAG,uBAAwB1G,gBAAgBgB,kBAOvDA,gBAAiB,SAASC,GACtBA,EAAE0C,qBACEsD,SAAWjH,gBAAgBkH,oBAAoBjG,GAC/CgG,UACAA,SAASjG,gBAAgBC,IAQjC6B,eAAgB,SAAS7B,OACjBjB,gBAAgB0D,sBAGpB1D,gBAAgB0D,sBAAuB,MACnCuD,SAAWjH,gBAAgBkH,oBAAoBjG,GAC/CgG,UACAA,SAASnE,eAAe7B,KAQhC4F,mBAAoB,SAASpM,gBACpB,IAAIV,eAAeiG,gBAAgBoG,UAChCpG,gBAAgBoG,UAAU/I,eAAetD,eACzCiG,gBAAgBoG,UAAUrM,aAAaU,WAAaA,WACpDuF,gBAAgBoG,UAAUrM,aAAayL,iBAUnDuB,uBAAwB,gBACfF,mBAAmB7G,gBAAgBvF,YAIxCU,YAAW,WACP6E,gBAAgB+G,uBAAuB/G,gBAAgBvF,cACxD,MAWPkM,gBAAiB,SAAS1F,EAAGvE,KAAMwE,OAAQtG,OACvC8B,KAAKwB,YAAY,gBAAgBd,IAAI,UAAW,IAChDV,KAAKU,IAAI,MAAO8D,OAAOoD,WAAWpH,KAAKE,IAAI,OAAQ8D,OAAOoD,WAAWtH,MACrEkE,OAAOnB,MAAMrD,MACbwE,OAAOhD,YAAY,eACkB,IAA1BxB,KAAKuC,KAAK,cAAyD,IAA1BvC,KAAKuC,KAAK,aAC1DvC,KAAKwB,YAAY,UAAUvD,SAAS,YACpC+B,KAAK2C,WAAW,YAChB3C,KAAKyK,WAAW,YAChBzK,KAAKU,IAAI,MAAO,IACXA,IAAI,OAAQ,IACZA,IAAI,YAAa,IAClBV,KAAK6B,SAAS,aAAe3D,MAAMkF,sBAAsBpD,MAAM,GAAMxB,OAAS,GAC9EN,MAAMkF,sBAAsBpD,MAAM,GAAM0K,QAAQC,WAGpD3K,KAAKuC,KAAK,UAAWiC,OAAOjC,KAAK,YAAYA,KAAK,UAAWiC,OAAOjC,KAAK,YACzErE,MAAMsE,mBAAmBxC,KAAM,kBAEC,IAAzBA,KAAKuC,KAAK,aAAuD,IAAzBvC,KAAKuC,KAAK,aACzDvC,KAAKgG,QACLhG,KAAKyK,WAAW,iBAEkB,IAA3BjG,OAAOjC,KAAK,aAAyD,IAA3BiC,OAAOjC,KAAK,YAC7DiC,OAAOiG,WAAW,WAElBnH,gBAAgB0D,uBAChB1D,gBAAgB0D,sBAAuB,GAEvC9I,MAAM2F,yBAENP,gBAAgBsH,kBAEhB1M,MAAMV,eAAiBU,MAAMuF,8BASrC+G,oBAAqB,SAASjG,OACtBlH,YAAcL,EAAEuH,EAAEsG,eAAepG,QAAQ,sBAAsBwB,KAAK,aACjE3C,gBAAgBoG,UAAUrM,cAMrCuN,gBAAiB,iBACPE,aAAe/C,SAASC,eAAe,gBAC7C7K,kBAAkB4N,gBAAgBD,sBAOnC,CACHnB,KAAMrG,gBAAgBqG"}
\ No newline at end of file
+{"version":3,"file":"question.min.js","sources":["../src/question.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/*\n * JavaScript to allow dragging options to slots (using mouse down or touch) or tab through slots using keyboard.\n *\n * @module     qtype_ddimageortext/question\n * @copyright  2018 The Open University\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\ndefine([\n    'jquery',\n    'core/dragdrop',\n    'core/key_codes',\n    'core_form/changechecker',\n    'core_filters/events',\n], function(\n    $,\n    dragDrop,\n    keys,\n    FormChangeChecker,\n    filterEvent\n) {\n\n    \"use strict\";\n\n    /**\n     * Initialise one drag-drop onto image question.\n     *\n     * @param {String} containerId id of the outer div for this question.\n     * @param {boolean} readOnly whether the question is being displayed read-only.\n     * @param {Array} places Information about the drop places.\n     * @constructor\n     */\n    function DragDropOntoImageQuestion(containerId, readOnly, places) {\n        this.containerId = containerId;\n        this.questionAnswer = {};\n        this.questionDragDropWidthHeight = [];\n        M.util.js_pending('qtype_ddimageortext-init-' + this.containerId);\n        this.places = places;\n        this.allImagesLoaded = false;\n        this.imageLoadingTimeoutId = null;\n        this.isPrinting = false;\n        if (readOnly) {\n            this.getRoot().addClass('qtype_ddimageortext-readonly');\n        }\n\n        var thisQ = this;\n        this.getNotYetLoadedImages().one('load', function() {\n            thisQ.waitForAllImagesToBeLoaded();\n        });\n        this.waitForAllImagesToBeLoaded();\n    }\n\n    /**\n     * Change all the drags and drops related to the item that has been changed by filter to correct size and content.\n     *\n     *  @param {object} filteredElement the element has been modified by filter.\n     */\n    DragDropOntoImageQuestion.prototype.changeAllDragsAndDropsToFilteredContent = function(filteredElement) {\n        let currentFilteredItem = $(filteredElement);\n        const parentIsDD = currentFilteredItem.parent().closest('div').hasClass('placed') ||\n            currentFilteredItem.parent().hasClass('draghome');\n        const isDD = currentFilteredItem.hasClass('placed') || currentFilteredItem.hasClass('draghome');\n        // The filtered element or parent element should a drag or drop item.\n        if (!parentIsDD && !isDD) {\n            return;\n        }\n        if (parentIsDD) {\n            currentFilteredItem = currentFilteredItem.parent().closest('div');\n        }\n        if (this.getRoot().find(currentFilteredItem).length <= 0) {\n            // If the DD item doesn't belong to this question\n            // In case we have multiple questions in the same page.\n            return;\n        }\n        const group = this.getGroup(currentFilteredItem),\n            choice = this.getChoice(currentFilteredItem);\n        let listOfModifiedDragDrop = [];\n        // Get the list of drag and drop item within the same group and choice.\n        this.getRoot().find('.group' + group + '.choice' + choice).each(function(i, node) {\n            // Same modified item, skip it.\n            if ($(node).get(0) === currentFilteredItem.get(0)) {\n                return;\n            }\n            const originalClass = $(node).attr('class');\n            const originalStyle = $(node).attr('style');\n            // We want to keep all the handler and event for filtered item, so using clone is the only choice.\n            const filteredDragDropClone = currentFilteredItem.clone();\n            // Sometimes, for the question that has a lot of input groups and unlimited draggable items,\n            // this 'clone' process takes longer than usual,it will not add the eventHandler for this cloned drag.\n            // We need to make sure to add the eventHandler for the cloned drag too.\n            questionManager.addEventHandlersToDrag(filteredDragDropClone);\n            // Replace the class and style of the drag drop item we want to replace for the clone.\n            filteredDragDropClone.attr('class', originalClass);\n            filteredDragDropClone.attr('style', originalStyle);\n            // Insert into DOM.\n            $(node).before(filteredDragDropClone);\n            // Add the item has been replaced to a list so we can remove it later.\n            listOfModifiedDragDrop.push(node);\n        });\n\n        listOfModifiedDragDrop.forEach(function(node) {\n            $(node).remove();\n        });\n        // Save the current height and width.\n        const currentHeight = currentFilteredItem.height();\n        const currentWidth = currentFilteredItem.width();\n        // Set to auto, so we can get the real height and width of the filtered item.\n        currentFilteredItem.height('auto');\n        currentFilteredItem.width('auto');\n        // We need to set display block so we can get height and width.\n        // Some browsers can't get the offsetWidth/Height if they are an inline element like span tag.\n        if (!filteredElement.offsetWidth || !filteredElement.offsetHeight) {\n            filteredElement.classList.add('d-block');\n        }\n        if (this.questionDragDropWidthHeight[group].maxWidth < Math.ceil(filteredElement.offsetWidth) ||\n            this.questionDragDropWidthHeight[group].maxHeight < Math.ceil(0 + filteredElement.offsetHeight)) {\n            // Remove the d-block class before calculation.\n            filteredElement.classList.remove('d-block');\n            // Now resize all the items in the same group if we have new maximum width or height.\n            this.resizeAllDragsAndDropsInGroup(group);\n        } else {\n            currentFilteredItem.height(currentHeight);\n            currentFilteredItem.width(currentWidth);\n        }\n        // Remove the d-block class after resize.\n        filteredElement.classList.remove('d-block');\n    };\n\n    /**\n     * Waits until all images are loaded before calling setupQuestion().\n     *\n     * This function is called from the onLoad of each image, and also polls with\n     * a time-out, because image on-loads are allegedly unreliable.\n     */\n    DragDropOntoImageQuestion.prototype.waitForAllImagesToBeLoaded = function() {\n        var thisQ = this;\n\n        // This method may get called multiple times (via image on-loads or timeouts.\n        // If we are already done, don't do it again.\n        if (this.allImagesLoaded) {\n            return;\n        }\n\n        // Clear any current timeout, if set.\n        if (this.imageLoadingTimeoutId !== null) {\n            clearTimeout(this.imageLoadingTimeoutId);\n        }\n\n        // If we have not yet loaded all images, set a timeout to\n        // call ourselves again, since apparently images on-load\n        // events are flakey.\n        if (this.getNotYetLoadedImages().length > 0) {\n            this.imageLoadingTimeoutId = setTimeout(function() {\n                thisQ.waitForAllImagesToBeLoaded();\n            }, 100);\n            return;\n        }\n\n        // We now have all images. Carry on, but only after giving the layout a chance to settle down.\n        this.allImagesLoaded = true;\n        thisQ.setupQuestion();\n        // Wait for all dynamic content loaded by filter to be completed.\n        document.addEventListener(filterEvent.eventTypes.filterContentRenderingComplete, (elements) => {\n            elements.detail.nodes.forEach((element) => {\n                thisQ.changeAllDragsAndDropsToFilteredContent(element);\n            });\n        });\n    };\n\n    /**\n     * Get any of the images in the drag-drop area that are not yet fully loaded.\n     *\n     * @returns {jQuery} those images.\n     */\n    DragDropOntoImageQuestion.prototype.getNotYetLoadedImages = function() {\n        var thisQ = this;\n        return this.getRoot().find('.ddarea img').not(function(i, imgNode) {\n            return thisQ.imageIsLoaded(imgNode);\n        });\n    };\n\n    /**\n     * Check if an image has loaded without errors.\n     *\n     * @param {HTMLImageElement} imgElement an image.\n     * @returns {boolean} true if this image has loaded without errors.\n     */\n    DragDropOntoImageQuestion.prototype.imageIsLoaded = function(imgElement) {\n        return imgElement.complete && imgElement.naturalHeight !== 0;\n    };\n\n    /**\n     * Set up the question, once all images have been loaded.\n     */\n    DragDropOntoImageQuestion.prototype.setupQuestion = function() {\n        this.resizeAllDragsAndDrops();\n        this.cloneDrags();\n        this.positionDragsAndDrops();\n        M.util.js_complete('qtype_ddimageortext-init-' + this.containerId);\n    };\n\n    /**\n     * In each group, resize all the items to be the same size.\n     */\n    DragDropOntoImageQuestion.prototype.resizeAllDragsAndDrops = function() {\n        var thisQ = this;\n        this.getRoot().find('.draghomes > div').each(function(i, node) {\n            thisQ.resizeAllDragsAndDropsInGroup(\n                thisQ.getClassnameNumericSuffix($(node), 'dragitemgroup'));\n        });\n    };\n\n    /**\n     * In a given group, set all the drags and drops to be the same size.\n     *\n     * @param {int} group the group number.\n     */\n    DragDropOntoImageQuestion.prototype.resizeAllDragsAndDropsInGroup = function(group) {\n        var root = this.getRoot(),\n            dragHomes = root.find(\".draghome.group\" + group),\n            maxWidth = 0,\n            maxHeight = 0;\n\n        // Find the maximum size of any drag in this groups.\n        dragHomes.each(function(i, drag) {\n            maxWidth = Math.max(maxWidth, Math.ceil(drag.offsetWidth));\n            maxHeight = Math.max(maxHeight, Math.ceil(drag.offsetHeight));\n        });\n\n        // The size we will want to set is a bit bigger than this.\n        maxWidth += 10;\n        maxHeight += 10;\n        this.questionDragDropWidthHeight[group] = {maxWidth, maxHeight};\n\n        // Set each drag home to that size.\n        dragHomes.each(function(i, drag) {\n            $(drag).width(maxWidth).height(maxHeight).css('lineHeight', maxHeight + 'px');\n        });\n\n        // Create the drops and make them the right size.\n        for (var i in this.places) {\n            if (!this.places.hasOwnProperty((i))) {\n                continue;\n            }\n            var place = this.places[i],\n                label = place.text;\n            if (parseInt(place.group) !== group) {\n                continue;\n            }\n            if (label === '') {\n                label = M.util.get_string('blank', 'qtype_ddimageortext');\n            }\n            if (root.find('.dropzones .dropzone.group' + place.group + '.place' + i).length === 0) {\n                root.find('.dropzones').append('<div class=\"dropzone active group' + place.group +\n                    ' place' + i + '\" tabindex=\"0\">' +\n                    '<span class=\"accesshide\">' + label + '</span>&nbsp;</div>');\n            }\n            root.find('.dropzone.place' + i).width(maxWidth - 2).height(maxHeight - 2);\n        }\n    };\n\n    /**\n     * Invisible 'drag homes' are output by the renderer. These have the same properties\n     * as the drag items but are invisible. We clone these invisible elements to make the\n     * actual drag items.\n     */\n    DragDropOntoImageQuestion.prototype.cloneDrags = function() {\n        var thisQ = this;\n        thisQ.getRoot().find('.draghome').each(function(index, dragHome) {\n            var drag = $(dragHome);\n            var placeHolder = drag.clone();\n            placeHolder.removeClass();\n            placeHolder.addClass('draghome choice' +\n                thisQ.getChoice(drag) + ' group' +\n                thisQ.getGroup(drag) + ' dragplaceholder');\n            drag.before(placeHolder);\n        });\n    };\n\n    /**\n     * Clone drag item for one choice.\n     *\n     * @param {jQuery} dragHome the drag home to clone.\n     */\n    DragDropOntoImageQuestion.prototype.cloneDragsForOneChoice = function(dragHome) {\n        if (dragHome.hasClass('infinite')) {\n            var noOfDrags = this.noOfDropsInGroup(this.getGroup(dragHome));\n            for (var i = 0; i < noOfDrags; i++) {\n                this.cloneDrag(dragHome);\n            }\n        } else {\n            this.cloneDrag(dragHome);\n        }\n    };\n\n    /**\n     * Clone drag item.\n     *\n     * @param {jQuery} dragHome\n     */\n    DragDropOntoImageQuestion.prototype.cloneDrag = function(dragHome) {\n        var drag = dragHome.clone();\n        drag.removeClass('draghome')\n            .addClass('drag unplaced moodle-has-zindex')\n            .offset(dragHome.offset());\n        this.getRoot().find('.dragitems').append(drag);\n    };\n\n    /**\n     * Update the position of drags.\n     */\n    DragDropOntoImageQuestion.prototype.positionDragsAndDrops = function() {\n        var thisQ = this,\n            root = this.getRoot(),\n            bgRatio = this.bgRatio();\n\n        // Move the drops into position.\n        root.find('.ddarea .dropzone').each(function(i, dropNode) {\n            var drop = $(dropNode),\n                place = thisQ.places[thisQ.getPlace(drop)];\n            // The xy values come from PHP as strings, so we need parseInt to stop JS doing string concatenation.\n            drop.css('left', parseInt(place.xy[0]) * bgRatio)\n                .css('top', parseInt(place.xy[1]) * bgRatio);\n            drop.data('originX', parseInt(place.xy[0]))\n                .data('originY', parseInt(place.xy[1]));\n            thisQ.handleElementScale(drop, 'left top');\n        });\n\n        // First move all items back home.\n        root.find('.draghome').not('.dragplaceholder').each(function(i, dragNode) {\n            var drag = $(dragNode),\n                currentPlace = thisQ.getClassnameNumericSuffix(drag, 'inplace');\n            drag.addClass('unplaced')\n                .removeClass('placed');\n            drag.removeAttr('tabindex');\n            if (currentPlace !== null) {\n                drag.removeClass('inplace' + currentPlace);\n            }\n        });\n\n        // Then place the ones that should be placed.\n        root.find('input.placeinput').each(function(i, inputNode) {\n            var input = $(inputNode),\n                choice = input.val();\n            if (choice.length === 0 || (choice.length > 0 && choice === '0')) {\n                // No item in this place.\n                return;\n            }\n\n            var place = thisQ.getPlace(input);\n            // Get the unplaced drag.\n            var unplacedDrag = thisQ.getUnplacedChoice(thisQ.getGroup(input), choice);\n            // Get the clone of the drag.\n            var hiddenDrag = thisQ.getDragClone(unplacedDrag);\n            if (hiddenDrag.length) {\n                if (unplacedDrag.hasClass('infinite')) {\n                    var noOfDrags = thisQ.noOfDropsInGroup(thisQ.getGroup(unplacedDrag));\n                    var cloneDrags = thisQ.getInfiniteDragClones(unplacedDrag, false);\n                    if (cloneDrags.length < noOfDrags) {\n                        var cloneDrag = unplacedDrag.clone();\n                        cloneDrag.removeClass('beingdragged');\n                        cloneDrag.removeAttr('tabindex');\n                        hiddenDrag.after(cloneDrag);\n                        // Sometimes, for the question that has a lot of input groups and unlimited draggable items,\n                        // this 'clone' process takes longer than usual, so the questionManager.init() method\n                        // will not add the eventHandler for this cloned drag.\n                        // We need to make sure to add the eventHandler for the cloned drag too.\n                        questionManager.addEventHandlersToDrag(cloneDrag);\n                    } else {\n                        hiddenDrag.addClass('active');\n                    }\n                } else {\n                    hiddenDrag.addClass('active');\n                }\n            }\n\n            // Send the drag to drop.\n            var drop = root.find('.dropzone.place' + place);\n            thisQ.sendDragToDrop(unplacedDrag, drop);\n        });\n\n        // Save the question answer.\n        thisQ.questionAnswer = thisQ.getQuestionAnsweredValues();\n    };\n\n    /**\n     * Get the question answered values.\n     *\n     * @return {Object} Contain key-value with key is the input id and value is the input value.\n     */\n    DragDropOntoImageQuestion.prototype.getQuestionAnsweredValues = function() {\n        let result = {};\n        this.getRoot().find('input.placeinput').each((i, inputNode) => {\n            result[inputNode.id] = inputNode.value;\n        });\n\n        return result;\n    };\n\n    /**\n     * Check if the question is being interacted or not.\n     *\n     * @return {boolean} Return true if the user has changed the question-answer.\n     */\n    DragDropOntoImageQuestion.prototype.isQuestionInteracted = function() {\n        const oldAnswer = this.questionAnswer;\n        const newAnswer = this.getQuestionAnsweredValues();\n        let isInteracted = false;\n\n        // First, check both answers have the same structure or not.\n        if (JSON.stringify(newAnswer) !== JSON.stringify(oldAnswer)) {\n            isInteracted = true;\n            return isInteracted;\n        }\n        // Check the values.\n        Object.keys(newAnswer).forEach(key => {\n            if (newAnswer[key] !== oldAnswer[key]) {\n                isInteracted = true;\n            }\n        });\n\n        return isInteracted;\n    };\n\n    /**\n     * Handles the start of dragging an item.\n     *\n     * @param {Event} e the touch start or mouse down event.\n     */\n    DragDropOntoImageQuestion.prototype.handleDragStart = function(e) {\n        var thisQ = this,\n            drag = $(e.target).closest('.draghome'),\n            currentIndex = this.calculateZIndex(),\n            newIndex = currentIndex + 2;\n\n        var info = dragDrop.prepare(e);\n        if (!info.start || drag.hasClass('beingdragged')) {\n            return;\n        }\n\n        drag.addClass('beingdragged').css('transform', '').css('z-index', newIndex);\n        var currentPlace = this.getClassnameNumericSuffix(drag, 'inplace');\n        if (currentPlace !== null) {\n            this.setInputValue(currentPlace, 0);\n            drag.removeClass('inplace' + currentPlace);\n            var hiddenDrop = thisQ.getDrop(drag, currentPlace);\n            if (hiddenDrop.length) {\n                hiddenDrop.addClass('active');\n                drag.offset(hiddenDrop.offset());\n            }\n        } else {\n            var hiddenDrag = thisQ.getDragClone(drag);\n            if (hiddenDrag.length) {\n                if (drag.hasClass('infinite')) {\n                    var noOfDrags = this.noOfDropsInGroup(thisQ.getGroup(drag));\n                    var cloneDrags = this.getInfiniteDragClones(drag, false);\n                    if (cloneDrags.length < noOfDrags) {\n                        var cloneDrag = drag.clone();\n                        cloneDrag.removeClass('beingdragged');\n                        cloneDrag.removeAttr('tabindex');\n                        hiddenDrag.after(cloneDrag);\n                        questionManager.addEventHandlersToDrag(cloneDrag);\n                        drag.offset(cloneDrag.offset());\n                    } else {\n                        hiddenDrag.addClass('active');\n                        drag.offset(hiddenDrag.offset());\n                    }\n                } else {\n                    hiddenDrag.addClass('active');\n                    drag.offset(hiddenDrag.offset());\n                }\n            }\n        }\n\n        dragDrop.start(e, drag, function(x, y, drag) {\n            thisQ.dragMove(x, y, drag);\n        }, function(x, y, drag) {\n            thisQ.dragEnd(x, y, drag);\n        });\n    };\n\n    /**\n     * Called whenever the currently dragged items moves.\n     *\n     * @param {Number} pageX the x position.\n     * @param {Number} pageY the y position.\n     * @param {jQuery} drag the item being moved.\n     */\n    DragDropOntoImageQuestion.prototype.dragMove = function(pageX, pageY, drag) {\n        var thisQ = this,\n            highlighted = false;\n        this.getRoot().find('.dropzone.group' + this.getGroup(drag)).each(function(i, dropNode) {\n            var drop = $(dropNode);\n            if (thisQ.isPointInDrop(pageX, pageY, drop) && !highlighted) {\n                highlighted = true;\n                drop.addClass('valid-drag-over-drop');\n            } else {\n                drop.removeClass('valid-drag-over-drop');\n            }\n        });\n        this.getRoot().find('.draghome.placed.group' + this.getGroup(drag)).not('.beingdragged').each(function(i, dropNode) {\n            var drop = $(dropNode);\n            if (thisQ.isPointInDrop(pageX, pageY, drop) && !highlighted && !thisQ.isDragSameAsDrop(drag, drop)) {\n                highlighted = true;\n                drop.addClass('valid-drag-over-drop');\n            } else {\n                drop.removeClass('valid-drag-over-drop');\n            }\n        });\n    };\n\n    /**\n     * Called when user drops a drag item.\n     *\n     * @param {Number} pageX the x position.\n     * @param {Number} pageY the y position.\n     * @param {jQuery} drag the item being moved.\n     */\n    DragDropOntoImageQuestion.prototype.dragEnd = function(pageX, pageY, drag) {\n        var thisQ = this,\n            root = this.getRoot(),\n            placed = false;\n\n        // Looking for drag that was dropped on a dropzone.\n        root.find('.dropzone.group' + this.getGroup(drag)).each(function(i, dropNode) {\n            var drop = $(dropNode);\n            if (!thisQ.isPointInDrop(pageX, pageY, drop)) {\n                // Not this drop.\n                return true;\n            }\n\n            // Now put this drag into the drop.\n            drop.removeClass('valid-drag-over-drop');\n            thisQ.sendDragToDrop(drag, drop);\n            placed = true;\n            return false; // Stop the each() here.\n        });\n\n        if (!placed) {\n            // Looking for drag that was dropped on a placed drag.\n            root.find('.draghome.placed.group' + this.getGroup(drag)).not('.beingdragged').each(function(i, placedNode) {\n                var placedDrag = $(placedNode);\n                if (!thisQ.isPointInDrop(pageX, pageY, placedDrag) || thisQ.isDragSameAsDrop(drag, placedDrag)) {\n                    // Not this placed drag.\n                    return true;\n                }\n\n                // Now put this drag into the drop.\n                placedDrag.removeClass('valid-drag-over-drop');\n                var currentPlace = thisQ.getClassnameNumericSuffix(placedDrag, 'inplace');\n                var drop = thisQ.getDrop(drag, currentPlace);\n                thisQ.sendDragToDrop(drag, drop);\n                placed = true;\n                return false; // Stop the each() here.\n            });\n        }\n\n        if (!placed) {\n            this.sendDragHome(drag);\n        }\n    };\n\n    /**\n     * Animate a drag item into a given place (or back home).\n     *\n     * @param {jQuery|null} drag the item to place. If null, clear the place.\n     * @param {jQuery} drop the place to put it.\n     */\n    DragDropOntoImageQuestion.prototype.sendDragToDrop = function(drag, drop) {\n        // Is there already a drag in this drop? if so, evict it.\n        var oldDrag = this.getCurrentDragInPlace(this.getPlace(drop));\n        if (oldDrag.length !== 0) {\n            oldDrag.addClass('beingdragged');\n            oldDrag.offset(oldDrag.offset());\n            var currentPlace = this.getClassnameNumericSuffix(oldDrag, 'inplace');\n            var hiddenDrop = this.getDrop(oldDrag, currentPlace);\n            hiddenDrop.addClass('active');\n            this.sendDragHome(oldDrag);\n        }\n\n        if (drag.length === 0) {\n            this.setInputValue(this.getPlace(drop), 0);\n            if (drop.data('isfocus')) {\n                drop.focus();\n            }\n        } else {\n            this.setInputValue(this.getPlace(drop), this.getChoice(drag));\n            drag.removeClass('unplaced')\n                .addClass('placed inplace' + this.getPlace(drop));\n            drag.attr('tabindex', 0);\n            this.animateTo(drag, drop);\n        }\n    };\n\n    /**\n     * Animate a drag back to its home.\n     *\n     * @param {jQuery} drag the item being moved.\n     */\n    DragDropOntoImageQuestion.prototype.sendDragHome = function(drag) {\n        var currentPlace = this.getClassnameNumericSuffix(drag, 'inplace');\n        if (currentPlace !== null) {\n            drag.removeClass('inplace' + currentPlace);\n        }\n        drag.data('unplaced', true);\n\n        this.animateTo(drag, this.getDragHome(this.getGroup(drag), this.getChoice(drag)));\n    };\n\n    /**\n     * Handles keyboard events on drops.\n     *\n     * Drops are focusable. Once focused, right/down/space switches to the next choice, and\n     * left/up switches to the previous. Escape clear.\n     *\n     * @param {KeyboardEvent} e\n     */\n    DragDropOntoImageQuestion.prototype.handleKeyPress = function(e) {\n        var drop = $(e.target).closest('.dropzone');\n        if (drop.length === 0) {\n            var placedDrag = $(e.target);\n            var currentPlace = this.getClassnameNumericSuffix(placedDrag, 'inplace');\n            if (currentPlace !== null) {\n                drop = this.getDrop(placedDrag, currentPlace);\n            }\n        }\n        var currentDrag = this.getCurrentDragInPlace(this.getPlace(drop)),\n            nextDrag = $();\n\n        switch (e.keyCode) {\n            case keys.space:\n            case keys.arrowRight:\n            case keys.arrowDown:\n                nextDrag = this.getNextDrag(this.getGroup(drop), currentDrag);\n                break;\n\n            case keys.arrowLeft:\n            case keys.arrowUp:\n                nextDrag = this.getPreviousDrag(this.getGroup(drop), currentDrag);\n                break;\n\n            case keys.escape:\n                questionManager.isKeyboardNavigation = false;\n                break;\n\n            default:\n                questionManager.isKeyboardNavigation = false;\n                return; // To avoid the preventDefault below.\n        }\n\n        if (nextDrag.length) {\n            nextDrag.data('isfocus', true);\n            nextDrag.addClass('beingdragged');\n            var hiddenDrag = this.getDragClone(nextDrag);\n            if (hiddenDrag.length) {\n                if (nextDrag.hasClass('infinite')) {\n                    var noOfDrags = this.noOfDropsInGroup(this.getGroup(nextDrag));\n                    var cloneDrags = this.getInfiniteDragClones(nextDrag, false);\n                    if (cloneDrags.length < noOfDrags) {\n                        var cloneDrag = nextDrag.clone();\n                        cloneDrag.removeClass('beingdragged');\n                        cloneDrag.removeAttr('tabindex');\n                        hiddenDrag.after(cloneDrag);\n                        questionManager.addEventHandlersToDrag(cloneDrag);\n                        nextDrag.offset(cloneDrag.offset());\n                    } else {\n                        hiddenDrag.addClass('active');\n                        nextDrag.offset(hiddenDrag.offset());\n                    }\n                } else {\n                    hiddenDrag.addClass('active');\n                    nextDrag.offset(hiddenDrag.offset());\n                }\n            }\n        } else {\n            drop.data('isfocus', true);\n        }\n\n        e.preventDefault();\n        this.sendDragToDrop(nextDrag, drop);\n    };\n\n    /**\n     * Choose the next drag in a group.\n     *\n     * @param {int} group which group.\n     * @param {jQuery} drag current choice (empty jQuery if there isn't one).\n     * @return {jQuery} the next drag in that group, or null if there wasn't one.\n     */\n    DragDropOntoImageQuestion.prototype.getNextDrag = function(group, drag) {\n        var choice,\n            numChoices = this.noOfChoicesInGroup(group);\n\n        if (drag.length === 0) {\n            choice = 1; // Was empty, so we want to select the first choice.\n        } else {\n            choice = this.getChoice(drag) + 1;\n        }\n\n        var next = this.getUnplacedChoice(group, choice);\n        while (next.length === 0 && choice < numChoices) {\n            choice++;\n            next = this.getUnplacedChoice(group, choice);\n        }\n\n        return next;\n    };\n\n    /**\n     * Choose the previous drag in a group.\n     *\n     * @param {int} group which group.\n     * @param {jQuery} drag current choice (empty jQuery if there isn't one).\n     * @return {jQuery} the next drag in that group, or null if there wasn't one.\n     */\n    DragDropOntoImageQuestion.prototype.getPreviousDrag = function(group, drag) {\n        var choice;\n\n        if (drag.length === 0) {\n            choice = this.noOfChoicesInGroup(group);\n        } else {\n            choice = this.getChoice(drag) - 1;\n        }\n\n        var previous = this.getUnplacedChoice(group, choice);\n        while (previous.length === 0 && choice > 1) {\n            choice--;\n            previous = this.getUnplacedChoice(group, choice);\n        }\n\n        // Does this choice exist?\n        return previous;\n    };\n\n    /**\n     * Animate an object to the given destination.\n     *\n     * @param {jQuery} drag the element to be animated.\n     * @param {jQuery} target element marking the place to move it to.\n     */\n    DragDropOntoImageQuestion.prototype.animateTo = function(drag, target) {\n        var currentPos = drag.offset(),\n            targetPos = target.offset(),\n            thisQ = this;\n\n        M.util.js_pending('qtype_ddimageortext-animate-' + thisQ.containerId);\n        // Animate works in terms of CSS position, whereas locating an object\n        // on the page works best with jQuery offset() function. So, to get\n        // the right target position, we work out the required change in\n        // offset() and then add that to the current CSS position.\n        drag.animate(\n            {\n                left: parseInt(drag.css('left')) + targetPos.left - currentPos.left,\n                top: parseInt(drag.css('top')) + targetPos.top - currentPos.top\n            },\n            {\n                duration: 'fast',\n                done: function() {\n                    $('body').trigger('qtype_ddimageortext-dragmoved', [drag, target, thisQ]);\n                    M.util.js_complete('qtype_ddimageortext-animate-' + thisQ.containerId);\n                }\n            }\n        );\n    };\n\n    /**\n     * Detect if a point is inside a given DOM node.\n     *\n     * @param {Number} pageX the x position.\n     * @param {Number} pageY the y position.\n     * @param {jQuery} drop the node to check (typically a drop).\n     * @return {boolean} whether the point is inside the node.\n     */\n    DragDropOntoImageQuestion.prototype.isPointInDrop = function(pageX, pageY, drop) {\n        var position = drop.offset();\n        if (drop.hasClass('draghome')) {\n            return pageX >= position.left && pageX < position.left + drop.outerWidth()\n                && pageY >= position.top && pageY < position.top + drop.outerHeight();\n        }\n        return pageX >= position.left && pageX < position.left + drop.width()\n            && pageY >= position.top && pageY < position.top + drop.height();\n    };\n\n    /**\n     * Set the value of the hidden input for a place, to record what is currently there.\n     *\n     * @param {int} place which place to set the input value for.\n     * @param {int} choice the value to set.\n     */\n    DragDropOntoImageQuestion.prototype.setInputValue = function(place, choice) {\n        this.getRoot().find('input.placeinput.place' + place).val(choice);\n    };\n\n    /**\n     * Get the outer div for this question.\n     *\n     * @returns {jQuery} containing that div.\n     */\n    DragDropOntoImageQuestion.prototype.getRoot = function() {\n        return $(document.getElementById(this.containerId));\n    };\n\n    /**\n     * Get the img that is the background image.\n     * @returns {jQuery} containing that img.\n     */\n    DragDropOntoImageQuestion.prototype.bgImage = function() {\n        return this.getRoot().find('img.dropbackground');\n    };\n\n    /**\n     * Get drag home for a given choice.\n     *\n     * @param {int} group the group.\n     * @param {int} choice the choice number.\n     * @returns {jQuery} containing that div.\n     */\n    DragDropOntoImageQuestion.prototype.getDragHome = function(group, choice) {\n        if (!this.getRoot().find('.draghome.dragplaceholder.group' + group + '.choice' + choice).is(':visible')) {\n            return this.getRoot().find('.dragitemgroup' + group +\n                ' .draghome.infinite' +\n                '.choice' + choice +\n                '.group' + group);\n        }\n        return this.getRoot().find('.draghome.dragplaceholder.group' + group + '.choice' + choice);\n    };\n\n    /**\n     * Get an unplaced choice for a particular group.\n     *\n     * @param {int} group the group.\n     * @param {int} choice the choice number.\n     * @returns {jQuery} jQuery wrapping the unplaced choice. If there isn't one, the jQuery will be empty.\n     */\n    DragDropOntoImageQuestion.prototype.getUnplacedChoice = function(group, choice) {\n        return this.getRoot().find('.ddarea .draghome.group' + group + '.choice' + choice + '.unplaced').slice(0, 1);\n    };\n\n    /**\n     * Get the drag that is currently in a given place.\n     *\n     * @param {int} place the place number.\n     * @return {jQuery} the current drag (or an empty jQuery if none).\n     */\n    DragDropOntoImageQuestion.prototype.getCurrentDragInPlace = function(place) {\n        return this.getRoot().find('.ddarea .draghome.inplace' + place);\n    };\n\n    /**\n     * Return the number of blanks in a given group.\n     *\n     * @param {int} group the group number.\n     * @returns {int} the number of drops.\n     */\n    DragDropOntoImageQuestion.prototype.noOfDropsInGroup = function(group) {\n        return this.getRoot().find('.dropzone.group' + group).length;\n    };\n\n    /**\n     * Return the number of choices in a given group.\n     *\n     * @param {int} group the group number.\n     * @returns {int} the number of choices.\n     */\n    DragDropOntoImageQuestion.prototype.noOfChoicesInGroup = function(group) {\n        return this.getRoot().find('.dragitemgroup' + group + ' .draghome').length;\n    };\n\n    /**\n     * Return the number at the end of the CSS class name with the given prefix.\n     *\n     * @param {jQuery} node\n     * @param {String} prefix name prefix\n     * @returns {Number|null} the suffix if found, else null.\n     */\n    DragDropOntoImageQuestion.prototype.getClassnameNumericSuffix = function(node, prefix) {\n        var classes = node.attr('class');\n        if (classes !== '') {\n            var classesArr = classes.split(' ');\n            for (var index = 0; index < classesArr.length; index++) {\n                var patt1 = new RegExp('^' + prefix + '([0-9])+$');\n                if (patt1.test(classesArr[index])) {\n                    var patt2 = new RegExp('([0-9])+$');\n                    var match = patt2.exec(classesArr[index]);\n                    return Number(match[0]);\n                }\n            }\n        }\n        return null;\n    };\n\n    /**\n     * Get the choice number of a drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @returns {Number} the choice number.\n     */\n    DragDropOntoImageQuestion.prototype.getChoice = function(drag) {\n        return this.getClassnameNumericSuffix(drag, 'choice');\n    };\n\n    /**\n     * Given a DOM node that is significant to this question\n     * (drag, drop, ...) get the group it belongs to.\n     *\n     * @param {jQuery} node a DOM node.\n     * @returns {Number} the group it belongs to.\n     */\n    DragDropOntoImageQuestion.prototype.getGroup = function(node) {\n        return this.getClassnameNumericSuffix(node, 'group');\n    };\n\n    /**\n     * Get the place number of a drop, or its corresponding hidden input.\n     *\n     * @param {jQuery} node the DOM node.\n     * @returns {Number} the place number.\n     */\n    DragDropOntoImageQuestion.prototype.getPlace = function(node) {\n        return this.getClassnameNumericSuffix(node, 'place');\n    };\n\n    /**\n     * Get drag clone for a given drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @returns {jQuery} the drag's clone.\n     */\n    DragDropOntoImageQuestion.prototype.getDragClone = function(drag) {\n        return this.getRoot().find('.dragitemgroup' +\n            this.getGroup(drag) +\n            ' .draghome' +\n            '.choice' + this.getChoice(drag) +\n            '.group' + this.getGroup(drag) +\n            '.dragplaceholder');\n    };\n\n    /**\n     * Get infinite drag clones for given drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @param {Boolean} inHome in the home area or not.\n     * @returns {jQuery} the drag's clones.\n     */\n    DragDropOntoImageQuestion.prototype.getInfiniteDragClones = function(drag, inHome) {\n        if (inHome) {\n            return this.getRoot().find('.dragitemgroup' +\n                this.getGroup(drag) +\n                ' .draghome' +\n                '.choice' + this.getChoice(drag) +\n                '.group' + this.getGroup(drag) +\n                '.infinite').not('.dragplaceholder');\n        }\n        return this.getRoot().find('.draghome' +\n            '.choice' + this.getChoice(drag) +\n            '.group' + this.getGroup(drag) +\n            '.infinite').not('.dragplaceholder');\n    };\n\n    /**\n     * Get drop for a given drag and place.\n     *\n     * @param {jQuery} drag the drag.\n     * @param {Integer} currentPlace the current place of drag.\n     * @returns {jQuery} the drop's clone.\n     */\n    DragDropOntoImageQuestion.prototype.getDrop = function(drag, currentPlace) {\n        return this.getRoot().find('.dropzone.group' + this.getGroup(drag) + '.place' + currentPlace);\n    };\n\n    /**\n     * Handle when the window is resized.\n     */\n    DragDropOntoImageQuestion.prototype.handleResize = function() {\n        var thisQ = this,\n            bgRatio = this.bgRatio();\n        if (this.isPrinting) {\n            bgRatio = 1;\n        }\n\n        this.getRoot().find('.ddarea .dropzone').each(function(i, dropNode) {\n            $(dropNode)\n                .css('left', parseInt($(dropNode).data('originX')) * parseFloat(bgRatio))\n                .css('top', parseInt($(dropNode).data('originY')) * parseFloat(bgRatio));\n            thisQ.handleElementScale(dropNode, 'left top');\n        });\n\n        this.getRoot().find('div.droparea .draghome').not('.beingdragged').each(function(key, drag) {\n            $(drag)\n                .css('left', parseFloat($(drag).data('originX')) * parseFloat(bgRatio))\n                .css('top', parseFloat($(drag).data('originY')) * parseFloat(bgRatio));\n            thisQ.handleElementScale(drag, 'left top');\n        });\n    };\n\n    /**\n     * Return the background ratio.\n     *\n     * @returns {number} Background ratio.\n     */\n    DragDropOntoImageQuestion.prototype.bgRatio = function() {\n        var bgImg = this.bgImage();\n        var bgImgNaturalWidth = bgImg.get(0).naturalWidth;\n        var bgImgClientWidth = bgImg.width();\n\n        return bgImgClientWidth / bgImgNaturalWidth;\n    };\n\n    /**\n     * Scale the drag if needed.\n     *\n     * @param {jQuery} element the item to place.\n     * @param {String} type scaling type\n     */\n    DragDropOntoImageQuestion.prototype.handleElementScale = function(element, type) {\n        var bgRatio = parseFloat(this.bgRatio());\n        if (this.isPrinting) {\n            bgRatio = 1;\n        }\n        $(element).css({\n            '-webkit-transform': 'scale(' + bgRatio + ')',\n            '-moz-transform': 'scale(' + bgRatio + ')',\n            '-ms-transform': 'scale(' + bgRatio + ')',\n            '-o-transform': 'scale(' + bgRatio + ')',\n            'transform': 'scale(' + bgRatio + ')',\n            'transform-origin': type\n        });\n    };\n\n    /**\n     * Calculate z-index value.\n     *\n     * @returns {number} z-index value\n     */\n    DragDropOntoImageQuestion.prototype.calculateZIndex = function() {\n        var zIndex = 0;\n        this.getRoot().find('.ddarea .dropzone, div.droparea .draghome').each(function(i, dropNode) {\n            dropNode = $(dropNode);\n            // Note that webkit browsers won't return the z-index value from the CSS stylesheet\n            // if the element doesn't have a position specified. Instead it'll return \"auto\".\n            var itemZIndex = dropNode.css('z-index') ? parseInt(dropNode.css('z-index')) : 0;\n\n            if (itemZIndex > zIndex) {\n                zIndex = itemZIndex;\n            }\n        });\n\n        return zIndex;\n    };\n\n    /**\n     * Check that the drag is drop to it's clone.\n     *\n     * @param {jQuery} drag The drag.\n     * @param {jQuery} drop The drop.\n     * @returns {boolean}\n     */\n    DragDropOntoImageQuestion.prototype.isDragSameAsDrop = function(drag, drop) {\n        return this.getChoice(drag) === this.getChoice(drop) && this.getGroup(drag) === this.getGroup(drop);\n    };\n\n    /**\n     * Singleton object that handles all the DragDropOntoImageQuestions\n     * on the page, and deals with event dispatching.\n     * @type {Object}\n     */\n    var questionManager = {\n\n        /**\n         * {boolean} ensures that the event handlers are only initialised once per page.\n         */\n        eventHandlersInitialised: false,\n\n        /**\n         * {Object} ensures that the drag event handlers are only initialised once per question,\n         * indexed by containerId (id on the .que div).\n         */\n        dragEventHandlersInitialised: {},\n\n        /**\n         * {boolean} is printing or not.\n         */\n        isPrinting: false,\n\n        /**\n         * {boolean} is keyboard navigation or not.\n         */\n        isKeyboardNavigation: false,\n\n        /**\n         * {Object} all the questions on this page, indexed by containerId (id on the .que div).\n         */\n        questions: {}, // An object containing all the information about each question on the page.\n\n        /**\n         * Initialise one question.\n         *\n         * @method\n         * @param {String} containerId the id of the div.que that contains this question.\n         * @param {boolean} readOnly whether the question is read-only.\n         * @param {Array} places data.\n         */\n        init: function(containerId, readOnly, places) {\n            questionManager.questions[containerId] =\n                new DragDropOntoImageQuestion(containerId, readOnly, places);\n            if (!questionManager.eventHandlersInitialised) {\n                questionManager.setupEventHandlers();\n                questionManager.eventHandlersInitialised = true;\n            }\n            if (!questionManager.dragEventHandlersInitialised.hasOwnProperty(containerId)) {\n                questionManager.dragEventHandlersInitialised[containerId] = true;\n                // We do not use the body event here to prevent the other event on Mobile device, such as scroll event.\n                var questionContainer = document.getElementById(containerId);\n                if (questionContainer.classList.contains('ddimageortext') &&\n                    !questionContainer.classList.contains('qtype_ddimageortext-readonly')) {\n                    // TODO: Convert all the jQuery selectors and events to native Javascript.\n                    questionManager.addEventHandlersToDrag($(questionContainer).find('.draghome'));\n                }\n            }\n        },\n\n        /**\n         * Set up the event handlers that make this question type work. (Done once per page.)\n         */\n        setupEventHandlers: function() {\n            $('body')\n                .on('keydown',\n                    '.que.ddimageortext:not(.qtype_ddimageortext-readonly) .dropzones .dropzone',\n                    questionManager.handleKeyPress)\n                .on('keydown',\n                    '.que.ddimageortext:not(.qtype_ddimageortext-readonly) .draghome.placed:not(.beingdragged)',\n                    questionManager.handleKeyPress)\n                .on('qtype_ddimageortext-dragmoved', questionManager.handleDragMoved);\n            $(window).on('resize', function() {\n                questionManager.handleWindowResize(false);\n            });\n            window.addEventListener('beforeprint', function() {\n                questionManager.isPrinting = true;\n                questionManager.handleWindowResize(questionManager.isPrinting);\n            });\n            window.addEventListener('afterprint', function() {\n                questionManager.isPrinting = false;\n                questionManager.handleWindowResize(questionManager.isPrinting);\n            });\n            setTimeout(function() {\n                questionManager.fixLayoutIfThingsMoved();\n            }, 100);\n        },\n\n        /**\n         * Binding the drag/touch event again for newly created element.\n         *\n         * @param {jQuery} element Element to bind the event\n         */\n        addEventHandlersToDrag: function(element) {\n            // Unbind all the mousedown and touchstart events to prevent double binding.\n            element.unbind('mousedown touchstart');\n            element.on('mousedown touchstart', questionManager.handleDragStart);\n        },\n\n        /**\n         * Handle mouse down / touch start events on drags.\n         * @param {Event} e the DOM event.\n         */\n        handleDragStart: function(e) {\n            e.preventDefault();\n            var question = questionManager.getQuestionForEvent(e);\n            if (question) {\n                question.handleDragStart(e);\n            }\n        },\n\n        /**\n         * Handle key down / press events on drags.\n         * @param {KeyboardEvent} e\n         */\n        handleKeyPress: function(e) {\n            if (questionManager.isKeyboardNavigation) {\n                return;\n            }\n            questionManager.isKeyboardNavigation = true;\n            var question = questionManager.getQuestionForEvent(e);\n            if (question) {\n                question.handleKeyPress(e);\n            }\n        },\n\n        /**\n         * Handle when the window is resized.\n         * @param {boolean} isPrinting\n         */\n        handleWindowResize: function(isPrinting) {\n            for (var containerId in questionManager.questions) {\n                if (questionManager.questions.hasOwnProperty(containerId)) {\n                    questionManager.questions[containerId].isPrinting = isPrinting;\n                    questionManager.questions[containerId].handleResize();\n                }\n            }\n        },\n\n        /**\n         * Sometimes, despite our best efforts, things change in a way that cannot\n         * be specifically caught (e.g. dock expanding or collapsing in Boost).\n         * Therefore, we need to periodically check everything is in the right position.\n         */\n        fixLayoutIfThingsMoved: function() {\n            this.handleWindowResize(questionManager.isPrinting);\n            // We use setTimeout after finishing work, rather than setInterval,\n            // in case positioning things is slow. We want 100 ms gap\n            // between executions, not what setInterval does.\n            setTimeout(function() {\n                questionManager.fixLayoutIfThingsMoved(questionManager.isPrinting);\n            }, 100);\n        },\n\n        /**\n         * Handle when drag moved.\n         *\n         * @param {Event} e the event.\n         * @param {jQuery} drag the drag\n         * @param {jQuery} target the target\n         * @param {DragDropOntoImageQuestion} thisQ the question.\n         */\n        handleDragMoved: function(e, drag, target, thisQ) {\n            drag.removeClass('beingdragged').css('z-index', '');\n            drag.css('top', target.position().top).css('left', target.position().left);\n            target.after(drag);\n            target.removeClass('active');\n            if (typeof drag.data('unplaced') !== 'undefined' && drag.data('unplaced') === true) {\n                drag.removeClass('placed').addClass('unplaced');\n                drag.removeAttr('tabindex');\n                drag.removeData('unplaced');\n                drag.css('top', '')\n                    .css('left', '')\n                    .css('transform', '');\n                if (drag.hasClass('infinite') && thisQ.getInfiniteDragClones(drag, true).length > 1) {\n                    thisQ.getInfiniteDragClones(drag, true).first().remove();\n                }\n            } else {\n                drag.data('originX', target.data('originX')).data('originY', target.data('originY'));\n                thisQ.handleElementScale(drag, 'left top');\n            }\n            if (typeof drag.data('isfocus') !== 'undefined' && drag.data('isfocus') === true) {\n                drag.focus();\n                drag.removeData('isfocus');\n            }\n            if (typeof target.data('isfocus') !== 'undefined' && target.data('isfocus') === true) {\n                target.removeData('isfocus');\n            }\n            if (questionManager.isKeyboardNavigation) {\n                questionManager.isKeyboardNavigation = false;\n            }\n            if (thisQ.isQuestionInteracted()) {\n                // The user has interacted with the draggable items. We need to mark the form as dirty.\n                questionManager.handleFormDirty();\n                // Save the new answered value.\n                thisQ.questionAnswer = thisQ.getQuestionAnsweredValues();\n            }\n        },\n\n        /**\n         * Given an event, work out which question it effects.\n         * @param {Event} e the event.\n         * @returns {DragDropOntoImageQuestion|undefined} The question, or undefined.\n         */\n        getQuestionForEvent: function(e) {\n            var containerId = $(e.currentTarget).closest('.que.ddimageortext').attr('id');\n            return questionManager.questions[containerId];\n        },\n\n        /**\n         * Handle when the form is dirty.\n         */\n        handleFormDirty: function() {\n            const responseForm = document.getElementById('responseform');\n            FormChangeChecker.markFormAsDirty(responseForm);\n        }\n    };\n\n    /**\n     * @alias module:qtype_ddimageortext/question\n     */\n    return {\n        init: questionManager.init\n    };\n});\n"],"names":["define","$","dragDrop","keys","FormChangeChecker","filterEvent","DragDropOntoImageQuestion","containerId","readOnly","places","questionAnswer","questionDragDropWidthHeight","M","util","js_pending","this","allImagesLoaded","imageLoadingTimeoutId","isPrinting","getRoot","addClass","thisQ","getNotYetLoadedImages","one","waitForAllImagesToBeLoaded","prototype","changeAllDragsAndDropsToFilteredContent","filteredElement","currentFilteredItem","parentIsDD","parent","closest","hasClass","isDD","find","length","group","getGroup","choice","getChoice","listOfModifiedDragDrop","each","i","node","get","originalClass","attr","originalStyle","filteredDragDropClone","clone","questionManager","addEventHandlersToDrag","before","push","forEach","remove","currentHeight","height","currentWidth","width","offsetWidth","offsetHeight","classList","add","maxWidth","Math","ceil","maxHeight","resizeAllDragsAndDropsInGroup","clearTimeout","setTimeout","setupQuestion","document","addEventListener","eventTypes","filterContentRenderingComplete","elements","detail","nodes","element","not","imgNode","imageIsLoaded","imgElement","complete","naturalHeight","resizeAllDragsAndDrops","cloneDrags","positionDragsAndDrops","js_complete","getClassnameNumericSuffix","root","dragHomes","drag","max","css","hasOwnProperty","place","label","text","parseInt","get_string","append","index","dragHome","placeHolder","removeClass","cloneDragsForOneChoice","noOfDrags","noOfDropsInGroup","cloneDrag","offset","bgRatio","dropNode","drop","getPlace","xy","data","handleElementScale","dragNode","currentPlace","removeAttr","inputNode","input","val","unplacedDrag","getUnplacedChoice","hiddenDrag","getDragClone","getInfiniteDragClones","after","sendDragToDrop","getQuestionAnsweredValues","result","id","value","isQuestionInteracted","oldAnswer","newAnswer","isInteracted","JSON","stringify","Object","key","handleDragStart","e","target","newIndex","calculateZIndex","prepare","start","setInputValue","hiddenDrop","getDrop","x","y","dragMove","dragEnd","pageX","pageY","highlighted","isPointInDrop","isDragSameAsDrop","placed","placedNode","placedDrag","sendDragHome","oldDrag","getCurrentDragInPlace","focus","animateTo","getDragHome","handleKeyPress","currentDrag","nextDrag","keyCode","space","arrowRight","arrowDown","getNextDrag","arrowLeft","arrowUp","getPreviousDrag","escape","isKeyboardNavigation","preventDefault","numChoices","noOfChoicesInGroup","next","previous","currentPos","targetPos","animate","left","top","duration","done","trigger","position","outerWidth","outerHeight","getElementById","bgImage","is","slice","prefix","classes","classesArr","split","RegExp","test","match","exec","Number","inHome","handleResize","parseFloat","bgImg","bgImgNaturalWidth","naturalWidth","type","zIndex","itemZIndex","eventHandlersInitialised","dragEventHandlersInitialised","questions","init","setupEventHandlers","questionContainer","contains","on","handleDragMoved","window","handleWindowResize","fixLayoutIfThingsMoved","unbind","question","getQuestionForEvent","removeData","first","handleFormDirty","currentTarget","responseForm","markFormAsDirty"],"mappings":";;;;;;;AAsBAA,sCAAO,CACH,SACA,gBACA,iBACA,0BACA,wBACD,SACCC,EACAC,SACAC,KACAC,kBACAC,sBAaSC,0BAA0BC,YAAaC,SAAUC,aACjDF,YAAcA,iBACdG,eAAiB,QACjBC,4BAA8B,GACnCC,EAAEC,KAAKC,WAAW,4BAA8BC,KAAKR,kBAChDE,OAASA,YACTO,iBAAkB,OAClBC,sBAAwB,UACxBC,YAAa,EACdV,eACKW,UAAUC,SAAS,oCAGxBC,MAAQN,UACPO,wBAAwBC,IAAI,QAAQ,WACrCF,MAAMG,qCAELA,6BAQTlB,0BAA0BmB,UAAUC,wCAA0C,SAASC,qBAC/EC,oBAAsB3B,EAAE0B,uBACtBE,WAAaD,oBAAoBE,SAASC,QAAQ,OAAOC,SAAS,WACpEJ,oBAAoBE,SAASE,SAAS,YACpCC,KAAOL,oBAAoBI,SAAS,WAAaJ,oBAAoBI,SAAS,gBAE/EH,aAAeI,eAGhBJ,aACAD,oBAAsBA,oBAAoBE,SAASC,QAAQ,QAE3DhB,KAAKI,UAAUe,KAAKN,qBAAqBO,QAAU,eAKjDC,MAAQrB,KAAKsB,SAAST,qBACxBU,OAASvB,KAAKwB,UAAUX,yBACxBY,uBAAyB,QAExBrB,UAAUe,KAAK,SAAWE,MAAQ,UAAYE,QAAQG,MAAK,SAASC,EAAGC,SAEpE1C,EAAE0C,MAAMC,IAAI,KAAOhB,oBAAoBgB,IAAI,gBAGzCC,cAAgB5C,EAAE0C,MAAMG,KAAK,SAC7BC,cAAgB9C,EAAE0C,MAAMG,KAAK,SAE7BE,sBAAwBpB,oBAAoBqB,QAIlDC,gBAAgBC,uBAAuBH,uBAEvCA,sBAAsBF,KAAK,QAASD,eACpCG,sBAAsBF,KAAK,QAASC,eAEpC9C,EAAE0C,MAAMS,OAAOJ,uBAEfR,uBAAuBa,KAAKV,SAGhCH,uBAAuBc,SAAQ,SAASX,MACpC1C,EAAE0C,MAAMY,kBAGNC,cAAgB5B,oBAAoB6B,SACpCC,aAAe9B,oBAAoB+B,QAEzC/B,oBAAoB6B,OAAO,QAC3B7B,oBAAoB+B,MAAM,QAGrBhC,gBAAgBiC,aAAgBjC,gBAAgBkC,cACjDlC,gBAAgBmC,UAAUC,IAAI,WAE9BhD,KAAKJ,4BAA4ByB,OAAO4B,SAAWC,KAAKC,KAAKvC,gBAAgBiC,cAC7E7C,KAAKJ,4BAA4ByB,OAAO+B,UAAYF,KAAKC,KAAK,EAAIvC,gBAAgBkC,eAElFlC,gBAAgBmC,UAAUP,OAAO,gBAE5Ba,8BAA8BhC,SAEnCR,oBAAoB6B,OAAOD,eAC3B5B,oBAAoB+B,MAAMD,eAG9B/B,gBAAgBmC,UAAUP,OAAO,YASrCjD,0BAA0BmB,UAAUD,2BAA6B,eACzDH,MAAQN,KAIRA,KAAKC,kBAK0B,OAA/BD,KAAKE,uBACLoD,aAAatD,KAAKE,uBAMlBF,KAAKO,wBAAwBa,OAAS,OACjClB,sBAAwBqD,YAAW,WACpCjD,MAAMG,+BACP,WAKFR,iBAAkB,EACvBK,MAAMkD,gBAENC,SAASC,iBAAiBpE,YAAYqE,WAAWC,gCAAiCC,WAC9EA,SAASC,OAAOC,MAAMxB,SAASyB,UAC3B1D,MAAMK,wCAAwCqD,kBAU1DzE,0BAA0BmB,UAAUH,sBAAwB,eACpDD,MAAQN,YACLA,KAAKI,UAAUe,KAAK,eAAe8C,KAAI,SAAStC,EAAGuC,gBAC/C5D,MAAM6D,cAAcD,aAUnC3E,0BAA0BmB,UAAUyD,cAAgB,SAASC,mBAClDA,WAAWC,UAAyC,IAA7BD,WAAWE,eAM7C/E,0BAA0BmB,UAAU8C,cAAgB,gBAC3Ce,8BACAC,kBACAC,wBACL5E,EAAEC,KAAK4E,YAAY,4BAA8B1E,KAAKR,cAM1DD,0BAA0BmB,UAAU6D,uBAAyB,eACrDjE,MAAQN,UACPI,UAAUe,KAAK,oBAAoBO,MAAK,SAASC,EAAGC,MACrDtB,MAAM+C,8BACF/C,MAAMqE,0BAA0BzF,EAAE0C,MAAO,sBASrDrC,0BAA0BmB,UAAU2C,8BAAgC,SAAShC,WACrEuD,KAAO5E,KAAKI,UACZyE,UAAYD,KAAKzD,KAAK,kBAAoBE,OAC1C4B,SAAW,EACXG,UAAY,MAmBX,IAAIzB,KAhBTkD,UAAUnD,MAAK,SAASC,EAAGmD,MACvB7B,SAAWC,KAAK6B,IAAI9B,SAAUC,KAAKC,KAAK2B,KAAKjC,cAC7CO,UAAYF,KAAK6B,IAAI3B,UAAWF,KAAKC,KAAK2B,KAAKhC,kBAInDG,UAAY,GACZG,WAAa,QACRxD,4BAA4ByB,OAAS,CAAC4B,SAAAA,SAAUG,UAAAA,WAGrDyB,UAAUnD,MAAK,SAASC,EAAGmD,MACvB5F,EAAE4F,MAAMlC,MAAMK,UAAUP,OAAOU,WAAW4B,IAAI,aAAc5B,UAAY,SAI9DpD,KAAKN,UACVM,KAAKN,OAAOuF,eAAgBtD,QAG7BuD,MAAQlF,KAAKN,OAAOiC,GACpBwD,MAAQD,MAAME,KACdC,SAASH,MAAM7D,SAAWA,QAGhB,KAAV8D,QACAA,MAAQtF,EAAEC,KAAKwF,WAAW,QAAS,wBAE6C,IAAhFV,KAAKzD,KAAK,6BAA+B+D,MAAM7D,MAAQ,SAAWM,GAAGP,QACrEwD,KAAKzD,KAAK,cAAcoE,OAAO,oCAAsCL,MAAM7D,MACvE,SAAWM,EADgB,2CAEGwD,MAAQ,uBAE9CP,KAAKzD,KAAK,kBAAoBQ,GAAGiB,MAAMK,SAAW,GAAGP,OAAOU,UAAY,MAShF7D,0BAA0BmB,UAAU8D,WAAa,eACzClE,MAAQN,KACZM,MAAMF,UAAUe,KAAK,aAAaO,MAAK,SAAS8D,MAAOC,cAC/CX,KAAO5F,EAAEuG,UACTC,YAAcZ,KAAK5C,QACvBwD,YAAYC,cACZD,YAAYrF,SAAS,kBACjBC,MAAMkB,UAAUsD,MAAQ,SACxBxE,MAAMgB,SAASwD,MAAQ,oBAC3BA,KAAKzC,OAAOqD,iBASpBnG,0BAA0BmB,UAAUkF,uBAAyB,SAASH,aAC9DA,SAASxE,SAAS,oBACd4E,UAAY7F,KAAK8F,iBAAiB9F,KAAKsB,SAASmE,WAC3C9D,EAAI,EAAGA,EAAIkE,UAAWlE,SACtBoE,UAAUN,oBAGdM,UAAUN,WASvBlG,0BAA0BmB,UAAUqF,UAAY,SAASN,cACjDX,KAAOW,SAASvD,QACpB4C,KAAKa,YAAY,YACZtF,SAAS,mCACT2F,OAAOP,SAASO,eAChB5F,UAAUe,KAAK,cAAcoE,OAAOT,OAM7CvF,0BAA0BmB,UAAU+D,sBAAwB,eACpDnE,MAAQN,KACR4E,KAAO5E,KAAKI,UACZ6F,QAAUjG,KAAKiG,UAGnBrB,KAAKzD,KAAK,qBAAqBO,MAAK,SAASC,EAAGuE,cACxCC,KAAOjH,EAAEgH,UACThB,MAAQ5E,MAAMZ,OAAOY,MAAM8F,SAASD,OAExCA,KAAKnB,IAAI,OAAQK,SAASH,MAAMmB,GAAG,IAAMJ,SACpCjB,IAAI,MAAOK,SAASH,MAAMmB,GAAG,IAAMJ,SACxCE,KAAKG,KAAK,UAAWjB,SAASH,MAAMmB,GAAG,KAClCC,KAAK,UAAWjB,SAASH,MAAMmB,GAAG,KACvC/F,MAAMiG,mBAAmBJ,KAAM,eAInCvB,KAAKzD,KAAK,aAAa8C,IAAI,oBAAoBvC,MAAK,SAASC,EAAG6E,cACxD1B,KAAO5F,EAAEsH,UACTC,aAAenG,MAAMqE,0BAA0BG,KAAM,WACzDA,KAAKzE,SAAS,YACTsF,YAAY,UACjBb,KAAK4B,WAAW,YACK,OAAjBD,cACA3B,KAAKa,YAAY,UAAYc,iBAKrC7B,KAAKzD,KAAK,oBAAoBO,MAAK,SAASC,EAAGgF,eACvCC,MAAQ1H,EAAEyH,WACVpF,OAASqF,MAAMC,WACG,IAAlBtF,OAAOH,QAAiBG,OAAOH,OAAS,GAAgB,MAAXG,aAK7C2D,MAAQ5E,MAAM8F,SAASQ,OAEvBE,aAAexG,MAAMyG,kBAAkBzG,MAAMgB,SAASsF,OAAQrF,QAE9DyF,WAAa1G,MAAM2G,aAAaH,iBAChCE,WAAW5F,UACP0F,aAAa7F,SAAS,YAAa,KAC/B4E,UAAYvF,MAAMwF,iBAAiBxF,MAAMgB,SAASwF,kBACrCxG,MAAM4G,sBAAsBJ,cAAc,GAC5C1F,OAASyE,UAAW,KAC3BE,UAAYe,aAAa5E,QAC7B6D,UAAUJ,YAAY,gBACtBI,UAAUW,WAAW,YACrBM,WAAWG,MAAMpB,WAKjB5D,gBAAgBC,uBAAuB2D,gBAEvCiB,WAAW3G,SAAS,eAGxB2G,WAAW3G,SAAS,cAKxB8F,KAAOvB,KAAKzD,KAAK,kBAAoB+D,OACzC5E,MAAM8G,eAAeN,aAAcX,UAIvC7F,MAAMX,eAAiBW,MAAM+G,6BAQjC9H,0BAA0BmB,UAAU2G,0BAA4B,eACxDC,OAAS,eACRlH,UAAUe,KAAK,oBAAoBO,MAAK,CAACC,EAAGgF,aAC7CW,OAAOX,UAAUY,IAAMZ,UAAUa,SAG9BF,QAQX/H,0BAA0BmB,UAAU+G,qBAAuB,iBACjDC,UAAY1H,KAAKL,eACjBgI,UAAY3H,KAAKqH,gCACnBO,cAAe,SAGfC,KAAKC,UAAUH,aAAeE,KAAKC,UAAUJ,YAC7CE,cAAe,EACRA,eAGXG,OAAO3I,KAAKuI,WAAWpF,SAAQyF,MACvBL,UAAUK,OAASN,UAAUM,OAC7BJ,cAAe,MAIhBA,eAQXrI,0BAA0BmB,UAAUuH,gBAAkB,SAASC,OACvD5H,MAAQN,KACR8E,KAAO5F,EAAEgJ,EAAEC,QAAQnH,QAAQ,aAE3BoH,SADepI,KAAKqI,kBACM,KAEnBlJ,SAASmJ,QAAQJ,GAClBK,QAASzD,KAAK7D,SAAS,iBAIjC6D,KAAKzE,SAAS,gBAAgB2E,IAAI,YAAa,IAAIA,IAAI,UAAWoD,cAC9D3B,aAAezG,KAAK2E,0BAA0BG,KAAM,cACnC,OAAjB2B,aAAuB,MAClB+B,cAAc/B,aAAc,GACjC3B,KAAKa,YAAY,UAAYc,kBACzBgC,WAAanI,MAAMoI,QAAQ5D,KAAM2B,cACjCgC,WAAWrH,SACXqH,WAAWpI,SAAS,UACpByE,KAAKkB,OAAOyC,WAAWzC,eAExB,KACCgB,WAAa1G,MAAM2G,aAAanC,SAChCkC,WAAW5F,UACP0D,KAAK7D,SAAS,YAAa,KACvB4E,UAAY7F,KAAK8F,iBAAiBxF,MAAMgB,SAASwD,UACpC9E,KAAKkH,sBAAsBpC,MAAM,GACnC1D,OAASyE,UAAW,KAC3BE,UAAYjB,KAAK5C,QACrB6D,UAAUJ,YAAY,gBACtBI,UAAUW,WAAW,YACrBM,WAAWG,MAAMpB,WACjB5D,gBAAgBC,uBAAuB2D,WACvCjB,KAAKkB,OAAOD,UAAUC,eAEtBgB,WAAW3G,SAAS,UACpByE,KAAKkB,OAAOgB,WAAWhB,eAG3BgB,WAAW3G,SAAS,UACpByE,KAAKkB,OAAOgB,WAAWhB,UAKnC7G,SAASoJ,MAAML,EAAGpD,MAAM,SAAS6D,EAAGC,EAAG9D,MACnCxE,MAAMuI,SAASF,EAAGC,EAAG9D,SACtB,SAAS6D,EAAGC,EAAG9D,MACdxE,MAAMwI,QAAQH,EAAGC,EAAG9D,WAW5BvF,0BAA0BmB,UAAUmI,SAAW,SAASE,MAAOC,MAAOlE,UAC9DxE,MAAQN,KACRiJ,aAAc,OACb7I,UAAUe,KAAK,kBAAoBnB,KAAKsB,SAASwD,OAAOpD,MAAK,SAASC,EAAGuE,cACtEC,KAAOjH,EAAEgH,UACT5F,MAAM4I,cAAcH,MAAOC,MAAO7C,QAAU8C,aAC5CA,aAAc,EACd9C,KAAK9F,SAAS,yBAEd8F,KAAKR,YAAY,gCAGpBvF,UAAUe,KAAK,yBAA2BnB,KAAKsB,SAASwD,OAAOb,IAAI,iBAAiBvC,MAAK,SAASC,EAAGuE,cAClGC,KAAOjH,EAAEgH,WACT5F,MAAM4I,cAAcH,MAAOC,MAAO7C,OAAU8C,aAAgB3I,MAAM6I,iBAAiBrE,KAAMqB,MAIzFA,KAAKR,YAAY,yBAHjBsD,aAAc,EACd9C,KAAK9F,SAAS,6BAc1Bd,0BAA0BmB,UAAUoI,QAAU,SAASC,MAAOC,MAAOlE,UAC7DxE,MAAQN,KACR4E,KAAO5E,KAAKI,UACZgJ,QAAS,EAGbxE,KAAKzD,KAAK,kBAAoBnB,KAAKsB,SAASwD,OAAOpD,MAAK,SAASC,EAAGuE,cAC5DC,KAAOjH,EAAEgH,iBACR5F,MAAM4I,cAAcH,MAAOC,MAAO7C,QAMvCA,KAAKR,YAAY,wBACjBrF,MAAM8G,eAAetC,KAAMqB,MAC3BiD,QAAS,GACF,MAGNA,QAEDxE,KAAKzD,KAAK,yBAA2BnB,KAAKsB,SAASwD,OAAOb,IAAI,iBAAiBvC,MAAK,SAASC,EAAG0H,gBACxFC,WAAapK,EAAEmK,gBACd/I,MAAM4I,cAAcH,MAAOC,MAAOM,aAAehJ,MAAM6I,iBAAiBrE,KAAMwE,mBAExE,EAIXA,WAAW3D,YAAY,4BACnBc,aAAenG,MAAMqE,0BAA0B2E,WAAY,WAC3DnD,KAAO7F,MAAMoI,QAAQ5D,KAAM2B,qBAC/BnG,MAAM8G,eAAetC,KAAMqB,MAC3BiD,QAAS,GACF,KAIVA,aACIG,aAAazE,OAU1BvF,0BAA0BmB,UAAU0G,eAAiB,SAAStC,KAAMqB,UAE5DqD,QAAUxJ,KAAKyJ,sBAAsBzJ,KAAKoG,SAASD,UAChC,IAAnBqD,QAAQpI,OAAc,CACtBoI,QAAQnJ,SAAS,gBACjBmJ,QAAQxD,OAAOwD,QAAQxD,cACnBS,aAAezG,KAAK2E,0BAA0B6E,QAAS,WAC1CxJ,KAAK0I,QAAQc,QAAS/C,cAC5BpG,SAAS,eACfkJ,aAAaC,SAGF,IAAhB1E,KAAK1D,aACAoH,cAAcxI,KAAKoG,SAASD,MAAO,GACpCA,KAAKG,KAAK,YACVH,KAAKuD,eAGJlB,cAAcxI,KAAKoG,SAASD,MAAOnG,KAAKwB,UAAUsD,OACvDA,KAAKa,YAAY,YACZtF,SAAS,iBAAmBL,KAAKoG,SAASD,OAC/CrB,KAAK/C,KAAK,WAAY,QACjB4H,UAAU7E,KAAMqB,QAS7B5G,0BAA0BmB,UAAU6I,aAAe,SAASzE,UACpD2B,aAAezG,KAAK2E,0BAA0BG,KAAM,WACnC,OAAjB2B,cACA3B,KAAKa,YAAY,UAAYc,cAEjC3B,KAAKwB,KAAK,YAAY,QAEjBqD,UAAU7E,KAAM9E,KAAK4J,YAAY5J,KAAKsB,SAASwD,MAAO9E,KAAKwB,UAAUsD,SAW9EvF,0BAA0BmB,UAAUmJ,eAAiB,SAAS3B,OACtD/B,KAAOjH,EAAEgJ,EAAEC,QAAQnH,QAAQ,gBACX,IAAhBmF,KAAK/E,OAAc,KACfkI,WAAapK,EAAEgJ,EAAEC,QACjB1B,aAAezG,KAAK2E,0BAA0B2E,WAAY,WACzC,OAAjB7C,eACAN,KAAOnG,KAAK0I,QAAQY,WAAY7C,mBAGpCqD,YAAc9J,KAAKyJ,sBAAsBzJ,KAAKoG,SAASD,OACvD4D,SAAW7K,WAEPgJ,EAAE8B,cACD5K,KAAK6K,WACL7K,KAAK8K,gBACL9K,KAAK+K,UACNJ,SAAW/J,KAAKoK,YAAYpK,KAAKsB,SAAS6E,MAAO2D,wBAGhD1K,KAAKiL,eACLjL,KAAKkL,QACNP,SAAW/J,KAAKuK,gBAAgBvK,KAAKsB,SAAS6E,MAAO2D,wBAGpD1K,KAAKoL,OACNrI,gBAAgBsI,sBAAuB,4BAIvCtI,gBAAgBsI,sBAAuB,MAI3CV,SAAS3I,OAAQ,CACjB2I,SAASzD,KAAK,WAAW,GACzByD,SAAS1J,SAAS,oBACd2G,WAAahH,KAAKiH,aAAa8C,aAC/B/C,WAAW5F,UACP2I,SAAS9I,SAAS,YAAa,KAC3B4E,UAAY7F,KAAK8F,iBAAiB9F,KAAKsB,SAASyI,cACnC/J,KAAKkH,sBAAsB6C,UAAU,GACvC3I,OAASyE,UAAW,KAC3BE,UAAYgE,SAAS7H,QACzB6D,UAAUJ,YAAY,gBACtBI,UAAUW,WAAW,YACrBM,WAAWG,MAAMpB,WACjB5D,gBAAgBC,uBAAuB2D,WACvCgE,SAAS/D,OAAOD,UAAUC,eAE1BgB,WAAW3G,SAAS,UACpB0J,SAAS/D,OAAOgB,WAAWhB,eAG/BgB,WAAW3G,SAAS,UACpB0J,SAAS/D,OAAOgB,WAAWhB,eAInCG,KAAKG,KAAK,WAAW,GAGzB4B,EAAEwC,sBACGtD,eAAe2C,SAAU5D,OAUlC5G,0BAA0BmB,UAAU0J,YAAc,SAAS/I,MAAOyD,UAC1DvD,OACAoJ,WAAa3K,KAAK4K,mBAAmBvJ,OAGrCE,OADgB,IAAhBuD,KAAK1D,OACI,EAEApB,KAAKwB,UAAUsD,MAAQ,UAGhC+F,KAAO7K,KAAK+G,kBAAkB1F,MAAOE,QAClB,IAAhBsJ,KAAKzJ,QAAgBG,OAASoJ,YACjCpJ,SACAsJ,KAAO7K,KAAK+G,kBAAkB1F,MAAOE,eAGlCsJ,MAUXtL,0BAA0BmB,UAAU6J,gBAAkB,SAASlJ,MAAOyD,UAC9DvD,OAGAA,OADgB,IAAhBuD,KAAK1D,OACIpB,KAAK4K,mBAAmBvJ,OAExBrB,KAAKwB,UAAUsD,MAAQ,UAGhCgG,SAAW9K,KAAK+G,kBAAkB1F,MAAOE,QAClB,IAApBuJ,SAAS1J,QAAgBG,OAAS,GACrCA,SACAuJ,SAAW9K,KAAK+G,kBAAkB1F,MAAOE,eAItCuJ,UASXvL,0BAA0BmB,UAAUiJ,UAAY,SAAS7E,KAAMqD,YACvD4C,WAAajG,KAAKkB,SAClBgF,UAAY7C,OAAOnC,SACnB1F,MAAQN,KAEZH,EAAEC,KAAKC,WAAW,+BAAiCO,MAAMd,aAKzDsF,KAAKmG,QACD,CACIC,KAAM7F,SAASP,KAAKE,IAAI,SAAWgG,UAAUE,KAAOH,WAAWG,KAC/DC,IAAK9F,SAASP,KAAKE,IAAI,QAAUgG,UAAUG,IAAMJ,WAAWI,KAEhE,CACIC,SAAU,OACVC,KAAM,WACFnM,EAAE,QAAQoM,QAAQ,gCAAiC,CAACxG,KAAMqD,OAAQ7H,QAClET,EAAEC,KAAK4E,YAAY,+BAAiCpE,MAAMd,iBAc1ED,0BAA0BmB,UAAUwI,cAAgB,SAASH,MAAOC,MAAO7C,UACnEoF,SAAWpF,KAAKH,gBAChBG,KAAKlF,SAAS,YACP8H,OAASwC,SAASL,MAAQnC,MAAQwC,SAASL,KAAO/E,KAAKqF,cACvDxC,OAASuC,SAASJ,KAAOnC,MAAQuC,SAASJ,IAAMhF,KAAKsF,cAEzD1C,OAASwC,SAASL,MAAQnC,MAAQwC,SAASL,KAAO/E,KAAKvD,SACvDoG,OAASuC,SAASJ,KAAOnC,MAAQuC,SAASJ,IAAMhF,KAAKzD,UAShEnD,0BAA0BmB,UAAU8H,cAAgB,SAAStD,MAAO3D,aAC3DnB,UAAUe,KAAK,yBAA2B+D,OAAO2B,IAAItF,SAQ9DhC,0BAA0BmB,UAAUN,QAAU,kBACnClB,EAAEuE,SAASiI,eAAe1L,KAAKR,eAO1CD,0BAA0BmB,UAAUiL,QAAU,kBACnC3L,KAAKI,UAAUe,KAAK,uBAU/B5B,0BAA0BmB,UAAUkJ,YAAc,SAASvI,MAAOE,eACzDvB,KAAKI,UAAUe,KAAK,kCAAoCE,MAAQ,UAAYE,QAAQqK,GAAG,YAMrF5L,KAAKI,UAAUe,KAAK,kCAAoCE,MAAQ,UAAYE,QALxEvB,KAAKI,UAAUe,KAAK,iBAAmBE,MAAnB,6BAEXE,OACZ,SAAWF,QAYvB9B,0BAA0BmB,UAAUqG,kBAAoB,SAAS1F,MAAOE,eAC7DvB,KAAKI,UAAUe,KAAK,0BAA4BE,MAAQ,UAAYE,OAAS,aAAasK,MAAM,EAAG,IAS9GtM,0BAA0BmB,UAAU+I,sBAAwB,SAASvE,cAC1DlF,KAAKI,UAAUe,KAAK,4BAA8B+D,QAS7D3F,0BAA0BmB,UAAUoF,iBAAmB,SAASzE,cACrDrB,KAAKI,UAAUe,KAAK,kBAAoBE,OAAOD,QAS1D7B,0BAA0BmB,UAAUkK,mBAAqB,SAASvJ,cACvDrB,KAAKI,UAAUe,KAAK,iBAAmBE,MAAQ,cAAcD,QAUxE7B,0BAA0BmB,UAAUiE,0BAA4B,SAAS/C,KAAMkK,YACvEC,QAAUnK,KAAKG,KAAK,YACR,KAAZgK,gBACIC,WAAaD,QAAQE,MAAM,KACtBzG,MAAQ,EAAGA,MAAQwG,WAAW5K,OAAQoE,QAAS,IACxC,IAAI0G,OAAO,IAAMJ,OAAS,aAC5BK,KAAKH,WAAWxG,QAAS,KAE3B4G,MADQ,IAAIF,OAAO,aACLG,KAAKL,WAAWxG,eAC3B8G,OAAOF,MAAM,YAIzB,MASX7M,0BAA0BmB,UAAUc,UAAY,SAASsD,aAC9C9E,KAAK2E,0BAA0BG,KAAM,WAUhDvF,0BAA0BmB,UAAUY,SAAW,SAASM,aAC7C5B,KAAK2E,0BAA0B/C,KAAM,UAShDrC,0BAA0BmB,UAAU0F,SAAW,SAASxE,aAC7C5B,KAAK2E,0BAA0B/C,KAAM,UAShDrC,0BAA0BmB,UAAUuG,aAAe,SAASnC,aACjD9E,KAAKI,UAAUe,KAAK,iBACvBnB,KAAKsB,SAASwD,MADS,oBAGX9E,KAAKwB,UAAUsD,MAC3B,SAAW9E,KAAKsB,SAASwD,MACzB,qBAURvF,0BAA0BmB,UAAUwG,sBAAwB,SAASpC,KAAMyH,eACnEA,OACOvM,KAAKI,UAAUe,KAAK,iBACvBnB,KAAKsB,SAASwD,MADS,oBAGX9E,KAAKwB,UAAUsD,MAC3B,SAAW9E,KAAKsB,SAASwD,MACzB,aAAab,IAAI,oBAElBjE,KAAKI,UAAUe,KAAK,mBACXnB,KAAKwB,UAAUsD,MAC3B,SAAW9E,KAAKsB,SAASwD,MACzB,aAAab,IAAI,qBAUzB1E,0BAA0BmB,UAAUgI,QAAU,SAAS5D,KAAM2B,qBAClDzG,KAAKI,UAAUe,KAAK,kBAAoBnB,KAAKsB,SAASwD,MAAQ,SAAW2B,eAMpFlH,0BAA0BmB,UAAU8L,aAAe,eAC3ClM,MAAQN,KACRiG,QAAUjG,KAAKiG,UACfjG,KAAKG,aACL8F,QAAU,QAGT7F,UAAUe,KAAK,qBAAqBO,MAAK,SAASC,EAAGuE,UACtDhH,EAAEgH,UACGlB,IAAI,OAAQK,SAASnG,EAAEgH,UAAUI,KAAK,YAAcmG,WAAWxG,UAC/DjB,IAAI,MAAOK,SAASnG,EAAEgH,UAAUI,KAAK,YAAcmG,WAAWxG,UACnE3F,MAAMiG,mBAAmBL,SAAU,oBAGlC9F,UAAUe,KAAK,0BAA0B8C,IAAI,iBAAiBvC,MAAK,SAASsG,IAAKlD,MAClF5F,EAAE4F,MACGE,IAAI,OAAQyH,WAAWvN,EAAE4F,MAAMwB,KAAK,YAAcmG,WAAWxG,UAC7DjB,IAAI,MAAOyH,WAAWvN,EAAE4F,MAAMwB,KAAK,YAAcmG,WAAWxG,UACjE3F,MAAMiG,mBAAmBzB,KAAM,gBASvCvF,0BAA0BmB,UAAUuF,QAAU,eACtCyG,MAAQ1M,KAAK2L,UACbgB,kBAAoBD,MAAM7K,IAAI,GAAG+K,oBACdF,MAAM9J,QAEH+J,mBAS9BpN,0BAA0BmB,UAAU6F,mBAAqB,SAASvC,QAAS6I,UACnE5G,QAAUwG,WAAWzM,KAAKiG,WAC1BjG,KAAKG,aACL8F,QAAU,GAEd/G,EAAE8E,SAASgB,IAAI,qBACU,SAAWiB,QAAU,qBACxB,SAAWA,QAAU,oBACtB,SAAWA,QAAU,mBACtB,SAAWA,QAAU,cACxB,SAAWA,QAAU,uBACd4G,QAS5BtN,0BAA0BmB,UAAU2H,gBAAkB,eAC9CyE,OAAS,cACR1M,UAAUe,KAAK,6CAA6CO,MAAK,SAASC,EAAGuE,cAI1E6G,YAHJ7G,SAAWhH,EAAEgH,WAGalB,IAAI,WAAaK,SAASa,SAASlB,IAAI,YAAc,EAE3E+H,WAAaD,SACbA,OAASC,eAIVD,QAUXvN,0BAA0BmB,UAAUyI,iBAAmB,SAASrE,KAAMqB,aAC3DnG,KAAKwB,UAAUsD,QAAU9E,KAAKwB,UAAU2E,OAASnG,KAAKsB,SAASwD,QAAU9E,KAAKsB,SAAS6E,WAQ9FhE,gBAAkB,CAKlB6K,0BAA0B,EAM1BC,6BAA8B,GAK9B9M,YAAY,EAKZsK,sBAAsB,EAKtByC,UAAW,GAUXC,KAAM,SAAS3N,YAAaC,SAAUC,WAClCyC,gBAAgB+K,UAAU1N,aACtB,IAAID,0BAA0BC,YAAaC,SAAUC,QACpDyC,gBAAgB6K,2BACjB7K,gBAAgBiL,qBAChBjL,gBAAgB6K,0BAA2B,IAE1C7K,gBAAgB8K,6BAA6BhI,eAAezF,aAAc,CAC3E2C,gBAAgB8K,6BAA6BzN,cAAe,MAExD6N,kBAAoB5J,SAASiI,eAAelM,aAC5C6N,kBAAkBtK,UAAUuK,SAAS,mBACpCD,kBAAkBtK,UAAUuK,SAAS,iCAEtCnL,gBAAgBC,uBAAuBlD,EAAEmO,mBAAmBlM,KAAK,gBAQ7EiM,mBAAoB,WAChBlO,EAAE,QACGqO,GAAG,UACA,6EACApL,gBAAgB0H,gBACnB0D,GAAG,UACA,4FACApL,gBAAgB0H,gBACnB0D,GAAG,gCAAiCpL,gBAAgBqL,iBACzDtO,EAAEuO,QAAQF,GAAG,UAAU,WACnBpL,gBAAgBuL,oBAAmB,MAEvCD,OAAO/J,iBAAiB,eAAe,WACnCvB,gBAAgBhC,YAAa,EAC7BgC,gBAAgBuL,mBAAmBvL,gBAAgBhC,eAEvDsN,OAAO/J,iBAAiB,cAAc,WAClCvB,gBAAgBhC,YAAa,EAC7BgC,gBAAgBuL,mBAAmBvL,gBAAgBhC,eAEvDoD,YAAW,WACPpB,gBAAgBwL,2BACjB,MAQPvL,uBAAwB,SAAS4B,SAE7BA,QAAQ4J,OAAO,wBACf5J,QAAQuJ,GAAG,uBAAwBpL,gBAAgB8F,kBAOvDA,gBAAiB,SAASC,GACtBA,EAAEwC,qBACEmD,SAAW1L,gBAAgB2L,oBAAoB5F,GAC/C2F,UACAA,SAAS5F,gBAAgBC,IAQjC2B,eAAgB,SAAS3B,OACjB/F,gBAAgBsI,sBAGpBtI,gBAAgBsI,sBAAuB,MACnCoD,SAAW1L,gBAAgB2L,oBAAoB5F,GAC/C2F,UACAA,SAAShE,eAAe3B,KAQhCwF,mBAAoB,SAASvN,gBACpB,IAAIX,eAAe2C,gBAAgB+K,UAChC/K,gBAAgB+K,UAAUjI,eAAezF,eACzC2C,gBAAgB+K,UAAU1N,aAAaW,WAAaA,WACpDgC,gBAAgB+K,UAAU1N,aAAagN,iBAUnDmB,uBAAwB,gBACfD,mBAAmBvL,gBAAgBhC,YAIxCoD,YAAW,WACPpB,gBAAgBwL,uBAAuBxL,gBAAgBhC,cACxD,MAWPqN,gBAAiB,SAAStF,EAAGpD,KAAMqD,OAAQ7H,OACvCwE,KAAKa,YAAY,gBAAgBX,IAAI,UAAW,IAChDF,KAAKE,IAAI,MAAOmD,OAAOoD,WAAWJ,KAAKnG,IAAI,OAAQmD,OAAOoD,WAAWL,MACrE/C,OAAOhB,MAAMrC,MACbqD,OAAOxC,YAAY,eACkB,IAA1Bb,KAAKwB,KAAK,cAAyD,IAA1BxB,KAAKwB,KAAK,aAC1DxB,KAAKa,YAAY,UAAUtF,SAAS,YACpCyE,KAAK4B,WAAW,YAChB5B,KAAKiJ,WAAW,YAChBjJ,KAAKE,IAAI,MAAO,IACXA,IAAI,OAAQ,IACZA,IAAI,YAAa,IAClBF,KAAK7D,SAAS,aAAeX,MAAM4G,sBAAsBpC,MAAM,GAAM1D,OAAS,GAC9Ed,MAAM4G,sBAAsBpC,MAAM,GAAMkJ,QAAQxL,WAGpDsC,KAAKwB,KAAK,UAAW6B,OAAO7B,KAAK,YAAYA,KAAK,UAAW6B,OAAO7B,KAAK,YACzEhG,MAAMiG,mBAAmBzB,KAAM,kBAEC,IAAzBA,KAAKwB,KAAK,aAAuD,IAAzBxB,KAAKwB,KAAK,aACzDxB,KAAK4E,QACL5E,KAAKiJ,WAAW,iBAEkB,IAA3B5F,OAAO7B,KAAK,aAAyD,IAA3B6B,OAAO7B,KAAK,YAC7D6B,OAAO4F,WAAW,WAElB5L,gBAAgBsI,uBAChBtI,gBAAgBsI,sBAAuB,GAEvCnK,MAAMmH,yBAENtF,gBAAgB8L,kBAEhB3N,MAAMX,eAAiBW,MAAM+G,8BASrCyG,oBAAqB,SAAS5F,OACtB1I,YAAcN,EAAEgJ,EAAEgG,eAAelN,QAAQ,sBAAsBe,KAAK,aACjEI,gBAAgB+K,UAAU1N,cAMrCyO,gBAAiB,iBACPE,aAAe1K,SAASiI,eAAe,gBAC7CrM,kBAAkB+O,gBAAgBD,sBAOnC,CACHhB,KAAMhL,gBAAgBgL"}
\ No newline at end of file
diff --git a/question/type/ddimageortext/amd/src/question.js b/question/type/ddimageortext/amd/src/question.js
index bfc1cecf395b6..05239c3169bd5 100644
--- a/question/type/ddimageortext/amd/src/question.js
+++ b/question/type/ddimageortext/amd/src/question.js
@@ -24,12 +24,14 @@ define([
     'jquery',
     'core/dragdrop',
     'core/key_codes',
-    'core_form/changechecker'
+    'core_form/changechecker',
+    'core_filters/events',
 ], function(
     $,
     dragDrop,
     keys,
-    FormChangeChecker
+    FormChangeChecker,
+    filterEvent
 ) {
 
     "use strict";
@@ -45,6 +47,7 @@ define([
     function DragDropOntoImageQuestion(containerId, readOnly, places) {
         this.containerId = containerId;
         this.questionAnswer = {};
+        this.questionDragDropWidthHeight = [];
         M.util.js_pending('qtype_ddimageortext-init-' + this.containerId);
         this.places = places;
         this.allImagesLoaded = false;
@@ -61,6 +64,82 @@ define([
         this.waitForAllImagesToBeLoaded();
     }
 
+    /**
+     * Change all the drags and drops related to the item that has been changed by filter to correct size and content.
+     *
+     *  @param {object} filteredElement the element has been modified by filter.
+     */
+    DragDropOntoImageQuestion.prototype.changeAllDragsAndDropsToFilteredContent = function(filteredElement) {
+        let currentFilteredItem = $(filteredElement);
+        const parentIsDD = currentFilteredItem.parent().closest('div').hasClass('placed') ||
+            currentFilteredItem.parent().hasClass('draghome');
+        const isDD = currentFilteredItem.hasClass('placed') || currentFilteredItem.hasClass('draghome');
+        // The filtered element or parent element should a drag or drop item.
+        if (!parentIsDD && !isDD) {
+            return;
+        }
+        if (parentIsDD) {
+            currentFilteredItem = currentFilteredItem.parent().closest('div');
+        }
+        if (this.getRoot().find(currentFilteredItem).length <= 0) {
+            // If the DD item doesn't belong to this question
+            // In case we have multiple questions in the same page.
+            return;
+        }
+        const group = this.getGroup(currentFilteredItem),
+            choice = this.getChoice(currentFilteredItem);
+        let listOfModifiedDragDrop = [];
+        // Get the list of drag and drop item within the same group and choice.
+        this.getRoot().find('.group' + group + '.choice' + choice).each(function(i, node) {
+            // Same modified item, skip it.
+            if ($(node).get(0) === currentFilteredItem.get(0)) {
+                return;
+            }
+            const originalClass = $(node).attr('class');
+            const originalStyle = $(node).attr('style');
+            // We want to keep all the handler and event for filtered item, so using clone is the only choice.
+            const filteredDragDropClone = currentFilteredItem.clone();
+            // Sometimes, for the question that has a lot of input groups and unlimited draggable items,
+            // this 'clone' process takes longer than usual,it will not add the eventHandler for this cloned drag.
+            // We need to make sure to add the eventHandler for the cloned drag too.
+            questionManager.addEventHandlersToDrag(filteredDragDropClone);
+            // Replace the class and style of the drag drop item we want to replace for the clone.
+            filteredDragDropClone.attr('class', originalClass);
+            filteredDragDropClone.attr('style', originalStyle);
+            // Insert into DOM.
+            $(node).before(filteredDragDropClone);
+            // Add the item has been replaced to a list so we can remove it later.
+            listOfModifiedDragDrop.push(node);
+        });
+
+        listOfModifiedDragDrop.forEach(function(node) {
+            $(node).remove();
+        });
+        // Save the current height and width.
+        const currentHeight = currentFilteredItem.height();
+        const currentWidth = currentFilteredItem.width();
+        // Set to auto, so we can get the real height and width of the filtered item.
+        currentFilteredItem.height('auto');
+        currentFilteredItem.width('auto');
+        // We need to set display block so we can get height and width.
+        // Some browsers can't get the offsetWidth/Height if they are an inline element like span tag.
+        if (!filteredElement.offsetWidth || !filteredElement.offsetHeight) {
+            filteredElement.classList.add('d-block');
+        }
+        if (this.questionDragDropWidthHeight[group].maxWidth < Math.ceil(filteredElement.offsetWidth) ||
+            this.questionDragDropWidthHeight[group].maxHeight < Math.ceil(0 + filteredElement.offsetHeight)) {
+            // Remove the d-block class before calculation.
+            filteredElement.classList.remove('d-block');
+            // Now resize all the items in the same group if we have new maximum width or height.
+            this.resizeAllDragsAndDropsInGroup(group);
+        } else {
+            currentFilteredItem.height(currentHeight);
+            currentFilteredItem.width(currentWidth);
+        }
+        // Remove the d-block class after resize.
+        filteredElement.classList.remove('d-block');
+    };
+
     /**
      * Waits until all images are loaded before calling setupQuestion().
      *
@@ -94,6 +173,12 @@ define([
         // We now have all images. Carry on, but only after giving the layout a chance to settle down.
         this.allImagesLoaded = true;
         thisQ.setupQuestion();
+        // Wait for all dynamic content loaded by filter to be completed.
+        document.addEventListener(filterEvent.eventTypes.filterContentRenderingComplete, (elements) => {
+            elements.detail.nodes.forEach((element) => {
+                thisQ.changeAllDragsAndDropsToFilteredContent(element);
+            });
+        });
     };
 
     /**
@@ -135,7 +220,7 @@ define([
         var thisQ = this;
         this.getRoot().find('.draghomes > div').each(function(i, node) {
             thisQ.resizeAllDragsAndDropsInGroup(
-                    thisQ.getClassnameNumericSuffix($(node), 'dragitemgroup'));
+                thisQ.getClassnameNumericSuffix($(node), 'dragitemgroup'));
         });
     };
 
@@ -146,7 +231,7 @@ define([
      */
     DragDropOntoImageQuestion.prototype.resizeAllDragsAndDropsInGroup = function(group) {
         var root = this.getRoot(),
-            dragHomes = root.find('.dragitemgroup' + group + ' .draghome'),
+            dragHomes = root.find(".draghome.group" + group),
             maxWidth = 0,
             maxHeight = 0;
 
@@ -159,18 +244,11 @@ define([
         // The size we will want to set is a bit bigger than this.
         maxWidth += 10;
         maxHeight += 10;
+        this.questionDragDropWidthHeight[group] = {maxWidth, maxHeight};
 
         // Set each drag home to that size.
         dragHomes.each(function(i, drag) {
-            var left = Math.round((maxWidth - drag.offsetWidth) / 2),
-                top = Math.floor((maxHeight - drag.offsetHeight) / 2);
-            // Set top and left padding so the item is centred.
-            $(drag).css({
-                'padding-left': left + 'px',
-                'padding-right': (maxWidth - drag.offsetWidth - left) + 'px',
-                'padding-top': top + 'px',
-                'padding-bottom': (maxHeight - drag.offsetHeight - top) + 'px'
-            });
+            $(drag).width(maxWidth).height(maxHeight).css('lineHeight', maxHeight + 'px');
         });
 
         // Create the drops and make them the right size.
@@ -186,9 +264,11 @@ define([
             if (label === '') {
                 label = M.util.get_string('blank', 'qtype_ddimageortext');
             }
-            root.find('.dropzones').append('<div class="dropzone active group' + place.group +
-                            ' place' + i + '" tabindex="0">' +
+            if (root.find('.dropzones .dropzone.group' + place.group + '.place' + i).length === 0) {
+                root.find('.dropzones').append('<div class="dropzone active group' + place.group +
+                    ' place' + i + '" tabindex="0">' +
                     '<span class="accesshide">' + label + '</span>&nbsp;</div>');
+            }
             root.find('.dropzone.place' + i).width(maxWidth - 2).height(maxHeight - 2);
         }
     };
diff --git a/question/type/ddimageortext/rendererbase.php b/question/type/ddimageortext/rendererbase.php
index 640600090a4b7..cb201cd397d8b 100644
--- a/question/type/ddimageortext/rendererbase.php
+++ b/question/type/ddimageortext/rendererbase.php
@@ -52,7 +52,6 @@ public function clear_wrong(question_attempt $qa) {
 
     public function formulation_and_controls(question_attempt $qa,
             question_display_options $options) {
-
         $question = $qa->get_question();
         $response = $qa->get_last_qt_data();
 
@@ -92,6 +91,7 @@ public function formulation_and_controls(question_attempt $qa,
                     $classes[] = 'infinite';
                 }
                 if ($dragimageurl === null) {
+                    $dragimage->text = question_utils::format_question_fragment($dragimage->text, $this->page->context);
                     $dragimagehomesgroup .= html_writer::div($dragimage->text, join(' ', $classes), ['src' => $dragimageurl]);
                 } else {
                     $dragimagehomesgroup .= html_writer::img($dragimageurl, $dragimage->text, ['class' => join(' ', $classes)]);
diff --git a/question/type/ddimageortext/styles.css b/question/type/ddimageortext/styles.css
index 8334a9d00bcfc..98ff22e892a7e 100644
--- a/question/type/ddimageortext/styles.css
+++ b/question/type/ddimageortext/styles.css
@@ -85,6 +85,10 @@ form.mform fieldset#id_previewareaheader .droppreview {
     display: none;
 }
 
+.que.ddimageortext .MathJax_Display {
+    margin: 0;
+}
+
 .que.ddimageortext .draghomes .draghome.dragplaceholder.active {
     visibility: hidden;
     display: inline-block;
diff --git a/question/type/ddimageortext/tests/behat/preview.feature b/question/type/ddimageortext/tests/behat/preview.feature
index bb5c5c868de5b..a40b0ef9405f8 100644
--- a/question/type/ddimageortext/tests/behat/preview.feature
+++ b/question/type/ddimageortext/tests/behat/preview.feature
@@ -18,8 +18,9 @@ Feature: Preview a drag-drop onto image question
       | contextlevel | reference | name           |
       | Course       | C1        | Test questions |
     And the following "questions" exist:
-      | questioncategory | qtype         | name            | template |
-      | Test questions   | ddimageortext | Drag onto image | xsection |
+      | questioncategory | qtype         | name                     | template |
+      | Test questions   | ddimageortext | Drag onto image          | xsection |
+      | Test questions   | ddimageortext | Drag to mathjax equation | mathjax  |
 
   @javascript @_bug_phantomjs
   Scenario: Preview a question using the mouse.
@@ -53,3 +54,12 @@ Feature: Preview a drag-drop onto image question
     And I press "Submit and finish"
     Then the state of "Identify the features" question is shown as "Correct"
     And I should see "Mark 1.00 out of 1.00"
+
+  @javascript
+  Scenario: Preview a drag-drop into image question with mathjax question.
+    Given the "mathjaxloader" filter is "on"
+    And the "mathjaxloader" filter applies to "content and headings"
+    And I am on the "Drag to mathjax equation" "core_question > preview" page logged in as teacher
+    And I press "Fill in correct responses"
+    When I press "Submit and finish"
+    Then ".filter_mathjaxloader_equation" "css_element" should exist in the ".draghome" "css_element"
diff --git a/question/type/ddimageortext/tests/helper.php b/question/type/ddimageortext/tests/helper.php
index 367d2c0d801be..8f0ee8810fdbd 100644
--- a/question/type/ddimageortext/tests/helper.php
+++ b/question/type/ddimageortext/tests/helper.php
@@ -34,7 +34,7 @@
  */
 class qtype_ddimageortext_test_helper extends question_test_helper {
     public function get_test_questions() {
-        return array('fox', 'maths', 'xsection', 'mixedlang');
+        return ['fox', 'maths', 'xsection', 'mixedlang', 'mathjax'];
     }
 
     /**
@@ -251,6 +251,54 @@ public function get_ddimageortext_question_form_data_xsection() {
         return $fromform;
     }
 
+    /**
+     * Get data required to save a drag-drop into text question where the the answer contain equation
+     *
+     *
+     * @return stdClass data to create a ddwtos question.
+     */
+    public function get_ddimageortext_question_form_data_mathjax() {
+        global $CFG, $USER;
+        $fromform = new stdClass();
+
+        $bgdraftitemid = 0;
+        file_prepare_draft_area($bgdraftitemid, null, null, null, null);
+        $fs = get_file_storage();
+        $filerecord = new stdClass();
+        $filerecord->contextid = context_user::instance($USER->id)->id;
+        $filerecord->component = 'user';
+        $filerecord->filearea = 'draft';
+        $filerecord->itemid = $bgdraftitemid;
+        $filerecord->filepath = '/';
+        $filerecord->filename = 'oceanfloorbase.jpg';
+        $fs->create_file_from_pathname($filerecord, $CFG->dirroot .
+            '/question/type/ddimageortext/tests/fixtures/oceanfloorbase.jpg');
+        $fromform->name = 'Drag-and-drop words into image question with equation';
+        $fromform->questiontext = ['text' => 'Fill in the correct mathjax equation: y = 2, x =4', 'format' => FORMAT_HTML];
+        $fromform->defaultmark = 1.0;
+        $fromform->generalfeedback = ['text' => 'The right answer is: "y = x^2"', 'format' => FORMAT_HTML];
+        $fromform->drags = [
+            ['dragitemtype' => 'word', 'draggroup' => '1', 'infinite' => '0'],
+            ['dragitemtype' => 'word', 'draggroup' => '1', 'infinite' => '0'],
+        ];
+        $fromform->bgimage = $bgdraftitemid;
+        $fromform->dragitem = [0, 0];
+        $fromform->draglabel =
+            [
+                '$$ y = x^2 $$',
+                '$$ y = x^5 $$',
+            ];
+        $fromform->drops = [
+            ['xleft' => '53', 'ytop' => '17', 'choice' => '1', 'droplabel' => ''],
+            ['xleft' => '172', 'ytop' => '2', 'choice' => '2', 'droplabel' => ''],
+        ];
+        test_question_maker::set_standard_combined_feedback_form_data($fromform);
+        $fromform->shownumcorrect = 0;
+        $fromform->penalty = 0.3333333;
+        $fromform->status = \core_question\local\bank\question_version_status::QUESTION_STATUS_READY;
+        return $fromform;
+    }
+
     /**
      * Make a test question where the drag items are a different language than the main question text.
      *

From 85c7492db2454ae19f6b4e0f1f3f38295cc6d3a9 Mon Sep 17 00:00:00 2001
From: hieuvu <hieuvu@nashtechglobal.com>
Date: Fri, 3 May 2024 09:20:05 +0700
Subject: [PATCH 004/119] MDL-78662 ddmarker: Allow answer to support filter
 dynamic content.

---
 .../type/ddmarker/amd/build/question.min.js   |  2 +-
 .../ddmarker/amd/build/question.min.js.map    |  2 +-
 question/type/ddmarker/amd/src/question.js    | 66 ++++++++++++++++++-
 question/type/ddmarker/renderer.php           | 10 ++-
 .../type/ddmarker/tests/behat/preview.feature | 14 +++-
 question/type/ddmarker/tests/helper.php       | 46 ++++++++++++-
 6 files changed, 129 insertions(+), 11 deletions(-)

diff --git a/question/type/ddmarker/amd/build/question.min.js b/question/type/ddmarker/amd/build/question.min.js
index 0d5612c648076..53ae4787ad366 100644
--- a/question/type/ddmarker/amd/build/question.min.js
+++ b/question/type/ddmarker/amd/build/question.min.js
@@ -5,6 +5,6 @@
  * @copyright  2018 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-define("qtype_ddmarker/question",["jquery","core/dragdrop","qtype_ddmarker/shapes","core/key_codes","core_form/changechecker"],(function($,dragDrop,Shapes,keys,FormChangeChecker){function DragDropMarkersQuestion(containerId,readOnly,visibleDropZones){var thisQ=this;this.containerId=containerId,this.visibleDropZones=visibleDropZones,this.shapes=[],this.shapeSVGs=[],this.isPrinting=!1,this.questionAnswer={},readOnly&&this.getRoot().addClass("qtype_ddmarker-readonly"),thisQ.allImagesLoaded=!1,thisQ.getNotYetLoadedImages().one("load",(function(){thisQ.waitForAllImagesToBeLoaded()})),thisQ.waitForAllImagesToBeLoaded()}DragDropMarkersQuestion.prototype.drawDropzones=function(){if(this.visibleDropZones.length>0){var bgImage=this.bgImage();this.getRoot().find("div.dropzones").html('<svg xmlns="http://www.w3.org/2000/svg" class="dropzones" width="'+bgImage.outerWidth()+'" height="'+bgImage.outerHeight()+'"></svg>');for(var svg=this.getRoot().find("svg.dropzones"),nextColourIndex=0,dropZoneNo=0;dropZoneNo<this.visibleDropZones.length;dropZoneNo++){var colourClass="color"+nextColourIndex;nextColourIndex=(nextColourIndex+1)%8,this.addDropzone(svg,dropZoneNo,colourClass)}}},DragDropMarkersQuestion.prototype.addDropzone=function(svg,dropZoneNo,colourClass){var existingmarkertext,dropZone=this.visibleDropZones[dropZoneNo],shape=Shapes.make(dropZone.shape,""),bgRatio=this.bgRatio();if(shape.parse(dropZone.coords,bgRatio)){if((existingmarkertext=this.getRoot().find("div.markertexts span.markertext"+dropZoneNo)).length)""!==dropZone.markertext?existingmarkertext.html(dropZone.markertext):existingmarkertext.remove();else if(""!==dropZone.markertext){var classnames="markertext markertext"+dropZoneNo;this.getRoot().find("div.markertexts").append('<span class="'+classnames+'">'+dropZone.markertext+"</span>");var markerspan=this.getRoot().find("div.ddarea div.markertexts span.markertext"+dropZoneNo);if(markerspan.length){var handles=shape.getHandlePositions(),positionLeft=handles.moveHandle.x-markerspan.outerWidth()/2-4,positionTop=handles.moveHandle.y-markerspan.outerHeight()/2;markerspan.css("left",positionLeft).css("top",positionTop),markerspan.data("originX",markerspan.position().left/bgRatio).data("originY",markerspan.position().top/bgRatio),this.handleElementScale(markerspan,"center")}}var shapeSVG=shape.makeSvg(svg[0]);shapeSVG.setAttribute("class","dropzone "+colourClass),this.shapes[this.shapes.length]=shape,this.shapeSVGs[this.shapeSVGs.length]=shapeSVG}},DragDropMarkersQuestion.prototype.repositionDrags=function(){var root=this.getRoot(),thisQ=this;root.find("div.draghomes .marker").not(".dragplaceholder").each((function(key,item){$(item).addClass("unneeded")})),root.find("input.choices").each((function(key,input){var choiceNo=thisQ.getChoiceNoFromElement(input),imageCoords=thisQ.getImageCoords(input);if(imageCoords.length){var drag=thisQ.getRoot().find(".draghomes span.marker.choice"+choiceNo).not(".dragplaceholder");drag.remove();for(var i=0;i<imageCoords.length;i++){var dragInDrop=drag.clone();const screenCoords=thisQ.convertToWindowXY(imageCoords[i]);dragInDrop.data("pagex",screenCoords.x).data("pagey",screenCoords.y),dragInDrop.data("imageCoords",imageCoords[i]),dragInDrop.data("scaleRatio",1),thisQ.sendDragToDrop(dragInDrop,!1,!0)}thisQ.getDragClone(drag).addClass("active"),thisQ.cloneDragIfNeeded(drag)}})),thisQ.questionAnswer=thisQ.getQuestionAnsweredValues()},DragDropMarkersQuestion.prototype.getQuestionAnsweredValues=function(){let result={};return this.getRoot().find("input.choices").each(((i,inputNode)=>{result[inputNode.id]=inputNode.value})),result},DragDropMarkersQuestion.prototype.isQuestionInteracted=function(){const oldAnswer=this.questionAnswer,newAnswer=this.getQuestionAnsweredValues();let isInteracted=!1;return JSON.stringify(newAnswer)!==JSON.stringify(oldAnswer)?(isInteracted=!0,isInteracted):(Object.keys(newAnswer).forEach((key=>{newAnswer[key]!==oldAnswer[key]&&(isInteracted=!0)})),isInteracted)},DragDropMarkersQuestion.prototype.getImageCoords=function(inputNode){var imageCoords=[],val=$(inputNode).val();if(""!==val)for(var coordsStrings=val.split(";"),i=0;i<coordsStrings.length;i++)imageCoords[i]=Shapes.Point.parse(coordsStrings[i]);return imageCoords},DragDropMarkersQuestion.prototype.convertToWindowXY=function(point){var bgImage=this.bgImage();return point.offset(bgImage.offset().left+1,bgImage.offset().top+1)},DragDropMarkersQuestion.prototype.convertToBgImgXY=function(point){var bgImage=this.bgImage();return point.offset(-bgImage.offset().left-1,-bgImage.offset().top-1)},DragDropMarkersQuestion.prototype.coordsInBgImg=function(point){var bgImage=this.bgImage(),bgPosition=bgImage.offset();return point.x>=bgPosition.left&&point.x<bgPosition.left+bgImage.width()&&point.y>=bgPosition.top&&point.y<bgPosition.top+bgImage.height()},DragDropMarkersQuestion.prototype.getRoot=function(){return $(document.getElementById(this.containerId))},DragDropMarkersQuestion.prototype.bgImage=function(){return this.getRoot().find("img.dropbackground")},DragDropMarkersQuestion.prototype.handleDragStart=function(e){var thisQ=this,dragged=$(e.target).closest(".marker");if(dragDrop.prepare(e).start){if(dragged.addClass("beingdragged").css("transform",""),!!dragged.hasClass("unneeded")){var hiddenDrag=thisQ.getDragClone(dragged);hiddenDrag.length&&(hiddenDrag.addClass("active"),dragged.offset(hiddenDrag.offset()))}dragDrop.start(e,dragged,(function(){}),(function(x,y,dragged){thisQ.dragEnd(dragged)}))}},DragDropMarkersQuestion.prototype.dragEnd=function(dragged){var dragXY,placed=!1,choiceNo=this.getChoiceNoFromElement(dragged),bgRatio=this.bgRatio();if(dragged.data("pagex",dragged.offset().left).data("pagey",dragged.offset().top),dragXY=new Shapes.Point(dragged.data("pagex"),dragged.data("pagey")),this.coordsInBgImg(dragXY)){this.sendDragToDrop(dragged,!0),placed=!0,dragged.data("imageCoords")&&dragged.data("imageCoords",null);var bgImgXY=this.convertToBgImgXY(dragXY);bgImgXY=new Shapes.Point(bgImgXY.x/bgRatio,bgImgXY.y/bgRatio),dragged.data("originX",bgImgXY.x).data("originY",bgImgXY.y)}placed?this.cloneDragIfNeeded(dragged):(this.sendDragHome(dragged),this.removeDragIfNeeded(dragged)),this.saveCoordsForChoice(choiceNo)},DragDropMarkersQuestion.prototype.saveCoordsForChoice=function(choiceNo){let imageCoords=[];var items=this.getRoot().find("div.droparea span.marker.choice"+choiceNo),thiQ=this,bgRatio=this.bgRatio();items.length&&items.each((function(){var drag=$(this);if(drag.hasClass("beingdragged")||drag.data("imageCoords"))drag.data("imageCoords")&&(imageCoords[imageCoords.length]=drag.data("imageCoords"));else{drag.data("scaleRatio")!==bgRatio&&drag.data("pagex",drag.offset().left).data("pagey",drag.offset().top);var dragXY=new Shapes.Point(drag.data("pagex"),drag.data("pagey"));if(thiQ.coordsInBgImg(dragXY)){var bgImgXY=thiQ.convertToBgImgXY(dragXY);bgImgXY=new Shapes.Point(bgImgXY.x/bgRatio,bgImgXY.y/bgRatio),imageCoords[imageCoords.length]=bgImgXY}}})),this.getRoot().find("input.choice"+choiceNo).val(imageCoords.join(";")),this.isQuestionInteracted()&&(questionManager.handleFormDirty(),this.questionAnswer=this.getQuestionAnsweredValues())},DragDropMarkersQuestion.prototype.handleKeyPress=function(e){var drag=$(e.target).closest(".marker"),point=new Shapes.Point(drag.offset().left,drag.offset().top),choiceNo=this.getChoiceNoFromElement(drag);switch(e.keyCode){case keys.arrowLeft:case 65:point.x-=1;break;case keys.arrowRight:case 68:point.x+=1;break;case keys.arrowDown:case 83:point.y+=1;break;case keys.arrowUp:case 87:point.y-=1;break;case keys.space:case keys.escape:point=null;break;default:return}if(e.preventDefault(),null!==point){point=this.constrainToBgImg(point),drag.offset({left:point.x,top:point.y}),drag.data("pagex",drag.offset().left).data("pagey",drag.offset().top);var dragXY=this.convertToBgImgXY(new Shapes.Point(drag.data("pagex"),drag.data("pagey")));if(drag.data("originX",dragXY.x/this.bgRatio()).data("originY",dragXY.y/this.bgRatio()),this.coordsInBgImg(new Shapes.Point(drag.offset().left,drag.offset().top))&&drag.hasClass("unneeded")){this.sendDragToDrop(drag,!0);var hiddenDrag=this.getDragClone(drag);hiddenDrag.length&&hiddenDrag.addClass("active"),this.cloneDragIfNeeded(drag)}}else drag.css("left","").css("top",""),drag.data("pagex",drag.offset().left).data("pagey",drag.offset().top),this.sendDragHome(drag),this.removeDragIfNeeded(drag);drag.focus(),this.saveCoordsForChoice(choiceNo)},DragDropMarkersQuestion.prototype.constrainToBgImg=function(windowxy){var bgImg=this.bgImage(),bgImgXY=this.convertToBgImgXY(windowxy);return bgImgXY.x=Math.max(0,bgImgXY.x),bgImgXY.y=Math.max(0,bgImgXY.y),bgImgXY.x=Math.min(bgImg.width(),bgImgXY.x),bgImgXY.y=Math.min(bgImg.height(),bgImgXY.y),this.convertToWindowXY(bgImgXY)},DragDropMarkersQuestion.prototype.getChoiceNoFromElement=function(node){return Number(this.getClassnameNumericSuffix(node,"choice"))},DragDropMarkersQuestion.prototype.getClassnameNumericSuffix=function(node,prefix){var classes=$(node).attr("class");if(void 0!==classes&&""!==classes)for(var classesarr=classes.split(" "),index=0;index<classesarr.length;index++){if(new RegExp("^"+prefix+"([0-9])+$").test(classesarr[index])){var match=new RegExp("([0-9])+$").exec(classesarr[index]);return Number(match[0])}}return null},DragDropMarkersQuestion.prototype.handleResize=function(){var thisQ=this,bgRatio=this.bgRatio();this.isPrinting&&(bgRatio=1),this.getRoot().find("div.droparea .marker").not(".beingdragged").each((function(key,drag){$(drag).css("left",parseFloat($(drag).data("originX"))*parseFloat(bgRatio)).css("top",parseFloat($(drag).data("originY"))*parseFloat(bgRatio)),thisQ.handleElementScale(drag,"left top")})),this.getRoot().find("div.droparea svg.dropzones").width(this.bgImage().width()).height(this.bgImage().height());for(var dropZoneNo=0;dropZoneNo<this.visibleDropZones.length;dropZoneNo++){var originCoords=thisQ.visibleDropZones[dropZoneNo].coords,shape=thisQ.shapes[dropZoneNo],shapeSVG=thisQ.shapeSVGs[dropZoneNo];shape.parse(originCoords,bgRatio),shape.updateSvg(shapeSVG);var handles=shape.getHandlePositions(),markerSpan=this.getRoot().find("div.ddarea div.markertexts span.markertext"+dropZoneNo);markerSpan.css("left",handles.moveHandle.x-markerSpan.outerWidth()/2-4).css("top",handles.moveHandle.y-markerSpan.outerHeight()/2),thisQ.handleElementScale(markerSpan,"center")}},DragDropMarkersQuestion.prototype.cloneDrags=function(){var thisQ=this;this.getRoot().find("div.draghomes span.marker").each((function(index,draghome){var drag=$(draghome),placeHolder=drag.clone();placeHolder.removeClass(),placeHolder.addClass("marker"),placeHolder.addClass("choice"+thisQ.getChoiceNoFromElement(drag)),placeHolder.addClass(thisQ.getDragNoClass(drag,!1)),placeHolder.addClass("dragplaceholder"),drag.before(placeHolder)}))},DragDropMarkersQuestion.prototype.getDragNo=function(drag){return this.getClassnameNumericSuffix(drag,"dragno")},DragDropMarkersQuestion.prototype.getDragNoClass=function(drag,includeSelector){var className="dragno"+this.getDragNo(drag);return this.isInfiniteDrag(drag)&&(className="infinite"),includeSelector?"."+className:className},DragDropMarkersQuestion.prototype.getDragClone=function(drag){return this.getRoot().find(".draghomes span.marker.choice"+this.getChoiceNoFromElement(drag)+this.getDragNoClass(drag,!0)+".dragplaceholder")},DragDropMarkersQuestion.prototype.dropArea=function(){return this.getRoot().find("div.droparea")},DragDropMarkersQuestion.prototype.sendDragHome=function(drag){drag.removeClass("beingdragged").addClass("unneeded").css("top","").css("left","").css("transform","");var placeHolder=this.getDragClone(drag);placeHolder.after(drag),placeHolder.removeClass("active")},DragDropMarkersQuestion.prototype.sendDragToDrop=function(drag,isScaling){let initialLoad=arguments.length>2&&void 0!==arguments[2]&&arguments[2];var dropArea=this.dropArea(),bgRatio=this.bgRatio();drag.removeClass("beingdragged").removeClass("unneeded");var dragXY=this.convertToBgImgXY(new Shapes.Point(drag.data("pagex"),drag.data("pagey")));isScaling?(drag.data("originX",dragXY.x/bgRatio).data("originY",dragXY.y/bgRatio),drag.css("left",dragXY.x).css("top",dragXY.y)):(drag.data("originX",dragXY.x).data("originY",dragXY.y),drag.css("left",dragXY.x*bgRatio).css("top",dragXY.y*bgRatio)),initialLoad||drag.data("scaleRatio",bgRatio),dropArea.append(drag),this.handleElementScale(drag,"left top")},DragDropMarkersQuestion.prototype.cloneDragIfNeeded=function(drag){var inputNode=this.getInput(drag),noOfDrags=Number(this.getClassnameNumericSuffix(inputNode,"noofdrags")),displayedDragsInDropArea=this.getRoot().find("div.droparea .marker.choice"+this.getChoiceNoFromElement(drag)+this.getDragNoClass(drag,!0)).length,displayedDragsInDragHomes=this.getRoot().find("div.draghomes .marker.choice"+this.getChoiceNoFromElement(drag)+this.getDragNoClass(drag,!0)).not(".dragplaceholder").length;if((this.isInfiniteDrag(drag)||!this.isInfiniteDrag(drag)&&displayedDragsInDropArea<noOfDrags)&&0===displayedDragsInDragHomes){var dragClone=drag.clone();dragClone.addClass("unneeded").css("top","").css("left","").css("transform",""),this.getDragClone(drag).removeClass("active").after(dragClone),questionManager.addEventHandlersToMarker(dragClone)}},DragDropMarkersQuestion.prototype.removeDragIfNeeded=function(drag){for(var dragsInHome=this.getRoot().find("div.draghomes .marker.choice"+this.getChoiceNoFromElement(drag)+this.getDragNoClass(drag,!0)).not(".dragplaceholder"),displayedDrags=dragsInHome.length;displayedDrags>1;)dragsInHome.first().remove(),displayedDrags--},DragDropMarkersQuestion.prototype.getInput=function(drag){var choiceNo=this.getChoiceNoFromElement(drag);return this.getRoot().find("input.choices.choice"+choiceNo)},DragDropMarkersQuestion.prototype.bgRatio=function(){var bgImg=this.bgImage(),bgImgNaturalWidth=bgImg.get(0).naturalWidth;return bgImg.width()/bgImgNaturalWidth},DragDropMarkersQuestion.prototype.handleElementScale=function(element,type){var bgRatio=parseFloat(this.bgRatio());this.isPrinting&&(bgRatio=1),$(element).css({"-webkit-transform":"scale("+bgRatio+")","-moz-transform":"scale("+bgRatio+")","-ms-transform":"scale("+bgRatio+")","-o-transform":"scale("+bgRatio+")",transform:"scale("+bgRatio+")","transform-origin":type})},DragDropMarkersQuestion.prototype.isInfiniteDrag=function(drag){return drag.hasClass("infinite")},DragDropMarkersQuestion.prototype.waitForAllImagesToBeLoaded=function(){this.allImagesLoaded||(null!==this.imageLoadingTimeoutId&&clearTimeout(this.imageLoadingTimeoutId),this.getNotYetLoadedImages().length>0?this.imageLoadingTimeoutId=setTimeout((function(){this.waitForAllImagesToBeLoaded()}),100):(this.allImagesLoaded=!0,this.cloneDrags(),this.repositionDrags(),this.drawDropzones()))},DragDropMarkersQuestion.prototype.getNotYetLoadedImages=function(){return this.getRoot().find(".ddmarker img.dropbackground").not((function(i,imgNode){return this.imageIsLoaded(imgNode)}))},DragDropMarkersQuestion.prototype.imageIsLoaded=function(imgElement){return imgElement.complete&&0!==imgElement.naturalHeight};var questionManager={eventHandlersInitialised:!1,markerEventHandlersInitialised:{},isPrinting:!1,isKeyboardNavigation:!1,questions:{},init:function(containerId,readOnly,visibleDropZones){if(questionManager.questions[containerId]=new DragDropMarkersQuestion(containerId,readOnly,visibleDropZones),questionManager.eventHandlersInitialised||(questionManager.setupEventHandlers(),questionManager.eventHandlersInitialised=!0),!questionManager.markerEventHandlersInitialised.hasOwnProperty(containerId)){questionManager.markerEventHandlersInitialised[containerId]=!0;var questionContainer=document.getElementById(containerId);questionContainer.classList.contains("ddmarker")&&!questionContainer.classList.contains("qtype_ddmarker-readonly")&&(questionManager.addEventHandlersToMarker($(questionContainer).find("div.draghomes .marker")),questionManager.addEventHandlersToMarker($(questionContainer).find("div.droparea .marker")))}},setupEventHandlers:function(){$(window).on("resize",(function(){questionManager.handleWindowResize(!1)})),window.addEventListener("beforeprint",(function(){questionManager.isPrinting=!0,questionManager.handleWindowResize(questionManager.isPrinting)})),window.addEventListener("afterprint",(function(){questionManager.isPrinting=!1,questionManager.handleWindowResize(questionManager.isPrinting)})),setTimeout((function(){questionManager.fixLayoutIfThingsMoved()}),100)},addEventHandlersToMarker:function(element){element.on("mousedown touchstart",questionManager.handleDragStart).on("keydown keypress",questionManager.handleKeyPress).focusin((function(e){questionManager.handleKeyboardFocus(e,!0)})).focusout((function(e){questionManager.handleKeyboardFocus(e,!1)}))},handleDragStart:function(e){e.preventDefault();var question=questionManager.getQuestionForEvent(e);question&&question.handleDragStart(e)},handleKeyPress:function(e){var question=questionManager.getQuestionForEvent(e);question&&question.handleKeyPress(e)},handleWindowResize:function(isPrinting){for(var containerId in questionManager.questions)questionManager.questions.hasOwnProperty(containerId)&&(questionManager.questions[containerId].isPrinting=isPrinting,questionManager.questions[containerId].handleResize())},handleKeyboardFocus:function(e,isNavigating){questionManager.isKeyboardNavigation=isNavigating},fixLayoutIfThingsMoved:function(){questionManager.isKeyboardNavigation||this.handleWindowResize(questionManager.isPrinting),setTimeout((function(){questionManager.fixLayoutIfThingsMoved(questionManager.isPrinting)}),100)},getQuestionForEvent:function(e){var containerId=$(e.currentTarget).closest(".que.ddmarker").attr("id");return questionManager.questions[containerId]},handleFormDirty:function(){const responseForm=document.getElementById("responseform");FormChangeChecker.markFormAsDirty(responseForm)}};return{init:questionManager.init}}));
+define("qtype_ddmarker/question",["jquery","core/dragdrop","qtype_ddmarker/shapes","core/key_codes","core_form/changechecker","core_filters/events"],(function($,dragDrop,Shapes,keys,FormChangeChecker,filterEvent){function DragDropMarkersQuestion(containerId,readOnly,visibleDropZones){var thisQ=this;this.containerId=containerId,this.visibleDropZones=visibleDropZones,this.shapes=[],this.shapeSVGs=[],this.isPrinting=!1,this.questionAnswer={},readOnly&&this.getRoot().addClass("qtype_ddmarker-readonly"),thisQ.allImagesLoaded=!1,thisQ.getNotYetLoadedImages().one("load",(function(){thisQ.waitForAllImagesToBeLoaded()})),thisQ.waitForAllImagesToBeLoaded()}DragDropMarkersQuestion.prototype.drawDropzones=function(){if(this.visibleDropZones.length>0){var bgImage=this.bgImage();this.getRoot().find("div.dropzones").html('<svg xmlns="http://www.w3.org/2000/svg" class="dropzones" width="'+bgImage.outerWidth()+'" height="'+bgImage.outerHeight()+'"></svg>');for(var svg=this.getRoot().find("svg.dropzones"),nextColourIndex=0,dropZoneNo=0;dropZoneNo<this.visibleDropZones.length;dropZoneNo++){var colourClass="color"+nextColourIndex;nextColourIndex=(nextColourIndex+1)%8,this.addDropzone(svg,dropZoneNo,colourClass)}}},DragDropMarkersQuestion.prototype.addDropzone=function(svg,dropZoneNo,colourClass){var existingmarkertext,dropZone=this.visibleDropZones[dropZoneNo],shape=Shapes.make(dropZone.shape,""),bgRatio=this.bgRatio();if(shape.parse(dropZone.coords,bgRatio)){if((existingmarkertext=this.getRoot().find("div.markertexts span.markertext"+dropZoneNo)).length)""!==dropZone.markertext?existingmarkertext.html(dropZone.markertext):existingmarkertext.remove();else if(""!==dropZone.markertext){var classnames="markertext markertext"+dropZoneNo;this.getRoot().find("div.markertexts").append('<span class="'+classnames+'">'+dropZone.markertext+"</span>");var markerspan=this.getRoot().find("div.ddarea div.markertexts span.markertext"+dropZoneNo);if(markerspan.length){var handles=shape.getHandlePositions(),positionLeft=handles.moveHandle.x-markerspan.outerWidth()/2-4,positionTop=handles.moveHandle.y-markerspan.outerHeight()/2;markerspan.css("left",positionLeft).css("top",positionTop),markerspan.data("originX",markerspan.position().left/bgRatio).data("originY",markerspan.position().top/bgRatio),this.handleElementScale(markerspan,"center")}}var shapeSVG=shape.makeSvg(svg[0]);shapeSVG.setAttribute("class","dropzone "+colourClass),this.shapes[this.shapes.length]=shape,this.shapeSVGs[this.shapeSVGs.length]=shapeSVG}},DragDropMarkersQuestion.prototype.repositionDrags=function(){var root=this.getRoot(),thisQ=this;root.find("div.draghomes .marker").not(".dragplaceholder").each((function(key,item){$(item).addClass("unneeded")})),root.find("input.choices").each((function(key,input){var choiceNo=thisQ.getChoiceNoFromElement(input),imageCoords=thisQ.getImageCoords(input);if(imageCoords.length){var drag=thisQ.getRoot().find(".draghomes span.marker.choice"+choiceNo).not(".dragplaceholder");drag.remove();for(var i=0;i<imageCoords.length;i++){var dragInDrop=drag.clone();const screenCoords=thisQ.convertToWindowXY(imageCoords[i]);dragInDrop.data("pagex",screenCoords.x).data("pagey",screenCoords.y),dragInDrop.data("imageCoords",imageCoords[i]),dragInDrop.data("scaleRatio",1),thisQ.sendDragToDrop(dragInDrop,!1,!0)}thisQ.getDragClone(drag).addClass("active"),thisQ.cloneDragIfNeeded(drag)}})),thisQ.questionAnswer=thisQ.getQuestionAnsweredValues()},DragDropMarkersQuestion.prototype.getQuestionAnsweredValues=function(){let result={};return this.getRoot().find("input.choices").each(((i,inputNode)=>{result[inputNode.id]=inputNode.value})),result},DragDropMarkersQuestion.prototype.isQuestionInteracted=function(){const oldAnswer=this.questionAnswer,newAnswer=this.getQuestionAnsweredValues();let isInteracted=!1;return JSON.stringify(newAnswer)!==JSON.stringify(oldAnswer)?(isInteracted=!0,isInteracted):(Object.keys(newAnswer).forEach((key=>{newAnswer[key]!==oldAnswer[key]&&(isInteracted=!0)})),isInteracted)},DragDropMarkersQuestion.prototype.getImageCoords=function(inputNode){var imageCoords=[],val=$(inputNode).val();if(""!==val)for(var coordsStrings=val.split(";"),i=0;i<coordsStrings.length;i++)imageCoords[i]=Shapes.Point.parse(coordsStrings[i]);return imageCoords},DragDropMarkersQuestion.prototype.convertToWindowXY=function(point){var bgImage=this.bgImage();return point.offset(bgImage.offset().left+1,bgImage.offset().top+1)},DragDropMarkersQuestion.prototype.convertToBgImgXY=function(point){var bgImage=this.bgImage();return point.offset(-bgImage.offset().left-1,-bgImage.offset().top-1)},DragDropMarkersQuestion.prototype.coordsInBgImg=function(point){var bgImage=this.bgImage(),bgPosition=bgImage.offset();return point.x>=bgPosition.left&&point.x<bgPosition.left+bgImage.width()&&point.y>=bgPosition.top&&point.y<bgPosition.top+bgImage.height()},DragDropMarkersQuestion.prototype.getRoot=function(){return $(document.getElementById(this.containerId))},DragDropMarkersQuestion.prototype.bgImage=function(){return this.getRoot().find("img.dropbackground")},DragDropMarkersQuestion.prototype.handleDragStart=function(e){var thisQ=this,dragged=$(e.target).closest(".marker");if(dragDrop.prepare(e).start){if(dragged.addClass("beingdragged").css("transform",""),!!dragged.hasClass("unneeded")){var hiddenDrag=thisQ.getDragClone(dragged);hiddenDrag.length&&(hiddenDrag.addClass("active"),dragged.offset(hiddenDrag.offset()))}dragDrop.start(e,dragged,(function(){}),(function(x,y,dragged){thisQ.dragEnd(dragged)}))}},DragDropMarkersQuestion.prototype.dragEnd=function(dragged){var dragXY,placed=!1,choiceNo=this.getChoiceNoFromElement(dragged),bgRatio=this.bgRatio();if(dragged.data("pagex",dragged.offset().left).data("pagey",dragged.offset().top),dragXY=new Shapes.Point(dragged.data("pagex"),dragged.data("pagey")),this.coordsInBgImg(dragXY)){this.sendDragToDrop(dragged,!0),placed=!0,dragged.data("imageCoords")&&dragged.data("imageCoords",null);var bgImgXY=this.convertToBgImgXY(dragXY);bgImgXY=new Shapes.Point(bgImgXY.x/bgRatio,bgImgXY.y/bgRatio),dragged.data("originX",bgImgXY.x).data("originY",bgImgXY.y)}placed?this.cloneDragIfNeeded(dragged):(this.sendDragHome(dragged),this.removeDragIfNeeded(dragged)),this.saveCoordsForChoice(choiceNo)},DragDropMarkersQuestion.prototype.saveCoordsForChoice=function(choiceNo){let imageCoords=[];var items=this.getRoot().find("div.droparea span.marker.choice"+choiceNo),thiQ=this,bgRatio=this.bgRatio();items.length&&items.each((function(){var drag=$(this);if(drag.hasClass("beingdragged")||drag.data("imageCoords"))drag.data("imageCoords")&&(imageCoords[imageCoords.length]=drag.data("imageCoords"));else{drag.data("scaleRatio")!==bgRatio&&drag.data("pagex",drag.offset().left).data("pagey",drag.offset().top);var dragXY=new Shapes.Point(drag.data("pagex"),drag.data("pagey"));if(thiQ.coordsInBgImg(dragXY)){var bgImgXY=thiQ.convertToBgImgXY(dragXY);bgImgXY=new Shapes.Point(bgImgXY.x/bgRatio,bgImgXY.y/bgRatio),imageCoords[imageCoords.length]=bgImgXY}}})),this.getRoot().find("input.choice"+choiceNo).val(imageCoords.join(";")),this.isQuestionInteracted()&&(questionManager.handleFormDirty(),this.questionAnswer=this.getQuestionAnsweredValues())},DragDropMarkersQuestion.prototype.handleKeyPress=function(e){var drag=$(e.target).closest(".marker"),point=new Shapes.Point(drag.offset().left,drag.offset().top),choiceNo=this.getChoiceNoFromElement(drag);switch(e.keyCode){case keys.arrowLeft:case 65:point.x-=1;break;case keys.arrowRight:case 68:point.x+=1;break;case keys.arrowDown:case 83:point.y+=1;break;case keys.arrowUp:case 87:point.y-=1;break;case keys.space:case keys.escape:point=null;break;default:return}if(e.preventDefault(),null!==point){point=this.constrainToBgImg(point),drag.offset({left:point.x,top:point.y}),drag.data("pagex",drag.offset().left).data("pagey",drag.offset().top);var dragXY=this.convertToBgImgXY(new Shapes.Point(drag.data("pagex"),drag.data("pagey")));if(drag.data("originX",dragXY.x/this.bgRatio()).data("originY",dragXY.y/this.bgRatio()),this.coordsInBgImg(new Shapes.Point(drag.offset().left,drag.offset().top))&&drag.hasClass("unneeded")){this.sendDragToDrop(drag,!0);var hiddenDrag=this.getDragClone(drag);hiddenDrag.length&&hiddenDrag.addClass("active"),this.cloneDragIfNeeded(drag)}}else drag.css("left","").css("top",""),drag.data("pagex",drag.offset().left).data("pagey",drag.offset().top),this.sendDragHome(drag),this.removeDragIfNeeded(drag);drag.focus(),this.saveCoordsForChoice(choiceNo)},DragDropMarkersQuestion.prototype.constrainToBgImg=function(windowxy){var bgImg=this.bgImage(),bgImgXY=this.convertToBgImgXY(windowxy);return bgImgXY.x=Math.max(0,bgImgXY.x),bgImgXY.y=Math.max(0,bgImgXY.y),bgImgXY.x=Math.min(bgImg.width(),bgImgXY.x),bgImgXY.y=Math.min(bgImg.height(),bgImgXY.y),this.convertToWindowXY(bgImgXY)},DragDropMarkersQuestion.prototype.getChoiceNoFromElement=function(node){return Number(this.getClassnameNumericSuffix(node,"choice"))},DragDropMarkersQuestion.prototype.getClassnameNumericSuffix=function(node,prefix){var classes=$(node).attr("class");if(void 0!==classes&&""!==classes)for(var classesarr=classes.split(" "),index=0;index<classesarr.length;index++){if(new RegExp("^"+prefix+"([0-9])+$").test(classesarr[index])){var match=new RegExp("([0-9])+$").exec(classesarr[index]);return Number(match[0])}}return null},DragDropMarkersQuestion.prototype.handleResize=function(){var thisQ=this,bgRatio=this.bgRatio();this.isPrinting&&(bgRatio=1),this.getRoot().find("div.droparea .marker").not(".beingdragged").each((function(key,drag){$(drag).css("left",parseFloat($(drag).data("originX"))*parseFloat(bgRatio)).css("top",parseFloat($(drag).data("originY"))*parseFloat(bgRatio)),thisQ.handleElementScale(drag,"left top")})),this.getRoot().find("div.droparea svg.dropzones").width(this.bgImage().width()).height(this.bgImage().height());for(var dropZoneNo=0;dropZoneNo<this.visibleDropZones.length;dropZoneNo++){var originCoords=thisQ.visibleDropZones[dropZoneNo].coords,shape=thisQ.shapes[dropZoneNo],shapeSVG=thisQ.shapeSVGs[dropZoneNo];shape.parse(originCoords,bgRatio),shape.updateSvg(shapeSVG);var handles=shape.getHandlePositions(),markerSpan=this.getRoot().find("div.ddarea div.markertexts span.markertext"+dropZoneNo);markerSpan.css("left",handles.moveHandle.x-markerSpan.outerWidth()/2-4).css("top",handles.moveHandle.y-markerSpan.outerHeight()/2),thisQ.handleElementScale(markerSpan,"center")}},DragDropMarkersQuestion.prototype.cloneDrags=function(){var thisQ=this;this.getRoot().find("div.draghomes span.marker").each((function(index,draghome){var drag=$(draghome),placeHolder=drag.clone();placeHolder.removeClass(),placeHolder.addClass("marker"),placeHolder.addClass("choice"+thisQ.getChoiceNoFromElement(drag)),placeHolder.addClass(thisQ.getDragNoClass(drag,!1)),placeHolder.addClass("dragplaceholder"),drag.before(placeHolder)}))},DragDropMarkersQuestion.prototype.getDragNo=function(drag){return this.getClassnameNumericSuffix(drag,"dragno")},DragDropMarkersQuestion.prototype.getDragNoClass=function(drag,includeSelector){var className="dragno"+this.getDragNo(drag);return this.isInfiniteDrag(drag)&&(className="infinite"),includeSelector?"."+className:className},DragDropMarkersQuestion.prototype.getDragClone=function(drag){return this.getRoot().find(".draghomes span.marker.choice"+this.getChoiceNoFromElement(drag)+this.getDragNoClass(drag,!0)+".dragplaceholder")},DragDropMarkersQuestion.prototype.dropArea=function(){return this.getRoot().find("div.droparea")},DragDropMarkersQuestion.prototype.sendDragHome=function(drag){drag.removeClass("beingdragged").addClass("unneeded").css("top","").css("left","").css("transform","");var placeHolder=this.getDragClone(drag);placeHolder.after(drag),placeHolder.removeClass("active")},DragDropMarkersQuestion.prototype.sendDragToDrop=function(drag,isScaling){let initialLoad=arguments.length>2&&void 0!==arguments[2]&&arguments[2];var dropArea=this.dropArea(),bgRatio=this.bgRatio();drag.removeClass("beingdragged").removeClass("unneeded");var dragXY=this.convertToBgImgXY(new Shapes.Point(drag.data("pagex"),drag.data("pagey")));isScaling?(drag.data("originX",dragXY.x/bgRatio).data("originY",dragXY.y/bgRatio),drag.css("left",dragXY.x).css("top",dragXY.y)):(drag.data("originX",dragXY.x).data("originY",dragXY.y),drag.css("left",dragXY.x*bgRatio).css("top",dragXY.y*bgRatio)),initialLoad||drag.data("scaleRatio",bgRatio),dropArea.append(drag),this.handleElementScale(drag,"left top")},DragDropMarkersQuestion.prototype.cloneDragIfNeeded=function(drag){var inputNode=this.getInput(drag),noOfDrags=Number(this.getClassnameNumericSuffix(inputNode,"noofdrags")),displayedDragsInDropArea=this.getRoot().find("div.droparea .marker.choice"+this.getChoiceNoFromElement(drag)+this.getDragNoClass(drag,!0)).length,displayedDragsInDragHomes=this.getRoot().find("div.draghomes .marker.choice"+this.getChoiceNoFromElement(drag)+this.getDragNoClass(drag,!0)).not(".dragplaceholder").length;if((this.isInfiniteDrag(drag)||!this.isInfiniteDrag(drag)&&displayedDragsInDropArea<noOfDrags)&&0===displayedDragsInDragHomes){var dragClone=drag.clone();dragClone.addClass("unneeded").css("top","").css("left","").css("transform",""),this.getDragClone(drag).removeClass("active").after(dragClone),questionManager.addEventHandlersToMarker(dragClone)}},DragDropMarkersQuestion.prototype.removeDragIfNeeded=function(drag){for(var dragsInHome=this.getRoot().find("div.draghomes .marker.choice"+this.getChoiceNoFromElement(drag)+this.getDragNoClass(drag,!0)).not(".dragplaceholder"),displayedDrags=dragsInHome.length;displayedDrags>1;)dragsInHome.first().remove(),displayedDrags--},DragDropMarkersQuestion.prototype.getInput=function(drag){var choiceNo=this.getChoiceNoFromElement(drag);return this.getRoot().find("input.choices.choice"+choiceNo)},DragDropMarkersQuestion.prototype.bgRatio=function(){var bgImg=this.bgImage(),bgImgNaturalWidth=bgImg.get(0).naturalWidth;return bgImg.width()/bgImgNaturalWidth},DragDropMarkersQuestion.prototype.handleElementScale=function(element,type){var bgRatio=parseFloat(this.bgRatio());this.isPrinting&&(bgRatio=1),$(element).css({"-webkit-transform":"scale("+bgRatio+")","-moz-transform":"scale("+bgRatio+")","-ms-transform":"scale("+bgRatio+")","-o-transform":"scale("+bgRatio+")",transform:"scale("+bgRatio+")","transform-origin":type})},DragDropMarkersQuestion.prototype.isInfiniteDrag=function(drag){return drag.hasClass("infinite")},DragDropMarkersQuestion.prototype.waitForAllImagesToBeLoaded=function(){var thisQ=this;this.allImagesLoaded||(null!==this.imageLoadingTimeoutId&&clearTimeout(this.imageLoadingTimeoutId),this.getNotYetLoadedImages().length>0?this.imageLoadingTimeoutId=setTimeout((function(){this.waitForAllImagesToBeLoaded()}),100):(this.allImagesLoaded=!0,this.cloneDrags(),this.repositionDrags(),this.drawDropzones(),document.addEventListener(filterEvent.eventTypes.filterContentRenderingComplete,(elements=>{elements.detail.nodes.forEach((element=>{thisQ.changeAllMakerToFilteredContent(element)}))}))))},DragDropMarkersQuestion.prototype.changeAllMakerToFilteredContent=function(filteredElement){let currentFilteredItem=$(filteredElement);const parentIsMarker=currentFilteredItem.parent().closest("span.marker"),isMarker=currentFilteredItem.hasClass("marker"),root=this.getRoot();if(!parentIsMarker&&!isMarker)return;if(parentIsMarker&&(currentFilteredItem=currentFilteredItem.parent().closest("span.marker")),root.find(currentFilteredItem).length<=0)return;const dragNo=this.getDragNo(currentFilteredItem),choiceNo=this.getChoiceNoFromElement(currentFilteredItem),listOfContainerToBeModifed=["div.draghomes .marker:not(.dragplaceholder).dragno"+dragNo+".choice"+choiceNo,"div.droparea .marker:not(.dragplaceholder).dragno"+dragNo+".choice"+choiceNo,"div.draghomes .marker:not(.dragplaceholder).infinite.choice"+choiceNo,"div.droparea .marker:not(.dragplaceholder).infinite.choice"+choiceNo];let listOfModifiedDragDrop=[];const filteredDragDropClone=currentFilteredItem.clone();listOfContainerToBeModifed.forEach((function(selector){root.find(selector).each((function(i,node){const originalClass=$(node).attr("class"),originalStyle=$(node).attr("style");filteredDragDropClone.attr("class",originalClass),filteredDragDropClone.attr("style",originalStyle),questionManager.addEventHandlersToMarker(filteredDragDropClone),$(node).before(filteredDragDropClone),listOfModifiedDragDrop.push(node)}))})),listOfModifiedDragDrop.forEach((function(node){$(node).remove()}))},DragDropMarkersQuestion.prototype.getNotYetLoadedImages=function(){return this.getRoot().find(".ddmarker img.dropbackground").not((function(i,imgNode){return this.imageIsLoaded(imgNode)}))},DragDropMarkersQuestion.prototype.imageIsLoaded=function(imgElement){return imgElement.complete&&0!==imgElement.naturalHeight};var questionManager={eventHandlersInitialised:!1,markerEventHandlersInitialised:{},isPrinting:!1,isKeyboardNavigation:!1,questions:{},init:function(containerId,readOnly,visibleDropZones){if(questionManager.questions[containerId]=new DragDropMarkersQuestion(containerId,readOnly,visibleDropZones),questionManager.eventHandlersInitialised||(questionManager.setupEventHandlers(),questionManager.eventHandlersInitialised=!0),!questionManager.markerEventHandlersInitialised.hasOwnProperty(containerId)){questionManager.markerEventHandlersInitialised[containerId]=!0;var questionContainer=document.getElementById(containerId);questionContainer.classList.contains("ddmarker")&&!questionContainer.classList.contains("qtype_ddmarker-readonly")&&(questionManager.addEventHandlersToMarker($(questionContainer).find("div.draghomes .marker")),questionManager.addEventHandlersToMarker($(questionContainer).find("div.droparea .marker")))}},setupEventHandlers:function(){$(window).on("resize",(function(){questionManager.handleWindowResize(!1)})),window.addEventListener("beforeprint",(function(){questionManager.isPrinting=!0,questionManager.handleWindowResize(questionManager.isPrinting)})),window.addEventListener("afterprint",(function(){questionManager.isPrinting=!1,questionManager.handleWindowResize(questionManager.isPrinting)})),setTimeout((function(){questionManager.fixLayoutIfThingsMoved()}),100)},addEventHandlersToMarker:function(element){element.on("mousedown touchstart",questionManager.handleDragStart).on("keydown keypress",questionManager.handleKeyPress).focusin((function(e){questionManager.handleKeyboardFocus(e,!0)})).focusout((function(e){questionManager.handleKeyboardFocus(e,!1)}))},handleDragStart:function(e){e.preventDefault();var question=questionManager.getQuestionForEvent(e);question&&question.handleDragStart(e)},handleKeyPress:function(e){var question=questionManager.getQuestionForEvent(e);question&&question.handleKeyPress(e)},handleWindowResize:function(isPrinting){for(var containerId in questionManager.questions)questionManager.questions.hasOwnProperty(containerId)&&(questionManager.questions[containerId].isPrinting=isPrinting,questionManager.questions[containerId].handleResize())},handleKeyboardFocus:function(e,isNavigating){questionManager.isKeyboardNavigation=isNavigating},fixLayoutIfThingsMoved:function(){questionManager.isKeyboardNavigation||this.handleWindowResize(questionManager.isPrinting),setTimeout((function(){questionManager.fixLayoutIfThingsMoved(questionManager.isPrinting)}),100)},getQuestionForEvent:function(e){var containerId=$(e.currentTarget).closest(".que.ddmarker").attr("id");return questionManager.questions[containerId]},handleFormDirty:function(){const responseForm=document.getElementById("responseform");FormChangeChecker.markFormAsDirty(responseForm)}};return{init:questionManager.init}}));
 
 //# sourceMappingURL=question.min.js.map
\ No newline at end of file
diff --git a/question/type/ddmarker/amd/build/question.min.js.map b/question/type/ddmarker/amd/build/question.min.js.map
index 14a7916e0c614..b7f7ad0be6b1b 100644
--- a/question/type/ddmarker/amd/build/question.min.js.map
+++ b/question/type/ddmarker/amd/build/question.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"question.min.js","sources":["../src/question.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Question class for drag and drop marker question type, used to support the question and preview pages.\n *\n * @module     qtype_ddmarker/question\n * @copyright  2018 The Open University\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\ndefine([\n    'jquery',\n    'core/dragdrop',\n    'qtype_ddmarker/shapes',\n    'core/key_codes',\n    'core_form/changechecker'\n], function(\n    $,\n    dragDrop,\n    Shapes,\n    keys,\n    FormChangeChecker\n) {\n\n    \"use strict\";\n\n    /**\n     * Object to handle one drag-drop markers question.\n     *\n     * @param {String} containerId id of the outer div for this question.\n     * @param {boolean} readOnly whether the question is being displayed read-only.\n     * @param {Object[]} visibleDropZones the geometry of any drop-zones to show.\n     *      Objects have fields shape, coords and markertext.\n     * @constructor\n     */\n    function DragDropMarkersQuestion(containerId, readOnly, visibleDropZones) {\n        var thisQ = this;\n        this.containerId = containerId;\n        this.visibleDropZones = visibleDropZones;\n        this.shapes = [];\n        this.shapeSVGs = [];\n        this.isPrinting = false;\n        this.questionAnswer = {};\n        if (readOnly) {\n            this.getRoot().addClass('qtype_ddmarker-readonly');\n        }\n        thisQ.allImagesLoaded = false;\n        thisQ.getNotYetLoadedImages().one('load', function() {\n            thisQ.waitForAllImagesToBeLoaded();\n        });\n        thisQ.waitForAllImagesToBeLoaded();\n    }\n\n    /**\n     * Draws the svg shapes of any drop zones that should be visible for feedback purposes.\n     */\n    DragDropMarkersQuestion.prototype.drawDropzones = function() {\n        if (this.visibleDropZones.length > 0) {\n            var bgImage = this.bgImage();\n\n            this.getRoot().find('div.dropzones').html('<svg xmlns=\"http://www.w3.org/2000/svg\" class=\"dropzones\" ' +\n                'width=\"' + bgImage.outerWidth() + '\" ' +\n                'height=\"' + bgImage.outerHeight() + '\"></svg>');\n            var svg = this.getRoot().find('svg.dropzones');\n\n            var nextColourIndex = 0;\n            for (var dropZoneNo = 0; dropZoneNo < this.visibleDropZones.length; dropZoneNo++) {\n                var colourClass = 'color' + nextColourIndex;\n                nextColourIndex = (nextColourIndex + 1) % 8;\n                this.addDropzone(svg, dropZoneNo, colourClass);\n            }\n        }\n    };\n\n    /**\n     * Adds a dropzone shape with colour, coords and link provided to the array of shapes.\n     *\n     * @param {jQuery} svg the SVG image to which to add this drop zone.\n     * @param {int} dropZoneNo which drop-zone to add.\n     * @param {string} colourClass class name\n     */\n    DragDropMarkersQuestion.prototype.addDropzone = function(svg, dropZoneNo, colourClass) {\n        var dropZone = this.visibleDropZones[dropZoneNo],\n            shape = Shapes.make(dropZone.shape, ''),\n            existingmarkertext,\n            bgRatio = this.bgRatio();\n        if (!shape.parse(dropZone.coords, bgRatio)) {\n            return;\n        }\n\n        existingmarkertext = this.getRoot().find('div.markertexts span.markertext' + dropZoneNo);\n        if (existingmarkertext.length) {\n            if (dropZone.markertext !== '') {\n                existingmarkertext.html(dropZone.markertext);\n            } else {\n                existingmarkertext.remove();\n            }\n        } else if (dropZone.markertext !== '') {\n            var classnames = 'markertext markertext' + dropZoneNo;\n            this.getRoot().find('div.markertexts').append('<span class=\"' + classnames + '\">' +\n                dropZone.markertext + '</span>');\n            var markerspan = this.getRoot().find('div.ddarea div.markertexts span.markertext' + dropZoneNo);\n            if (markerspan.length) {\n                var handles = shape.getHandlePositions();\n                var positionLeft = handles.moveHandle.x - (markerspan.outerWidth() / 2) - 4;\n                var positionTop = handles.moveHandle.y - (markerspan.outerHeight() / 2);\n                markerspan\n                    .css('left', positionLeft)\n                    .css('top', positionTop);\n                markerspan\n                    .data('originX', markerspan.position().left / bgRatio)\n                    .data('originY', markerspan.position().top / bgRatio);\n                this.handleElementScale(markerspan, 'center');\n            }\n        }\n\n        var shapeSVG = shape.makeSvg(svg[0]);\n        shapeSVG.setAttribute('class', 'dropzone ' + colourClass);\n\n        this.shapes[this.shapes.length] = shape;\n        this.shapeSVGs[this.shapeSVGs.length] = shapeSVG;\n    };\n\n    /**\n     * Draws the drag items on the page (and drop zones if required).\n     * The idea is to re-draw all the drags and drops whenever there is a change\n     * like a widow resize or an item dropped in place.\n     */\n    DragDropMarkersQuestion.prototype.repositionDrags = function() {\n        var root = this.getRoot(),\n            thisQ = this;\n\n        root.find('div.draghomes .marker').not('.dragplaceholder').each(function(key, item) {\n            $(item).addClass('unneeded');\n        });\n\n        root.find('input.choices').each(function(key, input) {\n            var choiceNo = thisQ.getChoiceNoFromElement(input),\n                imageCoords = thisQ.getImageCoords(input);\n            if (imageCoords.length) {\n                var drag = thisQ.getRoot().find('.draghomes' + ' span.marker' + '.choice' + choiceNo).not('.dragplaceholder');\n                drag.remove();\n                for (var i = 0; i < imageCoords.length; i++) {\n                    var dragInDrop = drag.clone();\n                    // Convert image coords to screen coords.\n                    const screenCoords = thisQ.convertToWindowXY(imageCoords[i]);\n                    dragInDrop.data('pagex', screenCoords.x).data('pagey', screenCoords.y);\n                    // Save image coords to the drag item so we can use it later.\n                    dragInDrop.data('imageCoords', imageCoords[i]);\n                    // We always save the coordinates in the 1:1 ratio.\n                    // So we need to set the scale ratio to 1 for the initial load.\n                    dragInDrop.data('scaleRatio', 1);\n                    thisQ.sendDragToDrop(dragInDrop, false, true);\n                }\n                thisQ.getDragClone(drag).addClass('active');\n                thisQ.cloneDragIfNeeded(drag);\n            }\n        });\n\n        // Save the question answer.\n        thisQ.questionAnswer = thisQ.getQuestionAnsweredValues();\n    };\n\n    /**\n     * Get the question answered values.\n     *\n     * @return {Object} Contain key-value with key is the input id and value is the input value.\n     */\n    DragDropMarkersQuestion.prototype.getQuestionAnsweredValues = function() {\n        let result = {};\n        this.getRoot().find('input.choices').each((i, inputNode) => {\n            result[inputNode.id] = inputNode.value;\n        });\n\n        return result;\n    };\n\n    /**\n     * Check if the question is being interacted or not.\n     *\n     * @return {boolean} Return true if the user has changed the question-answer.\n     */\n    DragDropMarkersQuestion.prototype.isQuestionInteracted = function() {\n        const oldAnswer = this.questionAnswer;\n        const newAnswer = this.getQuestionAnsweredValues();\n        let isInteracted = false;\n\n        // First, check both answers have the same structure or not.\n        if (JSON.stringify(newAnswer) !== JSON.stringify(oldAnswer)) {\n            isInteracted = true;\n            return isInteracted;\n        }\n        // Check the values.\n        Object.keys(newAnswer).forEach(key => {\n            if (newAnswer[key] !== oldAnswer[key]) {\n                isInteracted = true;\n            }\n        });\n\n        return isInteracted;\n    };\n\n    /**\n     * Determine what drag items need to be shown and\n     * return coords of all drag items except any that are currently being dragged\n     * based on contents of hidden inputs and whether drags are 'infinite' or how many\n     * drags should be shown.\n     *\n     * @param {jQuery} inputNode\n     * @returns {Point[]} image coordinates of however many copies of the drag item should be shown.\n     */\n    DragDropMarkersQuestion.prototype.getImageCoords = function(inputNode) {\n        var imageCoords = [],\n            val = $(inputNode).val();\n        if (val !== '') {\n            var coordsStrings = val.split(';');\n            for (var i = 0; i < coordsStrings.length; i++) {\n                imageCoords[i] = Shapes.Point.parse(coordsStrings[i]);\n            }\n        }\n        return imageCoords;\n    };\n\n    /**\n     * Converts the relative x and y position coordinates into\n     * absolute x and y position coordinates.\n     *\n     * @param {Point} point relative to the background image.\n     * @returns {Point} point relative to the page.\n     */\n    DragDropMarkersQuestion.prototype.convertToWindowXY = function(point) {\n        var bgImage = this.bgImage();\n        // The +1 seems rather odd, but seems to give the best results in\n        // the three main browsers at a range of zoom levels.\n        // (Its due to the 1px border around the image, that shifts the\n        // image pixels by 1 down and to the left.)\n        return point.offset(bgImage.offset().left + 1, bgImage.offset().top + 1);\n    };\n\n    /**\n     * Utility function converting window coordinates to relative to the\n     * background image coordinates.\n     *\n     * @param {Point} point relative to the page.\n     * @returns {Point} point relative to the background image.\n     */\n    DragDropMarkersQuestion.prototype.convertToBgImgXY = function(point) {\n        var bgImage = this.bgImage();\n        return point.offset(-bgImage.offset().left - 1, -bgImage.offset().top - 1);\n    };\n\n    /**\n     * Is the point within the background image?\n     *\n     * @param {Point} point relative to the BG image.\n     * @return {boolean} true it they are.\n     */\n    DragDropMarkersQuestion.prototype.coordsInBgImg = function(point) {\n        var bgImage = this.bgImage();\n        var bgPosition = bgImage.offset();\n\n        return point.x >= bgPosition.left && point.x < bgPosition.left + bgImage.width()\n            && point.y >= bgPosition.top && point.y < bgPosition.top + bgImage.height();\n    };\n\n    /**\n     * Get the outer div for this question.\n     * @returns {jQuery} containing that div.\n     */\n    DragDropMarkersQuestion.prototype.getRoot = function() {\n        return $(document.getElementById(this.containerId));\n    };\n\n    /**\n     * Get the img that is the background image.\n     * @returns {jQuery} containing that img.\n     */\n    DragDropMarkersQuestion.prototype.bgImage = function() {\n        return this.getRoot().find('img.dropbackground');\n    };\n\n    DragDropMarkersQuestion.prototype.handleDragStart = function(e) {\n        var thisQ = this,\n            dragged = $(e.target).closest('.marker');\n\n        var info = dragDrop.prepare(e);\n        if (!info.start) {\n            return;\n        }\n\n        dragged.addClass('beingdragged').css('transform', '');\n\n        var placed = !dragged.hasClass('unneeded');\n        if (!placed) {\n            var hiddenDrag = thisQ.getDragClone(dragged);\n            if (hiddenDrag.length) {\n                hiddenDrag.addClass('active');\n                dragged.offset(hiddenDrag.offset());\n            }\n        }\n\n        dragDrop.start(e, dragged, function() {\n            void (1);\n        }, function(x, y, dragged) {\n            thisQ.dragEnd(dragged);\n        });\n    };\n\n    /**\n     * Functionality at the end of a drag drop.\n     * @param {jQuery} dragged the marker that was dragged.\n     */\n    DragDropMarkersQuestion.prototype.dragEnd = function(dragged) {\n        var placed = false,\n            choiceNo = this.getChoiceNoFromElement(dragged),\n            bgRatio = this.bgRatio(),\n            dragXY;\n\n        dragged.data('pagex', dragged.offset().left).data('pagey', dragged.offset().top);\n        dragXY = new Shapes.Point(dragged.data('pagex'), dragged.data('pagey'));\n        if (this.coordsInBgImg(dragXY)) {\n            this.sendDragToDrop(dragged, true);\n            placed = true;\n            // Since we already move the drag item to new position.\n            // Remove the image coords if this drag item have it.\n            // We will get the new image coords for this drag item in saveCoordsForChoice.\n            if (dragged.data('imageCoords')) {\n                dragged.data('imageCoords', null);\n            }\n            // It seems that the dragdrop sometimes leaves the drag\n            // one pixel out of position. Put it in exactly the right place.\n            var bgImgXY = this.convertToBgImgXY(dragXY);\n            bgImgXY = new Shapes.Point(bgImgXY.x / bgRatio, bgImgXY.y / bgRatio);\n            dragged.data('originX', bgImgXY.x).data('originY', bgImgXY.y);\n        }\n\n        if (!placed) {\n            this.sendDragHome(dragged);\n            this.removeDragIfNeeded(dragged);\n        } else {\n            this.cloneDragIfNeeded(dragged);\n        }\n\n        this.saveCoordsForChoice(choiceNo);\n    };\n\n    /**\n     * Save the coordinates for a dropped item in the form field.\n     * @param {Number} choiceNo which copy of the choice this was.\n     */\n    DragDropMarkersQuestion.prototype.saveCoordsForChoice = function(choiceNo) {\n        let imageCoords = [];\n        var items = this.getRoot().find('div.droparea span.marker.choice' + choiceNo),\n            thiQ = this,\n            bgRatio = this.bgRatio();\n\n        if (items.length) {\n            items.each(function() {\n                var drag = $(this);\n                if (!drag.hasClass('beingdragged') && !drag.data('imageCoords')) {\n                    if (drag.data('scaleRatio') !== bgRatio) {\n                        // The scale ratio for the draggable item was changed. We need to update that.\n                        drag.data('pagex', drag.offset().left).data('pagey', drag.offset().top);\n                    }\n                    var dragXY = new Shapes.Point(drag.data('pagex'), drag.data('pagey'));\n                    if (thiQ.coordsInBgImg(dragXY)) {\n                        var bgImgXY = thiQ.convertToBgImgXY(dragXY);\n                        bgImgXY = new Shapes.Point(bgImgXY.x / bgRatio, bgImgXY.y / bgRatio);\n                        imageCoords[imageCoords.length] = bgImgXY;\n                    }\n                } else if (drag.data('imageCoords')) {\n                    imageCoords[imageCoords.length] = drag.data('imageCoords');\n                }\n            });\n        }\n\n        this.getRoot().find('input.choice' + choiceNo).val(imageCoords.join(';'));\n        if (this.isQuestionInteracted()) {\n            // The user has interacted with the draggable items. We need to mark the form as dirty.\n            questionManager.handleFormDirty();\n            // Save the new answered value.\n            this.questionAnswer = this.getQuestionAnsweredValues();\n        }\n    };\n\n    /**\n     * Handle key down / press events on markers.\n     * @param {KeyboardEvent} e\n     */\n    DragDropMarkersQuestion.prototype.handleKeyPress = function(e) {\n        var drag = $(e.target).closest('.marker'),\n            point = new Shapes.Point(drag.offset().left, drag.offset().top),\n            choiceNo = this.getChoiceNoFromElement(drag);\n\n        switch (e.keyCode) {\n            case keys.arrowLeft:\n            case 65: // A.\n                point.x -= 1;\n                break;\n            case keys.arrowRight:\n            case 68: // D.\n                point.x += 1;\n                break;\n            case keys.arrowDown:\n            case 83: // S.\n                point.y += 1;\n                break;\n            case keys.arrowUp:\n            case 87: // W.\n                point.y -= 1;\n                break;\n            case keys.space:\n            case keys.escape:\n                point = null;\n                break;\n            default:\n                return; // Ingore other keys.\n        }\n        e.preventDefault();\n\n        if (point !== null) {\n            point = this.constrainToBgImg(point);\n            drag.offset({'left': point.x, 'top': point.y});\n            drag.data('pagex', drag.offset().left).data('pagey', drag.offset().top);\n            var dragXY = this.convertToBgImgXY(new Shapes.Point(drag.data('pagex'), drag.data('pagey')));\n            drag.data('originX', dragXY.x / this.bgRatio()).data('originY', dragXY.y / this.bgRatio());\n            if (this.coordsInBgImg(new Shapes.Point(drag.offset().left, drag.offset().top))) {\n                if (drag.hasClass('unneeded')) {\n                    this.sendDragToDrop(drag, true);\n                    var hiddenDrag = this.getDragClone(drag);\n                    if (hiddenDrag.length) {\n                        hiddenDrag.addClass('active');\n                    }\n                    this.cloneDragIfNeeded(drag);\n                }\n            }\n        } else {\n            drag.css('left', '').css('top', '');\n            drag.data('pagex', drag.offset().left).data('pagey', drag.offset().top);\n            this.sendDragHome(drag);\n            this.removeDragIfNeeded(drag);\n        }\n        drag.focus();\n        this.saveCoordsForChoice(choiceNo);\n    };\n\n    /**\n     * Makes sure the dragged item always exists within the background image area.\n     *\n     * @param {Point} windowxy\n     * @returns {Point} coordinates\n     */\n    DragDropMarkersQuestion.prototype.constrainToBgImg = function(windowxy) {\n        var bgImg = this.bgImage(),\n            bgImgXY = this.convertToBgImgXY(windowxy);\n        bgImgXY.x = Math.max(0, bgImgXY.x);\n        bgImgXY.y = Math.max(0, bgImgXY.y);\n        bgImgXY.x = Math.min(bgImg.width(), bgImgXY.x);\n        bgImgXY.y = Math.min(bgImg.height(), bgImgXY.y);\n        return this.convertToWindowXY(bgImgXY);\n    };\n\n    /**\n     * Returns the choice number for a node.\n     *\n     * @param {Element|jQuery} node\n     * @returns {Number}\n     */\n    DragDropMarkersQuestion.prototype.getChoiceNoFromElement = function(node) {\n        return Number(this.getClassnameNumericSuffix(node, 'choice'));\n    };\n\n    /**\n     * Returns the numeric part of a class with the given prefix.\n     *\n     * @param {Element|jQuery} node\n     * @param {String} prefix\n     * @returns {Number|null}\n     */\n    DragDropMarkersQuestion.prototype.getClassnameNumericSuffix = function(node, prefix) {\n        var classes = $(node).attr('class');\n        if (classes !== undefined && classes !== '') {\n            var classesarr = classes.split(' ');\n            for (var index = 0; index < classesarr.length; index++) {\n                var patt1 = new RegExp('^' + prefix + '([0-9])+$');\n                if (patt1.test(classesarr[index])) {\n                    var patt2 = new RegExp('([0-9])+$');\n                    var match = patt2.exec(classesarr[index]);\n                    return Number(match[0]);\n                }\n            }\n        }\n        return null;\n    };\n\n    /**\n     * Handle when the window is resized.\n     */\n    DragDropMarkersQuestion.prototype.handleResize = function() {\n        var thisQ = this,\n            bgRatio = this.bgRatio();\n        if (this.isPrinting) {\n            bgRatio = 1;\n        }\n\n        this.getRoot().find('div.droparea .marker').not('.beingdragged').each(function(key, drag) {\n            $(drag)\n                .css('left', parseFloat($(drag).data('originX')) * parseFloat(bgRatio))\n                .css('top', parseFloat($(drag).data('originY')) * parseFloat(bgRatio));\n            thisQ.handleElementScale(drag, 'left top');\n        });\n\n        this.getRoot().find('div.droparea svg.dropzones')\n            .width(this.bgImage().width())\n            .height(this.bgImage().height());\n\n        for (var dropZoneNo = 0; dropZoneNo < this.visibleDropZones.length; dropZoneNo++) {\n            var dropZone = thisQ.visibleDropZones[dropZoneNo];\n            var originCoords = dropZone.coords;\n            var shape = thisQ.shapes[dropZoneNo];\n            var shapeSVG = thisQ.shapeSVGs[dropZoneNo];\n            shape.parse(originCoords, bgRatio);\n            shape.updateSvg(shapeSVG);\n\n            var handles = shape.getHandlePositions();\n            var markerSpan = this.getRoot().find('div.ddarea div.markertexts span.markertext' + dropZoneNo);\n            markerSpan\n                .css('left', handles.moveHandle.x - (markerSpan.outerWidth() / 2) - 4)\n                .css('top', handles.moveHandle.y - (markerSpan.outerHeight() / 2));\n            thisQ.handleElementScale(markerSpan, 'center');\n        }\n    };\n\n    /**\n     * Clone the drag.\n     */\n    DragDropMarkersQuestion.prototype.cloneDrags = function() {\n        var thisQ = this;\n        this.getRoot().find('div.draghomes span.marker').each(function(index, draghome) {\n            var drag = $(draghome);\n            var placeHolder = drag.clone();\n            placeHolder.removeClass();\n            placeHolder.addClass('marker');\n            placeHolder.addClass('choice' + thisQ.getChoiceNoFromElement(drag));\n            placeHolder.addClass(thisQ.getDragNoClass(drag, false));\n            placeHolder.addClass('dragplaceholder');\n            drag.before(placeHolder);\n        });\n    };\n\n    /**\n     * Get the drag number of a drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @returns {Number} the drag number.\n     */\n    DragDropMarkersQuestion.prototype.getDragNo = function(drag) {\n        return this.getClassnameNumericSuffix(drag, 'dragno');\n    };\n\n    /**\n     * Get the drag number prefix of a drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @param {Boolean} includeSelector include the CSS selector prefix or not.\n     * @return {String} Class name\n     */\n    DragDropMarkersQuestion.prototype.getDragNoClass = function(drag, includeSelector) {\n        var className = 'dragno' + this.getDragNo(drag);\n        if (this.isInfiniteDrag(drag)) {\n            className = 'infinite';\n        }\n\n        if (includeSelector) {\n            return '.' + className;\n        }\n\n        return className;\n    };\n\n    /**\n     * Get drag clone for a given drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @returns {jQuery} the drag's clone.\n     */\n    DragDropMarkersQuestion.prototype.getDragClone = function(drag) {\n        return this.getRoot().find('.draghomes' + ' span.marker' +\n            '.choice' + this.getChoiceNoFromElement(drag) + this.getDragNoClass(drag, true) + '.dragplaceholder');\n    };\n\n    /**\n     * Get the drop area element.\n     * @returns {jQuery} droparea element.\n     */\n    DragDropMarkersQuestion.prototype.dropArea = function() {\n        return this.getRoot().find('div.droparea');\n    };\n\n    /**\n     * Animate a drag back to its home.\n     *\n     * @param {jQuery} drag the item being moved.\n     */\n    DragDropMarkersQuestion.prototype.sendDragHome = function(drag) {\n        drag.removeClass('beingdragged')\n            .addClass('unneeded')\n            .css('top', '')\n            .css('left', '')\n            .css('transform', '');\n        var placeHolder = this.getDragClone(drag);\n        placeHolder.after(drag);\n        placeHolder.removeClass('active');\n    };\n\n    /**\n     * Animate a drag item into a given place.\n     *\n     * @param {jQuery} drag the item to place.\n     * @param {boolean} isScaling Scaling or not.\n     * @param {boolean} initialLoad Whether it is the initial load or not.\n     */\n    DragDropMarkersQuestion.prototype.sendDragToDrop = function(drag, isScaling, initialLoad = false) {\n        var dropArea = this.dropArea(),\n            bgRatio = this.bgRatio();\n        drag.removeClass('beingdragged').removeClass('unneeded');\n        var dragXY = this.convertToBgImgXY(new Shapes.Point(drag.data('pagex'), drag.data('pagey')));\n        if (isScaling) {\n            drag.data('originX', dragXY.x / bgRatio).data('originY', dragXY.y / bgRatio);\n            drag.css('left', dragXY.x).css('top', dragXY.y);\n        } else {\n            drag.data('originX', dragXY.x).data('originY', dragXY.y);\n            drag.css('left', dragXY.x * bgRatio).css('top', dragXY.y * bgRatio);\n        }\n        // We need to save the original scale ratio for each draggable item.\n        if (!initialLoad) {\n            // Only set the scale ratio for a current being-dragged item, not for the initial loading.\n            drag.data('scaleRatio', bgRatio);\n        }\n        dropArea.append(drag);\n        this.handleElementScale(drag, 'left top');\n    };\n\n    /**\n     * Clone the drag at the draghome area if needed.\n     *\n     * @param {jQuery} drag the item to place.\n     */\n    DragDropMarkersQuestion.prototype.cloneDragIfNeeded = function(drag) {\n        var inputNode = this.getInput(drag),\n            noOfDrags = Number(this.getClassnameNumericSuffix(inputNode, 'noofdrags')),\n            displayedDragsInDropArea = this.getRoot().find('div.droparea .marker.choice' +\n                this.getChoiceNoFromElement(drag) + this.getDragNoClass(drag, true)).length,\n            displayedDragsInDragHomes = this.getRoot().find('div.draghomes .marker.choice' +\n                this.getChoiceNoFromElement(drag) + this.getDragNoClass(drag, true)).not('.dragplaceholder').length;\n\n        if ((this.isInfiniteDrag(drag) ||\n                !this.isInfiniteDrag(drag) && displayedDragsInDropArea < noOfDrags) && displayedDragsInDragHomes === 0) {\n            var dragClone = drag.clone();\n            dragClone.addClass('unneeded')\n                .css('top', '')\n                .css('left', '')\n                .css('transform', '');\n            this.getDragClone(drag)\n                .removeClass('active')\n                .after(dragClone);\n            questionManager.addEventHandlersToMarker(dragClone);\n        }\n    };\n\n    /**\n     * Remove the clone drag at the draghome area if needed.\n     *\n     * @param {jQuery} drag the item to place.\n     */\n    DragDropMarkersQuestion.prototype.removeDragIfNeeded = function(drag) {\n        var dragsInHome = this.getRoot().find('div.draghomes .marker.choice' +\n            this.getChoiceNoFromElement(drag) + this.getDragNoClass(drag, true)).not('.dragplaceholder');\n        var displayedDrags = dragsInHome.length;\n        while (displayedDrags > 1) {\n            dragsInHome.first().remove();\n            displayedDrags--;\n        }\n    };\n\n    /**\n     * Get the input belong to drag.\n     *\n     * @param {jQuery} drag the item to place.\n     * @returns {jQuery} input element.\n     */\n    DragDropMarkersQuestion.prototype.getInput = function(drag) {\n        var choiceNo = this.getChoiceNoFromElement(drag);\n        return this.getRoot().find('input.choices.choice' + choiceNo);\n    };\n\n    /**\n     * Return the background ratio.\n     *\n     * @returns {number} Background ratio.\n     */\n    DragDropMarkersQuestion.prototype.bgRatio = function() {\n        var bgImg = this.bgImage();\n        var bgImgNaturalWidth = bgImg.get(0).naturalWidth;\n        var bgImgClientWidth = bgImg.width();\n\n        return bgImgClientWidth / bgImgNaturalWidth;\n    };\n\n    /**\n     * Scale the drag if needed.\n     *\n     * @param {jQuery} element the item to place.\n     * @param {String} type scaling type\n     */\n    DragDropMarkersQuestion.prototype.handleElementScale = function(element, type) {\n        var bgRatio = parseFloat(this.bgRatio());\n        if (this.isPrinting) {\n            bgRatio = 1;\n        }\n        $(element).css({\n            '-webkit-transform': 'scale(' + bgRatio + ')',\n            '-moz-transform': 'scale(' + bgRatio + ')',\n            '-ms-transform': 'scale(' + bgRatio + ')',\n            '-o-transform': 'scale(' + bgRatio + ')',\n            'transform': 'scale(' + bgRatio + ')',\n            'transform-origin': type\n        });\n    };\n\n    /**\n     * Check if the given drag is in infinite mode or not.\n     *\n     * @param {jQuery} drag The drag item need to check.\n     */\n    DragDropMarkersQuestion.prototype.isInfiniteDrag = function(drag) {\n        return drag.hasClass('infinite');\n    };\n\n    /**\n     * Waits until all images are loaded before calling setupQuestion().\n     *\n     * This function is called from the onLoad of each image, and also polls with\n     * a time-out, because image on-loads are allegedly unreliable.\n     */\n    DragDropMarkersQuestion.prototype.waitForAllImagesToBeLoaded = function() {\n\n        // This method may get called multiple times (via image on-loads or timeouts.\n        // If we are already done, don't do it again.\n        if (this.allImagesLoaded) {\n            return;\n        }\n\n        // Clear any current timeout, if set.\n        if (this.imageLoadingTimeoutId !== null) {\n            clearTimeout(this.imageLoadingTimeoutId);\n        }\n\n        // If we have not yet loaded all images, set a timeout to\n        // call ourselves again, since apparently images on-load\n        // events are flakey.\n        if (this.getNotYetLoadedImages().length > 0) {\n            this.imageLoadingTimeoutId = setTimeout(function() {\n                this.waitForAllImagesToBeLoaded();\n            }, 100);\n            return;\n        }\n\n        // We now have all images. Carry on, but only after giving the layout a chance to settle down.\n        this.allImagesLoaded = true;\n        this.cloneDrags();\n        this.repositionDrags();\n        this.drawDropzones();\n    };\n\n    /**\n     * Get any of the images in the drag-drop area that are not yet fully loaded.\n     *\n     * @returns {jQuery} those images.\n     */\n    DragDropMarkersQuestion.prototype.getNotYetLoadedImages = function() {\n        return this.getRoot().find('.ddmarker img.dropbackground').not(function(i, imgNode) {\n            return this.imageIsLoaded(imgNode);\n        });\n    };\n\n    /**\n     * Check if an image has loaded without errors.\n     *\n     * @param {HTMLImageElement} imgElement an image.\n     * @returns {boolean} true if this image has loaded without errors.\n     */\n    DragDropMarkersQuestion.prototype.imageIsLoaded = function(imgElement) {\n        return imgElement.complete && imgElement.naturalHeight !== 0;\n    };\n\n    /**\n     * Singleton that tracks all the DragDropToTextQuestions on this page, and deals\n     * with event dispatching.\n     *\n     * @type {Object}\n     */\n    var questionManager = {\n\n        /**\n         * {boolean} ensures that the event handlers are only initialised once per page.\n         */\n        eventHandlersInitialised: false,\n\n        /**\n         * {Object} ensures that the marker event handlers are only initialised once per question,\n         * indexed by containerId (id on the .que div).\n         */\n        markerEventHandlersInitialised: {},\n\n        /**\n         * {boolean} is printing or not.\n         */\n        isPrinting: false,\n\n        /**\n         * {boolean} is keyboard navigation.\n         */\n        isKeyboardNavigation: false,\n\n        /**\n         * {Object} all the questions on this page, indexed by containerId (id on the .que div).\n         */\n        questions: {}, // An object containing all the information about each question on the page.\n\n        /**\n         * Initialise one question.\n         *\n         * @param {String} containerId the id of the div.que that contains this question.\n         * @param {boolean} readOnly whether the question is read-only.\n         * @param {Object[]} visibleDropZones data on any drop zones to draw as part of the feedback.\n         */\n        init: function(containerId, readOnly, visibleDropZones) {\n            questionManager.questions[containerId] =\n                new DragDropMarkersQuestion(containerId, readOnly, visibleDropZones);\n            if (!questionManager.eventHandlersInitialised) {\n                questionManager.setupEventHandlers();\n                questionManager.eventHandlersInitialised = true;\n            }\n            if (!questionManager.markerEventHandlersInitialised.hasOwnProperty(containerId)) {\n                questionManager.markerEventHandlersInitialised[containerId] = true;\n                // We do not use the body event here to prevent the other event on Mobile device, such as scroll event.\n                var questionContainer = document.getElementById(containerId);\n                if (questionContainer.classList.contains('ddmarker') &&\n                    !questionContainer.classList.contains('qtype_ddmarker-readonly')) {\n                    // TODO: Convert all the jQuery selectors and events to native Javascript.\n                    questionManager.addEventHandlersToMarker($(questionContainer).find('div.draghomes .marker'));\n                    questionManager.addEventHandlersToMarker($(questionContainer).find('div.droparea .marker'));\n                }\n            }\n        },\n\n        /**\n         * Set up the event handlers that make this question type work. (Done once per page.)\n         */\n        setupEventHandlers: function() {\n            $(window).on('resize', function() {\n                questionManager.handleWindowResize(false);\n            });\n            window.addEventListener('beforeprint', function() {\n                questionManager.isPrinting = true;\n                questionManager.handleWindowResize(questionManager.isPrinting);\n            });\n            window.addEventListener('afterprint', function() {\n                questionManager.isPrinting = false;\n                questionManager.handleWindowResize(questionManager.isPrinting);\n            });\n            setTimeout(function() {\n                questionManager.fixLayoutIfThingsMoved();\n            }, 100);\n        },\n\n        /**\n         * Binding the event again for newly created element.\n         *\n         * @param {jQuery} element Element to bind the event\n         */\n        addEventHandlersToMarker: function(element) {\n            element\n                .on('mousedown touchstart', questionManager.handleDragStart)\n                .on('keydown keypress', questionManager.handleKeyPress)\n                .focusin(function(e) {\n                    questionManager.handleKeyboardFocus(e, true);\n                })\n                .focusout(function(e) {\n                    questionManager.handleKeyboardFocus(e, false);\n                });\n        },\n\n        /**\n         * Handle mouse down / touch start events on markers.\n         * @param {Event} e the DOM event.\n         */\n        handleDragStart: function(e) {\n            e.preventDefault();\n            var question = questionManager.getQuestionForEvent(e);\n            if (question) {\n                question.handleDragStart(e);\n            }\n        },\n\n        /**\n         * Handle key down / press events on markers.\n         * @param {Event} e\n         */\n        handleKeyPress: function(e) {\n            var question = questionManager.getQuestionForEvent(e);\n            if (question) {\n                question.handleKeyPress(e);\n            }\n        },\n\n        /**\n         * Handle when the window is resized.\n         * @param {boolean} isPrinting\n         */\n        handleWindowResize: function(isPrinting) {\n            for (var containerId in questionManager.questions) {\n                if (questionManager.questions.hasOwnProperty(containerId)) {\n                    questionManager.questions[containerId].isPrinting = isPrinting;\n                    questionManager.questions[containerId].handleResize();\n                }\n            }\n        },\n\n        /**\n         * Handle focus lost events on markers.\n         * @param {Event} e\n         * @param {boolean} isNavigating\n         */\n        handleKeyboardFocus: function(e, isNavigating) {\n            questionManager.isKeyboardNavigation = isNavigating;\n        },\n\n        /**\n         * Sometimes, despite our best efforts, things change in a way that cannot\n         * be specifically caught (e.g. dock expanding or collapsing in Boost).\n         * Therefore, we need to periodically check everything is in the right position.\n         */\n        fixLayoutIfThingsMoved: function() {\n            if (!questionManager.isKeyboardNavigation) {\n                this.handleWindowResize(questionManager.isPrinting);\n            }\n            // We use setTimeout after finishing work, rather than setInterval,\n            // in case positioning things is slow. We want 100 ms gap\n            // between executions, not what setInterval does.\n            setTimeout(function() {\n                questionManager.fixLayoutIfThingsMoved(questionManager.isPrinting);\n            }, 100);\n        },\n\n        /**\n         * Given an event, work out which question it effects.\n         * @param {Event} e the event.\n         * @returns {DragDropMarkersQuestion|undefined} The question, or undefined.\n         */\n        getQuestionForEvent: function(e) {\n            var containerId = $(e.currentTarget).closest('.que.ddmarker').attr('id');\n            return questionManager.questions[containerId];\n        },\n\n        /**\n         * Handle when the form is dirty.\n         */\n        handleFormDirty: function() {\n            const responseForm = document.getElementById('responseform');\n            FormChangeChecker.markFormAsDirty(responseForm);\n        }\n    };\n\n    /**\n     * @alias module:qtype_ddmarker/question\n     */\n    return {\n        /**\n         * Initialise one drag-drop markers question.\n         *\n         * @param {String} containerId id of the outer div for this question.\n         * @param {String} bgImgUrl the URL of the background image.\n         * @param {boolean} readOnly whether the question is being displayed read-only.\n         * @param {String[]} visibleDropZones the geometry of any drop-zones to show.\n         */\n        init: questionManager.init\n    };\n});\n"],"names":["define","$","dragDrop","Shapes","keys","FormChangeChecker","DragDropMarkersQuestion","containerId","readOnly","visibleDropZones","thisQ","this","shapes","shapeSVGs","isPrinting","questionAnswer","getRoot","addClass","allImagesLoaded","getNotYetLoadedImages","one","waitForAllImagesToBeLoaded","prototype","drawDropzones","length","bgImage","find","html","outerWidth","outerHeight","svg","nextColourIndex","dropZoneNo","colourClass","addDropzone","existingmarkertext","dropZone","shape","make","bgRatio","parse","coords","markertext","remove","classnames","append","markerspan","handles","getHandlePositions","positionLeft","moveHandle","x","positionTop","y","css","data","position","left","top","handleElementScale","shapeSVG","makeSvg","setAttribute","repositionDrags","root","not","each","key","item","input","choiceNo","getChoiceNoFromElement","imageCoords","getImageCoords","drag","i","dragInDrop","clone","screenCoords","convertToWindowXY","sendDragToDrop","getDragClone","cloneDragIfNeeded","getQuestionAnsweredValues","result","inputNode","id","value","isQuestionInteracted","oldAnswer","newAnswer","isInteracted","JSON","stringify","Object","forEach","val","coordsStrings","split","Point","point","offset","convertToBgImgXY","coordsInBgImg","bgPosition","width","height","document","getElementById","handleDragStart","e","dragged","target","closest","prepare","start","hasClass","hiddenDrag","dragEnd","dragXY","placed","bgImgXY","sendDragHome","removeDragIfNeeded","saveCoordsForChoice","items","thiQ","join","questionManager","handleFormDirty","handleKeyPress","keyCode","arrowLeft","arrowRight","arrowDown","arrowUp","space","escape","preventDefault","constrainToBgImg","focus","windowxy","bgImg","Math","max","min","node","Number","getClassnameNumericSuffix","prefix","classes","attr","undefined","classesarr","index","RegExp","test","match","exec","handleResize","parseFloat","originCoords","updateSvg","markerSpan","cloneDrags","draghome","placeHolder","removeClass","getDragNoClass","before","getDragNo","includeSelector","className","isInfiniteDrag","dropArea","after","isScaling","initialLoad","getInput","noOfDrags","displayedDragsInDropArea","displayedDragsInDragHomes","dragClone","addEventHandlersToMarker","dragsInHome","displayedDrags","first","bgImgNaturalWidth","get","naturalWidth","element","type","imageLoadingTimeoutId","clearTimeout","setTimeout","imgNode","imageIsLoaded","imgElement","complete","naturalHeight","eventHandlersInitialised","markerEventHandlersInitialised","isKeyboardNavigation","questions","init","setupEventHandlers","hasOwnProperty","questionContainer","classList","contains","window","on","handleWindowResize","addEventListener","fixLayoutIfThingsMoved","focusin","handleKeyboardFocus","focusout","question","getQuestionForEvent","isNavigating","currentTarget","responseForm","markFormAsDirty"],"mappings":";;;;;;;AAuBAA,iCAAO,CACH,SACA,gBACA,wBACA,iBACA,4BACD,SACCC,EACAC,SACAC,OACAC,KACAC,4BAcSC,wBAAwBC,YAAaC,SAAUC,sBAChDC,MAAQC,UACPJ,YAAcA,iBACdE,iBAAmBA,sBACnBG,OAAS,QACTC,UAAY,QACZC,YAAa,OACbC,eAAiB,GAClBP,eACKQ,UAAUC,SAAS,2BAE5BP,MAAMQ,iBAAkB,EACxBR,MAAMS,wBAAwBC,IAAI,QAAQ,WACtCV,MAAMW,gCAEVX,MAAMW,6BAMVf,wBAAwBgB,UAAUC,cAAgB,cAC1CZ,KAAKF,iBAAiBe,OAAS,EAAG,KAC9BC,QAAUd,KAAKc,eAEdT,UAAUU,KAAK,iBAAiBC,KAAK,oEAC1BF,QAAQG,aADkB,aAEzBH,QAAQI,cAAgB,oBACrCC,IAAMnB,KAAKK,UAAUU,KAAK,iBAE1BK,gBAAkB,EACbC,WAAa,EAAGA,WAAarB,KAAKF,iBAAiBe,OAAQQ,aAAc,KAC1EC,YAAc,QAAUF,gBAC5BA,iBAAmBA,gBAAkB,GAAK,OACrCG,YAAYJ,IAAKE,WAAYC,gBAY9C3B,wBAAwBgB,UAAUY,YAAc,SAASJ,IAAKE,WAAYC,iBAGlEE,mBAFAC,SAAWzB,KAAKF,iBAAiBuB,YACjCK,MAAQlC,OAAOmC,KAAKF,SAASC,MAAO,IAEpCE,QAAU5B,KAAK4B,aACdF,MAAMG,MAAMJ,SAASK,OAAQF,cAIlCJ,mBAAqBxB,KAAKK,UAAUU,KAAK,kCAAoCM,aACtDR,OACS,KAAxBY,SAASM,WACTP,mBAAmBR,KAAKS,SAASM,YAEjCP,mBAAmBQ,cAEpB,GAA4B,KAAxBP,SAASM,WAAmB,KAC/BE,WAAa,wBAA0BZ,gBACtChB,UAAUU,KAAK,mBAAmBmB,OAAO,gBAAkBD,WAAa,KACzER,SAASM,WAAa,eACtBI,WAAanC,KAAKK,UAAUU,KAAK,6CAA+CM,eAChFc,WAAWtB,OAAQ,KACfuB,QAAUV,MAAMW,qBAChBC,aAAeF,QAAQG,WAAWC,EAAKL,WAAWlB,aAAe,EAAK,EACtEwB,YAAcL,QAAQG,WAAWG,EAAKP,WAAWjB,cAAgB,EACrEiB,WACKQ,IAAI,OAAQL,cACZK,IAAI,MAAOF,aAChBN,WACKS,KAAK,UAAWT,WAAWU,WAAWC,KAAOlB,SAC7CgB,KAAK,UAAWT,WAAWU,WAAWE,IAAMnB,cAC5CoB,mBAAmBb,WAAY,eAIxCc,SAAWvB,MAAMwB,QAAQ/B,IAAI,IACjC8B,SAASE,aAAa,QAAS,YAAc7B,kBAExCrB,OAAOD,KAAKC,OAAOY,QAAUa,WAC7BxB,UAAUF,KAAKE,UAAUW,QAAUoC,WAQ5CtD,wBAAwBgB,UAAUyC,gBAAkB,eAC5CC,KAAOrD,KAAKK,UACZN,MAAQC,KAEZqD,KAAKtC,KAAK,yBAAyBuC,IAAI,oBAAoBC,MAAK,SAASC,IAAKC,MAC1EnE,EAAEmE,MAAMnD,SAAS,eAGrB+C,KAAKtC,KAAK,iBAAiBwC,MAAK,SAASC,IAAKE,WACtCC,SAAW5D,MAAM6D,uBAAuBF,OACxCG,YAAc9D,MAAM+D,eAAeJ,UACnCG,YAAYhD,OAAQ,KAChBkD,KAAOhE,MAAMM,UAAUU,KAAK,gCAA4C4C,UAAUL,IAAI,oBAC1FS,KAAK/B,aACA,IAAIgC,EAAI,EAAGA,EAAIH,YAAYhD,OAAQmD,IAAK,KACrCC,WAAaF,KAAKG,cAEhBC,aAAepE,MAAMqE,kBAAkBP,YAAYG,IACzDC,WAAWrB,KAAK,QAASuB,aAAa3B,GAAGI,KAAK,QAASuB,aAAazB,GAEpEuB,WAAWrB,KAAK,cAAeiB,YAAYG,IAG3CC,WAAWrB,KAAK,aAAc,GAC9B7C,MAAMsE,eAAeJ,YAAY,GAAO,GAE5ClE,MAAMuE,aAAaP,MAAMzD,SAAS,UAClCP,MAAMwE,kBAAkBR,UAKhChE,MAAMK,eAAiBL,MAAMyE,6BAQjC7E,wBAAwBgB,UAAU6D,0BAA4B,eACtDC,OAAS,eACRpE,UAAUU,KAAK,iBAAiBwC,MAAK,CAACS,EAAGU,aAC1CD,OAAOC,UAAUC,IAAMD,UAAUE,SAG9BH,QAQX9E,wBAAwBgB,UAAUkE,qBAAuB,iBAC/CC,UAAY9E,KAAKI,eACjB2E,UAAY/E,KAAKwE,gCACnBQ,cAAe,SAGfC,KAAKC,UAAUH,aAAeE,KAAKC,UAAUJ,YAC7CE,cAAe,EACRA,eAGXG,OAAO1F,KAAKsF,WAAWK,SAAQ5B,MACvBuB,UAAUvB,OAASsB,UAAUtB,OAC7BwB,cAAe,MAIhBA,eAYXrF,wBAAwBgB,UAAUmD,eAAiB,SAASY,eACpDb,YAAc,GACdwB,IAAM/F,EAAEoF,WAAWW,SACX,KAARA,YACIC,cAAgBD,IAAIE,MAAM,KACrBvB,EAAI,EAAGA,EAAIsB,cAAczE,OAAQmD,IACtCH,YAAYG,GAAKxE,OAAOgG,MAAM3D,MAAMyD,cAActB,WAGnDH,aAUXlE,wBAAwBgB,UAAUyD,kBAAoB,SAASqB,WACvD3E,QAAUd,KAAKc,iBAKZ2E,MAAMC,OAAO5E,QAAQ4E,SAAS5C,KAAO,EAAGhC,QAAQ4E,SAAS3C,IAAM,IAU1EpD,wBAAwBgB,UAAUgF,iBAAmB,SAASF,WACtD3E,QAAUd,KAAKc,iBACZ2E,MAAMC,QAAQ5E,QAAQ4E,SAAS5C,KAAO,GAAIhC,QAAQ4E,SAAS3C,IAAM,IAS5EpD,wBAAwBgB,UAAUiF,cAAgB,SAASH,WACnD3E,QAAUd,KAAKc,UACf+E,WAAa/E,QAAQ4E,gBAElBD,MAAMjD,GAAKqD,WAAW/C,MAAQ2C,MAAMjD,EAAIqD,WAAW/C,KAAOhC,QAAQgF,SAClEL,MAAM/C,GAAKmD,WAAW9C,KAAO0C,MAAM/C,EAAImD,WAAW9C,IAAMjC,QAAQiF,UAO3EpG,wBAAwBgB,UAAUN,QAAU,kBACjCf,EAAE0G,SAASC,eAAejG,KAAKJ,eAO1CD,wBAAwBgB,UAAUG,QAAU,kBACjCd,KAAKK,UAAUU,KAAK,uBAG/BpB,wBAAwBgB,UAAUuF,gBAAkB,SAASC,OACrDpG,MAAQC,KACRoG,QAAU9G,EAAE6G,EAAEE,QAAQC,QAAQ,cAEvB/G,SAASgH,QAAQJ,GAClBK,UAIVJ,QAAQ9F,SAAS,gBAAgBqC,IAAI,YAAa,MAEpCyD,QAAQK,SAAS,YAClB,KACLC,WAAa3G,MAAMuE,aAAa8B,SAChCM,WAAW7F,SACX6F,WAAWpG,SAAS,UACpB8F,QAAQV,OAAOgB,WAAWhB,WAIlCnG,SAASiH,MAAML,EAAGC,SAAS,eAExB,SAAS5D,EAAGE,EAAG0D,SACdrG,MAAM4G,QAAQP,cAQtBzG,wBAAwBgB,UAAUgG,QAAU,SAASP,aAI7CQ,OAHAC,QAAS,EACTlD,SAAW3D,KAAK4D,uBAAuBwC,SACvCxE,QAAU5B,KAAK4B,aAGnBwE,QAAQxD,KAAK,QAASwD,QAAQV,SAAS5C,MAAMF,KAAK,QAASwD,QAAQV,SAAS3C,KAC5E6D,OAAS,IAAIpH,OAAOgG,MAAMY,QAAQxD,KAAK,SAAUwD,QAAQxD,KAAK,UAC1D5C,KAAK4F,cAAcgB,QAAS,MACvBvC,eAAe+B,SAAS,GAC7BS,QAAS,EAILT,QAAQxD,KAAK,gBACbwD,QAAQxD,KAAK,cAAe,UAI5BkE,QAAU9G,KAAK2F,iBAAiBiB,QACpCE,QAAU,IAAItH,OAAOgG,MAAMsB,QAAQtE,EAAIZ,QAASkF,QAAQpE,EAAId,SAC5DwE,QAAQxD,KAAK,UAAWkE,QAAQtE,GAAGI,KAAK,UAAWkE,QAAQpE,GAG1DmE,YAIItC,kBAAkB6B,eAHlBW,aAAaX,cACbY,mBAAmBZ,eAKvBa,oBAAoBtD,WAO7BhE,wBAAwBgB,UAAUsG,oBAAsB,SAAStD,cACzDE,YAAc,OACdqD,MAAQlH,KAAKK,UAAUU,KAAK,kCAAoC4C,UAChEwD,KAAOnH,KACP4B,QAAU5B,KAAK4B,UAEfsF,MAAMrG,QACNqG,MAAM3D,MAAK,eACHQ,KAAOzE,EAAEU,SACR+D,KAAK0C,SAAS,iBAAoB1C,KAAKnB,KAAK,eAWtCmB,KAAKnB,KAAK,iBACjBiB,YAAYA,YAAYhD,QAAUkD,KAAKnB,KAAK,oBAZiB,CACzDmB,KAAKnB,KAAK,gBAAkBhB,SAE5BmC,KAAKnB,KAAK,QAASmB,KAAK2B,SAAS5C,MAAMF,KAAK,QAASmB,KAAK2B,SAAS3C,SAEnE6D,OAAS,IAAIpH,OAAOgG,MAAMzB,KAAKnB,KAAK,SAAUmB,KAAKnB,KAAK,aACxDuE,KAAKvB,cAAcgB,QAAS,KACxBE,QAAUK,KAAKxB,iBAAiBiB,QACpCE,QAAU,IAAItH,OAAOgG,MAAMsB,QAAQtE,EAAIZ,QAASkF,QAAQpE,EAAId,SAC5DiC,YAAYA,YAAYhD,QAAUiG,kBAQ7CzG,UAAUU,KAAK,eAAiB4C,UAAU0B,IAAIxB,YAAYuD,KAAK,MAChEpH,KAAK6E,yBAELwC,gBAAgBC,uBAEXlH,eAAiBJ,KAAKwE,8BAQnC7E,wBAAwBgB,UAAU4G,eAAiB,SAASpB,OACpDpC,KAAOzE,EAAE6G,EAAEE,QAAQC,QAAQ,WAC3Bb,MAAQ,IAAIjG,OAAOgG,MAAMzB,KAAK2B,SAAS5C,KAAMiB,KAAK2B,SAAS3C,KAC3DY,SAAW3D,KAAK4D,uBAAuBG,aAEnCoC,EAAEqB,cACD/H,KAAKgI,eACL,GACDhC,MAAMjD,GAAK,aAEV/C,KAAKiI,gBACL,GACDjC,MAAMjD,GAAK,aAEV/C,KAAKkI,eACL,GACDlC,MAAM/C,GAAK,aAEVjD,KAAKmI,aACL,GACDnC,MAAM/C,GAAK,aAEVjD,KAAKoI,WACLpI,KAAKqI,OACNrC,MAAQ,6BAKhBU,EAAE4B,iBAEY,OAAVtC,MAAgB,CAChBA,MAAQzF,KAAKgI,iBAAiBvC,OAC9B1B,KAAK2B,OAAO,MAASD,MAAMjD,MAAUiD,MAAM/C,IAC3CqB,KAAKnB,KAAK,QAASmB,KAAK2B,SAAS5C,MAAMF,KAAK,QAASmB,KAAK2B,SAAS3C,SAC/D6D,OAAS5G,KAAK2F,iBAAiB,IAAInG,OAAOgG,MAAMzB,KAAKnB,KAAK,SAAUmB,KAAKnB,KAAK,cAClFmB,KAAKnB,KAAK,UAAWgE,OAAOpE,EAAIxC,KAAK4B,WAAWgB,KAAK,UAAWgE,OAAOlE,EAAI1C,KAAK4B,WAC5E5B,KAAK4F,cAAc,IAAIpG,OAAOgG,MAAMzB,KAAK2B,SAAS5C,KAAMiB,KAAK2B,SAAS3C,OAClEgB,KAAK0C,SAAS,YAAa,MACtBpC,eAAeN,MAAM,OACtB2C,WAAa1G,KAAKsE,aAAaP,MAC/B2C,WAAW7F,QACX6F,WAAWpG,SAAS,eAEnBiE,kBAAkBR,YAI/BA,KAAKpB,IAAI,OAAQ,IAAIA,IAAI,MAAO,IAChCoB,KAAKnB,KAAK,QAASmB,KAAK2B,SAAS5C,MAAMF,KAAK,QAASmB,KAAK2B,SAAS3C,UAC9DgE,aAAahD,WACbiD,mBAAmBjD,MAE5BA,KAAKkE,aACAhB,oBAAoBtD,WAS7BhE,wBAAwBgB,UAAUqH,iBAAmB,SAASE,cACtDC,MAAQnI,KAAKc,UACbgG,QAAU9G,KAAK2F,iBAAiBuC,iBACpCpB,QAAQtE,EAAI4F,KAAKC,IAAI,EAAGvB,QAAQtE,GAChCsE,QAAQpE,EAAI0F,KAAKC,IAAI,EAAGvB,QAAQpE,GAChCoE,QAAQtE,EAAI4F,KAAKE,IAAIH,MAAMrC,QAASgB,QAAQtE,GAC5CsE,QAAQpE,EAAI0F,KAAKE,IAAIH,MAAMpC,SAAUe,QAAQpE,GACtC1C,KAAKoE,kBAAkB0C,UASlCnH,wBAAwBgB,UAAUiD,uBAAyB,SAAS2E,aACzDC,OAAOxI,KAAKyI,0BAA0BF,KAAM,YAUvD5I,wBAAwBgB,UAAU8H,0BAA4B,SAASF,KAAMG,YACrEC,QAAUrJ,EAAEiJ,MAAMK,KAAK,iBACXC,IAAZF,SAAqC,KAAZA,gBACrBG,WAAaH,QAAQpD,MAAM,KACtBwD,MAAQ,EAAGA,MAAQD,WAAWjI,OAAQkI,QAAS,IACxC,IAAIC,OAAO,IAAMN,OAAS,aAC5BO,KAAKH,WAAWC,QAAS,KAE3BG,MADQ,IAAIF,OAAO,aACLG,KAAKL,WAAWC,eAC3BP,OAAOU,MAAM,YAIzB,MAMXvJ,wBAAwBgB,UAAUyI,aAAe,eACzCrJ,MAAQC,KACR4B,QAAU5B,KAAK4B,UACf5B,KAAKG,aACLyB,QAAU,QAGTvB,UAAUU,KAAK,wBAAwBuC,IAAI,iBAAiBC,MAAK,SAASC,IAAKO,MAChFzE,EAAEyE,MACGpB,IAAI,OAAQ0G,WAAW/J,EAAEyE,MAAMnB,KAAK,YAAcyG,WAAWzH,UAC7De,IAAI,MAAO0G,WAAW/J,EAAEyE,MAAMnB,KAAK,YAAcyG,WAAWzH,UACjE7B,MAAMiD,mBAAmBe,KAAM,oBAG9B1D,UAAUU,KAAK,8BACf+E,MAAM9F,KAAKc,UAAUgF,SACrBC,OAAO/F,KAAKc,UAAUiF,cAEtB,IAAI1E,WAAa,EAAGA,WAAarB,KAAKF,iBAAiBe,OAAQQ,aAAc,KAE1EiI,aADWvJ,MAAMD,iBAAiBuB,YACVS,OACxBJ,MAAQ3B,MAAME,OAAOoB,YACrB4B,SAAWlD,MAAMG,UAAUmB,YAC/BK,MAAMG,MAAMyH,aAAc1H,SAC1BF,MAAM6H,UAAUtG,cAEZb,QAAUV,MAAMW,qBAChBmH,WAAaxJ,KAAKK,UAAUU,KAAK,6CAA+CM,YACpFmI,WACK7G,IAAI,OAAQP,QAAQG,WAAWC,EAAKgH,WAAWvI,aAAe,EAAK,GACnE0B,IAAI,MAAOP,QAAQG,WAAWG,EAAK8G,WAAWtI,cAAgB,GACnEnB,MAAMiD,mBAAmBwG,WAAY,YAO7C7J,wBAAwBgB,UAAU8I,WAAa,eACvC1J,MAAQC,UACPK,UAAUU,KAAK,6BAA6BwC,MAAK,SAASwF,MAAOW,cAC9D3F,KAAOzE,EAAEoK,UACTC,YAAc5F,KAAKG,QACvByF,YAAYC,cACZD,YAAYrJ,SAAS,UACrBqJ,YAAYrJ,SAAS,SAAWP,MAAM6D,uBAAuBG,OAC7D4F,YAAYrJ,SAASP,MAAM8J,eAAe9F,MAAM,IAChD4F,YAAYrJ,SAAS,mBACrByD,KAAK+F,OAAOH,iBAUpBhK,wBAAwBgB,UAAUoJ,UAAY,SAAShG,aAC5C/D,KAAKyI,0BAA0B1E,KAAM,WAUhDpE,wBAAwBgB,UAAUkJ,eAAiB,SAAS9F,KAAMiG,qBAC1DC,UAAY,SAAWjK,KAAK+J,UAAUhG,aACtC/D,KAAKkK,eAAenG,QACpBkG,UAAY,YAGZD,gBACO,IAAMC,UAGVA,WASXtK,wBAAwBgB,UAAU2D,aAAe,SAASP,aAC/C/D,KAAKK,UAAUU,KAAK,gCACXf,KAAK4D,uBAAuBG,MAAQ/D,KAAK6J,eAAe9F,MAAM,GAAQ,qBAO1FpE,wBAAwBgB,UAAUwJ,SAAW,kBAClCnK,KAAKK,UAAUU,KAAK,iBAQ/BpB,wBAAwBgB,UAAUoG,aAAe,SAAShD,MACtDA,KAAK6F,YAAY,gBACZtJ,SAAS,YACTqC,IAAI,MAAO,IACXA,IAAI,OAAQ,IACZA,IAAI,YAAa,QAClBgH,YAAc3J,KAAKsE,aAAaP,MACpC4F,YAAYS,MAAMrG,MAClB4F,YAAYC,YAAY,WAU5BjK,wBAAwBgB,UAAU0D,eAAiB,SAASN,KAAMsG,eAAWC,wEACrEH,SAAWnK,KAAKmK,WAChBvI,QAAU5B,KAAK4B,UACnBmC,KAAK6F,YAAY,gBAAgBA,YAAY,gBACzChD,OAAS5G,KAAK2F,iBAAiB,IAAInG,OAAOgG,MAAMzB,KAAKnB,KAAK,SAAUmB,KAAKnB,KAAK,WAC9EyH,WACAtG,KAAKnB,KAAK,UAAWgE,OAAOpE,EAAIZ,SAASgB,KAAK,UAAWgE,OAAOlE,EAAId,SACpEmC,KAAKpB,IAAI,OAAQiE,OAAOpE,GAAGG,IAAI,MAAOiE,OAAOlE,KAE7CqB,KAAKnB,KAAK,UAAWgE,OAAOpE,GAAGI,KAAK,UAAWgE,OAAOlE,GACtDqB,KAAKpB,IAAI,OAAQiE,OAAOpE,EAAIZ,SAASe,IAAI,MAAOiE,OAAOlE,EAAId,UAG1D0I,aAEDvG,KAAKnB,KAAK,aAAchB,SAE5BuI,SAASjI,OAAO6B,WACXf,mBAAmBe,KAAM,aAQlCpE,wBAAwBgB,UAAU4D,kBAAoB,SAASR,UACvDW,UAAY1E,KAAKuK,SAASxG,MAC1ByG,UAAYhC,OAAOxI,KAAKyI,0BAA0B/D,UAAW,cAC7D+F,yBAA2BzK,KAAKK,UAAUU,KAAK,8BAC3Cf,KAAK4D,uBAAuBG,MAAQ/D,KAAK6J,eAAe9F,MAAM,IAAOlD,OACzE6J,0BAA4B1K,KAAKK,UAAUU,KAAK,+BAC5Cf,KAAK4D,uBAAuBG,MAAQ/D,KAAK6J,eAAe9F,MAAM,IAAOT,IAAI,oBAAoBzC,WAEhGb,KAAKkK,eAAenG,QAChB/D,KAAKkK,eAAenG,OAAS0G,yBAA2BD,YAA4C,IAA9BE,0BAAiC,KACxGC,UAAY5G,KAAKG,QACrByG,UAAUrK,SAAS,YACdqC,IAAI,MAAO,IACXA,IAAI,OAAQ,IACZA,IAAI,YAAa,SACjB2B,aAAaP,MACb6F,YAAY,UACZQ,MAAMO,WACXtD,gBAAgBuD,yBAAyBD,aASjDhL,wBAAwBgB,UAAUqG,mBAAqB,SAASjD,cACxD8G,YAAc7K,KAAKK,UAAUU,KAAK,+BAClCf,KAAK4D,uBAAuBG,MAAQ/D,KAAK6J,eAAe9F,MAAM,IAAOT,IAAI,oBACzEwH,eAAiBD,YAAYhK,OAC1BiK,eAAiB,GACpBD,YAAYE,QAAQ/I,SACpB8I,kBAURnL,wBAAwBgB,UAAU4J,SAAW,SAASxG,UAC9CJ,SAAW3D,KAAK4D,uBAAuBG,aACpC/D,KAAKK,UAAUU,KAAK,uBAAyB4C,WAQxDhE,wBAAwBgB,UAAUiB,QAAU,eACpCuG,MAAQnI,KAAKc,UACbkK,kBAAoB7C,MAAM8C,IAAI,GAAGC,oBACd/C,MAAMrC,QAEHkF,mBAS9BrL,wBAAwBgB,UAAUqC,mBAAqB,SAASmI,QAASC,UACjExJ,QAAUyH,WAAWrJ,KAAK4B,WAC1B5B,KAAKG,aACLyB,QAAU,GAEdtC,EAAE6L,SAASxI,IAAI,qBACU,SAAWf,QAAU,qBACxB,SAAWA,QAAU,oBACtB,SAAWA,QAAU,mBACtB,SAAWA,QAAU,cACxB,SAAWA,QAAU,uBACdwJ,QAS5BzL,wBAAwBgB,UAAUuJ,eAAiB,SAASnG,aACjDA,KAAK0C,SAAS,aASzB9G,wBAAwBgB,UAAUD,2BAA6B,WAIvDV,KAAKO,kBAK0B,OAA/BP,KAAKqL,uBACLC,aAAatL,KAAKqL,uBAMlBrL,KAAKQ,wBAAwBK,OAAS,OACjCwK,sBAAwBE,YAAW,gBAC/B7K,+BACN,WAKFH,iBAAkB,OAClBkJ,kBACArG,uBACAxC,mBAQTjB,wBAAwBgB,UAAUH,sBAAwB,kBAC/CR,KAAKK,UAAUU,KAAK,gCAAgCuC,KAAI,SAASU,EAAGwH,gBAChExL,KAAKyL,cAAcD,aAUlC7L,wBAAwBgB,UAAU8K,cAAgB,SAASC,mBAChDA,WAAWC,UAAyC,IAA7BD,WAAWE,mBASzCvE,gBAAkB,CAKlBwE,0BAA0B,EAM1BC,+BAAgC,GAKhC3L,YAAY,EAKZ4L,sBAAsB,EAKtBC,UAAW,GASXC,KAAM,SAASrM,YAAaC,SAAUC,qBAClCuH,gBAAgB2E,UAAUpM,aACtB,IAAID,wBAAwBC,YAAaC,SAAUC,kBAClDuH,gBAAgBwE,2BACjBxE,gBAAgB6E,qBAChB7E,gBAAgBwE,0BAA2B,IAE1CxE,gBAAgByE,+BAA+BK,eAAevM,aAAc,CAC7EyH,gBAAgByE,+BAA+BlM,cAAe,MAE1DwM,kBAAoBpG,SAASC,eAAerG,aAC5CwM,kBAAkBC,UAAUC,SAAS,cACpCF,kBAAkBC,UAAUC,SAAS,6BAEtCjF,gBAAgBuD,yBAAyBtL,EAAE8M,mBAAmBrL,KAAK,0BACnEsG,gBAAgBuD,yBAAyBtL,EAAE8M,mBAAmBrL,KAAK,4BAQ/EmL,mBAAoB,WAChB5M,EAAEiN,QAAQC,GAAG,UAAU,WACnBnF,gBAAgBoF,oBAAmB,MAEvCF,OAAOG,iBAAiB,eAAe,WACnCrF,gBAAgBlH,YAAa,EAC7BkH,gBAAgBoF,mBAAmBpF,gBAAgBlH,eAEvDoM,OAAOG,iBAAiB,cAAc,WAClCrF,gBAAgBlH,YAAa,EAC7BkH,gBAAgBoF,mBAAmBpF,gBAAgBlH,eAEvDoL,YAAW,WACPlE,gBAAgBsF,2BACjB,MAQP/B,yBAA0B,SAASO,SAC/BA,QACKqB,GAAG,uBAAwBnF,gBAAgBnB,iBAC3CsG,GAAG,mBAAoBnF,gBAAgBE,gBACvCqF,SAAQ,SAASzG,GACdkB,gBAAgBwF,oBAAoB1G,GAAG,MAE1C2G,UAAS,SAAS3G,GACfkB,gBAAgBwF,oBAAoB1G,GAAG,OAQnDD,gBAAiB,SAASC,GACtBA,EAAE4B,qBACEgF,SAAW1F,gBAAgB2F,oBAAoB7G,GAC/C4G,UACAA,SAAS7G,gBAAgBC,IAQjCoB,eAAgB,SAASpB,OACjB4G,SAAW1F,gBAAgB2F,oBAAoB7G,GAC/C4G,UACAA,SAASxF,eAAepB,IAQhCsG,mBAAoB,SAAStM,gBACpB,IAAIP,eAAeyH,gBAAgB2E,UAChC3E,gBAAgB2E,UAAUG,eAAevM,eACzCyH,gBAAgB2E,UAAUpM,aAAaO,WAAaA,WACpDkH,gBAAgB2E,UAAUpM,aAAawJ,iBAUnDyD,oBAAqB,SAAS1G,EAAG8G,cAC7B5F,gBAAgB0E,qBAAuBkB,cAQ3CN,uBAAwB,WACftF,gBAAgB0E,2BACZU,mBAAmBpF,gBAAgBlH,YAK5CoL,YAAW,WACPlE,gBAAgBsF,uBAAuBtF,gBAAgBlH,cACxD,MAQP6M,oBAAqB,SAAS7G,OACtBvG,YAAcN,EAAE6G,EAAE+G,eAAe5G,QAAQ,iBAAiBsC,KAAK,aAC5DvB,gBAAgB2E,UAAUpM,cAMrC0H,gBAAiB,iBACP6F,aAAenH,SAASC,eAAe,gBAC7CvG,kBAAkB0N,gBAAgBD,sBAOnC,CASHlB,KAAM5E,gBAAgB4E"}
\ No newline at end of file
+{"version":3,"file":"question.min.js","sources":["../src/question.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Question class for drag and drop marker question type, used to support the question and preview pages.\n *\n * @module     qtype_ddmarker/question\n * @copyright  2018 The Open University\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\ndefine([\n    'jquery',\n    'core/dragdrop',\n    'qtype_ddmarker/shapes',\n    'core/key_codes',\n    'core_form/changechecker',\n    'core_filters/events',\n], function(\n    $,\n    dragDrop,\n    Shapes,\n    keys,\n    FormChangeChecker,\n    filterEvent\n) {\n\n    \"use strict\";\n\n    /**\n     * Object to handle one drag-drop markers question.\n     *\n     * @param {String} containerId id of the outer div for this question.\n     * @param {boolean} readOnly whether the question is being displayed read-only.\n     * @param {Object[]} visibleDropZones the geometry of any drop-zones to show.\n     *      Objects have fields shape, coords and markertext.\n     * @constructor\n     */\n    function DragDropMarkersQuestion(containerId, readOnly, visibleDropZones) {\n        var thisQ = this;\n        this.containerId = containerId;\n        this.visibleDropZones = visibleDropZones;\n        this.shapes = [];\n        this.shapeSVGs = [];\n        this.isPrinting = false;\n        this.questionAnswer = {};\n        if (readOnly) {\n            this.getRoot().addClass('qtype_ddmarker-readonly');\n        }\n        thisQ.allImagesLoaded = false;\n        thisQ.getNotYetLoadedImages().one('load', function() {\n            thisQ.waitForAllImagesToBeLoaded();\n        });\n        thisQ.waitForAllImagesToBeLoaded();\n    }\n\n    /**\n     * Draws the svg shapes of any drop zones that should be visible for feedback purposes.\n     */\n    DragDropMarkersQuestion.prototype.drawDropzones = function() {\n        if (this.visibleDropZones.length > 0) {\n            var bgImage = this.bgImage();\n\n            this.getRoot().find('div.dropzones').html('<svg xmlns=\"http://www.w3.org/2000/svg\" class=\"dropzones\" ' +\n                'width=\"' + bgImage.outerWidth() + '\" ' +\n                'height=\"' + bgImage.outerHeight() + '\"></svg>');\n            var svg = this.getRoot().find('svg.dropzones');\n\n            var nextColourIndex = 0;\n            for (var dropZoneNo = 0; dropZoneNo < this.visibleDropZones.length; dropZoneNo++) {\n                var colourClass = 'color' + nextColourIndex;\n                nextColourIndex = (nextColourIndex + 1) % 8;\n                this.addDropzone(svg, dropZoneNo, colourClass);\n            }\n        }\n    };\n\n    /**\n     * Adds a dropzone shape with colour, coords and link provided to the array of shapes.\n     *\n     * @param {jQuery} svg the SVG image to which to add this drop zone.\n     * @param {int} dropZoneNo which drop-zone to add.\n     * @param {string} colourClass class name\n     */\n    DragDropMarkersQuestion.prototype.addDropzone = function(svg, dropZoneNo, colourClass) {\n        var dropZone = this.visibleDropZones[dropZoneNo],\n            shape = Shapes.make(dropZone.shape, ''),\n            existingmarkertext,\n            bgRatio = this.bgRatio();\n        if (!shape.parse(dropZone.coords, bgRatio)) {\n            return;\n        }\n\n        existingmarkertext = this.getRoot().find('div.markertexts span.markertext' + dropZoneNo);\n        if (existingmarkertext.length) {\n            if (dropZone.markertext !== '') {\n                existingmarkertext.html(dropZone.markertext);\n            } else {\n                existingmarkertext.remove();\n            }\n        } else if (dropZone.markertext !== '') {\n            var classnames = 'markertext markertext' + dropZoneNo;\n            this.getRoot().find('div.markertexts').append('<span class=\"' + classnames + '\">' +\n                dropZone.markertext + '</span>');\n            var markerspan = this.getRoot().find('div.ddarea div.markertexts span.markertext' + dropZoneNo);\n            if (markerspan.length) {\n                var handles = shape.getHandlePositions();\n                var positionLeft = handles.moveHandle.x - (markerspan.outerWidth() / 2) - 4;\n                var positionTop = handles.moveHandle.y - (markerspan.outerHeight() / 2);\n                markerspan\n                    .css('left', positionLeft)\n                    .css('top', positionTop);\n                markerspan\n                    .data('originX', markerspan.position().left / bgRatio)\n                    .data('originY', markerspan.position().top / bgRatio);\n                this.handleElementScale(markerspan, 'center');\n            }\n        }\n\n        var shapeSVG = shape.makeSvg(svg[0]);\n        shapeSVG.setAttribute('class', 'dropzone ' + colourClass);\n\n        this.shapes[this.shapes.length] = shape;\n        this.shapeSVGs[this.shapeSVGs.length] = shapeSVG;\n    };\n\n    /**\n     * Draws the drag items on the page (and drop zones if required).\n     * The idea is to re-draw all the drags and drops whenever there is a change\n     * like a widow resize or an item dropped in place.\n     */\n    DragDropMarkersQuestion.prototype.repositionDrags = function() {\n        var root = this.getRoot(),\n            thisQ = this;\n\n        root.find('div.draghomes .marker').not('.dragplaceholder').each(function(key, item) {\n            $(item).addClass('unneeded');\n        });\n\n        root.find('input.choices').each(function(key, input) {\n            var choiceNo = thisQ.getChoiceNoFromElement(input),\n                imageCoords = thisQ.getImageCoords(input);\n            if (imageCoords.length) {\n                var drag = thisQ.getRoot().find('.draghomes' + ' span.marker' + '.choice' + choiceNo).not('.dragplaceholder');\n                drag.remove();\n                for (var i = 0; i < imageCoords.length; i++) {\n                    var dragInDrop = drag.clone();\n                    // Convert image coords to screen coords.\n                    const screenCoords = thisQ.convertToWindowXY(imageCoords[i]);\n                    dragInDrop.data('pagex', screenCoords.x).data('pagey', screenCoords.y);\n                    // Save image coords to the drag item so we can use it later.\n                    dragInDrop.data('imageCoords', imageCoords[i]);\n                    // We always save the coordinates in the 1:1 ratio.\n                    // So we need to set the scale ratio to 1 for the initial load.\n                    dragInDrop.data('scaleRatio', 1);\n                    thisQ.sendDragToDrop(dragInDrop, false, true);\n                }\n                thisQ.getDragClone(drag).addClass('active');\n                thisQ.cloneDragIfNeeded(drag);\n            }\n        });\n\n        // Save the question answer.\n        thisQ.questionAnswer = thisQ.getQuestionAnsweredValues();\n    };\n\n    /**\n     * Get the question answered values.\n     *\n     * @return {Object} Contain key-value with key is the input id and value is the input value.\n     */\n    DragDropMarkersQuestion.prototype.getQuestionAnsweredValues = function() {\n        let result = {};\n        this.getRoot().find('input.choices').each((i, inputNode) => {\n            result[inputNode.id] = inputNode.value;\n        });\n\n        return result;\n    };\n\n    /**\n     * Check if the question is being interacted or not.\n     *\n     * @return {boolean} Return true if the user has changed the question-answer.\n     */\n    DragDropMarkersQuestion.prototype.isQuestionInteracted = function() {\n        const oldAnswer = this.questionAnswer;\n        const newAnswer = this.getQuestionAnsweredValues();\n        let isInteracted = false;\n\n        // First, check both answers have the same structure or not.\n        if (JSON.stringify(newAnswer) !== JSON.stringify(oldAnswer)) {\n            isInteracted = true;\n            return isInteracted;\n        }\n        // Check the values.\n        Object.keys(newAnswer).forEach(key => {\n            if (newAnswer[key] !== oldAnswer[key]) {\n                isInteracted = true;\n            }\n        });\n\n        return isInteracted;\n    };\n\n    /**\n     * Determine what drag items need to be shown and\n     * return coords of all drag items except any that are currently being dragged\n     * based on contents of hidden inputs and whether drags are 'infinite' or how many\n     * drags should be shown.\n     *\n     * @param {jQuery} inputNode\n     * @returns {Point[]} image coordinates of however many copies of the drag item should be shown.\n     */\n    DragDropMarkersQuestion.prototype.getImageCoords = function(inputNode) {\n        var imageCoords = [],\n            val = $(inputNode).val();\n        if (val !== '') {\n            var coordsStrings = val.split(';');\n            for (var i = 0; i < coordsStrings.length; i++) {\n                imageCoords[i] = Shapes.Point.parse(coordsStrings[i]);\n            }\n        }\n        return imageCoords;\n    };\n\n    /**\n     * Converts the relative x and y position coordinates into\n     * absolute x and y position coordinates.\n     *\n     * @param {Point} point relative to the background image.\n     * @returns {Point} point relative to the page.\n     */\n    DragDropMarkersQuestion.prototype.convertToWindowXY = function(point) {\n        var bgImage = this.bgImage();\n        // The +1 seems rather odd, but seems to give the best results in\n        // the three main browsers at a range of zoom levels.\n        // (Its due to the 1px border around the image, that shifts the\n        // image pixels by 1 down and to the left.)\n        return point.offset(bgImage.offset().left + 1, bgImage.offset().top + 1);\n    };\n\n    /**\n     * Utility function converting window coordinates to relative to the\n     * background image coordinates.\n     *\n     * @param {Point} point relative to the page.\n     * @returns {Point} point relative to the background image.\n     */\n    DragDropMarkersQuestion.prototype.convertToBgImgXY = function(point) {\n        var bgImage = this.bgImage();\n        return point.offset(-bgImage.offset().left - 1, -bgImage.offset().top - 1);\n    };\n\n    /**\n     * Is the point within the background image?\n     *\n     * @param {Point} point relative to the BG image.\n     * @return {boolean} true it they are.\n     */\n    DragDropMarkersQuestion.prototype.coordsInBgImg = function(point) {\n        var bgImage = this.bgImage();\n        var bgPosition = bgImage.offset();\n\n        return point.x >= bgPosition.left && point.x < bgPosition.left + bgImage.width()\n            && point.y >= bgPosition.top && point.y < bgPosition.top + bgImage.height();\n    };\n\n    /**\n     * Get the outer div for this question.\n     * @returns {jQuery} containing that div.\n     */\n    DragDropMarkersQuestion.prototype.getRoot = function() {\n        return $(document.getElementById(this.containerId));\n    };\n\n    /**\n     * Get the img that is the background image.\n     * @returns {jQuery} containing that img.\n     */\n    DragDropMarkersQuestion.prototype.bgImage = function() {\n        return this.getRoot().find('img.dropbackground');\n    };\n\n    DragDropMarkersQuestion.prototype.handleDragStart = function(e) {\n        var thisQ = this,\n            dragged = $(e.target).closest('.marker');\n\n        var info = dragDrop.prepare(e);\n        if (!info.start) {\n            return;\n        }\n\n        dragged.addClass('beingdragged').css('transform', '');\n\n        var placed = !dragged.hasClass('unneeded');\n        if (!placed) {\n            var hiddenDrag = thisQ.getDragClone(dragged);\n            if (hiddenDrag.length) {\n                hiddenDrag.addClass('active');\n                dragged.offset(hiddenDrag.offset());\n            }\n        }\n\n        dragDrop.start(e, dragged, function() {\n            void (1);\n        }, function(x, y, dragged) {\n            thisQ.dragEnd(dragged);\n        });\n    };\n\n    /**\n     * Functionality at the end of a drag drop.\n     * @param {jQuery} dragged the marker that was dragged.\n     */\n    DragDropMarkersQuestion.prototype.dragEnd = function(dragged) {\n        var placed = false,\n            choiceNo = this.getChoiceNoFromElement(dragged),\n            bgRatio = this.bgRatio(),\n            dragXY;\n\n        dragged.data('pagex', dragged.offset().left).data('pagey', dragged.offset().top);\n        dragXY = new Shapes.Point(dragged.data('pagex'), dragged.data('pagey'));\n        if (this.coordsInBgImg(dragXY)) {\n            this.sendDragToDrop(dragged, true);\n            placed = true;\n            // Since we already move the drag item to new position.\n            // Remove the image coords if this drag item have it.\n            // We will get the new image coords for this drag item in saveCoordsForChoice.\n            if (dragged.data('imageCoords')) {\n                dragged.data('imageCoords', null);\n            }\n            // It seems that the dragdrop sometimes leaves the drag\n            // one pixel out of position. Put it in exactly the right place.\n            var bgImgXY = this.convertToBgImgXY(dragXY);\n            bgImgXY = new Shapes.Point(bgImgXY.x / bgRatio, bgImgXY.y / bgRatio);\n            dragged.data('originX', bgImgXY.x).data('originY', bgImgXY.y);\n        }\n\n        if (!placed) {\n            this.sendDragHome(dragged);\n            this.removeDragIfNeeded(dragged);\n        } else {\n            this.cloneDragIfNeeded(dragged);\n        }\n\n        this.saveCoordsForChoice(choiceNo);\n    };\n\n    /**\n     * Save the coordinates for a dropped item in the form field.\n     * @param {Number} choiceNo which copy of the choice this was.\n     */\n    DragDropMarkersQuestion.prototype.saveCoordsForChoice = function(choiceNo) {\n        let imageCoords = [];\n        var items = this.getRoot().find('div.droparea span.marker.choice' + choiceNo),\n            thiQ = this,\n            bgRatio = this.bgRatio();\n\n        if (items.length) {\n            items.each(function() {\n                var drag = $(this);\n                if (!drag.hasClass('beingdragged') && !drag.data('imageCoords')) {\n                    if (drag.data('scaleRatio') !== bgRatio) {\n                        // The scale ratio for the draggable item was changed. We need to update that.\n                        drag.data('pagex', drag.offset().left).data('pagey', drag.offset().top);\n                    }\n                    var dragXY = new Shapes.Point(drag.data('pagex'), drag.data('pagey'));\n                    if (thiQ.coordsInBgImg(dragXY)) {\n                        var bgImgXY = thiQ.convertToBgImgXY(dragXY);\n                        bgImgXY = new Shapes.Point(bgImgXY.x / bgRatio, bgImgXY.y / bgRatio);\n                        imageCoords[imageCoords.length] = bgImgXY;\n                    }\n                } else if (drag.data('imageCoords')) {\n                    imageCoords[imageCoords.length] = drag.data('imageCoords');\n                }\n            });\n        }\n\n        this.getRoot().find('input.choice' + choiceNo).val(imageCoords.join(';'));\n        if (this.isQuestionInteracted()) {\n            // The user has interacted with the draggable items. We need to mark the form as dirty.\n            questionManager.handleFormDirty();\n            // Save the new answered value.\n            this.questionAnswer = this.getQuestionAnsweredValues();\n        }\n    };\n\n    /**\n     * Handle key down / press events on markers.\n     * @param {KeyboardEvent} e\n     */\n    DragDropMarkersQuestion.prototype.handleKeyPress = function(e) {\n        var drag = $(e.target).closest('.marker'),\n            point = new Shapes.Point(drag.offset().left, drag.offset().top),\n            choiceNo = this.getChoiceNoFromElement(drag);\n\n        switch (e.keyCode) {\n            case keys.arrowLeft:\n            case 65: // A.\n                point.x -= 1;\n                break;\n            case keys.arrowRight:\n            case 68: // D.\n                point.x += 1;\n                break;\n            case keys.arrowDown:\n            case 83: // S.\n                point.y += 1;\n                break;\n            case keys.arrowUp:\n            case 87: // W.\n                point.y -= 1;\n                break;\n            case keys.space:\n            case keys.escape:\n                point = null;\n                break;\n            default:\n                return; // Ingore other keys.\n        }\n        e.preventDefault();\n\n        if (point !== null) {\n            point = this.constrainToBgImg(point);\n            drag.offset({'left': point.x, 'top': point.y});\n            drag.data('pagex', drag.offset().left).data('pagey', drag.offset().top);\n            var dragXY = this.convertToBgImgXY(new Shapes.Point(drag.data('pagex'), drag.data('pagey')));\n            drag.data('originX', dragXY.x / this.bgRatio()).data('originY', dragXY.y / this.bgRatio());\n            if (this.coordsInBgImg(new Shapes.Point(drag.offset().left, drag.offset().top))) {\n                if (drag.hasClass('unneeded')) {\n                    this.sendDragToDrop(drag, true);\n                    var hiddenDrag = this.getDragClone(drag);\n                    if (hiddenDrag.length) {\n                        hiddenDrag.addClass('active');\n                    }\n                    this.cloneDragIfNeeded(drag);\n                }\n            }\n        } else {\n            drag.css('left', '').css('top', '');\n            drag.data('pagex', drag.offset().left).data('pagey', drag.offset().top);\n            this.sendDragHome(drag);\n            this.removeDragIfNeeded(drag);\n        }\n        drag.focus();\n        this.saveCoordsForChoice(choiceNo);\n    };\n\n    /**\n     * Makes sure the dragged item always exists within the background image area.\n     *\n     * @param {Point} windowxy\n     * @returns {Point} coordinates\n     */\n    DragDropMarkersQuestion.prototype.constrainToBgImg = function(windowxy) {\n        var bgImg = this.bgImage(),\n            bgImgXY = this.convertToBgImgXY(windowxy);\n        bgImgXY.x = Math.max(0, bgImgXY.x);\n        bgImgXY.y = Math.max(0, bgImgXY.y);\n        bgImgXY.x = Math.min(bgImg.width(), bgImgXY.x);\n        bgImgXY.y = Math.min(bgImg.height(), bgImgXY.y);\n        return this.convertToWindowXY(bgImgXY);\n    };\n\n    /**\n     * Returns the choice number for a node.\n     *\n     * @param {Element|jQuery} node\n     * @returns {Number}\n     */\n    DragDropMarkersQuestion.prototype.getChoiceNoFromElement = function(node) {\n        return Number(this.getClassnameNumericSuffix(node, 'choice'));\n    };\n\n    /**\n     * Returns the numeric part of a class with the given prefix.\n     *\n     * @param {Element|jQuery} node\n     * @param {String} prefix\n     * @returns {Number|null}\n     */\n    DragDropMarkersQuestion.prototype.getClassnameNumericSuffix = function(node, prefix) {\n        var classes = $(node).attr('class');\n        if (classes !== undefined && classes !== '') {\n            var classesarr = classes.split(' ');\n            for (var index = 0; index < classesarr.length; index++) {\n                var patt1 = new RegExp('^' + prefix + '([0-9])+$');\n                if (patt1.test(classesarr[index])) {\n                    var patt2 = new RegExp('([0-9])+$');\n                    var match = patt2.exec(classesarr[index]);\n                    return Number(match[0]);\n                }\n            }\n        }\n        return null;\n    };\n\n    /**\n     * Handle when the window is resized.\n     */\n    DragDropMarkersQuestion.prototype.handleResize = function() {\n        var thisQ = this,\n            bgRatio = this.bgRatio();\n        if (this.isPrinting) {\n            bgRatio = 1;\n        }\n\n        this.getRoot().find('div.droparea .marker').not('.beingdragged').each(function(key, drag) {\n            $(drag)\n                .css('left', parseFloat($(drag).data('originX')) * parseFloat(bgRatio))\n                .css('top', parseFloat($(drag).data('originY')) * parseFloat(bgRatio));\n            thisQ.handleElementScale(drag, 'left top');\n        });\n\n        this.getRoot().find('div.droparea svg.dropzones')\n            .width(this.bgImage().width())\n            .height(this.bgImage().height());\n\n        for (var dropZoneNo = 0; dropZoneNo < this.visibleDropZones.length; dropZoneNo++) {\n            var dropZone = thisQ.visibleDropZones[dropZoneNo];\n            var originCoords = dropZone.coords;\n            var shape = thisQ.shapes[dropZoneNo];\n            var shapeSVG = thisQ.shapeSVGs[dropZoneNo];\n            shape.parse(originCoords, bgRatio);\n            shape.updateSvg(shapeSVG);\n\n            var handles = shape.getHandlePositions();\n            var markerSpan = this.getRoot().find('div.ddarea div.markertexts span.markertext' + dropZoneNo);\n            markerSpan\n                .css('left', handles.moveHandle.x - (markerSpan.outerWidth() / 2) - 4)\n                .css('top', handles.moveHandle.y - (markerSpan.outerHeight() / 2));\n            thisQ.handleElementScale(markerSpan, 'center');\n        }\n    };\n\n    /**\n     * Clone the drag.\n     */\n    DragDropMarkersQuestion.prototype.cloneDrags = function() {\n        var thisQ = this;\n        this.getRoot().find('div.draghomes span.marker').each(function(index, draghome) {\n            var drag = $(draghome);\n            var placeHolder = drag.clone();\n            placeHolder.removeClass();\n            placeHolder.addClass('marker');\n            placeHolder.addClass('choice' + thisQ.getChoiceNoFromElement(drag));\n            placeHolder.addClass(thisQ.getDragNoClass(drag, false));\n            placeHolder.addClass('dragplaceholder');\n            drag.before(placeHolder);\n        });\n    };\n\n    /**\n     * Get the drag number of a drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @returns {Number} the drag number.\n     */\n    DragDropMarkersQuestion.prototype.getDragNo = function(drag) {\n        return this.getClassnameNumericSuffix(drag, 'dragno');\n    };\n\n    /**\n     * Get the drag number prefix of a drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @param {Boolean} includeSelector include the CSS selector prefix or not.\n     * @return {String} Class name\n     */\n    DragDropMarkersQuestion.prototype.getDragNoClass = function(drag, includeSelector) {\n        var className = 'dragno' + this.getDragNo(drag);\n        if (this.isInfiniteDrag(drag)) {\n            className = 'infinite';\n        }\n\n        if (includeSelector) {\n            return '.' + className;\n        }\n\n        return className;\n    };\n\n    /**\n     * Get drag clone for a given drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @returns {jQuery} the drag's clone.\n     */\n    DragDropMarkersQuestion.prototype.getDragClone = function(drag) {\n        return this.getRoot().find('.draghomes' + ' span.marker' +\n            '.choice' + this.getChoiceNoFromElement(drag) + this.getDragNoClass(drag, true) + '.dragplaceholder');\n    };\n\n    /**\n     * Get the drop area element.\n     * @returns {jQuery} droparea element.\n     */\n    DragDropMarkersQuestion.prototype.dropArea = function() {\n        return this.getRoot().find('div.droparea');\n    };\n\n    /**\n     * Animate a drag back to its home.\n     *\n     * @param {jQuery} drag the item being moved.\n     */\n    DragDropMarkersQuestion.prototype.sendDragHome = function(drag) {\n        drag.removeClass('beingdragged')\n            .addClass('unneeded')\n            .css('top', '')\n            .css('left', '')\n            .css('transform', '');\n        var placeHolder = this.getDragClone(drag);\n        placeHolder.after(drag);\n        placeHolder.removeClass('active');\n    };\n\n    /**\n     * Animate a drag item into a given place.\n     *\n     * @param {jQuery} drag the item to place.\n     * @param {boolean} isScaling Scaling or not.\n     * @param {boolean} initialLoad Whether it is the initial load or not.\n     */\n    DragDropMarkersQuestion.prototype.sendDragToDrop = function(drag, isScaling, initialLoad = false) {\n        var dropArea = this.dropArea(),\n            bgRatio = this.bgRatio();\n        drag.removeClass('beingdragged').removeClass('unneeded');\n        var dragXY = this.convertToBgImgXY(new Shapes.Point(drag.data('pagex'), drag.data('pagey')));\n        if (isScaling) {\n            drag.data('originX', dragXY.x / bgRatio).data('originY', dragXY.y / bgRatio);\n            drag.css('left', dragXY.x).css('top', dragXY.y);\n        } else {\n            drag.data('originX', dragXY.x).data('originY', dragXY.y);\n            drag.css('left', dragXY.x * bgRatio).css('top', dragXY.y * bgRatio);\n        }\n        // We need to save the original scale ratio for each draggable item.\n        if (!initialLoad) {\n            // Only set the scale ratio for a current being-dragged item, not for the initial loading.\n            drag.data('scaleRatio', bgRatio);\n        }\n        dropArea.append(drag);\n        this.handleElementScale(drag, 'left top');\n    };\n\n    /**\n     * Clone the drag at the draghome area if needed.\n     *\n     * @param {jQuery} drag the item to place.\n     */\n    DragDropMarkersQuestion.prototype.cloneDragIfNeeded = function(drag) {\n        var inputNode = this.getInput(drag),\n            noOfDrags = Number(this.getClassnameNumericSuffix(inputNode, 'noofdrags')),\n            displayedDragsInDropArea = this.getRoot().find('div.droparea .marker.choice' +\n                this.getChoiceNoFromElement(drag) + this.getDragNoClass(drag, true)).length,\n            displayedDragsInDragHomes = this.getRoot().find('div.draghomes .marker.choice' +\n                this.getChoiceNoFromElement(drag) + this.getDragNoClass(drag, true)).not('.dragplaceholder').length;\n\n        if ((this.isInfiniteDrag(drag) ||\n                !this.isInfiniteDrag(drag) && displayedDragsInDropArea < noOfDrags) && displayedDragsInDragHomes === 0) {\n            var dragClone = drag.clone();\n            dragClone.addClass('unneeded')\n                .css('top', '')\n                .css('left', '')\n                .css('transform', '');\n            this.getDragClone(drag)\n                .removeClass('active')\n                .after(dragClone);\n            questionManager.addEventHandlersToMarker(dragClone);\n        }\n    };\n\n    /**\n     * Remove the clone drag at the draghome area if needed.\n     *\n     * @param {jQuery} drag the item to place.\n     */\n    DragDropMarkersQuestion.prototype.removeDragIfNeeded = function(drag) {\n        var dragsInHome = this.getRoot().find('div.draghomes .marker.choice' +\n            this.getChoiceNoFromElement(drag) + this.getDragNoClass(drag, true)).not('.dragplaceholder');\n        var displayedDrags = dragsInHome.length;\n        while (displayedDrags > 1) {\n            dragsInHome.first().remove();\n            displayedDrags--;\n        }\n    };\n\n    /**\n     * Get the input belong to drag.\n     *\n     * @param {jQuery} drag the item to place.\n     * @returns {jQuery} input element.\n     */\n    DragDropMarkersQuestion.prototype.getInput = function(drag) {\n        var choiceNo = this.getChoiceNoFromElement(drag);\n        return this.getRoot().find('input.choices.choice' + choiceNo);\n    };\n\n    /**\n     * Return the background ratio.\n     *\n     * @returns {number} Background ratio.\n     */\n    DragDropMarkersQuestion.prototype.bgRatio = function() {\n        var bgImg = this.bgImage();\n        var bgImgNaturalWidth = bgImg.get(0).naturalWidth;\n        var bgImgClientWidth = bgImg.width();\n\n        return bgImgClientWidth / bgImgNaturalWidth;\n    };\n\n    /**\n     * Scale the drag if needed.\n     *\n     * @param {jQuery} element the item to place.\n     * @param {String} type scaling type\n     */\n    DragDropMarkersQuestion.prototype.handleElementScale = function(element, type) {\n        var bgRatio = parseFloat(this.bgRatio());\n        if (this.isPrinting) {\n            bgRatio = 1;\n        }\n        $(element).css({\n            '-webkit-transform': 'scale(' + bgRatio + ')',\n            '-moz-transform': 'scale(' + bgRatio + ')',\n            '-ms-transform': 'scale(' + bgRatio + ')',\n            '-o-transform': 'scale(' + bgRatio + ')',\n            'transform': 'scale(' + bgRatio + ')',\n            'transform-origin': type\n        });\n    };\n\n    /**\n     * Check if the given drag is in infinite mode or not.\n     *\n     * @param {jQuery} drag The drag item need to check.\n     */\n    DragDropMarkersQuestion.prototype.isInfiniteDrag = function(drag) {\n        return drag.hasClass('infinite');\n    };\n\n    /**\n     * Waits until all images are loaded before calling setupQuestion().\n     *\n     * This function is called from the onLoad of each image, and also polls with\n     * a time-out, because image on-loads are allegedly unreliable.\n     */\n    DragDropMarkersQuestion.prototype.waitForAllImagesToBeLoaded = function() {\n        var thisQ = this;\n        // This method may get called multiple times (via image on-loads or timeouts.\n        // If we are already done, don't do it again.\n        if (this.allImagesLoaded) {\n            return;\n        }\n\n        // Clear any current timeout, if set.\n        if (this.imageLoadingTimeoutId !== null) {\n            clearTimeout(this.imageLoadingTimeoutId);\n        }\n\n        // If we have not yet loaded all images, set a timeout to\n        // call ourselves again, since apparently images on-load\n        // events are flakey.\n        if (this.getNotYetLoadedImages().length > 0) {\n            this.imageLoadingTimeoutId = setTimeout(function() {\n                this.waitForAllImagesToBeLoaded();\n            }, 100);\n            return;\n        }\n\n        // We now have all images. Carry on, but only after giving the layout a chance to settle down.\n        this.allImagesLoaded = true;\n        this.cloneDrags();\n        this.repositionDrags();\n        this.drawDropzones();\n        // Wait for all dynamic content loaded by filter to be completed.\n        document.addEventListener(filterEvent.eventTypes.filterContentRenderingComplete, (elements) => {\n            elements.detail.nodes.forEach((element) => {\n                thisQ.changeAllMakerToFilteredContent(element);\n            });\n        });\n    };\n\n    /**\n     * Change all the maker related to the item that has been changed by filter to correct size and content.\n     *\n     *  @param {object} filteredElement the element has been modified by filter.\n     */\n    DragDropMarkersQuestion.prototype.changeAllMakerToFilteredContent = function(filteredElement) {\n        let currentFilteredItem = $(filteredElement);\n        const parentIsMarker = currentFilteredItem.parent().closest('span.marker');\n        const isMarker = currentFilteredItem.hasClass('marker');\n        const root = this.getRoot();\n        // The filtered element or parent element should a drag or drop item.\n        if (!parentIsMarker && !isMarker) {\n            return;\n        }\n        if (parentIsMarker) {\n            currentFilteredItem = currentFilteredItem.parent().closest('span.marker');\n        }\n        if (root.find(currentFilteredItem).length <= 0) {\n            // If the maker doesn't belong to this question\n            // In case we have multiple questions in the same page.\n            return;\n        }\n        const dragNo = this.getDragNo(currentFilteredItem);\n        const choiceNo = this.getChoiceNoFromElement(currentFilteredItem);\n        const listOfContainerToBeModifed = [\n            'div.draghomes .marker:not(.dragplaceholder).dragno' + dragNo + '.choice' + choiceNo,\n            'div.droparea .marker:not(.dragplaceholder).dragno' + dragNo + '.choice' + choiceNo,\n            'div.draghomes .marker:not(.dragplaceholder).infinite.choice' + choiceNo,\n            'div.droparea .marker:not(.dragplaceholder).infinite.choice' + choiceNo\n        ];\n        let listOfModifiedDragDrop = [];\n        // We want to keep all the handler and event for filtered item, so using clone is the only choice.\n        const filteredDragDropClone = currentFilteredItem.clone();\n        listOfContainerToBeModifed.forEach(function(selector) {\n            root.find(selector).each(function(i, node) {\n                const originalClass = $(node).attr('class');\n                const originalStyle = $(node).attr('style');\n                // Replace the class and style of the maker we want to replace for the clone.\n                filteredDragDropClone.attr('class', originalClass);\n                filteredDragDropClone.attr('style', originalStyle);\n                // Add event for the clone.\n                questionManager.addEventHandlersToMarker(filteredDragDropClone);\n                // Insert into DOM.\n                $(node).before(filteredDragDropClone);\n                listOfModifiedDragDrop.push(node);\n            });\n        });\n        listOfModifiedDragDrop.forEach(function(node) {\n            $(node).remove();\n        });\n    };\n\n    /**\n     * Get any of the images in the drag-drop area that are not yet fully loaded.\n     *\n     * @returns {jQuery} those images.\n     */\n    DragDropMarkersQuestion.prototype.getNotYetLoadedImages = function() {\n        return this.getRoot().find('.ddmarker img.dropbackground').not(function(i, imgNode) {\n            return this.imageIsLoaded(imgNode);\n        });\n    };\n\n    /**\n     * Check if an image has loaded without errors.\n     *\n     * @param {HTMLImageElement} imgElement an image.\n     * @returns {boolean} true if this image has loaded without errors.\n     */\n    DragDropMarkersQuestion.prototype.imageIsLoaded = function(imgElement) {\n        return imgElement.complete && imgElement.naturalHeight !== 0;\n    };\n\n    /**\n     * Singleton that tracks all the DragDropToTextQuestions on this page, and deals\n     * with event dispatching.\n     *\n     * @type {Object}\n     */\n    var questionManager = {\n\n        /**\n         * {boolean} ensures that the event handlers are only initialised once per page.\n         */\n        eventHandlersInitialised: false,\n\n        /**\n         * {Object} ensures that the marker event handlers are only initialised once per question,\n         * indexed by containerId (id on the .que div).\n         */\n        markerEventHandlersInitialised: {},\n\n        /**\n         * {boolean} is printing or not.\n         */\n        isPrinting: false,\n\n        /**\n         * {boolean} is keyboard navigation.\n         */\n        isKeyboardNavigation: false,\n\n        /**\n         * {Object} all the questions on this page, indexed by containerId (id on the .que div).\n         */\n        questions: {}, // An object containing all the information about each question on the page.\n\n        /**\n         * Initialise one question.\n         *\n         * @param {String} containerId the id of the div.que that contains this question.\n         * @param {boolean} readOnly whether the question is read-only.\n         * @param {Object[]} visibleDropZones data on any drop zones to draw as part of the feedback.\n         */\n        init: function(containerId, readOnly, visibleDropZones) {\n            questionManager.questions[containerId] =\n                new DragDropMarkersQuestion(containerId, readOnly, visibleDropZones);\n            if (!questionManager.eventHandlersInitialised) {\n                questionManager.setupEventHandlers();\n                questionManager.eventHandlersInitialised = true;\n            }\n            if (!questionManager.markerEventHandlersInitialised.hasOwnProperty(containerId)) {\n                questionManager.markerEventHandlersInitialised[containerId] = true;\n                // We do not use the body event here to prevent the other event on Mobile device, such as scroll event.\n                var questionContainer = document.getElementById(containerId);\n                if (questionContainer.classList.contains('ddmarker') &&\n                    !questionContainer.classList.contains('qtype_ddmarker-readonly')) {\n                    // TODO: Convert all the jQuery selectors and events to native Javascript.\n                    questionManager.addEventHandlersToMarker($(questionContainer).find('div.draghomes .marker'));\n                    questionManager.addEventHandlersToMarker($(questionContainer).find('div.droparea .marker'));\n                }\n            }\n        },\n\n        /**\n         * Set up the event handlers that make this question type work. (Done once per page.)\n         */\n        setupEventHandlers: function() {\n            $(window).on('resize', function() {\n                questionManager.handleWindowResize(false);\n            });\n            window.addEventListener('beforeprint', function() {\n                questionManager.isPrinting = true;\n                questionManager.handleWindowResize(questionManager.isPrinting);\n            });\n            window.addEventListener('afterprint', function() {\n                questionManager.isPrinting = false;\n                questionManager.handleWindowResize(questionManager.isPrinting);\n            });\n            setTimeout(function() {\n                questionManager.fixLayoutIfThingsMoved();\n            }, 100);\n        },\n\n        /**\n         * Binding the event again for newly created element.\n         *\n         * @param {jQuery} element Element to bind the event\n         */\n        addEventHandlersToMarker: function(element) {\n            element\n                .on('mousedown touchstart', questionManager.handleDragStart)\n                .on('keydown keypress', questionManager.handleKeyPress)\n                .focusin(function(e) {\n                    questionManager.handleKeyboardFocus(e, true);\n                })\n                .focusout(function(e) {\n                    questionManager.handleKeyboardFocus(e, false);\n                });\n        },\n\n        /**\n         * Handle mouse down / touch start events on markers.\n         * @param {Event} e the DOM event.\n         */\n        handleDragStart: function(e) {\n            e.preventDefault();\n            var question = questionManager.getQuestionForEvent(e);\n            if (question) {\n                question.handleDragStart(e);\n            }\n        },\n\n        /**\n         * Handle key down / press events on markers.\n         * @param {Event} e\n         */\n        handleKeyPress: function(e) {\n            var question = questionManager.getQuestionForEvent(e);\n            if (question) {\n                question.handleKeyPress(e);\n            }\n        },\n\n        /**\n         * Handle when the window is resized.\n         * @param {boolean} isPrinting\n         */\n        handleWindowResize: function(isPrinting) {\n            for (var containerId in questionManager.questions) {\n                if (questionManager.questions.hasOwnProperty(containerId)) {\n                    questionManager.questions[containerId].isPrinting = isPrinting;\n                    questionManager.questions[containerId].handleResize();\n                }\n            }\n        },\n\n        /**\n         * Handle focus lost events on markers.\n         * @param {Event} e\n         * @param {boolean} isNavigating\n         */\n        handleKeyboardFocus: function(e, isNavigating) {\n            questionManager.isKeyboardNavigation = isNavigating;\n        },\n\n        /**\n         * Sometimes, despite our best efforts, things change in a way that cannot\n         * be specifically caught (e.g. dock expanding or collapsing in Boost).\n         * Therefore, we need to periodically check everything is in the right position.\n         */\n        fixLayoutIfThingsMoved: function() {\n            if (!questionManager.isKeyboardNavigation) {\n                this.handleWindowResize(questionManager.isPrinting);\n            }\n            // We use setTimeout after finishing work, rather than setInterval,\n            // in case positioning things is slow. We want 100 ms gap\n            // between executions, not what setInterval does.\n            setTimeout(function() {\n                questionManager.fixLayoutIfThingsMoved(questionManager.isPrinting);\n            }, 100);\n        },\n\n        /**\n         * Given an event, work out which question it effects.\n         * @param {Event} e the event.\n         * @returns {DragDropMarkersQuestion|undefined} The question, or undefined.\n         */\n        getQuestionForEvent: function(e) {\n            var containerId = $(e.currentTarget).closest('.que.ddmarker').attr('id');\n            return questionManager.questions[containerId];\n        },\n\n        /**\n         * Handle when the form is dirty.\n         */\n        handleFormDirty: function() {\n            const responseForm = document.getElementById('responseform');\n            FormChangeChecker.markFormAsDirty(responseForm);\n        }\n    };\n\n    /**\n     * @alias module:qtype_ddmarker/question\n     */\n    return {\n        /**\n         * Initialise one drag-drop markers question.\n         *\n         * @param {String} containerId id of the outer div for this question.\n         * @param {String} bgImgUrl the URL of the background image.\n         * @param {boolean} readOnly whether the question is being displayed read-only.\n         * @param {String[]} visibleDropZones the geometry of any drop-zones to show.\n         */\n        init: questionManager.init\n    };\n});\n"],"names":["define","$","dragDrop","Shapes","keys","FormChangeChecker","filterEvent","DragDropMarkersQuestion","containerId","readOnly","visibleDropZones","thisQ","this","shapes","shapeSVGs","isPrinting","questionAnswer","getRoot","addClass","allImagesLoaded","getNotYetLoadedImages","one","waitForAllImagesToBeLoaded","prototype","drawDropzones","length","bgImage","find","html","outerWidth","outerHeight","svg","nextColourIndex","dropZoneNo","colourClass","addDropzone","existingmarkertext","dropZone","shape","make","bgRatio","parse","coords","markertext","remove","classnames","append","markerspan","handles","getHandlePositions","positionLeft","moveHandle","x","positionTop","y","css","data","position","left","top","handleElementScale","shapeSVG","makeSvg","setAttribute","repositionDrags","root","not","each","key","item","input","choiceNo","getChoiceNoFromElement","imageCoords","getImageCoords","drag","i","dragInDrop","clone","screenCoords","convertToWindowXY","sendDragToDrop","getDragClone","cloneDragIfNeeded","getQuestionAnsweredValues","result","inputNode","id","value","isQuestionInteracted","oldAnswer","newAnswer","isInteracted","JSON","stringify","Object","forEach","val","coordsStrings","split","Point","point","offset","convertToBgImgXY","coordsInBgImg","bgPosition","width","height","document","getElementById","handleDragStart","e","dragged","target","closest","prepare","start","hasClass","hiddenDrag","dragEnd","dragXY","placed","bgImgXY","sendDragHome","removeDragIfNeeded","saveCoordsForChoice","items","thiQ","join","questionManager","handleFormDirty","handleKeyPress","keyCode","arrowLeft","arrowRight","arrowDown","arrowUp","space","escape","preventDefault","constrainToBgImg","focus","windowxy","bgImg","Math","max","min","node","Number","getClassnameNumericSuffix","prefix","classes","attr","undefined","classesarr","index","RegExp","test","match","exec","handleResize","parseFloat","originCoords","updateSvg","markerSpan","cloneDrags","draghome","placeHolder","removeClass","getDragNoClass","before","getDragNo","includeSelector","className","isInfiniteDrag","dropArea","after","isScaling","initialLoad","getInput","noOfDrags","displayedDragsInDropArea","displayedDragsInDragHomes","dragClone","addEventHandlersToMarker","dragsInHome","displayedDrags","first","bgImgNaturalWidth","get","naturalWidth","element","type","imageLoadingTimeoutId","clearTimeout","setTimeout","addEventListener","eventTypes","filterContentRenderingComplete","elements","detail","nodes","changeAllMakerToFilteredContent","filteredElement","currentFilteredItem","parentIsMarker","parent","isMarker","dragNo","listOfContainerToBeModifed","listOfModifiedDragDrop","filteredDragDropClone","selector","originalClass","originalStyle","push","imgNode","imageIsLoaded","imgElement","complete","naturalHeight","eventHandlersInitialised","markerEventHandlersInitialised","isKeyboardNavigation","questions","init","setupEventHandlers","hasOwnProperty","questionContainer","classList","contains","window","on","handleWindowResize","fixLayoutIfThingsMoved","focusin","handleKeyboardFocus","focusout","question","getQuestionForEvent","isNavigating","currentTarget","responseForm","markFormAsDirty"],"mappings":";;;;;;;AAuBAA,iCAAO,CACH,SACA,gBACA,wBACA,iBACA,0BACA,wBACD,SACCC,EACAC,SACAC,OACAC,KACAC,kBACAC,sBAcSC,wBAAwBC,YAAaC,SAAUC,sBAChDC,MAAQC,UACPJ,YAAcA,iBACdE,iBAAmBA,sBACnBG,OAAS,QACTC,UAAY,QACZC,YAAa,OACbC,eAAiB,GAClBP,eACKQ,UAAUC,SAAS,2BAE5BP,MAAMQ,iBAAkB,EACxBR,MAAMS,wBAAwBC,IAAI,QAAQ,WACtCV,MAAMW,gCAEVX,MAAMW,6BAMVf,wBAAwBgB,UAAUC,cAAgB,cAC1CZ,KAAKF,iBAAiBe,OAAS,EAAG,KAC9BC,QAAUd,KAAKc,eAEdT,UAAUU,KAAK,iBAAiBC,KAAK,oEAC1BF,QAAQG,aADkB,aAEzBH,QAAQI,cAAgB,oBACrCC,IAAMnB,KAAKK,UAAUU,KAAK,iBAE1BK,gBAAkB,EACbC,WAAa,EAAGA,WAAarB,KAAKF,iBAAiBe,OAAQQ,aAAc,KAC1EC,YAAc,QAAUF,gBAC5BA,iBAAmBA,gBAAkB,GAAK,OACrCG,YAAYJ,IAAKE,WAAYC,gBAY9C3B,wBAAwBgB,UAAUY,YAAc,SAASJ,IAAKE,WAAYC,iBAGlEE,mBAFAC,SAAWzB,KAAKF,iBAAiBuB,YACjCK,MAAQnC,OAAOoC,KAAKF,SAASC,MAAO,IAEpCE,QAAU5B,KAAK4B,aACdF,MAAMG,MAAMJ,SAASK,OAAQF,cAIlCJ,mBAAqBxB,KAAKK,UAAUU,KAAK,kCAAoCM,aACtDR,OACS,KAAxBY,SAASM,WACTP,mBAAmBR,KAAKS,SAASM,YAEjCP,mBAAmBQ,cAEpB,GAA4B,KAAxBP,SAASM,WAAmB,KAC/BE,WAAa,wBAA0BZ,gBACtChB,UAAUU,KAAK,mBAAmBmB,OAAO,gBAAkBD,WAAa,KACzER,SAASM,WAAa,eACtBI,WAAanC,KAAKK,UAAUU,KAAK,6CAA+CM,eAChFc,WAAWtB,OAAQ,KACfuB,QAAUV,MAAMW,qBAChBC,aAAeF,QAAQG,WAAWC,EAAKL,WAAWlB,aAAe,EAAK,EACtEwB,YAAcL,QAAQG,WAAWG,EAAKP,WAAWjB,cAAgB,EACrEiB,WACKQ,IAAI,OAAQL,cACZK,IAAI,MAAOF,aAChBN,WACKS,KAAK,UAAWT,WAAWU,WAAWC,KAAOlB,SAC7CgB,KAAK,UAAWT,WAAWU,WAAWE,IAAMnB,cAC5CoB,mBAAmBb,WAAY,eAIxCc,SAAWvB,MAAMwB,QAAQ/B,IAAI,IACjC8B,SAASE,aAAa,QAAS,YAAc7B,kBAExCrB,OAAOD,KAAKC,OAAOY,QAAUa,WAC7BxB,UAAUF,KAAKE,UAAUW,QAAUoC,WAQ5CtD,wBAAwBgB,UAAUyC,gBAAkB,eAC5CC,KAAOrD,KAAKK,UACZN,MAAQC,KAEZqD,KAAKtC,KAAK,yBAAyBuC,IAAI,oBAAoBC,MAAK,SAASC,IAAKC,MAC1EpE,EAAEoE,MAAMnD,SAAS,eAGrB+C,KAAKtC,KAAK,iBAAiBwC,MAAK,SAASC,IAAKE,WACtCC,SAAW5D,MAAM6D,uBAAuBF,OACxCG,YAAc9D,MAAM+D,eAAeJ,UACnCG,YAAYhD,OAAQ,KAChBkD,KAAOhE,MAAMM,UAAUU,KAAK,gCAA4C4C,UAAUL,IAAI,oBAC1FS,KAAK/B,aACA,IAAIgC,EAAI,EAAGA,EAAIH,YAAYhD,OAAQmD,IAAK,KACrCC,WAAaF,KAAKG,cAEhBC,aAAepE,MAAMqE,kBAAkBP,YAAYG,IACzDC,WAAWrB,KAAK,QAASuB,aAAa3B,GAAGI,KAAK,QAASuB,aAAazB,GAEpEuB,WAAWrB,KAAK,cAAeiB,YAAYG,IAG3CC,WAAWrB,KAAK,aAAc,GAC9B7C,MAAMsE,eAAeJ,YAAY,GAAO,GAE5ClE,MAAMuE,aAAaP,MAAMzD,SAAS,UAClCP,MAAMwE,kBAAkBR,UAKhChE,MAAMK,eAAiBL,MAAMyE,6BAQjC7E,wBAAwBgB,UAAU6D,0BAA4B,eACtDC,OAAS,eACRpE,UAAUU,KAAK,iBAAiBwC,MAAK,CAACS,EAAGU,aAC1CD,OAAOC,UAAUC,IAAMD,UAAUE,SAG9BH,QAQX9E,wBAAwBgB,UAAUkE,qBAAuB,iBAC/CC,UAAY9E,KAAKI,eACjB2E,UAAY/E,KAAKwE,gCACnBQ,cAAe,SAGfC,KAAKC,UAAUH,aAAeE,KAAKC,UAAUJ,YAC7CE,cAAe,EACRA,eAGXG,OAAO3F,KAAKuF,WAAWK,SAAQ5B,MACvBuB,UAAUvB,OAASsB,UAAUtB,OAC7BwB,cAAe,MAIhBA,eAYXrF,wBAAwBgB,UAAUmD,eAAiB,SAASY,eACpDb,YAAc,GACdwB,IAAMhG,EAAEqF,WAAWW,SACX,KAARA,YACIC,cAAgBD,IAAIE,MAAM,KACrBvB,EAAI,EAAGA,EAAIsB,cAAczE,OAAQmD,IACtCH,YAAYG,GAAKzE,OAAOiG,MAAM3D,MAAMyD,cAActB,WAGnDH,aAUXlE,wBAAwBgB,UAAUyD,kBAAoB,SAASqB,WACvD3E,QAAUd,KAAKc,iBAKZ2E,MAAMC,OAAO5E,QAAQ4E,SAAS5C,KAAO,EAAGhC,QAAQ4E,SAAS3C,IAAM,IAU1EpD,wBAAwBgB,UAAUgF,iBAAmB,SAASF,WACtD3E,QAAUd,KAAKc,iBACZ2E,MAAMC,QAAQ5E,QAAQ4E,SAAS5C,KAAO,GAAIhC,QAAQ4E,SAAS3C,IAAM,IAS5EpD,wBAAwBgB,UAAUiF,cAAgB,SAASH,WACnD3E,QAAUd,KAAKc,UACf+E,WAAa/E,QAAQ4E,gBAElBD,MAAMjD,GAAKqD,WAAW/C,MAAQ2C,MAAMjD,EAAIqD,WAAW/C,KAAOhC,QAAQgF,SAClEL,MAAM/C,GAAKmD,WAAW9C,KAAO0C,MAAM/C,EAAImD,WAAW9C,IAAMjC,QAAQiF,UAO3EpG,wBAAwBgB,UAAUN,QAAU,kBACjChB,EAAE2G,SAASC,eAAejG,KAAKJ,eAO1CD,wBAAwBgB,UAAUG,QAAU,kBACjCd,KAAKK,UAAUU,KAAK,uBAG/BpB,wBAAwBgB,UAAUuF,gBAAkB,SAASC,OACrDpG,MAAQC,KACRoG,QAAU/G,EAAE8G,EAAEE,QAAQC,QAAQ,cAEvBhH,SAASiH,QAAQJ,GAClBK,UAIVJ,QAAQ9F,SAAS,gBAAgBqC,IAAI,YAAa,MAEpCyD,QAAQK,SAAS,YAClB,KACLC,WAAa3G,MAAMuE,aAAa8B,SAChCM,WAAW7F,SACX6F,WAAWpG,SAAS,UACpB8F,QAAQV,OAAOgB,WAAWhB,WAIlCpG,SAASkH,MAAML,EAAGC,SAAS,eAExB,SAAS5D,EAAGE,EAAG0D,SACdrG,MAAM4G,QAAQP,cAQtBzG,wBAAwBgB,UAAUgG,QAAU,SAASP,aAI7CQ,OAHAC,QAAS,EACTlD,SAAW3D,KAAK4D,uBAAuBwC,SACvCxE,QAAU5B,KAAK4B,aAGnBwE,QAAQxD,KAAK,QAASwD,QAAQV,SAAS5C,MAAMF,KAAK,QAASwD,QAAQV,SAAS3C,KAC5E6D,OAAS,IAAIrH,OAAOiG,MAAMY,QAAQxD,KAAK,SAAUwD,QAAQxD,KAAK,UAC1D5C,KAAK4F,cAAcgB,QAAS,MACvBvC,eAAe+B,SAAS,GAC7BS,QAAS,EAILT,QAAQxD,KAAK,gBACbwD,QAAQxD,KAAK,cAAe,UAI5BkE,QAAU9G,KAAK2F,iBAAiBiB,QACpCE,QAAU,IAAIvH,OAAOiG,MAAMsB,QAAQtE,EAAIZ,QAASkF,QAAQpE,EAAId,SAC5DwE,QAAQxD,KAAK,UAAWkE,QAAQtE,GAAGI,KAAK,UAAWkE,QAAQpE,GAG1DmE,YAIItC,kBAAkB6B,eAHlBW,aAAaX,cACbY,mBAAmBZ,eAKvBa,oBAAoBtD,WAO7BhE,wBAAwBgB,UAAUsG,oBAAsB,SAAStD,cACzDE,YAAc,OACdqD,MAAQlH,KAAKK,UAAUU,KAAK,kCAAoC4C,UAChEwD,KAAOnH,KACP4B,QAAU5B,KAAK4B,UAEfsF,MAAMrG,QACNqG,MAAM3D,MAAK,eACHQ,KAAO1E,EAAEW,SACR+D,KAAK0C,SAAS,iBAAoB1C,KAAKnB,KAAK,eAWtCmB,KAAKnB,KAAK,iBACjBiB,YAAYA,YAAYhD,QAAUkD,KAAKnB,KAAK,oBAZiB,CACzDmB,KAAKnB,KAAK,gBAAkBhB,SAE5BmC,KAAKnB,KAAK,QAASmB,KAAK2B,SAAS5C,MAAMF,KAAK,QAASmB,KAAK2B,SAAS3C,SAEnE6D,OAAS,IAAIrH,OAAOiG,MAAMzB,KAAKnB,KAAK,SAAUmB,KAAKnB,KAAK,aACxDuE,KAAKvB,cAAcgB,QAAS,KACxBE,QAAUK,KAAKxB,iBAAiBiB,QACpCE,QAAU,IAAIvH,OAAOiG,MAAMsB,QAAQtE,EAAIZ,QAASkF,QAAQpE,EAAId,SAC5DiC,YAAYA,YAAYhD,QAAUiG,kBAQ7CzG,UAAUU,KAAK,eAAiB4C,UAAU0B,IAAIxB,YAAYuD,KAAK,MAChEpH,KAAK6E,yBAELwC,gBAAgBC,uBAEXlH,eAAiBJ,KAAKwE,8BAQnC7E,wBAAwBgB,UAAU4G,eAAiB,SAASpB,OACpDpC,KAAO1E,EAAE8G,EAAEE,QAAQC,QAAQ,WAC3Bb,MAAQ,IAAIlG,OAAOiG,MAAMzB,KAAK2B,SAAS5C,KAAMiB,KAAK2B,SAAS3C,KAC3DY,SAAW3D,KAAK4D,uBAAuBG,aAEnCoC,EAAEqB,cACDhI,KAAKiI,eACL,GACDhC,MAAMjD,GAAK,aAEVhD,KAAKkI,gBACL,GACDjC,MAAMjD,GAAK,aAEVhD,KAAKmI,eACL,GACDlC,MAAM/C,GAAK,aAEVlD,KAAKoI,aACL,GACDnC,MAAM/C,GAAK,aAEVlD,KAAKqI,WACLrI,KAAKsI,OACNrC,MAAQ,6BAKhBU,EAAE4B,iBAEY,OAAVtC,MAAgB,CAChBA,MAAQzF,KAAKgI,iBAAiBvC,OAC9B1B,KAAK2B,OAAO,MAASD,MAAMjD,MAAUiD,MAAM/C,IAC3CqB,KAAKnB,KAAK,QAASmB,KAAK2B,SAAS5C,MAAMF,KAAK,QAASmB,KAAK2B,SAAS3C,SAC/D6D,OAAS5G,KAAK2F,iBAAiB,IAAIpG,OAAOiG,MAAMzB,KAAKnB,KAAK,SAAUmB,KAAKnB,KAAK,cAClFmB,KAAKnB,KAAK,UAAWgE,OAAOpE,EAAIxC,KAAK4B,WAAWgB,KAAK,UAAWgE,OAAOlE,EAAI1C,KAAK4B,WAC5E5B,KAAK4F,cAAc,IAAIrG,OAAOiG,MAAMzB,KAAK2B,SAAS5C,KAAMiB,KAAK2B,SAAS3C,OAClEgB,KAAK0C,SAAS,YAAa,MACtBpC,eAAeN,MAAM,OACtB2C,WAAa1G,KAAKsE,aAAaP,MAC/B2C,WAAW7F,QACX6F,WAAWpG,SAAS,eAEnBiE,kBAAkBR,YAI/BA,KAAKpB,IAAI,OAAQ,IAAIA,IAAI,MAAO,IAChCoB,KAAKnB,KAAK,QAASmB,KAAK2B,SAAS5C,MAAMF,KAAK,QAASmB,KAAK2B,SAAS3C,UAC9DgE,aAAahD,WACbiD,mBAAmBjD,MAE5BA,KAAKkE,aACAhB,oBAAoBtD,WAS7BhE,wBAAwBgB,UAAUqH,iBAAmB,SAASE,cACtDC,MAAQnI,KAAKc,UACbgG,QAAU9G,KAAK2F,iBAAiBuC,iBACpCpB,QAAQtE,EAAI4F,KAAKC,IAAI,EAAGvB,QAAQtE,GAChCsE,QAAQpE,EAAI0F,KAAKC,IAAI,EAAGvB,QAAQpE,GAChCoE,QAAQtE,EAAI4F,KAAKE,IAAIH,MAAMrC,QAASgB,QAAQtE,GAC5CsE,QAAQpE,EAAI0F,KAAKE,IAAIH,MAAMpC,SAAUe,QAAQpE,GACtC1C,KAAKoE,kBAAkB0C,UASlCnH,wBAAwBgB,UAAUiD,uBAAyB,SAAS2E,aACzDC,OAAOxI,KAAKyI,0BAA0BF,KAAM,YAUvD5I,wBAAwBgB,UAAU8H,0BAA4B,SAASF,KAAMG,YACrEC,QAAUtJ,EAAEkJ,MAAMK,KAAK,iBACXC,IAAZF,SAAqC,KAAZA,gBACrBG,WAAaH,QAAQpD,MAAM,KACtBwD,MAAQ,EAAGA,MAAQD,WAAWjI,OAAQkI,QAAS,IACxC,IAAIC,OAAO,IAAMN,OAAS,aAC5BO,KAAKH,WAAWC,QAAS,KAE3BG,MADQ,IAAIF,OAAO,aACLG,KAAKL,WAAWC,eAC3BP,OAAOU,MAAM,YAIzB,MAMXvJ,wBAAwBgB,UAAUyI,aAAe,eACzCrJ,MAAQC,KACR4B,QAAU5B,KAAK4B,UACf5B,KAAKG,aACLyB,QAAU,QAGTvB,UAAUU,KAAK,wBAAwBuC,IAAI,iBAAiBC,MAAK,SAASC,IAAKO,MAChF1E,EAAE0E,MACGpB,IAAI,OAAQ0G,WAAWhK,EAAE0E,MAAMnB,KAAK,YAAcyG,WAAWzH,UAC7De,IAAI,MAAO0G,WAAWhK,EAAE0E,MAAMnB,KAAK,YAAcyG,WAAWzH,UACjE7B,MAAMiD,mBAAmBe,KAAM,oBAG9B1D,UAAUU,KAAK,8BACf+E,MAAM9F,KAAKc,UAAUgF,SACrBC,OAAO/F,KAAKc,UAAUiF,cAEtB,IAAI1E,WAAa,EAAGA,WAAarB,KAAKF,iBAAiBe,OAAQQ,aAAc,KAE1EiI,aADWvJ,MAAMD,iBAAiBuB,YACVS,OACxBJ,MAAQ3B,MAAME,OAAOoB,YACrB4B,SAAWlD,MAAMG,UAAUmB,YAC/BK,MAAMG,MAAMyH,aAAc1H,SAC1BF,MAAM6H,UAAUtG,cAEZb,QAAUV,MAAMW,qBAChBmH,WAAaxJ,KAAKK,UAAUU,KAAK,6CAA+CM,YACpFmI,WACK7G,IAAI,OAAQP,QAAQG,WAAWC,EAAKgH,WAAWvI,aAAe,EAAK,GACnE0B,IAAI,MAAOP,QAAQG,WAAWG,EAAK8G,WAAWtI,cAAgB,GACnEnB,MAAMiD,mBAAmBwG,WAAY,YAO7C7J,wBAAwBgB,UAAU8I,WAAa,eACvC1J,MAAQC,UACPK,UAAUU,KAAK,6BAA6BwC,MAAK,SAASwF,MAAOW,cAC9D3F,KAAO1E,EAAEqK,UACTC,YAAc5F,KAAKG,QACvByF,YAAYC,cACZD,YAAYrJ,SAAS,UACrBqJ,YAAYrJ,SAAS,SAAWP,MAAM6D,uBAAuBG,OAC7D4F,YAAYrJ,SAASP,MAAM8J,eAAe9F,MAAM,IAChD4F,YAAYrJ,SAAS,mBACrByD,KAAK+F,OAAOH,iBAUpBhK,wBAAwBgB,UAAUoJ,UAAY,SAAShG,aAC5C/D,KAAKyI,0BAA0B1E,KAAM,WAUhDpE,wBAAwBgB,UAAUkJ,eAAiB,SAAS9F,KAAMiG,qBAC1DC,UAAY,SAAWjK,KAAK+J,UAAUhG,aACtC/D,KAAKkK,eAAenG,QACpBkG,UAAY,YAGZD,gBACO,IAAMC,UAGVA,WASXtK,wBAAwBgB,UAAU2D,aAAe,SAASP,aAC/C/D,KAAKK,UAAUU,KAAK,gCACXf,KAAK4D,uBAAuBG,MAAQ/D,KAAK6J,eAAe9F,MAAM,GAAQ,qBAO1FpE,wBAAwBgB,UAAUwJ,SAAW,kBAClCnK,KAAKK,UAAUU,KAAK,iBAQ/BpB,wBAAwBgB,UAAUoG,aAAe,SAAShD,MACtDA,KAAK6F,YAAY,gBACZtJ,SAAS,YACTqC,IAAI,MAAO,IACXA,IAAI,OAAQ,IACZA,IAAI,YAAa,QAClBgH,YAAc3J,KAAKsE,aAAaP,MACpC4F,YAAYS,MAAMrG,MAClB4F,YAAYC,YAAY,WAU5BjK,wBAAwBgB,UAAU0D,eAAiB,SAASN,KAAMsG,eAAWC,wEACrEH,SAAWnK,KAAKmK,WAChBvI,QAAU5B,KAAK4B,UACnBmC,KAAK6F,YAAY,gBAAgBA,YAAY,gBACzChD,OAAS5G,KAAK2F,iBAAiB,IAAIpG,OAAOiG,MAAMzB,KAAKnB,KAAK,SAAUmB,KAAKnB,KAAK,WAC9EyH,WACAtG,KAAKnB,KAAK,UAAWgE,OAAOpE,EAAIZ,SAASgB,KAAK,UAAWgE,OAAOlE,EAAId,SACpEmC,KAAKpB,IAAI,OAAQiE,OAAOpE,GAAGG,IAAI,MAAOiE,OAAOlE,KAE7CqB,KAAKnB,KAAK,UAAWgE,OAAOpE,GAAGI,KAAK,UAAWgE,OAAOlE,GACtDqB,KAAKpB,IAAI,OAAQiE,OAAOpE,EAAIZ,SAASe,IAAI,MAAOiE,OAAOlE,EAAId,UAG1D0I,aAEDvG,KAAKnB,KAAK,aAAchB,SAE5BuI,SAASjI,OAAO6B,WACXf,mBAAmBe,KAAM,aAQlCpE,wBAAwBgB,UAAU4D,kBAAoB,SAASR,UACvDW,UAAY1E,KAAKuK,SAASxG,MAC1ByG,UAAYhC,OAAOxI,KAAKyI,0BAA0B/D,UAAW,cAC7D+F,yBAA2BzK,KAAKK,UAAUU,KAAK,8BAC3Cf,KAAK4D,uBAAuBG,MAAQ/D,KAAK6J,eAAe9F,MAAM,IAAOlD,OACzE6J,0BAA4B1K,KAAKK,UAAUU,KAAK,+BAC5Cf,KAAK4D,uBAAuBG,MAAQ/D,KAAK6J,eAAe9F,MAAM,IAAOT,IAAI,oBAAoBzC,WAEhGb,KAAKkK,eAAenG,QAChB/D,KAAKkK,eAAenG,OAAS0G,yBAA2BD,YAA4C,IAA9BE,0BAAiC,KACxGC,UAAY5G,KAAKG,QACrByG,UAAUrK,SAAS,YACdqC,IAAI,MAAO,IACXA,IAAI,OAAQ,IACZA,IAAI,YAAa,SACjB2B,aAAaP,MACb6F,YAAY,UACZQ,MAAMO,WACXtD,gBAAgBuD,yBAAyBD,aASjDhL,wBAAwBgB,UAAUqG,mBAAqB,SAASjD,cACxD8G,YAAc7K,KAAKK,UAAUU,KAAK,+BAClCf,KAAK4D,uBAAuBG,MAAQ/D,KAAK6J,eAAe9F,MAAM,IAAOT,IAAI,oBACzEwH,eAAiBD,YAAYhK,OAC1BiK,eAAiB,GACpBD,YAAYE,QAAQ/I,SACpB8I,kBAURnL,wBAAwBgB,UAAU4J,SAAW,SAASxG,UAC9CJ,SAAW3D,KAAK4D,uBAAuBG,aACpC/D,KAAKK,UAAUU,KAAK,uBAAyB4C,WAQxDhE,wBAAwBgB,UAAUiB,QAAU,eACpCuG,MAAQnI,KAAKc,UACbkK,kBAAoB7C,MAAM8C,IAAI,GAAGC,oBACd/C,MAAMrC,QAEHkF,mBAS9BrL,wBAAwBgB,UAAUqC,mBAAqB,SAASmI,QAASC,UACjExJ,QAAUyH,WAAWrJ,KAAK4B,WAC1B5B,KAAKG,aACLyB,QAAU,GAEdvC,EAAE8L,SAASxI,IAAI,qBACU,SAAWf,QAAU,qBACxB,SAAWA,QAAU,oBACtB,SAAWA,QAAU,mBACtB,SAAWA,QAAU,cACxB,SAAWA,QAAU,uBACdwJ,QAS5BzL,wBAAwBgB,UAAUuJ,eAAiB,SAASnG,aACjDA,KAAK0C,SAAS,aASzB9G,wBAAwBgB,UAAUD,2BAA6B,eACvDX,MAAQC,KAGRA,KAAKO,kBAK0B,OAA/BP,KAAKqL,uBACLC,aAAatL,KAAKqL,uBAMlBrL,KAAKQ,wBAAwBK,OAAS,OACjCwK,sBAAwBE,YAAW,gBAC/B7K,+BACN,WAKFH,iBAAkB,OAClBkJ,kBACArG,uBACAxC,gBAELoF,SAASwF,iBAAiB9L,YAAY+L,WAAWC,gCAAiCC,WAC9EA,SAASC,OAAOC,MAAMzG,SAAS+F,UAC3BpL,MAAM+L,gCAAgCX,kBAUlDxL,wBAAwBgB,UAAUmL,gCAAkC,SAASC,qBACrEC,oBAAsB3M,EAAE0M,uBACtBE,eAAiBD,oBAAoBE,SAAS5F,QAAQ,eACtD6F,SAAWH,oBAAoBvF,SAAS,UACxCpD,KAAOrD,KAAKK,cAEb4L,iBAAmBE,mBAGpBF,iBACAD,oBAAsBA,oBAAoBE,SAAS5F,QAAQ,gBAE3DjD,KAAKtC,KAAKiL,qBAAqBnL,QAAU,eAKvCuL,OAASpM,KAAK+J,UAAUiC,qBACxBrI,SAAW3D,KAAK4D,uBAAuBoI,qBACvCK,2BAA6B,CAC/B,qDAAuDD,OAAS,UAAYzI,SAC5E,oDAAsDyI,OAAS,UAAYzI,SAC3E,8DAAgEA,SAChE,6DAA+DA,cAE/D2I,uBAAyB,SAEvBC,sBAAwBP,oBAAoB9H,QAClDmI,2BAA2BjH,SAAQ,SAASoH,UACxCnJ,KAAKtC,KAAKyL,UAAUjJ,MAAK,SAASS,EAAGuE,YAC3BkE,cAAgBpN,EAAEkJ,MAAMK,KAAK,SAC7B8D,cAAgBrN,EAAEkJ,MAAMK,KAAK,SAEnC2D,sBAAsB3D,KAAK,QAAS6D,eACpCF,sBAAsB3D,KAAK,QAAS8D,eAEpCrF,gBAAgBuD,yBAAyB2B,uBAEzClN,EAAEkJ,MAAMuB,OAAOyC,uBACfD,uBAAuBK,KAAKpE,YAGpC+D,uBAAuBlH,SAAQ,SAASmD,MACpClJ,EAAEkJ,MAAMvG,aAShBrC,wBAAwBgB,UAAUH,sBAAwB,kBAC/CR,KAAKK,UAAUU,KAAK,gCAAgCuC,KAAI,SAASU,EAAG4I,gBAChE5M,KAAK6M,cAAcD,aAUlCjN,wBAAwBgB,UAAUkM,cAAgB,SAASC,mBAChDA,WAAWC,UAAyC,IAA7BD,WAAWE,mBASzC3F,gBAAkB,CAKlB4F,0BAA0B,EAM1BC,+BAAgC,GAKhC/M,YAAY,EAKZgN,sBAAsB,EAKtBC,UAAW,GASXC,KAAM,SAASzN,YAAaC,SAAUC,qBAClCuH,gBAAgB+F,UAAUxN,aACtB,IAAID,wBAAwBC,YAAaC,SAAUC,kBAClDuH,gBAAgB4F,2BACjB5F,gBAAgBiG,qBAChBjG,gBAAgB4F,0BAA2B,IAE1C5F,gBAAgB6F,+BAA+BK,eAAe3N,aAAc,CAC7EyH,gBAAgB6F,+BAA+BtN,cAAe,MAE1D4N,kBAAoBxH,SAASC,eAAerG,aAC5C4N,kBAAkBC,UAAUC,SAAS,cACpCF,kBAAkBC,UAAUC,SAAS,6BAEtCrG,gBAAgBuD,yBAAyBvL,EAAEmO,mBAAmBzM,KAAK,0BACnEsG,gBAAgBuD,yBAAyBvL,EAAEmO,mBAAmBzM,KAAK,4BAQ/EuM,mBAAoB,WAChBjO,EAAEsO,QAAQC,GAAG,UAAU,WACnBvG,gBAAgBwG,oBAAmB,MAEvCF,OAAOnC,iBAAiB,eAAe,WACnCnE,gBAAgBlH,YAAa,EAC7BkH,gBAAgBwG,mBAAmBxG,gBAAgBlH,eAEvDwN,OAAOnC,iBAAiB,cAAc,WAClCnE,gBAAgBlH,YAAa,EAC7BkH,gBAAgBwG,mBAAmBxG,gBAAgBlH,eAEvDoL,YAAW,WACPlE,gBAAgByG,2BACjB,MAQPlD,yBAA0B,SAASO,SAC/BA,QACKyC,GAAG,uBAAwBvG,gBAAgBnB,iBAC3C0H,GAAG,mBAAoBvG,gBAAgBE,gBACvCwG,SAAQ,SAAS5H,GACdkB,gBAAgB2G,oBAAoB7H,GAAG,MAE1C8H,UAAS,SAAS9H,GACfkB,gBAAgB2G,oBAAoB7H,GAAG,OAQnDD,gBAAiB,SAASC,GACtBA,EAAE4B,qBACEmG,SAAW7G,gBAAgB8G,oBAAoBhI,GAC/C+H,UACAA,SAAShI,gBAAgBC,IAQjCoB,eAAgB,SAASpB,OACjB+H,SAAW7G,gBAAgB8G,oBAAoBhI,GAC/C+H,UACAA,SAAS3G,eAAepB,IAQhC0H,mBAAoB,SAAS1N,gBACpB,IAAIP,eAAeyH,gBAAgB+F,UAChC/F,gBAAgB+F,UAAUG,eAAe3N,eACzCyH,gBAAgB+F,UAAUxN,aAAaO,WAAaA,WACpDkH,gBAAgB+F,UAAUxN,aAAawJ,iBAUnD4E,oBAAqB,SAAS7H,EAAGiI,cAC7B/G,gBAAgB8F,qBAAuBiB,cAQ3CN,uBAAwB,WACfzG,gBAAgB8F,2BACZU,mBAAmBxG,gBAAgBlH,YAK5CoL,YAAW,WACPlE,gBAAgByG,uBAAuBzG,gBAAgBlH,cACxD,MAQPgO,oBAAqB,SAAShI,OACtBvG,YAAcP,EAAE8G,EAAEkI,eAAe/H,QAAQ,iBAAiBsC,KAAK,aAC5DvB,gBAAgB+F,UAAUxN,cAMrC0H,gBAAiB,iBACPgH,aAAetI,SAASC,eAAe,gBAC7CxG,kBAAkB8O,gBAAgBD,sBAOnC,CASHjB,KAAMhG,gBAAgBgG"}
\ No newline at end of file
diff --git a/question/type/ddmarker/amd/src/question.js b/question/type/ddmarker/amd/src/question.js
index 6ff3d7df7269b..efe2caed37efd 100644
--- a/question/type/ddmarker/amd/src/question.js
+++ b/question/type/ddmarker/amd/src/question.js
@@ -26,13 +26,15 @@ define([
     'core/dragdrop',
     'qtype_ddmarker/shapes',
     'core/key_codes',
-    'core_form/changechecker'
+    'core_form/changechecker',
+    'core_filters/events',
 ], function(
     $,
     dragDrop,
     Shapes,
     keys,
-    FormChangeChecker
+    FormChangeChecker,
+    filterEvent
 ) {
 
     "use strict";
@@ -757,7 +759,7 @@ define([
      * a time-out, because image on-loads are allegedly unreliable.
      */
     DragDropMarkersQuestion.prototype.waitForAllImagesToBeLoaded = function() {
-
+        var thisQ = this;
         // This method may get called multiple times (via image on-loads or timeouts.
         // If we are already done, don't do it again.
         if (this.allImagesLoaded) {
@@ -784,6 +786,64 @@ define([
         this.cloneDrags();
         this.repositionDrags();
         this.drawDropzones();
+        // Wait for all dynamic content loaded by filter to be completed.
+        document.addEventListener(filterEvent.eventTypes.filterContentRenderingComplete, (elements) => {
+            elements.detail.nodes.forEach((element) => {
+                thisQ.changeAllMakerToFilteredContent(element);
+            });
+        });
+    };
+
+    /**
+     * Change all the maker related to the item that has been changed by filter to correct size and content.
+     *
+     *  @param {object} filteredElement the element has been modified by filter.
+     */
+    DragDropMarkersQuestion.prototype.changeAllMakerToFilteredContent = function(filteredElement) {
+        let currentFilteredItem = $(filteredElement);
+        const parentIsMarker = currentFilteredItem.parent().closest('span.marker');
+        const isMarker = currentFilteredItem.hasClass('marker');
+        const root = this.getRoot();
+        // The filtered element or parent element should a drag or drop item.
+        if (!parentIsMarker && !isMarker) {
+            return;
+        }
+        if (parentIsMarker) {
+            currentFilteredItem = currentFilteredItem.parent().closest('span.marker');
+        }
+        if (root.find(currentFilteredItem).length <= 0) {
+            // If the maker doesn't belong to this question
+            // In case we have multiple questions in the same page.
+            return;
+        }
+        const dragNo = this.getDragNo(currentFilteredItem);
+        const choiceNo = this.getChoiceNoFromElement(currentFilteredItem);
+        const listOfContainerToBeModifed = [
+            'div.draghomes .marker:not(.dragplaceholder).dragno' + dragNo + '.choice' + choiceNo,
+            'div.droparea .marker:not(.dragplaceholder).dragno' + dragNo + '.choice' + choiceNo,
+            'div.draghomes .marker:not(.dragplaceholder).infinite.choice' + choiceNo,
+            'div.droparea .marker:not(.dragplaceholder).infinite.choice' + choiceNo
+        ];
+        let listOfModifiedDragDrop = [];
+        // We want to keep all the handler and event for filtered item, so using clone is the only choice.
+        const filteredDragDropClone = currentFilteredItem.clone();
+        listOfContainerToBeModifed.forEach(function(selector) {
+            root.find(selector).each(function(i, node) {
+                const originalClass = $(node).attr('class');
+                const originalStyle = $(node).attr('style');
+                // Replace the class and style of the maker we want to replace for the clone.
+                filteredDragDropClone.attr('class', originalClass);
+                filteredDragDropClone.attr('style', originalStyle);
+                // Add event for the clone.
+                questionManager.addEventHandlersToMarker(filteredDragDropClone);
+                // Insert into DOM.
+                $(node).before(filteredDragDropClone);
+                listOfModifiedDragDrop.push(node);
+            });
+        });
+        listOfModifiedDragDrop.forEach(function(node) {
+            $(node).remove();
+        });
     };
 
     /**
diff --git a/question/type/ddmarker/renderer.php b/question/type/ddmarker/renderer.php
index 48f4c29859276..6b3c64b0bfc5a 100644
--- a/question/type/ddmarker/renderer.php
+++ b/question/type/ddmarker/renderer.php
@@ -68,6 +68,7 @@ public function formulation_and_controls(question_attempt $qa,
 
         $orderedgroup = $question->get_ordered_choices(1);
         $hiddenfields = '';
+        $dragitems = '';
         foreach ($orderedgroup as $choiceno => $drag) {
             $classes = ['marker', 'user-select-none', 'choice' . $choiceno];
             $attr = [];
@@ -81,14 +82,17 @@ public function formulation_and_controls(question_attempt $qa,
             }
             $dragoutput = html_writer::start_span(join(' ', $classes), $attr);
             $targeticonhtml = $this->output->image_icon('crosshairs', '', $componentname, ['class' => 'target']);
-            $markertext = html_writer::span($drag->text, 'markertext');
+            $markertext = html_writer::span(question_utils::format_question_fragment($drag->text, $this->page->context),
+                'markertext');
             $dragoutput .= $targeticonhtml . $markertext;
             $dragoutput .= html_writer::end_span();
-            $output .= $dragoutput;
+            $dragitems .= $dragoutput;
             $hiddenfields .= $this->hidden_field_choice($qa, $choiceno, $drag->infinite, $drag->noofdrags);
         }
-
+        $output .= $dragitems;
         $output .= html_writer::end_div();
+        // Add extra hidden drag items so we can make sure the filter will be applied.
+        $output .= html_writer::div($dragitems, 'dd-original d-none');
         $output .= html_writer::end_div();
 
         if ($question->showmisplaced && $qa->get_state()->is_finished()) {
diff --git a/question/type/ddmarker/tests/behat/preview.feature b/question/type/ddmarker/tests/behat/preview.feature
index 528c98e20ade9..68d4fd11d1775 100644
--- a/question/type/ddmarker/tests/behat/preview.feature
+++ b/question/type/ddmarker/tests/behat/preview.feature
@@ -18,8 +18,9 @@ Feature: Preview a drag-drop marker question
       | contextlevel | reference | name           |
       | Course       | C1        | Test questions |
     And the following "questions" exist:
-      | questioncategory | qtype    | name         | template |
-      | Test questions   | ddmarker | Drag markers | mkmap    |
+      | questioncategory | qtype    | name                     | template |
+      | Test questions   | ddmarker | Drag markers             | mkmap    |
+      | Test questions   | ddmarker | Drag to mathjax equation | mathjax  |
 
   @javascript @_bug_phantomjs
   Scenario: Preview a question using the mouse
@@ -56,3 +57,12 @@ Feature: Preview a drag-drop marker question
     And I press "Submit and finish"
     Then the state of "Please place the markers on the map of Milton Keynes" question is shown as "Correct"
     And I should see "Mark 1.00 out of 1.00"
+
+  @javascript
+  Scenario: Preview a drag-drop marker question with mathjax question.
+    Given the "mathjaxloader" filter is "on"
+    And the "mathjaxloader" filter applies to "content and headings"
+    And I am on the "Drag to mathjax equation" "core_question > preview" page logged in as teacher
+    And I press "Fill in correct responses"
+    When I press "Submit and finish"
+    Then ".filter_mathjaxloader_equation" "css_element" should exist in the ".droparea" "css_element"
diff --git a/question/type/ddmarker/tests/helper.php b/question/type/ddmarker/tests/helper.php
index 8863f11a595fa..e3f021fe923b6 100644
--- a/question/type/ddmarker/tests/helper.php
+++ b/question/type/ddmarker/tests/helper.php
@@ -35,7 +35,7 @@
  */
 class qtype_ddmarker_test_helper extends question_test_helper {
     public function get_test_questions() {
-        return array('fox', 'maths', 'mkmap', 'zerodrag');
+        return ['fox', 'maths', 'mkmap', 'zerodrag', 'mathjax'];
     }
 
     /**
@@ -198,6 +198,50 @@ public function get_ddmarker_question_form_data_mkmap() {
         return $fromform;
     }
 
+    /**
+     * Return the test data needed by the question generator to create question tempplate.
+     *
+     * @return stdClass date to create a ddmarkers question.
+     */
+    public function get_ddmarker_question_form_data_mathjax() {
+        global $CFG, $USER;
+        $fromform = new stdClass();
+
+        $bgdraftitemid = 0;
+        file_prepare_draft_area($bgdraftitemid, null, null, null, null);
+        $fs = get_file_storage();
+        $filerecord = new stdClass();
+        $filerecord->contextid = context_user::instance($USER->id)->id;
+        $filerecord->component = 'user';
+        $filerecord->filearea = 'draft';
+        $filerecord->itemid = $bgdraftitemid;
+        $filerecord->filepath = '/';
+        $filerecord->filename = 'mkmap.png';
+        $fs->create_file_from_pathname($filerecord, $CFG->dirroot .
+            '/question/type/ddmarker/tests/fixtures/mkmap.png');
+
+        $fromform->name = 'Drag-and-drop into maker question with equation';
+        $fromform->questiontext = ['text' => 'Fill in the correct mathjax equation: y = 2, x =4', 'format' => FORMAT_HTML];
+
+        $fromform->defaultmark = 1;
+        $fromform->generalfeedback = ['text' => 'The right answer is: "y = x^2"', 'format' => FORMAT_HTML];
+        $fromform->bgimage = $bgdraftitemid;
+        $fromform->shuffleanswers = 0;
+        $fromform->drags = [
+            ['label' => '$$ y = x^2 $$', 'noofdrags' => '1'],
+            ['label' => '$$ y = x^5 $$', 'noofdrags' => '1'],
+        ];
+        $fromform->drops = [
+            ['shape' => 'circle', 'coords' => '322,213;10', 'choice' => 1],
+            ['shape' => 'circle', 'coords' => '144,84;10', 'choice' => 2],
+        ];
+        test_question_maker::set_standard_combined_feedback_form_data($fromform);
+        $fromform->penalty = '0.3333333';
+        $fromform->status = \core_question\local\bank\question_version_status::QUESTION_STATUS_READY;
+
+        return $fromform;
+    }
+
     /**
      * Return the test data needed by the question generator (the data that
      * would come from saving the editing form).

From b4a9ce93a6ea2dc70c6fee565e52c09ef9c35c54 Mon Sep 17 00:00:00 2001
From: hieuvu <hieuvu@nashtechglobal.com>
Date: Fri, 3 May 2024 09:21:45 +0700
Subject: [PATCH 005/119] MDL-78662 ddwtos: Allow answer to support filter
 dynamic content.

---
 question/type/ddwtos/amd/build/ddwtos.min.js  |  2 +-
 .../type/ddwtos/amd/build/ddwtos.min.js.map   |  2 +-
 question/type/ddwtos/amd/src/ddwtos.js        | 97 +++++++++++++++++--
 question/type/ddwtos/renderer.php             |  6 +-
 question/type/ddwtos/styles.css               |  4 +
 .../type/ddwtos/tests/behat/preview.feature   | 16 ++-
 question/type/ddwtos/tests/helper.php         | 26 ++++-
 7 files changed, 134 insertions(+), 19 deletions(-)

diff --git a/question/type/ddwtos/amd/build/ddwtos.min.js b/question/type/ddwtos/amd/build/ddwtos.min.js
index f2af9705969e6..2d5fdccec9702 100644
--- a/question/type/ddwtos/amd/build/ddwtos.min.js
+++ b/question/type/ddwtos/amd/build/ddwtos.min.js
@@ -22,6 +22,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since      3.6
  */
-define("qtype_ddwtos/ddwtos",["jquery","core/dragdrop","core/key_codes","core_form/changechecker"],(function($,dragDrop,keys,FormChangeChecker){function DragDropToTextQuestion(containerId,readOnly){this.containerId=containerId,this.questionAnswer={},readOnly&&this.getRoot().addClass("qtype_ddwtos-readonly"),this.resizeAllDragsAndDrops(),this.cloneDrags(),this.positionDrags()}DragDropToTextQuestion.prototype.resizeAllDragsAndDrops=function(){var thisQ=this;this.getRoot().find(".answercontainer > div").each((function(i,node){thisQ.resizeAllDragsAndDropsInGroup(thisQ.getClassnameNumericSuffix($(node),"draggrouphomes"))}))},DragDropToTextQuestion.prototype.resizeAllDragsAndDropsInGroup=function(group){var thisQ=this,dragHomes=this.getRoot().find(".draggrouphomes"+group+" span.draghome"),maxWidth=0,maxHeight=0;dragHomes.each((function(i,drag){maxWidth=Math.max(maxWidth,Math.ceil(drag.offsetWidth)),maxHeight=Math.max(maxHeight,Math.ceil(0+drag.offsetHeight))})),maxWidth+=8,maxHeight+=2,dragHomes.each((function(i,drag){thisQ.setElementSize(drag,maxWidth,maxHeight)})),this.getRoot().find("span.drop.group"+group).each((function(i,drop){thisQ.setElementSize(drop,maxWidth,maxHeight)}))},DragDropToTextQuestion.prototype.setElementSize=function(element,width,height){$(element).width(width).height(height).css("lineHeight",height+"px")},DragDropToTextQuestion.prototype.cloneDrags=function(){var thisQ=this;thisQ.getRoot().find("span.draghome").each((function(index,draghome){var drag=$(draghome),placeHolder=drag.clone();placeHolder.removeClass(),placeHolder.addClass("draghome choice"+thisQ.getChoice(drag)+" group"+thisQ.getGroup(drag)+" dragplaceholder"),drag.before(placeHolder)}))},DragDropToTextQuestion.prototype.positionDrags=function(){var thisQ=this,root=this.getRoot();root.find("span.draghome").not(".dragplaceholder").each((function(i,dragNode){var drag=$(dragNode),currentPlace=thisQ.getClassnameNumericSuffix(drag,"inplace");drag.addClass("unplaced").removeClass("placed"),drag.removeAttr("tabindex"),null!==currentPlace&&drag.removeClass("inplace"+currentPlace)})),root.find("input.placeinput").each((function(i,inputNode){var input=$(inputNode),choice=input.val(),place=thisQ.getPlace(input),drop=root.find(".drop.place"+place),dropPosition=drop.offset();if(drop.data("prev-top",dropPosition.top).data("prev-left",dropPosition.left),"0"!==choice){var unplacedDrag=thisQ.getUnplacedChoice(thisQ.getGroup(input),choice),hiddenDrag=thisQ.getDragClone(unplacedDrag);if(hiddenDrag.length)if(unplacedDrag.hasClass("infinite")){var noOfDrags=thisQ.noOfDropsInGroup(thisQ.getGroup(unplacedDrag));if(thisQ.getInfiniteDragClones(unplacedDrag,!1).length<noOfDrags){var cloneDrag=unplacedDrag.clone();hiddenDrag.after(cloneDrag),questionManager.addEventHandlersToDrag(cloneDrag)}else hiddenDrag.addClass("active")}else hiddenDrag.addClass("active");thisQ.sendDragToDrop(thisQ.getUnplacedChoice(thisQ.getGroup(input),choice),drop)}})),thisQ.questionAnswer=thisQ.getQuestionAnsweredValues()},DragDropToTextQuestion.prototype.getQuestionAnsweredValues=function(){let result={};return this.getRoot().find("input.placeinput").each(((i,inputNode)=>{result[inputNode.id]=inputNode.value})),result},DragDropToTextQuestion.prototype.isQuestionInteracted=function(){const oldAnswer=this.questionAnswer,newAnswer=this.getQuestionAnsweredValues();let isInteracted=!1;return JSON.stringify(newAnswer)!==JSON.stringify(oldAnswer)?(isInteracted=!0,isInteracted):(Object.keys(newAnswer).forEach((key=>{newAnswer[key]!==oldAnswer[key]&&(isInteracted=!0)})),isInteracted)},DragDropToTextQuestion.prototype.handleDragStart=function(e){var thisQ=this,drag=$(e.target).closest(".draghome");if(dragDrop.prepare(e).start&&!drag.hasClass("beingdragged")){drag.addClass("beingdragged");var currentPlace=this.getClassnameNumericSuffix(drag,"inplace");if(null!==currentPlace){this.setInputValue(currentPlace,0),drag.removeClass("inplace"+currentPlace);var hiddenDrop=thisQ.getDrop(drag,currentPlace);hiddenDrop.length&&(hiddenDrop.addClass("active"),drag.offset(hiddenDrop.offset()))}else{var hiddenDrag=thisQ.getDragClone(drag);if(hiddenDrag.length)if(drag.hasClass("infinite")){var noOfDrags=this.noOfDropsInGroup(this.getGroup(drag));if(this.getInfiniteDragClones(drag,!1).length<noOfDrags){var cloneDrag=drag.clone();cloneDrag.removeClass("beingdragged"),hiddenDrag.after(cloneDrag),questionManager.addEventHandlersToDrag(cloneDrag),drag.offset(cloneDrag.offset())}else hiddenDrag.addClass("active"),drag.offset(hiddenDrag.offset())}else hiddenDrag.addClass("active"),drag.offset(hiddenDrag.offset())}dragDrop.start(e,drag,(function(x,y,drag){thisQ.dragMove(x,y,drag)}),(function(x,y,drag){thisQ.dragEnd(x,y,drag)}))}},DragDropToTextQuestion.prototype.dragMove=function(pageX,pageY,drag){var thisQ=this;this.getRoot().find("span.group"+this.getGroup(drag)).not(".beingdragged").each((function(i,dropNode){var drop=$(dropNode);thisQ.isPointInDrop(pageX,pageY,drop)?drop.addClass("valid-drag-over-drop"):drop.removeClass("valid-drag-over-drop")}))},DragDropToTextQuestion.prototype.dragEnd=function(pageX,pageY,drag){var thisQ=this,root=this.getRoot(),placed=!1;root.find("span.group"+this.getGroup(drag)).not(".beingdragged").each((function(i,dropNode){if(placed)return!1;const dropZone=$(dropNode);if(!thisQ.isPointInDrop(pageX,pageY,dropZone))return!0;let drop=null;return dropZone.hasClass("placed")?(dropZone.removeClass("valid-drag-over-drop"),drop=thisQ.getDrop(drag,thisQ.getClassnameNumericSuffix(dropZone,"inplace"))):drop=dropZone,drop.removeClass("valid-drag-over-drop"),thisQ.sendDragToDrop(drag,drop),placed=!0,!1})),placed||this.sendDragHome(drag)},DragDropToTextQuestion.prototype.sendDragToDrop=function(drag,drop){if(null!==this.getPlace(drop)){var oldDrag=this.getCurrentDragInPlace(this.getPlace(drop));if(0!==oldDrag.length){var currentPlace=this.getClassnameNumericSuffix(oldDrag,"inplace");if(this.hasDropSameDrag(currentPlace,drop,oldDrag,drag))return void this.sendDragHome(drag);var hiddenDrop=this.getDrop(oldDrag,currentPlace);hiddenDrop.addClass("active"),oldDrag.addClass("beingdragged"),oldDrag.offset(hiddenDrop.offset()),this.sendDragHome(oldDrag)}if(0===drag.length)this.setInputValue(this.getPlace(drop),0),drop.data("isfocus")&&drop.focus();else{if(this.getClassnameNumericSuffix(drag,"inplace"))return;this.setInputValue(this.getPlace(drop),this.getChoice(drag)),drag.removeClass("unplaced").addClass("placed inplace"+this.getPlace(drop)),drag.attr("tabindex",0),this.animateTo(drag,drop)}}else this.sendDragHome(drag)},DragDropToTextQuestion.prototype.hasDropSameDrag=function(currentPlace,drop,oldDrag,drag){return!!drag.hasClass("infinite")&&(drop.hasClass("place"+currentPlace)&&this.getGroup(drag)===this.getGroup(drop)&&this.getChoice(drag)===this.getChoice(oldDrag)&&this.getGroup(drag)===this.getGroup(oldDrag))},DragDropToTextQuestion.prototype.sendDragHome=function(drag){var currentPlace=this.getClassnameNumericSuffix(drag,"inplace");null!==currentPlace&&drag.removeClass("inplace"+currentPlace),drag.data("unplaced",!0),this.animateTo(drag,this.getDragHome(this.getGroup(drag),this.getChoice(drag)))},DragDropToTextQuestion.prototype.handleKeyPress=function(e){var drop=$(e.target).closest(".drop");if(0===drop.length){var placedDrag=$(e.target),currentPlace=this.getClassnameNumericSuffix(placedDrag,"inplace");null!==currentPlace&&(drop=this.getDrop(placedDrag,currentPlace))}var currentDrag=this.getCurrentDragInPlace(this.getPlace(drop)),nextDrag=$();switch(e.keyCode){case keys.space:case keys.arrowRight:case keys.arrowDown:nextDrag=this.getNextDrag(this.getGroup(drop),currentDrag);break;case keys.arrowLeft:case keys.arrowUp:nextDrag=this.getPreviousDrag(this.getGroup(drop),currentDrag);break;case keys.escape:break;default:return void(questionManager.isKeyboardNavigation=!1)}if(nextDrag.length){nextDrag.data("isfocus",!0),nextDrag.addClass("beingdragged");var hiddenDrag=this.getDragClone(nextDrag);if(hiddenDrag.length)if(nextDrag.hasClass("infinite")){var noOfDrags=this.noOfDropsInGroup(this.getGroup(nextDrag));if(this.getInfiniteDragClones(nextDrag,!1).length<noOfDrags){var cloneDrag=nextDrag.clone();cloneDrag.removeClass("beingdragged"),cloneDrag.removeAttr("tabindex"),hiddenDrag.after(cloneDrag),questionManager.addEventHandlersToDrag(cloneDrag),nextDrag.offset(cloneDrag.offset())}else hiddenDrag.addClass("active"),nextDrag.offset(hiddenDrag.offset())}else hiddenDrag.addClass("active"),nextDrag.offset(hiddenDrag.offset())}else drop.data("isfocus",!0);e.preventDefault(),this.sendDragToDrop(nextDrag,drop)},DragDropToTextQuestion.prototype.getNextDrag=function(group,drag){var choice,numChoices=this.noOfChoicesInGroup(group);choice=0===drag.length?1:this.getChoice(drag)+1;for(var next=this.getUnplacedChoice(group,choice);0===next.length&&choice<numChoices;)choice++,next=this.getUnplacedChoice(group,choice);return next},DragDropToTextQuestion.prototype.getPreviousDrag=function(group,drag){var choice;choice=0===drag.length?this.noOfChoicesInGroup(group):this.getChoice(drag)-1;for(var previous=this.getUnplacedChoice(group,choice);0===previous.length&&choice>1;)choice--,previous=this.getUnplacedChoice(group,choice);return previous},DragDropToTextQuestion.prototype.animateTo=function(drag,target){var currentPos=drag.offset(),targetPos=target.offset(),thisQ=this;M.util.js_pending("qtype_ddwtos-animate-"+thisQ.containerId),drag.animate({left:parseInt(drag.css("left"))+targetPos.left-currentPos.left,top:parseInt(drag.css("top"))+targetPos.top-currentPos.top},{duration:"fast",done:function(){$("body").trigger("qtype_ddwtos-dragmoved",[drag,target,thisQ]),M.util.js_complete("qtype_ddwtos-animate-"+thisQ.containerId)}})},DragDropToTextQuestion.prototype.isPointInDrop=function(pageX,pageY,drop){var position=drop.offset();return pageX>=position.left&&pageX<position.left+drop.width()&&pageY>=position.top&&pageY<position.top+drop.height()},DragDropToTextQuestion.prototype.setInputValue=function(place,choice){this.getRoot().find("input.placeinput.place"+place).val(choice)},DragDropToTextQuestion.prototype.getRoot=function(){return $(document.getElementById(this.containerId))},DragDropToTextQuestion.prototype.getDragHome=function(group,choice){return this.getRoot().find(".draghome.dragplaceholder.group"+group+".choice"+choice).is(":visible")?this.getRoot().find(".draghome.dragplaceholder.group"+group+".choice"+choice):this.getRoot().find(".draggrouphomes"+group+" span.draghome.infinite.choice"+choice+".group"+group)},DragDropToTextQuestion.prototype.getUnplacedChoice=function(group,choice){return this.getRoot().find(".draghome.group"+group+".choice"+choice+".unplaced").slice(0,1)},DragDropToTextQuestion.prototype.getCurrentDragInPlace=function(place){return this.getRoot().find("span.draghome.inplace"+place)},DragDropToTextQuestion.prototype.noOfDropsInGroup=function(group){return this.getRoot().find(".drop.group"+group).length},DragDropToTextQuestion.prototype.noOfChoicesInGroup=function(group){return this.getRoot().find(".draghome.group"+group).length},DragDropToTextQuestion.prototype.getClassnameNumericSuffix=function(node,prefix){var classes=node.attr("class");if(void 0!==classes&&""!==classes)for(var classesArr=classes.split(" "),index=0;index<classesArr.length;index++){if(new RegExp("^"+prefix+"([0-9])+$").test(classesArr[index])){var match=new RegExp("([0-9])+$").exec(classesArr[index]);return Number(match[0])}}return null},DragDropToTextQuestion.prototype.getChoice=function(drag){return this.getClassnameNumericSuffix(drag,"choice")},DragDropToTextQuestion.prototype.getGroup=function(node){return this.getClassnameNumericSuffix(node,"group")},DragDropToTextQuestion.prototype.getPlace=function(node){return this.getClassnameNumericSuffix(node,"place")},DragDropToTextQuestion.prototype.getDragClone=function(drag){return this.getRoot().find(".draggrouphomes"+this.getGroup(drag)+" span.draghome.choice"+this.getChoice(drag)+".group"+this.getGroup(drag)+".dragplaceholder")},DragDropToTextQuestion.prototype.getInfiniteDragClones=function(drag,inHome){return inHome?this.getRoot().find(".draggrouphomes"+this.getGroup(drag)+" span.draghome.choice"+this.getChoice(drag)+".group"+this.getGroup(drag)+".infinite").not(".dragplaceholder"):this.getRoot().find("span.draghome.choice"+this.getChoice(drag)+".group"+this.getGroup(drag)+".infinite").not(".dragplaceholder")},DragDropToTextQuestion.prototype.getDrop=function(drag,currentPlace){return this.getRoot().find(".drop.group"+this.getGroup(drag)+".place"+currentPlace)};var questionManager={eventHandlersInitialised:!1,dragEventHandlersInitialised:{},isKeyboardNavigation:!1,questions:{},init:function(containerId,readOnly){if(questionManager.questions[containerId]=new DragDropToTextQuestion(containerId,readOnly),questionManager.eventHandlersInitialised||(questionManager.setupEventHandlers(),questionManager.eventHandlersInitialised=!0),!questionManager.dragEventHandlersInitialised.hasOwnProperty(containerId)){questionManager.dragEventHandlersInitialised[containerId]=!0;var questionContainer=document.getElementById(containerId);questionContainer.classList.contains("ddwtos")&&!questionContainer.classList.contains("qtype_ddwtos-readonly")&&questionManager.addEventHandlersToDrag($(questionContainer).find("span.draghome"))}},setupEventHandlers:function(){$("body").on("keydown",".que.ddwtos:not(.qtype_ddwtos-readonly) span.drop",questionManager.handleKeyPress).on("keydown",".que.ddwtos:not(.qtype_ddwtos-readonly) span.draghome.placed:not(.beingdragged)",questionManager.handleKeyPress).on("qtype_ddwtos-dragmoved",questionManager.handleDragMoved)},addEventHandlersToDrag:function(element){element.unbind("mousedown touchstart"),element.on("mousedown touchstart",questionManager.handleDragStart)},handleDragStart:function(e){e.preventDefault();var question=questionManager.getQuestionForEvent(e);question&&question.handleDragStart(e)},handleKeyPress:function(e){if(!questionManager.isKeyboardNavigation){questionManager.isKeyboardNavigation=!0;var question=questionManager.getQuestionForEvent(e);question&&question.handleKeyPress(e)}},getQuestionForEvent:function(e){var containerId=$(e.currentTarget).closest(".que.ddwtos").attr("id");return questionManager.questions[containerId]},handleDragMoved:function(e,drag,target,thisQ){drag.removeClass("beingdragged"),drag.css("top","").css("left",""),target.after(drag),target.removeClass("active"),void 0!==drag.data("unplaced")&&!0===drag.data("unplaced")&&(drag.removeClass("placed").addClass("unplaced"),drag.removeAttr("tabindex"),drag.removeData("unplaced"),drag.hasClass("infinite")&&thisQ.getInfiniteDragClones(drag,!0).length>1&&thisQ.getInfiniteDragClones(drag,!0).first().remove()),void 0!==drag.data("isfocus")&&!0===drag.data("isfocus")&&(drag.focus(),drag.removeData("isfocus")),void 0!==target.data("isfocus")&&!0===target.data("isfocus")&&target.removeData("isfocus"),questionManager.isKeyboardNavigation&&(questionManager.isKeyboardNavigation=!1),thisQ.isQuestionInteracted()&&(questionManager.handleFormDirty(),thisQ.questionAnswer=thisQ.getQuestionAnsweredValues())},handleFormDirty:function(){const responseForm=document.getElementById("responseform");FormChangeChecker.markFormAsDirty(responseForm)}};return{init:questionManager.init}}));
+define("qtype_ddwtos/ddwtos",["jquery","core/dragdrop","core/key_codes","core_form/changechecker","core_filters/events"],(function($,dragDrop,keys,FormChangeChecker,filterEvent){function DragDropToTextQuestion(containerId,readOnly){const thisQ=this;this.containerId=containerId,this.questionAnswer={},this.questionDragDropWidthHeight=[],readOnly&&this.getRoot().addClass("qtype_ddwtos-readonly"),this.resizeAllDragsAndDrops(),this.cloneDrags(),this.positionDrags(),document.addEventListener(filterEvent.eventTypes.filterContentRenderingComplete,(elements=>{elements.detail.nodes.forEach((element=>{thisQ.changeAllDragsAndDropsToFilteredContent(element)}))}))}DragDropToTextQuestion.prototype.resizeAllDragsAndDrops=function(){var thisQ=this;this.getRoot().find(".answercontainer > div").each((function(i,node){thisQ.resizeAllDragsAndDropsInGroup(thisQ.getClassnameNumericSuffix($(node),"draggrouphomes"))}))},DragDropToTextQuestion.prototype.resizeAllDragsAndDropsInGroup=function(group){var thisQ=this,dragDropItems=this.getRoot().find("span.group"+group),maxWidth=0,maxHeight=0;dragDropItems.each((function(i,drag){maxWidth=Math.max(maxWidth,Math.ceil(drag.offsetWidth)),maxHeight=Math.max(maxHeight,Math.ceil(0+drag.offsetHeight))})),maxWidth+=8,maxHeight+=2,thisQ.questionDragDropWidthHeight[group]={maxWidth:maxWidth,maxHeight:maxHeight},dragDropItems.each((function(i,drag){thisQ.setElementSize(drag,maxWidth,maxHeight)}))},DragDropToTextQuestion.prototype.changeAllDragsAndDropsToFilteredContent=function(filteredElement){let currentFilteredItem=$(filteredElement);const parentIsDD=currentFilteredItem.parent().closest("span").hasClass("placed")||currentFilteredItem.parent().closest("span").hasClass("draghome"),isDD=currentFilteredItem.hasClass("placed")||currentFilteredItem.hasClass("draghome");if(!parentIsDD&&!isDD)return;parentIsDD&&(currentFilteredItem=currentFilteredItem.parent().closest("span"));const thisQ=this;if(thisQ.getRoot().find(currentFilteredItem).length<=0)return;const group=thisQ.getGroup(currentFilteredItem),choice=thisQ.getChoice(currentFilteredItem);let listOfModifiedDragDrop=[];this.getRoot().find(".group"+group+".choice"+choice).each((function(i,node){if($(node).get(0)===currentFilteredItem.get(0))return;const originalClass=$(node).attr("class"),originalStyle=$(node).attr("style"),filteredDragDropClone=currentFilteredItem.clone();filteredDragDropClone.attr("class",originalClass),filteredDragDropClone.attr("style",originalStyle),$(node).before(filteredDragDropClone),listOfModifiedDragDrop.push(node)})),listOfModifiedDragDrop.forEach((function(node){$(node).remove()}));const currentHeight=currentFilteredItem.height(),currentWidth=currentFilteredItem.width();currentFilteredItem.height("auto"),currentFilteredItem.width("auto"),filteredElement.offsetWidth&&filteredElement.offsetHeight||filteredElement.classList.add("d-block"),thisQ.questionDragDropWidthHeight[group].maxWidth<Math.ceil(filteredElement.offsetWidth)||thisQ.questionDragDropWidthHeight[group].maxHeight<Math.ceil(0+filteredElement.offsetHeight)?(filteredElement.classList.remove("d-block"),thisQ.resizeAllDragsAndDropsInGroup(group)):(currentFilteredItem.height(currentHeight),currentFilteredItem.width(currentWidth)),filteredElement.classList.remove("d-block")},DragDropToTextQuestion.prototype.setElementSize=function(element,width,height){$(element).width(width).height(height).css("lineHeight",height+"px")},DragDropToTextQuestion.prototype.cloneDrags=function(){var thisQ=this;thisQ.getRoot().find("span.draghome").each((function(index,draghome){var drag=$(draghome),placeHolder=drag.clone();placeHolder.removeClass(),placeHolder.addClass("draghome choice"+thisQ.getChoice(drag)+" group"+thisQ.getGroup(drag)+" dragplaceholder"),drag.before(placeHolder)}))},DragDropToTextQuestion.prototype.positionDrags=function(){var thisQ=this,root=this.getRoot();root.find("span.draghome").not(".dragplaceholder").each((function(i,dragNode){var drag=$(dragNode),currentPlace=thisQ.getClassnameNumericSuffix(drag,"inplace");drag.addClass("unplaced").removeClass("placed"),drag.removeAttr("tabindex"),null!==currentPlace&&drag.removeClass("inplace"+currentPlace)})),root.find("input.placeinput").each((function(i,inputNode){var input=$(inputNode),choice=input.val(),place=thisQ.getPlace(input),drop=root.find(".drop.place"+place),dropPosition=drop.offset();if(drop.data("prev-top",dropPosition.top).data("prev-left",dropPosition.left),"0"!==choice){var unplacedDrag=thisQ.getUnplacedChoice(thisQ.getGroup(input),choice),hiddenDrag=thisQ.getDragClone(unplacedDrag);if(hiddenDrag.length)if(unplacedDrag.hasClass("infinite")){var noOfDrags=thisQ.noOfDropsInGroup(thisQ.getGroup(unplacedDrag));if(thisQ.getInfiniteDragClones(unplacedDrag,!1).length<noOfDrags){var cloneDrag=unplacedDrag.clone();hiddenDrag.after(cloneDrag),questionManager.addEventHandlersToDrag(cloneDrag)}else hiddenDrag.addClass("active")}else hiddenDrag.addClass("active");thisQ.sendDragToDrop(thisQ.getUnplacedChoice(thisQ.getGroup(input),choice),drop)}})),thisQ.questionAnswer=thisQ.getQuestionAnsweredValues()},DragDropToTextQuestion.prototype.getQuestionAnsweredValues=function(){let result={};return this.getRoot().find("input.placeinput").each(((i,inputNode)=>{result[inputNode.id]=inputNode.value})),result},DragDropToTextQuestion.prototype.isQuestionInteracted=function(){const oldAnswer=this.questionAnswer,newAnswer=this.getQuestionAnsweredValues();let isInteracted=!1;return JSON.stringify(newAnswer)!==JSON.stringify(oldAnswer)?(isInteracted=!0,isInteracted):(Object.keys(newAnswer).forEach((key=>{newAnswer[key]!==oldAnswer[key]&&(isInteracted=!0)})),isInteracted)},DragDropToTextQuestion.prototype.handleDragStart=function(e){var thisQ=this,drag=$(e.target).closest(".draghome");if(dragDrop.prepare(e).start&&!drag.hasClass("beingdragged")){drag.addClass("beingdragged");var currentPlace=this.getClassnameNumericSuffix(drag,"inplace");if(null!==currentPlace){this.setInputValue(currentPlace,0),drag.removeClass("inplace"+currentPlace);var hiddenDrop=thisQ.getDrop(drag,currentPlace);hiddenDrop.length&&(hiddenDrop.addClass("active"),drag.offset(hiddenDrop.offset()))}else{var hiddenDrag=thisQ.getDragClone(drag);if(hiddenDrag.length)if(drag.hasClass("infinite")){var noOfDrags=this.noOfDropsInGroup(this.getGroup(drag));if(this.getInfiniteDragClones(drag,!1).length<noOfDrags){var cloneDrag=drag.clone();cloneDrag.removeClass("beingdragged"),hiddenDrag.after(cloneDrag),questionManager.addEventHandlersToDrag(cloneDrag),drag.offset(cloneDrag.offset())}else hiddenDrag.addClass("active"),drag.offset(hiddenDrag.offset())}else hiddenDrag.addClass("active"),drag.offset(hiddenDrag.offset())}dragDrop.start(e,drag,(function(x,y,drag){thisQ.dragMove(x,y,drag)}),(function(x,y,drag){thisQ.dragEnd(x,y,drag)}))}},DragDropToTextQuestion.prototype.dragMove=function(pageX,pageY,drag){var thisQ=this;this.getRoot().find("span.group"+this.getGroup(drag)).not(".beingdragged").each((function(i,dropNode){var drop=$(dropNode);thisQ.isPointInDrop(pageX,pageY,drop)?drop.addClass("valid-drag-over-drop"):drop.removeClass("valid-drag-over-drop")}))},DragDropToTextQuestion.prototype.dragEnd=function(pageX,pageY,drag){var thisQ=this,root=this.getRoot(),placed=!1;root.find("span.group"+this.getGroup(drag)).not(".beingdragged").each((function(i,dropNode){if(placed)return!1;const dropZone=$(dropNode);if(!thisQ.isPointInDrop(pageX,pageY,dropZone))return!0;let drop=null;return dropZone.hasClass("placed")?(dropZone.removeClass("valid-drag-over-drop"),drop=thisQ.getDrop(drag,thisQ.getClassnameNumericSuffix(dropZone,"inplace"))):drop=dropZone,drop.removeClass("valid-drag-over-drop"),thisQ.sendDragToDrop(drag,drop),placed=!0,!1})),placed||this.sendDragHome(drag)},DragDropToTextQuestion.prototype.sendDragToDrop=function(drag,drop){if(null!==this.getPlace(drop)){var oldDrag=this.getCurrentDragInPlace(this.getPlace(drop));if(0!==oldDrag.length){var currentPlace=this.getClassnameNumericSuffix(oldDrag,"inplace");if(this.hasDropSameDrag(currentPlace,drop,oldDrag,drag))return void this.sendDragHome(drag);var hiddenDrop=this.getDrop(oldDrag,currentPlace);hiddenDrop.addClass("active"),oldDrag.addClass("beingdragged"),oldDrag.offset(hiddenDrop.offset()),this.sendDragHome(oldDrag)}if(0===drag.length)this.setInputValue(this.getPlace(drop),0),drop.data("isfocus")&&drop.focus();else{if(this.getClassnameNumericSuffix(drag,"inplace"))return;this.setInputValue(this.getPlace(drop),this.getChoice(drag)),drag.removeClass("unplaced").addClass("placed inplace"+this.getPlace(drop)),drag.attr("tabindex",0),this.animateTo(drag,drop)}}else this.sendDragHome(drag)},DragDropToTextQuestion.prototype.hasDropSameDrag=function(currentPlace,drop,oldDrag,drag){return!!drag.hasClass("infinite")&&(drop.hasClass("place"+currentPlace)&&this.getGroup(drag)===this.getGroup(drop)&&this.getChoice(drag)===this.getChoice(oldDrag)&&this.getGroup(drag)===this.getGroup(oldDrag))},DragDropToTextQuestion.prototype.sendDragHome=function(drag){var currentPlace=this.getClassnameNumericSuffix(drag,"inplace");null!==currentPlace&&drag.removeClass("inplace"+currentPlace),drag.data("unplaced",!0),this.animateTo(drag,this.getDragHome(this.getGroup(drag),this.getChoice(drag)))},DragDropToTextQuestion.prototype.handleKeyPress=function(e){var drop=$(e.target).closest(".drop");if(0===drop.length){var placedDrag=$(e.target),currentPlace=this.getClassnameNumericSuffix(placedDrag,"inplace");null!==currentPlace&&(drop=this.getDrop(placedDrag,currentPlace))}var currentDrag=this.getCurrentDragInPlace(this.getPlace(drop)),nextDrag=$();switch(e.keyCode){case keys.space:case keys.arrowRight:case keys.arrowDown:nextDrag=this.getNextDrag(this.getGroup(drop),currentDrag);break;case keys.arrowLeft:case keys.arrowUp:nextDrag=this.getPreviousDrag(this.getGroup(drop),currentDrag);break;case keys.escape:break;default:return void(questionManager.isKeyboardNavigation=!1)}if(nextDrag.length){nextDrag.data("isfocus",!0),nextDrag.addClass("beingdragged");var hiddenDrag=this.getDragClone(nextDrag);if(hiddenDrag.length)if(nextDrag.hasClass("infinite")){var noOfDrags=this.noOfDropsInGroup(this.getGroup(nextDrag));if(this.getInfiniteDragClones(nextDrag,!1).length<noOfDrags){var cloneDrag=nextDrag.clone();cloneDrag.removeClass("beingdragged"),cloneDrag.removeAttr("tabindex"),hiddenDrag.after(cloneDrag),questionManager.addEventHandlersToDrag(cloneDrag),nextDrag.offset(cloneDrag.offset())}else hiddenDrag.addClass("active"),nextDrag.offset(hiddenDrag.offset())}else hiddenDrag.addClass("active"),nextDrag.offset(hiddenDrag.offset())}else drop.data("isfocus",!0);e.preventDefault(),this.sendDragToDrop(nextDrag,drop)},DragDropToTextQuestion.prototype.getNextDrag=function(group,drag){var choice,numChoices=this.noOfChoicesInGroup(group);choice=0===drag.length?1:this.getChoice(drag)+1;for(var next=this.getUnplacedChoice(group,choice);0===next.length&&choice<numChoices;)choice++,next=this.getUnplacedChoice(group,choice);return next},DragDropToTextQuestion.prototype.getPreviousDrag=function(group,drag){var choice;choice=0===drag.length?this.noOfChoicesInGroup(group):this.getChoice(drag)-1;for(var previous=this.getUnplacedChoice(group,choice);0===previous.length&&choice>1;)choice--,previous=this.getUnplacedChoice(group,choice);return previous},DragDropToTextQuestion.prototype.animateTo=function(drag,target){var currentPos=drag.offset(),targetPos=target.offset(),thisQ=this;M.util.js_pending("qtype_ddwtos-animate-"+thisQ.containerId),drag.animate({left:parseInt(drag.css("left"))+targetPos.left-currentPos.left,top:parseInt(drag.css("top"))+targetPos.top-currentPos.top},{duration:"fast",done:function(){$("body").trigger("qtype_ddwtos-dragmoved",[drag,target,thisQ]),M.util.js_complete("qtype_ddwtos-animate-"+thisQ.containerId)}})},DragDropToTextQuestion.prototype.isPointInDrop=function(pageX,pageY,drop){var position=drop.offset();return pageX>=position.left&&pageX<position.left+drop.width()&&pageY>=position.top&&pageY<position.top+drop.height()},DragDropToTextQuestion.prototype.setInputValue=function(place,choice){this.getRoot().find("input.placeinput.place"+place).val(choice)},DragDropToTextQuestion.prototype.getRoot=function(){return $(document.getElementById(this.containerId))},DragDropToTextQuestion.prototype.getDragHome=function(group,choice){return this.getRoot().find(".draghome.dragplaceholder.group"+group+".choice"+choice).is(":visible")?this.getRoot().find(".draghome.dragplaceholder.group"+group+".choice"+choice):this.getRoot().find(".draggrouphomes"+group+" span.draghome.infinite.choice"+choice+".group"+group)},DragDropToTextQuestion.prototype.getUnplacedChoice=function(group,choice){return this.getRoot().find(".draghome.group"+group+".choice"+choice+".unplaced").slice(0,1)},DragDropToTextQuestion.prototype.getCurrentDragInPlace=function(place){return this.getRoot().find("span.draghome.inplace"+place)},DragDropToTextQuestion.prototype.noOfDropsInGroup=function(group){return this.getRoot().find(".drop.group"+group).length},DragDropToTextQuestion.prototype.noOfChoicesInGroup=function(group){return this.getRoot().find(".draghome.group"+group).length},DragDropToTextQuestion.prototype.getClassnameNumericSuffix=function(node,prefix){var classes=node.attr("class");if(void 0!==classes&&""!==classes)for(var classesArr=classes.split(" "),index=0;index<classesArr.length;index++){if(new RegExp("^"+prefix+"([0-9])+$").test(classesArr[index])){var match=new RegExp("([0-9])+$").exec(classesArr[index]);return Number(match[0])}}return null},DragDropToTextQuestion.prototype.getChoice=function(drag){return this.getClassnameNumericSuffix(drag,"choice")},DragDropToTextQuestion.prototype.getGroup=function(node){return this.getClassnameNumericSuffix(node,"group")},DragDropToTextQuestion.prototype.getPlace=function(node){return this.getClassnameNumericSuffix(node,"place")},DragDropToTextQuestion.prototype.getDragClone=function(drag){return this.getRoot().find(".draggrouphomes"+this.getGroup(drag)+" span.draghome.choice"+this.getChoice(drag)+".group"+this.getGroup(drag)+".dragplaceholder")},DragDropToTextQuestion.prototype.getInfiniteDragClones=function(drag,inHome){return inHome?this.getRoot().find(".draggrouphomes"+this.getGroup(drag)+" span.draghome.choice"+this.getChoice(drag)+".group"+this.getGroup(drag)+".infinite").not(".dragplaceholder"):this.getRoot().find("span.draghome.choice"+this.getChoice(drag)+".group"+this.getGroup(drag)+".infinite").not(".dragplaceholder")},DragDropToTextQuestion.prototype.getDrop=function(drag,currentPlace){return this.getRoot().find(".drop.group"+this.getGroup(drag)+".place"+currentPlace)};var questionManager={eventHandlersInitialised:!1,dragEventHandlersInitialised:{},isKeyboardNavigation:!1,questions:{},init:function(containerId,readOnly){if(questionManager.questions[containerId]=new DragDropToTextQuestion(containerId,readOnly),questionManager.eventHandlersInitialised||(questionManager.setupEventHandlers(),questionManager.eventHandlersInitialised=!0),!questionManager.dragEventHandlersInitialised.hasOwnProperty(containerId)){questionManager.dragEventHandlersInitialised[containerId]=!0;var questionContainer=document.getElementById(containerId);questionContainer.classList.contains("ddwtos")&&!questionContainer.classList.contains("qtype_ddwtos-readonly")&&questionManager.addEventHandlersToDrag($(questionContainer).find("span.draghome"))}},setupEventHandlers:function(){$("body").on("keydown",".que.ddwtos:not(.qtype_ddwtos-readonly) span.drop",questionManager.handleKeyPress).on("keydown",".que.ddwtos:not(.qtype_ddwtos-readonly) span.draghome.placed:not(.beingdragged)",questionManager.handleKeyPress).on("qtype_ddwtos-dragmoved",questionManager.handleDragMoved)},addEventHandlersToDrag:function(element){element.unbind("mousedown touchstart"),element.on("mousedown touchstart",questionManager.handleDragStart)},handleDragStart:function(e){e.preventDefault();var question=questionManager.getQuestionForEvent(e);question&&question.handleDragStart(e)},handleKeyPress:function(e){if(!questionManager.isKeyboardNavigation){questionManager.isKeyboardNavigation=!0;var question=questionManager.getQuestionForEvent(e);question&&question.handleKeyPress(e)}},getQuestionForEvent:function(e){var containerId=$(e.currentTarget).closest(".que.ddwtos").attr("id");return questionManager.questions[containerId]},handleDragMoved:function(e,drag,target,thisQ){drag.removeClass("beingdragged"),drag.css("top","").css("left",""),target.after(drag),target.removeClass("active"),void 0!==drag.data("unplaced")&&!0===drag.data("unplaced")&&(drag.removeClass("placed").addClass("unplaced"),drag.removeAttr("tabindex"),drag.removeData("unplaced"),drag.hasClass("infinite")&&thisQ.getInfiniteDragClones(drag,!0).length>1&&thisQ.getInfiniteDragClones(drag,!0).first().remove()),void 0!==drag.data("isfocus")&&!0===drag.data("isfocus")&&(drag.focus(),drag.removeData("isfocus")),void 0!==target.data("isfocus")&&!0===target.data("isfocus")&&target.removeData("isfocus"),questionManager.isKeyboardNavigation&&(questionManager.isKeyboardNavigation=!1),thisQ.isQuestionInteracted()&&(questionManager.handleFormDirty(),thisQ.questionAnswer=thisQ.getQuestionAnsweredValues())},handleFormDirty:function(){const responseForm=document.getElementById("responseform");FormChangeChecker.markFormAsDirty(responseForm)}};return{init:questionManager.init}}));
 
 //# sourceMappingURL=ddwtos.min.js.map
\ No newline at end of file
diff --git a/question/type/ddwtos/amd/build/ddwtos.min.js.map b/question/type/ddwtos/amd/build/ddwtos.min.js.map
index 6c77f41e6c998..2918776c33eca 100644
--- a/question/type/ddwtos/amd/build/ddwtos.min.js.map
+++ b/question/type/ddwtos/amd/build/ddwtos.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"ddwtos.min.js","sources":["../src/ddwtos.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * JavaScript to make drag-drop into text questions work.\n *\n * Some vocabulary to help understand this code:\n *\n * The question text contains 'drops' - blanks into which the 'drags', the missing\n * words, can be put.\n *\n * The thing that can be moved into the drops are called 'drags'. There may be\n * multiple copies of the 'same' drag which does not really cause problems.\n * Each drag has a 'choice' number which is the value set on the drop's hidden\n * input when this drag is placed in a drop.\n *\n * These may be in separate 'groups', distinguished by colour.\n * Things can only interact with other things in the same group.\n * The groups are numbered from 1.\n *\n * The place where a given drag started from is called its 'home'.\n *\n * @module     qtype_ddwtos/ddwtos\n * @copyright  2018 The Open University\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n * @since      3.6\n */\ndefine([\n    'jquery',\n    'core/dragdrop',\n    'core/key_codes',\n    'core_form/changechecker'\n], function(\n    $,\n    dragDrop,\n    keys,\n    FormChangeChecker\n) {\n\n    \"use strict\";\n\n    /**\n     * Object to handle one drag-drop into text question.\n     *\n     * @param {String} containerId id of the outer div for this question.\n     * @param {boolean} readOnly whether the question is being displayed read-only.\n     * @constructor\n     */\n    function DragDropToTextQuestion(containerId, readOnly) {\n        this.containerId = containerId;\n        this.questionAnswer = {};\n        if (readOnly) {\n            this.getRoot().addClass('qtype_ddwtos-readonly');\n        }\n        this.resizeAllDragsAndDrops();\n        this.cloneDrags();\n        this.positionDrags();\n    }\n\n    /**\n     * In each group, resize all the items to be the same size.\n     */\n    DragDropToTextQuestion.prototype.resizeAllDragsAndDrops = function() {\n        var thisQ = this;\n        this.getRoot().find('.answercontainer > div').each(function(i, node) {\n            thisQ.resizeAllDragsAndDropsInGroup(\n                thisQ.getClassnameNumericSuffix($(node), 'draggrouphomes'));\n        });\n    };\n\n    /**\n     * In a given group, set all the drags and drops to be the same size.\n     *\n     * @param {int} group the group number.\n     */\n    DragDropToTextQuestion.prototype.resizeAllDragsAndDropsInGroup = function(group) {\n        var thisQ = this,\n            dragHomes = this.getRoot().find('.draggrouphomes' + group + ' span.draghome'),\n            maxWidth = 0,\n            maxHeight = 0;\n\n        // Find the maximum size of any drag in this groups.\n        dragHomes.each(function(i, drag) {\n            maxWidth = Math.max(maxWidth, Math.ceil(drag.offsetWidth));\n            maxHeight = Math.max(maxHeight, Math.ceil(0 + drag.offsetHeight));\n        });\n\n        // The size we will want to set is a bit bigger than this.\n        maxWidth += 8;\n        maxHeight += 2;\n\n        // Set each drag home to that size.\n        dragHomes.each(function(i, drag) {\n            thisQ.setElementSize(drag, maxWidth, maxHeight);\n        });\n\n        // Set each drop to that size.\n        this.getRoot().find('span.drop.group' + group).each(function(i, drop) {\n            thisQ.setElementSize(drop, maxWidth, maxHeight);\n        });\n    };\n\n    /**\n     * Set a given DOM element to be a particular size.\n     *\n     * @param {HTMLElement} element\n     * @param {int} width\n     * @param {int} height\n     */\n    DragDropToTextQuestion.prototype.setElementSize = function(element, width, height) {\n        $(element).width(width).height(height).css('lineHeight', height + 'px');\n    };\n\n    /**\n     * Invisible 'drag homes' are output by the renderer. These have the same properties\n     * as the drag items but are invisible. We clone these invisible elements to make the\n     * actual drag items.\n     */\n    DragDropToTextQuestion.prototype.cloneDrags = function() {\n        var thisQ = this;\n        thisQ.getRoot().find('span.draghome').each(function(index, draghome) {\n            var drag = $(draghome);\n            var placeHolder = drag.clone();\n            placeHolder.removeClass();\n            placeHolder.addClass('draghome choice' +\n                thisQ.getChoice(drag) + ' group' +\n                thisQ.getGroup(drag) + ' dragplaceholder');\n            drag.before(placeHolder);\n        });\n    };\n\n    /**\n     * Update the position of drags.\n     */\n    DragDropToTextQuestion.prototype.positionDrags = function() {\n        var thisQ = this,\n            root = this.getRoot();\n\n        // First move all items back home.\n        root.find('span.draghome').not('.dragplaceholder').each(function(i, dragNode) {\n            var drag = $(dragNode),\n                currentPlace = thisQ.getClassnameNumericSuffix(drag, 'inplace');\n            drag.addClass('unplaced')\n                .removeClass('placed');\n            drag.removeAttr('tabindex');\n            if (currentPlace !== null) {\n                drag.removeClass('inplace' + currentPlace);\n            }\n        });\n\n        // Then place the once that should be placed.\n        root.find('input.placeinput').each(function(i, inputNode) {\n            var input = $(inputNode),\n                choice = input.val(),\n                place = thisQ.getPlace(input);\n\n            // Record the last known position of the drop.\n            var drop = root.find('.drop.place' + place),\n                dropPosition = drop.offset();\n            drop.data('prev-top', dropPosition.top).data('prev-left', dropPosition.left);\n\n            if (choice === '0') {\n                // No item in this place.\n                return;\n            }\n\n            // Get the unplaced drag.\n            var unplacedDrag = thisQ.getUnplacedChoice(thisQ.getGroup(input), choice);\n            // Get the clone of the drag.\n            var hiddenDrag = thisQ.getDragClone(unplacedDrag);\n            if (hiddenDrag.length) {\n                if (unplacedDrag.hasClass('infinite')) {\n                    var noOfDrags = thisQ.noOfDropsInGroup(thisQ.getGroup(unplacedDrag));\n                    var cloneDrags = thisQ.getInfiniteDragClones(unplacedDrag, false);\n                    if (cloneDrags.length < noOfDrags) {\n                        var cloneDrag = unplacedDrag.clone();\n                        hiddenDrag.after(cloneDrag);\n                        questionManager.addEventHandlersToDrag(cloneDrag);\n                    } else {\n                        hiddenDrag.addClass('active');\n                    }\n                } else {\n                    hiddenDrag.addClass('active');\n                }\n            }\n            // Send the drag to drop.\n            thisQ.sendDragToDrop(thisQ.getUnplacedChoice(thisQ.getGroup(input), choice), drop);\n        });\n\n        // Save the question answer.\n        thisQ.questionAnswer = thisQ.getQuestionAnsweredValues();\n    };\n\n    /**\n     * Get the question answered values.\n     *\n     * @return {Object} Contain key-value with key is the input id and value is the input value.\n     */\n    DragDropToTextQuestion.prototype.getQuestionAnsweredValues = function() {\n        let result = {};\n        this.getRoot().find('input.placeinput').each((i, inputNode) => {\n            result[inputNode.id] = inputNode.value;\n        });\n\n        return result;\n    };\n\n    /**\n     * Check if the question is being interacted or not.\n     *\n     * @return {boolean} Return true if the user has changed the question-answer.\n     */\n    DragDropToTextQuestion.prototype.isQuestionInteracted = function() {\n        const oldAnswer = this.questionAnswer;\n        const newAnswer = this.getQuestionAnsweredValues();\n        let isInteracted = false;\n\n        // First, check both answers have the same structure or not.\n        if (JSON.stringify(newAnswer) !== JSON.stringify(oldAnswer)) {\n            isInteracted = true;\n            return isInteracted;\n        }\n        // Check the values.\n        Object.keys(newAnswer).forEach(key => {\n            if (newAnswer[key] !== oldAnswer[key]) {\n                isInteracted = true;\n            }\n        });\n\n        return isInteracted;\n    };\n\n    /**\n     * Handles the start of dragging an item.\n     *\n     * @param {Event} e the touch start or mouse down event.\n     */\n    DragDropToTextQuestion.prototype.handleDragStart = function(e) {\n        var thisQ = this,\n            drag = $(e.target).closest('.draghome');\n\n        var info = dragDrop.prepare(e);\n        if (!info.start || drag.hasClass('beingdragged')) {\n            return;\n        }\n\n        drag.addClass('beingdragged');\n        var currentPlace = this.getClassnameNumericSuffix(drag, 'inplace');\n        if (currentPlace !== null) {\n            this.setInputValue(currentPlace, 0);\n            drag.removeClass('inplace' + currentPlace);\n            var hiddenDrop = thisQ.getDrop(drag, currentPlace);\n            if (hiddenDrop.length) {\n                hiddenDrop.addClass('active');\n                drag.offset(hiddenDrop.offset());\n            }\n        } else {\n            var hiddenDrag = thisQ.getDragClone(drag);\n            if (hiddenDrag.length) {\n                if (drag.hasClass('infinite')) {\n                    var noOfDrags = this.noOfDropsInGroup(this.getGroup(drag));\n                    var cloneDrags = this.getInfiniteDragClones(drag, false);\n                    if (cloneDrags.length < noOfDrags) {\n                        var cloneDrag = drag.clone();\n                        cloneDrag.removeClass('beingdragged');\n                        hiddenDrag.after(cloneDrag);\n                        questionManager.addEventHandlersToDrag(cloneDrag);\n                        drag.offset(cloneDrag.offset());\n                    } else {\n                        hiddenDrag.addClass('active');\n                        drag.offset(hiddenDrag.offset());\n                    }\n                } else {\n                    hiddenDrag.addClass('active');\n                    drag.offset(hiddenDrag.offset());\n                }\n            }\n        }\n\n        dragDrop.start(e, drag, function(x, y, drag) {\n            thisQ.dragMove(x, y, drag);\n        }, function(x, y, drag) {\n            thisQ.dragEnd(x, y, drag);\n        });\n    };\n\n    /**\n     * Called whenever the currently dragged items moves.\n     *\n     * @param {Number} pageX the x position.\n     * @param {Number} pageY the y position.\n     * @param {jQuery} drag the item being moved.\n     */\n    DragDropToTextQuestion.prototype.dragMove = function(pageX, pageY, drag) {\n        var thisQ = this;\n        this.getRoot().find('span.group' + this.getGroup(drag)).not('.beingdragged').each(function(i, dropNode) {\n            var drop = $(dropNode);\n            if (thisQ.isPointInDrop(pageX, pageY, drop)) {\n                drop.addClass('valid-drag-over-drop');\n            } else {\n                drop.removeClass('valid-drag-over-drop');\n            }\n        });\n    };\n\n    /**\n     * Called when user drops a drag item.\n     *\n     * @param {Number} pageX the x position.\n     * @param {Number} pageY the y position.\n     * @param {jQuery} drag the item being moved.\n     */\n    DragDropToTextQuestion.prototype.dragEnd = function(pageX, pageY, drag) {\n        var thisQ = this,\n            root = this.getRoot(),\n            placed = false;\n        root.find('span.group' + this.getGroup(drag)).not('.beingdragged').each(function(i, dropNode) {\n            if (placed) {\n                return false;\n            }\n            const dropZone = $(dropNode);\n            if (!thisQ.isPointInDrop(pageX, pageY, dropZone)) {\n                // Not this drop zone.\n                return true;\n            }\n            let drop = null;\n            if (dropZone.hasClass('placed')) {\n                // This is an placed drag item in a drop.\n                dropZone.removeClass('valid-drag-over-drop');\n                // Get the correct drop.\n                drop = thisQ.getDrop(drag, thisQ.getClassnameNumericSuffix(dropZone, 'inplace'));\n            } else {\n                // Empty drop.\n                drop = dropZone;\n            }\n            // Now put this drag into the drop.\n            drop.removeClass('valid-drag-over-drop');\n            thisQ.sendDragToDrop(drag, drop);\n            placed = true;\n            return false; // Stop the each() here.\n        });\n        if (!placed) {\n            this.sendDragHome(drag);\n        }\n    };\n\n    /**\n     * Animate a drag item into a given place (or back home).\n     *\n     * @param {jQuery|null} drag the item to place. If null, clear the place.\n     * @param {jQuery} drop the place to put it.\n     */\n    DragDropToTextQuestion.prototype.sendDragToDrop = function(drag, drop) {\n        // Send drag home if there is no place in drop.\n        if (this.getPlace(drop) === null) {\n            this.sendDragHome(drag);\n            return;\n        }\n\n        // Is there already a drag in this drop? if so, evict it.\n        var oldDrag = this.getCurrentDragInPlace(this.getPlace(drop));\n        if (oldDrag.length !== 0) {\n            var currentPlace = this.getClassnameNumericSuffix(oldDrag, 'inplace');\n            // When infinite group and there is already a drag in a drop, reject the exact clone in the same drop.\n            if (this.hasDropSameDrag(currentPlace, drop, oldDrag, drag)) {\n                this.sendDragHome(drag);\n                return;\n            }\n            var hiddenDrop = this.getDrop(oldDrag, currentPlace);\n            hiddenDrop.addClass('active');\n            oldDrag.addClass('beingdragged');\n            oldDrag.offset(hiddenDrop.offset());\n            this.sendDragHome(oldDrag);\n        }\n\n        if (drag.length === 0) {\n            this.setInputValue(this.getPlace(drop), 0);\n            if (drop.data('isfocus')) {\n                drop.focus();\n            }\n        } else {\n            // Prevent the drag item drop into two drop-zone.\n            if (this.getClassnameNumericSuffix(drag, 'inplace')) {\n                return;\n            }\n\n            this.setInputValue(this.getPlace(drop), this.getChoice(drag));\n            drag.removeClass('unplaced')\n                .addClass('placed inplace' + this.getPlace(drop));\n            drag.attr('tabindex', 0);\n            this.animateTo(drag, drop);\n        }\n    };\n\n    /**\n     * When infinite group and there is already a drag in a drop, reject the exact clone in the same drop.\n     *\n     * @param {int} currentPlace  the position of the current drop.\n     * @param {jQuery} drop the drop containing a drag.\n     * @param {jQuery} oldDrag the drag already placed in drop.\n     * @param {jQuery} drag the new drag which is exactly the same (clone) as oldDrag .\n     * @returns {boolean}\n     */\n    DragDropToTextQuestion.prototype.hasDropSameDrag = function(currentPlace, drop, oldDrag, drag) {\n        if (drag.hasClass('infinite')) {\n            return drop.hasClass('place' + currentPlace) &&\n                this.getGroup(drag) === this.getGroup(drop) &&\n                this.getChoice(drag) === this.getChoice(oldDrag) &&\n                this.getGroup(drag) === this.getGroup(oldDrag);\n        }\n        return false;\n    };\n\n    /**\n     * Animate a drag back to its home.\n     *\n     * @param {jQuery} drag the item being moved.\n     */\n    DragDropToTextQuestion.prototype.sendDragHome = function(drag) {\n        var currentPlace = this.getClassnameNumericSuffix(drag, 'inplace');\n        if (currentPlace !== null) {\n            drag.removeClass('inplace' + currentPlace);\n        }\n        drag.data('unplaced', true);\n\n        this.animateTo(drag, this.getDragHome(this.getGroup(drag), this.getChoice(drag)));\n    };\n\n    /**\n     * Handles keyboard events on drops.\n     *\n     * Drops are focusable. Once focused, right/down/space switches to the next choice, and\n     * left/up switches to the previous. Escape clear.\n     *\n     * @param {KeyboardEvent} e\n     */\n    DragDropToTextQuestion.prototype.handleKeyPress = function(e) {\n        var drop = $(e.target).closest('.drop');\n        if (drop.length === 0) {\n            var placedDrag = $(e.target);\n            var currentPlace = this.getClassnameNumericSuffix(placedDrag, 'inplace');\n            if (currentPlace !== null) {\n                drop = this.getDrop(placedDrag, currentPlace);\n            }\n        }\n        var currentDrag = this.getCurrentDragInPlace(this.getPlace(drop)),\n            nextDrag = $();\n\n        switch (e.keyCode) {\n            case keys.space:\n            case keys.arrowRight:\n            case keys.arrowDown:\n                nextDrag = this.getNextDrag(this.getGroup(drop), currentDrag);\n                break;\n\n            case keys.arrowLeft:\n            case keys.arrowUp:\n                nextDrag = this.getPreviousDrag(this.getGroup(drop), currentDrag);\n                break;\n\n            case keys.escape:\n                break;\n\n            default:\n                questionManager.isKeyboardNavigation = false;\n                return; // To avoid the preventDefault below.\n        }\n\n        if (nextDrag.length) {\n            nextDrag.data('isfocus', true);\n            nextDrag.addClass('beingdragged');\n            var hiddenDrag = this.getDragClone(nextDrag);\n            if (hiddenDrag.length) {\n                if (nextDrag.hasClass('infinite')) {\n                    var noOfDrags = this.noOfDropsInGroup(this.getGroup(nextDrag));\n                    var cloneDrags = this.getInfiniteDragClones(nextDrag, false);\n                    if (cloneDrags.length < noOfDrags) {\n                        var cloneDrag = nextDrag.clone();\n                        cloneDrag.removeClass('beingdragged');\n                        cloneDrag.removeAttr('tabindex');\n                        hiddenDrag.after(cloneDrag);\n                        questionManager.addEventHandlersToDrag(cloneDrag);\n                        nextDrag.offset(cloneDrag.offset());\n                    } else {\n                        hiddenDrag.addClass('active');\n                        nextDrag.offset(hiddenDrag.offset());\n                    }\n                } else {\n                    hiddenDrag.addClass('active');\n                    nextDrag.offset(hiddenDrag.offset());\n                }\n            }\n        } else {\n            drop.data('isfocus', true);\n        }\n\n        e.preventDefault();\n        this.sendDragToDrop(nextDrag, drop);\n    };\n\n    /**\n     * Choose the next drag in a group.\n     *\n     * @param {int} group which group.\n     * @param {jQuery} drag current choice (empty jQuery if there isn't one).\n     * @return {jQuery} the next drag in that group, or null if there wasn't one.\n     */\n    DragDropToTextQuestion.prototype.getNextDrag = function(group, drag) {\n        var choice,\n            numChoices = this.noOfChoicesInGroup(group);\n\n        if (drag.length === 0) {\n            choice = 1; // Was empty, so we want to select the first choice.\n        } else {\n            choice = this.getChoice(drag) + 1;\n        }\n\n        var next = this.getUnplacedChoice(group, choice);\n        while (next.length === 0 && choice < numChoices) {\n            choice++;\n            next = this.getUnplacedChoice(group, choice);\n        }\n\n        return next;\n    };\n\n    /**\n     * Choose the previous drag in a group.\n     *\n     * @param {int} group which group.\n     * @param {jQuery} drag current choice (empty jQuery if there isn't one).\n     * @return {jQuery} the next drag in that group, or null if there wasn't one.\n     */\n    DragDropToTextQuestion.prototype.getPreviousDrag = function(group, drag) {\n        var choice;\n\n        if (drag.length === 0) {\n            choice = this.noOfChoicesInGroup(group);\n        } else {\n            choice = this.getChoice(drag) - 1;\n        }\n\n        var previous = this.getUnplacedChoice(group, choice);\n        while (previous.length === 0 && choice > 1) {\n            choice--;\n            previous = this.getUnplacedChoice(group, choice);\n        }\n\n        // Does this choice exist?\n        return previous;\n    };\n\n    /**\n     * Animate an object to the given destination.\n     *\n     * @param {jQuery} drag the element to be animated.\n     * @param {jQuery} target element marking the place to move it to.\n     */\n    DragDropToTextQuestion.prototype.animateTo = function(drag, target) {\n        var currentPos = drag.offset(),\n            targetPos = target.offset(),\n            thisQ = this;\n\n        M.util.js_pending('qtype_ddwtos-animate-' + thisQ.containerId);\n        // Animate works in terms of CSS position, whereas locating an object\n        // on the page works best with jQuery offset() function. So, to get\n        // the right target position, we work out the required change in\n        // offset() and then add that to the current CSS position.\n        drag.animate(\n            {\n                left: parseInt(drag.css('left')) + targetPos.left - currentPos.left,\n                top: parseInt(drag.css('top')) + targetPos.top - currentPos.top\n            },\n            {\n                duration: 'fast',\n                done: function() {\n                    $('body').trigger('qtype_ddwtos-dragmoved', [drag, target, thisQ]);\n                    M.util.js_complete('qtype_ddwtos-animate-' + thisQ.containerId);\n                }\n            }\n        );\n    };\n\n    /**\n     * Detect if a point is inside a given DOM node.\n     *\n     * @param {Number} pageX the x position.\n     * @param {Number} pageY the y position.\n     * @param {jQuery} drop the node to check (typically a drop).\n     * @return {boolean} whether the point is inside the node.\n     */\n    DragDropToTextQuestion.prototype.isPointInDrop = function(pageX, pageY, drop) {\n        var position = drop.offset();\n        return pageX >= position.left && pageX < position.left + drop.width()\n                && pageY >= position.top && pageY < position.top + drop.height();\n    };\n\n    /**\n     * Set the value of the hidden input for a place, to record what is currently there.\n     *\n     * @param {int} place which place to set the input value for.\n     * @param {int} choice the value to set.\n     */\n    DragDropToTextQuestion.prototype.setInputValue = function(place, choice) {\n        this.getRoot().find('input.placeinput.place' + place).val(choice);\n    };\n\n    /**\n     * Get the outer div for this question.\n     *\n     * @returns {jQuery} containing that div.\n     */\n    DragDropToTextQuestion.prototype.getRoot = function() {\n        return $(document.getElementById(this.containerId));\n    };\n\n    /**\n     * Get drag home for a given choice.\n     *\n     * @param {int} group the group.\n     * @param {int} choice the choice number.\n     * @returns {jQuery} containing that div.\n     */\n    DragDropToTextQuestion.prototype.getDragHome = function(group, choice) {\n        if (!this.getRoot().find('.draghome.dragplaceholder.group' + group + '.choice' + choice).is(':visible')) {\n            return this.getRoot().find('.draggrouphomes' + group +\n                ' span.draghome.infinite' +\n                '.choice' + choice +\n                '.group' + group);\n        }\n        return this.getRoot().find('.draghome.dragplaceholder.group' + group + '.choice' + choice);\n    };\n\n    /**\n     * Get an unplaced choice for a particular group.\n     *\n     * @param {int} group the group.\n     * @param {int} choice the choice number.\n     * @returns {jQuery} jQuery wrapping the unplaced choice. If there isn't one, the jQuery will be empty.\n     */\n    DragDropToTextQuestion.prototype.getUnplacedChoice = function(group, choice) {\n        return this.getRoot().find('.draghome.group' + group + '.choice' + choice + '.unplaced').slice(0, 1);\n    };\n\n    /**\n     * Get the drag that is currently in a given place.\n     *\n     * @param {int} place the place number.\n     * @return {jQuery} the current drag (or an empty jQuery if none).\n     */\n    DragDropToTextQuestion.prototype.getCurrentDragInPlace = function(place) {\n        return this.getRoot().find('span.draghome.inplace' + place);\n    };\n\n    /**\n     * Return the number of blanks in a given group.\n     *\n     * @param {int} group the group number.\n     * @returns {int} the number of drops.\n     */\n    DragDropToTextQuestion.prototype.noOfDropsInGroup = function(group) {\n        return this.getRoot().find('.drop.group' + group).length;\n    };\n\n    /**\n     * Return the number of choices in a given group.\n     *\n     * @param {int} group the group number.\n     * @returns {int} the number of choices.\n     */\n    DragDropToTextQuestion.prototype.noOfChoicesInGroup = function(group) {\n        return this.getRoot().find('.draghome.group' + group).length;\n    };\n\n    /**\n     * Return the number at the end of the CSS class name with the given prefix.\n     *\n     * @param {jQuery} node\n     * @param {String} prefix name prefix\n     * @returns {Number|null} the suffix if found, else null.\n     */\n    DragDropToTextQuestion.prototype.getClassnameNumericSuffix = function(node, prefix) {\n        var classes = node.attr('class');\n        if (classes !== undefined && classes !== '') {\n            var classesArr = classes.split(' ');\n            for (var index = 0; index < classesArr.length; index++) {\n                var patt1 = new RegExp('^' + prefix + '([0-9])+$');\n                if (patt1.test(classesArr[index])) {\n                    var patt2 = new RegExp('([0-9])+$');\n                    var match = patt2.exec(classesArr[index]);\n                    return Number(match[0]);\n                }\n            }\n        }\n        return null;\n    };\n\n    /**\n     * Get the choice number of a drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @returns {Number} the choice number.\n     */\n    DragDropToTextQuestion.prototype.getChoice = function(drag) {\n        return this.getClassnameNumericSuffix(drag, 'choice');\n    };\n\n    /**\n     * Given a DOM node that is significant to this question\n     * (drag, drop, ...) get the group it belongs to.\n     *\n     * @param {jQuery} node a DOM node.\n     * @returns {Number} the group it belongs to.\n     */\n    DragDropToTextQuestion.prototype.getGroup = function(node) {\n        return this.getClassnameNumericSuffix(node, 'group');\n    };\n\n    /**\n     * Get the place number of a drop, or its corresponding hidden input.\n     *\n     * @param {jQuery} node the DOM node.\n     * @returns {Number} the place number.\n     */\n    DragDropToTextQuestion.prototype.getPlace = function(node) {\n        return this.getClassnameNumericSuffix(node, 'place');\n    };\n\n    /**\n     * Get drag clone for a given drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @returns {jQuery} the drag's clone.\n     */\n    DragDropToTextQuestion.prototype.getDragClone = function(drag) {\n        return this.getRoot().find('.draggrouphomes' +\n            this.getGroup(drag) +\n            ' span.draghome' +\n            '.choice' + this.getChoice(drag) +\n            '.group' + this.getGroup(drag) +\n            '.dragplaceholder');\n    };\n\n    /**\n     * Get infinite drag clones for given drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @param {Boolean} inHome in the home area or not.\n     * @returns {jQuery} the drag's clones.\n     */\n    DragDropToTextQuestion.prototype.getInfiniteDragClones = function(drag, inHome) {\n        if (inHome) {\n            return this.getRoot().find('.draggrouphomes' +\n                this.getGroup(drag) +\n                ' span.draghome' +\n                '.choice' + this.getChoice(drag) +\n                '.group' + this.getGroup(drag) +\n                '.infinite').not('.dragplaceholder');\n        }\n        return this.getRoot().find('span.draghome' +\n            '.choice' + this.getChoice(drag) +\n            '.group' + this.getGroup(drag) +\n            '.infinite').not('.dragplaceholder');\n    };\n\n    /**\n     * Get drop for a given drag and place.\n     *\n     * @param {jQuery} drag the drag.\n     * @param {Integer} currentPlace the current place of drag.\n     * @returns {jQuery} the drop's clone.\n     */\n    DragDropToTextQuestion.prototype.getDrop = function(drag, currentPlace) {\n        return this.getRoot().find('.drop.group' + this.getGroup(drag) + '.place' + currentPlace);\n    };\n\n    /**\n     * Singleton that tracks all the DragDropToTextQuestions on this page, and deals\n     * with event dispatching.\n     *\n     * @type {Object}\n     */\n    var questionManager = {\n        /**\n         * {boolean} used to ensure the event handlers are only initialised once per page.\n         */\n        eventHandlersInitialised: false,\n\n        /**\n         * {Object} ensures that the drag event handlers are only initialised once per question,\n         * indexed by containerId (id on the .que div).\n         */\n        dragEventHandlersInitialised: {},\n\n        /**\n         * {boolean} is keyboard navigation or not.\n         */\n        isKeyboardNavigation: false,\n\n        /**\n         * {DragDropToTextQuestion[]} all the questions on this page, indexed by containerId (id on the .que div).\n         */\n        questions: {},\n\n        /**\n         * Initialise questions.\n         *\n         * @param {String} containerId id of the outer div for this question.\n         * @param {boolean} readOnly whether the question is being displayed read-only.\n         */\n        init: function(containerId, readOnly) {\n            questionManager.questions[containerId] = new DragDropToTextQuestion(containerId, readOnly);\n            if (!questionManager.eventHandlersInitialised) {\n                questionManager.setupEventHandlers();\n                questionManager.eventHandlersInitialised = true;\n            }\n            if (!questionManager.dragEventHandlersInitialised.hasOwnProperty(containerId)) {\n                questionManager.dragEventHandlersInitialised[containerId] = true;\n                // We do not use the body event here to prevent the other event on Mobile device, such as scroll event.\n                var questionContainer = document.getElementById(containerId);\n                if (questionContainer.classList.contains('ddwtos') &&\n                    !questionContainer.classList.contains('qtype_ddwtos-readonly')) {\n                    // TODO: Convert all the jQuery selectors and events to native Javascript.\n                    questionManager.addEventHandlersToDrag($(questionContainer).find('span.draghome'));\n                }\n            }\n        },\n\n        /**\n         * Set up the event handlers that make this question type work. (Done once per page.)\n         */\n        setupEventHandlers: function() {\n            $('body')\n                .on('keydown',\n                    '.que.ddwtos:not(.qtype_ddwtos-readonly) span.drop',\n                    questionManager.handleKeyPress)\n                .on('keydown',\n                    '.que.ddwtos:not(.qtype_ddwtos-readonly) span.draghome.placed:not(.beingdragged)',\n                    questionManager.handleKeyPress)\n                .on('qtype_ddwtos-dragmoved', questionManager.handleDragMoved);\n        },\n\n        /**\n         * Binding the drag/touch event again for newly created element.\n         *\n         * @param {jQuery} element Element to bind the event\n         */\n        addEventHandlersToDrag: function(element) {\n            // Unbind all the mousedown and touchstart events to prevent double binding.\n            element.unbind('mousedown touchstart');\n            element.on('mousedown touchstart', questionManager.handleDragStart);\n        },\n\n        /**\n         * Handle mouse down / touch start on drags.\n         * @param {Event} e the DOM event.\n         */\n        handleDragStart: function(e) {\n            e.preventDefault();\n            var question = questionManager.getQuestionForEvent(e);\n            if (question) {\n                question.handleDragStart(e);\n            }\n        },\n\n        /**\n         * Handle key down / press on drops.\n         * @param {KeyboardEvent} e\n         */\n        handleKeyPress: function(e) {\n            if (questionManager.isKeyboardNavigation) {\n                return;\n            }\n            questionManager.isKeyboardNavigation = true;\n            var question = questionManager.getQuestionForEvent(e);\n            if (question) {\n                question.handleKeyPress(e);\n            }\n        },\n\n        /**\n         * Given an event, work out which question it affects.\n         *\n         * @param {Event} e the event.\n         * @returns {DragDropToTextQuestion|undefined} The question, or undefined.\n         */\n        getQuestionForEvent: function(e) {\n            var containerId = $(e.currentTarget).closest('.que.ddwtos').attr('id');\n            return questionManager.questions[containerId];\n        },\n\n        /**\n         * Handle when drag moved.\n         *\n         * @param {Event} e the event.\n         * @param {jQuery} drag the drag\n         * @param {jQuery} target the target\n         * @param {DragDropToTextQuestion} thisQ the question.\n         */\n        handleDragMoved: function(e, drag, target, thisQ) {\n            drag.removeClass('beingdragged');\n            drag.css('top', '').css('left', '');\n            target.after(drag);\n            target.removeClass('active');\n            if (typeof drag.data('unplaced') !== 'undefined' && drag.data('unplaced') === true) {\n                drag.removeClass('placed').addClass('unplaced');\n                drag.removeAttr('tabindex');\n                drag.removeData('unplaced');\n                if (drag.hasClass('infinite') && thisQ.getInfiniteDragClones(drag, true).length > 1) {\n                    thisQ.getInfiniteDragClones(drag, true).first().remove();\n                }\n            }\n            if (typeof drag.data('isfocus') !== 'undefined' && drag.data('isfocus') === true) {\n                drag.focus();\n                drag.removeData('isfocus');\n            }\n            if (typeof target.data('isfocus') !== 'undefined' && target.data('isfocus') === true) {\n                target.removeData('isfocus');\n            }\n            if (questionManager.isKeyboardNavigation) {\n                questionManager.isKeyboardNavigation = false;\n            }\n            if (thisQ.isQuestionInteracted()) {\n                // The user has interacted with the draggable items. We need to mark the form as dirty.\n                questionManager.handleFormDirty();\n                // Save the new answered value.\n                thisQ.questionAnswer = thisQ.getQuestionAnsweredValues();\n            }\n        },\n\n        /**\n         * Handle when the form is dirty.\n         */\n        handleFormDirty: function() {\n            const responseForm = document.getElementById('responseform');\n            FormChangeChecker.markFormAsDirty(responseForm);\n        }\n    };\n\n    /**\n     * @alias module:qtype_ddwtos/ddwtos\n     */\n    return {\n        /**\n         * Initialise one drag-drop into text question.\n         *\n         * @param {String} containerId id of the outer div for this question.\n         * @param {boolean} readOnly whether the question is being displayed read-only.\n         */\n        init: questionManager.init\n    };\n});\n"],"names":["define","$","dragDrop","keys","FormChangeChecker","DragDropToTextQuestion","containerId","readOnly","questionAnswer","getRoot","addClass","resizeAllDragsAndDrops","cloneDrags","positionDrags","prototype","thisQ","this","find","each","i","node","resizeAllDragsAndDropsInGroup","getClassnameNumericSuffix","group","dragHomes","maxWidth","maxHeight","drag","Math","max","ceil","offsetWidth","offsetHeight","setElementSize","drop","element","width","height","css","index","draghome","placeHolder","clone","removeClass","getChoice","getGroup","before","root","not","dragNode","currentPlace","removeAttr","inputNode","input","choice","val","place","getPlace","dropPosition","offset","data","top","left","unplacedDrag","getUnplacedChoice","hiddenDrag","getDragClone","length","hasClass","noOfDrags","noOfDropsInGroup","getInfiniteDragClones","cloneDrag","after","questionManager","addEventHandlersToDrag","sendDragToDrop","getQuestionAnsweredValues","result","id","value","isQuestionInteracted","oldAnswer","newAnswer","isInteracted","JSON","stringify","Object","forEach","key","handleDragStart","e","target","closest","prepare","start","setInputValue","hiddenDrop","getDrop","x","y","dragMove","dragEnd","pageX","pageY","dropNode","isPointInDrop","placed","dropZone","sendDragHome","oldDrag","getCurrentDragInPlace","hasDropSameDrag","focus","attr","animateTo","getDragHome","handleKeyPress","placedDrag","currentDrag","nextDrag","keyCode","space","arrowRight","arrowDown","getNextDrag","arrowLeft","arrowUp","getPreviousDrag","escape","isKeyboardNavigation","preventDefault","numChoices","noOfChoicesInGroup","next","previous","currentPos","targetPos","M","util","js_pending","animate","parseInt","duration","done","trigger","js_complete","position","document","getElementById","is","slice","prefix","classes","undefined","classesArr","split","RegExp","test","match","exec","Number","inHome","eventHandlersInitialised","dragEventHandlersInitialised","questions","init","setupEventHandlers","hasOwnProperty","questionContainer","classList","contains","on","handleDragMoved","unbind","question","getQuestionForEvent","currentTarget","removeData","first","remove","handleFormDirty","responseForm","markFormAsDirty"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAuCAA,6BAAO,CACH,SACA,gBACA,iBACA,4BACD,SACCC,EACAC,SACAC,KACAC,4BAYSC,uBAAuBC,YAAaC,eACpCD,YAAcA,iBACdE,eAAiB,GAClBD,eACKE,UAAUC,SAAS,8BAEvBC,8BACAC,kBACAC,gBAMTR,uBAAuBS,UAAUH,uBAAyB,eAClDI,MAAQC,UACPP,UAAUQ,KAAK,0BAA0BC,MAAK,SAASC,EAAGC,MAC3DL,MAAMM,8BACFN,MAAMO,0BAA0BrB,EAAEmB,MAAO,uBASrDf,uBAAuBS,UAAUO,8BAAgC,SAASE,WAClER,MAAQC,KACRQ,UAAYR,KAAKP,UAAUQ,KAAK,kBAAoBM,MAAQ,kBAC5DE,SAAW,EACXC,UAAY,EAGhBF,UAAUN,MAAK,SAASC,EAAGQ,MACvBF,SAAWG,KAAKC,IAAIJ,SAAUG,KAAKE,KAAKH,KAAKI,cAC7CL,UAAYE,KAAKC,IAAIH,UAAWE,KAAKE,KAAK,EAAIH,KAAKK,kBAIvDP,UAAY,EACZC,WAAa,EAGbF,UAAUN,MAAK,SAASC,EAAGQ,MACvBZ,MAAMkB,eAAeN,KAAMF,SAAUC,mBAIpCjB,UAAUQ,KAAK,kBAAoBM,OAAOL,MAAK,SAASC,EAAGe,MAC5DnB,MAAMkB,eAAeC,KAAMT,SAAUC,eAW7CrB,uBAAuBS,UAAUmB,eAAiB,SAASE,QAASC,MAAOC,QACvEpC,EAAEkC,SAASC,MAAMA,OAAOC,OAAOA,QAAQC,IAAI,aAAcD,OAAS,OAQtEhC,uBAAuBS,UAAUF,WAAa,eACtCG,MAAQC,KACZD,MAAMN,UAAUQ,KAAK,iBAAiBC,MAAK,SAASqB,MAAOC,cACnDb,KAAO1B,EAAEuC,UACTC,YAAcd,KAAKe,QACvBD,YAAYE,cACZF,YAAY/B,SAAS,kBACjBK,MAAM6B,UAAUjB,MAAQ,SACxBZ,MAAM8B,SAASlB,MAAQ,oBAC3BA,KAAKmB,OAAOL,iBAOpBpC,uBAAuBS,UAAUD,cAAgB,eACzCE,MAAQC,KACR+B,KAAO/B,KAAKP,UAGhBsC,KAAK9B,KAAK,iBAAiB+B,IAAI,oBAAoB9B,MAAK,SAASC,EAAG8B,cAC5DtB,KAAO1B,EAAEgD,UACTC,aAAenC,MAAMO,0BAA0BK,KAAM,WACzDA,KAAKjB,SAAS,YACTiC,YAAY,UACjBhB,KAAKwB,WAAW,YACK,OAAjBD,cACAvB,KAAKgB,YAAY,UAAYO,iBAKrCH,KAAK9B,KAAK,oBAAoBC,MAAK,SAASC,EAAGiC,eACvCC,MAAQpD,EAAEmD,WACVE,OAASD,MAAME,MACfC,MAAQzC,MAAM0C,SAASJ,OAGvBnB,KAAOa,KAAK9B,KAAK,cAAgBuC,OACjCE,aAAexB,KAAKyB,YACxBzB,KAAK0B,KAAK,WAAYF,aAAaG,KAAKD,KAAK,YAAaF,aAAaI,MAExD,MAAXR,YAMAS,aAAehD,MAAMiD,kBAAkBjD,MAAM8B,SAASQ,OAAQC,QAE9DW,WAAalD,MAAMmD,aAAaH,iBAChCE,WAAWE,UACPJ,aAAaK,SAAS,YAAa,KAC/BC,UAAYtD,MAAMuD,iBAAiBvD,MAAM8B,SAASkB,kBACrChD,MAAMwD,sBAAsBR,cAAc,GAC5CI,OAASE,UAAW,KAC3BG,UAAYT,aAAarB,QAC7BuB,WAAWQ,MAAMD,WACjBE,gBAAgBC,uBAAuBH,gBAEvCP,WAAWvD,SAAS,eAGxBuD,WAAWvD,SAAS,UAI5BK,MAAM6D,eAAe7D,MAAMiD,kBAAkBjD,MAAM8B,SAASQ,OAAQC,QAASpB,UAIjFnB,MAAMP,eAAiBO,MAAM8D,6BAQjCxE,uBAAuBS,UAAU+D,0BAA4B,eACrDC,OAAS,eACRrE,UAAUQ,KAAK,oBAAoBC,MAAK,CAACC,EAAGiC,aAC7C0B,OAAO1B,UAAU2B,IAAM3B,UAAU4B,SAG9BF,QAQXzE,uBAAuBS,UAAUmE,qBAAuB,iBAC9CC,UAAYlE,KAAKR,eACjB2E,UAAYnE,KAAK6D,gCACnBO,cAAe,SAGfC,KAAKC,UAAUH,aAAeE,KAAKC,UAAUJ,YAC7CE,cAAe,EACRA,eAGXG,OAAOpF,KAAKgF,WAAWK,SAAQC,MACvBN,UAAUM,OAASP,UAAUO,OAC7BL,cAAe,MAIhBA,eAQX/E,uBAAuBS,UAAU4E,gBAAkB,SAASC,OACpD5E,MAAQC,KACRW,KAAO1B,EAAE0F,EAAEC,QAAQC,QAAQ,gBAEpB3F,SAAS4F,QAAQH,GAClBI,QAASpE,KAAKyC,SAAS,iBAIjCzC,KAAKjB,SAAS,oBACVwC,aAAelC,KAAKM,0BAA0BK,KAAM,cACnC,OAAjBuB,aAAuB,MAClB8C,cAAc9C,aAAc,GACjCvB,KAAKgB,YAAY,UAAYO,kBACzB+C,WAAalF,MAAMmF,QAAQvE,KAAMuB,cACjC+C,WAAW9B,SACX8B,WAAWvF,SAAS,UACpBiB,KAAKgC,OAAOsC,WAAWtC,eAExB,KACCM,WAAalD,MAAMmD,aAAavC,SAChCsC,WAAWE,UACPxC,KAAKyC,SAAS,YAAa,KACvBC,UAAYrD,KAAKsD,iBAAiBtD,KAAK6B,SAASlB,UACnCX,KAAKuD,sBAAsB5C,MAAM,GACnCwC,OAASE,UAAW,KAC3BG,UAAY7C,KAAKe,QACrB8B,UAAU7B,YAAY,gBACtBsB,WAAWQ,MAAMD,WACjBE,gBAAgBC,uBAAuBH,WACvC7C,KAAKgC,OAAOa,UAAUb,eAEtBM,WAAWvD,SAAS,UACpBiB,KAAKgC,OAAOM,WAAWN,eAG3BM,WAAWvD,SAAS,UACpBiB,KAAKgC,OAAOM,WAAWN,UAKnCzD,SAAS6F,MAAMJ,EAAGhE,MAAM,SAASwE,EAAGC,EAAGzE,MACnCZ,MAAMsF,SAASF,EAAGC,EAAGzE,SACtB,SAASwE,EAAGC,EAAGzE,MACdZ,MAAMuF,QAAQH,EAAGC,EAAGzE,WAW5BtB,uBAAuBS,UAAUuF,SAAW,SAASE,MAAOC,MAAO7E,UAC3DZ,MAAQC,UACPP,UAAUQ,KAAK,aAAeD,KAAK6B,SAASlB,OAAOqB,IAAI,iBAAiB9B,MAAK,SAASC,EAAGsF,cACtFvE,KAAOjC,EAAEwG,UACT1F,MAAM2F,cAAcH,MAAOC,MAAOtE,MAClCA,KAAKxB,SAAS,wBAEdwB,KAAKS,YAAY,4BAY7BtC,uBAAuBS,UAAUwF,QAAU,SAASC,MAAOC,MAAO7E,UAC1DZ,MAAQC,KACR+B,KAAO/B,KAAKP,UACZkG,QAAS,EACb5D,KAAK9B,KAAK,aAAeD,KAAK6B,SAASlB,OAAOqB,IAAI,iBAAiB9B,MAAK,SAASC,EAAGsF,aAC5EE,cACO,QAELC,SAAW3G,EAAEwG,cACd1F,MAAM2F,cAAcH,MAAOC,MAAOI,iBAE5B,MAEP1E,KAAO,YACP0E,SAASxC,SAAS,WAElBwC,SAASjE,YAAY,wBAErBT,KAAOnB,MAAMmF,QAAQvE,KAAMZ,MAAMO,0BAA0BsF,SAAU,aAGrE1E,KAAO0E,SAGX1E,KAAKS,YAAY,wBACjB5B,MAAM6D,eAAejD,KAAMO,MAC3ByE,QAAS,GACF,KAENA,aACIE,aAAalF,OAU1BtB,uBAAuBS,UAAU8D,eAAiB,SAASjD,KAAMO,SAEjC,OAAxBlB,KAAKyC,SAASvB,WAMd4E,QAAU9F,KAAK+F,sBAAsB/F,KAAKyC,SAASvB,UAChC,IAAnB4E,QAAQ3C,OAAc,KAClBjB,aAAelC,KAAKM,0BAA0BwF,QAAS,cAEvD9F,KAAKgG,gBAAgB9D,aAAchB,KAAM4E,QAASnF,uBAC7CkF,aAAalF,UAGlBsE,WAAajF,KAAKkF,QAAQY,QAAS5D,cACvC+C,WAAWvF,SAAS,UACpBoG,QAAQpG,SAAS,gBACjBoG,QAAQnD,OAAOsC,WAAWtC,eACrBkD,aAAaC,YAGF,IAAhBnF,KAAKwC,YACA6B,cAAchF,KAAKyC,SAASvB,MAAO,GACpCA,KAAK0B,KAAK,YACV1B,KAAK+E,YAEN,IAECjG,KAAKM,0BAA0BK,KAAM,uBAIpCqE,cAAchF,KAAKyC,SAASvB,MAAOlB,KAAK4B,UAAUjB,OACvDA,KAAKgB,YAAY,YACZjC,SAAS,iBAAmBM,KAAKyC,SAASvB,OAC/CP,KAAKuF,KAAK,WAAY,QACjBC,UAAUxF,KAAMO,iBAnChB2E,aAAalF,OAgD1BtB,uBAAuBS,UAAUkG,gBAAkB,SAAS9D,aAAchB,KAAM4E,QAASnF,cACjFA,KAAKyC,SAAS,cACPlC,KAAKkC,SAAS,QAAUlB,eAC3BlC,KAAK6B,SAASlB,QAAUX,KAAK6B,SAASX,OACtClB,KAAK4B,UAAUjB,QAAUX,KAAK4B,UAAUkE,UACxC9F,KAAK6B,SAASlB,QAAUX,KAAK6B,SAASiE,WAUlDzG,uBAAuBS,UAAU+F,aAAe,SAASlF,UACjDuB,aAAelC,KAAKM,0BAA0BK,KAAM,WACnC,OAAjBuB,cACAvB,KAAKgB,YAAY,UAAYO,cAEjCvB,KAAKiC,KAAK,YAAY,QAEjBuD,UAAUxF,KAAMX,KAAKoG,YAAYpG,KAAK6B,SAASlB,MAAOX,KAAK4B,UAAUjB,SAW9EtB,uBAAuBS,UAAUuG,eAAiB,SAAS1B,OACnDzD,KAAOjC,EAAE0F,EAAEC,QAAQC,QAAQ,YACX,IAAhB3D,KAAKiC,OAAc,KACfmD,WAAarH,EAAE0F,EAAEC,QACjB1C,aAAelC,KAAKM,0BAA0BgG,WAAY,WACzC,OAAjBpE,eACAhB,KAAOlB,KAAKkF,QAAQoB,WAAYpE,mBAGpCqE,YAAcvG,KAAK+F,sBAAsB/F,KAAKyC,SAASvB,OACvDsF,SAAWvH,WAEP0F,EAAE8B,cACDtH,KAAKuH,WACLvH,KAAKwH,gBACLxH,KAAKyH,UACNJ,SAAWxG,KAAK6G,YAAY7G,KAAK6B,SAASX,MAAOqF,wBAGhDpH,KAAK2H,eACL3H,KAAK4H,QACNP,SAAWxG,KAAKgH,gBAAgBhH,KAAK6B,SAASX,MAAOqF,wBAGpDpH,KAAK8H,iCAINvD,gBAAgBwD,sBAAuB,MAI3CV,SAASrD,OAAQ,CACjBqD,SAAS5D,KAAK,WAAW,GACzB4D,SAAS9G,SAAS,oBACduD,WAAajD,KAAKkD,aAAasD,aAC/BvD,WAAWE,UACPqD,SAASpD,SAAS,YAAa,KAC3BC,UAAYrD,KAAKsD,iBAAiBtD,KAAK6B,SAAS2E,cACnCxG,KAAKuD,sBAAsBiD,UAAU,GACvCrD,OAASE,UAAW,KAC3BG,UAAYgD,SAAS9E,QACzB8B,UAAU7B,YAAY,gBACtB6B,UAAUrB,WAAW,YACrBc,WAAWQ,MAAMD,WACjBE,gBAAgBC,uBAAuBH,WACvCgD,SAAS7D,OAAOa,UAAUb,eAE1BM,WAAWvD,SAAS,UACpB8G,SAAS7D,OAAOM,WAAWN,eAG/BM,WAAWvD,SAAS,UACpB8G,SAAS7D,OAAOM,WAAWN,eAInCzB,KAAK0B,KAAK,WAAW,GAGzB+B,EAAEwC,sBACGvD,eAAe4C,SAAUtF,OAUlC7B,uBAAuBS,UAAU+G,YAAc,SAAStG,MAAOI,UACvD2B,OACA8E,WAAapH,KAAKqH,mBAAmB9G,OAGrC+B,OADgB,IAAhB3B,KAAKwC,OACI,EAEAnD,KAAK4B,UAAUjB,MAAQ,UAGhC2G,KAAOtH,KAAKgD,kBAAkBzC,MAAO+B,QAClB,IAAhBgF,KAAKnE,QAAgBb,OAAS8E,YACjC9E,SACAgF,KAAOtH,KAAKgD,kBAAkBzC,MAAO+B,eAGlCgF,MAUXjI,uBAAuBS,UAAUkH,gBAAkB,SAASzG,MAAOI,UAC3D2B,OAGAA,OADgB,IAAhB3B,KAAKwC,OACInD,KAAKqH,mBAAmB9G,OAExBP,KAAK4B,UAAUjB,MAAQ,UAGhC4G,SAAWvH,KAAKgD,kBAAkBzC,MAAO+B,QAClB,IAApBiF,SAASpE,QAAgBb,OAAS,GACrCA,SACAiF,SAAWvH,KAAKgD,kBAAkBzC,MAAO+B,eAItCiF,UASXlI,uBAAuBS,UAAUqG,UAAY,SAASxF,KAAMiE,YACpD4C,WAAa7G,KAAKgC,SAClB8E,UAAY7C,OAAOjC,SACnB5C,MAAQC,KAEZ0H,EAAEC,KAAKC,WAAW,wBAA0B7H,MAAMT,aAKlDqB,KAAKkH,QACD,CACI/E,KAAMgF,SAASnH,KAAKW,IAAI,SAAWmG,UAAU3E,KAAO0E,WAAW1E,KAC/DD,IAAKiF,SAASnH,KAAKW,IAAI,QAAUmG,UAAU5E,IAAM2E,WAAW3E,KAEhE,CACIkF,SAAU,OACVC,KAAM,WACF/I,EAAE,QAAQgJ,QAAQ,yBAA0B,CAACtH,KAAMiE,OAAQ7E,QAC3D2H,EAAEC,KAAKO,YAAY,wBAA0BnI,MAAMT,iBAcnED,uBAAuBS,UAAU4F,cAAgB,SAASH,MAAOC,MAAOtE,UAChEiH,SAAWjH,KAAKyB,gBACb4C,OAAS4C,SAASrF,MAAQyC,MAAQ4C,SAASrF,KAAO5B,KAAKE,SACnDoE,OAAS2C,SAAStF,KAAO2C,MAAQ2C,SAAStF,IAAM3B,KAAKG,UASpEhC,uBAAuBS,UAAUkF,cAAgB,SAASxC,MAAOF,aACxD7C,UAAUQ,KAAK,yBAA2BuC,OAAOD,IAAID,SAQ9DjD,uBAAuBS,UAAUL,QAAU,kBAChCR,EAAEmJ,SAASC,eAAerI,KAAKV,eAU1CD,uBAAuBS,UAAUsG,YAAc,SAAS7F,MAAO+B,eACtDtC,KAAKP,UAAUQ,KAAK,kCAAoCM,MAAQ,UAAY+B,QAAQgG,GAAG,YAMrFtI,KAAKP,UAAUQ,KAAK,kCAAoCM,MAAQ,UAAY+B,QALxEtC,KAAKP,UAAUQ,KAAK,kBAAoBM,MAApB,iCAEX+B,OACZ,SAAW/B,QAYvBlB,uBAAuBS,UAAUkD,kBAAoB,SAASzC,MAAO+B,eAC1DtC,KAAKP,UAAUQ,KAAK,kBAAoBM,MAAQ,UAAY+B,OAAS,aAAaiG,MAAM,EAAG,IAStGlJ,uBAAuBS,UAAUiG,sBAAwB,SAASvD,cACvDxC,KAAKP,UAAUQ,KAAK,wBAA0BuC,QASzDnD,uBAAuBS,UAAUwD,iBAAmB,SAAS/C,cAClDP,KAAKP,UAAUQ,KAAK,cAAgBM,OAAO4C,QAStD9D,uBAAuBS,UAAUuH,mBAAqB,SAAS9G,cACpDP,KAAKP,UAAUQ,KAAK,kBAAoBM,OAAO4C,QAU1D9D,uBAAuBS,UAAUQ,0BAA4B,SAASF,KAAMoI,YACpEC,QAAUrI,KAAK8F,KAAK,iBACRwC,IAAZD,SAAqC,KAAZA,gBACrBE,WAAaF,QAAQG,MAAM,KACtBrH,MAAQ,EAAGA,MAAQoH,WAAWxF,OAAQ5B,QAAS,IACxC,IAAIsH,OAAO,IAAML,OAAS,aAC5BM,KAAKH,WAAWpH,QAAS,KAE3BwH,MADQ,IAAIF,OAAO,aACLG,KAAKL,WAAWpH,eAC3B0H,OAAOF,MAAM,YAIzB,MASX1J,uBAAuBS,UAAU8B,UAAY,SAASjB,aAC3CX,KAAKM,0BAA0BK,KAAM,WAUhDtB,uBAAuBS,UAAU+B,SAAW,SAASzB,aAC1CJ,KAAKM,0BAA0BF,KAAM,UAShDf,uBAAuBS,UAAU2C,SAAW,SAASrC,aAC1CJ,KAAKM,0BAA0BF,KAAM,UAShDf,uBAAuBS,UAAUoD,aAAe,SAASvC,aAC9CX,KAAKP,UAAUQ,KAAK,kBACvBD,KAAK6B,SAASlB,MADS,wBAGXX,KAAK4B,UAAUjB,MAC3B,SAAWX,KAAK6B,SAASlB,MACzB,qBAURtB,uBAAuBS,UAAUyD,sBAAwB,SAAS5C,KAAMuI,eAChEA,OACOlJ,KAAKP,UAAUQ,KAAK,kBACvBD,KAAK6B,SAASlB,MADS,wBAGXX,KAAK4B,UAAUjB,MAC3B,SAAWX,KAAK6B,SAASlB,MACzB,aAAaqB,IAAI,oBAElBhC,KAAKP,UAAUQ,KAAK,uBACXD,KAAK4B,UAAUjB,MAC3B,SAAWX,KAAK6B,SAASlB,MACzB,aAAaqB,IAAI,qBAUzB3C,uBAAuBS,UAAUoF,QAAU,SAASvE,KAAMuB,qBAC/ClC,KAAKP,UAAUQ,KAAK,cAAgBD,KAAK6B,SAASlB,MAAQ,SAAWuB,mBAS5EwB,gBAAkB,CAIlByF,0BAA0B,EAM1BC,6BAA8B,GAK9BlC,sBAAsB,EAKtBmC,UAAW,GAQXC,KAAM,SAAShK,YAAaC,aACxBmE,gBAAgB2F,UAAU/J,aAAe,IAAID,uBAAuBC,YAAaC,UAC5EmE,gBAAgByF,2BACjBzF,gBAAgB6F,qBAChB7F,gBAAgByF,0BAA2B,IAE1CzF,gBAAgB0F,6BAA6BI,eAAelK,aAAc,CAC3EoE,gBAAgB0F,6BAA6B9J,cAAe,MAExDmK,kBAAoBrB,SAASC,eAAe/I,aAC5CmK,kBAAkBC,UAAUC,SAAS,YACpCF,kBAAkBC,UAAUC,SAAS,0BAEtCjG,gBAAgBC,uBAAuB1E,EAAEwK,mBAAmBxJ,KAAK,oBAQ7EsJ,mBAAoB,WAChBtK,EAAE,QACG2K,GAAG,UACA,oDACAlG,gBAAgB2C,gBACnBuD,GAAG,UACA,kFACAlG,gBAAgB2C,gBACnBuD,GAAG,yBAA0BlG,gBAAgBmG,kBAQtDlG,uBAAwB,SAASxC,SAE7BA,QAAQ2I,OAAO,wBACf3I,QAAQyI,GAAG,uBAAwBlG,gBAAgBgB,kBAOvDA,gBAAiB,SAASC,GACtBA,EAAEwC,qBACE4C,SAAWrG,gBAAgBsG,oBAAoBrF,GAC/CoF,UACAA,SAASrF,gBAAgBC,IAQjC0B,eAAgB,SAAS1B,OACjBjB,gBAAgBwD,sBAGpBxD,gBAAgBwD,sBAAuB,MACnC6C,SAAWrG,gBAAgBsG,oBAAoBrF,GAC/CoF,UACAA,SAAS1D,eAAe1B,KAUhCqF,oBAAqB,SAASrF,OACtBrF,YAAcL,EAAE0F,EAAEsF,eAAepF,QAAQ,eAAeqB,KAAK,aAC1DxC,gBAAgB2F,UAAU/J,cAWrCuK,gBAAiB,SAASlF,EAAGhE,KAAMiE,OAAQ7E,OACvCY,KAAKgB,YAAY,gBACjBhB,KAAKW,IAAI,MAAO,IAAIA,IAAI,OAAQ,IAChCsD,OAAOnB,MAAM9C,MACbiE,OAAOjD,YAAY,eACkB,IAA1BhB,KAAKiC,KAAK,cAAyD,IAA1BjC,KAAKiC,KAAK,cAC1DjC,KAAKgB,YAAY,UAAUjC,SAAS,YACpCiB,KAAKwB,WAAW,YAChBxB,KAAKuJ,WAAW,YACZvJ,KAAKyC,SAAS,aAAerD,MAAMwD,sBAAsB5C,MAAM,GAAMwC,OAAS,GAC9EpD,MAAMwD,sBAAsB5C,MAAM,GAAMwJ,QAAQC,eAGpB,IAAzBzJ,KAAKiC,KAAK,aAAuD,IAAzBjC,KAAKiC,KAAK,aACzDjC,KAAKsF,QACLtF,KAAKuJ,WAAW,iBAEkB,IAA3BtF,OAAOhC,KAAK,aAAyD,IAA3BgC,OAAOhC,KAAK,YAC7DgC,OAAOsF,WAAW,WAElBxG,gBAAgBwD,uBAChBxD,gBAAgBwD,sBAAuB,GAEvCnH,MAAMkE,yBAENP,gBAAgB2G,kBAEhBtK,MAAMP,eAAiBO,MAAM8D,8BAOrCwG,gBAAiB,iBACPC,aAAelC,SAASC,eAAe,gBAC7CjJ,kBAAkBmL,gBAAgBD,sBAOnC,CAOHhB,KAAM5F,gBAAgB4F"}
\ No newline at end of file
+{"version":3,"file":"ddwtos.min.js","sources":["../src/ddwtos.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * JavaScript to make drag-drop into text questions work.\n *\n * Some vocabulary to help understand this code:\n *\n * The question text contains 'drops' - blanks into which the 'drags', the missing\n * words, can be put.\n *\n * The thing that can be moved into the drops are called 'drags'. There may be\n * multiple copies of the 'same' drag which does not really cause problems.\n * Each drag has a 'choice' number which is the value set on the drop's hidden\n * input when this drag is placed in a drop.\n *\n * These may be in separate 'groups', distinguished by colour.\n * Things can only interact with other things in the same group.\n * The groups are numbered from 1.\n *\n * The place where a given drag started from is called its 'home'.\n *\n * @module     qtype_ddwtos/ddwtos\n * @copyright  2018 The Open University\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n * @since      3.6\n */\ndefine([\n    'jquery',\n    'core/dragdrop',\n    'core/key_codes',\n    'core_form/changechecker',\n    'core_filters/events',\n], function(\n    $,\n    dragDrop,\n    keys,\n    FormChangeChecker,\n    filterEvent\n) {\n\n    \"use strict\";\n\n    /**\n     * Object to handle one drag-drop into text question.\n     *\n     * @param {String} containerId id of the outer div for this question.\n     * @param {boolean} readOnly whether the question is being displayed read-only.\n     * @constructor\n     */\n    function DragDropToTextQuestion(containerId, readOnly) {\n        const thisQ = this;\n        this.containerId = containerId;\n        this.questionAnswer = {};\n        this.questionDragDropWidthHeight = [];\n        if (readOnly) {\n            this.getRoot().addClass('qtype_ddwtos-readonly');\n        }\n        this.resizeAllDragsAndDrops();\n        this.cloneDrags();\n        this.positionDrags();\n        // Wait for all dynamic content loaded by filter to be completed.\n        document.addEventListener(filterEvent.eventTypes.filterContentRenderingComplete, (elements) => {\n            elements.detail.nodes.forEach((element) => {\n                thisQ.changeAllDragsAndDropsToFilteredContent(element);\n            });\n        });\n    }\n\n    /**\n     * In each group, resize all the items to be the same size.\n     */\n    DragDropToTextQuestion.prototype.resizeAllDragsAndDrops = function() {\n        var thisQ = this;\n        this.getRoot().find('.answercontainer > div').each(function(i, node) {\n            thisQ.resizeAllDragsAndDropsInGroup(\n                thisQ.getClassnameNumericSuffix($(node), 'draggrouphomes'));\n        });\n    };\n\n    /**\n     * In a given group, set all the drags and drops to be the same size.\n     *\n     * @param {int} group the group number.\n     */\n    DragDropToTextQuestion.prototype.resizeAllDragsAndDropsInGroup = function(group) {\n        var thisQ = this,\n            dragDropItems = this.getRoot().find('span.group' + group),\n            maxWidth = 0,\n            maxHeight = 0;\n\n        // Find the maximum size of any drag in this groups.\n        dragDropItems.each(function(i, drag) {\n            maxWidth = Math.max(maxWidth, Math.ceil(drag.offsetWidth));\n            maxHeight = Math.max(maxHeight, Math.ceil(0 + drag.offsetHeight));\n        });\n\n        // The size we will want to set is a bit bigger than this.\n        maxWidth += 8;\n        maxHeight += 2;\n        thisQ.questionDragDropWidthHeight[group] = {maxWidth: maxWidth, maxHeight: maxHeight};\n        // Set each drag home to that size.\n        dragDropItems.each(function(i, drag) {\n            thisQ.setElementSize(drag, maxWidth, maxHeight);\n        });\n    };\n\n    /**\n     * Change all the drags and drops related to the item that has been changed by filter to correct size and content.\n     *\n     *  @param {object} filteredElement the element has been modified by filter.\n     */\n    DragDropToTextQuestion.prototype.changeAllDragsAndDropsToFilteredContent = function(filteredElement) {\n        let currentFilteredItem = $(filteredElement);\n        const parentIsDD = currentFilteredItem.parent().closest('span').hasClass('placed') ||\n            currentFilteredItem.parent().closest('span').hasClass('draghome');\n        const isDD = currentFilteredItem.hasClass('placed') || currentFilteredItem.hasClass('draghome');\n        // The filtered element or parent element should a drag or drop item.\n        if (!parentIsDD && !isDD) {\n            return;\n        }\n        if (parentIsDD) {\n            currentFilteredItem = currentFilteredItem.parent().closest('span');\n        }\n        const thisQ = this;\n        if (thisQ.getRoot().find(currentFilteredItem).length <= 0) {\n            // If the DD item doesn't belong to this question\n            // In case we have multiple questions in the same page.\n            return;\n        }\n        const group = thisQ.getGroup(currentFilteredItem),\n              choice = thisQ.getChoice(currentFilteredItem);\n        let listOfModifiedDragDrop = [];\n        // Get the list of drag and drop item within the same group and choice.\n        this.getRoot().find('.group' + group + '.choice' + choice).each(function(i, node) {\n            // Same modified item, skip it.\n            if ($(node).get(0) === currentFilteredItem.get(0)) {\n                return;\n            }\n            const originalClass = $(node).attr('class');\n            const originalStyle = $(node).attr('style');\n            // We want to keep all the handler and event for filtered item, so using clone is the only choice.\n            const filteredDragDropClone = currentFilteredItem.clone();\n            // Replace the class and style of the drag drop item we want to replace for the clone.\n            filteredDragDropClone.attr('class', originalClass);\n            filteredDragDropClone.attr('style', originalStyle);\n            // Insert into DOM.\n            $(node).before(filteredDragDropClone);\n            // Add the item has been replaced to a list so we can remove it later.\n            listOfModifiedDragDrop.push(node);\n        });\n\n        listOfModifiedDragDrop.forEach(function(node) {\n            $(node).remove();\n        });\n        // Save the current height and width.\n        const currentHeight = currentFilteredItem.height();\n        const currentWidth = currentFilteredItem.width();\n        // Set to auto so we can get the real height and width of the filtered item.\n        currentFilteredItem.height('auto');\n        currentFilteredItem.width('auto');\n        // We need to set display block so we can get height and width.\n        // Some browser can't get the offsetWidth/Height if they are an inline element like span tag.\n        if (!filteredElement.offsetWidth || !filteredElement.offsetHeight) {\n            filteredElement.classList.add('d-block');\n        }\n        if (thisQ.questionDragDropWidthHeight[group].maxWidth < Math.ceil(filteredElement.offsetWidth) ||\n            thisQ.questionDragDropWidthHeight[group].maxHeight < Math.ceil(0 + filteredElement.offsetHeight)) {\n            // Remove the d-block class before calculation.\n            filteredElement.classList.remove('d-block');\n            // Now resize all the items in the same group if we have new maximum width or height.\n            thisQ.resizeAllDragsAndDropsInGroup(group);\n        } else {\n            // Return the original height and width in case the real height and width is not the maximum.\n            currentFilteredItem.height(currentHeight);\n            currentFilteredItem.width(currentWidth);\n        }\n        // Remove the d-block class after resize.\n        filteredElement.classList.remove('d-block');\n    };\n\n    /**\n     * Set a given DOM element to be a particular size.\n     *\n     * @param {HTMLElement} element\n     * @param {int} width\n     * @param {int} height\n     */\n    DragDropToTextQuestion.prototype.setElementSize = function(element, width, height) {\n        $(element).width(width).height(height).css('lineHeight', height + 'px');\n    };\n\n    /**\n     * Invisible 'drag homes' are output by the renderer. These have the same properties\n     * as the drag items but are invisible. We clone these invisible elements to make the\n     * actual drag items.\n     */\n    DragDropToTextQuestion.prototype.cloneDrags = function() {\n        var thisQ = this;\n        thisQ.getRoot().find('span.draghome').each(function(index, draghome) {\n            var drag = $(draghome);\n            var placeHolder = drag.clone();\n            placeHolder.removeClass();\n            placeHolder.addClass('draghome choice' +\n                thisQ.getChoice(drag) + ' group' +\n                thisQ.getGroup(drag) + ' dragplaceholder');\n            drag.before(placeHolder);\n        });\n    };\n\n    /**\n     * Update the position of drags.\n     */\n    DragDropToTextQuestion.prototype.positionDrags = function() {\n        var thisQ = this,\n            root = this.getRoot();\n\n        // First move all items back home.\n        root.find('span.draghome').not('.dragplaceholder').each(function(i, dragNode) {\n            var drag = $(dragNode),\n                currentPlace = thisQ.getClassnameNumericSuffix(drag, 'inplace');\n            drag.addClass('unplaced')\n                .removeClass('placed');\n            drag.removeAttr('tabindex');\n            if (currentPlace !== null) {\n                drag.removeClass('inplace' + currentPlace);\n            }\n        });\n\n        // Then place the once that should be placed.\n        root.find('input.placeinput').each(function(i, inputNode) {\n            var input = $(inputNode),\n                choice = input.val(),\n                place = thisQ.getPlace(input);\n\n            // Record the last known position of the drop.\n            var drop = root.find('.drop.place' + place),\n                dropPosition = drop.offset();\n            drop.data('prev-top', dropPosition.top).data('prev-left', dropPosition.left);\n\n            if (choice === '0') {\n                // No item in this place.\n                return;\n            }\n\n            // Get the unplaced drag.\n            var unplacedDrag = thisQ.getUnplacedChoice(thisQ.getGroup(input), choice);\n            // Get the clone of the drag.\n            var hiddenDrag = thisQ.getDragClone(unplacedDrag);\n            if (hiddenDrag.length) {\n                if (unplacedDrag.hasClass('infinite')) {\n                    var noOfDrags = thisQ.noOfDropsInGroup(thisQ.getGroup(unplacedDrag));\n                    var cloneDrags = thisQ.getInfiniteDragClones(unplacedDrag, false);\n                    if (cloneDrags.length < noOfDrags) {\n                        var cloneDrag = unplacedDrag.clone();\n                        hiddenDrag.after(cloneDrag);\n                        questionManager.addEventHandlersToDrag(cloneDrag);\n                    } else {\n                        hiddenDrag.addClass('active');\n                    }\n                } else {\n                    hiddenDrag.addClass('active');\n                }\n            }\n            // Send the drag to drop.\n            thisQ.sendDragToDrop(thisQ.getUnplacedChoice(thisQ.getGroup(input), choice), drop);\n        });\n\n        // Save the question answer.\n        thisQ.questionAnswer = thisQ.getQuestionAnsweredValues();\n    };\n\n    /**\n     * Get the question answered values.\n     *\n     * @return {Object} Contain key-value with key is the input id and value is the input value.\n     */\n    DragDropToTextQuestion.prototype.getQuestionAnsweredValues = function() {\n        let result = {};\n        this.getRoot().find('input.placeinput').each((i, inputNode) => {\n            result[inputNode.id] = inputNode.value;\n        });\n\n        return result;\n    };\n\n    /**\n     * Check if the question is being interacted or not.\n     *\n     * @return {boolean} Return true if the user has changed the question-answer.\n     */\n    DragDropToTextQuestion.prototype.isQuestionInteracted = function() {\n        const oldAnswer = this.questionAnswer;\n        const newAnswer = this.getQuestionAnsweredValues();\n        let isInteracted = false;\n\n        // First, check both answers have the same structure or not.\n        if (JSON.stringify(newAnswer) !== JSON.stringify(oldAnswer)) {\n            isInteracted = true;\n            return isInteracted;\n        }\n        // Check the values.\n        Object.keys(newAnswer).forEach(key => {\n            if (newAnswer[key] !== oldAnswer[key]) {\n                isInteracted = true;\n            }\n        });\n\n        return isInteracted;\n    };\n\n    /**\n     * Handles the start of dragging an item.\n     *\n     * @param {Event} e the touch start or mouse down event.\n     */\n    DragDropToTextQuestion.prototype.handleDragStart = function(e) {\n        var thisQ = this,\n            drag = $(e.target).closest('.draghome');\n\n        var info = dragDrop.prepare(e);\n        if (!info.start || drag.hasClass('beingdragged')) {\n            return;\n        }\n\n        drag.addClass('beingdragged');\n        var currentPlace = this.getClassnameNumericSuffix(drag, 'inplace');\n        if (currentPlace !== null) {\n            this.setInputValue(currentPlace, 0);\n            drag.removeClass('inplace' + currentPlace);\n            var hiddenDrop = thisQ.getDrop(drag, currentPlace);\n            if (hiddenDrop.length) {\n                hiddenDrop.addClass('active');\n                drag.offset(hiddenDrop.offset());\n            }\n        } else {\n            var hiddenDrag = thisQ.getDragClone(drag);\n            if (hiddenDrag.length) {\n                if (drag.hasClass('infinite')) {\n                    var noOfDrags = this.noOfDropsInGroup(this.getGroup(drag));\n                    var cloneDrags = this.getInfiniteDragClones(drag, false);\n                    if (cloneDrags.length < noOfDrags) {\n                        var cloneDrag = drag.clone();\n                        cloneDrag.removeClass('beingdragged');\n                        hiddenDrag.after(cloneDrag);\n                        questionManager.addEventHandlersToDrag(cloneDrag);\n                        drag.offset(cloneDrag.offset());\n                    } else {\n                        hiddenDrag.addClass('active');\n                        drag.offset(hiddenDrag.offset());\n                    }\n                } else {\n                    hiddenDrag.addClass('active');\n                    drag.offset(hiddenDrag.offset());\n                }\n            }\n        }\n\n        dragDrop.start(e, drag, function(x, y, drag) {\n            thisQ.dragMove(x, y, drag);\n        }, function(x, y, drag) {\n            thisQ.dragEnd(x, y, drag);\n        });\n    };\n\n    /**\n     * Called whenever the currently dragged items moves.\n     *\n     * @param {Number} pageX the x position.\n     * @param {Number} pageY the y position.\n     * @param {jQuery} drag the item being moved.\n     */\n    DragDropToTextQuestion.prototype.dragMove = function(pageX, pageY, drag) {\n        var thisQ = this;\n        this.getRoot().find('span.group' + this.getGroup(drag)).not('.beingdragged').each(function(i, dropNode) {\n            var drop = $(dropNode);\n            if (thisQ.isPointInDrop(pageX, pageY, drop)) {\n                drop.addClass('valid-drag-over-drop');\n            } else {\n                drop.removeClass('valid-drag-over-drop');\n            }\n        });\n    };\n\n    /**\n     * Called when user drops a drag item.\n     *\n     * @param {Number} pageX the x position.\n     * @param {Number} pageY the y position.\n     * @param {jQuery} drag the item being moved.\n     */\n    DragDropToTextQuestion.prototype.dragEnd = function(pageX, pageY, drag) {\n        var thisQ = this,\n            root = this.getRoot(),\n            placed = false;\n        root.find('span.group' + this.getGroup(drag)).not('.beingdragged').each(function(i, dropNode) {\n            if (placed) {\n                return false;\n            }\n            const dropZone = $(dropNode);\n            if (!thisQ.isPointInDrop(pageX, pageY, dropZone)) {\n                // Not this drop zone.\n                return true;\n            }\n            let drop = null;\n            if (dropZone.hasClass('placed')) {\n                // This is an placed drag item in a drop.\n                dropZone.removeClass('valid-drag-over-drop');\n                // Get the correct drop.\n                drop = thisQ.getDrop(drag, thisQ.getClassnameNumericSuffix(dropZone, 'inplace'));\n            } else {\n                // Empty drop.\n                drop = dropZone;\n            }\n            // Now put this drag into the drop.\n            drop.removeClass('valid-drag-over-drop');\n            thisQ.sendDragToDrop(drag, drop);\n            placed = true;\n            return false; // Stop the each() here.\n        });\n        if (!placed) {\n            this.sendDragHome(drag);\n        }\n    };\n\n    /**\n     * Animate a drag item into a given place (or back home).\n     *\n     * @param {jQuery|null} drag the item to place. If null, clear the place.\n     * @param {jQuery} drop the place to put it.\n     */\n    DragDropToTextQuestion.prototype.sendDragToDrop = function(drag, drop) {\n        // Send drag home if there is no place in drop.\n        if (this.getPlace(drop) === null) {\n            this.sendDragHome(drag);\n            return;\n        }\n\n        // Is there already a drag in this drop? if so, evict it.\n        var oldDrag = this.getCurrentDragInPlace(this.getPlace(drop));\n        if (oldDrag.length !== 0) {\n            var currentPlace = this.getClassnameNumericSuffix(oldDrag, 'inplace');\n            // When infinite group and there is already a drag in a drop, reject the exact clone in the same drop.\n            if (this.hasDropSameDrag(currentPlace, drop, oldDrag, drag)) {\n                this.sendDragHome(drag);\n                return;\n            }\n            var hiddenDrop = this.getDrop(oldDrag, currentPlace);\n            hiddenDrop.addClass('active');\n            oldDrag.addClass('beingdragged');\n            oldDrag.offset(hiddenDrop.offset());\n            this.sendDragHome(oldDrag);\n        }\n\n        if (drag.length === 0) {\n            this.setInputValue(this.getPlace(drop), 0);\n            if (drop.data('isfocus')) {\n                drop.focus();\n            }\n        } else {\n            // Prevent the drag item drop into two drop-zone.\n            if (this.getClassnameNumericSuffix(drag, 'inplace')) {\n                return;\n            }\n\n            this.setInputValue(this.getPlace(drop), this.getChoice(drag));\n            drag.removeClass('unplaced')\n                .addClass('placed inplace' + this.getPlace(drop));\n            drag.attr('tabindex', 0);\n            this.animateTo(drag, drop);\n        }\n    };\n\n    /**\n     * When infinite group and there is already a drag in a drop, reject the exact clone in the same drop.\n     *\n     * @param {int} currentPlace  the position of the current drop.\n     * @param {jQuery} drop the drop containing a drag.\n     * @param {jQuery} oldDrag the drag already placed in drop.\n     * @param {jQuery} drag the new drag which is exactly the same (clone) as oldDrag .\n     * @returns {boolean}\n     */\n    DragDropToTextQuestion.prototype.hasDropSameDrag = function(currentPlace, drop, oldDrag, drag) {\n        if (drag.hasClass('infinite')) {\n            return drop.hasClass('place' + currentPlace) &&\n                this.getGroup(drag) === this.getGroup(drop) &&\n                this.getChoice(drag) === this.getChoice(oldDrag) &&\n                this.getGroup(drag) === this.getGroup(oldDrag);\n        }\n        return false;\n    };\n\n    /**\n     * Animate a drag back to its home.\n     *\n     * @param {jQuery} drag the item being moved.\n     */\n    DragDropToTextQuestion.prototype.sendDragHome = function(drag) {\n        var currentPlace = this.getClassnameNumericSuffix(drag, 'inplace');\n        if (currentPlace !== null) {\n            drag.removeClass('inplace' + currentPlace);\n        }\n        drag.data('unplaced', true);\n\n        this.animateTo(drag, this.getDragHome(this.getGroup(drag), this.getChoice(drag)));\n    };\n\n    /**\n     * Handles keyboard events on drops.\n     *\n     * Drops are focusable. Once focused, right/down/space switches to the next choice, and\n     * left/up switches to the previous. Escape clear.\n     *\n     * @param {KeyboardEvent} e\n     */\n    DragDropToTextQuestion.prototype.handleKeyPress = function(e) {\n        var drop = $(e.target).closest('.drop');\n        if (drop.length === 0) {\n            var placedDrag = $(e.target);\n            var currentPlace = this.getClassnameNumericSuffix(placedDrag, 'inplace');\n            if (currentPlace !== null) {\n                drop = this.getDrop(placedDrag, currentPlace);\n            }\n        }\n        var currentDrag = this.getCurrentDragInPlace(this.getPlace(drop)),\n            nextDrag = $();\n\n        switch (e.keyCode) {\n            case keys.space:\n            case keys.arrowRight:\n            case keys.arrowDown:\n                nextDrag = this.getNextDrag(this.getGroup(drop), currentDrag);\n                break;\n\n            case keys.arrowLeft:\n            case keys.arrowUp:\n                nextDrag = this.getPreviousDrag(this.getGroup(drop), currentDrag);\n                break;\n\n            case keys.escape:\n                break;\n\n            default:\n                questionManager.isKeyboardNavigation = false;\n                return; // To avoid the preventDefault below.\n        }\n\n        if (nextDrag.length) {\n            nextDrag.data('isfocus', true);\n            nextDrag.addClass('beingdragged');\n            var hiddenDrag = this.getDragClone(nextDrag);\n            if (hiddenDrag.length) {\n                if (nextDrag.hasClass('infinite')) {\n                    var noOfDrags = this.noOfDropsInGroup(this.getGroup(nextDrag));\n                    var cloneDrags = this.getInfiniteDragClones(nextDrag, false);\n                    if (cloneDrags.length < noOfDrags) {\n                        var cloneDrag = nextDrag.clone();\n                        cloneDrag.removeClass('beingdragged');\n                        cloneDrag.removeAttr('tabindex');\n                        hiddenDrag.after(cloneDrag);\n                        questionManager.addEventHandlersToDrag(cloneDrag);\n                        nextDrag.offset(cloneDrag.offset());\n                    } else {\n                        hiddenDrag.addClass('active');\n                        nextDrag.offset(hiddenDrag.offset());\n                    }\n                } else {\n                    hiddenDrag.addClass('active');\n                    nextDrag.offset(hiddenDrag.offset());\n                }\n            }\n        } else {\n            drop.data('isfocus', true);\n        }\n\n        e.preventDefault();\n        this.sendDragToDrop(nextDrag, drop);\n    };\n\n    /**\n     * Choose the next drag in a group.\n     *\n     * @param {int} group which group.\n     * @param {jQuery} drag current choice (empty jQuery if there isn't one).\n     * @return {jQuery} the next drag in that group, or null if there wasn't one.\n     */\n    DragDropToTextQuestion.prototype.getNextDrag = function(group, drag) {\n        var choice,\n            numChoices = this.noOfChoicesInGroup(group);\n\n        if (drag.length === 0) {\n            choice = 1; // Was empty, so we want to select the first choice.\n        } else {\n            choice = this.getChoice(drag) + 1;\n        }\n\n        var next = this.getUnplacedChoice(group, choice);\n        while (next.length === 0 && choice < numChoices) {\n            choice++;\n            next = this.getUnplacedChoice(group, choice);\n        }\n\n        return next;\n    };\n\n    /**\n     * Choose the previous drag in a group.\n     *\n     * @param {int} group which group.\n     * @param {jQuery} drag current choice (empty jQuery if there isn't one).\n     * @return {jQuery} the next drag in that group, or null if there wasn't one.\n     */\n    DragDropToTextQuestion.prototype.getPreviousDrag = function(group, drag) {\n        var choice;\n\n        if (drag.length === 0) {\n            choice = this.noOfChoicesInGroup(group);\n        } else {\n            choice = this.getChoice(drag) - 1;\n        }\n\n        var previous = this.getUnplacedChoice(group, choice);\n        while (previous.length === 0 && choice > 1) {\n            choice--;\n            previous = this.getUnplacedChoice(group, choice);\n        }\n\n        // Does this choice exist?\n        return previous;\n    };\n\n    /**\n     * Animate an object to the given destination.\n     *\n     * @param {jQuery} drag the element to be animated.\n     * @param {jQuery} target element marking the place to move it to.\n     */\n    DragDropToTextQuestion.prototype.animateTo = function(drag, target) {\n        var currentPos = drag.offset(),\n            targetPos = target.offset(),\n            thisQ = this;\n\n        M.util.js_pending('qtype_ddwtos-animate-' + thisQ.containerId);\n        // Animate works in terms of CSS position, whereas locating an object\n        // on the page works best with jQuery offset() function. So, to get\n        // the right target position, we work out the required change in\n        // offset() and then add that to the current CSS position.\n        drag.animate(\n            {\n                left: parseInt(drag.css('left')) + targetPos.left - currentPos.left,\n                top: parseInt(drag.css('top')) + targetPos.top - currentPos.top\n            },\n            {\n                duration: 'fast',\n                done: function() {\n                    $('body').trigger('qtype_ddwtos-dragmoved', [drag, target, thisQ]);\n                    M.util.js_complete('qtype_ddwtos-animate-' + thisQ.containerId);\n                }\n            }\n        );\n    };\n\n    /**\n     * Detect if a point is inside a given DOM node.\n     *\n     * @param {Number} pageX the x position.\n     * @param {Number} pageY the y position.\n     * @param {jQuery} drop the node to check (typically a drop).\n     * @return {boolean} whether the point is inside the node.\n     */\n    DragDropToTextQuestion.prototype.isPointInDrop = function(pageX, pageY, drop) {\n        var position = drop.offset();\n        return pageX >= position.left && pageX < position.left + drop.width()\n                && pageY >= position.top && pageY < position.top + drop.height();\n    };\n\n    /**\n     * Set the value of the hidden input for a place, to record what is currently there.\n     *\n     * @param {int} place which place to set the input value for.\n     * @param {int} choice the value to set.\n     */\n    DragDropToTextQuestion.prototype.setInputValue = function(place, choice) {\n        this.getRoot().find('input.placeinput.place' + place).val(choice);\n    };\n\n    /**\n     * Get the outer div for this question.\n     *\n     * @returns {jQuery} containing that div.\n     */\n    DragDropToTextQuestion.prototype.getRoot = function() {\n        return $(document.getElementById(this.containerId));\n    };\n\n    /**\n     * Get drag home for a given choice.\n     *\n     * @param {int} group the group.\n     * @param {int} choice the choice number.\n     * @returns {jQuery} containing that div.\n     */\n    DragDropToTextQuestion.prototype.getDragHome = function(group, choice) {\n        if (!this.getRoot().find('.draghome.dragplaceholder.group' + group + '.choice' + choice).is(':visible')) {\n            return this.getRoot().find('.draggrouphomes' + group +\n                ' span.draghome.infinite' +\n                '.choice' + choice +\n                '.group' + group);\n        }\n        return this.getRoot().find('.draghome.dragplaceholder.group' + group + '.choice' + choice);\n    };\n\n    /**\n     * Get an unplaced choice for a particular group.\n     *\n     * @param {int} group the group.\n     * @param {int} choice the choice number.\n     * @returns {jQuery} jQuery wrapping the unplaced choice. If there isn't one, the jQuery will be empty.\n     */\n    DragDropToTextQuestion.prototype.getUnplacedChoice = function(group, choice) {\n        return this.getRoot().find('.draghome.group' + group + '.choice' + choice + '.unplaced').slice(0, 1);\n    };\n\n    /**\n     * Get the drag that is currently in a given place.\n     *\n     * @param {int} place the place number.\n     * @return {jQuery} the current drag (or an empty jQuery if none).\n     */\n    DragDropToTextQuestion.prototype.getCurrentDragInPlace = function(place) {\n        return this.getRoot().find('span.draghome.inplace' + place);\n    };\n\n    /**\n     * Return the number of blanks in a given group.\n     *\n     * @param {int} group the group number.\n     * @returns {int} the number of drops.\n     */\n    DragDropToTextQuestion.prototype.noOfDropsInGroup = function(group) {\n        return this.getRoot().find('.drop.group' + group).length;\n    };\n\n    /**\n     * Return the number of choices in a given group.\n     *\n     * @param {int} group the group number.\n     * @returns {int} the number of choices.\n     */\n    DragDropToTextQuestion.prototype.noOfChoicesInGroup = function(group) {\n        return this.getRoot().find('.draghome.group' + group).length;\n    };\n\n    /**\n     * Return the number at the end of the CSS class name with the given prefix.\n     *\n     * @param {jQuery} node\n     * @param {String} prefix name prefix\n     * @returns {Number|null} the suffix if found, else null.\n     */\n    DragDropToTextQuestion.prototype.getClassnameNumericSuffix = function(node, prefix) {\n        var classes = node.attr('class');\n        if (classes !== undefined && classes !== '') {\n            var classesArr = classes.split(' ');\n            for (var index = 0; index < classesArr.length; index++) {\n                var patt1 = new RegExp('^' + prefix + '([0-9])+$');\n                if (patt1.test(classesArr[index])) {\n                    var patt2 = new RegExp('([0-9])+$');\n                    var match = patt2.exec(classesArr[index]);\n                    return Number(match[0]);\n                }\n            }\n        }\n        return null;\n    };\n\n    /**\n     * Get the choice number of a drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @returns {Number} the choice number.\n     */\n    DragDropToTextQuestion.prototype.getChoice = function(drag) {\n        return this.getClassnameNumericSuffix(drag, 'choice');\n    };\n\n    /**\n     * Given a DOM node that is significant to this question\n     * (drag, drop, ...) get the group it belongs to.\n     *\n     * @param {jQuery} node a DOM node.\n     * @returns {Number} the group it belongs to.\n     */\n    DragDropToTextQuestion.prototype.getGroup = function(node) {\n        return this.getClassnameNumericSuffix(node, 'group');\n    };\n\n    /**\n     * Get the place number of a drop, or its corresponding hidden input.\n     *\n     * @param {jQuery} node the DOM node.\n     * @returns {Number} the place number.\n     */\n    DragDropToTextQuestion.prototype.getPlace = function(node) {\n        return this.getClassnameNumericSuffix(node, 'place');\n    };\n\n    /**\n     * Get drag clone for a given drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @returns {jQuery} the drag's clone.\n     */\n    DragDropToTextQuestion.prototype.getDragClone = function(drag) {\n        return this.getRoot().find('.draggrouphomes' +\n            this.getGroup(drag) +\n            ' span.draghome' +\n            '.choice' + this.getChoice(drag) +\n            '.group' + this.getGroup(drag) +\n            '.dragplaceholder');\n    };\n\n    /**\n     * Get infinite drag clones for given drag.\n     *\n     * @param {jQuery} drag the drag.\n     * @param {Boolean} inHome in the home area or not.\n     * @returns {jQuery} the drag's clones.\n     */\n    DragDropToTextQuestion.prototype.getInfiniteDragClones = function(drag, inHome) {\n        if (inHome) {\n            return this.getRoot().find('.draggrouphomes' +\n                this.getGroup(drag) +\n                ' span.draghome' +\n                '.choice' + this.getChoice(drag) +\n                '.group' + this.getGroup(drag) +\n                '.infinite').not('.dragplaceholder');\n        }\n        return this.getRoot().find('span.draghome' +\n            '.choice' + this.getChoice(drag) +\n            '.group' + this.getGroup(drag) +\n            '.infinite').not('.dragplaceholder');\n    };\n\n    /**\n     * Get drop for a given drag and place.\n     *\n     * @param {jQuery} drag the drag.\n     * @param {Integer} currentPlace the current place of drag.\n     * @returns {jQuery} the drop's clone.\n     */\n    DragDropToTextQuestion.prototype.getDrop = function(drag, currentPlace) {\n        return this.getRoot().find('.drop.group' + this.getGroup(drag) + '.place' + currentPlace);\n    };\n\n    /**\n     * Singleton that tracks all the DragDropToTextQuestions on this page, and deals\n     * with event dispatching.\n     *\n     * @type {Object}\n     */\n    var questionManager = {\n        /**\n         * {boolean} used to ensure the event handlers are only initialised once per page.\n         */\n        eventHandlersInitialised: false,\n\n        /**\n         * {Object} ensures that the drag event handlers are only initialised once per question,\n         * indexed by containerId (id on the .que div).\n         */\n        dragEventHandlersInitialised: {},\n\n        /**\n         * {boolean} is keyboard navigation or not.\n         */\n        isKeyboardNavigation: false,\n\n        /**\n         * {DragDropToTextQuestion[]} all the questions on this page, indexed by containerId (id on the .que div).\n         */\n        questions: {},\n\n        /**\n         * Initialise questions.\n         *\n         * @param {String} containerId id of the outer div for this question.\n         * @param {boolean} readOnly whether the question is being displayed read-only.\n         */\n        init: function(containerId, readOnly) {\n            questionManager.questions[containerId] = new DragDropToTextQuestion(containerId, readOnly);\n            if (!questionManager.eventHandlersInitialised) {\n                questionManager.setupEventHandlers();\n                questionManager.eventHandlersInitialised = true;\n            }\n            if (!questionManager.dragEventHandlersInitialised.hasOwnProperty(containerId)) {\n                questionManager.dragEventHandlersInitialised[containerId] = true;\n                // We do not use the body event here to prevent the other event on Mobile device, such as scroll event.\n                var questionContainer = document.getElementById(containerId);\n                if (questionContainer.classList.contains('ddwtos') &&\n                    !questionContainer.classList.contains('qtype_ddwtos-readonly')) {\n                    // TODO: Convert all the jQuery selectors and events to native Javascript.\n                    questionManager.addEventHandlersToDrag($(questionContainer).find('span.draghome'));\n                }\n            }\n        },\n\n        /**\n         * Set up the event handlers that make this question type work. (Done once per page.)\n         */\n        setupEventHandlers: function() {\n            $('body')\n                .on('keydown',\n                    '.que.ddwtos:not(.qtype_ddwtos-readonly) span.drop',\n                    questionManager.handleKeyPress)\n                .on('keydown',\n                    '.que.ddwtos:not(.qtype_ddwtos-readonly) span.draghome.placed:not(.beingdragged)',\n                    questionManager.handleKeyPress)\n                .on('qtype_ddwtos-dragmoved', questionManager.handleDragMoved);\n        },\n\n        /**\n         * Binding the drag/touch event again for newly created element.\n         *\n         * @param {jQuery} element Element to bind the event\n         */\n        addEventHandlersToDrag: function(element) {\n            // Unbind all the mousedown and touchstart events to prevent double binding.\n            element.unbind('mousedown touchstart');\n            element.on('mousedown touchstart', questionManager.handleDragStart);\n        },\n\n        /**\n         * Handle mouse down / touch start on drags.\n         * @param {Event} e the DOM event.\n         */\n        handleDragStart: function(e) {\n            e.preventDefault();\n            var question = questionManager.getQuestionForEvent(e);\n            if (question) {\n                question.handleDragStart(e);\n            }\n        },\n\n        /**\n         * Handle key down / press on drops.\n         * @param {KeyboardEvent} e\n         */\n        handleKeyPress: function(e) {\n            if (questionManager.isKeyboardNavigation) {\n                return;\n            }\n            questionManager.isKeyboardNavigation = true;\n            var question = questionManager.getQuestionForEvent(e);\n            if (question) {\n                question.handleKeyPress(e);\n            }\n        },\n\n        /**\n         * Given an event, work out which question it affects.\n         *\n         * @param {Event} e the event.\n         * @returns {DragDropToTextQuestion|undefined} The question, or undefined.\n         */\n        getQuestionForEvent: function(e) {\n            var containerId = $(e.currentTarget).closest('.que.ddwtos').attr('id');\n            return questionManager.questions[containerId];\n        },\n\n        /**\n         * Handle when drag moved.\n         *\n         * @param {Event} e the event.\n         * @param {jQuery} drag the drag\n         * @param {jQuery} target the target\n         * @param {DragDropToTextQuestion} thisQ the question.\n         */\n        handleDragMoved: function(e, drag, target, thisQ) {\n            drag.removeClass('beingdragged');\n            drag.css('top', '').css('left', '');\n            target.after(drag);\n            target.removeClass('active');\n            if (typeof drag.data('unplaced') !== 'undefined' && drag.data('unplaced') === true) {\n                drag.removeClass('placed').addClass('unplaced');\n                drag.removeAttr('tabindex');\n                drag.removeData('unplaced');\n                if (drag.hasClass('infinite') && thisQ.getInfiniteDragClones(drag, true).length > 1) {\n                    thisQ.getInfiniteDragClones(drag, true).first().remove();\n                }\n            }\n            if (typeof drag.data('isfocus') !== 'undefined' && drag.data('isfocus') === true) {\n                drag.focus();\n                drag.removeData('isfocus');\n            }\n            if (typeof target.data('isfocus') !== 'undefined' && target.data('isfocus') === true) {\n                target.removeData('isfocus');\n            }\n            if (questionManager.isKeyboardNavigation) {\n                questionManager.isKeyboardNavigation = false;\n            }\n            if (thisQ.isQuestionInteracted()) {\n                // The user has interacted with the draggable items. We need to mark the form as dirty.\n                questionManager.handleFormDirty();\n                // Save the new answered value.\n                thisQ.questionAnswer = thisQ.getQuestionAnsweredValues();\n            }\n        },\n\n        /**\n         * Handle when the form is dirty.\n         */\n        handleFormDirty: function() {\n            const responseForm = document.getElementById('responseform');\n            FormChangeChecker.markFormAsDirty(responseForm);\n        }\n    };\n\n    /**\n     * @alias module:qtype_ddwtos/ddwtos\n     */\n    return {\n        /**\n         * Initialise one drag-drop into text question.\n         *\n         * @param {String} containerId id of the outer div for this question.\n         * @param {boolean} readOnly whether the question is being displayed read-only.\n         */\n        init: questionManager.init\n    };\n});\n"],"names":["define","$","dragDrop","keys","FormChangeChecker","filterEvent","DragDropToTextQuestion","containerId","readOnly","thisQ","this","questionAnswer","questionDragDropWidthHeight","getRoot","addClass","resizeAllDragsAndDrops","cloneDrags","positionDrags","document","addEventListener","eventTypes","filterContentRenderingComplete","elements","detail","nodes","forEach","element","changeAllDragsAndDropsToFilteredContent","prototype","find","each","i","node","resizeAllDragsAndDropsInGroup","getClassnameNumericSuffix","group","dragDropItems","maxWidth","maxHeight","drag","Math","max","ceil","offsetWidth","offsetHeight","setElementSize","filteredElement","currentFilteredItem","parentIsDD","parent","closest","hasClass","isDD","length","getGroup","choice","getChoice","listOfModifiedDragDrop","get","originalClass","attr","originalStyle","filteredDragDropClone","clone","before","push","remove","currentHeight","height","currentWidth","width","classList","add","css","index","draghome","placeHolder","removeClass","root","not","dragNode","currentPlace","removeAttr","inputNode","input","val","place","getPlace","drop","dropPosition","offset","data","top","left","unplacedDrag","getUnplacedChoice","hiddenDrag","getDragClone","noOfDrags","noOfDropsInGroup","getInfiniteDragClones","cloneDrag","after","questionManager","addEventHandlersToDrag","sendDragToDrop","getQuestionAnsweredValues","result","id","value","isQuestionInteracted","oldAnswer","newAnswer","isInteracted","JSON","stringify","Object","key","handleDragStart","e","target","prepare","start","setInputValue","hiddenDrop","getDrop","x","y","dragMove","dragEnd","pageX","pageY","dropNode","isPointInDrop","placed","dropZone","sendDragHome","oldDrag","getCurrentDragInPlace","hasDropSameDrag","focus","animateTo","getDragHome","handleKeyPress","placedDrag","currentDrag","nextDrag","keyCode","space","arrowRight","arrowDown","getNextDrag","arrowLeft","arrowUp","getPreviousDrag","escape","isKeyboardNavigation","preventDefault","numChoices","noOfChoicesInGroup","next","previous","currentPos","targetPos","M","util","js_pending","animate","parseInt","duration","done","trigger","js_complete","position","getElementById","is","slice","prefix","classes","undefined","classesArr","split","RegExp","test","match","exec","Number","inHome","eventHandlersInitialised","dragEventHandlersInitialised","questions","init","setupEventHandlers","hasOwnProperty","questionContainer","contains","on","handleDragMoved","unbind","question","getQuestionForEvent","currentTarget","removeData","first","handleFormDirty","responseForm","markFormAsDirty"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAuCAA,6BAAO,CACH,SACA,gBACA,iBACA,0BACA,wBACD,SACCC,EACAC,SACAC,KACAC,kBACAC,sBAYSC,uBAAuBC,YAAaC,gBACnCC,MAAQC,UACTH,YAAcA,iBACdI,eAAiB,QACjBC,4BAA8B,GAC/BJ,eACKK,UAAUC,SAAS,8BAEvBC,8BACAC,kBACAC,gBAELC,SAASC,iBAAiBd,YAAYe,WAAWC,gCAAiCC,WAC9EA,SAASC,OAAOC,MAAMC,SAASC,UAC3BjB,MAAMkB,wCAAwCD,eAQ1DpB,uBAAuBsB,UAAUb,uBAAyB,eAClDN,MAAQC,UACPG,UAAUgB,KAAK,0BAA0BC,MAAK,SAASC,EAAGC,MAC3DvB,MAAMwB,8BACFxB,MAAMyB,0BAA0BjC,EAAE+B,MAAO,uBASrD1B,uBAAuBsB,UAAUK,8BAAgC,SAASE,WAClE1B,MAAQC,KACR0B,cAAgB1B,KAAKG,UAAUgB,KAAK,aAAeM,OACnDE,SAAW,EACXC,UAAY,EAGhBF,cAAcN,MAAK,SAASC,EAAGQ,MAC3BF,SAAWG,KAAKC,IAAIJ,SAAUG,KAAKE,KAAKH,KAAKI,cAC7CL,UAAYE,KAAKC,IAAIH,UAAWE,KAAKE,KAAK,EAAIH,KAAKK,kBAIvDP,UAAY,EACZC,WAAa,EACb7B,MAAMG,4BAA4BuB,OAAS,CAACE,SAAUA,SAAUC,UAAWA,WAE3EF,cAAcN,MAAK,SAASC,EAAGQ,MAC3B9B,MAAMoC,eAAeN,KAAMF,SAAUC,eAS7ChC,uBAAuBsB,UAAUD,wCAA0C,SAASmB,qBAC5EC,oBAAsB9C,EAAE6C,uBACtBE,WAAaD,oBAAoBE,SAASC,QAAQ,QAAQC,SAAS,WACrEJ,oBAAoBE,SAASC,QAAQ,QAAQC,SAAS,YACpDC,KAAOL,oBAAoBI,SAAS,WAAaJ,oBAAoBI,SAAS,gBAE/EH,aAAeI,YAGhBJ,aACAD,oBAAsBA,oBAAoBE,SAASC,QAAQ,eAEzDzC,MAAQC,QACVD,MAAMI,UAAUgB,KAAKkB,qBAAqBM,QAAU,eAKlDlB,MAAQ1B,MAAM6C,SAASP,qBACvBQ,OAAS9C,MAAM+C,UAAUT,yBAC3BU,uBAAyB,QAExB5C,UAAUgB,KAAK,SAAWM,MAAQ,UAAYoB,QAAQzB,MAAK,SAASC,EAAGC,SAEpE/B,EAAE+B,MAAM0B,IAAI,KAAOX,oBAAoBW,IAAI,gBAGzCC,cAAgB1D,EAAE+B,MAAM4B,KAAK,SAC7BC,cAAgB5D,EAAE+B,MAAM4B,KAAK,SAE7BE,sBAAwBf,oBAAoBgB,QAElDD,sBAAsBF,KAAK,QAASD,eACpCG,sBAAsBF,KAAK,QAASC,eAEpC5D,EAAE+B,MAAMgC,OAAOF,uBAEfL,uBAAuBQ,KAAKjC,SAGhCyB,uBAAuBhC,SAAQ,SAASO,MACpC/B,EAAE+B,MAAMkC,kBAGNC,cAAgBpB,oBAAoBqB,SACpCC,aAAetB,oBAAoBuB,QAEzCvB,oBAAoBqB,OAAO,QAC3BrB,oBAAoBuB,MAAM,QAGrBxB,gBAAgBH,aAAgBG,gBAAgBF,cACjDE,gBAAgByB,UAAUC,IAAI,WAE9B/D,MAAMG,4BAA4BuB,OAAOE,SAAWG,KAAKE,KAAKI,gBAAgBH,cAC9ElC,MAAMG,4BAA4BuB,OAAOG,UAAYE,KAAKE,KAAK,EAAII,gBAAgBF,eAEnFE,gBAAgByB,UAAUL,OAAO,WAEjCzD,MAAMwB,8BAA8BE,SAGpCY,oBAAoBqB,OAAOD,eAC3BpB,oBAAoBuB,MAAMD,eAG9BvB,gBAAgByB,UAAUL,OAAO,YAUrC5D,uBAAuBsB,UAAUiB,eAAiB,SAASnB,QAAS4C,MAAOF,QACvEnE,EAAEyB,SAAS4C,MAAMA,OAAOF,OAAOA,QAAQK,IAAI,aAAcL,OAAS,OAQtE9D,uBAAuBsB,UAAUZ,WAAa,eACtCP,MAAQC,KACZD,MAAMI,UAAUgB,KAAK,iBAAiBC,MAAK,SAAS4C,MAAOC,cACnDpC,KAAOtC,EAAE0E,UACTC,YAAcrC,KAAKwB,QACvBa,YAAYC,cACZD,YAAY9D,SAAS,kBACjBL,MAAM+C,UAAUjB,MAAQ,SACxB9B,MAAM6C,SAASf,MAAQ,oBAC3BA,KAAKyB,OAAOY,iBAOpBtE,uBAAuBsB,UAAUX,cAAgB,eACzCR,MAAQC,KACRoE,KAAOpE,KAAKG,UAGhBiE,KAAKjD,KAAK,iBAAiBkD,IAAI,oBAAoBjD,MAAK,SAASC,EAAGiD,cAC5DzC,KAAOtC,EAAE+E,UACTC,aAAexE,MAAMyB,0BAA0BK,KAAM,WACzDA,KAAKzB,SAAS,YACT+D,YAAY,UACjBtC,KAAK2C,WAAW,YACK,OAAjBD,cACA1C,KAAKsC,YAAY,UAAYI,iBAKrCH,KAAKjD,KAAK,oBAAoBC,MAAK,SAASC,EAAGoD,eACvCC,MAAQnF,EAAEkF,WACV5B,OAAS6B,MAAMC,MACfC,MAAQ7E,MAAM8E,SAASH,OAGvBI,KAAOV,KAAKjD,KAAK,cAAgByD,OACjCG,aAAeD,KAAKE,YACxBF,KAAKG,KAAK,WAAYF,aAAaG,KAAKD,KAAK,YAAaF,aAAaI,MAExD,MAAXtC,YAMAuC,aAAerF,MAAMsF,kBAAkBtF,MAAM6C,SAAS8B,OAAQ7B,QAE9DyC,WAAavF,MAAMwF,aAAaH,iBAChCE,WAAW3C,UACPyC,aAAa3C,SAAS,YAAa,KAC/B+C,UAAYzF,MAAM0F,iBAAiB1F,MAAM6C,SAASwC,kBACrCrF,MAAM2F,sBAAsBN,cAAc,GAC5CzC,OAAS6C,UAAW,KAC3BG,UAAYP,aAAa/B,QAC7BiC,WAAWM,MAAMD,WACjBE,gBAAgBC,uBAAuBH,gBAEvCL,WAAWlF,SAAS,eAGxBkF,WAAWlF,SAAS,UAI5BL,MAAMgG,eAAehG,MAAMsF,kBAAkBtF,MAAM6C,SAAS8B,OAAQ7B,QAASiC,UAIjF/E,MAAME,eAAiBF,MAAMiG,6BAQjCpG,uBAAuBsB,UAAU8E,0BAA4B,eACrDC,OAAS,eACR9F,UAAUgB,KAAK,oBAAoBC,MAAK,CAACC,EAAGoD,aAC7CwB,OAAOxB,UAAUyB,IAAMzB,UAAU0B,SAG9BF,QAQXrG,uBAAuBsB,UAAUkF,qBAAuB,iBAC9CC,UAAYrG,KAAKC,eACjBqG,UAAYtG,KAAKgG,gCACnBO,cAAe,SAGfC,KAAKC,UAAUH,aAAeE,KAAKC,UAAUJ,YAC7CE,cAAe,EACRA,eAGXG,OAAOjH,KAAK6G,WAAWvF,SAAQ4F,MACvBL,UAAUK,OAASN,UAAUM,OAC7BJ,cAAe,MAIhBA,eAQX3G,uBAAuBsB,UAAU0F,gBAAkB,SAASC,OACpD9G,MAAQC,KACR6B,KAAOtC,EAAEsH,EAAEC,QAAQtE,QAAQ,gBAEpBhD,SAASuH,QAAQF,GAClBG,QAASnF,KAAKY,SAAS,iBAIjCZ,KAAKzB,SAAS,oBACVmE,aAAevE,KAAKwB,0BAA0BK,KAAM,cACnC,OAAjB0C,aAAuB,MAClB0C,cAAc1C,aAAc,GACjC1C,KAAKsC,YAAY,UAAYI,kBACzB2C,WAAanH,MAAMoH,QAAQtF,KAAM0C,cACjC2C,WAAWvE,SACXuE,WAAW9G,SAAS,UACpByB,KAAKmD,OAAOkC,WAAWlC,eAExB,KACCM,WAAavF,MAAMwF,aAAa1D,SAChCyD,WAAW3C,UACPd,KAAKY,SAAS,YAAa,KACvB+C,UAAYxF,KAAKyF,iBAAiBzF,KAAK4C,SAASf,UACnC7B,KAAK0F,sBAAsB7D,MAAM,GACnCc,OAAS6C,UAAW,KAC3BG,UAAY9D,KAAKwB,QACrBsC,UAAUxB,YAAY,gBACtBmB,WAAWM,MAAMD,WACjBE,gBAAgBC,uBAAuBH,WACvC9D,KAAKmD,OAAOW,UAAUX,eAEtBM,WAAWlF,SAAS,UACpByB,KAAKmD,OAAOM,WAAWN,eAG3BM,WAAWlF,SAAS,UACpByB,KAAKmD,OAAOM,WAAWN,UAKnCxF,SAASwH,MAAMH,EAAGhF,MAAM,SAASuF,EAAGC,EAAGxF,MACnC9B,MAAMuH,SAASF,EAAGC,EAAGxF,SACtB,SAASuF,EAAGC,EAAGxF,MACd9B,MAAMwH,QAAQH,EAAGC,EAAGxF,WAW5BjC,uBAAuBsB,UAAUoG,SAAW,SAASE,MAAOC,MAAO5F,UAC3D9B,MAAQC,UACPG,UAAUgB,KAAK,aAAenB,KAAK4C,SAASf,OAAOwC,IAAI,iBAAiBjD,MAAK,SAASC,EAAGqG,cACtF5C,KAAOvF,EAAEmI,UACT3H,MAAM4H,cAAcH,MAAOC,MAAO3C,MAClCA,KAAK1E,SAAS,wBAEd0E,KAAKX,YAAY,4BAY7BvE,uBAAuBsB,UAAUqG,QAAU,SAASC,MAAOC,MAAO5F,UAC1D9B,MAAQC,KACRoE,KAAOpE,KAAKG,UACZyH,QAAS,EACbxD,KAAKjD,KAAK,aAAenB,KAAK4C,SAASf,OAAOwC,IAAI,iBAAiBjD,MAAK,SAASC,EAAGqG,aAC5EE,cACO,QAELC,SAAWtI,EAAEmI,cACd3H,MAAM4H,cAAcH,MAAOC,MAAOI,iBAE5B,MAEP/C,KAAO,YACP+C,SAASpF,SAAS,WAElBoF,SAAS1D,YAAY,wBAErBW,KAAO/E,MAAMoH,QAAQtF,KAAM9B,MAAMyB,0BAA0BqG,SAAU,aAGrE/C,KAAO+C,SAGX/C,KAAKX,YAAY,wBACjBpE,MAAMgG,eAAelE,KAAMiD,MAC3B8C,QAAS,GACF,KAENA,aACIE,aAAajG,OAU1BjC,uBAAuBsB,UAAU6E,eAAiB,SAASlE,KAAMiD,SAEjC,OAAxB9E,KAAK6E,SAASC,WAMdiD,QAAU/H,KAAKgI,sBAAsBhI,KAAK6E,SAASC,UAChC,IAAnBiD,QAAQpF,OAAc,KAClB4B,aAAevE,KAAKwB,0BAA0BuG,QAAS,cAEvD/H,KAAKiI,gBAAgB1D,aAAcO,KAAMiD,QAASlG,uBAC7CiG,aAAajG,UAGlBqF,WAAalH,KAAKmH,QAAQY,QAASxD,cACvC2C,WAAW9G,SAAS,UACpB2H,QAAQ3H,SAAS,gBACjB2H,QAAQ/C,OAAOkC,WAAWlC,eACrB8C,aAAaC,YAGF,IAAhBlG,KAAKc,YACAsE,cAAcjH,KAAK6E,SAASC,MAAO,GACpCA,KAAKG,KAAK,YACVH,KAAKoD,YAEN,IAEClI,KAAKwB,0BAA0BK,KAAM,uBAIpCoF,cAAcjH,KAAK6E,SAASC,MAAO9E,KAAK8C,UAAUjB,OACvDA,KAAKsC,YAAY,YACZ/D,SAAS,iBAAmBJ,KAAK6E,SAASC,OAC/CjD,KAAKqB,KAAK,WAAY,QACjBiF,UAAUtG,KAAMiD,iBAnChBgD,aAAajG,OAgD1BjC,uBAAuBsB,UAAU+G,gBAAkB,SAAS1D,aAAcO,KAAMiD,QAASlG,cACjFA,KAAKY,SAAS,cACPqC,KAAKrC,SAAS,QAAU8B,eAC3BvE,KAAK4C,SAASf,QAAU7B,KAAK4C,SAASkC,OACtC9E,KAAK8C,UAAUjB,QAAU7B,KAAK8C,UAAUiF,UACxC/H,KAAK4C,SAASf,QAAU7B,KAAK4C,SAASmF,WAUlDnI,uBAAuBsB,UAAU4G,aAAe,SAASjG,UACjD0C,aAAevE,KAAKwB,0BAA0BK,KAAM,WACnC,OAAjB0C,cACA1C,KAAKsC,YAAY,UAAYI,cAEjC1C,KAAKoD,KAAK,YAAY,QAEjBkD,UAAUtG,KAAM7B,KAAKoI,YAAYpI,KAAK4C,SAASf,MAAO7B,KAAK8C,UAAUjB,SAW9EjC,uBAAuBsB,UAAUmH,eAAiB,SAASxB,OACnD/B,KAAOvF,EAAEsH,EAAEC,QAAQtE,QAAQ,YACX,IAAhBsC,KAAKnC,OAAc,KACf2F,WAAa/I,EAAEsH,EAAEC,QACjBvC,aAAevE,KAAKwB,0BAA0B8G,WAAY,WACzC,OAAjB/D,eACAO,KAAO9E,KAAKmH,QAAQmB,WAAY/D,mBAGpCgE,YAAcvI,KAAKgI,sBAAsBhI,KAAK6E,SAASC,OACvD0D,SAAWjJ,WAEPsH,EAAE4B,cACDhJ,KAAKiJ,WACLjJ,KAAKkJ,gBACLlJ,KAAKmJ,UACNJ,SAAWxI,KAAK6I,YAAY7I,KAAK4C,SAASkC,MAAOyD,wBAGhD9I,KAAKqJ,eACLrJ,KAAKsJ,QACNP,SAAWxI,KAAKgJ,gBAAgBhJ,KAAK4C,SAASkC,MAAOyD,wBAGpD9I,KAAKwJ,iCAINpD,gBAAgBqD,sBAAuB,MAI3CV,SAAS7F,OAAQ,CACjB6F,SAASvD,KAAK,WAAW,GACzBuD,SAASpI,SAAS,oBACdkF,WAAatF,KAAKuF,aAAaiD,aAC/BlD,WAAW3C,UACP6F,SAAS/F,SAAS,YAAa,KAC3B+C,UAAYxF,KAAKyF,iBAAiBzF,KAAK4C,SAAS4F,cACnCxI,KAAK0F,sBAAsB8C,UAAU,GACvC7F,OAAS6C,UAAW,KAC3BG,UAAY6C,SAASnF,QACzBsC,UAAUxB,YAAY,gBACtBwB,UAAUnB,WAAW,YACrBc,WAAWM,MAAMD,WACjBE,gBAAgBC,uBAAuBH,WACvC6C,SAASxD,OAAOW,UAAUX,eAE1BM,WAAWlF,SAAS,UACpBoI,SAASxD,OAAOM,WAAWN,eAG/BM,WAAWlF,SAAS,UACpBoI,SAASxD,OAAOM,WAAWN,eAInCF,KAAKG,KAAK,WAAW,GAGzB4B,EAAEsC,sBACGpD,eAAeyC,SAAU1D,OAUlClF,uBAAuBsB,UAAU2H,YAAc,SAASpH,MAAOI,UACvDgB,OACAuG,WAAapJ,KAAKqJ,mBAAmB5H,OAGrCoB,OADgB,IAAhBhB,KAAKc,OACI,EAEA3C,KAAK8C,UAAUjB,MAAQ,UAGhCyH,KAAOtJ,KAAKqF,kBAAkB5D,MAAOoB,QAClB,IAAhByG,KAAK3G,QAAgBE,OAASuG,YACjCvG,SACAyG,KAAOtJ,KAAKqF,kBAAkB5D,MAAOoB,eAGlCyG,MAUX1J,uBAAuBsB,UAAU8H,gBAAkB,SAASvH,MAAOI,UAC3DgB,OAGAA,OADgB,IAAhBhB,KAAKc,OACI3C,KAAKqJ,mBAAmB5H,OAExBzB,KAAK8C,UAAUjB,MAAQ,UAGhC0H,SAAWvJ,KAAKqF,kBAAkB5D,MAAOoB,QAClB,IAApB0G,SAAS5G,QAAgBE,OAAS,GACrCA,SACA0G,SAAWvJ,KAAKqF,kBAAkB5D,MAAOoB,eAItC0G,UASX3J,uBAAuBsB,UAAUiH,UAAY,SAAStG,KAAMiF,YACpD0C,WAAa3H,KAAKmD,SAClByE,UAAY3C,OAAO9B,SACnBjF,MAAQC,KAEZ0J,EAAEC,KAAKC,WAAW,wBAA0B7J,MAAMF,aAKlDgC,KAAKgI,QACD,CACI1E,KAAM2E,SAASjI,KAAKkC,IAAI,SAAW0F,UAAUtE,KAAOqE,WAAWrE,KAC/DD,IAAK4E,SAASjI,KAAKkC,IAAI,QAAU0F,UAAUvE,IAAMsE,WAAWtE,KAEhE,CACI6E,SAAU,OACVC,KAAM,WACFzK,EAAE,QAAQ0K,QAAQ,yBAA0B,CAACpI,KAAMiF,OAAQ/G,QAC3D2J,EAAEC,KAAKO,YAAY,wBAA0BnK,MAAMF,iBAcnED,uBAAuBsB,UAAUyG,cAAgB,SAASH,MAAOC,MAAO3C,UAChEqF,SAAWrF,KAAKE,gBACbwC,OAAS2C,SAAShF,MAAQqC,MAAQ2C,SAAShF,KAAOL,KAAKlB,SACnD6D,OAAS0C,SAASjF,KAAOuC,MAAQ0C,SAASjF,IAAMJ,KAAKpB,UASpE9D,uBAAuBsB,UAAU+F,cAAgB,SAASrC,MAAO/B,aACxD1C,UAAUgB,KAAK,yBAA2ByD,OAAOD,IAAI9B,SAQ9DjD,uBAAuBsB,UAAUf,QAAU,kBAChCZ,EAAEiB,SAAS4J,eAAepK,KAAKH,eAU1CD,uBAAuBsB,UAAUkH,YAAc,SAAS3G,MAAOoB,eACtD7C,KAAKG,UAAUgB,KAAK,kCAAoCM,MAAQ,UAAYoB,QAAQwH,GAAG,YAMrFrK,KAAKG,UAAUgB,KAAK,kCAAoCM,MAAQ,UAAYoB,QALxE7C,KAAKG,UAAUgB,KAAK,kBAAoBM,MAApB,iCAEXoB,OACZ,SAAWpB,QAYvB7B,uBAAuBsB,UAAUmE,kBAAoB,SAAS5D,MAAOoB,eAC1D7C,KAAKG,UAAUgB,KAAK,kBAAoBM,MAAQ,UAAYoB,OAAS,aAAayH,MAAM,EAAG,IAStG1K,uBAAuBsB,UAAU8G,sBAAwB,SAASpD,cACvD5E,KAAKG,UAAUgB,KAAK,wBAA0ByD,QASzDhF,uBAAuBsB,UAAUuE,iBAAmB,SAAShE,cAClDzB,KAAKG,UAAUgB,KAAK,cAAgBM,OAAOkB,QAStD/C,uBAAuBsB,UAAUmI,mBAAqB,SAAS5H,cACpDzB,KAAKG,UAAUgB,KAAK,kBAAoBM,OAAOkB,QAU1D/C,uBAAuBsB,UAAUM,0BAA4B,SAASF,KAAMiJ,YACpEC,QAAUlJ,KAAK4B,KAAK,iBACRuH,IAAZD,SAAqC,KAAZA,gBACrBE,WAAaF,QAAQG,MAAM,KACtB3G,MAAQ,EAAGA,MAAQ0G,WAAW/H,OAAQqB,QAAS,IACxC,IAAI4G,OAAO,IAAML,OAAS,aAC5BM,KAAKH,WAAW1G,QAAS,KAE3B8G,MADQ,IAAIF,OAAO,aACLG,KAAKL,WAAW1G,eAC3BgH,OAAOF,MAAM,YAIzB,MASXlL,uBAAuBsB,UAAU4B,UAAY,SAASjB,aAC3C7B,KAAKwB,0BAA0BK,KAAM,WAUhDjC,uBAAuBsB,UAAU0B,SAAW,SAAStB,aAC1CtB,KAAKwB,0BAA0BF,KAAM,UAShD1B,uBAAuBsB,UAAU2D,SAAW,SAASvD,aAC1CtB,KAAKwB,0BAA0BF,KAAM,UAShD1B,uBAAuBsB,UAAUqE,aAAe,SAAS1D,aAC9C7B,KAAKG,UAAUgB,KAAK,kBACvBnB,KAAK4C,SAASf,MADS,wBAGX7B,KAAK8C,UAAUjB,MAC3B,SAAW7B,KAAK4C,SAASf,MACzB,qBAURjC,uBAAuBsB,UAAUwE,sBAAwB,SAAS7D,KAAMoJ,eAChEA,OACOjL,KAAKG,UAAUgB,KAAK,kBACvBnB,KAAK4C,SAASf,MADS,wBAGX7B,KAAK8C,UAAUjB,MAC3B,SAAW7B,KAAK4C,SAASf,MACzB,aAAawC,IAAI,oBAElBrE,KAAKG,UAAUgB,KAAK,uBACXnB,KAAK8C,UAAUjB,MAC3B,SAAW7B,KAAK4C,SAASf,MACzB,aAAawC,IAAI,qBAUzBzE,uBAAuBsB,UAAUiG,QAAU,SAAStF,KAAM0C,qBAC/CvE,KAAKG,UAAUgB,KAAK,cAAgBnB,KAAK4C,SAASf,MAAQ,SAAW0C,mBAS5EsB,gBAAkB,CAIlBqF,0BAA0B,EAM1BC,6BAA8B,GAK9BjC,sBAAsB,EAKtBkC,UAAW,GAQXC,KAAM,SAASxL,YAAaC,aACxB+F,gBAAgBuF,UAAUvL,aAAe,IAAID,uBAAuBC,YAAaC,UAC5E+F,gBAAgBqF,2BACjBrF,gBAAgByF,qBAChBzF,gBAAgBqF,0BAA2B,IAE1CrF,gBAAgBsF,6BAA6BI,eAAe1L,aAAc,CAC3EgG,gBAAgBsF,6BAA6BtL,cAAe,MAExD2L,kBAAoBhL,SAAS4J,eAAevK,aAC5C2L,kBAAkB3H,UAAU4H,SAAS,YACpCD,kBAAkB3H,UAAU4H,SAAS,0BAEtC5F,gBAAgBC,uBAAuBvG,EAAEiM,mBAAmBrK,KAAK,oBAQ7EmK,mBAAoB,WAChB/L,EAAE,QACGmM,GAAG,UACA,oDACA7F,gBAAgBwC,gBACnBqD,GAAG,UACA,kFACA7F,gBAAgBwC,gBACnBqD,GAAG,yBAA0B7F,gBAAgB8F,kBAQtD7F,uBAAwB,SAAS9E,SAE7BA,QAAQ4K,OAAO,wBACf5K,QAAQ0K,GAAG,uBAAwB7F,gBAAgBe,kBAOvDA,gBAAiB,SAASC,GACtBA,EAAEsC,qBACE0C,SAAWhG,gBAAgBiG,oBAAoBjF,GAC/CgF,UACAA,SAASjF,gBAAgBC,IAQjCwB,eAAgB,SAASxB,OACjBhB,gBAAgBqD,sBAGpBrD,gBAAgBqD,sBAAuB,MACnC2C,SAAWhG,gBAAgBiG,oBAAoBjF,GAC/CgF,UACAA,SAASxD,eAAexB,KAUhCiF,oBAAqB,SAASjF,OACtBhH,YAAcN,EAAEsH,EAAEkF,eAAevJ,QAAQ,eAAeU,KAAK,aAC1D2C,gBAAgBuF,UAAUvL,cAWrC8L,gBAAiB,SAAS9E,EAAGhF,KAAMiF,OAAQ/G,OACvC8B,KAAKsC,YAAY,gBACjBtC,KAAKkC,IAAI,MAAO,IAAIA,IAAI,OAAQ,IAChC+C,OAAOlB,MAAM/D,MACbiF,OAAO3C,YAAY,eACkB,IAA1BtC,KAAKoD,KAAK,cAAyD,IAA1BpD,KAAKoD,KAAK,cAC1DpD,KAAKsC,YAAY,UAAU/D,SAAS,YACpCyB,KAAK2C,WAAW,YAChB3C,KAAKmK,WAAW,YACZnK,KAAKY,SAAS,aAAe1C,MAAM2F,sBAAsB7D,MAAM,GAAMc,OAAS,GAC9E5C,MAAM2F,sBAAsB7D,MAAM,GAAMoK,QAAQzI,eAGpB,IAAzB3B,KAAKoD,KAAK,aAAuD,IAAzBpD,KAAKoD,KAAK,aACzDpD,KAAKqG,QACLrG,KAAKmK,WAAW,iBAEkB,IAA3BlF,OAAO7B,KAAK,aAAyD,IAA3B6B,OAAO7B,KAAK,YAC7D6B,OAAOkF,WAAW,WAElBnG,gBAAgBqD,uBAChBrD,gBAAgBqD,sBAAuB,GAEvCnJ,MAAMqG,yBAENP,gBAAgBqG,kBAEhBnM,MAAME,eAAiBF,MAAMiG,8BAOrCkG,gBAAiB,iBACPC,aAAe3L,SAAS4J,eAAe,gBAC7C1K,kBAAkB0M,gBAAgBD,sBAOnC,CAOHd,KAAMxF,gBAAgBwF"}
\ No newline at end of file
diff --git a/question/type/ddwtos/amd/src/ddwtos.js b/question/type/ddwtos/amd/src/ddwtos.js
index d02bc003c25d9..941e992b9bd8d 100644
--- a/question/type/ddwtos/amd/src/ddwtos.js
+++ b/question/type/ddwtos/amd/src/ddwtos.js
@@ -41,12 +41,14 @@ define([
     'jquery',
     'core/dragdrop',
     'core/key_codes',
-    'core_form/changechecker'
+    'core_form/changechecker',
+    'core_filters/events',
 ], function(
     $,
     dragDrop,
     keys,
-    FormChangeChecker
+    FormChangeChecker,
+    filterEvent
 ) {
 
     "use strict";
@@ -59,14 +61,22 @@ define([
      * @constructor
      */
     function DragDropToTextQuestion(containerId, readOnly) {
+        const thisQ = this;
         this.containerId = containerId;
         this.questionAnswer = {};
+        this.questionDragDropWidthHeight = [];
         if (readOnly) {
             this.getRoot().addClass('qtype_ddwtos-readonly');
         }
         this.resizeAllDragsAndDrops();
         this.cloneDrags();
         this.positionDrags();
+        // Wait for all dynamic content loaded by filter to be completed.
+        document.addEventListener(filterEvent.eventTypes.filterContentRenderingComplete, (elements) => {
+            elements.detail.nodes.forEach((element) => {
+                thisQ.changeAllDragsAndDropsToFilteredContent(element);
+            });
+        });
     }
 
     /**
@@ -87,12 +97,12 @@ define([
      */
     DragDropToTextQuestion.prototype.resizeAllDragsAndDropsInGroup = function(group) {
         var thisQ = this,
-            dragHomes = this.getRoot().find('.draggrouphomes' + group + ' span.draghome'),
+            dragDropItems = this.getRoot().find('span.group' + group),
             maxWidth = 0,
             maxHeight = 0;
 
         // Find the maximum size of any drag in this groups.
-        dragHomes.each(function(i, drag) {
+        dragDropItems.each(function(i, drag) {
             maxWidth = Math.max(maxWidth, Math.ceil(drag.offsetWidth));
             maxHeight = Math.max(maxHeight, Math.ceil(0 + drag.offsetHeight));
         });
@@ -100,16 +110,85 @@ define([
         // The size we will want to set is a bit bigger than this.
         maxWidth += 8;
         maxHeight += 2;
-
+        thisQ.questionDragDropWidthHeight[group] = {maxWidth: maxWidth, maxHeight: maxHeight};
         // Set each drag home to that size.
-        dragHomes.each(function(i, drag) {
+        dragDropItems.each(function(i, drag) {
             thisQ.setElementSize(drag, maxWidth, maxHeight);
         });
+    };
+
+    /**
+     * Change all the drags and drops related to the item that has been changed by filter to correct size and content.
+     *
+     *  @param {object} filteredElement the element has been modified by filter.
+     */
+    DragDropToTextQuestion.prototype.changeAllDragsAndDropsToFilteredContent = function(filteredElement) {
+        let currentFilteredItem = $(filteredElement);
+        const parentIsDD = currentFilteredItem.parent().closest('span').hasClass('placed') ||
+            currentFilteredItem.parent().closest('span').hasClass('draghome');
+        const isDD = currentFilteredItem.hasClass('placed') || currentFilteredItem.hasClass('draghome');
+        // The filtered element or parent element should a drag or drop item.
+        if (!parentIsDD && !isDD) {
+            return;
+        }
+        if (parentIsDD) {
+            currentFilteredItem = currentFilteredItem.parent().closest('span');
+        }
+        const thisQ = this;
+        if (thisQ.getRoot().find(currentFilteredItem).length <= 0) {
+            // If the DD item doesn't belong to this question
+            // In case we have multiple questions in the same page.
+            return;
+        }
+        const group = thisQ.getGroup(currentFilteredItem),
+              choice = thisQ.getChoice(currentFilteredItem);
+        let listOfModifiedDragDrop = [];
+        // Get the list of drag and drop item within the same group and choice.
+        this.getRoot().find('.group' + group + '.choice' + choice).each(function(i, node) {
+            // Same modified item, skip it.
+            if ($(node).get(0) === currentFilteredItem.get(0)) {
+                return;
+            }
+            const originalClass = $(node).attr('class');
+            const originalStyle = $(node).attr('style');
+            // We want to keep all the handler and event for filtered item, so using clone is the only choice.
+            const filteredDragDropClone = currentFilteredItem.clone();
+            // Replace the class and style of the drag drop item we want to replace for the clone.
+            filteredDragDropClone.attr('class', originalClass);
+            filteredDragDropClone.attr('style', originalStyle);
+            // Insert into DOM.
+            $(node).before(filteredDragDropClone);
+            // Add the item has been replaced to a list so we can remove it later.
+            listOfModifiedDragDrop.push(node);
+        });
 
-        // Set each drop to that size.
-        this.getRoot().find('span.drop.group' + group).each(function(i, drop) {
-            thisQ.setElementSize(drop, maxWidth, maxHeight);
+        listOfModifiedDragDrop.forEach(function(node) {
+            $(node).remove();
         });
+        // Save the current height and width.
+        const currentHeight = currentFilteredItem.height();
+        const currentWidth = currentFilteredItem.width();
+        // Set to auto so we can get the real height and width of the filtered item.
+        currentFilteredItem.height('auto');
+        currentFilteredItem.width('auto');
+        // We need to set display block so we can get height and width.
+        // Some browser can't get the offsetWidth/Height if they are an inline element like span tag.
+        if (!filteredElement.offsetWidth || !filteredElement.offsetHeight) {
+            filteredElement.classList.add('d-block');
+        }
+        if (thisQ.questionDragDropWidthHeight[group].maxWidth < Math.ceil(filteredElement.offsetWidth) ||
+            thisQ.questionDragDropWidthHeight[group].maxHeight < Math.ceil(0 + filteredElement.offsetHeight)) {
+            // Remove the d-block class before calculation.
+            filteredElement.classList.remove('d-block');
+            // Now resize all the items in the same group if we have new maximum width or height.
+            thisQ.resizeAllDragsAndDropsInGroup(group);
+        } else {
+            // Return the original height and width in case the real height and width is not the maximum.
+            currentFilteredItem.height(currentHeight);
+            currentFilteredItem.width(currentWidth);
+        }
+        // Remove the d-block class after resize.
+        filteredElement.classList.remove('d-block');
     };
 
     /**
diff --git a/question/type/ddwtos/renderer.php b/question/type/ddwtos/renderer.php
index bf3d5b194f695..a98af708c7dd8 100644
--- a/question/type/ddwtos/renderer.php
+++ b/question/type/ddwtos/renderer.php
@@ -107,11 +107,9 @@ protected function embedded_element(question_attempt $qa, $place,
 
     protected function drag_boxes($qa, $group, $choices, question_display_options $options) {
         $boxes = '';
-        foreach ($choices as $key => $choice) {
-            // Bug 8632: long text entry causes bug in drag and drop field in IE.
-            $content = str_replace('-', '&#x2011;', $choice->text);
-            $content = str_replace(' ', '&#160;', $content);
 
+        foreach ($choices as $key => $choice) {
+            $content = question_utils::format_question_fragment($choice->text, $this->page->context);
             $infinite = '';
             if ($choice->infinite) {
                 $infinite = ' infinite';
diff --git a/question/type/ddwtos/styles.css b/question/type/ddwtos/styles.css
index 35fb15b0947fa..aa552cdaf505c 100644
--- a/question/type/ddwtos/styles.css
+++ b/question/type/ddwtos/styles.css
@@ -126,3 +126,7 @@
 .que.ddwtos sub {
     bottom: -0.2em;
 }
+
+.que.ddwtos .MathJax_Display {
+    margin: 0;
+}
diff --git a/question/type/ddwtos/tests/behat/preview.feature b/question/type/ddwtos/tests/behat/preview.feature
index bf44032cf46ca..77deea44ce98f 100644
--- a/question/type/ddwtos/tests/behat/preview.feature
+++ b/question/type/ddwtos/tests/behat/preview.feature
@@ -18,9 +18,10 @@ Feature: Preview a drag-drop into text question
       | contextlevel | reference | name           |
       | Course       | C1        | Test questions |
     And the following "questions" exist:
-      | questioncategory | qtype  | name                  | template |
-      | Test questions   | ddwtos | Drag to text          | fox      |
-      | Test questions   | ddwtos | Drag to text infinite | infinite |
+      | questioncategory | qtype  | name                     | template |
+      | Test questions   | ddwtos | Drag to text             | fox      |
+      | Test questions   | ddwtos | Drag to text infinite    | infinite |
+      | Test questions   | ddwtos | Drag to mathjax equation | mathjax  |
 
   @javascript @_bug_phantomjs
   Scenario: Preview a question using the mouse.
@@ -78,3 +79,12 @@ Feature: Preview a drag-drop into text question
     Then I should see "Option1" in the home area of drag and drop into text question
     And I should see "Option2" in the home area of drag and drop into text question
     And I should see "Option3" in the home area of drag and drop into text question
+
+  @javascript
+  Scenario: Preview a drag-drop into text question with mathjax question.
+    Given the "mathjaxloader" filter is "on"
+    And the "mathjaxloader" filter applies to "content and headings"
+    And I am on the "Drag to mathjax equation" "core_question > preview" page logged in as teacher
+    And I press "Fill in correct responses"
+    When I press "Submit and finish"
+    Then ".filter_mathjaxloader_equation" "css_element" should exist in the ".draghome" "css_element"
diff --git a/question/type/ddwtos/tests/helper.php b/question/type/ddwtos/tests/helper.php
index d5e8b9f063a27..9517a9720c735 100644
--- a/question/type/ddwtos/tests/helper.php
+++ b/question/type/ddwtos/tests/helper.php
@@ -34,7 +34,7 @@
  */
 class qtype_ddwtos_test_helper extends question_test_helper {
     public function get_test_questions() {
-        return array('fox', 'maths', 'oddgroups', 'missingchoiceno', 'infinite');
+        return ['fox', 'maths', 'oddgroups', 'missingchoiceno', 'infinite', 'mathjax'];
     }
 
     /**
@@ -156,6 +156,30 @@ public function get_ddwtos_question_form_data_missingchoiceno() {
         return $fromform;
     }
 
+    /**
+     * Get data required to save a drag-drop into text question where the the answer contain equation
+     *
+     *
+     * @return stdClass data to create a ddwtos question.
+     */
+    public function get_ddwtos_question_form_data_mathjax() {
+        $fromform = new stdClass();
+
+        $fromform->name = 'Drag-and-drop words into sentences question with equation';
+        $fromform->questiontext = ['text' => 'Fill in the correct mathjax equation: y = 2, x =4 : [[1]]', 'format' => FORMAT_HTML];
+        $fromform->defaultmark = 1.0;
+        $fromform->generalfeedback = ['text' => 'The right answer is: "y = x^2"', 'format' => FORMAT_HTML];
+        $fromform->choices = [
+            ['answer' => '$$ y = x^2 $$', 'choicegroup' => '1'],
+            ['answer' => '$$ y = x^5 $$', 'choicegroup' => '1'],
+        ];
+        test_question_maker::set_standard_combined_feedback_form_data($fromform);
+        $fromform->shownumcorrect = 0;
+        $fromform->penalty = 0.3333333;
+        $fromform->status = \core_question\local\bank\question_version_status::QUESTION_STATUS_READY;
+        return $fromform;
+    }
+
     /**
      * @return qtype_ddwtos_question
      */

From 8f2d505e38c62c4d36642171d1a6958317c4b28a Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Mon, 12 Feb 2024 22:21:26 +0000
Subject: [PATCH 006/119] MDL-80907 behat: be more precise in selecting table
 rows

---
 lib/tests/behat/behat_general.php | 174 ++++++++++++++++++++----------
 1 file changed, 117 insertions(+), 57 deletions(-)

diff --git a/lib/tests/behat/behat_general.php b/lib/tests/behat/behat_general.php
index b38bd60956df5..74651ceaf4418 100644
--- a/lib/tests/behat/behat_general.php
+++ b/lib/tests/behat/behat_general.php
@@ -1423,31 +1423,8 @@ public function row_column_of_table_should_contain($row, $column, $table, $value
 
         $rowliteral = behat_context_helper::escape($row);
         $valueliteral = behat_context_helper::escape($value);
-        $columnliteral = behat_context_helper::escape($column);
-
-        if (preg_match('/^-?(\d+)-?$/', $column, $columnasnumber)) {
-            // Column indicated as a number, just use it as position of the column.
-            $columnpositionxpath = "/child::*[position() = {$columnasnumber[1]}]";
-        } else {
-            // Header can be in thead or tbody (first row), following xpath should work.
-            $theadheaderxpath = "thead/tr[1]/th[(normalize-space(.)=" . $columnliteral . " or a[normalize-space(text())=" .
-                    $columnliteral . "] or div[normalize-space(text())=" . $columnliteral . "])]";
-            $tbodyheaderxpath = "tbody/tr[1]/td[(normalize-space(.)=" . $columnliteral . " or a[normalize-space(text())=" .
-                    $columnliteral . "] or div[normalize-space(text())=" . $columnliteral . "])]";
 
-            // Check if column exists.
-            $columnheaderxpath = $tablexpath . "[" . $theadheaderxpath . " | " . $tbodyheaderxpath . "]";
-            $columnheader = $this->getSession()->getDriver()->find($columnheaderxpath);
-            if (empty($columnheader)) {
-                $columnexceptionmsg = $column . '" in table "' . $table . '"';
-                throw new ElementNotFoundException($this->getSession(), "\n$columnheaderxpath\n\n".'Column', null, $columnexceptionmsg);
-            }
-            // Following conditions were considered before finding column count.
-            // 1. Table header can be in thead/tr/th or tbody/tr/td[1].
-            // 2. First column can have th (Gradebook -> user report), so having lenient sibling check.
-            $columnpositionxpath = "/child::*[position() = count(" . $tablexpath . "/" . $theadheaderxpath .
-                "/preceding-sibling::*) + 1]";
-        }
+        $columnpositionxpath = $this->get_table_column_xpath($table, $column);
 
         // Check if value exists in specific row/column.
         // Get row xpath.
@@ -1489,6 +1466,99 @@ public function row_column_of_table_should_not_contain($row, $column, $table, $v
         );
     }
 
+    /**
+     * Get xpath for a row child that corresponds to the specified column header
+     *
+     * @param string $table table identifier that can be used with 'table' node selector (i.e. table title or CSS class)
+     * @param string $column either text in the column header or the column number, such as -1-, -2-, etc
+     *      When matching the column header it has to be either exact match of the whole header or an exact
+     *      match of a text inside a link in the header.
+     *      For example, to match "<a>First name</a> / <a>Last name</a>" you need to specify either "First name" or "Last name"
+     * @return string
+     */
+    protected function get_table_column_xpath(string $table, string $column): string {
+        $tablenode = $this->get_selected_node('table', $table);
+        $tablexpath = $tablenode->getXpath();
+        $columnliteral = behat_context_helper::escape($column);
+        if (preg_match('/^-?(\d+)-?$/', $column, $columnasnumber)) {
+            // Column indicated as a number, just use it as position of the column.
+            $columnpositionxpath = "/child::*[position() = {$columnasnumber[1]}]";
+        } else {
+            // Header can be in thead or tbody (first row), following xpath should work.
+            $theadheaderxpath = "thead/tr[1]/th[(normalize-space(.)={$columnliteral} or a[normalize-space(text())=" .
+                    $columnliteral . "] or div[normalize-space(text())={$columnliteral}])]";
+            $tbodyheaderxpath = "tbody/tr[1]/td[(normalize-space(.)={$columnliteral} or a[normalize-space(text())=" .
+                    $columnliteral . "] or div[normalize-space(text())={$columnliteral}])]";
+
+            // Check if column exists.
+            $columnheaderxpath = "{$tablexpath}[{$theadheaderxpath} | {$tbodyheaderxpath}]";
+            $columnheader = $this->getSession()->getDriver()->find($columnheaderxpath);
+            if (empty($columnheader)) {
+                if (strpos($column, '/') !== false) {
+                    // We are not able to match headers consisting of several links, such as "First name / Last name".
+                    // Instead we can match "First name" or "Last name" or "-1-" (column number).
+                    throw new Exception("Column matching locator \"$column\" not found. ".
+                        "If the column header contains multiple links, specify only one of the link texts. ".
+                        "Otherwise, use the column number as the locator");
+                }
+                $columnexceptionmsg = $column . '" in table "' . $table . '"';
+                throw new ElementNotFoundException($this->getSession(), "\n$columnheaderxpath\n\n".'Column',
+                    null, $columnexceptionmsg);
+            }
+            // Following conditions were considered before finding column count.
+            // 1. Table header can be in thead/tr/th or tbody/tr/td[1].
+            // 2. First column can have th (Gradebook -> user report), so having lenient sibling check.
+            $columnpositionxpath = "/child::*[position() = count({$tablexpath}/{$theadheaderxpath}" .
+                "/preceding-sibling::*) + 1]";
+        }
+        return $columnpositionxpath;
+    }
+
+    /**
+     * Find a table row where each of the specified columns matches and throw exception if not found
+     *
+     * @param string $table table locator
+     * @param array $cells key is the column locator (name or index such as '-1-') and value is the text contents of the table cell
+     */
+    protected function ensure_table_row_exists(string $table, array $cells): void {
+        $tablenode = $this->get_selected_node('table', $table);
+        $tablexpath = $tablenode->getXpath();
+
+        $columnconditions = [];
+        foreach ($cells as $columnname => $value) {
+            $valueliteral = behat_context_helper::escape($value);
+            $columnpositionxpath = $this->get_table_column_xpath($table, $columnname);
+            $columnconditions[] = '.' . $columnpositionxpath . "[contains(normalize-space(.)," . $valueliteral . ")]";
+        }
+        $rowxpath = $tablexpath . "/tbody/tr[" . join(' and ', $columnconditions) . ']';
+
+        $rownode = $this->getSession()->getDriver()->find($rowxpath);
+        if (empty($rownode)) {
+            $rowlocator = array_map(fn($k) => "{$k} => {$cells[$k]}", array_keys($cells));
+            throw new ElementNotFoundException($this->getSession(), "\n$rowxpath\n\n".'Table row', null, join(', ', $rowlocator));
+        }
+    }
+
+    /**
+     * Find a table row where each of the specified columns matches and throw exception if found
+     *
+     * @param string $table table locator
+     * @param array $cells key is the column locator (name or index such as '-1-') and value is the text contents of the table cell
+     */
+    protected function ensure_table_row_does_not_exist(string $table, array $cells): void {
+        try {
+            $this->ensure_table_row_exists($table, $cells);
+            // Throw exception if found.
+        } catch (ElementNotFoundException $e) {
+            // Table row/column doesn't contain this value. Nothing to do.
+            return;
+        }
+        $rowlocator = array_map(fn($k) => "{$k} => {$cells[$k]}", array_keys($cells));
+        throw new ExpectationException('Table row "' . join(', ', $rowlocator) .
+            '" is present in the table "' . $table . '"', $this->getSession()
+        );
+    }
+
     /**
      * Checks that the provided value exist in table.
      *
@@ -1505,29 +1575,22 @@ public function row_column_of_table_should_not_contain($row, $column, $table, $v
      */
     public function following_should_exist_in_the_table($table, TableNode $data) {
         $datahash = $data->getHash();
+        if ($datahash && count($data->getRow(0)) != count($datahash[0])) {
+            // Check that the number of columns in the hash is the same as the number of the columns in the first row.
+            throw new coding_exception('Table contains duplicate column headers');
+        }
 
         foreach ($datahash as $row) {
-
-            // Row contains only a single column, just assert it's present in the table.
-            if (count($row) === 1) {
-                $this->execute('behat_general::assert_element_contains_text', [reset($row), $table, 'table']);
-            } else {
-                // Iterate over all columns.
-                $firstcell = null;
-                foreach ($row as $column => $value) {
-                    if ($firstcell === null) {
-                        $firstcell = $value;
-                    } else {
-                        $this->row_column_of_table_should_contain($firstcell, $column, $table, $value);
-                    }
-                }
-            }
+            $this->ensure_table_row_exists($table, $row);
         }
     }
 
     /**
      * Checks that the provided values do not exist in a table.
      *
+     * If there are more than two columns, we check that NEITHER of the columns 2..n match
+     * in the row where the first column matches
+     *
      * @Then /^the following should not exist in the "(?P<table_string>[^"]*)" table:$/
      * @throws ExpectationException
      * @param string $table name of table
@@ -1537,27 +1600,24 @@ public function following_should_exist_in_the_table($table, TableNode $data) {
      */
     public function following_should_not_exist_in_the_table($table, TableNode $data) {
         $datahash = $data->getHash();
+        if ($datahash && count($data->getRow(0)) != count($datahash[0])) {
+            // Check that the number of columns in the hash is the same as the number of the columns in the first row.
+            throw new coding_exception('Table contains duplicate column headers');
+        }
 
         foreach ($datahash as $value) {
-
-            // Row contains only a single column, just assert it's not present in the table.
-            if (count($value) === 1) {
-                $this->execute('behat_general::assert_element_not_contains_text', [reset($value), $table, 'table']);
-            } else {
-                // Iterate over all columns.
-                $row = array_shift($value);
-                foreach ($value as $column => $value) {
-                    try {
-                        $this->row_column_of_table_should_contain($row, $column, $table, $value);
-                        // Throw exception if found.
-                    } catch (ElementNotFoundException $e) {
-                        // Table row/column doesn't contain this value. Nothing to do.
-                        continue;
-                    }
-                    throw new ExpectationException('"' . $column . '" with value "' . $value . '" is present in "' .
-                        $row . '"  row for table "' . $table . '"', $this->getSession()
-                    );
+            if (count($value) > 2) {
+                // When there are more than two columns, what we really want to check is that for the rows
+                // where the first column matches, NEITHER of the other columns match.
+                $columns = array_keys($value);
+                for ($i = 1; $i < count($columns); $i++) {
+                    $this->ensure_table_row_does_not_exist($table, [
+                        $columns[0] => $value[$columns[0]],
+                        $columns[$i] => $value[$columns[$i]],
+                    ]);
                 }
+            } else {
+                $this->ensure_table_row_does_not_exist($table, $value);
             }
         }
     }

From 49ab83c1a4c6a27009d23bb4e1637dc33fd63d62 Mon Sep 17 00:00:00 2001
From: Marina Glancy <marina@moodle.com>
Date: Mon, 12 Feb 2024 23:30:20 +0000
Subject: [PATCH 007/119] MDL-80907 various: fixes to incorrect column
 selectors in behat

---
 admin/tests/behat/browse_users.feature        | 12 ++--
 .../logstore_store_visibility_change.feature  |  2 +-
 .../task/tests/behat/manage_tasks.feature     |  4 +-
 comment/tests/behat/manage.feature            |  2 +-
 enrol/cohort/tests/behat/enrolcohorts.feature |  4 +-
 .../grader/tests/behat/switch_views.feature   | 12 ++--
 .../tests/behat/tertiary_name_filter.feature  | 14 ++--
 .../tertiary_navigation_searching.feature     |  9 +++
 .../tests/behat/basic_functionality.feature   | 10 +--
 .../singleview/tests/behat/singleview.feature |  2 +-
 grade/tests/behat/grade_import.feature        |  2 +-
 .../tests/behat/grade_letter_boundary.feature |  2 +-
 .../grade_letter_boundary_20160518.feature    |  2 +-
 .../grade_regrade_do_not_override.feature     |  8 +--
 grade/tests/behat/grade_scales.feature        |  4 +-
 .../behat/grade_single_item_scales.feature    |  4 +-
 .../behat/toggle_grade_categories.feature     | 72 ++++++++-----------
 group/tests/behat/private_groups.feature      | 20 +++---
 .../tests/behat/course_summary.feature        | 18 ++---
 .../tests/behat/summary_filter_groups.feature | 24 +++----
 .../behat/summary_filter_no_groups.feature    |  2 +-
 .../configlog/tests/behat/view_report.feature |  2 +-
 reportbuilder/tests/behat/audience.feature    |  2 +-
 user/tests/behat/table_sorting.feature        |  2 +-
 24 files changed, 114 insertions(+), 121 deletions(-)

diff --git a/admin/tests/behat/browse_users.feature b/admin/tests/behat/browse_users.feature
index 0c6a8e309d7d8..b06f508de9dac 100644
--- a/admin/tests/behat/browse_users.feature
+++ b/admin/tests/behat/browse_users.feature
@@ -18,7 +18,7 @@ Feature: An administrator can browse user accounts
     When I navigate to "Users > Accounts > Browse list of users" in site administration
     # Name field always present, email field is default for showidentity.
     Then the following should exist in the "reportbuilder-table" table:
-      | First name / Last name | Email address   |
+      | First name           | Email address   |
       | User One             | one@example.com |
       | User Two             | two@example.com |
     # Should not see other identity fields or non-default name fields.
@@ -34,7 +34,7 @@ Feature: An administrator can browse user accounts
       | alternativefullnameformat | firstnamephonetic lastname |
     When I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "reportbuilder-table" table:
-      | First name - phonetic / Last name | Email address   |
+      | First name - phonetic           | Email address   |
       | Yewzer One                      | one@example.com |
       | Yoozare Two                     | two@example.com |
 
@@ -43,7 +43,7 @@ Feature: An administrator can browse user accounts
       | showuseridentity | department,profile_field_frog |
     When I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "reportbuilder-table" table:
-      | First name / Last name | Favourite frog  | Department |
+      | First name           | Favourite frog  | Department |
       | User One             | Kermit          | Attack     |
       | User Two             | Tree            | Defence    |
     And I should not see "Email address" in the "table" "css_element"
@@ -103,7 +103,7 @@ Feature: An administrator can browse user accounts
       | user3    | User      | Three    | three@example.com | Glass              |
     And I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "reportbuilder-table" table:
-      | First name / Last name | Email address     |
+      | First name             | Email address     |
       | User One               | one@example.com   |
       | User Two               | two@example.com   |
       | User Three             | three@example.com |
@@ -137,7 +137,7 @@ Feature: An administrator can browse user accounts
       | user2 | C1     | student |
     And I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "reportbuilder-table" table:
-      | First name / Last name | Email address     |
+      | First name             | Email address     |
       | User One               | one@example.com   |
       | User Two               | two@example.com   |
     And I click on "Filters" "button"
@@ -166,7 +166,7 @@ Feature: An administrator can browse user accounts
       | user1 | coursecreator | system       |           |
     And I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "reportbuilder-table" table:
-      | First name / Last name | Email address     |
+      | First name             | Email address     |
       | User One               | one@example.com   |
       | User Two               | two@example.com   |
       | User Three             | three@example.com |
diff --git a/admin/tool/log/tests/behat/logstore_store_visibility_change.feature b/admin/tool/log/tests/behat/logstore_store_visibility_change.feature
index 79e5ebfe53a4f..39641c02e3d72 100644
--- a/admin/tool/log/tests/behat/logstore_store_visibility_change.feature
+++ b/admin/tool/log/tests/behat/logstore_store_visibility_change.feature
@@ -14,6 +14,6 @@ Feature: In a report, admin can see logstore visibility changes
     And I click on "Enable" "icon" in the "External database log" "table_row"
     And I navigate to "Reports > Config changes" in site administration
     Then the following should exist in the "reportbuilder-table" table:
-      | User       | Plugin               | Setting                  | New value | Original value |
+      | First name | Plugin               | Setting                  | New value | Original value |
       | Admin User | logstore_standard    | tool_logstore_visibility | 0         | 1              |
       | Admin User | logstore_database    | tool_logstore_visibility | 1         | 0              |
diff --git a/admin/tool/task/tests/behat/manage_tasks.feature b/admin/tool/task/tests/behat/manage_tasks.feature
index dd27d85f713e5..3fb58f25d8a0b 100644
--- a/admin/tool/task/tests/behat/manage_tasks.feature
+++ b/admin/tool/task/tests/behat/manage_tasks.feature
@@ -62,8 +62,8 @@ Feature: Manage scheduled tasks
     And I press "Save changes"
     Then I should see "Changes saved"
     And the following should not exist in the "admintable" table:
-      | Name               | Component    | Minute | Hour | Day | Day of week | Month |
-      | Log table cleanup  | Standard log | */5    | 1    | 2   | 4           | 3     |
+      | Name               | Minute | Hour | Day | Day of week | Month |
+      | Log table cleanup  | */5    | 1    | 2   | 4           | 3     |
     And I should see "Log table cleanup" in the "tr.table-primary" "css_element"
 
   Scenario: Disabled plugin's tasks are labelled as disabled too
diff --git a/comment/tests/behat/manage.feature b/comment/tests/behat/manage.feature
index 8f59e9dd185b0..64b231f8cd2ef 100644
--- a/comment/tests/behat/manage.feature
+++ b/comment/tests/behat/manage.feature
@@ -17,7 +17,7 @@ Feature: Manage comments made by users
   Scenario: View and filter site comments
     When I navigate to "Reports > Comments" in site administration
     And the following should exist in the "reportbuilder-table" table:
-      | -0-        | Content | Context URL      |
+      | First name | Content | Context URL      |
       | Admin User | Uno     | Course: Course 1 |
       | Admin User | Dos     | Course: Course 1 |
       | Admin User | Tres    | Course: Course 1 |
diff --git a/enrol/cohort/tests/behat/enrolcohorts.feature b/enrol/cohort/tests/behat/enrolcohorts.feature
index 2571dc52cbebf..a59b8a48029c6 100644
--- a/enrol/cohort/tests/behat/enrolcohorts.feature
+++ b/enrol/cohort/tests/behat/enrolcohorts.feature
@@ -83,11 +83,11 @@ Feature: Cohort enrolment management
     And I navigate to course participants
     # Verifies students 1 and 4 are in the cohort and student 2 is not any more.
     And the following should exist in the "participants" table:
-      | First name / Last name | Email address  | Roles   | Groups        |
+      | First name             | Email address  | Roles   | Groups        |
       | Sandra Cole            | s1@example.com | Student | Alpha1 cohort |
       | Jane Doe               | s4@example.com | Student | Alpha1 cohort |
     And the following should not exist in the "participants" table:
-      | First name / Last name | Email address  | Roles   | Groups        |
+      | First name             | Email address  | Roles   | Groups        |
       | John Smith             | s2@example.com | Student | Alpha1 cohort |
 
   @javascript
diff --git a/grade/report/grader/tests/behat/switch_views.feature b/grade/report/grader/tests/behat/switch_views.feature
index 8560e94ac0f2d..d493e43a746d5 100644
--- a/grade/report/grader/tests/behat/switch_views.feature
+++ b/grade/report/grader/tests/behat/switch_views.feature
@@ -48,7 +48,7 @@ Feature: We can change what we are viewing on the grader report
     And I should see "Manual grade"
     And I should see "Course total"
     And the following should exist in the "user-grades" table:
-      | -1-                | -1-                  | -3-       | -4-       | -5-       | -6-       |
+      | -1-                | -2-                  | -3-       | -4-       | -5-       | -6-       |
       | Student 1          | student1@example.com | 80        | 90        | 30        | 170       |
     And I click on grade item menu "Course 1" of type "course" on "grader" page
     And I choose "Show totals only" in the open action menu
@@ -57,7 +57,7 @@ Feature: We can change what we are viewing on the grader report
     And I should not see "Manual grade"
     And I should see "Course total"
     And the following should exist in the "user-grades" table:
-      | -1-                | -1-                  | -3-       |
+      | -1-                | -2-                  | -3-       |
       | Student 1          | student1@example.com | 170       |
     And I click on grade item menu "Course 1" of type "course" on "grader" page
     And I click on "Show grades only" "link"
@@ -66,7 +66,7 @@ Feature: We can change what we are viewing on the grader report
     And I should see "Manual grade"
     And I should not see "Course total"
     And the following should exist in the "user-grades" table:
-      | -1-                | -1-                  | -3-       | -4-       | -5-       |
+      | -1-                | -2-                  | -3-       | -4-       | -5-       |
       | Student 1          | student1@example.com | 80        | 90        | 30        |
 
   @javascript @skip_chrome_zerosize
@@ -83,7 +83,7 @@ Feature: We can change what we are viewing on the grader report
     And I should see "Manual grade"
     And I should see "Course total"
     And the following should exist in the "user-grades" table:
-      | -1-                | -1-                  | -3-       | -4-       | -5-       | -6-       |
+      | -1-                | -2-                  | -3-       | -4-       | -5-       | -6-       |
       | Student 1          | student1@example.com | 80        | -         | 30        | 105.71    |
     And I click on grade item menu "Course 1" of type "course" on "grader" page
     And I choose "Show totals only" in the open action menu
@@ -92,7 +92,7 @@ Feature: We can change what we are viewing on the grader report
     And I should not see "Manual grade"
     And I should see "Course total"
     And the following should exist in the "user-grades" table:
-      | -1-                | -1-                  | -3-       |
+      | -1-                | -2-                  | -3-       |
       | Student 1          | student1@example.com | 105.71    |
     And I click on grade item menu "Course 1" of type "course" on "grader" page
     When I click on "Show grades only" "link"
@@ -101,5 +101,5 @@ Feature: We can change what we are viewing on the grader report
     And I should see "Manual grade"
     And I should not see "Course total"
     And the following should exist in the "user-grades" table:
-      | -1-                | -1-                  | -3-       | -4-       | -5-       |
+      | -1-                | -2-                  | -3-       | -4-       | -5-       |
       | Student 1          | student1@example.com | 80        | -         | 30        |
diff --git a/grade/report/grader/tests/behat/tertiary_name_filter.feature b/grade/report/grader/tests/behat/tertiary_name_filter.feature
index ae82f47d565b6..f962bf861eb3b 100644
--- a/grade/report/grader/tests/behat/tertiary_name_filter.feature
+++ b/grade/report/grader/tests/behat/tertiary_name_filter.feature
@@ -156,10 +156,10 @@ Feature: Within the grader report, test that we can open our generic filter drop
     When I press "Apply"
     And the field "Search users" matches value "Student 1"
     Then the following should exist in the "user-grades" table:
-      | -1-                | -1-                  | -3- |
+      | -1-                | -2-                  | -3- |
       | Student 1          | student1@example.com | -   |
     And the following should not exist in the "user-grades" table:
-      | -1-                | -1-                  | -3- |
+      | -1-                | -2-                  | -3- |
       | Teacher 1          | teacher1@example.com | -   |
       | Dummy User         | student2@example.com | -   |
       | User Example       | student3@example.com | -   |
@@ -169,7 +169,7 @@ Feature: Within the grader report, test that we can open our generic filter drop
     And I select "M" in the "First name" "core_grades > initials bar"
     And I press "Apply"
     And the following should not exist in the "user-grades" table:
-      | -1-                | -1-                  | -3- |
+      | -1-                | -2-                  | -3- |
       | Student 1          | student1@example.com | -   |
       | Teacher 1          | teacher1@example.com | -   |
       | Dummy User         | student2@example.com | -   |
@@ -181,12 +181,12 @@ Feature: Within the grader report, test that we can open our generic filter drop
     Given I set the field "Search users" to "User"
     And I click on "View all results (3)" "option_role"
     And the following should exist in the "user-grades" table:
-      | -1-                | -1-                  | -3- |
+      | -1-                | -2-                  | -3- |
       | User Example       | student3@example.com | -   |
       | User Test          | student4@example.com | -   |
       | Dummy User         | student2@example.com | -   |
     And the following should not exist in the "user-grades" table:
-      | -1-                | -1-                  | -3- |
+      | -1-                | -2-                  | -3- |
       | Student 1          | student1@example.com | -   |
       | Teacher 1          | teacher1@example.com | -   |
       | Turtle Manatee     | student5@example.com | -   |
@@ -194,10 +194,10 @@ Feature: Within the grader report, test that we can open our generic filter drop
     And I select "E" in the "Last name" "core_grades > initials bar"
     And I press "Apply"
     Then the following should exist in the "user-grades" table:
-      | -1-                | -1-                  | -3- |
+      | -1-                | -2-                  | -3- |
       | User Example       | student3@example.com | -   |
     And the following should not exist in the "user-grades" table:
-      | -1-                | -1-                  | -3- |
+      | -1-                | -2-                  | -3- |
       | Student 1          | student1@example.com | -   |
       | Teacher 1          | teacher1@example.com | -   |
       | Dummy User         | student2@example.com | -   |
diff --git a/grade/report/grader/tests/behat/tertiary_navigation_searching.feature b/grade/report/grader/tests/behat/tertiary_navigation_searching.feature
index b9319b3f7dea9..3f787e7a89c2b 100644
--- a/grade/report/grader/tests/behat/tertiary_navigation_searching.feature
+++ b/grade/report/grader/tests/behat/tertiary_navigation_searching.feature
@@ -274,6 +274,8 @@ Feature: Within the grader report, test that we can search for users
     And I press the up key
     And I press the enter key
     And I wait to be redirected
+    # Sometimes with behat we get unattached nodes causing spurious failures.
+    And I wait "1" seconds
     And the following should exist in the "user-grades" table:
       | -1-                |
       | Dummy User         |
@@ -284,6 +286,13 @@ Feature: Within the grader report, test that we can search for users
       | Teacher 1          |
       | Student 1          |
       | Turtle Manatee     |
+    And I set the field "Search users" to "ABC"
+    And I wait until "Turtle Manatee" "option_role" exists
+    And I press the tab key
+    And the focused element is "Clear search input" "button"
+    And I press the enter key
+    And I wait until the page is ready
+    And I confirm "Turtle Manatee" in "user" search within the gradebook widget does not exist
 
   Scenario: Once a teacher searches, it'll apply the currently set filters and inform the teacher as such
     # Set up a basic filtering case.
diff --git a/grade/report/history/tests/behat/basic_functionality.feature b/grade/report/history/tests/behat/basic_functionality.feature
index 0889b4e176b43..8e2ca357014fa 100644
--- a/grade/report/history/tests/behat/basic_functionality.feature
+++ b/grade/report/history/tests/behat/basic_functionality.feature
@@ -51,7 +51,7 @@ Feature: A teacher checks the grade history report in a course
     And I navigate to "View > Grade history" in the course gradebook
     When I press "Submit"
     Then the following should exist in the "gradereport_history" table:
-      | First name/Last name | Email address        | Favourite food | Grade item                   | Original grade | Revised grade | Grader    |
+      | First name         | Email address        | Favourite food | Grade item                   | Original grade | Revised grade | Grader    |
       | Student 1          | student1@example.com | apple          | The greatest assignment ever |                | 50.00         | Teacher 1 |
       | Student 1          | student1@example.com | apple          | Rewarding assignment         |                | 60.00         | Teacher 1 |
       | Student 2          | student2@example.com | orange         | The greatest assignment ever |                | 50.00         | Teacher 1 |
@@ -79,7 +79,7 @@ Feature: A teacher checks the grade history report in a course
     And I press "Finish selecting users"
     And I press "Submit"
     And the following should exist in the "gradereport_history" table:
-      | First name/Last name | Grade item                    | Original grade | Revised grade | Grader    |
+      | First name         | Grade item                    | Original grade | Revised grade | Grader    |
       | Student 1          | The greatest assignment ever  |                | 50.00         | Teacher 1 |
       | Student 1          | Rewarding assignment          |                | 60.00         | Teacher 1 |
       | Student 1          | The greatest assignment ever  | 50.00          | 70.00         | Teacher 2 |
@@ -96,7 +96,7 @@ Feature: A teacher checks the grade history report in a course
     And I set the field "Grade item" to "The greatest assignment ever"
     And I press "Submit"
     And the following should exist in the "gradereport_history" table:
-      | First name/Last name | Grade item                    | Original grade | Revised grade | Grader    |
+      | First name         | Grade item                    | Original grade | Revised grade | Grader    |
       | Student 1          | The greatest assignment ever  |                | 50.00         | Teacher 1 |
       | Student 1          | The greatest assignment ever  | 50.00          | 70.00         | Teacher 2 |
     And the following should not exist in the "gradereport_history" table:
@@ -106,7 +106,7 @@ Feature: A teacher checks the grade history report in a course
     And I set the field "Grader" to "Teacher 1"
     And I press "Submit"
     And the following should exist in the "gradereport_history" table:
-      | First name/Last name | Email address        | Favourite food | Grade item                    | Original grade | Revised grade | Grader    |
+      | First name         | Email address        | Favourite food | Grade item                    | Original grade | Revised grade | Grader    |
       | Student 1          | student1@example.com | apple          | The greatest assignment ever  |                | 50.00         | Teacher 1 |
     And the following should not exist in the "gradereport_history" table:
       | Student 1          | The greatest assignment ever  | 50.00          | 70.00         | Teacher 2 |
@@ -114,5 +114,5 @@ Feature: A teacher checks the grade history report in a course
     And I click on "id_revisedonly" "checkbox"
     And I press "Submit"
     And the following should exist in the "gradereport_history" table:
-      | First name/Last name | Email address        | Favourite food | Grade item                    | Original grade | Revised grade | Grader    |
+      | First name         | Email address        | Favourite food | Grade item                    | Original grade | Revised grade | Grader    |
       | Student 1          | student1@example.com | apple          | The greatest assignment ever  |                | 50.00         | Teacher 1 |
diff --git a/grade/report/singleview/tests/behat/singleview.feature b/grade/report/singleview/tests/behat/singleview.feature
index 1cb9f29b24c01..5475a4204fb5c 100644
--- a/grade/report/singleview/tests/behat/singleview.feature
+++ b/grade/report/singleview/tests/behat/singleview.feature
@@ -93,7 +93,7 @@ Feature: We can use Single view
     And I press "Save"
     Then I should see "Grades were set for 1 items"
     And the following should exist in the "generaltable" table:
-        | First name (Alternate name) Last name | Grade |
+        | User full name                | Grade     |
         | Ann, Jill, Grainne, Beauchamp | Very good |
     And I am on the "Course 1" "grades > Single view > View" page logged in as "teacher2"
     And I click on "Users" "link" in the ".page-toggler" "css_element"
diff --git a/grade/tests/behat/grade_import.feature b/grade/tests/behat/grade_import.feature
index a5ea6f6feb3a7..f468d4cefbd70 100644
--- a/grade/tests/behat/grade_import.feature
+++ b/grade/tests/behat/grade_import.feature
@@ -62,7 +62,7 @@ Feature: An admin can import grades into gradebook using a CSV file
     And I should see "Grade import success"
     And I click on "Continue" "button"
     Then the following should exist in the "user-grades" table:
-      | -1-                | -1-                  | -3-       | -4-       |
+      | -1-                | -2-                  | -3-       | -4-       |
       | Student 1          | student1@example.com | 400.00    | 400.00    |
       | Student 2          | student2@example.com |  50.00    |  50.00    |
       | Student 3          | student3@example.com |  50.00    |  50.00    |
diff --git a/grade/tests/behat/grade_letter_boundary.feature b/grade/tests/behat/grade_letter_boundary.feature
index 2cf197229302a..7265ffbbe49c8 100644
--- a/grade/tests/behat/grade_letter_boundary.feature
+++ b/grade/tests/behat/grade_letter_boundary.feature
@@ -37,5 +37,5 @@ Feature: We can customise the letter boundary of a course.
     And I am on "Course 1" course homepage with editing mode off
     And I navigate to "View > Grader report" in the course gradebook
     Then the following should exist in the "user-grades" table:
-      | -1-       |  -1-                    |-3-  | -4- |
+      | -1-       |  -2-                    |-3-  | -4- |
       | Student 1 |  student1@example.com   | D   | D   |
diff --git a/grade/tests/behat/grade_letter_boundary_20160518.feature b/grade/tests/behat/grade_letter_boundary_20160518.feature
index 9c6636e983733..a984da8d62b4d 100644
--- a/grade/tests/behat/grade_letter_boundary_20160518.feature
+++ b/grade/tests/behat/grade_letter_boundary_20160518.feature
@@ -38,5 +38,5 @@ Feature: We can customise the letter boundary of a course in gradebook version 2
     And I am on "Course 1" course homepage with editing mode off
     And I navigate to "View > Grader report" in the course gradebook
     Then the following should exist in the "user-grades" table:
-      | -1-       |  -1-                    | -3- | -4- |
+      | -1-       |  -2-                    | -3- | -4- |
       | Student 1 |  student1@example.com   | F   | F   |
diff --git a/grade/tests/behat/grade_regrade_do_not_override.feature b/grade/tests/behat/grade_regrade_do_not_override.feature
index d20e68ed24c96..0dd89994422b9 100644
--- a/grade/tests/behat/grade_regrade_do_not_override.feature
+++ b/grade/tests/behat/grade_regrade_do_not_override.feature
@@ -32,8 +32,8 @@ Feature: Regrading grades does not unnecessarily mark some as overriden
     And I press "Save changes"
     And I am on the "Course 1" "grades > Grader report > View" page
     And the following should exist in the "gradereport-grader-table" table:
-      |                      |              |              |
-      | First name / Last name | Assignment 1 | Course total |
+      | -1-                  | -3-          | -4-          |
+      | First name           | Assignment 1 | Course total |
       | Student 1            | 80.00        | 80.00        |
       | Student 2            | 60.00        | 60.00        |
     And I turn editing mode on
@@ -64,7 +64,7 @@ Feature: Regrading grades does not unnecessarily mark some as overriden
     When I am on the "Course 1" "grades > Grader report > View" page
     And I turn editing mode off
     Then the following should exist in the "gradereport-grader-table" table:
-      |                      |              |              |
-      | First name / Last name | Assignment 1 | Course total |
+      | -1-                  | -3-          | -4-          |
+      | First name           | Assignment 1 | Course total |
       | Student 1            | 90.00        | 180.00       |
       | Student 2            | 70.00        | 160.00       |
diff --git a/grade/tests/behat/grade_scales.feature b/grade/tests/behat/grade_scales.feature
index 64d126751981b..fee7dd54f357a 100644
--- a/grade/tests/behat/grade_scales.feature
+++ b/grade/tests/behat/grade_scales.feature
@@ -73,7 +73,7 @@ Feature: View gradebook when scales are used
   Scenario: Test displaying scales in gradebook in aggregation method Natural
     When I turn editing mode off
     Then the following should exist in the "user-grades" table:
-      | -1-                | -1-                  | -3-      | -4-            | -5-          |
+      | -1-                | -2-                  | -3-      | -4-            | -5-          |
       | Student 1          | student1@example.com | A        | 5.00           | 5.00         |
       | Student 2          | student2@example.com | B        | 4.00           | 4.00         |
       | Student 3          | student3@example.com | C        | 3.00           | 3.00         |
@@ -116,7 +116,7 @@ Feature: View gradebook when scales are used
       | Minimum grade | 1                            |
     And I turn editing mode off
     Then the following should exist in the "user-grades" table:
-      | -1-                | -1-                  | -3-      | -4-            | -5-            |
+      | -1-                | -2-                  | -3-      | -4-            | -5-            |
       | Student 1          | student1@example.com | A        | 5.00           | <coursetotal1> |
       | Student 2          | student2@example.com | B        | 4.00           | <coursetotal2> |
       | Student 3          | student3@example.com | C        | 3.00           | <coursetotal3> |
diff --git a/grade/tests/behat/grade_single_item_scales.feature b/grade/tests/behat/grade_single_item_scales.feature
index 18889649ce487..16024ed456d80 100644
--- a/grade/tests/behat/grade_single_item_scales.feature
+++ b/grade/tests/behat/grade_single_item_scales.feature
@@ -58,7 +58,7 @@ Feature: View gradebook when single item scales are used
   Scenario: Test displaying single item scales in gradebook in aggregation method Natural
     When I turn editing mode off
     Then the following should exist in the "user-grades" table:
-      | -1-                | -1-                  | -3-       | -4-            | -5-          |
+      | -1-                | -2-                  | -3-       | -4-            | -5-          |
       | Student 1          | student1@example.com | Ace!      | 1.00           | 1.00         |
     And the following should exist in the "user-grades" table:
       | -1-                | -2-       | -3-            | -4-          |
@@ -92,7 +92,7 @@ Feature: View gradebook when single item scales are used
       | Category name   | Sub category (<aggregation>) |
     And I turn editing mode off
     Then the following should exist in the "user-grades" table:
-      | -1-                | -1-                  | -3-       | -4-            | -5-            |
+      | -1-                | -2-                  | -3-       | -4-            | -5-            |
       | Student 1          | student1@example.com | Ace!      | <cattotal1>    | <coursetotal1> |
       | Student 2          | student2@example.com | -         | -              | -              |
     And the following should exist in the "user-grades" table:
diff --git a/grade/tests/behat/toggle_grade_categories.feature b/grade/tests/behat/toggle_grade_categories.feature
index 3eed4f6f0f3df..0e2e47445f0f1 100644
--- a/grade/tests/behat/toggle_grade_categories.feature
+++ b/grade/tests/behat/toggle_grade_categories.feature
@@ -78,14 +78,12 @@ Feature: Teachers can toggle the visibility of the grade categories in the Grade
       | Course              |
     And I should see "Course" in the "setup-grades" "table"
     And "Expand" "link" should exist in the "Course" "table_row"
-    And the following should not exist in the "setup-grades" table:
-      | Name                |
-      | Test assignment one |
-      | Category 1          |
-      | Test assignment two |
-      | Manual grade        |
-      | Category 1 total    |
-      | Course total        |
+    And I should not see "Test assignment one" in the "setup-grades" "table"
+    And I should not see "Category 1" in the "setup-grades" "table"
+    And I should not see "Test assignment two" in the "setup-grades" "table"
+    And I should not see "Manual grade" in the "setup-grades" "table"
+    And I should not see "Category 1 total" in the "setup-grades" "table"
+    And I should not see "Course total" in the "setup-grades" "table"
     # Expand the grade category 'Course'. 'Category 1' should be still collapsed.
     And I click on "Expand" "link" in the "Course" "table_row"
     And the following should exist in the "setup-grades" table:
@@ -96,11 +94,9 @@ Feature: Teachers can toggle the visibility of the grade categories in the Grade
       | Course total        |
     And "Collapse" "link" should exist in the "Course" "table_row"
     And "Expand" "link" should exist in the "Category 1" "table_row"
-    And the following should not exist in the "setup-grades" table:
-      | Name                |
-      | Test assignment two |
-      | Manual grade        |
-      | Category 1 total    |
+    And I should not see "Test assignment two" in the "setup-grades" "table"
+    And I should not see "Manual grade" in the "setup-grades" "table"
+    And I should not see "Category 1 total" in the "setup-grades" "table"
 
   Scenario: A teacher can see the aggregated max grade for a grade category even when the category is collapsed
     Given the following should exist in the "setup-grades" table:
@@ -150,11 +146,9 @@ Feature: Teachers can toggle the visibility of the grade categories in the Grade
       | Category 1          |
     And "Collapse" "link" should exist in the "Course" "table_row"
     And "Expand" "link" should exist in the "Category 1" "table_row"
-    And the following should not exist in the "setup-grades" table:
-      | Name                |
-      | Test assignment two |
-      | Manual grade        |
-      | Category 1 total    |
+    And I should not see "Test assignment two" in the "setup-grades" "table"
+    And I should not see "Manual grade" in the "setup-grades" "table"
+    And I should not see "Category 1 total" in the "setup-grades" "table"
     # Expand the grade category 'Category 1'.
     And I click on "Expand" "link" in the "Category 1" "table_row"
     And the following should exist in the "setup-grades" table:
@@ -172,12 +166,10 @@ Feature: Teachers can toggle the visibility of the grade categories in the Grade
     And I click on "Collapse" "link" in the "Course" "table_row"
     And I should see "Course" in the "setup-grades" "table"
     And "Expand" "link" should exist in the "Course" "table_row"
-    And the following should not exist in the "setup-grades" table:
-      | Name                |
-      | Test assignment one |
-      | Category 1          |
-      | Test assignment two |
-      | Manual grade        |
+    And I should not see "Test assignment one" in the "setup-grades" "table"
+    And I should not see "Category 1" in the "setup-grades" "table"
+    And I should not see "Test assignment two" in the "setup-grades" "table"
+    And I should not see "Manual grade" in the "setup-grades" "table"
     # Expand the grade category 'Course'. 'Category 1' should be still collapsed.
     And I click on "Expand" "link" in the "Course" "table_row"
     And the following should exist in the "setup-grades" table:
@@ -187,11 +179,9 @@ Feature: Teachers can toggle the visibility of the grade categories in the Grade
       | Category 1          |
     And "Collapse" "link" should exist in the "Course" "table_row"
     And "Expand" "link" should exist in the "Category 1" "table_row"
-    And the following should not exist in the "setup-grades" table:
-      | Name                |
-      | Test assignment two |
-      | Manual grade        |
-      | Category 1 total    |
+    And I should not see "Test assignment two" in the "setup-grades" "table"
+    And I should not see "Manual grade" in the "setup-grades" "table"
+    And I should not see "Category 1 total" in the "setup-grades" "table"
 
   Scenario: Previously collapsed categories are still shown as collapsed when a teacher navigates back to Gradebook setup
     # Collapse the grade category 'Category 1' and navigate to the course homepage.
@@ -206,11 +196,9 @@ Feature: Teachers can toggle the visibility of the grade categories in the Grade
       | Course total        |
     And "Collapse" "link" should exist in the "Course" "table_row"
     And "Expand" "link" should exist in the "Category 1" "table_row"
-    And the following should not exist in the "setup-grades" table:
-      | Name                |
-      | Test assignment two |
-      | Manual grade        |
-      | Category 1 total    |
+    And I should not see "Test assignment two" in the "setup-grades" "table"
+    And I should not see "Manual grade" in the "setup-grades" "table"
+    And I should not see "Category 1 total" in the "setup-grades" "table"
 
   Scenario: Previously collapsed categories are still shown as collapsed when a teacher is moving grade items in Gradebook setup
     # Collapse the grade category 'Category 1'.
@@ -224,11 +212,9 @@ Feature: Teachers can toggle the visibility of the grade categories in the Grade
       | Category 1          |
     And "Collapse" "link" should exist in the "Course" "table_row"
     And "Expand" "link" should exist in the "Category 1" "table_row"
-    And the following should not exist in the "setup-grades" table:
-      | Name                |
-      | Test assignment two |
-      | Manual grade        |
-      | Category 1 total    |
+    And I should not see "Test assignment two" in the "setup-grades" "table"
+    And I should not see "Manual grade" in the "setup-grades" "table"
+    And I should not see "Category 1 total" in the "setup-grades" "table"
 
   Scenario: Grade categories are shown as collapsed only to the teacher that collapsed them
     # Collapse the grade category 'Category 1'.
@@ -256,8 +242,6 @@ Feature: Teachers can toggle the visibility of the grade categories in the Grade
       | Course total        |
     And "Collapse" "link" should exist in the "Course" "table_row"
     And "Expand" "link" should exist in the "Category 1" "table_row"
-    And the following should not exist in the "setup-grades" table:
-      | Name                |
-      | Test assignment two |
-      | Manual grade        |
-      | Category 1 total    |
+    And I should not see "Test assignment two" in the "setup-grades" "table"
+    And I should not see "Manual grade" in the "setup-grades" "table"
+    And I should not see "Category 1 total" in the "setup-grades" "table"
diff --git a/group/tests/behat/private_groups.feature b/group/tests/behat/private_groups.feature
index 87f9db427f1ac..3d8b665523946 100644
--- a/group/tests/behat/private_groups.feature
+++ b/group/tests/behat/private_groups.feature
@@ -56,7 +56,7 @@ Feature: Private groups
   Scenario: Participants in "Visible" groups see their membership and other members:
     Given I am on the "C1" "enrolled users" page logged in as "student1"
     Then the following should exist in the "participants" table:
-      | First name / Surname | Groups                                                         |
+      | First name           | Groups                                                         |
       | Student 1            | Visible/Non-Participation, Visible/Participation               |
       | Student 2            | No groups                                                      |
       | Student 3            | No groups                                                      |
@@ -69,7 +69,7 @@ Feature: Private groups
   Scenario: Participants in "Only visible to members" groups see their membership and other members, plus "Visible"
     Given I am on the "C1" "enrolled users" page logged in as "student2"
     Then the following should exist in the "participants" table:
-      | First name / Surname | Groups                                                                 |
+      | First name           | Groups                                                                 |
       | Student 1            | Visible/Non-Participation, Visible/Participation                       |
       | Student 2            | Only visible to members/Non-Participation, Only visible to members/Participation |
       | Student 3            | No groups                                                              |
@@ -82,7 +82,7 @@ Feature: Private groups
   Scenario: Participants in "Only see own membership" groups see their membership but not other members, plus "Visible"
     Given I am on the "C1" "enrolled users" page logged in as "student3"
     Then the following should exist in the "participants" table:
-      | First name / Surname | Groups                                                                 |
+      | First name           | Groups                                                                 |
       | Student 1            | Visible/Non-Participation, Visible/Participation                       |
       | Student 2            | No groups                                                              |
       | Student 3            | Only see own membership                                                     |
@@ -95,7 +95,7 @@ Feature: Private groups
   Scenario: Participants in "Not visible" groups do not see that group, do see "Visible"
     Given I am on the "C1" "enrolled users" page logged in as "student4"
     Then the following should exist in the "participants" table:
-      | First name / Surname | Groups                                                                 |
+      | First name           | Groups                                                                 |
       | Student 1            | Visible/Non-Participation, Visible/Participation                       |
       | Student 2            | No groups                                                              |
       | Student 3            | No groups                                                              |
@@ -108,7 +108,7 @@ Feature: Private groups
   Scenario: View participants list as a teacher:
     Given I am on the "C1" "enrolled users" page logged in as "teacher1"
     Then the following should exist in the "participants" table:
-      | First name / Surname | Groups                                                                 |
+      | First name           | Groups                                                                 |
       | Student 1            | Visible/Non-Participation, Visible/Participation                       |
       | Student 2            | Only visible to members/Non-Participation, Only visible to members/Participation |
       | Student 3            | Only see own membership                                                     |
@@ -125,10 +125,10 @@ Feature: Private groups
     And I set the field "Type or select..." to "Only see own membership"
     And I click on "Apply filters" "button"
     Then the following should exist in the "participants" table:
-      | First name / Surname | Groups                  |
+      | First name           | Groups                  |
       | Student 3            | Only see own membership |
     And the following should not exist in the "participants" table:
-      | First name / Surname | Groups                  |
+      | First name           | Groups                  |
       | Student 7            | No groups               |
 
   @javascript
@@ -138,7 +138,7 @@ Feature: Private groups
     And I set the field "Type or select..." to "No group"
     And I click on "Apply filters" "button"
     Then the following should exist in the "participants" table:
-      | First name / Surname | Groups     |
+      | First name           | Groups     |
       | Student 2            | No groups  |
       | Student 4            | No groups  |
       | Student 6            | No groups  |
@@ -153,7 +153,7 @@ Feature: Private groups
     And I set the field "Type or select..." to "Only see own membership"
     And I click on "Apply filters" "button"
     Then the following should exist in the "participants" table:
-      | First name / Surname | Groups                                                                   |
+      | First name           | Groups                                                                   |
       | Student 1            | Visible/Non-Participation, Visible/Participation                         |
       | Student 2            | No groups                                                                |
       | Student 4            | No groups                                                                |
@@ -170,7 +170,7 @@ Feature: Private groups
     And I set the field "Type or select..." to "No group"
     And I click on "Apply filters" "button"
     Then the following should exist in the "participants" table:
-      | First name / Surname | Groups                                                                   |
+      | First name           | Groups                                                                   |
       | Student 1            | Visible/Non-Participation, Visible/Participation                         |
       | Student 3            | Only see own membership                                                  |
       | Student 5            | Visible/Non-Participation, Visible/Participation                         |
diff --git a/mod/forum/report/summary/tests/behat/course_summary.feature b/mod/forum/report/summary/tests/behat/course_summary.feature
index 4357c493bcaed..c805c704a88aa 100644
--- a/mod/forum/report/summary/tests/behat/course_summary.feature
+++ b/mod/forum/report/summary/tests/behat/course_summary.feature
@@ -60,12 +60,12 @@ Feature: Course level forum summary report
     And I should see "Export posts"
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |                                 |                                |
-      | First name / Last name | -3-         | -4-     | Earliest post                   | Most recent post               |
+      | First name           | -3-         | -4-     | Earliest post                   | Most recent post               |
       | Student 1            | 1           | 1       | Thursday, 28 March 2019, 11:50  | Thursday, 6 June 2019, 6:40    |
       | Student 2            | 0           | 0       | -                               | -                              |
       | Teacher 1            | 1           | 2       | Wednesday, 27 March 2019, 12:10 | Wednesday, 10 July 2019, 9:30  |
     And the following should not exist in the "forumreport_summary_table" table:
-      | First name / Last name |
+      | First name           |
       | Student 3            |
     And the "Forum selected" select box should contain "All forums in course"
     And the "Forum selected" select box should contain "forum1"
@@ -76,13 +76,13 @@ Feature: Course level forum summary report
     And I should not see "Export posts"
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |                                 |                                  |
-      | First name / Last name | -3-         | -4-     | Earliest post                   | Most recent post                 |
+      | First name           | -3-         | -4-     | Earliest post                   | Most recent post                 |
       | Student 1            | 2           | 3       | Thursday, 25 January 2018, 4:40 | Saturday, 25 January 2020, 11:50 |
       | Student 2            | 0           | 0       | -                               | -                                |
       | Teacher 1            | 4           | 3       | Sunday, 14 January 2018, 9:00   | Thursday, 26 December 2019, 9:30 |
     And the following should not exist in the "forumreport_summary_table" table:
-      | First name / Last name |
-      | Student 3            |
+      | First name |
+      | Student 3  |
 
   Scenario: Course forum summary report correctly formats forum activity names
     Given the "multilang" filter is "on"
@@ -104,10 +104,10 @@ Feature: Course level forum summary report
     And I navigate to "Reports" in current page administration
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |                                 |                                 |
-      | First name / Last name | -2-         | -3-     | Earliest post                   | Most recent post                |
+      | First name           | -2-         | -3-     | Earliest post                   | Most recent post                |
       | Student 1            | 0           | 1       | Thursday, 25 January 2018, 4:40 | Thursday, 25 January 2018, 4:40 |
     And the following should not exist in the "forumreport_summary_table" table:
-      | First name / Last name |
+      | First name           |
       | Student 2            |
       | Student 3            |
       | Teacher 1            |
@@ -119,10 +119,10 @@ Feature: Course level forum summary report
     Then I select "All forums in course" from the "Forum selected" singleselect
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |                                 |                                  |
-      | First name / Last name | -2-         | -3-     | Earliest post                   | Most recent post                 |
+      | First name           | -2-         | -3-     | Earliest post                   | Most recent post                 |
       | Student 1            | 2           | 3       | Thursday, 25 January 2018, 4:40 | Saturday, 25 January 2020, 11:50 |
     And the following should not exist in the "forumreport_summary_table" table:
-      | First name / Last name |
+      | First name           |
       | Student 2            |
       | Student 3            |
       | Teacher 1            |
diff --git a/mod/forum/report/summary/tests/behat/summary_filter_groups.feature b/mod/forum/report/summary/tests/behat/summary_filter_groups.feature
index 3c24a189f8b9c..b57692e7da410 100644
--- a/mod/forum/report/summary/tests/behat/summary_filter_groups.feature
+++ b/mod/forum/report/summary/tests/behat/summary_filter_groups.feature
@@ -67,7 +67,7 @@ Feature: Groups report filter is available if groups exist
     Then "Groups" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Last name | -3-         | -4-     |
+      | First name           | -3-         | -4-     |
       | Student 1            | 1           | 1       |
       | Student 2            | 0           | 0       |
       | Teacher 1            | 2           | 2       |
@@ -103,7 +103,7 @@ Feature: Groups report filter is available if groups exist
     And "Groups (all)" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Last name | -3-         | -4-     |
+      | First name           | -3-         | -4-     |
       | Student 1            | 1           | 1       |
       | Student 2            | 0           | 0       |
       | Teacher 1            | 2           | 2       |
@@ -115,7 +115,7 @@ Feature: Groups report filter is available if groups exist
     Then "Groups" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Last name | -3-         | -4-     |
+      | First name           | -3-         | -4-     |
       | Student 1            | 1           | 1       |
       | Student 2            | 0           | 0       |
       | Teacher 1            | 2           | 2       |
@@ -128,7 +128,7 @@ Feature: Groups report filter is available if groups exist
     And "Groups (3)" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Last name | -3-         | -4-     |
+      | First name           | -3-         | -4-     |
       | Student 1            | 1           | 1       |
       | Teacher 1            | 1           | 2       |
     And I should not see "Student 2"
@@ -137,7 +137,7 @@ Feature: Groups report filter is available if groups exist
     And "Groups (3)" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Last name | -3-         | -4-     |
+      | First name           | -3-         | -4-     |
       | Student 1            | 1           | 1       |
       | Teacher 1            | 1           | 2       |
     And I should not see "Student 2"
@@ -149,7 +149,7 @@ Feature: Groups report filter is available if groups exist
     Then "Groups" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Last name | -3-         | -4-     |
+      | First name           | -3-         | -4-     |
       | Student 1            | 0           | 0       |
       | Student 2            | 1           | 2       |
       | Teacher 1            | 3           | 1       |
@@ -161,7 +161,7 @@ Feature: Groups report filter is available if groups exist
     And "Groups (2)" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Last name | -3-         | -4-     |
+      | First name           | -3-         | -4-     |
       | Student 1            | 0           | 0       |
       | Student 2            | 1           | 1       |
       | Teacher 1            | 2           | 1       |
@@ -172,7 +172,7 @@ Feature: Groups report filter is available if groups exist
     And I navigate to "Reports" in current page administration
     Then the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Last name | -3-         | -4-     |
+      | First name           | -3-         | -4-     |
       | Student 1            | 0           | 0       |
       | Student 2            | 1           | 2       |
       | Teacher 1            | 3           | 1       |
@@ -183,7 +183,7 @@ Feature: Groups report filter is available if groups exist
     And "Groups (1)" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Last name | -3-         | -4-     |
+      | First name           | -3-         | -4-     |
       | Student 1            | 0           | 0       |
       | Student 2            | 1           | 1       |
       | Teacher 1            | 1           | 0       |
@@ -196,7 +196,7 @@ Feature: Groups report filter is available if groups exist
     Then "Groups" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Last name | -3-         | -4-     |
+      | First name           | -3-         | -4-     |
       | Student 1            | 1           | 1       |
       | Student 2            | 0           | 0       |
       | Teacher 1            | 2           | 2       |
@@ -225,7 +225,7 @@ Feature: Groups report filter is available if groups exist
     And "Groups (2)" "button" should exist
     Then the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Last name | -3-         | -4-     |
+      | First name           | -3-         | -4-     |
       | Student 1            | 1           | 1       |
       | Teacher 1            | 2           | 3       |
     And I should not see "Student 2"
@@ -234,7 +234,7 @@ Feature: Groups report filter is available if groups exist
     And "Groups (2)" "button" should exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions | Replies |
-      | First name / Last name | -3-         | -4-     |
+      | First name           | -3-         | -4-     |
       | Student 1            | 1           | 1       |
       | Teacher 1            | 2           | 3       |
     And I should not see "Student 2"
diff --git a/mod/forum/report/summary/tests/behat/summary_filter_no_groups.feature b/mod/forum/report/summary/tests/behat/summary_filter_no_groups.feature
index 87f4f237da78c..ee5963e132d4f 100644
--- a/mod/forum/report/summary/tests/behat/summary_filter_no_groups.feature
+++ b/mod/forum/report/summary/tests/behat/summary_filter_no_groups.feature
@@ -54,7 +54,7 @@ Feature: Groups report filter is not available if no groups exist
     Then "Groups" "button" should not exist
     And the following should exist in the "forumreport_summary_table" table:
     # |                      | Discussions |
-      | First name / Last name | -3-         |
+      | First name           | -3-         |
       | Teacher 1            | 2           |
       | Student 1            | 1           |
       | Student 2            | 0           |
diff --git a/report/configlog/tests/behat/view_report.feature b/report/configlog/tests/behat/view_report.feature
index 0be890c5d9b76..b1a0650e6782b 100644
--- a/report/configlog/tests/behat/view_report.feature
+++ b/report/configlog/tests/behat/view_report.feature
@@ -17,7 +17,7 @@ Feature: In a report, admin can see configuration changes
   Scenario: Display configuration changes report
     When I navigate to "Reports > Config changes" in site administration
     Then the following should exist in the "reportbuilder-table" table:
-      | User       | Plugin | Setting             | New value | Original value |
+      | First name | Plugin | Setting             | New value | Original value |
       | Admin User | quiz   | initialnumfeedbacks | 5         | 2              |
       | Admin User | folder | maxsizetodownload   | 2048      | 0              |
       | Admin User | core   | defaultcity         | Perth     |                |
diff --git a/reportbuilder/tests/behat/audience.feature b/reportbuilder/tests/behat/audience.feature
index 115f08db8913b..887d58bec36db 100644
--- a/reportbuilder/tests/behat/audience.feature
+++ b/reportbuilder/tests/behat/audience.feature
@@ -250,7 +250,7 @@ Feature: Configure access to reports based on intended audience
     And I am on the "My report" "reportbuilder > Editor" page logged in as "admin"
     When I click on the "Access" dynamic tab
     Then the following should exist in the "reportbuilder-table" table:
-      | -0-    | Email address     | Fruit  |
+      | -1-    | Email address     | Fruit  |
       | User 1 | user1@example.com | Apple  |
       | User 2 | user2@example.com | Banana |
       | User 3 | user3@example.com | Banana |
diff --git a/user/tests/behat/table_sorting.feature b/user/tests/behat/table_sorting.feature
index 02b76201d8c7c..1626c812627cc 100644
--- a/user/tests/behat/table_sorting.feature
+++ b/user/tests/behat/table_sorting.feature
@@ -20,7 +20,7 @@ Feature: Tables can be sorted by additional names
   Scenario: All user names are show and sortable in the administration user list.
     Given I navigate to "Users > Accounts > Browse list of users" in site administration
     Then the following should exist in the "reportbuilder-table" table:
-    | First name / Middle name / Alternate name / Last name | Email address |
+    | First name | Email address |
     | Admin User | moodle@example.com |
     | Annie Faith Anne Edison | student1@example.com |
     | George David Gman Bradley | student2@example.com |

From 913c573a798f2e8567d66f00e54b153b506e9120 Mon Sep 17 00:00:00 2001
From: Sumaiya Javed <sumaiya.javed@catalyst.net.nz>
Date: Wed, 24 Apr 2024 16:36:44 +1200
Subject: [PATCH 008/119] MDL-80797 core: Hooks to add or reorder items in
 secondary navigation.

Add the ability for a third party plugin to add or reorder nodes in the course navigation menu.
This will allow secondary navigation to be overridden by using Hooks API.

new file:   lib/classes/hook/navigation/secondary_extend.php
modified:   lib/classes/navigation/views/secondary.php
---
 .../hook/navigation/secondary_extend.php      | 53 +++++++++++++++++++
 lib/classes/navigation/views/secondary.php    |  4 ++
 2 files changed, 57 insertions(+)
 create mode 100644 lib/classes/hook/navigation/secondary_extend.php

diff --git a/lib/classes/hook/navigation/secondary_extend.php b/lib/classes/hook/navigation/secondary_extend.php
new file mode 100644
index 0000000000000..eaa6d96348b18
--- /dev/null
+++ b/lib/classes/hook/navigation/secondary_extend.php
@@ -0,0 +1,53 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core\hook\navigation;
+use core\navigation\views\secondary;
+
+/**
+ * Allows plugins to insert nodes into site secondary navigation
+ *
+ * @package    core
+ * @author     Sumaiya Javed
+ * @copyright  2024 Catalyst IT
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+#[\core\attribute\label('Allows plugins to insert nodes into site secondary navigation')]
+#[\core\attribute\tags('navigation')]
+final class secondary_extend {
+
+    /**
+     * Creates new hook.
+     *
+     * @param secondary $secondaryview secondary navigation view
+     */
+    public function __construct(
+        /**
+         * @var secondary $secondaryview secondary navigation view
+         */
+        public readonly secondary $secondaryview,
+    ) {
+    }
+
+    /**
+     * secondary navigation view
+     *
+     * @return secondary
+     */
+    public function get_secondaryview(): secondary {
+        return $this->secondaryview;
+    }
+}
diff --git a/lib/classes/navigation/views/secondary.php b/lib/classes/navigation/views/secondary.php
index d9461681165a4..431af85d37d19 100644
--- a/lib/classes/navigation/views/secondary.php
+++ b/lib/classes/navigation/views/secondary.php
@@ -432,6 +432,10 @@ protected function load_course_navigation(?navigation_node $rootnode = null): vo
                     self::TYPE_COURSE, null, 'coursehome'), reset($nodekeys)
             );
         }
+
+        // Allow plugins to add nodes to the secondary navigation.
+        $hook = new \core\hook\navigation\secondary_extend($this);
+        \core\di::get(\core\hook\manager::class)->dispatch($hook);
     }
 
     /**

From 4e9a8c6cd71128e63701194ebff4d97091aa264a Mon Sep 17 00:00:00 2001
From: ferranrecio <ferran@moodle.com>
Date: Tue, 7 May 2024 11:35:58 +0200
Subject: [PATCH 009/119] MDL-81885 tool_generator: add admin settings
 generator

The tool_generator creates a testing scenario that can
execute all steps from behat_data_generators (with some
limitations). However, it cannot set any admin settings,
which limits the tool's ability to generate many
real test scenarios.
---
 .../classes/local/testscenario/runner.php     | 39 +++++++++-
 .../classes/local/testscenario/steprunner.php | 28 ++++---
 .../tests/behat/testscenario.feature          |  5 ++
 .../fixtures/testscenario/scenario.feature    |  4 +-
 .../tests/local/testscenario/runner_test.php  |  2 +-
 .../local/testscenario/steprunner_test.php    | 74 ++++++++++---------
 6 files changed, 99 insertions(+), 53 deletions(-)

diff --git a/admin/tool/generator/classes/local/testscenario/runner.php b/admin/tool/generator/classes/local/testscenario/runner.php
index ea9d04562594e..8122cf5cadc5f 100644
--- a/admin/tool/generator/classes/local/testscenario/runner.php
+++ b/admin/tool/generator/classes/local/testscenario/runner.php
@@ -16,12 +16,15 @@
 
 namespace tool_generator\local\testscenario;
 
+use behat_admin;
 use behat_data_generators;
+use behat_base;
 use Behat\Gherkin\Parser;
 use Behat\Gherkin\Lexer;
 use Behat\Gherkin\Keywords\ArrayKeywords;
 use ReflectionClass;
 use ReflectionMethod;
+use stdClass;
 
 /**
  * Class to process a scenario generator file.
@@ -72,6 +75,7 @@ public function include_behat_libraries() {
         require_once($CFG->libdir . '/behat/classes/behat_command.php');
         require_once($CFG->libdir . '/behat/behat_base.php');
         require_once("{$CFG->libdir}/tests/behat/behat_data_generators.php");
+        require_once("{$CFG->dirroot}/admin/tests/behat/behat_admin.php");
         return true;
     }
 
@@ -81,6 +85,15 @@ public function include_behat_libraries() {
     private function load_generator() {
         $this->generator = new behat_data_generators();
         $this->validsteps = $this->scan_generator($this->generator);
+
+        // Set config values is not inside the general behat generators.
+        $extra = $this->scan_method(
+            new ReflectionMethod(behat_admin::class, 'the_following_config_values_are_set_as_admin'),
+            new behat_admin(),
+        );
+        if ($extra) {
+            $this->validsteps[$extra->given] = $extra;
+        }
     }
 
     /**
@@ -93,14 +106,32 @@ private function scan_generator(behat_data_generators $generator): array {
         $class = new ReflectionClass($generator);
         $methods = $class->getMethods(ReflectionMethod::IS_PUBLIC);
         foreach ($methods as $method) {
-            $given = $this->get_method_given($method);
-            if ($given) {
-                $result[$given] = $method->getName();
+            $scan = $this->scan_method($method, $generator);
+            if ($scan) {
+                $result[$scan->given] = $scan;
             }
         }
         return $result;
     }
 
+    /**
+     * Scan a method to get the given expression tag.
+     * @param ReflectionMethod $method the method to scan.
+     * @param behat_base $behatclass the behat class instance to use.
+     * @return stdClass|null the method data (given, name, class).
+     */
+    private function scan_method(ReflectionMethod $method, behat_base $behatclass): ?stdClass {
+        $given = $this->get_method_given($method);
+        if (!$given) {
+            return null;
+        }
+        return (object)[
+            'given' => $given,
+            'name' => $method->getName(),
+            'generator' => $behatclass,
+        ];
+    }
+
     /**
      * Get the given expression tag of a method.
      *
@@ -146,7 +177,7 @@ public function parse_feature(string $content): parsedfeature {
                 $result->add_scenario($scenario->getNodeType(), $scenario->getTitle());
                 $steps = $scenario->getSteps();
                 foreach ($steps as $step) {
-                    $result->add_step(new steprunner($this->generator, $this->validsteps, $step));
+                    $result->add_step(new steprunner(null, $this->validsteps, $step));
                 }
             }
         }
diff --git a/admin/tool/generator/classes/local/testscenario/steprunner.php b/admin/tool/generator/classes/local/testscenario/steprunner.php
index e315640aad5ac..17b7834c276a6 100644
--- a/admin/tool/generator/classes/local/testscenario/steprunner.php
+++ b/admin/tool/generator/classes/local/testscenario/steprunner.php
@@ -16,7 +16,7 @@
 
 namespace tool_generator\local\testscenario;
 
-use behat_data_generators;
+use behat_base;
 use Behat\Gherkin\Node\StepNode;
 
 /**
@@ -27,8 +27,8 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class steprunner {
-    /** @var behat_data_generators the behat data generator instance. */
-    private behat_data_generators $generator;
+    /** @var behat_base|null the behat step class instance. */
+    private ?behat_base $generator = null;
 
     /** @var array the valid steps indexed by given expression tag. */
     private array $validsteps;
@@ -53,12 +53,14 @@ class steprunner {
 
     /**
      * Constructor.
-     * @param behat_data_generators $generator the behat data generator instance.
+     * @param behat_base|null $unused This does nothing, do not use it.
      * @param array $validsteps the valid steps indexed by given expression tag.
      * @param StepNode $stepnode the step node to process.
      */
-    public function __construct(behat_data_generators $generator, array $validsteps, StepNode $stepnode) {
-        $this->generator = $generator;
+    public function __construct($unused, array $validsteps, StepNode $stepnode) {
+        if ($unused !== null) {
+            debugging('Deprecated argument passed to ' . __FUNCTION__, DEBUG_DEVELOPER);
+        }
         $this->validsteps = $validsteps;
         $this->stepnode = $stepnode;
         $this->init();
@@ -73,12 +75,13 @@ public function __construct(behat_data_generators $generator, array $validsteps,
     private function init() {
         $matches = [];
         $linetext = $this->stepnode->getText();
-        foreach ($this->validsteps as $pattern => $method) {
-            if (!$this->match_given($pattern, $linetext, $matches)) {
+        foreach ($this->validsteps as $method) {
+            if (!$this->match_given($method->given, $linetext, $matches)) {
                 continue;
             }
-            $this->method = $method;
-            $this->params = $this->build_method_params($method, $matches);
+            $this->method = $method->name;
+            $this->params = $this->build_method_params($method->name, $matches, $method->generator);
+            $this->generator = $method->generator;
             $this->isvalid = true;
             return;
         }
@@ -89,10 +92,11 @@ private function init() {
      * Build the method parameters.
      * @param string $methodname the method name.
      * @param array $matches the matches.
+     * @param behat_base $generator the method class.
      * @return array the method parameters.
      */
-    private function build_method_params($methodname, $matches) {
-        $method = new \ReflectionMethod($this->generator, $methodname);
+    private function build_method_params(string $methodname, array $matches, behat_base $generator) {
+        $method = new \ReflectionMethod($generator, $methodname);
         $params = [];
         foreach ($method->getParameters() as $param) {
             $paramname = $param->getName();
diff --git a/admin/tool/generator/tests/behat/testscenario.feature b/admin/tool/generator/tests/behat/testscenario.feature
index 41f641df82b86..1a03a8bf065f5 100644
--- a/admin/tool/generator/tests/behat/testscenario.feature
+++ b/admin/tool/generator/tests/behat/testscenario.feature
@@ -21,6 +21,11 @@ Feature: Create testing scenarios using generators
     And I should see "Student Test3"
     And I should see "Student Test4"
     And I should see "Student Test5"
+    And I set the field "Participants tertiary navigation" to "Enrolment methods"
+    And I click on "Edit" "link" in the "Manual enrolments" "table_row"
+    And the field "Send course welcome message" matches value "No"
+    And I navigate to "Plugins > Enrolments > Manual enrolments" in site administration
+    And the field "Send course welcome message" matches value "No"
 
   @javascript
   Scenario: Prevent creating a testing scenario with no steps to execute
diff --git a/admin/tool/generator/tests/fixtures/testscenario/scenario.feature b/admin/tool/generator/tests/fixtures/testscenario/scenario.feature
index d228631ca0f2b..8993270dc694a 100644
--- a/admin/tool/generator/tests/fixtures/testscenario/scenario.feature
+++ b/admin/tool/generator/tests/fixtures/testscenario/scenario.feature
@@ -1,6 +1,8 @@
 Feature: Prepare scenario for testing
   Scenario: Create course content
-    Given the following "course" exists:
+    Given the following config values are set as admin:
+      | sendcoursewelcomemessage | 0 | enrol_manual |
+    And the following "course" exists:
       | fullname         | Course test |
       | shortname        | C1          |
       | category         | 0           |
diff --git a/admin/tool/generator/tests/local/testscenario/runner_test.php b/admin/tool/generator/tests/local/testscenario/runner_test.php
index 835abeb61b1b3..42e2471cae81a 100644
--- a/admin/tool/generator/tests/local/testscenario/runner_test.php
+++ b/admin/tool/generator/tests/local/testscenario/runner_test.php
@@ -46,7 +46,7 @@ public function test_parse_and_execute_feature(): void {
         $feature = $runner->parse_feature($contents);
 
         $this->assertEquals(2, count($feature->get_scenarios()));
-        $this->assertEquals(6, count($feature->get_all_steps()));
+        $this->assertEquals(7, count($feature->get_all_steps()));
         $this->assertTrue($feature->is_valid());
 
         $result = $runner->execute($feature);
diff --git a/admin/tool/generator/tests/local/testscenario/steprunner_test.php b/admin/tool/generator/tests/local/testscenario/steprunner_test.php
index 08d20c567a158..9aeb6a889669d 100644
--- a/admin/tool/generator/tests/local/testscenario/steprunner_test.php
+++ b/admin/tool/generator/tests/local/testscenario/steprunner_test.php
@@ -57,6 +57,31 @@ private function get_step(string $step): StepNode {
         return $steps[0];
     }
 
+    /**
+     * Get the list of valid behat steps for the tests.
+     * @return array the valid steps details.
+     */
+    private function get_valid_steps(): array {
+        $generator = new behat_data_generators();
+        return [
+            '/^the following "(?P<element_string>(?:[^"]|\\")*)" exist:$/' => (object) [
+                'name' => 'the_following_entities_exist',
+                'given' => '/^the following "(?P<element_string>(?:[^"]|\\")*)" exist:$/',
+                'generator' => $generator,
+            ],
+            ':count :entitytype exist with the following data:' => (object) [
+                'name' => 'the_following_repeated_entities_exist',
+                'given' => ':count :entitytype exist with the following data:',
+                'generator' => $generator,
+            ],
+            'the following :entitytype exists:' => (object) [
+                'name' => 'the_following_entity_exists',
+                'given' => 'the following :entitytype exists:',
+                'generator' => $generator,
+            ],
+        ];
+    }
+
     /**
      * Test for parse_feature.
      * @covers ::is_valid
@@ -65,15 +90,9 @@ private function get_step(string $step): StepNode {
      * @dataProvider execute_steps_provider
      */
     public function test_is_valid(string $step, bool $expected): void {
-        $generator = new behat_data_generators();
-        $validsteps = [
-            '/^the following "(?P<element_string>(?:[^"]|\\")*)" exist:$/' => 'the_following_entities_exist',
-            ':count :entitytype exist with the following data:' => 'the_following_repeated_entities_exist',
-            'the following :entitytype exists:' => 'the_following_entity_exists',
-        ];
-
+        $validsteps = $this->get_valid_steps();
         $step = $this->get_step($step);
-        $steprunner = new steprunner($generator, $validsteps, $step);
+        $steprunner = new steprunner(null, $validsteps, $step);
         $this->assertEquals($expected, $steprunner->is_valid());
     }
 
@@ -91,15 +110,10 @@ public function test_execute(string $step, bool $expected): void {
 
         $this->resetAfterTest();
 
-        $generator = new behat_data_generators();
-        $validsteps = [
-            '/^the following "(?P<element_string>(?:[^"]|\\")*)" exist:$/' => 'the_following_entities_exist',
-            ':count :entitytype exist with the following data:' => 'the_following_repeated_entities_exist',
-            'the following :entitytype exists:' => 'the_following_entity_exists',
-        ];
+        $validsteps = $this->get_valid_steps();
 
         $step = $this->get_step($step);
-        $steprunner = new steprunner($generator, $validsteps, $step);
+        $steprunner = new steprunner(null, $validsteps, $step);
 
         $this->assertFalse($steprunner->is_executed());
 
@@ -162,18 +176,13 @@ public function test_execute_duplicated(): void {
 
         $this->resetAfterTest();
 
-        $generator = new behat_data_generators();
-        $validsteps = [
-            '/^the following "(?P<element_string>(?:[^"]|\\")*)" exist:$/' => 'the_following_entities_exist',
-            ':count :entitytype exist with the following data:' => 'the_following_repeated_entities_exist',
-            'the following :entitytype exists:' => 'the_following_entity_exists',
-        ];
+        $validsteps = $this->get_valid_steps();
 
         $step = $this->get_step('Given the following "course" exists:
             | fullname         | Course test |
             | shortname        | C1          |
             | category         | 0           |');
-        $steprunner = new steprunner($generator, $validsteps, $step);
+        $steprunner = new steprunner(null, $validsteps, $step);
 
         $this->assertFalse($steprunner->is_executed());
 
@@ -190,7 +199,7 @@ public function test_execute_duplicated(): void {
         );
 
         // Execute the same course creation.
-        $steprunner = new steprunner($generator, $validsteps, $step);
+        $steprunner = new steprunner(null, $validsteps, $step);
         $this->assertFalse($steprunner->is_executed());
         $result = $steprunner->execute();
         $this->assertFalse($result);
@@ -204,19 +213,14 @@ public function test_execute_duplicated(): void {
      * @covers ::get_arguments_string
      */
     public function test_get_step_content(): void {
-        $generator = new behat_data_generators();
-        $validsteps = [
-            '/^the following "(?P<element_string>(?:[^"]|\\")*)" exist:$/' => 'the_following_entities_exist',
-            ':count :entitytype exist with the following data:' => 'the_following_repeated_entities_exist',
-            'the following :entitytype exists:' => 'the_following_entity_exists',
-        ];
-
         $step = $this->get_step('Given the following "course" exists:
-            | fullname    | Course test |
-            | shortname   | C1          |
-            | category    | 0           |
-            | numsections | 3           |');
-        $steprunner = new steprunner($generator, $validsteps, $step);
+        | fullname    | Course test |
+        | shortname   | C1          |
+        | category    | 0           |
+        | numsections | 3           |');
+
+        $validsteps = $this->get_valid_steps();
+        $steprunner = new steprunner(null, $validsteps, $step);
 
         $this->assertEquals(
             'the following "course" exists:',

From 306d733f5f8c1d780bb2951170d1784b55851f1e Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Thu, 25 Apr 2024 19:48:57 +0100
Subject: [PATCH 010/119] MDL-81657 libraries: upgrade to version 1.3.73 of
 Minify.

---
 lib/minify/matthiasmullie-minify/src/CSS.php  | 161 ++++++++++++++----
 lib/minify/matthiasmullie-minify/src/JS.php   |   3 -
 .../matthiasmullie-minify/src/Minify.php      |  20 ++-
 lib/thirdpartylibs.xml                        |   2 +-
 4 files changed, 140 insertions(+), 46 deletions(-)

diff --git a/lib/minify/matthiasmullie-minify/src/CSS.php b/lib/minify/matthiasmullie-minify/src/CSS.php
index 09cedeee3a064..4f56320c47459 100644
--- a/lib/minify/matthiasmullie-minify/src/CSS.php
+++ b/lib/minify/matthiasmullie-minify/src/CSS.php
@@ -106,8 +106,8 @@ protected function moveImportsToTop($content)
     /**
      * Combine CSS from import statements.
      *
-     * Import statements will be loaded and their content merged into the original
-     * file, to save HTTP requests.
+     * \@import's will be loaded and their content merged into the original file,
+     * to save HTTP requests.
      *
      * @param string   $source  The file to combine imports for
      * @param string   $content The CSS content to combine imports for
@@ -316,7 +316,9 @@ public function execute($path = null, $parents = array())
             $css = $this->replace($css);
 
             $css = $this->stripWhitespace($css);
-            $css = $this->shortenColors($css);
+            $css = $this->convertLegacyColors($css);
+            $css = $this->cleanupModernColors($css);
+            $css = $this->shortenHEXColors($css);
             $css = $this->shortenZeroes($css);
             $css = $this->shortenFontWeights($css);
             $css = $this->stripEmptyTags($css);
@@ -480,64 +482,153 @@ protected function move(ConverterInterface $converter, $content)
     }
 
     /**
-     * Shorthand hex color codes.
-     * #FF0000 -> #F00.
+     * Shorthand HEX color codes.
+     * #FF0000FF -> #f00 -> red
+     * #FF00FF00 -> transparent.
      *
-     * @param string $content The CSS content to shorten the hex color codes for
+     * @param string $content The CSS content to shorten the HEX color codes for
      *
      * @return string
      */
-    protected function shortenColors($content)
+    protected function shortenHexColors($content)
     {
-        $content = preg_replace('/(?<=[: ])#([0-9a-z])\\1([0-9a-z])\\2([0-9a-z])\\3(?:([0-9a-z])\\4)?(?=[; }])/i', '#$1$2$3$4', $content);
+        // shorten repeating patterns within HEX ..
+        $content = preg_replace('/(?<=[: ])#([0-9a-f])\\1([0-9a-f])\\2([0-9a-f])\\3(?:([0-9a-f])\\4)?(?=[; }])/i', '#$1$2$3$4', $content);
 
-        // remove alpha channel if it's pointless...
-        $content = preg_replace('/(?<=[: ])#([0-9a-z]{6})ff?(?=[; }])/i', '#$1', $content);
-        $content = preg_replace('/(?<=[: ])#([0-9a-z]{3})f?(?=[; }])/i', '#$1', $content);
+        // remove alpha channel if it's pointless ..
+        $content = preg_replace('/(?<=[: ])#([0-9a-f]{6})ff(?=[; }])/i', '#$1', $content);
+        $content = preg_replace('/(?<=[: ])#([0-9a-f]{3})f(?=[; }])/i', '#$1', $content);
+
+        // replace `transparent` with shortcut ..
+        $content = preg_replace('/(?<=[: ])#[0-9a-f]{6}00(?=[; }])/i', '#fff0', $content);
 
         $colors = array(
+            // make these more readable
+            '#00f' => 'blue',
+            '#dc143c' => 'crimson',
+            '#0ff' => 'cyan',
+            '#8b0000' => 'darkred',
+            '#696969' => 'dimgray',
+            '#ff69b4' => 'hotpink',
+            '#0f0' => 'lime',
+            '#fdf5e6' => 'oldlace',
+            '#87ceeb' => 'skyblue',
+            '#d8bfd8' => 'thistle',
             // we can shorten some even more by replacing them with their color name
-            '#F0FFFF' => 'azure',
-            '#F5F5DC' => 'beige',
-            '#A52A2A' => 'brown',
-            '#FF7F50' => 'coral',
-            '#FFD700' => 'gold',
+            '#f0ffff' => 'azure',
+            '#f5f5dc' => 'beige',
+            '#ffe4c4' => 'bisque',
+            '#a52a2a' => 'brown',
+            '#ff7f50' => 'coral',
+            '#ffd700' => 'gold',
             '#808080' => 'gray',
             '#008000' => 'green',
-            '#4B0082' => 'indigo',
-            '#FFFFF0' => 'ivory',
-            '#F0E68C' => 'khaki',
-            '#FAF0E6' => 'linen',
+            '#4b0082' => 'indigo',
+            '#fffff0' => 'ivory',
+            '#f0e68c' => 'khaki',
+            '#faf0e6' => 'linen',
             '#800000' => 'maroon',
             '#000080' => 'navy',
             '#808000' => 'olive',
-            '#CD853F' => 'peru',
-            '#FFC0CB' => 'pink',
-            '#DDA0DD' => 'plum',
+            '#ffa500' => 'orange',
+            '#da70d6' => 'orchid',
+            '#cd853f' => 'peru',
+            '#ffc0cb' => 'pink',
+            '#dda0dd' => 'plum',
             '#800080' => 'purple',
-            '#F00' => 'red',
-            '#FA8072' => 'salmon',
-            '#A0522D' => 'sienna',
-            '#C0C0C0' => 'silver',
-            '#FFFAFA' => 'snow',
-            '#D2B48C' => 'tan',
-            '#FF6347' => 'tomato',
-            '#EE82EE' => 'violet',
-            '#F5DEB3' => 'wheat',
+            '#f00' => 'red',
+            '#fa8072' => 'salmon',
+            '#a0522d' => 'sienna',
+            '#c0c0c0' => 'silver',
+            '#fffafa' => 'snow',
+            '#d2b48c' => 'tan',
+            '#008080' => 'teal',
+            '#ff6347' => 'tomato',
+            '#ee82ee' => 'violet',
+            '#f5deb3' => 'wheat',
             // or the other way around
-            'WHITE' => '#fff',
-            'BLACK' => '#000',
+            'black' => '#000',
+            'fuchsia' => '#f0f',
+            'magenta' => '#f0f',
+            'white' => '#fff',
+            'yellow' => '#ff0',
+            // and also `transparent`
+            'transparent' => '#fff0',
         );
 
         return preg_replace_callback(
             '/(?<=[: ])(' . implode('|', array_keys($colors)) . ')(?=[; }])/i',
             function ($match) use ($colors) {
-                return $colors[strtoupper($match[0])];
+                return $colors[strtolower($match[0])];
+            },
+            $content
+        );
+    }
+
+    /**
+     * Convert RGB|HSL color codes.
+     * rgb(255,0,0,.5) -> rgb(255 0 0 / .5).
+     * rgb(255,0,0) -> #f00.
+     *
+     * @param string $content The CSS content to shorten the RGB color codes for
+     *
+     * @return string
+     */
+    protected function convertLegacyColors($content)
+    {
+        /*
+          https://drafts.csswg.org/css-color/#color-syntax-legacy
+          https://developer.mozilla.org/en-US/docs/Web/CSS/color_value/rgb
+          https://developer.mozilla.org/en-US/docs/Web/CSS/color_value/hsl
+        */
+
+        // convert legacy color syntax
+        $content = preg_replace('/(rgb)a?\(\s*([0-9]{1,3}%?)\s*,\s*([0-9]{1,3}%?)\s*,\s*([0-9]{1,3}%?)\s*,\s*([0,1]?(?:\.[0-9]*)?)\s*\)/i', '$1($2 $3 $4 / $5)', $content);
+        $content = preg_replace('/(rgb)a?\(\s*([0-9]{1,3}%?)\s*,\s*([0-9]{1,3}%?)\s*,\s*([0-9]{1,3}%?)\s*\)/i', '$1($2 $3 $4)', $content);
+        $content = preg_replace('/(hsl)a?\(\s*([0-9]+(?:deg|grad|rad|turn)?)\s*,\s*([0-9]{1,3}%)\s*,\s*([0-9]{1,3}%)\s*,\s*([0,1]?(?:\.[0-9]*)?)\s*\)/i', '$1($2 $3 $4 / $5)', $content);
+        $content = preg_replace('/(hsl)a?\(\s*([0-9]+(?:deg|grad|rad|turn)?)\s*,\s*([0-9]{1,3}%)\s*,\s*([0-9]{1,3}%)\s*\)/i', '$1($2 $3 $4)', $content);
+
+        // convert `rgb` to `hex`
+        $dec = '([01]?[0-9]?[0-9]|2[0-4][0-9]|25[0-5])';
+        return preg_replace_callback(
+            "/rgb\($dec $dec $dec\)/i",
+            function ($match) {
+                return sprintf('#%02x%02x%02x', $match[1], $match[2], $match[3]);
             },
             $content
         );
     }
 
+    /**
+     * Cleanup RGB|HSL|HWB|LCH|LAB
+     * rgb(255 0 0 / 1) -> rgb(255 0 0).
+     * rgb(255 0 0 / 0) -> transparent.
+     *
+     * @param string $content The CSS content to cleanup HSL|HWB|LCH|LAB
+     *
+     * @return string
+     */
+    protected function cleanupModernColors($content)
+    {
+        /*
+          https://drafts.csswg.org/css-color/#color-syntax-modern
+          https://developer.mozilla.org/en-US/docs/Web/CSS/color_value/hwb
+          https://developer.mozilla.org/en-US/docs/Web/CSS/color_value/lch
+          https://developer.mozilla.org/en-US/docs/Web/CSS/color_value/lab
+          https://developer.mozilla.org/en-US/docs/Web/CSS/color_value/oklch
+          https://developer.mozilla.org/en-US/docs/Web/CSS/color_value/oklab
+        */
+        $tag = '(rgb|hsl|hwb|(?:(?:ok)?(?:lch|lab)))';
+
+        // remove alpha channel if it's pointless ..
+        $content = preg_replace('/' . $tag . '\(\s*([^\s]+)\s+([^\s]+)\s+([^\s]+)\s+\/\s+1(?:(?:\.\d?)*|00%)?\s*\)/i', '$1($2 $3 $4)', $content);
+
+        // replace `transparent` with shortcut ..
+        $content = preg_replace('/' . $tag . '\(\s*[^\s]+\s+[^\s]+\s+[^\s]+\s+\/\s+0(?:[\.0%]*)?\s*\)/i', '#fff0', $content);
+
+        return $content;
+    }
+
     /**
      * Shorten CSS font weights.
      *
diff --git a/lib/minify/matthiasmullie-minify/src/JS.php b/lib/minify/matthiasmullie-minify/src/JS.php
index d592b08bb33f5..9cf43a2e742a3 100644
--- a/lib/minify/matthiasmullie-minify/src/JS.php
+++ b/lib/minify/matthiasmullie-minify/src/JS.php
@@ -122,9 +122,6 @@ class JS extends Minify
      */
     protected $operatorsAfter = array();
 
-    /**
-     * {@inheritdoc}
-     */
     public function __construct()
     {
         call_user_func_array(array('\\MatthiasMullie\Minify\\Minify', '__construct'), func_get_args());
diff --git a/lib/minify/matthiasmullie-minify/src/Minify.php b/lib/minify/matthiasmullie-minify/src/Minify.php
index f77478bebb71f..29e6eb8c00af5 100644
--- a/lib/minify/matthiasmullie-minify/src/Minify.php
+++ b/lib/minify/matthiasmullie-minify/src/Minify.php
@@ -270,7 +270,7 @@ protected function stripMultilineComments()
         $minifier = $this;
         $callback = function ($match) use ($minifier) {
             $count = count($minifier->extracted);
-            $placeholder = '/*'.$count.'*/';
+            $placeholder = '/*' . $count . '*/';
             $minifier->extracted[$placeholder] = $match[0];
 
             return $placeholder;
@@ -494,14 +494,20 @@ protected function canImportFile($path)
         $parsed = parse_url($path);
         if (
             // file is elsewhere
-            isset($parsed['host']) ||
+            isset($parsed['host'])
             // file responds to queries (may change, or need to bypass cache)
-            isset($parsed['query'])
+            || isset($parsed['query'])
         ) {
             return false;
         }
 
-        return strlen($path) < PHP_MAXPATHLEN && @is_file($path) && is_readable($path);
+        try {
+            return strlen($path) < PHP_MAXPATHLEN && @is_file($path) && is_readable($path);
+        }
+        // catch openbasedir exceptions which are not caught by @ on is_file()
+        catch (\Exception $e) {
+            return false;
+        }
     }
 
     /**
@@ -534,9 +540,9 @@ protected function openFileForWriting($path)
     protected function writeToFile($handler, $content, $path = '')
     {
         if (
-            !is_resource($handler) ||
-            ($result = @fwrite($handler, $content)) === false ||
-            ($result < strlen($content))
+            !is_resource($handler)
+            || ($result = @fwrite($handler, $content)) === false
+            || ($result < strlen($content))
         ) {
             throw new IOException('The file "' . $path . '" could not be written to. Check your disk space and file permissions.');
         }
diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml
index d59a4ddc9e0ec..42014efcfcc92 100644
--- a/lib/thirdpartylibs.xml
+++ b/lib/thirdpartylibs.xml
@@ -82,7 +82,7 @@
     <location>minify/matthiasmullie-minify</location>
     <name>MatthiasMullie\Minify</name>
     <description>CSS &amp; JavaScript minifier, in PHP</description>
-    <version>1.3.71</version>
+    <version>1.3.73</version>
     <license>MIT</license>
     <repository>https://github.com/matthiasmullie/minify</repository>
     <customised/>

From 7c3b8c0a4019bdb7a7bb59f11e303040aa9de9ef Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Thu, 23 May 2024 19:04:33 +0100
Subject: [PATCH 011/119] MDL-82068 reportbuilder: re-factor SQL JOIN
 collection to trait.

Replace identical implementation of the same in various classes with
usage of the new trait. Implement constructor property promotion in
modified classes at the same time, to help clean up/clarify class
properties.
---
 reportbuilder/classes/local/entities/base.php | 40 +--------
 .../classes/local/helpers/custom_fields.php   | 62 +++----------
 .../classes/local/helpers/join_trait.php      | 65 ++++++++++++++
 .../local/helpers/user_profile_fields.php     | 76 ++++------------
 reportbuilder/classes/local/report/column.php | 84 +++++-------------
 reportbuilder/classes/local/report/filter.php | 86 ++++---------------
 .../tests/local/entities/base_test.php        | 46 +---------
 .../local/helpers/custom_fields_test.php      | 51 ++++-------
 .../tests/local/helpers/join_trait_test.php   | 86 +++++++++++++++++++
 .../helpers/user_profile_fields_test.php      | 41 ++++-----
 .../tests/local/report/column_test.php        | 34 +-------
 .../tests/local/report/filter_test.php        | 28 +-----
 12 files changed, 266 insertions(+), 433 deletions(-)
 create mode 100644 reportbuilder/classes/local/helpers/join_trait.php
 create mode 100644 reportbuilder/tests/local/helpers/join_trait_test.php

diff --git a/reportbuilder/classes/local/entities/base.php b/reportbuilder/classes/local/entities/base.php
index a24ddaaee27a4..5ba3b1c76edb6 100644
--- a/reportbuilder/classes/local/entities/base.php
+++ b/reportbuilder/classes/local/entities/base.php
@@ -19,7 +19,7 @@
 namespace core_reportbuilder\local\entities;
 
 use coding_exception;
-use core_reportbuilder\local\helpers\database;
+use core_reportbuilder\local\helpers\{database, join_trait};
 use core_reportbuilder\local\report\column;
 use core_reportbuilder\local\report\filter;
 use lang_string;
@@ -33,6 +33,8 @@
  */
 abstract class base {
 
+    use join_trait;
+
     /** @var string $entityname Internal reference to name of entity */
     private $entityname = null;
 
@@ -45,9 +47,6 @@ abstract class base {
     /** @var array $tablejoinaliases Database tables that have already been joined to the report and their aliases */
     private $tablejoinaliases = [];
 
-    /** @var string[] $joins List of SQL joins for the entity */
-    private $joins = [];
-
     /** @var column[] $columns List of columns for the entity */
     private $columns = [];
 
@@ -253,39 +252,6 @@ final public function has_table_join_alias(string $tablename): bool {
         return array_key_exists($tablename, $this->tablejoinaliases);
     }
 
-    /**
-     * Add join clause required for this entity to join to existing tables/entities
-     *
-     * @param string $join
-     * @return self
-     */
-    final public function add_join(string $join): self {
-        $this->joins[trim($join)] = trim($join);
-        return $this;
-    }
-
-    /**
-     * Add multiple join clauses required for this entity {@see add_join}
-     *
-     * @param string[] $joins
-     * @return self
-     */
-    final public function add_joins(array $joins): self {
-        foreach ($joins as $join) {
-            $this->add_join($join);
-        }
-        return $this;
-    }
-
-    /**
-     * Return entity joins
-     *
-     * @return string[]
-     */
-    final public function get_joins(): array {
-        return array_values($this->joins);
-    }
-
     /**
      * Helper method for returning joins necessary for retrieving tags related to the current entity
      *
diff --git a/reportbuilder/classes/local/helpers/custom_fields.php b/reportbuilder/classes/local/helpers/custom_fields.php
index 5ce3e6a83d867..b7ffe1e33c0a5 100644
--- a/reportbuilder/classes/local/helpers/custom_fields.php
+++ b/reportbuilder/classes/local/helpers/custom_fields.php
@@ -40,66 +40,32 @@
  */
 class custom_fields {
 
-    /** @var string $entityname Name of the entity */
-    private $entityname;
+    use join_trait;
 
     /** @var handler $handler The handler for the customfields */
-    private $handler;
-
-    /** @var int $tablefieldalias The table alias and the field name (table.field) that matches the customfield instanceid. */
-    private $tablefieldalias;
-
-    /** @var array additional joins */
-    private $joins = [];
+    private handler $handler;
 
     /**
-     * Class customfields constructor.
+     * Constructor
      *
-     * @param string $tablefieldalias table alias and the field name (table.field) that matches the customfield instanceid.
-     * @param string $entityname name of the entity in the report where we add custom fields.
+     * @param string $tablefieldalias The table/field alias to match the instance ID when adding columns and filters.
+     * @param string $entityname The entity name used when adding columns and filters.
      * @param string $component component name of full frankenstyle plugin name.
      * @param string $area name of the area (each component/plugin may define handlers for multiple areas).
      * @param int $itemid item id if the area uses them (usually not used).
      */
-    public function __construct(string $tablefieldalias, string $entityname, string $component, string $area, int $itemid = 0) {
-        $this->tablefieldalias = $tablefieldalias;
-        $this->entityname = $entityname;
+    public function __construct(
+        /** @var string The table/field alias to match the instance ID when adding columns and filters */
+        private readonly string $tablefieldalias,
+        /** @var string The entity name used when adding columns and filters */
+        private readonly string $entityname,
+        string $component,
+        string $area,
+        int $itemid = 0,
+    ) {
         $this->handler = handler::get_handler($component, $area, $itemid);
     }
 
-    /**
-     * Additional join that is needed.
-     *
-     * @param string $join
-     * @return self
-     */
-    public function add_join(string $join): self {
-        $this->joins[trim($join)] = trim($join);
-        return $this;
-    }
-
-    /**
-     * Additional joins that are needed.
-     *
-     * @param array $joins
-     * @return self
-     */
-    public function add_joins(array $joins): self {
-        foreach ($joins as $join) {
-            $this->add_join($join);
-        }
-        return $this;
-    }
-
-    /**
-     * Return joins
-     *
-     * @return string[]
-     */
-    private function get_joins(): array {
-        return array_values($this->joins);
-    }
-
     /**
      * Get table alias for given custom field
      *
diff --git a/reportbuilder/classes/local/helpers/join_trait.php b/reportbuilder/classes/local/helpers/join_trait.php
new file mode 100644
index 0000000000000..05b8a06be379d
--- /dev/null
+++ b/reportbuilder/classes/local/helpers/join_trait.php
@@ -0,0 +1,65 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+declare(strict_types=1);
+
+namespace core_reportbuilder\local\helpers;
+
+/**
+ * Trait for classes that expect to store SQL table joins
+ *
+ * @package     core_reportbuilder
+ * @copyright   2024 Paul Holden <paulh@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+trait join_trait {
+
+    /** @var string[] SQL table joins */
+    private array $joins = [];
+
+    /**
+     * Add single SQL table join
+     *
+     * @param string $join
+     * @return static
+     */
+    final public function add_join(string $join): static {
+        $this->joins[trim($join)] = trim($join);
+        return $this;
+    }
+
+    /**
+     * Add multiple SQL table joins
+     *
+     * @param string[] $joins
+     * @return static
+     */
+    final public function add_joins(array $joins): static {
+        foreach ($joins as $join) {
+            $this->add_join($join);
+        }
+        return $this;
+    }
+
+    /**
+     * Return SQL table joins
+     *
+     * @return string[]
+     */
+    final public function get_joins(): array {
+        return array_values($this->joins);
+    }
+}
diff --git a/reportbuilder/classes/local/helpers/user_profile_fields.php b/reportbuilder/classes/local/helpers/user_profile_fields.php
index 36cb0276b5c5a..bb2addfc5c91f 100644
--- a/reportbuilder/classes/local/helpers/user_profile_fields.php
+++ b/reportbuilder/classes/local/helpers/user_profile_fields.php
@@ -44,72 +44,28 @@
  */
 class user_profile_fields {
 
-    /** @var array user profile fields */
-    private $userprofilefields;
+    use join_trait;
 
-    /** @var string $entityname Name of the entity */
-    private $entityname;
-
-    /** @var int $usertablefieldalias The user table/field alias */
-    private $usertablefieldalias;
-
-    /** @var array additional joins */
-    private $joins = [];
+    /** @var profile_field_base[] User profile fields */
+    private array $userprofilefields;
 
     /**
-     * Class userprofilefields constructor.
+     * Constructor
      *
-     * @param string $usertablefieldalias The user table/field alias used when adding columns and filters.
+     * @param string $usertablefieldalias The table/field alias to match the user ID when adding columns and filters.
      * @param string $entityname The entity name used when adding columns and filters.
      */
-    public function __construct(string $usertablefieldalias, string $entityname) {
-        $this->usertablefieldalias = $usertablefieldalias;
-        $this->entityname = $entityname;
-        $this->userprofilefields = $this->get_user_profile_fields();
-    }
-
-    /**
-     * Retrieves the list of available/visible user profile fields
-     *
-     * @return profile_field_base[]
-     */
-    private function get_user_profile_fields(): array {
-        return array_filter(profile_get_user_fields_with_data(0), static function(profile_field_base $profilefield): bool {
-            return $profilefield->is_visible();
-        });
-    }
-
-    /**
-     * Additional join that is needed.
-     *
-     * @param string $join
-     * @return self
-     */
-    public function add_join(string $join): self {
-        $this->joins[trim($join)] = trim($join);
-        return $this;
-    }
-
-    /**
-     * Additional joins that are needed.
-     *
-     * @param array $joins
-     * @return self
-     */
-    public function add_joins(array $joins): self {
-        foreach ($joins as $join) {
-            $this->add_join($join);
-        }
-        return $this;
-    }
-
-    /**
-     * Return joins
-     *
-     * @return string[]
-     */
-    private function get_joins(): array {
-        return array_values($this->joins);
+    public function __construct(
+        /** @var string The table/field alias to match the user ID when adding columns and filters */
+        private readonly string $usertablefieldalias,
+        /** @var string The entity name used when adding columns and filters */
+        private readonly string $entityname,
+    ) {
+        // Retrieve the list of available/visible user profile fields.
+        $this->userprofilefields = array_filter(
+            profile_get_user_fields_with_data(0),
+            fn(profile_field_base $field) => $field->is_visible(),
+        );
     }
 
     /**
diff --git a/reportbuilder/classes/local/report/column.php b/reportbuilder/classes/local/report/column.php
index dcd4b9bd94353..fa7e4e84f8ed7 100644
--- a/reportbuilder/classes/local/report/column.php
+++ b/reportbuilder/classes/local/report/column.php
@@ -20,8 +20,7 @@
 
 use coding_exception;
 use lang_string;
-use core_reportbuilder\local\helpers\aggregation;
-use core_reportbuilder\local\helpers\database;
+use core_reportbuilder\local\helpers\{aggregation, database, join_trait};
 use core_reportbuilder\local\aggregation\base;
 use core_reportbuilder\local\models\column as column_model;
 
@@ -34,6 +33,8 @@
  */
 final class column {
 
+    use join_trait;
+
     /** @var int Column type is integer */
     public const TYPE_INTEGER = 1;
 
@@ -55,24 +56,12 @@ final class column {
     /** @var int $index Column index within a report */
     private $index;
 
-    /** @var string $columnname Internal reference to name of column */
-    private $columnname;
-
-    /** @var lang_string $columntitle Used as a title for the column in reports */
-    private $columntitle;
-
     /** @var bool $hascustomcolumntitle Used to store if the column has been given a custom title */
     private $hascustomcolumntitle = false;
 
-    /** @var string $entityname Name of the entity this column belongs to */
-    private $entityname;
-
     /** @var int $type Column data type (one of the TYPE_* class constants) */
     private $type = self::TYPE_TEXT;
 
-    /** @var string[] $joins List of SQL joins for this column */
-    private $joins = [];
-
     /** @var array $fields */
     private $fields = [];
 
@@ -101,16 +90,16 @@ final class column {
     private $attributes = [];
 
     /** @var bool $available Used to know if column is available to the current user or not */
-    protected $available = true;
+    private $available = true;
 
     /** @var bool $deprecated */
-    protected $deprecated = false;
+    private $deprecated = false;
 
     /** @var string $deprecatedmessage */
-    protected $deprecatedmessage;
+    private $deprecatedmessage;
 
     /** @var column_model $persistent */
-    protected $persistent;
+    private $persistent;
 
     /**
      * Column constructor
@@ -129,10 +118,15 @@ final class column {
      *      this value should be the result of calling {@see get_entity_name}, however if creating columns inside reports directly
      *      it should be the name of the entity as passed to {@see \core_reportbuilder\local\report\base::annotate_entity}
      */
-    public function __construct(string $name, ?lang_string $title, string $entityname) {
-        $this->columnname = $name;
-        $this->columntitle = $title;
-        $this->entityname = $entityname;
+    public function __construct(
+        /** @var string Internal name of the column */
+        private string $name,
+        /** @var lang_string|null Title of the column used in reports */
+        private ?lang_string $title,
+        /** @var string Name of the entity this column belongs to */
+        private readonly string $entityname,
+    ) {
+
     }
 
     /**
@@ -142,7 +136,7 @@ public function __construct(string $name, ?lang_string $title, string $entitynam
      * @return self
      */
     public function set_name(string $name): self {
-        $this->columnname = $name;
+        $this->name = $name;
         return $this;
     }
 
@@ -152,7 +146,7 @@ public function set_name(string $name): self {
      * @return mixed
      */
     public function get_name(): string {
-        return $this->columnname;
+        return $this->name;
     }
 
     /**
@@ -162,7 +156,7 @@ public function get_name(): string {
      * @return self
      */
     public function set_title(?lang_string $title): self {
-        $this->columntitle = $title;
+        $this->title = $title;
         $this->hascustomcolumntitle = true;
         return $this;
     }
@@ -173,7 +167,7 @@ public function set_title(?lang_string $title): self {
      * @return string
      */
     public function get_title(): string {
-        return $this->columntitle ? (string) $this->columntitle : '';
+        return $this->title ? (string) $this->title : '';
     }
 
     /**
@@ -251,44 +245,6 @@ public function get_type(): int {
         return $this->type;
     }
 
-    /**
-     * Add join clause required for this column to join to existing tables/entities
-     *
-     * This is necessary in the case where {@see add_field} is selecting data from a table that isn't otherwise queried
-     *
-     * @param string $join
-     * @return self
-     */
-    public function add_join(string $join): self {
-        $this->joins[trim($join)] = trim($join);
-        return $this;
-    }
-
-    /**
-     * Add multiple join clauses required for this column, passing each to {@see add_join}
-     *
-     * Typically when defining columns in entities, you should pass {@see \core_reportbuilder\local\report\base::get_joins} to
-     * this method, so that all entity joins are included in the report when your column is added to it
-     *
-     * @param string[] $joins
-     * @return self
-     */
-    public function add_joins(array $joins): self {
-        foreach ($joins as $join) {
-            $this->add_join($join);
-        }
-        return $this;
-    }
-
-    /**
-     * Return column joins
-     *
-     * @return string[]
-     */
-    public function get_joins(): array {
-        return array_values($this->joins);
-    }
-
     /**
      * Adds a field to be queried from the database that is necessary for this column
      *
diff --git a/reportbuilder/classes/local/report/filter.php b/reportbuilder/classes/local/report/filter.php
index 5a1ac9797d34d..4e11f87870631 100644
--- a/reportbuilder/classes/local/report/filter.php
+++ b/reportbuilder/classes/local/report/filter.php
@@ -21,7 +21,7 @@
 use lang_string;
 use moodle_exception;
 use core_reportbuilder\local\filters\base;
-use core_reportbuilder\local\helpers\database;
+use core_reportbuilder\local\helpers\{database, join_trait};
 use core_reportbuilder\local\models\filter as filter_model;
 
 /**
@@ -33,17 +33,7 @@
  */
 final class filter {
 
-    /** @var string $filterclass */
-    private $filterclass;
-
-    /** @var string $name */
-    private $name;
-
-    /** @var lang_string $header */
-    private $header;
-
-    /** @var string $entity */
-    private $entityname;
+    use join_trait;
 
     /** @var string $fieldsql */
     private $fieldsql = '';
@@ -51,26 +41,23 @@ final class filter {
     /** @var array $fieldparams */
     private $fieldparams = [];
 
-    /** @var string[] $joins */
-    protected $joins = [];
-
     /** @var bool $available */
-    protected $available = true;
+    private $available = true;
 
     /** @var bool $deprecated */
-    protected $deprecated = false;
+    private $deprecated = false;
 
     /** @var string $deprecatedmessage */
-    protected $deprecatedmessage;
+    private $deprecatedmessage;
 
     /** @var mixed $options */
-    protected $options;
+    private $options;
 
     /** @var array $limitoperators */
-    protected $limitoperators = [];
+    private $limitoperators = [];
 
     /** @var filter_model $persistent */
-    protected $persistent;
+    private $persistent;
 
     /**
      * Filter constructor
@@ -86,22 +73,21 @@ final class filter {
      * @throws moodle_exception For invalid filter class
      */
     public function __construct(
-        string $filterclass,
-        string $name,
-        lang_string $header,
-        string $entityname,
+        /** @var string Filter type class to use, must extend {@see base} filter class */
+        private readonly string $filterclass,
+        /** @var string Internal name of the filter */
+        private readonly string $name,
+        /** @var lang_string Title of the filter used in reports */
+        private lang_string $header,
+        /** @var string Name of the entity this filter belongs to */
+        private readonly string $entityname,
         string $fieldsql = '',
-        array $fieldparams = []
+        array $fieldparams = [],
     ) {
         if (!class_exists($filterclass) || !is_subclass_of($filterclass, base::class)) {
             throw new moodle_exception('filterinvalid', 'reportbuilder', '', null, $filterclass);
         }
 
-        $this->filterclass = $filterclass;
-        $this->name = $name;
-        $this->header = $header;
-        $this->entityname = $entityname;
-
         if ($fieldsql !== '') {
             $this->set_field_sql($fieldsql, $fieldparams);
         }
@@ -163,44 +149,6 @@ public function get_unique_identifier(): string {
         return $this->get_entity_name() . ':' . $this->get_name();
     }
 
-    /**
-     * Return joins
-     *
-     * @return string[]
-     */
-    public function get_joins(): array {
-        return array_values($this->joins);
-    }
-
-    /**
-     * Add join clause required for this filter to join to existing tables/entities
-     *
-     * This is necessary in the case where {@see set_field_sql} is selecting data from a table that isn't otherwise queried
-     *
-     * @param string $join
-     * @return self
-     */
-    public function add_join(string $join): self {
-        $this->joins[trim($join)] = trim($join);
-        return $this;
-    }
-
-    /**
-     * Add multiple join clauses required for this filter, passing each to {@see add_join}
-     *
-     * Typically when defining filters in entities, you should pass {@see \core_reportbuilder\local\report\base::get_joins} to
-     * this method, so that all entity joins are included in the report when your filter is used in it
-     *
-     * @param string[] $joins
-     * @return self
-     */
-    public function add_joins(array $joins): self {
-        foreach ($joins as $join) {
-            $this->add_join($join);
-        }
-        return $this;
-    }
-
     /**
      * Get SQL expression for the field
      *
diff --git a/reportbuilder/tests/local/entities/base_test.php b/reportbuilder/tests/local/entities/base_test.php
index 58330dbeb7216..8306df93fa825 100644
--- a/reportbuilder/tests/local/entities/base_test.php
+++ b/reportbuilder/tests/local/entities/base_test.php
@@ -43,7 +43,7 @@
  * @copyright   2021 David Matamoros <davidmc@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class base_test extends advanced_testcase {
+final class base_test extends advanced_testcase {
 
     /**
      * Test entity table alias
@@ -192,50 +192,6 @@ public function test_set_entity_title(): void {
         $this->assertEquals($newtitle, $entity->get_entity_title());
     }
 
-    /**
-     * Test adding single join
-     */
-    public function test_add_join(): void {
-        $entity = new base_test_entity();
-
-        $tablejoin = "JOIN {course} c2 ON c2.id = c1.id";
-        $entity->add_join($tablejoin);
-
-        $this->assertEquals([$tablejoin], $entity->get_joins());
-    }
-
-    /**
-     * Test adding multiple joins
-     */
-    public function test_add_joins(): void {
-        $entity = new base_test_entity();
-
-        $tablejoins = [
-            "JOIN {course} c2 ON c2.id = c1.id",
-            "JOIN {course} c3 ON c3.id = c1.id",
-        ];
-        $entity->add_joins($tablejoins);
-
-        $this->assertEquals($tablejoins, $entity->get_joins());
-    }
-
-    /**
-     * Test adding duplicate joins
-     */
-    public function test_add_duplicate_joins(): void {
-        $entity = new base_test_entity();
-
-        $tablejoins = [
-            "JOIN {course} c2 ON c2.id = c1.id",
-            "JOIN {course} c3 ON c3.id = c1.id",
-        ];
-        $entity
-            ->add_joins($tablejoins)
-            ->add_joins($tablejoins);
-
-        $this->assertEquals($tablejoins, $entity->get_joins());
-    }
-
     /**
      * Test getting column
      */
diff --git a/reportbuilder/tests/local/helpers/custom_fields_test.php b/reportbuilder/tests/local/helpers/custom_fields_test.php
index 35abb77cf5f97..759857da88b50 100644
--- a/reportbuilder/tests/local/helpers/custom_fields_test.php
+++ b/reportbuilder/tests/local/helpers/custom_fields_test.php
@@ -43,7 +43,7 @@
  * @copyright   2021 David Matamoros <davidmc@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class custom_fields_test extends core_reportbuilder_testcase {
+final class custom_fields_test extends core_reportbuilder_testcase {
 
     /**
      * Generate custom fields, one of each type
@@ -117,49 +117,34 @@ public function test_get_columns(): void {
     }
 
     /**
-     * Test for add_join
+     * Test that joins added to the custom fields helper are present in its columns/filters
      */
     public function test_add_join(): void {
         $this->resetAfterTest();
 
         $customfields = $this->generate_customfields();
 
-        // By default, we always join on the customfield data table.
-        $columns = $customfields->get_columns();
-        $joins = $columns[0]->get_joins();
+        // We always join on the customfield data table.
+        $columnjoins = $customfields->get_columns()[0]->get_joins();
+        $this->assertCount(1, $columnjoins);
+        $this->assertStringStartsWith('LEFT JOIN {customfield_data}', $columnjoins[0]);
 
-        $this->assertCount(1, $joins);
-        $this->assertStringStartsWith('LEFT JOIN {customfield_data}', $joins[0]);
+        $filterjoins = $customfields->get_filters()[0]->get_joins();
+        $this->assertCount(1, $filterjoins);
+        $this->assertStringStartsWith('LEFT JOIN {customfield_data}', $filterjoins[0]);
 
         // Add additional join.
         $customfields->add_join('JOIN {test} t ON t.id = id');
 
-        $columns = $customfields->get_columns();
-        $joins = $columns[0]->get_joins();
-
-        $this->assertCount(2, $joins);
-        $this->assertEquals('JOIN {test} t ON t.id = id', $joins[0]);
-        $this->assertStringStartsWith('LEFT JOIN {customfield_data}', $joins[1]);
-    }
-
-    /**
-     * Test for add_joins
-     */
-    public function test_add_joins(): void {
-        $this->resetAfterTest();
-
-        $customfields = $this->generate_customfields();
-
-        // Add additional joins.
-        $customfields->add_joins(['JOIN {test} t ON t.id = id', 'JOIN {test2} t2 ON t2.id = id']);
-
-        $columns = $customfields->get_columns();
-        $joins = $columns[0]->get_joins();
+        $columnjoins = $customfields->get_columns()[0]->get_joins();
+        $this->assertCount(2, $columnjoins);
+        $this->assertEquals('JOIN {test} t ON t.id = id', $columnjoins[0]);
+        $this->assertStringStartsWith('LEFT JOIN {customfield_data}', $columnjoins[1]);
 
-        $this->assertCount(3, $joins);
-        $this->assertEquals('JOIN {test} t ON t.id = id', $joins[0]);
-        $this->assertEquals('JOIN {test2} t2 ON t2.id = id', $joins[1]);
-        $this->assertStringStartsWith('LEFT JOIN {customfield_data}', $joins[2]);
+        $filterjoins = $customfields->get_filters()[0]->get_joins();
+        $this->assertCount(2, $filterjoins);
+        $this->assertEquals('JOIN {test} t ON t.id = id', $filterjoins[0]);
+        $this->assertStringStartsWith('LEFT JOIN {customfield_data}', $filterjoins[1]);
     }
 
     /**
@@ -254,7 +239,7 @@ public function test_custom_report_content_column_defaults(): void {
      *
      * @return array[]
      */
-    public function custom_report_filter_provider(): array {
+    public static function custom_report_filter_provider(): array {
         return [
             'Filter by text custom field' => ['course:customfield_text', [
                 'course:customfield_text_operator' => text::IS_EQUAL_TO,
diff --git a/reportbuilder/tests/local/helpers/join_trait_test.php b/reportbuilder/tests/local/helpers/join_trait_test.php
new file mode 100644
index 0000000000000..5e9dbe765adc2
--- /dev/null
+++ b/reportbuilder/tests/local/helpers/join_trait_test.php
@@ -0,0 +1,86 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+declare(strict_types=1);
+
+namespace core_reportbuilder\local\helpers;
+
+use advanced_testcase;
+
+/**
+ * Unit tests for the join trait
+ *
+ * @package     core_reportbuilder
+ * @covers      \core_reportbuilder\local\helpers\join_trait
+ * @copyright   2024 Paul Holden <paulh@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+final class join_trait_test extends advanced_testcase {
+
+    /**
+     * Test adding single join
+     */
+    public function test_add_join(): void {
+
+        /** @var join_trait $trait */
+        $trait = $this->getObjectForTrait(join_trait::class);
+        $trait->add_join('JOIN {test} t ON t.id = a.id');
+
+        $this->assertEquals(['JOIN {test} t ON t.id = a.id'], $trait->get_joins());
+    }
+
+    /**
+     * Test adding single join multiple times
+     */
+    public function test_add_join_multiple(): void {
+
+        /** @var join_trait $trait */
+        $trait = $this->getObjectForTrait(join_trait::class);
+
+        // Add multiple joins, two of which are duplicates.
+        $trait->add_join('JOIN {test} t1 ON t1.id = a.id')
+            ->add_join('JOIN {test} t2 ON t2.id = b.id')
+            ->add_join('JOIN {test} t1 ON t1.id = a.id');
+
+        // The duplicated join is normalised away.
+        $this->assertEquals([
+            'JOIN {test} t1 ON t1.id = a.id',
+            'JOIN {test} t2 ON t2.id = b.id',
+        ], $trait->get_joins());
+    }
+
+    /**
+     * Test adding multiple joins
+     */
+    public function test_add_joins(): void {
+
+        /** @var join_trait $trait */
+        $trait = $this->getObjectForTrait(join_trait::class);
+
+        // Add multiple joins, two of which are duplicates.
+        $trait->add_joins([
+            'JOIN {test} t1 ON t1.id = a.id',
+            'JOIN {test} t2 ON t2.id = b.id',
+            'JOIN {test} t1 ON t1.id = a.id',
+        ]);
+
+        // The duplicated join is normalised away.
+        $this->assertEquals([
+            'JOIN {test} t1 ON t1.id = a.id',
+            'JOIN {test} t2 ON t2.id = b.id',
+        ], $trait->get_joins());
+    }
+}
diff --git a/reportbuilder/tests/local/helpers/user_profile_fields_test.php b/reportbuilder/tests/local/helpers/user_profile_fields_test.php
index c8c35f9e571e6..321a460366679 100644
--- a/reportbuilder/tests/local/helpers/user_profile_fields_test.php
+++ b/reportbuilder/tests/local/helpers/user_profile_fields_test.php
@@ -42,7 +42,7 @@
  * @copyright   2021 David Matamoros <davidmc@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class user_profile_fields_test extends core_reportbuilder_testcase {
+final class user_profile_fields_test extends core_reportbuilder_testcase {
 
     /**
      * Generate custom profile fields, one of each type
@@ -132,33 +132,34 @@ public function test_get_columns(): void {
     }
 
     /**
-     * Test for add_join
+     * Test that joins added to the profile fields helper are present in its columns/filters
      */
     public function test_add_join(): void {
         $this->resetAfterTest();
 
         $userprofilefields = $this->generate_userprofilefields();
-        $columns = $userprofilefields->get_columns();
-        $this->assertCount(1, ($columns[0])->get_joins());
 
-        $userprofilefields->add_join('JOIN {test} t ON t.id = id');
-        $columns = $userprofilefields->get_columns();
-        $this->assertCount(2, ($columns[0])->get_joins());
-    }
+        // We always join on the user info data table.
+        $columnjoins = $userprofilefields->get_columns()[0]->get_joins();
+        $this->assertCount(1, $columnjoins);
+        $this->assertStringStartsWith('LEFT JOIN {user_info_data}', $columnjoins[0]);
 
-    /**
-     * Test for add_joins
-     */
-    public function test_add_joins(): void {
-        $this->resetAfterTest();
+        $filterjoins = $userprofilefields->get_filters()[0]->get_joins();
+        $this->assertCount(1, $filterjoins);
+        $this->assertStringStartsWith('LEFT JOIN {user_info_data}', $filterjoins[0]);
 
-        $userprofilefields = $this->generate_userprofilefields();
-        $columns = $userprofilefields->get_columns();
-        $this->assertCount(1, ($columns[0])->get_joins());
+        // Add additional join.
+        $userprofilefields->add_join('JOIN {test} t ON t.id = id');
 
-        $userprofilefields->add_joins(['JOIN {test} t ON t.id = id', 'JOIN {test2} t2 ON t2.id = id']);
-        $columns = $userprofilefields->get_columns();
-        $this->assertCount(3, ($columns[0])->get_joins());
+        $columnjoins = $userprofilefields->get_columns()[0]->get_joins();
+        $this->assertCount(2, $columnjoins);
+        $this->assertEquals('JOIN {test} t ON t.id = id', $columnjoins[0]);
+        $this->assertStringStartsWith('LEFT JOIN {user_info_data}', $columnjoins[1]);
+
+        $filterjoins = $userprofilefields->get_filters()[0]->get_joins();
+        $this->assertCount(2, $filterjoins);
+        $this->assertEquals('JOIN {test} t ON t.id = id', $filterjoins[0]);
+        $this->assertStringStartsWith('LEFT JOIN {user_info_data}', $filterjoins[1]);
     }
 
     /**
@@ -262,7 +263,7 @@ public function test_custom_report_content(): void {
      *
      * @return array[]
      */
-    public function custom_report_filter_provider(): array {
+    public static function custom_report_filter_provider(): array {
         return [
             'Filter by checkbox profile field' => ['user:profilefield_checkbox', [
                 'user:profilefield_checkbox_operator' => boolean_select::CHECKED,
diff --git a/reportbuilder/tests/local/report/column_test.php b/reportbuilder/tests/local/report/column_test.php
index 3b29dba4dc160..8ad01c67e2098 100644
--- a/reportbuilder/tests/local/report/column_test.php
+++ b/reportbuilder/tests/local/report/column_test.php
@@ -32,7 +32,7 @@
  * @copyright   2020 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class column_test extends advanced_testcase {
+final class column_test extends advanced_testcase {
 
     /**
      * Test column name getter/setter
@@ -112,38 +112,12 @@ public function test_type_invalid(): void {
         $column->set_type(-1);
     }
 
-    /**
-     * Test adding single join
-     */
-    public function test_add_join(): void {
-        $column = $this->create_column('test');
-        $this->assertEquals([], $column->get_joins());
-
-        $column->add_join('JOIN {user} u ON u.id = table.userid');
-        $this->assertEquals(['JOIN {user} u ON u.id = table.userid'], $column->get_joins());
-    }
-
-    /**
-     * Test adding multiple joins
-     */
-    public function test_add_joins(): void {
-        $tablejoins = [
-            "JOIN {course} c2 ON c2.id = c1.id",
-            "JOIN {course} c3 ON c3.id = c1.id",
-        ];
-
-        $column = $this->create_column('test')
-            ->add_joins($tablejoins);
-
-        $this->assertEquals($tablejoins, $column->get_joins());
-    }
-
     /**
      * Data provider for {@see test_add_field}
      *
      * @return array
      */
-    public function add_field_provider(): array {
+    public static function add_field_provider(): array {
         return [
             ['foo', '', ['foo AS c1_foo']],
             ['foo', 'bar', ['foo AS c1_bar']],
@@ -231,7 +205,7 @@ public function test_add_field_complex_without_alias(): void {
      *
      * @return array
      */
-    public function add_fields_provider(): array {
+    public static function add_fields_provider(): array {
         return [
             ['t.foo', ['t.foo AS c1_foo']],
             ['t.foo bar', ['t.foo AS c1_bar']],
@@ -327,7 +301,7 @@ public function test_get_groupby_sql(): void {
      *
      * @return array[]
      */
-    public function column_type_provider(): array {
+    public static function column_type_provider(): array {
         return [
             [column::TYPE_INTEGER, 42],
             [column::TYPE_TEXT, 'Hello'],
diff --git a/reportbuilder/tests/local/report/filter_test.php b/reportbuilder/tests/local/report/filter_test.php
index 299d599a11a92..4d3910e64ee97 100644
--- a/reportbuilder/tests/local/report/filter_test.php
+++ b/reportbuilder/tests/local/report/filter_test.php
@@ -31,7 +31,7 @@
  * @copyright   2021 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class filter_test extends advanced_testcase {
+final class filter_test extends advanced_testcase {
 
     /**
      * Test getting filter class
@@ -120,32 +120,6 @@ public function test_get_field_sql_and_params(): void {
         $this->assertEquals(['username_1' => 'test', 'idnumber_1' => 'bar'], $params);
     }
 
-    /**
-     * Test adding single join
-     */
-    public function test_add_join(): void {
-        $filter = $this->create_filter('username', 'u.username');
-        $this->assertEquals([], $filter->get_joins());
-
-        $filter->add_join('JOIN {user} u ON u.id = table.userid');
-        $this->assertEquals(['JOIN {user} u ON u.id = table.userid'], $filter->get_joins());
-    }
-
-    /**
-     * Test adding multiple joins
-     */
-    public function test_add_joins(): void {
-        $tablejoins = [
-            "JOIN {course} c2 ON c2.id = c1.id",
-            "JOIN {course} c3 ON c3.id = c1.id",
-        ];
-
-        $filter = $this->create_filter('username', 'u.username')
-            ->add_joins($tablejoins);
-
-        $this->assertEquals($tablejoins, $filter->get_joins());
-    }
-
     /**
      * Test is available
      */

From d5316aeac6c3a5571ee31bcaebb530a934fddb43 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Tue, 7 May 2024 21:59:38 +0100
Subject: [PATCH 012/119] MDL-80344 calendar: correct no subscriptions language
 string use.

Ensure expected parameters are present; avoid string concatenation.
---
 calendar/renderer.php  | 8 ++++----
 lang/en/calendar.php   | 7 +++++--
 lang/en/deprecated.txt | 2 ++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/calendar/renderer.php b/calendar/renderer.php
index 5134fa007fa5c..3d184b83e213b 100644
--- a/calendar/renderer.php
+++ b/calendar/renderer.php
@@ -298,9 +298,8 @@ public function render_subscriptions_header(): string {
      */
     public function render_no_calendar_subscriptions(): string {
         $output = html_writer::start_div('mt-5');
-        $importlink = html_writer::link((new moodle_url('/calendar/import.php', calendar_get_export_import_link_params()))->out(),
-                get_string('importcalendarexternal', 'calendar'));
-        $output .= get_string('nocalendarsubscriptions', 'calendar', $importlink);
+        $importlink = (new moodle_url('/calendar/import.php', calendar_get_export_import_link_params()))->out();
+        $output .= get_string('nocalendarsubscriptionsimportexternal', 'core_calendar', $importlink);
         $output .= html_writer::end_div();
 
         return $output;
@@ -327,7 +326,8 @@ public function subscription_details($unused, $subscriptions, $unused2 = '') {
         $table->id = 'subscription_details_table';
 
         if (empty($subscriptions)) {
-            $cell = new html_table_cell(get_string('nocalendarsubscriptions', 'calendar'));
+            $importlink = (new moodle_url('/calendar/import.php', calendar_get_export_import_link_params()))->out();
+            $cell = new html_table_cell(get_string('nocalendarsubscriptionsimportexternal', 'core_calendar', $importlink));
             $cell->colspan = 5;
             $table->data[] = new html_table_row(array($cell));
         }
diff --git a/lang/en/calendar.php b/lang/en/calendar.php
index f922d5d46d90d..694efe548bf09 100644
--- a/lang/en/calendar.php
+++ b/lang/en/calendar.php
@@ -168,7 +168,6 @@
 $string['hideeventtype'] = 'Hide {$a} events';
 $string['showeventtype'] = 'Show {$a} events';
 $string['hourly'] = 'Hourly';
-$string['importcalendarexternal'] = 'Import an external calendar?';
 $string['importcalendar'] = 'Import calendar';
 $string['importcalendarheading'] = 'Import calendar...';
 $string['importcalendarfrom'] = 'Import from';
@@ -193,9 +192,9 @@
 $string['never'] = 'Never';
 $string['newevent'] = 'New event';
 $string['newmonthannouncement'] = 'Calendar is now set to {$a}.';
+$string['nocalendarsubscriptionsimportexternal'] = 'No calendar subscriptions yet. <a href="{$a}">Import an external calendar</a>';
 $string['notitle'] = 'no title';
 $string['noupcomingevents'] = 'There are no upcoming events';
-$string['nocalendarsubscriptions'] = 'No calendar subscriptions yet. Do you want to {$a}';
 $string['oneevent'] = '1 event';
 $string['pollinterval'] = 'Update interval';
 $string['pollinterval_help'] = 'How often you would like the calendar to update with new events.';
@@ -287,3 +286,7 @@
 
 // Deprecated since Moodle 4.4.
 $string['coursecalendar'] = '{$a} calendar';
+
+// Deprecated since Moodle 4.5.
+$string['importcalendarexternal'] = 'Import an external calendar?';
+$string['nocalendarsubscriptions'] = 'No calendar subscriptions yet. Do you want to {$a}';
diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt
index 31c9828e288d2..b934616128dbf 100644
--- a/lang/en/deprecated.txt
+++ b/lang/en/deprecated.txt
@@ -113,4 +113,6 @@ coursesearch_help,core
 blocknotexist,core_debug
 modulenotexist,core_debug
 coursecalendar,core_calendar
+importcalendarexternal,core_calendar
+nocalendarsubscriptions,core_calendar
 datechanged,core

From fc8dfda112bb670414be37f1daa4080286758057 Mon Sep 17 00:00:00 2001
From: ferranrecio <ferran@moodle.com>
Date: Tue, 11 Jun 2024 16:15:02 +0200
Subject: [PATCH 013/119] MDL-82167 core: fix reactive debug panel

---
 lib/amd/build/local/reactive/debugpanel.min.js     | 2 +-
 lib/amd/build/local/reactive/debugpanel.min.js.map | 2 +-
 lib/amd/src/local/reactive/debugpanel.js           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/amd/build/local/reactive/debugpanel.min.js b/lib/amd/build/local/reactive/debugpanel.min.js
index 82de966570bc1..d6f23b882a6b2 100644
--- a/lib/amd/build/local/reactive/debugpanel.min.js
+++ b/lib/amd/build/local/reactive/debugpanel.min.js
@@ -9,6 +9,6 @@ define("core/local/reactive/debugpanel",["exports","core/reactive","core/log","c
    * @module     core/local/reactive/debugpanel
    * @copyright  2021 Ferran Recio <ferran@moodle.com>
    * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
-   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.initsubpanel=_exports.init=void 0,_log=(obj=_log)&&obj.__esModule?obj:{default:obj};_exports.init=(target,selectors)=>{const element=document.getElementById(target);void 0!==_reactive.debug?new GlobalDebugPanel({element:element,reactive:_reactive.debug,selectors:selectors}):element.remove()};_exports.initsubpanel=(target,selectors)=>{const element=document.getElementById(target);void 0!==_reactive.debug?new DebugInstanceSubpanel({element:element,reactive:_reactive.debug,selectors:selectors}):element.remove()};class GlobalDebugPanel extends _reactive.BaseComponent{create(){this.name="GlobalDebugPanel",this.selectors={LOADERS:"[data-for='loaders']",SUBPANEL:"[data-for='subpanel']",NOINSTANCES:"[data-for='noinstances']",LOG:"[data-for='log']"},this.classes={HIDE:"d-none"},this.subPanels=new Set}stateReady(state){this._updateReactivesPanels({state:state}),this.getElement(this.selectors.SUBPANEL).innerHTML=""}getWatchers(){return[{watch:"reactives:created",handler:this._updateReactivesPanels}]}_updateReactivesPanels(_ref){var _this$getElement,_this$getElement$clas;let{state:state}=_ref;null===(_this$getElement=this.getElement(this.selectors.NOINSTANCES))||void 0===_this$getElement||null===(_this$getElement$clas=_this$getElement.classList)||void 0===_this$getElement$clas||_this$getElement$clas.toggle(this.classes.HIDE,state.reactives.size>0),state.reactives.forEach((instance=>{this._createLoader(instance)}))}_createLoader(instance){if(this.subPanels.has(instance.id))return;this.subPanels.add(instance.id);const loaders=this.getElement(this.selectors.LOADERS),btn=document.createElement("button");btn.innerHTML=instance.id,btn.dataset.id=instance.id,loaders.appendChild(btn),this.addEventListener(btn,"click",(()=>this._openPanel(btn,instance)))}async _openPanel(btn,instance){try{const target=this.getElement(this.selectors.SUBPANEL),data={...instance};await this.renderComponent(target,"core/local/reactive/debuginstancepanel",data)}catch(error){throw _log.default.error("Cannot load reactive debug subpanel"),error}}}class DebugInstanceSubpanel extends _reactive.BaseComponent{create(){this.name="DebugInstanceSubpanel",this.selectors={NAME:"[data-for='name']",CLOSE:"[data-for='close']",READMODE:"[data-for='readmode']",HIGHLIGHT:"[data-for='highlight']",LOG:"[data-for='log']",STATE:"[data-for='state']",CLEAN:"[data-for='clean']",PIN:"[data-for='pin']",SAVE:"[data-for='save']",INVALID:"[data-for='invalid']"},this.id=this.element.dataset.id,this.controller=M.reactive[this.id],this.draggable=!1,this.relativeDrag=!0,this.strings={savewarning:""}}stateReady(){var _this$getElement$inne,_this$getElement2;this.dragdrop=new _reactive.DragDrop(this),this.addEventListener(this.getElement(this.selectors.CLOSE),"click",this.remove),this.controller.highlight&&this._toggleButtonText(this.getElement(this.selectors.HIGHLIGHT)),this.addEventListener(this.getElement(this.selectors.HIGHLIGHT),"click",(()=>{this.controller.highlight=!this.controller.highlight,this._toggleButtonText(this.getElement(this.selectors.HIGHLIGHT))})),this.addEventListener(this.getElement(this.selectors.READMODE),"click",this._toggleEditMode),this.addEventListener(this.getElement(this.selectors.CLEAN),"click",this._cleanAreas),this.addEventListener(this.getElement(this.selectors.PIN),"click",this._togglePin),this.getElement(this.selectors.SAVE).disabled=!0,this.addEventListener(this.getElement(this.selectors.STATE),"keyup",(0,_utils.debounce)(this._checkJSON,500)),this.addEventListener(this.getElement(this.selectors.SAVE),"click",this._saveState),this.strings.savewarning=null!==(_this$getElement$inne=null===(_this$getElement2=this.getElement(this.selectors.INVALID))||void 0===_this$getElement2?void 0:_this$getElement2.innerHTML)&&void 0!==_this$getElement$inne?_this$getElement$inne:"",this._refreshState()}destroy(){void 0!==this.dragdrop&&this.dragdrop.unregister()}getWatchers(){return[{watch:"reactives[".concat(this.id,"].lastChanges:updated"),handler:this._refreshLog},{watch:"reactives[".concat(this.id,"].modified:updated"),handler:this._refreshState},{watch:"reactives[".concat(this.id,"].readOnly:updated"),handler:this._refreshReadOnly}]}_refreshLog(_ref2){var _element$lastChanges;let{element:element}=_ref2;const logContent=(null!==(_element$lastChanges=null==element?void 0:element.lastChanges)&&void 0!==_element$lastChanges?_element$lastChanges:[]).join("\n"),target=this.getElement(this.selectors.LOG);target.value+="\n\n= Transaction =\n ".concat(logContent),target.scrollTop=target.scrollHeight}_cleanAreas(){this.getElement(this.selectors.LOG).value="",this._refreshState()}_refreshState(){this.getElement(this.selectors.STATE).value=JSON.stringify(this.controller.state,null,4)}_refreshReadOnly(){const target=this.getElement(this.selectors.READMODE);void 0===target.dataset.readonly&&(target.dataset.readonly=target.innerHTML),this.controller.readOnly?target.innerHTML=target.dataset.readonly:target.innerHTML=target.dataset.alt}_toggleEditMode(){this.controller.readOnly=!this.controller.readOnly}_checkJSON(){const invalid=this.getElement(this.selectors.INVALID),save=this.getElement(this.selectors.SAVE),edited=this.getElement(this.selectors.STATE).value,currentStateData=this.controller.stateData;if(edited==JSON.stringify(this.controller.state,null,4))return invalid.style.color="",invalid.innerHTML="",void(save.disabled=!0);try{const newState=JSON.parse(edited),result=this._generateStateUpdates(currentStateData,newState);return invalid.style.color="",invalid.innerHTML=this.strings.savewarning,save.disabled=!1,result}catch(error){var _error$message;return invalid.style.color="red",invalid.innerHTML=null!==(_error$message=error.message)&&void 0!==_error$message?_error$message:"Invalid JSON sctructure",void(save.disabled=!0)}}_saveState(){const updates=this._checkJSON();updates&&this.controller.processUpdates(updates)}_generateStateUpdates(currentStateData,newStateData){const updates=[],ids={};for(const[key,newValue]of Object.entries(newStateData))Array.isArray(newValue)?(ids[key]={},newValue.forEach((element=>{if(void 0===element.id)throw Error("Array ".concat(key," element without id attribute"));updates.push({name:key,action:"override",fields:element});const index=String(element.id).valueOf();ids[key][index]=!0}))):updates.push({name:key,action:"override",fields:newValue});for(const[key,oldValue]of Object.entries(currentStateData)){let deleteField=!1;if(void 0===newStateData[key]&&(deleteField=!0),Array.isArray(oldValue)){if(!deleteField&&void 0===ids[key])throw Error("Array ".concat(key," cannot change to object."));oldValue.forEach((element=>{const index=String(element.id).valueOf();let deleteEntry=deleteField;deleteEntry||void 0!==ids[key][index]||(deleteEntry=!0),deleteEntry&&updates.push({name:key,action:"delete",fields:element})}))}else{if(!deleteField&&void 0!==ids[key])throw Error("Object ".concat(key," cannot change to array."));deleteField&&updates.push({name:key,action:"delete",fields:oldValue})}}return updates}getDraggableData(){return this.draggable}dragEnd(dropdata,event){this.element.style.top="".concat(event.newFixedTop,"px"),this.element.style.left="".concat(event.newFixedLeft,"px")}_togglePin(){this.draggable=!this.draggable,this.dragdrop.setDraggable(this.draggable),this.draggable?this._unpin():this._pin()}_unpin(){const pageCenterY=window.innerHeight/2,pageCenterX=window.innerWidth/2,style={position:"fixed",resize:"both",overflow:"auto",height:"400px",width:"400px",top:"".concat(pageCenterY-200,"px"),left:"".concat(pageCenterX-200,"px")};Object.assign(this.element.style,style),this.getElement(this.selectors.STATE).style.height="50px",this.getElement(this.selectors.LOG).style.height="50px",this._toggleButtonText(this.getElement(this.selectors.PIN))}_pin(){["position","resize","overflow","top","left","height","width"].forEach((prop=>this.element.style.removeProperty(prop))),this._toggleButtonText(this.getElement(this.selectors.PIN))}_toggleButtonText(element){[element.innerHTML,element.dataset.alt]=[element.dataset.alt,element.innerHTML]}}}));
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.initsubpanel=_exports.init=void 0,_log=(obj=_log)&&obj.__esModule?obj:{default:obj};_exports.init=(target,selectors)=>{const element=document.getElementById(target);void 0!==_reactive.debug?new GlobalDebugPanel({element:element,reactive:_reactive.debug,selectors:selectors}):element.remove()};_exports.initsubpanel=(target,selectors)=>{const element=document.getElementById(target);void 0!==_reactive.debug?new DebugInstanceSubpanel({element:element,reactive:_reactive.debug,selectors:selectors}):element.remove()};class GlobalDebugPanel extends _reactive.BaseComponent{create(){this.name="GlobalDebugPanel",this.selectors={LOADERS:"[data-for='loaders']",SUBPANEL:"[data-for='subpanel']",NOINSTANCES:"[data-for='noinstances']",LOG:"[data-for='log']"},this.classes={HIDE:"d-none"},this.subPanels=new Set}stateReady(state){this._updateReactivesPanels({state:state}),this.getElement(this.selectors.SUBPANEL).innerHTML=""}getWatchers(){return[{watch:"reactives:created",handler:this._updateReactivesPanels}]}_updateReactivesPanels(_ref){var _this$getElement,_this$getElement$clas;let{state:state}=_ref;null===(_this$getElement=this.getElement(this.selectors.NOINSTANCES))||void 0===_this$getElement||null===(_this$getElement$clas=_this$getElement.classList)||void 0===_this$getElement$clas||_this$getElement$clas.toggle(this.classes.HIDE,state.reactives.size>0),state.reactives.forEach((instance=>{this._createLoader(instance)}))}_createLoader(instance){if(this.subPanels.has(instance.id))return;this.subPanels.add(instance.id);const loaders=this.getElement(this.selectors.LOADERS),btn=document.createElement("button");btn.innerHTML=instance.id,btn.dataset.id=instance.id,loaders.appendChild(btn),this.addEventListener(btn,"click",(()=>this._openPanel(btn,instance)))}async _openPanel(btn,instance){try{const target=this.getElement(this.selectors.SUBPANEL),data={...instance};await this.renderComponent(target,"core/local/reactive/debuginstancepanel",data)}catch(error){throw _log.default.error("Cannot load reactive debug subpanel"),error}}}class DebugInstanceSubpanel extends _reactive.BaseComponent{create(){this.name="DebugInstanceSubpanel",this.selectors={NAME:"[data-for='name']",CLOSE:"[data-for='close']",READMODE:"[data-for='readmode']",HIGHLIGHT:"[data-for='highlight']",LOG:"[data-for='log']",STATE:"[data-for='state']",CLEAN:"[data-for='clean']",PIN:"[data-for='pin']",SAVE:"[data-for='save']",INVALID:"[data-for='invalid']"},this.id=this.element.dataset.id,this.controller=M.reactive[this.id],this.draggable=!1,this.relativeDrag=!0,this.strings={savewarning:""}}stateReady(){var _this$getElement$inne,_this$getElement2;this.dragdrop=new _reactive.DragDrop(this),this.addEventListener(this.getElement(this.selectors.CLOSE),"click",this.remove),this.controller.highlight&&this._toggleButtonText(this.getElement(this.selectors.HIGHLIGHT)),this.addEventListener(this.getElement(this.selectors.HIGHLIGHT),"click",(()=>{this.controller.highlight=!this.controller.highlight,this._toggleButtonText(this.getElement(this.selectors.HIGHLIGHT))})),this.addEventListener(this.getElement(this.selectors.READMODE),"click",this._toggleEditMode),this.addEventListener(this.getElement(this.selectors.CLEAN),"click",this._cleanAreas),this.addEventListener(this.getElement(this.selectors.PIN),"click",this._togglePin),this.getElement(this.selectors.SAVE).disabled=!0,this.addEventListener(this.getElement(this.selectors.STATE),"keyup",(0,_utils.debounce)(this._checkJSON.bind(this),500)),this.addEventListener(this.getElement(this.selectors.SAVE),"click",this._saveState),this.strings.savewarning=null!==(_this$getElement$inne=null===(_this$getElement2=this.getElement(this.selectors.INVALID))||void 0===_this$getElement2?void 0:_this$getElement2.innerHTML)&&void 0!==_this$getElement$inne?_this$getElement$inne:"",this._refreshState()}destroy(){void 0!==this.dragdrop&&this.dragdrop.unregister()}getWatchers(){return[{watch:"reactives[".concat(this.id,"].lastChanges:updated"),handler:this._refreshLog},{watch:"reactives[".concat(this.id,"].modified:updated"),handler:this._refreshState},{watch:"reactives[".concat(this.id,"].readOnly:updated"),handler:this._refreshReadOnly}]}_refreshLog(_ref2){var _element$lastChanges;let{element:element}=_ref2;const logContent=(null!==(_element$lastChanges=null==element?void 0:element.lastChanges)&&void 0!==_element$lastChanges?_element$lastChanges:[]).join("\n"),target=this.getElement(this.selectors.LOG);target.value+="\n\n= Transaction =\n ".concat(logContent),target.scrollTop=target.scrollHeight}_cleanAreas(){this.getElement(this.selectors.LOG).value="",this._refreshState()}_refreshState(){this.getElement(this.selectors.STATE).value=JSON.stringify(this.controller.state,null,4)}_refreshReadOnly(){const target=this.getElement(this.selectors.READMODE);void 0===target.dataset.readonly&&(target.dataset.readonly=target.innerHTML),this.controller.readOnly?target.innerHTML=target.dataset.readonly:target.innerHTML=target.dataset.alt}_toggleEditMode(){this.controller.readOnly=!this.controller.readOnly}_checkJSON(){const invalid=this.getElement(this.selectors.INVALID),save=this.getElement(this.selectors.SAVE),edited=this.getElement(this.selectors.STATE).value,currentStateData=this.controller.stateData;if(edited==JSON.stringify(this.controller.state,null,4))return invalid.style.color="",invalid.innerHTML="",void(save.disabled=!0);try{const newState=JSON.parse(edited),result=this._generateStateUpdates(currentStateData,newState);return invalid.style.color="",invalid.innerHTML=this.strings.savewarning,save.disabled=!1,result}catch(error){var _error$message;return invalid.style.color="red",invalid.innerHTML=null!==(_error$message=error.message)&&void 0!==_error$message?_error$message:"Invalid JSON sctructure",void(save.disabled=!0)}}_saveState(){const updates=this._checkJSON();updates&&this.controller.processUpdates(updates)}_generateStateUpdates(currentStateData,newStateData){const updates=[],ids={};for(const[key,newValue]of Object.entries(newStateData))Array.isArray(newValue)?(ids[key]={},newValue.forEach((element=>{if(void 0===element.id)throw Error("Array ".concat(key," element without id attribute"));updates.push({name:key,action:"override",fields:element});const index=String(element.id).valueOf();ids[key][index]=!0}))):updates.push({name:key,action:"override",fields:newValue});for(const[key,oldValue]of Object.entries(currentStateData)){let deleteField=!1;if(void 0===newStateData[key]&&(deleteField=!0),Array.isArray(oldValue)){if(!deleteField&&void 0===ids[key])throw Error("Array ".concat(key," cannot change to object."));oldValue.forEach((element=>{const index=String(element.id).valueOf();let deleteEntry=deleteField;deleteEntry||void 0!==ids[key][index]||(deleteEntry=!0),deleteEntry&&updates.push({name:key,action:"delete",fields:element})}))}else{if(!deleteField&&void 0!==ids[key])throw Error("Object ".concat(key," cannot change to array."));deleteField&&updates.push({name:key,action:"delete",fields:oldValue})}}return updates}getDraggableData(){return this.draggable}dragEnd(dropdata,event){this.element.style.top="".concat(event.newFixedTop,"px"),this.element.style.left="".concat(event.newFixedLeft,"px")}_togglePin(){this.draggable=!this.draggable,this.dragdrop.setDraggable(this.draggable),this.draggable?this._unpin():this._pin()}_unpin(){const pageCenterY=window.innerHeight/2,pageCenterX=window.innerWidth/2,style={position:"fixed",resize:"both",overflow:"auto",height:"400px",width:"400px",top:"".concat(pageCenterY-200,"px"),left:"".concat(pageCenterX-200,"px")};Object.assign(this.element.style,style),this.getElement(this.selectors.STATE).style.height="50px",this.getElement(this.selectors.LOG).style.height="50px",this._toggleButtonText(this.getElement(this.selectors.PIN))}_pin(){["position","resize","overflow","top","left","height","width"].forEach((prop=>this.element.style.removeProperty(prop))),this._toggleButtonText(this.getElement(this.selectors.PIN))}_toggleButtonText(element){[element.innerHTML,element.dataset.alt]=[element.dataset.alt,element.innerHTML]}}}));
 
 //# sourceMappingURL=debugpanel.min.js.map
\ No newline at end of file
diff --git a/lib/amd/build/local/reactive/debugpanel.min.js.map b/lib/amd/build/local/reactive/debugpanel.min.js.map
index b69f3f6544023..b6841c9f46a63 100644
--- a/lib/amd/build/local/reactive/debugpanel.min.js.map
+++ b/lib/amd/build/local/reactive/debugpanel.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"debugpanel.min.js","sources":["../../../src/local/reactive/debugpanel.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Reactive module debug panel.\n *\n * This module contains all the UI components for the reactive debug tools.\n * Those tools are only available if the debug is enables and could be used\n * from the footer.\n *\n * @module     core/local/reactive/debugpanel\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport {BaseComponent, DragDrop, debug} from 'core/reactive';\nimport log from 'core/log';\nimport {debounce} from 'core/utils';\n\n/**\n * Init the main reactive panel.\n *\n * @param {element|string} target the DOM main element or its ID\n * @param {object} selectors optional css selector overrides\n */\nexport const init = (target, selectors) => {\n    const element = document.getElementById(target);\n    // Check if the debug reactive module is available.\n    if (debug === undefined) {\n        element.remove();\n        return;\n    }\n    // Create the main component.\n    new GlobalDebugPanel({\n        element,\n        reactive: debug,\n        selectors,\n    });\n};\n\n/**\n * Init an instance reactive subpanel.\n *\n * @param {element|string} target the DOM main element or its ID\n * @param {object} selectors optional css selector overrides\n */\nexport const initsubpanel = (target, selectors) => {\n    const element = document.getElementById(target);\n    // Check if the debug reactive module is available.\n    if (debug === undefined) {\n        element.remove();\n        return;\n    }\n    // Create the main component.\n    new DebugInstanceSubpanel({\n        element,\n        reactive: debug,\n        selectors,\n    });\n};\n\n/**\n * Component for the main reactive dev panel.\n *\n * This component shows the list of reactive instances and handle the buttons\n * to open a specific instance panel.\n */\nclass GlobalDebugPanel extends BaseComponent {\n\n    /**\n     * Constructor hook.\n     */\n    create() {\n        // Optional component name for debugging.\n        this.name = 'GlobalDebugPanel';\n        // Default query selectors.\n        this.selectors = {\n            LOADERS: `[data-for='loaders']`,\n            SUBPANEL: `[data-for='subpanel']`,\n            NOINSTANCES: `[data-for='noinstances']`,\n            LOG: `[data-for='log']`,\n        };\n        this.classes = {\n            HIDE: `d-none`,\n        };\n        // The list of loaded debuggers.\n        this.subPanels = new Set();\n    }\n\n    /**\n     * Initial state ready method.\n     *\n     * @param {object} state the initial state\n     */\n    stateReady(state) {\n        this._updateReactivesPanels({state});\n        // Remove loading wheel.\n        this.getElement(this.selectors.SUBPANEL).innerHTML = '';\n    }\n\n    /**\n     * Component watchers.\n     *\n     * @returns {Array} of watchers\n     */\n    getWatchers() {\n        return [\n            {watch: `reactives:created`, handler: this._updateReactivesPanels},\n        ];\n    }\n\n    /**\n     * Update the list of reactive instances.\n     * @param {Object} args\n     * @param {Object} args.state the current state\n     */\n    _updateReactivesPanels({state}) {\n        this.getElement(this.selectors.NOINSTANCES)?.classList?.toggle(\n            this.classes.HIDE,\n            state.reactives.size > 0\n        );\n        // Generate loading buttons.\n        state.reactives.forEach(\n            instance => {\n                this._createLoader(instance);\n            }\n        );\n    }\n\n    /**\n     * Create a debug panel button for a specific reactive instance.\n     *\n     * @param {object} instance hte instance data\n     */\n    _createLoader(instance) {\n        if (this.subPanels.has(instance.id)) {\n            return;\n        }\n        this.subPanels.add(instance.id);\n        const loaders = this.getElement(this.selectors.LOADERS);\n        const btn = document.createElement(\"button\");\n        btn.innerHTML = instance.id;\n        btn.dataset.id = instance.id;\n        loaders.appendChild(btn);\n        // Add click event.\n        this.addEventListener(btn, 'click', () => this._openPanel(btn, instance));\n    }\n\n    /**\n     * Open a debug panel.\n     *\n     * @param {Element} btn the button element\n     * @param {object} instance the instance data\n     */\n    async _openPanel(btn, instance) {\n        try {\n            const target = this.getElement(this.selectors.SUBPANEL);\n            const data = {...instance};\n            await this.renderComponent(target, 'core/local/reactive/debuginstancepanel', data);\n        } catch (error) {\n            log.error('Cannot load reactive debug subpanel');\n            throw error;\n        }\n    }\n}\n\n/**\n * Component for the main reactive dev panel.\n *\n * This component shows the list of reactive instances and handle the buttons\n * to open a specific instance panel.\n */\nclass DebugInstanceSubpanel extends BaseComponent {\n\n    /**\n     * Constructor hook.\n     */\n    create() {\n        // Optional component name for debugging.\n        this.name = 'DebugInstanceSubpanel';\n        // Default query selectors.\n        this.selectors = {\n            NAME: `[data-for='name']`,\n            CLOSE: `[data-for='close']`,\n            READMODE: `[data-for='readmode']`,\n            HIGHLIGHT: `[data-for='highlight']`,\n            LOG: `[data-for='log']`,\n            STATE: `[data-for='state']`,\n            CLEAN: `[data-for='clean']`,\n            PIN: `[data-for='pin']`,\n            SAVE: `[data-for='save']`,\n            INVALID: `[data-for='invalid']`,\n        };\n        this.id = this.element.dataset.id;\n        this.controller = M.reactive[this.id];\n\n        // The component is created always pinned.\n        this.draggable = false;\n        // We want the element to be dragged like modal.\n        this.relativeDrag = true;\n        // Save warning (will be loaded when state is ready.\n        this.strings = {\n            savewarning: '',\n        };\n    }\n\n    /**\n     * Initial state ready method.\n     *\n     */\n    stateReady() {\n        // Enable drag and drop.\n        this.dragdrop = new DragDrop(this);\n\n        // Close button.\n        this.addEventListener(\n            this.getElement(this.selectors.CLOSE),\n            'click',\n            this.remove\n        );\n        // Highlight button.\n        if (this.controller.highlight) {\n            this._toggleButtonText(this.getElement(this.selectors.HIGHLIGHT));\n        }\n        this.addEventListener(\n            this.getElement(this.selectors.HIGHLIGHT),\n            'click',\n            () => {\n                this.controller.highlight = !this.controller.highlight;\n                this._toggleButtonText(this.getElement(this.selectors.HIGHLIGHT));\n            }\n        );\n        // Edit mode button.\n        this.addEventListener(\n            this.getElement(this.selectors.READMODE),\n            'click',\n            this._toggleEditMode\n        );\n        // Clean log and state.\n        this.addEventListener(\n            this.getElement(this.selectors.CLEAN),\n            'click',\n            this._cleanAreas\n        );\n        // Unpin panel butotn.\n        this.addEventListener(\n            this.getElement(this.selectors.PIN),\n            'click',\n            this._togglePin\n        );\n        // Save button, state format error message and state textarea.\n        this.getElement(this.selectors.SAVE).disabled = true;\n\n        this.addEventListener(\n            this.getElement(this.selectors.STATE),\n            'keyup',\n            debounce(this._checkJSON, 500)\n        );\n\n        this.addEventListener(\n            this.getElement(this.selectors.SAVE),\n            'click',\n            this._saveState\n        );\n        // Save the default save warning message.\n        this.strings.savewarning = this.getElement(this.selectors.INVALID)?.innerHTML ?? '';\n        // Add current state.\n        this._refreshState();\n    }\n\n    /**\n     * Remove all subcomponents dependencies.\n     */\n    destroy() {\n        if (this.dragdrop !== undefined) {\n            this.dragdrop.unregister();\n        }\n    }\n\n    /**\n     * Component watchers.\n     *\n     * @returns {Array} of watchers\n     */\n    getWatchers() {\n        return [\n            {watch: `reactives[${this.id}].lastChanges:updated`, handler: this._refreshLog},\n            {watch: `reactives[${this.id}].modified:updated`, handler: this._refreshState},\n            {watch: `reactives[${this.id}].readOnly:updated`, handler: this._refreshReadOnly},\n        ];\n    }\n\n    /**\n     * Wtacher method to refresh the log panel.\n     *\n     * @param {object} args\n     * @param {HTMLElement} args.element\n     */\n    _refreshLog({element}) {\n        const list = element?.lastChanges ?? [];\n\n        const logContent = list.join(\"\\n\");\n        // Append last log.\n        const target = this.getElement(this.selectors.LOG);\n        target.value += `\\n\\n= Transaction =\\n ${logContent}`;\n        target.scrollTop = target.scrollHeight;\n    }\n\n    /**\n     * Listener method to clean the log area.\n     */\n    _cleanAreas() {\n        let target = this.getElement(this.selectors.LOG);\n        target.value = '';\n\n        this._refreshState();\n    }\n\n    /**\n     * Watcher to refresh the state information.\n     */\n    _refreshState() {\n        const target = this.getElement(this.selectors.STATE);\n        target.value = JSON.stringify(this.controller.state, null, 4);\n    }\n\n    /**\n     * Watcher to update the read only information.\n     */\n    _refreshReadOnly() {\n        // Toggle the read mode button.\n        const target = this.getElement(this.selectors.READMODE);\n        if (target.dataset.readonly === undefined) {\n            target.dataset.readonly = target.innerHTML;\n        }\n        if (this.controller.readOnly) {\n            target.innerHTML = target.dataset.readonly;\n        } else {\n            target.innerHTML = target.dataset.alt;\n        }\n    }\n\n    /**\n     * Listener to toggle the edit mode of the component.\n     */\n    _toggleEditMode() {\n        this.controller.readOnly = !this.controller.readOnly;\n    }\n\n    /**\n     * Check that the edited state JSON is valid.\n     *\n     * Not all valid JSON are suitable for transforming the state. For example,\n     * the first level attributes cannot change the type.\n     *\n     * @return {undefined|array} Array of state updates.\n     */\n    _checkJSON() {\n        const invalid = this.getElement(this.selectors.INVALID);\n        const save = this.getElement(this.selectors.SAVE);\n\n        const edited = this.getElement(this.selectors.STATE).value;\n\n        const currentStateData = this.controller.stateData;\n\n        // Check if the json is tha same as state.\n        if (edited == JSON.stringify(this.controller.state, null, 4)) {\n            invalid.style.color = '';\n            invalid.innerHTML = '';\n            save.disabled = true;\n            return undefined;\n        }\n\n        // Check if the json format is valid.\n        try {\n            const newState = JSON.parse(edited);\n            // Check the first level did not change types.\n            const result = this._generateStateUpdates(currentStateData, newState);\n            // Enable save button.\n            invalid.style.color = '';\n            invalid.innerHTML = this.strings.savewarning;\n            save.disabled = false;\n            return result;\n        } catch (error) {\n            invalid.style.color = 'red';\n            invalid.innerHTML = error.message ?? 'Invalid JSON sctructure';\n            save.disabled = true;\n            return undefined;\n        }\n    }\n\n    /**\n     * Listener to save the current edited state into the real state.\n     */\n    _saveState() {\n        const updates = this._checkJSON();\n        if (!updates) {\n            return;\n        }\n        // Sent the updates to the state manager.\n        this.controller.processUpdates(updates);\n    }\n\n    /**\n     * Check that the edited state JSON is valid.\n     *\n     * Not all valid JSON are suitable for transforming the state. For example,\n     * the first level attributes cannot change the type. This method do a two\n     * steps comparison between the current state data and the new state data.\n     *\n     * A reactive state cannot be overridden like any other variable. To keep\n     * the watchers updated is necessary to transform the current state into\n     * the new one. As a result, this method generates all the necessary state\n     * updates to convert the state into the new state.\n     *\n     * @param {object} currentStateData\n     * @param {object} newStateData\n     * @return {array} Array of state updates.\n     * @throws {Error} is the structure is not compatible\n     */\n    _generateStateUpdates(currentStateData, newStateData) {\n\n        const updates = [];\n\n        const ids = {};\n\n        // Step 1: Add all overrides newStateData.\n        for (const [key, newValue] of Object.entries(newStateData)) {\n            // Check is it is new.\n            if (Array.isArray(newValue)) {\n                ids[key] = {};\n                newValue.forEach(element => {\n                    if (element.id === undefined) {\n                        throw Error(`Array ${key} element without id attribute`);\n                    }\n                    updates.push({\n                        name: key,\n                        action: 'override',\n                        fields: element,\n                    });\n                    const index = String(element.id).valueOf();\n                    ids[key][index] = true;\n                });\n            } else {\n                updates.push({\n                    name: key,\n                    action: 'override',\n                    fields: newValue,\n                });\n            }\n        }\n        // Step 2: delete unnecesary data from currentStateData.\n        for (const [key, oldValue] of Object.entries(currentStateData)) {\n            let deleteField = false;\n            // Check if the attribute is still there.\n            if (newStateData[key] === undefined) {\n                deleteField = true;\n            }\n            if (Array.isArray(oldValue)) {\n                if (!deleteField && ids[key] === undefined) {\n                    throw Error(`Array ${key} cannot change to object.`);\n                }\n                oldValue.forEach(element => {\n                    const index = String(element.id).valueOf();\n                    let deleteEntry = deleteField;\n                    // Check if the id is there.\n                    if (!deleteEntry && ids[key][index] === undefined) {\n                        deleteEntry = true;\n                    }\n                    if (deleteEntry) {\n                        updates.push({\n                            name: key,\n                            action: 'delete',\n                            fields: element,\n                        });\n                    }\n                });\n            } else {\n                if (!deleteField && ids[key] !== undefined) {\n                    throw Error(`Object ${key} cannot change to array.`);\n                }\n                if (deleteField) {\n                    updates.push({\n                        name: key,\n                        action: 'delete',\n                        fields: oldValue,\n                    });\n                }\n            }\n        }\n        // Delete all elements without action.\n        return updates;\n    }\n\n    // Drag and drop methods.\n\n    /**\n     * Get the draggable data of this component.\n     *\n     * @returns {Object} exported course module drop data\n     */\n    getDraggableData() {\n        return this.draggable;\n    }\n\n    /**\n     * The element drop end hook.\n     *\n     * @param {Object} dropdata the dropdata\n     * @param {Event} event the dropdata\n     */\n    dragEnd(dropdata, event) {\n        this.element.style.top = `${event.newFixedTop}px`;\n        this.element.style.left = `${event.newFixedLeft}px`;\n    }\n\n    /**\n     * Pin and unpin the panel.\n     */\n    _togglePin() {\n        this.draggable = !this.draggable;\n        this.dragdrop.setDraggable(this.draggable);\n        if (this.draggable) {\n            this._unpin();\n        } else {\n            this._pin();\n        }\n    }\n\n    /**\n     * Unpin the panel form the footer.\n     */\n    _unpin() {\n        // Find the initial spot.\n        const pageCenterY = window.innerHeight / 2;\n        const pageCenterX = window.innerWidth / 2;\n        // Put the element in the middle of the screen\n        const style = {\n            position: 'fixed',\n            resize: 'both',\n            overflow: 'auto',\n            height: '400px',\n            width: '400px',\n            top: `${pageCenterY - 200}px`,\n            left: `${pageCenterX - 200}px`,\n        };\n        Object.assign(this.element.style, style);\n        // Small also the text areas.\n        this.getElement(this.selectors.STATE).style.height = '50px';\n        this.getElement(this.selectors.LOG).style.height = '50px';\n\n        this._toggleButtonText(this.getElement(this.selectors.PIN));\n    }\n\n    /**\n     * Pin the panel into the footer.\n     */\n    _pin() {\n        const props = [\n            'position',\n            'resize',\n            'overflow',\n            'top',\n            'left',\n            'height',\n            'width',\n        ];\n        props.forEach(\n            prop => this.element.style.removeProperty(prop)\n        );\n        this._toggleButtonText(this.getElement(this.selectors.PIN));\n    }\n\n    /**\n     * Toogle the button text with the data-alt value.\n     *\n     * @param {Element} element the button element\n     */\n    _toggleButtonText(element) {\n        [element.innerHTML, element.dataset.alt] = [element.dataset.alt, element.innerHTML];\n    }\n\n}\n"],"names":["target","selectors","element","document","getElementById","undefined","debug","GlobalDebugPanel","reactive","remove","DebugInstanceSubpanel","BaseComponent","create","name","LOADERS","SUBPANEL","NOINSTANCES","LOG","classes","HIDE","subPanels","Set","stateReady","state","_updateReactivesPanels","getElement","this","innerHTML","getWatchers","watch","handler","classList","toggle","reactives","size","forEach","instance","_createLoader","has","id","add","loaders","btn","createElement","dataset","appendChild","addEventListener","_openPanel","data","renderComponent","error","NAME","CLOSE","READMODE","HIGHLIGHT","STATE","CLEAN","PIN","SAVE","INVALID","controller","M","draggable","relativeDrag","strings","savewarning","dragdrop","DragDrop","highlight","_toggleButtonText","_toggleEditMode","_cleanAreas","_togglePin","disabled","_checkJSON","_saveState","_this$getElement2","_refreshState","destroy","unregister","_refreshLog","_refreshReadOnly","logContent","lastChanges","join","value","scrollTop","scrollHeight","JSON","stringify","readonly","readOnly","alt","invalid","save","edited","currentStateData","stateData","style","color","newState","parse","result","_generateStateUpdates","message","updates","processUpdates","newStateData","ids","key","newValue","Object","entries","Array","isArray","Error","push","action","fields","index","String","valueOf","oldValue","deleteField","deleteEntry","getDraggableData","dragEnd","dropdata","event","top","newFixedTop","left","newFixedLeft","setDraggable","_unpin","_pin","pageCenterY","window","innerHeight","pageCenterX","innerWidth","position","resize","overflow","height","width","assign","prop","removeProperty"],"mappings":";;;;;;;;;;;wKAqCoB,CAACA,OAAQC,mBACnBC,QAAUC,SAASC,eAAeJ,aAE1BK,IAAVC,oBAKAC,iBAAiB,CACjBL,QAAAA,QACAM,SAAUF,gBACVL,UAAAA,YAPAC,QAAQO,gCAiBY,CAACT,OAAQC,mBAC3BC,QAAUC,SAASC,eAAeJ,aAE1BK,IAAVC,oBAKAI,sBAAsB,CACtBR,QAAAA,QACAM,SAAUF,gBACVL,UAAAA,YAPAC,QAAQO,gBAiBVF,yBAAyBI,wBAK3BC,cAESC,KAAO,wBAEPZ,UAAY,CACba,+BACAC,iCACAC,uCACAC,6BAECC,QAAU,CACXC,oBAGCC,UAAY,IAAIC,IAQzBC,WAAWC,YACFC,uBAAuB,CAACD,MAAAA,aAExBE,WAAWC,KAAKzB,UAAUc,UAAUY,UAAY,GAQzDC,oBACW,CACH,CAACC,0BAA4BC,QAASJ,KAAKF,yBASnDA,4EAAuBD,MAACA,0CACfE,WAAWC,KAAKzB,UAAUe,yFAAce,kEAAWC,OACpDN,KAAKR,QAAQC,KACbI,MAAMU,UAAUC,KAAO,GAG3BX,MAAMU,UAAUE,SACZC,gBACSC,cAAcD,aAU/BC,cAAcD,aACNV,KAAKN,UAAUkB,IAAIF,SAASG,gBAG3BnB,UAAUoB,IAAIJ,SAASG,UACtBE,QAAUf,KAAKD,WAAWC,KAAKzB,UAAUa,SACzC4B,IAAMvC,SAASwC,cAAc,UACnCD,IAAIf,UAAYS,SAASG,GACzBG,IAAIE,QAAQL,GAAKH,SAASG,GAC1BE,QAAQI,YAAYH,UAEfI,iBAAiBJ,IAAK,SAAS,IAAMhB,KAAKqB,WAAWL,IAAKN,6BASlDM,IAAKN,oBAERpC,OAAS0B,KAAKD,WAAWC,KAAKzB,UAAUc,UACxCiC,KAAO,IAAIZ,gBACXV,KAAKuB,gBAAgBjD,OAAQ,yCAA0CgD,MAC/E,MAAOE,0BACDA,MAAM,uCACJA,cAWZxC,8BAA8BC,wBAKhCC,cAESC,KAAO,6BAEPZ,UAAY,CACbkD,yBACAC,2BACAC,iCACAC,mCACArC,uBACAsC,2BACAC,2BACAC,uBACAC,yBACAC,qCAECpB,GAAKb,KAAKxB,QAAQ0C,QAAQL,QAC1BqB,WAAaC,EAAErD,SAASkB,KAAKa,SAG7BuB,WAAY,OAEZC,cAAe,OAEfC,QAAU,CACXC,YAAa,IAQrB3C,8DAES4C,SAAW,IAAIC,mBAASzC,WAGxBoB,iBACDpB,KAAKD,WAAWC,KAAKzB,UAAUmD,OAC/B,QACA1B,KAAKjB,QAGLiB,KAAKkC,WAAWQ,gBACXC,kBAAkB3C,KAAKD,WAAWC,KAAKzB,UAAUqD,iBAErDR,iBACDpB,KAAKD,WAAWC,KAAKzB,UAAUqD,WAC/B,SACA,UACSM,WAAWQ,WAAa1C,KAAKkC,WAAWQ,eACxCC,kBAAkB3C,KAAKD,WAAWC,KAAKzB,UAAUqD,oBAIzDR,iBACDpB,KAAKD,WAAWC,KAAKzB,UAAUoD,UAC/B,QACA3B,KAAK4C,sBAGJxB,iBACDpB,KAAKD,WAAWC,KAAKzB,UAAUuD,OAC/B,QACA9B,KAAK6C,kBAGJzB,iBACDpB,KAAKD,WAAWC,KAAKzB,UAAUwD,KAC/B,QACA/B,KAAK8C,iBAGJ/C,WAAWC,KAAKzB,UAAUyD,MAAMe,UAAW,OAE3C3B,iBACDpB,KAAKD,WAAWC,KAAKzB,UAAUsD,OAC/B,SACA,mBAAS7B,KAAKgD,WAAY,WAGzB5B,iBACDpB,KAAKD,WAAWC,KAAKzB,UAAUyD,MAC/B,QACAhC,KAAKiD,iBAGJX,QAAQC,oEAAcvC,KAAKD,WAAWC,KAAKzB,UAAU0D,6CAA/BiB,kBAAyCjD,iEAAa,QAE5EkD,gBAMTC,eAC0BzE,IAAlBqB,KAAKwC,eACAA,SAASa,aAStBnD,oBACW,CACH,CAACC,0BAAoBH,KAAKa,4BAA2BT,QAASJ,KAAKsD,aACnE,CAACnD,0BAAoBH,KAAKa,yBAAwBT,QAASJ,KAAKmD,eAChE,CAAChD,0BAAoBH,KAAKa,yBAAwBT,QAASJ,KAAKuD,mBAUxED,gDAAY9E,QAACA,qBAGHgF,yCAFOhF,MAAAA,eAAAA,QAASiF,iEAAe,IAEbC,KAAK,MAEvBpF,OAAS0B,KAAKD,WAAWC,KAAKzB,UAAUgB,KAC9CjB,OAAOqF,uCAAkCH,YACzClF,OAAOsF,UAAYtF,OAAOuF,aAM9BhB,cACiB7C,KAAKD,WAAWC,KAAKzB,UAAUgB,KACrCoE,MAAQ,QAEVR,gBAMTA,gBACmBnD,KAAKD,WAAWC,KAAKzB,UAAUsD,OACvC8B,MAAQG,KAAKC,UAAU/D,KAAKkC,WAAWrC,MAAO,KAAM,GAM/D0D,yBAEUjF,OAAS0B,KAAKD,WAAWC,KAAKzB,UAAUoD,eACdhD,IAA5BL,OAAO4C,QAAQ8C,WACf1F,OAAO4C,QAAQ8C,SAAW1F,OAAO2B,WAEjCD,KAAKkC,WAAW+B,SAChB3F,OAAO2B,UAAY3B,OAAO4C,QAAQ8C,SAElC1F,OAAO2B,UAAY3B,OAAO4C,QAAQgD,IAO1CtB,uBACSV,WAAW+B,UAAYjE,KAAKkC,WAAW+B,SAWhDjB,mBACUmB,QAAUnE,KAAKD,WAAWC,KAAKzB,UAAU0D,SACzCmC,KAAOpE,KAAKD,WAAWC,KAAKzB,UAAUyD,MAEtCqC,OAASrE,KAAKD,WAAWC,KAAKzB,UAAUsD,OAAO8B,MAE/CW,iBAAmBtE,KAAKkC,WAAWqC,aAGrCF,QAAUP,KAAKC,UAAU/D,KAAKkC,WAAWrC,MAAO,KAAM,UACtDsE,QAAQK,MAAMC,MAAQ,GACtBN,QAAQlE,UAAY,QACpBmE,KAAKrB,UAAW,aAMV2B,SAAWZ,KAAKa,MAAMN,QAEtBO,OAAS5E,KAAK6E,sBAAsBP,iBAAkBI,iBAE5DP,QAAQK,MAAMC,MAAQ,GACtBN,QAAQlE,UAAYD,KAAKsC,QAAQC,YACjC6B,KAAKrB,UAAW,EACT6B,OACT,MAAOpD,iCACL2C,QAAQK,MAAMC,MAAQ,MACtBN,QAAQlE,iCAAYuB,MAAMsD,iDAAW,+BACrCV,KAAKrB,UAAW,IAQxBE,mBACU8B,QAAU/E,KAAKgD,aAChB+B,cAIA7C,WAAW8C,eAAeD,SAoBnCF,sBAAsBP,iBAAkBW,oBAE9BF,QAAU,GAEVG,IAAM,OAGP,MAAOC,IAAKC,YAAaC,OAAOC,QAAQL,cAErCM,MAAMC,QAAQJ,WACdF,IAAIC,KAAO,GACXC,SAAS3E,SAAQjC,kBACMG,IAAfH,QAAQqC,SACF4E,sBAAeN,sCAEzBJ,QAAQW,KAAK,CACTvG,KAAMgG,IACNQ,OAAQ,WACRC,OAAQpH,gBAENqH,MAAQC,OAAOtH,QAAQqC,IAAIkF,UACjCb,IAAIC,KAAKU,QAAS,MAGtBd,QAAQW,KAAK,CACTvG,KAAMgG,IACNQ,OAAQ,WACRC,OAAQR,eAKf,MAAOD,IAAKa,YAAaX,OAAOC,QAAQhB,kBAAmB,KACxD2B,aAAc,UAEQtH,IAAtBsG,aAAaE,OACbc,aAAc,GAEdV,MAAMC,QAAQQ,UAAW,KACpBC,kBAA4BtH,IAAbuG,IAAIC,WACdM,sBAAeN,kCAEzBa,SAASvF,SAAQjC,gBACPqH,MAAQC,OAAOtH,QAAQqC,IAAIkF,cAC7BG,YAAcD,YAEbC,kBAAmCvH,IAApBuG,IAAIC,KAAKU,SACzBK,aAAc,GAEdA,aACAnB,QAAQW,KAAK,CACTvG,KAAMgG,IACNQ,OAAQ,SACRC,OAAQpH,iBAIjB,KACEyH,kBAA4BtH,IAAbuG,IAAIC,WACdM,uBAAgBN,iCAEtBc,aACAlB,QAAQW,KAAK,CACTvG,KAAMgG,IACNQ,OAAQ,SACRC,OAAQI,mBAMjBjB,QAUXoB,0BACWnG,KAAKoC,UAShBgE,QAAQC,SAAUC,YACT9H,QAAQgG,MAAM+B,cAASD,MAAME,uBAC7BhI,QAAQgG,MAAMiC,eAAUH,MAAMI,mBAMvC5D,kBACSV,WAAapC,KAAKoC,eAClBI,SAASmE,aAAa3G,KAAKoC,WAC5BpC,KAAKoC,eACAwE,cAEAC,OAObD,eAEUE,YAAcC,OAAOC,YAAc,EACnCC,YAAcF,OAAOG,WAAa,EAElC1C,MAAQ,CACV2C,SAAU,QACVC,OAAQ,OACRC,SAAU,OACVC,OAAQ,QACRC,MAAO,QACPhB,cAAQO,YAAc,UACtBL,eAASQ,YAAc,WAE3B5B,OAAOmC,OAAOxH,KAAKxB,QAAQgG,MAAOA,YAE7BzE,WAAWC,KAAKzB,UAAUsD,OAAO2C,MAAM8C,OAAS,YAChDvH,WAAWC,KAAKzB,UAAUgB,KAAKiF,MAAM8C,OAAS,YAE9C3E,kBAAkB3C,KAAKD,WAAWC,KAAKzB,UAAUwD,MAM1D8E,OACkB,CACV,WACA,SACA,WACA,MACA,OACA,SACA,SAEEpG,SACFgH,MAAQzH,KAAKxB,QAAQgG,MAAMkD,eAAeD,aAEzC9E,kBAAkB3C,KAAKD,WAAWC,KAAKzB,UAAUwD,MAQ1DY,kBAAkBnE,UACbA,QAAQyB,UAAWzB,QAAQ0C,QAAQgD,KAAO,CAAC1F,QAAQ0C,QAAQgD,IAAK1F,QAAQyB"}
\ No newline at end of file
+{"version":3,"file":"debugpanel.min.js","sources":["../../../src/local/reactive/debugpanel.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Reactive module debug panel.\n *\n * This module contains all the UI components for the reactive debug tools.\n * Those tools are only available if the debug is enables and could be used\n * from the footer.\n *\n * @module     core/local/reactive/debugpanel\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport {BaseComponent, DragDrop, debug} from 'core/reactive';\nimport log from 'core/log';\nimport {debounce} from 'core/utils';\n\n/**\n * Init the main reactive panel.\n *\n * @param {element|string} target the DOM main element or its ID\n * @param {object} selectors optional css selector overrides\n */\nexport const init = (target, selectors) => {\n    const element = document.getElementById(target);\n    // Check if the debug reactive module is available.\n    if (debug === undefined) {\n        element.remove();\n        return;\n    }\n    // Create the main component.\n    new GlobalDebugPanel({\n        element,\n        reactive: debug,\n        selectors,\n    });\n};\n\n/**\n * Init an instance reactive subpanel.\n *\n * @param {element|string} target the DOM main element or its ID\n * @param {object} selectors optional css selector overrides\n */\nexport const initsubpanel = (target, selectors) => {\n    const element = document.getElementById(target);\n    // Check if the debug reactive module is available.\n    if (debug === undefined) {\n        element.remove();\n        return;\n    }\n    // Create the main component.\n    new DebugInstanceSubpanel({\n        element,\n        reactive: debug,\n        selectors,\n    });\n};\n\n/**\n * Component for the main reactive dev panel.\n *\n * This component shows the list of reactive instances and handle the buttons\n * to open a specific instance panel.\n */\nclass GlobalDebugPanel extends BaseComponent {\n\n    /**\n     * Constructor hook.\n     */\n    create() {\n        // Optional component name for debugging.\n        this.name = 'GlobalDebugPanel';\n        // Default query selectors.\n        this.selectors = {\n            LOADERS: `[data-for='loaders']`,\n            SUBPANEL: `[data-for='subpanel']`,\n            NOINSTANCES: `[data-for='noinstances']`,\n            LOG: `[data-for='log']`,\n        };\n        this.classes = {\n            HIDE: `d-none`,\n        };\n        // The list of loaded debuggers.\n        this.subPanels = new Set();\n    }\n\n    /**\n     * Initial state ready method.\n     *\n     * @param {object} state the initial state\n     */\n    stateReady(state) {\n        this._updateReactivesPanels({state});\n        // Remove loading wheel.\n        this.getElement(this.selectors.SUBPANEL).innerHTML = '';\n    }\n\n    /**\n     * Component watchers.\n     *\n     * @returns {Array} of watchers\n     */\n    getWatchers() {\n        return [\n            {watch: `reactives:created`, handler: this._updateReactivesPanels},\n        ];\n    }\n\n    /**\n     * Update the list of reactive instances.\n     * @param {Object} args\n     * @param {Object} args.state the current state\n     */\n    _updateReactivesPanels({state}) {\n        this.getElement(this.selectors.NOINSTANCES)?.classList?.toggle(\n            this.classes.HIDE,\n            state.reactives.size > 0\n        );\n        // Generate loading buttons.\n        state.reactives.forEach(\n            instance => {\n                this._createLoader(instance);\n            }\n        );\n    }\n\n    /**\n     * Create a debug panel button for a specific reactive instance.\n     *\n     * @param {object} instance hte instance data\n     */\n    _createLoader(instance) {\n        if (this.subPanels.has(instance.id)) {\n            return;\n        }\n        this.subPanels.add(instance.id);\n        const loaders = this.getElement(this.selectors.LOADERS);\n        const btn = document.createElement(\"button\");\n        btn.innerHTML = instance.id;\n        btn.dataset.id = instance.id;\n        loaders.appendChild(btn);\n        // Add click event.\n        this.addEventListener(btn, 'click', () => this._openPanel(btn, instance));\n    }\n\n    /**\n     * Open a debug panel.\n     *\n     * @param {Element} btn the button element\n     * @param {object} instance the instance data\n     */\n    async _openPanel(btn, instance) {\n        try {\n            const target = this.getElement(this.selectors.SUBPANEL);\n            const data = {...instance};\n            await this.renderComponent(target, 'core/local/reactive/debuginstancepanel', data);\n        } catch (error) {\n            log.error('Cannot load reactive debug subpanel');\n            throw error;\n        }\n    }\n}\n\n/**\n * Component for the main reactive dev panel.\n *\n * This component shows the list of reactive instances and handle the buttons\n * to open a specific instance panel.\n */\nclass DebugInstanceSubpanel extends BaseComponent {\n\n    /**\n     * Constructor hook.\n     */\n    create() {\n        // Optional component name for debugging.\n        this.name = 'DebugInstanceSubpanel';\n        // Default query selectors.\n        this.selectors = {\n            NAME: `[data-for='name']`,\n            CLOSE: `[data-for='close']`,\n            READMODE: `[data-for='readmode']`,\n            HIGHLIGHT: `[data-for='highlight']`,\n            LOG: `[data-for='log']`,\n            STATE: `[data-for='state']`,\n            CLEAN: `[data-for='clean']`,\n            PIN: `[data-for='pin']`,\n            SAVE: `[data-for='save']`,\n            INVALID: `[data-for='invalid']`,\n        };\n        this.id = this.element.dataset.id;\n        this.controller = M.reactive[this.id];\n\n        // The component is created always pinned.\n        this.draggable = false;\n        // We want the element to be dragged like modal.\n        this.relativeDrag = true;\n        // Save warning (will be loaded when state is ready.\n        this.strings = {\n            savewarning: '',\n        };\n    }\n\n    /**\n     * Initial state ready method.\n     *\n     */\n    stateReady() {\n        // Enable drag and drop.\n        this.dragdrop = new DragDrop(this);\n\n        // Close button.\n        this.addEventListener(\n            this.getElement(this.selectors.CLOSE),\n            'click',\n            this.remove\n        );\n        // Highlight button.\n        if (this.controller.highlight) {\n            this._toggleButtonText(this.getElement(this.selectors.HIGHLIGHT));\n        }\n        this.addEventListener(\n            this.getElement(this.selectors.HIGHLIGHT),\n            'click',\n            () => {\n                this.controller.highlight = !this.controller.highlight;\n                this._toggleButtonText(this.getElement(this.selectors.HIGHLIGHT));\n            }\n        );\n        // Edit mode button.\n        this.addEventListener(\n            this.getElement(this.selectors.READMODE),\n            'click',\n            this._toggleEditMode\n        );\n        // Clean log and state.\n        this.addEventListener(\n            this.getElement(this.selectors.CLEAN),\n            'click',\n            this._cleanAreas\n        );\n        // Unpin panel butotn.\n        this.addEventListener(\n            this.getElement(this.selectors.PIN),\n            'click',\n            this._togglePin\n        );\n        // Save button, state format error message and state textarea.\n        this.getElement(this.selectors.SAVE).disabled = true;\n\n        this.addEventListener(\n            this.getElement(this.selectors.STATE),\n            'keyup',\n            debounce(this._checkJSON.bind(this), 500)\n        );\n\n        this.addEventListener(\n            this.getElement(this.selectors.SAVE),\n            'click',\n            this._saveState\n        );\n        // Save the default save warning message.\n        this.strings.savewarning = this.getElement(this.selectors.INVALID)?.innerHTML ?? '';\n        // Add current state.\n        this._refreshState();\n    }\n\n    /**\n     * Remove all subcomponents dependencies.\n     */\n    destroy() {\n        if (this.dragdrop !== undefined) {\n            this.dragdrop.unregister();\n        }\n    }\n\n    /**\n     * Component watchers.\n     *\n     * @returns {Array} of watchers\n     */\n    getWatchers() {\n        return [\n            {watch: `reactives[${this.id}].lastChanges:updated`, handler: this._refreshLog},\n            {watch: `reactives[${this.id}].modified:updated`, handler: this._refreshState},\n            {watch: `reactives[${this.id}].readOnly:updated`, handler: this._refreshReadOnly},\n        ];\n    }\n\n    /**\n     * Wtacher method to refresh the log panel.\n     *\n     * @param {object} args\n     * @param {HTMLElement} args.element\n     */\n    _refreshLog({element}) {\n        const list = element?.lastChanges ?? [];\n\n        const logContent = list.join(\"\\n\");\n        // Append last log.\n        const target = this.getElement(this.selectors.LOG);\n        target.value += `\\n\\n= Transaction =\\n ${logContent}`;\n        target.scrollTop = target.scrollHeight;\n    }\n\n    /**\n     * Listener method to clean the log area.\n     */\n    _cleanAreas() {\n        let target = this.getElement(this.selectors.LOG);\n        target.value = '';\n\n        this._refreshState();\n    }\n\n    /**\n     * Watcher to refresh the state information.\n     */\n    _refreshState() {\n        const target = this.getElement(this.selectors.STATE);\n        target.value = JSON.stringify(this.controller.state, null, 4);\n    }\n\n    /**\n     * Watcher to update the read only information.\n     */\n    _refreshReadOnly() {\n        // Toggle the read mode button.\n        const target = this.getElement(this.selectors.READMODE);\n        if (target.dataset.readonly === undefined) {\n            target.dataset.readonly = target.innerHTML;\n        }\n        if (this.controller.readOnly) {\n            target.innerHTML = target.dataset.readonly;\n        } else {\n            target.innerHTML = target.dataset.alt;\n        }\n    }\n\n    /**\n     * Listener to toggle the edit mode of the component.\n     */\n    _toggleEditMode() {\n        this.controller.readOnly = !this.controller.readOnly;\n    }\n\n    /**\n     * Check that the edited state JSON is valid.\n     *\n     * Not all valid JSON are suitable for transforming the state. For example,\n     * the first level attributes cannot change the type.\n     *\n     * @return {undefined|array} Array of state updates.\n     */\n    _checkJSON() {\n        const invalid = this.getElement(this.selectors.INVALID);\n        const save = this.getElement(this.selectors.SAVE);\n\n        const edited = this.getElement(this.selectors.STATE).value;\n\n        const currentStateData = this.controller.stateData;\n\n        // Check if the json is tha same as state.\n        if (edited == JSON.stringify(this.controller.state, null, 4)) {\n            invalid.style.color = '';\n            invalid.innerHTML = '';\n            save.disabled = true;\n            return undefined;\n        }\n\n        // Check if the json format is valid.\n        try {\n            const newState = JSON.parse(edited);\n            // Check the first level did not change types.\n            const result = this._generateStateUpdates(currentStateData, newState);\n            // Enable save button.\n            invalid.style.color = '';\n            invalid.innerHTML = this.strings.savewarning;\n            save.disabled = false;\n            return result;\n        } catch (error) {\n            invalid.style.color = 'red';\n            invalid.innerHTML = error.message ?? 'Invalid JSON sctructure';\n            save.disabled = true;\n            return undefined;\n        }\n    }\n\n    /**\n     * Listener to save the current edited state into the real state.\n     */\n    _saveState() {\n        const updates = this._checkJSON();\n        if (!updates) {\n            return;\n        }\n        // Sent the updates to the state manager.\n        this.controller.processUpdates(updates);\n    }\n\n    /**\n     * Check that the edited state JSON is valid.\n     *\n     * Not all valid JSON are suitable for transforming the state. For example,\n     * the first level attributes cannot change the type. This method do a two\n     * steps comparison between the current state data and the new state data.\n     *\n     * A reactive state cannot be overridden like any other variable. To keep\n     * the watchers updated is necessary to transform the current state into\n     * the new one. As a result, this method generates all the necessary state\n     * updates to convert the state into the new state.\n     *\n     * @param {object} currentStateData\n     * @param {object} newStateData\n     * @return {array} Array of state updates.\n     * @throws {Error} is the structure is not compatible\n     */\n    _generateStateUpdates(currentStateData, newStateData) {\n\n        const updates = [];\n\n        const ids = {};\n\n        // Step 1: Add all overrides newStateData.\n        for (const [key, newValue] of Object.entries(newStateData)) {\n            // Check is it is new.\n            if (Array.isArray(newValue)) {\n                ids[key] = {};\n                newValue.forEach(element => {\n                    if (element.id === undefined) {\n                        throw Error(`Array ${key} element without id attribute`);\n                    }\n                    updates.push({\n                        name: key,\n                        action: 'override',\n                        fields: element,\n                    });\n                    const index = String(element.id).valueOf();\n                    ids[key][index] = true;\n                });\n            } else {\n                updates.push({\n                    name: key,\n                    action: 'override',\n                    fields: newValue,\n                });\n            }\n        }\n        // Step 2: delete unnecesary data from currentStateData.\n        for (const [key, oldValue] of Object.entries(currentStateData)) {\n            let deleteField = false;\n            // Check if the attribute is still there.\n            if (newStateData[key] === undefined) {\n                deleteField = true;\n            }\n            if (Array.isArray(oldValue)) {\n                if (!deleteField && ids[key] === undefined) {\n                    throw Error(`Array ${key} cannot change to object.`);\n                }\n                oldValue.forEach(element => {\n                    const index = String(element.id).valueOf();\n                    let deleteEntry = deleteField;\n                    // Check if the id is there.\n                    if (!deleteEntry && ids[key][index] === undefined) {\n                        deleteEntry = true;\n                    }\n                    if (deleteEntry) {\n                        updates.push({\n                            name: key,\n                            action: 'delete',\n                            fields: element,\n                        });\n                    }\n                });\n            } else {\n                if (!deleteField && ids[key] !== undefined) {\n                    throw Error(`Object ${key} cannot change to array.`);\n                }\n                if (deleteField) {\n                    updates.push({\n                        name: key,\n                        action: 'delete',\n                        fields: oldValue,\n                    });\n                }\n            }\n        }\n        // Delete all elements without action.\n        return updates;\n    }\n\n    // Drag and drop methods.\n\n    /**\n     * Get the draggable data of this component.\n     *\n     * @returns {Object} exported course module drop data\n     */\n    getDraggableData() {\n        return this.draggable;\n    }\n\n    /**\n     * The element drop end hook.\n     *\n     * @param {Object} dropdata the dropdata\n     * @param {Event} event the dropdata\n     */\n    dragEnd(dropdata, event) {\n        this.element.style.top = `${event.newFixedTop}px`;\n        this.element.style.left = `${event.newFixedLeft}px`;\n    }\n\n    /**\n     * Pin and unpin the panel.\n     */\n    _togglePin() {\n        this.draggable = !this.draggable;\n        this.dragdrop.setDraggable(this.draggable);\n        if (this.draggable) {\n            this._unpin();\n        } else {\n            this._pin();\n        }\n    }\n\n    /**\n     * Unpin the panel form the footer.\n     */\n    _unpin() {\n        // Find the initial spot.\n        const pageCenterY = window.innerHeight / 2;\n        const pageCenterX = window.innerWidth / 2;\n        // Put the element in the middle of the screen\n        const style = {\n            position: 'fixed',\n            resize: 'both',\n            overflow: 'auto',\n            height: '400px',\n            width: '400px',\n            top: `${pageCenterY - 200}px`,\n            left: `${pageCenterX - 200}px`,\n        };\n        Object.assign(this.element.style, style);\n        // Small also the text areas.\n        this.getElement(this.selectors.STATE).style.height = '50px';\n        this.getElement(this.selectors.LOG).style.height = '50px';\n\n        this._toggleButtonText(this.getElement(this.selectors.PIN));\n    }\n\n    /**\n     * Pin the panel into the footer.\n     */\n    _pin() {\n        const props = [\n            'position',\n            'resize',\n            'overflow',\n            'top',\n            'left',\n            'height',\n            'width',\n        ];\n        props.forEach(\n            prop => this.element.style.removeProperty(prop)\n        );\n        this._toggleButtonText(this.getElement(this.selectors.PIN));\n    }\n\n    /**\n     * Toogle the button text with the data-alt value.\n     *\n     * @param {Element} element the button element\n     */\n    _toggleButtonText(element) {\n        [element.innerHTML, element.dataset.alt] = [element.dataset.alt, element.innerHTML];\n    }\n\n}\n"],"names":["target","selectors","element","document","getElementById","undefined","debug","GlobalDebugPanel","reactive","remove","DebugInstanceSubpanel","BaseComponent","create","name","LOADERS","SUBPANEL","NOINSTANCES","LOG","classes","HIDE","subPanels","Set","stateReady","state","_updateReactivesPanels","getElement","this","innerHTML","getWatchers","watch","handler","classList","toggle","reactives","size","forEach","instance","_createLoader","has","id","add","loaders","btn","createElement","dataset","appendChild","addEventListener","_openPanel","data","renderComponent","error","NAME","CLOSE","READMODE","HIGHLIGHT","STATE","CLEAN","PIN","SAVE","INVALID","controller","M","draggable","relativeDrag","strings","savewarning","dragdrop","DragDrop","highlight","_toggleButtonText","_toggleEditMode","_cleanAreas","_togglePin","disabled","_checkJSON","bind","_saveState","_this$getElement2","_refreshState","destroy","unregister","_refreshLog","_refreshReadOnly","logContent","lastChanges","join","value","scrollTop","scrollHeight","JSON","stringify","readonly","readOnly","alt","invalid","save","edited","currentStateData","stateData","style","color","newState","parse","result","_generateStateUpdates","message","updates","processUpdates","newStateData","ids","key","newValue","Object","entries","Array","isArray","Error","push","action","fields","index","String","valueOf","oldValue","deleteField","deleteEntry","getDraggableData","dragEnd","dropdata","event","top","newFixedTop","left","newFixedLeft","setDraggable","_unpin","_pin","pageCenterY","window","innerHeight","pageCenterX","innerWidth","position","resize","overflow","height","width","assign","prop","removeProperty"],"mappings":";;;;;;;;;;;wKAqCoB,CAACA,OAAQC,mBACnBC,QAAUC,SAASC,eAAeJ,aAE1BK,IAAVC,oBAKAC,iBAAiB,CACjBL,QAAAA,QACAM,SAAUF,gBACVL,UAAAA,YAPAC,QAAQO,gCAiBY,CAACT,OAAQC,mBAC3BC,QAAUC,SAASC,eAAeJ,aAE1BK,IAAVC,oBAKAI,sBAAsB,CACtBR,QAAAA,QACAM,SAAUF,gBACVL,UAAAA,YAPAC,QAAQO,gBAiBVF,yBAAyBI,wBAK3BC,cAESC,KAAO,wBAEPZ,UAAY,CACba,+BACAC,iCACAC,uCACAC,6BAECC,QAAU,CACXC,oBAGCC,UAAY,IAAIC,IAQzBC,WAAWC,YACFC,uBAAuB,CAACD,MAAAA,aAExBE,WAAWC,KAAKzB,UAAUc,UAAUY,UAAY,GAQzDC,oBACW,CACH,CAACC,0BAA4BC,QAASJ,KAAKF,yBASnDA,4EAAuBD,MAACA,0CACfE,WAAWC,KAAKzB,UAAUe,yFAAce,kEAAWC,OACpDN,KAAKR,QAAQC,KACbI,MAAMU,UAAUC,KAAO,GAG3BX,MAAMU,UAAUE,SACZC,gBACSC,cAAcD,aAU/BC,cAAcD,aACNV,KAAKN,UAAUkB,IAAIF,SAASG,gBAG3BnB,UAAUoB,IAAIJ,SAASG,UACtBE,QAAUf,KAAKD,WAAWC,KAAKzB,UAAUa,SACzC4B,IAAMvC,SAASwC,cAAc,UACnCD,IAAIf,UAAYS,SAASG,GACzBG,IAAIE,QAAQL,GAAKH,SAASG,GAC1BE,QAAQI,YAAYH,UAEfI,iBAAiBJ,IAAK,SAAS,IAAMhB,KAAKqB,WAAWL,IAAKN,6BASlDM,IAAKN,oBAERpC,OAAS0B,KAAKD,WAAWC,KAAKzB,UAAUc,UACxCiC,KAAO,IAAIZ,gBACXV,KAAKuB,gBAAgBjD,OAAQ,yCAA0CgD,MAC/E,MAAOE,0BACDA,MAAM,uCACJA,cAWZxC,8BAA8BC,wBAKhCC,cAESC,KAAO,6BAEPZ,UAAY,CACbkD,yBACAC,2BACAC,iCACAC,mCACArC,uBACAsC,2BACAC,2BACAC,uBACAC,yBACAC,qCAECpB,GAAKb,KAAKxB,QAAQ0C,QAAQL,QAC1BqB,WAAaC,EAAErD,SAASkB,KAAKa,SAG7BuB,WAAY,OAEZC,cAAe,OAEfC,QAAU,CACXC,YAAa,IAQrB3C,8DAES4C,SAAW,IAAIC,mBAASzC,WAGxBoB,iBACDpB,KAAKD,WAAWC,KAAKzB,UAAUmD,OAC/B,QACA1B,KAAKjB,QAGLiB,KAAKkC,WAAWQ,gBACXC,kBAAkB3C,KAAKD,WAAWC,KAAKzB,UAAUqD,iBAErDR,iBACDpB,KAAKD,WAAWC,KAAKzB,UAAUqD,WAC/B,SACA,UACSM,WAAWQ,WAAa1C,KAAKkC,WAAWQ,eACxCC,kBAAkB3C,KAAKD,WAAWC,KAAKzB,UAAUqD,oBAIzDR,iBACDpB,KAAKD,WAAWC,KAAKzB,UAAUoD,UAC/B,QACA3B,KAAK4C,sBAGJxB,iBACDpB,KAAKD,WAAWC,KAAKzB,UAAUuD,OAC/B,QACA9B,KAAK6C,kBAGJzB,iBACDpB,KAAKD,WAAWC,KAAKzB,UAAUwD,KAC/B,QACA/B,KAAK8C,iBAGJ/C,WAAWC,KAAKzB,UAAUyD,MAAMe,UAAW,OAE3C3B,iBACDpB,KAAKD,WAAWC,KAAKzB,UAAUsD,OAC/B,SACA,mBAAS7B,KAAKgD,WAAWC,KAAKjD,MAAO,WAGpCoB,iBACDpB,KAAKD,WAAWC,KAAKzB,UAAUyD,MAC/B,QACAhC,KAAKkD,iBAGJZ,QAAQC,oEAAcvC,KAAKD,WAAWC,KAAKzB,UAAU0D,6CAA/BkB,kBAAyClD,iEAAa,QAE5EmD,gBAMTC,eAC0B1E,IAAlBqB,KAAKwC,eACAA,SAASc,aAStBpD,oBACW,CACH,CAACC,0BAAoBH,KAAKa,4BAA2BT,QAASJ,KAAKuD,aACnE,CAACpD,0BAAoBH,KAAKa,yBAAwBT,QAASJ,KAAKoD,eAChE,CAACjD,0BAAoBH,KAAKa,yBAAwBT,QAASJ,KAAKwD,mBAUxED,gDAAY/E,QAACA,qBAGHiF,yCAFOjF,MAAAA,eAAAA,QAASkF,iEAAe,IAEbC,KAAK,MAEvBrF,OAAS0B,KAAKD,WAAWC,KAAKzB,UAAUgB,KAC9CjB,OAAOsF,uCAAkCH,YACzCnF,OAAOuF,UAAYvF,OAAOwF,aAM9BjB,cACiB7C,KAAKD,WAAWC,KAAKzB,UAAUgB,KACrCqE,MAAQ,QAEVR,gBAMTA,gBACmBpD,KAAKD,WAAWC,KAAKzB,UAAUsD,OACvC+B,MAAQG,KAAKC,UAAUhE,KAAKkC,WAAWrC,MAAO,KAAM,GAM/D2D,yBAEUlF,OAAS0B,KAAKD,WAAWC,KAAKzB,UAAUoD,eACdhD,IAA5BL,OAAO4C,QAAQ+C,WACf3F,OAAO4C,QAAQ+C,SAAW3F,OAAO2B,WAEjCD,KAAKkC,WAAWgC,SAChB5F,OAAO2B,UAAY3B,OAAO4C,QAAQ+C,SAElC3F,OAAO2B,UAAY3B,OAAO4C,QAAQiD,IAO1CvB,uBACSV,WAAWgC,UAAYlE,KAAKkC,WAAWgC,SAWhDlB,mBACUoB,QAAUpE,KAAKD,WAAWC,KAAKzB,UAAU0D,SACzCoC,KAAOrE,KAAKD,WAAWC,KAAKzB,UAAUyD,MAEtCsC,OAAStE,KAAKD,WAAWC,KAAKzB,UAAUsD,OAAO+B,MAE/CW,iBAAmBvE,KAAKkC,WAAWsC,aAGrCF,QAAUP,KAAKC,UAAUhE,KAAKkC,WAAWrC,MAAO,KAAM,UACtDuE,QAAQK,MAAMC,MAAQ,GACtBN,QAAQnE,UAAY,QACpBoE,KAAKtB,UAAW,aAMV4B,SAAWZ,KAAKa,MAAMN,QAEtBO,OAAS7E,KAAK8E,sBAAsBP,iBAAkBI,iBAE5DP,QAAQK,MAAMC,MAAQ,GACtBN,QAAQnE,UAAYD,KAAKsC,QAAQC,YACjC8B,KAAKtB,UAAW,EACT8B,OACT,MAAOrD,iCACL4C,QAAQK,MAAMC,MAAQ,MACtBN,QAAQnE,iCAAYuB,MAAMuD,iDAAW,+BACrCV,KAAKtB,UAAW,IAQxBG,mBACU8B,QAAUhF,KAAKgD,aAChBgC,cAIA9C,WAAW+C,eAAeD,SAoBnCF,sBAAsBP,iBAAkBW,oBAE9BF,QAAU,GAEVG,IAAM,OAGP,MAAOC,IAAKC,YAAaC,OAAOC,QAAQL,cAErCM,MAAMC,QAAQJ,WACdF,IAAIC,KAAO,GACXC,SAAS5E,SAAQjC,kBACMG,IAAfH,QAAQqC,SACF6E,sBAAeN,sCAEzBJ,QAAQW,KAAK,CACTxG,KAAMiG,IACNQ,OAAQ,WACRC,OAAQrH,gBAENsH,MAAQC,OAAOvH,QAAQqC,IAAImF,UACjCb,IAAIC,KAAKU,QAAS,MAGtBd,QAAQW,KAAK,CACTxG,KAAMiG,IACNQ,OAAQ,WACRC,OAAQR,eAKf,MAAOD,IAAKa,YAAaX,OAAOC,QAAQhB,kBAAmB,KACxD2B,aAAc,UAEQvH,IAAtBuG,aAAaE,OACbc,aAAc,GAEdV,MAAMC,QAAQQ,UAAW,KACpBC,kBAA4BvH,IAAbwG,IAAIC,WACdM,sBAAeN,kCAEzBa,SAASxF,SAAQjC,gBACPsH,MAAQC,OAAOvH,QAAQqC,IAAImF,cAC7BG,YAAcD,YAEbC,kBAAmCxH,IAApBwG,IAAIC,KAAKU,SACzBK,aAAc,GAEdA,aACAnB,QAAQW,KAAK,CACTxG,KAAMiG,IACNQ,OAAQ,SACRC,OAAQrH,iBAIjB,KACE0H,kBAA4BvH,IAAbwG,IAAIC,WACdM,uBAAgBN,iCAEtBc,aACAlB,QAAQW,KAAK,CACTxG,KAAMiG,IACNQ,OAAQ,SACRC,OAAQI,mBAMjBjB,QAUXoB,0BACWpG,KAAKoC,UAShBiE,QAAQC,SAAUC,YACT/H,QAAQiG,MAAM+B,cAASD,MAAME,uBAC7BjI,QAAQiG,MAAMiC,eAAUH,MAAMI,mBAMvC7D,kBACSV,WAAapC,KAAKoC,eAClBI,SAASoE,aAAa5G,KAAKoC,WAC5BpC,KAAKoC,eACAyE,cAEAC,OAObD,eAEUE,YAAcC,OAAOC,YAAc,EACnCC,YAAcF,OAAOG,WAAa,EAElC1C,MAAQ,CACV2C,SAAU,QACVC,OAAQ,OACRC,SAAU,OACVC,OAAQ,QACRC,MAAO,QACPhB,cAAQO,YAAc,UACtBL,eAASQ,YAAc,WAE3B5B,OAAOmC,OAAOzH,KAAKxB,QAAQiG,MAAOA,YAE7B1E,WAAWC,KAAKzB,UAAUsD,OAAO4C,MAAM8C,OAAS,YAChDxH,WAAWC,KAAKzB,UAAUgB,KAAKkF,MAAM8C,OAAS,YAE9C5E,kBAAkB3C,KAAKD,WAAWC,KAAKzB,UAAUwD,MAM1D+E,OACkB,CACV,WACA,SACA,WACA,MACA,OACA,SACA,SAEErG,SACFiH,MAAQ1H,KAAKxB,QAAQiG,MAAMkD,eAAeD,aAEzC/E,kBAAkB3C,KAAKD,WAAWC,KAAKzB,UAAUwD,MAQ1DY,kBAAkBnE,UACbA,QAAQyB,UAAWzB,QAAQ0C,QAAQiD,KAAO,CAAC3F,QAAQ0C,QAAQiD,IAAK3F,QAAQyB"}
\ No newline at end of file
diff --git a/lib/amd/src/local/reactive/debugpanel.js b/lib/amd/src/local/reactive/debugpanel.js
index 738ad6bbad385..f9c3c58909ee3 100644
--- a/lib/amd/src/local/reactive/debugpanel.js
+++ b/lib/amd/src/local/reactive/debugpanel.js
@@ -266,7 +266,7 @@ class DebugInstanceSubpanel extends BaseComponent {
         this.addEventListener(
             this.getElement(this.selectors.STATE),
             'keyup',
-            debounce(this._checkJSON, 500)
+            debounce(this._checkJSON.bind(this), 500)
         );
 
         this.addEventListener(

From 904cf075e7f0b0b457f071a08fa34db034d9f72b Mon Sep 17 00:00:00 2001
From: "Shamiso.Jaravaza" <33659194+ssj365@users.noreply.github.com>
Date: Tue, 16 Jan 2024 10:16:37 -0700
Subject: [PATCH 014/119] MDL-80625 mod_bigbluebuttonbn: Fix param name

---
 mod/bigbluebuttonbn/classes/meeting.php     | 2 +-
 mod/bigbluebuttonbn/tests/generator/lib.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mod/bigbluebuttonbn/classes/meeting.php b/mod/bigbluebuttonbn/classes/meeting.php
index 25b9a34e25856..095a09d8a20c4 100644
--- a/mod/bigbluebuttonbn/classes/meeting.php
+++ b/mod/bigbluebuttonbn/classes/meeting.php
@@ -462,7 +462,7 @@ protected function create_meeting_metadata() {
             );
         }
         if ((boolean) config::get('recordingready_enabled')) {
-            $metadata['bn-recording-ready-url'] = $this->instance->get_record_ready_url()->out(false);
+            $metadata['bbb-recording-ready-url'] = $this->instance->get_record_ready_url()->out(false);
         }
         if ((boolean) config::get('meetingevents_enabled')) {
             $metadata['analytics-callback-url'] = $this->instance->get_meeting_event_notification_url()->out(false);
diff --git a/mod/bigbluebuttonbn/tests/generator/lib.php b/mod/bigbluebuttonbn/tests/generator/lib.php
index c6970e6909d21..81e46caa11a89 100644
--- a/mod/bigbluebuttonbn/tests/generator/lib.php
+++ b/mod/bigbluebuttonbn/tests/generator/lib.php
@@ -246,7 +246,7 @@ protected function create_mockserver_recording(instance $instance, stdClass $rec
             'sequence' => 1,
             'meta' => [
                 'bn-presenter-name' => $data['presentername'] ?? 'Fake presenter',
-                'bn-recording-ready-url' => new moodle_url('/mod/bigbluebuttonbn/bbb_broker.php', [
+                'bbb-recording-ready-url' => new moodle_url('/mod/bigbluebuttonbn/bbb_broker.php', [
                     'action' => 'recording_ready',
                     'bigbluebuttonbn' => $instance->get_instance_id()
                 ]),
@@ -352,7 +352,7 @@ public function create_meeting(array $data): stdClass {
             ],
         ]);
         if ((boolean) config::get('recordingready_enabled')) {
-            $roomconfig['meta']['bn-recording-ready-url'] = $instance->get_record_ready_url()->out(false);
+            $roomconfig['meta']['bbb-recording-ready-url'] = $instance->get_record_ready_url()->out(false);
         }
         if ((boolean) config::get('meetingevents_enabled')) {
             $roomconfig['meta']['analytics-callback-url'] = $instance->get_meeting_event_notification_url()->out(false);

From 802876e9a8161a83737192d34c0fe7e0bbf4ecb9 Mon Sep 17 00:00:00 2001
From: "Shamiso.Jaravaza" <33659194+ssj365@users.noreply.github.com>
Date: Tue, 27 Feb 2024 10:54:50 -0700
Subject: [PATCH 015/119] MDL-80061 mod_bigbluebuttonbn: Change filter field

* Change dismissed recording time filter from timecreated to timemodified
---
 mod/bigbluebuttonbn/classes/recording.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/bigbluebuttonbn/classes/recording.php b/mod/bigbluebuttonbn/classes/recording.php
index 34bcb7556c0c9..d0565a824267c 100644
--- a/mod/bigbluebuttonbn/classes/recording.php
+++ b/mod/bigbluebuttonbn/classes/recording.php
@@ -788,7 +788,7 @@ public static function sync_pending_recordings_from_server(bool $dismissedonly =
         if ($dismissedonly) {
             mtrace("=> Looking for any recording that has been 'dismissed' in the past " . self::RECORDING_TIME_LIMIT_DAYS
                 . " days.");
-            $select = 'status = :status_dismissed AND timecreated > :withindays';
+            $select = 'status = :status_dismissed AND timemodified > :withindays';
             $params['status_dismissed'] = self::RECORDING_STATUS_DISMISSED;
         } else {
             mtrace("=> Looking for any recording awaiting processing from the past " . self::RECORDING_TIME_LIMIT_DAYS . " days.");

From 1945ad1d36ffa131c167495fea023d1117b6de55 Mon Sep 17 00:00:00 2001
From: Anupama Sarjoshi <anupama.sarjoshi@open.ac.uk>
Date: Fri, 14 Jun 2024 11:04:03 +0100
Subject: [PATCH 016/119] MDL-79796 quiz: Preview icon should be visible in
 question bank pop-up

---
 mod/quiz/styles.css | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mod/quiz/styles.css b/mod/quiz/styles.css
index 64d2683b0d098..780bbe267c40e 100644
--- a/mod/quiz/styles.css
+++ b/mod/quiz/styles.css
@@ -815,7 +815,7 @@ table.quizreviewsummary td.cell {
 }
 
 #page-mod-quiz-edit .question-bank-table {
-    width: auto;
+    width: 100%;
 }
 
 #page-mod-quiz-edit .question-bank-table .header {
@@ -889,6 +889,7 @@ table.quizreviewsummary td.cell {
 
 #page-mod-quiz-edit .question-bank-table .questionnametext {
     padding: 0 0.2em;
+    width: 100% !important; /* stylelint-disable-line declaration-no-important */
 }
 
 #page-mod-quiz-edit .question-bank-table .questiontext {
@@ -915,6 +916,12 @@ table.quizreviewsummary td.cell {
 #page-mod-quiz-edit table.question-bank-table th {
     overflow: hidden;
     white-space: nowrap;
+    width: 1.2em !important; /* stylelint-disable-line declaration-no-important */
+}
+
+#page-mod-quiz-edit table.question-bank-table td.questionnametext > div {
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 .mod_quiz_qbank_dialogue {

From 6105d96744dda7ce3f7a7aae6cb7df85fcd3bcbb Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Fri, 14 Jun 2024 12:37:52 +0100
Subject: [PATCH 017/119] MDL-82200 inplace editable: fix background of the
 help text

---
 theme/boost/scss/moodle/course.scss | 1 +
 theme/boost/style/moodle.css        | 1 +
 theme/classic/style/moodle.css      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/theme/boost/scss/moodle/course.scss b/theme/boost/scss/moodle/course.scss
index 8451484ecc37e..c49311a4acd67 100644
--- a/theme/boost/scss/moodle/course.scss
+++ b/theme/boost/scss/moodle/course.scss
@@ -535,6 +535,7 @@ span.editinstructions {
     text-decoration: none;
     z-index: 9999;
     border: $alert-border-width solid transparent;
+    width: fit-content;
 
     @include alert-variant(
         theme-color-level('info', $alert-bg-level),
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 36dfa1fe71cc2..9862d27afd082 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -28459,6 +28459,7 @@ span.editinstructions {
   text-decoration: none;
   z-index: 9999;
   border: 0 solid transparent;
+  width: fit-content;
   color: #00434e;
   background-color: #cce6ea;
   border-color: #b8dce2;
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 41a60b439069b..a85f7f3e83263 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -28459,6 +28459,7 @@ span.editinstructions {
   text-decoration: none;
   z-index: 9999;
   border: 0 solid transparent;
+  width: fit-content;
   color: #00434e;
   background-color: #cce6ea;
   border-color: #b8dce2;

From 06b779d31d2045567b7920078ef3397fdb199b04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikel=20Mart=C3=ADn?= <mikel@moodle.com>
Date: Thu, 30 May 2024 12:38:27 +0200
Subject: [PATCH 018/119] MDL-81818 theme_boost: Refactor ".no-gutters" usages
 for BS5

- Add .g-0 to the Boostratp 5 bridge SCSS file
- Replace .no-gutters occurrences with .g-0
---
 .upgradenotes/MDL-81818-2024053109201607.yml           |  5 +++++
 .../content/bootstrap/components/card.md               |  4 ++--
 .../content/bootstrap/utilities/stretched-link.md      |  2 +-
 .../hugo/site/layouts/_default/docs.html               |  2 +-
 .../hugo/site/layouts/shortcodes/moodleicons.html      |  2 +-
 blocks/myoverview/templates/main.mustache              |  2 +-
 blocks/timeline/templates/main.mustache                |  2 +-
 message/templates/message_index.mustache               |  2 +-
 mod/quiz/templates/list_of_attempts.mustache           |  2 +-
 theme/boost/scss/moodle.scss                           |  3 +++
 theme/boost/scss/moodle/bs5-bridge.scss                |  7 +++++++
 theme/boost/style/moodle.css                           | 10 +++++++---
 theme/classic/style/moodle.css                         | 10 +++++++---
 13 files changed, 38 insertions(+), 15 deletions(-)
 create mode 100644 .upgradenotes/MDL-81818-2024053109201607.yml
 create mode 100644 theme/boost/scss/moodle/bs5-bridge.scss

diff --git a/.upgradenotes/MDL-81818-2024053109201607.yml b/.upgradenotes/MDL-81818-2024053109201607.yml
new file mode 100644
index 0000000000000..9fedb9068cf2f
--- /dev/null
+++ b/.upgradenotes/MDL-81818-2024053109201607.yml
@@ -0,0 +1,5 @@
+issueNumber: MDL-81818
+notes:
+  theme_boost:
+    - message: 'Bootstrap .no-gutters class is no longer used, use .g-0  instead.'
+      type: changed
diff --git a/admin/tool/componentlibrary/content/bootstrap/components/card.md b/admin/tool/componentlibrary/content/bootstrap/components/card.md
index ea784dc99461f..18645248cfcd5 100644
--- a/admin/tool/componentlibrary/content/bootstrap/components/card.md
+++ b/admin/tool/componentlibrary/content/bootstrap/components/card.md
@@ -392,11 +392,11 @@ Note that content should not be larger than the height of the image. If content
 
 ## Horizontal
 
-Using a combination of grid and utility classes, cards can be made horizontal in a mobile-friendly and responsive way. In the example below, we remove the grid gutters with `.no-gutters` and use `.col-md-*` classes to make the card horizontal at the `md` breakpoint. Further adjustments may be needed depending on your card content.
+Using a combination of grid and utility classes, cards can be made horizontal in a mobile-friendly and responsive way. In the example below, we remove the grid gutters with `.g-0` and use `.col-md-*` classes to make the card horizontal at the `md` breakpoint. Further adjustments may be needed depending on your card content.
 
 {{< example >}}
 <div class="card mb-3" style="max-width: 540px;">
-  <div class="row no-gutters">
+  <div class="row g-0">
     <div class="col-md-4">
       {{< placeholder width="100%" height="250" class="" text="Image" >}}
     </div>
diff --git a/admin/tool/componentlibrary/content/bootstrap/utilities/stretched-link.md b/admin/tool/componentlibrary/content/bootstrap/utilities/stretched-link.md
index db714cd7687ec..436318101cb20 100644
--- a/admin/tool/componentlibrary/content/bootstrap/utilities/stretched-link.md
+++ b/admin/tool/componentlibrary/content/bootstrap/utilities/stretched-link.md
@@ -38,7 +38,7 @@ Media objects do not have `position: relative` by default, so we need to add the
 Columns are `position: relative` by default, so clickable columns only require the `.stretched-link` class on a link. However, stretching a link over an entire `.row` requires `.position-static` on the column and `.position-relative` on the row.
 
 {{< example >}}
-<div class="row no-gutters bg-light position-relative">
+<div class="row g-0 bg-light position-relative">
   <div class="col-md-6 mb-md-0 p-md-4">
     {{< placeholder width="100%" height="200" class="w-100" text=" " title="Generic placeholder image" >}}
   </div>
diff --git a/admin/tool/componentlibrary/hugo/site/layouts/_default/docs.html b/admin/tool/componentlibrary/hugo/site/layouts/_default/docs.html
index 93c3b7c993897..27a96ef96b8d2 100644
--- a/admin/tool/componentlibrary/hugo/site/layouts/_default/docs.html
+++ b/admin/tool/componentlibrary/hugo/site/layouts/_default/docs.html
@@ -1,7 +1,7 @@
 {{ partial "skippy" . }}
 
 <div class="container-fluid p-0 bg-white" data-region="componentlibrary">
-    <div class="row no-gutters flex-xl-nowrap">
+    <div class="row g-0 flex-xl-nowrap">
         <div class="col-md-3 col-xl-2 sidebar">
             <div class="controls d-flex justify-content-between">
                 <div class="simplesearchform w-100">
diff --git a/admin/tool/componentlibrary/hugo/site/layouts/shortcodes/moodleicons.html b/admin/tool/componentlibrary/hugo/site/layouts/shortcodes/moodleicons.html
index 6f89fb4dbbcbd..bb0012391f915 100644
--- a/admin/tool/componentlibrary/hugo/site/layouts/shortcodes/moodleicons.html
+++ b/admin/tool/componentlibrary/hugo/site/layouts/shortcodes/moodleicons.html
@@ -6,7 +6,7 @@
   {{ range $.Site.Data.fontawesomeicons }}
   <div class="card mb-2 mx-1 p-1 d-flex flex-column justify-content-around text-center" style="flex: 0 0 20%; height: 150px">
     <div class="small text-truncate" data-toggle="tooltip" data-placement="bottom" title="{{ .name }}">{{ .name }}</div>
-    <div class="row no-gutters">
+    <div class="row g-0">
       <div class="col-sm-6 d-flex align-items-center justify-content-center">
         <i class="fa {{ .icon }} fa-2x"></i>
       </div>
diff --git a/blocks/myoverview/templates/main.mustache b/blocks/myoverview/templates/main.mustache
index 1828a0efcfb5f..b333e92ae24f1 100644
--- a/blocks/myoverview/templates/main.mustache
+++ b/blocks/myoverview/templates/main.mustache
@@ -27,7 +27,7 @@
     <hr class="mt-0"/>
 
     <div role="search" data-region="filter" class="d-flex align-items-center my-2" aria-label="{{#str}} aria:controls, block_myoverview {{/str}}">
-        <div class="row no-gutters">
+        <div class="row g-0">
             {{> block_myoverview/nav-grouping-selector }}
 
             {{> block_myoverview/nav-search-widget }}
diff --git a/blocks/timeline/templates/main.mustache b/blocks/timeline/templates/main.mustache
index b3f7ea87eb3cd..3f7a761a1af05 100644
--- a/blocks/timeline/templates/main.mustache
+++ b/blocks/timeline/templates/main.mustache
@@ -25,7 +25,7 @@
 
 <div id="block-timeline-{{uniqid}}-{{timelineinstanceid}}" class="block-timeline" data-region="timeline">
     <div class="p-0 px-2">
-        <div class="row no-gutters">
+        <div class="row g-0">
             <div class="mr-2 mb-1">
                 {{> block_timeline/nav-day-filter }}
             </div>
diff --git a/message/templates/message_index.mustache b/message/templates/message_index.mustache
index 8640609a554e6..361ca6b250d29 100644
--- a/message/templates/message_index.mustache
+++ b/message/templates/message_index.mustache
@@ -42,7 +42,7 @@
         role="region"
 >
     <div class="container-fluid">
-        <div class="row h-100 no-gutters">
+        <div class="row h-100 g-0">
             <div class="col-4 d-flex flex-column conversationcontainer">
                 <div class="border-right h-100">
                     <div class="panel-header-container" data-region="panel-header-container">
diff --git a/mod/quiz/templates/list_of_attempts.mustache b/mod/quiz/templates/list_of_attempts.mustache
index b29334ed68f93..0f7c0a6080f15 100644
--- a/mod/quiz/templates/list_of_attempts.mustache
+++ b/mod/quiz/templates/list_of_attempts.mustache
@@ -46,7 +46,7 @@
 {{#hasattempts}}
 <h3>{{# str}}summaryofattempts, quiz{{/str}}</h3>
 
-<ul class="list-unstyled row row-cols-1 row-cols-md-2 no-gutters">
+<ul class="list-unstyled row row-cols-1 row-cols-md-2 g-0">
 
 {{#attempts}}
 <li class="col pl-0 pr-2 mb-2">
diff --git a/theme/boost/scss/moodle.scss b/theme/boost/scss/moodle.scss
index a790a5f4ea1c8..98b66aae4e0ae 100644
--- a/theme/boost/scss/moodle.scss
+++ b/theme/boost/scss/moodle.scss
@@ -4,6 +4,9 @@ $breadcrumb-divider-rtl: "◀" !default;
 // Specific overrides to make Bootstrap RTL.
 @import "moodle/bootstrap-rtl";
 
+// Specific SCSS to make some Bootstrap 5 syntax work with Moodle.
+@import "moodle/bs5-bridge";
+
 // Old Moodle stuff from base theme.
 // Massive, needs broken up.
 @import "moodle/variables";
diff --git a/theme/boost/scss/moodle/bs5-bridge.scss b/theme/boost/scss/moodle/bs5-bridge.scss
new file mode 100644
index 0000000000000..02de1cc0d6031
--- /dev/null
+++ b/theme/boost/scss/moodle/bs5-bridge.scss
@@ -0,0 +1,7 @@
+/* Bootstrap 5 bridge classes */
+
+/* These classes are used to bridge the gap between Bootstrap 4 and Bootstrap 5. */
+/* This file should be removed as part of MDL-75669. */
+.g-0 {
+    @extend .no-gutters;
+}
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 36dfa1fe71cc2..2afd03e6fb8c9 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -13898,12 +13898,13 @@ pre code {
   margin-left: -15px;
 }
 
-.no-gutters {
+.no-gutters, .g-0 {
   margin-right: 0;
   margin-left: 0;
 }
-.no-gutters > .col,
-.no-gutters > [class*=col-] {
+.no-gutters > .col, .g-0 > .col,
+.no-gutters > [class*=col-],
+.g-0 > [class*=col-] {
   padding-right: 0;
   padding-left: 0;
 }
@@ -22964,6 +22965,9 @@ a.text-dark:hover, a.text-dark:focus {
   right: calc(-0.5rem - 1px);
 }
 
+/* Bootstrap 5 bridge classes */
+/* These classes are used to bridge the gap between Bootstrap 4 and Bootstrap 5. */
+/* This file should be removed as part of MDL-75669. */
 /**
  * Moodle variables
  *
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 41a60b439069b..a72eeb2aa43f1 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -13898,12 +13898,13 @@ pre code {
   margin-left: -15px;
 }
 
-.no-gutters {
+.no-gutters, .g-0 {
   margin-right: 0;
   margin-left: 0;
 }
-.no-gutters > .col,
-.no-gutters > [class*=col-] {
+.no-gutters > .col, .g-0 > .col,
+.no-gutters > [class*=col-],
+.g-0 > [class*=col-] {
   padding-right: 0;
   padding-left: 0;
 }
@@ -22964,6 +22965,9 @@ a.text-dark:hover, a.text-dark:focus {
   right: calc(-0.5rem - 1px);
 }
 
+/* Bootstrap 5 bridge classes */
+/* These classes are used to bridge the gap between Bootstrap 4 and Bootstrap 5. */
+/* This file should be removed as part of MDL-75669. */
 /**
  * Moodle variables
  *

From 2c4fb82def3c85b17dd007be207764d80ed62fb5 Mon Sep 17 00:00:00 2001
From: Daniel Ziegenberg <daniel@ziegenberg.at>
Date: Sun, 10 Mar 2024 01:29:47 +0100
Subject: [PATCH 019/119] MDL-80642 libaries: Update http-message to 2.0.0

Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
---
 lib/psr/http-message/README.md                |   5 +-
 lib/psr/http-message/composer.json            |   6 +-
 lib/psr/http-message/docs/PSR7-Interfaces.md  | 130 ++++++++++++++
 lib/psr/http-message/docs/PSR7-Usage.md       | 159 ++++++++++++++++++
 lib/psr/http-message/readme_moodle.txt        |  10 ++
 lib/psr/http-message/src/MessageInterface.php |  22 +--
 lib/psr/http-message/src/RequestInterface.php |  15 +-
 .../http-message/src/ResponseInterface.php    |   6 +-
 .../src/ServerRequestInterface.php            |  24 +--
 lib/psr/http-message/src/StreamInterface.php  |  30 ++--
 .../src/UploadedFileInterface.php             |  12 +-
 lib/psr/http-message/src/UriInterface.php     |  33 ++--
 lib/thirdpartylibs.xml                        |   2 +-
 13 files changed, 379 insertions(+), 75 deletions(-)
 create mode 100644 lib/psr/http-message/docs/PSR7-Interfaces.md
 create mode 100644 lib/psr/http-message/docs/PSR7-Usage.md
 create mode 100644 lib/psr/http-message/readme_moodle.txt

diff --git a/lib/psr/http-message/README.md b/lib/psr/http-message/README.md
index 28185338f7238..2668be6c30bbb 100644
--- a/lib/psr/http-message/README.md
+++ b/lib/psr/http-message/README.md
@@ -10,4 +10,7 @@ interface that describes a HTTP message. See the specification for more details.
 Usage
 -----
 
-We'll certainly need some stuff in here.
\ No newline at end of file
+Before reading the usage guide we recommend reading the PSR-7 interfaces method list:
+
+* [`PSR-7 Interfaces Method List`](docs/PSR7-Interfaces.md)
+* [`PSR-7 Usage Guide`](docs/PSR7-Usage.md)
\ No newline at end of file
diff --git a/lib/psr/http-message/composer.json b/lib/psr/http-message/composer.json
index b0d2937a03a5f..c66e5aba40c97 100644
--- a/lib/psr/http-message/composer.json
+++ b/lib/psr/http-message/composer.json
@@ -7,11 +7,11 @@
     "authors": [
         {
             "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
+            "homepage": "https://www.php-fig.org/"
         }
     ],
     "require": {
-        "php": ">=5.3.0"
+        "php": "^7.2 || ^8.0"
     },
     "autoload": {
         "psr-4": {
@@ -20,7 +20,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "2.0.x-dev"
         }
     }
 }
diff --git a/lib/psr/http-message/docs/PSR7-Interfaces.md b/lib/psr/http-message/docs/PSR7-Interfaces.md
new file mode 100644
index 0000000000000..3a7e7dda69534
--- /dev/null
+++ b/lib/psr/http-message/docs/PSR7-Interfaces.md
@@ -0,0 +1,130 @@
+# Interfaces
+
+The purpose of this list is to help in finding the methods when working with PSR-7. This can be considered as a cheatsheet for PSR-7 interfaces.
+
+The interfaces defined in PSR-7 are the following:
+
+| Class Name | Description |
+|---|---|
+| [Psr\Http\Message\MessageInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagemessageinterface) | Representation of a HTTP message |
+| [Psr\Http\Message\RequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagerequestinterface) | Representation of an outgoing, client-side request. |
+| [Psr\Http\Message\ServerRequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageserverrequestinterface) | Representation of an incoming, server-side HTTP request. | 
+| [Psr\Http\Message\ResponseInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageresponseinterface) | Representation of an outgoing, server-side response. |
+| [Psr\Http\Message\StreamInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagestreaminterface) | Describes a data stream |
+| [Psr\Http\Message\UriInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuriinterface) | Value object representing a URI. |
+| [Psr\Http\Message\UploadedFileInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuploadedfileinterface) | Value object representing a file uploaded through an HTTP request. |
+
+## `Psr\Http\Message\MessageInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getProtocolVersion()`             | Retrieve HTTP protocol version          |  1.0 or 1.1 |
+| `withProtocolVersion($version)`    | Returns new message instance with given HTTP protocol version          |      |
+| `getHeaders()`                     | Retrieve all HTTP Headers               | [Request Header List](https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Request_fields), [Response Header List](https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Response_fields)      |
+| `hasHeader($name)`                 | Checks if HTTP Header with given name exists  | |
+| `getHeader($name)`                 | Retrieves a array with the values for a single header | |
+| `getHeaderLine($name)`             | Retrieves a comma-separated string of the values for a single header |  |
+| `withHeader($name, $value)`        | Returns new message instance with given HTTP Header | if the header existed in the original instance, replaces the header value from the original message with the value provided when creating the new instance. |
+| `withAddedHeader($name, $value)`   | Returns new message instance with appended value to given header | If header already exists value will be appended, if not a new header will be created |
+| `withoutHeader($name)`             | Removes HTTP Header with given name| |
+| `getBody()`                        | Retrieves the HTTP Message Body | Returns object implementing `StreamInterface`|
+| `withBody(StreamInterface $body)`  | Returns new message instance with given HTTP Message Body | |
+
+
+## `Psr\Http\Message\RequestInterface` Methods
+
+Same methods as `Psr\Http\Message\MessageInterface`  + the following methods:
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getRequestTarget()`                | Retrieves the message's request target              | origin-form, absolute-form, authority-form, asterisk-form ([RFC7230](https://www.rfc-editor.org/rfc/rfc7230.txt)) |
+| `withRequestTarget($requestTarget)` | Return a new message instance with the specific request-target |      |
+| `getMethod()`                       | Retrieves the HTTP method of the request.  |  GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE (defined in [RFC7231](https://tools.ietf.org/html/rfc7231)), PATCH (defined in [RFC5789](https://tools.ietf.org/html/rfc5789)) |
+| `withMethod($method)`               | Returns a new message instance with the provided HTTP method  | |
+| `getUri()`                 | Retrieves the URI instance | |
+| `withUri(UriInterface $uri, $preserveHost = false)` | Returns a new message instance with the provided URI |  |
+
+
+## `Psr\Http\Message\ServerRequestInterface` Methods
+
+Same methods as `Psr\Http\Message\RequestInterface`  + the following methods:
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getServerParams() `               | Retrieve server parameters  | Typically derived from `$_SERVER`  |
+| `getCookieParams()`                | Retrieves cookies sent by the client to the server. | Typically derived from `$_COOKIES` |
+| `withCookieParams(array $cookies)` |  Returns a new request instance with the specified cookies      |   | 
+| `withQueryParams(array $query)` | Returns a new request instance with the specified query string arguments  |  |
+| `getUploadedFiles()` | Retrieve normalized file upload data  |  |
+| `withUploadedFiles(array $uploadedFiles)` | Returns a new request instance with the specified uploaded files  |  |
+| `getParsedBody()` | Retrieve any parameters provided in the request body  |  |
+| `withParsedBody($data)` | Returns a new request instance with the specified body parameters  |  |
+| `getAttributes()` | Retrieve attributes derived from the request  |  |
+| `getAttribute($name, $default = null)` | Retrieve a single derived request attribute  |  |
+| `withAttribute($name, $value)` | Returns a new request instance with the specified derived request attribute  |  |
+| `withoutAttribute($name)` | Returns a new request instance that without the specified derived request attribute  |  |
+
+## `Psr\Http\Message\ResponseInterface` Methods:
+
+Same methods as `Psr\Http\Message\MessageInterface`  + the following methods:
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getStatusCode()` | Gets the response status code. | |
+| `withStatus($code, $reasonPhrase = '')` | Returns a new response instance with the specified status code and, optionally, reason phrase. | |
+| `getReasonPhrase()` | Gets the response reason phrase associated with the status code. | |
+
+##  `Psr\Http\Message\StreamInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `__toString()` | Reads all data from the stream into a string, from the beginning to end. | |
+| `close()` | Closes the stream and any underlying resources. | |
+| `detach()` | Separates any underlying resources from the stream. | |
+| `getSize()` | Get the size of the stream if known. | |
+| `eof()` | Returns true if the stream is at the end of the stream.| |
+| `isSeekable()` |  Returns whether or not the stream is seekable. | |
+| `seek($offset, $whence = SEEK_SET)` | Seek to a position in the stream. | |
+| `rewind()` | Seek to the beginning of the stream. | |
+| `isWritable()` | Returns whether or not the stream is writable. | |
+| `write($string)` | Write data to the stream. | |
+| `isReadable()` | Returns whether or not the stream is readable. | |
+| `read($length)` | Read data from the stream. | |
+| `getContents()` | Returns the remaining contents in a string | |
+| `getMetadata($key = null)()` | Get stream metadata as an associative array or retrieve a specific key. | |
+
+## `Psr\Http\Message\UriInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getScheme()` | Retrieve the scheme component of the URI. | |
+| `getAuthority()` | Retrieve the authority component of the URI. | |
+| `getUserInfo()` | Retrieve the user information component of the URI. | |
+| `getHost()` | Retrieve the host component of the URI. | |
+| `getPort()` | Retrieve the port component of the URI. | |
+| `getPath()` | Retrieve the path component of the URI. | |
+| `getQuery()` | Retrieve the query string of the URI. | |
+| `getFragment()` | Retrieve the fragment component of the URI. | |
+| `withScheme($scheme)` | Return an instance with the specified scheme. | |
+| `withUserInfo($user, $password = null)` | Return an instance with the specified user information. | |
+| `withHost($host)` | Return an instance with the specified host. | |
+| `withPort($port)` | Return an instance with the specified port. | |
+| `withPath($path)` | Return an instance with the specified path. | |
+| `withQuery($query)` | Return an instance with the specified query string. | |
+| `withFragment($fragment)` | Return an instance with the specified URI fragment. | |
+| `__toString()` | Return the string representation as a URI reference. | |
+
+## `Psr\Http\Message\UploadedFileInterface` Methods
+
+| Method Name                        | Description | Notes |
+|------------------------------------| ----------- | ----- |
+| `getStream()` | Retrieve a stream representing the uploaded file. | |
+| `moveTo($targetPath)` | Move the uploaded file to a new location. | |
+| `getSize()` | Retrieve the file size. | |
+| `getError()` | Retrieve the error associated with the uploaded file. | |
+| `getClientFilename()` | Retrieve the filename sent by the client. | |
+| `getClientMediaType()` | Retrieve the media type sent by the client. | |
+
+> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface`  because the `Request` and the `Response` are `HTTP Messages`.
+> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered.
+
diff --git a/lib/psr/http-message/docs/PSR7-Usage.md b/lib/psr/http-message/docs/PSR7-Usage.md
new file mode 100644
index 0000000000000..b6d048a341e8c
--- /dev/null
+++ b/lib/psr/http-message/docs/PSR7-Usage.md
@@ -0,0 +1,159 @@
+### PSR-7 Usage
+
+All PSR-7 applications comply with these interfaces 
+They were created to establish a standard between middleware implementations.
+
+> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface`  because the `Request` and the `Response` are `HTTP Messages`.
+> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered.
+
+
+The following examples will illustrate how basic operations are done in PSR-7.
+
+##### Examples
+
+
+For this examples to work (at least) a PSR-7 implementation package is required. (eg: zendframework/zend-diactoros, guzzlehttp/psr7, slim/slim, etc)
+All PSR-7 implementations should have the same behaviour.
+
+The following will be assumed: 
+`$request` is an object of `Psr\Http\Message\RequestInterface` and
+
+`$response` is an object implementing `Psr\Http\Message\RequestInterface`
+
+
+### Working with HTTP Headers
+
+#### Adding headers to response:
+
+```php
+$response->withHeader('My-Custom-Header', 'My Custom Message');
+```
+
+#### Appending values to headers
+
+```php
+$response->withAddedHeader('My-Custom-Header', 'The second message');
+```
+
+#### Checking if header exists:
+
+```php
+$request->hasHeader('My-Custom-Header'); // will return false
+$response->hasHeader('My-Custom-Header'); // will return true
+```
+
+> Note: My-Custom-Header was only added in the Response
+
+#### Getting comma-separated values from a header (also applies to request)
+
+```php
+// getting value from request headers
+$request->getHeaderLine('Content-Type'); // will return: "text/html; charset=UTF-8"
+// getting value from response headers
+$response->getHeaderLine('My-Custom-Header'); // will return:  "My Custom Message; The second message"
+```
+
+#### Getting array of value from a header (also applies to request)
+```php
+// getting value from request headers
+$request->getHeader('Content-Type'); // will return: ["text/html", "charset=UTF-8"]
+// getting value from response headers
+$response->getHeader('My-Custom-Header'); // will return:  ["My Custom Message",  "The second message"]
+```
+
+#### Removing headers from HTTP Messages
+```php
+// removing a header from Request, removing deprecated "Content-MD5" header
+$request->withoutHeader('Content-MD5'); 
+
+// removing a header from Response
+// effect: the browser won't know the size of the stream
+// the browser will download the stream till it ends
+$response->withoutHeader('Content-Length');
+```
+
+### Working with HTTP Message Body
+
+When working with the PSR-7 there are two methods of implementation:
+#### 1. Getting the body separately
+
+> This method makes the body handling easier to understand and is useful when repeatedly calling body methods. (You only call `getBody()` once). Using this method mistakes like `$response->write()` are also prevented.
+
+```php
+$body = $response->getBody();
+// operations on body, eg. read, write, seek
+// ...
+// replacing the old body
+$response->withBody($body); 
+// this last statement is optional as we working with objects
+// in this case the "new" body is same with the "old" one
+// the $body variable has the same value as the one in $request, only the reference is passed
+```
+
+#### 2. Working directly on response
+
+> This method is useful when only performing few operations as the `$request->getBody()` statement fragment is required
+
+```php
+$response->getBody()->write('hello');
+```
+
+### Getting the body contents
+
+The following snippet gets the contents of a stream contents.
+> Note: Streams must be rewinded, if content was written into streams, it will be ignored when calling `getContents()` because the stream pointer is set to the last character, which is `\0` - meaning end of stream.
+```php 
+$body = $response->getBody();
+$body->rewind(); // or $body->seek(0);
+$bodyText = $body->getContents();
+```
+> Note: If `$body->seek(1)` is called before `$body->getContents()`, the first character will be ommited as the starting pointer is set to `1`, not `0`. This is why using `$body->rewind()` is recommended.
+
+### Append to body
+
+```php
+$response->getBody()->write('Hello'); // writing directly
+$body = $request->getBody(); // which is a `StreamInterface`
+$body->write('xxxxx');
+```
+
+### Prepend to body
+Prepending is different when it comes to streams. The content must be copied before writing the content to be prepended.
+The following example will explain the behaviour of streams.
+
+```php
+// assuming our response is initially empty
+$body = $repsonse->getBody();
+// writing the string "abcd"
+$body->write('abcd');
+
+// seeking to start of stream
+$body->seek(0);
+// writing 'ef'
+$body->write('ef'); // at this point the stream contains "efcd"
+```
+
+#### Prepending by rewriting separately
+
+```php
+// assuming our response body stream only contains: "abcd"
+$body = $response->getBody();
+$body->rewind();
+$contents = $body->getContents(); // abcd
+// seeking the stream to beginning
+$body->rewind();
+$body->write('ef'); // stream contains "efcd"
+$body->write($contents); // stream contains "efabcd"
+```
+
+> Note: `getContents()` seeks the stream while reading it, therefore if the second `rewind()` method call was not present the stream would have resulted in `abcdefabcd` because the `write()` method appends to stream if not preceeded by `rewind()` or `seek(0)`.
+
+#### Prepending by using contents as a string
+```php
+$body = $response->getBody();
+$body->rewind();
+$contents = $body->getContents(); // efabcd
+$contents = 'ef'.$contents;
+$body->rewind();
+$body->write($contents);
+```
diff --git a/lib/psr/http-message/readme_moodle.txt b/lib/psr/http-message/readme_moodle.txt
new file mode 100644
index 0000000000000..622d300aa9d89
--- /dev/null
+++ b/lib/psr/http-message/readme_moodle.txt
@@ -0,0 +1,10 @@
+# PSR-7 HTTP Message
+
+This is a description for including the PSR-7 Interfaces in Moodle
+
+## Installation
+
+1. Visit https://github.com/php-fig/http-message
+2. Download the latest release
+3. Unzip in this folder
+4. Update `thirdpartylibs.xml`
diff --git a/lib/psr/http-message/src/MessageInterface.php b/lib/psr/http-message/src/MessageInterface.php
index dd46e5ec81eef..a83c98518d549 100644
--- a/lib/psr/http-message/src/MessageInterface.php
+++ b/lib/psr/http-message/src/MessageInterface.php
@@ -23,7 +23,7 @@ interface MessageInterface
      *
      * @return string HTTP protocol version.
      */
-    public function getProtocolVersion();
+    public function getProtocolVersion(): string;
 
     /**
      * Return an instance with the specified HTTP protocol version.
@@ -38,7 +38,7 @@ public function getProtocolVersion();
      * @param string $version HTTP protocol version
      * @return static
      */
-    public function withProtocolVersion($version);
+    public function withProtocolVersion(string $version): MessageInterface;
 
     /**
      * Retrieves all message header values.
@@ -65,7 +65,7 @@ public function withProtocolVersion($version);
      *     key MUST be a header name, and each value MUST be an array of strings
      *     for that header.
      */
-    public function getHeaders();
+    public function getHeaders(): array;
 
     /**
      * Checks if a header exists by the given case-insensitive name.
@@ -75,7 +75,7 @@ public function getHeaders();
      *     name using a case-insensitive string comparison. Returns false if
      *     no matching header name is found in the message.
      */
-    public function hasHeader($name);
+    public function hasHeader(string $name): bool;
 
     /**
      * Retrieves a message header value by the given case-insensitive name.
@@ -91,7 +91,7 @@ public function hasHeader($name);
      *    header. If the header does not appear in the message, this method MUST
      *    return an empty array.
      */
-    public function getHeader($name);
+    public function getHeader(string $name): array;
 
     /**
      * Retrieves a comma-separated string of the values for a single header.
@@ -112,7 +112,7 @@ public function getHeader($name);
      *    concatenated together using a comma. If the header does not appear in
      *    the message, this method MUST return an empty string.
      */
-    public function getHeaderLine($name);
+    public function getHeaderLine(string $name): string;
 
     /**
      * Return an instance with the provided value replacing the specified header.
@@ -129,7 +129,7 @@ public function getHeaderLine($name);
      * @return static
      * @throws \InvalidArgumentException for invalid header names or values.
      */
-    public function withHeader($name, $value);
+    public function withHeader(string $name, $value): MessageInterface;
 
     /**
      * Return an instance with the specified header appended with the given value.
@@ -147,7 +147,7 @@ public function withHeader($name, $value);
      * @return static
      * @throws \InvalidArgumentException for invalid header names or values.
      */
-    public function withAddedHeader($name, $value);
+    public function withAddedHeader(string $name, $value): MessageInterface;
 
     /**
      * Return an instance without the specified header.
@@ -161,14 +161,14 @@ public function withAddedHeader($name, $value);
      * @param string $name Case-insensitive header field name to remove.
      * @return static
      */
-    public function withoutHeader($name);
+    public function withoutHeader(string $name): MessageInterface;
 
     /**
      * Gets the body of the message.
      *
      * @return StreamInterface Returns the body as a stream.
      */
-    public function getBody();
+    public function getBody(): StreamInterface;
 
     /**
      * Return an instance with the specified message body.
@@ -183,5 +183,5 @@ public function getBody();
      * @return static
      * @throws \InvalidArgumentException When the body is not valid.
      */
-    public function withBody(StreamInterface $body);
+    public function withBody(StreamInterface $body): MessageInterface;
 }
diff --git a/lib/psr/http-message/src/RequestInterface.php b/lib/psr/http-message/src/RequestInterface.php
index a96d4fd636679..33f85e559d024 100644
--- a/lib/psr/http-message/src/RequestInterface.php
+++ b/lib/psr/http-message/src/RequestInterface.php
@@ -39,7 +39,7 @@ interface RequestInterface extends MessageInterface
      *
      * @return string
      */
-    public function getRequestTarget();
+    public function getRequestTarget(): string;
 
     /**
      * Return an instance with the specific request-target.
@@ -55,17 +55,18 @@ public function getRequestTarget();
      *
      * @link http://tools.ietf.org/html/rfc7230#section-5.3 (for the various
      *     request-target forms allowed in request messages)
-     * @param mixed $requestTarget
+     * @param string $requestTarget
      * @return static
      */
-    public function withRequestTarget($requestTarget);
+    public function withRequestTarget(string $requestTarget): RequestInterface;
+
 
     /**
      * Retrieves the HTTP method of the request.
      *
      * @return string Returns the request method.
      */
-    public function getMethod();
+    public function getMethod(): string;
 
     /**
      * Return an instance with the provided HTTP method.
@@ -82,7 +83,7 @@ public function getMethod();
      * @return static
      * @throws \InvalidArgumentException for invalid HTTP methods.
      */
-    public function withMethod($method);
+    public function withMethod(string $method): RequestInterface;
 
     /**
      * Retrieves the URI instance.
@@ -93,7 +94,7 @@ public function withMethod($method);
      * @return UriInterface Returns a UriInterface instance
      *     representing the URI of the request.
      */
-    public function getUri();
+    public function getUri(): UriInterface;
 
     /**
      * Returns an instance with the provided URI.
@@ -125,5 +126,5 @@ public function getUri();
      * @param bool $preserveHost Preserve the original state of the Host header.
      * @return static
      */
-    public function withUri(UriInterface $uri, $preserveHost = false);
+    public function withUri(UriInterface $uri, bool $preserveHost = false): RequestInterface;
 }
diff --git a/lib/psr/http-message/src/ResponseInterface.php b/lib/psr/http-message/src/ResponseInterface.php
index c306514e6bbdf..e9299a91443f2 100644
--- a/lib/psr/http-message/src/ResponseInterface.php
+++ b/lib/psr/http-message/src/ResponseInterface.php
@@ -27,7 +27,7 @@ interface ResponseInterface extends MessageInterface
      *
      * @return int Status code.
      */
-    public function getStatusCode();
+    public function getStatusCode(): int;
 
     /**
      * Return an instance with the specified status code and, optionally, reason phrase.
@@ -49,7 +49,7 @@ public function getStatusCode();
      * @return static
      * @throws \InvalidArgumentException For invalid status code arguments.
      */
-    public function withStatus($code, $reasonPhrase = '');
+    public function withStatus(int $code, string $reasonPhrase = ''): ResponseInterface;
 
     /**
      * Gets the response reason phrase associated with the status code.
@@ -64,5 +64,5 @@ public function withStatus($code, $reasonPhrase = '');
      * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
      * @return string Reason phrase; must return an empty string if none present.
      */
-    public function getReasonPhrase();
+    public function getReasonPhrase(): string;
 }
diff --git a/lib/psr/http-message/src/ServerRequestInterface.php b/lib/psr/http-message/src/ServerRequestInterface.php
index 02512340ad853..8625d0e100d93 100644
--- a/lib/psr/http-message/src/ServerRequestInterface.php
+++ b/lib/psr/http-message/src/ServerRequestInterface.php
@@ -51,7 +51,7 @@ interface ServerRequestInterface extends RequestInterface
      *
      * @return array
      */
-    public function getServerParams();
+    public function getServerParams(): array;
 
     /**
      * Retrieve cookies.
@@ -63,7 +63,7 @@ public function getServerParams();
      *
      * @return array
      */
-    public function getCookieParams();
+    public function getCookieParams(): array;
 
     /**
      * Return an instance with the specified cookies.
@@ -82,7 +82,7 @@ public function getCookieParams();
      * @param array $cookies Array of key/value pairs representing cookies.
      * @return static
      */
-    public function withCookieParams(array $cookies);
+    public function withCookieParams(array $cookies): ServerRequestInterface;
 
     /**
      * Retrieve query string arguments.
@@ -96,7 +96,7 @@ public function withCookieParams(array $cookies);
      *
      * @return array
      */
-    public function getQueryParams();
+    public function getQueryParams(): array;
 
     /**
      * Return an instance with the specified query string arguments.
@@ -120,7 +120,7 @@ public function getQueryParams();
      *     $_GET.
      * @return static
      */
-    public function withQueryParams(array $query);
+    public function withQueryParams(array $query): ServerRequestInterface;
 
     /**
      * Retrieve normalized file upload data.
@@ -134,7 +134,7 @@ public function withQueryParams(array $query);
      * @return array An array tree of UploadedFileInterface instances; an empty
      *     array MUST be returned if no data is present.
      */
-    public function getUploadedFiles();
+    public function getUploadedFiles(): array;
 
     /**
      * Create a new instance with the specified uploaded files.
@@ -147,7 +147,7 @@ public function getUploadedFiles();
      * @return static
      * @throws \InvalidArgumentException if an invalid structure is provided.
      */
-    public function withUploadedFiles(array $uploadedFiles);
+    public function withUploadedFiles(array $uploadedFiles): ServerRequestInterface;
 
     /**
      * Retrieve any parameters provided in the request body.
@@ -194,7 +194,7 @@ public function getParsedBody();
      * @throws \InvalidArgumentException if an unsupported argument type is
      *     provided.
      */
-    public function withParsedBody($data);
+    public function withParsedBody($data): ServerRequestInterface;
 
     /**
      * Retrieve attributes derived from the request.
@@ -207,7 +207,7 @@ public function withParsedBody($data);
      *
      * @return array Attributes derived from the request.
      */
-    public function getAttributes();
+    public function getAttributes(): array;
 
     /**
      * Retrieve a single derived request attribute.
@@ -224,7 +224,7 @@ public function getAttributes();
      * @param mixed $default Default value to return if the attribute does not exist.
      * @return mixed
      */
-    public function getAttribute($name, $default = null);
+    public function getAttribute(string $name, $default = null);
 
     /**
      * Return an instance with the specified derived request attribute.
@@ -241,7 +241,7 @@ public function getAttribute($name, $default = null);
      * @param mixed $value The value of the attribute.
      * @return static
      */
-    public function withAttribute($name, $value);
+    public function withAttribute(string $name, $value): ServerRequestInterface;
 
     /**
      * Return an instance that removes the specified derived request attribute.
@@ -257,5 +257,5 @@ public function withAttribute($name, $value);
      * @param string $name The attribute name.
      * @return static
      */
-    public function withoutAttribute($name);
+    public function withoutAttribute(string $name): ServerRequestInterface;
 }
diff --git a/lib/psr/http-message/src/StreamInterface.php b/lib/psr/http-message/src/StreamInterface.php
index f68f391269b47..a62aabb8288b8 100644
--- a/lib/psr/http-message/src/StreamInterface.php
+++ b/lib/psr/http-message/src/StreamInterface.php
@@ -25,14 +25,14 @@ interface StreamInterface
      * @see http://php.net/manual/en/language.oop5.magic.php#object.tostring
      * @return string
      */
-    public function __toString();
+    public function __toString(): string;
 
     /**
      * Closes the stream and any underlying resources.
      *
      * @return void
      */
-    public function close();
+    public function close(): void;
 
     /**
      * Separates any underlying resources from the stream.
@@ -48,7 +48,7 @@ public function detach();
      *
      * @return int|null Returns the size in bytes if known, or null if unknown.
      */
-    public function getSize();
+    public function getSize(): ?int;
 
     /**
      * Returns the current position of the file read/write pointer
@@ -56,21 +56,21 @@ public function getSize();
      * @return int Position of the file pointer
      * @throws \RuntimeException on error.
      */
-    public function tell();
+    public function tell(): int;
 
     /**
      * Returns true if the stream is at the end of the stream.
      *
      * @return bool
      */
-    public function eof();
+    public function eof(): bool;
 
     /**
      * Returns whether or not the stream is seekable.
      *
      * @return bool
      */
-    public function isSeekable();
+    public function isSeekable(): bool;
 
     /**
      * Seek to a position in the stream.
@@ -84,7 +84,7 @@ public function isSeekable();
      *     SEEK_END: Set position to end-of-stream plus offset.
      * @throws \RuntimeException on failure.
      */
-    public function seek($offset, $whence = SEEK_SET);
+    public function seek(int $offset, int $whence = SEEK_SET): void;
 
     /**
      * Seek to the beginning of the stream.
@@ -96,14 +96,14 @@ public function seek($offset, $whence = SEEK_SET);
      * @link http://www.php.net/manual/en/function.fseek.php
      * @throws \RuntimeException on failure.
      */
-    public function rewind();
+    public function rewind(): void;
 
     /**
      * Returns whether or not the stream is writable.
      *
      * @return bool
      */
-    public function isWritable();
+    public function isWritable(): bool;
 
     /**
      * Write data to the stream.
@@ -112,14 +112,14 @@ public function isWritable();
      * @return int Returns the number of bytes written to the stream.
      * @throws \RuntimeException on failure.
      */
-    public function write($string);
+    public function write(string $string): int;
 
     /**
      * Returns whether or not the stream is readable.
      *
      * @return bool
      */
-    public function isReadable();
+    public function isReadable(): bool;
 
     /**
      * Read data from the stream.
@@ -131,7 +131,7 @@ public function isReadable();
      *     if no bytes are available.
      * @throws \RuntimeException if an error occurs.
      */
-    public function read($length);
+    public function read(int $length): string;
 
     /**
      * Returns the remaining contents in a string
@@ -140,7 +140,7 @@ public function read($length);
      * @throws \RuntimeException if unable to read or an error occurs while
      *     reading.
      */
-    public function getContents();
+    public function getContents(): string;
 
     /**
      * Get stream metadata as an associative array or retrieve a specific key.
@@ -149,10 +149,10 @@ public function getContents();
      * stream_get_meta_data() function.
      *
      * @link http://php.net/manual/en/function.stream-get-meta-data.php
-     * @param string $key Specific metadata to retrieve.
+     * @param string|null $key Specific metadata to retrieve.
      * @return array|mixed|null Returns an associative array if no key is
      *     provided. Returns a specific key value if a key is provided and the
      *     value is found, or null if the key is not found.
      */
-    public function getMetadata($key = null);
+    public function getMetadata(?string $key = null);
 }
diff --git a/lib/psr/http-message/src/UploadedFileInterface.php b/lib/psr/http-message/src/UploadedFileInterface.php
index f8a6901e01447..dd19d653819f1 100644
--- a/lib/psr/http-message/src/UploadedFileInterface.php
+++ b/lib/psr/http-message/src/UploadedFileInterface.php
@@ -28,7 +28,7 @@ interface UploadedFileInterface
      * @throws \RuntimeException in cases when no stream is available or can be
      *     created.
      */
-    public function getStream();
+    public function getStream(): StreamInterface;
 
     /**
      * Move the uploaded file to a new location.
@@ -62,7 +62,7 @@ public function getStream();
      * @throws \RuntimeException on any error during the move operation, or on
      *     the second or subsequent call to the method.
      */
-    public function moveTo($targetPath);
+    public function moveTo(string $targetPath): void;
     
     /**
      * Retrieve the file size.
@@ -73,7 +73,7 @@ public function moveTo($targetPath);
      *
      * @return int|null The file size in bytes or null if unknown.
      */
-    public function getSize();
+    public function getSize(): ?int;
     
     /**
      * Retrieve the error associated with the uploaded file.
@@ -89,7 +89,7 @@ public function getSize();
      * @see http://php.net/manual/en/features.file-upload.errors.php
      * @return int One of PHP's UPLOAD_ERR_XXX constants.
      */
-    public function getError();
+    public function getError(): int;
     
     /**
      * Retrieve the filename sent by the client.
@@ -104,7 +104,7 @@ public function getError();
      * @return string|null The filename sent by the client or null if none
      *     was provided.
      */
-    public function getClientFilename();
+    public function getClientFilename(): ?string;
     
     /**
      * Retrieve the media type sent by the client.
@@ -119,5 +119,5 @@ public function getClientFilename();
      * @return string|null The media type sent by the client or null if none
      *     was provided.
      */
-    public function getClientMediaType();
+    public function getClientMediaType(): ?string;
 }
diff --git a/lib/psr/http-message/src/UriInterface.php b/lib/psr/http-message/src/UriInterface.php
index 9d7ab9eae8f29..15e2cf2862850 100644
--- a/lib/psr/http-message/src/UriInterface.php
+++ b/lib/psr/http-message/src/UriInterface.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Psr\Http\Message;
 
 /**
@@ -37,7 +38,7 @@ interface UriInterface
      * @see https://tools.ietf.org/html/rfc3986#section-3.1
      * @return string The URI scheme.
      */
-    public function getScheme();
+    public function getScheme(): string;
 
     /**
      * Retrieve the authority component of the URI.
@@ -57,7 +58,7 @@ public function getScheme();
      * @see https://tools.ietf.org/html/rfc3986#section-3.2
      * @return string The URI authority, in "[user-info@]host[:port]" format.
      */
-    public function getAuthority();
+    public function getAuthority(): string;
 
     /**
      * Retrieve the user information component of the URI.
@@ -74,7 +75,7 @@ public function getAuthority();
      *
      * @return string The URI user information, in "username[:password]" format.
      */
-    public function getUserInfo();
+    public function getUserInfo(): string;
 
     /**
      * Retrieve the host component of the URI.
@@ -87,7 +88,7 @@ public function getUserInfo();
      * @see http://tools.ietf.org/html/rfc3986#section-3.2.2
      * @return string The URI host.
      */
-    public function getHost();
+    public function getHost(): string;
 
     /**
      * Retrieve the port component of the URI.
@@ -104,7 +105,7 @@ public function getHost();
      *
      * @return null|int The URI port.
      */
-    public function getPort();
+    public function getPort(): ?int;
 
     /**
      * Retrieve the path component of the URI.
@@ -131,7 +132,7 @@ public function getPort();
      * @see https://tools.ietf.org/html/rfc3986#section-3.3
      * @return string The URI path.
      */
-    public function getPath();
+    public function getPath(): string;
 
     /**
      * Retrieve the query string of the URI.
@@ -153,7 +154,7 @@ public function getPath();
      * @see https://tools.ietf.org/html/rfc3986#section-3.4
      * @return string The URI query string.
      */
-    public function getQuery();
+    public function getQuery(): string;
 
     /**
      * Retrieve the fragment component of the URI.
@@ -171,7 +172,7 @@ public function getQuery();
      * @see https://tools.ietf.org/html/rfc3986#section-3.5
      * @return string The URI fragment.
      */
-    public function getFragment();
+    public function getFragment(): string;
 
     /**
      * Return an instance with the specified scheme.
@@ -188,7 +189,7 @@ public function getFragment();
      * @return static A new instance with the specified scheme.
      * @throws \InvalidArgumentException for invalid or unsupported schemes.
      */
-    public function withScheme($scheme);
+    public function withScheme(string $scheme): UriInterface;
 
     /**
      * Return an instance with the specified user information.
@@ -204,7 +205,7 @@ public function withScheme($scheme);
      * @param null|string $password The password associated with $user.
      * @return static A new instance with the specified user information.
      */
-    public function withUserInfo($user, $password = null);
+    public function withUserInfo(string $user, ?string $password = null): UriInterface;
 
     /**
      * Return an instance with the specified host.
@@ -218,7 +219,7 @@ public function withUserInfo($user, $password = null);
      * @return static A new instance with the specified host.
      * @throws \InvalidArgumentException for invalid hostnames.
      */
-    public function withHost($host);
+    public function withHost(string $host): UriInterface;
 
     /**
      * Return an instance with the specified port.
@@ -237,7 +238,7 @@ public function withHost($host);
      * @return static A new instance with the specified port.
      * @throws \InvalidArgumentException for invalid ports.
      */
-    public function withPort($port);
+    public function withPort(?int $port): UriInterface;
 
     /**
      * Return an instance with the specified path.
@@ -261,7 +262,7 @@ public function withPort($port);
      * @return static A new instance with the specified path.
      * @throws \InvalidArgumentException for invalid paths.
      */
-    public function withPath($path);
+    public function withPath(string $path): UriInterface;
 
     /**
      * Return an instance with the specified query string.
@@ -278,7 +279,7 @@ public function withPath($path);
      * @return static A new instance with the specified query string.
      * @throws \InvalidArgumentException for invalid query strings.
      */
-    public function withQuery($query);
+    public function withQuery(string $query): UriInterface;
 
     /**
      * Return an instance with the specified URI fragment.
@@ -294,7 +295,7 @@ public function withQuery($query);
      * @param string $fragment The fragment to use with the new instance.
      * @return static A new instance with the specified fragment.
      */
-    public function withFragment($fragment);
+    public function withFragment(string $fragment): UriInterface;
 
     /**
      * Return the string representation as a URI reference.
@@ -319,5 +320,5 @@ public function withFragment($fragment);
      * @see http://tools.ietf.org/html/rfc3986#section-4.1
      * @return string
      */
-    public function __toString();
+    public function __toString(): string;
 }
diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml
index 8dca153892c67..1fd614d11c6be 100644
--- a/lib/thirdpartylibs.xml
+++ b/lib/thirdpartylibs.xml
@@ -640,7 +640,7 @@ All rights reserved.</copyright>
     <location>psr/http-message</location>
     <name>http-message</name>
     <description>Provide a set of common interfaces for HTTP messages as described in RFC 7230 and RFC 7231</description>
-    <version>1.0.1</version>
+    <version>2.0.0</version>
     <license>MIT</license>
     <repository>https://github.com/php-fig/http-message</repository>
   </library>

From 6222b1307e8c3937e291215f999a3af858789a37 Mon Sep 17 00:00:00 2001
From: Daniel Ziegenberg <daniel@ziegenberg.at>
Date: Sun, 10 Mar 2024 01:28:12 +0100
Subject: [PATCH 020/119] MDL-80643 libraries: Update http-client to 1.0.3

Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
---
 lib/psr/http-client/CHANGELOG.md      |  8 ++++++++
 lib/psr/http-client/README.md         |  2 +-
 lib/psr/http-client/composer.json     |  7 +++++--
 lib/psr/http-client/readme_moodle.txt | 10 ++++++++++
 lib/thirdpartylibs.xml                |  2 +-
 5 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 lib/psr/http-client/readme_moodle.txt

diff --git a/lib/psr/http-client/CHANGELOG.md b/lib/psr/http-client/CHANGELOG.md
index e2dc25f519b39..babba7c7b2ea6 100644
--- a/lib/psr/http-client/CHANGELOG.md
+++ b/lib/psr/http-client/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.0.3
+
+Add `source` link in composer.json. No code changes.
+
+## 1.0.2
+
+Allow PSR-7 (psr/http-message) 2.0. No code changes.
+
 ## 1.0.1
 
 Allow installation with PHP 8. No code changes.
diff --git a/lib/psr/http-client/README.md b/lib/psr/http-client/README.md
index 6876b8403639a..84af5c55d5fea 100644
--- a/lib/psr/http-client/README.md
+++ b/lib/psr/http-client/README.md
@@ -7,6 +7,6 @@ Note that this is not a HTTP Client implementation of its own. It is merely abst
 
 The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
 
-[psr-url]: http://www.php-fig.org/psr/psr-18
+[psr-url]: https://www.php-fig.org/psr/psr-18
 [package-url]: https://packagist.org/packages/psr/http-client
 [implementation-url]: https://packagist.org/providers/psr/http-client-implementation
diff --git a/lib/psr/http-client/composer.json b/lib/psr/http-client/composer.json
index c195f8ff155ad..6fed350beb874 100644
--- a/lib/psr/http-client/composer.json
+++ b/lib/psr/http-client/composer.json
@@ -7,12 +7,15 @@
     "authors": [
         {
             "name": "PHP-FIG",
-            "homepage": "http://www.php-fig.org/"
+            "homepage": "https://www.php-fig.org/"
         }
     ],
+    "support": {
+        "source": "https://github.com/php-fig/http-client"
+    },
     "require": {
         "php": "^7.0 || ^8.0",
-        "psr/http-message": "^1.0"
+        "psr/http-message": "^1.0 || ^2.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/lib/psr/http-client/readme_moodle.txt b/lib/psr/http-client/readme_moodle.txt
new file mode 100644
index 0000000000000..eaa9df3c716a0
--- /dev/null
+++ b/lib/psr/http-client/readme_moodle.txt
@@ -0,0 +1,10 @@
+# PSR-18 HTTP Client
+
+This is a description for including the PSR-18 Interfaces in Moodle
+
+## Installation
+
+1. Visit https://github.com/php-fig/http-client
+2. Download the latest release
+3. Unzip in this folder
+4. Update `thirdpartylibs.xml`
diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml
index 8dca153892c67..d0342e8eac505 100644
--- a/lib/thirdpartylibs.xml
+++ b/lib/thirdpartylibs.xml
@@ -624,7 +624,7 @@ All rights reserved.</copyright>
     <location>psr/http-client</location>
     <name>http-client</name>
     <description>Provides an abstraction that describe the components of a HTTP Client.</description>
-    <version>1.0.0</version>
+    <version>1.0.3</version>
     <license>MIT</license>
     <repository>https://github.com/php-fig/http-client</repository>
   </library>

From 52a5f2aa4e95ecf16973ea3a8cd5c09ae0158259 Mon Sep 17 00:00:00 2001
From: Daniel Ziegenberg <daniel@ziegenberg.at>
Date: Fri, 17 May 2024 21:10:14 +0200
Subject: [PATCH 021/119] MDL-80645 libaries: Update
 symfony/deprecation-contracts to 3.5.0

Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
---
 lib/symfony/deprecation-contracts/LICENSE       | 2 +-
 lib/symfony/deprecation-contracts/README.md     | 2 +-
 lib/symfony/deprecation-contracts/composer.json | 4 ++--
 lib/thirdpartylibs.xml                          | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/symfony/deprecation-contracts/LICENSE b/lib/symfony/deprecation-contracts/LICENSE
index 406242ff28554..0ed3a246553be 100644
--- a/lib/symfony/deprecation-contracts/LICENSE
+++ b/lib/symfony/deprecation-contracts/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2020-2022 Fabien Potencier
+Copyright (c) 2020-present Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/symfony/deprecation-contracts/README.md b/lib/symfony/deprecation-contracts/README.md
index 4957933a6cc50..9814864c03f58 100644
--- a/lib/symfony/deprecation-contracts/README.md
+++ b/lib/symfony/deprecation-contracts/README.md
@@ -22,5 +22,5 @@ trigger_deprecation('symfony/blockchain', '8.9', 'Using "%s" is deprecated, use
 This will generate the following message:
 `Since symfony/blockchain 8.9: Using "bitcoin" is deprecated, use "fabcoin" instead.`
 
-While not necessarily recommended, the deprecation notices can be completely ignored by declaring an empty
+While not recommended, the deprecation notices can be completely ignored by declaring an empty
 `function trigger_deprecation() {}` in your application.
diff --git a/lib/symfony/deprecation-contracts/composer.json b/lib/symfony/deprecation-contracts/composer.json
index 1c1b4ba0e9400..ceb6c07961052 100644
--- a/lib/symfony/deprecation-contracts/composer.json
+++ b/lib/symfony/deprecation-contracts/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": ">=8.0.2"
+        "php": ">=8.1"
     },
     "autoload": {
         "files": [
@@ -25,7 +25,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-main": "3.0-dev"
+            "dev-main": "3.5-dev"
         },
         "thanks": {
             "name": "symfony/contracts",
diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml
index 8dca153892c67..d529850ee15c3 100644
--- a/lib/thirdpartylibs.xml
+++ b/lib/thirdpartylibs.xml
@@ -701,7 +701,7 @@ All rights reserved.</copyright>
     <location>symfony/deprecation-contracts</location>
     <name>Symfony Deprecation contracts</name>
     <description>A generic function and convention to trigger deprecation notices</description>
-    <version>3.1.1</version>
+    <version>3.5.0</version>
     <license>MIT</license>
     <repository>https://github.com/symfony/deprecation-contracts</repository>
   </library>

From 1264e3e0f0d6df44ff12faf94620f32b5bb72a27 Mon Sep 17 00:00:00 2001
From: Wolfgang Reichert <wreichert@bethel.jw.org>
Date: Tue, 16 Nov 2021 16:11:47 +0100
Subject: [PATCH 022/119] MDL-73091 core_badges: Avoid undefined variable
 notice in review

* Fix review method for award_criteria_courseset when courseset is empty
* Add unit tests for coverage of the award_criteria_courseset class

@co-authored jz-reichert@web.de
---
 badges/criteria/award_criteria_courseset.php |  1 +
 badges/tests/badgeslib_test.php              | 60 ++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/badges/criteria/award_criteria_courseset.php b/badges/criteria/award_criteria_courseset.php
index b798842356bc3..68e26b40d82a0 100644
--- a/badges/criteria/award_criteria_courseset.php
+++ b/badges/criteria/award_criteria_courseset.php
@@ -197,6 +197,7 @@ public function get_options(&$mform) {
      * @return bool Whether criteria is complete
      */
     public function review($userid, $filtered = false) {
+        $overall = false;
         foreach ($this->params as $param) {
             $course =  new stdClass();
             $course->id = $param['course'];
diff --git a/badges/tests/badgeslib_test.php b/badges/tests/badgeslib_test.php
index fb7cf73077063..b5424a07bc4a6 100644
--- a/badges/tests/badgeslib_test.php
+++ b/badges/tests/badgeslib_test.php
@@ -757,6 +757,66 @@ public function test_badges_observer_any_cohort_criteria_review(): void {
         $this->assertSame(0, $badge->review_all_criteria()); // Verify award_criteria_cohort->get_completed_criteria_sql().
     }
 
+    /**
+     * Test badges observer when user_updated event is fired.
+     * @covers \award_criteria_courseset
+     */
+    public function test_badges_observer_courseset_criteria_review(): void {
+        $this->preventResetByRollback(); // Messaging is not compatible with transactions.
+        $badge = new badge($this->coursebadge);
+        $this->assertFalse($badge->is_issued($this->user->id));
+
+        $additionalcourse = $this->getDataGenerator()->create_course(['enablecompletion' => true]);
+        $this->getDataGenerator()->enrol_user($this->user->id, $additionalcourse->id);
+
+        $criteriaoverall = award_criteria::build(['criteriatype' => BADGE_CRITERIA_TYPE_OVERALL, 'badgeid' => $badge->id]);
+        $criteriaoverall->save(['agg' => BADGE_CRITERIA_AGGREGATION_ANY]);
+        $criteriaoverall1 = award_criteria::build(['criteriatype' => BADGE_CRITERIA_TYPE_COURSESET, 'badgeid' => $badge->id]);
+        $criteriaoverall1->save(['agg' => BADGE_CRITERIA_AGGREGATION_ANY, 'course_' . $this->course->id => $this->course->id,
+            'course_' . $additionalcourse->id => $additionalcourse->id]);
+
+        $ccompletion = new completion_completion(['course' => $this->course->id, 'userid' => $this->user->id]);
+        $ccompletion2 = new completion_completion(['course' => $additionalcourse->id, 'userid' => $this->user->id]);
+        // Assert the badge will not be issued to the user as is.
+        $badge = new badge($this->coursebadge);
+        $badge->review_all_criteria();
+        $this->assertFalse($badge->is_issued($this->user->id));
+
+        // Mark course as complete.
+        $sink = $this->redirectMessages();
+        $ccompletion->mark_complete();
+        $ccompletion2->mark_complete();
+        // Thee messages are generated: Two for the course completed and the other one for the badge awarded.
+        $messages = $sink->get_messages();
+        $this->assertCount(3, $messages);
+        $this->assertEquals('badgerecipientnotice', $messages[0]->eventtype);
+        $this->assertEquals('coursecompleted', $messages[1]->eventtype);
+        $sink->close();
+
+        // Check if badge is awarded.
+        $this->assertDebuggingCalled('Error baking badge image!');
+        $this->assertTrue($badge->is_issued($this->user->id));
+    }
+
+    /**
+     * Test the criteria review method for courseset
+     * @covers \award_criteria_courseset::review
+     */
+    public function test_badges_courseset_criteria_review_empty_courseset(): void {
+        $this->preventResetByRollback(); // Messaging is not compatible with transactions.
+        $badge = new badge($this->coursebadge);
+        $this->assertFalse($badge->is_issued($this->user->id));
+
+        $criteriaoverall = award_criteria::build(['criteriatype' => BADGE_CRITERIA_TYPE_OVERALL, 'badgeid' => $badge->id]);
+        $criteriaoverall->save(['agg' => BADGE_CRITERIA_AGGREGATION_ANY]);
+        $criteriaoverall1 = award_criteria::build(['criteriatype' => BADGE_CRITERIA_TYPE_COURSESET, 'badgeid' => $badge->id]);
+        $criteriaoverall1->save();
+        // Assert the badge will not be issued to the user as is.
+        $badge = new badge($this->coursebadge);
+        $badge->review_all_criteria();
+        $this->assertFalse($badge->is_issued($this->user->id));
+    }
+
     /**
      * Test badges observer when cohort_member_added event is fired and user required to belong to multiple (all) cohorts.
      *

From 53b69add3a7bb9a43ae76959092ca9e1a41bd6a0 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Mon, 17 Jun 2024 15:03:16 +0100
Subject: [PATCH 023/119] MDL-81671 libraries: upgrade to version 1.3.3 of
 Serializable Closure.

---
 .../serializable-closure/src/Support/ReflectionClosure.php     | 3 +--
 lib/thirdpartylibs.xml                                         | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/laravel/serializable-closure/src/Support/ReflectionClosure.php b/lib/laravel/serializable-closure/src/Support/ReflectionClosure.php
index 97b73d21c7aa1..0544004355b55 100644
--- a/lib/laravel/serializable-closure/src/Support/ReflectionClosure.php
+++ b/lib/laravel/serializable-closure/src/Support/ReflectionClosure.php
@@ -508,8 +508,7 @@ public function getCode()
                     break;
                 case 'id_name':
                     switch ($token[0]) {
-                        // named arguments...
-                        case ':':
+                        case $token[0] === ':' && $context !== 'instanceof':
                             if ($lastState === 'closure' && $context === 'root') {
                                 $state = 'closure';
                                 $code .= $id_start.$token;
diff --git a/lib/thirdpartylibs.xml b/lib/thirdpartylibs.xml
index 8dca153892c67..77f5eb7be2b6a 100644
--- a/lib/thirdpartylibs.xml
+++ b/lib/thirdpartylibs.xml
@@ -743,7 +743,7 @@ All rights reserved.</copyright>
   <library>
       <location>laravel/serializable-closure</location>
       <name>Serializable Closure</name>
-      <version>1.3.2</version>
+      <version>1.3.3</version>
       <license>MIT</license>
       <repository>https://github.com/laravel/serializable-closure</repository>
   </library>

From 1b1128d646276811ed59ca154a8c466f625d87d2 Mon Sep 17 00:00:00 2001
From: David Woloszyn <david.woloszyn@moodle.com>
Date: Tue, 18 Jun 2024 15:17:11 +1000
Subject: [PATCH 024/119] MDL-52046 reportbuilder: Support null return from
 checkbox callback

---
 .upgradenotes/MDL-52046-2024061805141748.yml | 8 ++++++++
 reportbuilder/classes/system_report.php      | 8 ++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 .upgradenotes/MDL-52046-2024061805141748.yml

diff --git a/.upgradenotes/MDL-52046-2024061805141748.yml b/.upgradenotes/MDL-52046-2024061805141748.yml
new file mode 100644
index 0000000000000..4e0600dacced7
--- /dev/null
+++ b/.upgradenotes/MDL-52046-2024061805141748.yml
@@ -0,0 +1,8 @@
+issueNumber: MDL-52046
+notes:
+  core_reportbuilder:
+    - message: >-
+        The return type of the `set_checkbox_toggleall` callback, defined by
+        system reports, can now be null. Use if the checkbox should not be shown
+        for the row.
+      type: improved
diff --git a/reportbuilder/classes/system_report.php b/reportbuilder/classes/system_report.php
index 07003c957b067..db859b9890292 100644
--- a/reportbuilder/classes/system_report.php
+++ b/reportbuilder/classes/system_report.php
@@ -143,7 +143,7 @@ final public function get_base_fields(): array {
      * Define toggle all checkbox for the report, required row data should be defined by calling {@see add_base_fields}
      *
      * @param callable $callback Callback to return value/label for each checkbox, implementing the following signature:
-     *      function(stdClass $row): array containing value/label pair
+     *      function(stdClass $row): ?array containing value/label pair, or null if the checkbox should not be shown for the row
      */
     final protected function set_checkbox_toggleall(callable $callback): void {
         $this->checkboxcallback = $callback;
@@ -166,7 +166,11 @@ final public function get_checkbox_toggleall(bool $ismaster, ?stdClass $row = nu
             $value = '';
             $label = get_string('selectall');
         } else {
-            [$value, $label] = ($this->checkboxcallback)($row);
+            $checkboxdata = ($this->checkboxcallback)($row);
+            if ($checkboxdata === null) {
+                return null;
+            }
+            [$value, $label] = $checkboxdata;
         }
 
         return new checkbox_toggleall('report-select-all', $ismaster, [

From b174d05b54c812f346bfd84971a1c115db8438f0 Mon Sep 17 00:00:00 2001
From: David Woloszyn <david.woloszyn@moodle.com>
Date: Thu, 20 Jun 2024 11:39:03 +1000
Subject: [PATCH 025/119] MDL-52046 cohorts: Add ability to bulk delete cohorts

---
 cohort/amd/build/actions.min.js               |  10 ++
 cohort/amd/build/actions.min.js.map           |   1 +
 cohort/amd/build/repository.min.js            |  10 ++
 cohort/amd/build/repository.min.js.map        |   1 +
 cohort/amd/src/actions.js                     | 115 ++++++++++++++++++
 cohort/amd/src/repository.js                  |  47 +++++++
 .../local/systemreports/cohorts.php           |  13 +-
 cohort/index.php                              |  16 +++
 cohort/tests/behat/delete_cohorts.feature     |  28 +++++
 lang/en/cohort.php                            |   1 +
 lib/db/services.php                           |   3 +-
 version.php                                   |   2 +-
 12 files changed, 244 insertions(+), 3 deletions(-)
 create mode 100644 cohort/amd/build/actions.min.js
 create mode 100644 cohort/amd/build/actions.min.js.map
 create mode 100644 cohort/amd/build/repository.min.js
 create mode 100644 cohort/amd/build/repository.min.js.map
 create mode 100644 cohort/amd/src/actions.js
 create mode 100644 cohort/amd/src/repository.js
 create mode 100644 cohort/tests/behat/delete_cohorts.feature

diff --git a/cohort/amd/build/actions.min.js b/cohort/amd/build/actions.min.js
new file mode 100644
index 0000000000000..c5d49ea397455
--- /dev/null
+++ b/cohort/amd/build/actions.min.js
@@ -0,0 +1,10 @@
+define("core_cohort/actions",["exports","core/event_dispatcher","core/notification","core/pending","core/prefetch","core/str","core_cohort/repository","core_reportbuilder/local/events","core_reportbuilder/local/selectors","core/local/inplace_editable/events"],(function(_exports,_event_dispatcher,_notification,_pending,_prefetch,_str,_repository,reportEvents,reportSelectors,_events2){function _getRequireWildcardCache(nodeInterop){if("function"!=typeof WeakMap)return null;var cacheBabelInterop=new WeakMap,cacheNodeInterop=new WeakMap;return(_getRequireWildcardCache=function(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop})(nodeInterop)}function _interopRequireWildcard(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule)return obj;if(null===obj||"object"!=typeof obj&&"function"!=typeof obj)return{default:obj};var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj))return cache.get(obj);var newObj={},hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj)if("default"!==key&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;desc&&(desc.get||desc.set)?Object.defineProperty(newObj,key,desc):newObj[key]=obj[key]}return newObj.default=obj,cache&&cache.set(obj,newObj),newObj}function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}
+/**
+   * Cohorts actions.
+   *
+   * @module     core_cohort/actions
+   * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>
+   * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.registerEventListeners=_exports.init=void 0,_notification=_interopRequireDefault(_notification),_pending=_interopRequireDefault(_pending),reportEvents=_interopRequireWildcard(reportEvents),reportSelectors=_interopRequireWildcard(reportSelectors);const SELECTORS_CHECKBOXES='[data-togglegroup="report-select-all"][data-toggle="slave"]:checked',SELECTORS_DELETEBUTTON='[data-action="cohort-delete-selected"]',SELECTORS_EDITNAME='[data-itemtype="cohortname"]';_exports.init=()=>{(0,_prefetch.prefetchStrings)("core_cohort",["delcohortsconfirm"]),(0,_prefetch.prefetchStrings)("core",["delete","deleteselected","selectitem"]),registerEventListeners()};const registerEventListeners=()=>{document.addEventListener(_events2.eventTypes.elementUpdated,(async event=>{if(event.target.closest(SELECTORS_EDITNAME)){const newName=await(0,_str.getString)("selectitem","core",event.target.dataset.value),cohortId=event.target.dataset.itemid,checkbox=document.querySelector('input[value="'.concat(cohortId,'"]')),label=document.querySelector('label[for="'.concat(checkbox.id,'"]'));newName&&label&&(label.innerHTML=newName)}})),document.addEventListener("click",(event=>{const cohortDeleteSelected=event.target.closest(SELECTORS_DELETEBUTTON);if(cohortDeleteSelected){event.preventDefault();const reportElement=document.querySelector(reportSelectors.regions.report),cohortDeleteChecked=reportElement.querySelectorAll(SELECTORS_CHECKBOXES);if(0===cohortDeleteChecked.length)return;_notification.default.saveCancelPromise((0,_str.getString)("deleteselected","core"),(0,_str.getString)("delcohortsconfirm","core_cohort"),(0,_str.getString)("delete","core"),{triggerElement:cohortDeleteSelected}).then((()=>{const pendingPromise=new _pending.default("core_cohort/cohorts:delete"),deleteCohortIds=[...cohortDeleteChecked].map((check=>check.value));return(0,_repository.deleteCohorts)(deleteCohortIds).then((()=>((0,_event_dispatcher.dispatchEvent)(reportEvents.tableReload,{preservePagination:!0},reportElement),pendingPromise.resolve()))).catch(_notification.default.exception)})).catch((()=>{}))}}))};_exports.registerEventListeners=registerEventListeners}));
+
+//# sourceMappingURL=actions.min.js.map
\ No newline at end of file
diff --git a/cohort/amd/build/actions.min.js.map b/cohort/amd/build/actions.min.js.map
new file mode 100644
index 0000000000000..7f777fd08ae6a
--- /dev/null
+++ b/cohort/amd/build/actions.min.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"actions.min.js","sources":["../src/actions.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Cohorts actions.\n *\n * @module     core_cohort/actions\n * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport {dispatchEvent} from 'core/event_dispatcher';\nimport Notification from 'core/notification';\nimport Pending from 'core/pending';\nimport {prefetchStrings} from 'core/prefetch';\nimport {getString} from 'core/str';\nimport {deleteCohorts} from 'core_cohort/repository';\nimport * as reportEvents from 'core_reportbuilder/local/events';\nimport * as reportSelectors from 'core_reportbuilder/local/selectors';\nimport {eventTypes} from 'core/local/inplace_editable/events';\n\nconst SELECTORS = {\n    CHECKBOXES: '[data-togglegroup=\"report-select-all\"][data-toggle=\"slave\"]:checked',\n    DELETEBUTTON: '[data-action=\"cohort-delete-selected\"]',\n    EDITNAME: '[data-itemtype=\"cohortname\"]',\n};\n\n/**\n * Initialise module.\n */\nexport const init = () => {\n\n    prefetchStrings('core_cohort', [\n        'delcohortsconfirm',\n    ]);\n\n    prefetchStrings('core', [\n        'delete',\n        'deleteselected',\n        'selectitem',\n    ]);\n\n    registerEventListeners();\n};\n\n/**\n * Register event listeners.\n */\nexport const registerEventListeners = () => {\n\n    // Edit cohort name inplace.\n    document.addEventListener(eventTypes.elementUpdated, async(event) => {\n\n        const editCohortName = event.target.closest(SELECTORS.EDITNAME);\n\n        if (editCohortName) {\n            const newName = await getString('selectitem', 'core', event.target.dataset.value);\n            const cohortId = event.target.dataset.itemid;\n            const checkbox = document.querySelector(`input[value=\"${cohortId}\"]`);\n            const label = document.querySelector(`label[for=\"${checkbox.id}\"]`);\n\n            if (newName && label) {\n                label.innerHTML = newName;\n            }\n        }\n    });\n\n    // Delete multiple cohorts.\n    document.addEventListener('click', event => {\n\n        const cohortDeleteSelected = event.target.closest(SELECTORS.DELETEBUTTON);\n\n        if (cohortDeleteSelected) {\n            event.preventDefault();\n\n            const reportElement = document.querySelector(reportSelectors.regions.report);\n            const cohortDeleteChecked = reportElement.querySelectorAll(SELECTORS.CHECKBOXES);\n            if (cohortDeleteChecked.length === 0) {\n                return;\n            }\n\n            Notification.saveCancelPromise(\n                getString('deleteselected', 'core'),\n                getString('delcohortsconfirm', 'core_cohort'),\n                getString('delete', 'core'),\n                {triggerElement: cohortDeleteSelected}\n            ).then(() => {\n                const pendingPromise = new Pending('core_cohort/cohorts:delete');\n                const deleteCohortIds = [...cohortDeleteChecked].map(check => check.value);\n\n                // eslint-disable-next-line promise/no-nesting\n                return deleteCohorts(deleteCohortIds)\n                    .then(() => {\n                        dispatchEvent(reportEvents.tableReload, {preservePagination: true}, reportElement);\n                        return pendingPromise.resolve();\n                    })\n                    .catch(Notification.exception);\n            }).catch(() => {\n                return;\n            });\n        }\n    });\n};\n"],"names":["SELECTORS","registerEventListeners","document","addEventListener","eventTypes","elementUpdated","async","event","target","closest","newName","dataset","value","cohortId","itemid","checkbox","querySelector","label","id","innerHTML","cohortDeleteSelected","preventDefault","reportElement","reportSelectors","regions","report","cohortDeleteChecked","querySelectorAll","length","saveCancelPromise","triggerElement","then","pendingPromise","Pending","deleteCohortIds","map","check","reportEvents","tableReload","preservePagination","resolve","catch","Notification","exception"],"mappings":";;;;;;;kUAiCMA,qBACU,sEADVA,uBAEY,yCAFZA,mBAGQ,6CAMM,mCAEA,cAAe,CAC3B,oDAGY,OAAQ,CACpB,SACA,iBACA,eAGJC,gCAMSA,uBAAyB,KAGlCC,SAASC,iBAAiBC,oBAAWC,gBAAgBC,MAAAA,WAE1BC,MAAMC,OAAOC,QAAQT,oBAExB,OACVU,cAAgB,kBAAU,aAAc,OAAQH,MAAMC,OAAOG,QAAQC,OACrEC,SAAWN,MAAMC,OAAOG,QAAQG,OAChCC,SAAWb,SAASc,qCAA8BH,gBAClDI,MAAQf,SAASc,mCAA4BD,SAASG,UAExDR,SAAWO,QACXA,MAAME,UAAYT,aAM9BR,SAASC,iBAAiB,SAASI,cAEzBa,qBAAuBb,MAAMC,OAAOC,QAAQT,2BAE9CoB,qBAAsB,CACtBb,MAAMc,uBAEAC,cAAgBpB,SAASc,cAAcO,gBAAgBC,QAAQC,QAC/DC,oBAAsBJ,cAAcK,iBAAiB3B,yBACxB,IAA/B0B,oBAAoBE,oCAIXC,mBACT,kBAAU,iBAAkB,SAC5B,kBAAU,oBAAqB,gBAC/B,kBAAU,SAAU,QACpB,CAACC,eAAgBV,uBACnBW,MAAK,WACGC,eAAiB,IAAIC,iBAAQ,8BAC7BC,gBAAkB,IAAIR,qBAAqBS,KAAIC,OAASA,MAAMxB,eAG7D,6BAAcsB,iBAChBH,MAAK,yCACYM,aAAaC,YAAa,CAACC,oBAAoB,GAAOjB,eAC7DU,eAAeQ,aAEzBC,MAAMC,sBAAaC,cACzBF,OAAM"}
\ No newline at end of file
diff --git a/cohort/amd/build/repository.min.js b/cohort/amd/build/repository.min.js
new file mode 100644
index 0000000000000..76f8244785fa8
--- /dev/null
+++ b/cohort/amd/build/repository.min.js
@@ -0,0 +1,10 @@
+define("core_cohort/repository",["exports","core/ajax"],(function(_exports,_ajax){var obj;
+/**
+   * Module to handle cohort AJAX requests.
+   *
+   * @module      core_cohort/repository
+   * @copyright   2024 David Woloszyn <david.woloszyn@moodle.com>
+   * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.deleteCohorts=_exports.deleteCohort=void 0,_ajax=(obj=_ajax)&&obj.__esModule?obj:{default:obj};_exports.deleteCohort=cohort=>deleteCohorts([cohort]);const deleteCohorts=cohorts=>{const request={methodname:"core_cohort_delete_cohorts",args:{cohortids:cohorts}};return _ajax.default.call([request])[0]};_exports.deleteCohorts=deleteCohorts}));
+
+//# sourceMappingURL=repository.min.js.map
\ No newline at end of file
diff --git a/cohort/amd/build/repository.min.js.map b/cohort/amd/build/repository.min.js.map
new file mode 100644
index 0000000000000..893bb2c2bdc11
--- /dev/null
+++ b/cohort/amd/build/repository.min.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"repository.min.js","sources":["../src/repository.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Module to handle cohort AJAX requests.\n *\n * @module      core_cohort/repository\n * @copyright   2024 David Woloszyn <david.woloszyn@moodle.com>\n * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport Ajax from 'core/ajax';\n\n/**\n * Delete single cohort.\n *\n * @param {Number} cohort Cohort ID\n * @return {Promise}\n */\nexport const deleteCohort = cohort => deleteCohorts([cohort]);\n\n/**\n * Delete multiple cohorts.\n *\n * @param {Number[]} cohorts Cohort IDs\n * @return {Promise}\n */\nexport const deleteCohorts = cohorts => {\n    const request = {\n        methodname: 'core_cohort_delete_cohorts',\n        args: {cohortids: cohorts}\n    };\n\n    return Ajax.call([request])[0];\n};\n"],"names":["cohort","deleteCohorts","cohorts","request","methodname","args","cohortids","Ajax","call"],"mappings":";;;;;;;2LA+B4BA,QAAUC,cAAc,CAACD,eAQxCC,cAAgBC,gBACnBC,QAAU,CACZC,WAAY,6BACZC,KAAM,CAACC,UAAWJ,iBAGfK,cAAKC,KAAK,CAACL,UAAU"}
\ No newline at end of file
diff --git a/cohort/amd/src/actions.js b/cohort/amd/src/actions.js
new file mode 100644
index 0000000000000..e529714f79852
--- /dev/null
+++ b/cohort/amd/src/actions.js
@@ -0,0 +1,115 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Cohorts actions.
+ *
+ * @module     core_cohort/actions
+ * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+import {dispatchEvent} from 'core/event_dispatcher';
+import Notification from 'core/notification';
+import Pending from 'core/pending';
+import {prefetchStrings} from 'core/prefetch';
+import {getString} from 'core/str';
+import {deleteCohorts} from 'core_cohort/repository';
+import * as reportEvents from 'core_reportbuilder/local/events';
+import * as reportSelectors from 'core_reportbuilder/local/selectors';
+import {eventTypes} from 'core/local/inplace_editable/events';
+
+const SELECTORS = {
+    CHECKBOXES: '[data-togglegroup="report-select-all"][data-toggle="slave"]:checked',
+    DELETEBUTTON: '[data-action="cohort-delete-selected"]',
+    EDITNAME: '[data-itemtype="cohortname"]',
+};
+
+/**
+ * Initialise module.
+ */
+export const init = () => {
+
+    prefetchStrings('core_cohort', [
+        'delcohortsconfirm',
+    ]);
+
+    prefetchStrings('core', [
+        'delete',
+        'deleteselected',
+        'selectitem',
+    ]);
+
+    registerEventListeners();
+};
+
+/**
+ * Register event listeners.
+ */
+export const registerEventListeners = () => {
+
+    // Edit cohort name inplace.
+    document.addEventListener(eventTypes.elementUpdated, async(event) => {
+
+        const editCohortName = event.target.closest(SELECTORS.EDITNAME);
+
+        if (editCohortName) {
+            const newName = await getString('selectitem', 'core', event.target.dataset.value);
+            const cohortId = event.target.dataset.itemid;
+            const checkbox = document.querySelector(`input[value="${cohortId}"]`);
+            const label = document.querySelector(`label[for="${checkbox.id}"]`);
+
+            if (newName && label) {
+                label.innerHTML = newName;
+            }
+        }
+    });
+
+    // Delete multiple cohorts.
+    document.addEventListener('click', event => {
+
+        const cohortDeleteSelected = event.target.closest(SELECTORS.DELETEBUTTON);
+
+        if (cohortDeleteSelected) {
+            event.preventDefault();
+
+            const reportElement = document.querySelector(reportSelectors.regions.report);
+            const cohortDeleteChecked = reportElement.querySelectorAll(SELECTORS.CHECKBOXES);
+            if (cohortDeleteChecked.length === 0) {
+                return;
+            }
+
+            Notification.saveCancelPromise(
+                getString('deleteselected', 'core'),
+                getString('delcohortsconfirm', 'core_cohort'),
+                getString('delete', 'core'),
+                {triggerElement: cohortDeleteSelected}
+            ).then(() => {
+                const pendingPromise = new Pending('core_cohort/cohorts:delete');
+                const deleteCohortIds = [...cohortDeleteChecked].map(check => check.value);
+
+                // eslint-disable-next-line promise/no-nesting
+                return deleteCohorts(deleteCohortIds)
+                    .then(() => {
+                        dispatchEvent(reportEvents.tableReload, {preservePagination: true}, reportElement);
+                        return pendingPromise.resolve();
+                    })
+                    .catch(Notification.exception);
+            }).catch(() => {
+                return;
+            });
+        }
+    });
+};
diff --git a/cohort/amd/src/repository.js b/cohort/amd/src/repository.js
new file mode 100644
index 0000000000000..8bd52578e630f
--- /dev/null
+++ b/cohort/amd/src/repository.js
@@ -0,0 +1,47 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Module to handle cohort AJAX requests.
+ *
+ * @module      core_cohort/repository
+ * @copyright   2024 David Woloszyn <david.woloszyn@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+import Ajax from 'core/ajax';
+
+/**
+ * Delete single cohort.
+ *
+ * @param {Number} cohort Cohort ID
+ * @return {Promise}
+ */
+export const deleteCohort = cohort => deleteCohorts([cohort]);
+
+/**
+ * Delete multiple cohorts.
+ *
+ * @param {Number[]} cohorts Cohort IDs
+ * @return {Promise}
+ */
+export const deleteCohorts = cohorts => {
+    const request = {
+        methodname: 'core_cohort_delete_cohorts',
+        args: {cohortids: cohorts}
+    };
+
+    return Ajax.call([request])[0];
+};
diff --git a/cohort/classes/reportbuilder/local/systemreports/cohorts.php b/cohort/classes/reportbuilder/local/systemreports/cohorts.php
index 91825c73e226d..84e2d151b0844 100644
--- a/cohort/classes/reportbuilder/local/systemreports/cohorts.php
+++ b/cohort/classes/reportbuilder/local/systemreports/cohorts.php
@@ -59,7 +59,18 @@ protected function initialise(): void {
 
         // Any columns required by actions should be defined here to ensure they're always available.
         $this->add_base_fields("{$entitymainalias}.id, {$entitymainalias}.contextid, {$entitymainalias}.visible, " .
-            "{$entitymainalias}.component");
+            "{$entitymainalias}.component, {$entitymainalias}.name");
+
+        $this->set_checkbox_toggleall(static function(stdClass $cohort): ?array {
+            if (!has_capability('moodle/cohort:manage', context::instance_by_id($cohort->contextid))) {
+                return null;
+            }
+
+            return [
+                $cohort->id,
+                get_string('selectitem', 'moodle', $cohort->name),
+            ];
+        });
 
         // Check if report needs to show a specific category.
         $contextid = $this->get_parameter('contextid', 0, PARAM_INT);
diff --git a/cohort/index.php b/cohort/index.php
index 9b40c5db09cae..47dd29d11a867 100644
--- a/cohort/index.php
+++ b/cohort/index.php
@@ -115,5 +115,21 @@
     ]);
 }
 
+// Show the report.
 echo $report->output();
+
+// Show the delete selected button if there are records.
+if ($DB->record_exists('cohort', [])) {
+
+    echo $OUTPUT->render(new single_button(
+        new moodle_url('#'),
+        get_string('deleteselected'),
+        'post',
+        single_button::BUTTON_PRIMARY,
+        ['data-action' => 'cohort-delete-selected']
+    ));
+
+    $PAGE->requires->js_call_amd('core_cohort/actions', 'init');
+}
+
 echo $OUTPUT->footer();
diff --git a/cohort/tests/behat/delete_cohorts.feature b/cohort/tests/behat/delete_cohorts.feature
new file mode 100644
index 0000000000000..8ad66c67fe922
--- /dev/null
+++ b/cohort/tests/behat/delete_cohorts.feature
@@ -0,0 +1,28 @@
+@core @core_cohort
+Feature: Delete cohorts
+  In order to delete multiple cohorts
+  As an admin
+  I need to select specific cohorts and perform that action
+
+  Background:
+    Given the following "cohorts" exist:
+      | name     | idnumber | contextlevel | reference | description    |
+      | Cohort 1 | cohort1  | System       |           | About cohort 1 |
+      | Cohort 2 | cohort2  | System       |           | About cohort 2 |
+      | Cohort 3 | cohort3  | System       |           | About cohort 3 |
+
+  @javascript
+  Scenario: I can delete multiple cohorts using the checkboxes
+    Given I log in as "admin"
+    And I navigate to "Users > Accounts > Cohorts" in site administration
+    And I should see "Cohort 1"
+    And I should see "Cohort 2"
+    And I should see "Cohort 3"
+    And I click on "Select 'Cohort 1'" "checkbox"
+    And I click on "Select 'Cohort 2'" "checkbox"
+    When I click on "Delete selected" "button"
+    Then I should see "Do you really want to delete the selected cohorts?"
+    And I click on "Delete" "button" in the "Delete selected" "dialogue"
+    And I should not see "Cohort 1"
+    And I should not see "Cohort 2"
+    And I should see "Cohort 3"
diff --git a/lang/en/cohort.php b/lang/en/cohort.php
index b913521a1c03a..93c94e0f20536 100644
--- a/lang/en/cohort.php
+++ b/lang/en/cohort.php
@@ -47,6 +47,7 @@
 $string['currentusersmatching'] = 'Current users matching';
 $string['defaultcontext'] = 'Default context';
 $string['delcohort'] = 'Delete cohort';
+$string['delcohortsconfirm'] = 'Do you really want to delete the selected cohorts?';
 $string['delconfirm'] = 'Do you really want to delete cohort \'{$a}\'?';
 $string['description'] = 'Description';
 $string['displayedrows'] = '{$a->displayed} rows displayed out of {$a->total}.';
diff --git a/lib/db/services.php b/lib/db/services.php
index 0fffbe9295f0a..feb0ce346c4d9 100644
--- a/lib/db/services.php
+++ b/lib/db/services.php
@@ -373,7 +373,8 @@
         'classpath' => 'cohort/externallib.php',
         'description' => 'Deletes all specified cohorts.',
         'type' => 'write',
-        'capabilities' => 'moodle/cohort:manage'
+        'capabilities' => 'moodle/cohort:manage',
+        'ajax' => true,
     ),
     'core_cohort_get_cohort_members' => array(
         'classname' => 'core_cohort_external',
diff --git a/version.php b/version.php
index 3829bcfbddc95..d559adffb31ce 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2024061400.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2024061400.02;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
 $release  = '4.5dev (Build: 20240614)'; // Human-friendly version name

From 8b71894d6222afff6b85f7135576736305f54a9e Mon Sep 17 00:00:00 2001
From: David Woloszyn <david.woloszyn@moodle.com>
Date: Thu, 20 Jun 2024 13:05:18 +1000
Subject: [PATCH 026/119] MDL-79231 mod_assign: Fix Tiny menu in fullscreen
 mode

---
 mod/assign/styles.css | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/mod/assign/styles.css b/mod/assign/styles.css
index 07db38c778b8f..9e63e71dcd6d9 100644
--- a/mod/assign/styles.css
+++ b/mod/assign/styles.css
@@ -1141,6 +1141,11 @@
         float: none;
         margin: 0 auto 10px;
     }
+
+    /* Bug fix for TinyMCE menu when in fullscreen mode (small screens). */
+    body.tox-fullscreen.path-mod-assign [data-region="grading-navigation"] {
+        display: none;
+    }
 }
 
 /** Start of CSS to make forms vertical in the grading panel (taken from theme/bootstrapbase/less/moodle/forms.less). */
@@ -1216,3 +1221,13 @@ div[id*='mod_assign-timer-'] {
     font-weight: 600;
     font-size: 1.4em;
 }
+
+/* Bug fix for TinyMCE menu when in fullscreen mode. */
+body.tox-fullscreen.path-mod-assign [data-region="grade-panel"] {
+    position: unset;
+}
+
+/* Bug fix for TinyMCE menu when in fullscreen mode and when editor is nested in a popout.*/
+body.path-mod-assign [data-region="grade-panel"] .mform .fitem.has-popout .felement[data-fieldtype="editor"] {
+    overflow: unset;
+}

From f90116e1c7a25199b194109aafad765ad62a1352 Mon Sep 17 00:00:00 2001
From: David Woloszyn <david.woloszyn@moodle.com>
Date: Thu, 20 Jun 2024 14:31:03 +1000
Subject: [PATCH 027/119] MDL-79231 core_theme: Fix Tiny menu in fullscreen
 mode modals

---
 theme/boost/scss/moodle/modal.scss | 21 +++++++++++++++++++++
 theme/boost/style/moodle.css       | 19 +++++++++++++++++++
 theme/classic/style/moodle.css     | 19 +++++++++++++++++++
 3 files changed, 59 insertions(+)

diff --git a/theme/boost/scss/moodle/modal.scss b/theme/boost/scss/moodle/modal.scss
index 8924d8495e71d..d06f572527851 100644
--- a/theme/boost/scss/moodle/modal.scss
+++ b/theme/boost/scss/moodle/modal.scss
@@ -30,3 +30,24 @@
         }
     }
 }
+
+/* Bug fix for TinyMCE menu when in fullscreen mode. */
+body.tox-fullscreen .modal-dialog {
+    width: 100%;
+    max-width: 100%;
+    height: 100%;
+
+    .modal-header {
+        height: 0;
+        padding: 0;
+    }
+
+    .tox-tinymce-aux {
+        position: relative;
+    }
+}
+
+/* Bug fix TinyMCE menu width dropdowns when in fullscreen mode. */
+body.tox-fullscreen .tox.tox-tinymce-aux {
+    position: relative !important; // stylelint-disable-line declaration-no-important
+}
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 36dfa1fe71cc2..aec7ee63c60f3 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -36811,6 +36811,25 @@ span[data-flexitour=container][x-placement=right] div[data-role=arrow]:after, sp
   opacity: inherit;
 }
 
+/* Bug fix for TinyMCE menu when in fullscreen mode. */
+body.tox-fullscreen .modal-dialog {
+  width: 100%;
+  max-width: 100%;
+  height: 100%;
+}
+body.tox-fullscreen .modal-dialog .modal-header {
+  height: 0;
+  padding: 0;
+}
+body.tox-fullscreen .modal-dialog .tox-tinymce-aux {
+  position: relative;
+}
+
+/* Bug fix TinyMCE menu width dropdowns when in fullscreen mode. */
+body.tox-fullscreen .tox.tox-tinymce-aux {
+  position: relative !important;
+}
+
 .layout.fullscreen {
   height: 100vh;
   position: fixed;
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 41a60b439069b..2f362a806840e 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -36745,6 +36745,25 @@ span[data-flexitour=container][x-placement=right] div[data-role=arrow]:after, sp
   opacity: inherit;
 }
 
+/* Bug fix for TinyMCE menu when in fullscreen mode. */
+body.tox-fullscreen .modal-dialog {
+  width: 100%;
+  max-width: 100%;
+  height: 100%;
+}
+body.tox-fullscreen .modal-dialog .modal-header {
+  height: 0;
+  padding: 0;
+}
+body.tox-fullscreen .modal-dialog .tox-tinymce-aux {
+  position: relative;
+}
+
+/* Bug fix TinyMCE menu width dropdowns when in fullscreen mode. */
+body.tox-fullscreen .tox.tox-tinymce-aux {
+  position: relative !important;
+}
+
 .layout.fullscreen {
   height: 100vh;
   position: fixed;

From d43da95ed66b771b8ced61e6f13d0f5630f94f36 Mon Sep 17 00:00:00 2001
From: David Woloszyn <david.woloszyn@moodle.com>
Date: Tue, 4 Jun 2024 16:04:17 +1000
Subject: [PATCH 028/119] MDL-81506 core_enrol: New capability to edit the
 welcome message

---
 enrol/editinstance.php |  5 ++++-
 lang/en/role.php       |  1 +
 lib/db/access.php      | 10 ++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/enrol/editinstance.php b/enrol/editinstance.php
index 2363340f918ee..047ab93e93304 100644
--- a/enrol/editinstance.php
+++ b/enrol/editinstance.php
@@ -38,7 +38,10 @@
 }
 
 require_login($course);
-require_capability('enrol/' . $type . ':config', $context);
+
+if (!has_any_capability(['enrol/' . $type . ':config', 'moodle/course:editcoursewelcomemessage'], $context)) {
+    throw new \moodle_exception('nopermissiontoaccesspage', 'error');
+}
 
 $url = new moodle_url('/enrol/editinstance.php', ['courseid' => $course->id, 'id' => $instanceid, 'type' => $type]);
 $PAGE->set_url($url);
diff --git a/lang/en/role.php b/lang/en/role.php
index 97fa84054228c..915f240d8c371 100644
--- a/lang/en/role.php
+++ b/lang/en/role.php
@@ -180,6 +180,7 @@
 $string['course:configurecustomfields'] = 'Configure course custom fields';
 $string['course:configuredownloadcontent'] = 'Configure download course content';
 $string['course:downloadcoursecontent'] = 'Download course content';
+$string['course:editcoursewelcomemessage'] = 'Edit course welcome message';
 $string['course:enrolconfig'] = 'Configure enrol instances in courses';
 $string['course:enrolreview'] = 'Review course enrolments';
 $string['course:setforcedlanguage'] = 'Force course or activity language';
diff --git a/lib/db/access.php b/lib/db/access.php
index 69b687aef83a3..eda798dd5b1ed 100644
--- a/lib/db/access.php
+++ b/lib/db/access.php
@@ -2748,4 +2748,14 @@
             'manager' => CAP_ALLOW,
         ]
     ],
+
+    // Allow users to edit course welcome messages.
+    'moodle/course:editcoursewelcomemessage' => [
+        'captype' => 'write',
+        'contextlevel' => CONTEXT_COURSE,
+        'archetypes' => [
+            'editingteacher' => CAP_ALLOW,
+            'manager' => CAP_ALLOW,
+        ],
+    ],
 );

From 49fa7785ddff212447415807aa1d4b5166bbff5d Mon Sep 17 00:00:00 2001
From: David Woloszyn <david.woloszyn@moodle.com>
Date: Tue, 4 Jun 2024 16:20:16 +1000
Subject: [PATCH 029/119] MDL-81506 enrol_manual: Edit welcome message
 capability applied

---
 enrol/manual/lib.php                          | 179 ++++++++++--------
 .../manual/tests/behat/welcomemessage.feature |  16 ++
 2 files changed, 116 insertions(+), 79 deletions(-)

diff --git a/enrol/manual/lib.php b/enrol/manual/lib.php
index c41d5d970d021..0ef478a228b98 100644
--- a/enrol/manual/lib.php
+++ b/enrol/manual/lib.php
@@ -114,8 +114,17 @@ public function get_action_icons(stdClass $instance) {
             $managelink = new moodle_url("/enrol/manual/manage.php", array('enrolid'=>$instance->id));
             $icons[] = $OUTPUT->action_icon($managelink, new pix_icon('t/enrolusers', get_string('enrolusers', 'enrol_manual'), 'core', array('class'=>'iconsmall')));
         }
-        $parenticons = parent::get_action_icons($instance);
-        $icons = array_merge($icons, $parenticons);
+
+        if (has_any_capability(['enrol/manual:config', 'moodle/course:editcoursewelcomemessage'], $context)) {
+            $linkparams = [
+                'courseid' => $instance->courseid,
+                'id' => $instance->id,
+                'type' => $instance->enrol,
+            ];
+            $editlink = new moodle_url('/enrol/editinstance.php', $linkparams);
+            $icon = new pix_icon('t/edit', get_string('edit'), 'core', ['class' => 'iconsmall']);
+            $icons[] = $OUTPUT->action_icon($editlink, $icon);
+        }
 
         return $icons;
     }
@@ -175,7 +184,11 @@ public function update_instance($instance, $data) {
             }
         }
 
-        $data->notifyall = $data->expirynotify == 2 ? 1 : 0;
+        // This method is used when configuring the enrolment method, and when only updating the welcome message.
+        // The 'expirynotify' property won't be set when updating the welcome message.
+        if (isset($data->expirynotify)) {
+            $data->notifyall = $data->expirynotify == 2 ? 1 : 0;
+        }
 
         return parent::update_instance($instance, $data);
     }
@@ -582,86 +595,92 @@ protected function get_expirynotify_options() {
      */
     public function edit_instance_form($instance, MoodleQuickForm $mform, $context) {
 
-        $options = $this->get_status_options();
-        $mform->addElement('select', 'status', get_string('status', 'enrol_manual'), $options);
-        $mform->addHelpButton('status', 'status', 'enrol_manual');
-        $mform->setDefault('status', $this->get_config('status'));
-
-        $roles = $this->get_roleid_options($instance, $context);
-        $mform->addElement('select', 'roleid', get_string('defaultrole', 'role'), $roles);
-        $mform->setDefault('roleid', $this->get_config('roleid'));
-
-        $options = array('optional' => true, 'defaultunit' => 86400);
-        $mform->addElement('duration', 'enrolperiod', get_string('defaultperiod', 'enrol_manual'), $options);
-        $mform->setDefault('enrolperiod', $this->get_config('enrolperiod'));
-        $mform->addHelpButton('enrolperiod', 'defaultperiod', 'enrol_manual');
-
-        $options = $this->get_expirynotify_options();
-        $mform->addElement('select', 'expirynotify', get_string('expirynotify', 'core_enrol'), $options);
-        $mform->addHelpButton('expirynotify', 'expirynotify', 'core_enrol');
-
-        $options = array('optional' => false, 'defaultunit' => 86400);
-        $mform->addElement('duration', 'expirythreshold', get_string('expirythreshold', 'core_enrol'), $options);
-        $mform->addHelpButton('expirythreshold', 'expirythreshold', 'core_enrol');
-        $mform->disabledIf('expirythreshold', 'expirynotify', 'eq', 0);
+        // Main fields.
+        if (has_capability('enrol/manual:config', $context)) {
+            $options = $this->get_status_options();
+            $mform->addElement('select', 'status', get_string('status', 'enrol_manual'), $options);
+            $mform->addHelpButton('status', 'status', 'enrol_manual');
+            $mform->setDefault('status', $this->get_config('status'));
+
+            $roles = $this->get_roleid_options($instance, $context);
+            $mform->addElement('select', 'roleid', get_string('defaultrole', 'role'), $roles);
+            $mform->setDefault('roleid', $this->get_config('roleid'));
+
+            $options = ['optional' => true, 'defaultunit' => 86400];
+            $mform->addElement('duration', 'enrolperiod', get_string('defaultperiod', 'enrol_manual'), $options);
+            $mform->setDefault('enrolperiod', $this->get_config('enrolperiod'));
+            $mform->addHelpButton('enrolperiod', 'defaultperiod', 'enrol_manual');
+
+            $options = $this->get_expirynotify_options();
+            $mform->addElement('select', 'expirynotify', get_string('expirynotify', 'core_enrol'), $options);
+            $mform->addHelpButton('expirynotify', 'expirynotify', 'core_enrol');
+
+            $options = ['optional' => false, 'defaultunit' => 86400];
+            $mform->addElement('duration', 'expirythreshold', get_string('expirythreshold', 'core_enrol'), $options);
+            $mform->addHelpButton('expirythreshold', 'expirythreshold', 'core_enrol');
+            $mform->disabledIf('expirythreshold', 'expirynotify', 'eq', 0);
+        }
 
         // Course welcome message.
-        $mform->addElement(
-            'select',
-            'customint1',
-            get_string(
+        if (has_any_capability(['enrol/manual:config', 'moodle/course:editcoursewelcomemessage'], $context)) {
+            $mform->addElement(
+                'select',
+                'customint1',
+                get_string(
+                    identifier: 'sendcoursewelcomemessage',
+                    component: 'core_enrol',
+                ),
+                enrol_send_welcome_email_options(),
+            );
+            $mform->addHelpButton(
+                elementname: 'customint1',
                 identifier: 'sendcoursewelcomemessage',
                 component: 'core_enrol',
-            ),
-            enrol_send_welcome_email_options(),
-        );
-        $mform->addHelpButton(
-            elementname: 'customint1',
-            identifier: 'sendcoursewelcomemessage',
-            component: 'core_enrol',
-        );
-
-        $options = [
-            'cols' => '60',
-            'rows' => '8',
-        ];
-        $mform->addElement(
-            'textarea',
-            'customtext1',
-            get_string(
-                identifier: 'customwelcomemessage',
-                component: 'core_enrol',
-            ),
-            $options,
-        );
-        $mform->setDefault('customtext1', get_string('customwelcomemessageplaceholder', 'core_enrol'));
-        $mform->hideIf(
-            elementname: 'customtext1',
-            dependenton: 'customint1',
-            condition: 'eq',
-            value: ENROL_DO_NOT_SEND_EMAIL,
-        );
-
-        // Static form elements cannot be hidden by hideIf() so we need to add a dummy group.
-        // See: https://tracker.moodle.org/browse/MDL-66251.
-        $group[] = $mform->createElement(
-            'static',
-            'customwelcomemessage_extra_help',
-            null,
-            get_string(
-                identifier: 'customwelcomemessage_help',
-                component: 'core_enrol',
-            ),
-        );
-        $mform->addGroup($group, 'group_customwelcomemessage_extra_help', '', ' ', false);
-        $mform->hideIf(
-            elementname: 'group_customwelcomemessage_extra_help',
-            dependenton: 'customint1',
-            condition: 'eq',
-            value: ENROL_DO_NOT_SEND_EMAIL,
-        );
+            );
+
+            $options = [
+                'cols' => '60',
+                'rows' => '8',
+            ];
+            $mform->addElement(
+                'textarea',
+                'customtext1',
+                get_string(
+                    identifier: 'customwelcomemessage',
+                    component: 'core_enrol',
+                ),
+                $options,
+            );
+            $mform->setDefault('customtext1', get_string('customwelcomemessageplaceholder', 'core_enrol'));
+            $mform->hideIf(
+                elementname: 'customtext1',
+                dependenton: 'customint1',
+                condition: 'eq',
+                value: ENROL_DO_NOT_SEND_EMAIL,
+            );
+
+            // Static form elements cannot be hidden by hideIf() so we need to add a dummy group.
+            // See: https://tracker.moodle.org/browse/MDL-66251.
+            $group[] = $mform->createElement(
+                'static',
+                'customwelcomemessage_extra_help',
+                null,
+                get_string(
+                    identifier: 'customwelcomemessage_help',
+                    component: 'core_enrol',
+                ),
+            );
+            $mform->addGroup($group, 'group_customwelcomemessage_extra_help', '', ' ', false);
+            $mform->hideIf(
+                elementname: 'group_customwelcomemessage_extra_help',
+                dependenton: 'customint1',
+                condition: 'eq',
+                value: ENROL_DO_NOT_SEND_EMAIL,
+            );
+        }
 
-        if (enrol_accessing_via_instance($instance)) {
+        // Enrolment changes warning.
+        if (has_capability('enrol/manual:config', $context) && enrol_accessing_via_instance($instance)) {
             $warntext = get_string('instanceeditselfwarningtext', 'core_enrol');
             $mform->addElement('static', 'selfwarn', get_string('instanceeditselfwarning', 'core_enrol'), $warntext);
         }
@@ -681,7 +700,9 @@ public function edit_instance_form($instance, MoodleQuickForm $mform, $context)
     public function edit_instance_validation($data, $files, $instance, $context) {
         $errors = array();
 
-        if ($data['expirynotify'] > 0 and $data['expirythreshold'] < 86400) {
+        // This method is used when configuring the enrolment method, and when only updating the welcome message.
+        // The 'expirynotify' key won't be set when updating the welcome message.
+        if (isset($data['expirynotify']) && $data['expirynotify'] > 0 && $data['expirythreshold'] < 86400) {
             $errors['expirythreshold'] = get_string('errorthresholdlow', 'core_enrol');
         }
 
diff --git a/enrol/manual/tests/behat/welcomemessage.feature b/enrol/manual/tests/behat/welcomemessage.feature
index 17d5377d5c634..6beda6759060d 100644
--- a/enrol/manual/tests/behat/welcomemessage.feature
+++ b/enrol/manual/tests/behat/welcomemessage.feature
@@ -35,6 +35,22 @@ Feature: A course welcome message will be sent to the user when they are enrolle
     And I should not see "Custom welcome message"
     And I should not see "Accepted formats: Plain text or Moodle-auto format. HTML tags and multi-lang tags are also accepted, as well as the following placeholders:"
 
+  @javascript
+  Scenario: Teacher can edit the course welcome message
+    Given I am on the "C1" "Enrolled users" page logged in as teacher
+    And I set the field "Participants tertiary navigation" to "Enrolment methods"
+    When I click on "Edit" "link" in the "Manual enrolments" "table_row"
+    Then I should see "Send course welcome message"
+    And I should not see "Enable manual enrolments"
+    And I should not see "Default role"
+    And I should not see "Default enrolment duration"
+    And I should not see "Notify before enrolment expires"
+    And I should not see "Notification threshold"
+    And I set the field "Custom welcome message" to "Hello {$a->fullname}, welcome to the course {$a->coursename}"
+    And I press "Save changes"
+    And I click on "Edit" "link" in the "Manual enrolments" "table_row"
+    And I should see "Hello {$a->fullname}, welcome to the course {$a->coursename}"
+
   @javascript
   Scenario: Student should not receive a welcome message if the setting is disabled
     Given I am on the "C1" "Enrolled users" page logged in as manager

From 7b14538f2105fde514e1509bff0a8061554163e9 Mon Sep 17 00:00:00 2001
From: David Woloszyn <david.woloszyn@moodle.com>
Date: Thu, 20 Jun 2024 14:51:56 +1000
Subject: [PATCH 030/119] MDL-81506 enrol_self: Edit welcome message capability
 applied

---
 enrol/self/lib.php                            | 290 ++++++++++--------
 enrol/self/tests/behat/welcomemessage.feature |  11 +
 2 files changed, 174 insertions(+), 127 deletions(-)

diff --git a/enrol/self/lib.php b/enrol/self/lib.php
index 80ad7d48e2844..3c987aec9a2ab 100644
--- a/enrol/self/lib.php
+++ b/enrol/self/lib.php
@@ -133,6 +133,32 @@ public function can_add_instance($courseid) {
         return true;
     }
 
+    /**
+     * Returns edit icons for the page with list of instances.
+     *
+     * @param stdClass $instance
+     * @return array
+     */
+    public function get_action_icons(stdClass $instance): array {
+        global $OUTPUT;
+
+        $context = context_course::instance($instance->courseid);
+
+        $icons = [];
+        if (has_any_capability(['enrol/self:config', 'moodle/course:editcoursewelcomemessage'], $context)) {
+            $linkparams = [
+                'courseid' => $instance->courseid,
+                'id' => $instance->id,
+                'type' => $instance->enrol,
+            ];
+            $editlink = new moodle_url('/enrol/editinstance.php', $linkparams);
+            $icon = new pix_icon('t/edit', get_string('edit'), 'core', ['class' => 'iconsmall']);
+            $icons[] = $OUTPUT->action_icon($editlink, $icon);
+        }
+
+        return $icons;
+    }
+
     /**
      * Self enrol user to course
      *
@@ -828,139 +854,149 @@ public function get_bulk_operations(course_enrolment_manager $manager) {
     public function edit_instance_form($instance, MoodleQuickForm $mform, $context) {
         global $CFG, $DB;
 
-        // Merge these two settings to one value for the single selection element.
-        if ($instance->notifyall and $instance->expirynotify) {
-            $instance->expirynotify = 2;
-        }
-        unset($instance->notifyall);
-
-        $nameattribs = array('size' => '20', 'maxlength' => '255');
-        $mform->addElement('text', 'name', get_string('custominstancename', 'enrol'), $nameattribs);
-        $mform->setType('name', PARAM_TEXT);
-        $mform->addRule('name', get_string('maximumchars', '', 255), 'maxlength', 255, 'server');
-
-        $options = $this->get_status_options();
-        $mform->addElement('select', 'status', get_string('status', 'enrol_self'), $options);
-        $mform->addHelpButton('status', 'status', 'enrol_self');
-
-        $options = $this->get_newenrols_options();
-        $mform->addElement('select', 'customint6', get_string('newenrols', 'enrol_self'), $options);
-        $mform->addHelpButton('customint6', 'newenrols', 'enrol_self');
-        $mform->disabledIf('customint6', 'status', 'eq', ENROL_INSTANCE_DISABLED);
-
-        $passattribs = array('size' => '20', 'maxlength' => '50');
-        $mform->addElement('passwordunmask', 'password', get_string('password', 'enrol_self'), $passattribs);
-        $mform->addHelpButton('password', 'password', 'enrol_self');
-        if (empty($instance->id) and $this->get_config('requirepassword')) {
-            $mform->addRule('password', get_string('required'), 'required', null, 'client');
-        }
-        $mform->addRule('password', get_string('maximumchars', '', 50), 'maxlength', 50, 'server');
-
-        $options = $this->get_groupkey_options();
-        $mform->addElement('select', 'customint1', get_string('groupkey', 'enrol_self'), $options);
-        $mform->addHelpButton('customint1', 'groupkey', 'enrol_self');
-
-        $roles = $this->extend_assignable_roles($context, $instance->roleid);
-        $mform->addElement('select', 'roleid', get_string('role', 'enrol_self'), $roles);
-
-        $options = array('optional' => true, 'defaultunit' => 86400);
-        $mform->addElement('duration', 'enrolperiod', get_string('enrolperiod', 'enrol_self'), $options);
-        $mform->addHelpButton('enrolperiod', 'enrolperiod', 'enrol_self');
-
-        $options = $this->get_expirynotify_options();
-        $mform->addElement('select', 'expirynotify', get_string('expirynotify', 'core_enrol'), $options);
-        $mform->addHelpButton('expirynotify', 'expirynotify', 'core_enrol');
-
-        $options = array('optional' => false, 'defaultunit' => 86400);
-        $mform->addElement('duration', 'expirythreshold', get_string('expirythreshold', 'core_enrol'), $options);
-        $mform->addHelpButton('expirythreshold', 'expirythreshold', 'core_enrol');
-        $mform->disabledIf('expirythreshold', 'expirynotify', 'eq', 0);
-
-        $options = array('optional' => true);
-        $mform->addElement('date_time_selector', 'enrolstartdate', get_string('enrolstartdate', 'enrol_self'), $options);
-        $mform->setDefault('enrolstartdate', 0);
-        $mform->addHelpButton('enrolstartdate', 'enrolstartdate', 'enrol_self');
-
-        $options = array('optional' => true);
-        $mform->addElement('date_time_selector', 'enrolenddate', get_string('enrolenddate', 'enrol_self'), $options);
-        $mform->setDefault('enrolenddate', 0);
-        $mform->addHelpButton('enrolenddate', 'enrolenddate', 'enrol_self');
-
-        $options = $this->get_longtimenosee_options();
-        $mform->addElement('select', 'customint2', get_string('longtimenosee', 'enrol_self'), $options);
-        $mform->addHelpButton('customint2', 'longtimenosee', 'enrol_self');
-
-        $mform->addElement('text', 'customint3', get_string('maxenrolled', 'enrol_self'));
-        $mform->addHelpButton('customint3', 'maxenrolled', 'enrol_self');
-        $mform->setType('customint3', PARAM_INT);
-
-        require_once($CFG->dirroot.'/cohort/lib.php');
-
-        $cohorts = array(0 => get_string('no'));
-        $allcohorts = cohort_get_available_cohorts($context, 0, 0, 0);
-        if ($instance->customint5 && !isset($allcohorts[$instance->customint5])) {
-            $c = $DB->get_record('cohort',
-                                 array('id' => $instance->customint5),
-                                 'id, name, idnumber, contextid, visible',
-                                 IGNORE_MISSING);
-            if ($c) {
-                // Current cohort was not found because current user can not see it. Still keep it.
-                $allcohorts[$instance->customint5] = $c;
+        // Main fields.
+        if (has_capability('enrol/self:config', $context)) {
+            // Merge these two settings to one value for the single selection element.
+            if ($instance->notifyall && $instance->expirynotify) {
+                $instance->expirynotify = 2;
             }
-        }
-        foreach ($allcohorts as $c) {
-            $cohorts[$c->id] = format_string($c->name, true, array('context' => context::instance_by_id($c->contextid)));
-            if ($c->idnumber) {
-                $cohorts[$c->id] .= ' ['.s($c->idnumber).']';
+            unset($instance->notifyall);
+
+            $nameattribs = ['size' => '20', 'maxlength' => '255'];
+            $mform->addElement('text', 'name', get_string('custominstancename', 'enrol'), $nameattribs);
+            $mform->setType('name', PARAM_TEXT);
+            $mform->addRule('name', get_string('maximumchars', '', 255), 'maxlength', 255, 'server');
+
+            $options = $this->get_status_options();
+            $mform->addElement('select', 'status', get_string('status', 'enrol_self'), $options);
+            $mform->addHelpButton('status', 'status', 'enrol_self');
+
+            $options = $this->get_newenrols_options();
+            $mform->addElement('select', 'customint6', get_string('newenrols', 'enrol_self'), $options);
+            $mform->addHelpButton('customint6', 'newenrols', 'enrol_self');
+            $mform->disabledIf('customint6', 'status', 'eq', ENROL_INSTANCE_DISABLED);
+
+            $passattribs = ['size' => '20', 'maxlength' => '50'];
+            $mform->addElement('passwordunmask', 'password', get_string('password', 'enrol_self'), $passattribs);
+            $mform->addHelpButton('password', 'password', 'enrol_self');
+            if (empty($instance->id) && $this->get_config('requirepassword')) {
+                $mform->addRule('password', get_string('required'), 'required', null, 'client');
+            }
+            $mform->addRule('password', get_string('maximumchars', '', 50), 'maxlength', 50, 'server');
+
+            $options = $this->get_groupkey_options();
+            $mform->addElement('select', 'customint1', get_string('groupkey', 'enrol_self'), $options);
+            $mform->addHelpButton('customint1', 'groupkey', 'enrol_self');
+
+            $roles = $this->extend_assignable_roles($context, $instance->roleid);
+            $mform->addElement('select', 'roleid', get_string('role', 'enrol_self'), $roles);
+
+            $options = ['optional' => true, 'defaultunit' => 86400];
+            $mform->addElement('duration', 'enrolperiod', get_string('enrolperiod', 'enrol_self'), $options);
+            $mform->addHelpButton('enrolperiod', 'enrolperiod', 'enrol_self');
+
+            $options = $this->get_expirynotify_options();
+            $mform->addElement('select', 'expirynotify', get_string('expirynotify', 'core_enrol'), $options);
+            $mform->addHelpButton('expirynotify', 'expirynotify', 'core_enrol');
+
+            $options = ['optional' => false, 'defaultunit' => 86400];
+            $mform->addElement('duration', 'expirythreshold', get_string('expirythreshold', 'core_enrol'), $options);
+            $mform->addHelpButton('expirythreshold', 'expirythreshold', 'core_enrol');
+            $mform->disabledIf('expirythreshold', 'expirynotify', 'eq', 0);
+
+            $options = ['optional' => true];
+            $mform->addElement('date_time_selector', 'enrolstartdate', get_string('enrolstartdate', 'enrol_self'), $options);
+            $mform->setDefault('enrolstartdate', 0);
+            $mform->addHelpButton('enrolstartdate', 'enrolstartdate', 'enrol_self');
+
+            $options = ['optional' => true];
+            $mform->addElement('date_time_selector', 'enrolenddate', get_string('enrolenddate', 'enrol_self'), $options);
+            $mform->setDefault('enrolenddate', 0);
+            $mform->addHelpButton('enrolenddate', 'enrolenddate', 'enrol_self');
+
+            $options = $this->get_longtimenosee_options();
+            $mform->addElement('select', 'customint2', get_string('longtimenosee', 'enrol_self'), $options);
+            $mform->addHelpButton('customint2', 'longtimenosee', 'enrol_self');
+
+            $mform->addElement('text', 'customint3', get_string('maxenrolled', 'enrol_self'));
+            $mform->addHelpButton('customint3', 'maxenrolled', 'enrol_self');
+            $mform->setType('customint3', PARAM_INT);
+
+            require_once($CFG->dirroot.'/cohort/lib.php');
+
+            $cohorts = [0 => get_string('no')];
+            $allcohorts = cohort_get_available_cohorts($context, 0, 0, 0);
+            if ($instance->customint5 && !isset($allcohorts[$instance->customint5])) {
+                $c = $DB->get_record('cohort',
+                                    ['id' => $instance->customint5],
+                                    'id, name, idnumber, contextid, visible',
+                                    IGNORE_MISSING);
+                if ($c) {
+                    // Current cohort was not found because current user can not see it. Still keep it.
+                    $allcohorts[$instance->customint5] = $c;
+                }
+            }
+            foreach ($allcohorts as $c) {
+                $cohorts[$c->id] = format_string($c->name, true, ['context' => context::instance_by_id($c->contextid)]);
+                if ($c->idnumber) {
+                    $cohorts[$c->id] .= ' ['.s($c->idnumber).']';
+                }
+            }
+            if ($instance->customint5 && !isset($allcohorts[$instance->customint5])) {
+                // Somebody deleted a cohort, better keep the wrong value so that random ppl can not enrol.
+                $cohorts[$instance->customint5] = get_string('unknowncohort', 'cohort', $instance->customint5);
+            }
+            if (count($cohorts) > 1) {
+                $mform->addElement('select', 'customint5', get_string('cohortonly', 'enrol_self'), $cohorts);
+                $mform->addHelpButton('customint5', 'cohortonly', 'enrol_self');
+            } else {
+                $mform->addElement('hidden', 'customint5');
+                $mform->setType('customint5', PARAM_INT);
+                $mform->setConstant('customint5', 0);
             }
-        }
-        if ($instance->customint5 && !isset($allcohorts[$instance->customint5])) {
-            // Somebody deleted a cohort, better keep the wrong value so that random ppl can not enrol.
-            $cohorts[$instance->customint5] = get_string('unknowncohort', 'cohort', $instance->customint5);
-        }
-        if (count($cohorts) > 1) {
-            $mform->addElement('select', 'customint5', get_string('cohortonly', 'enrol_self'), $cohorts);
-            $mform->addHelpButton('customint5', 'cohortonly', 'enrol_self');
-        } else {
-            $mform->addElement('hidden', 'customint5');
-            $mform->setType('customint5', PARAM_INT);
-            $mform->setConstant('customint5', 0);
         }
 
-        $mform->addElement('select', 'customint4', get_string('sendcoursewelcomemessage', 'enrol_self'),
-                enrol_send_welcome_email_options());
-        $mform->addHelpButton('customint4', 'sendcoursewelcomemessage', 'enrol_self');
-
-        $options = array('cols' => '60', 'rows' => '8');
-        $mform->addElement('textarea', 'customtext1', get_string('customwelcomemessage', 'core_enrol'), $options);
-        $mform->setDefault('customtext1', get_string('customwelcomemessageplaceholder', 'core_enrol'));
-        $mform->hideIf(
-            elementname: 'customtext1',
-            dependenton: 'customint4',
-            condition: 'eq',
-            value: ENROL_DO_NOT_SEND_EMAIL,
-        );
+        // Course welcome message.
+        if (has_any_capability(['enrol/self:config', 'moodle/course:editcoursewelcomemessage'], $context)) {
+            $mform->addElement('select', 'customint4', get_string('sendcoursewelcomemessage', 'enrol_self'),
+                    enrol_send_welcome_email_options());
+            $mform->addHelpButton('customint4', 'sendcoursewelcomemessage', 'enrol_self');
+
+            $options = [
+                'cols' => '60',
+                'rows' => '8',
+            ];
+            $mform->addElement('textarea', 'customtext1', get_string('customwelcomemessage', 'core_enrol'), $options);
+            $mform->setDefault('customtext1', get_string('customwelcomemessageplaceholder', 'core_enrol'));
+            $mform->hideIf(
+                elementname: 'customtext1',
+                dependenton: 'customint4',
+                condition: 'eq',
+                value: ENROL_DO_NOT_SEND_EMAIL,
+            );
 
-        // Static form elements cannot be hidden by hideIf() so we need to add a dummy group.
-        // See: https://tracker.moodle.org/browse/MDL-66251.
-        $group[] = $mform->createElement(
-            'static',
-            'customwelcomemessage_extra_help',
-            null,
-            get_string(
-                identifier: 'customwelcomemessage_help',
-                component: 'core_enrol',
-            ),
-        );
-        $mform->addGroup($group, 'group_customwelcomemessage_extra_help', '', ' ', false);
-        $mform->hideIf(
-            elementname: 'group_customwelcomemessage_extra_help',
-            dependenton: 'customint4',
-            condition: 'eq',
-            value: ENROL_DO_NOT_SEND_EMAIL,
-        );
+            // Static form elements cannot be hidden by hideIf() so we need to add a dummy group.
+            // See: https://tracker.moodle.org/browse/MDL-66251.
+            $group[] = $mform->createElement(
+                'static',
+                'customwelcomemessage_extra_help',
+                null,
+                get_string(
+                    identifier: 'customwelcomemessage_help',
+                    component: 'core_enrol',
+                ),
+            );
+            $mform->addGroup($group, 'group_customwelcomemessage_extra_help', '', ' ', false);
+            $mform->hideIf(
+                elementname: 'group_customwelcomemessage_extra_help',
+                dependenton: 'customint4',
+                condition: 'eq',
+                value: ENROL_DO_NOT_SEND_EMAIL,
+            );
+        }
 
-        if (enrol_accessing_via_instance($instance)) {
+        // Enrolment changes warning.
+        if (has_capability('enrol/self:config', $context) && enrol_accessing_via_instance($instance)) {
             $warntext = get_string('instanceeditselfwarningtext', 'core_enrol');
             $mform->addElement('static', 'selfwarn', get_string('instanceeditselfwarning', 'core_enrol'), $warntext);
         }
diff --git a/enrol/self/tests/behat/welcomemessage.feature b/enrol/self/tests/behat/welcomemessage.feature
index 3cc8e7df22fea..adf2e9f561239 100644
--- a/enrol/self/tests/behat/welcomemessage.feature
+++ b/enrol/self/tests/behat/welcomemessage.feature
@@ -40,6 +40,17 @@ Feature: A course welcome message will be sent to the user when they auto-enrol
     And I should not see "Custom welcome message"
     And I should not see "Accepted formats: Plain text or Moodle-auto format. HTML tags and multi-lang tags are also accepted, as well as the following placeholders:"
 
+  @javascript
+  Scenario: Teacher can edit the course welcome message
+    Given I am on the "C1" "Enrolled users" page logged in as teacher
+    And I set the field "Participants tertiary navigation" to "Enrolment methods"
+    When I click on "Edit" "link" in the "Self enrolment" "table_row"
+    Then I should see "Send course welcome message"
+    And I set the field "Custom welcome message" to "Hello {$a->fullname}, welcome to the course {$a->coursename}"
+    And I press "Save changes"
+    And I click on "Edit" "link" in the "Self enrolment" "table_row"
+    And I should see "Hello {$a->fullname}, welcome to the course {$a->coursename}"
+
   @javascript
   Scenario: Student should not receive a welcome message if the setting is disabled
     Given I am on the "C1" "Enrolled users" page logged in as manager

From 9db8d9148cabee7ecf03fc69441a17a6d9e3f7eb Mon Sep 17 00:00:00 2001
From: David Woloszyn <david.woloszyn@moodle.com>
Date: Thu, 20 Jun 2024 14:53:05 +1000
Subject: [PATCH 031/119] MDL-81506 core: Version bump

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

diff --git a/version.php b/version.php
index 3829bcfbddc95..ce1ab0077726b 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2024061400.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2024061400.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
 $release  = '4.5dev (Build: 20240614)'; // Human-friendly version name

From 9eab858ea3629e6ad916e1af07cd74fa82f65121 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Thu, 20 Jun 2024 08:26:49 +0100
Subject: [PATCH 032/119] MDL-82251 customfield: correct field management icon
 sizes.

---
 customfield/templates/list.mustache     | 9 +++++----
 lib/templates/inplace_editable.mustache | 2 +-
 theme/boost/scss/moodle/core.scss       | 4 ----
 theme/boost/style/moodle.css            | 3 ---
 theme/classic/style/moodle.css          | 3 ---
 5 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/customfield/templates/list.mustache b/customfield/templates/list.mustache
index 521b268c11611..9e4cf28a42552 100644
--- a/customfield/templates/list.mustache
+++ b/customfield/templates/list.mustache
@@ -78,10 +78,11 @@
             <div class="col-6 categoryinstance">
                 {{#usescategories}}
                     <h3>
-                        <span class="movecategory">
-                        {{> core/drag_handle}}</span>{{{nameeditable}}}
-                        <a href="#" data-role="deletecategory" data-id="{{id}}">{{#pix}}
-                            t/delete, core, {{#str}} delete, moodle {{/str}} {{/pix}}</a>
+                        <span class="movecategory icon-size-3">{{> core/drag_handle}}</span>
+                        {{{nameeditable}}}
+                        <a class="icon-size-3" href="#" data-role="deletecategory" data-id="{{id}}">
+                            {{#pix}} t/delete, core, {{#str}} delete, moodle {{/str}} {{/pix}}
+                        </a>
                     </h3>
                 {{/usescategories}}
             </div>
diff --git a/lib/templates/inplace_editable.mustache b/lib/templates/inplace_editable.mustache
index bcf874a98b4af..23c8425c5cd51 100644
--- a/lib/templates/inplace_editable.mustache
+++ b/lib/templates/inplace_editable.mustache
@@ -56,7 +56,7 @@
         {{^ linkeverything }}{{{displayvalue}}}{{/ linkeverything }}
         <a href="#" class="quickeditlink aalink" data-inplaceeditablelink="1" title="{{edithint}}">
             {{# linkeverything }}{{{displayvalue}}}{{/ linkeverything }}
-            <span class="quickediticon visibleifjs">
+            <span class="quickediticon visibleifjs icon-size-3">
                 {{#editicon}}{{#pix}}{{key}}, {{component}}, {{{title}}}{{/pix}}{{/editicon}}
             </span>
         </a>
diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss
index 1c3ee3fcfebb4..5f9d24b023f58 100644
--- a/theme/boost/scss/moodle/core.scss
+++ b/theme/boost/scss/moodle/core.scss
@@ -2040,10 +2040,6 @@ dd:after {
         }
     }
 
-    .quickediticon .icon {
-        font-size: medium;
-    }
-
     .quickediticon img {
         opacity: 0.2;
     }
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 36dfa1fe71cc2..818b86af4c5f3 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -25031,9 +25031,6 @@ dd:after {
 .inplaceeditable.inplaceeditingon select {
   margin-bottom: 0;
 }
-.inplaceeditable .quickediticon .icon {
-  font-size: medium;
-}
 .inplaceeditable .quickediticon img {
   opacity: 0.2;
 }
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 41a60b439069b..6415727fee03f 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -25031,9 +25031,6 @@ dd:after {
 .inplaceeditable.inplaceeditingon select {
   margin-bottom: 0;
 }
-.inplaceeditable .quickediticon .icon {
-  font-size: medium;
-}
 .inplaceeditable .quickediticon img {
   opacity: 0.2;
 }

From f0cd6f14affeede88a2c742477ec309b3c9aca4a Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 17 May 2024 23:10:39 +0800
Subject: [PATCH 033/119] MDL-81960 core: Migrate \moodle_url to autoloaded
 file

---
 lib/classes/url.php      | 848 +++++++++++++++++++++++++++++++++++++++
 lib/db/legacyclasses.php |   1 +
 lib/weblib.php           | 835 +-------------------------------------
 3 files changed, 852 insertions(+), 832 deletions(-)
 create mode 100644 lib/classes/url.php

diff --git a/lib/classes/url.php b/lib/classes/url.php
new file mode 100644
index 0000000000000..5e8a6da1022b1
--- /dev/null
+++ b/lib/classes/url.php
@@ -0,0 +1,848 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+use Psr\Http\Message\UriInterface;
+
+/**
+ * Class for creating and manipulating urls.
+ *
+ * It can be used in moodle pages where config.php has been included without any further includes.
+ *
+ * It is useful for manipulating urls with long lists of params.
+ * One situation where it will be useful is a page which links to itself to perform various actions
+ * and / or to process form data. A url object:
+ * can be created for a page to refer to itself with all the proper get params being passed from page call to
+ * page call and methods can be used to output a url including all the params, optionally adding and overriding
+ * params and can also be used to
+ *     - output the url without any get params
+ *     - and output the params as hidden fields to be output within a form
+ *
+ * @copyright 2007 jamiesensei
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
+ */
+class url {
+    /**
+     * Scheme, ex.: http, https
+     * @var string
+     */
+    protected $scheme = '';
+
+    /**
+     * Hostname.
+     * @var string
+     */
+    protected $host = '';
+
+    /**
+     * Port number, empty means default 80 or 443 in case of http.
+     * @var int
+     */
+    protected $port = '';
+
+    /**
+     * Username for http auth.
+     * @var string
+     */
+    protected $user = '';
+
+    /**
+     * Password for http auth.
+     * @var string
+     */
+    protected $pass = '';
+
+    /**
+     * Script path.
+     * @var string
+     */
+    protected $path = '';
+
+    /**
+     * Optional slash argument value.
+     * @var string
+     */
+    protected $slashargument = '';
+
+    /**
+     * Anchor, may be also empty, null means none.
+     * @var string
+     */
+    protected $anchor = null;
+
+    /**
+     * Url parameters as associative array.
+     * @var array
+     */
+    protected $params = array();
+
+    /**
+     * Create new instance of url.
+     *
+     * @param url|string $url - url means make a copy of another
+     *      url and change parameters, string means full url or shortened
+     *      form (ex.: '/course/view.php'). It is strongly encouraged to not include
+     *      query string because it may result in double encoded values. Use the
+     *      $params instead. For admin URLs, just use /admin/script.php, this
+     *      class takes care of the $CFG->admin issue.
+     * @param array $params these params override current params or add new
+     * @param string $anchor The anchor to use as part of the URL if there is one.
+     * @throws moodle_exception
+     */
+    public function __construct($url, array $params = null, $anchor = null) {
+        global $CFG;
+
+        if ($url instanceof url) {
+            $this->scheme = $url->scheme;
+            $this->host = $url->host;
+            $this->port = $url->port;
+            $this->user = $url->user;
+            $this->pass = $url->pass;
+            $this->path = $url->path;
+            $this->slashargument = $url->slashargument;
+            $this->params = $url->params;
+            $this->anchor = $url->anchor;
+
+        } else {
+            $url = $url ?? '';
+            // Detect if anchor used.
+            $apos = strpos($url, '#');
+            if ($apos !== false) {
+                $anchor = substr($url, $apos);
+                $anchor = ltrim($anchor, '#');
+                $this->set_anchor($anchor);
+                $url = substr($url, 0, $apos);
+            }
+
+            // Normalise shortened form of our url ex.: '/course/view.php'.
+            if (strpos($url, '/') === 0) {
+                $url = $CFG->wwwroot.$url;
+            }
+
+            if ($CFG->admin !== 'admin') {
+                if (strpos($url, "$CFG->wwwroot/admin/") === 0) {
+                    $url = str_replace("$CFG->wwwroot/admin/", "$CFG->wwwroot/$CFG->admin/", $url);
+                }
+            }
+
+            // Parse the $url.
+            $parts = parse_url($url);
+            if ($parts === false) {
+                throw new moodle_exception('invalidurl');
+            }
+            if (isset($parts['query'])) {
+                // Note: the values may not be correctly decoded, url parameters should be always passed as array.
+                parse_str(str_replace('&amp;', '&', $parts['query']), $this->params);
+            }
+            unset($parts['query']);
+            foreach ($parts as $key => $value) {
+                $this->$key = $value;
+            }
+
+            // Detect slashargument value from path - we do not support directory names ending with .php.
+            $pos = strpos($this->path, '.php/');
+            if ($pos !== false) {
+                $this->slashargument = substr($this->path, $pos + 4);
+                $this->path = substr($this->path, 0, $pos + 4);
+            }
+        }
+
+        $this->params($params);
+        if ($anchor !== null) {
+            $this->anchor = (string)$anchor;
+        }
+    }
+
+    /**
+     * Add an array of params to the params for this url.
+     *
+     * The added params override existing ones if they have the same name.
+     *
+     * @param array $params Defaults to null. If null then returns all params.
+     * @return array Array of Params for url.
+     * @throws coding_exception
+     */
+    public function params(array $params = null) {
+        $params = (array)$params;
+
+        foreach ($params as $key => $value) {
+            if (is_int($key)) {
+                throw new coding_exception('Url parameters can not have numeric keys!');
+            }
+            if (!is_string($value)) {
+                if (is_array($value)) {
+                    throw new coding_exception('Url parameters values can not be arrays!');
+                }
+                if (is_object($value) and !method_exists($value, '__toString')) {
+                    throw new coding_exception('Url parameters values can not be objects, unless __toString() is defined!');
+                }
+            }
+            $this->params[$key] = (string)$value;
+        }
+        return $this->params;
+    }
+
+    /**
+     * Remove all params if no arguments passed.
+     * Remove selected params if arguments are passed.
+     *
+     * Can be called as either remove_params('param1', 'param2')
+     * or remove_params(array('param1', 'param2')).
+     *
+     * @param string[]|string $params,... either an array of param names, or 1..n string params to remove as args.
+     * @return array url parameters
+     */
+    public function remove_params($params = null) {
+        if (!is_array($params)) {
+            $params = func_get_args();
+        }
+        foreach ($params as $param) {
+            unset($this->params[$param]);
+        }
+        return $this->params;
+    }
+
+    /**
+     * Remove all url parameters.
+     *
+     * @todo remove the unused param.
+     * @param array $params Unused param
+     * @return void
+     */
+    public function remove_all_params($params = null) {
+        $this->params = array();
+        $this->slashargument = '';
+    }
+
+    /**
+     * Add a param to the params for this url.
+     *
+     * The added param overrides existing one if they have the same name.
+     *
+     * @param string $paramname name
+     * @param string $newvalue Param value. If new value specified current value is overriden or parameter is added
+     * @return mixed string parameter value, null if parameter does not exist
+     */
+    public function param($paramname, $newvalue = '') {
+        if (func_num_args() > 1) {
+            // Set new value.
+            $this->params(array($paramname => $newvalue));
+        }
+        if (isset($this->params[$paramname])) {
+            return $this->params[$paramname];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Merges parameters and validates them
+     *
+     * @param array $overrideparams
+     * @return array merged parameters
+     * @throws coding_exception
+     */
+    protected function merge_overrideparams(array $overrideparams = null) {
+        $overrideparams = (array)$overrideparams;
+        $params = $this->params;
+        foreach ($overrideparams as $key => $value) {
+            if (is_int($key)) {
+                throw new coding_exception('Overridden parameters can not have numeric keys!');
+            }
+            if (is_array($value)) {
+                throw new coding_exception('Overridden parameters values can not be arrays!');
+            }
+            if (is_object($value) and !method_exists($value, '__toString')) {
+                throw new coding_exception('Overridden parameters values can not be objects, unless __toString() is defined!');
+            }
+            $params[$key] = (string)$value;
+        }
+        return $params;
+    }
+
+    /**
+     * Get the params as as a query string.
+     *
+     * This method should not be used outside of this method.
+     *
+     * @param bool $escaped Use &amp; as params separator instead of plain &
+     * @param array $overrideparams params to add to the output params, these
+     *      override existing ones with the same name.
+     * @return string query string that can be added to a url.
+     */
+    public function get_query_string($escaped = true, array $overrideparams = null) {
+        $arr = array();
+        if ($overrideparams !== null) {
+            $params = $this->merge_overrideparams($overrideparams);
+        } else {
+            $params = $this->params;
+        }
+        foreach ($params as $key => $val) {
+            if (is_array($val)) {
+                foreach ($val as $index => $value) {
+                    $arr[] = rawurlencode($key.'['.$index.']')."=".rawurlencode($value);
+                }
+            } else {
+                if (isset($val) && $val !== '') {
+                    $arr[] = rawurlencode($key)."=".rawurlencode($val);
+                } else {
+                    $arr[] = rawurlencode($key);
+                }
+            }
+        }
+        if ($escaped) {
+            return implode('&amp;', $arr);
+        } else {
+            return implode('&', $arr);
+        }
+    }
+
+    /**
+     * Get the url params as an array of key => value pairs.
+     *
+     * This helps in handling cases where url params contain arrays.
+     *
+     * @return array params array for templates.
+     */
+    public function export_params_for_template(): array {
+        $data = [];
+        foreach ($this->params as $key => $val) {
+            if (is_array($val)) {
+                foreach ($val as $index => $value) {
+                    $data[] = ['name' => $key.'['.$index.']', 'value' => $value];
+                }
+            } else {
+                $data[] = ['name' => $key, 'value' => $val];
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * Shortcut for printing of encoded URL.
+     *
+     * @return string
+     */
+    public function __toString() {
+        return $this->out(true);
+    }
+
+    /**
+     * Output url.
+     *
+     * If you use the returned URL in HTML code, you want the escaped ampersands. If you use
+     * the returned URL in HTTP headers, you want $escaped=false.
+     *
+     * @param bool $escaped Use &amp; as params separator instead of plain &
+     * @param array $overrideparams params to add to the output url, these override existing ones with the same name.
+     * @return string Resulting URL
+     */
+    public function out($escaped = true, array $overrideparams = null) {
+
+        global $CFG;
+
+        if (!is_bool($escaped)) {
+            debugging('Escape parameter must be of type boolean, '.gettype($escaped).' given instead.');
+        }
+
+        $url = $this;
+
+        // Allow url's to be rewritten by a plugin.
+        if (isset($CFG->urlrewriteclass) && !isset($CFG->upgraderunning)) {
+            $class = $CFG->urlrewriteclass;
+            $pluginurl = $class::url_rewrite($url);
+            if ($pluginurl instanceof url) {
+                $url = $pluginurl;
+            }
+        }
+
+        return $url->raw_out($escaped, $overrideparams);
+
+    }
+
+    /**
+     * Output url without any rewrites
+     *
+     * This is identical in signature and use to out() but doesn't call the rewrite handler.
+     *
+     * @param bool $escaped Use &amp; as params separator instead of plain &
+     * @param array $overrideparams params to add to the output url, these override existing ones with the same name.
+     * @return string Resulting URL
+     */
+    public function raw_out($escaped = true, array $overrideparams = null) {
+        if (!is_bool($escaped)) {
+            debugging('Escape parameter must be of type boolean, '.gettype($escaped).' given instead.');
+        }
+
+        $uri = $this->out_omit_querystring().$this->slashargument;
+
+        $querystring = $this->get_query_string($escaped, $overrideparams);
+        if ($querystring !== '') {
+            $uri .= '?' . $querystring;
+        }
+
+        $uri .= $this->get_encoded_anchor();
+
+        return $uri;
+    }
+
+    /**
+     * Encode the anchor according to RFC 3986.
+     *
+     * @return string The encoded anchor
+     */
+    public function get_encoded_anchor(): string {
+        if (is_null($this->anchor)) {
+            return '';
+        }
+
+        // RFC 3986 allows the following characters in a fragment without them being encoded:
+        // pct-encoded: "%" HEXDIG HEXDIG
+        // unreserved:  ALPHA / DIGIT / "-" / "." / "_" / "~" /
+        // sub-delims:  "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "=" / ":" / "@"
+        // fragment:    "/" / "?"
+        //
+        // All other characters should be encoded.
+        // These should not be encoded in the fragment unless they were already encoded.
+
+        // The following characters are allowed in the fragment without encoding.
+        // In addition to this list is pct-encoded, but we can't easily handle this with a regular expression.
+        $allowed = 'a-zA-Z0-9\\-._~!$&\'()*+,;=:@\/?';
+        $anchor = '#';
+
+        $remainder = $this->anchor;
+        do {
+            // Split the string on any %.
+            $parts = explode('%', $remainder, 2);
+            $anchorparts = array_shift($parts);
+
+            // The first part can go through our preg_replace_callback to quote any relevant characters.
+            $anchor .= preg_replace_callback(
+                '/[^' . $allowed . ']/',
+                fn ($matches) => rawurlencode($matches[0]),
+                $anchorparts,
+            );
+
+            // The second part _might_ be a valid pct-encoded character.
+            if (count($parts) === 0) {
+                break;
+            }
+
+            // If the second part is a valid pct-encoded character, append it to the anchor.
+            $remainder = array_shift($parts);
+            if (preg_match('/^[a-fA-F0-9]{2}/', $remainder, $matches)) {
+                $anchor .= "%{$matches[0]}";
+                $remainder = substr($remainder, 2);
+            } else {
+                // This was not a valid pct-encoded character. Encode the % and continue with the next part.
+                $anchor .= rawurlencode('%');
+            }
+        } while (strlen($remainder) > 0);
+
+        return $anchor;
+    }
+
+    /**
+     * Returns url without parameters, everything before '?'.
+     *
+     * @param bool $includeanchor if {@link self::anchor} is defined, should it be returned?
+     * @return string
+     */
+    public function out_omit_querystring($includeanchor = false) {
+
+        $uri = $this->scheme ? $this->scheme.':'.((strtolower($this->scheme) == 'mailto') ? '':'//'): '';
+        $uri .= $this->user ? $this->user.($this->pass? ':'.$this->pass:'').'@':'';
+        $uri .= $this->host ? $this->host : '';
+        $uri .= $this->port ? ':'.$this->port : '';
+        $uri .= $this->path ? $this->path : '';
+        if ($includeanchor) {
+            $uri .= $this->get_encoded_anchor();
+        }
+
+        return $uri;
+    }
+
+    /**
+     * Compares this url with another.
+     *
+     * See documentation of constants for an explanation of the comparison flags.
+     *
+     * @param url $url The url object to compare
+     * @param int $matchtype The type of comparison (URL_MATCH_BASE, URL_MATCH_PARAMS, URL_MATCH_EXACT)
+     * @return bool
+     */
+    public function compare(url $url, $matchtype = URL_MATCH_EXACT) {
+
+        $baseself = $this->out_omit_querystring();
+        $baseother = $url->out_omit_querystring();
+
+        // Append index.php if there is no specific file.
+        if (substr($baseself, -1) == '/') {
+            $baseself .= 'index.php';
+        }
+        if (substr($baseother, -1) == '/') {
+            $baseother .= 'index.php';
+        }
+
+        // Compare the two base URLs.
+        if ($baseself != $baseother) {
+            return false;
+        }
+
+        if ($matchtype == URL_MATCH_BASE) {
+            return true;
+        }
+
+        $urlparams = $url->params();
+        foreach ($this->params() as $param => $value) {
+            if ($param == 'sesskey') {
+                continue;
+            }
+            if (!array_key_exists($param, $urlparams) || $urlparams[$param] != $value) {
+                return false;
+            }
+        }
+
+        if ($matchtype == URL_MATCH_PARAMS) {
+            return true;
+        }
+
+        foreach ($urlparams as $param => $value) {
+            if ($param == 'sesskey') {
+                continue;
+            }
+            if (!array_key_exists($param, $this->params()) || $this->param($param) != $value) {
+                return false;
+            }
+        }
+
+        if ($url->anchor !== $this->anchor) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Sets the anchor for the URI (the bit after the hash)
+     *
+     * @param string $anchor null means remove previous
+     */
+    public function set_anchor($anchor) {
+        if (is_null($anchor)) {
+            // Remove.
+            $this->anchor = null;
+        } else {
+            $this->anchor = $anchor;
+        }
+    }
+
+    /**
+     * Sets the scheme for the URI (the bit before ://)
+     *
+     * @param string $scheme
+     */
+    public function set_scheme($scheme) {
+        // See http://www.ietf.org/rfc/rfc3986.txt part 3.1.
+        if (preg_match('/^[a-zA-Z][a-zA-Z0-9+.-]*$/', $scheme)) {
+            $this->scheme = $scheme;
+        } else {
+            throw new coding_exception('Bad URL scheme.');
+        }
+    }
+
+    /**
+     * Sets the url slashargument value.
+     *
+     * @param string $path usually file path
+     * @param string $parameter name of page parameter if slasharguments not supported
+     * @param bool $supported usually null, then it depends on $CFG->slasharguments, use true or false for other servers
+     * @return void
+     */
+    public function set_slashargument($path, $parameter = 'file', $supported = null) {
+        global $CFG;
+        if (is_null($supported)) {
+            $supported = !empty($CFG->slasharguments);
+        }
+
+        if ($supported) {
+            $parts = explode('/', $path);
+            $parts = array_map('rawurlencode', $parts);
+            $path  = implode('/', $parts);
+            $this->slashargument = $path;
+            unset($this->params[$parameter]);
+
+        } else {
+            $this->slashargument = '';
+            $this->params[$parameter] = $path;
+        }
+    }
+
+    // Static factory methods.
+
+    /**
+     * Create a new url instance from a UriInterface.
+     *
+     * @param UriInterface $uri
+     * @return self
+     */
+    public static function from_uri(UriInterface $uri): self {
+        $url = new self(
+            url: $uri->getScheme() . '://' . $uri->getAuthority() . $uri->getPath(),
+            anchor: $uri->getFragment() ?: null,
+        );
+
+        $params = $uri->getQuery();
+        foreach (explode('&', $params) as $param) {
+            $url->param(...explode('=', $param, 2));
+        }
+
+        return $url;
+    }
+
+    /**
+     * General moodle file url.
+     *
+     * @param string $urlbase the script serving the file
+     * @param string $path
+     * @param bool $forcedownload
+     * @return url
+     */
+    public static function make_file_url($urlbase, $path, $forcedownload = false) {
+        $params = array();
+        if ($forcedownload) {
+            $params['forcedownload'] = 1;
+        }
+        $url = new url($urlbase, $params);
+        $url->set_slashargument($path);
+        return $url;
+    }
+
+    /**
+     * Factory method for creation of url pointing to plugin file.
+     *
+     * Please note this method can be used only from the plugins to
+     * create urls of own files, it must not be used outside of plugins!
+     *
+     * @param int $contextid
+     * @param string $component
+     * @param string $area
+     * @param ?int $itemid
+     * @param string $pathname
+     * @param string $filename
+     * @param bool $forcedownload
+     * @param mixed $includetoken Whether to use a user token when displaying this group image.
+     *                True indicates to generate a token for current user, and integer value indicates to generate a token for the
+     *                user whose id is the value indicated.
+     *                If the group picture is included in an e-mail or some other location where the audience is a specific
+     *                user who will not be logged in when viewing, then we use a token to authenticate the user.
+     * @return url
+     */
+    public static function make_pluginfile_url($contextid, $component, $area, $itemid, $pathname, $filename,
+                                               $forcedownload = false, $includetoken = false) {
+        global $CFG, $USER;
+
+        $path = [];
+
+        if ($includetoken) {
+            $urlbase = "$CFG->wwwroot/tokenpluginfile.php";
+            $userid = $includetoken === true ? $USER->id : $includetoken;
+            $token = get_user_key('core_files', $userid);
+            if ($CFG->slasharguments) {
+                $path[] = $token;
+            }
+        } else {
+            $urlbase = "$CFG->wwwroot/pluginfile.php";
+        }
+        $path[] = $contextid;
+        $path[] = $component;
+        $path[] = $area;
+
+        if ($itemid !== null) {
+            $path[] = $itemid;
+        }
+
+        $path = "/" . implode('/', $path) . "{$pathname}{$filename}";
+
+        $url = self::make_file_url($urlbase, $path, $forcedownload, $includetoken);
+        if ($includetoken && empty($CFG->slasharguments)) {
+            $url->param('token', $token);
+        }
+        return $url;
+    }
+
+    /**
+     * Factory method for creation of url pointing to plugin file.
+     * This method is the same that make_pluginfile_url but pointing to the webservice pluginfile.php script.
+     * It should be used only in external functions.
+     *
+     * @since  2.8
+     * @param int $contextid
+     * @param string $component
+     * @param string $area
+     * @param int $itemid
+     * @param string $pathname
+     * @param string $filename
+     * @param bool $forcedownload
+     * @return url
+     */
+    public static function make_webservice_pluginfile_url($contextid, $component, $area, $itemid, $pathname, $filename,
+                                               $forcedownload = false) {
+        global $CFG;
+        $urlbase = "$CFG->wwwroot/webservice/pluginfile.php";
+        if ($itemid === null) {
+            return self::make_file_url($urlbase, "/$contextid/$component/$area".$pathname.$filename, $forcedownload);
+        } else {
+            return self::make_file_url($urlbase, "/$contextid/$component/$area/$itemid".$pathname.$filename, $forcedownload);
+        }
+    }
+
+    /**
+     * Factory method for creation of url pointing to draft file of current user.
+     *
+     * @param int $draftid draft item id
+     * @param string $pathname
+     * @param string $filename
+     * @param bool $forcedownload
+     * @return url
+     */
+    public static function make_draftfile_url($draftid, $pathname, $filename, $forcedownload = false) {
+        global $CFG, $USER;
+        $urlbase = "$CFG->wwwroot/draftfile.php";
+        $context = context_user::instance($USER->id);
+
+        return self::make_file_url($urlbase, "/$context->id/user/draft/$draftid".$pathname.$filename, $forcedownload);
+    }
+
+    /**
+     * Factory method for creating of links to legacy course files.
+     *
+     * @param int $courseid
+     * @param string $filepath
+     * @param bool $forcedownload
+     * @return url
+     */
+    public static function make_legacyfile_url($courseid, $filepath, $forcedownload = false) {
+        global $CFG;
+
+        $urlbase = "$CFG->wwwroot/file.php";
+        return self::make_file_url($urlbase, '/'.$courseid.'/'.$filepath, $forcedownload);
+    }
+
+    /**
+     * Checks if URL is relative to $CFG->wwwroot.
+     *
+     * @return bool True if URL is relative to $CFG->wwwroot; otherwise, false.
+     */
+    public function is_local_url(): bool {
+        global $CFG;
+
+        $url = $this->out();
+        // Does URL start with wwwroot? Otherwise, URL isn't relative to wwwroot.
+        return ( ($url === $CFG->wwwroot) || (strpos($url, $CFG->wwwroot.'/') === 0) );
+    }
+
+    /**
+     * Returns URL as relative path from $CFG->wwwroot
+     *
+     * Can be used for passing around urls with the wwwroot stripped
+     *
+     * @param boolean $escaped Use &amp; as params separator instead of plain &
+     * @param array $overrideparams params to add to the output url, these override existing ones with the same name.
+     * @return string Resulting URL
+     * @throws coding_exception if called on a non-local url
+     */
+    public function out_as_local_url($escaped = true, array $overrideparams = null) {
+        global $CFG;
+
+        // URL should be relative to wwwroot. If not then throw exception.
+        if ($this->is_local_url()) {
+            $url = $this->out($escaped, $overrideparams);
+            $localurl = substr($url, strlen($CFG->wwwroot));
+            return !empty($localurl) ? $localurl : '';
+        } else {
+            throw new coding_exception('out_as_local_url called on a non-local URL');
+        }
+    }
+
+    /**
+     * Returns the 'path' portion of a URL. For example, if the URL is
+     * http://www.example.org:447/my/file/is/here.txt?really=1 then this will
+     * return '/my/file/is/here.txt'.
+     *
+     * By default the path includes slash-arguments (for example,
+     * '/myfile.php/extra/arguments') so it is what you would expect from a
+     * URL path. If you don't want this behaviour, you can opt to exclude the
+     * slash arguments. (Be careful: if the $CFG variable slasharguments is
+     * disabled, these URLs will have a different format and you may need to
+     * look at the 'file' parameter too.)
+     *
+     * @param bool $includeslashargument If true, includes slash arguments
+     * @return string Path of URL
+     */
+    public function get_path($includeslashargument = true) {
+        return $this->path . ($includeslashargument ? $this->slashargument : '');
+    }
+
+    /**
+     * Returns a given parameter value from the URL.
+     *
+     * @param string $name Name of parameter
+     * @return string Value of parameter or null if not set
+     */
+    public function get_param($name) {
+        if (array_key_exists($name, $this->params)) {
+            return $this->params[$name];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Returns the 'scheme' portion of a URL. For example, if the URL is
+     * http://www.example.org:447/my/file/is/here.txt?really=1 then this will
+     * return 'http' (without the colon).
+     *
+     * @return string Scheme of the URL.
+     */
+    public function get_scheme() {
+        return $this->scheme;
+    }
+
+    /**
+     * Returns the 'host' portion of a URL. For example, if the URL is
+     * http://www.example.org:447/my/file/is/here.txt?really=1 then this will
+     * return 'www.example.org'.
+     *
+     * @return string Host of the URL.
+     */
+    public function get_host() {
+        return $this->host;
+    }
+
+    /**
+     * Returns the 'port' portion of a URL. For example, if the URL is
+     * http://www.example.org:447/my/file/is/here.txt?really=1 then this will
+     * return '447'.
+     *
+     * @return string Port of the URL.
+     */
+    public function get_port() {
+        return $this->port;
+    }
+}
+
+class_alias(url::class, \moodle_url::class);
diff --git a/lib/db/legacyclasses.php b/lib/db/legacyclasses.php
index 75076d95c3217..0cc0932271416 100644
--- a/lib/db/legacyclasses.php
+++ b/lib/db/legacyclasses.php
@@ -38,6 +38,7 @@
     \invalid_response_exception::class => 'exception/invalid_response_exception.php',
     \invalid_state_exception::class => 'exception/invalid_state_exception.php',
     \moodle_exception::class => 'exception/moodle_exception.php',
+    \moodle_url::class => 'url.php',
     \require_login_exception::class => 'exception/require_login_exception.php',
     \require_login_session_timeout_exception::class => 'exception/require_login_session_timeout_exception.php',
     \required_capability_exception::class => 'exception/required_capability_exception.php',
diff --git a/lib/weblib.php b/lib/weblib.php
index d6351ea2fb28d..7e9634c890c18 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -30,8 +30,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-use Psr\Http\Message\UriInterface;
-
 defined('MOODLE_INTERNAL') || die();
 
 // Constants.
@@ -81,6 +79,9 @@
  */
 define('URL_MATCH_EXACT', 2);
 
+// TODO MDL-81933 Remove after Moodle 4.5 release.
+require_once($CFG->libdir . '/classes/url.php');
+
 // Functions.
 
 /**
@@ -242,836 +243,6 @@ function get_local_referer($stripquery = true) {
     }
 }
 
-/**
- * Class for creating and manipulating urls.
- *
- * It can be used in moodle pages where config.php has been included without any further includes.
- *
- * It is useful for manipulating urls with long lists of params.
- * One situation where it will be useful is a page which links to itself to perform various actions
- * and / or to process form data. A moodle_url object :
- * can be created for a page to refer to itself with all the proper get params being passed from page call to
- * page call and methods can be used to output a url including all the params, optionally adding and overriding
- * params and can also be used to
- *     - output the url without any get params
- *     - and output the params as hidden fields to be output within a form
- *
- * @copyright 2007 jamiesensei
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package core
- */
-class moodle_url {
-
-    /**
-     * Scheme, ex.: http, https
-     * @var string
-     */
-    protected $scheme = '';
-
-    /**
-     * Hostname.
-     * @var string
-     */
-    protected $host = '';
-
-    /**
-     * Port number, empty means default 80 or 443 in case of http.
-     * @var int
-     */
-    protected $port = '';
-
-    /**
-     * Username for http auth.
-     * @var string
-     */
-    protected $user = '';
-
-    /**
-     * Password for http auth.
-     * @var string
-     */
-    protected $pass = '';
-
-    /**
-     * Script path.
-     * @var string
-     */
-    protected $path = '';
-
-    /**
-     * Optional slash argument value.
-     * @var string
-     */
-    protected $slashargument = '';
-
-    /**
-     * Anchor, may be also empty, null means none.
-     * @var string
-     */
-    protected $anchor = null;
-
-    /**
-     * Url parameters as associative array.
-     * @var array
-     */
-    protected $params = array();
-
-    /**
-     * Create new instance of moodle_url.
-     *
-     * @param moodle_url|string $url - moodle_url means make a copy of another
-     *      moodle_url and change parameters, string means full url or shortened
-     *      form (ex.: '/course/view.php'). It is strongly encouraged to not include
-     *      query string because it may result in double encoded values. Use the
-     *      $params instead. For admin URLs, just use /admin/script.php, this
-     *      class takes care of the $CFG->admin issue.
-     * @param array $params these params override current params or add new
-     * @param string $anchor The anchor to use as part of the URL if there is one.
-     * @throws moodle_exception
-     */
-    public function __construct($url, array $params = null, $anchor = null) {
-        global $CFG;
-
-        if ($url instanceof moodle_url) {
-            $this->scheme = $url->scheme;
-            $this->host = $url->host;
-            $this->port = $url->port;
-            $this->user = $url->user;
-            $this->pass = $url->pass;
-            $this->path = $url->path;
-            $this->slashargument = $url->slashargument;
-            $this->params = $url->params;
-            $this->anchor = $url->anchor;
-
-        } else {
-            $url = $url ?? '';
-            // Detect if anchor used.
-            $apos = strpos($url, '#');
-            if ($apos !== false) {
-                $anchor = substr($url, $apos);
-                $anchor = ltrim($anchor, '#');
-                $this->set_anchor($anchor);
-                $url = substr($url, 0, $apos);
-            }
-
-            // Normalise shortened form of our url ex.: '/course/view.php'.
-            if (strpos($url, '/') === 0) {
-                $url = $CFG->wwwroot.$url;
-            }
-
-            if ($CFG->admin !== 'admin') {
-                if (strpos($url, "$CFG->wwwroot/admin/") === 0) {
-                    $url = str_replace("$CFG->wwwroot/admin/", "$CFG->wwwroot/$CFG->admin/", $url);
-                }
-            }
-
-            // Parse the $url.
-            $parts = parse_url($url);
-            if ($parts === false) {
-                throw new moodle_exception('invalidurl');
-            }
-            if (isset($parts['query'])) {
-                // Note: the values may not be correctly decoded, url parameters should be always passed as array.
-                parse_str(str_replace('&amp;', '&', $parts['query']), $this->params);
-            }
-            unset($parts['query']);
-            foreach ($parts as $key => $value) {
-                $this->$key = $value;
-            }
-
-            // Detect slashargument value from path - we do not support directory names ending with .php.
-            $pos = strpos($this->path, '.php/');
-            if ($pos !== false) {
-                $this->slashargument = substr($this->path, $pos + 4);
-                $this->path = substr($this->path, 0, $pos + 4);
-            }
-        }
-
-        $this->params($params);
-        if ($anchor !== null) {
-            $this->anchor = (string)$anchor;
-        }
-    }
-
-    /**
-     * Add an array of params to the params for this url.
-     *
-     * The added params override existing ones if they have the same name.
-     *
-     * @param array $params Defaults to null. If null then returns all params.
-     * @return array Array of Params for url.
-     * @throws coding_exception
-     */
-    public function params(array $params = null) {
-        $params = (array)$params;
-
-        foreach ($params as $key => $value) {
-            if (is_int($key)) {
-                throw new coding_exception('Url parameters can not have numeric keys!');
-            }
-            if (!is_string($value)) {
-                if (is_array($value)) {
-                    throw new coding_exception('Url parameters values can not be arrays!');
-                }
-                if (is_object($value) and !method_exists($value, '__toString')) {
-                    throw new coding_exception('Url parameters values can not be objects, unless __toString() is defined!');
-                }
-            }
-            $this->params[$key] = (string)$value;
-        }
-        return $this->params;
-    }
-
-    /**
-     * Remove all params if no arguments passed.
-     * Remove selected params if arguments are passed.
-     *
-     * Can be called as either remove_params('param1', 'param2')
-     * or remove_params(array('param1', 'param2')).
-     *
-     * @param string[]|string $params,... either an array of param names, or 1..n string params to remove as args.
-     * @return array url parameters
-     */
-    public function remove_params($params = null) {
-        if (!is_array($params)) {
-            $params = func_get_args();
-        }
-        foreach ($params as $param) {
-            unset($this->params[$param]);
-        }
-        return $this->params;
-    }
-
-    /**
-     * Remove all url parameters.
-     *
-     * @todo remove the unused param.
-     * @param array $params Unused param
-     * @return void
-     */
-    public function remove_all_params($params = null) {
-        $this->params = array();
-        $this->slashargument = '';
-    }
-
-    /**
-     * Add a param to the params for this url.
-     *
-     * The added param overrides existing one if they have the same name.
-     *
-     * @param string $paramname name
-     * @param string $newvalue Param value. If new value specified current value is overriden or parameter is added
-     * @return mixed string parameter value, null if parameter does not exist
-     */
-    public function param($paramname, $newvalue = '') {
-        if (func_num_args() > 1) {
-            // Set new value.
-            $this->params(array($paramname => $newvalue));
-        }
-        if (isset($this->params[$paramname])) {
-            return $this->params[$paramname];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Merges parameters and validates them
-     *
-     * @param array $overrideparams
-     * @return array merged parameters
-     * @throws coding_exception
-     */
-    protected function merge_overrideparams(array $overrideparams = null) {
-        $overrideparams = (array)$overrideparams;
-        $params = $this->params;
-        foreach ($overrideparams as $key => $value) {
-            if (is_int($key)) {
-                throw new coding_exception('Overridden parameters can not have numeric keys!');
-            }
-            if (is_array($value)) {
-                throw new coding_exception('Overridden parameters values can not be arrays!');
-            }
-            if (is_object($value) and !method_exists($value, '__toString')) {
-                throw new coding_exception('Overridden parameters values can not be objects, unless __toString() is defined!');
-            }
-            $params[$key] = (string)$value;
-        }
-        return $params;
-    }
-
-    /**
-     * Get the params as as a query string.
-     *
-     * This method should not be used outside of this method.
-     *
-     * @param bool $escaped Use &amp; as params separator instead of plain &
-     * @param array $overrideparams params to add to the output params, these
-     *      override existing ones with the same name.
-     * @return string query string that can be added to a url.
-     */
-    public function get_query_string($escaped = true, array $overrideparams = null) {
-        $arr = array();
-        if ($overrideparams !== null) {
-            $params = $this->merge_overrideparams($overrideparams);
-        } else {
-            $params = $this->params;
-        }
-        foreach ($params as $key => $val) {
-            if (is_array($val)) {
-                foreach ($val as $index => $value) {
-                    $arr[] = rawurlencode($key.'['.$index.']')."=".rawurlencode($value);
-                }
-            } else {
-                if (isset($val) && $val !== '') {
-                    $arr[] = rawurlencode($key)."=".rawurlencode($val);
-                } else {
-                    $arr[] = rawurlencode($key);
-                }
-            }
-        }
-        if ($escaped) {
-            return implode('&amp;', $arr);
-        } else {
-            return implode('&', $arr);
-        }
-    }
-
-    /**
-     * Get the url params as an array of key => value pairs.
-     *
-     * This helps in handling cases where url params contain arrays.
-     *
-     * @return array params array for templates.
-     */
-    public function export_params_for_template(): array {
-        $data = [];
-        foreach ($this->params as $key => $val) {
-            if (is_array($val)) {
-                foreach ($val as $index => $value) {
-                    $data[] = ['name' => $key.'['.$index.']', 'value' => $value];
-                }
-            } else {
-                $data[] = ['name' => $key, 'value' => $val];
-            }
-        }
-        return $data;
-    }
-
-    /**
-     * Shortcut for printing of encoded URL.
-     *
-     * @return string
-     */
-    public function __toString() {
-        return $this->out(true);
-    }
-
-    /**
-     * Output url.
-     *
-     * If you use the returned URL in HTML code, you want the escaped ampersands. If you use
-     * the returned URL in HTTP headers, you want $escaped=false.
-     *
-     * @param bool $escaped Use &amp; as params separator instead of plain &
-     * @param array $overrideparams params to add to the output url, these override existing ones with the same name.
-     * @return string Resulting URL
-     */
-    public function out($escaped = true, array $overrideparams = null) {
-
-        global $CFG;
-
-        if (!is_bool($escaped)) {
-            debugging('Escape parameter must be of type boolean, '.gettype($escaped).' given instead.');
-        }
-
-        $url = $this;
-
-        // Allow url's to be rewritten by a plugin.
-        if (isset($CFG->urlrewriteclass) && !isset($CFG->upgraderunning)) {
-            $class = $CFG->urlrewriteclass;
-            $pluginurl = $class::url_rewrite($url);
-            if ($pluginurl instanceof moodle_url) {
-                $url = $pluginurl;
-            }
-        }
-
-        return $url->raw_out($escaped, $overrideparams);
-
-    }
-
-    /**
-     * Output url without any rewrites
-     *
-     * This is identical in signature and use to out() but doesn't call the rewrite handler.
-     *
-     * @param bool $escaped Use &amp; as params separator instead of plain &
-     * @param array $overrideparams params to add to the output url, these override existing ones with the same name.
-     * @return string Resulting URL
-     */
-    public function raw_out($escaped = true, array $overrideparams = null) {
-        if (!is_bool($escaped)) {
-            debugging('Escape parameter must be of type boolean, '.gettype($escaped).' given instead.');
-        }
-
-        $uri = $this->out_omit_querystring().$this->slashargument;
-
-        $querystring = $this->get_query_string($escaped, $overrideparams);
-        if ($querystring !== '') {
-            $uri .= '?' . $querystring;
-        }
-
-        $uri .= $this->get_encoded_anchor();
-
-        return $uri;
-    }
-
-    /**
-     * Encode the anchor according to RFC 3986.
-     *
-     * @return string The encoded anchor
-     */
-    public function get_encoded_anchor(): string {
-        if (is_null($this->anchor)) {
-            return '';
-        }
-
-        // RFC 3986 allows the following characters in a fragment without them being encoded:
-        // pct-encoded: "%" HEXDIG HEXDIG
-        // unreserved:  ALPHA / DIGIT / "-" / "." / "_" / "~" /
-        // sub-delims:  "!" / "$" / "&" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "=" / ":" / "@"
-        // fragment:    "/" / "?"
-        //
-        // All other characters should be encoded.
-        // These should not be encoded in the fragment unless they were already encoded.
-
-        // The following characters are allowed in the fragment without encoding.
-        // In addition to this list is pct-encoded, but we can't easily handle this with a regular expression.
-        $allowed = 'a-zA-Z0-9\\-._~!$&\'()*+,;=:@\/?';
-        $anchor = '#';
-
-        $remainder = $this->anchor;
-        do {
-            // Split the string on any %.
-            $parts = explode('%', $remainder, 2);
-            $anchorparts = array_shift($parts);
-
-            // The first part can go through our preg_replace_callback to quote any relevant characters.
-            $anchor .= preg_replace_callback(
-                '/[^' . $allowed . ']/',
-                fn ($matches) => rawurlencode($matches[0]),
-                $anchorparts,
-            );
-
-            // The second part _might_ be a valid pct-encoded character.
-            if (count($parts) === 0) {
-                break;
-            }
-
-            // If the second part is a valid pct-encoded character, append it to the anchor.
-            $remainder = array_shift($parts);
-            if (preg_match('/^[a-fA-F0-9]{2}/', $remainder, $matches)) {
-                $anchor .= "%{$matches[0]}";
-                $remainder = substr($remainder, 2);
-            } else {
-                // This was not a valid pct-encoded character. Encode the % and continue with the next part.
-                $anchor .= rawurlencode('%');
-            }
-        } while (strlen($remainder) > 0);
-
-        return $anchor;
-    }
-
-    /**
-     * Returns url without parameters, everything before '?'.
-     *
-     * @param bool $includeanchor if {@link self::anchor} is defined, should it be returned?
-     * @return string
-     */
-    public function out_omit_querystring($includeanchor = false) {
-
-        $uri = $this->scheme ? $this->scheme.':'.((strtolower($this->scheme) == 'mailto') ? '':'//'): '';
-        $uri .= $this->user ? $this->user.($this->pass? ':'.$this->pass:'').'@':'';
-        $uri .= $this->host ? $this->host : '';
-        $uri .= $this->port ? ':'.$this->port : '';
-        $uri .= $this->path ? $this->path : '';
-        if ($includeanchor) {
-            $uri .= $this->get_encoded_anchor();
-        }
-
-        return $uri;
-    }
-
-    /**
-     * Compares this moodle_url with another.
-     *
-     * See documentation of constants for an explanation of the comparison flags.
-     *
-     * @param moodle_url $url The moodle_url object to compare
-     * @param int $matchtype The type of comparison (URL_MATCH_BASE, URL_MATCH_PARAMS, URL_MATCH_EXACT)
-     * @return bool
-     */
-    public function compare(moodle_url $url, $matchtype = URL_MATCH_EXACT) {
-
-        $baseself = $this->out_omit_querystring();
-        $baseother = $url->out_omit_querystring();
-
-        // Append index.php if there is no specific file.
-        if (substr($baseself, -1) == '/') {
-            $baseself .= 'index.php';
-        }
-        if (substr($baseother, -1) == '/') {
-            $baseother .= 'index.php';
-        }
-
-        // Compare the two base URLs.
-        if ($baseself != $baseother) {
-            return false;
-        }
-
-        if ($matchtype == URL_MATCH_BASE) {
-            return true;
-        }
-
-        $urlparams = $url->params();
-        foreach ($this->params() as $param => $value) {
-            if ($param == 'sesskey') {
-                continue;
-            }
-            if (!array_key_exists($param, $urlparams) || $urlparams[$param] != $value) {
-                return false;
-            }
-        }
-
-        if ($matchtype == URL_MATCH_PARAMS) {
-            return true;
-        }
-
-        foreach ($urlparams as $param => $value) {
-            if ($param == 'sesskey') {
-                continue;
-            }
-            if (!array_key_exists($param, $this->params()) || $this->param($param) != $value) {
-                return false;
-            }
-        }
-
-        if ($url->anchor !== $this->anchor) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Sets the anchor for the URI (the bit after the hash)
-     *
-     * @param string $anchor null means remove previous
-     */
-    public function set_anchor($anchor) {
-        if (is_null($anchor)) {
-            // Remove.
-            $this->anchor = null;
-        } else {
-            $this->anchor = $anchor;
-        }
-    }
-
-    /**
-     * Sets the scheme for the URI (the bit before ://)
-     *
-     * @param string $scheme
-     */
-    public function set_scheme($scheme) {
-        // See http://www.ietf.org/rfc/rfc3986.txt part 3.1.
-        if (preg_match('/^[a-zA-Z][a-zA-Z0-9+.-]*$/', $scheme)) {
-            $this->scheme = $scheme;
-        } else {
-            throw new coding_exception('Bad URL scheme.');
-        }
-    }
-
-    /**
-     * Sets the url slashargument value.
-     *
-     * @param string $path usually file path
-     * @param string $parameter name of page parameter if slasharguments not supported
-     * @param bool $supported usually null, then it depends on $CFG->slasharguments, use true or false for other servers
-     * @return void
-     */
-    public function set_slashargument($path, $parameter = 'file', $supported = null) {
-        global $CFG;
-        if (is_null($supported)) {
-            $supported = !empty($CFG->slasharguments);
-        }
-
-        if ($supported) {
-            $parts = explode('/', $path);
-            $parts = array_map('rawurlencode', $parts);
-            $path  = implode('/', $parts);
-            $this->slashargument = $path;
-            unset($this->params[$parameter]);
-
-        } else {
-            $this->slashargument = '';
-            $this->params[$parameter] = $path;
-        }
-    }
-
-    // Static factory methods.
-
-    /**
-     * Create a new moodle_url instance from a UriInterface.
-     *
-     * @param UriInterface $uri
-     * @return self
-     */
-    public static function from_uri(UriInterface $uri): self {
-        $url = new self(
-            url: $uri->getScheme() . '://' . $uri->getAuthority() . $uri->getPath(),
-            anchor: $uri->getFragment() ?: null,
-        );
-
-        $params = $uri->getQuery();
-        foreach (explode('&', $params) as $param) {
-            $url->param(...explode('=', $param, 2));
-        }
-
-        return $url;
-    }
-
-    /**
-     * General moodle file url.
-     *
-     * @param string $urlbase the script serving the file
-     * @param string $path
-     * @param bool $forcedownload
-     * @return moodle_url
-     */
-    public static function make_file_url($urlbase, $path, $forcedownload = false) {
-        $params = array();
-        if ($forcedownload) {
-            $params['forcedownload'] = 1;
-        }
-        $url = new moodle_url($urlbase, $params);
-        $url->set_slashargument($path);
-        return $url;
-    }
-
-    /**
-     * Factory method for creation of url pointing to plugin file.
-     *
-     * Please note this method can be used only from the plugins to
-     * create urls of own files, it must not be used outside of plugins!
-     *
-     * @param int $contextid
-     * @param string $component
-     * @param string $area
-     * @param ?int $itemid
-     * @param string $pathname
-     * @param string $filename
-     * @param bool $forcedownload
-     * @param mixed $includetoken Whether to use a user token when displaying this group image.
-     *                True indicates to generate a token for current user, and integer value indicates to generate a token for the
-     *                user whose id is the value indicated.
-     *                If the group picture is included in an e-mail or some other location where the audience is a specific
-     *                user who will not be logged in when viewing, then we use a token to authenticate the user.
-     * @return moodle_url
-     */
-    public static function make_pluginfile_url($contextid, $component, $area, $itemid, $pathname, $filename,
-                                               $forcedownload = false, $includetoken = false) {
-        global $CFG, $USER;
-
-        $path = [];
-
-        if ($includetoken) {
-            $urlbase = "$CFG->wwwroot/tokenpluginfile.php";
-            $userid = $includetoken === true ? $USER->id : $includetoken;
-            $token = get_user_key('core_files', $userid);
-            if ($CFG->slasharguments) {
-                $path[] = $token;
-            }
-        } else {
-            $urlbase = "$CFG->wwwroot/pluginfile.php";
-        }
-        $path[] = $contextid;
-        $path[] = $component;
-        $path[] = $area;
-
-        if ($itemid !== null) {
-            $path[] = $itemid;
-        }
-
-        $path = "/" . implode('/', $path) . "{$pathname}{$filename}";
-
-        $url = self::make_file_url($urlbase, $path, $forcedownload, $includetoken);
-        if ($includetoken && empty($CFG->slasharguments)) {
-            $url->param('token', $token);
-        }
-        return $url;
-    }
-
-    /**
-     * Factory method for creation of url pointing to plugin file.
-     * This method is the same that make_pluginfile_url but pointing to the webservice pluginfile.php script.
-     * It should be used only in external functions.
-     *
-     * @since  2.8
-     * @param int $contextid
-     * @param string $component
-     * @param string $area
-     * @param int $itemid
-     * @param string $pathname
-     * @param string $filename
-     * @param bool $forcedownload
-     * @return moodle_url
-     */
-    public static function make_webservice_pluginfile_url($contextid, $component, $area, $itemid, $pathname, $filename,
-                                               $forcedownload = false) {
-        global $CFG;
-        $urlbase = "$CFG->wwwroot/webservice/pluginfile.php";
-        if ($itemid === null) {
-            return self::make_file_url($urlbase, "/$contextid/$component/$area".$pathname.$filename, $forcedownload);
-        } else {
-            return self::make_file_url($urlbase, "/$contextid/$component/$area/$itemid".$pathname.$filename, $forcedownload);
-        }
-    }
-
-    /**
-     * Factory method for creation of url pointing to draft file of current user.
-     *
-     * @param int $draftid draft item id
-     * @param string $pathname
-     * @param string $filename
-     * @param bool $forcedownload
-     * @return moodle_url
-     */
-    public static function make_draftfile_url($draftid, $pathname, $filename, $forcedownload = false) {
-        global $CFG, $USER;
-        $urlbase = "$CFG->wwwroot/draftfile.php";
-        $context = context_user::instance($USER->id);
-
-        return self::make_file_url($urlbase, "/$context->id/user/draft/$draftid".$pathname.$filename, $forcedownload);
-    }
-
-    /**
-     * Factory method for creating of links to legacy course files.
-     *
-     * @param int $courseid
-     * @param string $filepath
-     * @param bool $forcedownload
-     * @return moodle_url
-     */
-    public static function make_legacyfile_url($courseid, $filepath, $forcedownload = false) {
-        global $CFG;
-
-        $urlbase = "$CFG->wwwroot/file.php";
-        return self::make_file_url($urlbase, '/'.$courseid.'/'.$filepath, $forcedownload);
-    }
-
-    /**
-     * Checks if URL is relative to $CFG->wwwroot.
-     *
-     * @return bool True if URL is relative to $CFG->wwwroot; otherwise, false.
-     */
-    public function is_local_url(): bool {
-        global $CFG;
-
-        $url = $this->out();
-        // Does URL start with wwwroot? Otherwise, URL isn't relative to wwwroot.
-        return ( ($url === $CFG->wwwroot) || (strpos($url, $CFG->wwwroot.'/') === 0) );
-    }
-
-    /**
-     * Returns URL as relative path from $CFG->wwwroot
-     *
-     * Can be used for passing around urls with the wwwroot stripped
-     *
-     * @param boolean $escaped Use &amp; as params separator instead of plain &
-     * @param array $overrideparams params to add to the output url, these override existing ones with the same name.
-     * @return string Resulting URL
-     * @throws coding_exception if called on a non-local url
-     */
-    public function out_as_local_url($escaped = true, array $overrideparams = null) {
-        global $CFG;
-
-        // URL should be relative to wwwroot. If not then throw exception.
-        if ($this->is_local_url()) {
-            $url = $this->out($escaped, $overrideparams);
-            $localurl = substr($url, strlen($CFG->wwwroot));
-            return !empty($localurl) ? $localurl : '';
-        } else {
-            throw new coding_exception('out_as_local_url called on a non-local URL');
-        }
-    }
-
-    /**
-     * Returns the 'path' portion of a URL. For example, if the URL is
-     * http://www.example.org:447/my/file/is/here.txt?really=1 then this will
-     * return '/my/file/is/here.txt'.
-     *
-     * By default the path includes slash-arguments (for example,
-     * '/myfile.php/extra/arguments') so it is what you would expect from a
-     * URL path. If you don't want this behaviour, you can opt to exclude the
-     * slash arguments. (Be careful: if the $CFG variable slasharguments is
-     * disabled, these URLs will have a different format and you may need to
-     * look at the 'file' parameter too.)
-     *
-     * @param bool $includeslashargument If true, includes slash arguments
-     * @return string Path of URL
-     */
-    public function get_path($includeslashargument = true) {
-        return $this->path . ($includeslashargument ? $this->slashargument : '');
-    }
-
-    /**
-     * Returns a given parameter value from the URL.
-     *
-     * @param string $name Name of parameter
-     * @return string Value of parameter or null if not set
-     */
-    public function get_param($name) {
-        if (array_key_exists($name, $this->params)) {
-            return $this->params[$name];
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Returns the 'scheme' portion of a URL. For example, if the URL is
-     * http://www.example.org:447/my/file/is/here.txt?really=1 then this will
-     * return 'http' (without the colon).
-     *
-     * @return string Scheme of the URL.
-     */
-    public function get_scheme() {
-        return $this->scheme;
-    }
-
-    /**
-     * Returns the 'host' portion of a URL. For example, if the URL is
-     * http://www.example.org:447/my/file/is/here.txt?really=1 then this will
-     * return 'www.example.org'.
-     *
-     * @return string Host of the URL.
-     */
-    public function get_host() {
-        return $this->host;
-    }
-
-    /**
-     * Returns the 'port' portion of a URL. For example, if the URL is
-     * http://www.example.org:447/my/file/is/here.txt?really=1 then this will
-     * return '447'.
-     *
-     * @return string Port of the URL.
-     */
-    public function get_port() {
-        return $this->port;
-    }
-}
-
 /**
  * Determine if there is data waiting to be processed from a form
  *

From e138e03b2f531cc84cf547b67b6794686634bfd5 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 10 Jun 2024 10:14:10 +0800
Subject: [PATCH 034/119] MDL-81960 core: Move moodle_url to \core\url

---
 .upgradenotes/MDL-81960-2024061004043644.yml  |   7 +
 lib/classes/url.php                           |  22 ++-
 .../{moodle_url_test.php => url_test.php}     | 175 +++++++++---------
 3 files changed, 111 insertions(+), 93 deletions(-)
 create mode 100644 .upgradenotes/MDL-81960-2024061004043644.yml
 rename lib/tests/{moodle_url_test.php => url_test.php} (74%)

diff --git a/.upgradenotes/MDL-81960-2024061004043644.yml b/.upgradenotes/MDL-81960-2024061004043644.yml
new file mode 100644
index 0000000000000..964e907be2519
--- /dev/null
+++ b/.upgradenotes/MDL-81960-2024061004043644.yml
@@ -0,0 +1,7 @@
+issueNumber: MDL-81960
+notes:
+  core:
+    - message: >-
+        The `\moodle_url` class has been renamed to `\core\url` and now supports
+        autoloading. Existing uses are currently unaffected.
+      type: improved
diff --git a/lib/classes/url.php b/lib/classes/url.php
index 5e8a6da1022b1..a0b9971828031 100644
--- a/lib/classes/url.php
+++ b/lib/classes/url.php
@@ -14,6 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core;
+
+use core\context\user as context_user;
+use core\exception\coding_exception;
+use core\exception\moodle_exception;
 use Psr\Http\Message\UriInterface;
 
 /**
@@ -92,8 +97,8 @@ class url {
     /**
      * Create new instance of url.
      *
-     * @param url|string $url - url means make a copy of another
-     *      url and change parameters, string means full url or shortened
+     * @param self|string $url - moodle_url means make a copy of another
+     *      moodle_url and change parameters, string means full url or shortened
      *      form (ex.: '/course/view.php'). It is strongly encouraged to not include
      *      query string because it may result in double encoded values. Use the
      *      $params instead. For admin URLs, just use /admin/script.php, this
@@ -105,7 +110,7 @@ class url {
     public function __construct($url, array $params = null, $anchor = null) {
         global $CFG;
 
-        if ($url instanceof url) {
+        if ($url instanceof self) {
             $this->scheme = $url->scheme;
             $this->host = $url->host;
             $this->port = $url->port;
@@ -480,11 +485,11 @@ public function out_omit_querystring($includeanchor = false) {
      *
      * See documentation of constants for an explanation of the comparison flags.
      *
-     * @param url $url The url object to compare
+     * @param self $url The moodle_url object to compare
      * @param int $matchtype The type of comparison (URL_MATCH_BASE, URL_MATCH_PARAMS, URL_MATCH_EXACT)
      * @return bool
      */
-    public function compare(url $url, $matchtype = URL_MATCH_EXACT) {
+    public function compare(self $url, $matchtype = URL_MATCH_EXACT) {
 
         $baseself = $this->out_omit_querystring();
         $baseother = $url->out_omit_querystring();
@@ -619,14 +624,14 @@ public static function from_uri(UriInterface $uri): self {
      * @param string $urlbase the script serving the file
      * @param string $path
      * @param bool $forcedownload
-     * @return url
+     * @return self
      */
     public static function make_file_url($urlbase, $path, $forcedownload = false) {
         $params = array();
         if ($forcedownload) {
             $params['forcedownload'] = 1;
         }
-        $url = new url($urlbase, $params);
+        $url = new self($urlbase, $params);
         $url->set_slashargument($path);
         return $url;
     }
@@ -845,4 +850,7 @@ public function get_port() {
     }
 }
 
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
 class_alias(url::class, \moodle_url::class);
diff --git a/lib/tests/moodle_url_test.php b/lib/tests/url_test.php
similarity index 74%
rename from lib/tests/moodle_url_test.php
rename to lib/tests/url_test.php
index 9f2869428c5cf..3dfceb7929e63 100644
--- a/lib/tests/moodle_url_test.php
+++ b/lib/tests/url_test.php
@@ -19,98 +19,98 @@
 use GuzzleHttp\Psr7\Uri;
 
 /**
- * Tests for moodle_url.
+ * Tests for \core\url.
  *
  * @package   core
  * @copyright 2018 Andrew Nicols <andrew@nicols.co.uk>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @covers    \moodle_url
+ * @covers    \core\url
  */
-final class moodle_url_test extends \advanced_testcase {
+final class url_test extends \advanced_testcase {
     /**
-     * Test basic moodle_url construction.
+     * Test basic url construction.
      */
-    public function test_moodle_url_constructor(): void {
+    public function test_constructor(): void {
         global $CFG;
 
-        $url = new \moodle_url('/index.php');
-        $this->assertSame($CFG->wwwroot.'/index.php', $url->out());
+        $url = new url('/index.php');
+        $this->assertSame($CFG->wwwroot . '/index.php', $url->out());
 
-        $url = new \moodle_url('/index.php', array());
-        $this->assertSame($CFG->wwwroot.'/index.php', $url->out());
+        $url = new url('/index.php', []);
+        $this->assertSame($CFG->wwwroot . '/index.php', $url->out());
 
-        $url = new \moodle_url('/index.php', array('id' => 2));
-        $this->assertSame($CFG->wwwroot.'/index.php?id=2', $url->out());
+        $url = new url('/index.php', ['id' => 2]);
+        $this->assertSame($CFG->wwwroot . '/index.php?id=2', $url->out());
 
-        $url = new \moodle_url('/index.php', array('id' => 'two'));
-        $this->assertSame($CFG->wwwroot.'/index.php?id=two', $url->out());
+        $url = new url('/index.php', ['id' => 'two']);
+        $this->assertSame($CFG->wwwroot . '/index.php?id=two', $url->out());
 
-        $url = new \moodle_url('/index.php', array('id' => 1, 'cid' => '2'));
-        $this->assertSame($CFG->wwwroot.'/index.php?id=1&amp;cid=2', $url->out());
-        $this->assertSame($CFG->wwwroot.'/index.php?id=1&cid=2', $url->out(false));
+        $url = new url('/index.php', ['id' => 1, 'cid' => '2']);
+        $this->assertSame($CFG->wwwroot . '/index.php?id=1&amp;cid=2', $url->out());
+        $this->assertSame($CFG->wwwroot . '/index.php?id=1&cid=2', $url->out(false));
 
-        $url = new \moodle_url('/index.php', null, 'test');
-        $this->assertSame($CFG->wwwroot.'/index.php#test', $url->out());
+        $url = new url('/index.php', null, 'test');
+        $this->assertSame($CFG->wwwroot . '/index.php#test', $url->out());
 
-        $url = new \moodle_url('/index.php', array('id' => 2), 'test');
-        $this->assertSame($CFG->wwwroot.'/index.php?id=2#test', $url->out());
+        $url = new url('/index.php', ['id' => 2], 'test');
+        $this->assertSame($CFG->wwwroot . '/index.php?id=2#test', $url->out());
     }
 
     /**
-     * Tests \moodle_url::get_path().
+     * Tests url::get_path().
      */
-    public function test_moodle_url_get_path(): void {
-        $url = new \moodle_url('http://www.example.org:447/my/file/is/here.txt?really=1');
+    public function test_get_path(): void {
+        $url = new url('http://www.example.org:447/my/file/is/here.txt?really=1');
         $this->assertSame('/my/file/is/here.txt', $url->get_path());
 
-        $url = new \moodle_url('http://www.example.org/');
+        $url = new url('http://www.example.org/');
         $this->assertSame('/', $url->get_path());
 
-        $url = new \moodle_url('http://www.example.org/pluginfile.php/slash/arguments');
+        $url = new url('http://www.example.org/pluginfile.php/slash/arguments');
         $this->assertSame('/pluginfile.php/slash/arguments', $url->get_path());
         $this->assertSame('/pluginfile.php', $url->get_path(false));
     }
 
-    public function test_moodle_url_round_trip(): void {
+    public function test_round_trip(): void {
         $strurl = 'http://moodle.org/course/view.php?id=5';
-        $url = new \moodle_url($strurl);
+        $url = new url($strurl);
         $this->assertSame($strurl, $url->out(false));
 
         $strurl = 'http://moodle.org/user/index.php?contextid=53&sifirst=M&silast=D';
-        $url = new \moodle_url($strurl);
+        $url = new url($strurl);
         $this->assertSame($strurl, $url->out(false));
     }
 
     /**
      * Test Moodle URL objects created with a param with empty value.
      */
-    public function test_moodle_url_empty_param_values(): void {
+    public function test_empty_param_values(): void {
         $strurl = 'http://moodle.org/course/view.php?id=0';
-        $url = new \moodle_url($strurl, array('id' => 0));
+        $url = new url($strurl, ['id' => 0]);
         $this->assertSame($strurl, $url->out(false));
 
         $strurl = 'http://moodle.org/course/view.php?id';
-        $url = new \moodle_url($strurl, array('id' => false));
+        $url = new url($strurl, ['id' => false]);
         $this->assertSame($strurl, $url->out(false));
 
         $strurl = 'http://moodle.org/course/view.php?id';
-        $url = new \moodle_url($strurl, array('id' => null));
+        $url = new url($strurl, ['id' => null]);
         $this->assertSame($strurl, $url->out(false));
 
         $strurl = 'http://moodle.org/course/view.php?id';
-        $url = new \moodle_url($strurl, array('id' => ''));
+        $url = new url($strurl, ['id' => '']);
         $this->assertSame($strurl, $url->out(false));
 
         $strurl = 'http://moodle.org/course/view.php?id';
-        $url = new \moodle_url($strurl);
+        $url = new url($strurl);
         $this->assertSame($strurl, $url->out(false));
     }
 
     /**
      * Test set good scheme on Moodle URL objects.
      */
-    public function test_moodle_url_set_good_scheme(): void {
-        $url = new \moodle_url('http://moodle.org/foo/bar');
+    public function test_set_good_scheme(): void {
+        $url = new url('http://moodle.org/foo/bar');
         $url->set_scheme('myscheme');
         $this->assertSame('myscheme://moodle.org/foo/bar', $url->out());
     }
@@ -118,47 +118,47 @@ public function test_moodle_url_set_good_scheme(): void {
     /**
      * Test set bad scheme on Moodle URL objects.
      */
-    public function test_moodle_url_set_bad_scheme(): void {
-        $url = new \moodle_url('http://moodle.org/foo/bar');
+    public function test_set_bad_scheme(): void {
+        $url = new url('http://moodle.org/foo/bar');
         $this->expectException(\coding_exception::class);
         $url->set_scheme('not a valid $ scheme');
     }
 
-    public function test_moodle_url_round_trip_array_params(): void {
+    public function test_round_trip_array_params(): void {
         $strurl = 'http://example.com/?a%5B1%5D=1&a%5B2%5D=2';
-        $url = new \moodle_url($strurl);
+        $url = new url($strurl);
         $this->assertSame($strurl, $url->out(false));
 
-        $url = new \moodle_url('http://example.com/?a[1]=1&a[2]=2');
+        $url = new url('http://example.com/?a[1]=1&a[2]=2');
         $this->assertSame($strurl, $url->out(false));
 
         // For un-keyed array params, we expect 0..n keys to be returned.
         $strurl = 'http://example.com/?a%5B0%5D=0&a%5B1%5D=1';
-        $url = new \moodle_url('http://example.com/?a[]=0&a[]=1');
+        $url = new url('http://example.com/?a[]=0&a[]=1');
         $this->assertSame($strurl, $url->out(false));
     }
 
     public function test_compare_url(): void {
-        $url1 = new \moodle_url('index.php', array('var1' => 1, 'var2' => 2));
-        $url2 = new \moodle_url('index2.php', array('var1' => 1, 'var2' => 2, 'var3' => 3));
+        $url1 = new url('index.php', ['var1' => 1, 'var2' => 2]);
+        $url2 = new url('index2.php', ['var1' => 1, 'var2' => 2, 'var3' => 3]);
 
         $this->assertFalse($url1->compare($url2, URL_MATCH_BASE));
         $this->assertFalse($url1->compare($url2, URL_MATCH_PARAMS));
         $this->assertFalse($url1->compare($url2, URL_MATCH_EXACT));
 
-        $url2 = new \moodle_url('index.php', array('var1' => 1, 'var3' => 3));
+        $url2 = new url('index.php', ['var1' => 1, 'var3' => 3]);
 
         $this->assertTrue($url1->compare($url2, URL_MATCH_BASE));
         $this->assertFalse($url1->compare($url2, URL_MATCH_PARAMS));
         $this->assertFalse($url1->compare($url2, URL_MATCH_EXACT));
 
-        $url2 = new \moodle_url('index.php', array('var1' => 1, 'var2' => 2, 'var3' => 3));
+        $url2 = new url('index.php', ['var1' => 1, 'var2' => 2, 'var3' => 3]);
 
         $this->assertTrue($url1->compare($url2, URL_MATCH_BASE));
         $this->assertTrue($url1->compare($url2, URL_MATCH_PARAMS));
         $this->assertFalse($url1->compare($url2, URL_MATCH_EXACT));
 
-        $url2 = new \moodle_url('index.php', array('var2' => 2, 'var1' => 1));
+        $url2 = new url('index.php', ['var2' => 2, 'var1' => 1]);
 
         $this->assertTrue($url1->compare($url2, URL_MATCH_BASE));
         $this->assertTrue($url1->compare($url2, URL_MATCH_PARAMS));
@@ -178,25 +178,25 @@ public function test_compare_url(): void {
     public function test_out_as_local_url(): void {
         global $CFG;
         // Test http url.
-        $url1 = new \moodle_url('/lib/tests/weblib_test.php');
+        $url1 = new url('/lib/tests/weblib_test.php');
         $this->assertSame('/lib/tests/weblib_test.php', $url1->out_as_local_url());
 
         // Test https url.
         $httpswwwroot = str_replace("http://", "https://", $CFG->wwwroot);
-        $url2 = new \moodle_url($httpswwwroot.'/login/profile.php');
+        $url2 = new url($httpswwwroot . '/login/profile.php');
         $this->assertSame('/login/profile.php', $url2->out_as_local_url());
 
         // Test http url matching wwwroot.
-        $url3 = new \moodle_url($CFG->wwwroot);
+        $url3 = new url($CFG->wwwroot);
         $this->assertSame('', $url3->out_as_local_url());
 
         // Test http url matching wwwroot ending with slash (/).
-        $url3 = new \moodle_url($CFG->wwwroot.'/');
+        $url3 = new url($CFG->wwwroot . '/');
         $this->assertSame('/', $url3->out_as_local_url());
     }
 
     public function test_out_as_local_url_error(): void {
-        $url2 = new \moodle_url('http://www.google.com/lib/tests/weblib_test.php');
+        $url2 = new url('http://www.google.com/lib/tests/weblib_test.php');
         $this->expectException(\coding_exception::class);
         $url2->out_as_local_url();
     }
@@ -207,8 +207,8 @@ public function test_out_as_local_url_error(): void {
     public function test_modified_url_out_as_local_url_error(): void {
         global $CFG;
 
-        $modifiedurl = $CFG->wwwroot.'1';
-        $url3 = new \moodle_url($modifiedurl.'/login/profile.php');
+        $modifiedurl = $CFG->wwwroot . '1';
+        $url3 = new url($modifiedurl . '/login/profile.php');
         $this->expectException(\coding_exception::class);
         $url3->out_as_local_url();
     }
@@ -217,79 +217,79 @@ public function test_modified_url_out_as_local_url_error(): void {
      * Try get local url from external https url and you should get error
      */
     public function test_https_out_as_local_url_error(): void {
-        $url4 = new \moodle_url('https://www.google.com/lib/tests/weblib_test.php');
+        $url4 = new url('https://www.google.com/lib/tests/weblib_test.php');
         $this->expectException(\coding_exception::class);
         $url4->out_as_local_url();
     }
 
-    public function test_moodle_url_get_scheme(): void {
+    public function test_get_scheme(): void {
         // Should return the scheme only.
-        $url = new \moodle_url('http://www.example.org:447/my/file/is/here.txt?really=1');
+        $url = new url('http://www.example.org:447/my/file/is/here.txt?really=1');
         $this->assertSame('http', $url->get_scheme());
 
         // Should work for secure URLs.
-        $url = new \moodle_url('https://www.example.org:447/my/file/is/here.txt?really=1');
+        $url = new url('https://www.example.org:447/my/file/is/here.txt?really=1');
         $this->assertSame('https', $url->get_scheme());
 
         // Should return an empty string if no scheme is specified.
-        $url = new \moodle_url('www.example.org:447/my/file/is/here.txt?really=1');
+        $url = new url('www.example.org:447/my/file/is/here.txt?really=1');
         $this->assertSame('', $url->get_scheme());
     }
 
-    public function test_moodle_url_get_host(): void {
+    public function test_get_host(): void {
         // Should return the host part only.
-        $url = new \moodle_url('http://www.example.org:447/my/file/is/here.txt?really=1');
+        $url = new url('http://www.example.org:447/my/file/is/here.txt?really=1');
         $this->assertSame('www.example.org', $url->get_host());
     }
 
-    public function test_moodle_url_get_port(): void {
+    public function test_get_port(): void {
         // Should return the port if one provided.
-        $url = new \moodle_url('http://www.example.org:447/my/file/is/here.txt?really=1');
+        $url = new url('http://www.example.org:447/my/file/is/here.txt?really=1');
         $this->assertSame(447, $url->get_port());
 
         // Should return an empty string if port not specified.
-        $url = new \moodle_url('http://www.example.org/some/path/here.php');
+        $url = new url('http://www.example.org/some/path/here.php');
         $this->assertSame('', $url->get_port());
     }
 
     /**
      * Test exporting params for templates.
      *
-     * @dataProvider moodle_url_export_params_for_template_provider
+     * @dataProvider export_params_for_template_provider
      * @param string $url URL with params to test.
      * @param array $expected The expected result.
      */
-    public function test_moodle_url_export_params_for_template(string $url, array $expected): void {
+    public function test_export_params_for_template(string $url, array $expected): void {
         // Should return params in the URL.
-        $moodleurl = new \moodle_url($url);
+        $moodleurl = new url($url);
         $this->assertSame($expected, $moodleurl->export_params_for_template());
     }
 
     /**
-     * Data provider for moodle_url_export_params_for_template tests.
+     * Data provider for export_params_for_template tests.
      *
      * @return array[] the array of test data.
      */
-    public function moodle_url_export_params_for_template_provider(): array {
+    public static function export_params_for_template_provider(): array {
         $baseurl = "http://example.com";
         return [
                 'With indexed array params' => [
                     'url' => "@{$baseurl}/?tags[0]=123&tags[1]=456",
                     'expected' => [
                         0 => ['name' => 'tags[0]', 'value' => '123'],
-                        1 => ['name' => 'tags[1]', 'value' => '456']
-                    ]
+                        1 => ['name' => 'tags[1]', 'value' => '456'],
+                    ],
                 ],
                 'Without indexed array params' => [
                     'url' => "@{$baseurl}/?tags[]=123&tags[]=456",
                     'expected' => [
                         0 => ['name' => 'tags[0]', 'value' => '123'],
-                        1 => ['name' => 'tags[1]', 'value' => '456']
-                    ]
+                        1 => ['name' => 'tags[1]', 'value' => '456'],
+                    ],
                 ],
                 'with no params' => [
                     'url' => "@{$baseurl}/",
-                    'expected' => []
+                    'expected' => [],
                 ],
                 'with no array params' => [
                     'url' => "@{$baseurl}/?param1=1&param2=2&param3=3",
@@ -297,7 +297,7 @@ public function moodle_url_export_params_for_template_provider(): array {
                         0 => ['name' => 'param1', 'value' => '1'],
                         1 => ['name' => 'param2', 'value' => '2'],
                         2 => ['name' => 'param3', 'value' => '3'],
-                    ]
+                    ],
                 ],
                 'array embedded with other params' => [
                     'url' => "@{$baseurl}/?param1=1&tags[0]=123&tags[1]=456&param2=2&param3=3",
@@ -307,7 +307,7 @@ public function moodle_url_export_params_for_template_provider(): array {
                         2 => ['name' => 'tags[1]', 'value' => '456'],
                         3 => ['name' => 'param2', 'value' => '2'],
                         4 => ['name' => 'param3', 'value' => '3'],
-                    ]
+                    ],
                 ],
                 'params with array at the end' => [
                     'url' => "@{$baseurl}/?param1=1&tags[]=123&tags[]=456",
@@ -315,7 +315,7 @@ public function moodle_url_export_params_for_template_provider(): array {
                         0 => ['name' => 'param1', 'value' => '1'],
                         1 => ['name' => 'tags[0]', 'value' => '123'],
                         2 => ['name' => 'tags[1]', 'value' => '456'],
-                    ]
+                    ],
                 ],
         ];
     }
@@ -334,7 +334,7 @@ public function test_make_pluginfile_url($slashargs, $args, $expected): void {
         $this->resetAfterTest();
 
         $CFG->slasharguments = $slashargs;
-        $url = call_user_func_array('\moodle_url::make_pluginfile_url', $args);
+        $url = call_user_func_array([url::class, 'make_pluginfile_url'], $args);
         $this->assertMatchesRegularExpression($expected, $url->out(true));
     }
 
@@ -343,7 +343,7 @@ public function test_make_pluginfile_url($slashargs, $args, $expected): void {
      *
      * @return  array[]
      */
-    public function make_pluginfile_url_provider() {
+    public static function make_pluginfile_url_provider(): array {
         $baseurl = "https://www.example.com/moodle/pluginfile.php";
         $tokenbaseurl = "https://www.example.com/moodle/tokenpluginfile.php";
         return [
@@ -397,7 +397,8 @@ public function make_pluginfile_url_provider() {
                     false,
                     true,
                 ],
-                'expected' => "@{$tokenbaseurl}\?file=%2F1%2Fmod_forum%2Fposts%2F422%2Fmy%2Flocation%2Ffile.png&amp;token=[a-z0-9]*@",
+                'expected' =>
+                    "@{$tokenbaseurl}\?file=%2F1%2Fmod_forum%2Fposts%2F422%2Fmy%2Flocation%2Ffile.png&amp;token=[a-z0-9]*@",
             ],
         ];
     }
@@ -406,18 +407,18 @@ public function test_from_uri(): void {
         global $CFG;
 
         $uri = new Uri('http://www.example.org:447/my/file/is/here.txt?really=1');
-        $url = \moodle_url::from_uri($uri);
+        $url = url::from_uri($uri);
         $this->assertSame('http://www.example.org:447/my/file/is/here.txt?really=1', $url->out(false));
         $this->assertEquals(1, $url->param('really'));
 
         $uri = new Uri('https://www.example.org/my/file/is/here.txt?really=1');
-        $url = \moodle_url::from_uri($uri);
+        $url = url::from_uri($uri);
         $this->assertSame('https://www.example.org/my/file/is/here.txt?really=1', $url->out(false));
         $this->assertEquals(1, $url->param('really'));
 
         // Multiple params.
         $uri = new Uri('https://www.example.org/my/file/is/here.txt?really=1&another=2&&more=3&moar=4');
-        $url = \moodle_url::from_uri($uri);
+        $url = url::from_uri($uri);
         $this->assertSame('https://www.example.org/my/file/is/here.txt?really=1&another=2&more=3&moar=4', $url->out(false));
         $this->assertEquals(1, $url->param('really'));
         $this->assertEquals(2, $url->param('another'));
@@ -426,16 +427,18 @@ public function test_from_uri(): void {
 
         // Anchors.
         $uri = new Uri("{$CFG->wwwroot}/course/view/#section-1");
-        $url = \moodle_url::from_uri($uri);
+        $url = url::from_uri($uri);
         $this->assertSame("{$CFG->wwwroot}/course/view/#section-1", $url->out(false));
         $this->assertEmpty($url->params());
     }
 
     /**
+     * Test url fragment parsing.
+     *
      * @dataProvider url_fragment_parsing_provider
      */
     public function test_url_fragment_parsing(string $fragment, string $expected): void {
-        $url = new \moodle_url('/index.php', null, $fragment);
+        $url = new url('/index.php', null, $fragment);
 
         // Test the encoded fragment.
         $this->assertEquals(
@@ -484,7 +487,7 @@ public static function url_fragment_parsing_provider(): array {
                 '%25Percent',
             ],
             'Contains multiple %' => [
-                // % followed by a valid pct-encoded followed by two more %%.
+                // A % followed by a valid pct-encoded followed by two more %%.
                 '%%23%%',
                 '%25%23%25%25',
             ],

From c6e0b0f3460734674b9eaa13b8fbcc6333b8a48c Mon Sep 17 00:00:00 2001
From: Matt Porritt <pozze30@gmail.com>
Date: Sun, 9 Jun 2024 20:38:36 +1000
Subject: [PATCH 035/119] MDL-82141 Administration: Use toggle for Plugin
 Management Table

Replace the "eye" icon for enabling and disabling plugins in tables
that use the Plugin Management Table (plugin_management_table) class
with the Font Awesome "toggle" icon.
---
 .../classes/table/plugin_management_table.php | 35 ++++++------
 admin/templates/setting_configtoggle.mustache | 57 +++++++++++++++++++
 admin/tests/behat/manage_blocks.feature       | 28 +++------
 admin/tests/behat/manage_media.feature        | 29 +++-------
 .../tests/behat/apply_presets.feature         |  8 +--
 .../tests/behat/revert_changes.feature        |  6 +-
 .../behat/glossary_random_addblock.feature    |  2 +-
 .../glossary_random_addblock_disabled.feature |  4 +-
 .../behat/configure_tag_youtube_block.feature |  2 +-
 .../noautolink/tests/behat/noautolink.feature |  2 +-
 .../tests/behat/manage_subplugins.feature     | 28 +++------
 lib/tests/behat/behat_general.php             | 29 ++++++++++
 12 files changed, 141 insertions(+), 89 deletions(-)
 create mode 100644 admin/templates/setting_configtoggle.mustache

diff --git a/admin/classes/table/plugin_management_table.php b/admin/classes/table/plugin_management_table.php
index 314fe8a1e15b7..0f420d8ec52b9 100644
--- a/admin/classes/table/plugin_management_table.php
+++ b/admin/classes/table/plugin_management_table.php
@@ -303,28 +303,29 @@ protected function col_enabled(stdClass $row): string {
         global $OUTPUT;
 
         $enabled = $row->plugininfo->is_enabled();
-        $params = [
-            'sesskey' => sesskey(),
-            'plugin' => $row->plugininfo->name,
-            'action' => $enabled ? 'disable' : 'enable',
-        ];
-
         if ($enabled) {
-            $icon = $OUTPUT->pix_icon('t/hide', get_string('disableplugin', 'core_admin', $row->plugininfo->displayname));
+            $labelstr = get_string('disableplugin', 'core_admin', $row->plugininfo->displayname);
         } else {
-            $icon = $OUTPUT->pix_icon('t/show', get_string('enableplugin', 'core_admin', $row->plugininfo->displayname));
+            $labelstr = get_string('enableplugin', 'core_admin', $row->plugininfo->displayname);
         }
 
-        return html_writer::link(
-            $this->get_action_url($params),
-            $icon,
-            [
-                'data-toggle-method' => $this->get_toggle_service(),
-                'data-action' => 'togglestate',
-                'data-plugin' => $row->plugin,
-                'data-state' => $enabled ? 1 : 0,
+        $params = [
+            'id' => 'admin-toggle-' . $row->plugininfo->name,
+            'checked' => $enabled,
+            'dataattributes' => [
+                'name' => 'id',
+                'value' => $row->plugininfo->name,
+                'toggle-method' => $this->get_toggle_service(),
+                'action' => 'togglestate',
+                'plugin' => $row->plugin,
+                'state' => $enabled ? 1 : 0,
             ],
-        );
+            'title' => $labelstr,
+            'label' => $labelstr,
+            'labelclasses' => 'sr-only',
+        ];
+
+        return $OUTPUT->render_from_template('core_admin/setting_configtoggle', $params);
     }
 
     protected function col_order(stdClass $row): string {
diff --git a/admin/templates/setting_configtoggle.mustache b/admin/templates/setting_configtoggle.mustache
new file mode 100644
index 0000000000000..3d2174c78e85a
--- /dev/null
+++ b/admin/templates/setting_configtoggle.mustache
@@ -0,0 +1,57 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template core_admin/setting_configtoggle
+
+    Template for toggle element in admin settings.
+
+    Context variables required for this template:
+    * id - element id
+    * checked - bool, true if the toggle is enabled
+    * name - form element name
+    * value - form for name field
+    * action - action to be performed when the toggle is clicked
+    * plugin - plugin name
+    * state - state of the toggle
+    * title - title of the toggle tooltip
+    * label - label of the toggle
+    * labelclasses - classes for the label (sr-only for screen readers)
+
+    Example context (json):
+    {
+        "id": "reality-toggle-3",
+        "checked": true,
+        "dataattributes": [{
+            "name": "id",
+            "value": "toggle-reality",
+            "action": "togglestate",
+            "plugin": "tool_reality",
+            "state": 1
+        }],
+        "title": "Title example",
+        "label": "Enable/disable reality",
+        "labelclasses": "sr-only"
+    }
+}}
+<div id="container-{{id}}"
+     data-toggle-method="{{dataattributes.toggle-method}}"
+     data-action="{{dataattributes.action}}"
+     data-plugin="{{dataattributes.plugin}}"
+     data-state="{{dataattributes.state}}">
+  {{> core/toggle }}
+</div>
+
diff --git a/admin/tests/behat/manage_blocks.feature b/admin/tests/behat/manage_blocks.feature
index 548a2993188c1..b337229454bda 100644
--- a/admin/tests/behat/manage_blocks.feature
+++ b/admin/tests/behat/manage_blocks.feature
@@ -8,26 +8,14 @@ Feature: An administrator can manage Block plugins
   Scenario: An administrator can control the enabled state of block plugins using JavaScript
     Given I am logged in as "admin"
     And I navigate to "Plugins > Blocks > Manage blocks" in site administration
-    When I click on "Disable Latest badges" "link"
-    Then I should see "Latest badges disabled."
-    And "Disable Latest badges" "link" should not exist
-    But "Enable Latest badges" "link" should exist
-    When I click on "Enable Latest badges" "link"
-    Then I should see "Latest badges enabled."
-    And "Enable Latest badges" "link" should not exist
-    But "Disable Latest badges" "link" should exist
-
-  Scenario: An administrator can control the enabled state of block plugins without JavaScript
-    Given I am logged in as "admin"
-    And I navigate to "Plugins > Blocks > Manage blocks" in site administration
-    When I click on "Disable Latest badges" "link"
-    Then I should see "Latest badges disabled."
-    And "Disable Latest badges" "link" should not exist
-    But "Enable Latest badges" "link" should exist
-    When I click on "Enable Latest badges" "link"
-    Then I should see "Latest badges enabled."
-    And "Enable Latest badges" "link" should not exist
-    But "Disable Latest badges" "link" should exist
+    When I toggle the "Disable Latest badges" admin switch "off"
+    And I should see "Latest badges disabled."
+    And I reload the page
+    Then I should see "Enable Latest badges"
+    And I toggle the "Enable Latest badges" admin switch "on"
+    And I should see "Latest badges enabled."
+    And I reload the page
+    Then I should see "Disable Latest badges"
 
   @javascript
   Scenario: An administrator can control the protected state of block plugins using JavaScript
diff --git a/admin/tests/behat/manage_media.feature b/admin/tests/behat/manage_media.feature
index 27ef3fd3b76de..71ea37a7f0d86 100644
--- a/admin/tests/behat/manage_media.feature
+++ b/admin/tests/behat/manage_media.feature
@@ -6,25 +6,14 @@ Feature: An administrator can manage Media plugins
 
   @javascript
   Scenario: An administrator can control the enabled state of media plugins using JavaScript
+    The state change should be reflected in the UI and persist across page reloads
     Given I am logged in as "admin"
     And I navigate to "Plugins > Media players > Manage media players" in site administration
-    When I click on "Disable YouTube" "link"
-    Then I should see "YouTube disabled."
-    And "Disable YouTube" "link" should not exist
-    But "Enable YouTube" "link" should exist
-    When I click on "Enable YouTube" "link"
-    Then I should see "YouTube enabled."
-    And "Enable YouTube" "link" should not exist
-    But "Disable YouTube" "link" should exist
-
-  Scenario: An administrator can control the enabled state of media plugins without JavaScript
-    Given I am logged in as "admin"
-    And I navigate to "Plugins > Media players > Manage media players" in site administration
-    When I click on "Disable YouTube" "link"
-    Then I should see "YouTube disabled."
-    And "Disable YouTube" "link" should not exist
-    But "Enable YouTube" "link" should exist
-    When I click on "Enable YouTube" "link"
-    Then I should see "YouTube enabled."
-    And "Enable YouTube" "link" should not exist
-    But "Disable YouTube" "link" should exist
+    When I toggle the "Disable YouTube" admin switch "off"
+    And I should see "YouTube disabled."
+    And I reload the page
+    Then I should see "Enable YouTube"
+    And I toggle the "Enable YouTube" admin switch "on"
+    And I should see "YouTube enabled."
+    And I reload the page
+    Then I should see "Disable YouTube"
diff --git a/admin/tool/admin_presets/tests/behat/apply_presets.feature b/admin/tool/admin_presets/tests/behat/apply_presets.feature
index d23231f51c008..09b02e79c4056 100644
--- a/admin/tool/admin_presets/tests/behat/apply_presets.feature
+++ b/admin/tool/admin_presets/tests/behat/apply_presets.feature
@@ -14,11 +14,11 @@ Feature: I can apply presets
   Scenario: Applying Starter Moodle preset changes status and settings
 #   Checking the settings before applying Full Moodle preset (we're only testing one of each type).
     Given I navigate to "Plugins > Activity modules > Manage activities" in site administration
-    And "Disable Database" "icon" should exist in the "Database" "table_row"
+    And I should see "Disable Database"
     And I navigate to "Plugins > Availability restrictions > Manage restrictions" in site administration
     And "Hide" "icon" should exist in the "Restriction by grouping" "table_row"
     And I navigate to "Plugins > Blocks > Manage blocks" in site administration
-    And "Disable Logged in user" "icon" should exist in the "Logged in user" "table_row"
+    And I should see "Disable Logged in user"
     And I navigate to "Plugins > Course formats > Manage course formats" in site administration
     And "Disable" "icon" should exist in the "Social" "table_row"
     And I navigate to "Plugins > Question behaviours > Manage question behaviours" in site administration
@@ -109,11 +109,11 @@ Feature: I can apply presets
     And the field "Enable badges" matches value "0"
     And the field "Enable competencies" matches value "0"
     And I navigate to "Plugins > Activity modules > Manage activities" in site administration
-    And "Disable Database" "icon" should not exist in the "Database" "table_row"
+    And I should see "Enable Database"
     And I navigate to "Plugins > Availability restrictions > Manage restrictions" in site administration
     And "Hide" "icon" should not exist in the "Restriction by grouping" "table_row"
     And I navigate to "Plugins > Blocks > Manage blocks" in site administration
-    And "Disable Logged in user" "icon" should not exist in the "Logged in user" "table_row"
+    And I should see "Enable Logged in user"
     And I navigate to "Plugins > Course formats > Manage course formats" in site administration
     And "Disable" "icon" should not exist in the "Social" "table_row"
     And I navigate to "Plugins > Question behaviours > Manage question behaviours" in site administration
diff --git a/admin/tool/admin_presets/tests/behat/revert_changes.feature b/admin/tool/admin_presets/tests/behat/revert_changes.feature
index f5e417ea7772d..c722743ac2ad2 100644
--- a/admin/tool/admin_presets/tests/behat/revert_changes.feature
+++ b/admin/tool/admin_presets/tests/behat/revert_changes.feature
@@ -20,7 +20,7 @@ Feature: I can revert changes after a load
     And the field "Enable badges" matches value "0"
     And the field "Enable competencies" matches value "0"
     And I navigate to "Plugins > Activity modules > Manage activities" in site administration
-    And "Disable Database" "icon" should not exist in the "Database" "table_row"
+    And I should see "Enable Database"
     And I navigate to "Plugins > Availability restrictions > Manage restrictions" in site administration
     And "Hide" "icon" should not exist in the "Restriction by grouping" "table_row"
     And I navigate to "Plugins > Blocks > Manage blocks" in site administration
@@ -39,11 +39,11 @@ Feature: I can revert changes after a load
     Then the field "Enable badges" matches value "1"
     And the field "Enable competencies" matches value "1"
     And I navigate to "Plugins > Activity modules > Manage activities" in site administration
-    And "Disable Database" "icon" should exist in the "Database" "table_row"
+    And I should see "Disable Database"
     And I navigate to "Plugins > Availability restrictions > Manage restrictions" in site administration
     And "Hide" "icon" should exist in the "Restriction by grouping" "table_row"
     And I navigate to "Plugins > Blocks > Manage blocks" in site administration
-    And "Disable Logged in user" "icon" should exist in the "Logged in user" "table_row"
+    And I should see "Disable Logged in user"
     And I navigate to "Plugins > Course formats > Manage course formats" in site administration
     And "Disable" "icon" should exist in the "Social" "table_row"
     And I navigate to "Plugins > Question behaviours > Manage question behaviours" in site administration
diff --git a/blocks/glossary_random/tests/behat/glossary_random_addblock.feature b/blocks/glossary_random/tests/behat/glossary_random_addblock.feature
index 204e500896dd9..3a295adf186f7 100644
--- a/blocks/glossary_random/tests/behat/glossary_random_addblock.feature
+++ b/blocks/glossary_random/tests/behat/glossary_random_addblock.feature
@@ -17,7 +17,7 @@ Feature: Add the glossary random block when main feature is enabled
 
   Scenario: The glossary random block cannot be added when glossary module is disabled
     Given I navigate to "Plugins > Activity modules > Manage activities" in site administration
-    And I click on "Disable Glossary" "icon" in the "Glossary" "table_row"
+    And I toggle the "Disable Glossary" admin switch "off"
     And I am on "Course 1" course homepage with editing mode on
     When I click on "Add a block" "link"
     Then I should not see "Random glossary entry"
diff --git a/blocks/glossary_random/tests/behat/glossary_random_addblock_disabled.feature b/blocks/glossary_random/tests/behat/glossary_random_addblock_disabled.feature
index 1df05238ba28c..b952ba11c618e 100644
--- a/blocks/glossary_random/tests/behat/glossary_random_addblock_disabled.feature
+++ b/blocks/glossary_random/tests/behat/glossary_random_addblock_disabled.feature
@@ -15,7 +15,7 @@ Feature: Add the glossary random block when main feature is disabled
   Scenario: The glossary random block is displayed even when glossary module is disabled
     When I log in as "admin"
     And I navigate to "Plugins > Activity modules > Manage activities" in site administration
-    And I click on "Disable Glossary" "icon" in the "Glossary" "table_row"
+    And I toggle the "Disable Glossary" admin switch "off"
     And I am on "Course 1" course homepage with editing mode on
     Then "Random glossary entry" "block" should exist
 
@@ -28,7 +28,7 @@ Feature: Add the glossary random block when main feature is disabled
     And I click on "Cancel" "button" in the "Delete block?" "dialogue"
     And "Random glossary entry" "block" should exist
     When I navigate to "Plugins > Activity modules > Manage activities" in site administration
-    And I click on "Disable Glossary" "icon" in the "Glossary" "table_row"
+    And I toggle the "Disable Glossary" admin switch "off"
     And I am on "Course 1" course homepage with editing mode on
     And I open the "Random glossary entry" blocks action menu
     And I click on "Delete Random glossary entry block" "link" in the "Random glossary entry" "block"
diff --git a/blocks/tag_youtube/tests/behat/configure_tag_youtube_block.feature b/blocks/tag_youtube/tests/behat/configure_tag_youtube_block.feature
index 1ff584bbc83a4..e646087e9c4cf 100644
--- a/blocks/tag_youtube/tests/behat/configure_tag_youtube_block.feature
+++ b/blocks/tag_youtube/tests/behat/configure_tag_youtube_block.feature
@@ -7,7 +7,7 @@ Feature: Adding and configuring YouTube block
   Background:
     Given I log in as "admin"
     And I navigate to "Plugins > Blocks > Manage blocks" in site administration
-    And I click on "Enable YouTube" "icon" in the "YouTube" "table_row"
+    And I toggle the "Enable YouTube" admin switch "on"
 
   @javascript
   Scenario: Category options are not available (except default) in the block settings if the YouTube API key is not set.
diff --git a/lib/editor/tiny/plugins/noautolink/tests/behat/noautolink.feature b/lib/editor/tiny/plugins/noautolink/tests/behat/noautolink.feature
index 4715d58da0326..bdb877316ced2 100644
--- a/lib/editor/tiny/plugins/noautolink/tests/behat/noautolink.feature
+++ b/lib/editor/tiny/plugins/noautolink/tests/behat/noautolink.feature
@@ -6,7 +6,7 @@ Feature: Tiny noautolink
   Scenario: Insert a link, add and remove the auto-link prevention
     Given I log in as "admin"
     And I navigate to "Plugins > Text editors > TinyMCE editor > General settings" in site administration
-    And I click on "Enable No auto-link" "link"
+    And I toggle the "Enable No auto-link" admin switch "on"
     When I open my profile in edit mode
     And I set the field "Description" to "<p>https://moodle.org</p>"
 
diff --git a/lib/editor/tiny/tests/behat/manage_subplugins.feature b/lib/editor/tiny/tests/behat/manage_subplugins.feature
index 6b0e0c030b93e..09448a88fa7fa 100644
--- a/lib/editor/tiny/tests/behat/manage_subplugins.feature
+++ b/lib/editor/tiny/tests/behat/manage_subplugins.feature
@@ -8,23 +8,11 @@ Feature: An administrator can manage TinyMCE subplugins
   Scenario: An administrator can control the enabled state of TinyMCE subplugins using JavaScript
     Given I am logged in as "admin"
     And I navigate to "Plugins > Text editors > TinyMCE editor > General settings" in site administration
-    When I click on "Disable Equation editor" "link"
-    Then I should see "Equation editor disabled."
-    And "Disable Equation editor" "link" should not exist
-    But "Enable Equation editor" "link" should exist
-    When I click on "Enable Equation editor" "link"
-    Then I should see "Equation editor enabled."
-    And "Enable Equation editor" "link" should not exist
-    But "Disable Equation editor" "link" should exist
-
-  Scenario: An administrator can control the enabled state of TinyMCE subplugins without JavaScript
-    Given I am logged in as "admin"
-    And I navigate to "Plugins > Text editors > TinyMCE editor > General settings" in site administration
-    When I click on "Disable Equation editor" "link"
-    Then I should see "Equation editor disabled."
-    And "Disable Equation editor" "link" should not exist
-    But "Enable Equation editor" "link" should exist
-    When I click on "Enable Equation editor" "link"
-    Then I should see "Equation editor enabled."
-    And "Enable Equation editor" "link" should not exist
-    But "Disable Equation editor" "link" should exist
+    When I toggle the "Disable Equation editor" admin switch "off"
+    And I should see "Equation editor disabled."
+    And I reload the page
+    Then I should see "Enable Equation editor"
+    And I toggle the "Enable Equation editor" admin switch "on"
+    And I should see "Equation editor enabled."
+    And I reload the page
+    Then I should see "Disable Equation editor"
diff --git a/lib/tests/behat/behat_general.php b/lib/tests/behat/behat_general.php
index fc001187fc5eb..5cf76c9e98357 100644
--- a/lib/tests/behat/behat_general.php
+++ b/lib/tests/behat/behat_general.php
@@ -2401,4 +2401,33 @@ public function the_page_title_should_contain(string $title): void {
             );
         }
     }
+
+    /**
+     * Toggles the specified admin switch.
+     *
+     * @When /^I toggle the "(?P<element_string>(?:[^"]|\\")*)" admin switch "(?P<state_string>on|off)"$/
+     * @param string $element Element we look for
+     * @param string $state The state of the switch
+     * @throws ElementNotFoundException Thrown by behat_base::find
+     */
+    public function i_toggle_admin_switch($element, $state) {
+        // First check we are running Javascript, otherwise explode.
+        if (!$this->running_javascript()) {
+            throw new \Behat\Mink\Exception\DriverException('Switches are only available with JavaScript enabled');
+        }
+
+        // Next check that the node is available.
+        $node = $this->get_selected_node('checkbox', $element);
+        $this->ensure_node_is_visible($node);
+
+        // Update the state of the switch.
+        $field = $node->getAttribute('id');
+        if ($state == "on") {
+            $this->execute('behat_forms::i_set_the_field_to', [$field, 1]);
+        } else if ($state == "off") {
+            $this->execute('behat_forms::i_set_the_field_to', [$field, 0]);
+        } else {
+            throw new \Behat\Mink\Exception\ExpectationException('Invalid state for switch: ' . $state, $this->getSession());
+        }
+    }
 }

From 0208b9cae28cc4f1d3b061d7838d9be0e924099b Mon Sep 17 00:00:00 2001
From: "tai.letan" <tlt84@open.ac.uk>
Date: Fri, 21 Jun 2024 09:22:17 +0700
Subject: [PATCH 036/119] MDL-81111 tiny_recordrtc: add 'Pause' button for
 recording A/V

---
 .../recordrtc/amd/build/base_recorder.min.js  |   2 +-
 .../amd/build/base_recorder.min.js.map        |   2 +-
 .../recordrtc/amd/build/options.min.js        |   4 +-
 .../recordrtc/amd/build/options.min.js.map    |   2 +-
 .../amd/build/screen_recorder.min.js          |   2 +-
 .../amd/build/screen_recorder.min.js.map      |   2 +-
 .../recordrtc/amd/src/base_recorder.js        | 164 ++++++++++++++++--
 .../tiny/plugins/recordrtc/amd/src/options.js |  14 ++
 .../recordrtc/amd/src/screen_recorder.js      |   4 +-
 .../plugins/recordrtc/classes/plugininfo.php  |   2 +
 .../recordrtc/lang/en/tiny_recordrtc.php      |   3 +
 .../tiny/plugins/recordrtc/settings.php       |  10 ++
 .../templates/audio_recorder.mustache         |   8 +-
 .../templates/screen_recorder.mustache        |   8 +-
 .../templates/video_recorder.mustache         |   8 +-
 lib/editor/tiny/plugins/recordrtc/version.php |   2 +-
 16 files changed, 210 insertions(+), 27 deletions(-)

diff --git a/lib/editor/tiny/plugins/recordrtc/amd/build/base_recorder.min.js b/lib/editor/tiny/plugins/recordrtc/amd/build/base_recorder.min.js
index 085863073762b..a08c57003f0d1 100644
--- a/lib/editor/tiny/plugins/recordrtc/amd/build/base_recorder.min.js
+++ b/lib/editor/tiny/plugins/recordrtc/amd/build/base_recorder.min.js
@@ -1,3 +1,3 @@
-define("tiny_recordrtc/base_recorder",["exports","core/str","./common","core/pending","./options","editor_tiny/uploader","core/toast","core/modal_events","core/templates","core/notification","core/prefetch","core/local/modal/alert"],(function(_exports,_str,_common,_pending,_options,_uploader,_toast,ModalEvents,Templates,_notification,_prefetch,_alert){function _getRequireWildcardCache(nodeInterop){if("function"!=typeof WeakMap)return null;var cacheBabelInterop=new WeakMap,cacheNodeInterop=new WeakMap;return(_getRequireWildcardCache=function(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop})(nodeInterop)}function _interopRequireWildcard(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule)return obj;if(null===obj||"object"!=typeof obj&&"function"!=typeof obj)return{default:obj};var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj))return cache.get(obj);var newObj={},hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj)if("default"!==key&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;desc&&(desc.get||desc.set)?Object.defineProperty(newObj,key,desc):newObj[key]=obj[key]}return newObj.default=obj,cache&&cache.set(obj,newObj),newObj}function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,_pending=_interopRequireDefault(_pending),_uploader=_interopRequireDefault(_uploader),ModalEvents=_interopRequireWildcard(ModalEvents),Templates=_interopRequireWildcard(Templates),_alert=_interopRequireDefault(_alert);return _exports.default=class{constructor(editor,modal){var obj,key,value;value=!1,(key="stopRequested")in(obj=this)?Object.defineProperty(obj,key,{value:value,enumerable:!0,configurable:!0,writable:!0}):obj[key]=value,this.ready=!1,this.checkAndWarnAboutBrowserCompatibility()&&(this.editor=editor,this.config=(0,_options.getData)(editor).params,this.modal=modal,this.modalRoot=modal.getRoot()[0],this.startStopButton=this.modalRoot.querySelector('button[data-action="startstop"]'),this.uploadButton=this.modalRoot.querySelector('button[data-action="upload"]'),this.setRecordButtonState(!1),this.player=this.configurePlayer(),this.registerEventListeners(),this.ready=!0,this.captureUserMedia(),this.prefetchContent())}isReady(){return this.ready}configurePlayer(){throw new Error("configurePlayer() must be implemented in ".concat(this.constructor.name))}getSupportedTypes(){throw new Error("getSupportedTypes() must be implemented in ".concat(this.constructor.name))}getRecordingOptions(){throw new Error("getRecordingOptions() must be implemented in ".concat(this.constructor.name))}getFileName(prefix){throw new Error("getFileName() must be implemented in ".concat(this.constructor.name))}getMediaConstraints(){throw new Error("getMediaConstraints() must be implemented in ".concat(this.constructor.name))}playOnCapture(){return!1}getTimeLimit(){throw new Error("getTimeLimit() must be implemented in ".concat(this.constructor.name))}getEmbedTemplateName(){throw new Error("getEmbedTemplateName() must be implemented in ".concat(this.constructor.name))}static getModalClass(){throw new Error("getModalClass() must be implemented in ".concat(this.constructor.name))}getParsedRecordingOptions(){const compatTypes=this.getSupportedTypes().reduce(((result,type)=>(result.push(type),result.push(type.replace("=",":")),result)),[]).filter((type=>window.MediaRecorder.isTypeSupported(type))),options=this.getRecordingOptions();return 0!==compatTypes.length&&(options.mimeType=compatTypes[0]),window.console.info("Selected codec ".concat(options.mimeType," from ").concat(compatTypes.length," options."),compatTypes),options}async captureUserMedia(){try{const stream=await navigator.mediaDevices.getUserMedia(this.getMediaConstraints());this.handleCaptureSuccess(stream)}catch(error){this.handleCaptureFailure(error)}}prefetchContent(){(0,_prefetch.prefetchStrings)(_common.component,["uploading","recordagain_title","recordagain_desc","discard_title","discard_desc","confirm_yes","recordinguploaded","maxfilesizehit","maxfilesizehit_title","uploadfailed"]),(0,_prefetch.prefetchTemplates)([this.getEmbedTemplateName(),"tiny_recordrtc/timeremaining"])}async displayAlert(title,content){const pendingPromise=new _pending.default("core/confirm:alert"),modal=await _alert.default.create({title:title,body:content,removeOnClose:!0});return modal.show(),pendingPromise.resolve(),modal}handleCaptureSuccess(stream){this.player.srcObject=stream,this.playOnCapture()&&(this.player.muted=!0,this.player.play()),this.stream=stream,this.setupPlayerSource(),this.setRecordButtonState(!0)}setupPlayerSource(){this.player.srcObject||(this.player.srcObject=this.stream,this.player.muted=!0,this.player.play())}setRecordButtonState(enabled){this.startStopButton.disabled=!enabled}setRecordButtonVisibility(visible){this.getButtonContainer("start-stop").classList.toggle("hide",!visible)}setUploadButtonState(enabled){this.uploadButton.disabled=!enabled}setUploadButtonVisibility(visible){this.getButtonContainer("upload").classList.toggle("hide",!visible)}handleCaptureFailure(error){var subject="gum".concat(error.name.replace("Error","").toLowerCase());this.displayAlert((0,_str.getString)("".concat(subject,"_title"),_common.component),(0,_str.getString)(subject,_common.component))}close(){this.modal.hide()}registerEventListeners(){this.modalRoot.addEventListener("click",this.handleModalClick.bind(this)),this.modal.getRoot().on(ModalEvents.outsideClick,this.outsideClickHandler.bind(this)),this.modal.getRoot().on(ModalEvents.hidden,(()=>{this.cleanupStream(),this.requestRecordingStop()}))}async outsideClickHandler(event){if(this.isRecording())event.preventDefault();else if(this.hasData()){event.preventDefault();try{await(0,_notification.saveCancelPromise)(await(0,_str.getString)("discard_title",_common.component),await(0,_str.getString)("discard_desc",_common.component),await(0,_str.getString)("confirm_yes",_common.component)),this.modal.hide()}catch(error){}}}handleModalClick(event){const button=event.target.closest("button");if(button&&button.dataset.action){const action=button.dataset.action;"startstop"===action&&this.handleRecordingStartStopRequested(),"upload"===action&&this.uploadRecording()}}handleRecordingStartStopRequested(){var _this$mediaRecorder;"recording"===(null===(_this$mediaRecorder=this.mediaRecorder)||void 0===_this$mediaRecorder?void 0:_this$mediaRecorder.state)?this.requestRecordingStop():this.startRecording()}async onMediaStopped(){var _this$getButtonContai;this.blob=new Blob(this.data.chunks,{type:this.mediaRecorder.mimeType}),this.player.srcObject=null,this.player.src=URL.createObjectURL(this.blob),this.setRecordButtonTextFromString("recordagain"),this.player.muted=!1,this.player.controls=!0,null===(_this$getButtonContai=this.getButtonContainer("player"))||void 0===_this$getButtonContai||_this$getButtonContai.classList.toggle("hide",!1),this.setUploadButtonVisibility(!0),this.setUploadButtonState(!0)}async uploadRecording(){if(0===this.data.chunks.length)return void this.displayAlert("norecordingfound");const fileName=this.getFileName((1e3*Math.random()).toString().replace(".",""));try{this.setRecordButtonVisibility(!1),this.setUploadButtonState(!1);const fileURL=await(0,_uploader.default)(this.editor,"media",this.blob,fileName,(progress=>{this.setUploadButtonTextProgress(progress)}));this.insertMedia(fileURL),this.close(),(0,_toast.add)(await(0,_str.getString)("recordinguploaded",_common.component))}catch(error){this.setUploadButtonState(!0),(0,_toast.add)(await(0,_str.getString)("uploadfailed",_common.component,{error:error}),{type:"error"})}}getButtonContainer(purpose){return this.modalRoot.querySelector('[data-purpose="'.concat(purpose,'-container"]'))}static isBrowserCompatible(){return this.checkSecure()&&this.hasUserMedia()}static async display(editor){const ModalClass=this.getModalClass(),modal=await ModalClass.create({templateContext:{},large:!0,removeOnClose:!0});return new this(editor,modal).isReady()&&modal.show(),modal}checkAndWarnAboutBrowserCompatibility(){return this.constructor.checkSecure()?!!this.constructor.hasUserMedia||((0,_str.getStrings)(["nowebrtc_title","nowebrtc"].map((key=>({key:key,component:_common.component})))).then((_ref2=>{let[title,message]=_ref2;return(0,_toast.add)(message,{title:title,type:"error"})})).catch(),!1):((0,_str.getStrings)(["insecurealert_title","insecurealert"].map((key=>({key:key,component:_common.component})))).then((_ref=>{let[title,message]=_ref;return(0,_toast.add)(message,{title:title,type:"error"})})).catch(),!1)}static hasUserMedia(){return navigator.mediaDevices&&window.MediaRecorder}static checkSecure(){return window.isSecureContext}async setStopRecordingButton(){const{html:html,js:js}=await Templates.renderForPromise("tiny_recordrtc/timeremaining",this.getTimeRemaining());Templates.replaceNodeContents(this.startStopButton,html,js),this.buttonTimer=setInterval(this.updateRecordButtonTime.bind(this),500)}updateRecordButtonTime(){const{remaining:remaining,minutes:minutes,seconds:seconds}=this.getTimeRemaining();remaining<0?this.requestRecordingStop():(this.startStopButton.querySelector('[data-type="minutes"]').textContent=minutes,this.startStopButton.querySelector('[data-type="seconds"]').textContent=seconds)}async setRecordButtonTextFromString(string){this.startStopButton.textContent=await(0,_str.getString)(string,_common.component)}async setUploadButtonTextProgress(progress){this.uploadButton.textContent=await(0,_str.getString)("uploading",_common.component,{progress:Math.round(100*progress)/100})}async resetUploadButtonText(){this.uploadButton.textContent=await(0,_str.getString)("upload",_common.component)}clearButtonTimer(){this.buttonTimer&&clearInterval(this.buttonTimer),this.buttonTimer=null}getTimeRemaining(){const now=(new Date).getTime(),remaining=Math.floor(this.getTimeLimit()-(now-this.startTime)/1e3),formatter=new Intl.NumberFormat(navigator.language,{minimumIntegerDigits:2}),seconds=formatter.format(remaining%60);return{remaining:remaining,minutes:formatter.format(Math.floor((remaining-seconds)/60)),seconds:seconds}}getMaxUploadSize(){return this.config.maxrecsize}requestRecordingStop(){this.mediaRecorder&&"inactive"!==this.mediaRecorder.state?this.stopRequested=!0:this.cleanupStream()}stopRecorder(){this.mediaRecorder.stop(),this.player.muted=!1}cleanupStream(){this.stream&&this.stream.getTracks().filter((track=>"ended"!==track.readyState)).forEach((track=>track.stop()))}handleStopped(){this.onMediaStopped(),this.clearButtonTimer()}handleStarted(){this.startTime=(new Date).getTime(),this.setStopRecordingButton()}handleDataAvailable(event){if(this.isRecording()){const newSize=this.data.blobSize+event.data.size;newSize>=this.getMaxUploadSize()?(this.stopRecorder(),this.displayFileLimitHitMessage()):(this.data.chunks.push(event.data),this.data.blobSize=newSize,this.stopRequested&&this.stopRecorder())}}async displayFileLimitHitMessage(){(0,_toast.add)(await(0,_str.getString)("maxfilesizehit",_common.component),{title:await(0,_str.getString)("maxfilesizehit_title",_common.component),type:"error"})}isRecording(){var _this$mediaRecorder2;return"recording"===(null===(_this$mediaRecorder2=this.mediaRecorder)||void 0===_this$mediaRecorder2?void 0:_this$mediaRecorder2.state)}hasData(){var _this$data;return!(null===(_this$data=this.data)||void 0===_this$data||!_this$data.blobSize)}async startRecording(){if(this.mediaRecorder){if(this.isRecording()&&this.mediaRecorder.stop(),this.hasData()){if(!await this.recordAgainConfirmation())return;this.setUploadButtonVisibility(!1),this.stream.active||await this.captureUserMedia()}this.mediaRecorder=null}this.mediaRecorder=new MediaRecorder(this.stream,this.getParsedRecordingOptions()),this.mediaRecorder.addEventListener("dataavailable",this.handleDataAvailable.bind(this)),this.mediaRecorder.addEventListener("stop",this.handleStopped.bind(this)),this.mediaRecorder.addEventListener("start",this.handleStarted.bind(this)),this.data={chunks:[],blobSize:0},this.setupPlayerSource(),this.stopRequested=!1,this.mediaRecorder.start(50)}async recordAgainConfirmation(){try{return await(0,_notification.saveCancelPromise)(await(0,_str.getString)("recordagain_title",_common.component),await(0,_str.getString)("recordagain_desc",_common.component),await(0,_str.getString)("confirm_yes",_common.component)),!0}catch{return!1}}async insertMedia(source){const{html:html}=await Templates.renderForPromise(this.getEmbedTemplateName(),this.getEmbedTemplateContext({source:source}));this.editor.insertContent(html)}getEmbedTemplateContext(templateContext){return templateContext}},_exports.default}));
+define("tiny_recordrtc/base_recorder",["exports","core/str","./common","core/pending","./options","editor_tiny/uploader","core/toast","core/modal_events","core/templates","core/notification","core/prefetch","core/local/modal/alert"],(function(_exports,_str,_common,_pending,_options,_uploader,_toast,ModalEvents,Templates,_notification,_prefetch,_alert){function _getRequireWildcardCache(nodeInterop){if("function"!=typeof WeakMap)return null;var cacheBabelInterop=new WeakMap,cacheNodeInterop=new WeakMap;return(_getRequireWildcardCache=function(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop})(nodeInterop)}function _interopRequireWildcard(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule)return obj;if(null===obj||"object"!=typeof obj&&"function"!=typeof obj)return{default:obj};var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj))return cache.get(obj);var newObj={},hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj)if("default"!==key&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;desc&&(desc.get||desc.set)?Object.defineProperty(newObj,key,desc):newObj[key]=obj[key]}return newObj.default=obj,cache&&cache.set(obj,newObj),newObj}function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _defineProperty(obj,key,value){return key in obj?Object.defineProperty(obj,key,{value:value,enumerable:!0,configurable:!0,writable:!0}):obj[key]=value,obj}Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,_pending=_interopRequireDefault(_pending),_uploader=_interopRequireDefault(_uploader),ModalEvents=_interopRequireWildcard(ModalEvents),Templates=_interopRequireWildcard(Templates),_alert=_interopRequireDefault(_alert);return _exports.default=class{constructor(editor,modal){_defineProperty(this,"stopRequested",!1),_defineProperty(this,"buttonTimer",null),_defineProperty(this,"pauseTime",null),_defineProperty(this,"startTime",null),this.ready=!1,this.checkAndWarnAboutBrowserCompatibility()&&(this.editor=editor,this.config=(0,_options.getData)(editor).params,this.modal=modal,this.modalRoot=modal.getRoot()[0],this.startStopButton=this.modalRoot.querySelector('button[data-action="startstop"]'),this.uploadButton=this.modalRoot.querySelector('button[data-action="upload"]'),this.pauseResumeButton=this.modalRoot.querySelector('button[data-action="pauseresume"]'),this.setRecordButtonState(!1),this.player=this.configurePlayer(),this.registerEventListeners(),this.ready=!0,this.captureUserMedia(),this.prefetchContent())}isReady(){return this.ready}configurePlayer(){throw new Error("configurePlayer() must be implemented in ".concat(this.constructor.name))}getSupportedTypes(){throw new Error("getSupportedTypes() must be implemented in ".concat(this.constructor.name))}getRecordingOptions(){throw new Error("getRecordingOptions() must be implemented in ".concat(this.constructor.name))}getFileName(prefix){throw new Error("getFileName() must be implemented in ".concat(this.constructor.name))}getMediaConstraints(){throw new Error("getMediaConstraints() must be implemented in ".concat(this.constructor.name))}playOnCapture(){return!1}getTimeLimit(){throw new Error("getTimeLimit() must be implemented in ".concat(this.constructor.name))}getEmbedTemplateName(){throw new Error("getEmbedTemplateName() must be implemented in ".concat(this.constructor.name))}static getModalClass(){throw new Error("getModalClass() must be implemented in ".concat(this.constructor.name))}getParsedRecordingOptions(){const compatTypes=this.getSupportedTypes().reduce(((result,type)=>(result.push(type),result.push(type.replace("=",":")),result)),[]).filter((type=>window.MediaRecorder.isTypeSupported(type))),options=this.getRecordingOptions();return 0!==compatTypes.length&&(options.mimeType=compatTypes[0]),window.console.info("Selected codec ".concat(options.mimeType," from ").concat(compatTypes.length," options."),compatTypes),options}async captureUserMedia(){try{const stream=await navigator.mediaDevices.getUserMedia(this.getMediaConstraints());this.handleCaptureSuccess(stream)}catch(error){this.handleCaptureFailure(error)}}prefetchContent(){(0,_prefetch.prefetchStrings)(_common.component,["uploading","recordagain_title","recordagain_desc","discard_title","discard_desc","confirm_yes","recordinguploaded","maxfilesizehit","maxfilesizehit_title","uploadfailed","pause","resume"]),(0,_prefetch.prefetchTemplates)([this.getEmbedTemplateName(),"tiny_recordrtc/timeremaining"])}async displayAlert(title,content){const pendingPromise=new _pending.default("core/confirm:alert"),modal=await _alert.default.create({title:title,body:content,removeOnClose:!0});return modal.show(),pendingPromise.resolve(),modal}handleCaptureSuccess(stream){this.player.srcObject=stream,this.playOnCapture()&&(this.player.muted=!0,this.player.play()),this.stream=stream,this.setupPlayerSource(),this.setRecordButtonState(!0)}setupPlayerSource(){this.player.srcObject||(this.player.srcObject=this.stream,this.player.muted=!0,this.player.play())}setRecordButtonState(enabled){this.startStopButton.disabled=!enabled}setRecordButtonVisibility(visible){this.getButtonContainer("start-stop").classList.toggle("hide",!visible)}setPauseButtonVisibility(visible){this.pauseResumeButton&&this.pauseResumeButton.classList.toggle("hidden",!visible)}setUploadButtonState(enabled){this.uploadButton.disabled=!enabled}setUploadButtonVisibility(visible){this.getButtonContainer("upload").classList.toggle("hide",!visible)}setPlayerState(state){var _this$getButtonContai;this.player.muted=!state,this.player.controls=state,null===(_this$getButtonContai=this.getButtonContainer("player"))||void 0===_this$getButtonContai||_this$getButtonContai.classList.toggle("hide",!state)}handleCaptureFailure(error){var subject="gum".concat(error.name.replace("Error","").toLowerCase());this.displayAlert((0,_str.getString)("".concat(subject,"_title"),_common.component),(0,_str.getString)(subject,_common.component))}close(){this.modal.hide()}registerEventListeners(){this.modalRoot.addEventListener("click",this.handleModalClick.bind(this)),this.modal.getRoot().on(ModalEvents.outsideClick,this.outsideClickHandler.bind(this)),this.modal.getRoot().on(ModalEvents.hidden,(()=>{this.cleanupStream(),this.requestRecordingStop()}))}async outsideClickHandler(event){if(this.isRecording()||this.isPaused())event.preventDefault();else if(this.hasData()){event.preventDefault();try{await(0,_notification.saveCancelPromise)(await(0,_str.getString)("discard_title",_common.component),await(0,_str.getString)("discard_desc",_common.component),await(0,_str.getString)("confirm_yes",_common.component)),this.modal.hide()}catch(error){}}}handleModalClick(event){const button=event.target.closest("button");if(button&&button.dataset.action){const action=button.dataset.action;"startstop"===action&&this.handleRecordingStartStopRequested(),"upload"===action&&this.uploadRecording(),"pauseresume"===action&&this.handleRecordingPauseResumeRequested()}}handleRecordingStartStopRequested(){this.isRecording()||this.isPaused()?this.requestRecordingStop():this.startRecording()}handleRecordingPauseResumeRequested(){this.isRecording()?this.mediaRecorder.pause():this.isPaused()&&this.mediaRecorder.resume()}async onMediaStopped(){this.blob=new Blob(this.data.chunks,{type:this.mediaRecorder.mimeType}),this.player.srcObject=null,this.player.src=URL.createObjectURL(this.blob),this.setRecordButtonTextFromString("recordagain"),this.setUploadButtonVisibility(!0),this.setPlayerState(!0),this.setUploadButtonState(!0),this.setPauseButtonVisibility(!1),"inactive"===this.mediaRecorder.state&&this.setPauseButtonTextFromString("pause")}async uploadRecording(){if(0===this.data.chunks.length)return void this.displayAlert("norecordingfound");const fileName=this.getFileName((1e3*Math.random()).toString().replace(".",""));try{this.setRecordButtonVisibility(!1),this.setUploadButtonState(!1);const fileURL=await(0,_uploader.default)(this.editor,"media",this.blob,fileName,(progress=>{this.setUploadButtonTextProgress(progress)}));this.insertMedia(fileURL),this.close(),(0,_toast.add)(await(0,_str.getString)("recordinguploaded",_common.component))}catch(error){this.setUploadButtonState(!0),(0,_toast.add)(await(0,_str.getString)("uploadfailed",_common.component,{error:error}),{type:"error"})}}getButtonContainer(purpose){return this.modalRoot.querySelector('[data-purpose="'.concat(purpose,'-container"]'))}static isBrowserCompatible(){return this.checkSecure()&&this.hasUserMedia()}static async display(editor){const ModalClass=this.getModalClass(),modal=await ModalClass.create({templateContext:{isallowedpausing:(0,_options.isPausingAllowed)(editor)},large:!0,removeOnClose:!0});return new this(editor,modal).isReady()&&modal.show(),modal}checkAndWarnAboutBrowserCompatibility(){return this.constructor.checkSecure()?!!this.constructor.hasUserMedia||((0,_str.getStrings)(["nowebrtc_title","nowebrtc"].map((key=>({key:key,component:_common.component})))).then((_ref2=>{let[title,message]=_ref2;return(0,_toast.add)(message,{title:title,type:"error"})})).catch(),!1):((0,_str.getStrings)(["insecurealert_title","insecurealert"].map((key=>({key:key,component:_common.component})))).then((_ref=>{let[title,message]=_ref;return(0,_toast.add)(message,{title:title,type:"error"})})).catch(),!1)}static hasUserMedia(){return navigator.mediaDevices&&window.MediaRecorder}static checkSecure(){return window.isSecureContext}async setStopRecordingButton(){const{html:html,js:js}=await Templates.renderForPromise("tiny_recordrtc/timeremaining",this.getTimeRemaining());Templates.replaceNodeContents(this.startStopButton,html,js),this.startButtonTimer()}updateRecordButtonTime(){const{remaining:remaining,minutes:minutes,seconds:seconds}=this.getTimeRemaining();remaining<0?this.requestRecordingStop():(this.startStopButton.querySelector('[data-type="minutes"]').textContent=minutes,this.startStopButton.querySelector('[data-type="seconds"]').textContent=seconds)}async setRecordButtonTextFromString(string){this.startStopButton.textContent=await(0,_str.getString)(string,_common.component)}async setPauseButtonTextFromString(string){this.pauseResumeButton&&(this.pauseResumeButton.textContent=await(0,_str.getString)(string,_common.component))}async setUploadButtonTextProgress(progress){this.uploadButton.textContent=await(0,_str.getString)("uploading",_common.component,{progress:Math.round(100*progress)/100})}async resetUploadButtonText(){this.uploadButton.textContent=await(0,_str.getString)("upload",_common.component)}clearButtonTimer(){this.buttonTimer&&clearInterval(this.buttonTimer),this.buttonTimer=null,this.pauseTime=null,this.startTime=null}pauseButtonTimer(){this.pauseTime=(new Date).getTime(),this.buttonTimer&&clearInterval(this.buttonTimer)}startButtonTimer(){if(null!==this.pauseTime){const pauseDuration=(new Date).getTime()-this.pauseTime;this.startTime+=pauseDuration,this.pauseTime=null}this.buttonTimer=setInterval(this.updateRecordButtonTime.bind(this),500)}getTimeRemaining(){let now=(new Date).getTime();null!==this.pauseTime&&(now=this.pauseTime);const remaining=Math.floor(this.getTimeLimit()-(now-this.startTime)/1e3),formatter=new Intl.NumberFormat(navigator.language,{minimumIntegerDigits:2}),seconds=formatter.format(remaining%60);return{remaining:remaining,minutes:formatter.format(Math.floor((remaining-seconds)/60)),seconds:seconds}}getMaxUploadSize(){return this.config.maxrecsize}requestRecordingStop(){this.mediaRecorder&&"inactive"!==this.mediaRecorder.state?(this.stopRequested=!0,this.isPaused()&&this.stopRecorder()):this.cleanupStream()}stopRecorder(){this.isPaused()&&(this.pauseTime=null),this.mediaRecorder.stop(),this.player.muted=!1}cleanupStream(){this.stream&&this.stream.getTracks().filter((track=>"ended"!==track.readyState)).forEach((track=>track.stop()))}handleStopped(){this.onMediaStopped(),this.clearButtonTimer()}handleStarted(){this.startTime=(new Date).getTime(),(0,_options.isPausingAllowed)(this.editor)&&!this.isPaused()&&this.setPauseButtonVisibility(!0),this.setStopRecordingButton()}handlePaused(){this.pauseButtonTimer(),this.setPauseButtonTextFromString("resume")}handleResume(){this.startButtonTimer(),this.setPauseButtonTextFromString("pause")}handleDataAvailable(event){if(this.isRecording()||this.isPaused()){const newSize=this.data.blobSize+event.data.size;newSize>=this.getMaxUploadSize()?(this.stopRecorder(),this.displayFileLimitHitMessage()):(this.data.chunks.push(event.data),this.data.blobSize=newSize,this.stopRequested&&this.stopRecorder())}}async displayFileLimitHitMessage(){(0,_toast.add)(await(0,_str.getString)("maxfilesizehit",_common.component),{title:await(0,_str.getString)("maxfilesizehit_title",_common.component),type:"error"})}isRecording(){var _this$mediaRecorder;return"recording"===(null===(_this$mediaRecorder=this.mediaRecorder)||void 0===_this$mediaRecorder?void 0:_this$mediaRecorder.state)}isPaused(){var _this$mediaRecorder2;return"paused"===(null===(_this$mediaRecorder2=this.mediaRecorder)||void 0===_this$mediaRecorder2?void 0:_this$mediaRecorder2.state)}hasData(){var _this$data;return!(null===(_this$data=this.data)||void 0===_this$data||!_this$data.blobSize)}async startRecording(){if(this.mediaRecorder){if((this.isRecording()||this.isPaused())&&this.mediaRecorder.stop(),this.hasData()){if(!await this.recordAgainConfirmation())return;this.setUploadButtonVisibility(!1),this.setPlayerState(!1),this.stream.active||await this.captureUserMedia()}this.mediaRecorder=null}this.mediaRecorder=new MediaRecorder(this.stream,this.getParsedRecordingOptions()),this.mediaRecorder.addEventListener("dataavailable",this.handleDataAvailable.bind(this)),this.mediaRecorder.addEventListener("stop",this.handleStopped.bind(this)),this.mediaRecorder.addEventListener("start",this.handleStarted.bind(this)),this.mediaRecorder.addEventListener("pause",this.handlePaused.bind(this)),this.mediaRecorder.addEventListener("resume",this.handleResume.bind(this)),this.data={chunks:[],blobSize:0},this.setupPlayerSource(),this.stopRequested=!1,this.mediaRecorder.start(50)}async recordAgainConfirmation(){try{return await(0,_notification.saveCancelPromise)(await(0,_str.getString)("recordagain_title",_common.component),await(0,_str.getString)("recordagain_desc",_common.component),await(0,_str.getString)("confirm_yes",_common.component)),!0}catch{return!1}}async insertMedia(source){const{html:html}=await Templates.renderForPromise(this.getEmbedTemplateName(),this.getEmbedTemplateContext({source:source}));this.editor.insertContent(html)}getEmbedTemplateContext(templateContext){return templateContext}},_exports.default}));
 
 //# sourceMappingURL=base_recorder.min.js.map
\ No newline at end of file
diff --git a/lib/editor/tiny/plugins/recordrtc/amd/build/base_recorder.min.js.map b/lib/editor/tiny/plugins/recordrtc/amd/build/base_recorder.min.js.map
index a9dbd3cebb052..9eb02d8395575 100644
--- a/lib/editor/tiny/plugins/recordrtc/amd/build/base_recorder.min.js.map
+++ b/lib/editor/tiny/plugins/recordrtc/amd/build/base_recorder.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"base_recorder.min.js","sources":["../src/base_recorder.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n//\n\n/**\n * Tiny Record RTC type.\n *\n * @module      tiny_recordrtc/base_recorder\n * @copyright   2022 Stevani Andolo <stevani@hotmail.com.au>\n * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport {getString, getStrings} from 'core/str';\nimport {component} from './common';\nimport Pending from 'core/pending';\nimport {getData} from './options';\nimport uploadFile from 'editor_tiny/uploader';\nimport {add as addToast} from 'core/toast';\nimport * as ModalEvents from 'core/modal_events';\nimport * as Templates from 'core/templates';\nimport {saveCancelPromise} from 'core/notification';\nimport {prefetchStrings, prefetchTemplates} from 'core/prefetch';\nimport AlertModal from 'core/local/modal/alert';\n\n/**\n * The RecordRTC base class for audio, video, and any other future types\n */\nexport default class {\n\n    stopRequested = false;\n\n    /**\n     * Constructor for the RecordRTC class\n     *\n     * @param {TinyMCE} editor The Editor to which the content will be inserted\n     * @param {Modal} modal The Moodle Modal that contains the interface used for recording\n     */\n    constructor(editor, modal) {\n        this.ready = false;\n\n        if (!this.checkAndWarnAboutBrowserCompatibility()) {\n            return;\n        }\n\n        this.editor = editor;\n        this.config = getData(editor).params;\n        this.modal = modal;\n        this.modalRoot = modal.getRoot()[0];\n        this.startStopButton = this.modalRoot.querySelector('button[data-action=\"startstop\"]');\n        this.uploadButton = this.modalRoot.querySelector('button[data-action=\"upload\"]');\n\n        // Disable the record button untilt he stream is acquired.\n        this.setRecordButtonState(false);\n\n        this.player = this.configurePlayer();\n        this.registerEventListeners();\n        this.ready = true;\n\n        this.captureUserMedia();\n        this.prefetchContent();\n    }\n\n    /**\n     * Check whether the browser is compatible.\n     *\n     * @returns {boolean}\n     */\n    isReady() {\n        return this.ready;\n    }\n\n    // Disable eslint's valid-jsdoc rule as the following methods are abstract and mnust be overridden by the child class.\n\n    /* eslint-disable valid-jsdoc, no-unused-vars */\n\n    /**\n     * Get the Player element for this type.\n     *\n     * @returns {HTMLElement} The player element, typically an audio or video tag.\n     */\n    configurePlayer() {\n        throw new Error(`configurePlayer() must be implemented in ${this.constructor.name}`);\n    }\n\n    /**\n     * Get the list of supported mimetypes for this recorder.\n     * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/MediaRecorder/isTypeSupported}\n     *\n     * @returns {string[]} The list of supported mimetypes.\n     */\n    getSupportedTypes() {\n        throw new Error(`getSupportedTypes() must be implemented in ${this.constructor.name}`);\n    }\n\n    /**\n     * Get any recording options passed into the MediaRecorder.\n     * Please note that the mimeType will be fetched from {@link getSupportedTypes()}.\n     *\n     * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/MediaRecorder/MediaRecorder#options}\n     * @returns {Object}\n     */\n    getRecordingOptions() {\n        throw new Error(`getRecordingOptions() must be implemented in ${this.constructor.name}`);\n    }\n\n    /**\n     * Get a filename for the generated file.\n     *\n     * Typically this function will take a prefix and add a type-specific suffix such as the extension to it.\n     *\n     * @param {string} prefix The prefix for the filename generated by the recorder.\n     * @returns {string}\n     */\n    getFileName(prefix) {\n        throw new Error(`getFileName() must be implemented in ${this.constructor.name}`);\n    }\n\n    /**\n     * Get a list of constraints as required by the getUserMedia() function.\n     * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/getUserMedia#constraints}\n     *\n     * @returns {Object}\n     */\n    getMediaConstraints() {\n        throw new Error(`getMediaConstraints() must be implemented in ${this.constructor.name}`);\n    }\n\n    /**\n     * Whether to start playing the recording as it is captured.\n     * @returns {boolean} Whether to start playing the recording as it is captured.\n     */\n    playOnCapture() {\n        return false;\n    }\n\n    /**\n     * Get the time limit for this recording type.\n     *\n     * @returns {number} The time limit in seconds.\n     */\n    getTimeLimit() {\n        throw new Error(`getTimeLimit() must be implemented in ${this.constructor.name}`);\n    }\n\n    /**\n     * Get the name of the template used when embedding the URL in the editor content.\n     *\n     * @returns {string}\n     */\n    getEmbedTemplateName() {\n        throw new Error(`getEmbedTemplateName() must be implemented in ${this.constructor.name}`);\n    }\n\n    /**\n     * Fetch the Class of the Modal to be displayed.\n     *\n     * @returns {Modal}\n     */\n    static getModalClass() {\n        throw new Error(`getModalClass() must be implemented in ${this.constructor.name}`);\n    }\n\n    /* eslint-enable valid-jsdoc, no-unused-vars */\n\n    /**\n     * Get the options for the MediaRecorder.\n     *\n     * @returns {object} The options for the MediaRecorder instance.\n     */\n    getParsedRecordingOptions() {\n        const requestedTypes = this.getSupportedTypes();\n        const possibleTypes = requestedTypes.reduce((result, type) => {\n            result.push(type);\n            // Safari seems to use codecs: instead of codecs=.\n            // It is safe to add both, so we do, but we want them to remain in order.\n            result.push(type.replace('=', ':'));\n            return result;\n        }, []);\n\n        const compatTypes = possibleTypes.filter((type) => window.MediaRecorder.isTypeSupported(type));\n\n        const options = this.getRecordingOptions();\n        if (compatTypes.length !== 0) {\n            options.mimeType = compatTypes[0];\n        }\n        window.console.info(\n            `Selected codec ${options.mimeType} from ${compatTypes.length} options.`,\n            compatTypes,\n        );\n\n        return options;\n    }\n\n    /**\n     * Start capturing the User Media and handle success or failure of the capture.\n     */\n    async captureUserMedia() {\n        try {\n            const stream = await navigator.mediaDevices.getUserMedia(this.getMediaConstraints());\n            this.handleCaptureSuccess(stream);\n        } catch (error) {\n            this.handleCaptureFailure(error);\n        }\n    }\n\n    /**\n     * Prefetch some of the content that will be used in the UI.\n     *\n     * Note: not all of the strings used are pre-fetched.\n     * Some of the strings will be fetched because their template is used.\n     */\n    prefetchContent() {\n        prefetchStrings(component, [\n            'uploading',\n            'recordagain_title',\n            'recordagain_desc',\n            'discard_title',\n            'discard_desc',\n            'confirm_yes',\n            'recordinguploaded',\n            'maxfilesizehit',\n            'maxfilesizehit_title',\n            'uploadfailed',\n        ]);\n\n        prefetchTemplates([\n            this.getEmbedTemplateName(),\n            'tiny_recordrtc/timeremaining',\n        ]);\n    }\n\n    /**\n     * Display an error message to the user.\n     *\n     * @param {Promise<string>} title The error title\n     * @param {Promise<string>} content The error message\n     * @returns {Promise<Modal>}\n     */\n    async displayAlert(title, content) {\n        const pendingPromise = new Pending('core/confirm:alert');\n        const modal = await AlertModal.create({\n            title: title,\n            body: content,\n            removeOnClose: true,\n        });\n\n        modal.show();\n        pendingPromise.resolve();\n\n        return modal;\n    }\n\n    /**\n     * Handle successful capture of the User Media.\n     *\n     * @param {MediaStream} stream The stream as captured by the User Media.\n     */\n    handleCaptureSuccess(stream) {\n        // Set audio player source to microphone stream.\n        this.player.srcObject = stream;\n\n        if (this.playOnCapture()) {\n            // Mute audio, distracting while recording.\n            this.player.muted = true;\n\n            this.player.play();\n        }\n\n        this.stream = stream;\n        this.setupPlayerSource();\n        this.setRecordButtonState(true);\n    }\n\n    /**\n     * Setup the player to use the stream as a source.\n     */\n    setupPlayerSource() {\n        if (!this.player.srcObject) {\n            this.player.srcObject = this.stream;\n\n            // Mute audio, distracting while recording.\n            this.player.muted = true;\n\n            this.player.play();\n        }\n    }\n\n    /**\n     * Enable the record button.\n     *\n     * @param {boolean|null} enabled Set the button state\n     */\n    setRecordButtonState(enabled) {\n        this.startStopButton.disabled = !enabled;\n    }\n\n    /**\n     * Configure button visibility for the record button.\n     *\n     * @param {boolean} visible Set the visibility of the button.\n     */\n    setRecordButtonVisibility(visible) {\n        const container = this.getButtonContainer('start-stop');\n        container.classList.toggle('hide', !visible);\n    }\n\n    /**\n     * Enable the upload button.\n     *\n     * @param {boolean|null} enabled Set the button state\n     */\n    setUploadButtonState(enabled) {\n        this.uploadButton.disabled = !enabled;\n    }\n\n    /**\n     * Configure button visibility for the upload button.\n     *\n     * @param {boolean} visible Set the visibility of the button.\n     */\n    setUploadButtonVisibility(visible) {\n        const container = this.getButtonContainer('upload');\n        container.classList.toggle('hide', !visible);\n    }\n    /**\n     * Handle failure to capture the User Media.\n     *\n     * @param {Error} error\n     */\n    handleCaptureFailure(error) {\n        // Changes 'CertainError' -> 'gumcertain' to match language string names.\n        var subject = `gum${error.name.replace('Error', '').toLowerCase()}`;\n        this.displayAlert(\n            getString(`${subject}_title`, component),\n            getString(subject, component)\n        );\n    }\n\n    /**\n     * Close the modal and stop recording.\n     */\n    close() {\n        // Closing the modal will destroy it and remove it from the DOM.\n        // It will also stop the recording via the hidden Modal Event.\n        this.modal.hide();\n    }\n\n    /**\n     * Register event listeners for the modal.\n     */\n    registerEventListeners() {\n        this.modalRoot.addEventListener('click', this.handleModalClick.bind(this));\n        this.modal.getRoot().on(ModalEvents.outsideClick, this.outsideClickHandler.bind(this));\n        this.modal.getRoot().on(ModalEvents.hidden, () => {\n            this.cleanupStream();\n            this.requestRecordingStop();\n        });\n    }\n\n    /**\n     * Prevent the Modal from closing when recording is on process.\n     *\n     * @param {MouseEvent} event The click event\n     */\n    async outsideClickHandler(event) {\n        if (this.isRecording()) {\n            // The user is recording.\n            // Do not distract with a confirmation, just prevent closing.\n            event.preventDefault();\n        } else if (this.hasData()) {\n            // If there is a blobsize then there is data that may be lost.\n            // Ask the user to confirm they want to close the modal.\n            // We prevent default here, and then close the modal if they confirm.\n            event.preventDefault();\n\n            try {\n                await saveCancelPromise(\n                    await getString(\"discard_title\", component),\n                    await getString(\"discard_desc\", component),\n                    await getString(\"confirm_yes\", component),\n                );\n                this.modal.hide();\n            } catch (error) {\n                // Do nothing, the modal will not close.\n            }\n        }\n    }\n\n    /**\n     * Handle a click within the Modal.\n     *\n     * @param {MouseEvent} event The click event\n     */\n    handleModalClick(event) {\n        const button = event.target.closest('button');\n        if (button && button.dataset.action) {\n            const action = button.dataset.action;\n            if (action === 'startstop') {\n                this.handleRecordingStartStopRequested();\n            }\n\n            if (action === 'upload') {\n                this.uploadRecording();\n            }\n        }\n    }\n\n    /**\n     * Handle the click event for the recording start/stop button.\n     */\n    handleRecordingStartStopRequested() {\n        if (this.mediaRecorder?.state === 'recording') {\n            this.requestRecordingStop();\n        } else {\n            this.startRecording();\n        }\n    }\n\n    /**\n     * Handle the media stream after it has finished.\n     */\n    async onMediaStopped() {\n        // Set source of audio player.\n        this.blob = new Blob(this.data.chunks, {\n            type: this.mediaRecorder.mimeType\n        });\n        this.player.srcObject = null;\n        this.player.src = URL.createObjectURL(this.blob);\n\n        // Change the label to \"Record again\".\n        this.setRecordButtonTextFromString('recordagain');\n\n        // Show audio player with controls enabled, and unmute.\n        this.player.muted = false;\n        this.player.controls = true;\n        this.getButtonContainer('player')?.classList.toggle('hide', false);\n\n        // Show upload button.\n        this.setUploadButtonVisibility(true);\n        this.setUploadButtonState(true);\n    }\n\n    /**\n     * Upload the recording and insert it into the editor content.\n     */\n    async uploadRecording() {\n        // Trigger error if no recording has been made.\n        if (this.data.chunks.length === 0) {\n            this.displayAlert('norecordingfound');\n            return;\n        }\n\n        const fileName = this.getFileName((Math.random() * 1000).toString().replace('.', ''));\n\n        // Upload recording to server.\n        try {\n            // Once uploading starts, do not allow any further changes to the recording.\n            this.setRecordButtonVisibility(false);\n\n            // Disable the upload button.\n            this.setUploadButtonState(false);\n\n            // Upload the recording.\n            const fileURL = await uploadFile(this.editor, 'media', this.blob, fileName, (progress) => {\n                this.setUploadButtonTextProgress(progress);\n            });\n            this.insertMedia(fileURL);\n            this.close();\n            addToast(await getString('recordinguploaded', component));\n        } catch (error) {\n            // Show a toast and unhide the button.\n            this.setUploadButtonState(true);\n\n            addToast(await getString('uploadfailed', component, {error}), {\n                type: 'error',\n            });\n\n        }\n    }\n\n    /**\n     * Helper to get the container that a button is in.\n     *\n     * @param {string} purpose The button purpose\n     * @returns {HTMLElement}\n     */\n    getButtonContainer(purpose) {\n        return this.modalRoot.querySelector(`[data-purpose=\"${purpose}-container\"]`);\n    }\n\n    /**\n     * Check whether the browser is compatible with capturing media.\n     *\n     * @returns {boolean}\n     */\n    static isBrowserCompatible() {\n        return this.checkSecure() && this.hasUserMedia();\n    }\n\n    static async display(editor) {\n        const ModalClass = this.getModalClass();\n        const modal = await ModalClass.create({\n            templateContext: {},\n            large: true,\n            removeOnClose: true,\n        });\n\n        // Set up the VideoRecorder.\n        const recorder = new this(editor, modal);\n        if (recorder.isReady()) {\n            modal.show();\n        }\n        return modal;\n    }\n\n    /**\n     * Check whether the browser is compatible with capturing media, and display a warning if not.\n     *\n     * @returns {boolean}\n     */\n    checkAndWarnAboutBrowserCompatibility() {\n        if (!this.constructor.checkSecure()) {\n            getStrings(['insecurealert_title', 'insecurealert'].map((key) => ({key, component})))\n                .then(([title, message]) => addToast(message, {title, type: 'error'}))\n                .catch();\n            return false;\n        }\n\n        if (!this.constructor.hasUserMedia) {\n            getStrings(['nowebrtc_title', 'nowebrtc'].map((key) => ({key, component})))\n                .then(([title, message]) => addToast(message, {title, type: 'error'}))\n                .catch();\n            return false;\n        }\n\n        return true;\n    }\n\n    /**\n     * Check whether the browser supports WebRTC.\n     *\n     * @returns {boolean}\n     */\n    static hasUserMedia() {\n        return (navigator.mediaDevices && window.MediaRecorder);\n    }\n\n    /**\n     * Check whether the hostname is either hosted over SSL, or from a valid localhost hostname.\n     *\n     * The UserMedia API can only be used in secure contexts as noted.\n     * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/getUserMedia#privacy_and_security}\n     *\n     * @returns {boolean} Whether the plugin can be loaded.\n     */\n    static checkSecure() {\n        // Note: We can now use window.isSecureContext.\n        // https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts#feature_detection\n        // https://developer.mozilla.org/en-US/docs/Web/API/isSecureContext\n        return window.isSecureContext;\n    }\n\n    /**\n     * Update the content of the stop recording button timer.\n     */\n    async setStopRecordingButton() {\n        const {html, js} = await Templates.renderForPromise('tiny_recordrtc/timeremaining', this.getTimeRemaining());\n        Templates.replaceNodeContents(this.startStopButton, html, js);\n        this.buttonTimer = setInterval(this.updateRecordButtonTime.bind(this), 500);\n    }\n\n    /**\n     * Update the time on the stop recording button.\n     */\n    updateRecordButtonTime() {\n        const {remaining, minutes, seconds} = this.getTimeRemaining();\n        if (remaining < 0) {\n            this.requestRecordingStop();\n        } else {\n            this.startStopButton.querySelector('[data-type=\"minutes\"]').textContent = minutes;\n            this.startStopButton.querySelector('[data-type=\"seconds\"]').textContent = seconds;\n        }\n    }\n\n    /**\n     * Set the text of the record button using a language string.\n     *\n     * @param {string} string The string identifier\n     */\n    async setRecordButtonTextFromString(string) {\n        this.startStopButton.textContent = await getString(string, component);\n    }\n\n    /**\n     * Set the upload button text progress.\n     *\n     * @param {number} progress The progress\n     */\n    async setUploadButtonTextProgress(progress) {\n        this.uploadButton.textContent = await getString('uploading', component, {\n            progress: Math.round(progress * 100) / 100,\n        });\n    }\n\n    async resetUploadButtonText() {\n        this.uploadButton.textContent = await getString('upload', component);\n    }\n\n    /**\n     * Clear the timer for the stop recording button.\n     */\n    clearButtonTimer() {\n        if (this.buttonTimer) {\n            clearInterval(this.buttonTimer);\n        }\n        this.buttonTimer = null;\n    }\n\n    /**\n     * Get the time remaining for the recording.\n     *\n     * @returns {Object} The minutes and seconds remaining.\n     */\n    getTimeRemaining() {\n        // All times are in milliseconds\n        const now = new Date().getTime();\n        const remaining = Math.floor(this.getTimeLimit() - ((now - this.startTime) / 1000));\n\n        const formatter = new Intl.NumberFormat(navigator.language, {minimumIntegerDigits: 2});\n        const seconds = formatter.format(remaining % 60);\n        const minutes = formatter.format(Math.floor((remaining - seconds) / 60));\n        return {\n            remaining,\n            minutes,\n            seconds,\n        };\n    }\n\n    /**\n     * Get the maximum file size that can be uploaded.\n     *\n     * @returns {number} The max byte size\n     */\n    getMaxUploadSize() {\n        return this.config.maxrecsize;\n    }\n\n    /**\n     * Stop the recording.\n     * Please note that this should only stop the recording.\n     * Anything related to processing the recording should be handled by the\n     * mediaRecorder's stopped event handler which is processed after it has stopped.\n     */\n    requestRecordingStop() {\n        if (this.mediaRecorder && this.mediaRecorder.state !== 'inactive') {\n            this.stopRequested = true;\n        } else {\n            // There is no recording to stop, but the stream must still be cleaned up.\n            this.cleanupStream();\n        }\n    }\n\n    stopRecorder() {\n        this.mediaRecorder.stop();\n\n        // Unmute the player so that the audio is heard during playback.\n        this.player.muted = false;\n    }\n\n    /**\n     * Clean up the stream.\n     *\n     * This involves stopping any track which is still active.\n     */\n    cleanupStream() {\n        if (this.stream) {\n            this.stream.getTracks()\n                .filter((track) => track.readyState !== 'ended')\n                .forEach((track) => track.stop());\n        }\n    }\n\n    /**\n     * Handle the mediaRecorder `stop` event.\n     */\n    handleStopped() {\n        // Handle the stream data.\n        this.onMediaStopped();\n\n        // Clear the button timer.\n        this.clearButtonTimer();\n    }\n\n    /**\n     * Handle the mediaRecorder `start` event.\n     *\n     * This event is called when the recording starts.\n     */\n    handleStarted() {\n        this.startTime = new Date().getTime();\n        this.setStopRecordingButton();\n    }\n\n    /**\n     * Handle the mediaRecorder `dataavailable` event.\n     *\n     * @param {Event} event\n     */\n    handleDataAvailable(event) {\n        if (this.isRecording()) {\n            const newSize = this.data.blobSize + event.data.size;\n            // Recording stops when either the maximum upload size is reached, or the time limit expires.\n            // The time limit is checked in the `updateButtonTime` function.\n            if (newSize >= this.getMaxUploadSize()) {\n                this.stopRecorder();\n                this.displayFileLimitHitMessage();\n            } else {\n                // Push recording slice to array.\n                this.data.chunks.push(event.data);\n\n                // Size of all recorded data so far.\n                this.data.blobSize = newSize;\n\n                if (this.stopRequested) {\n                    this.stopRecorder();\n                }\n            }\n        }\n    }\n\n    async displayFileLimitHitMessage() {\n        addToast(await getString('maxfilesizehit', component), {\n            title: await getString('maxfilesizehit_title', component),\n            type: 'error',\n        });\n    }\n\n    /**\n     * Check whether the recording is in progress.\n     *\n     * @returns {boolean}\n     */\n    isRecording() {\n        return this.mediaRecorder?.state === 'recording';\n    }\n\n    /**\n     * Whether any data has been recorded.\n     *\n     * @returns {boolean}\n     */\n    hasData() {\n        return !!this.data?.blobSize;\n    }\n\n    /**\n     * Start the recording\n     */\n    async startRecording() {\n        if (this.mediaRecorder) {\n            // Stop the existing recorder if it exists.\n            if (this.isRecording()) {\n                this.mediaRecorder.stop();\n            }\n\n            if (this.hasData()) {\n                const resetRecording = await this.recordAgainConfirmation();\n                if (!resetRecording) {\n                    // User cancelled at the confirmation to reset the data, so exit early.\n                    return;\n                }\n                this.setUploadButtonVisibility(false);\n                if (!this.stream.active) {\n                    await this.captureUserMedia();\n                }\n            }\n\n            this.mediaRecorder = null;\n        }\n\n        // The options for the recording codecs and bitrates.\n        this.mediaRecorder = new MediaRecorder(this.stream, this.getParsedRecordingOptions());\n\n        this.mediaRecorder.addEventListener('dataavailable', this.handleDataAvailable.bind(this));\n        this.mediaRecorder.addEventListener('stop', this.handleStopped.bind(this));\n        this.mediaRecorder.addEventListener('start', this.handleStarted.bind(this));\n\n        this.data = {\n            chunks: [],\n            blobSize: 0\n        };\n        this.setupPlayerSource();\n        this.stopRequested = false;\n\n        // Capture in 50ms chunks.\n        this.mediaRecorder.start(50);\n    }\n\n    /**\n     * Confirm whether the user wants to reset the existing recoring.\n     *\n     * @returns {Promise<boolean>} Whether the user confirmed the reset.\n     */\n    async recordAgainConfirmation() {\n        try {\n            await saveCancelPromise(\n                await getString(\"recordagain_title\", component),\n                await getString(\"recordagain_desc\", component),\n                await getString(\"confirm_yes\", component)\n            );\n            return true;\n        } catch {\n            return false;\n        }\n    }\n\n    /**\n     * Insert the HTML to embed the recording into the editor content.\n     *\n     * @param {string} source The URL to view the media.\n     */\n    async insertMedia(source) {\n        const {html} = await Templates.renderForPromise(\n            this.getEmbedTemplateName(),\n            this.getEmbedTemplateContext({\n                source,\n            })\n        );\n        this.editor.insertContent(html);\n    }\n\n    /**\n     * Add or modify the template parameters for the specified type.\n     *\n     * @param {Object} templateContext The Tempalte context to use\n     * @returns {Object} The finalised template context\n     */\n    getEmbedTemplateContext(templateContext) {\n        return templateContext;\n    }\n}\n"],"names":["constructor","editor","modal","ready","this","checkAndWarnAboutBrowserCompatibility","config","params","modalRoot","getRoot","startStopButton","querySelector","uploadButton","setRecordButtonState","player","configurePlayer","registerEventListeners","captureUserMedia","prefetchContent","isReady","Error","name","getSupportedTypes","getRecordingOptions","getFileName","prefix","getMediaConstraints","playOnCapture","getTimeLimit","getEmbedTemplateName","getParsedRecordingOptions","compatTypes","reduce","result","type","push","replace","filter","window","MediaRecorder","isTypeSupported","options","length","mimeType","console","info","stream","navigator","mediaDevices","getUserMedia","handleCaptureSuccess","error","handleCaptureFailure","component","title","content","pendingPromise","Pending","AlertModal","create","body","removeOnClose","show","resolve","srcObject","muted","play","setupPlayerSource","enabled","disabled","setRecordButtonVisibility","visible","getButtonContainer","classList","toggle","setUploadButtonState","setUploadButtonVisibility","subject","toLowerCase","displayAlert","close","hide","addEventListener","handleModalClick","bind","on","ModalEvents","outsideClick","outsideClickHandler","hidden","cleanupStream","requestRecordingStop","event","isRecording","preventDefault","hasData","button","target","closest","dataset","action","handleRecordingStartStopRequested","uploadRecording","mediaRecorder","state","startRecording","blob","Blob","data","chunks","src","URL","createObjectURL","setRecordButtonTextFromString","controls","fileName","Math","random","toString","fileURL","progress","setUploadButtonTextProgress","insertMedia","purpose","checkSecure","hasUserMedia","ModalClass","getModalClass","templateContext","large","map","key","then","_ref2","message","catch","_ref","isSecureContext","html","js","Templates","renderForPromise","getTimeRemaining","replaceNodeContents","buttonTimer","setInterval","updateRecordButtonTime","remaining","minutes","seconds","textContent","string","round","clearButtonTimer","clearInterval","now","Date","getTime","floor","startTime","formatter","Intl","NumberFormat","language","minimumIntegerDigits","format","getMaxUploadSize","maxrecsize","stopRequested","stopRecorder","stop","getTracks","track","readyState","forEach","handleStopped","onMediaStopped","handleStarted","setStopRecordingButton","handleDataAvailable","newSize","blobSize","size","displayFileLimitHitMessage","_this$data","recordAgainConfirmation","active","start","source","getEmbedTemplateContext","insertContent"],"mappings":"mrDAiDIA,YAAYC,OAAQC,gCARJ,+IASPC,OAAQ,EAERC,KAAKC,+CAILJ,OAASA,YACTK,QAAS,oBAAQL,QAAQM,YACzBL,MAAQA,WACRM,UAAYN,MAAMO,UAAU,QAC5BC,gBAAkBN,KAAKI,UAAUG,cAAc,wCAC/CC,aAAeR,KAAKI,UAAUG,cAAc,qCAG5CE,sBAAqB,QAErBC,OAASV,KAAKW,uBACdC,8BACAb,OAAQ,OAERc,wBACAC,mBAQTC,iBACWf,KAAKD,MAYhBY,wBACU,IAAIK,yDAAkDhB,KAAKJ,YAAYqB,OASjFC,0BACU,IAAIF,2DAAoDhB,KAAKJ,YAAYqB,OAUnFE,4BACU,IAAIH,6DAAsDhB,KAAKJ,YAAYqB,OAWrFG,YAAYC,cACF,IAAIL,qDAA8ChB,KAAKJ,YAAYqB,OAS7EK,4BACU,IAAIN,6DAAsDhB,KAAKJ,YAAYqB,OAOrFM,uBACW,EAQXC,qBACU,IAAIR,sDAA+ChB,KAAKJ,YAAYqB,OAQ9EQ,6BACU,IAAIT,8DAAuDhB,KAAKJ,YAAYqB,oCAS5E,IAAID,uDAAgDhB,KAAKJ,YAAYqB,OAU/ES,kCAUUC,YATiB3B,KAAKkB,oBACSU,QAAO,CAACC,OAAQC,QACjDD,OAAOE,KAAKD,MAGZD,OAAOE,KAAKD,KAAKE,QAAQ,IAAK,MACvBH,SACR,IAE+BI,QAAQH,MAASI,OAAOC,cAAcC,gBAAgBN,QAElFO,QAAUrC,KAAKmB,6BACM,IAAvBQ,YAAYW,SACZD,QAAQE,SAAWZ,YAAY,IAEnCO,OAAOM,QAAQC,8BACOJ,QAAQE,0BAAiBZ,YAAYW,oBACvDX,aAGGU,2CAQGK,aAAeC,UAAUC,aAAaC,aAAa7C,KAAKsB,4BACzDwB,qBAAqBJ,QAC5B,MAAOK,YACAC,qBAAqBD,QAUlCjC,gDACoBmC,kBAAW,CACvB,YACA,oBACA,mBACA,gBACA,eACA,cACA,oBACA,iBACA,uBACA,iDAGc,CACdjD,KAAKyB,uBACL,oDAWWyB,MAAOC,eAChBC,eAAiB,IAAIC,iBAAQ,sBAC7BvD,YAAcwD,eAAWC,OAAO,CAClCL,MAAOA,MACPM,KAAML,QACNM,eAAe,WAGnB3D,MAAM4D,OACNN,eAAeO,UAER7D,MAQXgD,qBAAqBJ,aAEZhC,OAAOkD,UAAYlB,OAEpB1C,KAAKuB,uBAEAb,OAAOmD,OAAQ,OAEfnD,OAAOoD,aAGXpB,OAASA,YACTqB,yBACAtD,sBAAqB,GAM9BsD,oBACS/D,KAAKU,OAAOkD,iBACRlD,OAAOkD,UAAY5D,KAAK0C,YAGxBhC,OAAOmD,OAAQ,OAEfnD,OAAOoD,QASpBrD,qBAAqBuD,cACZ1D,gBAAgB2D,UAAYD,QAQrCE,0BAA0BC,SACJnE,KAAKoE,mBAAmB,cAChCC,UAAUC,OAAO,QAASH,SAQxCI,qBAAqBP,cACZxD,aAAayD,UAAYD,QAQlCQ,0BAA0BL,SACJnE,KAAKoE,mBAAmB,UAChCC,UAAUC,OAAO,QAASH,SAOxCnB,qBAAqBD,WAEb0B,qBAAgB1B,MAAM9B,KAAKe,QAAQ,QAAS,IAAI0C,oBAC/CC,cACD,4BAAaF,kBAAiBxB,oBAC9B,kBAAUwB,QAASxB,oBAO3B2B,aAGS9E,MAAM+E,OAMfjE,8BACSR,UAAU0E,iBAAiB,QAAS9E,KAAK+E,iBAAiBC,KAAKhF,YAC/DF,MAAMO,UAAU4E,GAAGC,YAAYC,aAAcnF,KAAKoF,oBAAoBJ,KAAKhF,YAC3EF,MAAMO,UAAU4E,GAAGC,YAAYG,QAAQ,UACnCC,qBACAC,oDASaC,UAClBxF,KAAKyF,cAGLD,MAAME,sBACH,GAAI1F,KAAK2F,UAAW,CAIvBH,MAAME,2BAGI,yCACI,kBAAU,gBAAiBzC,yBAC3B,kBAAU,eAAgBA,yBAC1B,kBAAU,cAAeA,yBAE9BnD,MAAM+E,OACb,MAAO9B,UAWjBgC,iBAAiBS,aACPI,OAASJ,MAAMK,OAAOC,QAAQ,aAChCF,QAAUA,OAAOG,QAAQC,OAAQ,OAC3BA,OAASJ,OAAOG,QAAQC,OACf,cAAXA,aACKC,oCAGM,WAAXD,aACKE,mBAQjBD,4DACsC,gDAAzBE,wEAAeC,YACfb,4BAEAc,uEASJC,KAAO,IAAIC,KAAKvG,KAAKwG,KAAKC,OAAQ,CACnC3E,KAAM9B,KAAKmG,cAAc5D,gBAExB7B,OAAOkD,UAAY,UACnBlD,OAAOgG,IAAMC,IAAIC,gBAAgB5G,KAAKsG,WAGtCO,8BAA8B,oBAG9BnG,OAAOmD,OAAQ,OACfnD,OAAOoG,UAAW,qCAClB1C,mBAAmB,kEAAWC,UAAUC,OAAO,QAAQ,QAGvDE,2BAA0B,QAC1BD,sBAAqB,8BAQM,IAA5BvE,KAAKwG,KAAKC,OAAOnE,wBACZqC,aAAa,0BAIhBoC,SAAW/G,KAAKoB,aAA6B,IAAhB4F,KAAKC,UAAiBC,WAAWlF,QAAQ,IAAK,cAKxEkC,2BAA0B,QAG1BK,sBAAqB,SAGpB4C,cAAgB,qBAAWnH,KAAKH,OAAQ,QAASG,KAAKsG,KAAMS,UAAWK,gBACpEC,4BAA4BD,kBAEhCE,YAAYH,cACZvC,6BACU,kBAAU,oBAAqB3B,oBAChD,MAAOF,YAEAwB,sBAAqB,wBAEX,kBAAU,eAAgBtB,kBAAW,CAACF,MAAAA,QAAS,CAC1DjB,KAAM,WAYlBsC,mBAAmBmD,gBACRvH,KAAKI,UAAUG,uCAAgCgH,6DAS/CvH,KAAKwH,eAAiBxH,KAAKyH,oCAGjB5H,cACX6H,WAAa1H,KAAK2H,gBAClB7H,YAAc4H,WAAWnE,OAAO,CAClCqE,gBAAiB,GACjBC,OAAO,EACPpE,eAAe,WAIF,IAAIzD,KAAKH,OAAQC,OACrBiB,WACTjB,MAAM4D,OAEH5D,MAQXG,+CACSD,KAAKJ,YAAY4H,gBAOjBxH,KAAKJ,YAAY6H,mCACP,CAAC,iBAAkB,YAAYK,KAAKC,OAAUA,IAAAA,IAAK9E,UAAAA,uBACzD+E,MAAKC,YAAE/E,MAAOgF,sBAAa,cAASA,QAAS,CAAChF,MAAAA,MAAOpB,KAAM,aAC3DqG,SACE,wBAVI,CAAC,sBAAuB,iBAAiBL,KAAKC,OAAUA,IAAAA,IAAK9E,UAAAA,uBACnE+E,MAAKI,WAAElF,MAAOgF,qBAAa,cAASA,QAAS,CAAChF,MAAAA,MAAOpB,KAAM,aAC3DqG,SACE,gCAmBHxF,UAAUC,cAAgBV,OAAOC,0CAelCD,OAAOmG,qDAORC,KAACA,KAADC,GAAOA,UAAYC,UAAUC,iBAAiB,+BAAgCzI,KAAK0I,oBACzFF,UAAUG,oBAAoB3I,KAAKM,gBAAiBgI,KAAMC,SACrDK,YAAcC,YAAY7I,KAAK8I,uBAAuB9D,KAAKhF,MAAO,KAM3E8I,+BACUC,UAACA,UAADC,QAAYA,QAAZC,QAAqBA,SAAWjJ,KAAK0I,mBACvCK,UAAY,OACPxD,6BAEAjF,gBAAgBC,cAAc,yBAAyB2I,YAAcF,aACrE1I,gBAAgBC,cAAc,yBAAyB2I,YAAcD,6CAS9CE,aAC3B7I,gBAAgB4I,kBAAoB,kBAAUC,OAAQlG,qDAQ7BmE,eACzB5G,aAAa0I,kBAAoB,kBAAU,YAAajG,kBAAW,CACpEmE,SAAUJ,KAAKoC,MAAiB,IAAXhC,UAAkB,yCAKtC5G,aAAa0I,kBAAoB,kBAAU,SAAUjG,mBAM9DoG,mBACQrJ,KAAK4I,aACLU,cAActJ,KAAK4I,kBAElBA,YAAc,KAQvBF,yBAEUa,KAAM,IAAIC,MAAOC,UACjBV,UAAY/B,KAAK0C,MAAM1J,KAAKwB,gBAAmB+H,IAAMvJ,KAAK2J,WAAa,KAEvEC,UAAY,IAAIC,KAAKC,aAAanH,UAAUoH,SAAU,CAACC,qBAAsB,IAC7Ef,QAAUW,UAAUK,OAAOlB,UAAY,UAEtC,CACHA,UAAAA,UACAC,QAHYY,UAAUK,OAAOjD,KAAK0C,OAAOX,UAAYE,SAAW,KAIhEA,QAAAA,SASRiB,0BACWlK,KAAKE,OAAOiK,WASvB5E,uBACQvF,KAAKmG,eAA8C,aAA7BnG,KAAKmG,cAAcC,WACpCgE,eAAgB,OAGhB9E,gBAIb+E,oBACSlE,cAAcmE,YAGd5J,OAAOmD,OAAQ,EAQxByB,gBACQtF,KAAK0C,aACAA,OAAO6H,YACPtI,QAAQuI,OAA+B,UAArBA,MAAMC,aACxBC,SAASF,OAAUA,MAAMF,SAOtCK,qBAESC,sBAGAvB,mBAQTwB,qBACSlB,WAAY,IAAIH,MAAOC,eACvBqB,yBAQTC,oBAAoBvF,UACZxF,KAAKyF,cAAe,OACduF,QAAUhL,KAAKwG,KAAKyE,SAAWzF,MAAMgB,KAAK0E,KAG5CF,SAAWhL,KAAKkK,yBACXG,oBACAc,oCAGA3E,KAAKC,OAAO1E,KAAKyD,MAAMgB,WAGvBA,KAAKyE,SAAWD,QAEjBhL,KAAKoK,oBACAC,yEAOF,kBAAU,iBAAkBpH,mBAAY,CACnDC,YAAa,kBAAU,uBAAwBD,mBAC/CnB,KAAM,UASd2D,6CACyC,iDAAzBU,0EAAeC,OAQ/BT,oDACa3F,KAAKwG,6BAAL4E,WAAWH,oCAOhBjL,KAAKmG,cAAe,IAEhBnG,KAAKyF,oBACAU,cAAcmE,OAGnBtK,KAAK2F,UAAW,WACa3F,KAAKqL,sCAK7B7G,2BAA0B,GAC1BxE,KAAK0C,OAAO4I,cACPtL,KAAKa,wBAIdsF,cAAgB,UAIpBA,cAAgB,IAAIhE,cAAcnC,KAAK0C,OAAQ1C,KAAK0B,kCAEpDyE,cAAcrB,iBAAiB,gBAAiB9E,KAAK+K,oBAAoB/F,KAAKhF,YAC9EmG,cAAcrB,iBAAiB,OAAQ9E,KAAK2K,cAAc3F,KAAKhF,YAC/DmG,cAAcrB,iBAAiB,QAAS9E,KAAK6K,cAAc7F,KAAKhF,YAEhEwG,KAAO,CACRC,OAAQ,GACRwE,SAAU,QAETlH,yBACAqG,eAAgB,OAGhBjE,cAAcoF,MAAM,qDAUf,yCACI,kBAAU,oBAAqBtI,yBAC/B,kBAAU,mBAAoBA,yBAC9B,kBAAU,cAAeA,qBAE5B,EACT,aACS,qBASGuI,cACRlD,KAACA,YAAcE,UAAUC,iBAC3BzI,KAAKyB,uBACLzB,KAAKyL,wBAAwB,CACzBD,OAAAA,eAGH3L,OAAO6L,cAAcpD,MAS9BmD,wBAAwB7D,wBACbA"}
\ No newline at end of file
+{"version":3,"file":"base_recorder.min.js","sources":["../src/base_recorder.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n//\n\n/**\n * Tiny Record RTC type.\n *\n * @module      tiny_recordrtc/base_recorder\n * @copyright   2022 Stevani Andolo <stevani@hotmail.com.au>\n * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport {getString, getStrings} from 'core/str';\nimport {component} from './common';\nimport Pending from 'core/pending';\nimport {getData, isPausingAllowed} from './options';\nimport uploadFile from 'editor_tiny/uploader';\nimport {add as addToast} from 'core/toast';\nimport * as ModalEvents from 'core/modal_events';\nimport * as Templates from 'core/templates';\nimport {saveCancelPromise} from 'core/notification';\nimport {prefetchStrings, prefetchTemplates} from 'core/prefetch';\nimport AlertModal from 'core/local/modal/alert';\n\n/**\n * The RecordRTC base class for audio, video, and any other future types\n */\nexport default class {\n\n    stopRequested = false;\n    buttonTimer = null;\n    pauseTime = null;\n    startTime = null;\n\n    /**\n     * Constructor for the RecordRTC class\n     *\n     * @param {TinyMCE} editor The Editor to which the content will be inserted\n     * @param {Modal} modal The Moodle Modal that contains the interface used for recording\n     */\n    constructor(editor, modal) {\n        this.ready = false;\n\n        if (!this.checkAndWarnAboutBrowserCompatibility()) {\n            return;\n        }\n\n        this.editor = editor;\n        this.config = getData(editor).params;\n        this.modal = modal;\n        this.modalRoot = modal.getRoot()[0];\n        this.startStopButton = this.modalRoot.querySelector('button[data-action=\"startstop\"]');\n        this.uploadButton = this.modalRoot.querySelector('button[data-action=\"upload\"]');\n        this.pauseResumeButton = this.modalRoot.querySelector('button[data-action=\"pauseresume\"]');\n\n        // Disable the record button untilt he stream is acquired.\n        this.setRecordButtonState(false);\n\n        this.player = this.configurePlayer();\n        this.registerEventListeners();\n        this.ready = true;\n\n        this.captureUserMedia();\n        this.prefetchContent();\n    }\n\n    /**\n     * Check whether the browser is compatible.\n     *\n     * @returns {boolean}\n     */\n    isReady() {\n        return this.ready;\n    }\n\n    // Disable eslint's valid-jsdoc rule as the following methods are abstract and mnust be overridden by the child class.\n\n    /* eslint-disable valid-jsdoc, no-unused-vars */\n\n    /**\n     * Get the Player element for this type.\n     *\n     * @returns {HTMLElement} The player element, typically an audio or video tag.\n     */\n    configurePlayer() {\n        throw new Error(`configurePlayer() must be implemented in ${this.constructor.name}`);\n    }\n\n    /**\n     * Get the list of supported mimetypes for this recorder.\n     * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/MediaRecorder/isTypeSupported}\n     *\n     * @returns {string[]} The list of supported mimetypes.\n     */\n    getSupportedTypes() {\n        throw new Error(`getSupportedTypes() must be implemented in ${this.constructor.name}`);\n    }\n\n    /**\n     * Get any recording options passed into the MediaRecorder.\n     * Please note that the mimeType will be fetched from {@link getSupportedTypes()}.\n     *\n     * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/MediaRecorder/MediaRecorder#options}\n     * @returns {Object}\n     */\n    getRecordingOptions() {\n        throw new Error(`getRecordingOptions() must be implemented in ${this.constructor.name}`);\n    }\n\n    /**\n     * Get a filename for the generated file.\n     *\n     * Typically this function will take a prefix and add a type-specific suffix such as the extension to it.\n     *\n     * @param {string} prefix The prefix for the filename generated by the recorder.\n     * @returns {string}\n     */\n    getFileName(prefix) {\n        throw new Error(`getFileName() must be implemented in ${this.constructor.name}`);\n    }\n\n    /**\n     * Get a list of constraints as required by the getUserMedia() function.\n     * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/getUserMedia#constraints}\n     *\n     * @returns {Object}\n     */\n    getMediaConstraints() {\n        throw new Error(`getMediaConstraints() must be implemented in ${this.constructor.name}`);\n    }\n\n    /**\n     * Whether to start playing the recording as it is captured.\n     * @returns {boolean} Whether to start playing the recording as it is captured.\n     */\n    playOnCapture() {\n        return false;\n    }\n\n    /**\n     * Get the time limit for this recording type.\n     *\n     * @returns {number} The time limit in seconds.\n     */\n    getTimeLimit() {\n        throw new Error(`getTimeLimit() must be implemented in ${this.constructor.name}`);\n    }\n\n    /**\n     * Get the name of the template used when embedding the URL in the editor content.\n     *\n     * @returns {string}\n     */\n    getEmbedTemplateName() {\n        throw new Error(`getEmbedTemplateName() must be implemented in ${this.constructor.name}`);\n    }\n\n    /**\n     * Fetch the Class of the Modal to be displayed.\n     *\n     * @returns {Modal}\n     */\n    static getModalClass() {\n        throw new Error(`getModalClass() must be implemented in ${this.constructor.name}`);\n    }\n\n    /* eslint-enable valid-jsdoc, no-unused-vars */\n\n    /**\n     * Get the options for the MediaRecorder.\n     *\n     * @returns {object} The options for the MediaRecorder instance.\n     */\n    getParsedRecordingOptions() {\n        const requestedTypes = this.getSupportedTypes();\n        const possibleTypes = requestedTypes.reduce((result, type) => {\n            result.push(type);\n            // Safari seems to use codecs: instead of codecs=.\n            // It is safe to add both, so we do, but we want them to remain in order.\n            result.push(type.replace('=', ':'));\n            return result;\n        }, []);\n\n        const compatTypes = possibleTypes.filter((type) => window.MediaRecorder.isTypeSupported(type));\n\n        const options = this.getRecordingOptions();\n        if (compatTypes.length !== 0) {\n            options.mimeType = compatTypes[0];\n        }\n        window.console.info(\n            `Selected codec ${options.mimeType} from ${compatTypes.length} options.`,\n            compatTypes,\n        );\n\n        return options;\n    }\n\n    /**\n     * Start capturing the User Media and handle success or failure of the capture.\n     */\n    async captureUserMedia() {\n        try {\n            const stream = await navigator.mediaDevices.getUserMedia(this.getMediaConstraints());\n            this.handleCaptureSuccess(stream);\n        } catch (error) {\n            this.handleCaptureFailure(error);\n        }\n    }\n\n    /**\n     * Prefetch some of the content that will be used in the UI.\n     *\n     * Note: not all of the strings used are pre-fetched.\n     * Some of the strings will be fetched because their template is used.\n     */\n    prefetchContent() {\n        prefetchStrings(component, [\n            'uploading',\n            'recordagain_title',\n            'recordagain_desc',\n            'discard_title',\n            'discard_desc',\n            'confirm_yes',\n            'recordinguploaded',\n            'maxfilesizehit',\n            'maxfilesizehit_title',\n            'uploadfailed',\n            'pause',\n            'resume',\n        ]);\n\n        prefetchTemplates([\n            this.getEmbedTemplateName(),\n            'tiny_recordrtc/timeremaining',\n        ]);\n    }\n\n    /**\n     * Display an error message to the user.\n     *\n     * @param {Promise<string>} title The error title\n     * @param {Promise<string>} content The error message\n     * @returns {Promise<Modal>}\n     */\n    async displayAlert(title, content) {\n        const pendingPromise = new Pending('core/confirm:alert');\n        const modal = await AlertModal.create({\n            title: title,\n            body: content,\n            removeOnClose: true,\n        });\n\n        modal.show();\n        pendingPromise.resolve();\n\n        return modal;\n    }\n\n    /**\n     * Handle successful capture of the User Media.\n     *\n     * @param {MediaStream} stream The stream as captured by the User Media.\n     */\n    handleCaptureSuccess(stream) {\n        // Set audio player source to microphone stream.\n        this.player.srcObject = stream;\n\n        if (this.playOnCapture()) {\n            // Mute audio, distracting while recording.\n            this.player.muted = true;\n\n            this.player.play();\n        }\n\n        this.stream = stream;\n        this.setupPlayerSource();\n        this.setRecordButtonState(true);\n    }\n\n    /**\n     * Setup the player to use the stream as a source.\n     */\n    setupPlayerSource() {\n        if (!this.player.srcObject) {\n            this.player.srcObject = this.stream;\n\n            // Mute audio, distracting while recording.\n            this.player.muted = true;\n\n            this.player.play();\n        }\n    }\n\n    /**\n     * Enable the record button.\n     *\n     * @param {boolean|null} enabled Set the button state\n     */\n    setRecordButtonState(enabled) {\n        this.startStopButton.disabled = !enabled;\n    }\n\n    /**\n     * Configure button visibility for the record button.\n     *\n     * @param {boolean} visible Set the visibility of the button.\n     */\n    setRecordButtonVisibility(visible) {\n        const container = this.getButtonContainer('start-stop');\n        container.classList.toggle('hide', !visible);\n    }\n\n    /**\n     * Configure button visibility for the pause button.\n     *\n     * @param {boolean} visible Set the visibility of the button.\n     */\n    setPauseButtonVisibility(visible) {\n        if (this.pauseResumeButton) {\n            this.pauseResumeButton.classList.toggle('hidden', !visible);\n        }\n    }\n\n    /**\n     * Enable the upload button.\n     *\n     * @param {boolean|null} enabled Set the button state\n     */\n    setUploadButtonState(enabled) {\n        this.uploadButton.disabled = !enabled;\n    }\n\n    /**\n     * Configure button visibility for the upload button.\n     *\n     * @param {boolean} visible Set the visibility of the button.\n     */\n    setUploadButtonVisibility(visible) {\n        const container = this.getButtonContainer('upload');\n        container.classList.toggle('hide', !visible);\n    }\n\n    /**\n     * Sets the state of the audio player, including visibility, muting, and controls.\n     *\n     * @param {boolean} state A boolean indicating the audio player state.\n     */\n    setPlayerState(state) {\n        // Mute or unmute the audio player and show or hide controls.\n        this.player.muted = !state;\n        this.player.controls = state;\n        // Toggle the 'hide' class on the player button container based on state.\n        this.getButtonContainer('player')?.classList.toggle('hide', !state);\n    }\n\n    /**\n     * Handle failure to capture the User Media.\n     *\n     * @param {Error} error\n     */\n    handleCaptureFailure(error) {\n        // Changes 'CertainError' -> 'gumcertain' to match language string names.\n        var subject = `gum${error.name.replace('Error', '').toLowerCase()}`;\n        this.displayAlert(\n            getString(`${subject}_title`, component),\n            getString(subject, component)\n        );\n    }\n\n    /**\n     * Close the modal and stop recording.\n     */\n    close() {\n        // Closing the modal will destroy it and remove it from the DOM.\n        // It will also stop the recording via the hidden Modal Event.\n        this.modal.hide();\n    }\n\n    /**\n     * Register event listeners for the modal.\n     */\n    registerEventListeners() {\n        this.modalRoot.addEventListener('click', this.handleModalClick.bind(this));\n        this.modal.getRoot().on(ModalEvents.outsideClick, this.outsideClickHandler.bind(this));\n        this.modal.getRoot().on(ModalEvents.hidden, () => {\n            this.cleanupStream();\n            this.requestRecordingStop();\n        });\n    }\n\n    /**\n     * Prevent the Modal from closing when recording is on process.\n     *\n     * @param {MouseEvent} event The click event\n     */\n    async outsideClickHandler(event) {\n        if (this.isRecording() || this.isPaused()) {\n            // The user is recording.\n            // Do not distract with a confirmation, just prevent closing.\n            event.preventDefault();\n        } else if (this.hasData()) {\n            // If there is a blobsize then there is data that may be lost.\n            // Ask the user to confirm they want to close the modal.\n            // We prevent default here, and then close the modal if they confirm.\n            event.preventDefault();\n\n            try {\n                await saveCancelPromise(\n                    await getString(\"discard_title\", component),\n                    await getString(\"discard_desc\", component),\n                    await getString(\"confirm_yes\", component),\n                );\n                this.modal.hide();\n            } catch (error) {\n                // Do nothing, the modal will not close.\n            }\n        }\n    }\n\n    /**\n     * Handle a click within the Modal.\n     *\n     * @param {MouseEvent} event The click event\n     */\n    handleModalClick(event) {\n        const button = event.target.closest('button');\n        if (button && button.dataset.action) {\n            const action = button.dataset.action;\n            if (action === 'startstop') {\n                this.handleRecordingStartStopRequested();\n            }\n\n            if (action === 'upload') {\n                this.uploadRecording();\n            }\n\n            if (action === 'pauseresume') {\n                this.handleRecordingPauseResumeRequested();\n            }\n        }\n    }\n\n    /**\n     * Handle the click event for the recording start/stop button.\n     */\n    handleRecordingStartStopRequested() {\n        if (this.isRecording() || this.isPaused()) {\n            this.requestRecordingStop();\n        } else {\n            this.startRecording();\n        }\n    }\n\n    /**\n     * Handle the click event for the recording pause/resume button.\n     */\n    handleRecordingPauseResumeRequested() {\n        if (this.isRecording()) {\n            // Pause recording.\n            this.mediaRecorder.pause();\n        } else if (this.isPaused()) {\n            // Resume recording.\n            this.mediaRecorder.resume();\n        }\n    }\n\n    /**\n     * Handle the media stream after it has finished.\n     */\n    async onMediaStopped() {\n        // Set source of audio player.\n        this.blob = new Blob(this.data.chunks, {\n            type: this.mediaRecorder.mimeType\n        });\n        this.player.srcObject = null;\n        this.player.src = URL.createObjectURL(this.blob);\n\n        // Change the label to \"Record again\".\n        this.setRecordButtonTextFromString('recordagain');\n\n        // Show upload button.\n        this.setUploadButtonVisibility(true);\n        this.setPlayerState(true);\n        this.setUploadButtonState(true);\n\n        // Hide the pause button.\n        this.setPauseButtonVisibility(false);\n        if (this.mediaRecorder.state === 'inactive') {\n            this.setPauseButtonTextFromString('pause');\n        }\n    }\n\n    /**\n     * Upload the recording and insert it into the editor content.\n     */\n    async uploadRecording() {\n        // Trigger error if no recording has been made.\n        if (this.data.chunks.length === 0) {\n            this.displayAlert('norecordingfound');\n            return;\n        }\n\n        const fileName = this.getFileName((Math.random() * 1000).toString().replace('.', ''));\n\n        // Upload recording to server.\n        try {\n            // Once uploading starts, do not allow any further changes to the recording.\n            this.setRecordButtonVisibility(false);\n\n            // Disable the upload button.\n            this.setUploadButtonState(false);\n\n            // Upload the recording.\n            const fileURL = await uploadFile(this.editor, 'media', this.blob, fileName, (progress) => {\n                this.setUploadButtonTextProgress(progress);\n            });\n            this.insertMedia(fileURL);\n            this.close();\n            addToast(await getString('recordinguploaded', component));\n        } catch (error) {\n            // Show a toast and unhide the button.\n            this.setUploadButtonState(true);\n\n            addToast(await getString('uploadfailed', component, {error}), {\n                type: 'error',\n            });\n\n        }\n    }\n\n    /**\n     * Helper to get the container that a button is in.\n     *\n     * @param {string} purpose The button purpose\n     * @returns {HTMLElement}\n     */\n    getButtonContainer(purpose) {\n        return this.modalRoot.querySelector(`[data-purpose=\"${purpose}-container\"]`);\n    }\n\n    /**\n     * Check whether the browser is compatible with capturing media.\n     *\n     * @returns {boolean}\n     */\n    static isBrowserCompatible() {\n        return this.checkSecure() && this.hasUserMedia();\n    }\n\n    static async display(editor) {\n        const ModalClass = this.getModalClass();\n        const modal = await ModalClass.create({\n            templateContext: {\n                isallowedpausing: isPausingAllowed(editor),\n            },\n            large: true,\n            removeOnClose: true,\n        });\n\n        // Set up the VideoRecorder.\n        const recorder = new this(editor, modal);\n        if (recorder.isReady()) {\n            modal.show();\n        }\n        return modal;\n    }\n\n    /**\n     * Check whether the browser is compatible with capturing media, and display a warning if not.\n     *\n     * @returns {boolean}\n     */\n    checkAndWarnAboutBrowserCompatibility() {\n        if (!this.constructor.checkSecure()) {\n            getStrings(['insecurealert_title', 'insecurealert'].map((key) => ({key, component})))\n                .then(([title, message]) => addToast(message, {title, type: 'error'}))\n                .catch();\n            return false;\n        }\n\n        if (!this.constructor.hasUserMedia) {\n            getStrings(['nowebrtc_title', 'nowebrtc'].map((key) => ({key, component})))\n                .then(([title, message]) => addToast(message, {title, type: 'error'}))\n                .catch();\n            return false;\n        }\n\n        return true;\n    }\n\n    /**\n     * Check whether the browser supports WebRTC.\n     *\n     * @returns {boolean}\n     */\n    static hasUserMedia() {\n        return (navigator.mediaDevices && window.MediaRecorder);\n    }\n\n    /**\n     * Check whether the hostname is either hosted over SSL, or from a valid localhost hostname.\n     *\n     * The UserMedia API can only be used in secure contexts as noted.\n     * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/getUserMedia#privacy_and_security}\n     *\n     * @returns {boolean} Whether the plugin can be loaded.\n     */\n    static checkSecure() {\n        // Note: We can now use window.isSecureContext.\n        // https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts#feature_detection\n        // https://developer.mozilla.org/en-US/docs/Web/API/isSecureContext\n        return window.isSecureContext;\n    }\n\n    /**\n     * Update the content of the stop recording button timer.\n     */\n    async setStopRecordingButton() {\n        const {html, js} = await Templates.renderForPromise('tiny_recordrtc/timeremaining', this.getTimeRemaining());\n        Templates.replaceNodeContents(this.startStopButton, html, js);\n        this.startButtonTimer();\n    }\n\n    /**\n     * Update the time on the stop recording button.\n     */\n    updateRecordButtonTime() {\n        const {remaining, minutes, seconds} = this.getTimeRemaining();\n        if (remaining < 0) {\n            this.requestRecordingStop();\n        } else {\n            this.startStopButton.querySelector('[data-type=\"minutes\"]').textContent = minutes;\n            this.startStopButton.querySelector('[data-type=\"seconds\"]').textContent = seconds;\n        }\n    }\n\n    /**\n     * Set the text of the record button using a language string.\n     *\n     * @param {string} string The string identifier\n     */\n    async setRecordButtonTextFromString(string) {\n        this.startStopButton.textContent = await getString(string, component);\n    }\n\n    /**\n     * Set the text of the pause button using a language string.\n     *\n     * @param {string} string The string identifier\n     */\n    async setPauseButtonTextFromString(string) {\n        if (this.pauseResumeButton) {\n            this.pauseResumeButton.textContent = await getString(string, component);\n        }\n    }\n\n    /**\n     * Set the upload button text progress.\n     *\n     * @param {number} progress The progress\n     */\n    async setUploadButtonTextProgress(progress) {\n        this.uploadButton.textContent = await getString('uploading', component, {\n            progress: Math.round(progress * 100) / 100,\n        });\n    }\n\n    async resetUploadButtonText() {\n        this.uploadButton.textContent = await getString('upload', component);\n    }\n\n    /**\n     * Clear the timer for the stop recording button.\n     */\n    clearButtonTimer() {\n        if (this.buttonTimer) {\n            clearInterval(this.buttonTimer);\n        }\n        this.buttonTimer = null;\n        this.pauseTime = null;\n        this.startTime = null;\n    }\n\n    /**\n     * Pause the timer for the stop recording button.\n     */\n    pauseButtonTimer() {\n        // Stop the countdown timer.\n        this.pauseTime = new Date().getTime(); // Store pause time.\n        if (this.buttonTimer) {\n            clearInterval(this.buttonTimer);\n        }\n    }\n\n    /**\n     * Start the timer for the start recording button.\n     * If the recording was paused, the timer will resume from the pause time.\n     */\n    startButtonTimer() {\n        if (this.pauseTime !== null) {\n            // Resume from pause.\n            const pauseDuration = new Date().getTime() - this.pauseTime;\n            // Adjust start time by pause duration.\n            this.startTime += pauseDuration;\n            this.pauseTime = null;\n        }\n        this.buttonTimer = setInterval(this.updateRecordButtonTime.bind(this), 500);\n    }\n\n    /**\n     * Get the time remaining for the recording.\n     *\n     * @returns {Object} The minutes and seconds remaining.\n     */\n    getTimeRemaining() {\n        // All times are in milliseconds.\n        let now = new Date().getTime();\n        if (this.pauseTime !== null) {\n            // If paused, use pauseTime instead of current time.\n            now = this.pauseTime;\n        }\n        const remaining = Math.floor(this.getTimeLimit() - ((now - this.startTime) / 1000));\n\n        const formatter = new Intl.NumberFormat(navigator.language, {minimumIntegerDigits: 2});\n        const seconds = formatter.format(remaining % 60);\n        const minutes = formatter.format(Math.floor((remaining - seconds) / 60));\n        return {\n            remaining,\n            minutes,\n            seconds,\n        };\n    }\n\n    /**\n     * Get the maximum file size that can be uploaded.\n     *\n     * @returns {number} The max byte size\n     */\n    getMaxUploadSize() {\n        return this.config.maxrecsize;\n    }\n\n    /**\n     * Stop the recording.\n     * Please note that this should only stop the recording.\n     * Anything related to processing the recording should be handled by the\n     * mediaRecorder's stopped event handler which is processed after it has stopped.\n     */\n    requestRecordingStop() {\n        if (this.mediaRecorder && this.mediaRecorder.state !== 'inactive') {\n            this.stopRequested = true;\n            if (this.isPaused()) {\n                this.stopRecorder();\n            }\n        } else {\n            // There is no recording to stop, but the stream must still be cleaned up.\n            this.cleanupStream();\n        }\n    }\n\n    stopRecorder() {\n        if (this.isPaused()) {\n            this.pauseTime = null;\n        }\n        this.mediaRecorder.stop();\n\n        // Unmute the player so that the audio is heard during playback.\n        this.player.muted = false;\n    }\n\n    /**\n     * Clean up the stream.\n     *\n     * This involves stopping any track which is still active.\n     */\n    cleanupStream() {\n        if (this.stream) {\n            this.stream.getTracks()\n                .filter((track) => track.readyState !== 'ended')\n                .forEach((track) => track.stop());\n        }\n    }\n\n    /**\n     * Handle the mediaRecorder `stop` event.\n     */\n    handleStopped() {\n        // Handle the stream data.\n        this.onMediaStopped();\n\n        // Clear the button timer.\n        this.clearButtonTimer();\n    }\n\n    /**\n     * Handle the mediaRecorder `start` event.\n     *\n     * This event is called when the recording starts.\n     */\n    handleStarted() {\n        this.startTime = new Date().getTime();\n        if (isPausingAllowed(this.editor) && !this.isPaused()) {\n            this.setPauseButtonVisibility(true);\n        }\n        this.setStopRecordingButton();\n    }\n\n    /**\n     * Handle the mediaRecorder `pause` event.\n     *\n     * This event is called when the recording pauses.\n     */\n    handlePaused() {\n        this.pauseButtonTimer();\n        this.setPauseButtonTextFromString('resume');\n    }\n\n    /**\n     * Handle the mediaRecorder `resume` event.\n     *\n     * This event is called when the recording resumes.\n     */\n    handleResume() {\n        this.startButtonTimer();\n        this.setPauseButtonTextFromString('pause');\n    }\n\n    /**\n     * Handle the mediaRecorder `dataavailable` event.\n     *\n     * @param {Event} event\n     */\n    handleDataAvailable(event) {\n        if (this.isRecording() || this.isPaused()) {\n            const newSize = this.data.blobSize + event.data.size;\n            // Recording stops when either the maximum upload size is reached, or the time limit expires.\n            // The time limit is checked in the `updateButtonTime` function.\n            if (newSize >= this.getMaxUploadSize()) {\n                this.stopRecorder();\n                this.displayFileLimitHitMessage();\n            } else {\n                // Push recording slice to array.\n                this.data.chunks.push(event.data);\n\n                // Size of all recorded data so far.\n                this.data.blobSize = newSize;\n\n                if (this.stopRequested) {\n                    this.stopRecorder();\n                }\n            }\n        }\n    }\n\n    async displayFileLimitHitMessage() {\n        addToast(await getString('maxfilesizehit', component), {\n            title: await getString('maxfilesizehit_title', component),\n            type: 'error',\n        });\n    }\n\n    /**\n     * Check whether the recording is in progress.\n     *\n     * @returns {boolean}\n     */\n    isRecording() {\n        return this.mediaRecorder?.state === 'recording';\n    }\n\n    /**\n     * Check whether the recording is paused.\n     *\n     * @returns {boolean}\n     */\n    isPaused() {\n        return this.mediaRecorder?.state === 'paused';\n    }\n\n    /**\n     * Whether any data has been recorded.\n     *\n     * @returns {boolean}\n     */\n    hasData() {\n        return !!this.data?.blobSize;\n    }\n\n    /**\n     * Start the recording\n     */\n    async startRecording() {\n        if (this.mediaRecorder) {\n            // Stop the existing recorder if it exists.\n            if (this.isRecording() || this.isPaused()) {\n                this.mediaRecorder.stop();\n            }\n\n            if (this.hasData()) {\n                const resetRecording = await this.recordAgainConfirmation();\n                if (!resetRecording) {\n                    // User cancelled at the confirmation to reset the data, so exit early.\n                    return;\n                }\n                this.setUploadButtonVisibility(false);\n                this.setPlayerState(false);\n                if (!this.stream.active) {\n                    await this.captureUserMedia();\n                }\n            }\n\n            this.mediaRecorder = null;\n        }\n\n        // The options for the recording codecs and bitrates.\n        this.mediaRecorder = new MediaRecorder(this.stream, this.getParsedRecordingOptions());\n\n        this.mediaRecorder.addEventListener('dataavailable', this.handleDataAvailable.bind(this));\n        this.mediaRecorder.addEventListener('stop', this.handleStopped.bind(this));\n        this.mediaRecorder.addEventListener('start', this.handleStarted.bind(this));\n        this.mediaRecorder.addEventListener('pause', this.handlePaused.bind(this));\n        this.mediaRecorder.addEventListener('resume', this.handleResume.bind(this));\n\n        this.data = {\n            chunks: [],\n            blobSize: 0\n        };\n        this.setupPlayerSource();\n        this.stopRequested = false;\n\n        // Capture in 50ms chunks.\n        this.mediaRecorder.start(50);\n    }\n\n    /**\n     * Confirm whether the user wants to reset the existing recoring.\n     *\n     * @returns {Promise<boolean>} Whether the user confirmed the reset.\n     */\n    async recordAgainConfirmation() {\n        try {\n            await saveCancelPromise(\n                await getString(\"recordagain_title\", component),\n                await getString(\"recordagain_desc\", component),\n                await getString(\"confirm_yes\", component)\n            );\n            return true;\n        } catch {\n            return false;\n        }\n    }\n\n    /**\n     * Insert the HTML to embed the recording into the editor content.\n     *\n     * @param {string} source The URL to view the media.\n     */\n    async insertMedia(source) {\n        const {html} = await Templates.renderForPromise(\n            this.getEmbedTemplateName(),\n            this.getEmbedTemplateContext({\n                source,\n            })\n        );\n        this.editor.insertContent(html);\n    }\n\n    /**\n     * Add or modify the template parameters for the specified type.\n     *\n     * @param {Object} templateContext The Tempalte context to use\n     * @returns {Object} The finalised template context\n     */\n    getEmbedTemplateContext(templateContext) {\n        return templateContext;\n    }\n}\n"],"names":["constructor","editor","modal","ready","this","checkAndWarnAboutBrowserCompatibility","config","params","modalRoot","getRoot","startStopButton","querySelector","uploadButton","pauseResumeButton","setRecordButtonState","player","configurePlayer","registerEventListeners","captureUserMedia","prefetchContent","isReady","Error","name","getSupportedTypes","getRecordingOptions","getFileName","prefix","getMediaConstraints","playOnCapture","getTimeLimit","getEmbedTemplateName","getParsedRecordingOptions","compatTypes","reduce","result","type","push","replace","filter","window","MediaRecorder","isTypeSupported","options","length","mimeType","console","info","stream","navigator","mediaDevices","getUserMedia","handleCaptureSuccess","error","handleCaptureFailure","component","title","content","pendingPromise","Pending","AlertModal","create","body","removeOnClose","show","resolve","srcObject","muted","play","setupPlayerSource","enabled","disabled","setRecordButtonVisibility","visible","getButtonContainer","classList","toggle","setPauseButtonVisibility","setUploadButtonState","setUploadButtonVisibility","setPlayerState","state","controls","subject","toLowerCase","displayAlert","close","hide","addEventListener","handleModalClick","bind","on","ModalEvents","outsideClick","outsideClickHandler","hidden","cleanupStream","requestRecordingStop","event","isRecording","isPaused","preventDefault","hasData","button","target","closest","dataset","action","handleRecordingStartStopRequested","uploadRecording","handleRecordingPauseResumeRequested","startRecording","mediaRecorder","pause","resume","blob","Blob","data","chunks","src","URL","createObjectURL","setRecordButtonTextFromString","setPauseButtonTextFromString","fileName","Math","random","toString","fileURL","progress","setUploadButtonTextProgress","insertMedia","purpose","checkSecure","hasUserMedia","ModalClass","getModalClass","templateContext","isallowedpausing","large","map","key","then","_ref2","message","catch","_ref","isSecureContext","html","js","Templates","renderForPromise","getTimeRemaining","replaceNodeContents","startButtonTimer","updateRecordButtonTime","remaining","minutes","seconds","textContent","string","round","clearButtonTimer","buttonTimer","clearInterval","pauseTime","startTime","pauseButtonTimer","Date","getTime","pauseDuration","setInterval","now","floor","formatter","Intl","NumberFormat","language","minimumIntegerDigits","format","getMaxUploadSize","maxrecsize","stopRequested","stopRecorder","stop","getTracks","track","readyState","forEach","handleStopped","onMediaStopped","handleStarted","setStopRecordingButton","handlePaused","handleResume","handleDataAvailable","newSize","blobSize","size","displayFileLimitHitMessage","_this$data","recordAgainConfirmation","active","start","source","getEmbedTemplateContext","insertContent"],"mappings":"u1DAoDIA,YAAYC,OAAQC,6CAXJ,sCACF,uCACF,uCACA,WASHC,OAAQ,EAERC,KAAKC,+CAILJ,OAASA,YACTK,QAAS,oBAAQL,QAAQM,YACzBL,MAAQA,WACRM,UAAYN,MAAMO,UAAU,QAC5BC,gBAAkBN,KAAKI,UAAUG,cAAc,wCAC/CC,aAAeR,KAAKI,UAAUG,cAAc,qCAC5CE,kBAAoBT,KAAKI,UAAUG,cAAc,0CAGjDG,sBAAqB,QAErBC,OAASX,KAAKY,uBACdC,8BACAd,OAAQ,OAERe,wBACAC,mBAQTC,iBACWhB,KAAKD,MAYhBa,wBACU,IAAIK,yDAAkDjB,KAAKJ,YAAYsB,OASjFC,0BACU,IAAIF,2DAAoDjB,KAAKJ,YAAYsB,OAUnFE,4BACU,IAAIH,6DAAsDjB,KAAKJ,YAAYsB,OAWrFG,YAAYC,cACF,IAAIL,qDAA8CjB,KAAKJ,YAAYsB,OAS7EK,4BACU,IAAIN,6DAAsDjB,KAAKJ,YAAYsB,OAOrFM,uBACW,EAQXC,qBACU,IAAIR,sDAA+CjB,KAAKJ,YAAYsB,OAQ9EQ,6BACU,IAAIT,8DAAuDjB,KAAKJ,YAAYsB,oCAS5E,IAAID,uDAAgDjB,KAAKJ,YAAYsB,OAU/ES,kCAUUC,YATiB5B,KAAKmB,oBACSU,QAAO,CAACC,OAAQC,QACjDD,OAAOE,KAAKD,MAGZD,OAAOE,KAAKD,KAAKE,QAAQ,IAAK,MACvBH,SACR,IAE+BI,QAAQH,MAASI,OAAOC,cAAcC,gBAAgBN,QAElFO,QAAUtC,KAAKoB,6BACM,IAAvBQ,YAAYW,SACZD,QAAQE,SAAWZ,YAAY,IAEnCO,OAAOM,QAAQC,8BACOJ,QAAQE,0BAAiBZ,YAAYW,oBACvDX,aAGGU,2CAQGK,aAAeC,UAAUC,aAAaC,aAAa9C,KAAKuB,4BACzDwB,qBAAqBJ,QAC5B,MAAOK,YACAC,qBAAqBD,QAUlCjC,gDACoBmC,kBAAW,CACvB,YACA,oBACA,mBACA,gBACA,eACA,cACA,oBACA,iBACA,uBACA,eACA,QACA,2CAGc,CACdlD,KAAK0B,uBACL,oDAWWyB,MAAOC,eAChBC,eAAiB,IAAIC,iBAAQ,sBAC7BxD,YAAcyD,eAAWC,OAAO,CAClCL,MAAOA,MACPM,KAAML,QACNM,eAAe,WAGnB5D,MAAM6D,OACNN,eAAeO,UAER9D,MAQXiD,qBAAqBJ,aAEZhC,OAAOkD,UAAYlB,OAEpB3C,KAAKwB,uBAEAb,OAAOmD,OAAQ,OAEfnD,OAAOoD,aAGXpB,OAASA,YACTqB,yBACAtD,sBAAqB,GAM9BsD,oBACShE,KAAKW,OAAOkD,iBACRlD,OAAOkD,UAAY7D,KAAK2C,YAGxBhC,OAAOmD,OAAQ,OAEfnD,OAAOoD,QASpBrD,qBAAqBuD,cACZ3D,gBAAgB4D,UAAYD,QAQrCE,0BAA0BC,SACJpE,KAAKqE,mBAAmB,cAChCC,UAAUC,OAAO,QAASH,SAQxCI,yBAAyBJ,SACjBpE,KAAKS,wBACAA,kBAAkB6D,UAAUC,OAAO,UAAWH,SAS3DK,qBAAqBR,cACZzD,aAAa0D,UAAYD,QAQlCS,0BAA0BN,SACJpE,KAAKqE,mBAAmB,UAChCC,UAAUC,OAAO,QAASH,SAQxCO,eAAeC,sCAENjE,OAAOmD,OAASc,WAChBjE,OAAOkE,SAAWD,yCAElBP,mBAAmB,kEAAWC,UAAUC,OAAO,QAASK,OAQjE3B,qBAAqBD,WAEb8B,qBAAgB9B,MAAM9B,KAAKe,QAAQ,QAAS,IAAI8C,oBAC/CC,cACD,4BAAaF,kBAAiB5B,oBAC9B,kBAAU4B,QAAS5B,oBAO3B+B,aAGSnF,MAAMoF,OAMfrE,8BACST,UAAU+E,iBAAiB,QAASnF,KAAKoF,iBAAiBC,KAAKrF,YAC/DF,MAAMO,UAAUiF,GAAGC,YAAYC,aAAcxF,KAAKyF,oBAAoBJ,KAAKrF,YAC3EF,MAAMO,UAAUiF,GAAGC,YAAYG,QAAQ,UACnCC,qBACAC,oDASaC,UAClB7F,KAAK8F,eAAiB9F,KAAK+F,WAG3BF,MAAMG,sBACH,GAAIhG,KAAKiG,UAAW,CAIvBJ,MAAMG,2BAGI,yCACI,kBAAU,gBAAiB9C,yBAC3B,kBAAU,eAAgBA,yBAC1B,kBAAU,cAAeA,yBAE9BpD,MAAMoF,OACb,MAAOlC,UAWjBoC,iBAAiBS,aACPK,OAASL,MAAMM,OAAOC,QAAQ,aAChCF,QAAUA,OAAOG,QAAQC,OAAQ,OAC3BA,OAASJ,OAAOG,QAAQC,OACf,cAAXA,aACKC,oCAGM,WAAXD,aACKE,kBAGM,gBAAXF,aACKG,uCAQjBF,oCACQvG,KAAK8F,eAAiB9F,KAAK+F,gBACtBH,4BAEAc,iBAObD,sCACQzG,KAAK8F,mBAEAa,cAAcC,QACZ5G,KAAK+F,iBAEPY,cAAcE,qCASlBC,KAAO,IAAIC,KAAK/G,KAAKgH,KAAKC,OAAQ,CACnClF,KAAM/B,KAAK2G,cAAcnE,gBAExB7B,OAAOkD,UAAY,UACnBlD,OAAOuG,IAAMC,IAAIC,gBAAgBpH,KAAK8G,WAGtCO,8BAA8B,oBAG9B3C,2BAA0B,QAC1BC,gBAAe,QACfF,sBAAqB,QAGrBD,0BAAyB,GACG,aAA7BxE,KAAK2G,cAAc/B,YACd0C,6BAA6B,oCASN,IAA5BtH,KAAKgH,KAAKC,OAAO1E,wBACZyC,aAAa,0BAIhBuC,SAAWvH,KAAKqB,aAA6B,IAAhBmG,KAAKC,UAAiBC,WAAWzF,QAAQ,IAAK,cAKxEkC,2BAA0B,QAG1BM,sBAAqB,SAGpBkD,cAAgB,qBAAW3H,KAAKH,OAAQ,QAASG,KAAK8G,KAAMS,UAAWK,gBACpEC,4BAA4BD,kBAEhCE,YAAYH,cACZ1C,6BACU,kBAAU,oBAAqB/B,oBAChD,MAAOF,YAEAyB,sBAAqB,wBAEX,kBAAU,eAAgBvB,kBAAW,CAACF,MAAAA,QAAS,CAC1DjB,KAAM,WAYlBsC,mBAAmB0D,gBACR/H,KAAKI,UAAUG,uCAAgCwH,6DAS/C/H,KAAKgI,eAAiBhI,KAAKiI,oCAGjBpI,cACXqI,WAAalI,KAAKmI,gBAClBrI,YAAcoI,WAAW1E,OAAO,CAClC4E,gBAAiB,CACbC,kBAAkB,6BAAiBxI,SAEvCyI,OAAO,EACP5E,eAAe,WAIF,IAAI1D,KAAKH,OAAQC,OACrBkB,WACTlB,MAAM6D,OAEH7D,MAQXG,+CACSD,KAAKJ,YAAYoI,gBAOjBhI,KAAKJ,YAAYqI,mCACP,CAAC,iBAAkB,YAAYM,KAAKC,OAAUA,IAAAA,IAAKtF,UAAAA,uBACzDuF,MAAKC,YAAEvF,MAAOwF,sBAAa,cAASA,QAAS,CAACxF,MAAAA,MAAOpB,KAAM,aAC3D6G,SACE,wBAVI,CAAC,sBAAuB,iBAAiBL,KAAKC,OAAUA,IAAAA,IAAKtF,UAAAA,uBACnEuF,MAAKI,WAAE1F,MAAOwF,qBAAa,cAASA,QAAS,CAACxF,MAAAA,MAAOpB,KAAM,aAC3D6G,SACE,gCAmBHhG,UAAUC,cAAgBV,OAAOC,0CAelCD,OAAO2G,qDAORC,KAACA,KAADC,GAAOA,UAAYC,UAAUC,iBAAiB,+BAAgClJ,KAAKmJ,oBACzFF,UAAUG,oBAAoBpJ,KAAKM,gBAAiByI,KAAMC,SACrDK,mBAMTC,+BACUC,UAACA,UAADC,QAAYA,QAAZC,QAAqBA,SAAWzJ,KAAKmJ,mBACvCI,UAAY,OACP3D,6BAEAtF,gBAAgBC,cAAc,yBAAyBmJ,YAAcF,aACrElJ,gBAAgBC,cAAc,yBAAyBmJ,YAAcD,6CAS9CE,aAC3BrJ,gBAAgBoJ,kBAAoB,kBAAUC,OAAQzG,sDAQ5ByG,QAC3B3J,KAAKS,yBACAA,kBAAkBiJ,kBAAoB,kBAAUC,OAAQzG,sDASnC0E,eACzBpH,aAAakJ,kBAAoB,kBAAU,YAAaxG,kBAAW,CACpE0E,SAAUJ,KAAKoC,MAAiB,IAAXhC,UAAkB,yCAKtCpH,aAAakJ,kBAAoB,kBAAU,SAAUxG,mBAM9D2G,mBACQ7J,KAAK8J,aACLC,cAAc/J,KAAK8J,kBAElBA,YAAc,UACdE,UAAY,UACZC,UAAY,KAMrBC,wBAESF,WAAY,IAAIG,MAAOC,UACxBpK,KAAK8J,aACLC,cAAc/J,KAAK8J,aAQ3BT,sBAC2B,OAAnBrJ,KAAKgK,UAAoB,OAEnBK,eAAgB,IAAIF,MAAOC,UAAYpK,KAAKgK,eAE7CC,WAAaI,mBACbL,UAAY,UAEhBF,YAAcQ,YAAYtK,KAAKsJ,uBAAuBjE,KAAKrF,MAAO,KAQ3EmJ,uBAEQoB,KAAM,IAAIJ,MAAOC,UACE,OAAnBpK,KAAKgK,YAELO,IAAMvK,KAAKgK,iBAETT,UAAY/B,KAAKgD,MAAMxK,KAAKyB,gBAAmB8I,IAAMvK,KAAKiK,WAAa,KAEvEQ,UAAY,IAAIC,KAAKC,aAAa/H,UAAUgI,SAAU,CAACC,qBAAsB,IAC7EpB,QAAUgB,UAAUK,OAAOvB,UAAY,UAEtC,CACHA,UAAAA,UACAC,QAHYiB,UAAUK,OAAOtD,KAAKgD,OAAOjB,UAAYE,SAAW,KAIhEA,QAAAA,SASRsB,0BACW/K,KAAKE,OAAO8K,WASvBpF,uBACQ5F,KAAK2G,eAA8C,aAA7B3G,KAAK2G,cAAc/B,YACpCqG,eAAgB,EACjBjL,KAAK+F,iBACAmF,qBAIJvF,gBAIbuF,eACQlL,KAAK+F,kBACAiE,UAAY,WAEhBrD,cAAcwE,YAGdxK,OAAOmD,OAAQ,EAQxB6B,gBACQ3F,KAAK2C,aACAA,OAAOyI,YACPlJ,QAAQmJ,OAA+B,UAArBA,MAAMC,aACxBC,SAASF,OAAUA,MAAMF,SAOtCK,qBAESC,sBAGA5B,mBAQT6B,qBACSzB,WAAY,IAAIE,MAAOC,WACxB,6BAAiBpK,KAAKH,UAAYG,KAAK+F,iBAClCvB,0BAAyB,QAE7BmH,yBAQTC,oBACS1B,wBACA5C,6BAA6B,UAQtCuE,oBACSxC,wBACA/B,6BAA6B,SAQtCwE,oBAAoBjG,UACZ7F,KAAK8F,eAAiB9F,KAAK+F,WAAY,OACjCgG,QAAU/L,KAAKgH,KAAKgF,SAAWnG,MAAMmB,KAAKiF,KAG5CF,SAAW/L,KAAK+K,yBACXG,oBACAgB,oCAGAlF,KAAKC,OAAOjF,KAAK6D,MAAMmB,WAGvBA,KAAKgF,SAAWD,QAEjB/L,KAAKiL,oBACAC,yEAOF,kBAAU,iBAAkBhI,mBAAY,CACnDC,YAAa,kBAAU,uBAAwBD,mBAC/CnB,KAAM,UASd+D,4CACyC,gDAAzBa,wEAAe/B,OAQ/BmB,0CACyC,8CAAzBY,0EAAe/B,OAQ/BqB,oDACajG,KAAKgH,6BAALmF,WAAWH,oCAOhBhM,KAAK2G,cAAe,KAEhB3G,KAAK8F,eAAiB9F,KAAK+F,kBACtBY,cAAcwE,OAGnBnL,KAAKiG,UAAW,WACajG,KAAKoM,sCAK7B1H,2BAA0B,QAC1BC,gBAAe,GACf3E,KAAK2C,OAAO0J,cACPrM,KAAKc,wBAId6F,cAAgB,UAIpBA,cAAgB,IAAIvE,cAAcpC,KAAK2C,OAAQ3C,KAAK2B,kCAEpDgF,cAAcxB,iBAAiB,gBAAiBnF,KAAK8L,oBAAoBzG,KAAKrF,YAC9E2G,cAAcxB,iBAAiB,OAAQnF,KAAKwL,cAAcnG,KAAKrF,YAC/D2G,cAAcxB,iBAAiB,QAASnF,KAAK0L,cAAcrG,KAAKrF,YAChE2G,cAAcxB,iBAAiB,QAASnF,KAAK4L,aAAavG,KAAKrF,YAC/D2G,cAAcxB,iBAAiB,SAAUnF,KAAK6L,aAAaxG,KAAKrF,YAEhEgH,KAAO,CACRC,OAAQ,GACR+E,SAAU,QAEThI,yBACAiH,eAAgB,OAGhBtE,cAAc2F,MAAM,qDAUf,yCACI,kBAAU,oBAAqBpJ,yBAC/B,kBAAU,mBAAoBA,yBAC9B,kBAAU,cAAeA,qBAE5B,EACT,aACS,qBASGqJ,cACRxD,KAACA,YAAcE,UAAUC,iBAC3BlJ,KAAK0B,uBACL1B,KAAKwM,wBAAwB,CACzBD,OAAAA,eAGH1M,OAAO4M,cAAc1D,MAS9ByD,wBAAwBpE,wBACbA"}
\ No newline at end of file
diff --git a/lib/editor/tiny/plugins/recordrtc/amd/build/options.min.js b/lib/editor/tiny/plugins/recordrtc/amd/build/options.min.js
index cdee95028bbc7..01505c3737aad 100644
--- a/lib/editor/tiny/plugins/recordrtc/amd/build/options.min.js
+++ b/lib/editor/tiny/plugins/recordrtc/amd/build/options.min.js
@@ -1,4 +1,4 @@
-define("tiny_recordrtc/options",["exports","./common","editor_tiny/options"],(function(_exports,_common,_options){Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.register=_exports.isVideoAllowed=_exports.isScreenAllowed=_exports.isAudioAllowed=_exports.getData=void 0;
+define("tiny_recordrtc/options",["exports","./common","editor_tiny/options"],(function(_exports,_common,_options){Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.register=_exports.isVideoAllowed=_exports.isScreenAllowed=_exports.isPausingAllowed=_exports.isAudioAllowed=_exports.getData=void 0;
 /**
    * Options helper for Tiny Record RTC plugin.
    *
@@ -6,6 +6,6 @@ define("tiny_recordrtc/options",["exports","./common","editor_tiny/options"],(fu
    * @copyright   2022, Stevani Andolo <stevani@hotmail.com.au>
    * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
    */
-const dataName=(0,_options.getPluginOptionName)(_common.pluginName,"data"),videoAllowedName=(0,_options.getPluginOptionName)(_common.pluginName,"videoAllowed"),audioAllowedName=(0,_options.getPluginOptionName)(_common.pluginName,"audioAllowed"),screenAllowedName=(0,_options.getPluginOptionName)(_common.pluginName,"screenAllowed");_exports.register=editor=>{const registerOption=editor.options.register;registerOption(dataName,{processor:"object"}),registerOption(videoAllowedName,{processor:"boolean",default:!1}),registerOption(audioAllowedName,{processor:"boolean",default:!1}),registerOption(screenAllowedName,{processor:"boolean",default:!1})};_exports.getData=editor=>editor.options.get(dataName);_exports.isAudioAllowed=editor=>editor.options.get(audioAllowedName);_exports.isVideoAllowed=editor=>editor.options.get(videoAllowedName);_exports.isScreenAllowed=editor=>editor.options.get(screenAllowedName)}));
+const dataName=(0,_options.getPluginOptionName)(_common.pluginName,"data"),videoAllowedName=(0,_options.getPluginOptionName)(_common.pluginName,"videoAllowed"),audioAllowedName=(0,_options.getPluginOptionName)(_common.pluginName,"audioAllowed"),screenAllowedName=(0,_options.getPluginOptionName)(_common.pluginName,"screenAllowed"),pausingAllowedName=(0,_options.getPluginOptionName)(_common.pluginName,"pausingAllowed");_exports.register=editor=>{const registerOption=editor.options.register;registerOption(dataName,{processor:"object"}),registerOption(videoAllowedName,{processor:"boolean",default:!1}),registerOption(audioAllowedName,{processor:"boolean",default:!1}),registerOption(screenAllowedName,{processor:"boolean",default:!1}),registerOption(pausingAllowedName,{processor:"boolean",default:!1})};_exports.getData=editor=>editor.options.get(dataName);_exports.isAudioAllowed=editor=>editor.options.get(audioAllowedName);_exports.isVideoAllowed=editor=>editor.options.get(videoAllowedName);_exports.isScreenAllowed=editor=>editor.options.get(screenAllowedName);_exports.isPausingAllowed=editor=>editor.options.get(pausingAllowedName)}));
 
 //# sourceMappingURL=options.min.js.map
\ No newline at end of file
diff --git a/lib/editor/tiny/plugins/recordrtc/amd/build/options.min.js.map b/lib/editor/tiny/plugins/recordrtc/amd/build/options.min.js.map
index 2ec39ef318450..b720b51ccbc2c 100644
--- a/lib/editor/tiny/plugins/recordrtc/amd/build/options.min.js.map
+++ b/lib/editor/tiny/plugins/recordrtc/amd/build/options.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"options.min.js","sources":["../src/options.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Options helper for Tiny Record RTC plugin.\n *\n * @module      tiny_recordrtc/options\n * @copyright   2022, Stevani Andolo <stevani@hotmail.com.au>\n * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport {pluginName} from './common';\nimport {getPluginOptionName} from 'editor_tiny/options';\n\nconst dataName = getPluginOptionName(pluginName, 'data');\nconst videoAllowedName = getPluginOptionName(pluginName, 'videoAllowed');\nconst audioAllowedName = getPluginOptionName(pluginName, 'audioAllowed');\nconst screenAllowedName = getPluginOptionName(pluginName, 'screenAllowed');\n\nexport const register = (editor) => {\n    const registerOption = editor.options.register;\n\n    registerOption(dataName, {\n        processor: 'object',\n    });\n\n    registerOption(videoAllowedName, {\n        processor: 'boolean',\n        \"default\": false,\n    });\n\n    registerOption(audioAllowedName, {\n        processor: 'boolean',\n        \"default\": false,\n    });\n\n    registerOption(screenAllowedName, {\n        processor: 'boolean',\n        \"default\": false,\n    });\n};\n\nexport const getData = (editor) => editor.options.get(dataName);\n\n/**\n * Whether video may be recorded in this instance.\n *\n * @param {TinyMCE} editor\n * @returns {boolean}\n */\nexport const isAudioAllowed = (editor) => editor.options.get(audioAllowedName);\n\n/**\n * Whether audio may be recorded in this instance.\n *\n * @param {TinyMCE} editor\n * @returns {boolean}\n */\nexport const isVideoAllowed = (editor) => editor.options.get(videoAllowedName);\n\n/**\n * Whether screen may be recorded in this instance.\n *\n * @param {TinyMCE} editor\n * @returns {boolean}\n */\nexport const isScreenAllowed = (editor) => editor.options.get(screenAllowedName);\n"],"names":["dataName","pluginName","videoAllowedName","audioAllowedName","screenAllowedName","editor","registerOption","options","register","processor","get"],"mappings":";;;;;;;;MA0BMA,UAAW,gCAAoBC,mBAAY,QAC3CC,kBAAmB,gCAAoBD,mBAAY,gBACnDE,kBAAmB,gCAAoBF,mBAAY,gBACnDG,mBAAoB,gCAAoBH,mBAAY,mCAEjCI,eACfC,eAAiBD,OAAOE,QAAQC,SAEtCF,eAAeN,SAAU,CACrBS,UAAW,WAGfH,eAAeJ,iBAAkB,CAC7BO,UAAW,mBACA,IAGfH,eAAeH,iBAAkB,CAC7BM,UAAW,mBACA,IAGfH,eAAeF,kBAAmB,CAC9BK,UAAW,mBACA,sBAIKJ,QAAWA,OAAOE,QAAQG,IAAIV,kCAQvBK,QAAWA,OAAOE,QAAQG,IAAIP,0CAQ9BE,QAAWA,OAAOE,QAAQG,IAAIR,2CAQ7BG,QAAWA,OAAOE,QAAQG,IAAIN"}
\ No newline at end of file
+{"version":3,"file":"options.min.js","sources":["../src/options.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Options helper for Tiny Record RTC plugin.\n *\n * @module      tiny_recordrtc/options\n * @copyright   2022, Stevani Andolo <stevani@hotmail.com.au>\n * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport {pluginName} from './common';\nimport {getPluginOptionName} from 'editor_tiny/options';\n\nconst dataName = getPluginOptionName(pluginName, 'data');\nconst videoAllowedName = getPluginOptionName(pluginName, 'videoAllowed');\nconst audioAllowedName = getPluginOptionName(pluginName, 'audioAllowed');\nconst screenAllowedName = getPluginOptionName(pluginName, 'screenAllowed');\nconst pausingAllowedName = getPluginOptionName(pluginName, 'pausingAllowed');\n\nexport const register = (editor) => {\n    const registerOption = editor.options.register;\n\n    registerOption(dataName, {\n        processor: 'object',\n    });\n\n    registerOption(videoAllowedName, {\n        processor: 'boolean',\n        \"default\": false,\n    });\n\n    registerOption(audioAllowedName, {\n        processor: 'boolean',\n        \"default\": false,\n    });\n\n    registerOption(screenAllowedName, {\n        processor: 'boolean',\n        \"default\": false,\n    });\n\n    registerOption(pausingAllowedName, {\n        processor: 'boolean',\n        \"default\": false,\n    });\n};\n\nexport const getData = (editor) => editor.options.get(dataName);\n\n/**\n * Whether video may be recorded in this instance.\n *\n * @param {TinyMCE} editor\n * @returns {boolean}\n */\nexport const isAudioAllowed = (editor) => editor.options.get(audioAllowedName);\n\n/**\n * Whether audio may be recorded in this instance.\n *\n * @param {TinyMCE} editor\n * @returns {boolean}\n */\nexport const isVideoAllowed = (editor) => editor.options.get(videoAllowedName);\n\n/**\n * Whether screen may be recorded in this instance.\n *\n * @param {TinyMCE} editor\n * @returns {boolean}\n */\nexport const isScreenAllowed = (editor) => editor.options.get(screenAllowedName);\n\n/**\n * Whether pausing is allowed in this instance.\n *\n * @param {TinyMCE} editor\n * @returns {boolean}\n */\nexport const isPausingAllowed = (editor) => editor.options.get(pausingAllowedName);\n"],"names":["dataName","pluginName","videoAllowedName","audioAllowedName","screenAllowedName","pausingAllowedName","editor","registerOption","options","register","processor","get"],"mappings":";;;;;;;;MA0BMA,UAAW,gCAAoBC,mBAAY,QAC3CC,kBAAmB,gCAAoBD,mBAAY,gBACnDE,kBAAmB,gCAAoBF,mBAAY,gBACnDG,mBAAoB,gCAAoBH,mBAAY,iBACpDI,oBAAqB,gCAAoBJ,mBAAY,oCAElCK,eACfC,eAAiBD,OAAOE,QAAQC,SAEtCF,eAAeP,SAAU,CACrBU,UAAW,WAGfH,eAAeL,iBAAkB,CAC7BQ,UAAW,mBACA,IAGfH,eAAeJ,iBAAkB,CAC7BO,UAAW,mBACA,IAGfH,eAAeH,kBAAmB,CAC9BM,UAAW,mBACA,IAGfH,eAAeF,mBAAoB,CAC/BK,UAAW,mBACA,sBAIKJ,QAAWA,OAAOE,QAAQG,IAAIX,kCAQvBM,QAAWA,OAAOE,QAAQG,IAAIR,0CAQ9BG,QAAWA,OAAOE,QAAQG,IAAIT,2CAQ7BI,QAAWA,OAAOE,QAAQG,IAAIP,6CAQ7BE,QAAWA,OAAOE,QAAQG,IAAIN"}
\ No newline at end of file
diff --git a/lib/editor/tiny/plugins/recordrtc/amd/build/screen_recorder.min.js b/lib/editor/tiny/plugins/recordrtc/amd/build/screen_recorder.min.js
index 216450ff110ff..d1f7dbf134bf6 100644
--- a/lib/editor/tiny/plugins/recordrtc/amd/build/screen_recorder.min.js
+++ b/lib/editor/tiny/plugins/recordrtc/amd/build/screen_recorder.min.js
@@ -1,3 +1,3 @@
-define("tiny_recordrtc/screen_recorder",["exports","./base_recorder","tiny_recordrtc/modal","tiny_recordrtc/common","core/str"],(function(_exports,_base_recorder,_modal,_common,_str){function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _defineProperty(obj,key,value){return key in obj?Object.defineProperty(obj,key,{value:value,enumerable:!0,configurable:!0,writable:!0}):obj[key]=value,obj}Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,_base_recorder=_interopRequireDefault(_base_recorder),_modal=_interopRequireDefault(_modal);class Screen extends _base_recorder.default{configurePlayer(){return this.modalRoot.querySelector("video")}getSupportedTypes(){return["video/webm;codecs=vp9,opus","video/webm;codecs=vp8,opus","video/mp4;codecs=h264,opus","video/mp4;codecs=h264,wav","video/mp4;codecs=v9,opus"]}getRecordingOptions(){return{videoBitsPerSecond:parseInt(this.config.screenbitrate),videoWidth:parseInt(this.config.videoscreenwidth),videoHeight:parseInt(this.config.videoscreenheight)}}getMediaConstraints(){return{audio:!0,systemAudio:"exclude",video:{displaySurface:"monitor",frameRate:{ideal:24},width:{max:parseInt(this.config.videoscreenwidth)},height:{max:parseInt(this.config.videoscreenheight)}}}}playOnCapture(){return!0}getRecordingType(){return"screen"}getTimeLimit(){return this.config.screentimelimit}getEmbedTemplateName(){return"tiny_recordrtc/embed_screen"}getFileName(prefix){return"".concat(prefix,"-video.").concat(this.getFileExtension())}getFileExtension(){return window.MediaRecorder.isTypeSupported("audio/webm")?"webm":window.MediaRecorder.isTypeSupported("audio/mp4")?"mp4":(window.console.warn("Unknown file type for MediaRecorder API"),"")}async captureUserMedia(){const audioPromise=navigator.mediaDevices.getUserMedia({audio:!0}),screenPromise=navigator.mediaDevices.getDisplayMedia(this.getMediaConstraints());await Promise.allSettled([audioPromise,screenPromise]).then(this.combineAudioAndScreenRecording.bind(this))}combineAudioAndScreenRecording(results){const[audioData,screenData]=results;if("fulfilled"!==screenData.status)return void this.handleCaptureFailure(screenData.reason);const screenStream=screenData.value;if(screenStream.getVideoTracks()[0].addEventListener("ended",this.handleStopScreenSharing.bind(this)),"fulfilled"!==audioData.status)return void this.handleCaptureSuccess(screenStream);const audioStream=audioData.value,composedStream=new MediaStream;screenStream.getTracks().forEach((function(track){"video"===track.kind?composedStream.addTrack(track):track.stop()})),audioStream.getAudioTracks().forEach((function(micTrack){composedStream.addTrack(micTrack)})),this.handleCaptureSuccess(composedStream)}handleStopScreenSharing(){this.isRecording()?(this.requestRecordingStop(),this.cleanupStream()):(this.setRecordButtonState(!1),this.displayAlert((0,_str.getString)("screensharingstopped_title",_common.component),(0,_str.getString)("screensharingstopped",_common.component)))}handleRecordingStartStopRequested(){this.isRecording()?(this.requestRecordingStop(),this.cleanupStream()):this.startRecording()}static getModalClass(){var _class;return _defineProperty(_class=class extends _modal.default{},"TYPE","".concat(_common.component,"/screen_recorder")),_defineProperty(_class,"TEMPLATE","".concat(_common.component,"/screen_recorder")),_class}}return _exports.default=Screen,_exports.default}));
+define("tiny_recordrtc/screen_recorder",["exports","./base_recorder","tiny_recordrtc/modal","tiny_recordrtc/common","core/str"],(function(_exports,_base_recorder,_modal,_common,_str){function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}function _defineProperty(obj,key,value){return key in obj?Object.defineProperty(obj,key,{value:value,enumerable:!0,configurable:!0,writable:!0}):obj[key]=value,obj}Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,_base_recorder=_interopRequireDefault(_base_recorder),_modal=_interopRequireDefault(_modal);class Screen extends _base_recorder.default{configurePlayer(){return this.modalRoot.querySelector("video")}getSupportedTypes(){return["video/webm;codecs=vp9,opus","video/webm;codecs=vp8,opus","video/mp4;codecs=h264,opus","video/mp4;codecs=h264,wav","video/mp4;codecs=v9,opus"]}getRecordingOptions(){return{videoBitsPerSecond:parseInt(this.config.screenbitrate),videoWidth:parseInt(this.config.videoscreenwidth),videoHeight:parseInt(this.config.videoscreenheight)}}getMediaConstraints(){return{audio:!0,systemAudio:"exclude",video:{displaySurface:"monitor",frameRate:{ideal:24},width:{max:parseInt(this.config.videoscreenwidth)},height:{max:parseInt(this.config.videoscreenheight)}}}}playOnCapture(){return!0}getRecordingType(){return"screen"}getTimeLimit(){return this.config.screentimelimit}getEmbedTemplateName(){return"tiny_recordrtc/embed_screen"}getFileName(prefix){return"".concat(prefix,"-video.").concat(this.getFileExtension())}getFileExtension(){return window.MediaRecorder.isTypeSupported("audio/webm")?"webm":window.MediaRecorder.isTypeSupported("audio/mp4")?"mp4":(window.console.warn("Unknown file type for MediaRecorder API"),"")}async captureUserMedia(){const audioPromise=navigator.mediaDevices.getUserMedia({audio:!0}),screenPromise=navigator.mediaDevices.getDisplayMedia(this.getMediaConstraints());await Promise.allSettled([audioPromise,screenPromise]).then(this.combineAudioAndScreenRecording.bind(this))}combineAudioAndScreenRecording(results){const[audioData,screenData]=results;if("fulfilled"!==screenData.status)return void this.handleCaptureFailure(screenData.reason);const screenStream=screenData.value;if(screenStream.getVideoTracks()[0].addEventListener("ended",this.handleStopScreenSharing.bind(this)),"fulfilled"!==audioData.status)return void this.handleCaptureSuccess(screenStream);const audioStream=audioData.value,composedStream=new MediaStream;screenStream.getTracks().forEach((function(track){"video"===track.kind?composedStream.addTrack(track):track.stop()})),audioStream.getAudioTracks().forEach((function(micTrack){composedStream.addTrack(micTrack)})),this.handleCaptureSuccess(composedStream)}handleStopScreenSharing(){this.isRecording()||this.isPaused()?(this.requestRecordingStop(),this.cleanupStream()):(this.setRecordButtonState(!1),this.displayAlert((0,_str.getString)("screensharingstopped_title",_common.component),(0,_str.getString)("screensharingstopped",_common.component)))}handleRecordingStartStopRequested(){this.isRecording()||this.isPaused()?(this.requestRecordingStop(),this.cleanupStream()):this.startRecording()}static getModalClass(){var _class;return _defineProperty(_class=class extends _modal.default{},"TYPE","".concat(_common.component,"/screen_recorder")),_defineProperty(_class,"TEMPLATE","".concat(_common.component,"/screen_recorder")),_class}}return _exports.default=Screen,_exports.default}));
 
 //# sourceMappingURL=screen_recorder.min.js.map
\ No newline at end of file
diff --git a/lib/editor/tiny/plugins/recordrtc/amd/build/screen_recorder.min.js.map b/lib/editor/tiny/plugins/recordrtc/amd/build/screen_recorder.min.js.map
index 2f4db9eacb3d6..22804ddc6847e 100644
--- a/lib/editor/tiny/plugins/recordrtc/amd/build/screen_recorder.min.js.map
+++ b/lib/editor/tiny/plugins/recordrtc/amd/build/screen_recorder.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"screen_recorder.min.js","sources":["../src/screen_recorder.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Tiny Record RTC - Screen recorder configuration.\n *\n * @module      tiny_recordrtc/screen_recorder\n * @copyright   2024 The Open University\n * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport BaseClass from './base_recorder';\nimport Modal from 'tiny_recordrtc/modal';\nimport {component} from 'tiny_recordrtc/common';\nimport {getString} from 'core/str';\n\nexport default class Screen extends BaseClass {\n    configurePlayer() {\n        return this.modalRoot.querySelector('video');\n    }\n\n    getSupportedTypes() {\n        return [\n            // Support webm as a preference.\n            // This container supports both vp9, and vp8.\n            // It does not support AVC1/h264 at all.\n            // It is supported by Chromium, and Firefox browsers, but not Safari.\n            'video/webm;codecs=vp9,opus',\n            'video/webm;codecs=vp8,opus',\n\n            // Fall back to mp4 if webm is not available.\n            // The mp4 container supports v9, and h264 but neither of these are supported for recording on other\n            // browsers.\n            // In addition to this, we can record in v9, but VideoJS does not support a mp4 container with v9 codec\n            // for playback. We leave it as a final option as a just-in-case.\n            'video/mp4;codecs=h264,opus',\n            'video/mp4;codecs=h264,wav',\n            'video/mp4;codecs=v9,opus',\n        ];\n\n    }\n\n    getRecordingOptions() {\n        return {\n            videoBitsPerSecond: parseInt(this.config.screenbitrate),\n            videoWidth: parseInt(this.config.videoscreenwidth),\n            videoHeight: parseInt(this.config.videoscreenheight),\n        };\n    }\n\n    getMediaConstraints() {\n        return {\n            audio: true,\n            systemAudio: 'exclude',\n            video: {\n                displaySurface: 'monitor',\n                frameRate: {ideal: 24},\n                width: {\n                    max: parseInt(this.config.videoscreenwidth),\n                },\n                height: {\n                    max: parseInt(this.config.videoscreenheight),\n                },\n            },\n        };\n    }\n\n    playOnCapture() {\n        // Play the recording back on capture.\n        return true;\n    }\n\n    getRecordingType() {\n        return 'screen';\n    }\n\n    getTimeLimit() {\n        return this.config.screentimelimit;\n    }\n\n    getEmbedTemplateName() {\n        return 'tiny_recordrtc/embed_screen';\n    }\n\n    getFileName(prefix) {\n        return `${prefix}-video.${this.getFileExtension()}`;\n    }\n\n    getFileExtension() {\n        if (window.MediaRecorder.isTypeSupported('audio/webm')) {\n            return 'webm';\n        } else if (window.MediaRecorder.isTypeSupported('audio/mp4')) {\n            return 'mp4';\n        }\n\n        window.console.warn(`Unknown file type for MediaRecorder API`);\n        return '';\n    }\n\n    async captureUserMedia() {\n        // Screen recording requires both audio and the screen, and we need to get them both together.\n        const audioPromise = navigator.mediaDevices.getUserMedia({audio: true});\n        const screenPromise = navigator.mediaDevices.getDisplayMedia(this.getMediaConstraints());\n        // If the audioPromise is \"rejected\" (indicating that the user does not want to share their voice),\n        // we will proceed to record their screen without audio.\n        // Therefore, we will use Promise.allSettled instead of Promise.all.\n        await Promise.allSettled([audioPromise, screenPromise]).then(this.combineAudioAndScreenRecording.bind(this));\n    }\n\n    /**\n     * For starting screen recording, once we have both audio and video, combine them.\n     *\n     * @param {Object[]} results from the above Promise.allSettled call.\n     */\n    combineAudioAndScreenRecording(results) {\n        const [audioData, screenData] = results;\n        if (screenData.status !== 'fulfilled') {\n            // If the user does not grant screen permission show warning popup.\n            this.handleCaptureFailure(screenData.reason);\n            return;\n        }\n\n        const screenStream = screenData.value;\n        // Prepare to handle if the user clicks the browser's \"Stop Sharing Screen\" button.\n        screenStream.getVideoTracks()[0].addEventListener('ended', this.handleStopScreenSharing.bind(this));\n\n        // Handle microphone.\n        if (audioData.status !== 'fulfilled') {\n            // We could not get audio. In this case, we just continue without audio.\n            this.handleCaptureSuccess(screenStream);\n            return;\n        }\n        const audioStream = audioData.value;\n        // Merge the video track from the media stream with the audio track from the microphone stream\n        // and stop any unnecessary tracks to ensure that the recorded video has microphone sound.\n        const composedStream = new MediaStream();\n        screenStream.getTracks().forEach(function(track) {\n            if (track.kind === 'video') {\n                composedStream.addTrack(track);\n            } else {\n                track.stop();\n            }\n        });\n        audioStream.getAudioTracks().forEach(function(micTrack) {\n            composedStream.addTrack(micTrack);\n        });\n\n        this.handleCaptureSuccess(composedStream);\n    }\n\n    /**\n     * Callback that is called by the user clicking Stop screen sharing on the browser.\n     */\n    handleStopScreenSharing() {\n        if (this.isRecording()) {\n            this.requestRecordingStop();\n            this.cleanupStream();\n        } else {\n            this.setRecordButtonState(false);\n            this.displayAlert(\n                getString('screensharingstopped_title', component),\n                getString('screensharingstopped', component)\n            );\n        }\n    }\n\n    handleRecordingStartStopRequested() {\n        if (this.isRecording()) {\n            this.requestRecordingStop();\n            this.cleanupStream();\n        } else {\n            this.startRecording();\n        }\n    }\n\n    static getModalClass() {\n        return class extends Modal {\n            static TYPE = `${component}/screen_recorder`;\n            static TEMPLATE = `${component}/screen_recorder`;\n        };\n    }\n}\n"],"names":["Screen","BaseClass","configurePlayer","this","modalRoot","querySelector","getSupportedTypes","getRecordingOptions","videoBitsPerSecond","parseInt","config","screenbitrate","videoWidth","videoscreenwidth","videoHeight","videoscreenheight","getMediaConstraints","audio","systemAudio","video","displaySurface","frameRate","ideal","width","max","height","playOnCapture","getRecordingType","getTimeLimit","screentimelimit","getEmbedTemplateName","getFileName","prefix","getFileExtension","window","MediaRecorder","isTypeSupported","console","warn","audioPromise","navigator","mediaDevices","getUserMedia","screenPromise","getDisplayMedia","Promise","allSettled","then","combineAudioAndScreenRecording","bind","results","audioData","screenData","status","handleCaptureFailure","reason","screenStream","value","getVideoTracks","addEventListener","handleStopScreenSharing","handleCaptureSuccess","audioStream","composedStream","MediaStream","getTracks","forEach","track","kind","addTrack","stop","getAudioTracks","micTrack","isRecording","requestRecordingStop","cleanupStream","setRecordButtonState","displayAlert","component","handleRecordingStartStopRequested","startRecording","Modal"],"mappings":"+lBA4BqBA,eAAeC,uBAChCC,yBACWC,KAAKC,UAAUC,cAAc,SAGxCC,0BACW,CAKH,6BACA,6BAOA,6BACA,4BACA,4BAKRC,4BACW,CACHC,mBAAoBC,SAASN,KAAKO,OAAOC,eACzCC,WAAYH,SAASN,KAAKO,OAAOG,kBACjCC,YAAaL,SAASN,KAAKO,OAAOK,oBAI1CC,4BACW,CACHC,OAAO,EACPC,YAAa,UACbC,MAAO,CACHC,eAAgB,UAChBC,UAAW,CAACC,MAAO,IACnBC,MAAO,CACHC,IAAKf,SAASN,KAAKO,OAAOG,mBAE9BY,OAAQ,CACJD,IAAKf,SAASN,KAAKO,OAAOK,sBAM1CW,uBAEW,EAGXC,yBACW,SAGXC,sBACWzB,KAAKO,OAAOmB,gBAGvBC,6BACW,8BAGXC,YAAYC,wBACEA,yBAAgB7B,KAAK8B,oBAGnCA,0BACQC,OAAOC,cAAcC,gBAAgB,cAC9B,OACAF,OAAOC,cAAcC,gBAAgB,aACrC,OAGXF,OAAOG,QAAQC,gDACR,mCAKDC,aAAeC,UAAUC,aAAaC,aAAa,CAACzB,OAAO,IAC3D0B,cAAgBH,UAAUC,aAAaG,gBAAgBzC,KAAKa,6BAI5D6B,QAAQC,WAAW,CAACP,aAAcI,gBAAgBI,KAAK5C,KAAK6C,+BAA+BC,KAAK9C,OAQ1G6C,+BAA+BE,eACpBC,UAAWC,YAAcF,WACN,cAAtBE,WAAWC,wBAENC,qBAAqBF,WAAWG,cAInCC,aAAeJ,WAAWK,SAEhCD,aAAaE,iBAAiB,GAAGC,iBAAiB,QAASxD,KAAKyD,wBAAwBX,KAAK9C,OAGpE,cAArBgD,UAAUE,wBAELQ,qBAAqBL,oBAGxBM,YAAcX,UAAUM,MAGxBM,eAAiB,IAAIC,YAC3BR,aAAaS,YAAYC,SAAQ,SAASC,OACnB,UAAfA,MAAMC,KACNL,eAAeM,SAASF,OAExBA,MAAMG,UAGdR,YAAYS,iBAAiBL,SAAQ,SAASM,UAC1CT,eAAeM,SAASG,kBAGvBX,qBAAqBE,gBAM9BH,0BACQzD,KAAKsE,oBACAC,4BACAC,uBAEAC,sBAAqB,QACrBC,cACD,kBAAU,6BAA8BC,oBACxC,kBAAU,uBAAwBA,qBAK9CC,oCACQ5E,KAAKsE,oBACAC,4BACAC,sBAEAK,iFAKF,cAAcC,kCACAH,mFACIA"}
\ No newline at end of file
+{"version":3,"file":"screen_recorder.min.js","sources":["../src/screen_recorder.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Tiny Record RTC - Screen recorder configuration.\n *\n * @module      tiny_recordrtc/screen_recorder\n * @copyright   2024 The Open University\n * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport BaseClass from './base_recorder';\nimport Modal from 'tiny_recordrtc/modal';\nimport {component} from 'tiny_recordrtc/common';\nimport {getString} from 'core/str';\n\nexport default class Screen extends BaseClass {\n    configurePlayer() {\n        return this.modalRoot.querySelector('video');\n    }\n\n    getSupportedTypes() {\n        return [\n            // Support webm as a preference.\n            // This container supports both vp9, and vp8.\n            // It does not support AVC1/h264 at all.\n            // It is supported by Chromium, and Firefox browsers, but not Safari.\n            'video/webm;codecs=vp9,opus',\n            'video/webm;codecs=vp8,opus',\n\n            // Fall back to mp4 if webm is not available.\n            // The mp4 container supports v9, and h264 but neither of these are supported for recording on other\n            // browsers.\n            // In addition to this, we can record in v9, but VideoJS does not support a mp4 container with v9 codec\n            // for playback. We leave it as a final option as a just-in-case.\n            'video/mp4;codecs=h264,opus',\n            'video/mp4;codecs=h264,wav',\n            'video/mp4;codecs=v9,opus',\n        ];\n\n    }\n\n    getRecordingOptions() {\n        return {\n            videoBitsPerSecond: parseInt(this.config.screenbitrate),\n            videoWidth: parseInt(this.config.videoscreenwidth),\n            videoHeight: parseInt(this.config.videoscreenheight),\n        };\n    }\n\n    getMediaConstraints() {\n        return {\n            audio: true,\n            systemAudio: 'exclude',\n            video: {\n                displaySurface: 'monitor',\n                frameRate: {ideal: 24},\n                width: {\n                    max: parseInt(this.config.videoscreenwidth),\n                },\n                height: {\n                    max: parseInt(this.config.videoscreenheight),\n                },\n            },\n        };\n    }\n\n    playOnCapture() {\n        // Play the recording back on capture.\n        return true;\n    }\n\n    getRecordingType() {\n        return 'screen';\n    }\n\n    getTimeLimit() {\n        return this.config.screentimelimit;\n    }\n\n    getEmbedTemplateName() {\n        return 'tiny_recordrtc/embed_screen';\n    }\n\n    getFileName(prefix) {\n        return `${prefix}-video.${this.getFileExtension()}`;\n    }\n\n    getFileExtension() {\n        if (window.MediaRecorder.isTypeSupported('audio/webm')) {\n            return 'webm';\n        } else if (window.MediaRecorder.isTypeSupported('audio/mp4')) {\n            return 'mp4';\n        }\n\n        window.console.warn(`Unknown file type for MediaRecorder API`);\n        return '';\n    }\n\n    async captureUserMedia() {\n        // Screen recording requires both audio and the screen, and we need to get them both together.\n        const audioPromise = navigator.mediaDevices.getUserMedia({audio: true});\n        const screenPromise = navigator.mediaDevices.getDisplayMedia(this.getMediaConstraints());\n        // If the audioPromise is \"rejected\" (indicating that the user does not want to share their voice),\n        // we will proceed to record their screen without audio.\n        // Therefore, we will use Promise.allSettled instead of Promise.all.\n        await Promise.allSettled([audioPromise, screenPromise]).then(this.combineAudioAndScreenRecording.bind(this));\n    }\n\n    /**\n     * For starting screen recording, once we have both audio and video, combine them.\n     *\n     * @param {Object[]} results from the above Promise.allSettled call.\n     */\n    combineAudioAndScreenRecording(results) {\n        const [audioData, screenData] = results;\n        if (screenData.status !== 'fulfilled') {\n            // If the user does not grant screen permission show warning popup.\n            this.handleCaptureFailure(screenData.reason);\n            return;\n        }\n\n        const screenStream = screenData.value;\n        // Prepare to handle if the user clicks the browser's \"Stop Sharing Screen\" button.\n        screenStream.getVideoTracks()[0].addEventListener('ended', this.handleStopScreenSharing.bind(this));\n\n        // Handle microphone.\n        if (audioData.status !== 'fulfilled') {\n            // We could not get audio. In this case, we just continue without audio.\n            this.handleCaptureSuccess(screenStream);\n            return;\n        }\n        const audioStream = audioData.value;\n        // Merge the video track from the media stream with the audio track from the microphone stream\n        // and stop any unnecessary tracks to ensure that the recorded video has microphone sound.\n        const composedStream = new MediaStream();\n        screenStream.getTracks().forEach(function(track) {\n            if (track.kind === 'video') {\n                composedStream.addTrack(track);\n            } else {\n                track.stop();\n            }\n        });\n        audioStream.getAudioTracks().forEach(function(micTrack) {\n            composedStream.addTrack(micTrack);\n        });\n\n        this.handleCaptureSuccess(composedStream);\n    }\n\n    /**\n     * Callback that is called by the user clicking Stop screen sharing on the browser.\n     */\n    handleStopScreenSharing() {\n        if (this.isRecording() || this.isPaused()) {\n            this.requestRecordingStop();\n            this.cleanupStream();\n        } else {\n            this.setRecordButtonState(false);\n            this.displayAlert(\n                getString('screensharingstopped_title', component),\n                getString('screensharingstopped', component)\n            );\n        }\n    }\n\n    handleRecordingStartStopRequested() {\n        if (this.isRecording() || this.isPaused()) {\n            this.requestRecordingStop();\n            this.cleanupStream();\n        } else {\n            this.startRecording();\n        }\n    }\n\n    static getModalClass() {\n        return class extends Modal {\n            static TYPE = `${component}/screen_recorder`;\n            static TEMPLATE = `${component}/screen_recorder`;\n        };\n    }\n}\n"],"names":["Screen","BaseClass","configurePlayer","this","modalRoot","querySelector","getSupportedTypes","getRecordingOptions","videoBitsPerSecond","parseInt","config","screenbitrate","videoWidth","videoscreenwidth","videoHeight","videoscreenheight","getMediaConstraints","audio","systemAudio","video","displaySurface","frameRate","ideal","width","max","height","playOnCapture","getRecordingType","getTimeLimit","screentimelimit","getEmbedTemplateName","getFileName","prefix","getFileExtension","window","MediaRecorder","isTypeSupported","console","warn","audioPromise","navigator","mediaDevices","getUserMedia","screenPromise","getDisplayMedia","Promise","allSettled","then","combineAudioAndScreenRecording","bind","results","audioData","screenData","status","handleCaptureFailure","reason","screenStream","value","getVideoTracks","addEventListener","handleStopScreenSharing","handleCaptureSuccess","audioStream","composedStream","MediaStream","getTracks","forEach","track","kind","addTrack","stop","getAudioTracks","micTrack","isRecording","isPaused","requestRecordingStop","cleanupStream","setRecordButtonState","displayAlert","component","handleRecordingStartStopRequested","startRecording","Modal"],"mappings":"+lBA4BqBA,eAAeC,uBAChCC,yBACWC,KAAKC,UAAUC,cAAc,SAGxCC,0BACW,CAKH,6BACA,6BAOA,6BACA,4BACA,4BAKRC,4BACW,CACHC,mBAAoBC,SAASN,KAAKO,OAAOC,eACzCC,WAAYH,SAASN,KAAKO,OAAOG,kBACjCC,YAAaL,SAASN,KAAKO,OAAOK,oBAI1CC,4BACW,CACHC,OAAO,EACPC,YAAa,UACbC,MAAO,CACHC,eAAgB,UAChBC,UAAW,CAACC,MAAO,IACnBC,MAAO,CACHC,IAAKf,SAASN,KAAKO,OAAOG,mBAE9BY,OAAQ,CACJD,IAAKf,SAASN,KAAKO,OAAOK,sBAM1CW,uBAEW,EAGXC,yBACW,SAGXC,sBACWzB,KAAKO,OAAOmB,gBAGvBC,6BACW,8BAGXC,YAAYC,wBACEA,yBAAgB7B,KAAK8B,oBAGnCA,0BACQC,OAAOC,cAAcC,gBAAgB,cAC9B,OACAF,OAAOC,cAAcC,gBAAgB,aACrC,OAGXF,OAAOG,QAAQC,gDACR,mCAKDC,aAAeC,UAAUC,aAAaC,aAAa,CAACzB,OAAO,IAC3D0B,cAAgBH,UAAUC,aAAaG,gBAAgBzC,KAAKa,6BAI5D6B,QAAQC,WAAW,CAACP,aAAcI,gBAAgBI,KAAK5C,KAAK6C,+BAA+BC,KAAK9C,OAQ1G6C,+BAA+BE,eACpBC,UAAWC,YAAcF,WACN,cAAtBE,WAAWC,wBAENC,qBAAqBF,WAAWG,cAInCC,aAAeJ,WAAWK,SAEhCD,aAAaE,iBAAiB,GAAGC,iBAAiB,QAASxD,KAAKyD,wBAAwBX,KAAK9C,OAGpE,cAArBgD,UAAUE,wBAELQ,qBAAqBL,oBAGxBM,YAAcX,UAAUM,MAGxBM,eAAiB,IAAIC,YAC3BR,aAAaS,YAAYC,SAAQ,SAASC,OACnB,UAAfA,MAAMC,KACNL,eAAeM,SAASF,OAExBA,MAAMG,UAGdR,YAAYS,iBAAiBL,SAAQ,SAASM,UAC1CT,eAAeM,SAASG,kBAGvBX,qBAAqBE,gBAM9BH,0BACQzD,KAAKsE,eAAiBtE,KAAKuE,iBACtBC,4BACAC,uBAEAC,sBAAqB,QACrBC,cACD,kBAAU,6BAA8BC,oBACxC,kBAAU,uBAAwBA,qBAK9CC,oCACQ7E,KAAKsE,eAAiBtE,KAAKuE,iBACtBC,4BACAC,sBAEAK,iFAKF,cAAcC,kCACAH,mFACIA"}
\ No newline at end of file
diff --git a/lib/editor/tiny/plugins/recordrtc/amd/src/base_recorder.js b/lib/editor/tiny/plugins/recordrtc/amd/src/base_recorder.js
index 9350671b347a5..b773dd9f715c4 100644
--- a/lib/editor/tiny/plugins/recordrtc/amd/src/base_recorder.js
+++ b/lib/editor/tiny/plugins/recordrtc/amd/src/base_recorder.js
@@ -25,7 +25,7 @@
 import {getString, getStrings} from 'core/str';
 import {component} from './common';
 import Pending from 'core/pending';
-import {getData} from './options';
+import {getData, isPausingAllowed} from './options';
 import uploadFile from 'editor_tiny/uploader';
 import {add as addToast} from 'core/toast';
 import * as ModalEvents from 'core/modal_events';
@@ -40,6 +40,9 @@ import AlertModal from 'core/local/modal/alert';
 export default class {
 
     stopRequested = false;
+    buttonTimer = null;
+    pauseTime = null;
+    startTime = null;
 
     /**
      * Constructor for the RecordRTC class
@@ -60,6 +63,7 @@ export default class {
         this.modalRoot = modal.getRoot()[0];
         this.startStopButton = this.modalRoot.querySelector('button[data-action="startstop"]');
         this.uploadButton = this.modalRoot.querySelector('button[data-action="upload"]');
+        this.pauseResumeButton = this.modalRoot.querySelector('button[data-action="pauseresume"]');
 
         // Disable the record button untilt he stream is acquired.
         this.setRecordButtonState(false);
@@ -233,6 +237,8 @@ export default class {
             'maxfilesizehit',
             'maxfilesizehit_title',
             'uploadfailed',
+            'pause',
+            'resume',
         ]);
 
         prefetchTemplates([
@@ -316,6 +322,17 @@ export default class {
         container.classList.toggle('hide', !visible);
     }
 
+    /**
+     * Configure button visibility for the pause button.
+     *
+     * @param {boolean} visible Set the visibility of the button.
+     */
+    setPauseButtonVisibility(visible) {
+        if (this.pauseResumeButton) {
+            this.pauseResumeButton.classList.toggle('hidden', !visible);
+        }
+    }
+
     /**
      * Enable the upload button.
      *
@@ -334,6 +351,20 @@ export default class {
         const container = this.getButtonContainer('upload');
         container.classList.toggle('hide', !visible);
     }
+
+    /**
+     * Sets the state of the audio player, including visibility, muting, and controls.
+     *
+     * @param {boolean} state A boolean indicating the audio player state.
+     */
+    setPlayerState(state) {
+        // Mute or unmute the audio player and show or hide controls.
+        this.player.muted = !state;
+        this.player.controls = state;
+        // Toggle the 'hide' class on the player button container based on state.
+        this.getButtonContainer('player')?.classList.toggle('hide', !state);
+    }
+
     /**
      * Handle failure to capture the User Media.
      *
@@ -375,7 +406,7 @@ export default class {
      * @param {MouseEvent} event The click event
      */
     async outsideClickHandler(event) {
-        if (this.isRecording()) {
+        if (this.isRecording() || this.isPaused()) {
             // The user is recording.
             // Do not distract with a confirmation, just prevent closing.
             event.preventDefault();
@@ -414,6 +445,10 @@ export default class {
             if (action === 'upload') {
                 this.uploadRecording();
             }
+
+            if (action === 'pauseresume') {
+                this.handleRecordingPauseResumeRequested();
+            }
         }
     }
 
@@ -421,13 +456,26 @@ export default class {
      * Handle the click event for the recording start/stop button.
      */
     handleRecordingStartStopRequested() {
-        if (this.mediaRecorder?.state === 'recording') {
+        if (this.isRecording() || this.isPaused()) {
             this.requestRecordingStop();
         } else {
             this.startRecording();
         }
     }
 
+    /**
+     * Handle the click event for the recording pause/resume button.
+     */
+    handleRecordingPauseResumeRequested() {
+        if (this.isRecording()) {
+            // Pause recording.
+            this.mediaRecorder.pause();
+        } else if (this.isPaused()) {
+            // Resume recording.
+            this.mediaRecorder.resume();
+        }
+    }
+
     /**
      * Handle the media stream after it has finished.
      */
@@ -442,14 +490,16 @@ export default class {
         // Change the label to "Record again".
         this.setRecordButtonTextFromString('recordagain');
 
-        // Show audio player with controls enabled, and unmute.
-        this.player.muted = false;
-        this.player.controls = true;
-        this.getButtonContainer('player')?.classList.toggle('hide', false);
-
         // Show upload button.
         this.setUploadButtonVisibility(true);
+        this.setPlayerState(true);
         this.setUploadButtonState(true);
+
+        // Hide the pause button.
+        this.setPauseButtonVisibility(false);
+        if (this.mediaRecorder.state === 'inactive') {
+            this.setPauseButtonTextFromString('pause');
+        }
     }
 
     /**
@@ -512,7 +562,9 @@ export default class {
     static async display(editor) {
         const ModalClass = this.getModalClass();
         const modal = await ModalClass.create({
-            templateContext: {},
+            templateContext: {
+                isallowedpausing: isPausingAllowed(editor),
+            },
             large: true,
             removeOnClose: true,
         });
@@ -578,7 +630,7 @@ export default class {
     async setStopRecordingButton() {
         const {html, js} = await Templates.renderForPromise('tiny_recordrtc/timeremaining', this.getTimeRemaining());
         Templates.replaceNodeContents(this.startStopButton, html, js);
-        this.buttonTimer = setInterval(this.updateRecordButtonTime.bind(this), 500);
+        this.startButtonTimer();
     }
 
     /**
@@ -603,6 +655,17 @@ export default class {
         this.startStopButton.textContent = await getString(string, component);
     }
 
+    /**
+     * Set the text of the pause button using a language string.
+     *
+     * @param {string} string The string identifier
+     */
+    async setPauseButtonTextFromString(string) {
+        if (this.pauseResumeButton) {
+            this.pauseResumeButton.textContent = await getString(string, component);
+        }
+    }
+
     /**
      * Set the upload button text progress.
      *
@@ -626,6 +689,34 @@ export default class {
             clearInterval(this.buttonTimer);
         }
         this.buttonTimer = null;
+        this.pauseTime = null;
+        this.startTime = null;
+    }
+
+    /**
+     * Pause the timer for the stop recording button.
+     */
+    pauseButtonTimer() {
+        // Stop the countdown timer.
+        this.pauseTime = new Date().getTime(); // Store pause time.
+        if (this.buttonTimer) {
+            clearInterval(this.buttonTimer);
+        }
+    }
+
+    /**
+     * Start the timer for the start recording button.
+     * If the recording was paused, the timer will resume from the pause time.
+     */
+    startButtonTimer() {
+        if (this.pauseTime !== null) {
+            // Resume from pause.
+            const pauseDuration = new Date().getTime() - this.pauseTime;
+            // Adjust start time by pause duration.
+            this.startTime += pauseDuration;
+            this.pauseTime = null;
+        }
+        this.buttonTimer = setInterval(this.updateRecordButtonTime.bind(this), 500);
     }
 
     /**
@@ -634,8 +725,12 @@ export default class {
      * @returns {Object} The minutes and seconds remaining.
      */
     getTimeRemaining() {
-        // All times are in milliseconds
-        const now = new Date().getTime();
+        // All times are in milliseconds.
+        let now = new Date().getTime();
+        if (this.pauseTime !== null) {
+            // If paused, use pauseTime instead of current time.
+            now = this.pauseTime;
+        }
         const remaining = Math.floor(this.getTimeLimit() - ((now - this.startTime) / 1000));
 
         const formatter = new Intl.NumberFormat(navigator.language, {minimumIntegerDigits: 2});
@@ -666,6 +761,9 @@ export default class {
     requestRecordingStop() {
         if (this.mediaRecorder && this.mediaRecorder.state !== 'inactive') {
             this.stopRequested = true;
+            if (this.isPaused()) {
+                this.stopRecorder();
+            }
         } else {
             // There is no recording to stop, but the stream must still be cleaned up.
             this.cleanupStream();
@@ -673,6 +771,9 @@ export default class {
     }
 
     stopRecorder() {
+        if (this.isPaused()) {
+            this.pauseTime = null;
+        }
         this.mediaRecorder.stop();
 
         // Unmute the player so that the audio is heard during playback.
@@ -710,16 +811,39 @@ export default class {
      */
     handleStarted() {
         this.startTime = new Date().getTime();
+        if (isPausingAllowed(this.editor) && !this.isPaused()) {
+            this.setPauseButtonVisibility(true);
+        }
         this.setStopRecordingButton();
     }
 
+    /**
+     * Handle the mediaRecorder `pause` event.
+     *
+     * This event is called when the recording pauses.
+     */
+    handlePaused() {
+        this.pauseButtonTimer();
+        this.setPauseButtonTextFromString('resume');
+    }
+
+    /**
+     * Handle the mediaRecorder `resume` event.
+     *
+     * This event is called when the recording resumes.
+     */
+    handleResume() {
+        this.startButtonTimer();
+        this.setPauseButtonTextFromString('pause');
+    }
+
     /**
      * Handle the mediaRecorder `dataavailable` event.
      *
      * @param {Event} event
      */
     handleDataAvailable(event) {
-        if (this.isRecording()) {
+        if (this.isRecording() || this.isPaused()) {
             const newSize = this.data.blobSize + event.data.size;
             // Recording stops when either the maximum upload size is reached, or the time limit expires.
             // The time limit is checked in the `updateButtonTime` function.
@@ -756,6 +880,15 @@ export default class {
         return this.mediaRecorder?.state === 'recording';
     }
 
+    /**
+     * Check whether the recording is paused.
+     *
+     * @returns {boolean}
+     */
+    isPaused() {
+        return this.mediaRecorder?.state === 'paused';
+    }
+
     /**
      * Whether any data has been recorded.
      *
@@ -771,7 +904,7 @@ export default class {
     async startRecording() {
         if (this.mediaRecorder) {
             // Stop the existing recorder if it exists.
-            if (this.isRecording()) {
+            if (this.isRecording() || this.isPaused()) {
                 this.mediaRecorder.stop();
             }
 
@@ -782,6 +915,7 @@ export default class {
                     return;
                 }
                 this.setUploadButtonVisibility(false);
+                this.setPlayerState(false);
                 if (!this.stream.active) {
                     await this.captureUserMedia();
                 }
@@ -796,6 +930,8 @@ export default class {
         this.mediaRecorder.addEventListener('dataavailable', this.handleDataAvailable.bind(this));
         this.mediaRecorder.addEventListener('stop', this.handleStopped.bind(this));
         this.mediaRecorder.addEventListener('start', this.handleStarted.bind(this));
+        this.mediaRecorder.addEventListener('pause', this.handlePaused.bind(this));
+        this.mediaRecorder.addEventListener('resume', this.handleResume.bind(this));
 
         this.data = {
             chunks: [],
diff --git a/lib/editor/tiny/plugins/recordrtc/amd/src/options.js b/lib/editor/tiny/plugins/recordrtc/amd/src/options.js
index 631d7c93bac4d..0f790997ef8ed 100644
--- a/lib/editor/tiny/plugins/recordrtc/amd/src/options.js
+++ b/lib/editor/tiny/plugins/recordrtc/amd/src/options.js
@@ -28,6 +28,7 @@ const dataName = getPluginOptionName(pluginName, 'data');
 const videoAllowedName = getPluginOptionName(pluginName, 'videoAllowed');
 const audioAllowedName = getPluginOptionName(pluginName, 'audioAllowed');
 const screenAllowedName = getPluginOptionName(pluginName, 'screenAllowed');
+const pausingAllowedName = getPluginOptionName(pluginName, 'pausingAllowed');
 
 export const register = (editor) => {
     const registerOption = editor.options.register;
@@ -50,6 +51,11 @@ export const register = (editor) => {
         processor: 'boolean',
         "default": false,
     });
+
+    registerOption(pausingAllowedName, {
+        processor: 'boolean',
+        "default": false,
+    });
 };
 
 export const getData = (editor) => editor.options.get(dataName);
@@ -77,3 +83,11 @@ export const isVideoAllowed = (editor) => editor.options.get(videoAllowedName);
  * @returns {boolean}
  */
 export const isScreenAllowed = (editor) => editor.options.get(screenAllowedName);
+
+/**
+ * Whether pausing is allowed in this instance.
+ *
+ * @param {TinyMCE} editor
+ * @returns {boolean}
+ */
+export const isPausingAllowed = (editor) => editor.options.get(pausingAllowedName);
diff --git a/lib/editor/tiny/plugins/recordrtc/amd/src/screen_recorder.js b/lib/editor/tiny/plugins/recordrtc/amd/src/screen_recorder.js
index dddb30fca3890..e6d083a4e0ef6 100644
--- a/lib/editor/tiny/plugins/recordrtc/amd/src/screen_recorder.js
+++ b/lib/editor/tiny/plugins/recordrtc/amd/src/screen_recorder.js
@@ -164,7 +164,7 @@ export default class Screen extends BaseClass {
      * Callback that is called by the user clicking Stop screen sharing on the browser.
      */
     handleStopScreenSharing() {
-        if (this.isRecording()) {
+        if (this.isRecording() || this.isPaused()) {
             this.requestRecordingStop();
             this.cleanupStream();
         } else {
@@ -177,7 +177,7 @@ export default class Screen extends BaseClass {
     }
 
     handleRecordingStartStopRequested() {
-        if (this.isRecording()) {
+        if (this.isRecording() || this.isPaused()) {
             this.requestRecordingStop();
             this.cleanupStream();
         } else {
diff --git a/lib/editor/tiny/plugins/recordrtc/classes/plugininfo.php b/lib/editor/tiny/plugins/recordrtc/classes/plugininfo.php
index 7ffd338016b53..1691c66d36c1d 100644
--- a/lib/editor/tiny/plugins/recordrtc/classes/plugininfo.php
+++ b/lib/editor/tiny/plugins/recordrtc/classes/plugininfo.php
@@ -85,6 +85,7 @@ public static function get_plugin_configuration_for_context(
         $audioallowed = false;
         $videoallowed = false;
         $screenallowed = false;
+        $allowedpausing = (bool) get_config('tiny_recordrtc', 'allowedpausing');
         foreach ($allowedtypes as $value) {
             switch ($value) {
                 case constants::TINYRECORDRTC_AUDIO_TYPE:
@@ -136,6 +137,7 @@ public static function get_plugin_configuration_for_context(
             'videoAllowed' => $videoallowed,
             'audioAllowed' => $audioallowed,
             'screenAllowed' => $screenallowed,
+            'pausingAllowed' => $allowedpausing,
         ];
     }
 }
diff --git a/lib/editor/tiny/plugins/recordrtc/lang/en/tiny_recordrtc.php b/lib/editor/tiny/plugins/recordrtc/lang/en/tiny_recordrtc.php
index b8bc643bceb56..b27b62aab818f 100644
--- a/lib/editor/tiny/plugins/recordrtc/lang/en/tiny_recordrtc.php
+++ b/lib/editor/tiny/plugins/recordrtc/lang/en/tiny_recordrtc.php
@@ -22,6 +22,7 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+$string['allowedpausing'] = 'Allow pausing';
 $string['allowedtypes'] = 'Recording type';
 $string['allowedtypes_desc'] = 'Which types of recording can be made in the TinyMCE editor? In addition to this setting, there are capabilities which control access to recording options.';
 $string['attachrecording'] = 'Attach recording';
@@ -62,6 +63,7 @@
 $string['onlyaudio'] = 'Audio';
 $string['onlyscreen'] = 'Screen';
 $string['onlyvideo'] = 'Video';
+$string['pause'] = 'Pause';
 $string['pluginname'] = 'RecordRTC';
 $string['privacy:metadata'] = 'The RecordRTC plugin does not store any personal data.';
 $string['recordagain'] = 'Record again';
@@ -72,6 +74,7 @@
 $string['recordrtc:recordaudio'] = 'Record audio in the text editor';
 $string['recordrtc:recordscreen'] = 'Record screen in the text editor';
 $string['recordrtc:recordvideo'] = 'Record video in the text editor';
+$string['resume'] = 'Resume';
 $string['screenbitrate'] = 'Screen bitrate';
 $string['screenbitrate_desc'] = 'Quality of Screen recording (larger number means higher quality).';
 $string['screenbuttontitle'] = 'Record screen';
diff --git a/lib/editor/tiny/plugins/recordrtc/settings.php b/lib/editor/tiny/plugins/recordrtc/settings.php
index 5ede2a5aced21..b96e7b1166d66 100644
--- a/lib/editor/tiny/plugins/recordrtc/settings.php
+++ b/lib/editor/tiny/plugins/recordrtc/settings.php
@@ -129,4 +129,14 @@
     $default = '1280,720';
     $setting = new admin_setting_configselect('tiny_recordrtc/screensize', $name, $desc, $default, $options);
     $settings->add($setting);
+
+    // Pausing allowed.
+    $options = [
+        '1' => new lang_string('yes'),
+        '0' => new lang_string('no'),
+    ];
+
+    $name = get_string('allowedpausing', 'tiny_recordrtc');
+    $setting = new admin_setting_configselect('tiny_recordrtc/allowedpausing', $name, '', 0, $options);
+    $settings->add($setting);
 }
diff --git a/lib/editor/tiny/plugins/recordrtc/templates/audio_recorder.mustache b/lib/editor/tiny/plugins/recordrtc/templates/audio_recorder.mustache
index 950a11f7417c9..6b80531fe63e5 100644
--- a/lib/editor/tiny/plugins/recordrtc/templates/audio_recorder.mustache
+++ b/lib/editor/tiny/plugins/recordrtc/templates/audio_recorder.mustache
@@ -21,6 +21,7 @@
 
     Example context (json):
     {
+        "isallowedpausing": true
     }
 }}
 {{!
@@ -53,10 +54,15 @@
         </div>
         <div data-purpose="start-stop-container" class="row">
             <div class="col-1"></div>
-            <div class="col-10">
+            <div class="col-10 d-inline-flex w-100">
                 <button class="btn btn-lg btn-outline-danger btn-block" data-action="startstop">
                     {{#str}} startrecording, tiny_recordrtc {{/str}}
                 </button>
+                {{#isallowedpausing}}
+                    <button class="btn btn-lg btn-outline-primary ml-3 hidden" data-action="pauseresume">
+                        {{#str}} pause, tiny_recordrtc {{/str}}
+                    </button>
+                {{/isallowedpausing}}
             </div>
             <div class="col-1"></div>
         </div>
diff --git a/lib/editor/tiny/plugins/recordrtc/templates/screen_recorder.mustache b/lib/editor/tiny/plugins/recordrtc/templates/screen_recorder.mustache
index dadd10ab72e83..fd340292987cb 100644
--- a/lib/editor/tiny/plugins/recordrtc/templates/screen_recorder.mustache
+++ b/lib/editor/tiny/plugins/recordrtc/templates/screen_recorder.mustache
@@ -21,6 +21,7 @@
 
     Example context (json):
     {
+        "isallowedpausing": true
     }
 }}
 {{< core/modal }}
@@ -47,10 +48,15 @@
             </div>
             <div data-purpose="start-stop-container" class="row">
                 <div class="col-1"></div>
-                <div class="col-10">
+                <div class="col-10 d-inline-flex w-100">
                     <button class="btn btn-lg btn-outline-danger btn-block" data-action="startstop">
                         {{#str}} startrecording, tiny_recordrtc {{/str}}
                     </button>
+                    {{#isallowedpausing}}
+                        <button class="btn btn-lg btn-outline-primary ml-3 hidden" data-action="pauseresume">
+                            {{#str}} pause, tiny_recordrtc {{/str}}
+                        </button>
+                    {{/isallowedpausing}}
                 </div>
                 <div class="col-1"></div>
             </div>
diff --git a/lib/editor/tiny/plugins/recordrtc/templates/video_recorder.mustache b/lib/editor/tiny/plugins/recordrtc/templates/video_recorder.mustache
index 0c80b8e1ef4f2..2e2b00b9b297d 100644
--- a/lib/editor/tiny/plugins/recordrtc/templates/video_recorder.mustache
+++ b/lib/editor/tiny/plugins/recordrtc/templates/video_recorder.mustache
@@ -21,6 +21,7 @@
 
     Example context (json):
     {
+        "isallowedpausing": true
     }
 }}
 {{!
@@ -53,10 +54,15 @@
         </div>
         <div data-purpose="start-stop-container" class="row">
             <div class="col-1"></div>
-            <div class="col-10">
+            <div class="col-10 d-inline-flex w-100">
                 <button class="btn btn-lg btn-outline-danger btn-block" data-action="startstop">
                     {{#str}} startrecording, tiny_recordrtc {{/str}}
                 </button>
+                {{#isallowedpausing}}
+                    <button class="btn btn-lg btn-outline-primary ml-3 hidden" data-action="pauseresume">
+                        {{#str}} pause, tiny_recordrtc {{/str}}
+                    </button>
+                {{/isallowedpausing}}
             </div>
             <div class="col-1"></div>
         </div>
diff --git a/lib/editor/tiny/plugins/recordrtc/version.php b/lib/editor/tiny/plugins/recordrtc/version.php
index 10d0922a14d16..e83c9049480a3 100644
--- a/lib/editor/tiny/plugins/recordrtc/version.php
+++ b/lib/editor/tiny/plugins/recordrtc/version.php
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2024042400;
+$plugin->version   = 2024053100;
 $plugin->requires  = 2024041600;
 $plugin->component = 'tiny_recordrtc';

From 062acb05296d08abed353e6b942da62209ae39d0 Mon Sep 17 00:00:00 2001
From: Sara Arjona <sara@moodle.com>
Date: Tue, 18 Jun 2024 16:04:55 +0200
Subject: [PATCH 037/119] MDL-82233 badges: Display awarded users only when it
 applies

The message with the number of uses who have awarded a badge
were displayed always (even when the badge was disabled).
---
 badges/overview.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/badges/overview.php b/badges/overview.php
index dbf814fc7788e..87ea1d76948ee 100644
--- a/badges/overview.php
+++ b/badges/overview.php
@@ -75,7 +75,7 @@
 
 if ($awards == 'cron') {
     echo $OUTPUT->notification(get_string('awardoncron', 'badges'), 'notifysuccess');
-} else if ($awards != 0) {
+} else if ((int)$awards > 0) {
     echo $OUTPUT->notification(get_string('numawardstat', 'badges', $awards), 'notifysuccess');
 }
 echo $output->print_badge_status_box($badge);

From b01fea1afa472e272397c7b85de2f78bf5313fe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20B=C3=B6sch?= <luca.boesch@bfh.ch>
Date: Fri, 24 May 2024 18:11:13 +0200
Subject: [PATCH 038/119] MDL-82008 backup: Format 'Continue' and 'Cancel'
 button to have a margin

---
 backup/util/ui/renderer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backup/util/ui/renderer.php b/backup/util/ui/renderer.php
index df14d273b7d1c..938fd5469efbf 100644
--- a/backup/util/ui/renderer.php
+++ b/backup/util/ui/renderer.php
@@ -522,7 +522,7 @@ public function precheck_notices($results) {
     public function substage_buttons($haserrors) {
         $output  = html_writer::start_tag('div', array('continuebutton'));
         if (!$haserrors) {
-            $attrs = array('type' => 'submit', 'value' => get_string('continue'), 'class' => 'btn btn-primary');
+            $attrs = ['type' => 'submit', 'value' => get_string('continue'), 'class' => 'btn btn-primary mr-1'];
             $output .= html_writer::empty_tag('input', $attrs);
         }
         $attrs = array('type' => 'submit', 'name' => 'cancel', 'value' => get_string('cancel'), 'class' => 'btn btn-secondary');

From 3b419c4540f805ec26b6332a2b89bd46d3557581 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikel=20Mart=C3=ADn?= <mikel@moodle.com>
Date: Tue, 11 Jun 2024 12:02:07 +0200
Subject: [PATCH 039/119] MDL-82160 renderer: Add render_context_header method
 to core_renderer

In MDL-81597 the original render_context_header method was removed and converted to a template.
That caused a regression, so this patch adds the method again but using the new template.
---
 .upgradenotes/MDL-82160-2024061112162023.yml |  7 +++++++
 lib/outputrenderers.php                      | 14 ++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 .upgradenotes/MDL-82160-2024061112162023.yml

diff --git a/.upgradenotes/MDL-82160-2024061112162023.yml b/.upgradenotes/MDL-82160-2024061112162023.yml
new file mode 100644
index 0000000000000..06c5fbf8b1264
--- /dev/null
+++ b/.upgradenotes/MDL-82160-2024061112162023.yml
@@ -0,0 +1,7 @@
+issueNumber: MDL-82160
+notes:
+  theme:
+    - message: >-
+        The method `core_renderer::render_context_header` has been deprecated
+        please use core_renderer::render($contextheader) instead
+      type: deprecated
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 918db5ec79d00..7b2e19354bb80 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -4601,6 +4601,20 @@ public function context_header($headerinfo = null, $headinglevel = 1) {
         return $this->render($contextheader);
     }
 
+    /**
+      * Renders the header bar.
+      *
+      * @param context_header $contextheader Header bar object.
+      * @return string HTML for the header bar.
+      * @deprecated since 4.5 Please use core_renderer::render($contextheader) instead
+      * @todo MDL-82163 This will be deleted in Moodle 6.0.
+      */
+    #[\core\attribute\deprecated('core_renderer::render($contextheader)', since: '4.5', mdl: 'MDL-82160')]
+    protected function render_context_header(context_header $contextheader) {
+        $context = $contextheader->export_for_template($this);
+        return $this->render_from_template('core/context_header', $context);
+    }
+
     /**
      * Renders the skip links for the page.
      *

From f166b15b28f8d0d6d5c16d3cbbd6300280d875a5 Mon Sep 17 00:00:00 2001
From: ferranrecio <ferran@moodle.com>
Date: Wed, 12 Jun 2024 13:49:40 +0200
Subject: [PATCH 040/119] MDL-81769 core_courseformat: prevent delegated
 section modules actions

---
 course/format/classes/stateactions.php | 24 ++++++++++++++++++++++++
 course/lib.php                         |  6 ++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/course/format/classes/stateactions.php b/course/format/classes/stateactions.php
index 34535375d967c..8ee286a717cfa 100644
--- a/course/format/classes/stateactions.php
+++ b/course/format/classes/stateactions.php
@@ -705,6 +705,10 @@ protected function set_cm_indentation(
         $this->validate_cms($course, $ids, __FUNCTION__, ['moodle/course:manageactivities']);
         $modinfo = get_fast_modinfo($course);
         $cms = $this->get_cm_info($modinfo, $ids);
+        $cms = $this->filter_cms_with_section_delegate($cms);
+        if (empty($cms)) {
+            return;
+        }
         list($insql, $inparams) = $DB->get_in_or_equal(array_keys($cms), SQL_PARAMS_NAMED);
         $DB->set_field_select('course_modules', 'indent', $indent, "id $insql", $inparams);
         rebuild_course_cache($course->id, false, true);
@@ -1071,6 +1075,26 @@ public function course_state(
         }
     }
 
+    /**
+     * Remove course modules with section delegate from a list.
+     *
+     * @param cm_info[] $cms the list of course modules to filter.
+     * @return cm_info[] the filtered list of course modules indexed by id.
+     */
+    protected function filter_cms_with_section_delegate(array $cms): array {
+        $filtered = [];
+        $modules = [];
+        foreach ($cms as $cm) {
+            if (!isset($modules[$cm->module])) {
+                $modules[$cm->module] = sectiondelegate::has_delegate_class('mod_' . $cm->modname);
+            }
+            if (!$modules[$cm->module]) {
+                $filtered[$cm->id] = $cm;
+            }
+        }
+        return $filtered;
+    }
+
     /**
      * Checks related to sections: course format support them, all given sections exist and topic 0 is not included.
      *
diff --git a/course/lib.php b/course/lib.php
index 3a3fb8f556ac9..37a28627d1b70 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -29,6 +29,7 @@
 use core_course\external\course_summary_exporter;
 use core_courseformat\base as course_format;
 use core_courseformat\formatactions;
+use core_courseformat\sectiondelegate;
 use core\output\local\action_menu\subpanel as action_menu_subpanel;
 
 require_once($CFG->libdir.'/completionlib.php');
@@ -1430,6 +1431,7 @@ function course_get_cm_edit_actions(cm_info $mod, $indent = -1, $sr = null) {
     $courseformat = course_get_format($mod->get_course());
     $usecomponents = $courseformat->supports_components();
     $sectioninfo = $mod->get_section_info();
+    $hasdelegatesection = sectiondelegate::has_delegate_class('mod_'.$mod->modname);
 
     $editcaps = array('moodle/course:manageactivities', 'moodle/course:activityvisibility', 'moodle/role:assign');
     $dupecaps = array('moodle/backup:backuptargetimport', 'moodle/restore:restoretargetimport');
@@ -1488,7 +1490,7 @@ function course_get_cm_edit_actions(cm_info $mod, $indent = -1, $sr = null) {
     }
 
     // Indent.
-    if ($hasmanageactivities && $indent >= 0) {
+    if ($hasmanageactivities && $indent >= 0 && !$hasdelegatesection) {
         $indentlimits = new stdClass();
         $indentlimits->min = 0;
         // Legacy indentation could continue using a limit of 16,
@@ -1569,7 +1571,7 @@ function course_get_cm_edit_actions(cm_info $mod, $indent = -1, $sr = null) {
     }
 
     // Assign.
-    if (has_capability('moodle/role:assign', $modcontext)){
+    if (has_capability('moodle/role:assign', $modcontext) && !$hasdelegatesection) {
         $actions['assign'] = new action_menu_link_secondary(
             new moodle_url('/admin/roles/assign.php', array('contextid' => $modcontext->id)),
             new pix_icon('t/assignroles', '', 'moodle', array('class' => 'iconsmall')),

From 8a4e52765a0e05eaffb26f6cb522e76acf7f46e3 Mon Sep 17 00:00:00 2001
From: Daniel Ziegenberg <daniel@ziegenberg.at>
Date: Wed, 27 Mar 2024 21:41:40 +0100
Subject: [PATCH 041/119] MDL-75022 backup: Final deprecation of
 core_backup\copy

Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
---
 .upgradenotes/MDL-75022-2024062111052809.yml |   8 +
 backup/util/ui/classes/copy/copy.php         | 170 -------------------
 2 files changed, 8 insertions(+), 170 deletions(-)
 create mode 100644 .upgradenotes/MDL-75022-2024062111052809.yml
 delete mode 100644 backup/util/ui/classes/copy/copy.php

diff --git a/.upgradenotes/MDL-75022-2024062111052809.yml b/.upgradenotes/MDL-75022-2024062111052809.yml
new file mode 100644
index 0000000000000..cdc3851d45d85
--- /dev/null
+++ b/.upgradenotes/MDL-75022-2024062111052809.yml
@@ -0,0 +1,8 @@
+issueNumber: MDL-75022
+notes:
+  core_backup:
+    - message: >-
+        Final deprecation and removal of core_backup\copy\copy in
+        backup/util/ui/classes/copy.php. Please use copy_helper from
+        backup/util/helper/copy_helper.class.php instead.
+      type: removed
diff --git a/backup/util/ui/classes/copy/copy.php b/backup/util/ui/classes/copy/copy.php
deleted file mode 100644
index 7adddafc01ed1..0000000000000
--- a/backup/util/ui/classes/copy/copy.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Course copy class.
- *
- * Handles procesing data submitted by UI copy form
- * and sets up the course copy process.
- *
- * @package    core_backup
- * @copyright  2020 onward The Moodle Users Association <https://moodleassociation.org/>
- * @author     Matt Porritt <mattp@catalyst-au.net>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @deprecated since Moodle 4.1. Use copy_helper instead
- */
-
-namespace core_backup\copy;
-
-defined('MOODLE_INTERNAL') || die;
-
-global $CFG;
-require_once($CFG->dirroot . '/backup/util/includes/backup_includes.php');
-require_once($CFG->dirroot . '/backup/util/includes/restore_includes.php');
-
-/**
- * Course copy class.
- *
- * Handles procesing data submitted by UI copy form
- * and sets up the course copy process.
- *
- * @package    core_backup
- * @copyright  2020 onward The Moodle Users Association <https://moodleassociation.org/>
- * @author     Matt Porritt <mattp@catalyst-au.net>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @deprecated since Moodle 4.1 MDL-74548 - please use copy_helper instead
- * @todo MDL-75022 This class will be deleted in Moodle 4.5
- * @see copy_helper
- */
-class copy {
-
-    /**
-     * The fields required for copy operations.
-     *
-     * @var array
-     */
-    private $copyfields = array(
-        'courseid',  // Course id integer.
-        'fullname', // Fullname of the destination course.
-        'shortname', // Shortname of the destination course.
-        'category', // Category integer ID that contains the destination course.
-        'visible', // Integer to detrmine of the copied course will be visible.
-        'startdate', // Integer timestamp of the start of the destination course.
-        'enddate', // Integer timestamp of the end of the destination course.
-        'idnumber', // ID of the destination course.
-        'userdata', // Integer to determine if the copied course will contain user data.
-    );
-
-    /**
-     * Data required for course copy operations.
-     *
-     * @var array
-     */
-    private $copydata = array();
-
-    /**
-     * List of role ids to keep enrolments for in the destination course.
-     *
-     * @var array
-     */
-    private $roles = array();
-
-    /**
-     * Constructor for the class.
-     *
-     * @param \stdClass $formdata Data from the validated course copy form.
-     */
-    public function __construct(\stdClass $formdata) {
-        debugging('Class \course_backup\copy\copy is deprecated. Please use the copy_helper class instead.');
-        $this->copydata = $this->get_copy_data($formdata);
-        $this->roles = $this->get_enrollment_roles($formdata);
-    }
-
-    /**
-     * Extract the enrolment roles to keep in the copied course
-     * from the raw submitted form data.
-     *
-     * @param \stdClass $formdata Data from the validated course copy form.
-     * @return array $keptroles The roles to keep.
-     */
-    private function get_enrollment_roles(\stdClass $formdata): array {
-        $keptroles = array();
-
-        foreach ($formdata as $key => $value) {
-            if ((substr($key, 0, 5 ) === 'role_') && ($value != 0)) {
-                $keptroles[] = $value;
-            }
-        }
-
-        return $keptroles;
-    }
-
-    /**
-     *  Take the validated form data and extract the required information for copy operations.
-     *
-     * @param \stdClass $formdata Data from the validated course copy form.
-     * @return \stdClass $copydata Data required for course copy operations.
-     * @throws \moodle_exception If one of the required copy fields is missing
-     */
-    private function get_copy_data(\stdClass $formdata): \stdClass {
-        $copydata = new \stdClass();
-
-        foreach ($this->copyfields as $field) {
-            if (isset($formdata->{$field})) {
-                $copydata->{$field} = $formdata->{$field};
-            } else {
-                throw new \moodle_exception('copyfieldnotfound', 'backup', '', null, $field);
-            }
-        }
-
-        return $copydata;
-    }
-
-    /**
-     * Creates a course copy.
-     * Sets up relevant controllers and adhoc task.
-     *
-     * @return array $copyids THe backup and restore controller ids.
-     * @deprecated since Moodle 4.1 MDL-74548 - please use copy_helper instead.
-     * @todo MDL-75023 This method will be deleted in Moodle 4.5
-     * @see copy_helper::process_formdata()
-     * @see copy_helper::create_copy()
-     */
-    public function create_copy(): array {
-        debugging('The method \core_backup\copy\copy::create_copy() is deprecated.
-            Please use the methods provided by copy_helper instead.', DEBUG_DEVELOPER);
-        $copydata = clone($this->copydata);
-        $copydata->keptroles = $this->roles;
-        return \copy_helper::create_copy($copydata);
-    }
-
-    /**
-     * Get the in progress course copy operations for a user.
-     *
-     * @param int $userid User id to get the course copies for.
-     * @param int $courseid The optional source course id to get copies for.
-     * @return array $copies Details of the inprogress copies.
-     * @deprecated since Moodle 4.1 MDL-74548 - please use copy_helper::get_copies() instead.
-     * @todo MDL-75024 This method will be deleted in Moodle 4.5
-     * @see copy_helper::get_copies()
-     */
-    public static function get_copies(int $userid, int $courseid=0): array {
-        debugging('The method \core_backup\copy\copy::get_copies() is deprecated.
-            Please use copy_helper::get_copies() instead.', DEBUG_DEVELOPER);
-
-        return \copy_helper::get_copies($userid, $coursied);
-    }
-}

From f69b0e189c75b65140fdeb0977c3367eff63831f Mon Sep 17 00:00:00 2001
From: Daniel Ziegenberg <daniel@ziegenberg.at>
Date: Thu, 24 Nov 2022 23:09:31 +0100
Subject: [PATCH 042/119] MDL-31192 core_webservice: do not render div inside
 span

`<span>` tags only permit "phrasing content" but `<div>` (and also the
`<ins>` tag) are flow content. So, switching to div all along.

Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
---
 webservice/renderer.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/webservice/renderer.php b/webservice/renderer.php
index 5bce6234a0c68..f9466b0f8bd69 100644
--- a/webservice/renderer.php
+++ b/webservice/renderer.php
@@ -565,7 +565,6 @@ public function xmlrpc_param_description_html($paramdescription, $indentation =
      * @return string HTML code
      */
     public function colored_box_with_pre_tag($title, $content, $rgb = 'FEEBE5') {
-        //TODO MDL-31192 this tag removes xhtml strict error but cause warning
         $coloredbox = html_writer::start_tag('div', array());
         $coloredbox .= html_writer::start_tag('div',
                         array('style' => "border:solid 1px #DEDEDE;background:#" . $rgb
@@ -706,7 +705,7 @@ public function documentation_html($functions, $printableformat, $activatedproto
             $documentationhtml .= $br;
             foreach ($description->parameters_desc->keys as $paramname => $paramdesc) {
                 // a argument documentation
-                $documentationhtml .= html_writer::start_tag('span', array('style' => 'font-size:80%'));
+                $documentationhtml .= html_writer::start_tag('div', ['style' => 'font-size:80%']);
 
                 if ($paramdesc->required == VALUE_REQUIRED) {
                     $required = get_string('required', 'webservice');
@@ -752,7 +751,7 @@ public function documentation_html($functions, $printableformat, $activatedproto
                                                     $paramdesc, $paramname), ENT_COMPAT),
                                     'FEEBE5');
                 }
-                $documentationhtml .= html_writer::end_tag('span');
+                $documentationhtml .= html_writer::end_tag('div');
             }
             $documentationhtml .= $br . $br;
 
@@ -763,7 +762,7 @@ public function documentation_html($functions, $printableformat, $activatedproto
             $documentationhtml .= html_writer::end_tag('span');
             $documentationhtml .= $br;
             // function response description
-            $documentationhtml .= html_writer::start_tag('span', array('style' => 'font-size:80%'));
+            $documentationhtml .= html_writer::start_tag('div', ['style' => 'font-size:80%']);
             if (!empty($description->returns_desc->desc)) {
                 $documentationhtml .= $description->returns_desc->desc;
                 $documentationhtml .= $br . $br;
@@ -795,7 +794,7 @@ public function documentation_html($functions, $printableformat, $activatedproto
                                     'FEEBE5');
                 }
             }
-            $documentationhtml .= html_writer::end_tag('span');
+            $documentationhtml .= html_writer::end_tag('div');
             $documentationhtml .= $br . $br;
 
             // function errors documentation for REST protocol
@@ -804,7 +803,7 @@ public function documentation_html($functions, $printableformat, $activatedproto
                 $documentationhtml .= get_string('errorcodes', 'webservice');
                 $documentationhtml .= html_writer::end_tag('span');
                 $documentationhtml .= $br . $br;
-                $documentationhtml .= html_writer::start_tag('span', array('style' => 'font-size:80%'));
+                $documentationhtml .= html_writer::start_tag('div', ['style' => 'font-size:80%']);
                 $errormessage = get_string('invalidparameter', 'debug');
                 $restexceptiontext = <<<EOF
 <?xml version="1.0" encoding="UTF-8"?>
@@ -818,7 +817,7 @@ public function documentation_html($functions, $printableformat, $activatedproto
                                 htmlentities($restexceptiontext, ENT_COMPAT),
                                 'FEEBE5');
 
-                $documentationhtml .= html_writer::end_tag('span');
+                $documentationhtml .= html_writer::end_tag('div');
             }
             $documentationhtml .= $br . $br;
 

From 047bd74c8b26d69a6b8d78cd291487ad38ed3dc6 Mon Sep 17 00:00:00 2001
From: Daniel Ziegenberg <daniel@ziegenberg.at>
Date: Wed, 27 Mar 2024 21:19:42 +0100
Subject: [PATCH 043/119] MDL-74843 tasks: Deprecation
 \core\task\manager::ensure_adhoc_task_qos

Signed-off-by: Daniel Ziegenberg <daniel@ziegenberg.at>
---
 .upgradenotes/MDL-74843-2024062023364909.yml |  5 ++
 lib/classes/task/manager.php                 | 80 +-------------------
 lib/upgrade.txt                              |  2 +-
 3 files changed, 10 insertions(+), 77 deletions(-)
 create mode 100644 .upgradenotes/MDL-74843-2024062023364909.yml

diff --git a/.upgradenotes/MDL-74843-2024062023364909.yml b/.upgradenotes/MDL-74843-2024062023364909.yml
new file mode 100644
index 0000000000000..ce34d4d43644f
--- /dev/null
+++ b/.upgradenotes/MDL-74843-2024062023364909.yml
@@ -0,0 +1,5 @@
+issueNumber: MDL-74843
+notes:
+  core:
+    - message: 'Final deprecation of \core\task\manager::ensure_adhoc_task_qos()'
+      type: removed
diff --git a/lib/classes/task/manager.php b/lib/classes/task/manager.php
index 5aba3f187c937..83d4736a5fe5d 100644
--- a/lib/classes/task/manager.php
+++ b/lib/classes/task/manager.php
@@ -664,83 +664,11 @@ public static function get_failed_adhoc_tasks(int $delay = 0): array {
     }
 
     /**
-     * Ensure quality of service for the ad hoc task queue.
-     *
-     * This reshuffles the adhoc tasks queue to balance by type to ensure a
-     * level of quality of service per type, while still maintaining the
-     * relative order of tasks queued by timestamp.
-     *
-     * @param array $records array of task records
-     * @param array $records array of same task records shuffled
-     * @deprecated since Moodle 4.1 MDL-67648 - please do not use this method anymore.
-     * @todo MDL-74843 This method will be deleted in Moodle 4.5
-     * @see \core\task\manager::get_next_adhoc_task
+     * @deprecated since Moodle 4.1 MDL-67648
      */
-    public static function ensure_adhoc_task_qos(array $records): array {
-        debugging('The method \core\task\manager::ensure_adhoc_task_qos is deprecated.
-             Please use \core\task\manager::get_next_adhoc_task instead.', DEBUG_DEVELOPER);
-
-        $count = count($records);
-        if ($count == 0) {
-            return $records;
-        }
-
-        $queues = []; // This holds a queue for each type of adhoc task.
-        $limits = []; // The relative limits of each type of task.
-        $limittotal = 0;
-
-        // Split the single queue up into queues per type.
-        foreach ($records as $record) {
-            $type = $record->classname;
-            if (!array_key_exists($type, $queues)) {
-                $queues[$type] = [];
-            }
-            if (!array_key_exists($type, $limits)) {
-                $limits[$type] = 1;
-                $limittotal += 1;
-            }
-            $queues[$type][] = $record;
-        }
-
-        $qos = []; // Our new queue with ensured quality of service.
-        $seed = $count % $limittotal; // Which task queue to shuffle from first?
-
-        $move = 1; // How many tasks to shuffle at a time.
-        do {
-            $shuffled = 0;
-
-            // Now cycle through task type queues and interleaving the tasks
-            // back into a single queue.
-            foreach ($limits as $type => $limit) {
-
-                // Just interleaving the queue is not enough, because after
-                // any task is processed the whole queue is rebuilt again. So
-                // we need to deterministically start on different types of
-                // tasks so that *on average* we rotate through each type of task.
-                //
-                // We achieve this by using a $seed to start moving tasks off a
-                // different queue each time. The seed is based on the task count
-                // modulo the number of types of tasks on the queue. As we count
-                // down this naturally cycles through each type of record.
-                if ($seed < 1) {
-                    $shuffled = 1;
-                    $seed += 1;
-                    continue;
-                }
-                $tasks = array_splice($queues[$type], 0, $move);
-                $qos = array_merge($qos, $tasks);
-
-                // Stop if we didn't move any tasks onto the main queue.
-                $shuffled += count($tasks);
-            }
-            // Generally the only tasks that matter are those that are near the start so
-            // after we have shuffled the first few 1 by 1, start shuffling larger groups.
-            if (count($qos) >= (4 * count($limits))) {
-                $move *= 2;
-            }
-        } while ($shuffled > 0);
-
-        return $qos;
+    #[\core\attribute\deprecated('\core\task\manager::get_next_adhoc_task()', since: '4.1', mdl: 'MDL-67648', final: true)]
+    public static function ensure_adhoc_task_qos(): void {
+        \core\deprecation::emit_deprecation_if_present([self::class, __FUNCTION__]);
     }
 
     /**
diff --git a/lib/upgrade.txt b/lib/upgrade.txt
index fa87a5084b231..01ff074df91e2 100644
--- a/lib/upgrade.txt
+++ b/lib/upgrade.txt
@@ -515,7 +515,7 @@ being forced open in all behat tests.
     - upgrade_analytics_fix_contextids_defaults()
     - upgrade_convert_hub_config_site_param_names()
     - upgrade_rename_prediction_actions_useful_incorrectly_flagged()
-* The method ensure_adhoc_task_qos() in lib/classes/task/manager.php  has been deprecated, please use get_next_adhoc_task()
+* The method ensure_adhoc_task_qos() in lib/classes/task/manager.php has been deprecated, please use get_next_adhoc_task()
   instead.
 * New setting $CFG->enrolments_sync_interval controls the minimum time in seconds between re-synchronization of enrollment via enrol_check_plugins.
   This only applies to web requests without a session such as webservice calls, tokenpluginfile.php and rss links Function

From a370ce73ae4729fe65291421b522be1809d2eb13 Mon Sep 17 00:00:00 2001
From: AMOS bot <amos@moodle.org>
Date: Sat, 22 Jun 2024 00:14:12 +0000
Subject: [PATCH 044/119] Automatically generated installer lang files

---
 install/lang/de_kids/langconfig.php    | 2 +-
 install/lang/el_kids/langconfig.php    | 2 +-
 install/lang/en_kids/langconfig.php    | 2 +-
 install/lang/es_mx_kids/langconfig.php | 2 +-
 install/lang/ja_kids/langconfig.php    | 2 +-
 install/lang/pt_br_kids/langconfig.php | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/install/lang/de_kids/langconfig.php b/install/lang/de_kids/langconfig.php
index 32a2d5992ec34..7b5842a1696f0 100644
--- a/install/lang/de_kids/langconfig.php
+++ b/install/lang/de_kids/langconfig.php
@@ -31,4 +31,4 @@
 
 $string['parentlanguage'] = 'de_du';
 $string['thisdirection'] = 'ltr';
-$string['thislanguage'] = 'Deutsch (kids)';
+$string['thislanguage'] = 'Deutsch';
diff --git a/install/lang/el_kids/langconfig.php b/install/lang/el_kids/langconfig.php
index 00def5ad34895..644ca01059a55 100644
--- a/install/lang/el_kids/langconfig.php
+++ b/install/lang/el_kids/langconfig.php
@@ -30,4 +30,4 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['parentlanguage'] = 'el';
-$string['thislanguage'] = 'Ελληνικά για παιδιά';
+$string['thislanguage'] = 'Ελληνικά';
diff --git a/install/lang/en_kids/langconfig.php b/install/lang/en_kids/langconfig.php
index 64bfc834f0fc5..5016ecaeff711 100644
--- a/install/lang/en_kids/langconfig.php
+++ b/install/lang/en_kids/langconfig.php
@@ -30,4 +30,4 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['parentlanguage'] = 'en';
-$string['thislanguage'] = 'English (kids)';
+$string['thislanguage'] = 'English';
diff --git a/install/lang/es_mx_kids/langconfig.php b/install/lang/es_mx_kids/langconfig.php
index 662a0b2075e3f..77f53f4229e24 100644
--- a/install/lang/es_mx_kids/langconfig.php
+++ b/install/lang/es_mx_kids/langconfig.php
@@ -30,4 +30,4 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['parentlanguage'] = 'es_mx';
-$string['thislanguage'] = 'Español - México para niños';
+$string['thislanguage'] = 'Español - México';
diff --git a/install/lang/ja_kids/langconfig.php b/install/lang/ja_kids/langconfig.php
index 6cc9bce34805b..13d08143fd076 100644
--- a/install/lang/ja_kids/langconfig.php
+++ b/install/lang/ja_kids/langconfig.php
@@ -31,4 +31,4 @@
 
 $string['parentlanguage'] = 'ja';
 $string['thisdirection'] = 'ltr';
-$string['thislanguage'] = 'Japanese (kids)';
+$string['thislanguage'] = 'Japanese';
diff --git a/install/lang/pt_br_kids/langconfig.php b/install/lang/pt_br_kids/langconfig.php
index 5151effc71e86..cc172aea0ca5d 100644
--- a/install/lang/pt_br_kids/langconfig.php
+++ b/install/lang/pt_br_kids/langconfig.php
@@ -30,4 +30,4 @@
 defined('MOODLE_INTERNAL') || die();
 
 $string['parentlanguage'] = 'pt_br';
-$string['thislanguage'] = 'Português Brasil para Crianças';
+$string['thislanguage'] = 'Português Brasil';

From ee8a16eccff31860223b060b4af1908d9c50a8b0 Mon Sep 17 00:00:00 2001
From: David Woloszyn <david.woloszyn@moodle.com>
Date: Fri, 8 Mar 2024 22:11:35 +1100
Subject: [PATCH 045/119] MDL-79718 mod_quiz: Send notifications for
 approaching open dates

---
 mod/quiz/classes/notification_helper.php      | 281 ++++++++++++++++++
 ...queue_all_quiz_open_notification_tasks.php |  44 +++
 ...quiz_open_notification_tasks_for_users.php |  42 +++
 ...nd_quiz_open_soon_notification_to_user.php |  35 +++
 mod/quiz/db/messages.php                      |   9 +
 mod/quiz/db/tasks.php                         |  11 +-
 mod/quiz/lang/en/quiz.php                     |   8 +
 mod/quiz/tests/notification_helper_test.php   | 241 +++++++++++++++
 mod/quiz/version.php                          |   2 +-
 9 files changed, 671 insertions(+), 2 deletions(-)
 create mode 100644 mod/quiz/classes/notification_helper.php
 create mode 100644 mod/quiz/classes/task/queue_all_quiz_open_notification_tasks.php
 create mode 100644 mod/quiz/classes/task/queue_quiz_open_notification_tasks_for_users.php
 create mode 100644 mod/quiz/classes/task/send_quiz_open_soon_notification_to_user.php
 create mode 100644 mod/quiz/tests/notification_helper_test.php

diff --git a/mod/quiz/classes/notification_helper.php b/mod/quiz/classes/notification_helper.php
new file mode 100644
index 0000000000000..53a34e50c28e1
--- /dev/null
+++ b/mod/quiz/classes/notification_helper.php
@@ -0,0 +1,281 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace mod_quiz;
+
+use stdClass;
+
+/**
+ * Helper for sending quiz related notifications.
+ *
+ * @package    mod_quiz
+ * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class notification_helper {
+    /**
+     * @var int Default date range of 48 hours.
+     */
+    private const DEFAULT_DATE_RANGE = (DAYSECS * 2);
+
+    /**
+     * Get all quizzes that have an approaching open date (includes users and groups with open date overrides).
+     *
+     * @return \moodle_recordset Returns the matching quiz records.
+     */
+    public static function get_quizzes_within_date_range(): \moodle_recordset {
+        global $DB;
+
+        $timenow = self::get_time_now();
+        $futuretime = self::get_future_time();
+
+        $sql = "SELECT DISTINCT q.id
+                  FROM {quiz} q
+                  JOIN {course_modules} cm ON q.id = cm.instance
+                  JOIN {modules} m ON cm.module = m.id AND m.name = :modulename
+             LEFT JOIN {quiz_overrides} qo ON q.id = qo.quiz
+                 WHERE (q.timeopen < :futuretime OR qo.timeopen < :qo_futuretime)
+                   AND (q.timeopen > :timenow OR qo.timeopen > :qo_timenow);";
+
+        $params = [
+            'timenow' => $timenow,
+            'futuretime' => $futuretime,
+            'qo_timenow' => $timenow,
+            'qo_futuretime' => $futuretime,
+            'modulename' => 'quiz',
+        ];
+
+        return $DB->get_recordset_sql($sql, $params);
+    }
+
+    /**
+     * Get all users that have an approaching open date within a quiz.
+     *
+     * @param int $quizid The quiz id.
+     * @return array The users after all filtering has been applied.
+     */
+    public static function get_users_within_quiz(int $quizid): array {
+        // Get quiz data.
+        $quizobj = quiz_settings::create($quizid);
+        $quiz = $quizobj->get_quiz();
+
+        // Get our users.
+        $users = get_enrolled_users(
+            context: \context_module::instance($quizobj->get_cm()->id),
+            withcapability: 'mod/quiz:attempt',
+            userfields: 'u.id, u.firstname',
+        );
+
+        // Check for any override dates.
+        $overrides = $quizobj->get_override_manager()->get_all_overrides();
+
+        foreach ($users as $key => $user) {
+            // Time open and time close dates can be user specific with an override.
+            // We begin by assuming it is the same as recorded in the quiz.
+            $user->timeopen = $quiz->timeopen;
+            $user->timeclose = $quiz->timeclose;
+
+            // Set the override type to 'none' to begin with.
+            $user->overridetype = 'none';
+
+            // Update this user with any applicable override dates.
+            if (!empty($overrides)) {
+                self::update_user_with_date_overrides($overrides, $user);
+            }
+
+            // If the 'timeopen' date has no value, even after overriding, unset this user.
+            if (empty($quiz->timeopen) && empty($user->timeopen)) {
+                unset($users[$key]);
+                continue;
+            }
+
+            // Check the date is within our range.
+            // We have to check here because we don't know if this quiz was selected because it only had users with overrides.
+            if (!self::is_time_within_range($user->timeopen)) {
+                unset($users[$key]);
+                continue;
+            }
+
+            // Check if the user has already received this notification.
+            $match = [
+                'quizid' => strval($quizid),
+                'timeopen' => $user->timeopen,
+                'overridetype' => $user->overridetype,
+            ];
+
+            if (self::has_user_been_sent_a_notification_already($user->id, json_encode($match))) {
+                unset($users[$key]);
+            }
+        }
+
+        return $users;
+    }
+
+    /**
+     * Send the notification to the user.
+     *
+     * @param stdClass $user The user's custom data.
+     */
+    public static function send_notification_to_user(stdClass $user): void {
+        // Check if the user has submitted already.
+        if (self::has_user_attempted($user)) {
+            return;
+        }
+
+        // Get quiz data.
+        $quizobj = quiz_settings::create($user->quizid);
+        $quiz = $quizobj->get_quiz();
+        $url = $quizobj->view_url();
+
+        $stringparams = [
+            'firstname' => $user->firstname,
+            'quizname' => $quiz->name,
+            'coursename' => $quizobj->get_course()->fullname,
+            'timeopen' => userdate($user->timeopen),
+            'timeclose' => !empty($user->timeclose) ? userdate($user->timeclose) : get_string('statusna'),
+            'url' => $url,
+        ];
+
+        $messagedata = [
+            'user' => \core_user::get_user($user->id),
+            'url' => $url->out(false),
+            'subject' => get_string('quizopendatesoonsubject', 'mod_quiz', $stringparams),
+            'quizname' => $quiz->name,
+            'html' => get_string('quizopendatesoonhtml', 'mod_quiz', $stringparams),
+        ];
+
+        // Prepare message object.
+        $message = new \core\message\message();
+        $message->component = 'mod_quiz';
+        $message->name = 'quiz_open_soon';
+        $message->userfrom = \core_user::get_noreply_user();
+        $message->userto = $messagedata['user'];
+        $message->subject = $messagedata['subject'];
+        $message->fullmessageformat = FORMAT_HTML;
+        $message->fullmessage = html_to_text($messagedata['html']);
+        $message->fullmessagehtml = $messagedata['html'];
+        $message->smallmessage = $messagedata['subject'];
+        $message->notification = 1;
+        $message->contexturl = $messagedata['url'];
+        $message->contexturlname = $messagedata['quizname'];
+        // Use custom data to avoid future notifications being sent again.
+        $message->customdata = [
+            'quizid' => $user->quizid,
+            'timeopen' => $user->timeopen,
+            'overridetype' => $user->overridetype,
+        ];
+
+        message_send($message);
+    }
+
+    /**
+     * Get the time now.
+     *
+     * @return int The time now as a timestamp.
+     */
+    protected static function get_time_now(): int {
+        return \core\di::get(\core\clock::class)->time();
+    }
+
+    /**
+     * Get a future time that serves as the cut-off for this notification.
+     *
+     * @param int|null $range Amount of seconds added to the now time (optional).
+     * @return int The time now value plus the range.
+     */
+    protected static function get_future_time(?int $range = null): int {
+        $range = $range ?? self::DEFAULT_DATE_RANGE;
+        return self::get_time_now() + $range;
+    }
+
+    /**
+     * Check if a time is within the current time now and the future time values.
+     *
+     * @param int $time The timestamp to check.
+     * @return boolean
+     */
+    protected static function is_time_within_range(int $time): bool {
+        return ($time > self::get_time_now() && $time < self::get_future_time());
+    }
+
+    /**
+     * Update user's recorded date based on the overrides.
+     *
+     * @param array $overrides The overrides to check.
+     * @param stdClass $user The user records we will be updating.
+     */
+    protected static function update_user_with_date_overrides(array $overrides, stdClass $user): void {
+
+        foreach ($overrides as $override) {
+            // User override.
+            if ($override->userid === $user->id) {
+                $user->timeopen = !empty($override->timeopen) ? $override->timeopen : $user->timeopen;
+                $user->timeclose = !empty($override->timeclose) ? $override->timeclose : $user->timeclose;
+                $user->overridetype = 'user';
+                // User override has precedence over group. Return here.
+                return;
+            }
+            // Group override.
+            if (!empty($override->groupid) && groups_is_member($override->groupid, $user->id)) {
+                // If user is a member of multiple groups, and we have set this already, use the earliest date.
+                if ($user->overridetype === 'group' && $user->timeopen < $override->timeopen) {
+                    continue;
+                }
+                $user->timeopen = !empty($override->timeopen) ? $override->timeopen : $user->timeopen;
+                $user->timeclose = !empty($override->timeclose) ? $override->timeclose : $user->timeclose;
+                $user->overridetype = 'group';
+            }
+        }
+    }
+
+    /**
+     * Check if a user has attempted this quiz already.
+     *
+     * @param stdClass $user The user record we will be checking.
+     * @return bool Return true if attempt found.
+     */
+    protected static function has_user_attempted(stdClass $user): bool {
+        global $DB;
+
+        return $DB->record_exists('quiz_attempts', [
+            'quiz' => $user->quizid,
+            'userid' => $user->id,
+        ]);
+    }
+
+    /**
+     * Check if a user has been sent a notification already.
+     *
+     * @param int $userid The user id.
+     * @param string $match The custom data string to match on.
+     * @return bool Returns true if already sent.
+     */
+    protected static function has_user_been_sent_a_notification_already(int $userid, string $match): bool {
+        global $DB;
+
+        $sql = "SELECT COUNT(n.id)
+                  FROM {notifications} n
+                 WHERE " . $DB->sql_compare_text('n.customdata', 255) . " = " . $DB->sql_compare_text(':match', 255) . "
+                   AND n.useridto = :userid";
+
+        $result = $DB->count_records_sql($sql, [
+            'userid' => $userid,
+            'match' => $match,
+        ]);
+
+        return ($result > 0);
+    }
+}
diff --git a/mod/quiz/classes/task/queue_all_quiz_open_notification_tasks.php b/mod/quiz/classes/task/queue_all_quiz_open_notification_tasks.php
new file mode 100644
index 0000000000000..7914f8509e3c6
--- /dev/null
+++ b/mod/quiz/classes/task/queue_all_quiz_open_notification_tasks.php
@@ -0,0 +1,44 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace mod_quiz\task;
+
+use core\task\scheduled_task;
+use mod_quiz\notification_helper;
+
+/**
+ * Scheduled task to queue tasks for notifying about quizzes with an approaching open date.
+ *
+ * @package    mod_quiz
+ * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class queue_all_quiz_open_notification_tasks extends scheduled_task {
+
+    public function get_name(): string {
+        return get_string('sendnotificationopendatesoon', 'mod_quiz');
+    }
+
+    public function execute(): void {
+        $quizzes = notification_helper::get_quizzes_within_date_range();
+        foreach ($quizzes as $quiz) {
+            $task = new queue_quiz_open_notification_tasks_for_users();
+            $task->set_custom_data($quiz);
+            \core\task\manager::queue_adhoc_task($task, true);
+        }
+        $quizzes->close();
+    }
+}
diff --git a/mod/quiz/classes/task/queue_quiz_open_notification_tasks_for_users.php b/mod/quiz/classes/task/queue_quiz_open_notification_tasks_for_users.php
new file mode 100644
index 0000000000000..a566e1c31e159
--- /dev/null
+++ b/mod/quiz/classes/task/queue_quiz_open_notification_tasks_for_users.php
@@ -0,0 +1,42 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace mod_quiz\task;
+
+use core\task\adhoc_task;
+use mod_quiz\notification_helper;
+
+/**
+ * Ad-hoc task to queue another task for notifying a user about an approaching open date.
+ *
+ * @package    mod_quiz
+ * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class queue_quiz_open_notification_tasks_for_users extends adhoc_task {
+
+    public function execute(): void {
+        $quizid = $this->get_custom_data()->id;
+        $users = notification_helper::get_users_within_quiz($quizid);
+        foreach ($users as $user) {
+            $user->quizid = $quizid;
+            $task = new send_quiz_open_soon_notification_to_user();
+            $task->set_custom_data($user);
+            $task->set_userid($user->id);
+            \core\task\manager::queue_adhoc_task($task, true);
+        }
+    }
+}
diff --git a/mod/quiz/classes/task/send_quiz_open_soon_notification_to_user.php b/mod/quiz/classes/task/send_quiz_open_soon_notification_to_user.php
new file mode 100644
index 0000000000000..ac9c9626ad71f
--- /dev/null
+++ b/mod/quiz/classes/task/send_quiz_open_soon_notification_to_user.php
@@ -0,0 +1,35 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace mod_quiz\task;
+
+use core\task\adhoc_task;
+use mod_quiz\notification_helper;
+
+/**
+ * Ad-hoc task to send a notification to a user about an approaching open date.
+ *
+ * @package    mod_quiz
+ * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class send_quiz_open_soon_notification_to_user extends adhoc_task {
+
+    public function execute(): void {
+        $user = $this->get_custom_data();
+        notification_helper::send_notification_to_user($user);
+    }
+}
diff --git a/mod/quiz/db/messages.php b/mod/quiz/db/messages.php
index 5c0a48cd4aa5e..6923354297afd 100644
--- a/mod/quiz/db/messages.php
+++ b/mod/quiz/db/messages.php
@@ -63,4 +63,13 @@
             'airnotifier' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
         ],
     ],
+
+    // Notify of a quiz opening soon.
+    'quiz_open_soon' => [
+        'defaults' => [
+            'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
+            'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
+            'airnotifier' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
+        ],
+    ],
 ];
diff --git a/mod/quiz/db/tasks.php b/mod/quiz/db/tasks.php
index da598f490bdaf..242562ae21dab 100644
--- a/mod/quiz/db/tasks.php
+++ b/mod/quiz/db/tasks.php
@@ -43,5 +43,14 @@
         'day' => '*',
         'dayofweek' => '*',
         'month' => '*'
-    ]
+    ],
+    [
+        'classname' => 'mod_quiz\task\queue_all_quiz_open_notification_tasks',
+        'blocking' => 0,
+        'minute' => 'R',
+        'hour' => '*/2',
+        'day' => '*',
+        'month' => '*',
+        'dayofweek' => '*',
+    ],
 ];
diff --git a/mod/quiz/lang/en/quiz.php b/mod/quiz/lang/en/quiz.php
index 429c2d0930ac0..25d56edff470e 100644
--- a/mod/quiz/lang/en/quiz.php
+++ b/mod/quiz/lang/en/quiz.php
@@ -544,6 +544,7 @@
 $string['messageprovider:attempt_overdue'] = 'Warning when your quiz attempt becomes overdue';
 $string['messageprovider:confirmation'] = 'Confirmation of your own quiz submissions';
 $string['messageprovider:attempt_grading_complete'] = 'Notification that your attempt has been graded';
+$string['messageprovider:quiz_open_soon'] = 'Quiz opens soon notification';
 $string['messageprovider:submission'] = 'Notification of your students\' quiz submissions';
 $string['max'] = 'Max';
 $string['maxmark'] = 'Maximum mark';
@@ -818,6 +819,12 @@
 $string['quizopened'] = 'This quiz is open.';
 $string['quizopenedon'] = 'This quiz opened on {$a}';
 $string['quizopens'] = 'Quiz opens';
+$string['quizopendatesoonhtml'] = '<p>Hi {$a->firstname},</p>
+<p>The quiz <strong>{$a->quizname}</strong> in course {$a->coursename} is opening soon.
+<p><strong>Opens: {$a->timeopen}</strong></p>
+<p><strong>Closes: {$a->timeclose}</strong></p>
+<p><a href="{$a->url}">Go to quiz</a></p>';
+$string['quizopendatesoonsubject'] = 'Opens on {$a->timeopen}: {$a->quizname}';
 $string['quizopenwillclose'] = 'This quiz is open, will close on {$a} at';
 $string['quizordernotrandom'] = 'Order of quiz not shuffled';
 $string['quizorderrandom'] = '* Order of quiz is shuffled';
@@ -978,6 +985,7 @@
 $string['selectnone'] = 'Deselect all';
 $string['selectquestionslot'] = 'Select question {$a}';
 $string['selectquestiontype'] = '-- Select question type --';
+$string['sendnotificationopendatesoon'] = 'Notify user of an approaching quiz open date';
 $string['serveradded'] = 'Server added';
 $string['serveridentifier'] = 'Identifier';
 $string['serverinfo'] = 'Server information';
diff --git a/mod/quiz/tests/notification_helper_test.php b/mod/quiz/tests/notification_helper_test.php
new file mode 100644
index 0000000000000..b85e7784e2576
--- /dev/null
+++ b/mod/quiz/tests/notification_helper_test.php
@@ -0,0 +1,241 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace mod_quiz;
+
+/**
+ * Test class for the quiz notification helper.
+ *
+ * @package    mod_quiz
+ * @category   test
+ * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \mod_quiz\notification_helper
+ */
+class notification_helper_test extends \advanced_testcase {
+    /**
+     * Run all the tasks related to the notifications.
+     */
+    public function run_notification_helper_tasks(): void {
+        $task = \core\task\manager::get_scheduled_task(\mod_quiz\task\queue_all_quiz_open_notification_tasks::class);
+        $task->execute();
+        $clock = $this->mock_clock_with_frozen();
+
+        $adhoctask = \core\task\manager::get_next_adhoc_task($clock->time());
+        if ($adhoctask) {
+            $this->assertInstanceOf(\mod_quiz\task\queue_quiz_open_notification_tasks_for_users::class, $adhoctask);
+            $adhoctask->execute();
+            \core\task\manager::adhoc_task_complete($adhoctask);
+        }
+
+        $adhoctask = \core\task\manager::get_next_adhoc_task($clock->time());
+        if ($adhoctask) {
+            $this->assertInstanceOf(\mod_quiz\task\send_quiz_open_soon_notification_to_user::class, $adhoctask);
+            $adhoctask->execute();
+            \core\task\manager::adhoc_task_complete($adhoctask);
+        }
+    }
+
+    /**
+     * Test getting quizzes with a 'timeopen' date within the date range.
+     */
+    public function test_get_quizzes_within_date_range(): void {
+        $this->resetAfterTest();
+        $generator = $this->getDataGenerator();
+        $helper = \core\di::get(notification_helper::class);
+        $clock = $this->mock_clock_with_frozen();
+
+        // Create a quiz with an open date < 48 hours.
+        $course = $generator->create_course();
+        $generator->create_module('quiz', ['course' => $course->id, 'timeopen' => $clock->time() + DAYSECS]);
+
+        // Check that we have a result returned.
+        $result = $helper::get_quizzes_within_date_range();
+        $this->assertTrue($result->valid());
+        $result->close();
+
+        // Time travel 3 days into the future. We should have no quizzes in range.
+        $clock->bump(DAYSECS * 3);
+        $result = $helper::get_quizzes_within_date_range();
+        $this->assertFalse($result->valid());
+        $result->close();
+    }
+
+    /**
+     * Test getting users within a quiz that are within our date range.
+     */
+    public function test_get_users_within_quiz(): void {
+        $this->resetAfterTest();
+        $generator = $this->getDataGenerator();
+        $helper = \core\di::get(notification_helper::class);
+        $clock = $this->mock_clock_with_frozen();
+
+        // Create a course and enrol some users.
+        $course = $generator->create_course();
+        $user1 = $generator->create_user();
+        $user2 = $generator->create_user();
+        $user3 = $generator->create_user();
+        $user4 = $generator->create_user();
+        $user5 = $generator->create_user();
+        $generator->enrol_user($user1->id, $course->id, 'student');
+        $generator->enrol_user($user2->id, $course->id, 'student');
+        $generator->enrol_user($user3->id, $course->id, 'student');
+        $generator->enrol_user($user4->id, $course->id, 'student');
+        $generator->enrol_user($user5->id, $course->id, 'teacher');
+
+        /** @var \mod_quiz_generator $quizgenerator */
+        $quizgenerator = $generator->get_plugin_generator('mod_quiz');
+
+        // Create a quiz with an open date < 48 hours.
+        $timeopen = $clock->time() + DAYSECS;
+        $quiz = $quizgenerator->create_instance([
+            'course' => $course->id,
+            'timeopen' => $timeopen,
+        ]);
+
+        // User1 will have a user specific override, giving them an extra 1 hour for 'timeopen'.
+        $usertimeopen = $timeopen + HOURSECS;
+        $quizgenerator->create_override([
+            'quiz' => $quiz->id,
+            'userid' => $user1->id,
+            'timeopen' => $usertimeopen,
+        ]);
+
+        // User2 and user3 will have a group override, giving them an extra 2 hours for 'timeopen'.
+        $grouptimeopen = $timeopen + (HOURSECS * 2);
+        $group = $generator->create_group(['courseid' => $course->id]);
+        $generator->create_group_member(['groupid' => $group->id, 'userid' => $user2->id]);
+        $generator->create_group_member(['groupid' => $group->id, 'userid' => $user3->id]);
+        $quizgenerator->create_override([
+            'quiz' => $quiz->id,
+            'groupid' => $group->id,
+            'timeopen' => $grouptimeopen,
+        ]);
+
+        // Get the users within the date range.
+        $quizzes = $helper::get_quizzes_within_date_range();
+        foreach ($quizzes as $q) {
+            $users = $helper::get_users_within_quiz($q->id);
+        }
+        $quizzes->close();
+
+        // User1 has the 'user' override and its 'timeopen' date has been updated.
+        $this->assertEquals($usertimeopen, $users[$user1->id]->timeopen);
+        $this->assertEquals('user', $users[$user1->id]->overridetype);
+
+        // User2 and user3 have the 'group' override and their 'timeopen' date has been updated.
+        $this->assertEquals($grouptimeopen, $users[$user2->id]->timeopen);
+        $this->assertEquals('group', $users[$user2->id]->overridetype);
+        $this->assertEquals($grouptimeopen, $users[$user3->id]->timeopen);
+        $this->assertEquals('group', $users[$user3->id]->overridetype);
+
+        // User4 is unchanged.
+        $this->assertEquals($timeopen, $users[$user4->id]->timeopen);
+        $this->assertEquals('none', $users[$user4->id]->overridetype);
+
+        // User5 should not be in the returned users because they are a teacher.
+        $this->assertArrayNotHasKey($user5->id, $users);
+    }
+
+    /**
+     * Test sending the quiz open soon notification to a user.
+     */
+    public function test_send_notification_to_user(): void {
+        global $DB;
+        $this->resetAfterTest();
+        $generator = $this->getDataGenerator();
+        $helper = \core\di::get(notification_helper::class);
+        $clock = $this->mock_clock_with_frozen();
+
+        // Create a course and enrol a user.
+        $course = $generator->create_course();
+        $user1 = $generator->create_user();
+        $generator->enrol_user($user1->id, $course->id, 'student');
+
+        /** @var \mod_quiz_generator $quizgenerator */
+        $quizgenerator = $generator->get_plugin_generator('mod_quiz');
+
+        // Create a quiz with an open date < 48 hours.
+        $timeopen = $clock->time() + DAYSECS;
+        $quiz = $quizgenerator->create_instance([
+            'course' => $course->id,
+            'timeopen' => $timeopen,
+        ]);
+
+        // Get the users within the date range.
+        $quizzes = $helper::get_quizzes_within_date_range();
+        foreach ($quizzes as $q) {
+            $users = $helper::get_users_within_quiz($q->id);
+        }
+        $quizzes->close();
+
+        // Run the tasks.
+        $this->run_notification_helper_tasks();
+
+        // Get the notifications that should have been created during the adhoc task.
+        $notifications = $DB->get_records('notifications', ['useridto' => $user1->id]);
+        $this->assertCount(1, $notifications);
+
+        // Check the subject matches.
+        $stringparams = ['timeopen' => userdate($users[$user1->id]->timeopen), 'quizname' => $quiz->name];
+        $expectedsubject = get_string('quizopendatesoonsubject', 'mod_quiz', $stringparams);
+        $this->assertEquals($expectedsubject, reset($notifications)->subject);
+
+        // Run the tasks again.
+        $this->run_notification_helper_tasks();
+
+        // There should still only be one notification because nothing has changed.
+        $notifications = $DB->get_records('notifications', ['useridto' => $user1->id]);
+        $this->assertCount(1, $notifications);
+
+        // Let's modify the 'timeopen' for the quiz (it will still be within the 48 hour range).
+        $updatedata = new \stdClass();
+        $updatedata->id = $quiz->id;
+        $updatedata->timeopen = $timeopen + HOURSECS;
+        $DB->update_record('quiz', $updatedata);
+
+        // Run the tasks again.
+        $this->run_notification_helper_tasks();
+
+        // There should now be two notifications.
+        $notifications = $DB->get_records('notifications', ['useridto' => $user1->id]);
+        $this->assertCount(2, $notifications);
+
+        // Let's modify the 'timeopen' one more time.
+        $updatedata = new \stdClass();
+        $updatedata->id = $quiz->id;
+        $updatedata->timeopen = $timeopen + (HOURSECS * 2);
+        $DB->update_record('quiz', $updatedata);
+
+        // This time, the user will submit an attempt.
+        $DB->insert_record('quiz_attempts', [
+            'quiz' => $quiz->id,
+            'userid' => $user1->id,
+            'state' => 'finished',
+            'timestart' => $clock->time(),
+            'timecheckstate' => 0,
+            'layout' => '',
+            'uniqueid' => 123,
+        ]);
+
+        // Run the tasks again.
+        $this->run_notification_helper_tasks();
+
+        // No new notification should have been sent.
+        $notifications = $DB->get_records('notifications', ['useridto' => $user1->id]);
+        $this->assertCount(2, $notifications);
+    }
+}
diff --git a/mod/quiz/version.php b/mod/quiz/version.php
index e4a472f0e92da..fa22a93ba4087 100644
--- a/mod/quiz/version.php
+++ b/mod/quiz/version.php
@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2024042200;
+$plugin->version = 2024051700;
 $plugin->requires = 2024041600;
 $plugin->component = 'mod_quiz';

From 7abffe7935509b0e3ddb752b327532f93935d9a5 Mon Sep 17 00:00:00 2001
From: Huong Nguyen <huongnv13@gmail.com>
Date: Thu, 13 Jun 2024 14:39:24 +0700
Subject: [PATCH 046/119] MDL-79809 environment: Moodle 4.5 requirements

---
 admin/environment.xml | 195 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 195 insertions(+)

diff --git a/admin/environment.xml b/admin/environment.xml
index 20fdcd27ad97d..2fd7533f84a21 100644
--- a/admin/environment.xml
+++ b/admin/environment.xml
@@ -4508,4 +4508,199 @@
       </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
+  <MOODLE version="4.5" requires="4.1.2">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="10.6.7" />
+      <VENDOR name="mysql" version="8.0" />
+      <VENDOR name="postgres" version="13" />
+      <VENDOR name="mssql" version="14.0" />
+      <VENDOR name="oracle" version="19" />
+    </DATABASE>
+    <PHP version="8.1.0" level="required">
+    </PHP>
+    <PCREUNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="pcreunicodewarning" />
+      </FEEDBACK>
+    </PCREUNICODE>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="mbstringrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="opensslrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zlib" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="gdrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlreader" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="intlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" level="required"/>
+      <PHP_EXTENSION name="fileinfo" level="required"/>
+      <PHP_EXTENSION name="sodium" level="required"/>
+      <PHP_EXTENSION name="exif" level="optional"/>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="96M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="opcache.enable" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opcacherecommended" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbstorageengine" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="quizattemptsupgradedmessage" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unsupporteddbtablerowformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unoconvwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="libcurlwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfileformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfilepertable" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddblargeprefix" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ishttpswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="incompleteunicodesupport" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="sixtyfourbitsrequired" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iscustomadminwarnings" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mod_assignment" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_db_prefix_length" level="required">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_oracle_usage" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_async_backup" level="recommended">
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>

From 585b0604622fa3be71a0a106c59fca2176273bad Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 13 Jun 2024 00:33:03 +0800
Subject: [PATCH 047/119] MDL-82183 core: Do not load subsystem
 db/legacyclasses.php

Subsystems do not support the notion of a `db` folder. Instead we must
conflate the lib/db/legacyclasses.php syntax to allow it to support
paths as either a string, or an array with [subsystem, path].
---
 lib/classes/component.php | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/lib/classes/component.php b/lib/classes/component.php
index e7f3eb4b324ff..26b83933d7102 100644
--- a/lib/classes/component.php
+++ b/lib/classes/component.php
@@ -727,14 +727,13 @@ protected static function fill_classmap_cache() {
         self::$classmap = [];
 
         self::load_classes('core', "$CFG->dirroot/lib/classes");
-        self::load_legacy_classes($CFG->libdir);
+        self::load_legacy_classes($CFG->libdir, true);
 
         foreach (self::$subsystems as $subsystem => $fulldir) {
             if (!$fulldir) {
                 continue;
             }
             self::load_classes('core_' . $subsystem, "$fulldir/classes");
-            self::load_legacy_classes($fulldir);
         }
 
         foreach (self::$plugins as $plugintype => $plugins) {
@@ -1448,8 +1447,12 @@ protected static function load_renamed_classes(?string $fulldir) {
      * and the value is the path to the class file within the relative ../classes/ directory.
      *
      * @param string|null $fulldir The directory to the legacy classes.
+     * @param bool $allowsubsystems Whether to allow the specification of alternative subsystems for this path.
      */
-    protected static function load_legacy_classes(?string $fulldir): void {
+    protected static function load_legacy_classes(
+        ?string $fulldir,
+        bool $allowsubsystems = false,
+    ): void {
         if (is_null($fulldir)) {
             return;
         }
@@ -1460,7 +1463,32 @@ protected static function load_legacy_classes(?string $fulldir): void {
             require($file);
             if (is_array($legacyclasses)) {
                 foreach ($legacyclasses as $classname => $path) {
-                    self::$classmap[$classname] = "{$fulldir}/classes/{$path}";
+                    if (is_array($path)) {
+                        if (!$allowsubsystems) {
+                            throw new \Exception(
+                                "Invalid legacy classes path entry for {$classname}. " .
+                                    "Only files within the component can be specified.",
+                            );
+                        }
+                        if (count($path) !== 2) {
+                            throw new \Exception(
+                                "Invalid legacy classes path entry for {$classname}. " .
+                                    "Entries must be in the format [subsystem, path].",
+                            );
+                        }
+                        [$subsystem, $path] = $path;
+                        $subsystem = substr($subsystem, 5);
+                        if (!array_key_exists($subsystem, self::$subsystems)) {
+                            throw new \Exception(
+                                "Unknown subsystem '{$subsystem}' for legacy classes entry of '{$classname}'",
+                            );
+                        }
+
+                        $subsystemfulldir = self::$subsystems[$subsystem];
+                        self::$classmap[$classname] = "{$subsystemfulldir}/classes/{$path}";
+                    } else {
+                        self::$classmap[$classname] = "{$fulldir}/classes/{$path}";
+                    }
                 }
             }
         }

From 5e976886c74df8f7fdd54868b28242d30613181f Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Mon, 24 Jun 2024 17:12:47 +0800
Subject: [PATCH 048/119] MDL-79718 mod_quiz: Remove unnecessary semicolon in
 SQL statement

---
 mod/quiz/classes/notification_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/quiz/classes/notification_helper.php b/mod/quiz/classes/notification_helper.php
index 53a34e50c28e1..4f4982d2fd52e 100644
--- a/mod/quiz/classes/notification_helper.php
+++ b/mod/quiz/classes/notification_helper.php
@@ -48,7 +48,7 @@ public static function get_quizzes_within_date_range(): \moodle_recordset {
                   JOIN {modules} m ON cm.module = m.id AND m.name = :modulename
              LEFT JOIN {quiz_overrides} qo ON q.id = qo.quiz
                  WHERE (q.timeopen < :futuretime OR qo.timeopen < :qo_futuretime)
-                   AND (q.timeopen > :timenow OR qo.timeopen > :qo_timenow);";
+                   AND (q.timeopen > :timenow OR qo.timeopen > :qo_timenow)";
 
         $params = [
             'timenow' => $timenow,

From ad5fe71868bbb740199de64e0f88f962ed74c642 Mon Sep 17 00:00:00 2001
From: "Eloy Lafuente (stronk7)" <stronk7@moodle.org>
Date: Mon, 17 Jun 2024 18:07:47 +0200
Subject: [PATCH 049/119] MDL-82207 phpunit: fix various @covers annotations
 (take#1)

This fixes various (not all) wrong @covers annotations that
are reported as warnings by PHPUnit when it's run with
code-coverage enabled.

When possible, the preferred solution is to change to
@covers at class level, that is the recommended way.

If multiple classes are involved, then a mix of @coversDefaultClass
and @covers at method level are used (always trying to use the
minimum needed patch).

This is the first of a series of issues created as sub-tasks
of MDL-82142.
---
 admin/presets/tests/helper_test.php           |  2 +-
 .../reportbuilder/datasource/roles_test.php   |  2 +-
 .../tests/restore_stepslib_date_test.php      |  3 ++-
 cache/tests/cache_test.php                    |  4 ++--
 calendar/tests/container_test.php             |  2 +-
 cohort/tests/lib_test.php                     |  9 ++++++---
 communication/tests/api_test.php              | 11 ----------
 communication/tests/processor_test.php        |  4 +++-
 completion/tests/api_test.php                 |  2 +-
 completion/tests/progress_test.php            |  3 +--
 contentbank/tests/contenttype_test.php        |  2 +-
 course/format/tests/base_test.php             |  1 -
 course/format/tests/formatactions_test.php    |  2 +-
 .../format/tests/local/baseactions_test.php   |  2 +-
 course/format/tests/local/cmactions_test.php  |  2 +-
 .../tests/local/sectionactions_test.php       |  2 +-
 .../tests/output/local/state/state_test.php   |  4 +++-
 course/tests/backup/restore_test.php          |  4 +++-
 course/tests/course_delete_modules_test.php   |  3 +--
 enrol/tests/enrollib_test.php                 |  4 ++--
 grade/tests/external/get_feedback_test.php    |  3 +--
 grade/tests/external/get_grade_tree_test.php  |  1 -
 group/tests/lib_test.php                      |  4 ++--
 h5p/tests/file_storage_test.php               |  5 +----
 h5p/tests/framework_test.php                  |  2 --
 h5p/tests/helper_test.php                     |  1 -
 lib/dml/tests/dml_read_slave_test.php         |  6 ------
 lib/dml/tests/dml_test.php                    |  4 ----
 .../pgsql_native_moodle_database_test.php     |  3 ---
 lib/external/tests/external_api_test.php      |  6 +++---
 lib/filestorage/tests/stored_file_test.php    |  4 ----
 lib/testing/tests/testing_generator_test.php  |  2 +-
 lib/tests/accesslib_test.php                  |  2 +-
 lib/tests/authlib_test.php                    |  3 +--
 lib/tests/check_test.php                      |  2 +-
 lib/tests/configonlylib_test.php              |  4 ++--
 .../exportable_filearea_test.php              |  2 +-
 .../exportable_stored_file_test.php           |  2 +-
 .../exportable_textarea_test.php              |  2 +-
 lib/tests/core_renderer_test.php              | 20 +++++++++----------
 lib/tests/cron_test.php                       |  3 ---
 lib/tests/oauth2_test.php                     | 10 ++++------
 lib/tests/output/choicelist_test.php          | 10 +++++-----
 lib/tests/pdflib_test.php                     |  3 ++-
 lib/tests/plugininfo/base_test.php            |  2 +-
 lib/tests/plugininfo/block_test.php           |  2 --
 lib/tests/plugininfo/media_test.php           |  2 --
 lib/tests/privacy/provider_test.php           |  1 +
 lib/tests/tablelib_test.php                   |  4 +---
 lib/tests/task/adhoc_task_test.php            |  3 +--
 lib/tests/task/automated_backup_task_test.php |  2 +-
 .../task/file_temp_cleanup_task_test.php      |  1 -
 lib/tests/task/scheduled_task_test.php        | 14 +------------
 53 files changed, 75 insertions(+), 128 deletions(-)

diff --git a/admin/presets/tests/helper_test.php b/admin/presets/tests/helper_test.php
index f0e39c1ed9782..b7fb36c053cae 100644
--- a/admin/presets/tests/helper_test.php
+++ b/admin/presets/tests/helper_test.php
@@ -23,7 +23,7 @@
  * @category   test
  * @copyright  2021 Sara Arjona (sara@moodle.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass helper
+ * @coversDefaultClass \core_adminpresets\helper
  */
 class helper_test extends \advanced_testcase {
 
diff --git a/admin/roles/tests/reportbuilder/datasource/roles_test.php b/admin/roles/tests/reportbuilder/datasource/roles_test.php
index 4f4258daaa4e5..60d9ff7ae75c8 100644
--- a/admin/roles/tests/reportbuilder/datasource/roles_test.php
+++ b/admin/roles/tests/reportbuilder/datasource/roles_test.php
@@ -32,7 +32,7 @@
  * Unit tests for roles datasource
  *
  * @package     core_role
- * @covers      \core_role\reportbuilder\datasource\roles;
+ * @covers      \core_role\reportbuilder\datasource\roles
  * @copyright   2024 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/backup/moodle2/tests/restore_stepslib_date_test.php b/backup/moodle2/tests/restore_stepslib_date_test.php
index 1505a3fdcd557..2655f3686f366 100644
--- a/backup/moodle2/tests/restore_stepslib_date_test.php
+++ b/backup/moodle2/tests/restore_stepslib_date_test.php
@@ -320,7 +320,8 @@ public function test_usercompletion_date_restore(): void {
     /**
      * Checking that the user completion of an activity relating to the view field does not change
      * when doing a course restore.
-     * @covers ::backup_and_restore
+     * @covers \backup_userscompletion_structure_step
+     * @covers \restore_userscompletion_structure_step
      */
     public function test_usercompletion_view_restore(): void {
         global $DB;
diff --git a/cache/tests/cache_test.php b/cache/tests/cache_test.php
index 142b11cf2fa31..c6371b4b5df46 100644
--- a/cache/tests/cache_test.php
+++ b/cache/tests/cache_test.php
@@ -2230,7 +2230,7 @@ public function test_application_locking_before_write(): void {
     /**
      * Test that locking before write works when writing across multiple layers.
      *
-     * @covers \cache_loader
+     * @covers \cache_application
      * @return void
      */
     public function test_application_locking_multiple_layers(): void {
@@ -2310,7 +2310,7 @@ public function test_application_locking_multiple_layers(): void {
     /**
      * Tests that locking fails correctly when either layer of a 2-layer cache has a lock already.
      *
-     * @covers \cache_loader
+     * @covers \cache_application
      */
     public function test_application_locking_multiple_layers_failures(): void {
 
diff --git a/calendar/tests/container_test.php b/calendar/tests/container_test.php
index 8a69a478bbffd..3a721a88691b4 100644
--- a/calendar/tests/container_test.php
+++ b/calendar/tests/container_test.php
@@ -37,6 +37,7 @@
  * @package core_calendar
  * @copyright 2017 Cameron Ball <cameron@cameron1729.xyz>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \core_calendar\local\event\container
  */
 class container_test extends \advanced_testcase {
 
@@ -370,7 +371,6 @@ public function test_event_factory_with_completion_related_event(): void {
 
     /**
      * Checks that completed activities events do not show.
-     * @covers \core_calendar\local\event::init
      */
     public function test_event_factory_with_completed_module_related_event(): void {
         global $CFG, $DB;
diff --git a/cohort/tests/lib_test.php b/cohort/tests/lib_test.php
index a535c85df7f16..b65532b1ad276 100644
--- a/cohort/tests/lib_test.php
+++ b/cohort/tests/lib_test.php
@@ -693,8 +693,11 @@ public function test_cohort_get_available_cohorts(): void {
     /**
      * Test that all get functions return custom fields data.
      *
-     * @covers \cohort_get_cohort, \cohort_get_cohorts, \cohort_get_all_cohorts
-     * @covers \cohort_get_available_cohorts, \cohort_get_user_cohorts
+     * @covers ::cohort_get_cohort
+     * @covers ::cohort_get_cohorts
+     * @covers ::cohort_get_all_cohorts
+     * @covers ::cohort_get_available_cohorts
+     * @covers ::cohort_get_user_cohorts
      */
     public function test_get_functions_return_custom_fields(): void {
         $this->resetAfterTest();
@@ -912,7 +915,7 @@ public function test_cohort_update_theme_cohort(): void {
     /**
      * Test that lib function returns custom field data for a cohorts.
      *
-     * @covers \cohort_get_custom_fields_data
+     * @covers ::cohort_get_custom_fields_data
      */
     public function test_cohort_get_custom_fields_data(): void {
         $this->resetAfterTest();
diff --git a/communication/tests/api_test.php b/communication/tests/api_test.php
index 54d35e9986fd8..bb1eb99d25e81 100644
--- a/communication/tests/api_test.php
+++ b/communication/tests/api_test.php
@@ -280,9 +280,6 @@ public function test_delete_room(): void {
 
     /**
      * Test the adding and removing of members from room.
-     *
-     * @covers ::add_members_to_room
-     * @covers ::remove_members_from_room
      */
     public function test_adding_and_removing_of_room_membership(): void {
         $course = $this->get_course();
@@ -311,8 +308,6 @@ public function test_adding_and_removing_of_room_membership(): void {
 
     /**
      * Test the update of room membership with the change user role.
-     *
-     * @covers ::update_room_membership
      */
     public function test_update_room_membership_on_user_role_change(): void {
         global $DB;
@@ -340,8 +335,6 @@ public function test_update_room_membership_on_user_role_change(): void {
 
     /**
      * Test sync_provider method for the sync of available provider.
-     *
-     * @covers ::sync_provider
      */
     public function test_sync_provider(): void {
         // Generate the data.
@@ -358,8 +351,6 @@ public function test_sync_provider(): void {
 
     /**
      * Test the removal of all members from the room.
-     *
-     * @covers ::remove_all_members_from_room
      */
     public function test_remove_all_members_from_room(): void {
         $course = $this->get_course();
@@ -382,8 +373,6 @@ public function test_remove_all_members_from_room(): void {
 
     /**
      * Test the configuration of room changes as well as the membership with the change of provider.
-     *
-     * @covers ::configure_room_and_membership_by_provider
      */
     public function test_configure_room_and_membership_by_provider(): void {
         global $DB;
diff --git a/communication/tests/processor_test.php b/communication/tests/processor_test.php
index 29c6344726a0a..34f8fd3a6b562 100644
--- a/communication/tests/processor_test.php
+++ b/communication/tests/processor_test.php
@@ -48,7 +48,9 @@ public function setUp(): void {
      *
      * @covers ::create_instance
      * @covers ::get_id
-     * @covers ::get_instance
+     * @covers ::get_context
+     * @covers ::get_context_id
+     * @covers ::get_provider
      * @covers ::get_room_name
      */
     public function test_create_instance(): void {
diff --git a/completion/tests/api_test.php b/completion/tests/api_test.php
index 230d379d2a8b3..b7e84e7769962 100644
--- a/completion/tests/api_test.php
+++ b/completion/tests/api_test.php
@@ -23,6 +23,7 @@
  * @category test
  * @copyright 2017 Mark Nelson <markn@moodle.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \core_completion\api
  */
 class api_test extends \advanced_testcase {
 
@@ -292,7 +293,6 @@ public function test_mark_course_completions_activity_criteria(): void {
 
     /**
      * Test for mark_course_completions_activity_criteria() with different completionpassgrade settings.
-     * @covers ::mark_course_completions_activity_criteria
      */
     public function test_mark_course_completions_activity_criteria_completion_states(): void {
         global $DB, $CFG;
diff --git a/completion/tests/progress_test.php b/completion/tests/progress_test.php
index d4cfa6fc83058..909fd972bc285 100644
--- a/completion/tests/progress_test.php
+++ b/completion/tests/progress_test.php
@@ -25,6 +25,7 @@
  * @category test
  * @copyright 2017 Mark Nelson <markn@moodle.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \core_completion\progress
  */
 class progress_test extends \advanced_testcase {
 
@@ -123,8 +124,6 @@ public function test_course_progress_percentage_with_activities_and_course(): vo
 
     /**
      * Tests that the course progress percentage is returned correctly for various grade to pass settings
-     *
-     * @covers \core_completion\progress::get_course_progress_percentage.
      */
     public function test_course_progress_percentage_completion_state(): void {
         global $DB, $CFG;
diff --git a/contentbank/tests/contenttype_test.php b/contentbank/tests/contenttype_test.php
index 5ef8ebf1c4d1c..3dd4cd49b569e 100644
--- a/contentbank/tests/contenttype_test.php
+++ b/contentbank/tests/contenttype_test.php
@@ -657,7 +657,7 @@ public function test_get_download_url(): void {
     /**
      * Tests pluginfile result.
      *
-     * @covers ::pluginfile
+     * @covers ::__construct
      */
     public function test_pluginfile(): void {
         $this->resetAfterTest();
diff --git a/course/format/tests/base_test.php b/course/format/tests/base_test.php
index de5b7a5f253db..d823a19184069 100644
--- a/course/format/tests/base_test.php
+++ b/course/format/tests/base_test.php
@@ -40,7 +40,6 @@ public static function setupBeforeClass(): void {
      * Tests the save and load functionality.
      *
      * @author Jason den Dulk
-     * @covers \core_courseformat
      */
     public function test_courseformat_saveandload(): void {
         $this->resetAfterTest();
diff --git a/course/format/tests/formatactions_test.php b/course/format/tests/formatactions_test.php
index f949099fb1151..0b59c61e74804 100644
--- a/course/format/tests/formatactions_test.php
+++ b/course/format/tests/formatactions_test.php
@@ -22,7 +22,7 @@
  * @package    core_courseformat
  * @copyright  2023 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \core_courseformat\base
+ * @coversDefaultClass \core_courseformat\formatactions
  */
 class formatactions_test extends \advanced_testcase {
 
diff --git a/course/format/tests/local/baseactions_test.php b/course/format/tests/local/baseactions_test.php
index 63a748d8249a6..52ed1794bda7d 100644
--- a/course/format/tests/local/baseactions_test.php
+++ b/course/format/tests/local/baseactions_test.php
@@ -25,7 +25,7 @@
  * @package    core_courseformat
  * @copyright  2023 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \core_courseformat\base
+ * @coversDefaultClass \core_courseformat\local\baseactions
  */
 class baseactions_test extends \advanced_testcase {
     /**
diff --git a/course/format/tests/local/cmactions_test.php b/course/format/tests/local/cmactions_test.php
index e84a2de12d0f5..e7bc284776248 100644
--- a/course/format/tests/local/cmactions_test.php
+++ b/course/format/tests/local/cmactions_test.php
@@ -24,7 +24,7 @@
  * @package    core_courseformat
  * @copyright  2024 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \core_courseformat\cmactions
+ * @coversDefaultClass \core_courseformat\local\cmactions
  */
 final class cmactions_test extends \advanced_testcase {
     /**
diff --git a/course/format/tests/local/sectionactions_test.php b/course/format/tests/local/sectionactions_test.php
index 8f663348cf19b..2b86f70c73d8d 100644
--- a/course/format/tests/local/sectionactions_test.php
+++ b/course/format/tests/local/sectionactions_test.php
@@ -24,7 +24,7 @@
  * @package    core_courseformat
  * @copyright  2023 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \core_courseformat\sectionactions
+ * @coversDefaultClass \core_courseformat\local\sectionactions
  */
 class sectionactions_test extends \advanced_testcase {
     /**
diff --git a/course/format/tests/output/local/state/state_test.php b/course/format/tests/output/local/state/state_test.php
index c364f7cbe53d4..8e073b83a6235 100644
--- a/course/format/tests/output/local/state/state_test.php
+++ b/course/format/tests/output/local/state/state_test.php
@@ -41,7 +41,9 @@ public static function setupBeforeClass(): void {
      * Test the behaviour of state::export_for_template().
      *
      * @dataProvider state_provider
-     * @covers \core_courseformat\output\local\state
+     * @covers \core_courseformat\output\local\state\course
+     * @covers \core_courseformat\output\local\state\section
+     * @covers \core_courseformat\output\local\state\cm
      *
      * @param string $format The course format of the course where the method will be executed.
      */
diff --git a/course/tests/backup/restore_test.php b/course/tests/backup/restore_test.php
index bfd98f5752bc0..83dd5dfc5c6fc 100644
--- a/course/tests/backup/restore_test.php
+++ b/course/tests/backup/restore_test.php
@@ -575,7 +575,9 @@ public function test_restore_course_startdate_in_existing_course_without_permiss
      * Tests course restore with editor in course format.
      *
      * @author Matthew Hilton
-     * @covers \core_courseformat
+     * @covers \core_courseformat\base
+     * @covers \backup_course_structure_step
+     * @covers \restore_course_structure_step
      */
     public function test_restore_editor_courseformat(): void {
         $this->resetAfterTest();
diff --git a/course/tests/course_delete_modules_test.php b/course/tests/course_delete_modules_test.php
index 1164f0964fe59..d70d567d7fffa 100644
--- a/course/tests/course_delete_modules_test.php
+++ b/course/tests/course_delete_modules_test.php
@@ -21,6 +21,7 @@
  * @subpackage course
  * @copyright  2021 Tomo Tsuyuki <tomotsuyuki@catalyst-au.net>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \core_course\task\course_delete_modules
  */
 namespace core_course;
 
@@ -68,8 +69,6 @@ public function test_delete_module_execution(): void {
 
     /**
      * Test with failed and successful cms
-     *
-     * @covers ::course_delete_modules
      */
     public function test_delete_module_exception(): void {
         global $DB;
diff --git a/enrol/tests/enrollib_test.php b/enrol/tests/enrollib_test.php
index b19530f672626..654d4fe1e4be6 100644
--- a/enrol/tests/enrollib_test.php
+++ b/enrol/tests/enrollib_test.php
@@ -1739,7 +1739,7 @@ public function test_enrol_selfenrol_available(): void {
     /**
      * Test the behaviour of validate_enrol_plugin_data().
      *
-     * @covers ::validate_enrol_plugin_data
+     * @covers \enrol_plugin::validate_enrol_plugin_data
      */
     public function test_validate_enrol_plugin_data(): void {
         $this->resetAfterTest();
@@ -1761,7 +1761,7 @@ public function test_validate_enrol_plugin_data(): void {
     /**
      * Test the behaviour of update_enrol_plugin_data().
      *
-     * @covers ::update_enrol_plugin_data
+     * @covers \enrol_plugin::update_enrol_plugin_data
      */
     public function test_update_enrol_plugin_data(): void {
         global $DB;
diff --git a/grade/tests/external/get_feedback_test.php b/grade/tests/external/get_feedback_test.php
index 9c90734ab686f..66c0fb064ce95 100644
--- a/grade/tests/external/get_feedback_test.php
+++ b/grade/tests/external/get_feedback_test.php
@@ -30,13 +30,13 @@
  * @copyright  2023 Kevin Percy <kevin.percy@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since      Moodle 4.2
+ * @covers \core_grades\external\get_feedback
  */
 class get_feedback_test extends \externallib_advanced_testcase {
 
     /**
      * Test get_feedback.
      *
-     * @covers ::get_feedback
      * @dataProvider get_feedback_provider
      * @param string|null $feedback The feedback text added for the grade item.
      * @param array $expected The expected feedback data.
@@ -103,7 +103,6 @@ public function get_feedback_provider(): array {
     /**
      * Test get_feedback with invalid requests.
      *
-     * @covers ::get_feedback
      * @dataProvider get_feedback_invalid_request_provider
      * @param string $loggeduserrole The role of the logged user.
      * @param bool $feedbacknotincourse Whether to request a feedback for a grade item which is not a part of the course.
diff --git a/grade/tests/external/get_grade_tree_test.php b/grade/tests/external/get_grade_tree_test.php
index 8f6c4df747310..50501a928e03a 100644
--- a/grade/tests/external/get_grade_tree_test.php
+++ b/grade/tests/external/get_grade_tree_test.php
@@ -37,7 +37,6 @@ class get_grade_tree_test extends \externallib_advanced_testcase {
     /**
      * Test the return value of the external function.
      *
-     * @covers ::execute
      * @return void
      */
     public function test_execute(): void {
diff --git a/group/tests/lib_test.php b/group/tests/lib_test.php
index 0fc33bae68825..ad6ad471a8cb4 100644
--- a/group/tests/lib_test.php
+++ b/group/tests/lib_test.php
@@ -883,7 +883,7 @@ public function test_groups_get_members_by_role(): void {
     /**
      * Tests set_groups_messaging
      *
-     * @covers \core_group::set_groups_messaging
+     * @covers ::set_groups_messaging
      */
     public function test_set_groups_messaging(): void {
         $this->resetAfterTest();
@@ -923,7 +923,7 @@ public function test_set_groups_messaging(): void {
     /**
      * Tests set group messaging where it doesn't exist
      *
-     * @covers \core_group::set_groups_messaging
+     * @covers ::set_groups_messaging
      */
     public function test_set_groups_messaging_doesnt_exist(): void {
         $this->resetAfterTest();
diff --git a/h5p/tests/file_storage_test.php b/h5p/tests/file_storage_test.php
index 065f0e516c220..23605719cd91b 100644
--- a/h5p/tests/file_storage_test.php
+++ b/h5p/tests/file_storage_test.php
@@ -33,6 +33,7 @@
  * @copyright  2019 Victor Deniz <victor@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @runTestsInSeparateProcesses
+ * @covers \core_h5p\file_storage
  */
 class file_storage_test extends \advanced_testcase {
 
@@ -847,8 +848,6 @@ public function test_removeContentFile(): void {
 
     /**
      * Test H5P custom styles generation.
-     *
-     * @covers ::generate_custom_styles
      */
     public function test_generate_custom_styles(): void {
         \set_config('h5pcustomcss', '.debug { color: #fab; }', 'core_h5p');
@@ -895,8 +894,6 @@ public function test_generate_custom_styles(): void {
 
     /**
      * Test H5P custom styles retrieval.
-     *
-     * @covers ::get_custom_styles
      */
     public function test_get_custom_styles(): void {
         global $CFG;
diff --git a/h5p/tests/framework_test.php b/h5p/tests/framework_test.php
index b0b7aaaebfcaa..3200f8c985ea7 100644
--- a/h5p/tests/framework_test.php
+++ b/h5p/tests/framework_test.php
@@ -1099,8 +1099,6 @@ public function test_updateContent(): void {
 
     /**
      * Test the behaviour of updateContent() with metadata.
-     *
-     * @covers ::updateContent
      */
     public function test_updateContent_withmetadata(): void {
         global $DB;
diff --git a/h5p/tests/helper_test.php b/h5p/tests/helper_test.php
index d1aef73a0d399..afc2bf3cd9606 100644
--- a/h5p/tests/helper_test.php
+++ b/h5p/tests/helper_test.php
@@ -205,7 +205,6 @@ public function test_save_h5p_existing_libraries(): void {
      * Test the behaviour of save_h5p() when the H5P file contains metadata.
      *
      * @runInSeparateProcess
-     * @covers ::save_h5p
      */
     public function test_save_h5p_metadata(): void {
         global $DB;
diff --git a/lib/dml/tests/dml_read_slave_test.php b/lib/dml/tests/dml_read_slave_test.php
index 9d7514629263c..5bd00d0ab9471 100644
--- a/lib/dml/tests/dml_read_slave_test.php
+++ b/lib/dml/tests/dml_read_slave_test.php
@@ -291,8 +291,6 @@ public function test_read_excluded_tables(): void {
      * so the latency parameter is applied properly.
      *
      * @return void
-     * @covers ::can_use_readonly
-     * @covers ::commit_delegated_transaction
      */
     public function test_transaction(): void {
         $DB = $this->new_db(true);
@@ -339,8 +337,6 @@ public function test_transaction(): void {
      * so the latency parameter is applied properly.
      *
      * @return void
-     * @covers ::can_use_readonly
-     * @covers ::query_end
      */
     public function test_long_update(): void {
         $DB = $this->new_db(true);
@@ -382,8 +378,6 @@ public function test_long_update(): void {
      * when the latency parameter is applied properly.
      *
      * @return void
-     * @covers ::can_use_readonly
-     * @covers ::commit_delegated_transaction
      */
     public function test_transaction_with_events(): void {
         $this->with_global_db(function () {
diff --git a/lib/dml/tests/dml_test.php b/lib/dml/tests/dml_test.php
index f131a84ce3eff..33383df8aa280 100644
--- a/lib/dml/tests/dml_test.php
+++ b/lib/dml/tests/dml_test.php
@@ -530,8 +530,6 @@ public function test_add_sql_debugging(): void {
 
     /**
      * Test the database debugging as SQL comment in anon class
-     *
-     * @covers ::add_sql_debugging
      */
     public function test_sql_debugging_anon_class(): void {
         global $CFG;
@@ -3924,8 +3922,6 @@ public function test_sql_ceil(): void {
 
     /**
      * Test DML libraries sql_cast_to_char method
-     *
-     * @covers ::sql_cast_to_char
      */
     public function test_cast_to_char(): void {
         $DB = $this->tdb;
diff --git a/lib/dml/tests/pgsql_native_moodle_database_test.php b/lib/dml/tests/pgsql_native_moodle_database_test.php
index 476d9eae76a3d..a2e12ae7ecaf6 100644
--- a/lib/dml/tests/pgsql_native_moodle_database_test.php
+++ b/lib/dml/tests/pgsql_native_moodle_database_test.php
@@ -395,9 +395,6 @@ public function new_connection($ssl) {
 
     /**
      * Test SSL connection.
-     *
-     * @return void
-     * @covers ::raw_connect
      */
     public function test_ssl_connection(): void {
         $pgconnerr = 'pg_connect(): Unable to connect to PostgreSQL server:';
diff --git a/lib/external/tests/external_api_test.php b/lib/external/tests/external_api_test.php
index f806785b77971..49bbedae95a5d 100644
--- a/lib/external/tests/external_api_test.php
+++ b/lib/external/tests/external_api_test.php
@@ -332,7 +332,7 @@ public function test_get_context_from_params(): void {
     /**
      * Test \core_external\external_api::get_context()_from_params parameter validation.
      *
-     * @covers \core_external\external_api::get_context
+     * @covers \core_external\external_api::get_context_from_params
      */
     public function test_get_context_params(): void {
         global $USER;
@@ -345,7 +345,7 @@ public function test_get_context_params(): void {
     /**
      * Test \core_external\external_api::get_context()_from_params parameter validation.
      *
-     * @covers \core_external\external_api::get_context
+     * @covers \core_external\external_api::get_context_from_params
      */
     public function test_get_context_params2(): void {
         global $USER;
@@ -357,7 +357,7 @@ public function test_get_context_params2(): void {
 
     /**
      * Test \core_external\external_api::get_context()_from_params parameter validation.
-     * @covers \core_external\external_api::get_context
+     * @covers \core_external\external_api::get_context_from_params
      */
     public function test_get_context_params3(): void {
         global $USER;
diff --git a/lib/filestorage/tests/stored_file_test.php b/lib/filestorage/tests/stored_file_test.php
index bd07c47c2834a..76d1606a5f364 100644
--- a/lib/filestorage/tests/stored_file_test.php
+++ b/lib/filestorage/tests/stored_file_test.php
@@ -33,7 +33,6 @@ class stored_file_test extends advanced_testcase {
     /**
      * Test that the rotate_image() method does not rotate
      * an image that is not supposed to be rotated.
-     * @covers ::rotate_image()
      */
     public function test_rotate_image_does_not_rotate_image(): void {
         global $CFG;
@@ -62,7 +61,6 @@ public function test_rotate_image_does_not_rotate_image(): void {
     /**
      * Test that the rotate_image() method rotates an image
      * that is supposed to be rotated.
-     * @covers ::rotate_image()
      */
     public function test_rotate_image_rotates_image(): void {
         global $CFG;
@@ -94,8 +92,6 @@ public function test_rotate_image_rotates_image(): void {
 
     /**
      * Ensure that get_content_file_handle returns a valid file handle.
-     *
-     * @covers ::get_psr_stream
      */
     public function test_get_psr_stream(): void {
         global $CFG;
diff --git a/lib/testing/tests/testing_generator_test.php b/lib/testing/tests/testing_generator_test.php
index 472cc273c951b..a007a107b8329 100644
--- a/lib/testing/tests/testing_generator_test.php
+++ b/lib/testing/tests/testing_generator_test.php
@@ -23,7 +23,7 @@
  * @category   phpunit
  * @copyright  2012 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @covers \core\testing_data_generator
+ * @covers \testing_data_generator
  */
 class testing_generator_test extends \advanced_testcase {
     public function test_get_plugin_generator_good_case(): void {
diff --git a/lib/tests/accesslib_test.php b/lib/tests/accesslib_test.php
index be464e2f66043..b75624824d915 100644
--- a/lib/tests/accesslib_test.php
+++ b/lib/tests/accesslib_test.php
@@ -5260,7 +5260,7 @@ public function test_require_all_capabilities(): void {
     /**
      * Test get_navigation_filter_context.
      *
-     * @covers ::get_navigation_filter_context
+     * @covers \core\context_helper::get_navigation_filter_context
      */
     public function test_get_navigation_filter_context(): void {
         $this->resetAfterTest();
diff --git a/lib/tests/authlib_test.php b/lib/tests/authlib_test.php
index cb649428f1da7..8a053ed6cf077 100644
--- a/lib/tests/authlib_test.php
+++ b/lib/tests/authlib_test.php
@@ -24,6 +24,7 @@
  * @category   test
  * @copyright  2012 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \auth_plugin_base
  */
 class authlib_test extends \advanced_testcase {
     public function test_lockout(): void {
@@ -507,7 +508,6 @@ public function test_signup_validate_data_same_email(): void {
 
     /**
      * Test the find_cli_user method
-     * @covers ::find_cli_user
      */
     public function test_find_cli_user(): void {
         global $CFG, $USER;
@@ -540,7 +540,6 @@ public function test_find_cli_user(): void {
 
     /**
      * Test the get_enabled_auth_plugin_classes method
-     * @covers ::get_enabled_auth_plugin_classes
      */
     public function test_get_enabled_auth_plugin_classes(): void {
         global $CFG;
diff --git a/lib/tests/check_test.php b/lib/tests/check_test.php
index 297c23ced838d..665b272fcd1d4 100644
--- a/lib/tests/check_test.php
+++ b/lib/tests/check_test.php
@@ -26,7 +26,7 @@
  * @category   check
  * @copyright  2020 Brendan Heywood <brendan@catalyst-au.net>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @covers     \core\check
+ * @covers     \core\check\check
  */
 class check_test extends \advanced_testcase {
 
diff --git a/lib/tests/configonlylib_test.php b/lib/tests/configonlylib_test.php
index f2a466f4ab7f0..0d13174c1729b 100644
--- a/lib/tests/configonlylib_test.php
+++ b/lib/tests/configonlylib_test.php
@@ -147,7 +147,7 @@ public function test_min_get_slash_argument(): void {
     /**
      * Test the min_get_minimum_version function.
      *
-     * @covers ::min_get_minimum_version
+     * @covers ::min_get_minimum_revision
      */
     public function test_min_get_minimum_version(): void {
         // This is fairly hard to write a test for, but we can at least check that it returns a number
@@ -161,7 +161,7 @@ public function test_min_get_minimum_version(): void {
     /**
      * Test the min_get_maximum_version function.
      *
-     * @covers ::min_get_maximum_version
+     * @covers ::min_get_maximum_revision
      */
     public function test_min_get_maximum_version(): void {
         // The maximum version should be set to a time in the near future.
diff --git a/lib/tests/content/export/exportable_items/exportable_filearea_test.php b/lib/tests/content/export/exportable_items/exportable_filearea_test.php
index 8ce062edfaf7a..d0a71ca124c8b 100644
--- a/lib/tests/content/export/exportable_items/exportable_filearea_test.php
+++ b/lib/tests/content/export/exportable_items/exportable_filearea_test.php
@@ -33,7 +33,7 @@
  * @category    test
  * @copyright   2020 Andrew Nicols <andrew@nicols.co.uk>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @covers      \core\content\exportable_items\exportable_filearea
+ * @covers      \core\content\export\exportable_items\exportable_filearea
  */
 class exportable_filearea_test extends advanced_testcase {
 
diff --git a/lib/tests/content/export/exportable_items/exportable_stored_file_test.php b/lib/tests/content/export/exportable_items/exportable_stored_file_test.php
index 0b92d1b48cdd6..affaf6fba0885 100644
--- a/lib/tests/content/export/exportable_items/exportable_stored_file_test.php
+++ b/lib/tests/content/export/exportable_items/exportable_stored_file_test.php
@@ -32,7 +32,7 @@
  * @category    test
  * @copyright   2020 Andrew Nicols <andrew@nicols.co.uk>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @covers      \core\content\exportable_items\exportable_stored_file
+ * @covers      \core\content\export\exportable_items\exportable_stored_file
  */
 class exportable_stored_file_test extends advanced_testcase {
 
diff --git a/lib/tests/content/export/exportable_items/exportable_textarea_test.php b/lib/tests/content/export/exportable_items/exportable_textarea_test.php
index de1968d30d15d..e3594acf5cc39 100644
--- a/lib/tests/content/export/exportable_items/exportable_textarea_test.php
+++ b/lib/tests/content/export/exportable_items/exportable_textarea_test.php
@@ -33,7 +33,7 @@
  * @category    test
  * @copyright   2020 Andrew Nicols <andrew@nicols.co.uk>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @covers      \core\content\exportable_items\exportable_textarea
+ * @covers      \core\content\export\exportable_items\exportable_textarea
  */
 class exportable_textarea_test extends advanced_testcase {
 
diff --git a/lib/tests/core_renderer_test.php b/lib/tests/core_renderer_test.php
index 7d07b48d217cc..73f063d6c24ab 100644
--- a/lib/tests/core_renderer_test.php
+++ b/lib/tests/core_renderer_test.php
@@ -30,7 +30,7 @@
  */
 final class core_renderer_test extends \advanced_testcase {
     /**
-     * @covers \core\hook\before_standard_top_of_body_html_generation
+     * @covers \core\hook\output\before_standard_top_of_body_html_generation
      */
     public function test_standard_top_of_body_html(): void {
         $page = new moodle_page();
@@ -42,7 +42,7 @@ public function test_standard_top_of_body_html(): void {
     }
 
     /**
-     * @covers \core\hook\before_standard_top_of_body_html_generation
+     * @covers \core\hook\output\before_standard_top_of_body_html_generation
      */
     public function test_before_standard_top_of_body_html_generation_hooked(): void {
         require_once(__DIR__ . '/fixtures/core_renderer/before_standard_top_of_body_html_generation_callbacks.php');
@@ -63,7 +63,7 @@ public function test_before_standard_top_of_body_html_generation_hooked(): void
     }
 
     /**
-     * @covers \core\hook\before_footer_html_generation
+     * @covers \core\hook\output\before_footer_html_generation
      */
     public function test_before_footer_html_generation(): void {
         $this->resetAfterTest();
@@ -79,7 +79,7 @@ public function test_before_footer_html_generation(): void {
     }
 
     /**
-     * @covers \core\hook\before_footer_html_generation
+     * @covers \core\hook\output\before_footer_html_generation
      */
     public function test_before_footer_html_generation_hooked(): void {
         $this->resetAfterTest();
@@ -104,7 +104,7 @@ public function test_before_footer_html_generation_hooked(): void {
     }
 
     /**
-     * @covers \core\hook\before_standard_footer_html_generation
+     * @covers \core\hook\output\before_standard_footer_html_generation
      */
     public function before_standard_footer_html_generation(): void {
         $page = new moodle_page();
@@ -116,7 +116,7 @@ public function before_standard_footer_html_generation(): void {
     }
 
     /**
-     * @covers \core\hook\before_standard_footer_html_generation
+     * @covers \core\hook\output\before_standard_footer_html_generation
      */
     public function test_before_standard_footer_html_generation_hooked(): void {
         require_once(__DIR__ . '/fixtures/core_renderer/before_standard_footer_html_generation_callbacks.php');
@@ -137,7 +137,7 @@ public function test_before_standard_footer_html_generation_hooked(): void {
     }
 
     /**
-     * @covers \core\hook\after_standard_main_region_html_generation
+     * @covers \core\hook\output\after_standard_main_region_html_generation
      */
     public function test_after_standard_main_region_html_generation(): void {
         $page = new moodle_page();
@@ -149,7 +149,7 @@ public function test_after_standard_main_region_html_generation(): void {
     }
 
     /**
-     * @covers \core\hook\after_standard_main_region_html_generation
+     * @covers \core\hook\output\after_standard_main_region_html_generation
      */
     public function test_after_standard_main_region_html_generation_hooked(): void {
         require_once(__DIR__ . '/fixtures/core_renderer/after_standard_main_region_html_generation_callbacks.php');
@@ -170,7 +170,7 @@ public function test_after_standard_main_region_html_generation_hooked(): void {
     }
 
     /**
-     * @covers \core\hook\before_html_attributes
+     * @covers \core\hook\output\before_html_attributes
      */
     public function test_htmlattributes(): void {
         $page = new moodle_page();
@@ -182,7 +182,7 @@ public function test_htmlattributes(): void {
     }
 
     /**
-     * @covers \core\hook\before_html_attributes
+     * @covers \core\hook\output\before_html_attributes
      */
     public function test_htmlattributes_hooked(): void {
         require_once(__DIR__ . '/fixtures/core_renderer/htmlattributes_callbacks.php');
diff --git a/lib/tests/cron_test.php b/lib/tests/cron_test.php
index fb9fa284ce8dc..28f4efe829f28 100644
--- a/lib/tests/cron_test.php
+++ b/lib/tests/cron_test.php
@@ -35,9 +35,6 @@ public function setUp(): void {
 
     /**
      * Test the setup_user function.
-     *
-     * @covers ::setup_user
-     * @covers ::reset_user_cache
      */
     public function test_setup_user(): void {
         // This function uses the $GLOBALS super global. Disable the VariableNameLowerCase sniff for this function.
diff --git a/lib/tests/oauth2_test.php b/lib/tests/oauth2_test.php
index 2dcf6f973081c..caccb9306d24b 100644
--- a/lib/tests/oauth2_test.php
+++ b/lib/tests/oauth2_test.php
@@ -29,7 +29,7 @@
  * @package    core
  * @copyright  2017 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later.
- * @coversDefaultClass \core\oauth2\api
+ * @covers \core\oauth2\api
  */
 class oauth2_test extends \advanced_testcase {
 
@@ -256,8 +256,6 @@ public function test_issuer_alloweddomains(): void {
      * Test endpoints creation for issuers.
      * @dataProvider create_endpoints_for_standard_issuer_provider
      *
-     * @covers ::create_endpoints_for_standard_issuer
-     *
      * @param string $type Issuer type to create.
      * @param string|null $discoveryurl Expected discovery URL or null if this endpoint doesn't exist.
      * @param bool $hasmappingfields True if it's expected the issuer to create has mapping fields.
@@ -495,7 +493,7 @@ public function create_custom_profile_fields(): array {
      * Test getting the list of internal fields.
      *
      * @dataProvider create_custom_profile_fields
-     * @covers ::get_internalfield_list
+     * @covers \core\oauth2\user_field_mapping::get_internalfield_list
      * @param array $given Categories and profile fields.
      * @param array $expected Expected value.
      */
@@ -522,7 +520,7 @@ public function test_get_internalfield_list(array $given, array $expected): void
      * Test getting the list of internal fields with flat array.
      *
      * @dataProvider create_custom_profile_fields
-     * @covers ::get_internalfields
+     * @covers \core\oauth2\user_field_mapping::get_internalfields
      * @param array $given Categories and profile fields.
      * @param array $expected Expected value.
      */
@@ -542,7 +540,7 @@ public function test_get_internalfields(array $given, array $expected): void {
     /**
      * Test getting the list of empty external/custom profile fields.
      *
-     * @covers ::get_internalfields
+     * @covers \core\oauth2\user_field_mapping::get_internalfields
      */
     public function test_get_empty_internalfield_list(): void {
 
diff --git a/lib/tests/output/choicelist_test.php b/lib/tests/output/choicelist_test.php
index 3672aa80267fb..7cba7d39e96a9 100644
--- a/lib/tests/output/choicelist_test.php
+++ b/lib/tests/output/choicelist_test.php
@@ -36,7 +36,7 @@ class choicelist_test extends advanced_testcase {
     /**
      * Test for a choice without options.
      *
-     * @covers ::_construct
+     * @covers ::__construct
      * @covers ::add_option
      * @covers ::export_for_template
      */
@@ -57,7 +57,7 @@ public function test_empty_export(): void {
     /**
      * Test for a choice with basic options.
      *
-     * @covers ::_construct
+     * @covers ::__construct
      * @covers ::add_option
      * @covers ::export_for_template
      */
@@ -82,7 +82,7 @@ public function test_basic_export(): void {
     /**
      * Test for a choice with extras options definition.
      *
-     * @covers ::_construct
+     * @covers ::__construct
      * @covers ::add_option
      * @covers ::set_option_extras
      * @covers ::export_for_template
@@ -126,7 +126,7 @@ public function test_option_defintion_export(): void {
     /**
      * Test for a choice with option selected.
      *
-     * @covers ::_construct
+     * @covers ::__construct
      * @covers ::add_option
      * @covers ::set_selected_value
      * @covers ::get_selected_value
@@ -196,7 +196,7 @@ private function validate_option(
     /**
      * Test for a choice with option selected.
      *
-     * @covers ::_construct
+     * @covers ::__construct
      * @covers ::add_option
      * @covers ::set_selected_value
      * @covers ::get_selected_value
diff --git a/lib/tests/pdflib_test.php b/lib/tests/pdflib_test.php
index 3f6eff168e6bf..a11f37d2ebd91 100644
--- a/lib/tests/pdflib_test.php
+++ b/lib/tests/pdflib_test.php
@@ -24,6 +24,7 @@
  * @package    core
  * @copyright  2021 Brendan Heywood (brendan@catalyst-au.net)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \pdf
  */
 class pdflib_test extends \advanced_testcase {
 
@@ -70,7 +71,7 @@ public function test_qrcode(): void {
     /**
      * Test get_export_fontlist function.
      *
-     * @covers ::get_export_fontlist
+     * @covers \pdf::get_export_fontlist
      *
      * @return void
      */
diff --git a/lib/tests/plugininfo/base_test.php b/lib/tests/plugininfo/base_test.php
index 9b774ce1e0de7..a4c8749d07e3e 100644
--- a/lib/tests/plugininfo/base_test.php
+++ b/lib/tests/plugininfo/base_test.php
@@ -27,6 +27,7 @@
  * @package   core
  * @copyright 2019 Andrew Nicols
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \core\plugininfo\base
  */
 class base_test extends \advanced_testcase {
 
@@ -277,7 +278,6 @@ public function load_disk_version_branch_supports_provider(): array {
 
     /**
      * Ensure that plugintype_supports_ordering() returns true.
-     * @covers ::plugintype_supports_ordering
      */
     public function test_plugintype_supports_ordering(): void {
         $this->assertFalse(base::plugintype_supports_ordering());
diff --git a/lib/tests/plugininfo/block_test.php b/lib/tests/plugininfo/block_test.php
index 63ed074f0b7ad..dd871a4607478 100644
--- a/lib/tests/plugininfo/block_test.php
+++ b/lib/tests/plugininfo/block_test.php
@@ -32,8 +32,6 @@ class block_test extends advanced_testcase {
 
     /**
      * Test the get_enabled_plugins method.
-     *
-     * @covers ::get_enabled_plugins
      */
     public function test_get_enabled_plugins(): void {
         $this->resetAfterTest();
diff --git a/lib/tests/plugininfo/media_test.php b/lib/tests/plugininfo/media_test.php
index 05f1f9ba18c47..14a117cca5018 100644
--- a/lib/tests/plugininfo/media_test.php
+++ b/lib/tests/plugininfo/media_test.php
@@ -32,8 +32,6 @@ class media_test extends advanced_testcase {
 
     /**
      * Test the get_enabled_plugins method.
-     *
-     * @covers ::get_enabled_plugins
      */
     public function test_get_enabled_plugins(): void {
         $this->resetAfterTest();
diff --git a/lib/tests/privacy/provider_test.php b/lib/tests/privacy/provider_test.php
index 18d1ab24fa7d5..50dfbb0bba597 100644
--- a/lib/tests/privacy/provider_test.php
+++ b/lib/tests/privacy/provider_test.php
@@ -29,6 +29,7 @@
  * @category   test
  * @copyright  2023 David Woloszyn <david.woloszyn@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @coversDefaultClass \core\privacy\provider
  */
 class provider_test extends provider_testcase {
 
diff --git a/lib/tests/tablelib_test.php b/lib/tests/tablelib_test.php
index 1325a5dc5d2c4..dd6df7c36286c 100644
--- a/lib/tests/tablelib_test.php
+++ b/lib/tests/tablelib_test.php
@@ -32,6 +32,7 @@
  * @category   test
  * @copyright  2013 Damyon Wiese <damyon@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \flexible_table
  */
 class tablelib_test extends \advanced_testcase {
     protected function generate_columns($cols) {
@@ -796,9 +797,6 @@ public function initials_provider(): array {
 
     /**
      * Data test for set and render caption for table.
-     *
-     * @covers ::set_caption_for_table
-     * @covers ::render_caption_for_table
      */
     public function test_set_and_render_caption_for_table(): void {
         $data = $this->generate_data(10, 2);
diff --git a/lib/tests/task/adhoc_task_test.php b/lib/tests/task/adhoc_task_test.php
index 067e6c85b5933..087b5e85f8b36 100644
--- a/lib/tests/task/adhoc_task_test.php
+++ b/lib/tests/task/adhoc_task_test.php
@@ -921,8 +921,7 @@ public function test_run_all_adhoc_from_cli(): void {
     /**
      * Test send messages when adhoc task reaches the max fail delay time.
      *
-     * @covers ::adhoc_task_failed
-     * @covers ::send_failed_task_max_delay_message
+     * @covers \core\task\failed_task_callbacks::send_failed_task_max_delay_message
      */
     public function test_adhoc_message_max_fail_delay(): void {
         $this->resetAfterTest();
diff --git a/lib/tests/task/automated_backup_task_test.php b/lib/tests/task/automated_backup_task_test.php
index acef35a825bfe..6e8ad5a348e69 100644
--- a/lib/tests/task/automated_backup_task_test.php
+++ b/lib/tests/task/automated_backup_task_test.php
@@ -35,7 +35,7 @@ class automated_backup_task_test extends \advanced_testcase {
     /**
      * Test the automated backup and report tasks.
      *
-     * @covers \automated_backup_report_task::execute
+     * @covers \core\task\automated_backup_report_task::execute
      * @covers \backup_cron_automated_helper::send_backup_status_to_admin
      * @covers \backup_cron_automated_helper::run_automated_backup
      * @covers \backup_cron_automated_helper::check_and_push_automated_backups
diff --git a/lib/tests/task/file_temp_cleanup_task_test.php b/lib/tests/task/file_temp_cleanup_task_test.php
index 470fcb37c39c8..e289a900b26ff 100644
--- a/lib/tests/task/file_temp_cleanup_task_test.php
+++ b/lib/tests/task/file_temp_cleanup_task_test.php
@@ -140,7 +140,6 @@ private function generate_test_path($path, $isdir = false, $time = 0, $keep = fa
      * @dataProvider cron_delete_from_temp_provider
      * @param array $nodes List of files and directories
      * @param array $expected The expected results
-     * @covers ::execute
      */
     public function test_cron_delete_from_temp($nodes, $expected): void {
         global $CFG;
diff --git a/lib/tests/task/scheduled_task_test.php b/lib/tests/task/scheduled_task_test.php
index af3de7df39d4a..11a1fed5979d7 100644
--- a/lib/tests/task/scheduled_task_test.php
+++ b/lib/tests/task/scheduled_task_test.php
@@ -26,7 +26,7 @@
  * @category test
  * @copyright 2013 Damyon Wiese
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @coversDefaultClass \core\task\scheduled_task
+ * @covers \core\task\scheduled_task
  */
 class scheduled_task_test extends \advanced_testcase {
 
@@ -65,8 +65,6 @@ public static function eval_cron_provider(): array {
      * @param int[] $expected
      *
      * @dataProvider eval_cron_provider
-     *
-     * @covers ::eval_cron_field
      */
     public function test_eval_cron_field(string $field, int $min, int $max, array $expected): void {
         $testclass = new scheduled_test_task();
@@ -242,7 +240,6 @@ public static function get_next_scheduled_time_detail_provider(): array {
      * @param string $month Month restriction list for task
      * @param string|int $expected Expected run time (strtotime format or time int)
      * @dataProvider get_next_scheduled_time_detail_provider
-     * @covers ::get_next_scheduled_time
      */
     public function test_get_next_scheduled_time_detail(string $now, string $minute, string $hour,
             string $day, string $dayofweek, string $month, string|int $expected): void {
@@ -271,8 +268,6 @@ public function test_get_next_scheduled_time_detail(string $now, string $minute,
      *
      * We want frequent tasks to keep progressing as normal and not randomly stop for an hour, or
      * suddenly decide they need to happen in the past.
-     *
-     * @covers ::get_next_scheduled_time
      */
     public function test_get_next_scheduled_time_dst_continuity(): void {
         $this->resetAfterTest();
@@ -987,10 +982,6 @@ public function test_is_component_enabled_core(): void {
 
     /**
      * Test disabling and enabling individual tasks.
-     *
-     * @covers ::disable
-     * @covers ::enable
-     * @covers ::has_default_configuration
      */
     public function test_disable_and_enable_task(): void {
         $this->resetAfterTest();
@@ -1038,9 +1029,6 @@ public function test_disable_and_enable_task(): void {
 
     /**
      * Test send messages when a task reaches the max fail delay time.
-     *
-     * @covers ::scheduled_task_failed
-     * @covers ::send_failed_task_max_delay_message
      */
     public function test_message_max_fail_delay(): void {
         $this->resetAfterTest();

From 0105cf126e6b7cb79f97503bb07cf06a03a69933 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Mon, 24 Jun 2024 11:39:08 +0100
Subject: [PATCH 050/119] MDL-62958 admin: ensure uploaded plugin directory
 structure present.

Including any empty directories, which would cause validation to
subsequently fail when they were skipped.

Co-authored-by: Leon Stringer <leon.stringer@ntlworld.com>
---
 lib/classes/update/code_manager.php | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/lib/classes/update/code_manager.php b/lib/classes/update/code_manager.php
index 3493ad427fb99..9be25ed00a420 100644
--- a/lib/classes/update/code_manager.php
+++ b/lib/classes/update/code_manager.php
@@ -14,16 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Provides core\update\code_manager class.
- *
- * @package     core_plugin
- * @copyright   2012, 2013, 2015 David Mudrak <david@moodle.com>
- * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace core\update;
 
+use core_collator;
 use core_component;
 use coding_exception;
 use moodle_exception;
@@ -44,7 +37,8 @@
  * - archive existing version of the plugin source code
  * - move (deploy) the plugin source code into the $CFG->dirroot
  *
- * @copyright 2015 David Mudrak <david@moodle.com>
+ * @package   core
+ * @copyright 2012 David Mudrak <david@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class code_manager {
@@ -539,6 +533,8 @@ protected function set_plugin_files_permissions($targetdir, array $files) {
     protected function move_extracted_plugin_files($sourcedir, $targetdir, array $files) {
         global $CFG;
 
+        // Iterate sorted file list (to ensure directories precede files within them).
+        core_collator::ksort($files);
         foreach ($files as $file => $status) {
             if ($status !== true) {
                 throw new moodle_exception('corrupted_archive_structure', 'core_plugin', '', $file, $status);
@@ -548,12 +544,8 @@ protected function move_extracted_plugin_files($sourcedir, $targetdir, array $fi
             $target = $targetdir.'/'.$file;
 
             if (is_dir($source)) {
-                continue;
-
+                mkdir($target, $CFG->directorypermissions, true);
             } else {
-                if (!is_dir(dirname($target))) {
-                    mkdir(dirname($target), $CFG->directorypermissions, true);
-                }
                 rename($source, $target);
             }
         }

From b8fa79c5a714443078829926d791a61a4d227524 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Mon, 24 Jun 2024 14:40:22 +0100
Subject: [PATCH 051/119] MDL-82277 mod_h5pactivity: less fragile error Behat
 step assertion.

Avoids frequent failures related to iframe resizing/timing.
---
 mod/h5pactivity/tests/behat/h5pactivity_deployment.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/h5pactivity/tests/behat/h5pactivity_deployment.feature b/mod/h5pactivity/tests/behat/h5pactivity_deployment.feature
index 6206e134037f0..425feaeeb3189 100644
--- a/mod/h5pactivity/tests/behat/h5pactivity_deployment.feature
+++ b/mod/h5pactivity/tests/behat/h5pactivity_deployment.feature
@@ -34,7 +34,7 @@ Feature: Undeployed H5P activities packages should be available only to any user
   beforehand. Then if a second teacher deploys the package, I can see it.
     Given I am on the "Music history" "h5pactivity activity" page logged in as student1
     And I switch to "h5p-player" class iframe
-    And I should see "This file can't be displayed"
+    And "This file can't be displayed because it has been uploaded by a user without the required capability to deploy H5P content" "text" should exist
     And I switch to the main frame
     And I log out
     # Then teacher2 will be allowed to deploy the package.

From e8ae5222d696d9a8f82cc4ba2cc5b965f1452226 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Mon, 24 Jun 2024 14:13:29 +0100
Subject: [PATCH 052/119] MDL-82024 format_topics: toggle un/highlight section
 icon correctly.

---
 course/format/topics/amd/build/section.min.js       |  2 +-
 course/format/topics/amd/build/section.min.js.map   |  2 +-
 course/format/topics/amd/src/section.js             |  2 ++
 .../courseformat/content/section/controlmenu.php    | 13 +++++++++----
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/course/format/topics/amd/build/section.min.js b/course/format/topics/amd/build/section.min.js
index 5c5a411a75368..44733c754ebd8 100644
--- a/course/format/topics/amd/build/section.min.js
+++ b/course/format/topics/amd/build/section.min.js
@@ -5,6 +5,6 @@ define("format_topics/section",["exports","core/reactive","core_courseformat/cou
    * @module     format_topics/section
    * @copyright  2022 Ferran Recio <ferran@moodle.com>
    * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
-   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=void 0,_templates=(obj=_templates)&&obj.__esModule?obj:{default:obj};class HighlightSection extends _reactive.BaseComponent{create(){this.name="format_topics_section",this.selectors={SETMARKER:'[data-action="sectionHighlight"]',REMOVEMARKER:'[data-action="sectionUnhighlight"]',ACTIONTEXT:".menu-action-text",ICON:".icon"},this.classes={HIDE:"d-none"},this.formatActions={HIGHLIGHT:"sectionHighlight",UNHIGHLIGHT:"sectionUnhighlight"}}getWatchers(){return[{watch:"section.current:updated",handler:this._refreshHighlight}]}async _refreshHighlight(_ref){var _affectedAction$datas,_affectedAction$datas2;let selector,newAction,{element:element}=_ref;element.current?(selector=this.selectors.SETMARKER,newAction=this.formatActions.UNHIGHLIGHT):(selector=this.selectors.REMOVEMARKER,newAction=this.formatActions.HIGHLIGHT);const affectedAction=this.getElement("".concat(selector),element.id);if(!affectedAction)return;affectedAction.dataset.action=newAction;const actionText=affectedAction.querySelector(this.selectors.ACTIONTEXT);if(null!==(_affectedAction$datas=affectedAction.dataset)&&void 0!==_affectedAction$datas&&_affectedAction$datas.swapname&&actionText){const oldText=null==actionText?void 0:actionText.innerText;actionText.innerText=affectedAction.dataset.swapname,affectedAction.dataset.swapname=oldText}const icon=affectedAction.querySelector(this.selectors.ICON);if(null!==(_affectedAction$datas2=affectedAction.dataset)&&void 0!==_affectedAction$datas2&&_affectedAction$datas2.swapicon&&icon){const newIcon=affectedAction.dataset.swapicon;if(newIcon){const pixHtml=await _templates.default.renderPix(newIcon,"core");_templates.default.replaceNode(icon,pixHtml,"")}}}}_exports.init=()=>{const courseEditor=(0,_courseeditor.getCurrentCourseEditor)();courseEditor.supportComponents&&courseEditor.isEditing&&new HighlightSection({element:document.getElementById("page"),reactive:courseEditor})}}));
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=void 0,_templates=(obj=_templates)&&obj.__esModule?obj:{default:obj};class HighlightSection extends _reactive.BaseComponent{create(){this.name="format_topics_section",this.selectors={SETMARKER:'[data-action="sectionHighlight"]',REMOVEMARKER:'[data-action="sectionUnhighlight"]',ACTIONTEXT:".menu-action-text",ICON:".icon"},this.classes={HIDE:"d-none"},this.formatActions={HIGHLIGHT:"sectionHighlight",UNHIGHLIGHT:"sectionUnhighlight"}}getWatchers(){return[{watch:"section.current:updated",handler:this._refreshHighlight}]}async _refreshHighlight(_ref){var _affectedAction$datas,_affectedAction$datas2;let selector,newAction,{element:element}=_ref;element.current?(selector=this.selectors.SETMARKER,newAction=this.formatActions.UNHIGHLIGHT):(selector=this.selectors.REMOVEMARKER,newAction=this.formatActions.HIGHLIGHT);const affectedAction=this.getElement("".concat(selector),element.id);if(!affectedAction)return;affectedAction.dataset.action=newAction;const actionText=affectedAction.querySelector(this.selectors.ACTIONTEXT);if(null!==(_affectedAction$datas=affectedAction.dataset)&&void 0!==_affectedAction$datas&&_affectedAction$datas.swapname&&actionText){const oldText=null==actionText?void 0:actionText.innerText;actionText.innerText=affectedAction.dataset.swapname,affectedAction.dataset.swapname=oldText}const icon=affectedAction.querySelector(this.selectors.ICON);if(null!==(_affectedAction$datas2=affectedAction.dataset)&&void 0!==_affectedAction$datas2&&_affectedAction$datas2.swapicon&&icon){const newIcon=affectedAction.dataset.swapicon;if(newIcon){const pixHtml=await _templates.default.renderPix(newIcon,"core");_templates.default.replaceNode(icon,pixHtml,""),affectedAction.dataset.swapicon=affectedAction.dataset.icon,affectedAction.dataset.icon=newIcon}}}}_exports.init=()=>{const courseEditor=(0,_courseeditor.getCurrentCourseEditor)();courseEditor.supportComponents&&courseEditor.isEditing&&new HighlightSection({element:document.getElementById("page"),reactive:courseEditor})}}));
 
 //# sourceMappingURL=section.min.js.map
\ No newline at end of file
diff --git a/course/format/topics/amd/build/section.min.js.map b/course/format/topics/amd/build/section.min.js.map
index b84d95b25d0c1..6347edca064bd 100644
--- a/course/format/topics/amd/build/section.min.js.map
+++ b/course/format/topics/amd/build/section.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"section.min.js","sources":["../src/section.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Format topics section extra logic component.\n *\n * @module     format_topics/section\n * @copyright  2022 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport {BaseComponent} from 'core/reactive';\nimport {getCurrentCourseEditor} from 'core_courseformat/courseeditor';\nimport Templates from 'core/templates';\n\nclass HighlightSection extends BaseComponent {\n\n    /**\n     * Constructor hook.\n     */\n    create() {\n        // Optional component name for debugging.\n        this.name = 'format_topics_section';\n        // Default query selectors.\n        this.selectors = {\n            SETMARKER: `[data-action=\"sectionHighlight\"]`,\n            REMOVEMARKER: `[data-action=\"sectionUnhighlight\"]`,\n            ACTIONTEXT: `.menu-action-text`,\n            ICON: `.icon`,\n        };\n        // Default classes to toggle on refresh.\n        this.classes = {\n            HIDE: 'd-none',\n        };\n        // The topics format section specific actions.\n        this.formatActions = {\n            HIGHLIGHT: 'sectionHighlight',\n            UNHIGHLIGHT: 'sectionUnhighlight',\n        };\n    }\n\n    /**\n     * Component watchers.\n     *\n     * @returns {Array} of watchers\n     */\n    getWatchers() {\n        return [\n            {watch: `section.current:updated`, handler: this._refreshHighlight},\n        ];\n    }\n\n    /**\n     * Update a content section using the state information.\n     *\n     * @param {object} param\n     * @param {Object} param.element details the update details.\n     */\n    async _refreshHighlight({element}) {\n        let selector;\n        let newAction;\n        if (element.current) {\n            selector = this.selectors.SETMARKER;\n            newAction = this.formatActions.UNHIGHLIGHT;\n        } else {\n            selector = this.selectors.REMOVEMARKER;\n            newAction = this.formatActions.HIGHLIGHT;\n        }\n        // Find the affected action.\n        const affectedAction = this.getElement(`${selector}`, element.id);\n        if (!affectedAction) {\n            return;\n        }\n        // Change action, text and icon.\n        affectedAction.dataset.action = newAction;\n        const actionText = affectedAction.querySelector(this.selectors.ACTIONTEXT);\n        if (affectedAction.dataset?.swapname && actionText) {\n            const oldText = actionText?.innerText;\n            actionText.innerText = affectedAction.dataset.swapname;\n            affectedAction.dataset.swapname = oldText;\n        }\n        const icon = affectedAction.querySelector(this.selectors.ICON);\n        if (affectedAction.dataset?.swapicon && icon) {\n            const newIcon = affectedAction.dataset.swapicon;\n            if (newIcon) {\n                const pixHtml = await Templates.renderPix(newIcon, 'core');\n                Templates.replaceNode(icon, pixHtml, '');\n            }\n        }\n    }\n}\n\nexport const init = () => {\n    // Add component to the section.\n    const courseEditor = getCurrentCourseEditor();\n    if (courseEditor.supportComponents && courseEditor.isEditing) {\n        new HighlightSection({\n            element: document.getElementById('page'),\n            reactive: courseEditor,\n        });\n    }\n};\n"],"names":["HighlightSection","BaseComponent","create","name","selectors","SETMARKER","REMOVEMARKER","ACTIONTEXT","ICON","classes","HIDE","formatActions","HIGHLIGHT","UNHIGHLIGHT","getWatchers","watch","handler","this","_refreshHighlight","selector","newAction","element","current","affectedAction","getElement","id","dataset","action","actionText","querySelector","swapname","oldText","innerText","icon","swapicon","newIcon","pixHtml","Templates","renderPix","replaceNode","courseEditor","supportComponents","isEditing","document","getElementById","reactive"],"mappings":";;;;;;;sJA2BMA,yBAAyBC,wBAK3BC,cAESC,KAAO,6BAEPC,UAAY,CACbC,6CACAC,kDACAC,+BACAC,mBAGCC,QAAU,CACXC,KAAM,eAGLC,cAAgB,CACjBC,UAAW,mBACXC,YAAa,sBASrBC,oBACW,CACH,CAACC,gCAAkCC,QAASC,KAAKC,uGAWjDC,SACAC,WAFgBC,QAACA,cAGjBA,QAAQC,SACRH,SAAWF,KAAKb,UAAUC,UAC1Be,UAAYH,KAAKN,cAAcE,cAE/BM,SAAWF,KAAKb,UAAUE,aAC1Bc,UAAYH,KAAKN,cAAcC,iBAG7BW,eAAiBN,KAAKO,qBAAcL,UAAYE,QAAQI,QACzDF,sBAILA,eAAeG,QAAQC,OAASP,gBAC1BQ,WAAaL,eAAeM,cAAcZ,KAAKb,UAAUG,6CAC3DgB,eAAeG,gEAASI,UAAYF,WAAY,OAC1CG,QAAUH,MAAAA,kBAAAA,WAAYI,UAC5BJ,WAAWI,UAAYT,eAAeG,QAAQI,SAC9CP,eAAeG,QAAQI,SAAWC,cAEhCE,KAAOV,eAAeM,cAAcZ,KAAKb,UAAUI,wCACrDe,eAAeG,kEAASQ,UAAYD,KAAM,OACpCE,QAAUZ,eAAeG,QAAQQ,YACnCC,QAAS,OACHC,cAAgBC,mBAAUC,UAAUH,QAAS,2BACzCI,YAAYN,KAAMG,QAAS,qBAMjC,WAEVI,cAAe,0CACjBA,aAAaC,mBAAqBD,aAAaE,eAC3C1C,iBAAiB,CACjBqB,QAASsB,SAASC,eAAe,QACjCC,SAAUL"}
\ No newline at end of file
+{"version":3,"file":"section.min.js","sources":["../src/section.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Format topics section extra logic component.\n *\n * @module     format_topics/section\n * @copyright  2022 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport {BaseComponent} from 'core/reactive';\nimport {getCurrentCourseEditor} from 'core_courseformat/courseeditor';\nimport Templates from 'core/templates';\n\nclass HighlightSection extends BaseComponent {\n\n    /**\n     * Constructor hook.\n     */\n    create() {\n        // Optional component name for debugging.\n        this.name = 'format_topics_section';\n        // Default query selectors.\n        this.selectors = {\n            SETMARKER: `[data-action=\"sectionHighlight\"]`,\n            REMOVEMARKER: `[data-action=\"sectionUnhighlight\"]`,\n            ACTIONTEXT: `.menu-action-text`,\n            ICON: `.icon`,\n        };\n        // Default classes to toggle on refresh.\n        this.classes = {\n            HIDE: 'd-none',\n        };\n        // The topics format section specific actions.\n        this.formatActions = {\n            HIGHLIGHT: 'sectionHighlight',\n            UNHIGHLIGHT: 'sectionUnhighlight',\n        };\n    }\n\n    /**\n     * Component watchers.\n     *\n     * @returns {Array} of watchers\n     */\n    getWatchers() {\n        return [\n            {watch: `section.current:updated`, handler: this._refreshHighlight},\n        ];\n    }\n\n    /**\n     * Update a content section using the state information.\n     *\n     * @param {object} param\n     * @param {Object} param.element details the update details.\n     */\n    async _refreshHighlight({element}) {\n        let selector;\n        let newAction;\n        if (element.current) {\n            selector = this.selectors.SETMARKER;\n            newAction = this.formatActions.UNHIGHLIGHT;\n        } else {\n            selector = this.selectors.REMOVEMARKER;\n            newAction = this.formatActions.HIGHLIGHT;\n        }\n        // Find the affected action.\n        const affectedAction = this.getElement(`${selector}`, element.id);\n        if (!affectedAction) {\n            return;\n        }\n        // Change action, text and icon.\n        affectedAction.dataset.action = newAction;\n        const actionText = affectedAction.querySelector(this.selectors.ACTIONTEXT);\n        if (affectedAction.dataset?.swapname && actionText) {\n            const oldText = actionText?.innerText;\n            actionText.innerText = affectedAction.dataset.swapname;\n            affectedAction.dataset.swapname = oldText;\n        }\n        const icon = affectedAction.querySelector(this.selectors.ICON);\n        if (affectedAction.dataset?.swapicon && icon) {\n            const newIcon = affectedAction.dataset.swapicon;\n            if (newIcon) {\n                const pixHtml = await Templates.renderPix(newIcon, 'core');\n                Templates.replaceNode(icon, pixHtml, '');\n                affectedAction.dataset.swapicon = affectedAction.dataset.icon;\n                affectedAction.dataset.icon = newIcon;\n            }\n        }\n    }\n}\n\nexport const init = () => {\n    // Add component to the section.\n    const courseEditor = getCurrentCourseEditor();\n    if (courseEditor.supportComponents && courseEditor.isEditing) {\n        new HighlightSection({\n            element: document.getElementById('page'),\n            reactive: courseEditor,\n        });\n    }\n};\n"],"names":["HighlightSection","BaseComponent","create","name","selectors","SETMARKER","REMOVEMARKER","ACTIONTEXT","ICON","classes","HIDE","formatActions","HIGHLIGHT","UNHIGHLIGHT","getWatchers","watch","handler","this","_refreshHighlight","selector","newAction","element","current","affectedAction","getElement","id","dataset","action","actionText","querySelector","swapname","oldText","innerText","icon","swapicon","newIcon","pixHtml","Templates","renderPix","replaceNode","courseEditor","supportComponents","isEditing","document","getElementById","reactive"],"mappings":";;;;;;;sJA2BMA,yBAAyBC,wBAK3BC,cAESC,KAAO,6BAEPC,UAAY,CACbC,6CACAC,kDACAC,+BACAC,mBAGCC,QAAU,CACXC,KAAM,eAGLC,cAAgB,CACjBC,UAAW,mBACXC,YAAa,sBASrBC,oBACW,CACH,CAACC,gCAAkCC,QAASC,KAAKC,uGAWjDC,SACAC,WAFgBC,QAACA,cAGjBA,QAAQC,SACRH,SAAWF,KAAKb,UAAUC,UAC1Be,UAAYH,KAAKN,cAAcE,cAE/BM,SAAWF,KAAKb,UAAUE,aAC1Bc,UAAYH,KAAKN,cAAcC,iBAG7BW,eAAiBN,KAAKO,qBAAcL,UAAYE,QAAQI,QACzDF,sBAILA,eAAeG,QAAQC,OAASP,gBAC1BQ,WAAaL,eAAeM,cAAcZ,KAAKb,UAAUG,6CAC3DgB,eAAeG,gEAASI,UAAYF,WAAY,OAC1CG,QAAUH,MAAAA,kBAAAA,WAAYI,UAC5BJ,WAAWI,UAAYT,eAAeG,QAAQI,SAC9CP,eAAeG,QAAQI,SAAWC,cAEhCE,KAAOV,eAAeM,cAAcZ,KAAKb,UAAUI,wCACrDe,eAAeG,kEAASQ,UAAYD,KAAM,OACpCE,QAAUZ,eAAeG,QAAQQ,YACnCC,QAAS,OACHC,cAAgBC,mBAAUC,UAAUH,QAAS,2BACzCI,YAAYN,KAAMG,QAAS,IACrCb,eAAeG,QAAQQ,SAAWX,eAAeG,QAAQO,KACzDV,eAAeG,QAAQO,KAAOE,yBAM1B,WAEVK,cAAe,0CACjBA,aAAaC,mBAAqBD,aAAaE,eAC3C1C,iBAAiB,CACjBqB,QAASsB,SAASC,eAAe,QACjCC,SAAUL"}
\ No newline at end of file
diff --git a/course/format/topics/amd/src/section.js b/course/format/topics/amd/src/section.js
index 7c4466bd094c9..8676b30631dd1 100644
--- a/course/format/topics/amd/src/section.js
+++ b/course/format/topics/amd/src/section.js
@@ -97,6 +97,8 @@ class HighlightSection extends BaseComponent {
             if (newIcon) {
                 const pixHtml = await Templates.renderPix(newIcon, 'core');
                 Templates.replaceNode(icon, pixHtml, '');
+                affectedAction.dataset.swapicon = affectedAction.dataset.icon;
+                affectedAction.dataset.icon = newIcon;
             }
         }
     }
diff --git a/course/format/topics/classes/output/courseformat/content/section/controlmenu.php b/course/format/topics/classes/output/courseformat/content/section/controlmenu.php
index 73c045aa1cbfd..8a0bcbf08f707 100644
--- a/course/format/topics/classes/output/courseformat/content/section/controlmenu.php
+++ b/course/format/topics/classes/output/courseformat/content/section/controlmenu.php
@@ -117,13 +117,16 @@ protected function get_highlight_control(): array {
         }
 
         $highlightoff = get_string('highlightoff');
+        $highlightofficon = 'i/marked';
+
         $highlighton = get_string('highlight');
+        $highlightonicon = 'i/marker';
 
         if ($course->marker == $section->section) {  // Show the "light globe" on/off.
             $url->param('marker', 0);
             $result = [
                 'url' => $url,
-                'icon' => 'i/marked',
+                'icon' => $highlightofficon,
                 'name' => $highlightoff,
                 'pixattr' => ['class' => ''],
                 'attr' => [
@@ -131,15 +134,16 @@ protected function get_highlight_control(): array {
                     'data-action' => 'sectionUnhighlight',
                     'data-sectionreturn' => $sectionreturn,
                     'data-id' => $section->id,
+                    'data-icon' => $highlightofficon,
                     'data-swapname' => $highlighton,
-                    'data-swapicon' => 'i/marker',
+                    'data-swapicon' => $highlightonicon,
                 ],
             ];
         } else {
             $url->param('marker', $section->section);
             $result = [
                 'url' => $url,
-                'icon' => 'i/marker',
+                'icon' => $highlightonicon,
                 'name' => $highlighton,
                 'pixattr' => ['class' => ''],
                 'attr' => [
@@ -147,8 +151,9 @@ protected function get_highlight_control(): array {
                     'data-action' => 'sectionHighlight',
                     'data-sectionreturn' => $sectionreturn,
                     'data-id' => $section->id,
+                    'data-icon' => $highlightonicon,
                     'data-swapname' => $highlightoff,
-                    'data-swapicon' => 'i/marked',
+                    'data-swapicon' => $highlightofficon,
                 ],
             ];
         }

From d0e82b746ea167e1d99e9ccca670f694377af73e Mon Sep 17 00:00:00 2001
From: Trisha Milan <trishamilan@catalyst-au.net>
Date: Fri, 10 May 2024 12:10:32 +1000
Subject: [PATCH 053/119] MDL-81807 core: Add scheduled task for updating the
 GeoIP database

This commit includes the following changes:

- Implemented a scheduled task to automate the download and update of the GeoIP database.
- Integrated checksum verification for the downloaded database file.
- Added new configuration settings to enable administrators to enter MaxMind account credentials,
  allowing authenticated access to both free and paid GeoIP database versions from Maxmind.
---
 admin/settings/location.php                 |  21 ++-
 lang/en/admin.php                           |  17 +-
 lang/en/error.php                           |   2 +-
 lib/classes/task/update_geoip2file_task.php | 183 ++++++++++++++++++++
 lib/db/tasks.php                            |  10 ++
 version.php                                 |   2 +-
 6 files changed, 227 insertions(+), 8 deletions(-)
 create mode 100644 lib/classes/task/update_geoip2file_task.php

diff --git a/admin/settings/location.php b/admin/settings/location.php
index 5a4cc9010c86a..3d6809ad655df 100644
--- a/admin/settings/location.php
+++ b/admin/settings/location.php
@@ -44,7 +44,26 @@
 
         $temp->add(new admin_setting_configfile('geoip2file', new lang_string('geoipfile', 'core_admin'),
             new lang_string('configgeoipfile', 'core_admin', $CFG->dataroot . '/geoip/'),
-            $CFG->dataroot . '/geoip/GeoLite2-City.mmdb'));
+            $CFG->dataroot . '/geoip/GeoIP-City.mmdb'));
+
+        $temp->add(new admin_setting_configselect('geoipdbedition',
+            new lang_string('geoipdbedition', 'core_admin'),
+            new lang_string('geoipdbedition_desc', 'core_admin'), 'GeoLite2-City',
+            ['GeoLite2-City' => 'GeoLite2-City', 'GeoIP2-City' => 'GeoIP2-City']));
+
+        $temp->add(new admin_setting_configtext('geoipmaxmindaccid',
+            new lang_string('geoipmaxmindaccid', 'core_admin'),
+            new lang_string('geoipmaxmindaccid_desc', 'core_admin'),
+            '',
+            PARAM_TEXT,
+        ));
+
+        $temp->add(new admin_setting_configtext('geoipmaxmindlicensekey',
+            new lang_string('geoipmaxmindlicensekey', 'core_admin'),
+            new lang_string('geoipmaxmindlicensekey_desc', 'core_admin'),
+            '',
+            PARAM_TEXT,
+        ));
 
         $temp->add(new admin_setting_configtext('googlemapkey3', new lang_string('googlemapkey3', 'core_admin'),
             new lang_string('googlemapkey3_help', 'core_admin'), '', PARAM_RAW, 60));
diff --git a/lang/en/admin.php b/lang/en/admin.php
index 664b9790dc73b..be392c748380c 100644
--- a/lang/en/admin.php
+++ b/lang/en/admin.php
@@ -286,7 +286,7 @@
 $string['configfullnamedisplay'] = 'This defines how names are shown when they are displayed in full. The default value, "language", leaves it to the string "fullnamedisplay" in the current language pack to decide. Some languages have different name display conventions.
 
 For most mono-lingual sites the most efficient setting is "firstname lastname", but you may choose to hide last names altogether. Placeholders that can be used are: firstname, lastname, firstnamephonetic, lastnamephonetic, middlename, and alternatename.';
-$string['configgeoipfile'] = 'Location of GeoLite2 City binary data file. This file is not part of Moodle distribution and must be obtained separately from <a href="https://www.maxmind.com/">MaxMind</a>. You can either buy a commercial version or use the free version. You\'ll need to register to download the City database file, which you can do at <a href="https://dev.maxmind.com/geoip/geoip2/geolite2/" >https://dev.maxmind.com/geoip/geoip2/geolite2/</a>. Once you\'ve registered and downloaded the file, extract it into "{$a}" directory on your server.';
+$string['configgeoipfile'] = 'Location of GeoIP City binary data file. This file is not part of Moodle distribution and must be obtained separately from <a href="https://www.maxmind.com/">MaxMind</a>. You can either buy a commercial version or use the free version. You\'ll need to register to download the City database file, which you can do at <a href="https://dev.maxmind.com/geoip/geoip2/geolite2/" >https://dev.maxmind.com/geoip/geoip2/geolite2/</a>. Once you\'ve registered and downloaded the file, extract it into "{$a}" directory on your server.';
 $string['configgetremoteaddrconf'] = 'If your server is behind a reverse proxy, you can use this setting to specify which HTTP headers can be trusted to contain the remote IP address. The headers are read in order, using the first one that is available.';
 $string['configgradebookroles'] = 'This setting allows you to control who appears on the gradebook.  Users need to have at least one of these roles in a course to be shown in the gradebook for that course.';
 $string['configgradeexport'] = 'Choose which gradebook export formats are your primary methods for exporting grades.  Chosen plugins will then set and use a "last exported" field for every grade.  For example, this might result in exported records being identified as being "new" or "updated".  If you are not sure about this then leave everything unchecked.';
@@ -690,7 +690,13 @@
 $string['fullnamedisplayprivate'] = 'Full name format - private';
 $string['gdrequired'] = 'The GD extension is now required by Moodle for image conversion.';
 $string['generalsettings'] = 'General settings';
-$string['geoipfile'] = 'GeoLite2 City MaxMind DB';
+$string['geoipdbedition'] = 'GeoIP Database Edition';
+$string['geoipdbedition_desc'] = 'Select the edition of the GeoIP database to download. Please be aware that using the GeoIP2-City database requires a valid paid license.';
+$string['geoipfile'] = 'GeoIP City DB';
+$string['geoipmaxmindaccid'] = 'MaxMind account ID';
+$string['geoipmaxmindaccid_desc'] = 'The account ID of the account created on the MaxMind API service.';
+$string['geoipmaxmindlicensekey'] = 'MaxMind license key';
+$string['geoipmaxmindlicensekey_desc'] = 'The license key of the account created on the MaxMind API service.';
 $string['getremoteaddrconf'] = 'Logged IP address source';
 $string['globalsearch'] = 'Global search';
 $string['globalsearchmanage'] = 'Manage global search';
@@ -775,10 +781,10 @@
 $string['ipblocker'] = 'IP blocker';
 $string['ipblockersyntax'] = 'Put every entry on one line. Valid entries are either full IP address (such as <b>192.168.10.1</b>) which matches a single host; or partial address (such as <b>192.168</b>) which matches any address starting with those numbers; or CIDR notation (such as <b>231.54.211.0/20</b>); or a range of IP addresses (such as <b>231.3.56.10-20</b>) where the range applies to the last part of the address. Text domain names (like \'example.com\') are not supported. Blank lines, and text following a "#" character are ignored.';
 $string['iplookup'] = 'IP address lookup';
-$string['iplookupgeoplugin'] = 'The <a href="https://www.geoplugin.com">geoPlugin</a> service is currently being used to look up geographical information. For more accurate results we recommend installing a local copy of the MaxMind GeoLite database.';
-$string['iplookupinfo'] = 'The free online NetGeo server is used to look up IP address locations. The database is not maintained any more though, and may return incorrect data. Installing a local copy of the free GeoLite2 City database from MaxMind is recommended.<br />
+$string['iplookupgeoplugin'] = 'The <a href="https://www.geoplugin.com">geoPlugin</a> service is currently being used to look up geographical information. For more accurate results we recommend installing a local copy of the MaxMind GeoIP City database.';
+$string['iplookupinfo'] = 'The free online NetGeo server is used to look up IP address locations. The database is not maintained any more though, and may return incorrect data. Installing a local copy of a GeoIP database from MaxMind is recommended.<br />
 If a Google Maps API V3 key is provided, IP address location is displayed using Google Maps. You need a Google account and to apply for a Google Maps API key. If no Google Maps API V3 key is provided, IP address location is displayed using OpenStreetMap.';
-$string['iplookupmaxmindnote'] = 'This product includes GeoLite2 data created by MaxMind, available from <a href="https://www.maxmind.com">https://www.maxmind.com</a>.';
+$string['iplookupmaxmindnote'] = 'This product includes GeoIP City data created by MaxMind, available from <a href="https://www.maxmind.com">https://www.maxmind.com</a>.';
 $string['iscustomadminwarnings'] = 'It has been detected that your site is using a custom admin directory. This feature is no longer supported and will be removed after Moodle 4.2.';
 $string['ishttpswarning'] = 'It has been detected that your site is not secured using HTTPS. It is strongly recommended to migrate your site to HTTPS for increased security and improved integration with other systems.';
 $string['keeptagnamecase'] = 'Keep tag name casing';
@@ -1436,6 +1442,7 @@
 $string['taskstatscron'] = 'Background processing for statistics';
 $string['tasktagcron'] = 'Background processing for tags';
 $string['tasktempfilecleanup'] = 'Delete stale temp files';
+$string['taskupdategeoip2file'] = 'Update GeoIP file';
 $string['tempdatafoldercleanup'] = 'Clean up temporary data files older than';
 $string['templates'] = 'Templates';
 $string['testoutgoingmailconf'] = 'Test outgoing mail configuration';
diff --git a/lang/en/error.php b/lang/en/error.php
index 09764f33a61d3..9de16f6fe16f9 100644
--- a/lang/en/error.php
+++ b/lang/en/error.php
@@ -96,7 +96,7 @@
 $string['cannotfindlang'] = 'Cannot find "{$a}" language pack!';
 $string['cannotfindteacher'] = 'Cannot find teacher';
 $string['cannotfinduser'] = 'Cannot find user named "{$a}"';
-$string['cannotgeoplugin'] = 'Cannot connect to the geoPlugin server at https://www.geoplugin.com. Please check your proxy settings or install the MaxMind GeoLite City data file.';
+$string['cannotgeoplugin'] = 'Cannot connect to the geoPlugin server at https://www.geoplugin.com. Please check your proxy settings or install the MaxMind GeoIP City data file.';
 $string['cannotgetblock'] = 'Could not retrieve blocks from the database';
 $string['cannotgetcats'] = 'Cannot get category record';
 $string['cannotgetdata'] = 'Cannot get data';
diff --git a/lib/classes/task/update_geoip2file_task.php b/lib/classes/task/update_geoip2file_task.php
new file mode 100644
index 0000000000000..2e7fb7798c4b7
--- /dev/null
+++ b/lib/classes/task/update_geoip2file_task.php
@@ -0,0 +1,183 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core\task;
+
+use core\http_client;
+use moodle_exception;
+use PharData;
+
+/**
+ * Simple task to update the GeoIP database file.
+ *
+ * @package     core
+ * @author      Trisha Milan <trishamilan@catalyst-au.net>
+ * @copyright   Monash University 2024
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class update_geoip2file_task extends scheduled_task {
+
+    /**
+     * Get a descriptive name for this task (shown to admins).
+     *
+     * @return string
+     */
+    public function get_name(): string {
+        return get_string('taskupdategeoip2file', 'admin');
+    }
+
+    /**
+     * Execute the task to update the GeoIP2 database file.
+     *
+     * @throws \GuzzleHttp\Exception\GuzzleException
+     * @throws moodle_exception
+     */
+    public function execute(): void {
+        global $CFG;
+
+        if (!$CFG->geoipmaxmindaccid || !$CFG->geoipmaxmindlicensekey) {
+            mtrace("MaxMind account information is incomplete. Please configure the account ID and license key.");
+            return;
+        }
+
+        // Setup base directory path and permissions.
+        $geoip2file = $CFG->geoip2file;
+        $geoipdirectory = dirname($geoip2file);
+        if (!check_dir_exists($geoipdirectory) && !mkdir($geoipdirectory, $CFG->directorypermissions, true)) {
+            throw new moodle_exception("Cannot create output directory $geoipdirectory");
+        }
+
+        $geoippermalink = 'https://download.maxmind.com/geoip/databases/' . $CFG->geoipdbedition . '/download';
+
+        $client = new http_client(['auth' => [$CFG->geoipmaxmindaccid, $CFG->geoipmaxmindlicensekey]]);
+        $response = $client->head($geoippermalink, ['query' => ['suffix' => 'tar.gz']]);
+        $headers = $response->getHeaders();
+        $lastmodified = strtotime($headers['Last-Modified'][0]);
+        if (!$this->is_update_needed($geoip2file, $lastmodified)) {
+            mtrace("No update needed. The GeoIP database is up to date.");
+            return;
+        }
+
+        // Define path for downloading the GeoIP2 archive.
+        $archivefilename = 'GeoIP-City.tar.gz';
+        $tempdirectory = make_request_directory(true);
+        $geoipdownloadpath = $tempdirectory . '/' . $archivefilename;
+
+        mtrace("Downloading $CFG->geoipdbedition database from MaxMind......");
+        $response = $client->request('GET', $geoippermalink, [
+            'query' => ['suffix' => 'tar.gz'],
+            'sink' => $geoipdownloadpath,
+        ]);
+        if ($response->getStatusCode() != 200) {
+            throw new moodle_exception("Error downloading file.");
+        }
+
+        mtrace("File downloaded successfully to $geoipdownloadpath");
+        mtrace("Verifying checksum......");
+
+        // Get the latest checksum from MaxMind.
+        $checksumcontent = $client->get($geoippermalink, ['query' => ['suffix' => 'tar.gz.sha256']])->getBody()->getContents();
+        list($checksum) = explode(' ', $checksumcontent);
+        if (!$this->verify_checksum($checksum, $geoipdownloadpath)) {
+            throw new moodle_exception("Checksum verification failed.");
+        }
+
+        mtrace("Checksum verified successfully.");
+        if ($this->update_geoip2file($geoipdownloadpath, $tempdirectory, $geoip2file)) {
+            // Store the last seen timestamp.
+            set_config('geoip_last_seen_timestamp', $lastmodified);
+            mtrace("GeoIP database update successful!");
+        } else {
+            throw new moodle_exception("GeoIP database update failed.");
+        }
+    }
+
+    /**
+     * Determines if an update is needed for the GeoIP2 file based on the last modified date.
+     *
+     * @param string $geoip2file The path to the GeoIP2 file that needs to be checked for updates.
+     * @param string $lastmodified The last modified date to be compared against the stored last seen timestamp.
+     * @return bool
+     */
+    private function is_update_needed(string $geoip2file, string $lastmodified): bool {
+        return !file_exists($geoip2file) || $lastmodified !== get_config('core', 'geoip_last_seen_timestamp');
+    }
+
+    /**
+     * Verify the checksum of the downloaded file against an expected checksum.
+     *
+     * @param string $expectedchecksum The checksum expected for the file.
+     * @param string $geoipdownloadpath The path where the downloaded geoip archive is located.
+     * @return bool Returns true if the checksums match, returns false otherwise.
+     */
+    private function verify_checksum(string $expectedchecksum, string $geoipdownloadpath): bool {
+        $actualchecksum = hash_file('sha256', $geoipdownloadpath);
+        return $expectedchecksum === $actualchecksum;
+    }
+
+    /**
+     * Extract the archive and update the GeoIP2 database file.
+     *
+     * @param string $archivepath The path to the archive file that needs to be extracted.
+     * @param string $targetdirectory Directory where the archive contents will be extracted.
+     * @param string $geoip2file The path to move the extracted GeoIP2 file.
+     * @return bool Returns true if the file was successfully extracted and moved to the specified location,
+     *              false if any part of the process fails.
+     */
+    private function update_geoip2file(string $archivepath, string $targetdirectory, string $geoip2file): bool {
+        $archive = new PharData($archivepath);
+        $archivename = $archive->getFilename();
+
+        mtrace("Extracting file......");
+        $archive->extractTo($targetdirectory);
+        $sourcefolder = $targetdirectory . '/' . $archivename;
+
+        // Find the mmdb file.
+        $mmdbfiles = glob($sourcefolder . '/*.mmdb');
+        if (count($mmdbfiles) > 1) {
+            throw new moodle_exception("Multiple .mmdb files found in the extracted folder.");
+        } else if (count($mmdbfiles) === 0) {
+            throw new moodle_exception("GeoIP file does not exist.");
+        }
+
+        // Backup existing GeoIP file before attempting to update.
+        $geoip2filename = basename($geoip2file);
+        $backuppath = $targetdirectory . '/' . 'backup_' . $geoip2filename;
+        if (file_exists($geoip2file)) {
+            if (!rename($geoip2file, $backuppath)) {
+                mtrace("Failed to create a backup of the existing GeoIP database.");
+            }
+            mtrace("Temporary backup of existing GeoIP file has been created.");
+        }
+
+        mtrace("Moving {$mmdbfiles[0]} into $geoip2file");
+        if (!copy($mmdbfiles[0], $geoip2file)) {
+            mtrace("Failed to update $geoip2filename.");
+            // Attempt to restore the original file from the backup.
+            if (file_exists($backuppath)) {
+                mtrace("Attempting to restore from backup.");
+                if (!copy($backuppath, $geoip2file)) {
+                    throw new moodle_exception("Failed to restore the GeoIP database from backup.");
+                } else {
+                    mtrace("The GeoIP database has been restored from the backup successfully.");
+                }
+            }
+            return false;
+        }
+        mtrace("$geoip2filename updated successfully.");
+        return true;
+    }
+}
diff --git a/lib/db/tasks.php b/lib/db/tasks.php
index 905c73f06e360..0a9548e4b45dc 100644
--- a/lib/db/tasks.php
+++ b/lib/db/tasks.php
@@ -466,4 +466,14 @@
         'month' => '*',
         'dayofweek' => '*',
     ],
+    [
+        'classname' => 'core\task\update_geoip2file_task',
+        'blocking' => 0,
+        'minute' => '0',
+        'hour' => 'R',
+        'day' => '*',
+        'month' => '*',
+        'dayofweek' => 'R',
+        'disabled' => true,
+    ],
 );
diff --git a/version.php b/version.php
index 732cea4ccfbc4..a6c30fe3288af 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2024062000.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2024062000.001;             // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
 $release  = '4.5dev (Build: 20240620)'; // Human-friendly version name

From d63aff3f51ba2b295ea2ebcf65e3281d27601ab9 Mon Sep 17 00:00:00 2001
From: Meirza <meirza.arson@moodle.com>
Date: Thu, 16 May 2024 18:04:44 +0700
Subject: [PATCH 054/119] MDL-81250 calendar: Use full course name as the
 course filter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Eduardo Domínguez <eduardo.dominguez@uib.es>
---
 blocks/timeline/tests/behat/block_timeline_search.feature | 2 +-
 calendar/renderer.php                                     | 8 +++++---
 calendar/templates/add_event_button.mustache              | 2 +-
 calendar/templates/view_selector.mustache                 | 2 +-
 calendar/tests/behat/calendar.feature                     | 4 ++--
 theme/boost/scss/moodle/forms.scss                        | 3 +++
 theme/boost/style/moodle.css                              | 3 +++
 theme/classic/style/moodle.css                            | 3 +++
 8 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/blocks/timeline/tests/behat/block_timeline_search.feature b/blocks/timeline/tests/behat/block_timeline_search.feature
index f25bbd4cf856e..5814ea418a35b 100644
--- a/blocks/timeline/tests/behat/block_timeline_search.feature
+++ b/blocks/timeline/tests/behat/block_timeline_search.feature
@@ -141,7 +141,7 @@ Feature: The timeline block allows users to search for upcoming activities
     And I should see "Test choice 7" in the ".block-timeline [data-region='view-courses']" "css_element"
     And I should see "Test choice 8" in the ".block-timeline [data-region='view-courses']" "css_element"
     When I set the field "Search by activity type or name" to "choice 1"
-    And I wait until "Course 4" "text" does not exist
+    And I wait until "//h4[contains(@class, 'h5') and contains(.,'Course 4')]" "xpath_element" does not exist
     Then I should see "Test choice 1" in the "Timeline" "block"
     And I should see "Course 2" in the ".block-timeline [data-region='view-courses']" "css_element"
     And I should not see "Course 1" in the ".block-timeline [data-region='view-courses']" "css_element"
diff --git a/calendar/renderer.php b/calendar/renderer.php
index 5134fa007fa5c..3693953d85b1a 100644
--- a/calendar/renderer.php
+++ b/calendar/renderer.php
@@ -206,7 +206,7 @@ public function course_filter_selector(moodle_url $returnurl, $label = null, $co
         }
 
         $contextrecords = [];
-        $courses = calendar_get_default_courses($courseid, 'id, shortname');
+        $courses = calendar_get_default_courses($courseid, 'id, fullname');
 
         if (!empty($courses) && count($courses) > CONTEXT_CACHE_MAX_SIZE) {
             // We need to pull the context records from the DB to preload them
@@ -235,7 +235,9 @@ public function course_filter_selector(moodle_url $returnurl, $label = null, $co
                 context_helper::preload_from_record($contextrecords[$course->id]);
             }
             $coursecontext = context_course::instance($course->id);
-            $courseoptions[$course->id] = format_string($course->shortname, true, array('context' => $coursecontext));
+            // Limit the displayed course name to prevent the dropdown from getting too wide.
+            $coursename = shorten_text($course->fullname, 50, true);
+            $courseoptions[$course->id] = format_string($coursename, true, ['context' => $coursecontext]);
         }
 
         if ($courseid) {
@@ -260,7 +262,7 @@ public function course_filter_selector(moodle_url $returnurl, $label = null, $co
         }
         $select = html_writer::label($label, $filterid, false, $labelattributes);
         $select .= html_writer::select($courseoptions, 'course', $selected, false,
-                ['class' => 'cal_courses_flt ml-1 mr-auto', 'id' => $filterid]);
+                ['class' => 'cal_courses_flt ml-1 mr-auto mr-2 mb-2', 'id' => $filterid]);
 
         return $select;
     }
diff --git a/calendar/templates/add_event_button.mustache b/calendar/templates/add_event_button.mustache
index 115e58ce5dbe4..06cdebfd80dca 100644
--- a/calendar/templates/add_event_button.mustache
+++ b/calendar/templates/add_event_button.mustache
@@ -34,7 +34,7 @@
 }}
 {{#defaulteventcontext}}
 <button{{!
-    }} class="btn btn-primary float-sm-right float-right"{{!
+    }} class="btn btn-primary float-sm-right float-right ml-1 mb-2"{{!
     }} data-context-id="{{defaulteventcontext}}"{{!
     }} data-action="new-event-button"{{!
     }}>
diff --git a/calendar/templates/view_selector.mustache b/calendar/templates/view_selector.mustache
index 6a9de4cad1dd8..a0d5ce36edf2f 100644
--- a/calendar/templates/view_selector.mustache
+++ b/calendar/templates/view_selector.mustache
@@ -27,7 +27,7 @@
     }
 }}
 <div data-region="view-selector">
-    <button id="calendarviewdropdown" type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+    <button id="calendarviewdropdown" type="button" class="btn btn-outline-secondary dropdown-toggle ml-1 mr-2 mb-2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         <span class="d-sm-inline-block" data-active-item-text>
             {{#viewingmonth}}{{#str}} month {{/str}}{{/viewingmonth}}
             {{#viewingday}}{{#str}} day, core_calendar {{/str}}{{/viewingday}}
diff --git a/calendar/tests/behat/calendar.feature b/calendar/tests/behat/calendar.feature
index ff681b5c0f8c1..14f9951eb89e4 100644
--- a/calendar/tests/behat/calendar.feature
+++ b/calendar/tests/behat/calendar.feature
@@ -77,7 +77,7 @@ Feature: Perform basic calendar functionality
   Scenario: Create a group event
     Given I log in as "teacher1"
     And I follow "Full calendar"
-    And I set the field "course" to "C1"
+    And I set the field "course" to "Course 1"
     And I create a calendar event:
       | Type of event | group |
       | Group         | Group 1 |
@@ -217,7 +217,7 @@ Feature: Perform basic calendar functionality
     And I click on "New event" "button"
     Then the field "Type of event" matches value "User"
     And I click on "Close" "button" in the "New event" "dialogue"
-    And I set the field "course" to "C1"
+    And I set the field "course" to "Course 1"
     When I click on "New event" "button"
     Then the field "Type of event" matches value "Course"
 
diff --git a/theme/boost/scss/moodle/forms.scss b/theme/boost/scss/moodle/forms.scss
index 84e318729f428..03218acb8947b 100644
--- a/theme/boost/scss/moodle/forms.scss
+++ b/theme/boost/scss/moodle/forms.scss
@@ -279,6 +279,9 @@ div#dateselector-calendar-panel {
     margin: 0;
     cursor: pointer;
     color: $body-color;
+    word-break: normal;
+    overflow-wrap: anywhere;
+    white-space: normal;
     &:hover,
     &:focus,
     &[aria-selected="true"] {
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index bba2e639d67df..668038afe0212 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -33165,6 +33165,9 @@ div#dateselector-calendar-panel {
   margin: 0;
   cursor: pointer;
   color: #1d2125;
+  word-break: normal;
+  overflow-wrap: anywhere;
+  white-space: normal;
 }
 .form-autocomplete-suggestions li:hover, .form-autocomplete-suggestions li:focus, .form-autocomplete-suggestions li[aria-selected=true] {
   background-color: #0f6cbf;
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 6607b1a5b66ca..082a1fa854964 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -33165,6 +33165,9 @@ div#dateselector-calendar-panel {
   margin: 0;
   cursor: pointer;
   color: #1d2125;
+  word-break: normal;
+  overflow-wrap: anywhere;
+  white-space: normal;
 }
 .form-autocomplete-suggestions li:hover, .form-autocomplete-suggestions li:focus, .form-autocomplete-suggestions li[aria-selected=true] {
   background-color: #0f6cbf;

From 7402706c599583a3c3038a4e3eb3fd008c63cac3 Mon Sep 17 00:00:00 2001
From: Sara Arjona <sara@moodle.com>
Date: Wed, 8 May 2024 13:21:24 +0200
Subject: [PATCH 055/119] MDL-81866 course: Improve workflow for reset course

The following changes have been done to improve the reset course:
- Reset course button moved to sticky footer. Select default and
deselect all buttons set as secondary and left at the end of the form
- Adjusted page layout to a standardized format, centering the form for
improving presentation and recolocating the Reset course button away
from the bottom-right corner
- Changed page layout to standard, to display the form centered and
avoid having the Reset course button in the right bottom corner
- Modal added before resetting a course, asking user for confirmation
- Reset course buttons displayed with danger styling, because they
remove information
- All sections are expanded by default
- Default options are selected by default
---
 course/amd/build/resetcourse.min.js     | 10 ++++
 course/amd/build/resetcourse.min.js.map |  1 +
 course/amd/src/resetcourse.js           | 77 +++++++++++++++++++++++++
 course/reset.php                        |  7 ++-
 course/reset_form.php                   | 42 ++++++++++++--
 course/tests/behat/reset_course.feature | 75 ++++++++++++++++++++++++
 lang/en/moodle.php                      |  7 ++-
 7 files changed, 213 insertions(+), 6 deletions(-)
 create mode 100644 course/amd/build/resetcourse.min.js
 create mode 100644 course/amd/build/resetcourse.min.js.map
 create mode 100644 course/amd/src/resetcourse.js
 create mode 100644 course/tests/behat/reset_course.feature

diff --git a/course/amd/build/resetcourse.min.js b/course/amd/build/resetcourse.min.js
new file mode 100644
index 0000000000000..4f899eeafcd63
--- /dev/null
+++ b/course/amd/build/resetcourse.min.js
@@ -0,0 +1,10 @@
+define("core_course/resetcourse",["exports","core/notification","core/prefetch","core/str"],(function(_exports,_notification,_prefetch,_str){var obj;
+/**
+   * Javascript module for resetting a course
+   *
+   * @module      core_course/resetcourse
+   * @copyright   2024 Sara Arjona <sara@moodle.com>
+   * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=void 0,_notification=(obj=_notification)&&obj.__esModule?obj:{default:obj};const selectors_resetCoursetButton='[data-action="resetcourse"]';_exports.init=()=>{(0,_prefetch.prefetchStrings)("core",["resetcourseconfirm","resetcoursewarning","resetcourse"]),registerEventListeners()};const registerEventListeners=()=>{document.addEventListener("click",(event=>{const resetButton=event.target.closest(selectors_resetCoursetButton);resetButton&&(event.preventDefault(),resetCourseConfirm(resetButton))}))},resetCourseConfirm=async resetButton=>{const courseName=resetButton.dataset.coursename;_notification.default.deleteCancelPromise((0,_str.getString)("resetcourseconfirm"),(0,_str.getString)("resetcoursewarning","core",courseName),(0,_str.getString)("resetcourse")).then((()=>{resetButton.closest("form").submit()})).catch((()=>{}))}}));
+
+//# sourceMappingURL=resetcourse.min.js.map
\ No newline at end of file
diff --git a/course/amd/build/resetcourse.min.js.map b/course/amd/build/resetcourse.min.js.map
new file mode 100644
index 0000000000000..b3a0159184ca6
--- /dev/null
+++ b/course/amd/build/resetcourse.min.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"resetcourse.min.js","sources":["../src/resetcourse.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Javascript module for resetting a course\n *\n * @module      core_course/resetcourse\n * @copyright   2024 Sara Arjona <sara@moodle.com>\n * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport Notification from 'core/notification';\nimport {prefetchStrings} from 'core/prefetch';\nimport {getString} from 'core/str';\n\nconst selectors = {\n    resetCoursetButton: '[data-action=\"resetcourse\"]',\n};\n\n/**\n * Initialize module\n */\nexport const init = () => {\n    prefetchStrings('core', [\n        'resetcourseconfirm',\n        'resetcoursewarning',\n        'resetcourse',\n    ]);\n\n    registerEventListeners();\n};\n\n/**\n * Register events for course reset button.\n */\nconst registerEventListeners = () => {\n    document.addEventListener('click', (event) => {\n        const resetButton = event.target.closest(selectors.resetCoursetButton);\n        if (resetButton) {\n            event.preventDefault();\n            resetCourseConfirm(resetButton);\n        }\n    });\n};\n\n/**\n * Show the confirmation modal to reset the course.\n *\n * @param {HTMLElement} resetButton the element to delete.\n *\n */\nconst resetCourseConfirm = async(resetButton) => {\n    const courseName = resetButton.dataset.coursename;\n\n    Notification.deleteCancelPromise(\n        getString('resetcourseconfirm'),\n        getString('resetcoursewarning', 'core', courseName),\n        getString('resetcourse'),\n    ).then(() => {\n        resetButton.closest('form').submit();\n        return;\n    }).catch(() => {\n        return;\n    });\n};\n"],"names":["selectors","registerEventListeners","document","addEventListener","event","resetButton","target","closest","preventDefault","resetCourseConfirm","async","courseName","dataset","coursename","deleteCancelPromise","then","submit","catch"],"mappings":";;;;;;;4JA2BMA,6BACkB,4CAMJ,mCACA,OAAQ,CACpB,qBACA,qBACA,gBAGJC,gCAMEA,uBAAyB,KAC3BC,SAASC,iBAAiB,SAAUC,cAC1BC,YAAcD,MAAME,OAAOC,QAAQP,8BACrCK,cACAD,MAAMI,iBACNC,mBAAmBJ,kBAWzBI,mBAAqBC,MAAAA,oBACjBC,WAAaN,YAAYO,QAAQC,iCAE1BC,qBACT,kBAAU,uBACV,kBAAU,qBAAsB,OAAQH,aACxC,kBAAU,gBACZI,MAAK,KACHV,YAAYE,QAAQ,QAAQS,YAE7BC,OAAM"}
\ No newline at end of file
diff --git a/course/amd/src/resetcourse.js b/course/amd/src/resetcourse.js
new file mode 100644
index 0000000000000..9dd51e68836e2
--- /dev/null
+++ b/course/amd/src/resetcourse.js
@@ -0,0 +1,77 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Javascript module for resetting a course
+ *
+ * @module      core_course/resetcourse
+ * @copyright   2024 Sara Arjona <sara@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+import Notification from 'core/notification';
+import {prefetchStrings} from 'core/prefetch';
+import {getString} from 'core/str';
+
+const selectors = {
+    resetCoursetButton: '[data-action="resetcourse"]',
+};
+
+/**
+ * Initialize module
+ */
+export const init = () => {
+    prefetchStrings('core', [
+        'resetcourseconfirm',
+        'resetcoursewarning',
+        'resetcourse',
+    ]);
+
+    registerEventListeners();
+};
+
+/**
+ * Register events for course reset button.
+ */
+const registerEventListeners = () => {
+    document.addEventListener('click', (event) => {
+        const resetButton = event.target.closest(selectors.resetCoursetButton);
+        if (resetButton) {
+            event.preventDefault();
+            resetCourseConfirm(resetButton);
+        }
+    });
+};
+
+/**
+ * Show the confirmation modal to reset the course.
+ *
+ * @param {HTMLElement} resetButton the element to delete.
+ *
+ */
+const resetCourseConfirm = async(resetButton) => {
+    const courseName = resetButton.dataset.coursename;
+
+    Notification.deleteCancelPromise(
+        getString('resetcourseconfirm'),
+        getString('resetcoursewarning', 'core', courseName),
+        getString('resetcourse'),
+    ).then(() => {
+        resetButton.closest('form').submit();
+        return;
+    }).catch(() => {
+        return;
+    });
+};
diff --git a/course/reset.php b/course/reset.php
index 3a9e5b0a99eac..406a8660e0c76 100644
--- a/course/reset.php
+++ b/course/reset.php
@@ -39,7 +39,7 @@
 }
 
 $PAGE->set_url('/course/reset.php', ['id' => $id]);
-$PAGE->set_pagelayout('admin');
+$PAGE->set_pagelayout('standard');
 
 require_login($course);
 require_capability('moodle/course:reset', context_course::instance($course->id));
@@ -103,12 +103,17 @@
         echo $OUTPUT->footer();
         exit;
     }
+} else {
+    $mform = new course_reset_form();
+    $mform->load_defaults();
 }
 
+$PAGE->requires->js_call_amd('core_course/resetcourse', 'init');
 echo $OUTPUT->header();
 \backup_helper::print_coursereuse_selector('reset');
 
 echo $OUTPUT->box(get_string('resetinfo'));
+echo $OUTPUT->box(get_string('resetinfoselect'));
 
 $mform->display();
 echo $OUTPUT->footer();
diff --git a/course/reset_form.php b/course/reset_form.php
index e8851ef976efe..d162594edb145 100644
--- a/course/reset_form.php
+++ b/course/reset_form.php
@@ -111,15 +111,49 @@ public function definition() {
             }
         }
 
+        $elements = $mform->_elements;
+        foreach ($elements as $element) {
+            if (is_a($element, 'HTML_QuickForm_header')) {
+                $mform->setExpanded($element->getName());
+            }
+        }
+
         $mform->addElement('hidden', 'id', $COURSE->id);
         $mform->setType('id', PARAM_INT);
 
         $buttonarray = [];
-        $buttonarray[] = &$mform->createElement('submit', 'submitbutton', get_string('resetcourse'));
-        $buttonarray[] = &$mform->createElement('submit', 'selectdefault', get_string('selectdefault'));
-        $buttonarray[] = &$mform->createElement('submit', 'deselectall', get_string('deselectall'));
-        $buttonarray[] = &$mform->createElement('cancel');
+        $buttonarray[] = $mform->createElement(
+            'submit',
+            'selectdefault',
+            get_string('selectdefault'),
+            null,
+            null,
+            ['customclassoverride' => 'btn-secondary'],
+        );
+        $buttonarray[] = $mform->createElement(
+            'submit',
+            'deselectall',
+            get_string('deselectall'),
+            null,
+            null,
+            ['customclassoverride' => 'btn-secondary'],
+        );
         $mform->addGroup($buttonarray, 'buttonar', '', [' '], false);
+
+        $mform->addElement(
+            'submit',
+            'submitbutton',
+            get_string('resetcourse'),
+            [
+                'data-action' => 'resetcourse',
+                'data-courseid' => $COURSE->id,
+                'data-coursename' => $COURSE->fullname,
+            ],
+            null,
+            ['customclassoverride' => 'btn-danger'],
+        );
+        $mform->set_sticky_footer('submitbutton');
+
         $mform->closeHeaderBefore('buttonar');
     }
 
diff --git a/course/tests/behat/reset_course.feature b/course/tests/behat/reset_course.feature
new file mode 100644
index 0000000000000..e202c965e7c3f
--- /dev/null
+++ b/course/tests/behat/reset_course.feature
@@ -0,0 +1,75 @@
+@core @core_course
+Feature: Reset course
+  In order to reuse a course
+  As a teacher
+  I need to clear all user data and reset the course to its initial state
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email                |
+      | teacher1 | Teacher   | 1        | teacher1@example.com |
+      | student1 | Student   | 1        | student1@example.com |
+    And the following "courses" exist:
+      | fullname | shortname | format | numsections |
+      | Course 1 | C1        | topics | 2           |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+      | student1 | C1     | student        |
+    And the following "activity" exists:
+      | activity                            | assign               |
+      | course                              | C1                   |
+      | name                                | Test assignment name |
+      | assignsubmission_onlinetext_enabled | 1                    |
+      | assignsubmission_file_enabled       | 0                    |
+      | submissiondrafts                    | 0                    |
+    And the following "mod_assign > submissions" exist:
+      | assign                | user      | onlinetext                   |
+      | Test assignment name  | student1  | I'm the student1 submission  |
+
+  Scenario: Reset course select and deselect buttons
+    When I am on the "Course 1" "reset" page logged in as "teacher1"
+    Then I should see "Collapse all"
+    And the field "Events" matches value "1"
+    And the field "All notes" matches value "1"
+    And the field "All comments" matches value "0"
+    And the field "Completion data" matches value "0"
+    And the field "All submissions" matches value "1"
+    And the field "All user overrides" matches value "1"
+    And the field "All group overrides" matches value "1"
+    # Check fields are unchecked when Deselect all is clicked
+    And I click on "Deselect all" "button"
+    And the field "Events" matches value "0"
+    And the field "All notes" matches value "0"
+    And the field "All comments" matches value "0"
+    And the field "Completion data" matches value "0"
+    And the field "All submissions" matches value "0"
+    And the field "All user overrides" matches value "0"
+    And the field "All group overrides" matches value "0"
+    # Check default fields are checked again when Select default is clicked
+    And I click on "Select default" "button"
+    And the field "Events" matches value "1"
+    And the field "All notes" matches value "1"
+    And the field "All comments" matches value "0"
+    And the field "Completion data" matches value "0"
+    And the field "All submissions" matches value "1"
+    And the field "All user overrides" matches value "1"
+    And the field "All group overrides" matches value "1"
+
+  @javascript
+  Scenario: Reset course with default settings
+    Given I am on the "Course 1" "reset" page logged in as "teacher1"
+    When I click on "Reset course" "button"
+    And I click on "Reset course" "button" in the "Reset course?" "dialogue"
+    Then I should see "Done" in the "All notes" "table_row"
+    And I should see "Done" in the "All local role assignments" "table_row"
+    And I should see "Done" in the "All submissions" "table_row"
+    And I click on "Continue" "button"
+    # Check that you're redirected to the course page.
+    And I should not see "Reset course"
+    # Check the course has been reset.
+    And I navigate to course participants
+    And I should see "Teacher 1"
+    And I should not see "Student 1"
+    And I am on the "Test assignment name" "assign activity" page
+    And I should see "0" in the "Submitted" "table_row"
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 13d916783acee..9a27682c6c309 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -1863,7 +1863,12 @@
 $string['reset'] = 'Reset';
 $string['resetcomponent'] = 'Component';
 $string['resetcourse'] = 'Reset course';
-$string['resetinfo'] = 'Delete all user data and reset this course to its original state, keeping activities and settings intact.';
+$string['resetcourseconfirm'] = 'Reset course?';
+$string['resetcoursewarning'] = 'Are you sure you want to reset the course \'{$a}\'?
+<br/><br/>
+This will delete the selected data and reset the course back to its original state. You can\'t undo this action.';
+$string['resetinfo'] = 'This feature allows you to clear all user data and reset the course to its original state. Course activities and settings will remain untouched.';
+$string['resetinfoselect'] = 'Select the data you want to delete or reset from the categories below:';
 $string['resetnotimplemented'] = 'Reset not supported';
 $string['resetnotimplementedinfo'] = 'These activities can\'t be reset:';
 $string['resetrecordexpired'] = 'The password reset link you used is more than {$a} minutes old and has expired. Please initiate a new password reset.';

From cf7cc40f4b516bcfb1310e9d4a7b29c94e99559f Mon Sep 17 00:00:00 2001
From: Sara Arjona <sara@moodle.com>
Date: Fri, 10 May 2024 08:13:02 +0200
Subject: [PATCH 056/119] MDL-81866 course: Fix behat errors after improving
 reset

---
 .../behat/activity_tags_deletion.feature      | 27 ++++++++++++-------
 .../tests/behat/assign_course_reset.feature   |  4 ++-
 .../tests/behat/chat_course_reset.feature     |  9 ++++---
 .../behat/h5pactivity_reset_grades.feature    |  5 ++--
 .../tests/behat/lesson_course_reset.feature   |  9 +++++--
 .../reset_wiki_comments_tags_files.feature    | 16 +++++++----
 theme/boost/tests/behat/course_reuse.feature  | 10 +++----
 7 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/course/tests/behat/activity_tags_deletion.feature b/course/tests/behat/activity_tags_deletion.feature
index a969aae3e7ae8..f4a034cb6d9b4 100644
--- a/course/tests/behat/activity_tags_deletion.feature
+++ b/course/tests/behat/activity_tags_deletion.feature
@@ -22,7 +22,9 @@ Feature: Delete activity tags during course reset
     # Perform course reset without checking anything.
     And I log in as "admin"
     And I am on the "Course 1" "reset" page
-    And I press "Reset"
+    And I press "Deselect all"
+    And I press "Reset course"
+    And I click on "Reset course" "button" in the "Reset course?" "dialogue"
     And I press "Continue"
     # Confirm that book chapter tags are not deleted.
     When I am on the "Test Book" "book activity" page
@@ -30,9 +32,10 @@ Feature: Delete activity tags during course reset
     And I should see "ChapterTag"
     # Delete book chapter tags using course reset.
     And I am on the "Course 1" "reset" page
-    And I expand all fieldsets
+    And I press "Deselect all"
     And I click on "All book tags" "checkbox"
-    And I press "Reset"
+    And I press "Reset course"
+    And I click on "Reset course" "button" in the "Reset course?" "dialogue"
     # Confirm that book chapter tags are deleted.
     And I should see "All book tags" in the "Books" "table_row"
     And I press "Continue"
@@ -47,7 +50,9 @@ Feature: Delete activity tags during course reset
       | admin | forum1 | Discussion 1 | Discussion 1 message | SampleTag, DiscussionTag |
     # Perform course reset without checking anything.
     And I am on the "Course 1" "reset" page logged in as admin
-    And I press "Reset"
+    And I press "Deselect all"
+    And I press "Reset course"
+    And I click on "Reset course" "button" in the "Reset course?" "dialogue"
     And I press "Continue"
     # Confirm that forum discussion tags are not deleted.
     When I am on the "Test Forum" "forum activity" page
@@ -55,12 +60,13 @@ Feature: Delete activity tags during course reset
     Then I should see "SampleTag"
     And I should see "DiscussionTag"
     And I am on the "Course 1" "reset" page
-    And I expand all fieldsets
+    And I press "Deselect all"
     # Depending on <resetcheck> value, either delete all discussion posts or remove all forum discussion tags only.
     And I click on "<resetcheck>" "checkbox"
     # Confirm `Remove all forum tags` is disabled when `Delete all posts` on previous step is checked.
     And the "All forum tags" "checkbox" should be <canbechecked>
-    And I press "Reset"
+    And I press "Reset course"
+    And I click on "Reset course" "button" in the "Reset course?" "dialogue"
     And I should see "<resetmessage>" in the "Forums" "table_row"
     And I press "Continue"
     And I am on the "Test Forum" "forum activity" page
@@ -82,19 +88,22 @@ Feature: Delete activity tags during course reset
       | Test Glossary | Aubergine | Also eggpgplant | admin | SampleTag, GlossaryTag |
     # Perform course reset without checking anything.
     And I am on the "Course 1" "reset" page logged in as admin
-    And I press "Reset"
+    And I press "Deselect all"
+    And I press "Reset course"
+    And I click on "Reset course" "button" in the "Reset course?" "dialogue"
     And I press "Continue"
     # Confirm that glossary entry tags are not deleted.
     When I am on the "Test Glossary" "glossary activity" page
     Then I should see "SampleTag"
     And I should see "GlossaryTag"
     And I am on the "Course 1" "reset" page
-    And I expand all fieldsets
+    And I press "Deselect all"
     # Depending on <resetcheck> value, either delete all glossary entries or remove all glossary entry tags only.
     And I click on "<resetcheck>" "checkbox"
     # Confirm `Remove all forum tags` is disabled when `Delete entries from all glossaries` on previous step is checked.
     And the "All glossary tags" "checkbox" should be <canbechecked>
-    And I press "Reset"
+    And I press "Reset course"
+    And I click on "Reset course" "button" in the "Reset course?" "dialogue"
     And I should see "<resetmessage>" in the "Glossaries" "table_row"
     And I press "Continue"
     And I am on the "Test Glossary" "glossary activity" page
diff --git a/mod/assign/tests/behat/assign_course_reset.feature b/mod/assign/tests/behat/assign_course_reset.feature
index 7a07f20c03dc6..84a8333b9ba58 100644
--- a/mod/assign/tests/behat/assign_course_reset.feature
+++ b/mod/assign/tests/behat/assign_course_reset.feature
@@ -56,7 +56,7 @@ Feature: Assign reset
     Then I should not see "Submitted for grading"
 
   @javascript
-  Scenario: Use course reset to remove user overrides.
+  Scenario: Use course reset to remove user overrides
     And I am on the "Test assignment name" Activity page logged in as teacher1
     And I navigate to "Overrides" in current page administration
     And I press "Add user override"
@@ -71,9 +71,11 @@ Feature: Assign reset
     And I press "Save"
     And I should see "Sam1 Student1"
     When I am on the "Course 1" "reset" page
+    And I press "Deselect all"
     And I set the following fields to these values:
         | All user overrides | 1  |
     And I press "Reset course"
+    And I click on "Reset course" "button" in the "Reset course?" "dialogue"
     And I press "Continue"
     And I am on "Course 1" course homepage
     And I click on "Test assignment name" "link" in the "region-main" "region"
diff --git a/mod/chat/tests/behat/chat_course_reset.feature b/mod/chat/tests/behat/chat_course_reset.feature
index 3b7dfb15f8fec..cb58ba2c4eeee 100644
--- a/mod/chat/tests/behat/chat_course_reset.feature
+++ b/mod/chat/tests/behat/chat_course_reset.feature
@@ -21,9 +21,9 @@ Feature: Chat reset
       | activity | name           | Description           | course | idnumber |
       | chat     | Test chat name | Test chat description | C1     | chat1    |
 
+  @javascript
   Scenario: Use course reset to update chat start date
-    And I log in as "teacher1"
-    And I am on "Course 1" course homepage with editing mode on
+    Given I am on the "Course 1" "course" page logged in as teacher1
     And I navigate to "Settings" in current page administration
     And I set the following fields to these values:
       | startdate[day]       | 1 |
@@ -40,16 +40,17 @@ Feature: Chat reset
       | chattime[minute]    | 00 |
     And I press "Save and display"
     And I am on the "Course 1" "reset" page
+    And I press "Deselect all"
     And I set the following fields to these values:
       | reset_start_date[enabled] | 1  |
       | reset_start_date[day]       | 1 |
       | reset_start_date[month]     | January |
       | reset_start_date[year]      | 2030 |
     And I press "Reset course"
+    And I click on "Reset course" "button" in the "Reset course?" "dialogue"
     And I should see "Date" in the "Chats" "table_row"
     And I press "Continue"
-    Then I am on "Course 1" course homepage
-    And I follow "Test chat name"
+    Then I follow "Test chat name"
     And I navigate to "Settings" in current page administration
     And I expand all fieldsets
     And the "chattime[year]" select box should contain "2030"
diff --git a/mod/h5pactivity/tests/behat/h5pactivity_reset_grades.feature b/mod/h5pactivity/tests/behat/h5pactivity_reset_grades.feature
index 38650b78b4eec..ce0cbeec31d84 100644
--- a/mod/h5pactivity/tests/behat/h5pactivity_reset_grades.feature
+++ b/mod/h5pactivity/tests/behat/h5pactivity_reset_grades.feature
@@ -38,10 +38,11 @@ Feature: Teacher can reset H5P activity grades
     And I should see "5.00" in the "Second Student" "table_row"
     And I should see "0.00" in the "Third Student" "table_row"
     When I am on the "Course 1" "reset" page
-    And I expand all fieldsets
+    And I press "Deselect all"
     # Check `Delete all grades` in course reset page to reset grades
     And I click on "All grades" "checkbox"
-    And I press "Reset"
+    And I press "Reset course"
+    And I click on "Reset course" "button" in the "Reset course?" "dialogue"
     Then I should see "Done" in the "Gradebook" "table_row"
     And I press "Continue"
     # Confirm that previously saved grades are gone
diff --git a/mod/lesson/tests/behat/lesson_course_reset.feature b/mod/lesson/tests/behat/lesson_course_reset.feature
index e98ef5d81296f..4cd6e7f316581 100644
--- a/mod/lesson/tests/behat/lesson_course_reset.feature
+++ b/mod/lesson/tests/behat/lesson_course_reset.feature
@@ -54,7 +54,7 @@ Feature: Lesson reset
     Then I should see "No attempts have been made on this lesson"
 
   @javascript
-  Scenario: Use course reset to remove user overrides.
+  Scenario: Use course reset to remove user overrides
     When I am on the "Test lesson name" "lesson activity" page logged in as teacher1
     And I navigate to "Overrides" in current page administration
     And I follow "Add user override"
@@ -64,15 +64,18 @@ Feature: Lesson reset
     And I press "Save"
     And I should see "Sam1 Student1"
     And I am on the "Course 1" "reset" page
+    And I press "Deselect all"
     And I set the following fields to these values:
         | All user overrides | 1  |
     And I press "Reset course"
+    And I click on "Reset course" "button" in the "Reset course?" "dialogue"
     And I press "Continue"
     And I am on the "Test lesson name" "lesson activity" page
     And I navigate to "Overrides" in current page administration
     Then I should not see "Sam1 Student1"
 
-  Scenario: Use course reset to remove group overrides.
+  @javascript
+  Scenario: Use course reset to remove group overrides
     When I am on the "Test lesson name" "lesson activity" page logged in as teacher1
     And I navigate to "Overrides" in current page administration
     And I select "Group overrides" from the "jump" singleselect
@@ -83,9 +86,11 @@ Feature: Lesson reset
     And I press "Save"
     And I should see "Group 1"
     And I am on the "Course 1" "reset" page
+    And I press "Deselect all"
     And I set the following fields to these values:
         | All group overrides | 1  |
     And I press "Reset course"
+    And I click on "Reset course" "button" in the "Reset course?" "dialogue"
     And I press "Continue"
     And I am on the "Test lesson name" "lesson activity" page
     And I navigate to "Overrides" in current page administration
diff --git a/mod/wiki/tests/behat/reset_wiki_comments_tags_files.feature b/mod/wiki/tests/behat/reset_wiki_comments_tags_files.feature
index 35dbda985e82b..77f96f58a59da 100644
--- a/mod/wiki/tests/behat/reset_wiki_comments_tags_files.feature
+++ b/mod/wiki/tests/behat/reset_wiki_comments_tags_files.feature
@@ -41,11 +41,13 @@ Feature: Teachers can reset wiki pages, tags and files
     And I am on the "Course 1" "reset" page
 
   Scenario: Reset page, tags and files
-    Given I set the following fields to these values:
-      | All wiki pages | 1 |
-      | All wiki tags  | 1 |
+    Given I press "Deselect all"
+    And  I set the following fields to these values:
+      | All wiki pages      | 1 |
+      | All wiki tags       | 1 |
       | reset_wiki_comments | 1 |
     And I press "Reset course"
+    And I click on "Reset course" "button" in the "Reset course?" "dialogue"
     And I should see "All wiki pages"
     And I should see "All wiki tags"
     And I should see "All comments"
@@ -61,9 +63,11 @@ Feature: Teachers can reset wiki pages, tags and files
     And I should not see "empty.txt"
 
   Scenario: Reset only tags
-    Given I set the following fields to these values:
+    Given I press "Deselect all"
+    And I set the following fields to these values:
       | All wiki tags | 1 |
     When I press "Reset course"
+    And I click on "Reset course" "button" in the "Reset course?" "dialogue"
     And I should not see "All wiki pages"
     And I should see "All wiki tags"
     And I should not see "All comments"
@@ -77,9 +81,11 @@ Feature: Teachers can reset wiki pages, tags and files
     And I should see "empty.txt"
 
   Scenario: Reset only comments
-    Given I set the following fields to these values:
+    Given I press "Deselect all"
+    And I set the following fields to these values:
       | reset_wiki_comments | 1 |
     When I press "Reset course"
+    And I click on "Reset course" "button" in the "Reset course?" "dialogue"
     And I should not see "All wiki pages"
     And I should not see "All wiki tags"
     And I should see "All comments"
diff --git a/theme/boost/tests/behat/course_reuse.feature b/theme/boost/tests/behat/course_reuse.feature
index eb6ae6f17bc6c..5194ea780a74d 100644
--- a/theme/boost/tests/behat/course_reuse.feature
+++ b/theme/boost/tests/behat/course_reuse.feature
@@ -32,11 +32,11 @@ Feature: Course reuse navigation
     Then I should see "<content>"
 
     Examples:
-      | adminpage     | content                                                           |
-      |   Backup      | Backup settings                                                   |
-      |   Restore     | Upload a backup file                                              |
-      |   Import      | Find a course to import data from:                                |
-      |   Reset       | Delete all user data and reset this course to its original state  |
+      | adminpage     | content                                                                                    |
+      |   Backup      | Backup settings                                                                            |
+      |   Restore     | Upload a backup file                                                                       |
+      |   Import      | Find a course to import data from:                                                         |
+      |   Reset       | This feature allows you to clear all user data and reset the course to its original state  |
 
   Scenario: An Administrator can view the course copy page.
     Given I log in as "admin"

From ae01fe1ba4f2f4d8560bb9c47f779f74e4eddf82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikel=20Mart=C3=ADn?= <mikel@moodle.com>
Date: Tue, 23 Apr 2024 13:40:12 +0200
Subject: [PATCH 057/119] MDL-81743 mod_feedback: Improve 'Edit' page UI

- Move styles in css to modules.scss
- Add new styles for questions
- Change Delete action to red colour
- Add "Page break" text to pagebreak elements in edit page
---
 mod/feedback/classes/complete_form.php    |   6 +-
 mod/feedback/edit_item.php                |   1 +
 mod/feedback/item/feedback_item_class.php |  27 ++--
 mod/feedback/styles.css                   | 123 -------------------
 theme/boost/scss/moodle/modules.scss      | 143 ++++++++++++++++++++++
 theme/boost/style/moodle.css              | 123 +++++++++++++++++++
 theme/classic/style/moodle.css            | 123 +++++++++++++++++++
 7 files changed, 409 insertions(+), 137 deletions(-)
 delete mode 100644 mod/feedback/styles.css

diff --git a/mod/feedback/classes/complete_form.php b/mod/feedback/classes/complete_form.php
index 3840e6fcbf9f4..29e3190abcff2 100644
--- a/mod/feedback/classes/complete_form.php
+++ b/mod/feedback/classes/complete_form.php
@@ -333,7 +333,7 @@ public function add_form_element($item, $element, $addrequiredrule = true, $setd
 
         // Add red asterisks on required fields.
         if ($item->required) {
-            $required = $OUTPUT->pix_icon('req', get_string('requiredelement', 'form'));
+            $required = $OUTPUT->pix_icon('req', get_string('requiredelement', 'form'), 'moodle', ['class' => 'ml-2']);
             $element->setLabel($element->getLabel() . $required);
             $this->hasrequired = true;
         }
@@ -449,7 +449,7 @@ protected function enhance_name_for_edit($item, $element) {
         global $OUTPUT;
         $menu = new action_menu();
         $menu->set_owner_selector('#' . $this->guess_element_id($item, $element));
-        $menu->set_menu_trigger(get_string('edit'));
+        $menu->set_kebab_trigger(get_string('edit'));
         $menu->prioritise = true;
 
         $itemobj = feedback_get_item_class($item->typ);
@@ -464,7 +464,7 @@ protected function enhance_name_for_edit($item, $element) {
         $name = html_writer::span('', 'itemdd', array('id' => 'feedback_item_box_' . $item->id)) .
                 html_writer::span($name, 'itemname') .
                 html_writer::span($editmenu, 'itemactions');
-        $element->setLabel(html_writer::span($name, 'itemtitle'));
+        $element->setLabel(html_writer::span($name, 'itemtitle', ['class' => 'mx-5']));
     }
 
     /**
diff --git a/mod/feedback/edit_item.php b/mod/feedback/edit_item.php
index cbc88b076f960..892ec394fc48a 100644
--- a/mod/feedback/edit_item.php
+++ b/mod/feedback/edit_item.php
@@ -99,6 +99,7 @@
     "hidecompletion" => true,
     "description" => ''
 ]);
+$PAGE->add_body_class('limitedwidth');
 echo $OUTPUT->header();
 
 /// print the tabs
diff --git a/mod/feedback/item/feedback_item_class.php b/mod/feedback/item/feedback_item_class.php
index 5585adb49ea84..80f9b9edc9382 100644
--- a/mod/feedback/item/feedback_item_class.php
+++ b/mod/feedback/item/feedback_item_class.php
@@ -223,14 +223,14 @@ abstract public function complete_form_element($item, $form);
      * @return action_menu_link[]
      */
     public function edit_actions($item, $feedback, $cm) {
-        $actions = array();
+        $actions = [];
 
         $strupdate = get_string('edit_item', 'feedback');
         $actions['update'] = new action_menu_link_secondary(
-            new moodle_url('/mod/feedback/edit_item.php', array('id' => $item->id)),
-            new pix_icon('t/edit', $strupdate, 'moodle', array('class' => 'iconsmall', 'title' => '')),
+            new moodle_url('/mod/feedback/edit_item.php', ['id' => $item->id]),
+            new pix_icon('t/edit', $strupdate, 'moodle', ['class' => 'iconsmall', 'title' => '']),
             $strupdate,
-            array('class' => 'editing_update', 'data-action' => 'update')
+            ['class' => 'editing_update', 'data-action' => 'update']
         );
 
         if ($this->can_switch_require()) {
@@ -242,20 +242,25 @@ public function edit_actions($item, $feedback, $cm) {
                 $buttonimg = 'notrequired';
             }
             $actions['required'] = new action_menu_link_secondary(
-                new moodle_url('/mod/feedback/edit.php', array('id' => $cm->id,
-                    'switchitemrequired' => $item->id, 'sesskey' => sesskey())),
+                new moodle_url(
+                    '/mod/feedback/edit.php',
+                    ['id' => $cm->id, 'switchitemrequired' => $item->id, 'sesskey' => sesskey()]
+                ),
                 new pix_icon($buttonimg, $buttontitle, 'feedback', array('class' => 'iconsmall', 'title' => '')),
                 $buttontitle,
-                array('class' => 'editing_togglerequired', 'data-action' => 'togglerequired')
+                ['class' => 'editing_togglerequired', 'data-action' => 'togglerequired']
             );
         }
 
         $strdelete = get_string('delete_item', 'feedback');
         $actions['delete'] = new action_menu_link_secondary(
-            new moodle_url('/mod/feedback/edit.php', array('id' => $cm->id, 'deleteitem' => $item->id, 'sesskey' => sesskey())),
+            new moodle_url(
+                '/mod/feedback/edit.php',
+                ['id' => $cm->id, 'deleteitem' => $item->id, 'sesskey' => sesskey()]
+            ),
             new pix_icon('t/delete', $strdelete, 'moodle', array('class' => 'iconsmall', 'title' => '')),
             $strdelete,
-            array('class' => 'editing_delete', 'data-action' => 'delete')
+            ['class' => 'editing_delete text-danger', 'data-action' => 'delete']
         );
 
         return $actions;
@@ -334,7 +339,7 @@ public function complete_form_element($item, $form) {
         $form->add_form_element($item,
             ['static',
                 $item->typ.'_'.$item->id,
-                '',
+                get_string('pagebreak', 'feedback'),
                 html_writer::empty_tag('hr', ['class' => 'feedback_pagebreak', 'id' => 'feedback_item_' . $item->id])
             ]);
     }
@@ -354,7 +359,7 @@ public function edit_actions($item, $feedback, $cm) {
             new moodle_url('/mod/feedback/edit.php', array('id' => $cm->id, 'deleteitem' => $item->id, 'sesskey' => sesskey())),
             new pix_icon('t/delete', $strdelete, 'moodle', array('class' => 'iconsmall', 'title' => '')),
             $strdelete,
-            array('class' => 'editing_delete', 'data-action' => 'delete')
+            ['class' => 'editing_delete text-danger', 'data-action' => 'delete']
         );
         return $actions;
     }
diff --git a/mod/feedback/styles.css b/mod/feedback/styles.css
deleted file mode 100644
index 0fcbdad295347..0000000000000
--- a/mod/feedback/styles.css
+++ /dev/null
@@ -1,123 +0,0 @@
-/* styles using by feedback */
-.path-mod-feedback span.feedback_info {
-    font-weight: bold;
-}
-
-.path-mod-feedback div.feedback_is_dependent {
-    background: #ddd;
-}
-
-.path-mod-feedback span.feedback_depend {
-    color: #f00;
-}
-
-.path-mod-feedback hr.feedback_pagebreak {
-    height: 4px;
-    color: #aaa;
-    background-color: #aaa;
-    border: 0;
-    margin: 0;
-}
-
-.path-mod-feedback .drag_target_active {
-    opacity: .25;
-}
-
-.path-mod-feedback .drag_item_active {
-    opacity: .5;
-}
-
-.path-mod-feedback .feedback_bar_image {
-    height: 10px;
-}
-
-.path-mod-feedback #analysis-form label {
-    display: inline;
-}
-
-.path-mod-feedback .templateslist td.cell.action,
-.path-mod-feedback .templateslist th.header.action {
-    width: 10%;
-}
-
-.path-mod-feedback .feedback_form .itemactions {
-    display: inline-block;
-    margin: 0 .5em;
-}
-
-/* Analysis page */
-.path-mod-feedback table.analysis {
-    width: 100%;
-    border-top: 1px solid #aaa;
-    margin-top: 10px;
-}
-
-.path-mod-feedback table.analysis tr:first-child th {
-    padding-top: 10px;
-}
-
-.path-mod-feedback table.analysis tr:hover {
-    background: #f5f5f5;
-}
-
-.path-mod-feedback table.analysis td.singlevalue:before,
-.path-mod-feedback table.analysis td.optionname:before {
-    content: '- ';
-}
-
-.path-mod-feedback table.analysis.itemtype_textarea td {
-    padding: 4px 0;
-}
-
-.path-mod-feedback table.analysis tr.isempty {
-    display: none;
-}
-
-/* Responses list */
-.path-mod-feedback #showentrytable td.cell.completed_timemodified,
-.path-mod-feedback #showentryanontable td.cell.random_response {
-    font-weight: bold;
-}
-
-.path-mod-feedback #showentrytable td.cell.userpic,
-.path-mod-feedback #showentrytable td.cell.deleteentry,
-.path-mod-feedback #showentryanontable td.cell.deleteentry {
-    width: 10px;
-}
-
-/* Responses navigation */
-.path-mod-feedback .response_navigation {
-    margin: .5em 0;
-}
-
-.path-mod-feedback .response_navigation a {
-    display: block;
-}
-
-.path-mod-feedback .response_navigation a.back_to_list {
-    text-align: center;
-}
-
-.path-mod-feedback .response_navigation .prev_response:before {
-    /*rtl:raw:
-    content: ' ► ';
-    */
-    /*rtl:remove*/
-    content: ' ◄ ';
-}
-
-.path-mod-feedback .response_navigation .next_response:after {
-    /*rtl:raw:
-    content: ' ◄ ';
-    */
-    /*rtl:remove*/
-    content: ' ► ';
-}
-
-.path-mod-feedback .response_navigation .next_response {
-    text-align: right;
-}
-
-.path-mod-feedback .response_navigation .prev_response {
-    text-align: left;
-}
diff --git a/theme/boost/scss/moodle/modules.scss b/theme/boost/scss/moodle/modules.scss
index 5ae0c605d82fa..efffa9d030c73 100644
--- a/theme/boost/scss/moodle/modules.scss
+++ b/theme/boost/scss/moodle/modules.scss
@@ -1506,3 +1506,146 @@ $popout-header-height: 4rem;
         height: auto;
     }
 }
+
+/**
+ * Mod Feedback.
+ */
+
+.path-mod-feedback {
+    span.feedback_info {
+        font-weight: bold;
+    }
+    div.feedback_is_dependent {
+        background: $gray-600;
+    }
+    span.feedback_depend {
+        color: $danger;
+    }
+    hr.feedback_pagebreak {
+        height: 4px;
+        color: $gray-600;
+        background-color: $gray-600;
+        border: 0;
+        margin: 0;
+    }
+    .drag_target_active {
+        opacity: .25;
+    }
+    .drag_item_active {
+        opacity: .5;
+    }
+    .feedback_bar_image {
+        height: 10px;
+    }
+    #analysis-form {
+        label {
+            display: inline;
+        }
+    }
+    .templateslist {
+        td.cell.action {
+            width: 10%;
+        }
+        th.header.action {
+            width: 10%;
+        }
+    }
+    .feedback_form {
+        .itemactions {
+            display: inline-block;
+            margin: 0 map-get($spacers, 2);
+        }
+    }
+
+    // Feedback edit form.
+    #feedback_edit_form {
+        [id*=_feedback_item_].feedback_itemlist {
+            padding: map-get($spacers, 3);
+            border: $border-width solid $border-color;
+            @include border-radius();
+            .itemhandle {
+                position: absolute;
+                width: 32px;
+                height: 32px;
+                text-align: center;
+                align-content: center;
+            }
+            .action-menu {
+                position: absolute;
+                top: 0;
+                right: 0;
+            }
+            .dropdown-toggle {
+                border-radius: .5rem;
+                width: 32px;
+                height: 32px;
+            }
+        }
+    }
+
+    // Analysis page.
+    table.analysis {
+        width: 100%;
+        border-top: $border-width solid $border-color;
+        margin-top: 10px;
+        &.itemtype_textarea td {
+            padding: 4px 0;
+        }
+        tr:first-child th {
+            padding-top: 10px;
+        }
+        tr:hover {
+            background: $gray-300;
+        }
+        td.singlevalue:before,
+        td.optionname:before {
+            content: '- ';
+        }
+        tr.isempty {
+            display: none;
+        }
+    }
+
+    // Responses list.
+    #showentrytable td.cell.completed_timemodified,
+    #showentryanontable td.cell.random_response {
+        font-weight: bold;
+    }
+
+    #showentrytable td.cell.userpic,
+    #showentrytable td.cell.deleteentry,
+    #showentryanontable td.cell.deleteentry {
+        width: 10px;
+    }
+
+    // Responses navigation.
+    .response_navigation {
+        margin: map-get($spacers, 2) 0;
+        a {
+            display: block;
+            &.back_to_list {
+                text-align: center;
+            }
+        }
+        .prev_response {
+            text-align: left;
+            &:before {
+                /*rtl:raw:
+                content: ' ► ';
+                */
+                /*rtl:remove*/
+                content: ' ◄ ';
+            }
+        }
+        .next_response {
+            text-align: right;
+            &:after {
+                /*rtl:raw:
+                content: ' ◄ ';
+                */
+                /*rtl:remove*/
+                content: ' ► ';
+            }
+        }
+    }
+}
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index bba2e639d67df..ce51c49df6d5f 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -34764,6 +34764,129 @@ img.userpicture {
   height: auto;
 }
 
+/**
+ * Mod Feedback.
+ */
+.path-mod-feedback span.feedback_info {
+  font-weight: bold;
+}
+.path-mod-feedback div.feedback_is_dependent {
+  background: #6a737b;
+}
+.path-mod-feedback span.feedback_depend {
+  color: #ca3120;
+}
+.path-mod-feedback hr.feedback_pagebreak {
+  height: 4px;
+  color: #6a737b;
+  background-color: #6a737b;
+  border: 0;
+  margin: 0;
+}
+.path-mod-feedback .drag_target_active {
+  opacity: 0.25;
+}
+.path-mod-feedback .drag_item_active {
+  opacity: 0.5;
+}
+.path-mod-feedback .feedback_bar_image {
+  height: 10px;
+}
+.path-mod-feedback #analysis-form label {
+  display: inline;
+}
+.path-mod-feedback .templateslist td.cell.action {
+  width: 10%;
+}
+.path-mod-feedback .templateslist th.header.action {
+  width: 10%;
+}
+.path-mod-feedback .feedback_form .itemactions {
+  display: inline-block;
+  margin: 0 0.5rem;
+}
+.path-mod-feedback #feedback_edit_form [id*=_feedback_item_].feedback_itemlist {
+  padding: 1rem;
+  border: 1px solid #dee2e6;
+  border-radius: 0.5rem;
+}
+.path-mod-feedback #feedback_edit_form [id*=_feedback_item_].feedback_itemlist .itemhandle {
+  position: absolute;
+  width: 32px;
+  height: 32px;
+  text-align: center;
+  align-content: center;
+}
+.path-mod-feedback #feedback_edit_form [id*=_feedback_item_].feedback_itemlist .action-menu {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+.path-mod-feedback #feedback_edit_form [id*=_feedback_item_].feedback_itemlist .dropdown-toggle {
+  border-radius: 0.5rem;
+  width: 32px;
+  height: 32px;
+}
+.path-mod-feedback table.analysis {
+  width: 100%;
+  border-top: 1px solid #dee2e6;
+  margin-top: 10px;
+}
+.path-mod-feedback table.analysis.itemtype_textarea td {
+  padding: 4px 0;
+}
+.path-mod-feedback table.analysis tr:first-child th {
+  padding-top: 10px;
+}
+.path-mod-feedback table.analysis tr:hover {
+  background: #dee2e6;
+}
+.path-mod-feedback table.analysis td.singlevalue:before,
+.path-mod-feedback table.analysis td.optionname:before {
+  content: "- ";
+}
+.path-mod-feedback table.analysis tr.isempty {
+  display: none;
+}
+.path-mod-feedback #showentrytable td.cell.completed_timemodified,
+.path-mod-feedback #showentryanontable td.cell.random_response {
+  font-weight: bold;
+}
+.path-mod-feedback #showentrytable td.cell.userpic,
+.path-mod-feedback #showentrytable td.cell.deleteentry,
+.path-mod-feedback #showentryanontable td.cell.deleteentry {
+  width: 10px;
+}
+.path-mod-feedback .response_navigation {
+  margin: 0.5rem 0;
+}
+.path-mod-feedback .response_navigation a {
+  display: block;
+}
+.path-mod-feedback .response_navigation a.back_to_list {
+  text-align: center;
+}
+.path-mod-feedback .response_navigation .prev_response {
+  text-align: left;
+}
+.path-mod-feedback .response_navigation .prev_response:before {
+  /*rtl:raw:
+  content: ' ► ';
+  */
+  /*rtl:remove*/
+  content: " ◄ ";
+}
+.path-mod-feedback .response_navigation .next_response {
+  text-align: right;
+}
+.path-mod-feedback .response_navigation .next_response:after {
+  /*rtl:raw:
+  content: ' ◄ ';
+  */
+  /*rtl:remove*/
+  content: " ► ";
+}
+
 .yui-skin-sam .yui-layout.path-mod-chat-gui_ajax {
   background-color: #fff;
 }
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 6607b1a5b66ca..3f3d052c4ebac 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -34764,6 +34764,129 @@ img.userpicture {
   height: auto;
 }
 
+/**
+ * Mod Feedback.
+ */
+.path-mod-feedback span.feedback_info {
+  font-weight: bold;
+}
+.path-mod-feedback div.feedback_is_dependent {
+  background: #6a737b;
+}
+.path-mod-feedback span.feedback_depend {
+  color: #ca3120;
+}
+.path-mod-feedback hr.feedback_pagebreak {
+  height: 4px;
+  color: #6a737b;
+  background-color: #6a737b;
+  border: 0;
+  margin: 0;
+}
+.path-mod-feedback .drag_target_active {
+  opacity: 0.25;
+}
+.path-mod-feedback .drag_item_active {
+  opacity: 0.5;
+}
+.path-mod-feedback .feedback_bar_image {
+  height: 10px;
+}
+.path-mod-feedback #analysis-form label {
+  display: inline;
+}
+.path-mod-feedback .templateslist td.cell.action {
+  width: 10%;
+}
+.path-mod-feedback .templateslist th.header.action {
+  width: 10%;
+}
+.path-mod-feedback .feedback_form .itemactions {
+  display: inline-block;
+  margin: 0 0.5rem;
+}
+.path-mod-feedback #feedback_edit_form [id*=_feedback_item_].feedback_itemlist {
+  padding: 1rem;
+  border: 1px solid #dee2e6;
+  border-radius: 0.25rem;
+}
+.path-mod-feedback #feedback_edit_form [id*=_feedback_item_].feedback_itemlist .itemhandle {
+  position: absolute;
+  width: 32px;
+  height: 32px;
+  text-align: center;
+  align-content: center;
+}
+.path-mod-feedback #feedback_edit_form [id*=_feedback_item_].feedback_itemlist .action-menu {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+.path-mod-feedback #feedback_edit_form [id*=_feedback_item_].feedback_itemlist .dropdown-toggle {
+  border-radius: 0.5rem;
+  width: 32px;
+  height: 32px;
+}
+.path-mod-feedback table.analysis {
+  width: 100%;
+  border-top: 1px solid #dee2e6;
+  margin-top: 10px;
+}
+.path-mod-feedback table.analysis.itemtype_textarea td {
+  padding: 4px 0;
+}
+.path-mod-feedback table.analysis tr:first-child th {
+  padding-top: 10px;
+}
+.path-mod-feedback table.analysis tr:hover {
+  background: #dee2e6;
+}
+.path-mod-feedback table.analysis td.singlevalue:before,
+.path-mod-feedback table.analysis td.optionname:before {
+  content: "- ";
+}
+.path-mod-feedback table.analysis tr.isempty {
+  display: none;
+}
+.path-mod-feedback #showentrytable td.cell.completed_timemodified,
+.path-mod-feedback #showentryanontable td.cell.random_response {
+  font-weight: bold;
+}
+.path-mod-feedback #showentrytable td.cell.userpic,
+.path-mod-feedback #showentrytable td.cell.deleteentry,
+.path-mod-feedback #showentryanontable td.cell.deleteentry {
+  width: 10px;
+}
+.path-mod-feedback .response_navigation {
+  margin: 0.5rem 0;
+}
+.path-mod-feedback .response_navigation a {
+  display: block;
+}
+.path-mod-feedback .response_navigation a.back_to_list {
+  text-align: center;
+}
+.path-mod-feedback .response_navigation .prev_response {
+  text-align: left;
+}
+.path-mod-feedback .response_navigation .prev_response:before {
+  /*rtl:raw:
+  content: ' ► ';
+  */
+  /*rtl:remove*/
+  content: " ◄ ";
+}
+.path-mod-feedback .response_navigation .next_response {
+  text-align: right;
+}
+.path-mod-feedback .response_navigation .next_response:after {
+  /*rtl:raw:
+  content: ' ◄ ';
+  */
+  /*rtl:remove*/
+  content: " ► ";
+}
+
 .yui-skin-sam .yui-layout.path-mod-chat-gui_ajax {
   background-color: #fff;
 }

From fdb7f280c4e746fcd7d3fcf3d302d1aabb5eece8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikel=20Mart=C3=ADn?= <mikel@moodle.com>
Date: Thu, 25 Apr 2024 11:26:56 +0200
Subject: [PATCH 058/119] MDL-81743 mod_feedback: Fix multichoice items
 separation

---
 mod/feedback/item/multichoice/lib.php      | 2 +-
 mod/feedback/item/multichoicerated/lib.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php
index 925ed01f52db1..dc9c25c5bbfa0 100644
--- a/mod/feedback/item/multichoice/lib.php
+++ b/mod/feedback/item/multichoice/lib.php
@@ -319,7 +319,7 @@ public function complete_form_element($item, $form) {
         $class = 'multichoice-' . $info->subtype;
         $inputname = $item->typ . '_' . $item->id;
         $options = $this->get_options($item);
-        $separator = !empty($info->horizontal) ? ' ' : '<br>';
+        $separator = !empty($info->horizontal) ? ' ' : \html_writer::div('', 'w-100');
         $tmpvalue = $form->get_item_value($item) ?? 0; // Used for element defaults, so must be a valid value (not null).
 
         // Subtypes:
diff --git a/mod/feedback/item/multichoicerated/lib.php b/mod/feedback/item/multichoicerated/lib.php
index 54e62ccafc803..781510114df97 100644
--- a/mod/feedback/item/multichoicerated/lib.php
+++ b/mod/feedback/item/multichoicerated/lib.php
@@ -324,7 +324,7 @@ public function complete_form_element($item, $form) {
             }
             // Span to hold the element id. The id is used for drag and drop reordering.
             $objs[] = ['static', '', '', html_writer::span('', '', ['id' => 'feedback_item_' . $item->id])];
-            $separator = $info->horizontal ? ' ' : '<br>';
+            $separator = $info->horizontal ? ' ' : \html_writer::div('', 'w-100');
             $class .= ' multichoicerated-' . ($info->horizontal ? 'horizontal' : 'vertical');
             $el = $form->add_form_group_element($item, 'group_'.$inputname, $name, $objs, $separator, $class);
             $form->set_element_type($inputname, PARAM_INT);

From 7b0e95aec0ad1800115e44117741f0d18b8fa4dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mikel=20Mart=C3=ADn?= <mikel@moodle.com>
Date: Wed, 15 May 2024 14:34:26 +0200
Subject: [PATCH 059/119] MDL-81743 mod_feedback: Add manage questions behat
 feature

---
 .../tests/behat/behat_mod_feedback.php        | 13 +++
 mod/feedback/tests/behat/questions.feature    | 87 +++++++++++++++++++
 2 files changed, 100 insertions(+)
 create mode 100644 mod/feedback/tests/behat/questions.feature

diff --git a/mod/feedback/tests/behat/behat_mod_feedback.php b/mod/feedback/tests/behat/behat_mod_feedback.php
index b1118274a805b..eb3ecf46d7ca6 100644
--- a/mod/feedback/tests/behat/behat_mod_feedback.php
+++ b/mod/feedback/tests/behat/behat_mod_feedback.php
@@ -228,4 +228,17 @@ protected function compare_exports($expected, $actual) {
             $itemactual = next($dataactual);
         }
     }
+
+    /**
+     * Return the list of partial named selectors
+     *
+     * @return behat_component_named_selector[]
+     */
+    public static function get_partial_named_selectors(): array {
+        return [
+            new behat_component_named_selector('Question', [
+                ".//*[starts-with(@id, 'fitem_feedback_item_')][.//*[contains(text(), %locator%)]]",
+            ]),
+        ];
+    }
 }
diff --git a/mod/feedback/tests/behat/questions.feature b/mod/feedback/tests/behat/questions.feature
new file mode 100644
index 0000000000000..4ed942a73be37
--- /dev/null
+++ b/mod/feedback/tests/behat/questions.feature
@@ -0,0 +1,87 @@
+@mod @mod_feedback
+Feature: Managing feedback questions
+  In order to manage feedback questions
+  As a teacher
+  I need to be able to create, edit and delete feedback questions
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname |
+      | teacher  | Teacher   | 1        |
+    And the following "courses" exist:
+      | fullname | shortname |
+      | Course 1 | C1        |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher  | C1     | editingteacher |
+    And the following "activities" exist:
+      | activity   | name                         | course | idnumber    |
+      | feedback   | Learning experience course 1 | C1     | feedback1   |
+
+  Scenario: Teacher can create a new feedback question
+    Given I am on the "Learning experience course 1" "feedback activity" page logged in as teacher
+    And I click on "Edit questions" "link" in the "region-main" "region"
+    When I add a "Short text answer" question to the feedback with:
+      | Question         | Is it me you're looking for? |
+      | Label            | q1                           |
+    Then I should see "(q1) Is it me you're looking for?"
+
+  @javascript
+  Scenario: Teacher can edit feedback questions
+    Given I am on the "Learning experience course 1" "feedback activity" page logged in as teacher
+    And I click on "Edit questions" "link" in the "region-main" "region"
+    And I add a "Short text answer" question to the feedback with:
+      | Question         | Is it me you're looking for? |
+      | Label            | q1                           |
+    When I open the action menu in "Is it me you're looking for?" "mod_feedback > Question"
+    And I choose "Edit question" in the open action menu
+    And I set the field "Question" to "Can you see it in my eyes?"
+    And I press "Save changes to question"
+    Then I should see "(q1) Can you see it in my eyes?"
+    And I should not see "(q1) Is it me you're looking for?"
+
+  @javascript
+  Scenario: Teacher can edit and save as new feedback questions
+    Given I am on the "Learning experience course 1" "feedback activity" page logged in as teacher
+    And I click on "Edit questions" "link" in the "region-main" "region"
+    And I add a "Short text answer" question to the feedback with:
+      | Question         | Is it me you're looking for? |
+      | Label            | q1                           |
+    When I open the action menu in "Is it me you're looking for?" "mod_feedback > Question"
+    And I choose "Edit question" in the open action menu
+    And I set the field "Question" to "You can se it in my eyes?"
+    And I press "Save as new question"
+    Then I should see "(q1) Is it me you're looking for?"
+    And I should see "(q1) You can se it in my eyes?"
+
+  @javascript
+  Scenario: Teacher can delete feedback questions
+    Given I am on the "Learning experience course 1" "feedback activity" page logged in as teacher
+    And I click on "Edit questions" "link" in the "region-main" "region"
+    And I add a "Short text answer" question to the feedback with:
+      | Question         | Is it me you're looking for? |
+      | Label            | q1                           |
+    When I open the action menu in "Is it me you're looking for?" "mod_feedback > Question"
+    And I choose "Delete question" in the open action menu
+    And I click on "Yes" "button" in the "Confirmation" "dialogue"
+    Then I should not see "(q1) Is it me you're looking for?"
+
+  @javascript
+  Scenario: Teacher can mark as required feedback questions
+    Given I am on the "Learning experience course 1" "feedback activity" page logged in as teacher
+    And I click on "Edit questions" "link" in the "region-main" "region"
+    And I add a "Short text answer" question to the feedback with:
+      | Question         | Is it me you're looking for? |
+      | Label            | q1                           |
+      | Required         | 0                            |
+    When I open the action menu in "Is it me you're looking for?" "mod_feedback > Question"
+    And I choose "Set as required" in the open action menu
+    And I open the action menu in "Is it me you're looking for?" "mod_feedback > Question"
+    And I choose "Edit question" in the open action menu
+    Then the field "Required" matches value "1"
+    And I press "Cancel"
+    And I open the action menu in "Is it me you're looking for?" "mod_feedback > Question"
+    And I choose "Set as not required" in the open action menu
+    And I open the action menu in "Is it me you're looking for?" "mod_feedback > Question"
+    And I choose "Edit question" in the open action menu
+    And the field "Required" matches value "0"

From a48d11dd7d984d1026f367ff3b02f703be01008d Mon Sep 17 00:00:00 2001
From: Lars Bonczek <bonczek@tu-berlin.de>
Date: Wed, 26 Jun 2024 12:57:36 +0200
Subject: [PATCH 060/119] MDL-63753 course: Show stealth activity links to
 non-editing teachers

---
 .../behat/activities_visibility_icons.feature |  25 ++--
 lib/modinfolib.php                            |   9 +-
 lib/tests/modinfolib_test.php                 | 116 +++++++++++++-----
 3 files changed, 106 insertions(+), 44 deletions(-)

diff --git a/course/tests/behat/activities_visibility_icons.feature b/course/tests/behat/activities_visibility_icons.feature
index 382110cc13e3e..557b378dabf64 100644
--- a/course/tests/behat/activities_visibility_icons.feature
+++ b/course/tests/behat/activities_visibility_icons.feature
@@ -6,16 +6,18 @@ Feature: Toggle activities visibility from the course page
 
   Background:
     Given the following "users" exist:
-      | username | firstname | lastname | email                |
-      | teacher1 | Teacher   | 1        | teacher1@example.com |
-      | student1 | Student   | 1        | student1@example.com |
+      | username           | firstname           | lastname | email                          |
+      | teacher1           | Teacher             | 1        | teacher1@example.com           |
+      | noneditingteacher1 | Non-Editing Teacher | 1        | noneditingteacher1@example.com |
+      | student1           | Student             | 1        | student1@example.com           |
     And the following "courses" exist:
       | fullname | shortname | format | numsections |
       | Course 1 | C1        | topics | 2           |
     And the following "course enrolments" exist:
-      | user     | course | role           |
-      | teacher1 | C1     | editingteacher |
-      | student1 | C1     | student        |
+      | user               | course | role           |
+      | teacher1           | C1     | editingteacher |
+      | noneditingteacher1 | C1     | teacher        |
+      | student1           | C1     | student        |
     And the following "activities" exist:
       | activity | course | section | idnumber | name                 | intro                       | id_visible |
       | assign   | C1     | 1       | 1        | Test assignment name | Test assignment description | 1          |
@@ -53,6 +55,9 @@ Feature: Toggle activities visibility from the course page
     And the field "Availability" matches value "Hide on course page"
     And I press "Save and return to course"
     And "Test forum name" activity should be hidden
+    # Non-editing teacher should see this activity.
+    And I am on the "Course 1" course page logged in as noneditingteacher1
+    And I should see "Test forum name" in the "region-main" "region"
     # Student should not see this activity.
     And I am on the "Course 1" course page logged in as student1
     And I should not see "Test forum name"
@@ -115,12 +120,12 @@ Feature: Toggle activities visibility from the course page
     And "Test assignment name" activity should be available but hidden from course page
     And I turn editing mode off
     And "Test assignment name" activity should be available but hidden from course page
-    And I log out
+    # Non-editing teacher will see the module on the course page:
+    And I am on the "Course 1" course page logged in as noneditingteacher1
+    And I should see "Test assignment name" in the "region-main" "region"
     # Student will not see the module on the course page but can access it from other reports and blocks:
-    And I log in as "student1"
-    And I am on "Course 1" course homepage
+    And I am on the "Course 1" course page logged in as student1
     And "Test assignment name" activity should be hidden
     And I click on "Test assignment name" "link" in the "Recent activity" "block"
     And I should see "Test assignment name"
     And I should see "Submission status"
-    And I log out
diff --git a/lib/modinfolib.php b/lib/modinfolib.php
index 06ed6cc8ddc65..37d95d556898c 100644
--- a/lib/modinfolib.php
+++ b/lib/modinfolib.php
@@ -2602,10 +2602,13 @@ private function update_user_visible() {
             $this->availableinfo = '';
         }
 
+        $capabilities = [
+            'moodle/course:manageactivities',
+            'moodle/course:activityvisibility',
+            'moodle/course:viewhiddenactivities',
+        ];
         $this->uservisibleoncoursepage = $this->uservisible &&
-            ($this->visibleoncoursepage ||
-                has_capability('moodle/course:manageactivities', $this->get_context(), $userid) ||
-                has_capability('moodle/course:activityvisibility', $this->get_context(), $userid));
+            ($this->visibleoncoursepage || has_any_capability($capabilities, $this->get_context(), $userid));
         // Activity that is not available, not hidden from course page and has availability
         // info is actually visible on the course page (with availability info and without a link).
         if (!$this->uservisible && $this->visibleoncoursepage && $this->availableinfo) {
diff --git a/lib/tests/modinfolib_test.php b/lib/tests/modinfolib_test.php
index c522527af6b7f..cd69f15250f33 100644
--- a/lib/tests/modinfolib_test.php
+++ b/lib/tests/modinfolib_test.php
@@ -414,65 +414,119 @@ public function test_course_modinfo_properties(): void {
         $this->resetAfterTest();
         $this->setAdminUser();
 
+        set_config('allowstealth', true);
+
         // Generate the course and some modules. Make one section hidden.
         $course = $this->getDataGenerator()->create_course(
-                array('format' => 'topics',
-                    'numsections' => 3),
-                array('createsections' => true));
+                ['format' => 'topics', 'numsections' => 3],
+                ['createsections' => true]);
         $DB->execute('UPDATE {course_sections} SET visible = 0 WHERE course = ? and section = ?',
-                array($course->id, 3));
-        $coursecontext = context_course::instance($course->id);
+                [$course->id, 3]);
         $forum0 = $this->getDataGenerator()->create_module('forum',
-                array('course' => $course->id), array('section' => 0));
+                ['course' => $course->id, 'section' => 0]);
         $assign0 = $this->getDataGenerator()->create_module('assign',
-                array('course' => $course->id), array('section' => 0, 'visible' => 0));
+                ['course' => $course->id, 'section' => 0, 'visible' => 0]);
+        $page0 = $this->getDataGenerator()->create_module('page',
+                ['course' => $course->id, 'section' => 0, 'visibleoncoursepage' => 0]);
         $forum1 = $this->getDataGenerator()->create_module('forum',
-                array('course' => $course->id), array('section' => 1));
+                ['course' => $course->id, 'section' => 1]);
         $assign1 = $this->getDataGenerator()->create_module('assign',
-                array('course' => $course->id), array('section' => 1));
+                ['course' => $course->id, 'section' => 1]);
         $page1 = $this->getDataGenerator()->create_module('page',
-                array('course' => $course->id), array('section' => 1));
+                ['course' => $course->id, 'section' => 1]);
         $page3 = $this->getDataGenerator()->create_module('page',
-                array('course' => $course->id), array('section' => 3));
+                ['course' => $course->id, 'section' => 3]);
 
         $modinfo = get_fast_modinfo($course->id);
 
-        $this->assertEquals(array($forum0->cmid, $assign0->cmid, $forum1->cmid, $assign1->cmid, $page1->cmid, $page3->cmid),
+        $this->assertEquals(
+                [$forum0->cmid, $assign0->cmid, $page0->cmid, $forum1->cmid, $assign1->cmid, $page1->cmid, $page3->cmid],
                 array_keys($modinfo->cms));
         $this->assertEquals($course->id, $modinfo->courseid);
         $this->assertEquals($USER->id, $modinfo->userid);
-        $this->assertEquals(array(0 => array($forum0->cmid, $assign0->cmid),
-            1 => array($forum1->cmid, $assign1->cmid, $page1->cmid), 3 => array($page3->cmid)), $modinfo->sections);
-        $this->assertEquals(array('forum', 'assign', 'page'), array_keys($modinfo->instances));
-        $this->assertEquals(array($assign0->id, $assign1->id), array_keys($modinfo->instances['assign']));
-        $this->assertEquals(array($forum0->id, $forum1->id), array_keys($modinfo->instances['forum']));
-        $this->assertEquals(array($page1->id, $page3->id), array_keys($modinfo->instances['page']));
+        $this->assertEquals([
+                0 => [$forum0->cmid, $assign0->cmid, $page0->cmid],
+                1 => [$forum1->cmid, $assign1->cmid, $page1->cmid],
+                3 => [$page3->cmid],
+            ], $modinfo->sections);
+        $this->assertEquals(['forum', 'assign', 'page'], array_keys($modinfo->instances));
+        $this->assertEquals([$assign0->id, $assign1->id], array_keys($modinfo->instances['assign']));
+        $this->assertEquals([$forum0->id, $forum1->id], array_keys($modinfo->instances['forum']));
+        $this->assertEquals([$page0->id, $page1->id, $page3->id], array_keys($modinfo->instances['page']));
         $this->assertEquals(groups_get_user_groups($course->id), $modinfo->groups);
-        $this->assertEquals(array(0 => array($forum0->cmid, $assign0->cmid),
-            1 => array($forum1->cmid, $assign1->cmid, $page1->cmid),
-            3 => array($page3->cmid)), $modinfo->get_sections());
-        $this->assertEquals(array(0, 1, 2, 3), array_keys($modinfo->get_section_info_all()));
-        $this->assertEquals($forum0->cmid . ',' . $assign0->cmid, $modinfo->get_section_info(0)->sequence);
+        $this->assertEquals([
+                0 => [$forum0->cmid, $assign0->cmid, $page0->cmid],
+                1 => [$forum1->cmid, $assign1->cmid, $page1->cmid],
+                3 => [$page3->cmid],
+            ], $modinfo->get_sections());
+        $this->assertEquals([0, 1, 2, 3], array_keys($modinfo->get_section_info_all()));
+        $this->assertEquals($forum0->cmid . ',' . $assign0->cmid . ',' . $page0->cmid, $modinfo->get_section_info(0)->sequence);
         $this->assertEquals($forum1->cmid . ',' . $assign1->cmid . ',' . $page1->cmid, $modinfo->get_section_info(1)->sequence);
         $this->assertEquals('', $modinfo->get_section_info(2)->sequence);
         $this->assertEquals($page3->cmid, $modinfo->get_section_info(3)->sequence);
         $this->assertEquals($course->id, $modinfo->get_course()->id);
         $names = array_keys($modinfo->get_used_module_names());
         sort($names);
-        $this->assertEquals(array('assign', 'forum', 'page'), $names);
+        $this->assertEquals(['assign', 'forum', 'page'], $names);
         $names = array_keys($modinfo->get_used_module_names(true));
         sort($names);
-        $this->assertEquals(array('assign', 'forum', 'page'), $names);
+        $this->assertEquals(['assign', 'forum', 'page'], $names);
         // Admin can see hidden modules/sections.
         $this->assertTrue($modinfo->cms[$assign0->cmid]->uservisible);
+        $this->assertTrue($modinfo->cms[$assign0->cmid]->is_visible_on_course_page());
+        $this->assertTrue($modinfo->cms[$page0->cmid]->uservisible);
+        $this->assertTrue($modinfo->cms[$page0->cmid]->is_visible_on_course_page());
         $this->assertTrue($modinfo->get_section_info(3)->uservisible);
 
-        // Get modinfo for non-current user (without capability to view hidden activities/sections).
-        $user = $this->getDataGenerator()->create_user();
-        $modinfo = get_fast_modinfo($course->id, $user->id);
-        $this->assertEquals($user->id, $modinfo->userid);
-        $this->assertFalse($modinfo->cms[$assign0->cmid]->uservisible);
-        $this->assertFalse($modinfo->get_section_info(3)->uservisible);
+        $this->assertFalse($modinfo->cms[$assign0->cmid]->is_stealth());
+        $this->assertFalse($modinfo->cms[$assign0->cmid]->is_stealth());
+        $this->assertTrue($modinfo->cms[$page0->cmid]->is_stealth());
+        $this->assertTrue($modinfo->cms[$page3->cmid]->is_stealth());
+
+        // Get modinfo for user with student role (without capability to view hidden activities/sections).
+        $student = $this->getDataGenerator()->create_user();
+        $this->getDataGenerator()->enrol_user($student->id, $course->id, 'student');
+        $studentmodinfo = get_fast_modinfo($course->id, $student->id);
+        $this->assertEquals($student->id, $studentmodinfo->userid);
+        $this->assertTrue($studentmodinfo->cms[$forum0->cmid]->uservisible);
+        $this->assertTrue($studentmodinfo->cms[$forum0->cmid]->is_visible_on_course_page());
+        $this->assertFalse($studentmodinfo->cms[$assign0->cmid]->uservisible);
+        $this->assertFalse($studentmodinfo->cms[$assign0->cmid]->is_visible_on_course_page());
+        $this->assertTrue($studentmodinfo->cms[$page0->cmid]->uservisible);
+        $this->assertFalse($studentmodinfo->cms[$page0->cmid]->is_visible_on_course_page());
+        $this->assertFalse($studentmodinfo->get_section_info(3)->uservisible);
+        $this->assertTrue($studentmodinfo->cms[$page3->cmid]->uservisible);
+        $this->assertTrue($studentmodinfo->cms[$page3->cmid]->is_visible_on_course_page());
+
+        // Get modinfo for user with teacher role (with capability to view hidden activities but not sections).
+        $teacher = $this->getDataGenerator()->create_user();
+        $this->getDataGenerator()->enrol_user($teacher->id, $course->id, 'teacher');
+        $teachermodinfo = get_fast_modinfo($course->id, $teacher->id);
+        $this->assertEquals($teacher->id, $teachermodinfo->userid);
+        $this->assertTrue($teachermodinfo->cms[$forum0->cmid]->uservisible);
+        $this->assertTrue($teachermodinfo->cms[$forum0->cmid]->is_visible_on_course_page());
+        $this->assertTrue($teachermodinfo->cms[$assign0->cmid]->uservisible);
+        $this->assertTrue($teachermodinfo->cms[$assign0->cmid]->is_visible_on_course_page());
+        $this->assertTrue($teachermodinfo->cms[$page0->cmid]->uservisible);
+        $this->assertTrue($teachermodinfo->cms[$page0->cmid]->is_visible_on_course_page());
+        $this->assertFalse($teachermodinfo->get_section_info(3)->uservisible);
+        $this->assertTrue($teachermodinfo->cms[$page3->cmid]->uservisible);
+        $this->assertTrue($teachermodinfo->cms[$page3->cmid]->is_visible_on_course_page());
+
+        // Get modinfo for user with editingteacher role (with capability to view hidden activities/sections).
+        $editingteacher = $this->getDataGenerator()->create_user();
+        $this->getDataGenerator()->enrol_user($editingteacher->id, $course->id, 'editingteacher');
+        $editingteachermodinfo = get_fast_modinfo($course->id, $editingteacher->id);
+        $this->assertEquals($editingteacher->id, $editingteachermodinfo->userid);
+        $this->assertTrue($editingteachermodinfo->cms[$forum0->cmid]->uservisible);
+        $this->assertTrue($editingteachermodinfo->cms[$forum0->cmid]->is_visible_on_course_page());
+        $this->assertTrue($editingteachermodinfo->cms[$assign0->cmid]->uservisible);
+        $this->assertTrue($editingteachermodinfo->cms[$assign0->cmid]->is_visible_on_course_page());
+        $this->assertTrue($editingteachermodinfo->cms[$page0->cmid]->uservisible);
+        $this->assertTrue($editingteachermodinfo->cms[$page0->cmid]->is_visible_on_course_page());
+        $this->assertTrue($editingteachermodinfo->get_section_info(3)->uservisible);
+        $this->assertTrue($editingteachermodinfo->cms[$page3->cmid]->uservisible);
+        $this->assertTrue($editingteachermodinfo->cms[$page3->cmid]->is_visible_on_course_page());
 
         // Attempt to access and set non-existing field.
         $this->assertTrue(empty($modinfo->somefield));

From cc30087d8458e2f27332f4bf94d486fc8a609383 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Fri, 17 May 2024 00:18:31 +0100
Subject: [PATCH 061/119] MDL-81920 lang: move language string class into
 autoload namespace.

---
 lib/classes/component.php    |   1 +
 lib/classes/lang_string.php  | 280 +++++++++++++++++++++++++++++++++++
 lib/db/legacyclasses.php     |   7 +-
 lib/moodlelib.php            | 250 -------------------------------
 lib/tests/moodlelib_test.php |  10 +-
 5 files changed, 291 insertions(+), 257 deletions(-)
 create mode 100644 lib/classes/lang_string.php

diff --git a/lib/classes/component.php b/lib/classes/component.php
index e7f3eb4b324ff..1e63ce80bee68 100644
--- a/lib/classes/component.php
+++ b/lib/classes/component.php
@@ -390,6 +390,7 @@ protected static function is_cache_valid(array $cache): bool {
         $keyclasses = [
             \core\exception\moodle_exception::class,
             \core\output\bootstrap_renderer::class,
+            \core\lang_string::class,
         ];
         foreach ($keyclasses as $classname) {
             if (!array_key_exists($classname, $cache['classmap'])) {
diff --git a/lib/classes/lang_string.php b/lib/classes/lang_string.php
new file mode 100644
index 0000000000000..5f09a9b5cb86d
--- /dev/null
+++ b/lib/classes/lang_string.php
@@ -0,0 +1,280 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core;
+
+use core\exception\coding_exception;
+use stdClass;
+
+/**
+ * The lang_string class
+ *
+ * This special class is used to create an object representation of a string request.
+ * It is special because processing doesn't occur until the object is first used.
+ * The class was created especially to aid performance in areas where strings were
+ * required to be generated but were not necessarily used.
+ * As an example the admin tree when generated uses over 1500 strings, of which
+ * normally only 1/3 are ever actually printed at any time.
+ * The performance advantage is achieved by not actually processing strings that
+ * aren't being used, as such reducing the processing required for the page.
+ *
+ * How to use the lang_string class?
+ *     There are two methods of using the lang_string class, first through the
+ *     forth argument of the get_string function, and secondly directly.
+ *     The following are examples of both.
+ * 1. Through get_string calls e.g.
+ *     $string = get_string($identifier, $component, $a, true);
+ *     $string = get_string('yes', 'moodle', null, true);
+ * 2. Direct instantiation
+ *     $string = new lang_string($identifier, $component, $a, $lang);
+ *     $string = new lang_string('yes');
+ *
+ * How do I use a lang_string object?
+ *     The lang_string object makes use of a magic __toString method so that you
+ *     are able to use the object exactly as you would use a string in most cases.
+ *     This means you are able to collect it into a variable and then directly
+ *     echo it, or concatenate it into another string, or similar.
+ *     The other thing you can do is manually get the string by calling the
+ *     lang_strings out method e.g.
+ *         $string = new lang_string('yes');
+ *         $string->out();
+ *     Also worth noting is that the out method can take one argument, $lang which
+ *     allows the developer to change the language on the fly.
+ *
+ * When should I use a lang_string object?
+ *     The lang_string object is designed to be used in any situation where a
+ *     string may not be needed, but needs to be generated.
+ *     The admin tree is a good example of where lang_string objects should be
+ *     used.
+ *     A more practical example would be any class that requires strings that may
+ *     not be printed (after all classes get rendered by renderers and who knows
+ *     what they will do ;))
+ *
+ * When should I not use a lang_string object?
+ *     Don't use lang_strings when you are going to use a string immediately.
+ *     There is no need as it will be processed immediately and there will be no
+ *     advantage, and in fact perhaps a negative hit as a class has to be
+ *     instantiated for a lang_string object, however get_string won't require
+ *     that.
+ *
+ * Limitations:
+ * 1. You cannot use a lang_string object as an array offset. Doing so will
+ *     result in PHP throwing an error. (You can use it as an object property!)
+ *
+ * @package     core
+ * @copyright   2011 Sam Hemelryk
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class lang_string {
+
+    /** @var string The strings component. Default '' */
+    protected ?string $component = '';
+
+    /** @var array|stdClass Any arguments required for the string. Default null */
+    protected mixed $a = null;
+
+    /** @var string The processed string (once processed) */
+    protected ?string $string = null;
+
+    /**
+     * A special boolean. If set to true then the object has been woken up and
+     * cannot be regenerated. If this is set then $this->string MUST be used.
+     * @var bool
+     */
+    protected bool $forcedstring = false;
+
+    /**
+     * Constructs a lang_string object
+     *
+     * This function should do as little processing as possible to ensure the best
+     * performance for strings that won't be used.
+     *
+     * @param string $identifier The strings identifier
+     * @param string|null $component The strings component
+     * @param mixed $a Any arguments the string requires
+     * @param string|null $lang The language to use when processing the string.
+     * @throws coding_exception
+     */
+    public function __construct(
+        /** @var string The strings identifier */
+        protected readonly string $identifier,
+        ?string $component = '',
+        mixed $a = null,
+        /** @var string The language to use when processing the string*/
+        protected readonly ?string $lang = null,
+    ) {
+        if (empty($component)) {
+            $component = 'moodle';
+        }
+
+        $this->component = $component;
+
+        // We MUST duplicate $a to ensure that it if it changes by reference those
+        // changes are not carried across.
+        // To do this we always ensure $a or its properties/values are strings
+        // and that any properties/values that arn't convertable are forgotten.
+        if ($a !== null) {
+            if (is_scalar($a)) {
+                $this->a = $a;
+            } else if ($a instanceof lang_string) {
+                $this->a = $a->out();
+            } else if (is_object($a) || is_array($a)) {
+                $a = (array)$a;
+                $this->a = [];
+                foreach ($a as $key => $value) {
+                    // Make sure conversion errors don't get displayed (results in '').
+                    if (is_array($value)) {
+                        $this->a[$key] = '';
+                    } else if (is_object($value)) {
+                        if (method_exists($value, '__toString')) {
+                            $this->a[$key] = $value->__toString();
+                        } else {
+                            $this->a[$key] = '';
+                        }
+                    } else {
+                        $this->a[$key] = (string)$value;
+                    }
+                }
+            }
+        }
+
+        if (debugging(false, DEBUG_DEVELOPER)) {
+            if (clean_param($this->identifier, PARAM_STRINGID) == '') {
+                throw new coding_exception('Invalid string identifier. Most probably some illegal character is part of ' .
+                    'the string identifier. Please check your string definition');
+            }
+            if (!empty($this->component) && clean_param($this->component, PARAM_COMPONENT) == '') {
+                throw new coding_exception('Invalid string compontent. Please check your string definition');
+            }
+            if (!get_string_manager()->string_exists($this->identifier, $this->component)) {
+                debugging('String does not exist. Please check your string definition for '.$this->identifier.'/'.$this->component,
+                    DEBUG_DEVELOPER);
+            }
+        }
+    }
+
+    /**
+     * Processes the string.
+     *
+     * This function actually processes the string, stores it in the string property
+     * and then returns it.
+     * You will notice that this function is VERY similar to the get_string method.
+     * That is because it is pretty much doing the same thing.
+     * However as this function is an upgrade it isn't as tolerant to backwards
+     * compatibility.
+     *
+     * @return string
+     * @throws coding_exception
+     */
+    protected function get_string(): string {
+        global $CFG;
+
+        // Check if we need to process the string.
+        if ($this->string === null) {
+            // Check the quality of the identifier.
+            if ($CFG->debugdeveloper && clean_param($this->identifier, PARAM_STRINGID) === '') {
+                throw new coding_exception('Invalid string identifier. Most probably some illegal character is part of ' .
+                    'the string identifier. Please check your string definition', DEBUG_DEVELOPER);
+            }
+
+            // Process the string.
+            $this->string = get_string_manager()->get_string($this->identifier, $this->component, $this->a, $this->lang);
+            // Debugging feature lets you display string identifier and component.
+            if (isset($CFG->debugstringids) && $CFG->debugstringids && optional_param('strings', 0, PARAM_INT)) {
+                $this->string .= ' {' . $this->identifier . '/' . $this->component . '}';
+            }
+        }
+        // Return the string.
+        return $this->string;
+    }
+
+    /**
+     * Returns the string
+     *
+     * @param string $lang The langauge to use when processing the string
+     * @return string
+     */
+    public function out($lang = null): string {
+        if ($lang !== null && $lang != $this->lang && ($this->lang == null && $lang != current_language())) {
+            if ($this->forcedstring) {
+                debugging('lang_string objects that have been used cannot be printed in another language. ('.$this->lang.' used)',
+                    DEBUG_DEVELOPER);
+                return $this->get_string();
+            }
+            $translatedstring = new lang_string($this->identifier, $this->component, $this->a, $lang);
+            return $translatedstring->out();
+        }
+        return $this->get_string();
+    }
+
+    /**
+     * Magic __toString method for printing a string
+     *
+     * @return string
+     */
+    public function __toString() {
+        return $this->get_string();
+    }
+
+    /**
+     * Magic __set_state method used for var_export
+     *
+     * @param array $array
+     * @return self
+     */
+    public static function __set_state(array $array): self {
+        $tmp = new lang_string($array['identifier'], $array['component'], $array['a'], $array['lang']);
+        $tmp->string = $array['string'];
+        $tmp->forcedstring = $array['forcedstring'];
+        return $tmp;
+    }
+
+    /**
+     * Prepares the lang_string for sleep and stores only the forcedstring and
+     * string properties... the string cannot be regenerated so we need to ensure
+     * it is generated for this.
+     *
+     * @return array
+     */
+    public function __sleep() {
+        $this->get_string();
+        $this->forcedstring = true;
+        return ['forcedstring', 'string', 'lang'];
+    }
+
+    /**
+     * Returns the identifier.
+     *
+     * @return string
+     */
+    public function get_identifier(): string {
+        return $this->identifier;
+    }
+
+    /**
+     * Returns the component.
+     *
+     * @return string
+     */
+    public function get_component(): string {
+        return $this->component;
+    }
+}
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(lang_string::class, \lang_string::class);
diff --git a/lib/db/legacyclasses.php b/lib/db/legacyclasses.php
index 75076d95c3217..e1568603b03ec 100644
--- a/lib/db/legacyclasses.php
+++ b/lib/db/legacyclasses.php
@@ -27,10 +27,15 @@
 defined('MOODLE_INTERNAL') || die();
 
 // Like other files in the db directory this file uses an array.
-// The old class name is the key, the path to the file containing the class is the vlaue.
+// The old class name is the key, the path to the file containing the class is the value.
 // The array must be called $legacyclasses.
 $legacyclasses = [
     \bootstrap_renderer::class => 'output/bootstrap_renderer.php',
+
+    // Core API.
+    \lang_string::class => 'lang_string.php',
+
+    // Exception API.
     \coding_exception::class => 'exception/coding_exception.php',
     \file_serving_exception::class => 'exception/file_serving_exception.php',
     \invalid_dataroot_permissions::class => 'exception/invalid_dataroot_permissions.php',
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index a68bb235f0fc6..d3c5d020fe008 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -10183,256 +10183,6 @@ function unserialize_object(string $input): stdClass {
     return (object) $instance;
 }
 
-/**
- * The lang_string class
- *
- * This special class is used to create an object representation of a string request.
- * It is special because processing doesn't occur until the object is first used.
- * The class was created especially to aid performance in areas where strings were
- * required to be generated but were not necessarily used.
- * As an example the admin tree when generated uses over 1500 strings, of which
- * normally only 1/3 are ever actually printed at any time.
- * The performance advantage is achieved by not actually processing strings that
- * arn't being used, as such reducing the processing required for the page.
- *
- * How to use the lang_string class?
- *     There are two methods of using the lang_string class, first through the
- *     forth argument of the get_string function, and secondly directly.
- *     The following are examples of both.
- * 1. Through get_string calls e.g.
- *     $string = get_string($identifier, $component, $a, true);
- *     $string = get_string('yes', 'moodle', null, true);
- * 2. Direct instantiation
- *     $string = new lang_string($identifier, $component, $a, $lang);
- *     $string = new lang_string('yes');
- *
- * How do I use a lang_string object?
- *     The lang_string object makes use of a magic __toString method so that you
- *     are able to use the object exactly as you would use a string in most cases.
- *     This means you are able to collect it into a variable and then directly
- *     echo it, or concatenate it into another string, or similar.
- *     The other thing you can do is manually get the string by calling the
- *     lang_strings out method e.g.
- *         $string = new lang_string('yes');
- *         $string->out();
- *     Also worth noting is that the out method can take one argument, $lang which
- *     allows the developer to change the language on the fly.
- *
- * When should I use a lang_string object?
- *     The lang_string object is designed to be used in any situation where a
- *     string may not be needed, but needs to be generated.
- *     The admin tree is a good example of where lang_string objects should be
- *     used.
- *     A more practical example would be any class that requries strings that may
- *     not be printed (after all classes get renderer by renderers and who knows
- *     what they will do ;))
- *
- * When should I not use a lang_string object?
- *     Don't use lang_strings when you are going to use a string immediately.
- *     There is no need as it will be processed immediately and there will be no
- *     advantage, and in fact perhaps a negative hit as a class has to be
- *     instantiated for a lang_string object, however get_string won't require
- *     that.
- *
- * Limitations:
- * 1. You cannot use a lang_string object as an array offset. Doing so will
- *     result in PHP throwing an error. (You can use it as an object property!)
- *
- * @package    core
- * @category   string
- * @copyright  2011 Sam Hemelryk
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class lang_string {
-
-    /** @var string The strings identifier */
-    protected $identifier;
-    /** @var string The strings component. Default '' */
-    protected $component = '';
-    /** @var array|stdClass Any arguments required for the string. Default null */
-    protected $a = null;
-    /** @var string The language to use when processing the string. Default null */
-    protected $lang = null;
-
-    /** @var string The processed string (once processed) */
-    protected $string = null;
-
-    /**
-     * A special boolean. If set to true then the object has been woken up and
-     * cannot be regenerated. If this is set then $this->string MUST be used.
-     * @var bool
-     */
-    protected $forcedstring = false;
-
-    /**
-     * Constructs a lang_string object
-     *
-     * This function should do as little processing as possible to ensure the best
-     * performance for strings that won't be used.
-     *
-     * @param string $identifier The strings identifier
-     * @param string $component The strings component
-     * @param stdClass|array|mixed $a Any arguments the string requires
-     * @param string $lang The language to use when processing the string.
-     * @throws coding_exception
-     */
-    public function __construct($identifier, $component = '', $a = null, $lang = null) {
-        if (empty($component)) {
-            $component = 'moodle';
-        }
-
-        $this->identifier = $identifier;
-        $this->component = $component;
-        $this->lang = $lang;
-
-        // We MUST duplicate $a to ensure that it if it changes by reference those
-        // changes are not carried across.
-        // To do this we always ensure $a or its properties/values are strings
-        // and that any properties/values that arn't convertable are forgotten.
-        if ($a !== null) {
-            if (is_scalar($a)) {
-                $this->a = $a;
-            } else if ($a instanceof lang_string) {
-                $this->a = $a->out();
-            } else if (is_object($a) or is_array($a)) {
-                $a = (array)$a;
-                $this->a = array();
-                foreach ($a as $key => $value) {
-                    // Make sure conversion errors don't get displayed (results in '').
-                    if (is_array($value)) {
-                        $this->a[$key] = '';
-                    } else if (is_object($value)) {
-                        if (method_exists($value, '__toString')) {
-                            $this->a[$key] = $value->__toString();
-                        } else {
-                            $this->a[$key] = '';
-                        }
-                    } else {
-                        $this->a[$key] = (string)$value;
-                    }
-                }
-            }
-        }
-
-        if (debugging(false, DEBUG_DEVELOPER)) {
-            if (clean_param($this->identifier, PARAM_STRINGID) == '') {
-                throw new coding_exception('Invalid string identifier. Most probably some illegal character is part of the string identifier. Please check your string definition');
-            }
-            if (!empty($this->component) && clean_param($this->component, PARAM_COMPONENT) == '') {
-                throw new coding_exception('Invalid string compontent. Please check your string definition');
-            }
-            if (!get_string_manager()->string_exists($this->identifier, $this->component)) {
-                debugging('String does not exist. Please check your string definition for '.$this->identifier.'/'.$this->component, DEBUG_DEVELOPER);
-            }
-        }
-    }
-
-    /**
-     * Processes the string.
-     *
-     * This function actually processes the string, stores it in the string property
-     * and then returns it.
-     * You will notice that this function is VERY similar to the get_string method.
-     * That is because it is pretty much doing the same thing.
-     * However as this function is an upgrade it isn't as tolerant to backwards
-     * compatibility.
-     *
-     * @return string
-     * @throws coding_exception
-     */
-    protected function get_string() {
-        global $CFG;
-
-        // Check if we need to process the string.
-        if ($this->string === null) {
-            // Check the quality of the identifier.
-            if ($CFG->debugdeveloper && clean_param($this->identifier, PARAM_STRINGID) === '') {
-                throw new coding_exception('Invalid string identifier. Most probably some illegal character is part of the string identifier. Please check your string definition', DEBUG_DEVELOPER);
-            }
-
-            // Process the string.
-            $this->string = get_string_manager()->get_string($this->identifier, $this->component, $this->a, $this->lang);
-            // Debugging feature lets you display string identifier and component.
-            if (isset($CFG->debugstringids) && $CFG->debugstringids && optional_param('strings', 0, PARAM_INT)) {
-                $this->string .= ' {' . $this->identifier . '/' . $this->component . '}';
-            }
-        }
-        // Return the string.
-        return $this->string;
-    }
-
-    /**
-     * Returns the string
-     *
-     * @param string $lang The langauge to use when processing the string
-     * @return string
-     */
-    public function out($lang = null) {
-        if ($lang !== null && $lang != $this->lang && ($this->lang == null && $lang != current_language())) {
-            if ($this->forcedstring) {
-                debugging('lang_string objects that have been used cannot be printed in another language. ('.$this->lang.' used)', DEBUG_DEVELOPER);
-                return $this->get_string();
-            }
-            $translatedstring = new lang_string($this->identifier, $this->component, $this->a, $lang);
-            return $translatedstring->out();
-        }
-        return $this->get_string();
-    }
-
-    /**
-     * Magic __toString method for printing a string
-     *
-     * @return string
-     */
-    public function __toString() {
-        return $this->get_string();
-    }
-
-    /**
-     * Magic __set_state method used for var_export
-     *
-     * @param array $array
-     * @return self
-     */
-    public static function __set_state(array $array): self {
-        $tmp = new lang_string($array['identifier'], $array['component'], $array['a'], $array['lang']);
-        $tmp->string = $array['string'];
-        $tmp->forcedstring = $array['forcedstring'];
-        return $tmp;
-    }
-
-    /**
-     * Prepares the lang_string for sleep and stores only the forcedstring and
-     * string properties... the string cannot be regenerated so we need to ensure
-     * it is generated for this.
-     *
-     * @return array
-     */
-    public function __sleep() {
-        $this->get_string();
-        $this->forcedstring = true;
-        return array('forcedstring', 'string', 'lang');
-    }
-
-    /**
-     * Returns the identifier.
-     *
-     * @return string
-     */
-    public function get_identifier() {
-        return $this->identifier;
-    }
-
-    /**
-     * Returns the component.
-     *
-     * @return string
-     */
-    public function get_component() {
-        return $this->component;
-    }
-}
-
 /**
  * Get human readable name describing the given callable.
  *
diff --git a/lib/tests/moodlelib_test.php b/lib/tests/moodlelib_test.php
index fd9a80cb3e692..6a3ce1cbeae14 100644
--- a/lib/tests/moodlelib_test.php
+++ b/lib/tests/moodlelib_test.php
@@ -16,8 +16,6 @@
 
 namespace core;
 
-use lang_string;
-
 /**
  * Unit tests for (some of) ../moodlelib.php.
  *
@@ -2115,13 +2113,13 @@ public function test_lang_string_var_export(): void {
         $leadingbackslash = (version_compare(PHP_VERSION, '8.2.0', '>=')) ? '\\' : '';
 
         $expected1 = <<<EOF
-{$leadingbackslash}lang_string::__set_state(array(
-   'identifier' => 'no',
+{$leadingbackslash}core\lang_string::__set_state(array(
    'component' => 'moodle',
    'a' => NULL,
-   'lang' => NULL,
    'string' => NULL,
    'forcedstring' => false,
+   'identifier' => 'no',
+   'lang' => NULL,
 ))
 EOF;
 
@@ -4656,7 +4654,7 @@ public function callable_names_provider() {
             ],
             'method_of_object' => [
                 [new lang_string('parentlanguage', 'core_langconfig'), 'my_foobar_method'],
-                'lang_string::my_foobar_method',
+                'core\lang_string::my_foobar_method',
             ],
             'function_as_literal' => [
                 'my_foobar_callback',

From 751aa2efc3cdf137fe087f4d2f03d0f270ea4aa7 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Thu, 16 May 2024 22:46:48 +0100
Subject: [PATCH 062/119] MDL-81920 core: move emoticon manager class into
 autoload namespace.

---
 .upgradenotes/MDL-81920-2024061811464967.yml |  12 ++
 lib/classes/emoticon_manager.php             | 191 +++++++++++++++++++
 lib/db/legacyclasses.php                     |   1 +
 lib/moodlelib.php                            | 160 +---------------
 lib/tests/emoticon_manager_test.php          | 123 ++++++++++++
 5 files changed, 331 insertions(+), 156 deletions(-)
 create mode 100644 .upgradenotes/MDL-81920-2024061811464967.yml
 create mode 100644 lib/classes/emoticon_manager.php
 create mode 100644 lib/tests/emoticon_manager_test.php

diff --git a/.upgradenotes/MDL-81920-2024061811464967.yml b/.upgradenotes/MDL-81920-2024061811464967.yml
new file mode 100644
index 0000000000000..c3b7b437bd94d
--- /dev/null
+++ b/.upgradenotes/MDL-81920-2024061811464967.yml
@@ -0,0 +1,12 @@
+issueNumber: MDL-81920
+notes:
+  core:
+    - message: >
+        The following classes have been moved into the `\core` namespace and now
+        support autoloading:
+
+
+        - `emoticon_manager`
+
+        - `lang_string`
+      type: improved
diff --git a/lib/classes/emoticon_manager.php b/lib/classes/emoticon_manager.php
new file mode 100644
index 0000000000000..44351c022bd2d
--- /dev/null
+++ b/lib/classes/emoticon_manager.php
@@ -0,0 +1,191 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core;
+
+use pix_emoticon;
+use stdClass;
+
+/**
+ * Provides core support for plugins that have to deal with emoticons (like HTML editor or emoticon filter).
+ *
+ * Whenever this manager mentiones 'emoticon object', the following data structure is expected:
+ * stdClass with properties text, imagename, imagecomponent, altidentifier and altcomponent
+ *
+ * @see \admin_setting_emoticons
+ *
+ * @package     core
+ * @copyright   2010 David Mudrak
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class emoticon_manager {
+
+    /**
+     * Returns the currently enabled emoticons
+     *
+     * @param bool $selectable If true, only return emoticons that should be selectable from a list
+     * @return stdClass[] array of emoticon objects
+     */
+    public function get_emoticons(
+        bool $selectable = false,
+    ): array {
+        global $CFG;
+
+        $notselectable = ['martin', 'egg'];
+
+        if (empty($CFG->emoticons)) {
+            return [];
+        }
+
+        $emoticons = $this->decode_stored_config($CFG->emoticons);
+
+        if (!is_array($emoticons)) {
+            // Something is wrong with the format of stored setting.
+            debugging('Invalid format of emoticons setting, please resave the emoticons settings form', DEBUG_NORMAL);
+            return [];
+        }
+
+        if ($selectable) {
+            foreach ($emoticons as $index => $emote) {
+                if (in_array($emote->altidentifier, $notselectable)) {
+                    // Skip this one.
+                    unset($emoticons[$index]);
+                }
+            }
+        }
+
+        return $emoticons;
+    }
+
+    /**
+     * Converts emoticon object into renderable pix_emoticon object
+     *
+     * @param stdClass $emoticon emoticon object
+     * @param array $attributes explicit HTML attributes to set
+     * @return pix_emoticon
+     */
+    public function prepare_renderable_emoticon(
+        stdClass $emoticon,
+        array $attributes = [],
+    ): pix_emoticon {
+        $stringmanager = get_string_manager();
+        if ($stringmanager->string_exists($emoticon->altidentifier, $emoticon->altcomponent)) {
+            $alt = get_string($emoticon->altidentifier, $emoticon->altcomponent);
+        } else {
+            $alt = s($emoticon->text);
+        }
+        return new pix_emoticon($emoticon->imagename, $alt, $emoticon->imagecomponent, $attributes);
+    }
+
+    /**
+     * Encodes the array of emoticon objects into a string storable in config table
+     *
+     * @param stdClass[] $emoticons array of emoticon objects
+     * @return string
+     */
+    public function encode_stored_config(
+        array $emoticons,
+    ): string {
+        return json_encode($emoticons);
+    }
+
+    /**
+     * Decodes the string into an array of emoticon objects
+     *
+     * @param string $encoded
+     * @return ?array
+     */
+    public function decode_stored_config(
+        string $encoded,
+    ): ?array {
+        $decoded = json_decode($encoded);
+        if (!is_array($decoded)) {
+            return null;
+        }
+        return $decoded;
+    }
+
+    /**
+     * Returns default set of emoticons supported by Moodle
+     *
+     * @return stdClass[] array of emoticon objects
+     */
+    public function default_emoticons(): array {
+        return [
+            $this->prepare_emoticon_object(":-)", 's/smiley', 'smiley'),
+            $this->prepare_emoticon_object(":)", 's/smiley', 'smiley'),
+            $this->prepare_emoticon_object(":-D", 's/biggrin', 'biggrin'),
+            $this->prepare_emoticon_object(";-)", 's/wink', 'wink'),
+            $this->prepare_emoticon_object(":-/", 's/mixed', 'mixed'),
+            $this->prepare_emoticon_object("V-.", 's/thoughtful', 'thoughtful'),
+            $this->prepare_emoticon_object(":-P", 's/tongueout', 'tongueout'),
+            $this->prepare_emoticon_object(":-p", 's/tongueout', 'tongueout'),
+            $this->prepare_emoticon_object("B-)", 's/cool', 'cool'),
+            $this->prepare_emoticon_object("^-)", 's/approve', 'approve'),
+            $this->prepare_emoticon_object("8-)", 's/wideeyes', 'wideeyes'),
+            $this->prepare_emoticon_object(":o)", 's/clown', 'clown'),
+            $this->prepare_emoticon_object(":-(", 's/sad', 'sad'),
+            $this->prepare_emoticon_object(":(", 's/sad', 'sad'),
+            $this->prepare_emoticon_object("8-.", 's/shy', 'shy'),
+            $this->prepare_emoticon_object(":-I", 's/blush', 'blush'),
+            $this->prepare_emoticon_object(":-X", 's/kiss', 'kiss'),
+            $this->prepare_emoticon_object("8-o", 's/surprise', 'surprise'),
+            $this->prepare_emoticon_object("P-|", 's/blackeye', 'blackeye'),
+            $this->prepare_emoticon_object("8-[", 's/angry', 'angry'),
+            $this->prepare_emoticon_object("(grr)", 's/angry', 'angry'),
+            $this->prepare_emoticon_object("xx-P", 's/dead', 'dead'),
+            $this->prepare_emoticon_object("|-.", 's/sleepy', 'sleepy'),
+            $this->prepare_emoticon_object("}-]", 's/evil', 'evil'),
+            $this->prepare_emoticon_object("(h)", 's/heart', 'heart'),
+            $this->prepare_emoticon_object("(heart)", 's/heart', 'heart'),
+            $this->prepare_emoticon_object("(y)", 's/yes', 'yes', 'core'),
+            $this->prepare_emoticon_object("(n)", 's/no', 'no', 'core'),
+            $this->prepare_emoticon_object("(martin)", 's/martin', 'martin'),
+            $this->prepare_emoticon_object("( )", 's/egg', 'egg'),
+        ];
+    }
+
+    /**
+     * Helper method preparing an emoticon object
+     *
+     * @param string|string[] $text
+     * @param string $imagename to be used by {@see pix_emoticon}
+     * @param ?string $altidentifier alternative string identifier, null for no alt
+     * @param string $altcomponent where the alternative string is defined
+     * @param string $imagecomponent to be used by {@see pix_emoticon}
+     * @return stdClass
+     */
+    protected function prepare_emoticon_object(
+        string|array $text,
+        string $imagename,
+        ?string $altidentifier = null,
+        string $altcomponent = 'core_pix',
+        string $imagecomponent = 'core',
+    ): stdClass {
+        return (object) [
+            'text' => $text,
+            'imagename' => $imagename,
+            'altidentifier' => $altidentifier,
+            'altcomponent' => $altcomponent,
+            'imagecomponent' => $imagecomponent,
+        ];
+    }
+}
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(emoticon_manager::class, \emoticon_manager::class);
diff --git a/lib/db/legacyclasses.php b/lib/db/legacyclasses.php
index e1568603b03ec..7d049292dcfc1 100644
--- a/lib/db/legacyclasses.php
+++ b/lib/db/legacyclasses.php
@@ -33,6 +33,7 @@
     \bootstrap_renderer::class => 'output/bootstrap_renderer.php',
 
     // Core API.
+    \emoticon_manager::class => 'emoticon_manager.php',
     \lang_string::class => 'lang_string.php',
 
     // Exception API.
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index d3c5d020fe008..e8aac00c08951 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -7128,172 +7128,20 @@ function get_list_of_themes() {
 }
 
 /**
- * Factory function for emoticon_manager
+ * Factory function for {@see \core\emoticon_manager}
  *
- * @return emoticon_manager singleton
+ * @return \core\emoticon_manager singleton
  */
-function get_emoticon_manager() {
+function get_emoticon_manager(): \core\emoticon_manager {
     static $singleton = null;
 
     if (is_null($singleton)) {
-        $singleton = new emoticon_manager();
+        $singleton = new \core\emoticon_manager();
     }
 
     return $singleton;
 }
 
-/**
- * Provides core support for plugins that have to deal with emoticons (like HTML editor or emoticon filter).
- *
- * Whenever this manager mentiones 'emoticon object', the following data
- * structure is expected: stdClass with properties text, imagename, imagecomponent,
- * altidentifier and altcomponent
- *
- * @see admin_setting_emoticons
- *
- * @copyright 2010 David Mudrak
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class emoticon_manager {
-
-    /**
-     * Returns the currently enabled emoticons
-     *
-     * @param boolean $selectable - If true, only return emoticons that should be selectable from a list.
-     * @return array of emoticon objects
-     */
-    public function get_emoticons($selectable = false) {
-        global $CFG;
-        $notselectable = ['martin', 'egg'];
-
-        if (empty($CFG->emoticons)) {
-            return array();
-        }
-
-        $emoticons = $this->decode_stored_config($CFG->emoticons);
-
-        if (!is_array($emoticons)) {
-            // Something is wrong with the format of stored setting.
-            debugging('Invalid format of emoticons setting, please resave the emoticons settings form', DEBUG_NORMAL);
-            return array();
-        }
-        if ($selectable) {
-            foreach ($emoticons as $index => $emote) {
-                if (in_array($emote->altidentifier, $notselectable)) {
-                    // Skip this one.
-                    unset($emoticons[$index]);
-                }
-            }
-        }
-
-        return $emoticons;
-    }
-
-    /**
-     * Converts emoticon object into renderable pix_emoticon object
-     *
-     * @param stdClass $emoticon emoticon object
-     * @param array $attributes explicit HTML attributes to set
-     * @return pix_emoticon
-     */
-    public function prepare_renderable_emoticon(stdClass $emoticon, array $attributes = array()) {
-        $stringmanager = get_string_manager();
-        if ($stringmanager->string_exists($emoticon->altidentifier, $emoticon->altcomponent)) {
-            $alt = get_string($emoticon->altidentifier, $emoticon->altcomponent);
-        } else {
-            $alt = s($emoticon->text);
-        }
-        return new pix_emoticon($emoticon->imagename, $alt, $emoticon->imagecomponent, $attributes);
-    }
-
-    /**
-     * Encodes the array of emoticon objects into a string storable in config table
-     *
-     * @see self::decode_stored_config()
-     * @param array $emoticons array of emtocion objects
-     * @return string
-     */
-    public function encode_stored_config(array $emoticons) {
-        return json_encode($emoticons);
-    }
-
-    /**
-     * Decodes the string into an array of emoticon objects
-     *
-     * @see self::encode_stored_config()
-     * @param string $encoded
-     * @return array|null
-     */
-    public function decode_stored_config($encoded) {
-        $decoded = json_decode($encoded);
-        if (!is_array($decoded)) {
-            return null;
-        }
-        return $decoded;
-    }
-
-    /**
-     * Returns default set of emoticons supported by Moodle
-     *
-     * @return array of sdtClasses
-     */
-    public function default_emoticons() {
-        return array(
-            $this->prepare_emoticon_object(":-)", 's/smiley', 'smiley'),
-            $this->prepare_emoticon_object(":)", 's/smiley', 'smiley'),
-            $this->prepare_emoticon_object(":-D", 's/biggrin', 'biggrin'),
-            $this->prepare_emoticon_object(";-)", 's/wink', 'wink'),
-            $this->prepare_emoticon_object(":-/", 's/mixed', 'mixed'),
-            $this->prepare_emoticon_object("V-.", 's/thoughtful', 'thoughtful'),
-            $this->prepare_emoticon_object(":-P", 's/tongueout', 'tongueout'),
-            $this->prepare_emoticon_object(":-p", 's/tongueout', 'tongueout'),
-            $this->prepare_emoticon_object("B-)", 's/cool', 'cool'),
-            $this->prepare_emoticon_object("^-)", 's/approve', 'approve'),
-            $this->prepare_emoticon_object("8-)", 's/wideeyes', 'wideeyes'),
-            $this->prepare_emoticon_object(":o)", 's/clown', 'clown'),
-            $this->prepare_emoticon_object(":-(", 's/sad', 'sad'),
-            $this->prepare_emoticon_object(":(", 's/sad', 'sad'),
-            $this->prepare_emoticon_object("8-.", 's/shy', 'shy'),
-            $this->prepare_emoticon_object(":-I", 's/blush', 'blush'),
-            $this->prepare_emoticon_object(":-X", 's/kiss', 'kiss'),
-            $this->prepare_emoticon_object("8-o", 's/surprise', 'surprise'),
-            $this->prepare_emoticon_object("P-|", 's/blackeye', 'blackeye'),
-            $this->prepare_emoticon_object("8-[", 's/angry', 'angry'),
-            $this->prepare_emoticon_object("(grr)", 's/angry', 'angry'),
-            $this->prepare_emoticon_object("xx-P", 's/dead', 'dead'),
-            $this->prepare_emoticon_object("|-.", 's/sleepy', 'sleepy'),
-            $this->prepare_emoticon_object("}-]", 's/evil', 'evil'),
-            $this->prepare_emoticon_object("(h)", 's/heart', 'heart'),
-            $this->prepare_emoticon_object("(heart)", 's/heart', 'heart'),
-            $this->prepare_emoticon_object("(y)", 's/yes', 'yes', 'core'),
-            $this->prepare_emoticon_object("(n)", 's/no', 'no', 'core'),
-            $this->prepare_emoticon_object("(martin)", 's/martin', 'martin'),
-            $this->prepare_emoticon_object("( )", 's/egg', 'egg'),
-        );
-    }
-
-    /**
-     * Helper method preparing the stdClass with the emoticon properties
-     *
-     * @param string|array $text or array of strings
-     * @param string $imagename to be used by {@link pix_emoticon}
-     * @param string $altidentifier alternative string identifier, null for no alt
-     * @param string $altcomponent where the alternative string is defined
-     * @param string $imagecomponent to be used by {@link pix_emoticon}
-     * @return stdClass
-     */
-    protected function prepare_emoticon_object($text, $imagename, $altidentifier = null,
-                                               $altcomponent = 'core_pix', $imagecomponent = 'core') {
-        return (object)array(
-            'text'           => $text,
-            'imagename'      => $imagename,
-            'imagecomponent' => $imagecomponent,
-            'altidentifier'  => $altidentifier,
-            'altcomponent'   => $altcomponent,
-        );
-    }
-}
-
 // ENVIRONMENT CHECKING.
 
 /**
diff --git a/lib/tests/emoticon_manager_test.php b/lib/tests/emoticon_manager_test.php
new file mode 100644
index 0000000000000..c734fbf5e0f18
--- /dev/null
+++ b/lib/tests/emoticon_manager_test.php
@@ -0,0 +1,123 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core;
+
+use advanced_testcase;
+use stdClass;
+use ReflectionMethod;
+
+/**
+ * Unit tests for emoticon manager
+ *
+ * @package     core
+ * @covers      \core\emoticon_manager
+ * @copyright   2024 Paul Holden <paulh@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+final class emoticon_manager_test extends advanced_testcase {
+
+    /**
+     * Data provider for {@see test_get_emoticons}
+     *
+     * @return array[]
+     */
+    public static function get_emoticons_provider(): array {
+        return [
+            'Only selectable' => [true, ['wink', 'biggrin'], ['egg', 'martin']],
+            'Including non-selectable' => [false, ['wink', 'biggrin', 'egg', 'martin']],
+        ];
+    }
+
+    /**
+     * Test getting enabled emoticons
+     *
+     * @param bool $selectable
+     * @param string[] $expected
+     * @param string[] $excluded
+     *
+     * @dataProvider get_emoticons_provider
+     */
+    public function test_get_emoticons(
+        bool $selectable,
+        array $expected,
+        array $excluded = [],
+    ): void {
+        $emoticons = (new emoticon_manager())->get_emoticons($selectable);
+        $identifiers = array_column($emoticons, 'altidentifier');
+
+        // Assert the subset of expected identifiers are all present.
+        $this->assertEquals([], array_diff($expected, $identifiers));
+
+        // Assert none of the excluded identifiers are present.
+        $this->assertEquals($excluded, array_diff($excluded, $identifiers));
+    }
+
+    /**
+     * Test converting emoticon object into renderable
+     */
+    public function test_prepare_renderable_emoticon(): void {
+        $manager = new emoticon_manager();
+
+        // With language string identifier.
+        $emoticon = $this->prepare_emoticon_object(':)', 's/smiley', 'smiley');
+        $pixemoticon = $manager->prepare_renderable_emoticon($emoticon);
+
+        $this->assertEquals('s/smiley', $pixemoticon->pix);
+        $this->assertEquals('core', $pixemoticon->component);
+        $this->assertEquals([
+            'class' => 'emoticon',
+            'alt' => 'smile',
+            'title' => 'smile',
+        ], $pixemoticon->attributes);
+
+        // With language string identifier from another component.
+        $emoticon = $this->prepare_emoticon_object(':)', 's/smiley', 'thanks', 'core');
+        $pixemoticon = $manager->prepare_renderable_emoticon($emoticon);
+
+        $this->assertEquals('s/smiley', $pixemoticon->pix);
+        $this->assertEquals('core', $pixemoticon->component);
+        $this->assertEquals([
+            'class' => 'emoticon',
+            'alt' => 'Thanks',
+            'title' => 'Thanks',
+        ], $pixemoticon->attributes);
+
+        // Without language string identifier.
+        $emoticon = $this->prepare_emoticon_object(':-O', 's/shock');
+        $pixemoticon = $manager->prepare_renderable_emoticon($emoticon);
+
+        $this->assertEquals('s/shock', $pixemoticon->pix);
+        $this->assertEquals('core', $pixemoticon->component);
+        $this->assertEquals([
+            'class' => 'emoticon',
+            'alt' => ':-O',
+            'title' => ':-O',
+        ], $pixemoticon->attributes);
+    }
+
+    /**
+     * Proxy method for creating emoticon object via {@see \core\emoticon_manager::prepare_emoticon_object}
+     *
+     * @param mixed ...$params
+     * @return stdClass
+     */
+    private function prepare_emoticon_object(...$params): stdClass {
+        $manager = new emoticon_manager();
+        $method = new ReflectionMethod($manager, 'prepare_emoticon_object');
+        return $method->invoke($manager, ...$params);
+    }
+}

From 2fff48b07c3a6ced72b67dcabd3f20427f691b71 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 12 Jun 2024 23:45:33 +0800
Subject: [PATCH 063/119] MDL-82183 core: Migrate all output classes to
 autoloaded

---
 blocks/classes/output/block_contents.php      |  161 +
 blocks/classes/output/block_move_target.php   |   44 +
 lib/classes/component.php                     |    1 +
 lib/classes/output/action_link.php            |  156 +
 lib/classes/output/action_menu.php            |  666 ++
 lib/classes/output/action_menu/filler.php     |   39 +
 lib/classes/output/action_menu/link.php       |  106 +
 .../output/action_menu/link_primary.php       |   37 +
 .../output/action_menu/link_secondary.php     |   37 +
 .../output/actions/component_action.php       |   79 +
 lib/classes/output/actions/confirm_action.php |   47 +
 lib/classes/output/actions/popup_action.php   |  106 +
 lib/classes/output/context_header.php         |  147 +
 lib/classes/output/core_renderer.php          | 4765 ++++++++++++++
 lib/classes/output/core_renderer_ajax.php     |  134 +
 lib/classes/output/core_renderer_cli.php      |  250 +
 .../output/core_renderer_maintenance.php      |  229 +
 lib/classes/output/custom_menu.php            |  179 +
 lib/classes/output/custom_menu_item.php       |  261 +
 lib/classes/output/file_picker.php            |   93 +
 lib/classes/output/help_icon.php              |  118 +
 lib/classes/output/html_writer.php            |  870 +++
 lib/classes/output/image_icon.php             |   27 +
 lib/classes/output/initials_bar.php           |  148 +
 lib/classes/output/js_writer.php              |  147 +
 lib/classes/output/paging_bar.php             |  255 +
 lib/classes/output/pix_emoticon.php           |   40 +
 lib/classes/output/pix_icon.php               |  143 +
 lib/classes/output/pix_icon_font.php          |   93 +
 lib/classes/output/pix_icon_fontawesome.php   |   26 +
 lib/classes/output/plugin_renderer_base.php   |  131 +
 lib/classes/output/preferences_group.php      |   47 +
 lib/classes/output/preferences_groups.php     |   39 +
 lib/classes/output/progress_bar.php           |  204 +
 lib/classes/output/renderable.php             |   26 +
 lib/classes/output/renderer_base.php          |  406 ++
 .../renderer_factory_base.php                 |  197 +
 .../renderer_factory_interface.php            |   61 +
 .../standard_renderer_factory.php             |   80 +
 .../theme_overridden_renderer_factory.php     |  118 +
 .../fragment_requirements_manager.php         |  118 +
 .../page_requirements_manager.php             | 1814 +++++
 lib/classes/output/requirements/yui.php       |  351 +
 lib/classes/output/single_button.php          |  266 +
 lib/classes/output/single_select.php          |  289 +
 lib/classes/output/tabobject.php              |  140 +
 lib/classes/output/tabtree.php                |   91 +
 lib/classes/output/templatable.php            |   37 +
 lib/classes/output/theme_config.php           | 2312 +++++++
 lib/classes/output/url_select.php             |  282 +
 lib/classes/output/user_picture.php           |  302 +
 lib/classes/output/xhtml_container_stack.php  |  153 +
 lib/db/legacyclasses.php                      |   83 +
 lib/form/button.php                           |    1 -
 lib/form/templatable_form_element.php         |   12 -
 lib/outputactions.php                         |  209 +-
 lib/outputcomponents.php                      | 5355 +--------------
 lib/outputfactories.php                       |  438 +-
 lib/outputfragmentrequirementslib.php         |  118 +-
 lib/outputlib.php                             | 2471 +------
 lib/outputrenderers.php                       | 5857 +----------------
 lib/outputrequirementslib.php                 | 2186 +-----
 lib/pagelib.php                               |    3 -
 lib/table/classes/output/html_table.php       |  207 +
 lib/table/classes/output/html_table_cell.php  |   82 +
 lib/table/classes/output/html_table_row.php   |   63 +
 lib/tests/coverage.php                        |    6 -
 lib/tests/fixtures/test_renderer_factory.php  |   14 -
 lib/tests/html_writer_test.php                |   17 +-
 lib/tests/outputcomponents_test.php           |    8 +-
 lib/tests/outputfactories_test.php            |   16 +-
 lib/tests/outputrequirementslib_test.php      |    8 +-
 mod/wiki/parser/utils.php                     |    3 -
 73 files changed, 17384 insertions(+), 16641 deletions(-)
 create mode 100644 blocks/classes/output/block_contents.php
 create mode 100644 blocks/classes/output/block_move_target.php
 create mode 100644 lib/classes/output/action_link.php
 create mode 100644 lib/classes/output/action_menu.php
 create mode 100644 lib/classes/output/action_menu/filler.php
 create mode 100644 lib/classes/output/action_menu/link.php
 create mode 100644 lib/classes/output/action_menu/link_primary.php
 create mode 100644 lib/classes/output/action_menu/link_secondary.php
 create mode 100644 lib/classes/output/actions/component_action.php
 create mode 100644 lib/classes/output/actions/confirm_action.php
 create mode 100644 lib/classes/output/actions/popup_action.php
 create mode 100644 lib/classes/output/context_header.php
 create mode 100644 lib/classes/output/core_renderer.php
 create mode 100644 lib/classes/output/core_renderer_ajax.php
 create mode 100644 lib/classes/output/core_renderer_cli.php
 create mode 100644 lib/classes/output/core_renderer_maintenance.php
 create mode 100644 lib/classes/output/custom_menu.php
 create mode 100644 lib/classes/output/custom_menu_item.php
 create mode 100644 lib/classes/output/file_picker.php
 create mode 100644 lib/classes/output/help_icon.php
 create mode 100644 lib/classes/output/html_writer.php
 create mode 100644 lib/classes/output/image_icon.php
 create mode 100644 lib/classes/output/initials_bar.php
 create mode 100644 lib/classes/output/js_writer.php
 create mode 100644 lib/classes/output/paging_bar.php
 create mode 100644 lib/classes/output/pix_emoticon.php
 create mode 100644 lib/classes/output/pix_icon.php
 create mode 100644 lib/classes/output/pix_icon_font.php
 create mode 100644 lib/classes/output/pix_icon_fontawesome.php
 create mode 100644 lib/classes/output/plugin_renderer_base.php
 create mode 100644 lib/classes/output/preferences_group.php
 create mode 100644 lib/classes/output/preferences_groups.php
 create mode 100644 lib/classes/output/progress_bar.php
 create mode 100644 lib/classes/output/renderable.php
 create mode 100644 lib/classes/output/renderer_base.php
 create mode 100644 lib/classes/output/renderer_factory/renderer_factory_base.php
 create mode 100644 lib/classes/output/renderer_factory/renderer_factory_interface.php
 create mode 100644 lib/classes/output/renderer_factory/standard_renderer_factory.php
 create mode 100644 lib/classes/output/renderer_factory/theme_overridden_renderer_factory.php
 create mode 100644 lib/classes/output/requirements/fragment_requirements_manager.php
 create mode 100644 lib/classes/output/requirements/page_requirements_manager.php
 create mode 100644 lib/classes/output/requirements/yui.php
 create mode 100644 lib/classes/output/single_button.php
 create mode 100644 lib/classes/output/single_select.php
 create mode 100644 lib/classes/output/tabobject.php
 create mode 100644 lib/classes/output/tabtree.php
 create mode 100644 lib/classes/output/templatable.php
 create mode 100644 lib/classes/output/theme_config.php
 create mode 100644 lib/classes/output/url_select.php
 create mode 100644 lib/classes/output/user_picture.php
 create mode 100644 lib/classes/output/xhtml_container_stack.php
 create mode 100644 lib/table/classes/output/html_table.php
 create mode 100644 lib/table/classes/output/html_table_cell.php
 create mode 100644 lib/table/classes/output/html_table_row.php

diff --git a/blocks/classes/output/block_contents.php b/blocks/classes/output/block_contents.php
new file mode 100644
index 0000000000000..a18800bbe1bba
--- /dev/null
+++ b/blocks/classes/output/block_contents.php
@@ -0,0 +1,161 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This class represents how a block appears on a page.
+ *
+ * During output, each block instance is asked to return a block_contents object,
+ * those are then passed to the $OUTPUT->block function for display.
+ *
+ * contents should probably be generated using a moodle_block_..._renderer.
+ *
+ * Other block-like things that need to appear on the page, for example the
+ * add new block UI, are also represented as block_contents objects.
+ *
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class block_contents {
+
+    /** Used when the block cannot be collapsed **/
+    const NOT_HIDEABLE = 0;
+
+    /** Used when the block can be collapsed but currently is not **/
+    const VISIBLE = 1;
+
+    /** Used when the block has been collapsed **/
+    const HIDDEN = 2;
+
+    /**
+     * @var int Used to set $skipid.
+     */
+    protected static $idcounter = 1;
+
+    /**
+     * @var int All the blocks (or things that look like blocks) printed on
+     * a page are given a unique number that can be used to construct id="" attributes.
+     * This is set automatically be the {@link prepare()} method.
+     * Do not try to set it manually.
+     */
+    public $skipid;
+
+    /**
+     * @var int If this is the contents of a real block, this should be set
+     * to the block_instance.id. Otherwise this should be set to 0.
+     */
+    public $blockinstanceid = 0;
+
+    /**
+     * @var int If this is a real block instance, and there is a corresponding
+     * block_position.id for the block on this page, this should be set to that id.
+     * Otherwise it should be 0.
+     */
+    public $blockpositionid = 0;
+
+    /**
+     * @var array An array of attribute => value pairs that are put on the outer div of this
+     * block. {@link $id} and {@link $classes} attributes should be set separately.
+     */
+    public $attributes;
+
+    /**
+     * @var string The title of this block. If this came from user input, it should already
+     * have had format_string() processing done on it. This will be output inside
+     * <h2> tags. Please do not cause invalid XHTML.
+     */
+    public $title = '';
+
+    /**
+     * @var string The label to use when the block does not, or will not have a visible title.
+     * You should never set this as well as title... it will just be ignored.
+     */
+    public $arialabel = '';
+
+    /**
+     * @var string HTML for the content
+     */
+    public $content = '';
+
+    /**
+     * @var array An alternative to $content, it you want a list of things with optional icons.
+     */
+    public $footer = '';
+
+    /**
+     * @var string Any small print that should appear under the block to explain
+     * to the teacher about the block, for example 'This is a sticky block that was
+     * added in the system context.'
+     */
+    public $annotation = '';
+
+    /**
+     * @var int One of the constants NOT_HIDEABLE, VISIBLE, HIDDEN. Whether
+     * the user can toggle whether this block is visible.
+     */
+    public $collapsible = self::NOT_HIDEABLE;
+
+    /**
+     * Set this to true if the block is dockable.
+     * @var bool
+     */
+    public $dockable = false;
+
+    /**
+     * @var array A (possibly empty) array of editing controls. Each element of
+     * this array should be an array('url' => $url, 'icon' => $icon, 'caption' => $caption).
+     * $icon is the icon name. Fed to $OUTPUT->image_url.
+     */
+    public $controls = array();
+
+
+    /**
+     * Create new instance of block content
+     * @param array $attributes
+     */
+    public function __construct(array $attributes = null) {
+        $this->skipid = self::$idcounter;
+        self::$idcounter += 1;
+
+        if ($attributes) {
+            // standard block
+            $this->attributes = $attributes;
+        } else {
+            // simple "fake" blocks used in some modules and "Add new block" block
+            $this->attributes = array('class'=>'block');
+        }
+    }
+
+    /**
+     * Add html class to block
+     *
+     * @param string $class
+     */
+    public function add_class($class) {
+        $this->attributes['class'] .= ' '.$class;
+    }
+
+    /**
+     * Check if the block is a fake block.
+     *
+     * @return boolean
+     */
+    public function is_fake() {
+        return isset($this->attributes['data-block']) && $this->attributes['data-block'] == '_fake';
+    }
+}
diff --git a/blocks/classes/output/block_move_target.php b/blocks/classes/output/block_move_target.php
new file mode 100644
index 0000000000000..c0312747b8bc7
--- /dev/null
+++ b/blocks/classes/output/block_move_target.php
@@ -0,0 +1,44 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This class represents a target for where a block can go when it is being moved.
+ *
+ * This needs to be rendered as a form with the given hidden from fields, and
+ * clicking anywhere in the form should submit it. The form action should be
+ * $PAGE->url.
+ *
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class block_move_target {
+
+    /**
+     * @var moodle_url Move url
+     */
+    public $url;
+
+    /**
+     * Constructor
+     * @param moodle_url $url
+     */
+    public function __construct(moodle_url $url) {
+        $this->url  = $url;
+    }
+}
diff --git a/lib/classes/component.php b/lib/classes/component.php
index 26b83933d7102..50a5be5f4c321 100644
--- a/lib/classes/component.php
+++ b/lib/classes/component.php
@@ -390,6 +390,7 @@ protected static function is_cache_valid(array $cache): bool {
         $keyclasses = [
             \core\exception\moodle_exception::class,
             \core\output\bootstrap_renderer::class,
+            \renderable::class,
         ];
         foreach ($keyclasses as $classname) {
             if (!array_key_exists($classname, $cache['classmap'])) {
diff --git a/lib/classes/output/action_link.php b/lib/classes/output/action_link.php
new file mode 100644
index 0000000000000..ae006adfe278a
--- /dev/null
+++ b/lib/classes/output/action_link.php
@@ -0,0 +1,156 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Data structure describing html link with special action attached.
+ *
+ * @copyright 2010 Petr Skoda
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class action_link implements renderable {
+
+    /**
+     * @var moodle_url Href url
+     */
+    public $url;
+
+    /**
+     * @var string Link text HTML fragment
+     */
+    public $text;
+
+    /**
+     * @var array HTML attributes
+     */
+    public $attributes;
+
+    /**
+     * @var array List of actions attached to link
+     */
+    public $actions;
+
+    /**
+     * @var pix_icon Optional pix icon to render with the link
+     */
+    public $icon;
+
+    /**
+     * Constructor
+     * @param moodle_url $url
+     * @param string $text HTML fragment
+     * @param component_action $action
+     * @param array $attributes associative array of html link attributes + disabled
+     * @param pix_icon $icon optional pix_icon to render with the link text
+     */
+    public function __construct(moodle_url $url,
+        $text,
+        component_action $action=null,
+        array $attributes=null,
+        pix_icon $icon=null) {
+        $this->url = clone($url);
+        $this->text = $text;
+        if (empty($attributes['id'])) {
+            $attributes['id'] = html_writer::random_id('action_link');
+        }
+        $this->attributes = (array)$attributes;
+        if ($action) {
+            $this->add_action($action);
+        }
+        $this->icon = $icon;
+    }
+
+    /**
+     * Add action to the link.
+     *
+     * @param component_action $action
+     */
+    public function add_action(component_action $action) {
+        $this->actions[] = $action;
+    }
+
+    /**
+     * Adds a CSS class to this action link object
+     * @param string $class
+     */
+    public function add_class($class) {
+        if (empty($this->attributes['class'])) {
+            $this->attributes['class'] = $class;
+        } else {
+            $this->attributes['class'] .= ' ' . $class;
+        }
+    }
+
+    /**
+     * Returns true if the specified class has been added to this link.
+     * @param string $class
+     * @return bool
+     */
+    public function has_class($class) {
+        return strpos(' ' . $this->attributes['class'] . ' ', ' ' . $class . ' ') !== false;
+    }
+
+    /**
+     * Return the rendered HTML for the icon. Useful for rendering action links in a template.
+     * @return string
+     */
+    public function get_icon_html() {
+        global $OUTPUT;
+        if (!$this->icon) {
+            return '';
+        }
+        return $OUTPUT->render($this->icon);
+    }
+
+    /**
+     * Export for template.
+     *
+     * @param renderer_base $output The renderer.
+     * @return stdClass
+     */
+    public function export_for_template(renderer_base $output) {
+        $data = new stdClass();
+        $attributes = $this->attributes;
+
+        $data->id = $attributes['id'];
+        unset($attributes['id']);
+
+        $data->disabled = !empty($attributes['disabled']);
+        unset($attributes['disabled']);
+
+        $data->text = $this->text instanceof renderable ? $output->render($this->text) : (string) $this->text;
+        $data->url = $this->url ? $this->url->out(false) : '';
+        $data->icon = $this->icon ? $this->icon->export_for_pix() : null;
+        $data->classes = isset($attributes['class']) ? $attributes['class'] : '';
+        unset($attributes['class']);
+
+        $data->attributes = array_map(function($key, $value) {
+            return [
+                'name' => $key,
+                'value' => $value
+            ];
+        }, array_keys($attributes), $attributes);
+
+        $data->actions = array_map(function($action) use ($output) {
+            return $action->export_for_template($output);
+        }, !empty($this->actions) ? $this->actions : []);
+        $data->hasactions = !empty($this->actions);
+
+        return $data;
+    }
+}
diff --git a/lib/classes/output/action_menu.php b/lib/classes/output/action_menu.php
new file mode 100644
index 0000000000000..2906f1c86fa89
--- /dev/null
+++ b/lib/classes/output/action_menu.php
@@ -0,0 +1,666 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+use core\output\local\action_menu\subpanel;
+
+/**
+ * An action menu.
+ *
+ * This action menu component takes a series of primary and secondary actions.
+ * The primary actions are displayed permanently and the secondary attributes are displayed within a drop
+ * down menu.
+ *
+ * @package core
+ * @category output
+ * @copyright 2013 Sam Hemelryk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class action_menu implements renderable, templatable {
+
+    /**
+     * Top right alignment.
+     */
+    const TL = 1;
+
+    /**
+     * Top right alignment.
+     */
+    const TR = 2;
+
+    /**
+     * Top right alignment.
+     */
+    const BL = 3;
+
+    /**
+     * Top right alignment.
+     */
+    const BR = 4;
+
+    /**
+     * The instance number. This is unique to this instance of the action menu.
+     * @var int
+     */
+    protected $instance = 0;
+
+    /**
+     * An array of primary actions. Please use {@link action_menu::add_primary_action()} to add actions.
+     * @var array
+     */
+    protected $primaryactions = array();
+
+    /**
+     * An array of secondary actions. Please use {@link action_menu::add_secondary_action()} to add actions.
+     * @var array
+     */
+    protected $secondaryactions = array();
+
+    /**
+     * An array of attributes added to the container of the action menu.
+     * Initialised with defaults during construction.
+     * @var array
+     */
+    public $attributes = array();
+    /**
+     * An array of attributes added to the container of the primary actions.
+     * Initialised with defaults during construction.
+     * @var array
+     */
+    public $attributesprimary = array();
+    /**
+     * An array of attributes added to the container of the secondary actions.
+     * Initialised with defaults during construction.
+     * @var array
+     */
+    public $attributessecondary = array();
+
+    /**
+     * The string to use next to the icon for the action icon relating to the secondary (dropdown) menu.
+     * @var array
+     */
+    public $actiontext = null;
+
+    /**
+     * The string to use for the accessible label for the menu.
+     * @var array
+     */
+    public $actionlabel = null;
+
+    /**
+     * An icon to use for the toggling the secondary menu (dropdown).
+     * @var pix_icon
+     */
+    public $actionicon;
+
+    /**
+     * Any text to use for the toggling the secondary menu (dropdown).
+     * @var string
+     */
+    public $menutrigger = '';
+
+    /**
+     * An array of attributes added to the trigger element of the secondary menu.
+     * @var array
+     */
+    public $triggerattributes = [];
+
+    /**
+     * Any extra classes for toggling to the secondary menu.
+     * @var string
+     */
+    public $triggerextraclasses = '';
+
+    /**
+     * Place the action menu before all other actions.
+     * @var bool
+     */
+    public $prioritise = false;
+
+    /**
+     * Dropdown menu alignment class.
+     * @var string
+     */
+    public $dropdownalignment = '';
+
+    /**
+     * Constructs the action menu with the given items.
+     *
+     * @param array $actions An array of actions (action_menu_link|pix_icon|string).
+     */
+    public function __construct(array $actions = array()) {
+        static $initialised = 0;
+        $this->instance = $initialised;
+        $initialised++;
+
+        $this->attributes = array(
+            'id' => 'action-menu-'.$this->instance,
+            'class' => 'moodle-actionmenu',
+            'data-enhance' => 'moodle-core-actionmenu'
+        );
+        $this->attributesprimary = array(
+            'id' => 'action-menu-'.$this->instance.'-menubar',
+            'class' => 'menubar',
+        );
+        $this->attributessecondary = array(
+            'id' => 'action-menu-'.$this->instance.'-menu',
+            'class' => 'menu',
+            'data-rel' => 'menu-content',
+            'aria-labelledby' => 'action-menu-toggle-'.$this->instance,
+            'role' => 'menu'
+        );
+        $this->dropdownalignment = 'dropdown-menu-right';
+        foreach ($actions as $action) {
+            $this->add($action);
+        }
+    }
+
+    /**
+     * Sets the label for the menu trigger.
+     *
+     * @param string $label The text
+     */
+    public function set_action_label($label) {
+        $this->actionlabel = $label;
+    }
+
+    /**
+     * Sets the menu trigger text.
+     *
+     * @param string $trigger The text
+     * @param string $extraclasses Extra classes to style the secondary menu toggle.
+     */
+    public function set_menu_trigger($trigger, $extraclasses = '') {
+        $this->menutrigger = $trigger;
+        $this->triggerextraclasses = $extraclasses;
+    }
+
+    /**
+     * Classes for the trigger menu
+     */
+    const DEFAULT_KEBAB_TRIGGER_CLASSES = 'btn btn-icon d-flex align-items-center justify-content-center no-caret';
+
+    /**
+     * Setup trigger as in the kebab menu.
+     *
+     * @param string|null $triggername
+     * @param core_renderer|null $output
+     * @param string|null $extraclasses extra classes for the trigger {@see self::set_menu_trigger()}
+     * @throws coding_exception
+     */
+    public function set_kebab_trigger(?string $triggername = null, ?core_renderer $output = null,
+        ?string $extraclasses = '') {
+        global $OUTPUT;
+        if (empty($output)) {
+            $output = $OUTPUT;
+        }
+        $label = $triggername ?? get_string('actions');
+        $triggerclasses = self::DEFAULT_KEBAB_TRIGGER_CLASSES . ' ' . $extraclasses;
+        $icon = $output->pix_icon('i/menu', $label);
+        $this->set_menu_trigger($icon, $triggerclasses);
+    }
+
+    /**
+     * Return true if there is at least one visible link in the menu.
+     *
+     * @return bool
+     */
+    public function is_empty() {
+        return !count($this->primaryactions) && !count($this->secondaryactions);
+    }
+
+    /**
+     * Initialises JS required fore the action menu.
+     * The JS is only required once as it manages all action menu's on the page.
+     *
+     * @param moodle_page $page
+     */
+    public function initialise_js(moodle_page $page) {
+        static $initialised = false;
+        if (!$initialised) {
+            $page->requires->yui_module('moodle-core-actionmenu', 'M.core.actionmenu.init');
+            $initialised = true;
+        }
+    }
+
+    /**
+     * Adds an action to this action menu.
+     *
+     * @param action_link|pix_icon|subpanel|string $action
+     */
+    public function add($action) {
+
+        if ($action instanceof subpanel) {
+            $this->add_secondary_subpanel($action);
+        } else if ($action instanceof action_link) {
+            if ($action->primary) {
+                $this->add_primary_action($action);
+            } else {
+                $this->add_secondary_action($action);
+            }
+        } else if ($action instanceof pix_icon) {
+            $this->add_primary_action($action);
+        } else {
+            $this->add_secondary_action($action);
+        }
+    }
+
+    /**
+     * Adds a secondary subpanel.
+     * @param subpanel $subpanel
+     */
+    public function add_secondary_subpanel(subpanel $subpanel) {
+        $this->secondaryactions[] = $subpanel;
+    }
+
+    /**
+     * Adds a primary action to the action menu.
+     *
+     * @param action_menu_link|action_link|pix_icon|string $action
+     */
+    public function add_primary_action($action) {
+        if ($action instanceof action_link || $action instanceof pix_icon) {
+            $action->attributes['role'] = 'menuitem';
+            $action->attributes['tabindex'] = '-1';
+            if ($action instanceof action_menu_link) {
+                $action->actionmenu = $this;
+            }
+        }
+        $this->primaryactions[] = $action;
+    }
+
+    /**
+     * Adds a secondary action to the action menu.
+     *
+     * @param action_link|pix_icon|string $action
+     */
+    public function add_secondary_action($action) {
+        if ($action instanceof action_link || $action instanceof pix_icon) {
+            $action->attributes['role'] = 'menuitem';
+            $action->attributes['tabindex'] = '-1';
+            if ($action instanceof action_menu_link) {
+                $action->actionmenu = $this;
+            }
+        }
+        $this->secondaryactions[] = $action;
+    }
+
+    /**
+     * Returns the primary actions ready to be rendered.
+     *
+     * @param core_renderer $output The renderer to use for getting icons.
+     * @return array
+     */
+    public function get_primary_actions(core_renderer $output = null) {
+        global $OUTPUT;
+        if ($output === null) {
+            $output = $OUTPUT;
+        }
+        $pixicon = $this->actionicon;
+        $linkclasses = array('toggle-display');
+
+        $title = '';
+        if (!empty($this->menutrigger)) {
+            $pixicon = '<b class="caret"></b>';
+            $linkclasses[] = 'textmenu';
+        } else {
+            $title = new lang_string('actionsmenu', 'moodle');
+            $this->actionicon = new pix_icon(
+                't/edit_menu',
+                '',
+                'moodle',
+                array('class' => 'iconsmall actionmenu', 'title' => '')
+            );
+            $pixicon = $this->actionicon;
+        }
+        if ($pixicon instanceof renderable) {
+            $pixicon = $output->render($pixicon);
+            if ($pixicon instanceof pix_icon && isset($pixicon->attributes['alt'])) {
+                $title = $pixicon->attributes['alt'];
+            }
+        }
+        $string = '';
+        if ($this->actiontext) {
+            $string = $this->actiontext;
+        }
+        $label = '';
+        if ($this->actionlabel) {
+            $label = $this->actionlabel;
+        } else {
+            $label = $title;
+        }
+        $actions = $this->primaryactions;
+        $attributes = array(
+            'class' => implode(' ', $linkclasses),
+            'title' => $title,
+            'aria-label' => $label,
+            'id' => 'action-menu-toggle-'.$this->instance,
+            'role' => 'menuitem',
+            'tabindex' => '-1',
+        );
+        $link = html_writer::link('#', $string . $this->menutrigger . $pixicon, $attributes);
+        if ($this->prioritise) {
+            array_unshift($actions, $link);
+        } else {
+            $actions[] = $link;
+        }
+        return $actions;
+    }
+
+    /**
+     * Returns the secondary actions ready to be rendered.
+     * @return array
+     */
+    public function get_secondary_actions() {
+        return $this->secondaryactions;
+    }
+
+    /**
+     * Sets the selector that should be used to find the owning node of this menu.
+     * @param string $selector A CSS/YUI selector to identify the owner of the menu.
+     */
+    public function set_owner_selector($selector) {
+        $this->attributes['data-owner'] = $selector;
+    }
+
+    /**
+     * Sets the alignment of the dialogue in relation to button used to toggle it.
+     *
+     * @deprecated since Moodle 4.0
+     *
+     * @param int $dialogue One of action_menu::TL, action_menu::TR, action_menu::BL, action_menu::BR.
+     * @param int $button One of action_menu::TL, action_menu::TR, action_menu::BL, action_menu::BR.
+     */
+    public function set_alignment($dialogue, $button) {
+        debugging('The method action_menu::set_alignment() is deprecated, use action_menu::set_menu_left()', DEBUG_DEVELOPER);
+        if (isset($this->attributessecondary['data-align'])) {
+            // We've already got one set, lets remove the old class so as to avoid troubles.
+            $class = $this->attributessecondary['class'];
+            $search = 'align-'.$this->attributessecondary['data-align'];
+            $this->attributessecondary['class'] = str_replace($search, '', $class);
+        }
+        $align = $this->get_align_string($dialogue) . '-' . $this->get_align_string($button);
+        $this->attributessecondary['data-align'] = $align;
+        $this->attributessecondary['class'] .= ' align-'.$align;
+    }
+
+    /**
+     * Returns a string to describe the alignment.
+     *
+     * @param int $align One of action_menu::TL, action_menu::TR, action_menu::BL, action_menu::BR.
+     * @return string
+     */
+    protected function get_align_string($align) {
+        switch ($align) {
+            case self::TL :
+                return 'tl';
+            case self::TR :
+                return 'tr';
+            case self::BL :
+                return 'bl';
+            case self::BR :
+                return 'br';
+            default :
+                return 'tl';
+        }
+    }
+
+    /**
+     * Aligns the left corner of the dropdown.
+     *
+     */
+    public function set_menu_left() {
+        $this->dropdownalignment = 'dropdown-menu-left';
+    }
+
+    /**
+     * Sets a constraint for the dialogue.
+     *
+     * The constraint is applied when the dialogue is shown and limits the display of the dialogue to within the
+     * element the constraint identifies.
+     *
+     * This is required whenever the action menu is displayed inside any CSS element with the .no-overflow class
+     * (flexible_table and any of it's child classes are a likely candidate).
+     *
+     * @deprecated since Moodle 4.3
+     * @param string $ancestorselector A snippet of CSS used to identify the ancestor to contrain the dialogue to.
+     */
+    public function set_constraint($ancestorselector) {
+        debugging('The method set_constraint() is deprecated. Please use the set_boundary() method instead.', DEBUG_DEVELOPER);
+        $this->set_boundary('window');
+    }
+
+    /**
+     * Set the overflow constraint boundary of the dropdown menu.
+     * @see https://getbootstrap.com/docs/4.6/components/dropdowns/#options The 'boundary' option in the Bootstrap documentation
+     *
+     * @param string $boundary Accepts the values of 'viewport', 'window', or 'scrollParent'.
+     * @throws coding_exception
+     */
+    public function set_boundary(string $boundary) {
+        if (!in_array($boundary, ['viewport', 'window', 'scrollParent'])) {
+            throw new coding_exception("HTMLElement reference boundaries are not supported." .
+                "Accepted boundaries are 'viewport', 'window', or 'scrollParent'.", DEBUG_DEVELOPER);
+        }
+
+        $this->triggerattributes['data-boundary'] = $boundary;
+    }
+
+    /**
+     * If you call this method the action menu will be displayed but will not be enhanced.
+     *
+     * By not displaying the menu enhanced all items will be displayed in a single row.
+     *
+     * @deprecated since Moodle 3.2
+     */
+    public function do_not_enhance() {
+        debugging('The method action_menu::do_not_enhance() is deprecated, use a list of action_icon instead.', DEBUG_DEVELOPER);
+    }
+
+    /**
+     * Returns true if this action menu will be enhanced.
+     *
+     * @return bool
+     */
+    public function will_be_enhanced() {
+        return isset($this->attributes['data-enhance']);
+    }
+
+    /**
+     * Sets nowrap on items. If true menu items should not wrap lines if they are longer than the available space.
+     *
+     * This property can be useful when the action menu is displayed within a parent element that is either floated
+     * or relatively positioned.
+     * In that situation the width of the menu is determined by the width of the parent element which may not be large
+     * enough for the menu items without them wrapping.
+     * This disables the wrapping so that the menu takes on the width of the longest item.
+     *
+     * @param bool $value If true nowrap gets set, if false it gets removed. Defaults to true.
+     */
+    public function set_nowrap_on_items($value = true) {
+        $class = 'nowrap-items';
+        if (!empty($this->attributes['class'])) {
+            $pos = strpos($this->attributes['class'], $class);
+            if ($value === true && $pos === false) {
+                // The value is true and the class has not been set yet. Add it.
+                $this->attributes['class'] .= ' '.$class;
+            } else if ($value === false && $pos !== false) {
+                // The value is false and the class has been set. Remove it.
+                $this->attributes['class'] = substr($this->attributes['class'], $pos, strlen($class));
+            }
+        } else if ($value) {
+            // The value is true and the class has not been set yet. Add it.
+            $this->attributes['class'] = $class;
+        }
+    }
+
+    /**
+     * Add classes to the action menu for an easier styling.
+     *
+     * @param string $class The class to add to attributes.
+     */
+    public function set_additional_classes(string $class = '') {
+        if (!empty($this->attributes['class'])) {
+            $this->attributes['class'] .= " ".$class;
+        } else {
+            $this->attributes['class'] = $class;
+        }
+    }
+
+    /**
+     * Export for template.
+     *
+     * @param renderer_base $output The renderer.
+     * @return stdClass
+     */
+    public function export_for_template(renderer_base $output) {
+        $data = new stdClass();
+        // Assign a role of menubar to this action menu when:
+        // - it contains 2 or more primary actions; or
+        // - if it contains a primary action and secondary actions.
+        if (count($this->primaryactions) > 1 || (!empty($this->primaryactions) && !empty($this->secondaryactions))) {
+            $this->attributes['role'] = 'menubar';
+        }
+        $attributes = $this->attributes;
+
+        $data->instance = $this->instance;
+
+        $data->classes = isset($attributes['class']) ? $attributes['class'] : '';
+        unset($attributes['class']);
+
+        $data->attributes = array_map(function($key, $value) {
+            return [ 'name' => $key, 'value' => $value ];
+        }, array_keys($attributes), $attributes);
+
+        $data->primary = $this->export_primary_actions_for_template($output);
+        $data->secondary = $this->export_secondary_actions_for_template($output);
+        $data->dropdownalignment = $this->dropdownalignment;
+
+        return $data;
+    }
+
+    /**
+     * Export the primary actions for the template.
+     * @param renderer_base $output
+     * @return stdClass
+     */
+    protected function export_primary_actions_for_template(renderer_base $output): stdClass {
+        $attributes = $this->attributes;
+        $attributesprimary = $this->attributesprimary;
+
+        $primary = new stdClass();
+        $primary->title = '';
+        $primary->prioritise = $this->prioritise;
+
+        $primary->classes = isset($attributesprimary['class']) ? $attributesprimary['class'] : '';
+        unset($attributesprimary['class']);
+
+        $primary->attributes = array_map(function ($key, $value) {
+            return ['name' => $key, 'value' => $value];
+        }, array_keys($attributesprimary), $attributesprimary);
+        $primary->triggerattributes = array_map(function ($key, $value) {
+            return ['name' => $key, 'value' => $value];
+        }, array_keys($this->triggerattributes), $this->triggerattributes);
+
+        $actionicon = $this->actionicon;
+        if (!empty($this->menutrigger)) {
+            $primary->menutrigger = $this->menutrigger;
+            $primary->triggerextraclasses = $this->triggerextraclasses;
+            if ($this->actionlabel) {
+                $primary->title = $this->actionlabel;
+            } else if ($this->actiontext) {
+                $primary->title = $this->actiontext;
+            } else {
+                $primary->title = strip_tags($this->menutrigger);
+            }
+        } else {
+            $primary->title = get_string('actionsmenu');
+            $iconattributes = ['class' => 'iconsmall actionmenu', 'title' => $primary->title];
+            $actionicon = new pix_icon('t/edit_menu', '', 'moodle', $iconattributes);
+        }
+
+        // If the menu trigger is within the menubar, assign a role of menuitem. Otherwise, assign as a button.
+        $primary->triggerrole = 'button';
+        if (isset($attributes['role']) && $attributes['role'] === 'menubar') {
+            $primary->triggerrole = 'menuitem';
+        }
+
+        if ($actionicon instanceof pix_icon) {
+            $primary->icon = $actionicon->export_for_pix();
+            if (!empty($actionicon->attributes['alt'])) {
+                $primary->title = $actionicon->attributes['alt'];
+            }
+        } else {
+            $primary->iconraw = $actionicon ? $output->render($actionicon) : '';
+        }
+
+        $primary->actiontext = $this->actiontext ? (string) $this->actiontext : '';
+        $primary->items = array_map(function ($item) use ($output) {
+            $data = (object) [];
+            if ($item instanceof action_menu_link) {
+                $data->actionmenulink = $item->export_for_template($output);
+            } else if ($item instanceof action_menu_filler) {
+                $data->actionmenufiller = $item->export_for_template($output);
+            } else if ($item instanceof action_link) {
+                $data->actionlink = $item->export_for_template($output);
+            } else if ($item instanceof pix_icon) {
+                $data->pixicon = $item->export_for_template($output);
+            } else {
+                $data->rawhtml = ($item instanceof renderable) ? $output->render($item) : $item;
+            }
+            return $data;
+        }, $this->primaryactions);
+        return $primary;
+    }
+
+    /**
+     * Export the secondary actions for the template.
+     * @param renderer_base $output
+     * @return stdClass
+     */
+    protected function export_secondary_actions_for_template(renderer_base $output): stdClass {
+        $attributessecondary = $this->attributessecondary;
+        $secondary = new stdClass();
+        $secondary->classes = isset($attributessecondary['class']) ? $attributessecondary['class'] : '';
+        unset($attributessecondary['class']);
+
+        $secondary->attributes = array_map(function ($key, $value) {
+            return ['name' => $key, 'value' => $value];
+        }, array_keys($attributessecondary), $attributessecondary);
+        $secondary->items = array_map(function ($item) use ($output) {
+            $data = (object) [
+                'simpleitem' => true,
+            ];
+            if ($item instanceof action_menu_link) {
+                $data->actionmenulink = $item->export_for_template($output);
+                $data->simpleitem = false;
+            } else if ($item instanceof action_menu_filler) {
+                $data->actionmenufiller = $item->export_for_template($output);
+                $data->simpleitem = false;
+            } else if ($item instanceof subpanel) {
+                $data->subpanel = $item->export_for_template($output);
+                $data->simpleitem = false;
+            } else if ($item instanceof action_link) {
+                $data->actionlink = $item->export_for_template($output);
+            } else if ($item instanceof pix_icon) {
+                $data->pixicon = $item->export_for_template($output);
+            } else {
+                $data->rawhtml = ($item instanceof renderable) ? $output->render($item) : $item;
+            }
+            return $data;
+        }, $this->secondaryactions);
+        return $secondary;
+    }
+}
diff --git a/lib/classes/output/action_menu/filler.php b/lib/classes/output/action_menu/filler.php
new file mode 100644
index 0000000000000..2a2fe9a0d00ad
--- /dev/null
+++ b/lib/classes/output/action_menu/filler.php
@@ -0,0 +1,39 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * An action menu filler
+ *
+ * @package core
+ * @category output
+ * @copyright 2013 Andrew Nicols
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class action_menu_filler extends action_link implements renderable {
+
+    /**
+     * True if this is a primary action. False if not.
+     * @var bool
+     */
+    public $primary = true;
+
+    /**
+     * Constructs the object.
+     */
+    public function __construct() {
+        $this->attributes['id'] = html_writer::random_id('action_link');
+    }
+}
diff --git a/lib/classes/output/action_menu/link.php b/lib/classes/output/action_menu/link.php
new file mode 100644
index 0000000000000..d91abd646bc00
--- /dev/null
+++ b/lib/classes/output/action_menu/link.php
@@ -0,0 +1,106 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * An action menu action
+ *
+ * @package core
+ * @category output
+ * @copyright 2013 Sam Hemelryk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class action_menu_link extends action_link implements renderable {
+
+    /**
+     * True if this is a primary action. False if not.
+     * @var bool
+     */
+    public $primary = true;
+
+    /**
+     * The action menu this link has been added to.
+     * @var action_menu
+     */
+    public $actionmenu = null;
+
+    /**
+     * The number of instances of this action menu link (and its subclasses).
+     *
+     * @deprecated since Moodle 4.4.
+     * @var int
+     */
+    protected static $instance = 1;
+
+    /**
+     * Constructs the object.
+     *
+     * @param moodle_url $url The URL for the action.
+     * @param pix_icon|null $icon The icon to represent the action.
+     * @param string $text The text to represent the action.
+     * @param bool $primary Whether this is a primary action or not.
+     * @param array $attributes Any attribtues associated with the action.
+     */
+    public function __construct(moodle_url $url, ?pix_icon $icon, $text, $primary = true, array $attributes = array()) {
+        parent::__construct($url, $text, null, $attributes, $icon);
+        $this->primary = (bool)$primary;
+        $this->add_class('menu-action');
+        $this->attributes['role'] = 'menuitem';
+    }
+
+    /**
+     * Export for template.
+     *
+     * @param renderer_base $output The renderer.
+     * @return stdClass
+     */
+    public function export_for_template(renderer_base $output) {
+        $data = parent::export_for_template($output);
+
+        // Ignore what the parent did with the attributes, except for ID and class.
+        $data->attributes = [];
+        $attributes = $this->attributes;
+        unset($attributes['id']);
+        unset($attributes['class']);
+
+        // Handle text being a renderable.
+        if ($this->text instanceof renderable) {
+            $data->text = $this->render($this->text);
+        }
+
+        $data->showtext = (!$this->icon || $this->primary === false);
+
+        $data->icon = null;
+        if ($this->icon) {
+            $icon = $this->icon;
+            if ($this->primary || !$this->actionmenu->will_be_enhanced()) {
+                $attributes['title'] = $data->text;
+            }
+            $data->icon = $icon ? $icon->export_for_pix() : null;
+        }
+
+        $data->disabled = !empty($attributes['disabled']);
+        unset($attributes['disabled']);
+
+        $data->attributes = array_map(function($key, $value) {
+            return [
+                'name' => $key,
+                'value' => $value
+            ];
+        }, array_keys($attributes), $attributes);
+
+        return $data;
+    }
+}
diff --git a/lib/classes/output/action_menu/link_primary.php b/lib/classes/output/action_menu/link_primary.php
new file mode 100644
index 0000000000000..7359fbe4d6173
--- /dev/null
+++ b/lib/classes/output/action_menu/link_primary.php
@@ -0,0 +1,37 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * A primary action menu action
+ *
+ * @package core
+ * @category output
+ * @copyright 2013 Sam Hemelryk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class action_menu_link_primary extends action_menu_link {
+    /**
+     * Constructs the object.
+     *
+     * @param moodle_url $url
+     * @param pix_icon|null $icon
+     * @param string $text
+     * @param array $attributes
+     */
+    public function __construct(moodle_url $url, ?pix_icon $icon, $text, array $attributes = array()) {
+        parent::__construct($url, $icon, $text, true, $attributes);
+    }
+}
diff --git a/lib/classes/output/action_menu/link_secondary.php b/lib/classes/output/action_menu/link_secondary.php
new file mode 100644
index 0000000000000..45780a1f9ea02
--- /dev/null
+++ b/lib/classes/output/action_menu/link_secondary.php
@@ -0,0 +1,37 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * A secondary action menu action
+ *
+ * @package core
+ * @category output
+ * @copyright 2013 Sam Hemelryk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class action_menu_link_secondary extends action_menu_link {
+    /**
+     * Constructs the object.
+     *
+     * @param moodle_url $url
+     * @param pix_icon|null $icon
+     * @param string $text
+     * @param array $attributes
+     */
+    public function __construct(moodle_url $url, ?pix_icon $icon, $text, array $attributes = array()) {
+        parent::__construct($url, $icon, $text, false, $attributes);
+    }
+}
diff --git a/lib/classes/output/actions/component_action.php b/lib/classes/output/actions/component_action.php
new file mode 100644
index 0000000000000..72bb07c048003
--- /dev/null
+++ b/lib/classes/output/actions/component_action.php
@@ -0,0 +1,79 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Helper class used by other components that involve an action on the page (URL or JS).
+ *
+ * @copyright 2009 Nicolas Connault
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class component_action implements templatable {
+
+    /**
+     * @var string $event The DOM event that will trigger this action when caught
+     */
+    public $event;
+
+    /**
+     * @var string A function name to call when the button is clicked
+     * The JS function you create must have two arguments:
+     *      1. The event object
+     *      2. An object/array of arguments ($jsfunctionargs)
+     */
+    public $jsfunction = false;
+
+    /**
+     * @var array An array of arguments to pass to the JS function
+     */
+    public $jsfunctionargs = array();
+
+    /**
+     * Constructor
+     * @param string $event DOM event
+     * @param string $jsfunction An optional JS function. Required if jsfunctionargs is given
+     * @param array $jsfunctionargs An array of arguments to pass to the jsfunction
+     */
+    public function __construct($event, $jsfunction, $jsfunctionargs=array()) {
+        $this->event = $event;
+
+        $this->jsfunction = $jsfunction;
+        $this->jsfunctionargs = $jsfunctionargs;
+
+        if (!empty($this->jsfunctionargs)) {
+            if (empty($this->jsfunction)) {
+                throw new coding_exception('The component_action object needs a jsfunction value to pass the jsfunctionargs to.');
+            }
+        }
+    }
+
+    /**
+     * Export for template.
+     *
+     * @param renderer_base $output The renderer.
+     * @return stdClass
+     */
+    public function export_for_template(renderer_base $output) {
+        $args = !empty($this->jsfunctionargs) ? json_encode($this->jsfunctionargs) : false;
+        return (object) [
+            'event' => $this->event,
+            'jsfunction' => $this->jsfunction,
+            'jsfunctionargs' => $args,
+        ];
+    }
+}
diff --git a/lib/classes/output/actions/confirm_action.php b/lib/classes/output/actions/confirm_action.php
new file mode 100644
index 0000000000000..5ce5b5bfed763
--- /dev/null
+++ b/lib/classes/output/actions/confirm_action.php
@@ -0,0 +1,47 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Confirm action
+ *
+ * @copyright 2009 Nicolas Connault
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class confirm_action extends component_action {
+    /**
+     * Constructs the confirm action object
+     *
+     * @param string $message The message to display to the user when they are shown
+     *    the confirm dialogue.
+     * @param string $callback Deprecated since 2.7
+     * @param string $continuelabel The string to use for he continue button
+     * @param string $cancellabel The string to use for the cancel button
+     */
+    public function __construct($message, $callback = null, $continuelabel = null, $cancellabel = null) {
+        if ($callback !== null) {
+            debugging('The callback argument to new confirm_action() has been deprecated.' .
+                    ' If you need to use a callback, please write Javascript to use moodle-core-notification-confirmation ' .
+                    'and attach to the provided events.',
+                    DEBUG_DEVELOPER);
+        }
+        parent::__construct('click', 'M.util.show_confirm_dialog', array(
+                'message' => $message,
+                'continuelabel' => $continuelabel, 'cancellabel' => $cancellabel));
+    }
+}
diff --git a/lib/classes/output/actions/popup_action.php b/lib/classes/output/actions/popup_action.php
new file mode 100644
index 0000000000000..4c0bdc49c4e08
--- /dev/null
+++ b/lib/classes/output/actions/popup_action.php
@@ -0,0 +1,106 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+/**
+ * Component action for a popup window.
+ *
+ * @copyright 2009 Nicolas Connault
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class popup_action extends component_action {
+    /**
+     * @var string The JS function to call for the popup
+     */
+    public $jsfunction = 'openpopup';
+
+    /**
+     * @var array An array of parameters that will be passed to the openpopup JS function
+     */
+    public $params = array(
+            'height' =>  400,
+            'width' => 500,
+            'top' => 0,
+            'left' => 0,
+            'menubar' => false,
+            'location' => false,
+            'scrollbars' => true,
+            'resizable' => true,
+            'toolbar' => true,
+            'status' => true,
+            'directories' => false,
+            'fullscreen' => false,
+            'dependent' => true);
+
+    /**
+     * Constructor
+     *
+     * @param string $event DOM event
+     * @param moodle_url|string $url A moodle_url object, required if no jsfunction is given
+     * @param string $name The JS function to call for the popup (default 'popup')
+     * @param array  $params An array of popup parameters
+     */
+    public function __construct($event, $url, $name='popup', $params=array()) {
+        global $CFG;
+
+        $url = new moodle_url($url);
+
+        if ($name) {
+            $_name = $name;
+            if (($_name = preg_replace("/\s/", '_', $_name)) != $name) {
+                throw new coding_exception('The $name of a popup window shouldn\'t contain spaces - string modified. '. $name .' changed to '. $_name);
+                $name = $_name;
+            }
+        } else {
+            $name = 'popup';
+        }
+
+        foreach ($this->params as $var => $val) {
+            if (array_key_exists($var, $params)) {
+                $this->params[$var] = $params[$var];
+            }
+        }
+
+        $attributes = array('url' => $url->out(false), 'name' => $name, 'options' => $this->get_js_options($params));
+        if (!empty($params['fullscreen'])) {
+            $attributes['fullscreen'] = 1;
+        }
+        parent::__construct($event, $this->jsfunction, $attributes);
+    }
+
+    /**
+     * Returns a string of concatenated option->value pairs used by JS to call the popup window,
+     * based on this object's variables
+     *
+     * @return string String of option->value pairs for JS popup function.
+     */
+    public function get_js_options() {
+        $jsoptions = '';
+
+        foreach ($this->params as $var => $val) {
+            if (is_string($val) || is_int($val)) {
+                $jsoptions .= "$var=$val,";
+            } elseif (is_bool($val)) {
+                $jsoptions .= ($val) ? "$var," : "$var=0,";
+            }
+        }
+
+        $jsoptions = substr($jsoptions, 0, strlen($jsoptions) - 1);
+
+        return $jsoptions;
+    }
+}
diff --git a/lib/classes/output/context_header.php b/lib/classes/output/context_header.php
new file mode 100644
index 0000000000000..e1c02d8614c6c
--- /dev/null
+++ b/lib/classes/output/context_header.php
@@ -0,0 +1,147 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Renderable for the main page header.
+ *
+ * @package core
+ * @category output
+ * @since 2.9
+ * @copyright 2015 Adrian Greeve <adrian@moodle.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class context_header implements renderable, templatable {
+    /**
+     * @var string $heading Main heading.
+     */
+    public $heading;
+    /**
+     * @var int $headinglevel Main heading 'h' tag level.
+     */
+    public $headinglevel;
+    /**
+     * @var string|null $imagedata HTML code for the picture in the page header.
+     */
+    public $imagedata;
+    /**
+     * @var array $additionalbuttons Additional buttons for the header e.g. Messaging button for the user header.
+     *      array elements - title => alternate text for the image, or if no image is available the button text.
+     *                       url => Link for the button to head to. Should be a moodle_url.
+     *                       image => location to the image, or name of the image in /pix/t/{image name}.
+     *                       linkattributes => additional attributes for the <a href> element.
+     *                       page => page object. Don't include if the image is an external image.
+     */
+    public $additionalbuttons;
+    /**
+     * @var string $prefix A string that is before the title.
+     */
+    public $prefix;
+
+    /**
+     * Constructor.
+     *
+     * @param string $heading Main heading data.
+     * @param int $headinglevel Main heading 'h' tag level.
+     * @param string|null $imagedata HTML code for the picture in the page header.
+     * @param string $additionalbuttons Buttons for the header e.g. Messaging button for the user header.
+     * @param string $prefix Text that precedes the heading.
+     */
+    public function __construct($heading = null, $headinglevel = 1, $imagedata = null, $additionalbuttons = null, $prefix = null) {
+
+        $this->heading = $heading;
+        $this->headinglevel = $headinglevel;
+        $this->imagedata = $imagedata;
+        $this->additionalbuttons = $additionalbuttons;
+        // If we have buttons then format them.
+        if (isset($this->additionalbuttons)) {
+            $this->format_button_images();
+        }
+        $this->prefix = $prefix;
+    }
+
+    /**
+     * Adds an array element for a formatted image.
+     */
+    protected function format_button_images() {
+
+        foreach ($this->additionalbuttons as $buttontype => $button) {
+            $page = $button['page'];
+            // If no image is provided then just use the title.
+            if (!isset($button['image'])) {
+                $this->additionalbuttons[$buttontype]['formattedimage'] = $button['title'];
+            } else {
+                // Check to see if this is an internal Moodle icon.
+                $internalimage = $page->theme->resolve_image_location('t/' . $button['image'], 'moodle');
+                if ($internalimage) {
+                    $this->additionalbuttons[$buttontype]['formattedimage'] = 't/' . $button['image'];
+                } else {
+                    // Treat as an external image.
+                    $this->additionalbuttons[$buttontype]['formattedimage'] = $button['image'];
+                }
+            }
+
+            if (isset($button['linkattributes']['class'])) {
+                $class = $button['linkattributes']['class'] . ' btn';
+            } else {
+                $class = 'btn';
+            }
+            // Add the bootstrap 'btn' class for formatting.
+            $this->additionalbuttons[$buttontype]['linkattributes'] = array_merge($button['linkattributes'],
+                array('class' => $class));
+        }
+    }
+
+    /**
+     * Export for template.
+     *
+     * @param renderer_base $output Renderer.
+     * @return array
+     */
+    public function export_for_template(renderer_base $output): array {
+        // Heading.
+        $headingtext = isset($this->heading) ? $this->heading : $output->get_page()->heading;
+        $heading = $output->heading($headingtext, $this->headinglevel, "h2 mb-0");
+
+        // Buttons.
+        if (isset($this->additionalbuttons)) {
+            $additionalbuttons = [];
+            foreach ($this->additionalbuttons as $button) {
+                if (!isset($button->page)) {
+                    // Include js for messaging.
+                    if ($button['buttontype'] === 'togglecontact') {
+                        \core_message\helper::togglecontact_requirejs();
+                    }
+                    if ($button['buttontype'] === 'message') {
+                        \core_message\helper::messageuser_requirejs();
+                    }
+                }
+                foreach ($button['linkattributes'] as $key => $value) {
+                    $button['attributes'][] = ['name' => $key, 'value' => $value];
+                }
+                $additionalbuttons[] = $button;
+            }
+        }
+
+        return [
+            'heading' => $heading,
+            'headinglevel' => $this->headinglevel,
+            'imagedata' => $this->imagedata,
+            'prefix' => $this->prefix,
+            'hasadditionalbuttons' => !empty($additionalbuttons),
+            'additionalbuttons' => $additionalbuttons ?? [],
+        ];
+    }
+}
diff --git a/lib/classes/output/core_renderer.php b/lib/classes/output/core_renderer.php
new file mode 100644
index 0000000000000..df1de09d58403
--- /dev/null
+++ b/lib/classes/output/core_renderer.php
@@ -0,0 +1,4765 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+use core\di;
+use core\hook\manager as hook_manager;
+use core\hook\output\after_standard_main_region_html_generation;
+use core\hook\output\before_footer_html_generation;
+use core\hook\output\before_html_attributes;
+use core\hook\output\before_http_headers;
+use core\hook\output\before_standard_footer_html_generation;
+use core\hook\output\before_standard_top_of_body_html_generation;
+use core_completion\cm_completion_details;
+use core_course\output\activity_information;
+
+/**
+ * The standard implementation of the core_renderer interface.
+ *
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class core_renderer extends renderer_base {
+    /**
+     * Do NOT use, please use <?php echo $OUTPUT->main_content() ?>
+     * in layout files instead.
+     * @deprecated
+     * @var string used in {@link core_renderer::header()}.
+     */
+    const MAIN_CONTENT_TOKEN = '[MAIN CONTENT GOES HERE]';
+
+    /**
+     * @var string Used to pass information from {@link core_renderer::doctype()} to
+     * {@link core_renderer::standard_head_html()}.
+     */
+    protected $contenttype;
+
+    /**
+     * @var string Used by {@link core_renderer::redirect_message()} method to communicate
+     * with {@link core_renderer::header()}.
+     */
+    protected $metarefreshtag = '';
+
+    /**
+     * @var string Unique token for the closing HTML
+     */
+    protected $unique_end_html_token;
+
+    /**
+     * @var string Unique token for performance information
+     */
+    protected $unique_performance_info_token;
+
+    /**
+     * @var string Unique token for the main content.
+     */
+    protected $unique_main_content_token;
+
+    /** @var custom_menu_item language The language menu if created */
+    protected $language = null;
+
+    /** @var string The current selector for an element being streamed into */
+    protected $currentselector = '';
+
+    /** @var string The current element tag which is being streamed into */
+    protected $currentelement = '';
+
+    /**
+     * Constructor
+     *
+     * @param moodle_page $page the page we are doing output for.
+     * @param string $target one of rendering target constants
+     */
+    public function __construct(moodle_page $page, $target) {
+        $this->opencontainers = $page->opencontainers;
+        $this->page = $page;
+        $this->target = $target;
+
+        $this->unique_end_html_token = '%%ENDHTML-'.sesskey().'%%';
+        $this->unique_performance_info_token = '%%PERFORMANCEINFO-'.sesskey().'%%';
+        $this->unique_main_content_token = '[MAIN CONTENT GOES HERE - '.sesskey().']';
+    }
+
+    /**
+     * Get the DOCTYPE declaration that should be used with this page. Designed to
+     * be called in theme layout.php files.
+     *
+     * @return string the DOCTYPE declaration that should be used.
+     */
+    public function doctype() {
+        if ($this->page->theme->doctype === 'html5') {
+            $this->contenttype = 'text/html; charset=utf-8';
+            return "<!DOCTYPE html>\n";
+
+        } else if ($this->page->theme->doctype === 'xhtml5') {
+            $this->contenttype = 'application/xhtml+xml; charset=utf-8';
+            return "<!DOCTYPE html>\n";
+
+        } else {
+            // legacy xhtml 1.0
+            $this->contenttype = 'text/html; charset=utf-8';
+            return ('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' . "\n");
+        }
+    }
+
+    /**
+     * The attributes that should be added to the <html> tag. Designed to
+     * be called in theme layout.php files.
+     *
+     * @return string HTML fragment.
+     */
+    public function htmlattributes() {
+        $return = get_html_lang(true);
+
+        $hook = new before_html_attributes($this);
+
+        if ($this->page->theme->doctype !== 'html5') {
+            $hook->add_attribute('xmlns', 'http://www.w3.org/1999/xhtml');
+        }
+
+        $hook->process_legacy_callbacks();
+        di::get(hook_manager::class)->dispatch($hook);
+
+        foreach ($hook->get_attributes() as $key => $val) {
+            $val = s($val);
+            $return .= " $key=\"$val\"";
+        }
+
+        return $return;
+    }
+
+    /**
+     * The standard tags (meta tags, links to stylesheets and JavaScript, etc.)
+     * that should be included in the <head> tag. Designed to be called in theme
+     * layout.php files.
+     *
+     * @return string HTML fragment.
+     */
+    public function standard_head_html() {
+        global $CFG, $SESSION, $SITE;
+
+        // Before we output any content, we need to ensure that certain
+        // page components are set up.
+
+        // Blocks must be set up early as they may require javascript which
+        // has to be included in the page header before output is created.
+        foreach ($this->page->blocks->get_regions() as $region) {
+            $this->page->blocks->ensure_content_created($region, $this);
+        }
+
+        // Give plugins an opportunity to add any head elements. The callback
+        // must always return a string containing valid html head content.
+
+        $hook = new \core\hook\output\before_standard_head_html_generation($this);
+        $hook->process_legacy_callbacks();
+        di::get(hook_manager::class)->dispatch($hook);
+
+        // Allow a url_rewrite plugin to setup any dynamic head content.
+        if (isset($CFG->urlrewriteclass) && !isset($CFG->upgraderunning)) {
+            $class = $CFG->urlrewriteclass;
+            $hook->add_html($class::html_head_setup());
+        }
+
+        $hook->add_html('<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />' . "\n");
+        $hook->add_html('<meta name="keywords" content="moodle, ' . $this->page->title . '" />' . "\n");
+        // This is only set by the {@link redirect()} method
+        $hook->add_html($this->metarefreshtag);
+
+        // Check if a periodic refresh delay has been set and make sure we arn't
+        // already meta refreshing
+        if ($this->metarefreshtag=='' && $this->page->periodicrefreshdelay!==null) {
+            $hook->add_html(
+                html_writer::empty_tag('meta', [
+                    'http-equiv' => 'refresh',
+                    'content' => $this->page->periodicrefreshdelay . ';url='.$this->page->url->out(),
+                ]),
+            );
+        }
+
+        $output = $hook->get_output();
+
+        // Set up help link popups for all links with the helptooltip class
+        $this->page->requires->js_init_call('M.util.help_popups.setup');
+
+        $focus = $this->page->focuscontrol;
+        if (!empty($focus)) {
+            if (preg_match("#forms\['([a-zA-Z0-9]+)'\].elements\['([a-zA-Z0-9]+)'\]#", $focus, $matches)) {
+                // This is a horrifically bad way to handle focus but it is passed in
+                // through messy formslib::moodleform
+                $this->page->requires->js_function_call('old_onload_focus', array($matches[1], $matches[2]));
+            } else if (strpos($focus, '.')!==false) {
+                // Old style of focus, bad way to do it
+                debugging('This code is using the old style focus event, Please update this code to focus on an element id or the moodleform focus method.', DEBUG_DEVELOPER);
+                $this->page->requires->js_function_call('old_onload_focus', explode('.', $focus, 2));
+            } else {
+                // Focus element with given id
+                $this->page->requires->js_function_call('focuscontrol', array($focus));
+            }
+        }
+
+        // Get the theme stylesheet - this has to be always first CSS, this loads also styles.css from all plugins;
+        // any other custom CSS can not be overridden via themes and is highly discouraged
+        $urls = $this->page->theme->css_urls($this->page);
+        foreach ($urls as $url) {
+            $this->page->requires->css_theme($url);
+        }
+
+        // Get the theme javascript head and footer
+        if ($jsurl = $this->page->theme->javascript_url(true)) {
+            $this->page->requires->js($jsurl, true);
+        }
+        if ($jsurl = $this->page->theme->javascript_url(false)) {
+            $this->page->requires->js($jsurl);
+        }
+
+        // Get any HTML from the page_requirements_manager.
+        $output .= $this->page->requires->get_head_code($this->page, $this);
+
+        // List alternate versions.
+        foreach ($this->page->alternateversions as $type => $alt) {
+            $output .= html_writer::empty_tag('link', array('rel' => 'alternate',
+                    'type' => $type, 'title' => $alt->title, 'href' => $alt->url));
+        }
+
+        // Add noindex tag if relevant page and setting applied.
+        $allowindexing = isset($CFG->allowindexing) ? $CFG->allowindexing : 0;
+        $loginpages = array('login-index', 'login-signup');
+        if ($allowindexing == 2 || ($allowindexing == 0 && in_array($this->page->pagetype, $loginpages))) {
+            if (!isset($CFG->additionalhtmlhead)) {
+                $CFG->additionalhtmlhead = '';
+            }
+            $CFG->additionalhtmlhead .= '<meta name="robots" content="noindex" />';
+        }
+
+        if (!empty($CFG->additionalhtmlhead)) {
+            $output .= "\n".$CFG->additionalhtmlhead;
+        }
+
+        if ($this->page->pagelayout == 'frontpage') {
+            $summary = s(strip_tags(format_text($SITE->summary, FORMAT_HTML)));
+            if (!empty($summary)) {
+                $output .= "<meta name=\"description\" content=\"$summary\" />\n";
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * The standard tags (typically skip links) that should be output just inside
+     * the start of the <body> tag. Designed to be called in theme layout.php files.
+     *
+     * @return string HTML fragment.
+     */
+    public function standard_top_of_body_html() {
+        global $CFG;
+        $output = $this->page->requires->get_top_of_body_code($this);
+        if ($this->page->pagelayout !== 'embedded' && !empty($CFG->additionalhtmltopofbody)) {
+            $output .= "\n".$CFG->additionalhtmltopofbody;
+        }
+
+        // Allow components to add content to the top of the body.
+        $hook = new before_standard_top_of_body_html_generation($this, $output);
+        $hook->process_legacy_callbacks();
+        di::get(hook_manager::class)->dispatch($hook);
+        $output = $hook->get_output();
+
+        $output .= $this->maintenance_warning();
+
+        return $output;
+    }
+
+    /**
+     * Scheduled maintenance warning message.
+     *
+     * Note: This is a nasty hack to display maintenance notice, this should be moved
+     *       to some general notification area once we have it.
+     *
+     * @return string
+     */
+    public function maintenance_warning() {
+        global $CFG;
+
+        $output = '';
+        if (isset($CFG->maintenance_later) and $CFG->maintenance_later > time()) {
+            $timeleft = $CFG->maintenance_later - time();
+            // If timeleft less than 30 sec, set the class on block to error to highlight.
+            $errorclass = ($timeleft < 30) ? 'alert-error alert-danger' : 'alert-warning';
+            $output .= $this->box_start($errorclass . ' moodle-has-zindex maintenancewarning m-3 alert');
+            $a = new stdClass();
+            $a->hour = (int)($timeleft / 3600);
+            $a->min = (int)(floor($timeleft / 60) % 60);
+            $a->sec = (int)($timeleft % 60);
+            if ($a->hour > 0) {
+                $output .= get_string('maintenancemodeisscheduledlong', 'admin', $a);
+            } else {
+                $output .= get_string('maintenancemodeisscheduled', 'admin', $a);
+            }
+
+            $output .= $this->box_end();
+            $this->page->requires->yui_module('moodle-core-maintenancemodetimer', 'M.core.maintenancemodetimer',
+                    array(array('timeleftinsec' => $timeleft)));
+            $this->page->requires->strings_for_js(
+                    array('maintenancemodeisscheduled', 'maintenancemodeisscheduledlong', 'sitemaintenance'),
+                    'admin');
+        }
+        return $output;
+    }
+
+    /**
+     * content that should be output in the footer area
+     * of the page. Designed to be called in theme layout.php files.
+     *
+     * @return string HTML fragment.
+     */
+    public function standard_footer_html() {
+        if (during_initial_install()) {
+            // Debugging info can not work before install is finished,
+            // in any case we do not want any links during installation!
+            return '';
+        }
+
+        $hook = new before_standard_footer_html_generation($this);
+        $hook->process_legacy_callbacks();
+        di::get(hook_manager::class)->dispatch($hook);
+        $output = $hook->get_output();
+
+        if ($this->page->devicetypeinuse == 'legacy') {
+            // The legacy theme is in use print the notification
+            $output .= html_writer::tag('div', get_string('legacythemeinuse'), array('class'=>'legacythemeinuse'));
+        }
+
+        // Get links to switch device types (only shown for users not on a default device)
+        $output .= $this->theme_switch_links();
+
+        return $output;
+    }
+
+    /**
+     * Performance information and validation links for debugging.
+     *
+     * @return string HTML fragment.
+     */
+    public function debug_footer_html() {
+        global $CFG, $SCRIPT;
+        $output = '';
+
+        if (during_initial_install()) {
+            // Debugging info can not work before install is finished.
+            return $output;
+        }
+
+        // This function is normally called from a layout.php file
+        // but some of the content won't be known until later, so we return a placeholder
+        // for now. This will be replaced with the real content in the footer.
+        $output .= $this->unique_performance_info_token;
+
+        if (!empty($CFG->debugpageinfo)) {
+            $output .= '<div class="performanceinfo pageinfo">' . get_string('pageinfodebugsummary', 'core_admin',
+                $this->page->debug_summary()) . '</div>';
+        }
+        if (debugging(null, DEBUG_DEVELOPER) and has_capability('moodle/site:config', context_system::instance())) {  // Only in developer mode
+
+            // Add link to profiling report if necessary
+            if (function_exists('profiling_is_running') && profiling_is_running()) {
+                $txt = get_string('profiledscript', 'admin');
+                $title = get_string('profiledscriptview', 'admin');
+                $url = $CFG->wwwroot . '/admin/tool/profiling/index.php?script=' . urlencode($SCRIPT);
+                $link= '<a title="' . $title . '" href="' . $url . '">' . $txt . '</a>';
+                $output .= '<div class="profilingfooter">' . $link . '</div>';
+            }
+            $purgeurl = new moodle_url('/admin/purgecaches.php', array('confirm' => 1,
+                'sesskey' => sesskey(), 'returnurl' => $this->page->url->out_as_local_url(false)));
+            $output .= '<div class="purgecaches">' .
+                    html_writer::link($purgeurl, get_string('purgecaches', 'admin')) . '</div>';
+
+            // Reactive module debug panel.
+            $output .= $this->render_from_template('core/local/reactive/debugpanel', []);
+        }
+        if (!empty($CFG->debugvalidators)) {
+            $siteurl = qualified_me();
+            $nuurl = new moodle_url('https://validator.w3.org/nu/', ['doc' => $siteurl, 'showsource' => 'yes']);
+            $waveurl = new moodle_url('https://wave.webaim.org/report#/' . urlencode($siteurl));
+            $validatorlinks = [
+                html_writer::link($nuurl, get_string('validatehtml')),
+                html_writer::link($waveurl, get_string('wcagcheck'))
+            ];
+            $validatorlinkslist = html_writer::alist($validatorlinks, ['class' => 'list-unstyled ml-1']);
+            $output .= html_writer::div($validatorlinkslist, 'validators');
+        }
+        return $output;
+    }
+
+    /**
+     * Returns standard main content placeholder.
+     * Designed to be called in theme layout.php files.
+     *
+     * @return string HTML fragment.
+     */
+    public function main_content() {
+        // This is here because it is the only place we can inject the "main" role over the entire main content area
+        // without requiring all theme's to manually do it, and without creating yet another thing people need to
+        // remember in the theme.
+        // This is an unfortunate hack. DO NO EVER add anything more here.
+        // DO NOT add classes.
+        // DO NOT add an id.
+        return '<div role="main">'.$this->unique_main_content_token.'</div>';
+    }
+
+    /**
+     * Returns information about an activity.
+     *
+     * @deprecated since Moodle 4.3 MDL-78744
+     * @todo MDL-78926 This method will be deleted in Moodle 4.7
+     * @param cm_info $cminfo The course module information.
+     * @param cm_completion_details $completiondetails The completion details for this activity module.
+     * @param array $activitydates The dates for this activity module.
+     * @return string the activity information HTML.
+     * @throws coding_exception
+     */
+    public function activity_information(cm_info $cminfo, cm_completion_details $completiondetails, array $activitydates): string {
+        debugging('activity_information method is deprecated.', DEBUG_DEVELOPER);
+        if (!$completiondetails->has_completion() && empty($activitydates)) {
+            // No need to render the activity information when there's no completion info and activity dates to show.
+            return '';
+        }
+        $activityinfo = new activity_information($cminfo, $completiondetails, $activitydates);
+        $renderer = $this->page->get_renderer('core', 'course');
+        return $renderer->render($activityinfo);
+    }
+
+    /**
+     * Returns standard navigation between activities in a course.
+     *
+     * @return string the navigation HTML.
+     */
+    public function activity_navigation() {
+        // First we should check if we want to add navigation.
+        $context = $this->page->context;
+        if (($this->page->pagelayout !== 'incourse' && $this->page->pagelayout !== 'frametop')
+            || $context->contextlevel != CONTEXT_MODULE) {
+            return '';
+        }
+
+        // If the activity is in stealth mode, show no links.
+        if ($this->page->cm->is_stealth()) {
+            return '';
+        }
+
+        $course = $this->page->cm->get_course();
+        $courseformat = course_get_format($course);
+
+        // If the theme implements course index and the current course format uses course index and the current
+        // page layout is not 'frametop' (this layout does not support course index), show no links.
+        if ($this->page->theme->usescourseindex && $courseformat->uses_course_index() &&
+                $this->page->pagelayout !== 'frametop') {
+            return '';
+        }
+
+        // Get a list of all the activities in the course.
+        $modules = get_fast_modinfo($course->id)->get_cms();
+
+        // Put the modules into an array in order by the position they are shown in the course.
+        $mods = [];
+        $activitylist = [];
+        foreach ($modules as $module) {
+            // Only add activities the user can access, aren't in stealth mode and have a url (eg. mod_label does not).
+            if (!$module->uservisible || $module->is_stealth() || empty($module->url)) {
+                continue;
+            }
+            $mods[$module->id] = $module;
+
+            // No need to add the current module to the list for the activity dropdown menu.
+            if ($module->id == $this->page->cm->id) {
+                continue;
+            }
+            // Module name.
+            $modname = $module->get_formatted_name();
+            // Display the hidden text if necessary.
+            if (!$module->visible) {
+                $modname .= ' ' . get_string('hiddenwithbrackets');
+            }
+            // Module URL.
+            $linkurl = new moodle_url($module->url, array('forceview' => 1));
+            // Add module URL (as key) and name (as value) to the activity list array.
+            $activitylist[$linkurl->out(false)] = $modname;
+        }
+
+        $nummods = count($mods);
+
+        // If there is only one mod then do nothing.
+        if ($nummods == 1) {
+            return '';
+        }
+
+        // Get an array of just the course module ids used to get the cmid value based on their position in the course.
+        $modids = array_keys($mods);
+
+        // Get the position in the array of the course module we are viewing.
+        $position = array_search($this->page->cm->id, $modids);
+
+        $prevmod = null;
+        $nextmod = null;
+
+        // Check if we have a previous mod to show.
+        if ($position > 0) {
+            $prevmod = $mods[$modids[$position - 1]];
+        }
+
+        // Check if we have a next mod to show.
+        if ($position < ($nummods - 1)) {
+            $nextmod = $mods[$modids[$position + 1]];
+        }
+
+        $activitynav = new \core_course\output\activity_navigation($prevmod, $nextmod, $activitylist);
+        $renderer = $this->page->get_renderer('core', 'course');
+        return $renderer->render($activitynav);
+    }
+
+    /**
+     * The standard tags (typically script tags that are not needed earlier) that
+     * should be output after everything else. Designed to be called in theme layout.php files.
+     *
+     * @return string HTML fragment.
+     */
+    public function standard_end_of_body_html() {
+        global $CFG;
+
+        // This function is normally called from a layout.php file in {@link core_renderer::header()}
+        // but some of the content won't be known until later, so we return a placeholder
+        // for now. This will be replaced with the real content in {@link core_renderer::footer()}.
+        $output = '';
+        if ($this->page->pagelayout !== 'embedded' && !empty($CFG->additionalhtmlfooter)) {
+            $output .= "\n".$CFG->additionalhtmlfooter;
+        }
+        $output .= $this->unique_end_html_token;
+        return $output;
+    }
+
+    /**
+     * The standard HTML that should be output just before the <footer> tag.
+     * Designed to be called in theme layout.php files.
+     *
+     * @return string HTML fragment.
+     */
+    public function standard_after_main_region_html() {
+        global $CFG;
+
+        $hook = new after_standard_main_region_html_generation($this);
+
+        if ($this->page->pagelayout !== 'embedded' && !empty($CFG->additionalhtmlbottomofbody)) {
+            $hook->add_html("\n");
+            $hook->add_html($CFG->additionalhtmlbottomofbody);
+        }
+
+        $hook->process_legacy_callbacks();
+        di::get(hook_manager::class)->dispatch($hook);
+
+        return $hook->get_output();
+    }
+
+    /**
+     * Return the standard string that says whether you are logged in (and switched
+     * roles/logged in as another user).
+     * @param bool $withlinks if false, then don't include any links in the HTML produced.
+     * If not set, the default is the nologinlinks option from the theme config.php file,
+     * and if that is not set, then links are included.
+     * @return string HTML fragment.
+     */
+    public function login_info($withlinks = null) {
+        global $USER, $CFG, $DB, $SESSION;
+
+        if (during_initial_install()) {
+            return '';
+        }
+
+        if (is_null($withlinks)) {
+            $withlinks = empty($this->page->layout_options['nologinlinks']);
+        }
+
+        $course = $this->page->course;
+        if (\core\session\manager::is_loggedinas()) {
+            $realuser = \core\session\manager::get_realuser();
+            $fullname = fullname($realuser);
+            if ($withlinks) {
+                $loginastitle = get_string('loginas');
+                $realuserinfo = " [<a href=\"$CFG->wwwroot/course/loginas.php?id=$course->id&amp;sesskey=".sesskey()."\"";
+                $realuserinfo .= "title =\"".$loginastitle."\">$fullname</a>] ";
+            } else {
+                $realuserinfo = " [$fullname] ";
+            }
+        } else {
+            $realuserinfo = '';
+        }
+
+        $loginpage = $this->is_login_page();
+        $loginurl = get_login_url();
+
+        if (empty($course->id)) {
+            // $course->id is not defined during installation
+            return '';
+        } else if (isloggedin()) {
+            $context = context_course::instance($course->id);
+
+            $fullname = fullname($USER);
+            // Since Moodle 2.0 this link always goes to the public profile page (not the course profile page)
+            if ($withlinks) {
+                $linktitle = get_string('viewprofile');
+                $username = "<a href=\"$CFG->wwwroot/user/profile.php?id=$USER->id\" title=\"$linktitle\">$fullname</a>";
+            } else {
+                $username = $fullname;
+            }
+            if (is_mnet_remote_user($USER) and $idprovider = $DB->get_record('mnet_host', array('id'=>$USER->mnethostid))) {
+                if ($withlinks) {
+                    $username .= " from <a href=\"{$idprovider->wwwroot}\">{$idprovider->name}</a>";
+                } else {
+                    $username .= " from {$idprovider->name}";
+                }
+            }
+            if (isguestuser()) {
+                $loggedinas = $realuserinfo.get_string('loggedinasguest');
+                if (!$loginpage && $withlinks) {
+                    $loggedinas .= " (<a href=\"$loginurl\">".get_string('login').'</a>)';
+                }
+            } else if (is_role_switched($course->id)) { // Has switched roles
+                $rolename = '';
+                if ($role = $DB->get_record('role', array('id'=>$USER->access['rsw'][$context->path]))) {
+                    $rolename = ': '.role_get_name($role, $context);
+                }
+                $loggedinas = get_string('loggedinas', 'moodle', $username).$rolename;
+                if ($withlinks) {
+                    $url = new moodle_url('/course/switchrole.php', array('id'=>$course->id,'sesskey'=>sesskey(), 'switchrole'=>0, 'returnurl'=>$this->page->url->out_as_local_url(false)));
+                    $loggedinas .= ' ('.html_writer::tag('a', get_string('switchrolereturn'), array('href' => $url)).')';
+                }
+            } else {
+                $loggedinas = $realuserinfo.get_string('loggedinas', 'moodle', $username);
+                if ($withlinks) {
+                    $loggedinas .= " (<a href=\"$CFG->wwwroot/login/logout.php?sesskey=".sesskey()."\">".get_string('logout').'</a>)';
+                }
+            }
+        } else {
+            $loggedinas = get_string('loggedinnot', 'moodle');
+            if (!$loginpage && $withlinks) {
+                $loggedinas .= " (<a href=\"$loginurl\">".get_string('login').'</a>)';
+            }
+        }
+
+        $loggedinas = '<div class="logininfo">'.$loggedinas.'</div>';
+
+        if (isset($SESSION->justloggedin)) {
+            unset($SESSION->justloggedin);
+            if (!isguestuser()) {
+                // Include this file only when required.
+                require_once($CFG->dirroot . '/user/lib.php');
+                if (($count = user_count_login_failures($USER)) && !empty($CFG->displayloginfailures)) {
+                    $loggedinas .= '<div class="loginfailures">';
+                    $a = new stdClass();
+                    $a->attempts = $count;
+                    $loggedinas .= get_string('failedloginattempts', '', $a);
+                    if (file_exists("$CFG->dirroot/report/log/index.php") and has_capability('report/log:view', context_system::instance())) {
+                        $loggedinas .= ' ('.html_writer::link(new moodle_url('/report/log/index.php', array('chooselog' => 1,
+                                'id' => 0 , 'modid' => 'site_errors')), get_string('logs')).')';
+                    }
+                    $loggedinas .= '</div>';
+                }
+            }
+        }
+
+        return $loggedinas;
+    }
+
+    /**
+     * Check whether the current page is a login page.
+     *
+     * @since Moodle 2.9
+     * @return bool
+     */
+    protected function is_login_page() {
+        // This is a real bit of a hack, but its a rarety that we need to do something like this.
+        // In fact the login pages should be only these two pages and as exposing this as an option for all pages
+        // could lead to abuse (or at least unneedingly complex code) the hack is the way to go.
+        return in_array(
+            $this->page->url->out_as_local_url(false, array()),
+            array(
+                '/login/index.php',
+                '/login/forgot_password.php',
+            )
+        );
+    }
+
+    /**
+     * Return the 'back' link that normally appears in the footer.
+     *
+     * @return string HTML fragment.
+     */
+    public function home_link() {
+        global $CFG, $SITE;
+
+        if ($this->page->pagetype == 'site-index') {
+            // Special case for site home page - please do not remove
+            return '<div class="sitelink">' .
+                   '<a title="Moodle" class="d-inline-block aalink" href="http://moodle.org/">' .
+                   '<img src="' . $this->image_url('moodlelogo_grayhat') . '" alt="'.get_string('moodlelogo').'" /></a></div>';
+
+        } else if (!empty($CFG->target_release) && $CFG->target_release != $CFG->release) {
+            // Special case for during install/upgrade.
+            return '<div class="sitelink">'.
+                   '<a title="Moodle" href="http://docs.moodle.org/en/Administrator_documentation" onclick="this.target=\'_blank\'">' .
+                   '<img src="' . $this->image_url('moodlelogo_grayhat') . '" alt="'.get_string('moodlelogo').'" /></a></div>';
+
+        } else if ($this->page->course->id == $SITE->id || strpos($this->page->pagetype, 'course-view') === 0) {
+            return '<div class="homelink"><a href="' . $CFG->wwwroot . '/">' .
+                    get_string('home') . '</a></div>';
+
+        } else {
+            return '<div class="homelink"><a href="' . $CFG->wwwroot . '/course/view.php?id=' . $this->page->course->id . '">' .
+                    format_string($this->page->course->shortname, true, array('context' => $this->page->context)) . '</a></div>';
+        }
+    }
+
+    /**
+     * Redirects the user by any means possible given the current state
+     *
+     * This function should not be called directly, it should always be called using
+     * the redirect function in lib/weblib.php
+     *
+     * The redirect function should really only be called before page output has started
+     * however it will allow itself to be called during the state STATE_IN_BODY
+     *
+     * @param string $encodedurl The URL to send to encoded if required
+     * @param string $message The message to display to the user if any
+     * @param int $delay The delay before redirecting a user, if $message has been
+     *         set this is a requirement and defaults to 3, set to 0 no delay
+     * @param boolean $debugdisableredirect this redirect has been disabled for
+     *         debugging purposes. Display a message that explains, and don't
+     *         trigger the redirect.
+     * @param string $messagetype The type of notification to show the message in.
+     *         See constants on \core\output\notification.
+     * @return string The HTML to display to the user before dying, may contain
+     *         meta refresh, javascript refresh, and may have set header redirects
+     */
+    public function redirect_message($encodedurl, $message, $delay, $debugdisableredirect,
+                                     $messagetype = \core\output\notification::NOTIFY_INFO) {
+        global $CFG;
+        $url = str_replace('&amp;', '&', $encodedurl);
+
+        switch ($this->page->state) {
+            case moodle_page::STATE_BEFORE_HEADER :
+                // No output yet it is safe to delivery the full arsenal of redirect methods
+                if (!$debugdisableredirect) {
+                    // Don't use exactly the same time here, it can cause problems when both redirects fire at the same time.
+                    $this->metarefreshtag = '<meta http-equiv="refresh" content="'. $delay .'; url='. $encodedurl .'" />'."\n";
+                    $this->page->requires->js_function_call('document.location.replace', array($url), false, ($delay + 3));
+                }
+                $output = $this->header();
+                break;
+            case moodle_page::STATE_PRINTING_HEADER :
+                // We should hopefully never get here
+                throw new coding_exception('You cannot redirect while printing the page header');
+                break;
+            case moodle_page::STATE_IN_BODY :
+                // We really shouldn't be here but we can deal with this
+                debugging("You should really redirect before you start page output");
+                if (!$debugdisableredirect) {
+                    $this->page->requires->js_function_call('document.location.replace', array($url), false, $delay);
+                }
+                $output = $this->opencontainers->pop_all_but_last();
+                break;
+            case moodle_page::STATE_DONE :
+                // Too late to be calling redirect now
+                throw new coding_exception('You cannot redirect after the entire page has been generated');
+                break;
+        }
+        $output .= $this->notification($message, $messagetype);
+        $output .= '<div class="continuebutton">(<a href="'. $encodedurl .'">'. get_string('continue') .'</a>)</div>';
+        if ($debugdisableredirect) {
+            $output .= '<p><strong>'.get_string('erroroutput', 'error').'</strong></p>';
+        }
+        $output .= $this->footer();
+        return $output;
+    }
+
+    /**
+     * Start output by sending the HTTP headers, and printing the HTML <head>
+     * and the start of the <body>.
+     *
+     * To control what is printed, you should set properties on $PAGE.
+     *
+     * @return string HTML that you must output this, preferably immediately.
+     */
+    public function header() {
+        global $USER, $CFG, $SESSION;
+
+        $hook = new before_http_headers($this);
+        $hook->process_legacy_callbacks();
+        di::get(hook_manager::class)->dispatch($hook);
+
+        if (\core\session\manager::is_loggedinas()) {
+            $this->page->add_body_class('userloggedinas');
+        }
+
+        if (isset($SESSION->justloggedin) && !empty($CFG->displayloginfailures)) {
+            require_once($CFG->dirroot . '/user/lib.php');
+            // Set second parameter to false as we do not want reset the counter, the same message appears on footer.
+            if ($count = user_count_login_failures($USER, false)) {
+                $this->page->add_body_class('loginfailures');
+            }
+        }
+
+        // If the user is logged in, and we're not in initial install,
+        // check to see if the user is role-switched and add the appropriate
+        // CSS class to the body element.
+        if (!during_initial_install() && isloggedin() && is_role_switched($this->page->course->id)) {
+            $this->page->add_body_class('userswitchedrole');
+        }
+
+        // Give themes a chance to init/alter the page object.
+        $this->page->theme->init_page($this->page);
+
+        $this->page->set_state(moodle_page::STATE_PRINTING_HEADER);
+
+        // Find the appropriate page layout file, based on $this->page->pagelayout.
+        $layoutfile = $this->page->theme->layout_file($this->page->pagelayout);
+        // Render the layout using the layout file.
+        $rendered = $this->render_page_layout($layoutfile);
+
+        // Slice the rendered output into header and footer.
+        $cutpos = strpos($rendered, $this->unique_main_content_token);
+        if ($cutpos === false) {
+            $cutpos = strpos($rendered, self::MAIN_CONTENT_TOKEN);
+            $token = self::MAIN_CONTENT_TOKEN;
+        } else {
+            $token = $this->unique_main_content_token;
+        }
+
+        if ($cutpos === false) {
+            throw new coding_exception('page layout file ' . $layoutfile . ' does not contain the main content placeholder, please include "<?php echo $OUTPUT->main_content() ?>" in theme layout file.');
+        }
+
+        $header = substr($rendered, 0, $cutpos);
+        $footer = substr($rendered, $cutpos + strlen($token));
+
+        if (empty($this->contenttype)) {
+            debugging('The page layout file did not call $OUTPUT->doctype()');
+            $header = $this->doctype() . $header;
+        }
+
+        // If this theme version is below 2.4 release and this is a course view page
+        if ((!isset($this->page->theme->settings->version) || $this->page->theme->settings->version < 2012101500) &&
+                $this->page->pagelayout === 'course' && $this->page->url->compare(new moodle_url('/course/view.php'), URL_MATCH_BASE)) {
+            // check if course content header/footer have not been output during render of theme layout
+            $coursecontentheader = $this->course_content_header(true);
+            $coursecontentfooter = $this->course_content_footer(true);
+            if (!empty($coursecontentheader)) {
+                // display debug message and add header and footer right above and below main content
+                // Please note that course header and footer (to be displayed above and below the whole page)
+                // are not displayed in this case at all.
+                // Besides the content header and footer are not displayed on any other course page
+                debugging('The current theme is not optimised for 2.4, the course-specific header and footer defined in course format will not be output', DEBUG_DEVELOPER);
+                $header .= $coursecontentheader;
+                $footer = $coursecontentfooter. $footer;
+            }
+        }
+
+        send_headers($this->contenttype, $this->page->cacheable);
+
+        $this->opencontainers->push('header/footer', $footer);
+        $this->page->set_state(moodle_page::STATE_IN_BODY);
+
+        // If an activity record has been set, activity_header will handle this.
+        if (!$this->page->cm || !empty($this->page->layout_options['noactivityheader'])) {
+            $header .= $this->skip_link_target('maincontent');
+        }
+        return $header;
+    }
+
+    /**
+     * Renders and outputs the page layout file.
+     *
+     * This is done by preparing the normal globals available to a script, and
+     * then including the layout file provided by the current theme for the
+     * requested layout.
+     *
+     * @param string $layoutfile The name of the layout file
+     * @return string HTML code
+     */
+    protected function render_page_layout($layoutfile) {
+        global $CFG, $SITE, $USER;
+        // The next lines are a bit tricky. The point is, here we are in a method
+        // of a renderer class, and this object may, or may not, be the same as
+        // the global $OUTPUT object. When rendering the page layout file, we want to use
+        // this object. However, people writing Moodle code expect the current
+        // renderer to be called $OUTPUT, not $this, so define a variable called
+        // $OUTPUT pointing at $this. The same comment applies to $PAGE and $COURSE.
+        $OUTPUT = $this;
+        $PAGE = $this->page;
+        $COURSE = $this->page->course;
+
+        ob_start();
+        include($layoutfile);
+        $rendered = ob_get_contents();
+        ob_end_clean();
+        return $rendered;
+    }
+
+    /**
+     * Outputs the page's footer
+     *
+     * @return string HTML fragment
+     */
+    public function footer() {
+        global $CFG, $DB, $PERF;
+
+        $hook = new before_footer_html_generation($this);
+        $hook->process_legacy_callbacks();
+        di::get(hook_manager::class)->dispatch($hook);
+        $hook->add_html($this->container_end_all(true));
+        $output = $hook->get_output();
+
+        $footer = $this->opencontainers->pop('header/footer');
+
+        if (debugging() and $DB and $DB->is_transaction_started()) {
+            // TODO: MDL-20625 print warning - transaction will be rolled back
+        }
+
+        // Provide some performance info if required
+        $performanceinfo = '';
+        if (MDL_PERF || (!empty($CFG->perfdebug) && $CFG->perfdebug > 7)) {
+            if (MDL_PERFTOFOOT || debugging() || (!empty($CFG->perfdebug) && $CFG->perfdebug > 7)) {
+                if (NO_OUTPUT_BUFFERING) {
+                    // If the output buffer was off then we render a placeholder and stream the
+                    // performance debugging into it at the very end in the shutdown handler.
+                    $PERF->perfdebugdeferred = true;
+                    $performanceinfo .= html_writer::tag('div',
+                        get_string('perfdebugdeferred', 'admin'),
+                        [
+                            'id' => 'perfdebugfooter',
+                            'style' => 'min-height: 30em',
+                        ]);
+                } else {
+                    $perf = get_performance_info();
+                    $performanceinfo = $perf['html'];
+                }
+            }
+        }
+
+        // We always want performance data when running a performance test, even if the user is redirected to another page.
+        if (MDL_PERF_TEST && strpos($footer, $this->unique_performance_info_token) === false) {
+            $footer = $this->unique_performance_info_token . $footer;
+        }
+        $footer = str_replace($this->unique_performance_info_token, $performanceinfo, $footer);
+
+        // Only show notifications when the current page has a context id.
+        if (!empty($this->page->context->id)) {
+            $this->page->requires->js_call_amd('core/notification', 'init', array(
+                $this->page->context->id,
+                \core\notification::fetch_as_array($this)
+            ));
+        }
+        $footer = str_replace($this->unique_end_html_token, $this->page->requires->get_end_code(), $footer);
+
+        $this->page->set_state(moodle_page::STATE_DONE);
+
+        // Here we remove the closing body and html tags and store them to be added back
+        // in the shutdown handler so we can have valid html with streaming script tags
+        // which are rendered after the visible footer.
+        $tags = '';
+        preg_match('#\<\/body>#i', $footer, $matches);
+        $tags .= $matches[0];
+        $footer = str_replace($matches[0], '', $footer);
+
+        preg_match('#\<\/html>#i', $footer, $matches);
+        $tags .= $matches[0];
+        $footer = str_replace($matches[0], '', $footer);
+
+        $CFG->closingtags = $tags;
+
+        return $output . $footer;
+    }
+
+    /**
+     * Close all but the last open container. This is useful in places like error
+     * handling, where you want to close all the open containers (apart from <body>)
+     * before outputting the error message.
+     *
+     * @param bool $shouldbenone assert that the stack should be empty now - causes a
+     *      developer debug warning if it isn't.
+     * @return string the HTML required to close any open containers inside <body>.
+     */
+    public function container_end_all($shouldbenone = false) {
+        return $this->opencontainers->pop_all_but_last($shouldbenone);
+    }
+
+    /**
+     * Returns course-specific information to be output immediately above content on any course page
+     * (for the current course)
+     *
+     * @param bool $onlyifnotcalledbefore output content only if it has not been output before
+     * @return string
+     */
+    public function course_content_header($onlyifnotcalledbefore = false) {
+        global $CFG;
+        static $functioncalled = false;
+        if ($functioncalled && $onlyifnotcalledbefore) {
+            // we have already output the content header
+            return '';
+        }
+
+        // Output any session notification.
+        $notifications = \core\notification::fetch();
+
+        $bodynotifications = '';
+        foreach ($notifications as $notification) {
+            $bodynotifications .= $this->render_from_template(
+                    $notification->get_template_name(),
+                    $notification->export_for_template($this)
+                );
+        }
+
+        $output = html_writer::span($bodynotifications, 'notifications', array('id' => 'user-notifications'));
+
+        if ($this->page->course->id == SITEID) {
+            // return immediately and do not include /course/lib.php if not necessary
+            return $output;
+        }
+
+        require_once($CFG->dirroot.'/course/lib.php');
+        $functioncalled = true;
+        $courseformat = course_get_format($this->page->course);
+        if (($obj = $courseformat->course_content_header()) !== null) {
+            $output .= html_writer::div($courseformat->get_renderer($this->page)->render($obj), 'course-content-header');
+        }
+        return $output;
+    }
+
+    /**
+     * Returns course-specific information to be output immediately below content on any course page
+     * (for the current course)
+     *
+     * @param bool $onlyifnotcalledbefore output content only if it has not been output before
+     * @return string
+     */
+    public function course_content_footer($onlyifnotcalledbefore = false) {
+        global $CFG;
+        if ($this->page->course->id == SITEID) {
+            // return immediately and do not include /course/lib.php if not necessary
+            return '';
+        }
+        static $functioncalled = false;
+        if ($functioncalled && $onlyifnotcalledbefore) {
+            // we have already output the content footer
+            return '';
+        }
+        $functioncalled = true;
+        require_once($CFG->dirroot.'/course/lib.php');
+        $courseformat = course_get_format($this->page->course);
+        if (($obj = $courseformat->course_content_footer()) !== null) {
+            return html_writer::div($courseformat->get_renderer($this->page)->render($obj), 'course-content-footer');
+        }
+        return '';
+    }
+
+    /**
+     * Returns course-specific information to be output on any course page in the header area
+     * (for the current course)
+     *
+     * @return string
+     */
+    public function course_header() {
+        global $CFG;
+        if ($this->page->course->id == SITEID) {
+            // return immediately and do not include /course/lib.php if not necessary
+            return '';
+        }
+        require_once($CFG->dirroot.'/course/lib.php');
+        $courseformat = course_get_format($this->page->course);
+        if (($obj = $courseformat->course_header()) !== null) {
+            return $courseformat->get_renderer($this->page)->render($obj);
+        }
+        return '';
+    }
+
+    /**
+     * Returns course-specific information to be output on any course page in the footer area
+     * (for the current course)
+     *
+     * @return string
+     */
+    public function course_footer() {
+        global $CFG;
+        if ($this->page->course->id == SITEID) {
+            // return immediately and do not include /course/lib.php if not necessary
+            return '';
+        }
+        require_once($CFG->dirroot.'/course/lib.php');
+        $courseformat = course_get_format($this->page->course);
+        if (($obj = $courseformat->course_footer()) !== null) {
+            return $courseformat->get_renderer($this->page)->render($obj);
+        }
+        return '';
+    }
+
+    /**
+     * Get the course pattern datauri to show on a course card.
+     *
+     * The datauri is an encoded svg that can be passed as a url.
+     * @param int $id Id to use when generating the pattern
+     * @return string datauri
+     */
+    public function get_generated_image_for_id($id) {
+        $color = $this->get_generated_color_for_id($id);
+        $pattern = new \core_geopattern();
+        $pattern->setColor($color);
+        $pattern->patternbyid($id);
+        return $pattern->datauri();
+    }
+
+    /**
+     * Get the course pattern image URL.
+     *
+     * @param context_course $context course context object
+     * @return string URL of the course pattern image in SVG format
+     */
+    public function get_generated_url_for_course(context_course $context): string {
+        return moodle_url::make_pluginfile_url($context->id, 'course', 'generated', null, '/', 'course.svg')->out();
+    }
+
+    /**
+     * Get the course pattern in SVG format to show on a course card.
+     *
+     * @param int $id id to use when generating the pattern
+     * @return string SVG file contents
+     */
+    public function get_generated_svg_for_id(int $id): string {
+        $color = $this->get_generated_color_for_id($id);
+        $pattern = new \core_geopattern();
+        $pattern->setColor($color);
+        $pattern->patternbyid($id);
+        return $pattern->toSVG();
+    }
+
+    /**
+     * Get the course color to show on a course card.
+     *
+     * @param int $id Id to use when generating the color.
+     * @return string hex color code.
+     */
+    public function get_generated_color_for_id($id) {
+        $colornumbers = range(1, 10);
+        $basecolors = [];
+        foreach ($colornumbers as $number) {
+            $basecolors[] = get_config('core_admin', 'coursecolor' . $number);
+        }
+
+        $color = $basecolors[$id % 10];
+        return $color;
+    }
+
+    /**
+     * Returns lang menu or '', this method also checks forcing of languages in courses.
+     *
+     * This function calls {@link core_renderer::render_single_select()} to actually display the language menu.
+     *
+     * @return string The lang menu HTML or empty string
+     */
+    public function lang_menu() {
+        $languagemenu = new \core\output\language_menu($this->page);
+        $data = $languagemenu->export_for_single_select($this);
+        if ($data) {
+            return $this->render_from_template('core/single_select', $data);
+        }
+        return '';
+    }
+
+    /**
+     * Output the row of editing icons for a block, as defined by the controls array.
+     *
+     * @param array $controls an array like {@link block_contents::$controls}.
+     * @param string $blockid The ID given to the block.
+     * @return string HTML fragment.
+     */
+    public function block_controls($actions, $blockid = null) {
+        if (empty($actions)) {
+            return '';
+        }
+        $menu = new action_menu($actions);
+        if ($blockid !== null) {
+            $menu->set_owner_selector('#'.$blockid);
+        }
+        $menu->attributes['class'] .= ' block-control-actions commands';
+        return $this->render($menu);
+    }
+
+    /**
+     * Returns the HTML for a basic textarea field.
+     *
+     * @param string $name Name to use for the textarea element
+     * @param string $id The id to use fort he textarea element
+     * @param string $value Initial content to display in the textarea
+     * @param int $rows Number of rows to display
+     * @param int $cols Number of columns to display
+     * @return string the HTML to display
+     */
+    public function print_textarea($name, $id, $value, $rows, $cols) {
+        editors_head_setup();
+        $editor = editors_get_preferred_editor(FORMAT_HTML);
+        $editor->set_text($value);
+        $editor->use_editor($id, []);
+
+        $context = [
+            'id' => $id,
+            'name' => $name,
+            'value' => $value,
+            'rows' => $rows,
+            'cols' => $cols
+        ];
+
+        return $this->render_from_template('core_form/editor_textarea', $context);
+    }
+
+    /**
+     * Renders an action menu component.
+     *
+     * @param action_menu $menu
+     * @return string HTML
+     */
+    public function render_action_menu(action_menu $menu) {
+
+        // We don't want the class icon there!
+        foreach ($menu->get_secondary_actions() as $action) {
+            if ($action instanceof \action_menu_link && $action->has_class('icon')) {
+                $action->attributes['class'] = preg_replace('/(^|\s+)icon(\s+|$)/i', '', $action->attributes['class']);
+            }
+        }
+
+        if ($menu->is_empty()) {
+            return '';
+        }
+        $context = $menu->export_for_template($this);
+
+        return $this->render_from_template('core/action_menu', $context);
+    }
+
+    /**
+     * Renders a full check API result including summary and details
+     *
+     * @param core\check\check $check the check that was run to get details from
+     * @param core\check\result $result the result of a check
+     * @param bool $includedetails if true, details are included as well
+     * @return string rendered html
+     */
+    protected function render_check_full_result(core\check\check $check, core\check\result $result, bool $includedetails): string {
+        // Initially render just badge itself.
+        $renderedresult = $this->render_from_template($result->get_template_name(), $result->export_for_template($this));
+
+        // Add summary.
+        $renderedresult .= ' ' . $result->get_summary();
+
+        // Wrap in notificaiton.
+        $notificationmap = [
+            \core\check\result::NA => \core\output\notification::NOTIFY_INFO,
+            \core\check\result::OK => \core\output\notification::NOTIFY_SUCCESS,
+            \core\check\result::INFO => \core\output\notification::NOTIFY_INFO,
+            \core\check\result::UNKNOWN => \core\output\notification::NOTIFY_WARNING,
+            \core\check\result::WARNING => \core\output\notification::NOTIFY_WARNING,
+            \core\check\result::ERROR => \core\output\notification::NOTIFY_ERROR,
+            \core\check\result::CRITICAL => \core\output\notification::NOTIFY_ERROR,
+        ];
+
+        // Get type, or default to error.
+        $notificationtype = $notificationmap[$result->get_status()] ?? \core\output\notification::NOTIFY_ERROR;
+        $renderedresult = $this->notification($renderedresult, $notificationtype, false);
+
+        // If adding details, add on new line.
+        if ($includedetails) {
+            $renderedresult .= $result->get_details();
+        }
+
+        // Add the action link.
+        $renderedresult .= $this->render_action_link($check->get_action_link());
+
+        return $renderedresult;
+    }
+
+    /**
+     * Renders a full check API result including summary and details
+     *
+     * @param core\check\check $check the check that was run to get details from
+     * @param core\check\result $result the result of a check
+     * @param bool $includedetails if details should be included
+     * @return string HTML fragment
+     */
+    public function check_full_result(core\check\check $check, core\check\result $result, bool $includedetails = false) {
+        return $this->render_check_full_result($check, $result, $includedetails);
+    }
+
+    /**
+     * Renders a Check API result
+     *
+     * @param core\check\result $result
+     * @return string HTML fragment
+     */
+    protected function render_check_result(core\check\result $result) {
+        return $this->render_from_template($result->get_template_name(), $result->export_for_template($this));
+    }
+
+    /**
+     * Renders a Check API result
+     *
+     * @param core\check\result $result
+     * @return string HTML fragment
+     */
+    public function check_result(core\check\result $result) {
+        return $this->render_check_result($result);
+    }
+
+    /**
+     * Renders an action_menu_link item.
+     *
+     * @param action_menu_link $action
+     * @return string HTML fragment
+     */
+    protected function render_action_menu_link(action_menu_link $action) {
+        return $this->render_from_template('core/action_menu_link', $action->export_for_template($this));
+    }
+
+    /**
+     * Renders a primary action_menu_filler item.
+     *
+     * @param action_menu_filler $action
+     * @return string HTML fragment
+     */
+    protected function render_action_menu_filler(action_menu_filler $action) {
+        return html_writer::span('&nbsp;', 'filler');
+    }
+
+    /**
+     * Renders a primary action_menu_link item.
+     *
+     * @param action_menu_link_primary $action
+     * @return string HTML fragment
+     */
+    protected function render_action_menu_link_primary(action_menu_link_primary $action) {
+        return $this->render_action_menu_link($action);
+    }
+
+    /**
+     * Renders a secondary action_menu_link item.
+     *
+     * @param action_menu_link_secondary $action
+     * @return string HTML fragment
+     */
+    protected function render_action_menu_link_secondary(action_menu_link_secondary $action) {
+        return $this->render_action_menu_link($action);
+    }
+
+    /**
+     * Prints a nice side block with an optional header.
+     *
+     * @param block_contents $bc HTML for the content
+     * @param string $region the region the block is appearing in.
+     * @return string the HTML to be output.
+     */
+    public function block(block_contents $bc, $region) {
+        $bc = clone($bc); // Avoid messing up the object passed in.
+        if (empty($bc->blockinstanceid) || !strip_tags($bc->title)) {
+            $bc->collapsible = block_contents::NOT_HIDEABLE;
+        }
+
+        $id = !empty($bc->attributes['id']) ? $bc->attributes['id'] : uniqid('block-');
+        $context = new stdClass();
+        $context->skipid = $bc->skipid;
+        $context->blockinstanceid = $bc->blockinstanceid ?: uniqid('fakeid-');
+        $context->dockable = $bc->dockable;
+        $context->id = $id;
+        $context->hidden = $bc->collapsible == block_contents::HIDDEN;
+        $context->skiptitle = strip_tags($bc->title);
+        $context->showskiplink = !empty($context->skiptitle);
+        $context->arialabel = $bc->arialabel;
+        $context->ariarole = !empty($bc->attributes['role']) ? $bc->attributes['role'] : 'complementary';
+        $context->class = $bc->attributes['class'];
+        $context->type = $bc->attributes['data-block'];
+        $context->title = $bc->title;
+        $context->content = $bc->content;
+        $context->annotation = $bc->annotation;
+        $context->footer = $bc->footer;
+        $context->hascontrols = !empty($bc->controls);
+        if ($context->hascontrols) {
+            $context->controls = $this->block_controls($bc->controls, $id);
+        }
+
+        return $this->render_from_template('core/block', $context);
+    }
+
+    /**
+     * Render the contents of a block_list.
+     *
+     * @param array $icons the icon for each item.
+     * @param array $items the content of each item.
+     * @return string HTML
+     */
+    public function list_block_contents($icons, $items) {
+        $row = 0;
+        $lis = array();
+        foreach ($items as $key => $string) {
+            $item = html_writer::start_tag('li', array('class' => 'r' . $row));
+            if (!empty($icons[$key])) { //test if the content has an assigned icon
+                $item .= html_writer::tag('div', $icons[$key], array('class' => 'icon column c0'));
+            }
+            $item .= html_writer::tag('div', $string, array('class' => 'column c1'));
+            $item .= html_writer::end_tag('li');
+            $lis[] = $item;
+            $row = 1 - $row; // Flip even/odd.
+        }
+        return html_writer::tag('ul', implode("\n", $lis), array('class' => 'unlist'));
+    }
+
+    /**
+     * Output all the blocks in a particular region.
+     *
+     * @param string $region the name of a region on this page.
+     * @param boolean $fakeblocksonly Output fake block only.
+     * @return string the HTML to be output.
+     */
+    public function blocks_for_region($region, $fakeblocksonly = false) {
+        $blockcontents = $this->page->blocks->get_content_for_region($region, $this);
+        $lastblock = null;
+        $zones = array();
+        foreach ($blockcontents as $bc) {
+            if ($bc instanceof block_contents) {
+                $zones[] = $bc->title;
+            }
+        }
+        $output = '';
+
+        foreach ($blockcontents as $bc) {
+            if ($bc instanceof block_contents) {
+                if ($fakeblocksonly && !$bc->is_fake()) {
+                    // Skip rendering real blocks if we only want to show fake blocks.
+                    continue;
+                }
+                $output .= $this->block($bc, $region);
+                $lastblock = $bc->title;
+            } else if ($bc instanceof block_move_target) {
+                if (!$fakeblocksonly) {
+                    $output .= $this->block_move_target($bc, $zones, $lastblock, $region);
+                }
+            } else {
+                throw new coding_exception('Unexpected type of thing (' . get_class($bc) . ') found in list of block contents.');
+            }
+        }
+        return $output;
+    }
+
+    /**
+     * Output a place where the block that is currently being moved can be dropped.
+     *
+     * @param block_move_target $target with the necessary details.
+     * @param array $zones array of areas where the block can be moved to
+     * @param string $previous the block located before the area currently being rendered.
+     * @param string $region the name of the region
+     * @return string the HTML to be output.
+     */
+    public function block_move_target($target, $zones, $previous, $region) {
+        if ($previous == null) {
+            if (empty($zones)) {
+                // There are no zones, probably because there are no blocks.
+                $regions = $this->page->theme->get_all_block_regions();
+                $position = get_string('moveblockinregion', 'block', $regions[$region]);
+            } else {
+                $position = get_string('moveblockbefore', 'block', $zones[0]);
+            }
+        } else {
+            $position = get_string('moveblockafter', 'block', $previous);
+        }
+        return html_writer::tag('a', html_writer::tag('span', $position, array('class' => 'accesshide')), array('href' => $target->url, 'class' => 'blockmovetarget'));
+    }
+
+    /**
+     * Renders a special html link with attached action
+     *
+     * Theme developers: DO NOT OVERRIDE! Please override function
+     * {@link core_renderer::render_action_link()} instead.
+     *
+     * @param string|moodle_url $url
+     * @param string $text HTML fragment
+     * @param component_action $action
+     * @param array $attributes associative array of html link attributes + disabled
+     * @param pix_icon optional pix icon to render with the link
+     * @return string HTML fragment
+     */
+    public function action_link($url, $text, component_action $action = null, array $attributes = null, $icon = null) {
+        if (!($url instanceof moodle_url)) {
+            $url = new moodle_url($url);
+        }
+        $link = new action_link($url, $text, $action, $attributes, $icon);
+
+        return $this->render($link);
+    }
+
+    /**
+     * Renders an action_link object.
+     *
+     * The provided link is renderer and the HTML returned. At the same time the
+     * associated actions are setup in JS by {@link core_renderer::add_action_handler()}
+     *
+     * @param action_link $link
+     * @return string HTML fragment
+     */
+    protected function render_action_link(action_link $link) {
+        return $this->render_from_template('core/action_link', $link->export_for_template($this));
+    }
+
+    /**
+     * Renders an action_icon.
+     *
+     * This function uses the {@link core_renderer::action_link()} method for the
+     * most part. What it does different is prepare the icon as HTML and use it
+     * as the link text.
+     *
+     * Theme developers: If you want to change how action links and/or icons are rendered,
+     * consider overriding function {@link core_renderer::render_action_link()} and
+     * {@link core_renderer::render_pix_icon()}.
+     *
+     * @param string|moodle_url $url A string URL or moodel_url
+     * @param pix_icon $pixicon
+     * @param component_action $action
+     * @param array $attributes associative array of html link attributes + disabled
+     * @param bool $linktext show title next to image in link
+     * @return string HTML fragment
+     */
+    public function action_icon($url, pix_icon $pixicon, component_action $action = null, array $attributes = null, $linktext=false) {
+        if (!($url instanceof moodle_url)) {
+            $url = new moodle_url($url);
+        }
+        $attributes = (array)$attributes;
+
+        if (empty($attributes['class'])) {
+            // let ppl override the class via $options
+            $attributes['class'] = 'action-icon';
+        }
+
+        if ($linktext) {
+            $text = $pixicon->attributes['alt'];
+            // Set the icon as a decorative image if we're displaying the action text.
+            // Otherwise, the action name will be read twice by assistive technologies.
+            $pixicon->attributes['alt'] = '';
+            $pixicon->attributes['title'] = '';
+            $pixicon->attributes['aria-hidden'] = 'true';
+        } else {
+            $text = '';
+        }
+
+        $icon = $this->render($pixicon);
+
+        return $this->action_link($url, $text.$icon, $action, $attributes);
+    }
+
+   /**
+    * Print a message along with button choices for Continue/Cancel
+    *
+    * If a string or moodle_url is given instead of a single_button, method defaults to post.
+    *
+    * @param string $message The question to ask the user
+    * @param single_button|moodle_url|string $continue The single_button component representing the Continue answer. Can also be a moodle_url or string URL
+    * @param single_button|moodle_url|string $cancel The single_button component representing the Cancel answer. Can also be a moodle_url or string URL
+    * @param array $displayoptions optional extra display options
+    * @return string HTML fragment
+    */
+    public function confirm($message, $continue, $cancel, array $displayoptions = []) {
+
+        // Check existing displayoptions.
+        $displayoptions['confirmtitle'] = $displayoptions['confirmtitle'] ?? get_string('confirm');
+        $displayoptions['continuestr'] = $displayoptions['continuestr'] ?? get_string('continue');
+        $displayoptions['cancelstr'] = $displayoptions['cancelstr'] ?? get_string('cancel');
+
+        if ($continue instanceof single_button) {
+            // Continue button should be primary if set to secondary type as it is the fefault.
+            if ($continue->type === single_button::BUTTON_SECONDARY) {
+                $continue->type = single_button::BUTTON_PRIMARY;
+            }
+        } else if (is_string($continue)) {
+            $continue = new single_button(new moodle_url($continue), $displayoptions['continuestr'], 'post',
+                $displayoptions['type'] ?? single_button::BUTTON_PRIMARY);
+        } else if ($continue instanceof moodle_url) {
+            $continue = new single_button($continue, $displayoptions['continuestr'], 'post',
+                $displayoptions['type'] ?? single_button::BUTTON_PRIMARY);
+        } else {
+            throw new coding_exception('The continue param to $OUTPUT->confirm() must be either a URL (string/moodle_url) or a single_button instance.');
+        }
+
+        if ($cancel instanceof single_button) {
+            // ok
+        } else if (is_string($cancel)) {
+            $cancel = new single_button(new moodle_url($cancel), $displayoptions['cancelstr'], 'get');
+        } else if ($cancel instanceof moodle_url) {
+            $cancel = new single_button($cancel, $displayoptions['cancelstr'], 'get');
+        } else {
+            throw new coding_exception('The cancel param to $OUTPUT->confirm() must be either a URL (string/moodle_url) or a single_button instance.');
+        }
+
+        $attributes = [
+            'role'=>'alertdialog',
+            'aria-labelledby'=>'modal-header',
+            'aria-describedby'=>'modal-body',
+            'aria-modal'=>'true'
+        ];
+
+        $output = $this->box_start('generalbox modal modal-dialog modal-in-page show', 'notice', $attributes);
+        $output .= $this->box_start('modal-content', 'modal-content');
+        $output .= $this->box_start('modal-header px-3', 'modal-header');
+        $output .= html_writer::tag('h4', $displayoptions['confirmtitle']);
+        $output .= $this->box_end();
+        $attributes = [
+            'role'=>'alert',
+            'data-aria-autofocus'=>'true'
+        ];
+        $output .= $this->box_start('modal-body', 'modal-body', $attributes);
+        $output .= html_writer::tag('p', $message);
+        $output .= $this->box_end();
+        $output .= $this->box_start('modal-footer', 'modal-footer');
+        $output .= html_writer::tag('div', $this->render($cancel) . $this->render($continue), ['class' => 'buttons']);
+        $output .= $this->box_end();
+        $output .= $this->box_end();
+        $output .= $this->box_end();
+        return $output;
+    }
+
+    /**
+     * Returns a form with a single button.
+     *
+     * Theme developers: DO NOT OVERRIDE! Please override function
+     * {@link core_renderer::render_single_button()} instead.
+     *
+     * @param string|moodle_url $url
+     * @param string $label button text
+     * @param string $method get or post submit method
+     * @param array $options associative array {disabled, title, etc.}
+     * @return string HTML fragment
+     */
+    public function single_button($url, $label, $method='post', array $options=null) {
+        if (!($url instanceof moodle_url)) {
+            $url = new moodle_url($url);
+        }
+        $button = new single_button($url, $label, $method);
+
+        foreach ((array)$options as $key=>$value) {
+            if (property_exists($button, $key)) {
+                $button->$key = $value;
+            } else {
+                $button->set_attribute($key, $value);
+            }
+        }
+
+        return $this->render($button);
+    }
+
+    /**
+     * Renders a single button widget.
+     *
+     * This will return HTML to display a form containing a single button.
+     *
+     * @param single_button $button
+     * @return string HTML fragment
+     */
+    protected function render_single_button(single_button $button) {
+        return $this->render_from_template('core/single_button', $button->export_for_template($this));
+    }
+
+    /**
+     * Returns a form with a single select widget.
+     *
+     * Theme developers: DO NOT OVERRIDE! Please override function
+     * {@link core_renderer::render_single_select()} instead.
+     *
+     * @param moodle_url $url form action target, includes hidden fields
+     * @param string $name name of selection field - the changing parameter in url
+     * @param array $options list of options
+     * @param string $selected selected element
+     * @param array $nothing
+     * @param string $formid
+     * @param array $attributes other attributes for the single select
+     * @return string HTML fragment
+     */
+    public function single_select($url, $name, array $options, $selected = '',
+                                $nothing = array('' => 'choosedots'), $formid = null, $attributes = array()) {
+        if (!($url instanceof moodle_url)) {
+            $url = new moodle_url($url);
+        }
+        $select = new single_select($url, $name, $options, $selected, $nothing, $formid);
+
+        if (array_key_exists('label', $attributes)) {
+            $select->set_label($attributes['label']);
+            unset($attributes['label']);
+        }
+        $select->attributes = $attributes;
+
+        return $this->render($select);
+    }
+
+    /**
+     * Returns a dataformat selection and download form
+     *
+     * @param string $label A text label
+     * @param moodle_url|string $base The download page url
+     * @param string $name The query param which will hold the type of the download
+     * @param array $params Extra params sent to the download page
+     * @return string HTML fragment
+     */
+    public function download_dataformat_selector($label, $base, $name = 'dataformat', $params = array()) {
+
+        $formats = core_plugin_manager::instance()->get_plugins_of_type('dataformat');
+        $options = array();
+        foreach ($formats as $format) {
+            if ($format->is_enabled()) {
+                $options[] = array(
+                    'value' => $format->name,
+                    'label' => get_string('dataformat', $format->component),
+                );
+            }
+        }
+        $hiddenparams = array();
+        foreach ($params as $key => $value) {
+            $hiddenparams[] = array(
+                'name' => $key,
+                'value' => $value,
+            );
+        }
+        $data = array(
+            'label' => $label,
+            'base' => $base,
+            'name' => $name,
+            'params' => $hiddenparams,
+            'options' => $options,
+            'sesskey' => sesskey(),
+            'submit' => get_string('download'),
+        );
+
+        return $this->render_from_template('core/dataformat_selector', $data);
+    }
+
+
+    /**
+     * Internal implementation of single_select rendering
+     *
+     * @param single_select $select
+     * @return string HTML fragment
+     */
+    protected function render_single_select(single_select $select) {
+        return $this->render_from_template('core/single_select', $select->export_for_template($this));
+    }
+
+    /**
+     * Returns a form with a url select widget.
+     *
+     * Theme developers: DO NOT OVERRIDE! Please override function
+     * {@link core_renderer::render_url_select()} instead.
+     *
+     * @param array $urls list of urls - array('/course/view.php?id=1'=>'Frontpage', ....)
+     * @param string $selected selected element
+     * @param array $nothing
+     * @param string $formid
+     * @return string HTML fragment
+     */
+    public function url_select(array $urls, $selected, $nothing = array('' => 'choosedots'), $formid = null) {
+        $select = new url_select($urls, $selected, $nothing, $formid);
+        return $this->render($select);
+    }
+
+    /**
+     * Internal implementation of url_select rendering
+     *
+     * @param url_select $select
+     * @return string HTML fragment
+     */
+    protected function render_url_select(url_select $select) {
+        return $this->render_from_template('core/url_select', $select->export_for_template($this));
+    }
+
+    /**
+     * Returns a string containing a link to the user documentation.
+     * Also contains an icon by default. Shown to teachers and admin only.
+     *
+     * @param string $path The page link after doc root and language, no leading slash.
+     * @param string $text The text to be displayed for the link
+     * @param boolean $forcepopup Whether to force a popup regardless of the value of $CFG->doctonewwindow
+     * @param array $attributes htm attributes
+     * @return string
+     */
+    public function doc_link($path, $text = '', $forcepopup = false, array $attributes = []) {
+        global $CFG;
+
+        $icon = $this->pix_icon('book', '', 'moodle', array('class' => 'iconhelp icon-pre'));
+
+        $attributes['href'] = new moodle_url(get_docs_url($path));
+        $newwindowicon = '';
+        if (!empty($CFG->doctonewwindow) || $forcepopup) {
+            $attributes['target'] = '_blank';
+            $newwindowicon = $this->pix_icon('i/externallink', get_string('opensinnewwindow'), 'moodle',
+            ['class' => 'fa fa-externallink fa-fw']);
+        }
+
+        return html_writer::tag('a', $icon . $text . $newwindowicon, $attributes);
+    }
+
+    /**
+     * Return HTML for an image_icon.
+     *
+     * Theme developers: DO NOT OVERRIDE! Please override function
+     * {@link core_renderer::render_image_icon()} instead.
+     *
+     * @param string $pix short pix name
+     * @param string $alt mandatory alt attribute
+     * @param string $component standard compoennt name like 'moodle', 'mod_forum', etc.
+     * @param array $attributes htm attributes
+     * @return string HTML fragment
+     */
+    public function image_icon($pix, $alt, $component='moodle', array $attributes = null) {
+        $icon = new image_icon($pix, $alt, $component, $attributes);
+        return $this->render($icon);
+    }
+
+    /**
+     * Renders a pix_icon widget and returns the HTML to display it.
+     *
+     * @param image_icon $icon
+     * @return string HTML fragment
+     */
+    protected function render_image_icon(image_icon $icon) {
+        $system = \core\output\icon_system::instance(\core\output\icon_system::STANDARD);
+        return $system->render_pix_icon($this, $icon);
+    }
+
+    /**
+     * Return HTML for a pix_icon.
+     *
+     * Theme developers: DO NOT OVERRIDE! Please override function
+     * {@link core_renderer::render_pix_icon()} instead.
+     *
+     * @param string $pix short pix name
+     * @param string $alt mandatory alt attribute
+     * @param string $component standard compoennt name like 'moodle', 'mod_forum', etc.
+     * @param array $attributes htm lattributes
+     * @return string HTML fragment
+     */
+    public function pix_icon($pix, $alt, $component='moodle', array $attributes = null) {
+        $icon = new pix_icon($pix, $alt, $component, $attributes);
+        return $this->render($icon);
+    }
+
+    /**
+     * Renders a pix_icon widget and returns the HTML to display it.
+     *
+     * @param pix_icon $icon
+     * @return string HTML fragment
+     */
+    protected function render_pix_icon(pix_icon $icon) {
+        $system = \core\output\icon_system::instance();
+        return $system->render_pix_icon($this, $icon);
+    }
+
+    /**
+     * Return HTML to display an emoticon icon.
+     *
+     * @param pix_emoticon $emoticon
+     * @return string HTML fragment
+     */
+    protected function render_pix_emoticon(pix_emoticon $emoticon) {
+        $system = \core\output\icon_system::instance(\core\output\icon_system::STANDARD);
+        return $system->render_pix_icon($this, $emoticon);
+    }
+
+    /**
+     * Produces the html that represents this rating in the UI
+     *
+     * @param rating $rating the page object on which this rating will appear
+     * @return string
+     */
+    function render_rating(rating $rating) {
+        global $CFG, $USER;
+
+        if ($rating->settings->aggregationmethod == RATING_AGGREGATE_NONE) {
+            return null;//ratings are turned off
+        }
+
+        $ratingmanager = new rating_manager();
+        // Initialise the JavaScript so ratings can be done by AJAX.
+        $ratingmanager->initialise_rating_javascript($this->page);
+
+        $strrate = get_string("rate", "rating");
+        $ratinghtml = ''; //the string we'll return
+
+        // permissions check - can they view the aggregate?
+        if ($rating->user_can_view_aggregate()) {
+
+            $aggregatelabel = $ratingmanager->get_aggregate_label($rating->settings->aggregationmethod);
+            $aggregatelabel = html_writer::tag('span', $aggregatelabel, array('class'=>'rating-aggregate-label'));
+            $aggregatestr   = $rating->get_aggregate_string();
+
+            $aggregatehtml  = html_writer::tag('span', $aggregatestr, array('id' => 'ratingaggregate'.$rating->itemid, 'class' => 'ratingaggregate')).' ';
+            if ($rating->count > 0) {
+                $countstr = "({$rating->count})";
+            } else {
+                $countstr = '-';
+            }
+            $aggregatehtml .= html_writer::tag('span', $countstr, array('id'=>"ratingcount{$rating->itemid}", 'class' => 'ratingcount')).' ';
+
+            if ($rating->settings->permissions->viewall && $rating->settings->pluginpermissions->viewall) {
+
+                $nonpopuplink = $rating->get_view_ratings_url();
+                $popuplink = $rating->get_view_ratings_url(true);
+
+                $action = new popup_action('click', $popuplink, 'ratings', array('height' => 400, 'width' => 600));
+                $aggregatehtml = $this->action_link($nonpopuplink, $aggregatehtml, $action);
+            }
+
+            $ratinghtml .= html_writer::tag('span', $aggregatelabel . $aggregatehtml, array('class' => 'rating-aggregate-container'));
+        }
+
+        $formstart = null;
+        // if the item doesn't belong to the current user, the user has permission to rate
+        // and we're within the assessable period
+        if ($rating->user_can_rate()) {
+
+            $rateurl = $rating->get_rate_url();
+            $inputs = $rateurl->params();
+
+            //start the rating form
+            $formattrs = array(
+                'id'     => "postrating{$rating->itemid}",
+                'class'  => 'postratingform',
+                'method' => 'post',
+                'action' => $rateurl->out_omit_querystring()
+            );
+            $formstart  = html_writer::start_tag('form', $formattrs);
+            $formstart .= html_writer::start_tag('div', array('class' => 'ratingform'));
+
+            // add the hidden inputs
+            foreach ($inputs as $name => $value) {
+                $attributes = array('type' => 'hidden', 'class' => 'ratinginput', 'name' => $name, 'value' => $value);
+                $formstart .= html_writer::empty_tag('input', $attributes);
+            }
+
+            if (empty($ratinghtml)) {
+                $ratinghtml .= $strrate.': ';
+            }
+            $ratinghtml = $formstart.$ratinghtml;
+
+            $scalearray = array(RATING_UNSET_RATING => $strrate.'...') + $rating->settings->scale->scaleitems;
+            $scaleattrs = array('class'=>'postratingmenu ratinginput','id'=>'menurating'.$rating->itemid);
+            $ratinghtml .= html_writer::label($rating->rating, 'menurating'.$rating->itemid, false, array('class' => 'accesshide'));
+            $ratinghtml .= html_writer::select($scalearray, 'rating', $rating->rating, false, $scaleattrs);
+
+            //output submit button
+            $ratinghtml .= html_writer::start_tag('span', array('class'=>"ratingsubmit"));
+
+            $attributes = array('type' => 'submit', 'class' => 'postratingmenusubmit', 'id' => 'postratingsubmit'.$rating->itemid, 'value' => s(get_string('rate', 'rating')));
+            $ratinghtml .= html_writer::empty_tag('input', $attributes);
+
+            if (!$rating->settings->scale->isnumeric) {
+                // If a global scale, try to find current course ID from the context
+                if (empty($rating->settings->scale->courseid) and $coursecontext = $rating->context->get_course_context(false)) {
+                    $courseid = $coursecontext->instanceid;
+                } else {
+                    $courseid = $rating->settings->scale->courseid;
+                }
+                $ratinghtml .= $this->help_icon_scale($courseid, $rating->settings->scale);
+            }
+            $ratinghtml .= html_writer::end_tag('span');
+            $ratinghtml .= html_writer::end_tag('div');
+            $ratinghtml .= html_writer::end_tag('form');
+        }
+
+        return $ratinghtml;
+    }
+
+    /**
+     * Centered heading with attached help button (same title text)
+     * and optional icon attached.
+     *
+     * @param string $text A heading text
+     * @param string $helpidentifier The keyword that defines a help page
+     * @param string $component component name
+     * @param string|moodle_url $icon
+     * @param string $iconalt icon alt text
+     * @param int $level The level of importance of the heading. Defaulting to 2
+     * @param string $classnames A space-separated list of CSS classes. Defaulting to null
+     * @return string HTML fragment
+     */
+    public function heading_with_help($text, $helpidentifier, $component = 'moodle', $icon = '', $iconalt = '', $level = 2, $classnames = null) {
+        $image = '';
+        if ($icon) {
+            $image = $this->pix_icon($icon, $iconalt, $component, array('class'=>'icon iconlarge'));
+        }
+
+        $help = '';
+        if ($helpidentifier) {
+            $help = $this->help_icon($helpidentifier, $component);
+        }
+
+        return $this->heading($image.$text.$help, $level, $classnames);
+    }
+
+    /**
+     * Returns HTML to display a help icon.
+     *
+     * @deprecated since Moodle 2.0
+     */
+    public function old_help_icon($helpidentifier, $title, $component = 'moodle', $linktext = '') {
+        throw new coding_exception('old_help_icon() can not be used any more, please see help_icon().');
+    }
+
+    /**
+     * Returns HTML to display a help icon.
+     *
+     * Theme developers: DO NOT OVERRIDE! Please override function
+     * {@link core_renderer::render_help_icon()} instead.
+     *
+     * @param string $identifier The keyword that defines a help page
+     * @param string $component component name
+     * @param string|bool $linktext true means use $title as link text, string means link text value
+     * @param string|object|array|int $a An object, string or number that can be used
+     *      within translation strings
+     * @return string HTML fragment
+     */
+    public function help_icon($identifier, $component = 'moodle', $linktext = '', $a = null) {
+        $icon = new help_icon($identifier, $component, $a);
+        $icon->diag_strings();
+        if ($linktext === true) {
+            $icon->linktext = get_string($icon->identifier, $icon->component, $a);
+        } else if (!empty($linktext)) {
+            $icon->linktext = $linktext;
+        }
+        return $this->render($icon);
+    }
+
+    /**
+     * Implementation of user image rendering.
+     *
+     * @param help_icon $helpicon A help icon instance
+     * @return string HTML fragment
+     */
+    protected function render_help_icon(help_icon $helpicon) {
+        $context = $helpicon->export_for_template($this);
+        return $this->render_from_template('core/help_icon', $context);
+    }
+
+    /**
+     * Returns HTML to display a scale help icon.
+     *
+     * @param int $courseid
+     * @param stdClass $scale instance
+     * @return string HTML fragment
+     */
+    public function help_icon_scale($courseid, stdClass $scale) {
+        global $CFG;
+
+        $title = get_string('helpprefix2', '', $scale->name) .' ('.get_string('newwindow').')';
+
+        $icon = $this->pix_icon('help', get_string('scales'), 'moodle', array('class'=>'iconhelp'));
+
+        $scaleid = abs($scale->id);
+
+        $link = new moodle_url('/course/scales.php', array('id' => $courseid, 'list' => true, 'scaleid' => $scaleid));
+        $action = new popup_action('click', $link, 'ratingscale');
+
+        return html_writer::tag('span', $this->action_link($link, $icon, $action), array('class' => 'helplink'));
+    }
+
+    /**
+     * Creates and returns a spacer image with optional line break.
+     *
+     * @param array $attributes Any HTML attributes to add to the spaced.
+     * @param bool $br Include a BR after the spacer.... DON'T USE THIS. Don't be
+     *     laxy do it with CSS which is a much better solution.
+     * @return string HTML fragment
+     */
+    public function spacer(array $attributes = null, $br = false) {
+        $attributes = (array)$attributes;
+        if (empty($attributes['width'])) {
+            $attributes['width'] = 1;
+        }
+        if (empty($attributes['height'])) {
+            $attributes['height'] = 1;
+        }
+        $attributes['class'] = 'spacer';
+
+        $output = $this->pix_icon('spacer', '', 'moodle', $attributes);
+
+        if (!empty($br)) {
+            $output .= '<br />';
+        }
+
+        return $output;
+    }
+
+    /**
+     * Returns HTML to display the specified user's avatar.
+     *
+     * User avatar may be obtained in two ways:
+     * <pre>
+     * // Option 1: (shortcut for simple cases, preferred way)
+     * // $user has come from the DB and has fields id, picture, imagealt, firstname and lastname
+     * $OUTPUT->user_picture($user, array('popup'=>true));
+     *
+     * // Option 2:
+     * $userpic = new user_picture($user);
+     * // Set properties of $userpic
+     * $userpic->popup = true;
+     * $OUTPUT->render($userpic);
+     * </pre>
+     *
+     * Theme developers: DO NOT OVERRIDE! Please override function
+     * {@link core_renderer::render_user_picture()} instead.
+     *
+     * @param stdClass $user Object with at least fields id, picture, imagealt, firstname, lastname
+     *     If any of these are missing, the database is queried. Avoid this
+     *     if at all possible, particularly for reports. It is very bad for performance.
+     * @param array $options associative array with user picture options, used only if not a user_picture object,
+     *     options are:
+     *     - courseid=$this->page->course->id (course id of user profile in link)
+     *     - size=35 (size of image)
+     *     - link=true (make image clickable - the link leads to user profile)
+     *     - popup=false (open in popup)
+     *     - alttext=true (add image alt attribute)
+     *     - class = image class attribute (default 'userpicture')
+     *     - visibletoscreenreaders=true (whether to be visible to screen readers)
+     *     - includefullname=false (whether to include the user's full name together with the user picture)
+     *     - includetoken = false (whether to use a token for authentication. True for current user, int value for other user id)
+     * @return string HTML fragment
+     */
+    public function user_picture(stdClass $user, array $options = null) {
+        $userpicture = new user_picture($user);
+        foreach ((array)$options as $key=>$value) {
+            if (property_exists($userpicture, $key)) {
+                $userpicture->$key = $value;
+            }
+        }
+        return $this->render($userpicture);
+    }
+
+    /**
+     * Internal implementation of user image rendering.
+     *
+     * @param user_picture $userpicture
+     * @return string
+     */
+    protected function render_user_picture(user_picture $userpicture) {
+        global $CFG;
+
+        $user = $userpicture->user;
+        $canviewfullnames = has_capability('moodle/site:viewfullnames', $this->page->context);
+
+        $alt = '';
+        if ($userpicture->alttext) {
+            if (!empty($user->imagealt)) {
+                $alt = trim($user->imagealt);
+            }
+        }
+
+        // If the user picture is being rendered as a link but without the full name, an empty alt text for the user picture
+        // would mean that the link displayed will not have any discernible text. This becomes an accessibility issue,
+        // especially to screen reader users. Use the user's full name by default for the user picture's alt-text if this is
+        // the case.
+        if ($userpicture->link && !$userpicture->includefullname && empty($alt)) {
+            $alt = fullname($user);
+        }
+
+        if (empty($userpicture->size)) {
+            $size = 35;
+        } else if ($userpicture->size === true or $userpicture->size == 1) {
+            $size = 100;
+        } else {
+            $size = $userpicture->size;
+        }
+
+        $class = $userpicture->class;
+
+        if ($user->picture == 0) {
+            $class .= ' defaultuserpic';
+        }
+
+        $src = $userpicture->get_url($this->page, $this);
+
+        $attributes = array('src' => $src, 'class' => $class, 'width' => $size, 'height' => $size);
+        if (!$userpicture->visibletoscreenreaders) {
+            $alt = '';
+        }
+        $attributes['alt'] = $alt;
+
+        if (!empty($alt)) {
+            $attributes['title'] = $alt;
+        }
+
+        // Get the image html output first, auto generated based on initials if one isn't already set.
+        if ($user->picture == 0 && empty($CFG->enablegravatar) && !defined('BEHAT_SITE_RUNNING')) {
+            $initials = \core_user::get_initials($user);
+            $fullname = fullname($userpicture->user, $canviewfullnames);
+            // Don't modify in corner cases where neither the firstname nor the lastname appears.
+            $output = html_writer::tag(
+                'span', $initials,
+                [
+                    'class' => 'userinitials size-' . $size,
+                    'title' => $fullname,
+                    'aria-label' => $fullname,
+                    'role' => 'img',
+                ]
+            );
+        } else {
+            $output = html_writer::empty_tag('img', $attributes);
+        }
+
+        // Show fullname together with the picture when desired.
+        if ($userpicture->includefullname) {
+            $output .= fullname($userpicture->user, $canviewfullnames);
+        }
+
+        if (empty($userpicture->courseid)) {
+            $courseid = $this->page->course->id;
+        } else {
+            $courseid = $userpicture->courseid;
+        }
+        if ($courseid == SITEID) {
+            $url = new moodle_url('/user/profile.php', array('id' => $user->id));
+        } else {
+            $url = new moodle_url('/user/view.php', array('id' => $user->id, 'course' => $courseid));
+        }
+
+        // Then wrap it in link if needed. Also we don't wrap it in link if the link redirects to itself.
+        if (!$userpicture->link ||
+                ($this->page->has_set_url() && $this->page->url == $url)) { // Protect against unset page->url.
+            return $output;
+        }
+
+        $attributes = array('href' => $url, 'class' => 'd-inline-block aabtn');
+        if (!$userpicture->visibletoscreenreaders) {
+            $attributes['tabindex'] = '-1';
+            $attributes['aria-hidden'] = 'true';
+        }
+
+        if ($userpicture->popup) {
+            $id = html_writer::random_id('userpicture');
+            $attributes['id'] = $id;
+            $this->add_action_handler(new popup_action('click', $url), $id);
+        }
+
+        return html_writer::tag('a', $output, $attributes);
+    }
+
+    /**
+     * @deprecated since Moodle 4.3
+     */
+    public function htmllize_file_tree() {
+        throw new coding_exception('This function is deprecated and no longer relevant.');
+    }
+
+    /**
+     * Returns HTML to display the file picker
+     *
+     * <pre>
+     * $OUTPUT->file_picker($options);
+     * </pre>
+     *
+     * Theme developers: DO NOT OVERRIDE! Please override function
+     * {@link core_renderer::render_file_picker()} instead.
+     *
+     * @param stdClass $options file manager options
+     *   options are:
+     *       maxbytes=>-1,
+     *       itemid=>0,
+     *       client_id=>uniqid(),
+     *       acepted_types=>'*',
+     *       return_types=>FILE_INTERNAL,
+     *       context=>current page context
+     * @return string HTML fragment
+     */
+    public function file_picker($options) {
+        $fp = new file_picker($options);
+        return $this->render($fp);
+    }
+
+    /**
+     * Internal implementation of file picker rendering.
+     *
+     * @param file_picker $fp
+     * @return string
+     */
+    public function render_file_picker(file_picker $fp) {
+        $options = $fp->options;
+        $client_id = $options->client_id;
+        $strsaved = get_string('filesaved', 'repository');
+        $straddfile = get_string('openpicker', 'repository');
+        $strloading  = get_string('loading', 'repository');
+        $strdndenabled = get_string('dndenabled_inbox', 'moodle');
+        $strdroptoupload = get_string('droptoupload', 'moodle');
+        $iconprogress = $this->pix_icon('i/loading_small', $strloading).'';
+
+        $currentfile = $options->currentfile;
+        if (empty($currentfile)) {
+            $currentfile = '';
+        } else {
+            $currentfile .= ' - ';
+        }
+        if ($options->maxbytes) {
+            $size = $options->maxbytes;
+        } else {
+            $size = get_max_upload_file_size();
+        }
+        if ($size == -1) {
+            $maxsize = '';
+        } else {
+            $maxsize = get_string('maxfilesize', 'moodle', display_size($size, 0));
+        }
+        if ($options->buttonname) {
+            $buttonname = ' name="' . $options->buttonname . '"';
+        } else {
+            $buttonname = '';
+        }
+        $html = <<<EOD
+<div class="filemanager-loading mdl-align" id='filepicker-loading-{$client_id}'>
+$iconprogress
+</div>
+<div id="filepicker-wrapper-{$client_id}" class="mdl-left w-100" style="display:none">
+    <div>
+        <input type="button" class="btn btn-secondary fp-btn-choose" id="filepicker-button-{$client_id}" value="{$straddfile}"{$buttonname}/>
+        <span> $maxsize </span>
+    </div>
+EOD;
+        if ($options->env != 'url') {
+            $html .= <<<EOD
+    <div id="file_info_{$client_id}" class="mdl-left filepicker-filelist" style="position: relative">
+    <div class="filepicker-filename">
+        <div class="filepicker-container">$currentfile
+            <div class="dndupload-message">$strdndenabled <br/>
+                <div class="dndupload-arrow d-flex"><i class="fa fa-arrow-circle-o-down fa-3x m-auto"></i></div>
+            </div>
+        </div>
+        <div class="dndupload-progressbars"></div>
+    </div>
+    <div>
+        <div class="dndupload-target">{$strdroptoupload}<br/>
+            <div class="dndupload-arrow d-flex"><i class="fa fa-arrow-circle-o-down fa-3x m-auto"></i></div>
+        </div>
+    </div>
+    </div>
+EOD;
+        }
+        $html .= '</div>';
+        return $html;
+    }
+
+    /**
+     * @deprecated since Moodle 3.2
+     */
+    public function update_module_button() {
+        throw new coding_exception('core_renderer::update_module_button() can not be used anymore. Activity ' .
+            'modules should not add the edit module button, the link is already available in the Administration block. ' .
+            'Themes can choose to display the link in the buttons row consistently for all module types.');
+    }
+
+    /**
+     * Returns HTML to display a "Turn editing on/off" button in a form.
+     *
+     * @param moodle_url $url The URL + params to send through when clicking the button
+     * @param string $method
+     * @return ?string HTML the button
+     */
+    public function edit_button(moodle_url $url, string $method = 'post') {
+
+        if ($this->page->theme->haseditswitch == true) {
+            return;
+        }
+        $url->param('sesskey', sesskey());
+        if ($this->page->user_is_editing()) {
+            $url->param('edit', 'off');
+            $editstring = get_string('turneditingoff');
+        } else {
+            $url->param('edit', 'on');
+            $editstring = get_string('turneditingon');
+        }
+
+        return $this->single_button($url, $editstring, $method);
+    }
+
+    /**
+     * Create a navbar switch for toggling editing mode.
+     *
+     * @return ?string Html containing the edit switch
+     */
+    public function edit_switch() {
+        if ($this->page->user_allowed_editing()) {
+
+            $temp = (object) [
+                'legacyseturl' => (new moodle_url('/editmode.php'))->out(false),
+                'pagecontextid' => $this->page->context->id,
+                'pageurl' => $this->page->url,
+                'sesskey' => sesskey(),
+            ];
+            if ($this->page->user_is_editing()) {
+                $temp->checked = true;
+            }
+            return $this->render_from_template('core/editswitch', $temp);
+        }
+    }
+
+    /**
+     * Returns HTML to display a simple button to close a window
+     *
+     * @param string $text The lang string for the button's label (already output from get_string())
+     * @return string html fragment
+     */
+    public function close_window_button($text='') {
+        if (empty($text)) {
+            $text = get_string('closewindow');
+        }
+        $button = new single_button(new moodle_url('#'), $text, 'get');
+        $button->add_action(new component_action('click', 'close_window'));
+
+        return $this->container($this->render($button), 'closewindow');
+    }
+
+    /**
+     * Output an error message. By default wraps the error message in <span class="error">.
+     * If the error message is blank, nothing is output.
+     *
+     * @param string $message the error message.
+     * @return string the HTML to output.
+     */
+    public function error_text($message) {
+        if (empty($message)) {
+            return '';
+        }
+        $message = $this->pix_icon('i/warning', get_string('error'), '', array('class' => 'icon icon-pre', 'title'=>'')) . $message;
+        return html_writer::tag('span', $message, array('class' => 'error'));
+    }
+
+    /**
+     * Do not call this function directly.
+     *
+     * To terminate the current script with a fatal error, throw an exception.
+     * Doing this will then call this function to display the error, before terminating the execution.
+     *
+     * @param string $message The message to output
+     * @param string $moreinfourl URL where more info can be found about the error
+     * @param string $link Link for the Continue button
+     * @param array $backtrace The execution backtrace
+     * @param string $debuginfo Debugging information
+     * @return string the HTML to output.
+     */
+    public function fatal_error($message, $moreinfourl, $link, $backtrace, $debuginfo = null, $errorcode = "") {
+        global $CFG;
+
+        $output = '';
+        $obbuffer = '';
+
+        if ($this->has_started()) {
+            // we can not always recover properly here, we have problems with output buffering,
+            // html tables, etc.
+            $output .= $this->opencontainers->pop_all_but_last();
+
+        } else {
+            // It is really bad if library code throws exception when output buffering is on,
+            // because the buffered text would be printed before our start of page.
+            // NOTE: this hack might be behave unexpectedly in case output buffering is enabled in PHP.ini
+            error_reporting(0); // disable notices from gzip compression, etc.
+            while (ob_get_level() > 0) {
+                $buff = ob_get_clean();
+                if ($buff === false) {
+                    break;
+                }
+                $obbuffer .= $buff;
+            }
+            error_reporting($CFG->debug);
+
+            // Output not yet started.
+            $protocol = (isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0');
+            if (empty($_SERVER['HTTP_RANGE'])) {
+                @header($protocol . ' 404 Not Found');
+            } else if (core_useragent::check_safari_ios_version(602) && !empty($_SERVER['HTTP_X_PLAYBACK_SESSION_ID'])) {
+                // Coax iOS 10 into sending the session cookie.
+                @header($protocol . ' 403 Forbidden');
+            } else {
+                // Must stop byteserving attempts somehow,
+                // this is weird but Chrome PDF viewer can be stopped only with 407!
+                @header($protocol . ' 407 Proxy Authentication Required');
+            }
+
+            $this->page->set_context(null); // ugly hack - make sure page context is set to something, we do not want bogus warnings here
+            $this->page->set_url('/'); // no url
+            //$this->page->set_pagelayout('base'); //TODO: MDL-20676 blocks on error pages are weird, unfortunately it somehow detect the pagelayout from URL :-(
+            $this->page->set_title(get_string('error'));
+            $this->page->set_heading($this->page->course->fullname);
+            // No need to display the activity header when encountering an error.
+            $this->page->activityheader->disable();
+            $output .= $this->header();
+        }
+
+        $message = '<p class="errormessage">' . s($message) . '</p>'.
+                '<p class="errorcode"><a href="' . s($moreinfourl) . '">' .
+                get_string('moreinformation') . '</a></p>';
+        if (empty($CFG->rolesactive)) {
+            $message .= '<p class="errormessage">' . get_string('installproblem', 'error') . '</p>';
+            //It is usually not possible to recover from errors triggered during installation, you may need to create a new database or use a different database prefix for new installation.
+        }
+        $output .= $this->box($message, 'errorbox alert alert-danger', null, array('data-rel' => 'fatalerror'));
+
+        if ($CFG->debugdeveloper) {
+            $labelsep = get_string('labelsep', 'langconfig');
+            if (!empty($debuginfo)) {
+                $debuginfo = s($debuginfo); // removes all nasty JS
+                $debuginfo = str_replace("\n", '<br />', $debuginfo); // keep newlines
+                $label = get_string('debuginfo', 'debug') . $labelsep;
+                $output .= $this->notification("<strong>$label</strong> " . $debuginfo, 'notifytiny');
+            }
+            if (!empty($backtrace)) {
+                $label = get_string('stacktrace', 'debug') . $labelsep;
+                $output .= $this->notification("<strong>$label</strong> " . format_backtrace($backtrace), 'notifytiny');
+            }
+            if ($obbuffer !== '' ) {
+                $label = get_string('outputbuffer', 'debug') . $labelsep;
+                $output .= $this->notification("<strong>$label</strong> " . s($obbuffer), 'notifytiny');
+            }
+        }
+
+        if (empty($CFG->rolesactive)) {
+            // continue does not make much sense if moodle is not installed yet because error is most probably not recoverable
+        } else if (!empty($link)) {
+            $output .= $this->continue_button($link);
+        }
+
+        $output .= $this->footer();
+
+        // Padding to encourage IE to display our error page, rather than its own.
+        $output .= str_repeat(' ', 512);
+
+        return $output;
+    }
+
+    /**
+     * Output a notification (that is, a status message about something that has just happened).
+     *
+     * Note: \core\notification::add() may be more suitable for your usage.
+     *
+     * @param string $message The message to print out.
+     * @param ?string $type   The type of notification. See constants on \core\output\notification.
+     * @param bool $closebutton Whether to show a close icon to remove the notification (default true).
+     * @return string the HTML to output.
+     */
+    public function notification($message, $type = null, $closebutton = true) {
+        $typemappings = [
+            // Valid types.
+            'success'           => \core\output\notification::NOTIFY_SUCCESS,
+            'info'              => \core\output\notification::NOTIFY_INFO,
+            'warning'           => \core\output\notification::NOTIFY_WARNING,
+            'error'             => \core\output\notification::NOTIFY_ERROR,
+
+            // Legacy types mapped to current types.
+            'notifyproblem'     => \core\output\notification::NOTIFY_ERROR,
+            'notifytiny'        => \core\output\notification::NOTIFY_ERROR,
+            'notifyerror'       => \core\output\notification::NOTIFY_ERROR,
+            'notifysuccess'     => \core\output\notification::NOTIFY_SUCCESS,
+            'notifymessage'     => \core\output\notification::NOTIFY_INFO,
+            'notifyredirect'    => \core\output\notification::NOTIFY_INFO,
+            'redirectmessage'   => \core\output\notification::NOTIFY_INFO,
+        ];
+
+        $extraclasses = [];
+
+        if ($type) {
+            if (strpos($type, ' ') === false) {
+                // No spaces in the list of classes, therefore no need to loop over and determine the class.
+                if (isset($typemappings[$type])) {
+                    $type = $typemappings[$type];
+                } else {
+                    // The value provided did not match a known type. It must be an extra class.
+                    $extraclasses = [$type];
+                }
+            } else {
+                // Identify what type of notification this is.
+                $classarray = explode(' ', self::prepare_classes($type));
+
+                // Separate out the type of notification from the extra classes.
+                foreach ($classarray as $class) {
+                    if (isset($typemappings[$class])) {
+                        $type = $typemappings[$class];
+                    } else {
+                        $extraclasses[] = $class;
+                    }
+                }
+            }
+        }
+
+        $notification = new \core\output\notification($message, $type, $closebutton);
+        if (count($extraclasses)) {
+            $notification->set_extra_classes($extraclasses);
+        }
+
+        // Return the rendered template.
+        return $this->render_from_template($notification->get_template_name(), $notification->export_for_template($this));
+    }
+
+    /**
+     * @deprecated since Moodle 3.1 MDL-30811 - please do not use this function any more.
+     */
+    public function notify_problem() {
+        throw new coding_exception('core_renderer::notify_problem() can not be used any more, '.
+            'please use \core\notification::add(), or \core\output\notification as required.');
+    }
+
+    /**
+     * @deprecated since Moodle 3.1 MDL-30811 - please do not use this function any more.
+     */
+    public function notify_success() {
+        throw new coding_exception('core_renderer::notify_success() can not be used any more, '.
+            'please use \core\notification::add(), or \core\output\notification as required.');
+    }
+
+    /**
+     * @deprecated since Moodle 3.1 MDL-30811 - please do not use this function any more.
+     */
+    public function notify_message() {
+        throw new coding_exception('core_renderer::notify_message() can not be used any more, '.
+            'please use \core\notification::add(), or \core\output\notification as required.');
+    }
+
+    /**
+     * @deprecated since Moodle 3.1 MDL-30811 - please do not use this function any more.
+     */
+    public function notify_redirect() {
+        throw new coding_exception('core_renderer::notify_redirect() can not be used any more, '.
+            'please use \core\notification::add(), or \core\output\notification as required.');
+    }
+
+    /**
+     * Render a notification (that is, a status message about something that has
+     * just happened).
+     *
+     * @param \core\output\notification $notification the notification to print out
+     * @return string the HTML to output.
+     */
+    protected function render_notification(\core\output\notification $notification) {
+        return $this->render_from_template($notification->get_template_name(), $notification->export_for_template($this));
+    }
+
+    /**
+     * Returns HTML to display a continue button that goes to a particular URL.
+     *
+     * @param string|moodle_url $url The url the button goes to.
+     * @return string the HTML to output.
+     */
+    public function continue_button($url) {
+        if (!($url instanceof moodle_url)) {
+            $url = new moodle_url($url);
+        }
+        $button = new single_button($url, get_string('continue'), 'get', single_button::BUTTON_PRIMARY);
+        $button->class = 'continuebutton';
+
+        return $this->render($button);
+    }
+
+    /**
+     * Returns HTML to display a single paging bar to provide access to other pages  (usually in a search)
+     *
+     * Theme developers: DO NOT OVERRIDE! Please override function
+     * {@link core_renderer::render_paging_bar()} instead.
+     *
+     * @param int $totalcount The total number of entries available to be paged through
+     * @param int $page The page you are currently viewing
+     * @param int $perpage The number of entries that should be shown per page
+     * @param string|moodle_url $baseurl url of the current page, the $pagevar parameter is added
+     * @param string $pagevar name of page parameter that holds the page number
+     * @return string the HTML to output.
+     */
+    public function paging_bar($totalcount, $page, $perpage, $baseurl, $pagevar = 'page') {
+        $pb = new paging_bar($totalcount, $page, $perpage, $baseurl, $pagevar);
+        return $this->render($pb);
+    }
+
+    /**
+     * Returns HTML to display the paging bar.
+     *
+     * @param paging_bar $pagingbar
+     * @return string the HTML to output.
+     */
+    protected function render_paging_bar(paging_bar $pagingbar) {
+        // Any more than 10 is not usable and causes weird wrapping of the pagination.
+        $pagingbar->maxdisplay = 10;
+        return $this->render_from_template('core/paging_bar', $pagingbar->export_for_template($this));
+    }
+
+    /**
+     * Returns HTML to display initials bar to provide access to other pages  (usually in a search)
+     *
+     * @param string $current the currently selected letter.
+     * @param string $class class name to add to this initial bar.
+     * @param string $title the name to put in front of this initial bar.
+     * @param string $urlvar URL parameter name for this initial.
+     * @param string $url URL object.
+     * @param array $alpha of letters in the alphabet.
+     * @param bool $minirender Return a trimmed down view of the initials bar.
+     * @return string the HTML to output.
+     */
+    public function initials_bar($current, $class, $title, $urlvar, $url, $alpha = null, bool $minirender = false) {
+        $ib = new initials_bar($current, $class, $title, $urlvar, $url, $alpha, $minirender);
+        return $this->render($ib);
+    }
+
+    /**
+     * Internal implementation of initials bar rendering.
+     *
+     * @param initials_bar $initialsbar
+     * @return string
+     */
+    protected function render_initials_bar(initials_bar $initialsbar) {
+        return $this->render_from_template('core/initials_bar', $initialsbar->export_for_template($this));
+    }
+
+    /**
+     * Output the place a skip link goes to.
+     *
+     * @param string $id The target name from the corresponding $PAGE->requires->skip_link_to($target) call.
+     * @return string the HTML to output.
+     */
+    public function skip_link_target($id = null) {
+        return html_writer::span('', '', array('id' => $id));
+    }
+
+    /**
+     * Outputs a heading
+     *
+     * @param string $text The text of the heading
+     * @param int $level The level of importance of the heading. Defaulting to 2
+     * @param string $classes A space-separated list of CSS classes. Defaulting to null
+     * @param string $id An optional ID
+     * @return string the HTML to output.
+     */
+    public function heading($text, $level = 2, $classes = null, $id = null) {
+        $level = (integer) $level;
+        if ($level < 1 or $level > 6) {
+            throw new coding_exception('Heading level must be an integer between 1 and 6.');
+        }
+        return html_writer::tag('h' . $level, $text, array('id' => $id, 'class' => renderer_base::prepare_classes($classes)));
+    }
+
+    /**
+     * Outputs a box.
+     *
+     * @param string $contents The contents of the box
+     * @param string $classes A space-separated list of CSS classes
+     * @param string $id An optional ID
+     * @param array $attributes An array of other attributes to give the box.
+     * @return string the HTML to output.
+     */
+    public function box($contents, $classes = 'generalbox', $id = null, $attributes = array()) {
+        return $this->box_start($classes, $id, $attributes) . $contents . $this->box_end();
+    }
+
+    /**
+     * Outputs the opening section of a box.
+     *
+     * @param string $classes A space-separated list of CSS classes
+     * @param string $id An optional ID
+     * @param array $attributes An array of other attributes to give the box.
+     * @return string the HTML to output.
+     */
+    public function box_start($classes = 'generalbox', $id = null, $attributes = array()) {
+        $this->opencontainers->push('box', html_writer::end_tag('div'));
+        $attributes['id'] = $id;
+        $attributes['class'] = 'box py-3 ' . renderer_base::prepare_classes($classes);
+        return html_writer::start_tag('div', $attributes);
+    }
+
+    /**
+     * Outputs the closing section of a box.
+     *
+     * @return string the HTML to output.
+     */
+    public function box_end() {
+        return $this->opencontainers->pop('box');
+    }
+
+    /**
+     * Outputs a paragraph.
+     *
+     * @param string $contents The contents of the paragraph
+     * @param string|null $classes A space-separated list of CSS classes
+     * @param string|null $id An optional ID
+     * @return string the HTML to output.
+     */
+    public function paragraph(string $contents, ?string $classes = null, ?string $id = null): string {
+        return html_writer::tag(
+            'p',
+            $contents,
+            ['id' => $id, 'class' => renderer_base::prepare_classes($classes)]
+        );
+    }
+
+    /**
+     * Outputs a screen reader only inline text.
+     *
+     * @param string $contents The contents of the paragraph
+     * @return string the HTML to output.
+     */
+    public function sr_text(string $contents): string {
+        return html_writer::tag(
+            'span',
+            $contents,
+            ['class' => 'sr-only']
+        ) . ' ';
+    }
+
+    /**
+     * Outputs a container.
+     *
+     * @param string $contents The contents of the box
+     * @param string $classes A space-separated list of CSS classes
+     * @param string $id An optional ID
+     * @param array $attributes Optional other attributes as array
+     * @return string the HTML to output.
+     */
+    public function container($contents, $classes = null, $id = null, $attributes = []) {
+        return $this->container_start($classes, $id, $attributes) . $contents . $this->container_end();
+    }
+
+    /**
+     * Outputs the opening section of a container.
+     *
+     * @param string $classes A space-separated list of CSS classes
+     * @param string $id An optional ID
+     * @param array $attributes Optional other attributes as array
+     * @return string the HTML to output.
+     */
+    public function container_start($classes = null, $id = null, $attributes = []) {
+        $this->opencontainers->push('container', html_writer::end_tag('div'));
+        $attributes = array_merge(['id' => $id, 'class' => renderer_base::prepare_classes($classes)], $attributes);
+        return html_writer::start_tag('div', $attributes);
+    }
+
+    /**
+     * Outputs the closing section of a container.
+     *
+     * @return string the HTML to output.
+     */
+    public function container_end() {
+        return $this->opencontainers->pop('container');
+    }
+
+    /**
+     * Make nested HTML lists out of the items
+     *
+     * The resulting list will look something like this:
+     *
+     * <pre>
+     * <<ul>>
+     * <<li>><div class='tree_item parent'>(item contents)</div>
+     *      <<ul>
+     *      <<li>><div class='tree_item'>(item contents)</div><</li>>
+     *      <</ul>>
+     * <</li>>
+     * <</ul>>
+     * </pre>
+     *
+     * @param array $items
+     * @param array $attrs html attributes passed to the top ofs the list
+     * @return string HTML
+     */
+    public function tree_block_contents($items, $attrs = array()) {
+        // exit if empty, we don't want an empty ul element
+        if (empty($items)) {
+            return '';
+        }
+        // array of nested li elements
+        $lis = array();
+        foreach ($items as $item) {
+            // this applies to the li item which contains all child lists too
+            $content = $item->content($this);
+            $liclasses = array($item->get_css_type());
+            if (!$item->forceopen || (!$item->forceopen && $item->collapse) || ($item->children->count()==0  && $item->nodetype==navigation_node::NODETYPE_BRANCH)) {
+                $liclasses[] = 'collapsed';
+            }
+            if ($item->isactive === true) {
+                $liclasses[] = 'current_branch';
+            }
+            $liattr = array('class'=>join(' ',$liclasses));
+            // class attribute on the div item which only contains the item content
+            $divclasses = array('tree_item');
+            if ($item->children->count()>0  || $item->nodetype==navigation_node::NODETYPE_BRANCH) {
+                $divclasses[] = 'branch';
+            } else {
+                $divclasses[] = 'leaf';
+            }
+            if (!empty($item->classes) && count($item->classes)>0) {
+                $divclasses[] = join(' ', $item->classes);
+            }
+            $divattr = array('class'=>join(' ', $divclasses));
+            if (!empty($item->id)) {
+                $divattr['id'] = $item->id;
+            }
+            $content = html_writer::tag('p', $content, $divattr) . $this->tree_block_contents($item->children);
+            if (!empty($item->preceedwithhr) && $item->preceedwithhr===true) {
+                $content = html_writer::empty_tag('hr') . $content;
+            }
+            $content = html_writer::tag('li', $content, $liattr);
+            $lis[] = $content;
+        }
+        return html_writer::tag('ul', implode("\n", $lis), $attrs);
+    }
+
+    /**
+     * Returns a search box.
+     *
+     * @param  string $id     The search box wrapper div id, defaults to an autogenerated one.
+     * @return string         HTML with the search form hidden by default.
+     */
+    public function search_box($id = false) {
+        global $CFG;
+
+        // Accessing $CFG directly as using \core_search::is_global_search_enabled would
+        // result in an extra included file for each site, even the ones where global search
+        // is disabled.
+        if (empty($CFG->enableglobalsearch) || !has_capability('moodle/search:query', context_system::instance())) {
+            return '';
+        }
+
+        $data = [
+            'action' => new moodle_url('/search/index.php'),
+            'hiddenfields' => (object) ['name' => 'context', 'value' => $this->page->context->id],
+            'inputname' => 'q',
+            'searchstring' => get_string('search'),
+            ];
+        return $this->render_from_template('core/search_input_navbar', $data);
+    }
+
+    /**
+     * Allow plugins to provide some content to be rendered in the navbar.
+     * The plugin must define a PLUGIN_render_navbar_output function that returns
+     * the HTML they wish to add to the navbar.
+     *
+     * @return string HTML for the navbar
+     */
+    public function navbar_plugin_output() {
+        $output = '';
+
+        // Give subsystems an opportunity to inject extra html content. The callback
+        // must always return a string containing valid html.
+        foreach (\core_component::get_core_subsystems() as $name => $path) {
+            if ($path) {
+                $output .= component_callback($name, 'render_navbar_output', [$this], '');
+            }
+        }
+
+        if ($pluginsfunction = get_plugins_with_function('render_navbar_output')) {
+            foreach ($pluginsfunction as $plugintype => $plugins) {
+                foreach ($plugins as $pluginfunction) {
+                    $output .= $pluginfunction($this);
+                }
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Construct a user menu, returning HTML that can be echoed out by a
+     * layout file.
+     *
+     * @param stdClass $user A user object, usually $USER.
+     * @param bool $withlinks true if a dropdown should be built.
+     * @return string HTML fragment.
+     */
+    public function user_menu($user = null, $withlinks = null) {
+        global $USER, $CFG;
+        require_once($CFG->dirroot . '/user/lib.php');
+
+        if (is_null($user)) {
+            $user = $USER;
+        }
+
+        // Note: this behaviour is intended to match that of core_renderer::login_info,
+        // but should not be considered to be good practice; layout options are
+        // intended to be theme-specific. Please don't copy this snippet anywhere else.
+        if (is_null($withlinks)) {
+            $withlinks = empty($this->page->layout_options['nologinlinks']);
+        }
+
+        // Add a class for when $withlinks is false.
+        $usermenuclasses = 'usermenu';
+        if (!$withlinks) {
+            $usermenuclasses .= ' withoutlinks';
+        }
+
+        $returnstr = "";
+
+        // If during initial install, return the empty return string.
+        if (during_initial_install()) {
+            return $returnstr;
+        }
+
+        $loginpage = $this->is_login_page();
+        $loginurl = get_login_url();
+
+        // Get some navigation opts.
+        $opts = user_get_user_navigation_info($user, $this->page);
+
+        if (!empty($opts->unauthenticateduser)) {
+            $returnstr = get_string($opts->unauthenticateduser['content'], 'moodle');
+            // If not logged in, show the typical not-logged-in string.
+            if (!$loginpage && (!$opts->unauthenticateduser['guest'] || $withlinks)) {
+                $returnstr .= " (<a href=\"$loginurl\">" . get_string('login') . '</a>)';
+            }
+
+            return html_writer::div(
+                html_writer::span(
+                    $returnstr,
+                    'login nav-link'
+                ),
+                $usermenuclasses
+            );
+        }
+
+        $avatarclasses = "avatars";
+        $avatarcontents = html_writer::span($opts->metadata['useravatar'], 'avatar current');
+        $usertextcontents = $opts->metadata['userfullname'];
+
+        // Other user.
+        if (!empty($opts->metadata['asotheruser'])) {
+            $avatarcontents .= html_writer::span(
+                $opts->metadata['realuseravatar'],
+                'avatar realuser'
+            );
+            $usertextcontents = $opts->metadata['realuserfullname'];
+            $usertextcontents .= html_writer::tag(
+                'span',
+                get_string(
+                    'loggedinas',
+                    'moodle',
+                    html_writer::span(
+                        $opts->metadata['userfullname'],
+                        'value'
+                    )
+                ),
+                array('class' => 'meta viewingas')
+            );
+        }
+
+        // Role.
+        if (!empty($opts->metadata['asotherrole'])) {
+            $role = core_text::strtolower(preg_replace('#[ ]+#', '-', trim($opts->metadata['rolename'])));
+            $usertextcontents .= html_writer::span(
+                $opts->metadata['rolename'],
+                'meta role role-' . $role
+            );
+        }
+
+        // User login failures.
+        if (!empty($opts->metadata['userloginfail'])) {
+            $usertextcontents .= html_writer::span(
+                $opts->metadata['userloginfail'],
+                'meta loginfailures'
+            );
+        }
+
+        // MNet.
+        if (!empty($opts->metadata['asmnetuser'])) {
+            $mnet = strtolower(preg_replace('#[ ]+#', '-', trim($opts->metadata['mnetidprovidername'])));
+            $usertextcontents .= html_writer::span(
+                $opts->metadata['mnetidprovidername'],
+                'meta mnet mnet-' . $mnet
+            );
+        }
+
+        $returnstr .= html_writer::span(
+            html_writer::span($usertextcontents, 'usertext mr-1') .
+            html_writer::span($avatarcontents, $avatarclasses),
+            'userbutton'
+        );
+
+        // Create a divider (well, a filler).
+        $divider = new action_menu_filler();
+        $divider->primary = false;
+
+        $am = new action_menu();
+        $am->set_menu_trigger(
+            $returnstr,
+            'nav-link'
+        );
+        $am->set_action_label(get_string('usermenu'));
+        $am->set_nowrap_on_items();
+        if ($withlinks) {
+            $navitemcount = count($opts->navitems);
+            $idx = 0;
+            foreach ($opts->navitems as $key => $value) {
+
+                switch ($value->itemtype) {
+                    case 'divider':
+                        // If the nav item is a divider, add one and skip link processing.
+                        $am->add($divider);
+                        break;
+
+                    case 'invalid':
+                        // Silently skip invalid entries (should we post a notification?).
+                        break;
+
+                    case 'link':
+                        // Process this as a link item.
+                        $pix = null;
+                        if (isset($value->pix) && !empty($value->pix)) {
+                            $pix = new pix_icon($value->pix, '', null, array('class' => 'iconsmall'));
+                        } else if (isset($value->imgsrc) && !empty($value->imgsrc)) {
+                            $value->title = html_writer::img(
+                                $value->imgsrc,
+                                $value->title,
+                                array('class' => 'iconsmall')
+                            ) . $value->title;
+                        }
+
+                        $al = new action_menu_link_secondary(
+                            $value->url,
+                            $pix,
+                            $value->title,
+                            array('class' => 'icon')
+                        );
+                        if (!empty($value->titleidentifier)) {
+                            $al->attributes['data-title'] = $value->titleidentifier;
+                        }
+                        $am->add($al);
+                        break;
+                }
+
+                $idx++;
+
+                // Add dividers after the first item and before the last item.
+                if ($idx == 1 || $idx == $navitemcount - 1) {
+                    $am->add($divider);
+                }
+            }
+        }
+
+        return html_writer::div(
+            $this->render($am),
+            $usermenuclasses
+        );
+    }
+
+    /**
+     * Secure layout login info.
+     *
+     * @return string
+     */
+    public function secure_layout_login_info() {
+        if (get_config('core', 'logininfoinsecurelayout')) {
+            return $this->login_info(false);
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Returns the language menu in the secure layout.
+     *
+     * No custom menu items are passed though, such that it will render only the language selection.
+     *
+     * @return string
+     */
+    public function secure_layout_language_menu() {
+        if (get_config('core', 'langmenuinsecurelayout')) {
+            $custommenu = new custom_menu('', current_language());
+            return $this->render_custom_menu($custommenu);
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * This renders the navbar.
+     * Uses bootstrap compatible html.
+     */
+    public function navbar() {
+        return $this->render_from_template('core/navbar', $this->page->navbar);
+    }
+
+    /**
+     * Renders a breadcrumb navigation node object.
+     *
+     * @param breadcrumb_navigation_node $item The navigation node to render.
+     * @return string HTML fragment
+     */
+    protected function render_breadcrumb_navigation_node(breadcrumb_navigation_node $item) {
+
+        if ($item->action instanceof moodle_url) {
+            $content = $item->get_content();
+            $title = $item->get_title();
+            $attributes = array();
+            $attributes['itemprop'] = 'url';
+            if ($title !== '') {
+                $attributes['title'] = $title;
+            }
+            if ($item->hidden) {
+                $attributes['class'] = 'dimmed_text';
+            }
+            if ($item->is_last()) {
+                $attributes['aria-current'] = 'page';
+            }
+            $content = html_writer::tag('span', $content, array('itemprop' => 'title'));
+            $content = html_writer::link($item->action, $content, $attributes);
+
+            $attributes = array();
+            $attributes['itemscope'] = '';
+            $attributes['itemtype'] = 'http://data-vocabulary.org/Breadcrumb';
+            $content = html_writer::tag('span', $content, $attributes);
+
+        } else {
+            $content = $this->render_navigation_node($item);
+        }
+        return $content;
+    }
+
+    /**
+     * Renders a navigation node object.
+     *
+     * @param navigation_node $item The navigation node to render.
+     * @return string HTML fragment
+     */
+    protected function render_navigation_node(navigation_node $item) {
+        $content = $item->get_content();
+        $title = $item->get_title();
+        if ($item->icon instanceof renderable && !$item->hideicon) {
+            $icon = $this->render($item->icon);
+            $content = $icon.$content; // use CSS for spacing of icons
+        }
+        if ($item->helpbutton !== null) {
+            $content = trim($item->helpbutton).html_writer::tag('span', $content, array('class'=>'clearhelpbutton', 'tabindex'=>'0'));
+        }
+        if ($content === '') {
+            return '';
+        }
+        if ($item->action instanceof action_link) {
+            $link = $item->action;
+            if ($item->hidden) {
+                $link->add_class('dimmed');
+            }
+            if (!empty($content)) {
+                // Providing there is content we will use that for the link content.
+                $link->text = $content;
+            }
+            $content = $this->render($link);
+        } else if ($item->action instanceof moodle_url) {
+            $attributes = array();
+            if ($title !== '') {
+                $attributes['title'] = $title;
+            }
+            if ($item->hidden) {
+                $attributes['class'] = 'dimmed_text';
+            }
+            $content = html_writer::link($item->action, $content, $attributes);
+
+        } else if (is_string($item->action) || empty($item->action)) {
+            $attributes = array('tabindex'=>'0'); //add tab support to span but still maintain character stream sequence.
+            if ($title !== '') {
+                $attributes['title'] = $title;
+            }
+            if ($item->hidden) {
+                $attributes['class'] = 'dimmed_text';
+            }
+            $content = html_writer::tag('span', $content, $attributes);
+        }
+        return $content;
+    }
+
+    /**
+     * Accessibility: Right arrow-like character is
+     * used in the breadcrumb trail, course navigation menu
+     * (previous/next activity), calendar, and search forum block.
+     * If the theme does not set characters, appropriate defaults
+     * are set automatically. Please DO NOT
+     * use &lt; &gt; &raquo; - these are confusing for blind users.
+     *
+     * @return string
+     */
+    public function rarrow() {
+        return $this->page->theme->rarrow;
+    }
+
+    /**
+     * Accessibility: Left arrow-like character is
+     * used in the breadcrumb trail, course navigation menu
+     * (previous/next activity), calendar, and search forum block.
+     * If the theme does not set characters, appropriate defaults
+     * are set automatically. Please DO NOT
+     * use &lt; &gt; &raquo; - these are confusing for blind users.
+     *
+     * @return string
+     */
+    public function larrow() {
+        return $this->page->theme->larrow;
+    }
+
+    /**
+     * Accessibility: Up arrow-like character is used in
+     * the book heirarchical navigation.
+     * If the theme does not set characters, appropriate defaults
+     * are set automatically. Please DO NOT
+     * use ^ - this is confusing for blind users.
+     *
+     * @return string
+     */
+    public function uarrow() {
+        return $this->page->theme->uarrow;
+    }
+
+    /**
+     * Accessibility: Down arrow-like character.
+     * If the theme does not set characters, appropriate defaults
+     * are set automatically.
+     *
+     * @return string
+     */
+    public function darrow() {
+        return $this->page->theme->darrow;
+    }
+
+    /**
+     * Returns the custom menu if one has been set
+     *
+     * A custom menu can be configured by browsing to a theme's settings page
+     * and then configuring the custommenu config setting as described.
+     *
+     * Theme developers: DO NOT OVERRIDE! Please override function
+     * {@link core_renderer::render_custom_menu()} instead.
+     *
+     * @param string $custommenuitems - custom menuitems set by theme instead of global theme settings
+     * @return string
+     */
+    public function custom_menu($custommenuitems = '') {
+        global $CFG;
+
+        if (empty($custommenuitems) && !empty($CFG->custommenuitems)) {
+            $custommenuitems = $CFG->custommenuitems;
+        }
+        $custommenu = new custom_menu($custommenuitems, current_language());
+        return $this->render_custom_menu($custommenu);
+    }
+
+    /**
+     * We want to show the custom menus as a list of links in the footer on small screens.
+     * Just return the menu object exported so we can render it differently.
+     */
+    public function custom_menu_flat() {
+        global $CFG;
+        $custommenuitems = '';
+
+        if (empty($custommenuitems) && !empty($CFG->custommenuitems)) {
+            $custommenuitems = $CFG->custommenuitems;
+        }
+        $custommenu = new custom_menu($custommenuitems, current_language());
+        $langs = get_string_manager()->get_list_of_translations();
+        $haslangmenu = $this->lang_menu() != '';
+
+        if ($haslangmenu) {
+            $strlang = get_string('language');
+            $currentlang = current_language();
+            if (isset($langs[$currentlang])) {
+                $currentlang = $langs[$currentlang];
+            } else {
+                $currentlang = $strlang;
+            }
+            $this->language = $custommenu->add($currentlang, new moodle_url('#'), $strlang, 10000);
+            foreach ($langs as $langtype => $langname) {
+                $this->language->add($langname, new moodle_url($this->page->url, array('lang' => $langtype)), $langname);
+            }
+        }
+
+        return $custommenu->export_for_template($this);
+    }
+
+    /**
+     * Renders a custom menu object (located in outputcomponents.php)
+     *
+     * The custom menu this method produces makes use of the YUI3 menunav widget
+     * and requires very specific html elements and classes.
+     *
+     * @staticvar int $menucount
+     * @param custom_menu $menu
+     * @return string
+     */
+    protected function render_custom_menu(custom_menu $menu) {
+        global $CFG;
+
+        $langs = get_string_manager()->get_list_of_translations();
+        $haslangmenu = $this->lang_menu() != '';
+
+        if (!$menu->has_children() && !$haslangmenu) {
+            return '';
+        }
+
+        if ($haslangmenu) {
+            $strlang = get_string('language');
+            $currentlang = current_language();
+            if (isset($langs[$currentlang])) {
+                $currentlangstr = $langs[$currentlang];
+            } else {
+                $currentlangstr = $strlang;
+            }
+            $this->language = $menu->add($currentlangstr, new moodle_url('#'), $strlang, 10000);
+            foreach ($langs as $langtype => $langname) {
+                $attributes = [];
+                // Set the lang attribute for languages different from the page's current language.
+                if ($langtype !== $currentlang) {
+                    $attributes[] = [
+                        'key' => 'lang',
+                        'value' => get_html_lang_attribute_value($langtype),
+                    ];
+                }
+                $this->language->add($langname, new moodle_url($this->page->url, ['lang' => $langtype]), null, null, $attributes);
+            }
+        }
+
+        $content = '';
+        foreach ($menu->get_children() as $item) {
+            $context = $item->export_for_template($this);
+            $content .= $this->render_from_template('core/custom_menu_item', $context);
+        }
+
+        return $content;
+    }
+
+    /**
+     * Renders a custom menu node as part of a submenu
+     *
+     * The custom menu this method produces makes use of the YUI3 menunav widget
+     * and requires very specific html elements and classes.
+     *
+     * @see core:renderer::render_custom_menu()
+     *
+     * @staticvar int $submenucount
+     * @param custom_menu_item $menunode
+     * @return string
+     */
+    protected function render_custom_menu_item(custom_menu_item $menunode) {
+        // Required to ensure we get unique trackable id's
+        static $submenucount = 0;
+        if ($menunode->has_children()) {
+            // If the child has menus render it as a sub menu
+            $submenucount++;
+            $content = html_writer::start_tag('li');
+            if ($menunode->get_url() !== null) {
+                $url = $menunode->get_url();
+            } else {
+                $url = '#cm_submenu_'.$submenucount;
+            }
+            $content .= html_writer::link($url, $menunode->get_text(), array('class'=>'yui3-menu-label', 'title'=>$menunode->get_title()));
+            $content .= html_writer::start_tag('div', array('id'=>'cm_submenu_'.$submenucount, 'class'=>'yui3-menu custom_menu_submenu'));
+            $content .= html_writer::start_tag('div', array('class'=>'yui3-menu-content'));
+            $content .= html_writer::start_tag('ul');
+            foreach ($menunode->get_children() as $menunode) {
+                $content .= $this->render_custom_menu_item($menunode);
+            }
+            $content .= html_writer::end_tag('ul');
+            $content .= html_writer::end_tag('div');
+            $content .= html_writer::end_tag('div');
+            $content .= html_writer::end_tag('li');
+        } else {
+            // The node doesn't have children so produce a final menuitem.
+            // Also, if the node's text matches '####', add a class so we can treat it as a divider.
+            $content = '';
+            if (preg_match("/^#+$/", $menunode->get_text())) {
+
+                // This is a divider.
+                $content = html_writer::start_tag('li', array('class' => 'yui3-menuitem divider'));
+            } else {
+                $content = html_writer::start_tag(
+                    'li',
+                    array(
+                        'class' => 'yui3-menuitem'
+                    )
+                );
+                if ($menunode->get_url() !== null) {
+                    $url = $menunode->get_url();
+                } else {
+                    $url = '#';
+                }
+                $content .= html_writer::link(
+                    $url,
+                    $menunode->get_text(),
+                    array('class' => 'yui3-menuitem-content', 'title' => $menunode->get_title())
+                );
+            }
+            $content .= html_writer::end_tag('li');
+        }
+        // Return the sub menu
+        return $content;
+    }
+
+    /**
+     * Renders theme links for switching between default and other themes.
+     *
+     * @return string
+     */
+    protected function theme_switch_links() {
+
+        $actualdevice = core_useragent::get_device_type();
+        $currentdevice = $this->page->devicetypeinuse;
+        $switched = ($actualdevice != $currentdevice);
+
+        if (!$switched && $currentdevice == 'default' && $actualdevice == 'default') {
+            // The user is using the a default device and hasn't switched so don't shown the switch
+            // device links.
+            return '';
+        }
+
+        if ($switched) {
+            $linktext = get_string('switchdevicerecommended');
+            $devicetype = $actualdevice;
+        } else {
+            $linktext = get_string('switchdevicedefault');
+            $devicetype = 'default';
+        }
+        $linkurl = new moodle_url('/theme/switchdevice.php', array('url' => $this->page->url, 'device' => $devicetype, 'sesskey' => sesskey()));
+
+        $content  = html_writer::start_tag('div', array('id' => 'theme_switch_link'));
+        $content .= html_writer::link($linkurl, $linktext, array('rel' => 'nofollow'));
+        $content .= html_writer::end_tag('div');
+
+        return $content;
+    }
+
+    /**
+     * Renders tabs
+     *
+     * This function replaces print_tabs() used before Moodle 2.5 but with slightly different arguments
+     *
+     * Theme developers: In order to change how tabs are displayed please override functions
+     * {@link core_renderer::render_tabtree()} and/or {@link core_renderer::render_tabobject()}
+     *
+     * @param array $tabs array of tabs, each of them may have it's own ->subtree
+     * @param string|null $selected which tab to mark as selected, all parent tabs will
+     *     automatically be marked as activated
+     * @param array|string|null $inactive list of ids of inactive tabs, regardless of
+     *     their level. Note that you can as weel specify tabobject::$inactive for separate instances
+     * @return string
+     */
+    final public function tabtree($tabs, $selected = null, $inactive = null) {
+        return $this->render(new tabtree($tabs, $selected, $inactive));
+    }
+
+    /**
+     * Renders tabtree
+     *
+     * @param tabtree $tabtree
+     * @return string
+     */
+    protected function render_tabtree(tabtree $tabtree) {
+        if (empty($tabtree->subtree)) {
+            return '';
+        }
+        $data = $tabtree->export_for_template($this);
+        return $this->render_from_template('core/tabtree', $data);
+    }
+
+    /**
+     * Renders tabobject (part of tabtree)
+     *
+     * This function is called from {@link core_renderer::render_tabtree()}
+     * and also it calls itself when printing the $tabobject subtree recursively.
+     *
+     * Property $tabobject->level indicates the number of row of tabs.
+     *
+     * @param tabobject $tabobject
+     * @return string HTML fragment
+     */
+    protected function render_tabobject(tabobject $tabobject) {
+        $str = '';
+
+        // Print name of the current tab.
+        if ($tabobject instanceof tabtree) {
+            // No name for tabtree root.
+        } else if ($tabobject->inactive || $tabobject->activated || ($tabobject->selected && !$tabobject->linkedwhenselected)) {
+            // Tab name without a link. The <a> tag is used for styling.
+            $str .= html_writer::tag('a', html_writer::span($tabobject->text), array('class' => 'nolink moodle-has-zindex'));
+        } else {
+            // Tab name with a link.
+            if (!($tabobject->link instanceof moodle_url)) {
+                // backward compartibility when link was passed as quoted string
+                $str .= "<a href=\"$tabobject->link\" title=\"$tabobject->title\"><span>$tabobject->text</span></a>";
+            } else {
+                $str .= html_writer::link($tabobject->link, html_writer::span($tabobject->text), array('title' => $tabobject->title));
+            }
+        }
+
+        if (empty($tabobject->subtree)) {
+            if ($tabobject->selected) {
+                $str .= html_writer::tag('div', '&nbsp;', array('class' => 'tabrow'. ($tabobject->level + 1). ' empty'));
+            }
+            return $str;
+        }
+
+        // Print subtree.
+        if ($tabobject->level == 0 || $tabobject->selected || $tabobject->activated) {
+            $str .= html_writer::start_tag('ul', array('class' => 'tabrow'. $tabobject->level));
+            $cnt = 0;
+            foreach ($tabobject->subtree as $tab) {
+                $liclass = '';
+                if (!$cnt) {
+                    $liclass .= ' first';
+                }
+                if ($cnt == count($tabobject->subtree) - 1) {
+                    $liclass .= ' last';
+                }
+                if ((empty($tab->subtree)) && (!empty($tab->selected))) {
+                    $liclass .= ' onerow';
+                }
+
+                if ($tab->selected) {
+                    $liclass .= ' here selected';
+                } else if ($tab->activated) {
+                    $liclass .= ' here active';
+                }
+
+                // This will recursively call function render_tabobject() for each item in subtree.
+                $str .= html_writer::tag('li', $this->render($tab), array('class' => trim($liclass)));
+                $cnt++;
+            }
+            $str .= html_writer::end_tag('ul');
+        }
+
+        return $str;
+    }
+
+    /**
+     * Get the HTML for blocks in the given region.
+     *
+     * @since Moodle 2.5.1 2.6
+     * @param string $region The region to get HTML for.
+     * @param array $classes Wrapping tag classes.
+     * @param string $tag Wrapping tag.
+     * @param boolean $fakeblocksonly Include fake blocks only.
+     * @return string HTML.
+     */
+    public function blocks($region, $classes = array(), $tag = 'aside', $fakeblocksonly = false) {
+        $displayregion = $this->page->apply_theme_region_manipulations($region);
+        $classes = (array)$classes;
+        $classes[] = 'block-region';
+        $attributes = array(
+            'id' => 'block-region-'.preg_replace('#[^a-zA-Z0-9_\-]+#', '-', $displayregion),
+            'class' => join(' ', $classes),
+            'data-blockregion' => $displayregion,
+            'data-droptarget' => '1'
+        );
+        if ($this->page->blocks->region_has_content($displayregion, $this)) {
+            $content = html_writer::tag('h2', get_string('blocks'), ['class' => 'sr-only']) .
+                $this->blocks_for_region($displayregion, $fakeblocksonly);
+        } else {
+            $content = html_writer::tag('h2', get_string('blocks'), ['class' => 'sr-only']);
+        }
+        return html_writer::tag($tag, $content, $attributes);
+    }
+
+    /**
+     * Renders a custom block region.
+     *
+     * Use this method if you want to add an additional block region to the content of the page.
+     * Please note this should only be used in special situations.
+     * We want to leave the theme is control where ever possible!
+     *
+     * This method must use the same method that the theme uses within its layout file.
+     * As such it asks the theme what method it is using.
+     * It can be one of two values, blocks or blocks_for_region (deprecated).
+     *
+     * @param string $regionname The name of the custom region to add.
+     * @return string HTML for the block region.
+     */
+    public function custom_block_region($regionname) {
+        if ($this->page->theme->get_block_render_method() === 'blocks') {
+            return $this->blocks($regionname);
+        } else {
+            return $this->blocks_for_region($regionname);
+        }
+    }
+
+    /**
+     * Returns the CSS classes to apply to the body tag.
+     *
+     * @since Moodle 2.5.1 2.6
+     * @param array $additionalclasses Any additional classes to apply.
+     * @return string
+     */
+    public function body_css_classes(array $additionalclasses = array()) {
+        return $this->page->bodyclasses . ' ' . implode(' ', $additionalclasses);
+    }
+
+    /**
+     * The ID attribute to apply to the body tag.
+     *
+     * @since Moodle 2.5.1 2.6
+     * @return string
+     */
+    public function body_id() {
+        return $this->page->bodyid;
+    }
+
+    /**
+     * Returns HTML attributes to use within the body tag. This includes an ID and classes.
+     *
+     * @since Moodle 2.5.1 2.6
+     * @param string|array $additionalclasses Any additional classes to give the body tag,
+     * @return string
+     */
+    public function body_attributes($additionalclasses = array()) {
+        if (!is_array($additionalclasses)) {
+            $additionalclasses = explode(' ', $additionalclasses);
+        }
+        return ' id="'. $this->body_id().'" class="'.$this->body_css_classes($additionalclasses).'"';
+    }
+
+    /**
+     * Gets HTML for the page heading.
+     *
+     * @since Moodle 2.5.1 2.6
+     * @param string $tag The tag to encase the heading in. h1 by default.
+     * @return string HTML.
+     */
+    public function page_heading($tag = 'h1') {
+        return html_writer::tag($tag, $this->page->heading);
+    }
+
+    /**
+     * Gets the HTML for the page heading button.
+     *
+     * @since Moodle 2.5.1 2.6
+     * @return string HTML.
+     */
+    public function page_heading_button() {
+        return $this->page->button;
+    }
+
+    /**
+     * Returns the Moodle docs link to use for this page.
+     *
+     * @since Moodle 2.5.1 2.6
+     * @param string $text
+     * @return string
+     */
+    public function page_doc_link($text = null) {
+        if ($text === null) {
+            $text = get_string('moodledocslink');
+        }
+        $path = page_get_doc_link_path($this->page);
+        if (!$path) {
+            return '';
+        }
+        return $this->doc_link($path, $text);
+    }
+
+    /**
+     * Returns the HTML for the site support email link
+     *
+     * @param array $customattribs Array of custom attributes for the support email anchor tag.
+     * @param bool $embed Set to true if you want to embed the link in other inline content.
+     * @return string The html code for the support email link.
+     */
+    public function supportemail(array $customattribs = [], bool $embed = false): string {
+        global $CFG;
+
+        // Do not provide a link to contact site support if it is unavailable to this user. This would be where the site has
+        // disabled support, or limited it to authenticated users and the current user is a guest or not logged in.
+        if (!isset($CFG->supportavailability) ||
+                $CFG->supportavailability == CONTACT_SUPPORT_DISABLED ||
+                ($CFG->supportavailability == CONTACT_SUPPORT_AUTHENTICATED && (!isloggedin() || isguestuser()))) {
+            return '';
+        }
+
+        $label = get_string('contactsitesupport', 'admin');
+        $icon = $this->pix_icon('t/email', '');
+
+        if (!$embed) {
+            $content = $icon . $label;
+        } else {
+            $content = $label;
+        }
+
+        if (!empty($CFG->supportpage)) {
+            $attributes = ['href' => $CFG->supportpage, 'target' => 'blank'];
+            $content .= $this->pix_icon('i/externallink', '', 'moodle', ['class' => 'ml-1']);
+        } else {
+            $attributes = ['href' => $CFG->wwwroot . '/user/contactsitesupport.php'];
+        }
+
+        $attributes += $customattribs;
+
+        return html_writer::tag('a', $content, $attributes);
+    }
+
+    /**
+     * Returns the services and support link for the help pop-up.
+     *
+     * @return string
+     */
+    public function services_support_link(): string {
+        global $CFG;
+
+        if (during_initial_install() ||
+            (isset($CFG->showservicesandsupportcontent) && $CFG->showservicesandsupportcontent == false) ||
+            !is_siteadmin()) {
+            return '';
+        }
+
+        $liferingicon = $this->pix_icon('t/life-ring', '', 'moodle', ['class' => 'fa fa-life-ring']);
+        $newwindowicon = $this->pix_icon('i/externallink', get_string('opensinnewwindow'), 'moodle', ['class' => 'ml-1']);
+        $link = !empty($CFG->servicespage)
+            ? $CFG->servicespage
+            : 'https://moodle.com/help/?utm_source=CTA-banner&utm_medium=platform&utm_campaign=name~Moodle4+cat~lms+mp~no';
+        $content = $liferingicon . get_string('moodleservicesandsupport') . $newwindowicon;
+
+        return html_writer::tag('a', $content, ['target' => '_blank', 'href' => $link]);
+    }
+
+    /**
+     * Helper function to decide whether to show the help popover header or not.
+     *
+     * @return bool
+     */
+    public function has_popover_links(): bool {
+        return !empty($this->services_support_link()) || !empty($this->page_doc_link()) || !empty($this->supportemail());
+    }
+
+    /**
+     * Helper function to decide whether to show the communication link or not.
+     *
+     * @return bool
+     */
+    public function has_communication_links(): bool {
+        if (during_initial_install() || !core_communication\api::is_available()) {
+            return false;
+        }
+        return !empty($this->communication_link());
+    }
+
+    /**
+     * Returns the communication link, complete with html.
+     *
+     * @return string
+     */
+    public function communication_link(): string {
+        $link = $this->communication_url() ?? '';
+        $commicon = $this->pix_icon('t/messages-o', '', 'moodle', ['class' => 'fa fa-comments']);
+        $newwindowicon = $this->pix_icon('i/externallink', get_string('opensinnewwindow'), 'moodle', ['class' => 'ml-1']);
+        $content = $commicon . get_string('communicationroomlink', 'course') . $newwindowicon;
+        $html = html_writer::tag('a', $content, ['target' => '_blank', 'href' => $link]);
+
+        return !empty($link) ? $html : '';
+    }
+
+    /**
+     * Returns the communication url for a given instance if it exists.
+     *
+     * @return string
+     */
+    public function communication_url(): string {
+        global $COURSE;
+        return \core_communication\helper::get_course_communication_url($COURSE);
+    }
+
+    /**
+     * Returns the page heading menu.
+     *
+     * @since Moodle 2.5.1 2.6
+     * @return string HTML.
+     */
+    public function page_heading_menu() {
+        return $this->page->headingmenu;
+    }
+
+    /**
+     * Returns the title to use on the page.
+     *
+     * @since Moodle 2.5.1 2.6
+     * @return string
+     */
+    public function page_title() {
+        return $this->page->title;
+    }
+
+    /**
+     * Returns the moodle_url for the favicon.
+     *
+     * @since Moodle 2.5.1 2.6
+     * @return moodle_url The moodle_url for the favicon
+     */
+    public function favicon() {
+        $logo = null;
+        if (!during_initial_install()) {
+            $logo = get_config('core_admin', 'favicon');
+        }
+        if (empty($logo)) {
+            return $this->image_url('favicon', 'theme');
+        }
+
+        // Use $CFG->themerev to prevent browser caching when the file changes.
+        return moodle_url::make_pluginfile_url(context_system::instance()->id, 'core_admin', 'favicon', '64x64/',
+            theme_get_revision(), $logo);
+    }
+
+    /**
+     * Renders preferences groups.
+     *
+     * @param  preferences_groups $renderable The renderable
+     * @return string The output.
+     */
+    public function render_preferences_groups(preferences_groups $renderable) {
+        return $this->render_from_template('core/preferences_groups', $renderable);
+    }
+
+    /**
+     * Renders preferences group.
+     *
+     * @param  preferences_group $renderable The renderable
+     * @return string The output.
+     */
+    public function render_preferences_group(preferences_group $renderable) {
+        $html = '';
+        $html .= html_writer::start_tag('div', array('class' => 'col-sm-4 preferences-group'));
+        $html .= $this->heading($renderable->title, 3);
+        $html .= html_writer::start_tag('ul');
+        foreach ($renderable->nodes as $node) {
+            if ($node->has_children()) {
+                debugging('Preferences nodes do not support children', DEBUG_DEVELOPER);
+            }
+            $html .= html_writer::tag('li', $this->render($node));
+        }
+        $html .= html_writer::end_tag('ul');
+        $html .= html_writer::end_tag('div');
+        return $html;
+    }
+
+    public function context_header($headerinfo = null, $headinglevel = 1) {
+        global $DB, $USER, $CFG, $SITE;
+        require_once($CFG->dirroot . '/user/lib.php');
+        $context = $this->page->context;
+        $heading = null;
+        $imagedata = null;
+        $subheader = null;
+        $userbuttons = null;
+
+        // Make sure to use the heading if it has been set.
+        if (isset($headerinfo['heading'])) {
+            $heading = $headerinfo['heading'];
+        } else {
+            $heading = $this->page->heading;
+        }
+
+        // The user context currently has images and buttons. Other contexts may follow.
+        if ((isset($headerinfo['user']) || $context->contextlevel == CONTEXT_USER) && $this->page->pagetype !== 'my-index') {
+            if (isset($headerinfo['user'])) {
+                $user = $headerinfo['user'];
+            } else {
+                // Look up the user information if it is not supplied.
+                $user = $DB->get_record('user', array('id' => $context->instanceid));
+            }
+
+            // If the user context is set, then use that for capability checks.
+            if (isset($headerinfo['usercontext'])) {
+                $context = $headerinfo['usercontext'];
+            }
+
+            // Only provide user information if the user is the current user, or a user which the current user can view.
+            // When checking user_can_view_profile(), either:
+            // If the page context is course, check the course context (from the page object) or;
+            // If page context is NOT course, then check across all courses.
+            $course = ($this->page->context->contextlevel == CONTEXT_COURSE) ? $this->page->course : null;
+
+            if (user_can_view_profile($user, $course)) {
+                // Use the user's full name if the heading isn't set.
+                if (empty($heading)) {
+                    $heading = fullname($user);
+                }
+
+                $imagedata = $this->user_picture($user, array('size' => 100));
+
+                // Check to see if we should be displaying a message button.
+                if (!empty($CFG->messaging) && has_capability('moodle/site:sendmessage', $context)) {
+                    $userbuttons = array(
+                        'messages' => array(
+                            'buttontype' => 'message',
+                            'title' => get_string('message', 'message'),
+                            'url' => new moodle_url('/message/index.php', array('id' => $user->id)),
+                            'image' => 'message',
+                            'linkattributes' => \core_message\helper::messageuser_link_params($user->id),
+                            'page' => $this->page
+                        )
+                    );
+
+                    if ($USER->id != $user->id) {
+                        $iscontact = \core_message\api::is_contact($USER->id, $user->id);
+                        $isrequested = \core_message\api::get_contact_requests_between_users($USER->id, $user->id);
+                        $contacturlaction = '';
+                        $linkattributes = \core_message\helper::togglecontact_link_params(
+                            $user,
+                            $iscontact,
+                            true,
+                            !empty($isrequested),
+                        );
+                        // If the user is not a contact.
+                        if (!$iscontact) {
+                            if ($isrequested) {
+                                // We just need the first request.
+                                $requests = array_shift($isrequested);
+                                if ($requests->userid == $USER->id) {
+                                    // If the user has requested to be a contact.
+                                    $contacttitle = 'contactrequestsent';
+                                } else {
+                                    // If the user has been requested to be a contact.
+                                    $contacttitle = 'waitingforcontactaccept';
+                                }
+                                $linkattributes = array_merge($linkattributes, [
+                                    'class' => 'disabled',
+                                    'tabindex' => '-1',
+                                ]);
+                            } else {
+                                // If the user is not a contact and has not requested to be a contact.
+                                $contacttitle = 'addtoyourcontacts';
+                                $contacturlaction = 'addcontact';
+                            }
+                            $contactimage = 'addcontact';
+                        } else {
+                            // If the user is a contact.
+                            $contacttitle = 'removefromyourcontacts';
+                            $contacturlaction = 'removecontact';
+                            $contactimage = 'removecontact';
+                        }
+                        $userbuttons['togglecontact'] = array(
+                                'buttontype' => 'togglecontact',
+                                'title' => get_string($contacttitle, 'message'),
+                                'url' => new moodle_url('/message/index.php', array(
+                                        'user1' => $USER->id,
+                                        'user2' => $user->id,
+                                        $contacturlaction => $user->id,
+                                        'sesskey' => sesskey())
+                                ),
+                                'image' => $contactimage,
+                                'linkattributes' => $linkattributes,
+                                'page' => $this->page
+                            );
+                    }
+                }
+            } else {
+                $heading = null;
+            }
+        }
+
+        // Return the heading wrapped in an sr-only element so it is only visible to screen-readers for nocontextheader layouts.
+        if (!empty($this->page->layout_options['nocontextheader'])) {
+            return html_writer::div($heading, 'sr-only');
+        }
+
+        $contextheader = new context_header($heading, $headinglevel, $imagedata, $userbuttons);
+        return $this->render($contextheader);
+    }
+
+    /**
+     * Renders the skip links for the page.
+     *
+     * @param array $links List of skip links.
+     * @return string HTML for the skip links.
+     */
+    public function render_skip_links($links) {
+        $context = [ 'links' => []];
+
+        foreach ($links as $url => $text) {
+            $context['links'][] = [ 'url' => $url, 'text' => $text];
+        }
+
+        return $this->render_from_template('core/skip_links', $context);
+    }
+
+    /**
+     * Wrapper for header elements.
+     *
+     * @return string HTML to display the main header.
+     */
+    public function full_header() {
+        $pagetype = $this->page->pagetype;
+        $homepage = get_home_page();
+        $homepagetype = null;
+        // Add a special case since /my/courses is a part of the /my subsystem.
+        if ($homepage == HOMEPAGE_MY || $homepage == HOMEPAGE_MYCOURSES) {
+            $homepagetype = 'my-index';
+        } else if ($homepage == HOMEPAGE_SITE) {
+            $homepagetype = 'site-index';
+        }
+        if ($this->page->include_region_main_settings_in_header_actions() &&
+                !$this->page->blocks->is_block_present('settings')) {
+            // Only include the region main settings if the page has requested it and it doesn't already have
+            // the settings block on it. The region main settings are included in the settings block and
+            // duplicating the content causes behat failures.
+            $this->page->add_header_action(html_writer::div(
+                $this->region_main_settings_menu(),
+                'd-print-none',
+                ['id' => 'region-main-settings-menu']
+            ));
+        }
+
+        $header = new stdClass();
+        $header->settingsmenu = $this->context_header_settings_menu();
+        $header->contextheader = $this->context_header();
+        $header->hasnavbar = empty($this->page->layout_options['nonavbar']);
+        $header->navbar = $this->navbar();
+        $header->pageheadingbutton = $this->page_heading_button();
+        $header->courseheader = $this->course_header();
+        $header->headeractions = $this->page->get_header_actions();
+        if (!empty($pagetype) && !empty($homepagetype) && $pagetype == $homepagetype) {
+            $header->welcomemessage = \core_user::welcome_message();
+        }
+        return $this->render_from_template('core/full_header', $header);
+    }
+
+    /**
+     * This is an optional menu that can be added to a layout by a theme. It contains the
+     * menu for the course administration, only on the course main page.
+     *
+     * @return string
+     */
+    public function context_header_settings_menu() {
+        $context = $this->page->context;
+        $menu = new action_menu();
+
+        $items = $this->page->navbar->get_items();
+        $currentnode = end($items);
+
+        $showcoursemenu = false;
+        $showfrontpagemenu = false;
+        $showusermenu = false;
+
+        // We are on the course home page.
+        if (($context->contextlevel == CONTEXT_COURSE) &&
+                !empty($currentnode) &&
+                ($currentnode->type == navigation_node::TYPE_COURSE || $currentnode->type == navigation_node::TYPE_SECTION)) {
+            $showcoursemenu = true;
+        }
+
+        $courseformat = course_get_format($this->page->course);
+        // This is a single activity course format, always show the course menu on the activity main page.
+        if ($context->contextlevel == CONTEXT_MODULE &&
+                !$courseformat->has_view_page()) {
+
+            $this->page->navigation->initialise();
+            $activenode = $this->page->navigation->find_active_node();
+            // If the settings menu has been forced then show the menu.
+            if ($this->page->is_settings_menu_forced()) {
+                $showcoursemenu = true;
+            } else if (!empty($activenode) && ($activenode->type == navigation_node::TYPE_ACTIVITY ||
+                            $activenode->type == navigation_node::TYPE_RESOURCE)) {
+
+                // We only want to show the menu on the first page of the activity. This means
+                // the breadcrumb has no additional nodes.
+                if ($currentnode && ($currentnode->key == $activenode->key && $currentnode->type == $activenode->type)) {
+                    $showcoursemenu = true;
+                }
+            }
+        }
+
+        // This is the site front page.
+        if ($context->contextlevel == CONTEXT_COURSE &&
+                !empty($currentnode) &&
+                $currentnode->key === 'home') {
+            $showfrontpagemenu = true;
+        }
+
+        // This is the user profile page.
+        if ($context->contextlevel == CONTEXT_USER &&
+                !empty($currentnode) &&
+                ($currentnode->key === 'myprofile')) {
+            $showusermenu = true;
+        }
+
+        if ($showfrontpagemenu) {
+            $settingsnode = $this->page->settingsnav->find('frontpage', navigation_node::TYPE_SETTING);
+            if ($settingsnode) {
+                // Build an action menu based on the visible nodes from this navigation tree.
+                $skipped = $this->build_action_menu_from_navigation($menu, $settingsnode, false, true);
+
+                // We only add a list to the full settings menu if we didn't include every node in the short menu.
+                if ($skipped) {
+                    $text = get_string('morenavigationlinks');
+                    $url = new moodle_url('/course/admin.php', array('courseid' => $this->page->course->id));
+                    $link = new action_link($url, $text, null, null, new pix_icon('t/edit', $text));
+                    $menu->add_secondary_action($link);
+                }
+            }
+        } else if ($showcoursemenu) {
+            $settingsnode = $this->page->settingsnav->find('courseadmin', navigation_node::TYPE_COURSE);
+            if ($settingsnode) {
+                // Build an action menu based on the visible nodes from this navigation tree.
+                $skipped = $this->build_action_menu_from_navigation($menu, $settingsnode, false, true);
+
+                // We only add a list to the full settings menu if we didn't include every node in the short menu.
+                if ($skipped) {
+                    $text = get_string('morenavigationlinks');
+                    $url = new moodle_url('/course/admin.php', array('courseid' => $this->page->course->id));
+                    $link = new action_link($url, $text, null, null, new pix_icon('t/edit', $text));
+                    $menu->add_secondary_action($link);
+                }
+            }
+        } else if ($showusermenu) {
+            // Get the course admin node from the settings navigation.
+            $settingsnode = $this->page->settingsnav->find('useraccount', navigation_node::TYPE_CONTAINER);
+            if ($settingsnode) {
+                // Build an action menu based on the visible nodes from this navigation tree.
+                $this->build_action_menu_from_navigation($menu, $settingsnode);
+            }
+        }
+
+        return $this->render($menu);
+    }
+
+    /**
+     * Take a node in the nav tree and make an action menu out of it.
+     * The links are injected in the action menu.
+     *
+     * @param action_menu $menu
+     * @param navigation_node $node
+     * @param boolean $indent
+     * @param boolean $onlytopleafnodes
+     * @return boolean nodesskipped - True if nodes were skipped in building the menu
+     */
+    protected function build_action_menu_from_navigation(action_menu $menu,
+            navigation_node $node,
+            $indent = false,
+            $onlytopleafnodes = false) {
+        $skipped = false;
+        // Build an action menu based on the visible nodes from this navigation tree.
+        foreach ($node->children as $menuitem) {
+            if ($menuitem->display) {
+                if ($onlytopleafnodes && $menuitem->children->count()) {
+                    $skipped = true;
+                    continue;
+                }
+                if ($menuitem->action) {
+                    if ($menuitem->action instanceof action_link) {
+                        $link = $menuitem->action;
+                        // Give preference to setting icon over action icon.
+                        if (!empty($menuitem->icon)) {
+                            $link->icon = $menuitem->icon;
+                        }
+                    } else {
+                        $link = new action_link($menuitem->action, $menuitem->text, null, null, $menuitem->icon);
+                    }
+                } else {
+                    if ($onlytopleafnodes) {
+                        $skipped = true;
+                        continue;
+                    }
+                    $link = new action_link(new moodle_url('#'), $menuitem->text, null, ['disabled' => true], $menuitem->icon);
+                }
+                if ($indent) {
+                    $link->add_class('ml-4');
+                }
+                if (!empty($menuitem->classes)) {
+                    $link->add_class(implode(" ", $menuitem->classes));
+                }
+
+                $menu->add_secondary_action($link);
+                $skipped = $skipped || $this->build_action_menu_from_navigation($menu, $menuitem, true);
+            }
+        }
+        return $skipped;
+    }
+
+    /**
+     * This is an optional menu that can be added to a layout by a theme. It contains the
+     * menu for the most specific thing from the settings block. E.g. Module administration.
+     *
+     * @return string
+     */
+    public function region_main_settings_menu() {
+        $context = $this->page->context;
+        $menu = new action_menu();
+
+        if ($context->contextlevel == CONTEXT_MODULE) {
+
+            $this->page->navigation->initialise();
+            $node = $this->page->navigation->find_active_node();
+            $buildmenu = false;
+            // If the settings menu has been forced then show the menu.
+            if ($this->page->is_settings_menu_forced()) {
+                $buildmenu = true;
+            } else if (!empty($node) && ($node->type == navigation_node::TYPE_ACTIVITY ||
+                            $node->type == navigation_node::TYPE_RESOURCE)) {
+
+                $items = $this->page->navbar->get_items();
+                $navbarnode = end($items);
+                // We only want to show the menu on the first page of the activity. This means
+                // the breadcrumb has no additional nodes.
+                if ($navbarnode && ($navbarnode->key === $node->key && $navbarnode->type == $node->type)) {
+                    $buildmenu = true;
+                }
+            }
+            if ($buildmenu) {
+                // Get the course admin node from the settings navigation.
+                $node = $this->page->settingsnav->find('modulesettings', navigation_node::TYPE_SETTING);
+                if ($node) {
+                    // Build an action menu based on the visible nodes from this navigation tree.
+                    $this->build_action_menu_from_navigation($menu, $node);
+                }
+            }
+
+        } else if ($context->contextlevel == CONTEXT_COURSECAT) {
+            // For course category context, show category settings menu, if we're on the course category page.
+            if ($this->page->pagetype === 'course-index-category') {
+                $node = $this->page->settingsnav->find('categorysettings', navigation_node::TYPE_CONTAINER);
+                if ($node) {
+                    // Build an action menu based on the visible nodes from this navigation tree.
+                    $this->build_action_menu_from_navigation($menu, $node);
+                }
+            }
+
+        } else {
+            $items = $this->page->navbar->get_items();
+            $navbarnode = end($items);
+
+            if ($navbarnode && ($navbarnode->key === 'participants')) {
+                $node = $this->page->settingsnav->find('users', navigation_node::TYPE_CONTAINER);
+                if ($node) {
+                    // Build an action menu based on the visible nodes from this navigation tree.
+                    $this->build_action_menu_from_navigation($menu, $node);
+                }
+
+            }
+        }
+        return $this->render($menu);
+    }
+
+    /**
+     * Displays the list of tags associated with an entry
+     *
+     * @param array $tags list of instances of core_tag or stdClass
+     * @param string $label label to display in front, by default 'Tags' (get_string('tags')), set to null
+     *               to use default, set to '' (empty string) to omit the label completely
+     * @param string $classes additional classes for the enclosing div element
+     * @param int $limit limit the number of tags to display, if size of $tags is more than this limit the "more" link
+     *               will be appended to the end, JS will toggle the rest of the tags
+     * @param context $pagecontext specify if needed to overwrite the current page context for the view tag link
+     * @param bool $accesshidelabel if true, the label should have class="accesshide" added.
+     * @return string
+     */
+    public function tag_list($tags, $label = null, $classes = '', $limit = 10,
+            $pagecontext = null, $accesshidelabel = false) {
+        $list = new \core_tag\output\taglist($tags, $label, $classes, $limit, $pagecontext, $accesshidelabel);
+        return $this->render_from_template('core_tag/taglist', $list->export_for_template($this));
+    }
+
+    /**
+     * Renders element for inline editing of any value
+     *
+     * @param \core\output\inplace_editable $element
+     * @return string
+     */
+    public function render_inplace_editable(\core\output\inplace_editable $element) {
+        return $this->render_from_template('core/inplace_editable', $element->export_for_template($this));
+    }
+
+    /**
+     * Renders a bar chart.
+     *
+     * @param \core\chart_bar $chart The chart.
+     * @return string
+     */
+    public function render_chart_bar(\core\chart_bar $chart) {
+        return $this->render_chart($chart);
+    }
+
+    /**
+     * Renders a line chart.
+     *
+     * @param \core\chart_line $chart The chart.
+     * @return string
+     */
+    public function render_chart_line(\core\chart_line $chart) {
+        return $this->render_chart($chart);
+    }
+
+    /**
+     * Renders a pie chart.
+     *
+     * @param \core\chart_pie $chart The chart.
+     * @return string
+     */
+    public function render_chart_pie(\core\chart_pie $chart) {
+        return $this->render_chart($chart);
+    }
+
+    /**
+     * Renders a chart.
+     *
+     * @param \core\chart_base $chart The chart.
+     * @param bool $withtable Whether to include a data table with the chart.
+     * @return string
+     */
+    public function render_chart(\core\chart_base $chart, $withtable = true) {
+        $chartdata = json_encode($chart);
+        return $this->render_from_template('core/chart', (object) [
+            'chartdata' => $chartdata,
+            'withtable' => $withtable
+        ]);
+    }
+
+    /**
+     * Renders the login form.
+     *
+     * @param \core_auth\output\login $form The renderable.
+     * @return string
+     */
+    public function render_login(\core_auth\output\login $form) {
+        global $CFG, $SITE;
+
+        $context = $form->export_for_template($this);
+
+        $context->errorformatted = $this->error_text($context->error);
+        $url = $this->get_logo_url();
+        if ($url) {
+            $url = $url->out(false);
+        }
+        $context->logourl = $url;
+        $context->sitename = format_string($SITE->fullname, true,
+                ['context' => context_course::instance(SITEID), "escape" => false]);
+
+        return $this->render_from_template('core/loginform', $context);
+    }
+
+    /**
+     * Renders an mform element from a template.
+     *
+     * @param HTML_QuickForm_element $element element
+     * @param bool $required if input is required field
+     * @param bool $advanced if input is an advanced field
+     * @param string $error error message to display
+     * @param bool $ingroup True if this element is rendered as part of a group
+     * @return mixed string|bool
+     */
+    public function mform_element($element, $required, $advanced, $error, $ingroup) {
+        $templatename = 'core_form/element-' . $element->getType();
+        if ($ingroup) {
+            $templatename .= "-inline";
+        }
+        try {
+            // We call this to generate a file not found exception if there is no template.
+            // We don't want to call export_for_template if there is no template.
+            core\output\mustache_template_finder::get_template_filepath($templatename);
+
+            if ($element instanceof templatable) {
+                $elementcontext = $element->export_for_template($this);
+
+                $helpbutton = '';
+                if (method_exists($element, 'getHelpButton')) {
+                    $helpbutton = $element->getHelpButton();
+                }
+                $label = $element->getLabel();
+                $text = '';
+                if (method_exists($element, 'getText')) {
+                    // There currently exists code that adds a form element with an empty label.
+                    // If this is the case then set the label to the description.
+                    if (empty($label)) {
+                        $label = $element->getText();
+                    } else {
+                        $text = $element->getText();
+                    }
+                }
+
+                // Generate the form element wrapper ids and names to pass to the template.
+                // This differs between group and non-group elements.
+                if ($element->getType() === 'group') {
+                    // Group element.
+                    // The id will be something like 'fgroup_id_NAME'. E.g. fgroup_id_mygroup.
+                    $elementcontext['wrapperid'] = $elementcontext['id'];
+
+                    // Ensure group elements pass through the group name as the element name.
+                    $elementcontext['name'] = $elementcontext['groupname'];
+                } else {
+                    // Non grouped element.
+                    // Creates an id like 'fitem_id_NAME'. E.g. fitem_id_mytextelement.
+                    $elementcontext['wrapperid'] = 'fitem_' . $elementcontext['id'];
+                }
+
+                $context = array(
+                    'element' => $elementcontext,
+                    'label' => $label,
+                    'text' => $text,
+                    'required' => $required,
+                    'advanced' => $advanced,
+                    'helpbutton' => $helpbutton,
+                    'error' => $error
+                );
+                return $this->render_from_template($templatename, $context);
+            }
+        } catch (Exception $e) {
+            // No template for this element.
+            return false;
+        }
+    }
+
+    /**
+     * Render the login signup form into a nice template for the theme.
+     *
+     * @param moodleform $form
+     * @return string
+     */
+    public function render_login_signup_form($form) {
+        global $SITE;
+
+        $context = $form->export_for_template($this);
+        $url = $this->get_logo_url();
+        if ($url) {
+            $url = $url->out(false);
+        }
+        $context['logourl'] = $url;
+        $context['sitename'] = format_string($SITE->fullname, true,
+                ['context' => context_course::instance(SITEID), "escape" => false]);
+
+        return $this->render_from_template('core/signup_form_layout', $context);
+    }
+
+    /**
+     * Render the verify age and location page into a nice template for the theme.
+     *
+     * @param \core_auth\output\verify_age_location_page $page The renderable
+     * @return string
+     */
+    protected function render_verify_age_location_page($page) {
+        $context = $page->export_for_template($this);
+
+        return $this->render_from_template('core/auth_verify_age_location_page', $context);
+    }
+
+    /**
+     * Render the digital minor contact information page into a nice template for the theme.
+     *
+     * @param \core_auth\output\digital_minor_page $page The renderable
+     * @return string
+     */
+    protected function render_digital_minor_page($page) {
+        $context = $page->export_for_template($this);
+
+        return $this->render_from_template('core/auth_digital_minor_page', $context);
+    }
+
+    /**
+     * Renders a progress bar.
+     *
+     * Do not use $OUTPUT->render($bar), instead use progress_bar::create().
+     *
+     * @param  progress_bar $bar The bar.
+     * @return string HTML fragment
+     */
+    public function render_progress_bar(progress_bar $bar) {
+        $data = $bar->export_for_template($this);
+        return $this->render_from_template('core/progress_bar', $data);
+    }
+
+    /**
+     * Renders an update to a progress bar.
+     *
+     * Note: This does not cleanly map to a renderable class and should
+     * never be used directly.
+     *
+     * @param  string $id
+     * @param  float $percent
+     * @param  string $msg Message
+     * @param  string $estimate time remaining message
+     * @return string ascii fragment
+     */
+    public function render_progress_bar_update(string $id, float $percent, string $msg, string $estimate): string {
+        return html_writer::script(js_writer::function_call('updateProgressBar', [
+            $id,
+            round($percent, 1),
+            $msg,
+            $estimate,
+        ]));
+    }
+
+    /**
+     * Renders element for a toggle-all checkbox.
+     *
+     * @param \core\output\checkbox_toggleall $element
+     * @return string
+     */
+    public function render_checkbox_toggleall(\core\output\checkbox_toggleall $element) {
+        return $this->render_from_template($element->get_template(), $element->export_for_template($this));
+    }
+
+    /**
+     * Renders the tertiary nav for the participants page
+     *
+     * @param object $course The course we are operating within
+     * @param string|null $renderedbuttons Any additional buttons/content to be displayed in line with the nav
+     * @return string
+     */
+    public function render_participants_tertiary_nav(object $course, ?string $renderedbuttons = null) {
+        $actionbar = new \core\output\participants_action_bar($course, $this->page, $renderedbuttons);
+        $content = $this->render_from_template('core_course/participants_actionbar', $actionbar->export_for_template($this));
+        return $content ?: "";
+    }
+
+    /**
+     * Renders release information in the footer popup
+     * @return ?string Moodle release info.
+     */
+    public function moodle_release() {
+        global $CFG;
+        if (!during_initial_install() && is_siteadmin()) {
+            return $CFG->release;
+        }
+    }
+
+    /**
+     * Generate the add block button when editing mode is turned on and the user can edit blocks.
+     *
+     * @param string $region where new blocks should be added.
+     * @return string html for the add block button.
+     */
+    public function addblockbutton($region = ''): string {
+        $addblockbutton = '';
+        $regions = $this->page->blocks->get_regions();
+        if (count($regions) == 0) {
+            return '';
+        }
+        if (isset($this->page->theme->addblockposition) &&
+                $this->page->user_is_editing() &&
+                $this->page->user_can_edit_blocks() &&
+                $this->page->pagelayout !== 'mycourses'
+        ) {
+            $params = ['bui_addblock' => '', 'sesskey' => sesskey()];
+            if (!empty($region)) {
+                $params['bui_blockregion'] = $region;
+            }
+            $url = new moodle_url($this->page->url, $params);
+            $addblockbutton = $this->render_from_template('core/add_block_button',
+                [
+                    'link' => $url->out(false),
+                    'escapedlink' => "?{$url->get_query_string(false)}",
+                    'pagehash' => $this->page->get_edited_page_hash(),
+                    'blockregion' => $region,
+                    // The following parameters are not used since Moodle 4.2 but are
+                    // still passed for backward-compatibility.
+                    'pageType' => $this->page->pagetype,
+                    'pageLayout' => $this->page->pagelayout,
+                    'subPage' => $this->page->subpage,
+                ]
+            );
+        }
+        return $addblockbutton;
+    }
+
+    /**
+     * Prepares an element for streaming output
+     *
+     * This must be used with NO_OUTPUT_BUFFERING set to true. After using this method
+     * any subsequent prints or echos to STDOUT result in the outputted content magically
+     * being appended inside that element rather than where the current html would be
+     * normally. This enables pages which take some time to render incremental content to
+     * first output a fully formed html page, including the footer, and to then stream
+     * into an element such as the main content div. This fixes a class of page layout
+     * bugs and reduces layout shift issues and was inspired by Facebook BigPipe.
+     *
+     * Some use cases such as a simple page which loads content via ajax could be swapped
+     * to this method wich saves another http request and its network latency resulting
+     * in both lower server load and better front end performance.
+     *
+     * You should consider giving the element you stream into a minimum height to further
+     * reduce layout shift as the content initally streams into the element.
+     *
+     * You can safely finish the output without closing the streamed element. You can also
+     * call this method again to swap the target of the streaming to a new element as
+     * often as you want.
+
+     * https://www.youtube.com/watch?v=LLRig4s1_yA&t=1022s
+     * Watch this video segment to explain how and why this 'One Weird Trick' works.
+     *
+     * @param string $selector where new content should be appended
+     * @param string $element which contains the streamed content
+     * @return string html to be written
+     */
+    public function select_element_for_append(string $selector = '#region-main [role=main]', string $element = 'div') {
+
+        if (!CLI_SCRIPT && !NO_OUTPUT_BUFFERING) {
+            throw new coding_exception('select_element_for_append used in a non-CLI script without setting NO_OUTPUT_BUFFERING.',
+                DEBUG_DEVELOPER);
+        }
+
+        // We are already streaming into this element so don't change anything.
+        if ($this->currentselector === $selector && $this->currentelement === $element) {
+            return;
+        }
+
+        // If we have a streaming element close it before starting a new one.
+        $html = $this->close_element_for_append();
+
+        $this->currentselector = $selector;
+        $this->currentelement = $element;
+
+        // Create an unclosed element for the streamed content to append into.
+        $id = uniqid();
+        $html .= html_writer::start_tag($element, ['id' => $id]);
+        $html .= html_writer::tag('script', "document.querySelector('$selector').append(document.getElementById('$id'))");
+        $html .= "\n";
+        return $html;
+    }
+
+    /**
+     * This closes any opened stream elements
+     *
+     * @return string html to be written
+     */
+    public function close_element_for_append() {
+        $html = '';
+        if ($this->currentselector !== '') {
+            $html .= html_writer::end_tag($this->currentelement);
+            $html .= "\n";
+            $this->currentelement = '';
+        }
+        return $html;
+    }
+
+    /**
+     * A companion method to select_element_for_append
+     *
+     * This must be used with NO_OUTPUT_BUFFERING set to true.
+     *
+     * This is similar but instead of appending into the element it replaces
+     * the content in the element. Depending on the 3rd argument it can replace
+     * the innerHTML or the outerHTML which can be useful to completely remove
+     * the element if needed.
+     *
+     * @param string $selector where new content should be replaced
+     * @param string $html A chunk of well formed html
+     * @param bool $outer Wether it replaces the innerHTML or the outerHTML
+     * @return string html to be written
+     */
+    public function select_element_for_replace(string $selector, string $html, bool $outer = false) {
+
+        if (!CLI_SCRIPT && !NO_OUTPUT_BUFFERING) {
+            throw new coding_exception('select_element_for_replace used in a non-CLI script without setting NO_OUTPUT_BUFFERING.',
+                DEBUG_DEVELOPER);
+        }
+
+        // Escape html for use inside a javascript string.
+        $html = addslashes_js($html);
+        $property = $outer ? 'outerHTML' : 'innerHTML';
+        $output = html_writer::tag('script', "document.querySelector('$selector').$property = '$html';");
+        $output .= "\n";
+        return $output;
+    }
+}
diff --git a/lib/classes/output/core_renderer_ajax.php b/lib/classes/output/core_renderer_ajax.php
new file mode 100644
index 0000000000000..61e0ac12912ed
--- /dev/null
+++ b/lib/classes/output/core_renderer_ajax.php
@@ -0,0 +1,134 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * A renderer that generates output for ajax scripts.
+ *
+ * This renderer prevents accidental sends back only json
+ * encoded error messages, all other output is ignored.
+ *
+ * @copyright 2010 Petr Skoda
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class core_renderer_ajax extends core_renderer {
+
+    /**
+     * Returns a template fragment representing a fatal error.
+     *
+     * @param string $message The message to output
+     * @param string $moreinfourl URL where more info can be found about the error
+     * @param string $link Link for the Continue button
+     * @param array $backtrace The execution backtrace
+     * @param string $debuginfo Debugging information
+     * @return string A template fragment for a fatal error
+     */
+    public function fatal_error($message, $moreinfourl, $link, $backtrace, $debuginfo = null, $errorcode = "") {
+        global $CFG;
+
+        $this->page->set_context(null); // ugly hack - make sure page context is set to something, we do not want bogus warnings here
+
+        $e = new stdClass();
+        $e->error      = $message;
+        $e->errorcode  = $errorcode;
+        $e->stacktrace = NULL;
+        $e->debuginfo  = NULL;
+        $e->reproductionlink = NULL;
+        if (!empty($CFG->debug) and $CFG->debug >= DEBUG_DEVELOPER) {
+            $link = (string) $link;
+            if ($link) {
+                $e->reproductionlink = $link;
+            }
+            if (!empty($debuginfo)) {
+                $e->debuginfo = $debuginfo;
+            }
+            if (!empty($backtrace)) {
+                $e->stacktrace = format_backtrace($backtrace, true);
+            }
+        }
+        $this->header();
+        return json_encode($e);
+    }
+
+    /**
+     * Used to display a notification.
+     * For the AJAX notifications are discarded.
+     *
+     * @param string $message The message to print out.
+     * @param string $type    The type of notification. See constants on \core\output\notification.
+     * @param bool $closebutton Whether to show a close icon to remove the notification (default true).
+     */
+    public function notification($message, $type = null, $closebutton = true) {
+    }
+
+    /**
+     * Used to display a redirection message.
+     * AJAX redirections should not occur and as such redirection messages
+     * are discarded.
+     *
+     * @param moodle_url|string $encodedurl
+     * @param string $message
+     * @param int $delay
+     * @param bool $debugdisableredirect
+     * @param string $messagetype The type of notification to show the message in.
+     *         See constants on \core\output\notification.
+     */
+    public function redirect_message($encodedurl, $message, $delay, $debugdisableredirect,
+                                     $messagetype = \core\output\notification::NOTIFY_INFO) {}
+
+    /**
+     * Prepares the start of an AJAX output.
+     */
+    public function header() {
+        // unfortunately YUI iframe upload does not support application/json
+        if (!empty($_FILES)) {
+            @header('Content-type: text/plain; charset=utf-8');
+            if (!core_useragent::supports_json_contenttype()) {
+                @header('X-Content-Type-Options: nosniff');
+            }
+        } else if (!core_useragent::supports_json_contenttype()) {
+            @header('Content-type: text/plain; charset=utf-8');
+            @header('X-Content-Type-Options: nosniff');
+        } else {
+            @header('Content-type: application/json; charset=utf-8');
+        }
+
+        // Headers to make it not cacheable and json
+        @header('Cache-Control: no-store, no-cache, must-revalidate');
+        @header('Cache-Control: post-check=0, pre-check=0', false);
+        @header('Pragma: no-cache');
+        @header('Expires: Mon, 20 Aug 1969 09:23:00 GMT');
+        @header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+        @header('Accept-Ranges: none');
+    }
+
+    /**
+     * There is no footer for an AJAX request, however we must override the
+     * footer method to prevent the default footer.
+     */
+    public function footer() {}
+
+    /**
+     * No need for headers in an AJAX request... this should never happen.
+     * @param string $text
+     * @param int $level
+     * @param string $classes
+     * @param string $id
+     */
+    public function heading($text, $level = 2, $classes = 'main', $id = null) {}
+}
diff --git a/lib/classes/output/core_renderer_cli.php b/lib/classes/output/core_renderer_cli.php
new file mode 100644
index 0000000000000..21b0bb113ebea
--- /dev/null
+++ b/lib/classes/output/core_renderer_cli.php
@@ -0,0 +1,250 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * A renderer that generates output for command-line scripts.
+ *
+ * The implementation of this renderer is probably incomplete.
+ *
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class core_renderer_cli extends core_renderer {
+
+    /**
+     * @var array $progressmaximums stores the largest percentage for a progress bar.
+     * @return string ascii fragment
+     */
+    private $progressmaximums = [];
+
+    /**
+     * Returns the page header.
+     *
+     * @return string HTML fragment
+     */
+    public function header() {
+        return $this->page->heading . "\n";
+    }
+
+    /**
+     * Renders a Check API result
+     *
+     * To aid in CLI consistency this status is NOT translated and the visual
+     * width is always exactly 10 chars.
+     *
+     * @param core\check\result $result
+     * @return string HTML fragment
+     */
+    protected function render_check_result(core\check\result $result) {
+        $status = $result->get_status();
+
+        $labels = [
+            core\check\result::NA        => '      ' . cli_ansi_format('<colour:darkGray>' ) . ' NA ',
+            core\check\result::OK        => '      ' . cli_ansi_format('<colour:green>') . ' OK ',
+            core\check\result::INFO      => '    '   . cli_ansi_format('<colour:blue>' ) . ' INFO ',
+            core\check\result::UNKNOWN   => ' '      . cli_ansi_format('<colour:darkGray>' ) . ' UNKNOWN ',
+            core\check\result::WARNING   => ' '      . cli_ansi_format('<colour:black><bgcolour:yellow>') . ' WARNING ',
+            core\check\result::ERROR     => '   '    . cli_ansi_format('<bgcolour:red>') . ' ERROR ',
+            core\check\result::CRITICAL  => ''       . cli_ansi_format('<bgcolour:red>') . ' CRITICAL ',
+        ];
+        $string = $labels[$status] . cli_ansi_format('<colour:normal>');
+        return $string;
+    }
+
+    /**
+     * Renders a Check API result
+     *
+     * @param core\check\result $result
+     * @return string fragment
+     */
+    public function check_result(core\check\result $result) {
+        return $this->render_check_result($result);
+    }
+
+    /**
+     * Renders a progress bar.
+     *
+     * Do not use $OUTPUT->render($bar), instead use progress_bar::create().
+     *
+     * @param  progress_bar $bar The bar.
+     * @return string ascii fragment
+     */
+    public function render_progress_bar(progress_bar $bar) {
+        global $CFG;
+
+        $size = 55; // The width of the progress bar in chars.
+        $ascii = "\n";
+
+        if (stream_isatty(STDOUT)) {
+            require_once($CFG->libdir.'/clilib.php');
+
+            $ascii .= "[" . str_repeat(' ', $size) . "] 0% \n";
+            return cli_ansi_format($ascii);
+        }
+
+        $this->progressmaximums[$bar->get_id()] = 0;
+        $ascii .= '[';
+        return $ascii;
+    }
+
+    /**
+     * Renders an update to a progress bar.
+     *
+     * Note: This does not cleanly map to a renderable class and should
+     * never be used directly.
+     *
+     * @param  string $id
+     * @param  float $percent
+     * @param  string $msg Message
+     * @param  string $estimate time remaining message
+     * @return string ascii fragment
+     */
+    public function render_progress_bar_update(string $id, float $percent, string $msg, string $estimate): string {
+        $size = 55; // The width of the progress bar in chars.
+        $ascii = '';
+
+        // If we are rendering to a terminal then we can safely use ansii codes
+        // to move the cursor and redraw the complete progress bar each time
+        // it is updated.
+        if (stream_isatty(STDOUT)) {
+            $colour = $percent == 100 ? 'green' : 'blue';
+
+            $done = $percent * $size * 0.01;
+            $whole = floor($done);
+            $bar = "<colour:$colour>";
+            $bar .= str_repeat('█', $whole);
+
+            if ($whole < $size) {
+                // By using unicode chars for partial blocks we can have higher
+                // precision progress bar.
+                $fraction = floor(($done - $whole) * 8);
+                $bar .= core_text::substr(' ▏▎▍▌▋▊▉', $fraction, 1);
+
+                // Fill the rest of the empty bar.
+                $bar .= str_repeat(' ', $size - $whole - 1);
+            }
+
+            $bar .= '<colour:normal>';
+
+            if ($estimate) {
+                $estimate = "- $estimate";
+            }
+
+            $ascii .= '<cursor:up>';
+            $ascii .= '<cursor:up>';
+            $ascii .= sprintf("[$bar] %3.1f%% %-22s\n", $percent, $estimate);
+            $ascii .= sprintf("%-80s\n", $msg);
+            return cli_ansi_format($ascii);
+        }
+
+        // If we are not rendering to a tty, ie when piped to another command
+        // or on windows we need to progressively render the progress bar
+        // which can only ever go forwards.
+        $done = round($percent * $size * 0.01);
+        $delta = max(0, $done - $this->progressmaximums[$id]);
+
+        $ascii .= str_repeat('#', $delta);
+        if ($percent >= 100 && $delta > 0) {
+            $ascii .= sprintf("] %3.1f%%", $percent) . "\n$msg\n";
+        }
+        $this->progressmaximums[$id] += $delta;
+        return $ascii;
+    }
+
+    /**
+     * Returns a template fragment representing a Heading.
+     *
+     * @param string $text The text of the heading
+     * @param int $level The level of importance of the heading
+     * @param string $classes A space-separated list of CSS classes
+     * @param string $id An optional ID
+     * @return string A template fragment for a heading
+     */
+    public function heading($text, $level = 2, $classes = 'main', $id = null) {
+        $text .= "\n";
+        switch ($level) {
+            case 1:
+                return '=>' . $text;
+            case 2:
+                return '-->' . $text;
+            default:
+                return $text;
+        }
+    }
+
+    /**
+     * Returns a template fragment representing a fatal error.
+     *
+     * @param string $message The message to output
+     * @param string $moreinfourl URL where more info can be found about the error
+     * @param string $link Link for the Continue button
+     * @param array $backtrace The execution backtrace
+     * @param string $debuginfo Debugging information
+     * @return string A template fragment for a fatal error
+     */
+    public function fatal_error($message, $moreinfourl, $link, $backtrace, $debuginfo = null, $errorcode = "") {
+        global $CFG;
+
+        $output = "!!! $message !!!\n";
+
+        if ($CFG->debugdeveloper) {
+            if (!empty($debuginfo)) {
+                $output .= $this->notification($debuginfo, 'notifytiny');
+            }
+            if (!empty($backtrace)) {
+                $output .= $this->notification('Stack trace: ' . format_backtrace($backtrace, true), 'notifytiny');
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Returns a template fragment representing a notification.
+     *
+     * @param string $message The message to print out.
+     * @param string $type    The type of notification. See constants on \core\output\notification.
+     * @param bool $closebutton Whether to show a close icon to remove the notification (default true).
+     * @return string A template fragment for a notification
+     */
+    public function notification($message, $type = null, $closebutton = true) {
+        $message = clean_text($message);
+        if ($type === 'notifysuccess' || $type === 'success') {
+            return "++ $message ++\n";
+        }
+        return "!! $message !!\n";
+    }
+
+    /**
+     * There is no footer for a cli request, however we must override the
+     * footer method to prevent the default footer.
+     */
+    public function footer() {}
+
+    /**
+     * Render a notification (that is, a status message about something that has
+     * just happened).
+     *
+     * @param \core\output\notification $notification the notification to print out
+     * @return string plain text output
+     */
+    public function render_notification(\core\output\notification $notification) {
+        return $this->notification($notification->get_message(), $notification->get_message_type());
+    }
+}
diff --git a/lib/classes/output/core_renderer_maintenance.php b/lib/classes/output/core_renderer_maintenance.php
new file mode 100644
index 0000000000000..641922cb3681a
--- /dev/null
+++ b/lib/classes/output/core_renderer_maintenance.php
@@ -0,0 +1,229 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * The maintenance renderer.
+ *
+ * The purpose of this renderer is to block out the core renderer methods that are not usable when the site
+ * is running a maintenance related task.
+ * It must always extend the core_renderer as we switch from the core_renderer to this renderer in a couple of places.
+ *
+ * @since Moodle 2.6
+ * @package core
+ * @category output
+ * @copyright 2013 Sam Hemelryk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class core_renderer_maintenance extends core_renderer {
+    /**
+     * Initialises the renderer instance.
+     *
+     * @param moodle_page $page
+     * @param string $target
+     * @throws coding_exception
+     */
+    public function __construct(moodle_page $page, $target) {
+        if ($target !== RENDERER_TARGET_MAINTENANCE || $page->pagelayout !== 'maintenance') {
+            throw new coding_exception('Invalid request for the maintenance renderer.');
+        }
+        parent::__construct($page, $target);
+    }
+
+    /**
+     * Does nothing. The maintenance renderer cannot produce blocks.
+     *
+     * @param block_contents $bc
+     * @param string $region
+     * @return string
+     */
+    public function block(block_contents $bc, $region) {
+        return '';
+    }
+
+    /**
+     * Does nothing. The maintenance renderer cannot produce blocks.
+     *
+     * @param string $region
+     * @param array $classes
+     * @param string $tag
+     * @param boolean $fakeblocksonly
+     * @return string
+     */
+    public function blocks($region, $classes = array(), $tag = 'aside', $fakeblocksonly = false) {
+        return '';
+    }
+
+    /**
+     * Does nothing. The maintenance renderer cannot produce blocks.
+     *
+     * @param string $region
+     * @param boolean $fakeblocksonly Output fake block only.
+     * @return string
+     */
+    public function blocks_for_region($region, $fakeblocksonly = false) {
+        return '';
+    }
+
+    /**
+     * Does nothing. The maintenance renderer cannot produce a course content header.
+     *
+     * @param bool $onlyifnotcalledbefore
+     * @return string
+     */
+    public function course_content_header($onlyifnotcalledbefore = false) {
+        return '';
+    }
+
+    /**
+     * Does nothing. The maintenance renderer cannot produce a course content footer.
+     *
+     * @param bool $onlyifnotcalledbefore
+     * @return string
+     */
+    public function course_content_footer($onlyifnotcalledbefore = false) {
+        return '';
+    }
+
+    /**
+     * Does nothing. The maintenance renderer cannot produce a course header.
+     *
+     * @return string
+     */
+    public function course_header() {
+        return '';
+    }
+
+    /**
+     * Does nothing. The maintenance renderer cannot produce a course footer.
+     *
+     * @return string
+     */
+    public function course_footer() {
+        return '';
+    }
+
+    /**
+     * Does nothing. The maintenance renderer cannot produce a custom menu.
+     *
+     * @param string $custommenuitems
+     * @return string
+     */
+    public function custom_menu($custommenuitems = '') {
+        return '';
+    }
+
+    /**
+     * Does nothing. The maintenance renderer cannot produce a file picker.
+     *
+     * @param array $options
+     * @return string
+     */
+    public function file_picker($options) {
+        return '';
+    }
+
+    /**
+     * Overridden confirm message for upgrades.
+     *
+     * @param string $message The question to ask the user
+     * @param single_button|moodle_url|string $continue The single_button component representing the Continue answer.
+     * @param single_button|moodle_url|string $cancel The single_button component representing the Cancel answer.
+     * @param array $displayoptions optional extra display options
+     * @return string HTML fragment
+     */
+    public function confirm($message, $continue, $cancel, array $displayoptions = []) {
+        // We need plain styling of confirm boxes on upgrade because we don't know which stylesheet we have (it could be
+        // from any previous version of Moodle).
+        if ($continue instanceof single_button) {
+            $continue->type = single_button::BUTTON_PRIMARY;
+        } else if (is_string($continue)) {
+            $continue = new single_button(new moodle_url($continue), get_string('continue'), 'post',
+                $displayoptions['type'] ?? single_button::BUTTON_PRIMARY);
+        } else if ($continue instanceof moodle_url) {
+            $continue = new single_button($continue, get_string('continue'), 'post',
+                $displayoptions['type'] ?? single_button::BUTTON_PRIMARY);
+        } else {
+            throw new coding_exception('The continue param to $OUTPUT->confirm() must be either a URL' .
+                                       ' (string/moodle_url) or a single_button instance.');
+        }
+
+        if ($cancel instanceof single_button) {
+            $output = '';
+        } else if (is_string($cancel)) {
+            $cancel = new single_button(new moodle_url($cancel), get_string('cancel'), 'get');
+        } else if ($cancel instanceof moodle_url) {
+            $cancel = new single_button($cancel, get_string('cancel'), 'get');
+        } else {
+            throw new coding_exception('The cancel param to $OUTPUT->confirm() must be either a URL' .
+                                       ' (string/moodle_url) or a single_button instance.');
+        }
+
+        $output = $this->box_start('generalbox', 'notice');
+        $output .= html_writer::tag('h4', get_string('confirm'));
+        $output .= html_writer::tag('p', $message);
+        $output .= html_writer::tag('div', $this->render($cancel) . $this->render($continue), ['class' => 'buttons']);
+        $output .= $this->box_end();
+        return $output;
+    }
+
+    /**
+     * Does nothing. The maintenance renderer does not support JS.
+     *
+     * @param block_contents $bc
+     */
+    public function init_block_hider_js(block_contents $bc) {
+        // Does nothing.
+    }
+
+    /**
+     * Does nothing. The maintenance renderer cannot produce language menus.
+     *
+     * @return string
+     */
+    public function lang_menu() {
+        return '';
+    }
+
+    /**
+     * Does nothing. The maintenance renderer has no need for login information.
+     *
+     * @param mixed $withlinks
+     * @return string
+     */
+    public function login_info($withlinks = null) {
+        return '';
+    }
+
+    /**
+     * Secure login info.
+     *
+     * @return string
+     */
+    public function secure_login_info() {
+        return $this->login_info(false);
+    }
+
+    /**
+     * Does nothing. The maintenance renderer cannot produce user pictures.
+     *
+     * @param stdClass $user
+     * @param array $options
+     * @return string
+     */
+    public function user_picture(stdClass $user, array $options = null) {
+        return '';
+    }
+}
diff --git a/lib/classes/output/custom_menu.php b/lib/classes/output/custom_menu.php
new file mode 100644
index 0000000000000..1ed34eea65929
--- /dev/null
+++ b/lib/classes/output/custom_menu.php
@@ -0,0 +1,179 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Custom menu class
+ *
+ * This class is used to operate a custom menu that can be rendered for the page.
+ * The custom menu is built using $CFG->custommenuitems and is a structured collection
+ * of custom_menu_item nodes that can be rendered by the core renderer.
+ *
+ * To configure the custom menu:
+ *     Settings: Administration > Appearance > Advanced theme settings
+ *
+ * @copyright 2010 Sam Hemelryk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class custom_menu extends custom_menu_item {
+
+    /**
+     * @var string The language we should render for, null disables multilang support.
+     */
+    protected $currentlanguage = null;
+
+    /**
+     * Creates the custom menu
+     *
+     * @param string $definition the menu items definition in syntax required by {@link convert_text_to_menu_nodes()}
+     * @param string $currentlanguage the current language code, null disables multilang support
+     */
+    public function __construct($definition = '', $currentlanguage = null) {
+        $this->currentlanguage = $currentlanguage;
+        parent::__construct('root'); // create virtual root element of the menu
+        if (!empty($definition)) {
+            $this->override_children(self::convert_text_to_menu_nodes($definition, $currentlanguage));
+        }
+    }
+
+    /**
+     * Overrides the children of this custom menu. Useful when getting children
+     * from $CFG->custommenuitems
+     *
+     * @param array $children
+     */
+    public function override_children(array $children) {
+        $this->children = array();
+        foreach ($children as $child) {
+            if ($child instanceof custom_menu_item) {
+                $this->children[] = $child;
+            }
+        }
+    }
+
+    /**
+     * Converts a string into a structured array of custom_menu_items which can
+     * then be added to a custom menu.
+     *
+     * Structure:
+     *     text|url|title|langs
+     * The number of hyphens at the start determines the depth of the item. The
+     * languages are optional, comma separated list of languages the line is for.
+     *
+     * Example structure:
+     *     First level first item|http://www.moodle.com/
+     *     -Second level first item|http://www.moodle.com/partners/
+     *     -Second level second item|http://www.moodle.com/hq/
+     *     --Third level first item|http://www.moodle.com/jobs/
+     *     -Second level third item|http://www.moodle.com/development/
+     *     First level second item|http://www.moodle.com/feedback/
+     *     First level third item
+     *     English only|http://moodle.com|English only item|en
+     *     German only|http://moodle.de|Deutsch|de,de_du,de_kids
+     *
+     *
+     * @static
+     * @param string $text the menu items definition
+     * @param string $language the language code, null disables multilang support
+     * @return array
+     */
+    public static function convert_text_to_menu_nodes($text, $language = null) {
+        $root = new custom_menu();
+        $lastitem = $root;
+        $lastdepth = 0;
+        $hiddenitems = array();
+        $lines = explode("\n", $text);
+        foreach ($lines as $linenumber => $line) {
+            $line = trim($line);
+            if (strlen($line) == 0) {
+                continue;
+            }
+            // Parse item settings.
+            $itemtext = null;
+            $itemurl = null;
+            $itemtitle = null;
+            $itemvisible = true;
+            $settings = explode('|', $line);
+            foreach ($settings as $i => $setting) {
+                $setting = trim($setting);
+                if ($setting !== '') {
+                    switch ($i) {
+                        case 0: // Menu text.
+                            $itemtext = ltrim($setting, '-');
+                            break;
+                        case 1: // URL.
+                            try {
+                                $itemurl = new moodle_url($setting);
+                            } catch (moodle_exception $exception) {
+                                // We're not actually worried about this, we don't want to mess up the display
+                                // just for a wrongly entered URL.
+                                $itemurl = null;
+                            }
+                            break;
+                        case 2: // Title attribute.
+                            $itemtitle = $setting;
+                            break;
+                        case 3: // Language.
+                            if (!empty($language)) {
+                                $itemlanguages = array_map('trim', explode(',', $setting));
+                                $itemvisible &= in_array($language, $itemlanguages);
+                            }
+                            break;
+                    }
+                }
+            }
+            // Get depth of new item.
+            preg_match('/^(\-*)/', $line, $match);
+            $itemdepth = strlen($match[1]) + 1;
+            // Find parent item for new item.
+            while (($lastdepth - $itemdepth) >= 0) {
+                $lastitem = $lastitem->get_parent();
+                $lastdepth--;
+            }
+            $lastitem = $lastitem->add($itemtext, $itemurl, $itemtitle, $linenumber + 1);
+            $lastdepth++;
+            if (!$itemvisible) {
+                $hiddenitems[] = $lastitem;
+            }
+        }
+        foreach ($hiddenitems as $item) {
+            $item->parent->remove_child($item);
+        }
+        return $root->get_children();
+    }
+
+    /**
+     * Sorts two custom menu items
+     *
+     * This function is designed to be used with the usort method
+     *     usort($this->children, array('custom_menu','sort_custom_menu_items'));
+     *
+     * @static
+     * @param custom_menu_item $itema
+     * @param custom_menu_item $itemb
+     * @return int
+     */
+    public static function sort_custom_menu_items(custom_menu_item $itema, custom_menu_item $itemb) {
+        $itema = $itema->get_sort_order();
+        $itemb = $itemb->get_sort_order();
+        if ($itema == $itemb) {
+            return 0;
+        }
+        return ($itema > $itemb) ? +1 : -1;
+    }
+}
diff --git a/lib/classes/output/custom_menu_item.php b/lib/classes/output/custom_menu_item.php
new file mode 100644
index 0000000000000..560cf2a3ec6f4
--- /dev/null
+++ b/lib/classes/output/custom_menu_item.php
@@ -0,0 +1,261 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Custom menu item
+ *
+ * This class is used to represent one item within a custom menu that may or may
+ * not have children.
+ *
+ * @copyright 2010 Sam Hemelryk
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class custom_menu_item implements renderable, templatable {
+
+    /**
+     * @var string The text to show for the item
+     */
+    protected $text;
+
+    /**
+     * @var moodle_url The link to give the icon if it has no children
+     */
+    protected $url;
+
+    /**
+     * @var string A title to apply to the item. By default the text
+     */
+    protected $title;
+
+    /**
+     * @var int A sort order for the item, not necessary if you order things in
+     * the CFG var.
+     */
+    protected $sort;
+
+    /**
+     * @var custom_menu_item A reference to the parent for this item or NULL if
+     * it is a top level item
+     */
+    protected $parent;
+
+    /**
+     * @var array A array in which to store children this item has.
+     */
+    protected $children = array();
+
+    /**
+     * @var int A reference to the sort var of the last child that was added
+     */
+    protected $lastsort = 0;
+
+    /** @var array Array of other HTML attributes for the custom menu item. */
+    protected $attributes = [];
+
+    /**
+     * Constructs the new custom menu item
+     *
+     * @param string $text
+     * @param moodle_url $url A moodle url to apply as the link for this item [Optional]
+     * @param string $title A title to apply to this item [Optional]
+     * @param int $sort A sort or to use if we need to sort differently [Optional]
+     * @param custom_menu_item $parent A reference to the parent custom_menu_item this child
+     *        belongs to, only if the child has a parent. [Optional]
+     * @param array $attributes Array of other HTML attributes for the custom menu item.
+     */
+    public function __construct($text, moodle_url $url = null, $title = null, $sort = null, custom_menu_item $parent = null,
+        array $attributes = []) {
+
+        // Use class setter method for text to ensure it's always a string type.
+        $this->set_text($text);
+
+        $this->url = $url;
+        $this->title = $title;
+        $this->sort = (int)$sort;
+        $this->parent = $parent;
+        $this->attributes = $attributes;
+    }
+
+    /**
+     * Adds a custom menu item as a child of this node given its properties.
+     *
+     * @param string $text
+     * @param moodle_url $url
+     * @param string $title
+     * @param int $sort
+     * @param array $attributes Array of other HTML attributes for the custom menu item.
+     * @return custom_menu_item
+     */
+    public function add($text, moodle_url $url = null, $title = null, $sort = null, $attributes = []) {
+        $key = count($this->children);
+        if (empty($sort)) {
+            $sort = $this->lastsort + 1;
+        }
+        $this->children[$key] = new custom_menu_item($text, $url, $title, $sort, $this, $attributes);
+        $this->lastsort = (int)$sort;
+        return $this->children[$key];
+    }
+
+    /**
+     * Removes a custom menu item that is a child or descendant to the current menu.
+     *
+     * Returns true if child was found and removed.
+     *
+     * @param custom_menu_item $menuitem
+     * @return bool
+     */
+    public function remove_child(custom_menu_item $menuitem) {
+        $removed = false;
+        if (($key = array_search($menuitem, $this->children)) !== false) {
+            unset($this->children[$key]);
+            $this->children = array_values($this->children);
+            $removed = true;
+        } else {
+            foreach ($this->children as $child) {
+                if ($removed = $child->remove_child($menuitem)) {
+                    break;
+                }
+            }
+        }
+        return $removed;
+    }
+
+    /**
+     * Returns the text for this item
+     * @return string
+     */
+    public function get_text() {
+        return $this->text;
+    }
+
+    /**
+     * Returns the url for this item
+     * @return moodle_url
+     */
+    public function get_url() {
+        return $this->url;
+    }
+
+    /**
+     * Returns the title for this item
+     * @return string
+     */
+    public function get_title() {
+        return $this->title;
+    }
+
+    /**
+     * Sorts and returns the children for this item
+     * @return array
+     */
+    public function get_children() {
+        $this->sort();
+        return $this->children;
+    }
+
+    /**
+     * Gets the sort order for this child
+     * @return int
+     */
+    public function get_sort_order() {
+        return $this->sort;
+    }
+
+    /**
+     * Gets the parent this child belong to
+     * @return custom_menu_item
+     */
+    public function get_parent() {
+        return $this->parent;
+    }
+
+    /**
+     * Sorts the children this item has
+     */
+    public function sort() {
+        usort($this->children, array('custom_menu','sort_custom_menu_items'));
+    }
+
+    /**
+     * Returns true if this item has any children
+     * @return bool
+     */
+    public function has_children() {
+        return (count($this->children) > 0);
+    }
+
+    /**
+     * Sets the text for the node
+     * @param string $text
+     */
+    public function set_text($text) {
+        $this->text = (string)$text;
+    }
+
+    /**
+     * Sets the title for the node
+     * @param string $title
+     */
+    public function set_title($title) {
+        $this->title = (string)$title;
+    }
+
+    /**
+     * Sets the url for the node
+     * @param moodle_url $url
+     */
+    public function set_url(moodle_url $url) {
+        $this->url = $url;
+    }
+
+    /**
+     * Export this data so it can be used as the context for a mustache template.
+     *
+     * @param renderer_base $output Used to do a final render of any components that need to be rendered for export.
+     * @return stdClass
+     */
+    public function export_for_template(renderer_base $output) {
+        $syscontext = context_system::instance();
+
+        $context = new stdClass();
+        $context->moremenuid = uniqid();
+        $context->text = \core_external\util::format_string($this->text, $syscontext->id);
+        $context->url = $this->url ? $this->url->out() : null;
+        // No need for the title if it's the same with text.
+        if ($this->text !== $this->title) {
+            // Show the title attribute only if it's different from the text.
+            $context->title = \core_external\util::format_string($this->title, $syscontext->id);
+        }
+        $context->sort = $this->sort;
+        if (!empty($this->attributes)) {
+            $context->attributes = $this->attributes;
+        }
+        $context->children = array();
+        if (preg_match("/^#+$/", $this->text)) {
+            $context->divider = true;
+        }
+        $context->haschildren = !empty($this->children) && (count($this->children) > 0);
+        foreach ($this->children as $child) {
+            $child = $child->export_for_template($output);
+            array_push($context->children, $child);
+        }
+
+        return $context;
+    }
+}
diff --git a/lib/classes/output/file_picker.php b/lib/classes/output/file_picker.php
new file mode 100644
index 0000000000000..785b0d9a69f4f
--- /dev/null
+++ b/lib/classes/output/file_picker.php
@@ -0,0 +1,93 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Data structure representing a file picker.
+ *
+ * @copyright 2010 Dongsheng Cai
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class file_picker implements renderable {
+
+    /**
+     * @var stdClass An object containing options for the file picker
+     */
+    public $options;
+
+    /**
+     * Constructs a file picker object.
+     *
+     * The following are possible options for the filepicker:
+     *    - accepted_types  (*)
+     *    - return_types    (FILE_INTERNAL)
+     *    - env             (filepicker)
+     *    - client_id       (uniqid)
+     *    - itemid          (0)
+     *    - maxbytes        (-1)
+     *    - maxfiles        (1)
+     *    - buttonname      (false)
+     *
+     * @param stdClass $options An object containing options for the file picker.
+     */
+    public function __construct(stdClass $options) {
+        global $CFG, $USER, $PAGE;
+        require_once($CFG->dirroot. '/repository/lib.php');
+        $defaults = array(
+            'accepted_types'=>'*',
+            'return_types'=>FILE_INTERNAL,
+            'env' => 'filepicker',
+            'client_id' => uniqid(),
+            'itemid' => 0,
+            'maxbytes'=>-1,
+            'maxfiles'=>1,
+            'buttonname'=>false
+        );
+        foreach ($defaults as $key=>$value) {
+            if (empty($options->$key)) {
+                $options->$key = $value;
+            }
+        }
+
+        $options->currentfile = '';
+        if (!empty($options->itemid)) {
+            $fs = get_file_storage();
+            $usercontext = context_user::instance($USER->id);
+            if (empty($options->filename)) {
+                if ($files = $fs->get_area_files($usercontext->id, 'user', 'draft', $options->itemid, 'id DESC', false)) {
+                    $file = reset($files);
+                }
+            } else {
+                $file = $fs->get_file($usercontext->id, 'user', 'draft', $options->itemid, $options->filepath, $options->filename);
+            }
+            if (!empty($file)) {
+                $options->currentfile = html_writer::link(moodle_url::make_draftfile_url($file->get_itemid(), $file->get_filepath(), $file->get_filename()), $file->get_filename());
+            }
+        }
+
+        // initilise options, getting files in root path
+        $this->options = initialise_filepicker($options);
+
+        // copying other options
+        foreach ($options as $name=>$value) {
+            if (!isset($this->options->$name)) {
+                $this->options->$name = $value;
+            }
+        }
+    }
+}
diff --git a/lib/classes/output/help_icon.php b/lib/classes/output/help_icon.php
new file mode 100644
index 0000000000000..9fee559cad5e3
--- /dev/null
+++ b/lib/classes/output/help_icon.php
@@ -0,0 +1,118 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Data structure representing a help icon.
+ *
+ * @copyright 2010 Petr Skoda (info@skodak.org)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class help_icon implements renderable, templatable {
+
+    /**
+     * @var string lang pack identifier (without the "_help" suffix),
+     * both get_string($identifier, $component) and get_string($identifier.'_help', $component)
+     * must exist.
+     */
+    public $identifier;
+
+    /**
+     * @var string Component name, the same as in get_string()
+     */
+    public $component;
+
+    /**
+     * @var string Extra descriptive text next to the icon
+     */
+    public $linktext = null;
+
+    /**
+     * @var mixed An object, string or number that can be used within translation strings
+     */
+    public $a = null;
+
+    /**
+     * Constructor
+     *
+     * @param string $identifier string for help page title,
+     *  string with _help suffix is used for the actual help text.
+     *  string with _link suffix is used to create a link to further info (if it exists)
+     * @param string $component
+     * @param string|object|array|int $a An object, string or number that can be used
+     *      within translation strings
+     */
+    public function __construct($identifier, $component, $a = null) {
+        $this->identifier = $identifier;
+        $this->component  = $component;
+        $this->a = $a;
+    }
+
+    /**
+     * Verifies that both help strings exists, shows debug warnings if not
+     */
+    public function diag_strings() {
+        $sm = get_string_manager();
+        if (!$sm->string_exists($this->identifier, $this->component)) {
+            debugging("Help title string does not exist: [$this->identifier, $this->component]");
+        }
+        if (!$sm->string_exists($this->identifier.'_help', $this->component)) {
+            debugging("Help contents string does not exist: [{$this->identifier}_help, $this->component]");
+        }
+    }
+
+    /**
+     * Export this data so it can be used as the context for a mustache template.
+     *
+     * @param renderer_base $output Used to do a final render of any components that need to be rendered for export.
+     * @return stdClass
+     */
+    public function export_for_template(renderer_base $output) {
+        global $CFG;
+
+        $title = get_string($this->identifier, $this->component, $this->a);
+
+        if (empty($this->linktext)) {
+            $alt = get_string('helpprefix2', '', trim($title, ". \t"));
+        } else {
+            $alt = get_string('helpwiththis');
+        }
+
+        $data = get_formatted_help_string($this->identifier, $this->component, false, $this->a);
+
+        $data->alt = $alt;
+        $data->icon = (new pix_icon('help', $alt, 'core', ['class' => 'iconhelp']))->export_for_template($output);
+        $data->linktext = $this->linktext;
+        $data->title = get_string('helpprefix2', '', trim($title, ". \t"));
+
+        $options = [
+            'component' => $this->component,
+            'identifier' => $this->identifier,
+            'lang' => current_language()
+        ];
+
+        // Debugging feature lets you display string identifier and component.
+        if (isset($CFG->debugstringids) && $CFG->debugstringids && optional_param('strings', 0, PARAM_INT)) {
+            $options['strings'] = 1;
+        }
+
+        $data->url = (new moodle_url('/help.php', $options))->out(false);
+        $data->ltr = !right_to_left();
+        return $data;
+    }
+}
diff --git a/lib/classes/output/html_writer.php b/lib/classes/output/html_writer.php
new file mode 100644
index 0000000000000..9d595335d325a
--- /dev/null
+++ b/lib/classes/output/html_writer.php
@@ -0,0 +1,870 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Simple html output class
+ *
+ * @copyright 2009 Tim Hunt, 2010 Petr Skoda
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class html_writer {
+
+    /**
+     * Outputs a tag with attributes and contents
+     *
+     * @param string $tagname The name of tag ('a', 'img', 'span' etc.)
+     * @param string $contents What goes between the opening and closing tags
+     * @param array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
+     * @return string HTML fragment
+     */
+    public static function tag($tagname, $contents, array $attributes = null) {
+        return self::start_tag($tagname, $attributes) . $contents . self::end_tag($tagname);
+    }
+
+    /**
+     * Outputs an opening tag with attributes
+     *
+     * @param string $tagname The name of tag ('a', 'img', 'span' etc.)
+     * @param array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
+     * @return string HTML fragment
+     */
+    public static function start_tag($tagname, array $attributes = null) {
+        return '<' . $tagname . self::attributes($attributes) . '>';
+    }
+
+    /**
+     * Outputs a closing tag
+     *
+     * @param string $tagname The name of tag ('a', 'img', 'span' etc.)
+     * @return string HTML fragment
+     */
+    public static function end_tag($tagname) {
+        return '</' . $tagname . '>';
+    }
+
+    /**
+     * Outputs an empty tag with attributes
+     *
+     * @param string $tagname The name of tag ('input', 'img', 'br' etc.)
+     * @param array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
+     * @return string HTML fragment
+     */
+    public static function empty_tag($tagname, array $attributes = null) {
+        return '<' . $tagname . self::attributes($attributes) . ' />';
+    }
+
+    /**
+     * Outputs a tag, but only if the contents are not empty
+     *
+     * @param string $tagname The name of tag ('a', 'img', 'span' etc.)
+     * @param string $contents What goes between the opening and closing tags
+     * @param array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
+     * @return string HTML fragment
+     */
+    public static function nonempty_tag($tagname, $contents, array $attributes = null) {
+        if ($contents === '' || is_null($contents)) {
+            return '';
+        }
+        return self::tag($tagname, $contents, $attributes);
+    }
+
+    /**
+     * Outputs a HTML attribute and value
+     *
+     * @param string $name The name of the attribute ('src', 'href', 'class' etc.)
+     * @param string $value The value of the attribute. The value will be escaped with {@link s()}
+     * @return string HTML fragment
+     */
+    public static function attribute($name, $value) {
+        if ($value instanceof moodle_url) {
+            return ' ' . $name . '="' . $value->out() . '"';
+        }
+
+        // special case, we do not want these in output
+        if ($value === null) {
+            return '';
+        }
+
+        // no sloppy trimming here!
+        return ' ' . $name . '="' . s($value) . '"';
+    }
+
+    /**
+     * Outputs a list of HTML attributes and values
+     *
+     * @param array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
+     *       The values will be escaped with {@link s()}
+     * @return string HTML fragment
+     */
+    public static function attributes(array $attributes = null) {
+        $attributes = (array)$attributes;
+        $output = '';
+        foreach ($attributes as $name => $value) {
+            $output .= self::attribute($name, $value);
+        }
+        return $output;
+    }
+
+    /**
+     * Generates a simple image tag with attributes.
+     *
+     * @param string $src The source of image
+     * @param string $alt The alternate text for image
+     * @param array $attributes The tag attributes (array('height' => $max_height, 'class' => 'class1') etc.)
+     * @return string HTML fragment
+     */
+    public static function img($src, $alt, array $attributes = null) {
+        $attributes = (array)$attributes;
+        $attributes['src'] = $src;
+        // In case a null alt text is provided, set it to an empty string.
+        $attributes['alt'] = $alt ?? '';
+        if (array_key_exists('role', $attributes) && core_text::strtolower($attributes['role']) === 'presentation') {
+            // A presentation role is not necessary for the img tag.
+            // If a non-empty alt text is provided, the presentation role will conflict with the alt text.
+            // An empty alt text denotes a decorative image. The presence of a presentation role is redundant.
+            unset($attributes['role']);
+            debugging('The presentation role is not necessary for an img tag.', DEBUG_DEVELOPER);
+        }
+
+        return self::empty_tag('img', $attributes);
+    }
+
+    /**
+     * Generates random html element id.
+     *
+     * @staticvar int $counter
+     * @staticvar string $uniq
+     * @param string $base A string fragment that will be included in the random ID.
+     * @return string A unique ID
+     */
+    public static function random_id($base='random') {
+        static $counter = 0;
+        static $uniq;
+
+        if (!isset($uniq)) {
+            $uniq = uniqid();
+        }
+
+        $counter++;
+        return $base.$uniq.$counter;
+    }
+
+    /**
+     * Generates a simple html link
+     *
+     * @param string|moodle_url $url The URL
+     * @param string $text The text
+     * @param array $attributes HTML attributes
+     * @return string HTML fragment
+     */
+    public static function link($url, $text, array $attributes = null) {
+        $attributes = (array)$attributes;
+        $attributes['href']  = $url;
+        return self::tag('a', $text, $attributes);
+    }
+
+    /**
+     * Generates a simple checkbox with optional label
+     *
+     * @param string $name The name of the checkbox
+     * @param string $value The value of the checkbox
+     * @param bool $checked Whether the checkbox is checked
+     * @param string $label The label for the checkbox
+     * @param array $attributes Any attributes to apply to the checkbox
+     * @param array $labelattributes Any attributes to apply to the label, if present
+     * @return string html fragment
+     */
+    public static function checkbox($name, $value, $checked = true, $label = '',
+        array $attributes = null, array $labelattributes = null) {
+        $attributes = (array) $attributes;
+        $output = '';
+
+        if ($label !== '' and !is_null($label)) {
+            if (empty($attributes['id'])) {
+                $attributes['id'] = self::random_id('checkbox_');
+            }
+        }
+        $attributes['type']    = 'checkbox';
+        $attributes['value']   = $value;
+        $attributes['name']    = $name;
+        $attributes['checked'] = $checked ? 'checked' : null;
+
+        $output .= self::empty_tag('input', $attributes);
+
+        if ($label !== '' and !is_null($label)) {
+            $labelattributes = (array) $labelattributes;
+            $labelattributes['for'] = $attributes['id'];
+            $output .= self::tag('label', $label, $labelattributes);
+        }
+
+        return $output;
+    }
+
+    /**
+     * Generates a simple select yes/no form field
+     *
+     * @param string $name name of select element
+     * @param bool $selected
+     * @param array $attributes - html select element attributes
+     * @return string HTML fragment
+     */
+    public static function select_yes_no($name, $selected=true, array $attributes = null) {
+        $options = array('1'=>get_string('yes'), '0'=>get_string('no'));
+        return self::select($options, $name, $selected, null, $attributes);
+    }
+
+    /**
+     * Generates a simple select form field
+     *
+     * Note this function does HTML escaping on the optgroup labels, but not on the choice labels.
+     *
+     * @param array $options associative array value=>label ex.:
+     *                array(1=>'One, 2=>Two)
+     *              it is also possible to specify optgroup as complex label array ex.:
+     *                array(array('Odd'=>array(1=>'One', 3=>'Three)), array('Even'=>array(2=>'Two')))
+     *                array(1=>'One', '--1uniquekey'=>array('More'=>array(2=>'Two', 3=>'Three')))
+     * @param string $name name of select element
+     * @param string|array $selected value or array of values depending on multiple attribute
+     * @param array|bool|null $nothing add nothing selected option, or false of not added
+     * @param array $attributes html select element attributes
+     * @return string HTML fragment
+     */
+    public static function select(array $options, $name, $selected = '', $nothing = array('' => 'choosedots'), array $attributes = null) {
+        $attributes = (array)$attributes;
+        if (is_array($nothing)) {
+            foreach ($nothing as $k=>$v) {
+                if ($v === 'choose' or $v === 'choosedots') {
+                    $nothing[$k] = get_string('choosedots');
+                }
+            }
+            $options = $nothing + $options; // keep keys, do not override
+
+        } else if (is_string($nothing) and $nothing !== '') {
+            // BC
+            $options = array(''=>$nothing) + $options;
+        }
+
+        // we may accept more values if multiple attribute specified
+        $selected = (array)$selected;
+        foreach ($selected as $k=>$v) {
+            $selected[$k] = (string)$v;
+        }
+
+        if (!isset($attributes['id'])) {
+            $id = 'menu'.$name;
+            // name may contaion [], which would make an invalid id. e.g. numeric question type editing form, assignment quickgrading
+            $id = str_replace('[', '', $id);
+            $id = str_replace(']', '', $id);
+            $attributes['id'] = $id;
+        }
+
+        if (!isset($attributes['class'])) {
+            $class = 'menu'.$name;
+            // name may contaion [], which would make an invalid class. e.g. numeric question type editing form, assignment quickgrading
+            $class = str_replace('[', '', $class);
+            $class = str_replace(']', '', $class);
+            $attributes['class'] = $class;
+        }
+        $attributes['class'] = 'select custom-select ' . $attributes['class']; // Add 'select' selector always.
+
+        $attributes['name'] = $name;
+
+        if (!empty($attributes['disabled'])) {
+            $attributes['disabled'] = 'disabled';
+        } else {
+            unset($attributes['disabled']);
+        }
+
+        $output = '';
+        foreach ($options as $value=>$label) {
+            if (is_array($label)) {
+                // ignore key, it just has to be unique
+                $output .= self::select_optgroup(key($label), current($label), $selected);
+            } else {
+                $output .= self::select_option($label, $value, $selected);
+            }
+        }
+        return self::tag('select', $output, $attributes);
+    }
+
+    /**
+     * Returns HTML to display a select box option.
+     *
+     * @param string $label The label to display as the option.
+     * @param string|int $value The value the option represents
+     * @param array $selected An array of selected options
+     * @return string HTML fragment
+     */
+    private static function select_option($label, $value, array $selected) {
+        $attributes = array();
+        $value = (string)$value;
+        if (in_array($value, $selected, true)) {
+            $attributes['selected'] = 'selected';
+        }
+        $attributes['value'] = $value;
+        return self::tag('option', $label, $attributes);
+    }
+
+    /**
+     * Returns HTML to display a select box option group.
+     *
+     * @param string $groupname The label to use for the group
+     * @param array $options The options in the group
+     * @param array $selected An array of selected values.
+     * @return string HTML fragment.
+     */
+    private static function select_optgroup($groupname, $options, array $selected) {
+        if (empty($options)) {
+            return '';
+        }
+        $attributes = array('label'=>$groupname);
+        $output = '';
+        foreach ($options as $value=>$label) {
+            $output .= self::select_option($label, $value, $selected);
+        }
+        return self::tag('optgroup', $output, $attributes);
+    }
+
+    /**
+     * This is a shortcut for making an hour selector menu.
+     *
+     * @param string $type The type of selector (years, months, days, hours, minutes)
+     * @param string $name fieldname
+     * @param int $currenttime A default timestamp in GMT
+     * @param int $step minute spacing
+     * @param array $attributes - html select element attributes
+     * @param float|int|string $timezone the timezone to use to calculate the time
+     *        {@link https://moodledev.io/docs/apis/subsystems/time#timezone}
+     * @return string HTML fragment
+     */
+    public static function select_time($type, $name, $currenttime = 0, $step = 5, array $attributes = null, $timezone = 99) {
+        global $OUTPUT;
+
+        if (!$currenttime) {
+            $currenttime = time();
+        }
+        $calendartype = \core_calendar\type_factory::get_calendar_instance();
+        $currentdate = $calendartype->timestamp_to_date_array($currenttime, $timezone);
+
+        $userdatetype = $type;
+        $timeunits = array();
+
+        switch ($type) {
+            case 'years':
+                $timeunits = $calendartype->get_years();
+                $userdatetype = 'year';
+                break;
+            case 'months':
+                $timeunits = $calendartype->get_months();
+                $userdatetype = 'month';
+                $currentdate['month'] = (int)$currentdate['mon'];
+                break;
+            case 'days':
+                $timeunits = $calendartype->get_days();
+                $userdatetype = 'mday';
+                break;
+            case 'hours':
+                for ($i=0; $i<=23; $i++) {
+                    $timeunits[$i] = sprintf("%02d",$i);
+                }
+                break;
+            case 'minutes':
+                if ($step != 1) {
+                    $currentdate['minutes'] = ceil($currentdate['minutes']/$step)*$step;
+                }
+
+                for ($i=0; $i<=59; $i+=$step) {
+                    $timeunits[$i] = sprintf("%02d",$i);
+                }
+                break;
+            default:
+                throw new coding_exception("Time type $type is not supported by html_writer::select_time().");
+        }
+
+        $attributes = (array) $attributes;
+        $data = (object) [
+            'name' => $name,
+            'id' => !empty($attributes['id']) ? $attributes['id'] : self::random_id('ts_'),
+            'label' => get_string(substr($type, 0, -1), 'form'),
+            'options' => array_map(function($value) use ($timeunits, $currentdate, $userdatetype) {
+                return [
+                    'name' => $timeunits[$value],
+                    'value' => $value,
+                    'selected' => $currentdate[$userdatetype] == $value
+                ];
+            }, array_keys($timeunits)),
+        ];
+
+        unset($attributes['id']);
+        unset($attributes['name']);
+        $data->attributes = array_map(function($name) use ($attributes) {
+            return [
+                'name' => $name,
+                'value' => $attributes[$name]
+            ];
+        }, array_keys($attributes));
+
+        return $OUTPUT->render_from_template('core/select_time', $data);
+    }
+
+    /**
+     * Shortcut for quick making of lists
+     *
+     * Note: 'list' is a reserved keyword ;-)
+     *
+     * @param array $items
+     * @param array $attributes
+     * @param string $tag ul or ol
+     * @return string
+     */
+    public static function alist(array $items, array $attributes = null, $tag = 'ul') {
+        $output = html_writer::start_tag($tag, $attributes)."\n";
+        foreach ($items as $item) {
+            $output .= html_writer::tag('li', $item)."\n";
+        }
+        $output .= html_writer::end_tag($tag);
+        return $output;
+    }
+
+    /**
+     * Returns hidden input fields created from url parameters.
+     *
+     * @param moodle_url $url
+     * @param array $exclude list of excluded parameters
+     * @return string HTML fragment
+     */
+    public static function input_hidden_params(moodle_url $url, array $exclude = null) {
+        $exclude = (array)$exclude;
+        $params = $url->params();
+        foreach ($exclude as $key) {
+            unset($params[$key]);
+        }
+
+        $output = '';
+        foreach ($params as $key => $value) {
+            $attributes = array('type'=>'hidden', 'name'=>$key, 'value'=>$value);
+            $output .= self::empty_tag('input', $attributes)."\n";
+        }
+        return $output;
+    }
+
+    /**
+     * Generate a script tag containing the the specified code.
+     *
+     * @param string $jscode the JavaScript code
+     * @param moodle_url|string $url optional url of the external script, $code ignored if specified
+     * @return string HTML, the code wrapped in <script> tags.
+     */
+    public static function script($jscode, $url=null) {
+        if ($jscode) {
+            return self::tag('script', "\n//<![CDATA[\n$jscode\n//]]>\n") . "\n";
+
+        } else if ($url) {
+            return self::tag('script', '', ['src' => $url]) . "\n";
+
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Renders HTML table
+     *
+     * This method may modify the passed instance by adding some default properties if they are not set yet.
+     * If this is not what you want, you should make a full clone of your data before passing them to this
+     * method. In most cases this is not an issue at all so we do not clone by default for performance
+     * and memory consumption reasons.
+     *
+     * @param html_table $table data to be rendered
+     * @return string HTML code
+     */
+    public static function table(html_table $table) {
+        // prepare table data and populate missing properties with reasonable defaults
+        if (!empty($table->align)) {
+            foreach ($table->align as $key => $aa) {
+                if ($aa) {
+                    $table->align[$key] = 'text-align:'. fix_align_rtl($aa) .';';  // Fix for RTL languages
+                } else {
+                    $table->align[$key] = null;
+                }
+            }
+        }
+        if (!empty($table->size)) {
+            foreach ($table->size as $key => $ss) {
+                if ($ss) {
+                    $table->size[$key] = 'width:'. $ss .';';
+                } else {
+                    $table->size[$key] = null;
+                }
+            }
+        }
+        if (!empty($table->wrap)) {
+            foreach ($table->wrap as $key => $ww) {
+                if ($ww) {
+                    $table->wrap[$key] = 'white-space:nowrap;';
+                } else {
+                    $table->wrap[$key] = '';
+                }
+            }
+        }
+        if (!empty($table->head)) {
+            foreach ($table->head as $key => $val) {
+                if (!isset($table->align[$key])) {
+                    $table->align[$key] = null;
+                }
+                if (!isset($table->size[$key])) {
+                    $table->size[$key] = null;
+                }
+                if (!isset($table->wrap[$key])) {
+                    $table->wrap[$key] = null;
+                }
+
+            }
+        }
+        if (empty($table->attributes['class'])) {
+            $table->attributes['class'] = 'generaltable';
+        }
+        if (!empty($table->tablealign)) {
+            $table->attributes['class'] .= ' boxalign' . $table->tablealign;
+        }
+
+        // explicitly assigned properties override those defined via $table->attributes
+        $table->attributes['class'] = trim($table->attributes['class']);
+        $attributes = array_merge($table->attributes, array(
+            'id'            => $table->id,
+            'width'         => $table->width,
+            'summary'       => $table->summary,
+            'cellpadding'   => $table->cellpadding,
+            'cellspacing'   => $table->cellspacing,
+        ));
+        $output = html_writer::start_tag('table', $attributes) . "\n";
+
+        $countcols = 0;
+
+        // Output a caption if present.
+        if (!empty($table->caption)) {
+            $captionattributes = array();
+            if ($table->captionhide) {
+                $captionattributes['class'] = 'accesshide';
+            }
+            $output .= html_writer::tag(
+                'caption',
+                $table->caption,
+                $captionattributes
+            );
+        }
+
+        if (!empty($table->head)) {
+            $countcols = count($table->head);
+
+            $output .= html_writer::start_tag('thead', array()) . "\n";
+            $output .= html_writer::start_tag('tr', array()) . "\n";
+            $keys = array_keys($table->head);
+            $lastkey = end($keys);
+
+            foreach ($table->head as $key => $heading) {
+                // Convert plain string headings into html_table_cell objects
+                if (!($heading instanceof html_table_cell)) {
+                    $headingtext = $heading;
+                    $heading = new html_table_cell();
+                    $heading->text = $headingtext;
+                    $heading->header = true;
+                }
+
+                if ($heading->header !== false) {
+                    $heading->header = true;
+                }
+
+                $tagtype = 'td';
+                if ($heading->header && (string)$heading->text != '') {
+                    $tagtype = 'th';
+                }
+
+                $heading->attributes['class'] .= ' header c' . $key;
+                if (isset($table->headspan[$key]) && $table->headspan[$key] > 1) {
+                    $heading->colspan = $table->headspan[$key];
+                    $countcols += $table->headspan[$key] - 1;
+                }
+
+                if ($key == $lastkey) {
+                    $heading->attributes['class'] .= ' lastcol';
+                }
+                if (isset($table->colclasses[$key])) {
+                    $heading->attributes['class'] .= ' ' . $table->colclasses[$key];
+                }
+                $heading->attributes['class'] = trim($heading->attributes['class']);
+                $attributes = array_merge($heading->attributes, [
+                    'style'     => $table->align[$key] . $table->size[$key] . $heading->style,
+                    'colspan'   => $heading->colspan,
+                ]);
+
+                if ($tagtype == 'th') {
+                    $attributes['scope'] = !empty($heading->scope) ? $heading->scope : 'col';
+                }
+
+                $output .= html_writer::tag($tagtype, $heading->text, $attributes) . "\n";
+            }
+            $output .= html_writer::end_tag('tr') . "\n";
+            $output .= html_writer::end_tag('thead') . "\n";
+
+            if (empty($table->data)) {
+                // For valid XHTML strict every table must contain either a valid tr
+                // or a valid tbody... both of which must contain a valid td
+                $output .= html_writer::start_tag('tbody', array('class' => 'empty'));
+                $output .= html_writer::tag('tr', html_writer::tag('td', '', array('colspan'=>count($table->head))));
+                $output .= html_writer::end_tag('tbody');
+            }
+        }
+
+        if (!empty($table->data)) {
+            $keys       = array_keys($table->data);
+            $lastrowkey = end($keys);
+            $output .= html_writer::start_tag('tbody', array());
+
+            foreach ($table->data as $key => $row) {
+                if (($row === 'hr') && ($countcols)) {
+                    $output .= html_writer::tag('td', html_writer::tag('div', '', array('class' => 'tabledivider')), array('colspan' => $countcols));
+                } else {
+                    // Convert array rows to html_table_rows and cell strings to html_table_cell objects
+                    if (!($row instanceof html_table_row)) {
+                        $newrow = new html_table_row();
+
+                        foreach ($row as $cell) {
+                            if (!($cell instanceof html_table_cell)) {
+                                $cell = new html_table_cell($cell);
+                            }
+                            $newrow->cells[] = $cell;
+                        }
+                        $row = $newrow;
+                    }
+
+                    if (isset($table->rowclasses[$key])) {
+                        $row->attributes['class'] .= ' ' . $table->rowclasses[$key];
+                    }
+
+                    if ($key == $lastrowkey) {
+                        $row->attributes['class'] .= ' lastrow';
+                    }
+
+                    // Explicitly assigned properties should override those defined in the attributes.
+                    $row->attributes['class'] = trim($row->attributes['class']);
+                    $trattributes = array_merge($row->attributes, array(
+                        'id'            => $row->id,
+                        'style'         => $row->style,
+                    ));
+                    $output .= html_writer::start_tag('tr', $trattributes) . "\n";
+                    $keys2 = array_keys($row->cells);
+                    $lastkey = end($keys2);
+
+                    $gotlastkey = false; //flag for sanity checking
+                    foreach ($row->cells as $key => $cell) {
+                        if ($gotlastkey) {
+                            //This should never happen. Why do we have a cell after the last cell?
+                            mtrace("A cell with key ($key) was found after the last key ($lastkey)");
+                        }
+
+                        if (!($cell instanceof html_table_cell)) {
+                            $mycell = new html_table_cell();
+                            $mycell->text = $cell;
+                            $cell = $mycell;
+                        }
+
+                        if (($cell->header === true) && empty($cell->scope)) {
+                            $cell->scope = 'row';
+                        }
+
+                        if (isset($table->colclasses[$key])) {
+                            $cell->attributes['class'] .= ' ' . $table->colclasses[$key];
+                        }
+
+                        $cell->attributes['class'] .= ' cell c' . $key;
+                        if ($key == $lastkey) {
+                            $cell->attributes['class'] .= ' lastcol';
+                            $gotlastkey = true;
+                        }
+                        $tdstyle = '';
+                        $tdstyle .= isset($table->align[$key]) ? $table->align[$key] : '';
+                        $tdstyle .= isset($table->size[$key]) ? $table->size[$key] : '';
+                        $tdstyle .= isset($table->wrap[$key]) ? $table->wrap[$key] : '';
+                        $cell->attributes['class'] = trim($cell->attributes['class']);
+                        $tdattributes = array_merge($cell->attributes, array(
+                            'style' => $tdstyle . $cell->style,
+                            'colspan' => $cell->colspan,
+                            'rowspan' => $cell->rowspan,
+                            'id' => $cell->id,
+                            'abbr' => $cell->abbr,
+                            'scope' => $cell->scope,
+                        ));
+                        $tagtype = 'td';
+                        if ($cell->header === true) {
+                            $tagtype = 'th';
+                        }
+                        $output .= html_writer::tag($tagtype, $cell->text, $tdattributes) . "\n";
+                    }
+                }
+                $output .= html_writer::end_tag('tr') . "\n";
+            }
+            $output .= html_writer::end_tag('tbody') . "\n";
+        }
+        $output .= html_writer::end_tag('table') . "\n";
+
+        if ($table->responsive) {
+            return self::div($output, 'table-responsive');
+        }
+
+        return $output;
+    }
+
+    /**
+     * Renders form element label
+     *
+     * By default, the label is suffixed with a label separator defined in the
+     * current language pack (colon by default in the English lang pack).
+     * Adding the colon can be explicitly disabled if needed. Label separators
+     * are put outside the label tag itself so they are not read by
+     * screenreaders (accessibility).
+     *
+     * Parameter $for explicitly associates the label with a form control. When
+     * set, the value of this attribute must be the same as the value of
+     * the id attribute of the form control in the same document. When null,
+     * the label being defined is associated with the control inside the label
+     * element.
+     *
+     * @param string $text content of the label tag
+     * @param string|null $for id of the element this label is associated with, null for no association
+     * @param bool $colonize add label separator (colon) to the label text, if it is not there yet
+     * @param array $attributes to be inserted in the tab, for example array('accesskey' => 'a')
+     * @return string HTML of the label element
+     */
+    public static function label($text, $for, $colonize = true, array $attributes=array()) {
+        if (!is_null($for)) {
+            $attributes = array_merge($attributes, array('for' => $for));
+        }
+        $text = trim($text ?? '');
+        $label = self::tag('label', $text, $attributes);
+
+        // TODO MDL-12192 $colonize disabled for now yet
+        // if (!empty($text) and $colonize) {
+        //     // the $text may end with the colon already, though it is bad string definition style
+        //     $colon = get_string('labelsep', 'langconfig');
+        //     if (!empty($colon)) {
+        //         $trimmed = trim($colon);
+        //         if ((substr($text, -strlen($trimmed)) == $trimmed) or (substr($text, -1) == ':')) {
+        //             //debugging('The label text should not end with colon or other label separator,
+        //             //           please fix the string definition.', DEBUG_DEVELOPER);
+        //         } else {
+        //             $label .= $colon;
+        //         }
+        //     }
+        // }
+
+        return $label;
+    }
+
+    /**
+     * Combines a class parameter with other attributes. Aids in code reduction
+     * because the class parameter is very frequently used.
+     *
+     * If the class attribute is specified both in the attributes and in the
+     * class parameter, the two values are combined with a space between.
+     *
+     * @param string $class Optional CSS class (or classes as space-separated list)
+     * @param array $attributes Optional other attributes as array
+     * @return array Attributes (or null if still none)
+     */
+    private static function add_class($class = '', array $attributes = null) {
+        if ($class !== '') {
+            $classattribute = array('class' => $class);
+            if ($attributes) {
+                if (array_key_exists('class', $attributes)) {
+                    $attributes['class'] = trim($attributes['class'] . ' ' . $class);
+                } else {
+                    $attributes = $classattribute + $attributes;
+                }
+            } else {
+                $attributes = $classattribute;
+            }
+        }
+        return $attributes;
+    }
+
+    /**
+     * Creates a <div> tag. (Shortcut function.)
+     *
+     * @param string $content HTML content of tag
+     * @param string $class Optional CSS class (or classes as space-separated list)
+     * @param array $attributes Optional other attributes as array
+     * @return string HTML code for div
+     */
+    public static function div($content, $class = '', array $attributes = null) {
+        return self::tag('div', $content, self::add_class($class, $attributes));
+    }
+
+    /**
+     * Starts a <div> tag. (Shortcut function.)
+     *
+     * @param string $class Optional CSS class (or classes as space-separated list)
+     * @param array $attributes Optional other attributes as array
+     * @return string HTML code for open div tag
+     */
+    public static function start_div($class = '', array $attributes = null) {
+        return self::start_tag('div', self::add_class($class, $attributes));
+    }
+
+    /**
+     * Ends a <div> tag. (Shortcut function.)
+     *
+     * @return string HTML code for close div tag
+     */
+    public static function end_div() {
+        return self::end_tag('div');
+    }
+
+    /**
+     * Creates a <span> tag. (Shortcut function.)
+     *
+     * @param string $content HTML content of tag
+     * @param string $class Optional CSS class (or classes as space-separated list)
+     * @param array $attributes Optional other attributes as array
+     * @return string HTML code for span
+     */
+    public static function span($content, $class = '', array $attributes = null) {
+        return self::tag('span', $content, self::add_class($class, $attributes));
+    }
+
+    /**
+     * Starts a <span> tag. (Shortcut function.)
+     *
+     * @param string $class Optional CSS class (or classes as space-separated list)
+     * @param array $attributes Optional other attributes as array
+     * @return string HTML code for open span tag
+     */
+    public static function start_span($class = '', array $attributes = null) {
+        return self::start_tag('span', self::add_class($class, $attributes));
+    }
+
+    /**
+     * Ends a <span> tag. (Shortcut function.)
+     *
+     * @return string HTML code for close span tag
+     */
+    public static function end_span() {
+        return self::end_tag('span');
+    }
+}
diff --git a/lib/classes/output/image_icon.php b/lib/classes/output/image_icon.php
new file mode 100644
index 0000000000000..805b655d1b6bc
--- /dev/null
+++ b/lib/classes/output/image_icon.php
@@ -0,0 +1,27 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Data structure representing an activity icon.
+ *
+ * The difference is that activity icons will always render with the standard icon system (no font icons).
+ *
+ * @copyright 2017 Damyon Wiese
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
+ */
+class image_icon extends pix_icon {
+}
diff --git a/lib/classes/output/initials_bar.php b/lib/classes/output/initials_bar.php
new file mode 100644
index 0000000000000..e7c48a903ac93
--- /dev/null
+++ b/lib/classes/output/initials_bar.php
@@ -0,0 +1,148 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Component representing initials bar.
+ *
+ * @copyright 2017 Ilya Tregubov
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 3.3
+ * @package core
+ * @category output
+ */
+class initials_bar implements renderable, templatable {
+
+    /**
+     * @var string Currently selected letter.
+     */
+    public $current;
+
+    /**
+     * @var string Class name to add to this initial bar.
+     */
+    public $class;
+
+    /**
+     * @var string The name to put in front of this initial bar.
+     */
+    public $title;
+
+    /**
+     * @var string URL parameter name for this initial.
+     */
+    public $urlvar;
+
+    /**
+     * @var moodle_url URL object.
+     */
+    public $url;
+
+    /**
+     * @var array An array of letters in the alphabet.
+     */
+    public $alpha;
+
+    /**
+     * @var bool Omit links if we are doing a mini render.
+     */
+    public $minirender;
+
+    /**
+     * Constructor initials_bar with only the required params.
+     *
+     * @param string $current the currently selected letter.
+     * @param string $class class name to add to this initial bar.
+     * @param string $title the name to put in front of this initial bar.
+     * @param string $urlvar URL parameter name for this initial.
+     * @param string $url URL object.
+     * @param array $alpha of letters in the alphabet.
+     * @param bool $minirender Return a trimmed down view of the initials bar.
+     */
+    public function __construct($current, $class, $title, $urlvar, $url, $alpha = null, bool $minirender = false) {
+        $this->current       = $current;
+        $this->class    = $class;
+        $this->title    = $title;
+        $this->urlvar    = $urlvar;
+        $this->url    = $url;
+        $this->alpha    = $alpha;
+        $this->minirender = $minirender;
+    }
+
+    /**
+     * Export for template.
+     *
+     * @param renderer_base $output The renderer.
+     * @return stdClass
+     */
+    public function export_for_template(renderer_base $output) {
+        $data = new stdClass();
+
+        if ($this->alpha == null) {
+            $this->alpha = explode(',', get_string('alphabet', 'langconfig'));
+        }
+
+        if ($this->current == 'all') {
+            $this->current = '';
+        }
+
+        // We want to find a letter grouping size which suits the language so
+        // find the largest group size which is less than 15 chars.
+        // The choice of 15 chars is the largest number of chars that reasonably
+        // fits on the smallest supported screen size. By always using a max number
+        // of groups which is a factor of 2, we always get nice wrapping, and the
+        // last row is always the shortest.
+        $groupsize = count($this->alpha);
+        $groups = 1;
+        while ($groupsize > 15) {
+            $groups *= 2;
+            $groupsize = ceil(count($this->alpha) / $groups);
+        }
+
+        $groupsizelimit = 0;
+        $groupnumber = 0;
+        foreach ($this->alpha as $letter) {
+            if ($groupsizelimit++ > 0 && $groupsizelimit % $groupsize == 1) {
+                $groupnumber++;
+            }
+            $groupletter = new stdClass();
+            $groupletter->name = $letter;
+            if (!$this->minirender) {
+                $groupletter->url = $this->url->out(false, array($this->urlvar => $letter));
+            } else {
+                $groupletter->input = $letter;
+            }
+            if ($letter == $this->current) {
+                $groupletter->selected = $this->current;
+            }
+            if (!isset($data->group[$groupnumber])) {
+                $data->group[$groupnumber] = new stdClass();
+            }
+            $data->group[$groupnumber]->letter[] = $groupletter;
+        }
+
+        $data->class = $this->class;
+        $data->title = $this->title;
+        if (!$this->minirender) {
+            $data->url = $this->url->out(false, array($this->urlvar => ''));
+        } else {
+            $data->input = 'ALL';
+        }
+        $data->current = $this->current;
+        $data->all = get_string('all');
+
+        return $data;
+    }
+}
diff --git a/lib/classes/output/js_writer.php b/lib/classes/output/js_writer.php
new file mode 100644
index 0000000000000..348fb79c0e481
--- /dev/null
+++ b/lib/classes/output/js_writer.php
@@ -0,0 +1,147 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Simple javascript output class
+ *
+ * @copyright 2010 Petr Skoda
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class js_writer {
+
+    /**
+     * Returns javascript code calling the function
+     *
+     * @param string $function function name, can be complex like Y.Event.purgeElement
+     * @param array $arguments parameters
+     * @param int $delay execution delay in seconds
+     * @return string JS code fragment
+     */
+    public static function function_call($function, array $arguments = null, $delay=0) {
+        if ($arguments) {
+            $arguments = array_map('json_encode', convert_to_array($arguments));
+            $arguments = implode(', ', $arguments);
+        } else {
+            $arguments = '';
+        }
+        $js = "$function($arguments);";
+
+        if ($delay) {
+            $delay = $delay * 1000; // in miliseconds
+            $js = "setTimeout(function() { $js }, $delay);";
+        }
+        return $js . "\n";
+    }
+
+    /**
+     * Special function which adds Y as first argument of function call.
+     *
+     * @param string $function The function to call
+     * @param array $extraarguments Any arguments to pass to it
+     * @return string Some JS code
+     */
+    public static function function_call_with_Y($function, array $extraarguments = null) {
+        if ($extraarguments) {
+            $extraarguments = array_map('json_encode', convert_to_array($extraarguments));
+            $arguments = 'Y, ' . implode(', ', $extraarguments);
+        } else {
+            $arguments = 'Y';
+        }
+        return "$function($arguments);\n";
+    }
+
+    /**
+     * Returns JavaScript code to initialise a new object
+     *
+     * @param string $var If it is null then no var is assigned the new object.
+     * @param string $class The class to initialise an object for.
+     * @param array $arguments An array of args to pass to the init method.
+     * @param array $requirements Any modules required for this class.
+     * @param int $delay The delay before initialisation. 0 = no delay.
+     * @return string Some JS code
+     */
+    public static function object_init($var, $class, array $arguments = null, array $requirements = null, $delay=0) {
+        if (is_array($arguments)) {
+            $arguments = array_map('json_encode', convert_to_array($arguments));
+            $arguments = implode(', ', $arguments);
+        }
+
+        if ($var === null) {
+            $js = "new $class(Y, $arguments);";
+        } else if (strpos($var, '.')!==false) {
+            $js = "$var = new $class(Y, $arguments);";
+        } else {
+            $js = "var $var = new $class(Y, $arguments);";
+        }
+
+        if ($delay) {
+            $delay = $delay * 1000; // in miliseconds
+            $js = "setTimeout(function() { $js }, $delay);";
+        }
+
+        if (count($requirements) > 0) {
+            $requirements = implode("', '", $requirements);
+            $js = "Y.use('$requirements', function(Y){ $js });";
+        }
+        return $js."\n";
+    }
+
+    /**
+     * Returns code setting value to variable
+     *
+     * @param string $name
+     * @param mixed $value json serialised value
+     * @param bool $usevar add var definition, ignored for nested properties
+     * @return string JS code fragment
+     */
+    public static function set_variable($name, $value, $usevar = true) {
+        $output = '';
+
+        if ($usevar) {
+            if (strpos($name, '.')) {
+                $output .= '';
+            } else {
+                $output .= 'var ';
+            }
+        }
+
+        $output .= "$name = ".json_encode($value).";";
+
+        return $output;
+    }
+
+    /**
+     * Writes event handler attaching code
+     *
+     * @param array|string $selector standard YUI selector for elements, may be
+     *     array or string, element id is in the form "#idvalue"
+     * @param string $event A valid DOM event (click, mousedown, change etc.)
+     * @param string $function The name of the function to call
+     * @param array $arguments An optional array of argument parameters to pass to the function
+     * @return string JS code fragment
+     */
+    public static function event_handler($selector, $event, $function, array $arguments = null) {
+        $selector = json_encode($selector);
+        $output = "Y.on('$event', $function, $selector, null";
+        if (!empty($arguments)) {
+            $output .= ', ' . json_encode($arguments);
+        }
+        return $output . ");\n";
+    }
+}
diff --git a/lib/classes/output/paging_bar.php b/lib/classes/output/paging_bar.php
new file mode 100644
index 0000000000000..bc6a47c632c7a
--- /dev/null
+++ b/lib/classes/output/paging_bar.php
@@ -0,0 +1,255 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Component representing a paging bar.
+ *
+ * @copyright 2009 Nicolas Connault
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class paging_bar implements renderable, templatable {
+
+    /**
+     * @var int The maximum number of pagelinks to display.
+     */
+    public $maxdisplay = 18;
+
+    /**
+     * @var int The total number of entries to be pages through..
+     */
+    public $totalcount;
+
+    /**
+     * @var int The page you are currently viewing.
+     */
+    public $page;
+
+    /**
+     * @var int The number of entries that should be shown per page.
+     */
+    public $perpage;
+
+    /**
+     * @var string|moodle_url If this  is a string then it is the url which will be appended with $pagevar,
+     * an equals sign and the page number.
+     * If this is a moodle_url object then the pagevar param will be replaced by
+     * the page no, for each page.
+     */
+    public $baseurl;
+
+    /**
+     * @var string This is the variable name that you use for the pagenumber in your
+     * code (ie. 'tablepage', 'blogpage', etc)
+     */
+    public $pagevar;
+
+    /**
+     * @var string A HTML link representing the "previous" page.
+     */
+    public $previouslink = null;
+
+    /**
+     * @var string A HTML link representing the "next" page.
+     */
+    public $nextlink = null;
+
+    /**
+     * @var string A HTML link representing the first page.
+     */
+    public $firstlink = null;
+
+    /**
+     * @var string A HTML link representing the last page.
+     */
+    public $lastlink = null;
+
+    /**
+     * @var array An array of strings. One of them is just a string: the current page
+     */
+    public $pagelinks = array();
+
+    /**
+     * Constructor paging_bar with only the required params.
+     *
+     * @param int $totalcount The total number of entries available to be paged through
+     * @param int $page The page you are currently viewing
+     * @param int $perpage The number of entries that should be shown per page
+     * @param string|moodle_url $baseurl url of the current page, the $pagevar parameter is added
+     * @param string $pagevar name of page parameter that holds the page number
+     */
+    public function __construct($totalcount, $page, $perpage, $baseurl, $pagevar = 'page') {
+        $this->totalcount = $totalcount;
+        $this->page       = $page;
+        $this->perpage    = $perpage;
+        $this->baseurl    = $baseurl;
+        $this->pagevar    = $pagevar;
+    }
+
+    /**
+     * Prepares the paging bar for output.
+     *
+     * This method validates the arguments set up for the paging bar and then
+     * produces fragments of HTML to assist display later on.
+     *
+     * @param renderer_base $output
+     * @param moodle_page $page
+     * @param string $target
+     * @throws coding_exception
+     */
+    public function prepare(renderer_base $output, moodle_page $page, $target) {
+        if (!isset($this->totalcount) || is_null($this->totalcount)) {
+            throw new coding_exception('paging_bar requires a totalcount value.');
+        }
+        if (!isset($this->page) || is_null($this->page)) {
+            throw new coding_exception('paging_bar requires a page value.');
+        }
+        if (empty($this->perpage)) {
+            throw new coding_exception('paging_bar requires a perpage value.');
+        }
+        if (empty($this->baseurl)) {
+            throw new coding_exception('paging_bar requires a baseurl value.');
+        }
+
+        if ($this->totalcount > $this->perpage) {
+            $pagenum = $this->page - 1;
+
+            if ($this->page > 0) {
+                $this->previouslink = html_writer::link(new moodle_url($this->baseurl, array($this->pagevar=>$pagenum)), get_string('previous'), array('class'=>'previous'));
+            }
+
+            if ($this->perpage > 0) {
+                $lastpage = ceil($this->totalcount / $this->perpage);
+            } else {
+                $lastpage = 1;
+            }
+
+            if ($this->page > round(($this->maxdisplay/3)*2)) {
+                $currpage = $this->page - round($this->maxdisplay/3);
+
+                $this->firstlink = html_writer::link(new moodle_url($this->baseurl, array($this->pagevar=>0)), '1', array('class'=>'first'));
+            } else {
+                $currpage = 0;
+            }
+
+            $displaycount = $displaypage = 0;
+
+            while ($displaycount < $this->maxdisplay and $currpage < $lastpage) {
+                $displaypage = $currpage + 1;
+
+                if ($this->page == $currpage) {
+                    $this->pagelinks[] = html_writer::span($displaypage, 'current-page');
+                } else {
+                    $pagelink = html_writer::link(new moodle_url($this->baseurl, array($this->pagevar=>$currpage)), $displaypage);
+                    $this->pagelinks[] = $pagelink;
+                }
+
+                $displaycount++;
+                $currpage++;
+            }
+
+            if ($currpage < $lastpage) {
+                $lastpageactual = $lastpage - 1;
+                $this->lastlink = html_writer::link(new moodle_url($this->baseurl, array($this->pagevar=>$lastpageactual)), $lastpage, array('class'=>'last'));
+            }
+
+            $pagenum = $this->page + 1;
+
+            if ($pagenum != $lastpage) {
+                $this->nextlink = html_writer::link(new moodle_url($this->baseurl, array($this->pagevar=>$pagenum)), get_string('next'), array('class'=>'next'));
+            }
+        }
+    }
+
+    /**
+     * Export for template.
+     *
+     * @param renderer_base $output The renderer.
+     * @return stdClass
+     */
+    public function export_for_template(renderer_base $output) {
+        $data = new stdClass();
+        $data->previous = null;
+        $data->next = null;
+        $data->first = null;
+        $data->last = null;
+        $data->label = get_string('page');
+        $data->pages = [];
+        $data->haspages = $this->totalcount > $this->perpage;
+        $data->pagesize = $this->perpage;
+
+        if (!$data->haspages) {
+            return $data;
+        }
+
+        if ($this->page > 0) {
+            $data->previous = [
+                'page' => $this->page,
+                'url' => (new moodle_url($this->baseurl, [$this->pagevar => $this->page - 1]))->out(false)
+            ];
+        }
+
+        $currpage = 0;
+        if ($this->page > round(($this->maxdisplay / 3) * 2)) {
+            $currpage = $this->page - round($this->maxdisplay / 3);
+            $data->first = [
+                'page' => 1,
+                'url' => (new moodle_url($this->baseurl, [$this->pagevar => 0]))->out(false)
+            ];
+        }
+
+        $lastpage = 1;
+        if ($this->perpage > 0) {
+            $lastpage = ceil($this->totalcount / $this->perpage);
+        }
+
+        $displaycount = 0;
+        $displaypage = 0;
+        while ($displaycount < $this->maxdisplay and $currpage < $lastpage) {
+            $displaypage = $currpage + 1;
+
+            $iscurrent = $this->page == $currpage;
+            $link = new moodle_url($this->baseurl, [$this->pagevar => $currpage]);
+
+            $data->pages[] = [
+                'page' => $displaypage,
+                'active' => $iscurrent,
+                'url' => $iscurrent ? null : $link->out(false)
+            ];
+
+            $displaycount++;
+            $currpage++;
+        }
+
+        if ($currpage < $lastpage) {
+            $data->last = [
+                'page' => $lastpage,
+                'url' => (new moodle_url($this->baseurl, [$this->pagevar => $lastpage - 1]))->out(false)
+            ];
+        }
+
+        if ($this->page + 1 != $lastpage) {
+            $data->next = [
+                'page' => $this->page + 2,
+                'url' => (new moodle_url($this->baseurl, [$this->pagevar => $this->page + 1]))->out(false)
+            ];
+        }
+
+        return $data;
+    }
+}
diff --git a/lib/classes/output/pix_emoticon.php b/lib/classes/output/pix_emoticon.php
new file mode 100644
index 0000000000000..5740c729f251f
--- /dev/null
+++ b/lib/classes/output/pix_emoticon.php
@@ -0,0 +1,40 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Data structure representing an emoticon image
+ *
+ * @copyright 2010 David Mudrak
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class pix_emoticon extends pix_icon implements renderable {
+    /**
+     * Constructor
+     * @param string $pix short icon name
+     * @param string $alt alternative text
+     * @param string $component emoticon image provider
+     * @param array $attributes explicit HTML attributes
+     */
+    public function __construct($pix, $alt, $component = 'moodle', array $attributes = array()) {
+        if (empty($attributes['class'])) {
+            $attributes['class'] = 'emoticon';
+        }
+        parent::__construct($pix, $alt, $component, $attributes);
+    }
+}
diff --git a/lib/classes/output/pix_icon.php b/lib/classes/output/pix_icon.php
new file mode 100644
index 0000000000000..0106e7c0d52b8
--- /dev/null
+++ b/lib/classes/output/pix_icon.php
@@ -0,0 +1,143 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Data structure representing an icon.
+ *
+ * @copyright 2010 Petr Skoda
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class pix_icon implements renderable, templatable {
+
+    /**
+     * @var string The icon name
+     */
+    var $pix;
+
+    /**
+     * @var string The component the icon belongs to.
+     */
+    var $component;
+
+    /**
+     * @var array An array of attributes to use on the icon
+     */
+    var $attributes = array();
+
+    /**
+     * Constructor
+     *
+     * @param string $pix short icon name
+     * @param string $alt The alt text to use for the icon
+     * @param string $component component name
+     * @param array $attributes html attributes
+     */
+    public function __construct($pix, $alt, $component='moodle', array $attributes = null) {
+        global $PAGE;
+
+        $this->pix = $pix;
+        $this->component  = $component;
+        $this->attributes = (array)$attributes;
+
+        if (empty($this->attributes['class'])) {
+            $this->attributes['class'] = '';
+        }
+
+        // Set an additional class for big icons so that they can be styled properly.
+        if (substr($pix, 0, 2) === 'b/') {
+            $this->attributes['class'] .= ' iconsize-big';
+        }
+
+        // If the alt is empty, don't place it in the attributes, otherwise it will override parent alt text.
+        if (!is_null($alt)) {
+            $this->attributes['alt'] = $alt;
+
+            // If there is no title, set it to the attribute.
+            if (!isset($this->attributes['title'])) {
+                $this->attributes['title'] = $this->attributes['alt'];
+            }
+        } else {
+            unset($this->attributes['alt']);
+        }
+
+        if (empty($this->attributes['title'])) {
+            // Remove the title attribute if empty, we probably want to use the parent node's title
+            // and some browsers might overwrite it with an empty title.
+            unset($this->attributes['title']);
+        }
+
+        // Hide icons from screen readers that have no alt.
+        if (empty($this->attributes['alt'])) {
+            $this->attributes['aria-hidden'] = 'true';
+        }
+    }
+
+    /**
+     * Export this data so it can be used as the context for a mustache template.
+     *
+     * @param renderer_base $output Used to do a final render of any components that need to be rendered for export.
+     * @return array
+     */
+    public function export_for_template(renderer_base $output) {
+        $attributes = $this->attributes;
+        $extraclasses = '';
+
+        foreach ($attributes as $key => $item) {
+            if ($key == 'class') {
+                $extraclasses = $item;
+                unset($attributes[$key]);
+                break;
+            }
+        }
+
+        $attributes['src'] = $output->image_url($this->pix, $this->component)->out(false);
+        $templatecontext = array();
+        foreach ($attributes as $name => $value) {
+            $templatecontext[] = array('name' => $name, 'value' => $value);
+        }
+        $title = isset($attributes['title']) ? $attributes['title'] : '';
+        if (empty($title)) {
+            $title = isset($attributes['alt']) ? $attributes['alt'] : '';
+        }
+        $data = array(
+            'attributes' => $templatecontext,
+            'extraclasses' => $extraclasses
+        );
+
+        return $data;
+    }
+
+    /**
+     * Much simpler version of export that will produce the data required to render this pix with the
+     * pix helper in a mustache tag.
+     *
+     * @return array
+     */
+    public function export_for_pix() {
+        $title = isset($this->attributes['title']) ? $this->attributes['title'] : '';
+        if (empty($title)) {
+            $title = isset($this->attributes['alt']) ? $this->attributes['alt'] : '';
+        }
+        return [
+            'key' => $this->pix,
+            'component' => $this->component,
+            'title' => (string) $title,
+        ];
+    }
+}
diff --git a/lib/classes/output/pix_icon_font.php b/lib/classes/output/pix_icon_font.php
new file mode 100644
index 0000000000000..280853de86ae8
--- /dev/null
+++ b/lib/classes/output/pix_icon_font.php
@@ -0,0 +1,93 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Data structure representing an icon font.
+ *
+ * @copyright 2016 Damyon Wiese
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
+ * @category output
+ */
+class pix_icon_font implements templatable {
+
+    /**
+     * @var pix_icon $pixicon The original icon.
+     */
+    private $pixicon = null;
+
+    /**
+     * @var string $key The mapped key.
+     */
+    private $key;
+
+    /**
+     * @var bool $mapped The icon could not be mapped.
+     */
+    private $mapped;
+
+    /**
+     * Constructor
+     *
+     * @param pix_icon $pixicon The original icon
+     */
+    public function __construct(pix_icon $pixicon) {
+        global $PAGE;
+
+        $this->pixicon = $pixicon;
+        $this->mapped = false;
+        $iconsystem = \core\output\icon_system::instance();
+
+        $this->key = $iconsystem->remap_icon_name($pixicon->pix, $pixicon->component);
+        if (!empty($this->key)) {
+            $this->mapped = true;
+        }
+    }
+
+    /**
+     * Return true if this pix_icon was successfully mapped to an icon font.
+     *
+     * @return bool
+     */
+    public function is_mapped() {
+        return $this->mapped;
+    }
+
+    /**
+     * Export this data so it can be used as the context for a mustache template.
+     *
+     * @param renderer_base $output Used to do a final render of any components that need to be rendered for export.
+     * @return array
+     */
+    public function export_for_template(renderer_base $output) {
+
+        $pixdata = $this->pixicon->export_for_template($output);
+
+        $title = isset($this->pixicon->attributes['title']) ? $this->pixicon->attributes['title'] : '';
+        $alt = isset($this->pixicon->attributes['alt']) ? $this->pixicon->attributes['alt'] : '';
+        if (empty($title)) {
+            $title = $alt;
+        }
+        $data = array(
+            'extraclasses' => $pixdata['extraclasses'],
+            'title' => $title,
+            'alt' => $alt,
+            'key' => $this->key
+        );
+
+        return $data;
+    }
+}
diff --git a/lib/classes/output/pix_icon_fontawesome.php b/lib/classes/output/pix_icon_fontawesome.php
new file mode 100644
index 0000000000000..8cab6924e5c30
--- /dev/null
+++ b/lib/classes/output/pix_icon_fontawesome.php
@@ -0,0 +1,26 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Data structure representing an icon subtype.
+ *
+ * @copyright 2016 Damyon Wiese
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
+ * @category output
+ */
+class pix_icon_fontawesome extends pix_icon_font {
+}
diff --git a/lib/classes/output/plugin_renderer_base.php b/lib/classes/output/plugin_renderer_base.php
new file mode 100644
index 0000000000000..922d867a867ca
--- /dev/null
+++ b/lib/classes/output/plugin_renderer_base.php
@@ -0,0 +1,131 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Basis for all plugin renderers.
+ *
+ * @copyright Petr Skoda (skodak)
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class plugin_renderer_base extends renderer_base {
+
+    /**
+     * @var renderer_base|core_renderer A reference to the current renderer.
+     * The renderer provided here will be determined by the page but will in 90%
+     * of cases by the {@link core_renderer}
+     */
+    protected $output;
+
+    /**
+     * Constructor method, calls the parent constructor
+     *
+     * @param moodle_page $page
+     * @param string $target one of rendering target constants
+     */
+    public function __construct(moodle_page $page, $target) {
+        if (empty($target) && $page->pagelayout === 'maintenance') {
+            // If the page is using the maintenance layout then we're going to force the target to maintenance.
+            // This way we'll get a special maintenance renderer that is designed to block access to API's that are likely
+            // unavailable for this page layout.
+            $target = RENDERER_TARGET_MAINTENANCE;
+        }
+        $this->output = $page->get_renderer('core', null, $target);
+        parent::__construct($page, $target);
+    }
+
+    /**
+     * Renders the provided widget and returns the HTML to display it.
+     *
+     * @param renderable $widget instance with renderable interface
+     * @return string
+     */
+    public function render(renderable $widget) {
+        $classname = get_class($widget);
+
+        // Strip namespaces.
+        $classname = preg_replace('/^.*\\\/', '', $classname);
+
+        // Keep a copy at this point, we may need to look for a deprecated method.
+        $deprecatedmethod = "render_{$classname}";
+
+        // Remove _renderable suffixes.
+        $classname = preg_replace('/_renderable$/', '', $classname);
+        $rendermethod = "render_{$classname}";
+
+        if (method_exists($this, $rendermethod)) {
+            // Call the render_[widget_name] function.
+            // Note: This has a higher priority than the named_templatable to allow the theme to override the template.
+            return $this->$rendermethod($widget);
+        }
+
+        if ($widget instanceof named_templatable) {
+            // This is a named templatable.
+            // Fetch the template name from the get_template_name function instead.
+            // Note: This has higher priority than the deprecated method which is not overridable by themes anyway.
+            return $this->render_from_template(
+                $widget->get_template_name($this),
+                $widget->export_for_template($this)
+            );
+        }
+
+        if ($rendermethod !== $deprecatedmethod && method_exists($this, $deprecatedmethod)) {
+            // This is exactly where we don't want to be.
+            // If you have arrived here you have a renderable component within your plugin that has the name
+            // blah_renderable, and you have a render method render_blah_renderable on your plugin.
+            // In 2.8 we revamped output, as part of this change we changed slightly how renderables got rendered
+            // and the _renderable suffix now gets removed when looking for a render method.
+            // You need to change your renderers render_blah_renderable to render_blah.
+            // Until you do this it will not be possible for a theme to override the renderer to override your method.
+            // Please do it ASAP.
+            static $debugged = [];
+            if (!isset($debugged[$deprecatedmethod])) {
+                debugging(sprintf(
+                    'Deprecated call. Please rename your renderables render method from %s to %s.',
+                    $deprecatedmethod,
+                    $rendermethod
+                ), DEBUG_DEVELOPER);
+                $debugged[$deprecatedmethod] = true;
+            }
+            return $this->$deprecatedmethod($widget);
+        }
+
+        // Pass to core renderer if method not found here.
+        // Note: this is not a parent. This is _new_ renderer which respects the requested format, and output type.
+        return $this->output->render($widget);
+    }
+
+    /**
+     * Magic method used to pass calls otherwise meant for the standard renderer
+     * to it to ensure we don't go causing unnecessary grief.
+     *
+     * @param string $method
+     * @param array $arguments
+     * @return mixed
+     */
+    public function __call($method, $arguments) {
+        if (method_exists('renderer_base', $method)) {
+            throw new coding_exception('Protected method called against '.get_class($this).' :: '.$method);
+        }
+        if (method_exists($this->output, $method)) {
+            return call_user_func_array(array($this->output, $method), $arguments);
+        } else {
+            throw new coding_exception('Unknown method called against '.get_class($this).' :: '.$method);
+        }
+    }
+}
diff --git a/lib/classes/output/preferences_group.php b/lib/classes/output/preferences_group.php
new file mode 100644
index 0000000000000..bc8a5d0d7a71b
--- /dev/null
+++ b/lib/classes/output/preferences_group.php
@@ -0,0 +1,47 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Represents a group of preferences page link.
+ *
+ * @package core
+ * @category output
+ * @copyright 2015 Frédéric Massart - FMCorz.net
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class preferences_group implements renderable {
+    /**
+     * Title of the group.
+     * @var string
+     */
+    public $title;
+
+    /**
+     * Array of navigation_node.
+     * @var array
+     */
+    public $nodes;
+
+    /**
+     * Constructor.
+     * @param string $title The title.
+     * @param array $nodes of navigation_node.
+     */
+    public function __construct($title, $nodes) {
+        $this->title = $title;
+        $this->nodes = $nodes;
+    }
+}
diff --git a/lib/classes/output/preferences_groups.php b/lib/classes/output/preferences_groups.php
new file mode 100644
index 0000000000000..6bdcf936fb060
--- /dev/null
+++ b/lib/classes/output/preferences_groups.php
@@ -0,0 +1,39 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Represents a set of preferences groups.
+ *
+ * @package core
+ * @category output
+ * @copyright 2015 Frédéric Massart - FMCorz.net
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class preferences_groups implements renderable {
+    /**
+     * Array of preferences_group.
+     * @var array
+     */
+    public $groups;
+
+    /**
+     * Constructor.
+     * @param array $groups of preferences_group
+     */
+    public function __construct($groups) {
+        $this->groups = $groups;
+    }
+}
diff --git a/lib/classes/output/progress_bar.php b/lib/classes/output/progress_bar.php
new file mode 100644
index 0000000000000..a674ec87d28c7
--- /dev/null
+++ b/lib/classes/output/progress_bar.php
@@ -0,0 +1,204 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Progress bar class.
+ *
+ * Manages the display of a progress bar.
+ *
+ * To use this class.
+ * - construct
+ * - call create (or use the 3rd param to the constructor)
+ * - call update or update_full() or update() repeatedly
+ *
+ * @copyright 2008 jamiesensei
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
+ * @category output
+ */
+class progress_bar implements renderable, templatable {
+    /** @var string html id */
+    private $html_id;
+    /** @var int total width */
+    private $width;
+    /** @var int last percentage printed */
+    private $percent = 0;
+    /** @var int time when last printed */
+    private $lastupdate = 0;
+    /** @var int when did we start printing this */
+    private $time_start = 0;
+
+    /**
+     * Constructor
+     *
+     * Prints JS code if $autostart true.
+     *
+     * @param string $htmlid The container ID.
+     * @param int $width The suggested width.
+     * @param bool $autostart Whether to start the progress bar right away.
+     */
+    public function __construct($htmlid = '', $width = 500, $autostart = false) {
+        if (!CLI_SCRIPT && !NO_OUTPUT_BUFFERING) {
+            debugging('progress_bar used in a non-CLI script without setting NO_OUTPUT_BUFFERING.', DEBUG_DEVELOPER);
+        }
+
+        if (!empty($htmlid)) {
+            $this->html_id  = $htmlid;
+        } else {
+            $this->html_id  = 'pbar_'.uniqid();
+        }
+
+        $this->width = $width;
+
+        if ($autostart) {
+            $this->create();
+        }
+    }
+
+    /**
+     * Getter for ID
+     * @return string id
+     */
+    public function get_id(): string {
+        return $this->html_id;
+    }
+
+    /**
+     * Create a new progress bar, this function will output html.
+     *
+     * @return void Echo's output
+     */
+    public function create() {
+        global $OUTPUT;
+
+        $this->time_start = microtime(true);
+
+        flush();
+        echo $OUTPUT->render($this);
+        flush();
+    }
+
+    /**
+     * Update the progress bar.
+     *
+     * @param int $percent From 1-100.
+     * @param string $msg The message.
+     * @return void Echo's output
+     * @throws coding_exception
+     */
+    private function _update($percent, $msg) {
+        global $OUTPUT;
+
+        if (empty($this->time_start)) {
+            throw new coding_exception('You must call create() (or use the $autostart ' .
+                'argument to the constructor) before you try updating the progress bar.');
+        }
+
+        $estimate = $this->estimate($percent);
+
+        if ($estimate === null) {
+            // Always do the first and last updates.
+        } else if ($estimate == 0) {
+            // Always do the last updates.
+        } else if ($this->lastupdate + 20 < time()) {
+            // We must update otherwise browser would time out.
+        } else if (round($this->percent, 2) === round($percent, 2)) {
+            // No significant change, no need to update anything.
+            return;
+        }
+
+        $estimatemsg = '';
+        if ($estimate != 0 && is_numeric($estimate)) {
+            // Err on the conservative side and also avoid showing 'now' as the estimate.
+            $estimatemsg = format_time(ceil($estimate));
+        }
+
+        $this->percent = $percent;
+        $this->lastupdate = microtime(true);
+
+        echo $OUTPUT->render_progress_bar_update($this->html_id, $this->percent, $msg, $estimatemsg);
+        flush();
+    }
+
+    /**
+     * Estimate how much time it is going to take.
+     *
+     * @param int $pt From 1-100.
+     * @return mixed Null (unknown), or int.
+     */
+    private function estimate($pt) {
+        if ($this->lastupdate == 0) {
+            return null;
+        }
+        if ($pt < 0.00001) {
+            return null; // We do not know yet how long it will take.
+        }
+        if ($pt > 99.99999) {
+            return 0; // Nearly done, right?
+        }
+        $consumed = microtime(true) - $this->time_start;
+        if ($consumed < 0.001) {
+            return null;
+        }
+
+        return (100 - $pt) * ($consumed / $pt);
+    }
+
+    /**
+     * Update progress bar according percent.
+     *
+     * @param int $percent From 1-100.
+     * @param string $msg The message needed to be shown.
+     */
+    public function update_full($percent, $msg) {
+        $percent = max(min($percent, 100), 0);
+        $this->_update($percent, $msg);
+    }
+
+    /**
+     * Update progress bar according the number of tasks.
+     *
+     * @param int $cur Current task number.
+     * @param int $total Total task number.
+     * @param string $msg The message needed to be shown.
+     */
+    public function update($cur, $total, $msg) {
+        $percent = ($cur / $total) * 100;
+        $this->update_full($percent, $msg);
+    }
+
+    /**
+     * Restart the progress bar.
+     */
+    public function restart() {
+        $this->percent    = 0;
+        $this->lastupdate = 0;
+        $this->time_start = 0;
+    }
+
+    /**
+     * Export for template.
+     *
+     * @param  renderer_base $output The renderer.
+     * @return array
+     */
+    public function export_for_template(renderer_base $output) {
+        return [
+            'id' => $this->html_id,
+            'width' => $this->width,
+        ];
+    }
+}
diff --git a/lib/classes/output/renderable.php b/lib/classes/output/renderable.php
new file mode 100644
index 0000000000000..7c1a065146b5a
--- /dev/null
+++ b/lib/classes/output/renderable.php
@@ -0,0 +1,26 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Interface marking other classes as suitable for renderer_base::render()
+ *
+ * @copyright 2010 Petr Skoda (skodak) info@skodak.org
+ * @package core
+ * @category output
+ */
+interface renderable {
+    // intentionally empty
+}
diff --git a/lib/classes/output/renderer_base.php b/lib/classes/output/renderer_base.php
new file mode 100644
index 0000000000000..c33c12bfafe92
--- /dev/null
+++ b/lib/classes/output/renderer_base.php
@@ -0,0 +1,406 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+use core\output\named_templatable;
+
+/**
+ * Simple base class for Moodle renderers.
+ *
+ * Tracks the xhtml_container_stack to use, which is passed in in the constructor.
+ *
+ * Also has methods to facilitate generating HTML output.
+ *
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class renderer_base {
+    /**
+     * @var xhtml_container_stack The xhtml_container_stack to use.
+     */
+    protected $opencontainers;
+
+    /**
+     * @var moodle_page The Moodle page the renderer has been created to assist with.
+     */
+    protected $page;
+
+    /**
+     * @var string The requested rendering target.
+     */
+    protected $target;
+
+    /**
+     * @var Mustache_Engine $mustache The mustache template compiler
+     */
+    private $mustache;
+
+    /**
+     * @var array $templatecache The mustache template cache.
+     */
+    protected $templatecache = [];
+
+    /**
+     * Return an instance of the mustache class.
+     *
+     * @since 2.9
+     * @return Mustache_Engine
+     */
+    protected function get_mustache() {
+        global $CFG;
+
+        if ($this->mustache === null) {
+            require_once("{$CFG->libdir}/filelib.php");
+
+            $themename = $this->page->theme->name;
+            $themerev = theme_get_revision();
+
+            // Create new localcache directory.
+            $cachedir = make_localcache_directory("mustache/$themerev/$themename");
+
+            // Remove old localcache directories.
+            $mustachecachedirs = glob("{$CFG->localcachedir}/mustache/*", GLOB_ONLYDIR);
+            foreach ($mustachecachedirs as $localcachedir) {
+                $cachedrev = [];
+                preg_match("/\/mustache\/([0-9]+)$/", $localcachedir, $cachedrev);
+                $cachedrev = isset($cachedrev[1]) ? intval($cachedrev[1]) : 0;
+                if ($cachedrev > 0 && $cachedrev < $themerev) {
+                    fulldelete($localcachedir);
+                }
+            }
+
+            $loader = new \core\output\mustache_filesystem_loader();
+            $stringhelper = new \core\output\mustache_string_helper();
+            $cleanstringhelper = new \core\output\mustache_clean_string_helper();
+            $quotehelper = new \core\output\mustache_quote_helper();
+            $jshelper = new \core\output\mustache_javascript_helper($this->page);
+            $pixhelper = new \core\output\mustache_pix_helper($this);
+            $shortentexthelper = new \core\output\mustache_shorten_text_helper();
+            $userdatehelper = new \core\output\mustache_user_date_helper();
+
+            // We only expose the variables that are exposed to JS templates.
+            $safeconfig = $this->page->requires->get_config_for_javascript($this->page, $this);
+
+            $helpers = array('config' => $safeconfig,
+                             'str' => array($stringhelper, 'str'),
+                             'cleanstr' => array($cleanstringhelper, 'cleanstr'),
+                             'quote' => array($quotehelper, 'quote'),
+                             'js' => array($jshelper, 'help'),
+                             'pix' => array($pixhelper, 'pix'),
+                             'shortentext' => array($shortentexthelper, 'shorten'),
+                             'userdate' => array($userdatehelper, 'transform'),
+                         );
+
+            $this->mustache = new \core\output\mustache_engine(array(
+                'cache' => $cachedir,
+                'escape' => 's',
+                'loader' => $loader,
+                'helpers' => $helpers,
+                'pragmas' => [Mustache_Engine::PRAGMA_BLOCKS],
+                // Don't allow the JavaScript helper to be executed from within another
+                // helper. If it's allowed it can be used by users to inject malicious
+                // JS into the page.
+                'disallowednestedhelpers' => ['js'],
+                // Disable lambda rendering - content in helpers is already rendered, no need to render it again.
+                'disable_lambda_rendering' => true,
+            ));
+
+        }
+
+        return $this->mustache;
+    }
+
+
+    /**
+     * Constructor
+     *
+     * The constructor takes two arguments. The first is the page that the renderer
+     * has been created to assist with, and the second is the target.
+     * The target is an additional identifier that can be used to load different
+     * renderers for different options.
+     *
+     * @param moodle_page $page the page we are doing output for.
+     * @param string $target one of rendering target constants
+     */
+    public function __construct(moodle_page $page, $target) {
+        $this->opencontainers = $page->opencontainers;
+        $this->page = $page;
+        $this->target = $target;
+    }
+
+    /**
+     * Renders a template by name with the given context.
+     *
+     * The provided data needs to be array/stdClass made up of only simple types.
+     * Simple types are array,stdClass,bool,int,float,string
+     *
+     * @since 2.9
+     * @param array|stdClass $context Context containing data for the template.
+     * @return string|boolean
+     */
+    public function render_from_template($templatename, $context) {
+        $mustache = $this->get_mustache();
+
+        if ($mustache->hasHelper('uniqid')) {
+            // Grab a copy of the existing helper to be restored later.
+            $uniqidhelper = $mustache->getHelper('uniqid');
+        } else {
+            // Helper doesn't exist.
+            $uniqidhelper = null;
+        }
+
+        // Provide 1 random value that will not change within a template
+        // but will be different from template to template. This is useful for
+        // e.g. aria attributes that only work with id attributes and must be
+        // unique in a page.
+        $mustache->addHelper('uniqid', new \core\output\mustache_uniqid_helper());
+        if (isset($this->templatecache[$templatename])) {
+            $template = $this->templatecache[$templatename];
+        } else {
+            try {
+                $template = $mustache->loadTemplate($templatename);
+                $this->templatecache[$templatename] = $template;
+            } catch (Mustache_Exception_UnknownTemplateException $e) {
+                throw new moodle_exception('Unknown template: ' . $templatename);
+            }
+        }
+
+        $renderedtemplate = trim($template->render($context));
+
+        // If we had an existing uniqid helper then we need to restore it to allow
+        // handle nested calls of render_from_template.
+        if ($uniqidhelper) {
+            $mustache->addHelper('uniqid', $uniqidhelper);
+        }
+
+        return $renderedtemplate;
+    }
+
+
+    /**
+     * Returns rendered widget.
+     *
+     * The provided widget needs to be an object that extends the renderable
+     * interface.
+     * If will then be rendered by a method based upon the classname for the widget.
+     * For instance a widget of class `crazywidget` will be rendered by a protected
+     * render_crazywidget method of this renderer.
+     * If no render_crazywidget method exists and crazywidget implements templatable,
+     * look for the 'crazywidget' template in the same component and render that.
+     *
+     * @param renderable $widget instance with renderable interface
+     * @return string
+     */
+    public function render(renderable $widget) {
+        $classparts = explode('\\', get_class($widget));
+        // Strip namespaces.
+        $classname = array_pop($classparts);
+        // Remove _renderable suffixes.
+        $classname = preg_replace('/_renderable$/', '', $classname);
+
+        $rendermethod = "render_{$classname}";
+        if (method_exists($this, $rendermethod)) {
+            // Call the render_[widget_name] function.
+            // Note: This has a higher priority than the named_templatable to allow the theme to override the template.
+            return $this->$rendermethod($widget);
+        }
+
+        if ($widget instanceof named_templatable) {
+            // This is a named templatable.
+            // Fetch the template name from the get_template_name function instead.
+            // Note: This has higher priority than the guessed template name.
+            return $this->render_from_template(
+                $widget->get_template_name($this),
+                $widget->export_for_template($this)
+            );
+        }
+
+        if ($widget instanceof templatable) {
+            // Guess the templat ename based on the class name.
+            // Note: There's no benefit to moving this aboved the named_templatable and this approach is more costly.
+            $component = array_shift($classparts);
+            if (!$component) {
+                $component = 'core';
+            }
+            $template = $component . '/' . $classname;
+            $context = $widget->export_for_template($this);
+            return $this->render_from_template($template, $context);
+        }
+        throw new coding_exception("Can not render widget, renderer method ('{$rendermethod}') not found.");
+    }
+
+    /**
+     * Adds a JS action for the element with the provided id.
+     *
+     * This method adds a JS event for the provided component action to the page
+     * and then returns the id that the event has been attached to.
+     * If no id has been provided then a new ID is generated by {@link html_writer::random_id()}
+     *
+     * @param component_action $action
+     * @param string $id
+     * @return string id of element, either original submitted or random new if not supplied
+     */
+    public function add_action_handler(component_action $action, $id = null) {
+        if (!$id) {
+            $id = html_writer::random_id($action->event);
+        }
+        $this->page->requires->event_handler("#$id", $action->event, $action->jsfunction, $action->jsfunctionargs);
+        return $id;
+    }
+
+    /**
+     * Returns true is output has already started, and false if not.
+     *
+     * @return boolean true if the header has been printed.
+     */
+    public function has_started() {
+        return $this->page->state >= moodle_page::STATE_IN_BODY;
+    }
+
+    /**
+     * Given an array or space-separated list of classes, prepares and returns the HTML class attribute value
+     *
+     * @param mixed $classes Space-separated string or array of classes
+     * @return string HTML class attribute value
+     */
+    public static function prepare_classes($classes) {
+        if (is_array($classes)) {
+            return implode(' ', array_unique($classes));
+        }
+        return $classes;
+    }
+
+    /**
+     * Return the direct URL for an image from the pix folder.
+     *
+     * Use this function sparingly and never for icons. For icons use pix_icon or the pix helper in a mustache template.
+     *
+     * @deprecated since Moodle 3.3
+     * @param string $imagename the name of the icon.
+     * @param string $component specification of one plugin like in get_string()
+     * @return moodle_url
+     */
+    public function pix_url($imagename, $component = 'moodle') {
+        debugging('pix_url is deprecated. Use image_url for images and pix_icon for icons.', DEBUG_DEVELOPER);
+        return $this->page->theme->image_url($imagename, $component);
+    }
+
+    /**
+     * Return the moodle_url for an image.
+     *
+     * The exact image location and extension is determined
+     * automatically by searching for gif|png|jpg|jpeg, please
+     * note there can not be diferent images with the different
+     * extension. The imagename is for historical reasons
+     * a relative path name, it may be changed later for core
+     * images. It is recommended to not use subdirectories
+     * in plugin and theme pix directories.
+     *
+     * There are three types of images:
+     * 1/ theme images  - stored in theme/mytheme/pix/,
+     *                    use component 'theme'
+     * 2/ core images   - stored in /pix/,
+     *                    overridden via theme/mytheme/pix_core/
+     * 3/ plugin images - stored in mod/mymodule/pix,
+     *                    overridden via theme/mytheme/pix_plugins/mod/mymodule/,
+     *                    example: image_url('comment', 'mod_glossary')
+     *
+     * @param string $imagename the pathname of the image
+     * @param string $component full plugin name (aka component) or 'theme'
+     * @return moodle_url
+     */
+    public function image_url($imagename, $component = 'moodle') {
+        return $this->page->theme->image_url($imagename, $component);
+    }
+
+    /**
+     * Return the site's logo URL, if any.
+     *
+     * @param int $maxwidth The maximum width, or null when the maximum width does not matter.
+     * @param int $maxheight The maximum height, or null when the maximum height does not matter.
+     * @return moodle_url|false
+     */
+    public function get_logo_url($maxwidth = null, $maxheight = 200) {
+        global $CFG;
+        $logo = get_config('core_admin', 'logo');
+        if (empty($logo)) {
+            return false;
+        }
+
+        // 200px high is the default image size which should be displayed at 100px in the page to account for retina displays.
+        // It's not worth the overhead of detecting and serving 2 different images based on the device.
+
+        // Hide the requested size in the file path.
+        $filepath = ((int) $maxwidth . 'x' . (int) $maxheight) . '/';
+
+        // Use $CFG->themerev to prevent browser caching when the file changes.
+        return moodle_url::make_pluginfile_url(context_system::instance()->id, 'core_admin', 'logo', $filepath,
+            theme_get_revision(), $logo);
+    }
+
+    /**
+     * Return the site's compact logo URL, if any.
+     *
+     * @param int $maxwidth The maximum width, or null when the maximum width does not matter.
+     * @param int $maxheight The maximum height, or null when the maximum height does not matter.
+     * @return moodle_url|false
+     */
+    public function get_compact_logo_url($maxwidth = 300, $maxheight = 300) {
+        global $CFG;
+        $logo = get_config('core_admin', 'logocompact');
+        if (empty($logo)) {
+            return false;
+        }
+
+        // Hide the requested size in the file path.
+        $filepath = ((int) $maxwidth . 'x' . (int) $maxheight) . '/';
+
+        // Use $CFG->themerev to prevent browser caching when the file changes.
+        return moodle_url::make_pluginfile_url(context_system::instance()->id, 'core_admin', 'logocompact', $filepath,
+            theme_get_revision(), $logo);
+    }
+
+    /**
+     * Whether we should display the logo in the navbar.
+     *
+     * We will when there are no main logos, and we have compact logo.
+     *
+     * @return bool
+     */
+    public function should_display_navbar_logo() {
+        $logo = $this->get_compact_logo_url();
+        return !empty($logo);
+    }
+
+    /**
+     * @deprecated since Moodle 4.0
+     */
+    #[\core\attribute\deprecated(null, reason: 'It is no longer used', since: '4.0', final: true)]
+    public function should_display_main_logo() {
+        \core\deprecation::emit_deprecation_if_present([self::class, __FUNCTION__]);
+    }
+
+    /**
+     * Returns the moodle page object.
+     *
+     * @return moodle_page
+     */
+    public function get_page(): moodle_page {
+        return $this->page;
+    }
+}
diff --git a/lib/classes/output/renderer_factory/renderer_factory_base.php b/lib/classes/output/renderer_factory/renderer_factory_base.php
new file mode 100644
index 0000000000000..73367d34bf067
--- /dev/null
+++ b/lib/classes/output/renderer_factory/renderer_factory_base.php
@@ -0,0 +1,197 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This is a base class to help you implement the renderer_factory interface.
+ *
+ * It keeps a cache of renderers that have been constructed, so you only need
+ * to construct each one once in you subclass.
+ *
+ * It also has a method to get the name of, and include the renderer.php with
+ * the definition of, the standard renderer class for a given module.
+ *
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+abstract class renderer_factory_base implements renderer_factory {
+    /**
+     * @var theme_config The theme we belong to.
+     */
+    protected $theme;
+
+    /**
+     * Constructor.
+     *
+     * @param theme_config $theme the theme we belong to.
+     */
+    public function __construct(theme_config $theme) {
+        $this->theme = $theme;
+    }
+
+    /**
+     * Returns suffix of renderer class expected for given target.
+     *
+     * @param string $target one of the renderer target constants, target is guessed if null used
+     * @return array two element array, first element is target, second the target suffix string
+     */
+    protected function get_target_suffix($target) {
+        if (empty($target) || $target === RENDERER_TARGET_MAINTENANCE) {
+            // If the target hasn't been specified we need to guess the defaults.
+            // We also override the target with the default if the maintenance target has been provided.
+            // This ensures we don't use the maintenance renderer if we are processing a special target.
+            if (defined('PREFERRED_RENDERER_TARGET')) {
+                $target = PREFERRED_RENDERER_TARGET;
+            } else if (CLI_SCRIPT) {
+                $target = RENDERER_TARGET_CLI;
+            } else if (AJAX_SCRIPT) {
+                $target = RENDERER_TARGET_AJAX;
+            }
+        }
+
+        switch ($target) {
+            case RENDERER_TARGET_CLI: $suffix = '_cli'; break;
+            case RENDERER_TARGET_AJAX: $suffix = '_ajax'; break;
+            case RENDERER_TARGET_TEXTEMAIL: $suffix = '_textemail'; break;
+            case RENDERER_TARGET_HTMLEMAIL: $suffix = '_htmlemail'; break;
+            case RENDERER_TARGET_MAINTENANCE: $suffix = '_maintenance'; break;
+            default: $target = RENDERER_TARGET_GENERAL; $suffix = '';
+        }
+
+        return array($target, $suffix);
+    }
+
+    /**
+     * For a given module name, return the possible class names
+     * that defines the renderer interface for that module.
+     *
+     * Newer auto-loaded class names are returned as well as the old style _renderable classnames.
+     *
+     * Also, if it exists, include the renderer.php file for that module, so
+     * the class definition of the default renderer has been loaded.
+     *
+     * @param string $component name such as 'core', 'mod_forum' or 'qtype_multichoice'.
+     * @param string $subtype optional subtype such as 'news' resulting to:
+     *              '\mod_forum\output\news_renderer'
+     *              or '\mod_forum\output\news\renderer'
+     *              or non-autoloaded 'mod_forum_news'
+     * @return array[] Each element of the array is an array with keys:
+     *                 classname - The class name to search
+     *                 autoloaded - Does this classname assume autoloading?
+     *                 validwithprefix - Is this class name valid when a prefix is added to it?
+     *                 validwithoutprefix - Is this class name valid when no prefix is added to it?
+     * @throws coding_exception
+     */
+    protected function standard_renderer_classnames($component, $subtype = null) {
+        global $CFG; // Needed in included files.
+        $classnames = array();
+
+        // Standardize component name ala frankenstyle.
+        list($plugin, $type) = core_component::normalize_component($component);
+        if ($type === null) {
+            $component = $plugin;
+        } else {
+            $component = $plugin.'_'.$type;
+        }
+
+        if ($component !== 'core') {
+            // Renderers are stored in renderer.php files.
+            if (!$compdirectory = core_component::get_component_directory($component)) {
+                throw new coding_exception('Invalid component specified in renderer request', $component);
+            }
+            $rendererfile = $compdirectory . '/renderer.php';
+            if (file_exists($rendererfile)) {
+                include_once($rendererfile);
+            }
+
+        } else if (!empty($subtype)) {
+            $coresubsystems = core_component::get_core_subsystems();
+            if (!array_key_exists($subtype, $coresubsystems)) { // There may be nulls.
+                throw new coding_exception('Invalid core subtype "' . $subtype . '" in renderer request', $subtype);
+            }
+            if ($coresubsystems[$subtype]) {
+                $rendererfile = $coresubsystems[$subtype] . '/renderer.php';
+                if (file_exists($rendererfile)) {
+                    include_once($rendererfile);
+                }
+            }
+        }
+
+        if (empty($subtype)) {
+            // Theme specific auto-loaded name (only valid when prefixed with the theme name).
+            $classnames[] = array(
+                'validwithprefix' => true,
+                'validwithoutprefix' => false,
+                'autoloaded' => true,
+                'classname' => '\\output\\' . $component . '_renderer'
+            );
+
+            // Standard autoloaded plugin name (not valid with a prefix).
+            $classnames[] = array(
+                'validwithprefix' => false,
+                'validwithoutprefix' => true,
+                'autoloaded' => true,
+                'classname' => '\\' . $component . '\\output\\renderer'
+            );
+            // Legacy class name - (valid with or without a prefix).
+            $classnames[] = array(
+                'validwithprefix' => true,
+                'validwithoutprefix' => true,
+                'autoloaded' => false,
+                'classname' => $component . '_renderer'
+            );
+        } else {
+            // Theme specific auto-loaded name (only valid when prefixed with the theme name).
+            $classnames[] = array(
+                'validwithprefix' => true,
+                'validwithoutprefix' => false,
+                'autoloaded' => true,
+                'classname' => '\\output\\' . $component . '\\' . $subtype . '_renderer'
+            );
+            // Version of the above with subtype being a namespace level on it's own.
+            $classnames[] = array(
+                'validwithprefix' => true,
+                'validwithoutprefix' => false,
+                'autoloaded' => true,
+                'classname' => '\\output\\' . $component . '\\' . $subtype . '\\renderer'
+            );
+            // Standard autoloaded plugin name (not valid with a prefix).
+            $classnames[] = array(
+                'validwithprefix' => false,
+                'validwithoutprefix' => true,
+                'autoloaded' => true,
+                'classname' => '\\' . $component . '\\output\\' . $subtype . '_renderer'
+            );
+            // Version of the above with subtype being a namespace level on it's own.
+            $classnames[] = array(
+                'validwithprefix' => false,
+                'validwithoutprefix' => true,
+                'autoloaded' => true,
+                'classname' => '\\' . $component . '\\output\\' . $subtype . '\\renderer'
+            );
+            // Legacy class name - (valid with or without a prefix).
+            $classnames[] = array(
+                'validwithprefix' => true,
+                'validwithoutprefix' => true,
+                'autoloaded' => false,
+                'classname' => $component . '_' . $subtype . '_renderer'
+            );
+        }
+        return $classnames;
+    }
+}
diff --git a/lib/classes/output/renderer_factory/renderer_factory_interface.php b/lib/classes/output/renderer_factory/renderer_factory_interface.php
new file mode 100644
index 0000000000000..0b4631443ba55
--- /dev/null
+++ b/lib/classes/output/renderer_factory/renderer_factory_interface.php
@@ -0,0 +1,61 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * A renderer factory is just responsible for creating an appropriate renderer
+ * for any given part of Moodle.
+ *
+ * Which renderer factory to use is chose by the current theme, and an instance
+ * if created automatically when the theme is set up.
+ *
+ * A renderer factory must also have a constructor that takes a theme_config object.
+ * (See {@link renderer_factory_base::__construct} for an example.)
+ *
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+interface renderer_factory {
+
+    /**
+     * Return the renderer for a particular part of Moodle.
+     *
+     * The renderer interfaces are defined by classes called {plugin}_renderer
+     * where {plugin} is the name of the component. The renderers for core Moodle are
+     * defined in lib/renderer.php. For plugins, they will be defined in a file
+     * called renderer.php inside the plugin.
+     *
+     * Renderers will normally want to subclass the renderer_base class.
+     * (However, if you really know what you are doing, you don't have to do that.)
+     *
+     * There is no separate interface definition for renderers. The default
+     * {plugin}_renderer implementation also serves to define the API for
+     * other implementations of the interface, whether or not they subclass it.
+     *
+     * A particular plugin can define multiple renderers if it wishes, using the
+     * $subtype parameter. For example workshop_renderer,
+     * workshop_allocation_manual_renderer etc.
+     *
+     * @param moodle_page $page the page the renderer is outputting content for.
+     * @param string $component name such as 'core', 'mod_forum' or 'qtype_multichoice'.
+     * @param string $subtype optional subtype such as 'news' resulting to 'mod_forum_news'
+     * @param string $target one of rendering target constants
+     * @return renderer_base an object implementing the requested renderer interface.
+     */
+    public function get_renderer(moodle_page $page, $component, $subtype=null, $target=null);
+}
diff --git a/lib/classes/output/renderer_factory/standard_renderer_factory.php b/lib/classes/output/renderer_factory/standard_renderer_factory.php
new file mode 100644
index 0000000000000..4256dd115636d
--- /dev/null
+++ b/lib/classes/output/renderer_factory/standard_renderer_factory.php
@@ -0,0 +1,80 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This is the default renderer factory for Moodle.
+ *
+ * It simply returns an instance of the appropriate standard renderer class.
+ *
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class standard_renderer_factory extends renderer_factory_base {
+
+    /**
+     * Implement the subclass method
+     *
+     * @param moodle_page $page the page the renderer is outputting content for.
+     * @param string $component name such as 'core', 'mod_forum' or 'qtype_multichoice'.
+     * @param string $subtype optional subtype such as 'news' resulting to 'mod_forum_news'
+     * @param string $target one of rendering target constants
+     * @return renderer_base an object implementing the requested renderer interface.
+     */
+    public function get_renderer(moodle_page $page, $component, $subtype = null, $target = null) {
+        $classnames = $this->standard_renderer_classnames($component, $subtype);
+        $classname = '';
+
+        list($target, $suffix) = $this->get_target_suffix($target);
+        // First look for a version with a suffix.
+        foreach ($classnames as $classnamedetails) {
+            if ($classnamedetails['validwithoutprefix']) {
+                $newclassname = $classnamedetails['classname'] . $suffix;
+                if (class_exists($newclassname)) {
+                    $classname = $newclassname;
+                    break;
+                } else {
+                    $newclassname = $classnamedetails['classname'];
+                    if (class_exists($newclassname)) {
+                        $classname = $newclassname;
+                        break;
+                    }
+                }
+            }
+        }
+        // Now look for a non-suffixed version.
+        if (empty($classname)) {
+            foreach ($classnames as $classnamedetails) {
+                if ($classnamedetails['validwithoutprefix']) {
+                    $newclassname = $classnamedetails['classname'];
+                    if (class_exists($newclassname)) {
+                        $classname = $newclassname;
+                        break;
+                    }
+                }
+            }
+        }
+
+        if (empty($classname)) {
+            // Standard renderer must always exist.
+            throw new coding_exception('Request for an unknown renderer class. Searched for: ' . var_export($classnames, true));
+        }
+
+        return new $classname($page, $target);
+    }
+}
diff --git a/lib/classes/output/renderer_factory/theme_overridden_renderer_factory.php b/lib/classes/output/renderer_factory/theme_overridden_renderer_factory.php
new file mode 100644
index 0000000000000..81487f1e6c6bc
--- /dev/null
+++ b/lib/classes/output/renderer_factory/theme_overridden_renderer_factory.php
@@ -0,0 +1,118 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This is renderer factory allows themes to override the standard renderers using php code.
+ *
+ * It will load any code from theme/mytheme/renderers.php and
+ * theme/parenttheme/renderers.php, if then exist. Then whenever you ask for
+ * a renderer for 'component', it will create a mytheme_component_renderer or a
+ * parenttheme_component_renderer, instead of a component_renderer,
+ * if either of those classes exist.
+ *
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class theme_overridden_renderer_factory extends renderer_factory_base {
+    /**
+     * @var array An array of renderer prefixes
+     */
+    protected $prefixes = array();
+
+    /**
+     * Constructor.
+     * @param theme_config $theme the theme we are rendering for.
+     */
+    public function __construct(theme_config $theme) {
+        parent::__construct($theme);
+        // Initialise $this->prefixes.
+        $this->prefixes = $theme->renderer_prefixes();
+    }
+
+    /**
+     * Implement the subclass method
+     *
+     * @param moodle_page $page the page the renderer is outputting content for.
+     * @param string $component name such as 'core', 'mod_forum' or 'qtype_multichoice'.
+     * @param string $subtype optional subtype such as 'news' resulting to 'mod_forum_news'
+     * @param string $target one of rendering target constants
+     * @return renderer_base an object implementing the requested renderer interface.
+     */
+    public function get_renderer(moodle_page $page, $component, $subtype = null, $target = null) {
+        $classnames = $this->standard_renderer_classnames($component, $subtype);
+
+        list($target, $suffix) = $this->get_target_suffix($target);
+
+        // Theme lib.php and renderers.php files are loaded automatically
+        // when loading the theme configs.
+
+        // First try the renderers with correct suffix.
+        foreach ($this->prefixes as $prefix) {
+            foreach ($classnames as $classnamedetails) {
+                if ($classnamedetails['validwithprefix']) {
+                    if ($classnamedetails['autoloaded']) {
+                        $newclassname = $prefix . $classnamedetails['classname'] . $suffix;
+                    } else {
+                        $newclassname = $prefix . '_' . $classnamedetails['classname'] . $suffix;
+                    }
+                    if (class_exists($newclassname)) {
+                        return new $newclassname($page, $target);
+                    }
+                }
+            }
+        }
+        foreach ($classnames as $classnamedetails) {
+            if ($classnamedetails['validwithoutprefix']) {
+                $newclassname = $classnamedetails['classname'] . $suffix;
+                if (class_exists($newclassname)) {
+                    // Use the specialised renderer for given target, default renderer might also decide
+                    // to implement support for more targets.
+                    return new $newclassname($page, $target);
+                }
+            }
+        }
+
+        // Then try general renderer.
+        foreach ($this->prefixes as $prefix) {
+            foreach ($classnames as $classnamedetails) {
+                if ($classnamedetails['validwithprefix']) {
+                    if ($classnamedetails['autoloaded']) {
+                        $newclassname = $prefix . $classnamedetails['classname'];
+                    } else {
+                        $newclassname = $prefix . '_' . $classnamedetails['classname'];
+                    }
+                    if (class_exists($newclassname)) {
+                        return new $newclassname($page, $target);
+                    }
+                }
+            }
+        }
+
+        // Final attempt - no prefix or suffix.
+        foreach ($classnames as $classnamedetails) {
+            if ($classnamedetails['validwithoutprefix']) {
+                $newclassname = $classnamedetails['classname'];
+                if (class_exists($newclassname)) {
+                    return new $newclassname($page, $target);
+                }
+            }
+        }
+        throw new coding_exception('Request for an unknown renderer ' . $component . ', ' . $subtype . ', ' . $target);
+    }
+}
diff --git a/lib/classes/output/requirements/fragment_requirements_manager.php b/lib/classes/output/requirements/fragment_requirements_manager.php
new file mode 100644
index 0000000000000..840d3b55f2f6c
--- /dev/null
+++ b/lib/classes/output/requirements/fragment_requirements_manager.php
@@ -0,0 +1,118 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This requirements manager captures the appropriate html for creating a fragment to
+ * be inserted elsewhere.
+ *
+ * @copyright 2016 Adrian Greeve <adrian@moodle.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 3.1
+ * @package core
+ * @category output
+ */
+class fragment_requirements_manager extends page_requirements_manager {
+
+    /**
+     * Page fragment constructor.
+     */
+    public function __construct() {
+        parent::__construct();
+        // As this is a fragment the header should already be done.
+        $this->headdone = true;
+    }
+
+    /**
+     * Returns js code to load amd module loader, then insert inline script tags
+     * that contain require() calls using RequireJS.
+     *
+     * @return string
+     */
+    protected function get_amd_footercode() {
+        global $CFG;
+        $output = '';
+
+        // First include must be to a module with no dependencies, this prevents multiple requests.
+        $prefix = 'M.util.js_pending("core/first");';
+        $prefix .= "require(['core/first'], function() {\n";
+        $suffix = "\n});";
+        $suffix .= 'M.util.js_complete("core/first");';
+        $output .= html_writer::script($prefix . implode(";\n", $this->amdjscode) . $suffix);
+        return $output;
+    }
+
+
+    /**
+     * Generate any HTML that needs to go at the end of the page.
+     *
+     * @return string the HTML code to to at the end of the page.
+     */
+    public function get_end_code() {
+        global $CFG;
+
+        $output = '';
+
+        // Call amd init functions.
+        $output .= $this->get_amd_footercode();
+
+        // Add other requested modules.
+        $output .= $this->get_extra_modules_code();
+
+        // All the other linked scripts - there should be as few as possible.
+        if ($this->jsincludes['footer']) {
+            foreach ($this->jsincludes['footer'] as $url) {
+                $output .= html_writer::script('', $url);
+            }
+        }
+
+        if (!empty($this->stringsforjs)) {
+            // Add all needed strings.
+            $strings = array();
+            foreach ($this->stringsforjs as $component => $v) {
+                foreach ($v as $indentifier => $langstring) {
+                    $strings[$component][$indentifier] = $langstring->out();
+                }
+            }
+            // Append don't overwrite.
+            $output .= html_writer::script('require(["jquery"], function($) {
+                M.str = $.extend(true, M.str, ' . json_encode($strings) . ');
+            });');
+        }
+
+        // Add variables.
+        if ($this->jsinitvariables['footer']) {
+            $js = '';
+            foreach ($this->jsinitvariables['footer'] as $data) {
+                list($var, $value) = $data;
+                $js .= js_writer::set_variable($var, $value, true);
+            }
+            $output .= html_writer::script($js);
+        }
+
+        $inyuijs = $this->get_javascript_code(false);
+        $ondomreadyjs = $this->get_javascript_code(true);
+        // See if this is still needed when we get to the ajax page.
+        $jsinit = $this->get_javascript_init_code();
+        $handlersjs = $this->get_event_handler_code();
+
+        // There is a global Y, make sure it is available in your scope.
+        $js = "(function() {{$inyuijs}{$ondomreadyjs}{$jsinit}{$handlersjs}})();";
+
+        $output .= html_writer::script($js);
+
+        return $output;
+    }
+}
diff --git a/lib/classes/output/requirements/page_requirements_manager.php b/lib/classes/output/requirements/page_requirements_manager.php
new file mode 100644
index 0000000000000..5e68103dfd524
--- /dev/null
+++ b/lib/classes/output/requirements/page_requirements_manager.php
@@ -0,0 +1,1814 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This class tracks all the things that are needed by the current page.
+ *
+ * Normally, the only instance of this  class you will need to work with is the
+ * one accessible via $PAGE->requires.
+ *
+ * Typical usage would be
+ * <pre>
+ *     $PAGE->requires->js_call_amd('mod_forum/view', 'init');
+ * </pre>
+ *
+ * It also supports obsoleted coding style with/without YUI3 modules.
+ * <pre>
+ *     $PAGE->requires->js_init_call('M.mod_forum.init_view');
+ *     $PAGE->requires->css('/mod/mymod/userstyles.php?id='.$id); // not overridable via themes!
+ *     $PAGE->requires->js('/mod/mymod/script.js');
+ *     $PAGE->requires->js('/mod/mymod/small_but_urgent.js', true);
+ *     $PAGE->requires->js_function_call('init_mymod', array($data), true);
+ * </pre>
+ *
+ * There are some natural restrictions on some methods. For example, {@link css()}
+ * can only be called before the <head> tag is output. See the comments on the
+ * individual methods for details.
+ *
+ * @copyright 2009 Tim Hunt, 2010 Petr Skoda
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class page_requirements_manager {
+
+    /**
+     * @var array List of string available from JS
+     */
+    protected $stringsforjs = array();
+
+    /**
+     * @var array List of get_string $a parameters - used for validation only.
+     */
+    protected $stringsforjs_as = array();
+
+    /**
+     * @var array List of JS variables to be initialised
+     */
+    protected $jsinitvariables = array('head'=>array(), 'footer'=>array());
+
+    /**
+     * @var array Included JS scripts
+     */
+    protected $jsincludes = array('head'=>array(), 'footer'=>array());
+
+    /**
+     * @var array Inline scripts using RequireJS module loading.
+     */
+    protected $amdjscode = array('');
+
+    /**
+     * @var array List of needed function calls
+     */
+    protected $jscalls = array('normal'=>array(), 'ondomready'=>array());
+
+    /**
+     * @var array List of skip links, those are needed for accessibility reasons
+     */
+    protected $skiplinks = array();
+
+    /**
+     * @var array Javascript code used for initialisation of page, it should
+     * be relatively small
+     */
+    protected $jsinitcode = array();
+
+    /**
+     * @var array of moodle_url Theme sheets, initialised only from core_renderer
+     */
+    protected $cssthemeurls = array();
+
+    /**
+     * @var array of moodle_url List of custom theme sheets, these are strongly discouraged!
+     * Useful mostly only for CSS submitted by teachers that is not part of the theme.
+     */
+    protected $cssurls = array();
+
+    /**
+     * @var array List of requested event handlers
+     */
+    protected $eventhandlers = array();
+
+    /**
+     * @var array Extra modules
+     */
+    protected $extramodules = array();
+
+    /**
+     * @var array trackes the names of bits of HTML that are only required once
+     * per page. See {@link has_one_time_item_been_created()},
+     * {@link set_one_time_item_created()} and {@link should_create_one_time_item_now()}.
+     */
+    protected $onetimeitemsoutput = array();
+
+    /**
+     * @var bool Flag indicated head stuff already printed
+     */
+    protected $headdone = false;
+
+    /**
+     * @var bool Flag indicating top of body already printed
+     */
+    protected $topofbodydone = false;
+
+    /**
+     * @var stdClass YUI PHPLoader instance responsible for YUI3 loading from PHP only
+     */
+    protected $yui3loader;
+
+    /**
+     * @var YUI_config default YUI loader configuration
+     */
+    protected $YUI_config;
+
+    /**
+     * @var array $yuicssmodules
+     */
+    protected $yuicssmodules = array();
+
+    /**
+     * @var array Some config vars exposed in JS, please no secret stuff there
+     */
+    protected $M_cfg;
+
+    /**
+     * @var array list of requested jQuery plugins
+     */
+    protected $jqueryplugins = array();
+
+    /**
+     * @var array list of jQuery plugin overrides
+     */
+    protected $jquerypluginoverrides = array();
+
+    /**
+     * Page requirements constructor.
+     */
+    public function __construct() {
+        global $CFG;
+
+        // You may need to set up URL rewrite rule because oversized URLs might not be allowed by web server.
+        $sep = empty($CFG->yuislasharguments) ? '?' : '/';
+
+        $this->yui3loader = new stdClass();
+        $this->YUI_config = new YUI_config();
+
+        // Set up some loader options.
+        $this->yui3loader->local_base = $CFG->wwwroot . '/lib/yuilib/'. $CFG->yui3version . '/';
+        $this->yui3loader->local_comboBase = $CFG->wwwroot . '/theme/yui_combo.php'.$sep;
+
+        $this->yui3loader->base = $this->yui3loader->local_base;
+        $this->yui3loader->comboBase = $this->yui3loader->local_comboBase;
+
+        // Enable combo loader? This significantly helps with caching and performance!
+        $this->yui3loader->combine = !empty($CFG->yuicomboloading);
+
+        $jsrev = $this->get_jsrev();
+
+        // Set up JS YUI loader helper object.
+        $this->YUI_config->base         = $this->yui3loader->base;
+        $this->YUI_config->comboBase    = $this->yui3loader->comboBase;
+        $this->YUI_config->combine      = $this->yui3loader->combine;
+
+        // If we've had to patch any YUI modules between releases, we must override the YUI configuration to include them.
+        if (!empty($CFG->yuipatchedmodules) && !empty($CFG->yuipatchlevel)) {
+            $this->YUI_config->define_patched_core_modules($this->yui3loader->local_comboBase,
+                    $CFG->yui3version,
+                    $CFG->yuipatchlevel,
+                    $CFG->yuipatchedmodules);
+        }
+
+        $configname = $this->YUI_config->set_config_source('lib/yui/config/yui2.js');
+        $this->YUI_config->add_group('yui2', array(
+            // Loader configuration for our 2in3.
+            'base' => $CFG->wwwroot . '/lib/yuilib/2in3/' . $CFG->yui2version . '/build/',
+            'comboBase' => $CFG->wwwroot . '/theme/yui_combo.php'.$sep,
+            'combine' => $this->yui3loader->combine,
+            'ext' => false,
+            'root' => '2in3/' . $CFG->yui2version .'/build/',
+            'patterns' => array(
+                'yui2-' => array(
+                    'group' => 'yui2',
+                    'configFn' => $configname,
+                )
+            )
+        ));
+        $configname = $this->YUI_config->set_config_source('lib/yui/config/moodle.js');
+        $this->YUI_config->add_group('moodle', array(
+            'name' => 'moodle',
+            'base' => $CFG->wwwroot . '/theme/yui_combo.php' . $sep . 'm/' . $jsrev . '/',
+            'combine' => $this->yui3loader->combine,
+            'comboBase' => $CFG->wwwroot . '/theme/yui_combo.php'.$sep,
+            'ext' => false,
+            'root' => 'm/'.$jsrev.'/', // Add the rev to the root path so that we can control caching.
+            'patterns' => array(
+                'moodle-' => array(
+                    'group' => 'moodle',
+                    'configFn' => $configname,
+                )
+            )
+        ));
+
+        $this->YUI_config->add_group('gallery', array(
+            'name' => 'gallery',
+            'base' => $CFG->wwwroot . '/lib/yuilib/gallery/',
+            'combine' => $this->yui3loader->combine,
+            'comboBase' => $CFG->wwwroot . '/theme/yui_combo.php' . $sep,
+            'ext' => false,
+            'root' => 'gallery/' . $jsrev . '/',
+            'patterns' => array(
+                'gallery-' => array(
+                    'group' => 'gallery',
+                )
+            )
+        ));
+
+        // Set some more loader options applying to groups too.
+        if ($CFG->debugdeveloper) {
+            // When debugging is enabled, we want to load the non-minified (RAW) versions of YUI library modules rather
+            // than the DEBUG versions as these generally generate too much logging for our purposes.
+            // However we do want the DEBUG versions of our Moodle-specific modules.
+            // To debug a YUI-specific issue, change the yui3loader->filter value to DEBUG.
+            $this->YUI_config->filter = 'RAW';
+            $this->YUI_config->groups['moodle']['filter'] = 'DEBUG';
+
+            // We use the yui3loader->filter setting when writing the YUI3 seed scripts into the header.
+            $this->yui3loader->filter = $this->YUI_config->filter;
+            $this->YUI_config->debug = true;
+        } else {
+            $this->yui3loader->filter = null;
+            $this->YUI_config->groups['moodle']['filter'] = null;
+            $this->YUI_config->debug = false;
+        }
+
+        // Include the YUI config log filters.
+        if (!empty($CFG->yuilogexclude) && is_array($CFG->yuilogexclude)) {
+            $this->YUI_config->logExclude = $CFG->yuilogexclude;
+        }
+        if (!empty($CFG->yuiloginclude) && is_array($CFG->yuiloginclude)) {
+            $this->YUI_config->logInclude = $CFG->yuiloginclude;
+        }
+        if (!empty($CFG->yuiloglevel)) {
+            $this->YUI_config->logLevel = $CFG->yuiloglevel;
+        }
+
+        // Add the moodle group's module data.
+        $this->YUI_config->add_moodle_metadata();
+
+        // Every page should include definition of following modules.
+        $this->js_module($this->find_module('core_filepicker'));
+        $this->js_module($this->find_module('core_comment'));
+    }
+
+    /**
+     * Return the safe config values that get set for javascript in "M.cfg".
+     *
+     * @since 2.9
+     * @return array List of safe config values that are available to javascript.
+     */
+    public function get_config_for_javascript(moodle_page $page, renderer_base $renderer) {
+        global $CFG;
+
+        if (empty($this->M_cfg)) {
+
+            $iconsystem = \core\output\icon_system::instance();
+
+            // It is possible that the $page->context is null, so we can't use $page->context->id.
+            $contextid = null;
+            $contextinstanceid = null;
+            if (!is_null($page->context)) {
+                $contextid = $page->context->id;
+                $contextinstanceid = $page->context->instanceid;
+                $courseid = $page->course->id;
+                $coursecontext = context_course::instance($courseid);
+            }
+
+            $this->M_cfg = array(
+                'wwwroot'               => $CFG->wwwroot,
+                'homeurl'               => $page->navigation->action,
+                'sesskey'               => sesskey(),
+                'sessiontimeout'        => $CFG->sessiontimeout,
+                'sessiontimeoutwarning' => $CFG->sessiontimeoutwarning,
+                'themerev'              => theme_get_revision(),
+                'slasharguments'        => (int)(!empty($CFG->slasharguments)),
+                'theme'                 => $page->theme->name,
+                'iconsystemmodule'      => $iconsystem->get_amd_name(),
+                'jsrev'                 => $this->get_jsrev(),
+                'admin'                 => $CFG->admin,
+                'svgicons'              => $page->theme->use_svg_icons(),
+                'usertimezone'          => usertimezone(),
+                'language'              => current_language(),
+                'courseId'              => isset($courseid) ? (int) $courseid : 0,
+                'courseContextId'       => isset($coursecontext) ? $coursecontext->id : 0,
+                'contextid'             => $contextid,
+                'contextInstanceId'     => (int) $contextinstanceid,
+                'langrev'               => get_string_manager()->get_revision(),
+                'templaterev'           => $this->get_templaterev(),
+                'siteId'                => (int) SITEID,
+            );
+            if ($CFG->debugdeveloper) {
+                $this->M_cfg['developerdebug'] = true;
+            }
+            if (defined('BEHAT_SITE_RUNNING')) {
+                $this->M_cfg['behatsiterunning'] = true;
+            }
+
+        }
+        return $this->M_cfg;
+    }
+
+    /**
+     * Initialise with the bits of JavaScript that every Moodle page should have.
+     *
+     * @param moodle_page $page
+     * @param core_renderer $renderer
+     */
+    protected function init_requirements_data(moodle_page $page, core_renderer $renderer) {
+        global $CFG;
+
+        // Init the js config.
+        $this->get_config_for_javascript($page, $renderer);
+
+        // Accessibility stuff.
+        $this->skip_link_to('maincontent', get_string('tocontent', 'access'));
+
+        // Add strings used on many pages.
+        $this->string_for_js('confirmation', 'admin');
+        $this->string_for_js('cancel', 'moodle');
+        $this->string_for_js('yes', 'moodle');
+
+        // Alter links in top frame to break out of frames.
+        if ($page->pagelayout === 'frametop') {
+            $this->js_init_call('M.util.init_frametop');
+        }
+
+        // Include block drag/drop if editing is on
+        if ($page->user_is_editing()) {
+            $params = array(
+                'regions' => $page->blocks->get_regions(),
+                'pagehash' => $page->get_edited_page_hash(),
+            );
+            if (!empty($page->cm->id)) {
+                $params['cmid'] = $page->cm->id;
+            }
+            // Strings for drag and drop.
+            $this->strings_for_js(array('movecontent',
+                                        'tocontent',
+                                        'emptydragdropregion'),
+                                  'moodle');
+            $page->requires->yui_module('moodle-core-blocks', 'M.core_blocks.init_dragdrop', array($params), null, true);
+            $page->requires->js_call_amd('core_block/edit', 'init', ['pagehash' => $page->get_edited_page_hash()]);
+        }
+
+        // Include the YUI CSS Modules.
+        $page->requires->set_yuicssmodules($page->theme->yuicssmodules);
+    }
+
+    /**
+     * Determine the correct JS Revision to use for this load.
+     *
+     * @return int the jsrev to use.
+     */
+    public function get_jsrev() {
+        global $CFG;
+
+        if (empty($CFG->cachejs)) {
+            $jsrev = -1;
+        } else if (empty($CFG->jsrev)) {
+            $jsrev = 1;
+        } else {
+            $jsrev = $CFG->jsrev;
+        }
+
+        return $jsrev;
+    }
+
+    /**
+     * Determine the correct Template revision to use for this load.
+     *
+     * @return int the templaterev to use.
+     */
+    protected function get_templaterev() {
+        global $CFG;
+
+        if (empty($CFG->cachetemplates)) {
+            $templaterev = -1;
+        } else if (empty($CFG->templaterev)) {
+            $templaterev = 1;
+        } else {
+            $templaterev = $CFG->templaterev;
+        }
+
+        return $templaterev;
+    }
+
+    /**
+     * Ensure that the specified JavaScript file is linked to from this page.
+     *
+     * NOTE: This function is to be used in RARE CASES ONLY, please store your JS in module.js file
+     * and use $PAGE->requires->js_init_call() instead or use /yui/ subdirectories for YUI modules.
+     *
+     * By default the link is put at the end of the page, since this gives best page-load performance.
+     *
+     * Even if a particular script is requested more than once, it will only be linked
+     * to once.
+     *
+     * @param string|moodle_url $url The path to the .js file, relative to $CFG->dirroot / $CFG->wwwroot.
+     *      For example '/mod/mymod/customscripts.js'; use moodle_url for external scripts
+     * @param bool $inhead initialise in head
+     */
+    public function js($url, $inhead = false) {
+        if ($url == '/question/qengine.js') {
+            debugging('The question/qengine.js has been deprecated. ' .
+                'Please use core_question/question_engine', DEBUG_DEVELOPER);
+        }
+        $url = $this->js_fix_url($url);
+        $where = $inhead ? 'head' : 'footer';
+        $this->jsincludes[$where][$url->out()] = $url;
+    }
+
+    /**
+     * Request inclusion of jQuery library in the page.
+     *
+     * NOTE: this should not be used in official Moodle distribution!
+     *
+     * {@link https://moodledev.io/docs/guides/javascript/jquery}
+     */
+    public function jquery() {
+        $this->jquery_plugin('jquery');
+    }
+
+    /**
+     * Request inclusion of jQuery plugin.
+     *
+     * NOTE: this should not be used in official Moodle distribution!
+     *
+     * jQuery plugins are located in plugin/jquery/* subdirectory,
+     * plugin/jquery/plugins.php lists all available plugins.
+     *
+     * Included core plugins:
+     *   - jQuery UI
+     *
+     * Add-ons may include extra jQuery plugins in jquery/ directory,
+     * plugins.php file defines the mapping between plugin names and
+     * necessary page includes.
+     *
+     * Examples:
+     * <code>
+     *   // file: mod/xxx/view.php
+     *   $PAGE->requires->jquery();
+     *   $PAGE->requires->jquery_plugin('ui');
+     *   $PAGE->requires->jquery_plugin('ui-css');
+     * </code>
+     *
+     * <code>
+     *   // file: theme/yyy/lib.php
+     *   function theme_yyy_page_init(moodle_page $page) {
+     *       $page->requires->jquery();
+     *       $page->requires->jquery_plugin('ui');
+     *       $page->requires->jquery_plugin('ui-css');
+     *   }
+     * </code>
+     *
+     * <code>
+     *   // file: blocks/zzz/block_zzz.php
+     *   public function get_required_javascript() {
+     *       parent::get_required_javascript();
+     *       $this->page->requires->jquery();
+     *       $page->requires->jquery_plugin('ui');
+     *       $page->requires->jquery_plugin('ui-css');
+     *   }
+     * </code>
+     *
+     * {@link https://moodledev.io/docs/guides/javascript/jquery}
+     *
+     * @param string $plugin name of the jQuery plugin as defined in jquery/plugins.php
+     * @param string $component name of the component
+     * @return bool success
+     */
+    public function jquery_plugin($plugin, $component = 'core') {
+        global $CFG;
+
+        if ($this->headdone) {
+            debugging('Can not add jQuery plugins after starting page output!');
+            return false;
+        }
+
+        if ($component !== 'core' and in_array($plugin, array('jquery', 'ui', 'ui-css'))) {
+            debugging("jQuery plugin '$plugin' is included in Moodle core, other components can not use the same name.", DEBUG_DEVELOPER);
+            $component = 'core';
+        } else if ($component !== 'core' and strpos($component, '_') === false) {
+            // Let's normalise the legacy activity names, Frankenstyle rulez!
+            $component = 'mod_' . $component;
+        }
+
+        if (empty($this->jqueryplugins) and ($component !== 'core' or $plugin !== 'jquery')) {
+            // Make sure the jQuery itself is always loaded first,
+            // the order of all other plugins depends on order of $PAGE_>requires->.
+            $this->jquery_plugin('jquery', 'core');
+        }
+
+        if (isset($this->jqueryplugins[$plugin])) {
+            // No problem, we already have something, first Moodle plugin to register the jQuery plugin wins.
+            return true;
+        }
+
+        $componentdir = core_component::get_component_directory($component);
+        if (!file_exists($componentdir) or !file_exists("$componentdir/jquery/plugins.php")) {
+            debugging("Can not load jQuery plugin '$plugin', missing plugins.php in component '$component'.", DEBUG_DEVELOPER);
+            return false;
+        }
+
+        $plugins = array();
+        require("$componentdir/jquery/plugins.php");
+
+        if (!isset($plugins[$plugin])) {
+            debugging("jQuery plugin '$plugin' can not be found in component '$component'.", DEBUG_DEVELOPER);
+            return false;
+        }
+
+        $this->jqueryplugins[$plugin] = new stdClass();
+        $this->jqueryplugins[$plugin]->plugin    = $plugin;
+        $this->jqueryplugins[$plugin]->component = $component;
+        $this->jqueryplugins[$plugin]->urls      = array();
+
+        foreach ($plugins[$plugin]['files'] as $file) {
+            if ($CFG->debugdeveloper) {
+                if (!file_exists("$componentdir/jquery/$file")) {
+                    debugging("Invalid file '$file' specified in jQuery plugin '$plugin' in component '$component'");
+                    continue;
+                }
+                $file = str_replace('.min.css', '.css', $file);
+                $file = str_replace('.min.js', '.js', $file);
+            }
+            if (!file_exists("$componentdir/jquery/$file")) {
+                debugging("Invalid file '$file' specified in jQuery plugin '$plugin' in component '$component'");
+                continue;
+            }
+            if (!empty($CFG->slasharguments)) {
+                $url = new moodle_url("/theme/jquery.php");
+                $url->set_slashargument("/$component/$file");
+
+            } else {
+                // This is not really good, we need slasharguments for relative links, this means no caching...
+                $path = realpath("$componentdir/jquery/$file");
+                if (strpos($path, $CFG->dirroot) === 0) {
+                    $url = $CFG->wwwroot.preg_replace('/^'.preg_quote($CFG->dirroot, '/').'/', '', $path);
+                    // Replace all occurences of backslashes characters in url to forward slashes.
+                    $url = str_replace('\\', '/', $url);
+                    $url = new moodle_url($url);
+                } else {
+                    // Bad luck, fix your server!
+                    debugging("Moodle jQuery integration requires 'slasharguments' setting to be enabled.");
+                    continue;
+                }
+            }
+            $this->jqueryplugins[$plugin]->urls[] = $url;
+        }
+
+        return true;
+    }
+
+    /**
+     * Request replacement of one jQuery plugin by another.
+     *
+     * This is useful when themes want to replace the jQuery UI theme,
+     * the problem is that theme can not prevent others from including the core ui-css plugin.
+     *
+     * Example:
+     *  1/ generate new jQuery UI theme and place it into theme/yourtheme/jquery/
+     *  2/ write theme/yourtheme/jquery/plugins.php
+     *  3/ init jQuery from theme
+     *
+     * <code>
+     *   // file theme/yourtheme/lib.php
+     *   function theme_yourtheme_page_init($page) {
+     *       $page->requires->jquery_plugin('yourtheme-ui-css', 'theme_yourtheme');
+     *       $page->requires->jquery_override_plugin('ui-css', 'yourtheme-ui-css');
+     *   }
+     * </code>
+     *
+     * This code prevents loading of standard 'ui-css' which my be requested by other plugins,
+     * the 'yourtheme-ui-css' gets loaded only if some other code requires jquery.
+     *
+     * {@link https://moodledev.io/docs/guides/javascript/jquery}
+     *
+     * @param string $oldplugin original plugin
+     * @param string $newplugin the replacement
+     */
+    public function jquery_override_plugin($oldplugin, $newplugin) {
+        if ($this->headdone) {
+            debugging('Can not override jQuery plugins after starting page output!');
+            return;
+        }
+        $this->jquerypluginoverrides[$oldplugin] = $newplugin;
+    }
+
+    /**
+     * Return jQuery related markup for page start.
+     * @return string
+     */
+    protected function get_jquery_headcode() {
+        if (empty($this->jqueryplugins['jquery'])) {
+            // If nobody requested jQuery then do not bother to load anything.
+            // This may be useful for themes that want to override 'ui-css' only if requested by something else.
+            return '';
+        }
+
+        $included = array();
+        $urls = array();
+
+        foreach ($this->jqueryplugins as $name => $unused) {
+            if (isset($included[$name])) {
+                continue;
+            }
+            if (array_key_exists($name, $this->jquerypluginoverrides)) {
+                // The following loop tries to resolve the replacements,
+                // use max 100 iterations to prevent infinite loop resulting
+                // in blank page.
+                $cyclic = true;
+                $oldname = $name;
+                for ($i=0; $i<100; $i++) {
+                    $name = $this->jquerypluginoverrides[$name];
+                    if (!array_key_exists($name, $this->jquerypluginoverrides)) {
+                        $cyclic = false;
+                        break;
+                    }
+                }
+                if ($cyclic) {
+                    // We can not do much with cyclic references here, let's use the old plugin.
+                    $name = $oldname;
+                    debugging("Cyclic overrides detected for jQuery plugin '$name'");
+
+                } else if (empty($name)) {
+                    // Developer requested removal of the plugin.
+                    continue;
+
+                } else if (!isset($this->jqueryplugins[$name])) {
+                    debugging("Unknown jQuery override plugin '$name' detected");
+                    $name = $oldname;
+
+                } else if (isset($included[$name])) {
+                    // The plugin was already included, easy.
+                    continue;
+                }
+            }
+
+            $plugin = $this->jqueryplugins[$name];
+            $urls = array_merge($urls, $plugin->urls);
+            $included[$name] = true;
+        }
+
+        $output = '';
+        $attributes = array('rel' => 'stylesheet', 'type' => 'text/css');
+        foreach ($urls as $url) {
+            if (preg_match('/\.js$/', $url)) {
+                $output .= html_writer::script('', $url);
+            } else if (preg_match('/\.css$/', $url)) {
+                $attributes['href'] = $url;
+                $output .= html_writer::empty_tag('link', $attributes) . "\n";
+            }
+        }
+
+        return $output;
+    }
+
+    /**
+     * Returns the actual url through which a JavaScript file is served.
+     *
+     * @param moodle_url|string $url full moodle url, or shortened path to script.
+     * @throws coding_exception if the given $url isn't a shortened url starting with / or a moodle_url instance.
+     * @return moodle_url
+     */
+    protected function js_fix_url($url) {
+        global $CFG;
+
+        if ($url instanceof moodle_url) {
+            // If the URL is external to Moodle, it won't be handled by Moodle (!).
+            if ($url->is_local_url()) {
+                $localurl = $url->out_as_local_url();
+                // Check if the URL points to a Moodle PHP resource.
+                if (strpos($localurl, '.php') !== false) {
+                    // It's a Moodle PHP resource e.g. a resource already served by the proper Moodle Handler.
+                    return $url;
+                }
+                // It's a local resource: we need to further examine it.
+                return $this->js_fix_url($url->out_as_local_url(false));
+            }
+            // The URL is not a Moodle resource.
+            return $url;
+        } else if (null !== $url && strpos($url, '/') === 0) {
+            // Fix the admin links if needed.
+            if ($CFG->admin !== 'admin') {
+                if (strpos($url, "/admin/") === 0) {
+                    $url = preg_replace("|^/admin/|", "/$CFG->admin/", $url);
+                }
+            }
+            if (debugging()) {
+                // Check file existence only when in debug mode.
+                if (!file_exists($CFG->dirroot . strtok($url, '?'))) {
+                    throw new coding_exception('Attempt to require a JavaScript file that does not exist.', $url);
+                }
+            }
+            if (substr($url, -3) === '.js') {
+                $jsrev = $this->get_jsrev();
+                if (empty($CFG->slasharguments)) {
+                    return new moodle_url('/lib/javascript.php', ['rev' => $jsrev, 'jsfile' => $url]);
+                } else {
+                    $returnurl = new moodle_url('/lib/javascript.php');
+                    $returnurl->set_slashargument('/'.$jsrev.$url);
+                    return $returnurl;
+                }
+            } else {
+                return new moodle_url($url);
+            }
+        } else {
+            throw new coding_exception('Invalid JS url, it has to be shortened url starting with / or moodle_url instance.', $url);
+        }
+    }
+
+    /**
+     * Find out if JS module present and return details.
+     *
+     * @param string $component name of component in frankenstyle, ex: core_group, mod_forum
+     * @return array description of module or null if not found
+     */
+    protected function find_module($component) {
+        global $CFG, $PAGE;
+
+        $module = null;
+
+        if (strpos($component, 'core_') === 0) {
+            // Must be some core stuff - list here is not complete, this is just the stuff used from multiple places
+            // so that we do nto have to repeat the definition of these modules over and over again.
+            switch($component) {
+                case 'core_filepicker':
+                    $module = array('name'     => 'core_filepicker',
+                                    'fullpath' => '/repository/filepicker.js',
+                                    'requires' => array(
+                                        'base', 'node', 'node-event-simulate', 'json', 'async-queue', 'io-base', 'io-upload-iframe', 'io-form',
+                                        'yui2-treeview', 'panel', 'cookie', 'datatable', 'datatable-sort', 'resize-plugin', 'dd-plugin',
+                                        'escape', 'moodle-core_filepicker', 'moodle-core-notification-dialogue'
+                                    ),
+                                    'strings'  => array(array('lastmodified', 'moodle'), array('name', 'moodle'), array('type', 'repository'), array('size', 'repository'),
+                                                        array('invalidjson', 'repository'), array('error', 'moodle'), array('info', 'moodle'),
+                                                        array('nofilesattached', 'repository'), array('filepicker', 'repository'), array('logout', 'repository'),
+                                                        array('nofilesavailable', 'repository'), array('norepositoriesavailable', 'repository'),
+                                                        array('fileexistsdialogheader', 'repository'), array('fileexistsdialog_editor', 'repository'),
+                                                        array('fileexistsdialog_filemanager', 'repository'), array('renameto', 'repository'),
+                                                        array('referencesexist', 'repository'), array('select', 'repository')
+                                                    ));
+                    break;
+                case 'core_comment':
+                    $module = array('name'     => 'core_comment',
+                                    'fullpath' => '/comment/comment.js',
+                                    'requires' => array('base', 'io-base', 'node', 'json', 'yui2-animation', 'overlay', 'escape'),
+                                    'strings' => array(array('confirmdeletecomments', 'admin'), array('yes', 'moodle'), array('no', 'moodle'))
+                                );
+                    break;
+                case 'core_role':
+                    $module = array('name'     => 'core_role',
+                                    'fullpath' => '/admin/roles/module.js',
+                                    'requires' => array('node', 'cookie'));
+                    break;
+                case 'core_completion':
+                    break;
+                case 'core_message':
+                    $module = array('name'     => 'core_message',
+                                    'requires' => array('base', 'node', 'event', 'node-event-simulate'),
+                                    'fullpath' => '/message/module.js');
+                    break;
+                case 'core_group':
+                    $module = array('name'     => 'core_group',
+                                    'fullpath' => '/group/module.js',
+                                    'requires' => array('node', 'overlay', 'event-mouseenter'));
+                    break;
+                case 'core_question_engine':
+                    $module = array('name'     => 'core_question_engine',
+                                    'fullpath' => '/question/qengine.js',
+                                    'requires' => array('node', 'event'));
+                    break;
+                case 'core_rating':
+                    $module = array('name'     => 'core_rating',
+                                    'fullpath' => '/rating/module.js',
+                                    'requires' => array('node', 'event', 'overlay', 'io-base', 'json'));
+                    break;
+                case 'core_dndupload':
+                    $module = array('name'     => 'core_dndupload',
+                                    'fullpath' => '/lib/form/dndupload.js',
+                                    'requires' => array('node', 'event', 'json', 'core_filepicker'),
+                                    'strings'  => array(array('uploadformlimit', 'moodle'), array('droptoupload', 'moodle'), array('maxfilesreached', 'moodle'),
+                                                        array('dndenabled_inbox', 'moodle'), array('fileexists', 'moodle'), array('maxbytesfile', 'error'),
+                                                        array('sizegb', 'moodle'), array('sizemb', 'moodle'), array('sizekb', 'moodle'), array('sizeb', 'moodle'),
+                                                        array('maxareabytesreached', 'moodle'), array('serverconnection', 'error'),
+                                                        array('changesmadereallygoaway', 'moodle'), array('complete', 'moodle')
+                                                    ));
+                    break;
+            }
+
+        } else {
+            if ($dir = core_component::get_component_directory($component)) {
+                if (file_exists("$dir/module.js")) {
+                    if (strpos($dir, $CFG->dirroot.'/') === 0) {
+                        $dir = substr($dir, strlen($CFG->dirroot));
+                        $module = array('name'=>$component, 'fullpath'=>"$dir/module.js", 'requires' => array());
+                    }
+                }
+            }
+        }
+
+        return $module;
+    }
+
+    /**
+     * Append YUI3 module to default YUI3 JS loader.
+     * The structure of module array is described at {@link http://developer.yahoo.com/yui/3/yui/}
+     *
+     * @param string|array $module name of module (details are autodetected), or full module specification as array
+     * @return void
+     */
+    public function js_module($module) {
+        global $CFG;
+
+        if (empty($module)) {
+            throw new coding_exception('Missing YUI3 module name or full description.');
+        }
+
+        if (is_string($module)) {
+            $module = $this->find_module($module);
+        }
+
+        if (empty($module) or empty($module['name']) or empty($module['fullpath'])) {
+            throw new coding_exception('Missing YUI3 module details.');
+        }
+
+        $module['fullpath'] = $this->js_fix_url($module['fullpath'])->out(false);
+        // Add all needed strings.
+        if (!empty($module['strings'])) {
+            foreach ($module['strings'] as $string) {
+                $identifier = $string[0];
+                $component = isset($string[1]) ? $string[1] : 'moodle';
+                $a = isset($string[2]) ? $string[2] : null;
+                $this->string_for_js($identifier, $component, $a);
+            }
+        }
+        unset($module['strings']);
+
+        // Process module requirements and attempt to load each. This allows
+        // moodle modules to require each other.
+        if (!empty($module['requires'])){
+            foreach ($module['requires'] as $requirement) {
+                $rmodule = $this->find_module($requirement);
+                if (is_array($rmodule)) {
+                    $this->js_module($rmodule);
+                }
+            }
+        }
+
+        if ($this->headdone) {
+            $this->extramodules[$module['name']] = $module;
+        } else {
+            $this->YUI_config->add_module_config($module['name'], $module);
+        }
+    }
+
+    /**
+     * Returns true if the module has already been loaded.
+     *
+     * @param string|array $module
+     * @return bool True if the module has already been loaded
+     */
+    protected function js_module_loaded($module) {
+        if (is_string($module)) {
+            $modulename = $module;
+        } else {
+            $modulename = $module['name'];
+        }
+        return array_key_exists($modulename, $this->YUI_config->modules) ||
+               array_key_exists($modulename, $this->extramodules);
+    }
+
+    /**
+     * Ensure that the specified CSS file is linked to from this page.
+     *
+     * Because stylesheet links must go in the <head> part of the HTML, you must call
+     * this function before {@link get_head_code()} is called. That normally means before
+     * the call to print_header. If you call it when it is too late, an exception
+     * will be thrown.
+     *
+     * Even if a particular style sheet is requested more than once, it will only
+     * be linked to once.
+     *
+     * Please note use of this feature is strongly discouraged,
+     * it is suitable only for places where CSS is submitted directly by teachers.
+     * (Students must not be allowed to submit any external CSS because it may
+     * contain embedded javascript!). Example of correct use is mod/data.
+     *
+     * @param string $stylesheet The path to the .css file, relative to $CFG->wwwroot.
+     *   For example:
+     *      $PAGE->requires->css('mod/data/css.php?d='.$data->id);
+     */
+    public function css($stylesheet) {
+        global $CFG;
+
+        if ($this->headdone) {
+            throw new coding_exception('Cannot require a CSS file after &lt;head> has been printed.', $stylesheet);
+        }
+
+        if ($stylesheet instanceof moodle_url) {
+            // ok
+        } else if (strpos($stylesheet, '/') === 0) {
+            $stylesheet = new moodle_url($stylesheet);
+        } else {
+            throw new coding_exception('Invalid stylesheet parameter.', $stylesheet);
+        }
+
+        $this->cssurls[$stylesheet->out()] = $stylesheet;
+    }
+
+    /**
+     * Add theme stylesheet to page - do not use from plugin code,
+     * this should be called only from the core renderer!
+     *
+     * @param moodle_url $stylesheet
+     * @return void
+     */
+    public function css_theme(moodle_url $stylesheet) {
+        $this->cssthemeurls[] = $stylesheet;
+    }
+
+    /**
+     * Ensure that a skip link to a given target is printed at the top of the <body>.
+     *
+     * You must call this function before {@link get_top_of_body_code()}, (if not, an exception
+     * will be thrown). That normally means you must call this before the call to print_header.
+     *
+     * If you ask for a particular skip link to be printed, it is then your responsibility
+     * to ensure that the appropriate <a name="..."> tag is printed in the body of the
+     * page, so that the skip link goes somewhere.
+     *
+     * Even if a particular skip link is requested more than once, only one copy of it will be output.
+     *
+     * @param string $target the name of anchor this link should go to. For example 'maincontent'.
+     * @param string $linktext The text to use for the skip link. Normally get_string('skipto', 'access', ...);
+     */
+    public function skip_link_to($target, $linktext) {
+        if ($this->topofbodydone) {
+            debugging('Page header already printed, can not add skip links any more, code needs to be fixed.');
+            return;
+        }
+        $this->skiplinks[$target] = $linktext;
+    }
+
+    /**
+     * !!!DEPRECATED!!! please use js_init_call() if possible
+     * Ensure that the specified JavaScript function is called from an inline script
+     * somewhere on this page.
+     *
+     * By default the call will be put in a script tag at the
+     * end of the page after initialising Y instance, since this gives best page-load
+     * performance and allows you to use YUI3 library.
+     *
+     * If you request that a particular function is called several times, then
+     * that is what will happen (unlike linking to a CSS or JS file, where only
+     * one link will be output).
+     *
+     * The main benefit of the method is the automatic encoding of all function parameters.
+     *
+     * @deprecated
+     *
+     * @param string $function the name of the JavaScritp function to call. Can
+     *      be a compound name like 'Y.Event.purgeElement'. Can also be
+     *      used to create and object by using a 'function name' like 'new user_selector'.
+     * @param array $arguments and array of arguments to be passed to the function.
+     *      When generating the function call, this will be escaped using json_encode,
+     *      so passing objects and arrays should work.
+     * @param bool $ondomready If tru the function is only called when the dom is
+     *      ready for manipulation.
+     * @param int $delay The delay before the function is called.
+     */
+    public function js_function_call($function, array $arguments = null, $ondomready = false, $delay = 0) {
+        $where = $ondomready ? 'ondomready' : 'normal';
+        $this->jscalls[$where][] = array($function, $arguments, $delay);
+    }
+
+    /**
+     * This function appends a block of code to the AMD specific javascript block executed
+     * in the page footer, just after loading the requirejs library.
+     *
+     * The code passed here can rely on AMD module loading, e.g. require('jquery', function($) {...});
+     *
+     * @param string $code The JS code to append.
+     */
+    public function js_amd_inline($code) {
+        $this->amdjscode[] = $code;
+    }
+
+    /**
+     * Load an AMD module and eventually call its method.
+     *
+     * This function creates a minimal inline JS snippet that requires an AMD module and eventually calls a single
+     * function from the module with given arguments. If it is called multiple times, it will be create multiple
+     * snippets.
+     *
+     * @param string $fullmodule The name of the AMD module to load, formatted as <component name>/<module name>.
+     * @param string $func Optional function from the module to call, defaults to just loading the AMD module.
+     * @param array $params The params to pass to the function (will be serialized into JSON).
+     */
+    public function js_call_amd($fullmodule, $func = null, $params = array()) {
+        global $CFG;
+
+        $modulepath = explode('/', $fullmodule);
+
+        $modname = clean_param(array_shift($modulepath), PARAM_COMPONENT);
+        foreach ($modulepath as $module) {
+            $modname .= '/' . clean_param($module, PARAM_ALPHANUMEXT);
+        }
+
+        $functioncode = [];
+        if ($func !== null) {
+            $func = clean_param($func, PARAM_ALPHANUMEXT);
+
+            $jsonparams = array();
+            foreach ($params as $param) {
+                $jsonparams[] = json_encode($param);
+            }
+            $strparams = implode(', ', $jsonparams);
+            if ($CFG->debugdeveloper) {
+                $toomanyparamslimit = 1024;
+                if (strlen($strparams) > $toomanyparamslimit) {
+                    debugging('Too much data passed as arguments to js_call_amd("' . $fullmodule . '", "' . $func .
+                        '"). Generally there are better ways to pass lots of data from PHP to JavaScript, for example via Ajax, ' .
+                        'data attributes, ... . This warning is triggered if the argument string becomes longer than ' .
+                        $toomanyparamslimit . ' characters.', DEBUG_DEVELOPER);
+                }
+            }
+
+            $functioncode[] = "amd.{$func}({$strparams});";
+        }
+
+        $functioncode[] = "M.util.js_complete('{$modname}');";
+
+        $initcode = implode(' ', $functioncode);
+        $js = "M.util.js_pending('{$modname}'); require(['{$modname}'], function(amd) {{$initcode}});";
+
+        $this->js_amd_inline($js);
+    }
+
+    /**
+     * Creates a JavaScript function call that requires one or more modules to be loaded.
+     *
+     * This function can be used to include all of the standard YUI module types within JavaScript:
+     *     - YUI3 modules    [node, event, io]
+     *     - YUI2 modules    [yui2-*]
+     *     - Moodle modules  [moodle-*]
+     *     - Gallery modules [gallery-*]
+     *
+     * Before writing new code that makes extensive use of YUI, you should consider it's replacement AMD/JQuery.
+     * @see js_call_amd()
+     *
+     * @param array|string $modules One or more modules
+     * @param string $function The function to call once modules have been loaded
+     * @param array $arguments An array of arguments to pass to the function
+     * @param string $galleryversion Deprecated: The gallery version to use
+     * @param bool $ondomready
+     */
+    public function yui_module($modules, $function, array $arguments = null, $galleryversion = null, $ondomready = false) {
+        if (!is_array($modules)) {
+            $modules = array($modules);
+        }
+
+        if ($galleryversion != null) {
+            debugging('The galleryversion parameter to yui_module has been deprecated since Moodle 2.3.');
+        }
+
+        $jscode = 'Y.use('.join(',', array_map('json_encode', convert_to_array($modules))).',function() {'.js_writer::function_call($function, $arguments).'});';
+        if ($ondomready) {
+            $jscode = "Y.on('domready', function() { $jscode });";
+        }
+        $this->jsinitcode[] = $jscode;
+    }
+
+    /**
+     * Set the CSS Modules to be included from YUI.
+     *
+     * @param array $modules The list of YUI CSS Modules to include.
+     */
+    public function set_yuicssmodules(array $modules = array()) {
+        $this->yuicssmodules = $modules;
+    }
+
+    /**
+     * Ensure that the specified JavaScript function is called from an inline script
+     * from page footer.
+     *
+     * @param string $function the name of the JavaScritp function to with init code,
+     *      usually something like 'M.mod_mymodule.init'
+     * @param array $extraarguments and array of arguments to be passed to the function.
+     *      The first argument is always the YUI3 Y instance with all required dependencies
+     *      already loaded.
+     * @param bool $ondomready wait for dom ready (helps with some IE problems when modifying DOM)
+     * @param array $module JS module specification array
+     */
+    public function js_init_call($function, array $extraarguments = null, $ondomready = false, array $module = null) {
+        $jscode = js_writer::function_call_with_Y($function, $extraarguments);
+        if (!$module) {
+            // Detect module automatically.
+            if (preg_match('/M\.([a-z0-9]+_[^\.]+)/', $function, $matches)) {
+                $module = $this->find_module($matches[1]);
+            }
+        }
+
+        $this->js_init_code($jscode, $ondomready, $module);
+    }
+
+    /**
+     * Add short static javascript code fragment to page footer.
+     * This is intended primarily for loading of js modules and initialising page layout.
+     * Ideally the JS code fragment should be stored in plugin renderer so that themes
+     * may override it.
+     *
+     * @param string $jscode
+     * @param bool $ondomready wait for dom ready (helps with some IE problems when modifying DOM)
+     * @param array $module JS module specification array
+     */
+    public function js_init_code($jscode, $ondomready = false, array $module = null) {
+        $jscode = trim($jscode, " ;\n"). ';';
+
+        $uniqid = html_writer::random_id();
+        $startjs = " M.util.js_pending('" . $uniqid . "');";
+        $endjs = " M.util.js_complete('" . $uniqid . "');";
+
+        if ($module) {
+            $this->js_module($module);
+            $modulename = $module['name'];
+            $jscode = "$startjs Y.use('$modulename', function(Y) { $jscode $endjs });";
+        }
+
+        if ($ondomready) {
+            $jscode = "$startjs Y.on('domready', function() { $jscode $endjs });";
+        }
+
+        $this->jsinitcode[] = $jscode;
+    }
+
+    /**
+     * Make a language string available to JavaScript.
+     *
+     * All the strings will be available in a M.str object in the global namespace.
+     * So, for example, after a call to $PAGE->requires->string_for_js('course', 'moodle');
+     * then the JavaScript variable M.str.moodle.course will be 'Course', or the
+     * equivalent in the current language.
+     *
+     * The arguments to this function are just like the arguments to get_string
+     * except that $component is not optional, and there are some aspects to consider
+     * when the string contains {$a} placeholder.
+     *
+     * If the string does not contain any {$a} placeholder, you can simply use
+     * M.str.component.identifier to obtain it. If you prefer, you can call
+     * M.util.get_string(identifier, component) to get the same result.
+     *
+     * If you need to use {$a} placeholders, there are two options. Either the
+     * placeholder should be substituted in PHP on server side or it should
+     * be substituted in Javascript at client side.
+     *
+     * To substitute the placeholder at server side, just provide the required
+     * value for the placeholder when you require the string. Because each string
+     * is only stored once in the JavaScript (based on $identifier and $module)
+     * you cannot get the same string with two different values of $a. If you try,
+     * an exception will be thrown. Once the placeholder is substituted, you can
+     * use M.str or M.util.get_string() as shown above:
+     *
+     *     // Require the string in PHP and replace the placeholder.
+     *     $PAGE->requires->string_for_js('fullnamedisplay', 'moodle', $USER);
+     *     // Use the result of the substitution in Javascript.
+     *     alert(M.str.moodle.fullnamedisplay);
+     *
+     * To substitute the placeholder at client side, use M.util.get_string()
+     * function. It implements the same logic as {@link get_string()}:
+     *
+     *     // Require the string in PHP but keep {$a} as it is.
+     *     $PAGE->requires->string_for_js('fullnamedisplay', 'moodle');
+     *     // Provide the values on the fly in Javascript.
+     *     user = { firstname : 'Harry', lastname : 'Potter' }
+     *     alert(M.util.get_string('fullnamedisplay', 'moodle', user);
+     *
+     * If you do need the same string expanded with different $a values in PHP
+     * on server side, then the solution is to put them in your own data structure
+     * (e.g. and array) that you pass to JavaScript with {@link data_for_js()}.
+     *
+     * @param string $identifier the desired string.
+     * @param string $component the language file to look in.
+     * @param mixed $a any extra data to add into the string (optional).
+     */
+    public function string_for_js($identifier, $component, $a = null) {
+        if (!$component) {
+            throw new coding_exception('The $component parameter is required for page_requirements_manager::string_for_js().');
+        }
+        if (isset($this->stringsforjs_as[$component][$identifier]) and $this->stringsforjs_as[$component][$identifier] !== $a) {
+            throw new coding_exception("Attempt to re-define already required string '$identifier' " .
+                    "from lang file '$component' with different \$a parameter?");
+        }
+        if (!isset($this->stringsforjs[$component][$identifier])) {
+            $this->stringsforjs[$component][$identifier] = new lang_string($identifier, $component, $a);
+            $this->stringsforjs_as[$component][$identifier] = $a;
+        }
+    }
+
+    /**
+     * Make an array of language strings available for JS.
+     *
+     * This function calls the above function {@link string_for_js()} for each requested
+     * string in the $identifiers array that is passed to the argument for a single module
+     * passed in $module.
+     *
+     * <code>
+     * $PAGE->requires->strings_for_js(array('one', 'two', 'three'), 'mymod', array('a', null, 3));
+     *
+     * // The above is identical to calling:
+     *
+     * $PAGE->requires->string_for_js('one', 'mymod', 'a');
+     * $PAGE->requires->string_for_js('two', 'mymod');
+     * $PAGE->requires->string_for_js('three', 'mymod', 3);
+     * </code>
+     *
+     * @param array $identifiers An array of desired strings
+     * @param string $component The module to load for
+     * @param mixed $a This can either be a single variable that gets passed as extra
+     *         information for every string or it can be an array of mixed data where the
+     *         key for the data matches that of the identifier it is meant for.
+     *
+     */
+    public function strings_for_js($identifiers, $component, $a = null) {
+        foreach ($identifiers as $key => $identifier) {
+            if (is_array($a) && array_key_exists($key, $a)) {
+                $extra = $a[$key];
+            } else {
+                $extra = $a;
+            }
+            $this->string_for_js($identifier, $component, $extra);
+        }
+    }
+
+    /**
+     * !!!!!!DEPRECATED!!!!!! please use js_init_call() for everything now.
+     *
+     * Make some data from PHP available to JavaScript code.
+     *
+     * For example, if you call
+     * <pre>
+     *      $PAGE->requires->data_for_js('mydata', array('name' => 'Moodle'));
+     * </pre>
+     * then in JavsScript mydata.name will be 'Moodle'.
+     *
+     * @deprecated
+     * @param string $variable the the name of the JavaScript variable to assign the data to.
+     *      Will probably work if you use a compound name like 'mybuttons.button[1]', but this
+     *      should be considered an experimental feature.
+     * @param mixed $data The data to pass to JavaScript. This will be escaped using json_encode,
+     *      so passing objects and arrays should work.
+     * @param bool $inhead initialise in head
+     * @return void
+     */
+    public function data_for_js($variable, $data, $inhead=false) {
+        $where = $inhead ? 'head' : 'footer';
+        $this->jsinitvariables[$where][] = array($variable, $data);
+    }
+
+    /**
+     * Creates a YUI event handler.
+     *
+     * @param mixed $selector standard YUI selector for elements, may be array or string, element id is in the form "#idvalue"
+     * @param string $event A valid DOM event (click, mousedown, change etc.)
+     * @param string $function The name of the function to call
+     * @param array  $arguments An optional array of argument parameters to pass to the function
+     */
+    public function event_handler($selector, $event, $function, array $arguments = null) {
+        $this->eventhandlers[] = array('selector'=>$selector, 'event'=>$event, 'function'=>$function, 'arguments'=>$arguments);
+    }
+
+    /**
+     * Returns code needed for registering of event handlers.
+     * @return string JS code
+     */
+    protected function get_event_handler_code() {
+        $output = '';
+        foreach ($this->eventhandlers as $h) {
+            $output .= js_writer::event_handler($h['selector'], $h['event'], $h['function'], $h['arguments']);
+        }
+        return $output;
+    }
+
+    /**
+     * Get the inline JavaScript code that need to appear in a particular place.
+     * @param bool $ondomready
+     * @return string
+     */
+    protected function get_javascript_code($ondomready) {
+        $where = $ondomready ? 'ondomready' : 'normal';
+        $output = '';
+        if ($this->jscalls[$where]) {
+            foreach ($this->jscalls[$where] as $data) {
+                $output .= js_writer::function_call($data[0], $data[1], $data[2]);
+            }
+            if (!empty($ondomready)) {
+                $output = "    Y.on('domready', function() {\n$output\n});";
+            }
+        }
+        return $output;
+    }
+
+    /**
+     * Returns js code to be executed when Y is available.
+     * @return string
+     */
+    protected function get_javascript_init_code() {
+        if (count($this->jsinitcode)) {
+            return implode("\n", $this->jsinitcode) . "\n";
+        }
+        return '';
+    }
+
+    /**
+     * Returns js code to load amd module loader, then insert inline script tags
+     * that contain require() calls using RequireJS.
+     * @return string
+     */
+    protected function get_amd_footercode() {
+        global $CFG;
+        $output = '';
+
+        // We will cache JS if cachejs is not set, or it is true.
+        $cachejs = !isset($CFG->cachejs) || $CFG->cachejs;
+        $jsrev = $this->get_jsrev();
+
+        $jsloader = new moodle_url('/lib/javascript.php');
+        $jsloader->set_slashargument('/' . $jsrev . '/');
+        $requirejsloader = new moodle_url('/lib/requirejs.php');
+        $requirejsloader->set_slashargument('/' . $jsrev . '/');
+
+        $requirejsconfig = file_get_contents($CFG->dirroot . '/lib/requirejs/moodle-config.js');
+
+        // No extension required unless slash args is disabled.
+        $jsextension = '.js';
+        if (!empty($CFG->slasharguments)) {
+            $jsextension = '';
+        }
+
+        $minextension = '.min';
+        if (!$cachejs) {
+            $minextension = '';
+        }
+
+        $requirejsconfig = str_replace('[BASEURL]', $requirejsloader, $requirejsconfig);
+        $requirejsconfig = str_replace('[JSURL]', $jsloader, $requirejsconfig);
+        $requirejsconfig = str_replace('[JSMIN]', $minextension, $requirejsconfig);
+        $requirejsconfig = str_replace('[JSEXT]', $jsextension, $requirejsconfig);
+
+        $output .= html_writer::script($requirejsconfig);
+        if ($cachejs) {
+            $output .= html_writer::script('', $this->js_fix_url('/lib/requirejs/require.min.js'));
+        } else {
+            $output .= html_writer::script('', $this->js_fix_url('/lib/requirejs/require.js'));
+        }
+
+        // First include must be to a module with no dependencies, this prevents multiple requests.
+        $prefix = <<<EOF
+M.util.js_pending("core/first");
+require(['core/first'], function() {
+
+EOF;
+
+        if (during_initial_install()) {
+            // Do not run a prefetch during initial install as the DB is not available to service WS calls.
+            $prefetch = '';
+        } else {
+            $prefetch = "require(['core/prefetch'])\n";
+        }
+
+        $suffix = <<<EOF
+
+    M.util.js_complete("core/first");
+});
+EOF;
+
+        $output .= html_writer::script($prefix . $prefetch . implode(";\n", $this->amdjscode) . $suffix);
+        return $output;
+    }
+
+    /**
+     * Returns basic YUI3 CSS code.
+     *
+     * @return string
+     */
+    protected function get_yui3lib_headcss() {
+        global $CFG;
+
+        $yuiformat = '-min';
+        if ($this->yui3loader->filter === 'RAW') {
+            $yuiformat = '';
+        }
+
+        $code = '';
+        if ($this->yui3loader->combine) {
+            if (!empty($this->yuicssmodules)) {
+                $modules = array();
+                foreach ($this->yuicssmodules as $module) {
+                    $modules[] = "$CFG->yui3version/$module/$module-min.css";
+                }
+                $code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->comboBase.implode('&amp;', $modules).'" />';
+            }
+            $code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->local_comboBase.'rollup/'.$CFG->yui3version.'/yui-moodlesimple' . $yuiformat . '.css" />';
+
+        } else {
+            if (!empty($this->yuicssmodules)) {
+                foreach ($this->yuicssmodules as $module) {
+                    $code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->base.$module.'/'.$module.'-min.css" />';
+                }
+            }
+            $code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->local_comboBase.'rollup/'.$CFG->yui3version.'/yui-moodlesimple' . $yuiformat . '.css" />';
+        }
+
+        if ($this->yui3loader->filter === 'RAW') {
+            $code = str_replace('-min.css', '.css', $code);
+        } else if ($this->yui3loader->filter === 'DEBUG') {
+            $code = str_replace('-min.css', '.css', $code);
+        }
+        return $code;
+    }
+
+    /**
+     * Returns basic YUI3 JS loading code.
+     *
+     * @return string
+     */
+    protected function get_yui3lib_headcode() {
+        global $CFG;
+
+        $jsrev = $this->get_jsrev();
+
+        $yuiformat = '-min';
+        if ($this->yui3loader->filter === 'RAW') {
+            $yuiformat = '';
+        }
+
+        $format = '-min';
+        if ($this->YUI_config->groups['moodle']['filter'] === 'DEBUG') {
+            $format = '-debug';
+        }
+
+        $rollupversion = $CFG->yui3version;
+        if (!empty($CFG->yuipatchlevel)) {
+            $rollupversion .= '_' . $CFG->yuipatchlevel;
+        }
+
+        $baserollups = array(
+            'rollup/' . $rollupversion . "/yui-moodlesimple{$yuiformat}.js",
+        );
+
+        if ($this->yui3loader->combine) {
+            return '<script src="' .
+                    $this->yui3loader->local_comboBase .
+                    implode('&amp;', $baserollups) .
+                    '"></script>';
+        } else {
+            $code = '';
+            foreach ($baserollups as $rollup) {
+                $code .= '<script src="'.$this->yui3loader->local_comboBase.$rollup.'"></script>';
+            }
+            return $code;
+        }
+
+    }
+
+    /**
+     * Returns html tags needed for inclusion of theme CSS.
+     *
+     * @return string
+     */
+    protected function get_css_code() {
+        // First of all the theme CSS, then any custom CSS
+        // Please note custom CSS is strongly discouraged,
+        // because it can not be overridden by themes!
+        // It is suitable only for things like mod/data which accepts CSS from teachers.
+        $attributes = array('rel'=>'stylesheet', 'type'=>'text/css');
+
+        // Add the YUI code first. We want this to be overridden by any Moodle CSS.
+        $code = $this->get_yui3lib_headcss();
+
+        // This line of code may look funny but it is currently required in order
+        // to avoid MASSIVE display issues in Internet Explorer.
+        // As of IE8 + YUI3.1.1 the reference stylesheet (firstthemesheet) gets
+        // ignored whenever another resource is added until such time as a redraw
+        // is forced, usually by moving the mouse over the affected element.
+        $code .= html_writer::tag('script', '/** Required in order to fix style inclusion problems in IE with YUI **/', array('id'=>'firstthemesheet', 'type'=>'text/css'));
+
+        $urls = $this->cssthemeurls + $this->cssurls;
+        foreach ($urls as $url) {
+            $attributes['href'] = $url;
+            $code .= html_writer::empty_tag('link', $attributes) . "\n";
+            // This id is needed in first sheet only so that theme may override YUI sheets loaded on the fly.
+            unset($attributes['id']);
+        }
+
+        return $code;
+    }
+
+    /**
+     * Adds extra modules specified after printing of page header.
+     *
+     * @return string
+     */
+    protected function get_extra_modules_code() {
+        if (empty($this->extramodules)) {
+            return '';
+        }
+        return html_writer::script(js_writer::function_call('M.yui.add_module', array($this->extramodules)));
+    }
+
+    /**
+     * Generate any HTML that needs to go inside the <head> tag.
+     *
+     * Normally, this method is called automatically by the code that prints the
+     * <head> tag. You should not normally need to call it in your own code.
+     *
+     * @param moodle_page $page
+     * @param core_renderer $renderer
+     * @return string the HTML code to to inside the <head> tag.
+     */
+    public function get_head_code(moodle_page $page, core_renderer $renderer) {
+        global $CFG;
+
+        // Note: the $page and $output are not stored here because it would
+        // create circular references in memory which prevents garbage collection.
+        $this->init_requirements_data($page, $renderer);
+
+        $output = '';
+
+        // Add all standard CSS for this page.
+        $output .= $this->get_css_code();
+
+        // Set up the M namespace.
+        $js = "var M = {}; M.yui = {};\n";
+
+        // Capture the time now ASAP during page load. This minimises the lag when
+        // we try to relate times on the server to times in the browser.
+        // An example of where this is used is the quiz countdown timer.
+        $js .= "M.pageloadstarttime = new Date();\n";
+
+        // Add a subset of Moodle configuration to the M namespace.
+        $js .= js_writer::set_variable('M.cfg', $this->M_cfg, false);
+
+        // Set up global YUI3 loader object - this should contain all code needed by plugins.
+        // Note: in JavaScript just use "YUI().use('overlay', function(Y) { .... });",
+        //       this needs to be done before including any other script.
+        $js .= $this->YUI_config->get_config_functions();
+        $js .= js_writer::set_variable('YUI_config', $this->YUI_config, false) . "\n";
+        $js .= "M.yui.loader = {modules: {}};\n"; // Backwards compatibility only, not used any more.
+        $js = $this->YUI_config->update_header_js($js);
+
+        $output .= html_writer::script($js);
+
+        // Add variables.
+        if ($this->jsinitvariables['head']) {
+            $js = '';
+            foreach ($this->jsinitvariables['head'] as $data) {
+                list($var, $value) = $data;
+                $js .= js_writer::set_variable($var, $value, true);
+            }
+            $output .= html_writer::script($js);
+        }
+
+        // Mark head sending done, it is not possible to anything there.
+        $this->headdone = true;
+
+        return $output;
+    }
+
+    /**
+     * Generate any HTML that needs to go at the start of the <body> tag.
+     *
+     * Normally, this method is called automatically by the code that prints the
+     * <head> tag. You should not normally need to call it in your own code.
+     *
+     * @param renderer_base $renderer
+     * @return string the HTML code to go at the start of the <body> tag.
+     */
+    public function get_top_of_body_code(renderer_base $renderer) {
+        global $CFG;
+
+        // First the skip links.
+        $output = $renderer->render_skip_links($this->skiplinks);
+
+        // Include the Polyfills.
+        $output .= html_writer::script('', $this->js_fix_url('/lib/polyfills/polyfill.js'));
+
+        // YUI3 JS needs to be loaded early in the body. It should be cached well by the browser.
+        $output .= $this->get_yui3lib_headcode();
+
+        // Add hacked jQuery support, it is not intended for standard Moodle distribution!
+        $output .= $this->get_jquery_headcode();
+
+        // Link our main JS file, all core stuff should be there.
+        $output .= html_writer::script('', $this->js_fix_url('/lib/javascript-static.js'));
+
+        // All the other linked things from HEAD - there should be as few as possible.
+        if ($this->jsincludes['head']) {
+            foreach ($this->jsincludes['head'] as $url) {
+                $output .= html_writer::script('', $url);
+            }
+        }
+
+        // Then the clever trick for hiding of things not needed when JS works.
+        $output .= html_writer::script("document.body.className += ' jsenabled';") . "\n";
+        $this->topofbodydone = true;
+        return $output;
+    }
+
+    /**
+     * Generate any HTML that needs to go at the end of the page.
+     *
+     * Normally, this method is called automatically by the code that prints the
+     * page footer. You should not normally need to call it in your own code.
+     *
+     * @return string the HTML code to to at the end of the page.
+     */
+    public function get_end_code() {
+        global $CFG;
+        $output = '';
+
+        // Set the log level for the JS logging.
+        $logconfig = new stdClass();
+        $logconfig->level = 'warn';
+        if ($CFG->debugdeveloper) {
+            $logconfig->level = 'trace';
+        }
+        $this->js_call_amd('core/log', 'setConfig', array($logconfig));
+        // Add any global JS that needs to run on all pages.
+        $this->js_call_amd('core/page_global', 'init');
+        $this->js_call_amd('core/utility');
+
+        // Call amd init functions.
+        $output .= $this->get_amd_footercode();
+
+        // Add other requested modules.
+        $output .= $this->get_extra_modules_code();
+
+        $this->js_init_code('M.util.js_complete("init");', true);
+
+        // All the other linked scripts - there should be as few as possible.
+        if ($this->jsincludes['footer']) {
+            foreach ($this->jsincludes['footer'] as $url) {
+                $output .= html_writer::script('', $url);
+            }
+        }
+
+        // Add all needed strings.
+        // First add core strings required for some dialogues.
+        $this->strings_for_js(array(
+            'confirm',
+            'yes',
+            'no',
+            'areyousure',
+            'closebuttontitle',
+            'unknownerror',
+            'error',
+            'file',
+            'url',
+            // TODO MDL-70830 shortforms should preload the collapseall/expandall strings properly.
+            'collapseall',
+            'expandall',
+        ), 'moodle');
+        $this->strings_for_js(array(
+            'debuginfo',
+            'line',
+            'stacktrace',
+        ), 'debug');
+        $this->string_for_js('labelsep', 'langconfig');
+        if (!empty($this->stringsforjs)) {
+            $strings = array();
+            foreach ($this->stringsforjs as $component=>$v) {
+                foreach($v as $indentifier => $langstring) {
+                    $strings[$component][$indentifier] = $langstring->out();
+                }
+            }
+            $output .= html_writer::script(js_writer::set_variable('M.str', $strings));
+        }
+
+        // Add variables.
+        if ($this->jsinitvariables['footer']) {
+            $js = '';
+            foreach ($this->jsinitvariables['footer'] as $data) {
+                list($var, $value) = $data;
+                $js .= js_writer::set_variable($var, $value, true);
+            }
+            $output .= html_writer::script($js);
+        }
+
+        $inyuijs = $this->get_javascript_code(false);
+        $ondomreadyjs = $this->get_javascript_code(true);
+        $jsinit = $this->get_javascript_init_code();
+        $handlersjs = $this->get_event_handler_code();
+
+        // There is a global Y, make sure it is available in your scope.
+        $js = "(function() {{$inyuijs}{$ondomreadyjs}{$jsinit}{$handlersjs}})();";
+
+        $output .= html_writer::script($js);
+
+        return $output;
+    }
+
+    /**
+     * Have we already output the code in the <head> tag?
+     *
+     * @return bool
+     */
+    public function is_head_done() {
+        return $this->headdone;
+    }
+
+    /**
+     * Have we already output the code at the start of the <body> tag?
+     *
+     * @return bool
+     */
+    public function is_top_of_body_done() {
+        return $this->topofbodydone;
+    }
+
+    /**
+     * Should we generate a bit of content HTML that is only required once  on
+     * this page (e.g. the contents of the modchooser), now? Basically, we call
+     * {@link has_one_time_item_been_created()}, and if the thing has not already
+     * been output, we return true to tell the caller to generate it, and also
+     * call {@link set_one_time_item_created()} to record the fact that it is
+     * about to be generated.
+     *
+     * That is, a typical usage pattern (in a renderer method) is:
+     * <pre>
+     * if (!$this->page->requires->should_create_one_time_item_now($thing)) {
+     *     return '';
+     * }
+     * // Else generate it.
+     * </pre>
+     *
+     * @param string $thing identifier for the bit of content. Should be of the form
+     *      frankenstyle_things, e.g. core_course_modchooser.
+     * @return bool if true, the caller should generate that bit of output now, otherwise don't.
+     */
+    public function should_create_one_time_item_now($thing) {
+        if ($this->has_one_time_item_been_created($thing)) {
+            return false;
+        }
+
+        $this->set_one_time_item_created($thing);
+        return true;
+    }
+
+    /**
+     * Has a particular bit of HTML that is only required once  on this page
+     * (e.g. the contents of the modchooser) already been generated?
+     *
+     * Normally, you can use the {@link should_create_one_time_item_now()} helper
+     * method rather than calling this method directly.
+     *
+     * @param string $thing identifier for the bit of content. Should be of the form
+     *      frankenstyle_things, e.g. core_course_modchooser.
+     * @return bool whether that bit of output has been created.
+     */
+    public function has_one_time_item_been_created($thing) {
+        return isset($this->onetimeitemsoutput[$thing]);
+    }
+
+    /**
+     * Indicate that a particular bit of HTML that is only required once on this
+     * page (e.g. the contents of the modchooser) has been generated (or is about to be)?
+     *
+     * Normally, you can use the {@link should_create_one_time_item_now()} helper
+     * method rather than calling this method directly.
+     *
+     * @param string $thing identifier for the bit of content. Should be of the form
+     *      frankenstyle_things, e.g. core_course_modchooser.
+     */
+    public function set_one_time_item_created($thing) {
+        if ($this->has_one_time_item_been_created($thing)) {
+            throw new coding_exception($thing . ' is only supposed to be ouput ' .
+                    'once per page, but it seems to be being output again.');
+        }
+        return $this->onetimeitemsoutput[$thing] = true;
+    }
+}
diff --git a/lib/classes/output/requirements/yui.php b/lib/classes/output/requirements/yui.php
new file mode 100644
index 0000000000000..272753aa4fe10
--- /dev/null
+++ b/lib/classes/output/requirements/yui.php
@@ -0,0 +1,351 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This class represents the YUI configuration.
+ *
+ * @copyright 2013 Andrew Nicols
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.5
+ * @package core
+ * @category output
+ */
+class YUI_config {
+    /**
+     * These settings must be public so that when the object is converted to json they are exposed.
+     * Note: Some of these are camelCase because YUI uses camelCase variable names.
+     *
+     * The settings are described and documented in the YUI API at:
+     * - http://yuilibrary.com/yui/docs/api/classes/config.html
+     * - http://yuilibrary.com/yui/docs/api/classes/Loader.html
+     */
+    public $debug = false;
+    public $base;
+    public $comboBase;
+    public $combine;
+    public $filter = null;
+    public $insertBefore = 'firstthemesheet';
+    public $groups = array();
+    public $modules = array();
+    /** @var array The log sources that should be not be logged. */
+    public $logInclude = [];
+    /** @var array Tog sources that should be logged. */
+    public $logExclude = [];
+    /** @var string The minimum log level for YUI logging statements. */
+    public $logLevel;
+
+    /**
+     * @var array List of functions used by the YUI Loader group pattern recognition.
+     */
+    protected $jsconfigfunctions = array();
+
+    /**
+     * Create a new group within the YUI_config system.
+     *
+     * @param string $name The name of the group. This must be unique and
+     * not previously used.
+     * @param array $config The configuration for this group.
+     * @return void
+     */
+    public function add_group($name, $config) {
+        if (isset($this->groups[$name])) {
+            throw new coding_exception("A YUI configuration group for '{$name}' already exists. To make changes to this group use YUI_config->update_group().");
+        }
+        $this->groups[$name] = $config;
+    }
+
+    /**
+     * Update an existing group configuration
+     *
+     * Note, any existing configuration for that group will be wiped out.
+     * This includes module configuration.
+     *
+     * @param string $name The name of the group. This must be unique and
+     * not previously used.
+     * @param array $config The configuration for this group.
+     * @return void
+     */
+    public function update_group($name, $config) {
+        if (!isset($this->groups[$name])) {
+            throw new coding_exception('The Moodle YUI module does not exist. You must define the moodle module config using YUI_config->add_module_config first.');
+        }
+        $this->groups[$name] = $config;
+    }
+
+    /**
+     * Set the value of a configuration function used by the YUI Loader's pattern testing.
+     *
+     * Only the body of the function should be passed, and not the whole function wrapper.
+     *
+     * The JS function your write will be passed a single argument 'name' containing the
+     * name of the module being loaded.
+     *
+     * @param $function String the body of the JavaScript function. This should be used i
+     * @return string the name of the function to use in the group pattern configuration.
+     */
+    public function set_config_function($function) {
+        $configname = 'yui' . (count($this->jsconfigfunctions) + 1) . 'ConfigFn';
+        if (isset($this->jsconfigfunctions[$configname])) {
+            throw new coding_exception("A YUI config function with this name already exists. Config function names must be unique.");
+        }
+        $this->jsconfigfunctions[$configname] = $function;
+        return '@' . $configname . '@';
+    }
+
+    /**
+     * Allow setting of the config function described in {@see set_config_function} from a file.
+     * The contents of this file are then passed to set_config_function.
+     *
+     * When jsrev is positive, the function is minified and stored in a MUC cache for subsequent uses.
+     *
+     * @param $file The path to the JavaScript function used for YUI configuration.
+     * @return string the name of the function to use in the group pattern configuration.
+     */
+    public function set_config_source($file) {
+        global $CFG;
+        $cache = cache::make('core', 'yuimodules');
+
+        // Attempt to get the metadata from the cache.
+        $keyname = 'configfn_' . $file;
+        $fullpath = $CFG->dirroot . '/' . $file;
+        if (!isset($CFG->jsrev) || $CFG->jsrev == -1) {
+            $cache->delete($keyname);
+            $configfn = file_get_contents($fullpath);
+        } else {
+            $configfn = $cache->get($keyname);
+            if ($configfn === false) {
+                require_once($CFG->libdir . '/jslib.php');
+                $configfn = core_minify::js_files(array($fullpath));
+                $cache->set($keyname, $configfn);
+            }
+        }
+        return $this->set_config_function($configfn);
+    }
+
+    /**
+     * Retrieve the list of JavaScript functions for YUI_config groups.
+     *
+     * @return string The complete set of config functions
+     */
+    public function get_config_functions() {
+        $configfunctions = '';
+        foreach ($this->jsconfigfunctions as $functionname => $function) {
+            $configfunctions .= "var {$functionname} = function(me) {";
+            $configfunctions .= $function;
+            $configfunctions .= "};\n";
+        }
+        return $configfunctions;
+    }
+
+    /**
+     * Update the header JavaScript with any required modification for the YUI Loader.
+     *
+     * @param $js String The JavaScript to manipulate.
+     * @return string the modified JS string.
+     */
+    public function update_header_js($js) {
+        // Update the names of the the configFn variables.
+        // The PHP json_encode function cannot handle literal names so we have to wrap
+        // them in @ and then replace them with literals of the same function name.
+        foreach ($this->jsconfigfunctions as $functionname => $function) {
+            $js = str_replace('"@' . $functionname . '@"', $functionname, $js);
+        }
+        return $js;
+    }
+
+    /**
+     * Add configuration for a specific module.
+     *
+     * @param string $name The name of the module to add configuration for.
+     * @param array $config The configuration for the specified module.
+     * @param string $group The name of the group to add configuration for.
+     * If not specified, then this module is added to the global
+     * configuration.
+     * @return void
+     */
+    public function add_module_config($name, $config, $group = null) {
+        if ($group) {
+            if (!isset($this->groups[$name])) {
+                throw new coding_exception('The Moodle YUI module does not exist. You must define the moodle module config using YUI_config->add_module_config first.');
+            }
+            if (!isset($this->groups[$group]['modules'])) {
+                $this->groups[$group]['modules'] = array();
+            }
+            $modules = &$this->groups[$group]['modules'];
+        } else {
+            $modules = &$this->modules;
+        }
+        $modules[$name] = $config;
+    }
+
+    /**
+     * Add the moodle YUI module metadata for the moodle group to the YUI_config instance.
+     *
+     * If js caching is disabled, metadata will not be served causing YUI to calculate
+     * module dependencies as each module is loaded.
+     *
+     * If metadata does not exist it will be created and stored in a MUC entry.
+     *
+     * @return void
+     */
+    public function add_moodle_metadata() {
+        global $CFG;
+        if (!isset($this->groups['moodle'])) {
+            throw new coding_exception('The Moodle YUI module does not exist. You must define the moodle module config using YUI_config->add_module_config first.');
+        }
+
+        if (!isset($this->groups['moodle']['modules'])) {
+            $this->groups['moodle']['modules'] = array();
+        }
+
+        $cache = cache::make('core', 'yuimodules');
+        if (!isset($CFG->jsrev) || $CFG->jsrev == -1) {
+            $metadata = array();
+            $metadata = $this->get_moodle_metadata();
+            $cache->delete('metadata');
+        } else {
+            // Attempt to get the metadata from the cache.
+            if (!$metadata = $cache->get('metadata')) {
+                $metadata = $this->get_moodle_metadata();
+                $cache->set('metadata', $metadata);
+            }
+        }
+
+        // Merge with any metadata added specific to this page which was added manually.
+        $this->groups['moodle']['modules'] = array_merge($this->groups['moodle']['modules'],
+                $metadata);
+    }
+
+    /**
+     * Determine the module metadata for all moodle YUI modules.
+     *
+     * This works through all modules capable of serving YUI modules, and attempts to get
+     * metadata for each of those modules.
+     *
+     * @return array of module metadata
+     */
+    private function get_moodle_metadata() {
+        $moodlemodules = array();
+        // Core isn't a plugin type or subsystem - handle it seperately.
+        if ($module = $this->get_moodle_path_metadata(core_component::get_component_directory('core'))) {
+            $moodlemodules = array_merge($moodlemodules, $module);
+        }
+
+        // Handle other core subsystems.
+        $subsystems = core_component::get_core_subsystems();
+        foreach ($subsystems as $subsystem => $path) {
+            if (is_null($path)) {
+                continue;
+            }
+            if ($module = $this->get_moodle_path_metadata($path)) {
+                $moodlemodules = array_merge($moodlemodules, $module);
+            }
+        }
+
+        // And finally the plugins.
+        $plugintypes = core_component::get_plugin_types();
+        foreach ($plugintypes as $plugintype => $pathroot) {
+            $pluginlist = core_component::get_plugin_list($plugintype);
+            foreach ($pluginlist as $plugin => $path) {
+                if ($module = $this->get_moodle_path_metadata($path)) {
+                    $moodlemodules = array_merge($moodlemodules, $module);
+                }
+            }
+        }
+
+        return $moodlemodules;
+    }
+
+    /**
+     * Helper function process and return the YUI metadata for all of the modules under the specified path.
+     *
+     * @param string $path the UNC path to the YUI src directory.
+     * @return array the complete array for frankenstyle directory.
+     */
+    private function get_moodle_path_metadata($path) {
+        // Add module metadata is stored in frankenstyle_modname/yui/src/yui_modname/meta/yui_modname.json.
+        $baseyui = $path . '/yui/src';
+        $modules = array();
+        if (is_dir($baseyui)) {
+            $items = new DirectoryIterator($baseyui);
+            foreach ($items as $item) {
+                if ($item->isDot() or !$item->isDir()) {
+                    continue;
+                }
+                $metafile = realpath($baseyui . '/' . $item . '/meta/' . $item . '.json');
+                if (!is_readable($metafile)) {
+                    continue;
+                }
+                $metadata = file_get_contents($metafile);
+                $modules = array_merge($modules, (array) json_decode($metadata));
+            }
+        }
+        return $modules;
+    }
+
+    /**
+     * Define YUI modules which we have been required to patch between releases.
+     *
+     * We must do this because we aggressively cache content on the browser, and we must also override use of the
+     * external CDN which will serve the true authoritative copy of the code without our patches.
+     *
+     * @param string $combobase The local combobase
+     * @param string $yuiversion The current YUI version
+     * @param int $patchlevel The patch level we're working to for YUI
+     * @param array $patchedmodules An array containing the names of the patched modules
+     * @return void
+     */
+    public function define_patched_core_modules($combobase, $yuiversion, $patchlevel, $patchedmodules) {
+        // The version we use is suffixed with a patchlevel so that we can get additional revisions between YUI releases.
+        $subversion = $yuiversion . '_' . $patchlevel;
+
+        if ($this->comboBase == $combobase) {
+            // If we are using the local combobase in the loader, we can add a group and still make use of the combo
+            // loader. We just need to specify a different root which includes a slightly different YUI version number
+            // to include our patchlevel.
+            $patterns = array();
+            $modules = array();
+            foreach ($patchedmodules as $modulename) {
+                // We must define the pattern and module here so that the loader uses our group configuration instead of
+                // the standard module definition. We may lose some metadata provided by upstream but this will be
+                // loaded when the module is loaded anyway.
+                $patterns[$modulename] = array(
+                    'group' => 'yui-patched',
+                );
+                $modules[$modulename] = array();
+            }
+
+            // Actually add the patch group here.
+            $this->add_group('yui-patched', array(
+                'combine' => true,
+                'root' => $subversion . '/',
+                'patterns' => $patterns,
+                'modules' => $modules,
+            ));
+
+        } else {
+            // The CDN is in use - we need to instead use the local combobase for this module and override the modules
+            // definition. We cannot use the local base - we must use the combobase because we cannot invalidate the
+            // local base in browser caches.
+            $fullpathbase = $combobase . $subversion . '/';
+            foreach ($patchedmodules as $modulename) {
+                $this->modules[$modulename] = array(
+                    'fullpath' => $fullpathbase . $modulename . '/' . $modulename . '-min.js'
+                );
+            }
+        }
+    }
+}
diff --git a/lib/classes/output/single_button.php b/lib/classes/output/single_button.php
new file mode 100644
index 0000000000000..83de95439b320
--- /dev/null
+++ b/lib/classes/output/single_button.php
@@ -0,0 +1,266 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Data structure representing a simple form with only one button.
+ *
+ * @copyright 2009 Petr Skoda
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class single_button implements renderable {
+
+    /**
+     * Possible button types. From boostrap.
+     */
+    const BUTTON_TYPES = [
+        self::BUTTON_PRIMARY,
+        self::BUTTON_SECONDARY,
+        self::BUTTON_SUCCESS,
+        self::BUTTON_DANGER,
+        self::BUTTON_WARNING,
+        self::BUTTON_INFO
+    ];
+
+    /**
+     * Possible button types - Primary.
+     */
+    const BUTTON_PRIMARY = 'primary';
+    /**
+     * Possible button types - Secondary.
+     */
+    const BUTTON_SECONDARY = 'secondary';
+    /**
+     * Possible button types - Danger.
+     */
+    const BUTTON_DANGER = 'danger';
+    /**
+     * Possible button types - Success.
+     */
+    const BUTTON_SUCCESS = 'success';
+    /**
+     * Possible button types - Warning.
+     */
+    const BUTTON_WARNING = 'warning';
+    /**
+     * Possible button types - Info.
+     */
+    const BUTTON_INFO = 'info';
+
+    /**
+     * @var moodle_url Target url
+     */
+    public $url;
+
+    /**
+     * @var string Button label
+     */
+    public $label;
+
+    /**
+     * @var string Form submit method post or get
+     */
+    public $method = 'post';
+
+    /**
+     * @var string Wrapping div class
+     */
+    public $class = 'singlebutton';
+
+    /**
+     * @var string Type of button (from defined types). Used for styling.
+     */
+    protected $type;
+
+    /**
+     * @var bool True if button is primary button. Used for styling.
+     * @deprecated since Moodle 4.2
+     */
+    private $primary = false;
+
+    /**
+     * @var bool True if button disabled, false if normal
+     */
+    public $disabled = false;
+
+    /**
+     * @var string Button tooltip
+     */
+    public $tooltip = null;
+
+    /**
+     * @var string Form id
+     */
+    public $formid;
+
+    /**
+     * @var array List of attached actions
+     */
+    public $actions = array();
+
+    /**
+     * @var array $params URL Params
+     */
+    public $params;
+
+    /**
+     * @var string Action id
+     */
+    public $actionid;
+
+    /**
+     * @var array
+     */
+    protected $attributes = [];
+
+    /**
+     * Constructor
+     *
+     * @param moodle_url $url
+     * @param string $label button text
+     * @param string $method get or post submit method
+     * @param string $type whether this is a primary button or another type, used for styling
+     * @param array $attributes Attributes for the HTML button tag
+     */
+    public function __construct(moodle_url $url, $label, $method = 'post', $type = self::BUTTON_SECONDARY,
+        $attributes = []) {
+        if (is_bool($type)) {
+            debugging('The boolean $primary is deprecated and replaced by $type,
+            use single_button::BUTTON_PRIMARY or self::BUTTON_SECONDARY instead');
+            $type = $type ? self::BUTTON_PRIMARY : self::BUTTON_SECONDARY;
+        }
+        $this->url = clone($url);
+        $this->label = $label;
+        $this->method = $method;
+        $this->type = $type;
+        $this->attributes = $attributes;
+    }
+
+    /**
+     * Shortcut for adding a JS confirm dialog when the button is clicked.
+     * The message must be a yes/no question.
+     *
+     * @param string $confirmmessage The yes/no confirmation question. If "Yes" is clicked, the original action will occur.
+     */
+    public function add_confirm_action($confirmmessage) {
+        $this->add_action(new confirm_action($confirmmessage));
+    }
+
+    /**
+     * Add action to the button.
+     * @param component_action $action
+     */
+    public function add_action(component_action $action) {
+        $this->actions[] = $action;
+    }
+
+    /**
+     * Sets an attribute for the HTML button tag.
+     *
+     * @param  string $name  The attribute name
+     * @param  mixed  $value The value
+     * @return null
+     */
+    public function set_attribute($name, $value) {
+        $this->attributes[$name] = $value;
+    }
+
+    /**
+     * Magic setter method.
+     *
+     * This method manages access to some properties and will display deprecation message when accessing 'primary' property.
+     *
+     * @param string $name
+     * @param mixed $value
+     */
+    public function __set($name, $value) {
+        switch ($name) {
+            case 'primary':
+                debugging('The primary field is deprecated, use the type field instead');
+                // Here just in case we modified the primary field from outside {@see \mod_quiz_renderer::summary_page_controls}.
+                $this->type = $value ? self::BUTTON_PRIMARY : self::BUTTON_SECONDARY;
+                break;
+            case 'type':
+                $this->type = in_array($value, self::BUTTON_TYPES) ? $value : self::BUTTON_SECONDARY;
+                break;
+            default:
+                $this->$name = $value;
+        }
+    }
+
+    /**
+     * Magic method getter.
+     *
+     * This method manages access to some properties and will display deprecation message when accessing 'primary' property.
+     *
+     * @param string $name
+     * @return mixed
+     */
+    public function __get($name) {
+        switch ($name) {
+            case 'primary':
+                debugging('The primary field is deprecated, use type field instead');
+                return $this->type == self::BUTTON_PRIMARY;
+            case 'type':
+                return $this->type;
+            default:
+                return $this->$name;
+        }
+    }
+
+    /**
+     * Export data.
+     *
+     * @param renderer_base $output Renderer.
+     * @return stdClass
+     */
+    public function export_for_template(renderer_base $output) {
+        $url = $this->method === 'get' ? $this->url->out_omit_querystring(true) : $this->url->out_omit_querystring();
+
+        $data = new stdClass();
+        $data->id = html_writer::random_id('single_button');
+        $data->formid = $this->formid;
+        $data->method = $this->method;
+        $data->url = $url === '' ? '#' : $url;
+        $data->label = $this->label;
+        $data->classes = $this->class;
+        $data->disabled = $this->disabled;
+        $data->tooltip = $this->tooltip;
+        $data->type = $this->type;
+        $data->attributes = [];
+        foreach ($this->attributes as $key => $value) {
+            $data->attributes[] = ['name' => $key, 'value' => $value];
+        }
+
+        // Form parameters.
+        $actionurl = new moodle_url($this->url);
+        if ($this->method === 'post') {
+            $actionurl->param('sesskey', sesskey());
+        }
+        $data->params = $actionurl->export_params_for_template();
+
+        // Button actions.
+        $actions = $this->actions;
+        $data->actions = array_map(function($action) use ($output) {
+            return $action->export_for_template($output);
+        }, $actions);
+        $data->hasactions = !empty($data->actions);
+
+        return $data;
+    }
+}
diff --git a/lib/classes/output/single_select.php b/lib/classes/output/single_select.php
new file mode 100644
index 0000000000000..4645e7bd8b79d
--- /dev/null
+++ b/lib/classes/output/single_select.php
@@ -0,0 +1,289 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Simple form with just one select field that gets submitted automatically.
+ *
+ * If JS not enabled small go button is printed too.
+ *
+ * @copyright 2009 Petr Skoda
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class single_select implements renderable, templatable {
+
+    /**
+     * @var moodle_url Target url - includes hidden fields
+     */
+    var $url;
+
+    /**
+     * @var string Name of the select element.
+     */
+    var $name;
+
+    /**
+     * @var array $options associative array value=>label ex.: array(1=>'One, 2=>Two)
+     *     it is also possible to specify optgroup as complex label array ex.:
+     *         array(array('Odd'=>array(1=>'One', 3=>'Three)), array('Even'=>array(2=>'Two')))
+     *         array(1=>'One', '--1uniquekey'=>array('More'=>array(2=>'Two', 3=>'Three')))
+     */
+    var $options;
+
+    /**
+     * @var string Selected option
+     */
+    var $selected;
+
+    /**
+     * @var array Nothing selected
+     */
+    var $nothing;
+
+    /**
+     * @var array Extra select field attributes
+     */
+    var $attributes = array();
+
+    /**
+     * @var string Button label
+     */
+    var $label = '';
+
+    /**
+     * @var array Button label's attributes
+     */
+    var $labelattributes = array();
+
+    /**
+     * @var string Form submit method post or get
+     */
+    var $method = 'get';
+
+    /**
+     * @var string Wrapping div class
+     */
+    var $class = 'singleselect';
+
+    /**
+     * @var bool True if button disabled, false if normal
+     */
+    var $disabled = false;
+
+    /**
+     * @var string Button tooltip
+     */
+    var $tooltip = null;
+
+    /**
+     * @var string Form id
+     */
+    var $formid = null;
+
+    /**
+     * @var help_icon The help icon for this element.
+     */
+    var $helpicon = null;
+
+    /** @var component_action[] component action. */
+    public $actions = [];
+
+    /**
+     * Constructor
+     * @param moodle_url $url form action target, includes hidden fields
+     * @param string $name name of selection field - the changing parameter in url
+     * @param array $options list of options
+     * @param string $selected selected element
+     * @param ?array $nothing
+     * @param string $formid
+     */
+    public function __construct(moodle_url $url, $name, array $options, $selected = '', $nothing = array('' => 'choosedots'), $formid = null) {
+        $this->url      = $url;
+        $this->name     = $name;
+        $this->options  = $options;
+        $this->selected = $selected;
+        $this->nothing  = $nothing;
+        $this->formid   = $formid;
+    }
+
+    /**
+     * Shortcut for adding a JS confirm dialog when the button is clicked.
+     * The message must be a yes/no question.
+     *
+     * @param string $confirmmessage The yes/no confirmation question. If "Yes" is clicked, the original action will occur.
+     */
+    public function add_confirm_action($confirmmessage) {
+        $this->add_action(new component_action('submit', 'M.util.show_confirm_dialog', array('message' => $confirmmessage)));
+    }
+
+    /**
+     * Add action to the button.
+     *
+     * @param component_action $action
+     */
+    public function add_action(component_action $action) {
+        $this->actions[] = $action;
+    }
+
+    /**
+     * Adds help icon.
+     *
+     * @deprecated since Moodle 2.0
+     */
+    public function set_old_help_icon($helppage, $title, $component = 'moodle') {
+        throw new coding_exception('set_old_help_icon() can not be used any more, please see set_help_icon().');
+    }
+
+    /**
+     * Adds help icon.
+     *
+     * @param string $identifier The keyword that defines a help page
+     * @param string $component
+     */
+    public function set_help_icon($identifier, $component = 'moodle') {
+        $this->helpicon = new help_icon($identifier, $component);
+    }
+
+    /**
+     * Sets select's label
+     *
+     * @param string $label
+     * @param array $attributes (optional)
+     */
+    public function set_label($label, $attributes = array()) {
+        $this->label = $label;
+        $this->labelattributes = $attributes;
+
+    }
+
+    /**
+     * Export data.
+     *
+     * @param renderer_base $output Renderer.
+     * @return stdClass
+     */
+    public function export_for_template(renderer_base $output) {
+        $attributes = $this->attributes;
+
+        $data = new stdClass();
+        $data->name = $this->name;
+        $data->method = $this->method;
+        $data->action = $this->method === 'get' ? $this->url->out_omit_querystring(true) : $this->url->out_omit_querystring();
+        $data->classes = $this->class;
+        $data->label = $this->label;
+        $data->disabled = $this->disabled;
+        $data->title = $this->tooltip;
+        $data->formid = !empty($this->formid) ? $this->formid : html_writer::random_id('single_select_f');
+        $data->id = !empty($attributes['id']) ? $attributes['id'] : html_writer::random_id('single_select');
+
+        // Select element attributes.
+        // Unset attributes that are already predefined in the template.
+        unset($attributes['id']);
+        unset($attributes['class']);
+        unset($attributes['name']);
+        unset($attributes['title']);
+        unset($attributes['disabled']);
+
+        // Map the attributes.
+        $data->attributes = array_map(function($key) use ($attributes) {
+            return ['name' => $key, 'value' => $attributes[$key]];
+        }, array_keys($attributes));
+
+        // Form parameters.
+        $actionurl = new moodle_url($this->url);
+        if ($this->method === 'post') {
+            $actionurl->param('sesskey', sesskey());
+        }
+        $data->params = $actionurl->export_params_for_template();
+
+        // Select options.
+        $hasnothing = false;
+        if (is_string($this->nothing) && $this->nothing !== '') {
+            $nothing = ['' => $this->nothing];
+            $hasnothing = true;
+            $nothingkey = '';
+        } else if (is_array($this->nothing)) {
+            $nothingvalue = reset($this->nothing);
+            if ($nothingvalue === 'choose' || $nothingvalue === 'choosedots') {
+                $nothing = [key($this->nothing) => get_string('choosedots')];
+            } else {
+                $nothing = $this->nothing;
+            }
+            $hasnothing = true;
+            $nothingkey = key($this->nothing);
+        }
+        if ($hasnothing) {
+            $options = $nothing + $this->options;
+        } else {
+            $options = $this->options;
+        }
+
+        foreach ($options as $value => $name) {
+            if (is_array($options[$value])) {
+                foreach ($options[$value] as $optgroupname => $optgroupvalues) {
+                    $sublist = [];
+                    foreach ($optgroupvalues as $optvalue => $optname) {
+                        $option = [
+                            'value' => $optvalue,
+                            'name' => $optname,
+                            'selected' => strval($this->selected) === strval($optvalue),
+                        ];
+
+                        if ($hasnothing && $nothingkey === $optvalue) {
+                            $option['ignore'] = 'data-ignore';
+                        }
+
+                        $sublist[] = $option;
+                    }
+                    $data->options[] = [
+                        'name' => $optgroupname,
+                        'optgroup' => true,
+                        'options' => $sublist
+                    ];
+                }
+            } else {
+                $option = [
+                    'value' => $value,
+                    'name' => $options[$value],
+                    'selected' => strval($this->selected) === strval($value),
+                    'optgroup' => false
+                ];
+
+                if ($hasnothing && $nothingkey === $value) {
+                    $option['ignore'] = 'data-ignore';
+                }
+
+                $data->options[] = $option;
+            }
+        }
+
+        // Label attributes.
+        $data->labelattributes = [];
+        // Unset label attributes that are already in the template.
+        unset($this->labelattributes['for']);
+        // Map the label attributes.
+        foreach ($this->labelattributes as $key => $value) {
+            $data->labelattributes[] = ['name' => $key, 'value' => $value];
+        }
+
+        // Help icon.
+        $data->helpicon = !empty($this->helpicon) ? $this->helpicon->export_for_template($output) : false;
+
+        return $data;
+    }
+}
diff --git a/lib/classes/output/tabobject.php b/lib/classes/output/tabobject.php
new file mode 100644
index 0000000000000..305d5b30a7597
--- /dev/null
+++ b/lib/classes/output/tabobject.php
@@ -0,0 +1,140 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Stores one tab
+ *
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
+ */
+class tabobject implements renderable, templatable {
+    /** @var string unique id of the tab in this tree, it is used to find selected and/or inactive tabs */
+    var $id;
+    /** @var moodle_url|string link */
+    var $link;
+    /** @var string text on the tab */
+    var $text;
+    /** @var string title under the link, by defaul equals to text */
+    var $title;
+    /** @var bool whether to display a link under the tab name when it's selected */
+    var $linkedwhenselected = false;
+    /** @var bool whether the tab is inactive */
+    var $inactive = false;
+    /** @var bool indicates that this tab's child is selected */
+    var $activated = false;
+    /** @var bool indicates that this tab is selected */
+    var $selected = false;
+    /** @var array stores children tabobjects */
+    var $subtree = array();
+    /** @var int level of tab in the tree, 0 for root (instance of tabtree), 1 for the first row of tabs */
+    var $level = 1;
+
+    /**
+     * Constructor
+     *
+     * @param string $id unique id of the tab in this tree, it is used to find selected and/or inactive tabs
+     * @param string|moodle_url $link
+     * @param string $text text on the tab
+     * @param string $title title under the link, by defaul equals to text
+     * @param bool $linkedwhenselected whether to display a link under the tab name when it's selected
+     */
+    public function __construct($id, $link = null, $text = '', $title = '', $linkedwhenselected = false) {
+        $this->id = $id;
+        $this->link = $link;
+        $this->text = $text;
+        $this->title = $title ? $title : $text;
+        $this->linkedwhenselected = $linkedwhenselected;
+    }
+
+    /**
+     * Travels through tree and finds the tab to mark as selected, all parents are automatically marked as activated
+     *
+     * @param string $selected the id of the selected tab (whatever row it's on),
+     *    if null marks all tabs as unselected
+     * @return bool whether this tab is selected or contains selected tab in its subtree
+     */
+    protected function set_selected($selected) {
+        if ((string)$selected === (string)$this->id) {
+            $this->selected = true;
+            // This tab is selected. No need to travel through subtree.
+            return true;
+        }
+        foreach ($this->subtree as $subitem) {
+            if ($subitem->set_selected($selected)) {
+                // This tab has child that is selected. Mark it as activated. No need to check other children.
+                $this->activated = true;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Travels through tree and finds a tab with specified id
+     *
+     * @param string $id
+     * @return tabtree|null
+     */
+    public function find($id) {
+        if ((string)$this->id === (string)$id) {
+            return $this;
+        }
+        foreach ($this->subtree as $tab) {
+            if ($obj = $tab->find($id)) {
+                return $obj;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Allows to mark each tab's level in the tree before rendering.
+     *
+     * @param int $level
+     */
+    protected function set_level($level) {
+        $this->level = $level;
+        foreach ($this->subtree as $tab) {
+            $tab->set_level($level + 1);
+        }
+    }
+
+    /**
+     * Export for template.
+     *
+     * @param renderer_base $output Renderer.
+     * @return object
+     */
+    public function export_for_template(renderer_base $output) {
+        if ($this->inactive || ($this->selected && !$this->linkedwhenselected) || $this->activated) {
+            $link = null;
+        } else {
+            $link = $this->link;
+        }
+        $active = $this->activated || $this->selected;
+
+        return (object) [
+            'id' => $this->id,
+            'link' => is_object($link) ? $link->out(false) : $link,
+            'text' => $this->text,
+            'title' => $this->title,
+            'inactive' => !$active && $this->inactive,
+            'active' => $active,
+            'level' => $this->level,
+        ];
+    }
+
+}
diff --git a/lib/classes/output/tabtree.php b/lib/classes/output/tabtree.php
new file mode 100644
index 0000000000000..ca31e32ea7e51
--- /dev/null
+++ b/lib/classes/output/tabtree.php
@@ -0,0 +1,91 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Stores tabs list
+ *
+ * Example how to print a single line tabs:
+ * $rows = array(
+ *    new tabobject(...),
+ *    new tabobject(...)
+ * );
+ * echo $OUTPUT->tabtree($rows, $selectedid);
+ *
+ * Multiple row tabs may not look good on some devices but if you want to use them
+ * you can specify ->subtree for the active tabobject.
+ *
+ * @copyright 2013 Marina Glancy
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.5
+ * @package core
+ * @category output
+ */
+class tabtree extends tabobject {
+    /**
+     * Constuctor
+     *
+     * It is highly recommended to call constructor when list of tabs is already
+     * populated, this way you ensure that selected and inactive tabs are located
+     * and attribute level is set correctly.
+     *
+     * @param array $tabs array of tabs, each of them may have it's own ->subtree
+     * @param string|null $selected which tab to mark as selected, all parent tabs will
+     *     automatically be marked as activated
+     * @param array|string|null $inactive list of ids of inactive tabs, regardless of
+     *     their level. Note that you can as weel specify tabobject::$inactive for separate instances
+     */
+    public function __construct($tabs, $selected = null, $inactive = null) {
+        $this->subtree = $tabs;
+        if ($selected !== null) {
+            $this->set_selected($selected);
+        }
+        if ($inactive !== null) {
+            if (is_array($inactive)) {
+                foreach ($inactive as $id) {
+                    if ($tab = $this->find($id)) {
+                        $tab->inactive = true;
+                    }
+                }
+            } else if ($tab = $this->find($inactive)) {
+                $tab->inactive = true;
+            }
+        }
+        $this->set_level(0);
+    }
+
+    /**
+     * Export for template.
+     *
+     * @param renderer_base $output Renderer.
+     * @return object
+     */
+    public function export_for_template(renderer_base $output) {
+        $tabs = [];
+        $secondrow = false;
+
+        foreach ($this->subtree as $tab) {
+            $tabs[] = $tab->export_for_template($output);
+            if (!empty($tab->subtree) && ($tab->level == 0 || $tab->selected || $tab->activated)) {
+                $secondrow = new tabtree($tab->subtree);
+            }
+        }
+
+        return (object) [
+            'tabs' => $tabs,
+            'secondrow' => $secondrow ? $secondrow->export_for_template($output) : false
+        ];
+    }
+}
diff --git a/lib/classes/output/templatable.php b/lib/classes/output/templatable.php
new file mode 100644
index 0000000000000..8a05b61e43e89
--- /dev/null
+++ b/lib/classes/output/templatable.php
@@ -0,0 +1,37 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Interface marking other classes having the ability to export their data for use by templates.
+ *
+ * @copyright 2015 Damyon Wiese
+ * @package core
+ * @category output
+ * @since 2.9
+ */
+interface templatable {
+
+    /**
+     * Function to export the renderer data in a format that is suitable for a
+     * mustache template. This means:
+     * 1. No complex types - only stdClass, array, int, string, float, bool
+     * 2. Any additional info that is required for the template is pre-calculated (e.g. capability checks).
+     *
+     * @param renderer_base $output Used to do a final render of any components that need to be rendered for export.
+     * @return stdClass|array
+     */
+    public function export_for_template(renderer_base $output);
+}
diff --git a/lib/classes/output/theme_config.php b/lib/classes/output/theme_config.php
new file mode 100644
index 0000000000000..d162a454fea91
--- /dev/null
+++ b/lib/classes/output/theme_config.php
@@ -0,0 +1,2312 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This class represents the configuration variables of a Moodle theme.
+ *
+ * All the variables with access: public below (with a few exceptions that are marked)
+ * are the properties you can set in your themes config.php file.
+ *
+ * There are also some methods and protected variables that are part of the inner
+ * workings of Moodle's themes system. If you are just editing a themes config.php
+ * file, you can just ignore those, and the following information for developers.
+ *
+ * Normally, to create an instance of this class, you should use the
+ * {@link theme_config::load()} factory method to load a themes config.php file.
+ * However, normally you don't need to bother, because moodle_page (that is, $PAGE)
+ * will create one for you, accessible as $PAGE->theme.
+ *
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
+ * @category output
+ */
+class theme_config {
+
+    /**
+     * @var string Default theme, used when requested theme not found.
+     */
+    const DEFAULT_THEME = 'boost';
+
+    /** The key under which the SCSS file is stored amongst the CSS files. */
+    const SCSS_KEY = '__SCSS__';
+
+    /**
+     * @var array You can base your theme on other themes by linking to the other theme as
+     * parents. This lets you use the CSS and layouts from the other themes
+     * (see {@link theme_config::$layouts}).
+     * That makes it easy to create a new theme that is similar to another one
+     * but with a few changes. In this themes CSS you only need to override
+     * those rules you want to change.
+     */
+    public $parents;
+
+    /**
+     * @var array The names of all the stylesheets from this theme that you would
+     * like included, in order. Give the names of the files without .css.
+     */
+    public $sheets = array();
+
+    /**
+     * @var array The names of all the stylesheets from parents that should be excluded.
+     * true value may be used to specify all parents or all themes from one parent.
+     * If no value specified value from parent theme used.
+     */
+    public $parents_exclude_sheets = null;
+
+    /**
+     * @var array List of plugin sheets to be excluded.
+     * If no value specified value from parent theme used.
+     */
+    public $plugins_exclude_sheets = null;
+
+    /**
+     * @var array List of style sheets that are included in the text editor bodies.
+     * Sheets from parent themes are used automatically and can not be excluded.
+     */
+    public $editor_sheets = array();
+
+    /**
+     * @var bool Whether a fallback version of the stylesheet will be used
+     * whilst the final version is generated.
+     */
+    public $usefallback = false;
+
+    /**
+     * @var array The names of all the javascript files this theme that you would
+     * like included from head, in order. Give the names of the files without .js.
+     */
+    public $javascripts = array();
+
+    /**
+     * @var array The names of all the javascript files this theme that you would
+     * like included from footer, in order. Give the names of the files without .js.
+     */
+    public $javascripts_footer = array();
+
+    /**
+     * @var array The names of all the javascript files from parents that should
+     * be excluded. true value may be used to specify all parents or all themes
+     * from one parent.
+     * If no value specified value from parent theme used.
+     */
+    public $parents_exclude_javascripts = null;
+
+    /**
+     * @var array Which file to use for each page layout.
+     *
+     * This is an array of arrays. The keys of the outer array are the different layouts.
+     * Pages in Moodle are using several different layouts like 'normal', 'course', 'home',
+     * 'popup', 'form', .... The most reliable way to get a complete list is to look at
+     * {@link http://cvs.moodle.org/moodle/theme/base/config.php?view=markup the base theme config.php file}.
+     * That file also has a good example of how to set this setting.
+     *
+     * For each layout, the value in the outer array is an array that describes
+     * how you want that type of page to look. For example
+     * <pre>
+     *   $THEME->layouts = array(
+     *       // Most pages - if we encounter an unknown or a missing page type, this one is used.
+     *       'standard' => array(
+     *           'theme' = 'mytheme',
+     *           'file' => 'normal.php',
+     *           'regions' => array('side-pre', 'side-post'),
+     *           'defaultregion' => 'side-post'
+     *       ),
+     *       // The site home page.
+     *       'home' => array(
+     *           'theme' = 'mytheme',
+     *           'file' => 'home.php',
+     *           'regions' => array('side-pre', 'side-post'),
+     *           'defaultregion' => 'side-post'
+     *       ),
+     *       // ...
+     *   );
+     * </pre>
+     *
+     * 'theme' name of the theme where is the layout located
+     * 'file' is the layout file to use for this type of page.
+     * layout files are stored in layout subfolder
+     * 'regions' This lists the regions on the page where blocks may appear. For
+     * each region you list here, your layout file must include a call to
+     * <pre>
+     *   echo $OUTPUT->blocks_for_region($regionname);
+     * </pre>
+     * or equivalent so that the blocks are actually visible.
+     *
+     * 'defaultregion' If the list of regions is non-empty, then you must pick
+     * one of the one of them as 'default'. This has two meanings. First, this is
+     * where new blocks are added. Second, if there are any blocks associated with
+     * the page, but in non-existent regions, they appear here. (Imaging, for example,
+     * that someone added blocks using a different theme that used different region
+     * names, and then switched to this theme.)
+     */
+    public $layouts = array();
+
+    /**
+     * @var string Name of the renderer factory class to use. Must implement the
+     * {@link renderer_factory} interface.
+     *
+     * This is an advanced feature. Moodle output is generated by 'renderers',
+     * you can customise the HTML that is output by writing custom renderers,
+     * and then you need to specify 'renderer factory' so that Moodle can find
+     * your renderers.
+     *
+     * There are some renderer factories supplied with Moodle. Please follow these
+     * links to see what they do.
+     * <ul>
+     * <li>{@link standard_renderer_factory} - the default.</li>
+     * <li>{@link theme_overridden_renderer_factory} - use this if you want to write
+     *      your own custom renderers in a lib.php file in this theme (or the parent theme).</li>
+     * </ul>
+     */
+    public $rendererfactory = 'standard_renderer_factory';
+
+    /**
+     * @var string Function to do custom CSS post-processing.
+     *
+     * This is an advanced feature. If you want to do custom post-processing on the
+     * CSS before it is output (for example, to replace certain variable names
+     * with particular values) you can give the name of a function here.
+     */
+    public $csspostprocess = null;
+
+    /**
+     * @var string Function to do custom CSS post-processing on a parsed CSS tree.
+     *
+     * This is an advanced feature. If you want to do custom post-processing on the
+     * CSS before it is output, you can provide the name of the function here. The
+     * function will receive a CSS tree document as first parameter, and the theme_config
+     * object as second parameter. A return value is not required, the tree can
+     * be edited in place.
+     */
+    public $csstreepostprocessor = null;
+
+    /**
+     * @var string Accessibility: Right arrow-like character is
+     * used in the breadcrumb trail, course navigation menu
+     * (previous/next activity), calendar, and search forum block.
+     * If the theme does not set characters, appropriate defaults
+     * are set automatically. Please DO NOT
+     * use &lt; &gt; &raquo; - these are confusing for blind users.
+     */
+    public $rarrow = null;
+
+    /**
+     * @var string Accessibility: Left arrow-like character is
+     * used in the breadcrumb trail, course navigation menu
+     * (previous/next activity), calendar, and search forum block.
+     * If the theme does not set characters, appropriate defaults
+     * are set automatically. Please DO NOT
+     * use &lt; &gt; &raquo; - these are confusing for blind users.
+     */
+    public $larrow = null;
+
+    /**
+     * @var string Accessibility: Up arrow-like character is used in
+     * the book heirarchical navigation.
+     * If the theme does not set characters, appropriate defaults
+     * are set automatically. Please DO NOT
+     * use ^ - this is confusing for blind users.
+     */
+    public $uarrow = null;
+
+    /**
+     * @var string Accessibility: Down arrow-like character.
+     * If the theme does not set characters, appropriate defaults
+     * are set automatically.
+     */
+    public $darrow = null;
+
+    /**
+     * @var bool Some themes may want to disable ajax course editing.
+     */
+    public $enablecourseajax = true;
+
+    /**
+     * @var string Determines served document types
+     *  - 'html5' the only officially supported doctype in Moodle
+     *  - 'xhtml5' may be used in development for validation (not intended for production servers!)
+     *  - 'xhtml' XHTML 1.0 Strict for legacy themes only
+     */
+    public $doctype = 'html5';
+
+    /**
+     * @var string|false requiredblocks If set to a string, will list the block types that cannot be deleted. Defaults to
+     *                                   navigation and settings.
+     */
+    public $requiredblocks = false;
+
+    //==Following properties are not configurable from theme config.php==
+
+    /**
+     * @var string The name of this theme. Set automatically when this theme is
+     * loaded. This can not be set in theme config.php
+     */
+    public $name;
+
+    /**
+     * @var string The folder where this themes files are stored. This is set
+     * automatically. This can not be set in theme config.php
+     */
+    public $dir;
+
+    /**
+     * @var stdClass Theme settings stored in config_plugins table.
+     * This can not be set in theme config.php
+     */
+    public $settings = null;
+
+    /**
+     * @var bool If set to true and the theme enables the dock then  blocks will be able
+     * to be moved to the special dock
+     */
+    public $enable_dock = false;
+
+    /**
+     * @var bool If set to true then this theme will not be shown in the theme selector unless
+     * theme designer mode is turned on.
+     */
+    public $hidefromselector = false;
+
+    /**
+     * @var array list of YUI CSS modules to be included on each page. This may be used
+     * to remove cssreset and use cssnormalise module instead.
+     */
+    public $yuicssmodules = array('cssreset', 'cssfonts', 'cssgrids', 'cssbase');
+
+    /**
+     * An associative array of block manipulations that should be made if the user is using an rtl language.
+     * The key is the original block region, and the value is the block region to change to.
+     * This is used when displaying blocks for regions only.
+     * @var array
+     */
+    public $blockrtlmanipulations = array();
+
+    /**
+     * @var renderer_factory Instance of the renderer_factory implementation
+     * we are using. Implementation detail.
+     */
+    protected $rf = null;
+
+    /**
+     * @var array List of parent config objects.
+     **/
+    protected $parent_configs = array();
+
+    /**
+     * Used to determine whether we can serve SVG images or not.
+     * @var bool
+     */
+    private $usesvg = null;
+
+    /**
+     * Whether in RTL mode or not.
+     * @var bool
+     */
+    protected $rtlmode = false;
+
+    /**
+     * The SCSS file to compile (without .scss), located in the scss/ folder of the theme.
+     * Or a Closure, which receives the theme_config as argument and must
+     * return the SCSS content.
+     * @var string|Closure
+     */
+    public $scss = false;
+
+    /**
+     * Local cache of the SCSS property.
+     * @var false|array
+     */
+    protected $scsscache = null;
+
+    /**
+     * The name of the function to call to get the SCSS code to inject.
+     * @var string
+     */
+    public $extrascsscallback = null;
+
+    /**
+     * The name of the function to call to get SCSS to prepend.
+     * @var string
+     */
+    public $prescsscallback = null;
+
+    /**
+     * Sets the render method that should be used for rendering custom block regions by scripts such as my/index.php
+     * Defaults to {@link core_renderer::blocks_for_region()}
+     * @var string
+     */
+    public $blockrendermethod = null;
+
+    /**
+     * Remember the results of icon remapping for the current page.
+     * @var array
+     */
+    public $remapiconcache = [];
+
+    /**
+     * The name of the function to call to get precompiled CSS.
+     * @var string
+     */
+    public $precompiledcsscallback = null;
+
+    /**
+     * Whether the theme uses course index.
+     * @var bool
+     */
+    public $usescourseindex = false;
+
+    /**
+     * Configuration for the page activity header
+     * @var array
+     */
+    public $activityheaderconfig = [];
+
+    /**
+     * For backward compatibility with old themes.
+     * BLOCK_ADDBLOCK_POSITION_DEFAULT, BLOCK_ADDBLOCK_POSITION_FLATNAV.
+     * @var int
+     */
+    public $addblockposition;
+
+    /**
+     * editor_scss file(s) provided by this theme.
+     * @var array
+     */
+    public $editor_scss;
+
+    /**
+     * Name of the class extending \core\output\icon_system.
+     * @var string
+     */
+    public $iconsystem;
+
+    /**
+     * Theme defines its own editing mode switch.
+     * @var bool
+     */
+    public $haseditswitch = false;
+
+    /**
+     * Allows a theme to customise primary navigation by specifying the list of items to remove.
+     * @var array
+     */
+    public $removedprimarynavitems = [];
+
+    /**
+     * Load the config.php file for a particular theme, and return an instance
+     * of this class. (That is, this is a factory method.)
+     *
+     * @param string $themename the name of the theme.
+     * @return theme_config an instance of this class.
+     */
+    public static function load($themename) {
+        global $CFG;
+
+        // load theme settings from db
+        try {
+            $settings = get_config('theme_'.$themename);
+        } catch (dml_exception $e) {
+            // most probably moodle tables not created yet
+            $settings = new stdClass();
+        }
+
+        if ($config = theme_config::find_theme_config($themename, $settings)) {
+            return new theme_config($config);
+
+        } else if ($themename == theme_config::DEFAULT_THEME) {
+            throw new coding_exception('Default theme '.theme_config::DEFAULT_THEME.' not available or broken!');
+
+        } else if ($config = theme_config::find_theme_config($CFG->theme, $settings)) {
+            debugging('This page should be using theme ' . $themename .
+                    ' which cannot be initialised. Falling back to the site theme ' . $CFG->theme, DEBUG_NORMAL);
+            return new theme_config($config);
+
+        } else {
+            // bad luck, the requested theme has some problems - admin see details in theme config
+            debugging('This page should be using theme ' . $themename .
+                    ' which cannot be initialised. Nor can the site theme ' . $CFG->theme .
+                    '. Falling back to ' . theme_config::DEFAULT_THEME, DEBUG_NORMAL);
+            return new theme_config(theme_config::find_theme_config(theme_config::DEFAULT_THEME, $settings));
+        }
+    }
+
+    /**
+     * Theme diagnostic code. It is very problematic to send debug output
+     * to the actual CSS file, instead this functions is supposed to
+     * diagnose given theme and highlights all potential problems.
+     * This information should be available from the theme selection page
+     * or some other debug page for theme designers.
+     *
+     * @param string $themename
+     * @return array description of problems
+     */
+    public static function diagnose($themename) {
+        //TODO: MDL-21108
+        return array();
+    }
+
+    /**
+     * Private constructor, can be called only from the factory method.
+     * @param stdClass $config
+     */
+    private function __construct($config) {
+        global $CFG; //needed for included lib.php files
+
+        $this->settings = $config->settings;
+        $this->name     = $config->name;
+        $this->dir      = $config->dir;
+
+        if ($this->name != self::DEFAULT_THEME) {
+            $baseconfig = self::find_theme_config(self::DEFAULT_THEME, $this->settings);
+        } else {
+            $baseconfig = $config;
+        }
+
+        // Ensure that each of the configurable properties defined below are also defined at the class level.
+        $configurable = [
+            'parents', 'sheets', 'parents_exclude_sheets', 'plugins_exclude_sheets', 'usefallback',
+            'javascripts', 'javascripts_footer', 'parents_exclude_javascripts',
+            'layouts', 'enablecourseajax', 'requiredblocks',
+            'rendererfactory', 'csspostprocess', 'editor_sheets', 'editor_scss', 'rarrow', 'larrow', 'uarrow', 'darrow',
+            'hidefromselector', 'doctype', 'yuicssmodules', 'blockrtlmanipulations', 'blockrendermethod',
+            'scss', 'extrascsscallback', 'prescsscallback', 'csstreepostprocessor', 'addblockposition',
+            'iconsystem', 'precompiledcsscallback', 'haseditswitch', 'usescourseindex', 'activityheaderconfig',
+            'removedprimarynavitems',
+        ];
+
+        foreach ($config as $key=>$value) {
+            if (in_array($key, $configurable)) {
+                $this->$key = $value;
+            }
+        }
+
+        // verify all parents and load configs and renderers
+        foreach ($this->parents as $parent) {
+            if (!$parent_config = theme_config::find_theme_config($parent, $this->settings)) {
+                // this is not good - better exclude faulty parents
+                continue;
+            }
+            $libfile = $parent_config->dir.'/lib.php';
+            if (is_readable($libfile)) {
+                // theme may store various function here
+                include_once($libfile);
+            }
+            $renderersfile = $parent_config->dir.'/renderers.php';
+            if (is_readable($renderersfile)) {
+                // may contain core and plugin renderers and renderer factory
+                include_once($renderersfile);
+            }
+            $this->parent_configs[$parent] = $parent_config;
+        }
+        $libfile = $this->dir.'/lib.php';
+        if (is_readable($libfile)) {
+            // theme may store various function here
+            include_once($libfile);
+        }
+        $rendererfile = $this->dir.'/renderers.php';
+        if (is_readable($rendererfile)) {
+            // may contain core and plugin renderers and renderer factory
+            include_once($rendererfile);
+        } else {
+            // check if renderers.php file is missnamed renderer.php
+            if (is_readable($this->dir.'/renderer.php')) {
+                debugging('Developer hint: '.$this->dir.'/renderer.php should be renamed to ' . $this->dir."/renderers.php.
+                    See: http://docs.moodle.org/dev/Output_renderers#Theme_renderers.", DEBUG_DEVELOPER);
+            }
+        }
+
+        // cascade all layouts properly
+        foreach ($baseconfig->layouts as $layout=>$value) {
+            if (!isset($this->layouts[$layout])) {
+                foreach ($this->parent_configs as $parent_config) {
+                    if (isset($parent_config->layouts[$layout])) {
+                        $this->layouts[$layout] = $parent_config->layouts[$layout];
+                        continue 2;
+                    }
+                }
+                $this->layouts[$layout] = $value;
+            }
+        }
+
+        //fix arrows if needed
+        $this->check_theme_arrows();
+    }
+
+    /**
+     * Let the theme initialise the page object (usually $PAGE).
+     *
+     * This may be used for example to request jQuery in add-ons.
+     *
+     * @param moodle_page $page
+     */
+    public function init_page(moodle_page $page) {
+        $themeinitfunction = 'theme_'.$this->name.'_page_init';
+        if (function_exists($themeinitfunction)) {
+            $themeinitfunction($page);
+        }
+    }
+
+    /**
+     * Checks if arrows $THEME->rarrow, $THEME->larrow, $THEME->uarrow, $THEME->darrow have been set (theme/-/config.php).
+     * If not it applies sensible defaults.
+     *
+     * Accessibility: right and left arrow Unicode characters for breadcrumb, calendar,
+     * search forum block, etc. Important: these are 'silent' in a screen-reader
+     * (unlike &gt; &raquo;), and must be accompanied by text.
+     */
+    private function check_theme_arrows() {
+        if (!isset($this->rarrow) and !isset($this->larrow)) {
+            // Default, looks good in Win XP/IE 6, Win/Firefox 1.5, Win/Netscape 8...
+            // Also OK in Win 9x/2K/IE 5.x
+            $this->rarrow = '&#x25BA;';
+            $this->larrow = '&#x25C4;';
+            $this->uarrow = '&#x25B2;';
+            $this->darrow = '&#x25BC;';
+            if (empty($_SERVER['HTTP_USER_AGENT'])) {
+                $uagent = '';
+            } else {
+                $uagent = $_SERVER['HTTP_USER_AGENT'];
+            }
+            if (false !== strpos($uagent, 'Opera')
+                || false !== strpos($uagent, 'Mac')) {
+                // Looks good in Win XP/Mac/Opera 8/9, Mac/Firefox 2, Camino, Safari.
+                // Not broken in Mac/IE 5, Mac/Netscape 7 (?).
+                $this->rarrow = '&#x25B6;&#xFE0E;';
+                $this->larrow = '&#x25C0;&#xFE0E;';
+            }
+            elseif ((false !== strpos($uagent, 'Konqueror'))
+                || (false !== strpos($uagent, 'Android')))  {
+                // The fonts on Android don't include the characters required for this to work as expected.
+                // So we use the same ones Konqueror uses.
+                $this->rarrow = '&rarr;';
+                $this->larrow = '&larr;';
+                $this->uarrow = '&uarr;';
+                $this->darrow = '&darr;';
+            }
+            elseif (isset($_SERVER['HTTP_ACCEPT_CHARSET'])
+                && false === stripos($_SERVER['HTTP_ACCEPT_CHARSET'], 'utf-8')) {
+                // (Win/IE 5 doesn't set ACCEPT_CHARSET, but handles Unicode.)
+                // To be safe, non-Unicode browsers!
+                $this->rarrow = '&gt;';
+                $this->larrow = '&lt;';
+                $this->uarrow = '^';
+                $this->darrow = 'v';
+            }
+
+            // RTL support - in RTL languages, swap r and l arrows
+            if (right_to_left()) {
+                $t = $this->rarrow;
+                $this->rarrow = $this->larrow;
+                $this->larrow = $t;
+            }
+        }
+    }
+
+    /**
+     * Returns output renderer prefixes, these are used when looking
+     * for the overridden renderers in themes.
+     *
+     * @return array
+     */
+    public function renderer_prefixes() {
+        global $CFG; // just in case the included files need it
+
+        $prefixes = array('theme_'.$this->name);
+
+        foreach ($this->parent_configs as $parent) {
+            $prefixes[] = 'theme_'.$parent->name;
+        }
+
+        return $prefixes;
+    }
+
+    /**
+     * Returns the stylesheet URL of this editor content
+     *
+     * @param bool $encoded false means use & and true use &amp; in URLs
+     * @return moodle_url
+     */
+    public function editor_css_url($encoded=true) {
+        global $CFG;
+        $rev = theme_get_revision();
+        $type = 'editor';
+        if (right_to_left()) {
+            $type .= '-rtl';
+        }
+
+        if ($rev > -1) {
+            $themesubrevision = theme_get_sub_revision_for_theme($this->name);
+
+            // Provide the sub revision to allow us to invalidate cached theme CSS
+            // on a per theme basis, rather than globally.
+            if ($themesubrevision && $themesubrevision > 0) {
+                $rev .= "_{$themesubrevision}";
+            }
+
+            $url = new moodle_url("/theme/styles.php");
+            if (!empty($CFG->slasharguments)) {
+                $url->set_slashargument("/{$this->name}/{$rev}/{$type}", 'noparam', true);
+            } else {
+                $url->params([
+                    'theme' => $this->name,
+                    'rev' => $rev,
+                    'type' => $type,
+                ]);
+            }
+        } else {
+            $url = new moodle_url('/theme/styles_debug.php', [
+                'theme' => $this->name,
+                'type' => $type,
+            ]);
+        }
+        return $url;
+    }
+
+    /**
+     * Returns the content of the CSS to be used in editor content
+     *
+     * @return array
+     */
+    public function editor_css_files() {
+        $files = array();
+
+        // First editor plugins.
+        $plugins = core_component::get_plugin_list('editor');
+        foreach ($plugins as $plugin => $fulldir) {
+            $sheetfile = "$fulldir/editor_styles.css";
+            if (is_readable($sheetfile)) {
+                $files['plugin_'.$plugin] = $sheetfile;
+            }
+
+            $subplugintypes = core_component::get_subplugins("editor_{$plugin}") ?? [];
+            // Fetch sheets for any editor subplugins.
+            foreach ($subplugintypes as $plugintype => $subplugins) {
+                foreach ($subplugins as $subplugin) {
+                    $plugindir = core_component::get_plugin_directory($plugintype, $subplugin);
+                    $sheetfile = "{$plugindir}/editor_styles.css";
+                    if (is_readable($sheetfile)) {
+                        $files["{$plugintype}_{$subplugin}"] = $sheetfile;
+                    }
+                }
+            }
+        }
+
+        // Then parent themes - base first, the immediate parent last.
+        foreach (array_reverse($this->parent_configs) as $parent_config) {
+            if (empty($parent_config->editor_sheets)) {
+                continue;
+            }
+            foreach ($parent_config->editor_sheets as $sheet) {
+                $sheetfile = "$parent_config->dir/style/$sheet.css";
+                if (is_readable($sheetfile)) {
+                    $files['parent_'.$parent_config->name.'_'.$sheet] = $sheetfile;
+                }
+            }
+        }
+        // Finally this theme.
+        if (!empty($this->editor_sheets)) {
+            foreach ($this->editor_sheets as $sheet) {
+                $sheetfile = "$this->dir/style/$sheet.css";
+                if (is_readable($sheetfile)) {
+                    $files['theme_'.$sheet] = $sheetfile;
+                }
+            }
+        }
+
+        return $files;
+    }
+
+    /**
+     * Compiles and returns the content of the SCSS to be used in editor content
+     *
+     * @return string Compiled CSS from the editor SCSS
+     */
+    public function editor_scss_to_css() {
+        $css = '';
+        $dir = $this->dir;
+        $filenames = [];
+
+        // Use editor_scss file(s) provided by this theme if set.
+        if (!empty($this->editor_scss)) {
+            $filenames = $this->editor_scss;
+        } else {
+            // If no editor_scss set, move up theme hierarchy until one is found (if at all).
+            // This is so child themes only need to set editor_scss if an override is required.
+            foreach (array_reverse($this->parent_configs) as $parentconfig) {
+                if (!empty($parentconfig->editor_scss)) {
+                    $dir = $parentconfig->dir;
+                    $filenames = $parentconfig->editor_scss;
+
+                    // Config found, stop looking.
+                    break;
+                }
+            }
+        }
+
+        if (!empty($filenames)) {
+            $compiler = new core_scss();
+
+            foreach ($filenames as $filename) {
+                $compiler->set_file("{$dir}/scss/{$filename}.scss");
+
+                try {
+                    $css .= $compiler->to_css();
+                } catch (\Exception $e) {
+                    debugging('Error while compiling editor SCSS: ' . $e->getMessage(), DEBUG_DEVELOPER);
+                }
+            }
+        }
+
+        return $css;
+    }
+
+    /**
+     * Get the stylesheet URL of this theme.
+     *
+     * @param moodle_page $page Not used... deprecated?
+     * @return moodle_url[]
+     */
+    public function css_urls(moodle_page $page) {
+        global $CFG;
+
+        $rev = theme_get_revision();
+
+        $urls = array();
+
+        $svg = $this->use_svg_icons();
+        $separate = (core_useragent::is_ie() && !core_useragent::check_ie_version('10'));
+
+        if ($rev > -1) {
+            $filename = right_to_left() ? 'all-rtl' : 'all';
+            $url = new moodle_url("/theme/styles.php");
+            $themesubrevision = theme_get_sub_revision_for_theme($this->name);
+
+            // Provide the sub revision to allow us to invalidate cached theme CSS
+            // on a per theme basis, rather than globally.
+            if ($themesubrevision && $themesubrevision > 0) {
+                $rev .= "_{$themesubrevision}";
+            }
+
+            if (!empty($CFG->slasharguments)) {
+                $slashargs = '';
+                if (!$svg) {
+                    // We add a simple /_s to the start of the path.
+                    // The underscore is used to ensure that it isn't a valid theme name.
+                    $slashargs .= '/_s'.$slashargs;
+                }
+                $slashargs .= '/'.$this->name.'/'.$rev.'/'.$filename;
+                if ($separate) {
+                    $slashargs .= '/chunk0';
+                }
+                $url->set_slashargument($slashargs, 'noparam', true);
+            } else {
+                $params = array('theme' => $this->name, 'rev' => $rev, 'type' => $filename);
+                if (!$svg) {
+                    // We add an SVG param so that we know not to serve SVG images.
+                    // We do this because all modern browsers support SVG and this param will one day be removed.
+                    $params['svg'] = '0';
+                }
+                if ($separate) {
+                    $params['chunk'] = '0';
+                }
+                $url->params($params);
+            }
+            $urls[] = $url;
+
+        } else {
+            $baseurl = new moodle_url('/theme/styles_debug.php');
+
+            $css = $this->get_css_files(true);
+            if (!$svg) {
+                // We add an SVG param so that we know not to serve SVG images.
+                // We do this because all modern browsers support SVG and this param will one day be removed.
+                $baseurl->param('svg', '0');
+            }
+            if (right_to_left()) {
+                $baseurl->param('rtl', 1);
+            }
+            if ($separate) {
+                // We might need to chunk long files.
+                $baseurl->param('chunk', '0');
+            }
+            if (core_useragent::is_ie()) {
+                // Lalala, IE does not allow more than 31 linked CSS files from main document.
+                $urls[] = new moodle_url($baseurl, array('theme'=>$this->name, 'type'=>'ie', 'subtype'=>'plugins'));
+                foreach ($css['parents'] as $parent=>$sheets) {
+                    // We need to serve parents individually otherwise we may easily exceed the style limit IE imposes (4096).
+                    $urls[] = new moodle_url($baseurl, array('theme'=>$this->name,'type'=>'ie', 'subtype'=>'parents', 'sheet'=>$parent));
+                }
+                if ($this->get_scss_property()) {
+                    // No need to define the type as IE here.
+                    $urls[] = new moodle_url($baseurl, array('theme' => $this->name, 'type' => 'scss'));
+                }
+                $urls[] = new moodle_url($baseurl, array('theme'=>$this->name, 'type'=>'ie', 'subtype'=>'theme'));
+
+            } else {
+                foreach ($css['plugins'] as $plugin=>$unused) {
+                    $urls[] = new moodle_url($baseurl, array('theme'=>$this->name,'type'=>'plugin', 'subtype'=>$plugin));
+                }
+                foreach ($css['parents'] as $parent=>$sheets) {
+                    foreach ($sheets as $sheet=>$unused2) {
+                        $urls[] = new moodle_url($baseurl, array('theme'=>$this->name,'type'=>'parent', 'subtype'=>$parent, 'sheet'=>$sheet));
+                    }
+                }
+                foreach ($css['theme'] as $sheet => $filename) {
+                    if ($sheet === self::SCSS_KEY) {
+                        // This is the theme SCSS file.
+                        $urls[] = new moodle_url($baseurl, array('theme' => $this->name, 'type' => 'scss'));
+                    } else {
+                        // Sheet first in order to make long urls easier to read.
+                        $urls[] = new moodle_url($baseurl, array('sheet'=>$sheet, 'theme'=>$this->name, 'type'=>'theme'));
+                    }
+                }
+            }
+        }
+
+        // Allow themes to change the css url to something like theme/mytheme/mycss.php.
+        component_callback('theme_' . $this->name, 'alter_css_urls', [&$urls]);
+        return $urls;
+    }
+
+    /**
+     * Get the whole css stylesheet for production mode.
+     *
+     * NOTE: this method is not expected to be used from any addons.
+     *
+     * @return string CSS markup compressed
+     */
+    public function get_css_content() {
+
+        $csscontent = '';
+        foreach ($this->get_css_files(false) as $type => $value) {
+            foreach ($value as $identifier => $val) {
+                if (is_array($val)) {
+                    foreach ($val as $v) {
+                        $csscontent .= file_get_contents($v) . "\n";
+                    }
+                } else {
+                    if ($type === 'theme' && $identifier === self::SCSS_KEY) {
+                        // We need the content from SCSS because this is the SCSS file from the theme.
+                        if ($compiled = $this->get_css_content_from_scss(false)) {
+                            $csscontent .= $compiled;
+                        } else {
+                            // The compiler failed so default back to any precompiled css that might
+                            // exist.
+                            $csscontent .= $this->get_precompiled_css_content();
+                        }
+                    } else {
+                        $csscontent .= file_get_contents($val) . "\n";
+                    }
+                }
+            }
+        }
+        $csscontent = $this->post_process($csscontent);
+        $csscontent = core_minify::css($csscontent);
+
+        return $csscontent;
+    }
+    /**
+     * Set post processed CSS content cache.
+     *
+     * @param string $csscontent The post processed CSS content.
+     * @return bool True if the content was successfully cached.
+     */
+    public function set_css_content_cache($csscontent) {
+
+        $cache = cache::make('core', 'postprocessedcss');
+        $key = $this->get_css_cache_key();
+
+        return $cache->set($key, $csscontent);
+    }
+
+    /**
+     * Return whether the post processed CSS content has been cached.
+     *
+     * @return bool Whether the post-processed CSS is available in the cache.
+     */
+    public function has_css_cached_content() {
+
+        $key = $this->get_css_cache_key();
+        $cache = cache::make('core', 'postprocessedcss');
+
+        return $cache->has($key);
+    }
+
+    /**
+     * Return cached post processed CSS content.
+     *
+     * @return bool|string The cached css content or false if not found.
+     */
+    public function get_css_cached_content() {
+
+        $key = $this->get_css_cache_key();
+        $cache = cache::make('core', 'postprocessedcss');
+
+        return $cache->get($key);
+    }
+
+    /**
+     * Generate the css content cache key.
+     *
+     * @return string The post processed css cache key.
+     */
+    public function get_css_cache_key() {
+        $nosvg = (!$this->use_svg_icons()) ? 'nosvg_' : '';
+        $rtlmode = ($this->rtlmode == true) ? 'rtl' : 'ltr';
+
+        return $nosvg . $this->name . '_' . $rtlmode;
+    }
+
+    /**
+     * Get the theme designer css markup,
+     * the parameters are coming from css_urls().
+     *
+     * NOTE: this method is not expected to be used from any addons.
+     *
+     * @param string $type
+     * @param string $subtype
+     * @param string $sheet
+     * @return string CSS markup
+     */
+    public function get_css_content_debug($type, $subtype, $sheet) {
+        if ($type === 'scss') {
+            // The SCSS file of the theme is requested.
+            $csscontent = $this->get_css_content_from_scss(true);
+            if ($csscontent !== false) {
+                return $this->post_process($csscontent);
+            }
+            return '';
+        }
+
+        $cssfiles = array();
+        $css = $this->get_css_files(true);
+
+        if ($type === 'ie') {
+            // IE is a sloppy browser with weird limits, sorry.
+            if ($subtype === 'plugins') {
+                $cssfiles = $css['plugins'];
+
+            } else if ($subtype === 'parents') {
+                if (empty($sheet)) {
+                    // Do not bother with the empty parent here.
+                } else {
+                    // Build up the CSS for that parent so we can serve it as one file.
+                    foreach ($css[$subtype][$sheet] as $parent => $css) {
+                        $cssfiles[] = $css;
+                    }
+                }
+            } else if ($subtype === 'theme') {
+                $cssfiles = $css['theme'];
+                foreach ($cssfiles as $key => $value) {
+                    if (in_array($key, [self::SCSS_KEY])) {
+                        // Remove the SCSS file from the theme CSS files.
+                        // The SCSS files use the type 'scss', not 'ie'.
+                        unset($cssfiles[$key]);
+                    }
+                }
+            }
+
+        } else if ($type === 'plugin') {
+            if (isset($css['plugins'][$subtype])) {
+                $cssfiles[] = $css['plugins'][$subtype];
+            }
+
+        } else if ($type === 'parent') {
+            if (isset($css['parents'][$subtype][$sheet])) {
+                $cssfiles[] = $css['parents'][$subtype][$sheet];
+            }
+
+        } else if ($type === 'theme') {
+            if (isset($css['theme'][$sheet])) {
+                $cssfiles[] = $css['theme'][$sheet];
+            }
+        }
+
+        $csscontent = '';
+        foreach ($cssfiles as $file) {
+            $contents = file_get_contents($file);
+            $contents = $this->post_process($contents);
+            $comment = "/** Path: $type $subtype $sheet.' **/\n";
+            $stats = '';
+            $csscontent .= $comment.$stats.$contents."\n\n";
+        }
+
+        return $csscontent;
+    }
+
+    /**
+     * Get the whole css stylesheet for editor iframe.
+     *
+     * NOTE: this method is not expected to be used from any addons.
+     *
+     * @return string CSS markup
+     */
+    public function get_css_content_editor() {
+        $css = '';
+        $cssfiles = $this->editor_css_files();
+
+        // If editor has static CSS, include it.
+        foreach ($cssfiles as $file) {
+            $css .= file_get_contents($file)."\n";
+        }
+
+        // If editor has SCSS, compile and include it.
+        if (($convertedscss = $this->editor_scss_to_css())) {
+            $css .= $convertedscss;
+        }
+
+        $output = $this->post_process($css);
+
+        return $output;
+    }
+
+    /**
+     * Returns an array of organised CSS files required for this output.
+     *
+     * @param bool $themedesigner
+     * @return array nested array of file paths
+     */
+    protected function get_css_files($themedesigner) {
+        global $CFG;
+
+        $cache = null;
+        $cachekey = 'cssfiles';
+        if ($themedesigner) {
+            require_once($CFG->dirroot.'/lib/csslib.php');
+            // We need some kind of caching here because otherwise the page navigation becomes
+            // way too slow in theme designer mode. Feel free to create full cache definition later...
+            $cache = cache::make_from_params(cache_store::MODE_APPLICATION, 'core', 'themedesigner', array('theme' => $this->name));
+            if ($files = $cache->get($cachekey)) {
+                if ($files['created'] > time() - THEME_DESIGNER_CACHE_LIFETIME) {
+                    unset($files['created']);
+                    return $files;
+                }
+            }
+        }
+
+        $cssfiles = array('plugins'=>array(), 'parents'=>array(), 'theme'=>array());
+
+        // Get all plugin sheets.
+        $excludes = $this->resolve_excludes('plugins_exclude_sheets');
+        if ($excludes !== true) {
+            foreach (core_component::get_plugin_types() as $type=>$unused) {
+                if ($type === 'theme' || (!empty($excludes[$type]) and $excludes[$type] === true)) {
+                    continue;
+                }
+                $plugins = core_component::get_plugin_list($type);
+                foreach ($plugins as $plugin=>$fulldir) {
+                    if (!empty($excludes[$type]) and is_array($excludes[$type])
+                            and in_array($plugin, $excludes[$type])) {
+                        continue;
+                    }
+
+                    // Get the CSS from the plugin.
+                    $sheetfile = "$fulldir/styles.css";
+                    if (is_readable($sheetfile)) {
+                        $cssfiles['plugins'][$type.'_'.$plugin] = $sheetfile;
+                    }
+
+                    // Create a list of candidate sheets from parents (direct parent last) and current theme.
+                    $candidates = array();
+                    foreach (array_reverse($this->parent_configs) as $parent_config) {
+                        $candidates[] = $parent_config->name;
+                    }
+                    $candidates[] = $this->name;
+
+                    // Add the sheets found.
+                    foreach ($candidates as $candidate) {
+                        $sheetthemefile = "$fulldir/styles_{$candidate}.css";
+                        if (is_readable($sheetthemefile)) {
+                            $cssfiles['plugins'][$type.'_'.$plugin.'_'.$candidate] = $sheetthemefile;
+                        }
+                    }
+                }
+            }
+        }
+
+        // Find out wanted parent sheets.
+        $excludes = $this->resolve_excludes('parents_exclude_sheets');
+        if ($excludes !== true) {
+            foreach (array_reverse($this->parent_configs) as $parent_config) { // Base first, the immediate parent last.
+                $parent = $parent_config->name;
+                if (empty($parent_config->sheets) || (!empty($excludes[$parent]) and $excludes[$parent] === true)) {
+                    continue;
+                }
+                foreach ($parent_config->sheets as $sheet) {
+                    if (!empty($excludes[$parent]) && is_array($excludes[$parent])
+                            && in_array($sheet, $excludes[$parent])) {
+                        continue;
+                    }
+
+                    // We never refer to the parent LESS files.
+                    $sheetfile = "$parent_config->dir/style/$sheet.css";
+                    if (is_readable($sheetfile)) {
+                        $cssfiles['parents'][$parent][$sheet] = $sheetfile;
+                    }
+                }
+            }
+        }
+
+
+        // Current theme sheets.
+        // We first add the SCSS file because we want the CSS ones to
+        // be included after the SCSS code.
+        if ($this->get_scss_property()) {
+            $cssfiles['theme'][self::SCSS_KEY] = true;
+        }
+        if (is_array($this->sheets)) {
+            foreach ($this->sheets as $sheet) {
+                $sheetfile = "$this->dir/style/$sheet.css";
+                if (is_readable($sheetfile) && !isset($cssfiles['theme'][$sheet])) {
+                    $cssfiles['theme'][$sheet] = $sheetfile;
+                }
+            }
+        }
+
+        if ($cache) {
+            $files = $cssfiles;
+            $files['created'] = time();
+            $cache->set($cachekey, $files);
+        }
+        return $cssfiles;
+    }
+
+    /**
+     * Return the CSS content generated from the SCSS file.
+     *
+     * @param bool $themedesigner True if theme designer is enabled.
+     * @return bool|string Return false when the compilation failed. Else the compiled string.
+     */
+    protected function get_css_content_from_scss($themedesigner) {
+        global $CFG;
+
+        list($paths, $scss) = $this->get_scss_property();
+        if (!$scss) {
+            throw new coding_exception('The theme did not define a SCSS file, or it is not readable.');
+        }
+
+        // We might need more memory/time to do this, so let's play safe.
+        raise_memory_limit(MEMORY_EXTRA);
+        core_php_time_limit::raise(300);
+
+        // TODO: MDL-62757 When changing anything in this method please do not forget to check
+        // if the validate() method in class admin_setting_configthemepreset needs updating too.
+
+        $cachedir = make_localcache_directory('scsscache-' . $this->name, false);
+        $cacheoptions = [];
+        if ($themedesigner) {
+            $cacheoptions = array(
+                  'cacheDir' => $cachedir,
+                  'prefix' => 'scssphp_',
+                  'forceRefresh' => false,
+            );
+        } else {
+            if (file_exists($cachedir)) {
+                remove_dir($cachedir);
+            }
+        }
+
+        // Set-up the compiler.
+        $compiler = new core_scss($cacheoptions);
+
+        if ($this->supports_source_maps($themedesigner)) {
+            // Enable source maps.
+            $compiler->setSourceMapOptions([
+                'sourceMapBasepath' => str_replace('\\', '/', $CFG->dirroot),
+                'sourceMapRootpath' => $CFG->wwwroot . '/'
+            ]);
+            $compiler->setSourceMap($compiler::SOURCE_MAP_INLINE);
+        }
+
+        $compiler->prepend_raw_scss($this->get_pre_scss_code());
+        if (is_string($scss)) {
+            $compiler->set_file($scss);
+        } else {
+            $compiler->append_raw_scss($scss($this));
+            $compiler->setImportPaths($paths);
+        }
+        $compiler->append_raw_scss($this->get_extra_scss_code());
+
+        try {
+            // Compile!
+            $compiled = $compiler->to_css();
+
+        } catch (\Exception $e) {
+            $compiled = false;
+            debugging('Error while compiling SCSS: ' . $e->getMessage(), DEBUG_DEVELOPER);
+        }
+
+        // Try to save memory.
+        $compiler = null;
+        unset($compiler);
+
+        return $compiled;
+    }
+
+    /**
+     * Return the precompiled CSS if the precompiledcsscallback exists.
+     *
+     * @return string Return compiled css.
+     */
+    public function get_precompiled_css_content() {
+        $configs = array_reverse($this->parent_configs) + [$this];
+        $css = '';
+
+        foreach ($configs as $config) {
+            if (isset($config->precompiledcsscallback)) {
+                $function = $config->precompiledcsscallback;
+                if (function_exists($function)) {
+                    $css .= $function($this);
+                }
+            }
+        }
+        return $css;
+    }
+
+    /**
+     * Get the icon system to use.
+     *
+     * @return string
+     */
+    public function get_icon_system() {
+
+        // Getting all the candidate functions.
+        $system = false;
+        if (isset($this->iconsystem) && \core\output\icon_system::is_valid_system($this->iconsystem)) {
+            return $this->iconsystem;
+        }
+        foreach ($this->parent_configs as $parent_config) {
+            if (isset($parent_config->iconsystem) && \core\output\icon_system::is_valid_system($parent_config->iconsystem)) {
+                return $parent_config->iconsystem;
+            }
+        }
+        return \core\output\icon_system::STANDARD;
+    }
+
+    /**
+     * Return extra SCSS code to add when compiling.
+     *
+     * This is intended to be used by themes to inject some SCSS code
+     * before it gets compiled. If you want to inject variables you
+     * should use {@link self::get_scss_variables()}.
+     *
+     * @return string The SCSS code to inject.
+     */
+    public function get_extra_scss_code() {
+        $content = '';
+
+        // Getting all the candidate functions.
+        $candidates = array();
+        foreach (array_reverse($this->parent_configs) as $parent_config) {
+            if (!isset($parent_config->extrascsscallback)) {
+                continue;
+            }
+            $candidates[] = $parent_config->extrascsscallback;
+        }
+
+        if (isset($this->extrascsscallback)) {
+            $candidates[] = $this->extrascsscallback;
+        }
+
+        // Calling the functions.
+        foreach ($candidates as $function) {
+            if (function_exists($function)) {
+                $content .= "\n/** Extra SCSS from $function **/\n" . $function($this) . "\n";
+            }
+        }
+
+        return $content;
+    }
+
+    /**
+     * SCSS code to prepend when compiling.
+     *
+     * This is intended to be used by themes to inject SCSS code before it gets compiled.
+     *
+     * @return string The SCSS code to inject.
+     */
+    public function get_pre_scss_code() {
+        $content = '';
+
+        // Getting all the candidate functions.
+        $candidates = array();
+        foreach (array_reverse($this->parent_configs) as $parent_config) {
+            if (!isset($parent_config->prescsscallback)) {
+                continue;
+            }
+            $candidates[] = $parent_config->prescsscallback;
+        }
+
+        if (isset($this->prescsscallback)) {
+            $candidates[] = $this->prescsscallback;
+        }
+
+        // Calling the functions.
+        foreach ($candidates as $function) {
+            if (function_exists($function)) {
+                $content .= "\n/** Pre-SCSS from $function **/\n" . $function($this) . "\n";
+            }
+        }
+
+        return $content;
+    }
+
+    /**
+     * Get the SCSS property.
+     *
+     * This resolves whether a SCSS file (or content) has to be used when generating
+     * the stylesheet for the theme. It will look at parents themes and check the
+     * SCSS properties there.
+     *
+     * @return array|false False when SCSS is not used.
+     *         An array with the import paths, and the path to the SCSS file or Closure as second.
+     */
+    public function get_scss_property() {
+        if ($this->scsscache === null) {
+            $configs = [$this] + $this->parent_configs;
+            $scss = null;
+
+            foreach ($configs as $config) {
+                $path = "{$config->dir}/scss";
+
+                // We collect the SCSS property until we've found one.
+                if (empty($scss) && !empty($config->scss)) {
+                    $candidate = is_string($config->scss) ? "{$path}/{$config->scss}.scss" : $config->scss;
+                    if ($candidate instanceof Closure) {
+                        $scss = $candidate;
+                    } else if (is_string($candidate) && is_readable($candidate)) {
+                        $scss = $candidate;
+                    }
+                }
+
+                // We collect the import paths once we've found a SCSS property.
+                if ($scss && is_dir($path)) {
+                    $paths[] = $path;
+                }
+
+            }
+
+            $this->scsscache = $scss !== null ? [$paths, $scss] : false;
+        }
+
+        return $this->scsscache;
+    }
+
+    /**
+     * Generate a URL to the file that serves theme JavaScript files.
+     *
+     * If we determine that the theme has no relevant files, then we return
+     * early with a null value.
+     *
+     * @param bool $inhead true means head url, false means footer
+     * @return moodle_url|null
+     */
+    public function javascript_url($inhead) {
+        global $CFG;
+
+        $rev = theme_get_revision();
+        $params = array('theme'=>$this->name,'rev'=>$rev);
+        $params['type'] = $inhead ? 'head' : 'footer';
+
+        // Return early if there are no files to serve
+        if (count($this->javascript_files($params['type'])) === 0) {
+            return null;
+        }
+
+        if (!empty($CFG->slasharguments) and $rev > 0) {
+            $url = new moodle_url("/theme/javascript.php");
+            $url->set_slashargument('/'.$this->name.'/'.$rev.'/'.$params['type'], 'noparam', true);
+            return $url;
+        } else {
+            return new moodle_url('/theme/javascript.php', $params);
+        }
+    }
+
+    /**
+     * Get the URL's for the JavaScript files used by this theme.
+     * They won't be served directly, instead they'll be mediated through
+     * theme/javascript.php.
+     *
+     * @param string $type Either javascripts_footer, or javascripts
+     * @return array
+     */
+    public function javascript_files($type) {
+        if ($type === 'footer') {
+            $type = 'javascripts_footer';
+        } else {
+            $type = 'javascripts';
+        }
+
+        $js = array();
+        // find out wanted parent javascripts
+        $excludes = $this->resolve_excludes('parents_exclude_javascripts');
+        if ($excludes !== true) {
+            foreach (array_reverse($this->parent_configs) as $parent_config) { // base first, the immediate parent last
+                $parent = $parent_config->name;
+                if (empty($parent_config->$type)) {
+                    continue;
+                }
+                if (!empty($excludes[$parent]) and $excludes[$parent] === true) {
+                    continue;
+                }
+                foreach ($parent_config->$type as $javascript) {
+                    if (!empty($excludes[$parent]) and is_array($excludes[$parent])
+                        and in_array($javascript, $excludes[$parent])) {
+                        continue;
+                    }
+                    $javascriptfile = "$parent_config->dir/javascript/$javascript.js";
+                    if (is_readable($javascriptfile)) {
+                        $js[] = $javascriptfile;
+                    }
+                }
+            }
+        }
+
+        // current theme javascripts
+        if (is_array($this->$type)) {
+            foreach ($this->$type as $javascript) {
+                $javascriptfile = "$this->dir/javascript/$javascript.js";
+                if (is_readable($javascriptfile)) {
+                    $js[] = $javascriptfile;
+                }
+            }
+        }
+        return $js;
+    }
+
+    /**
+     * Resolves an exclude setting to the themes setting is applicable or the
+     * setting of its closest parent.
+     *
+     * @param string $variable The name of the setting the exclude setting to resolve
+     * @param string $default
+     * @return mixed
+     */
+    protected function resolve_excludes($variable, $default = null) {
+        $setting = $default;
+        if (is_array($this->{$variable}) or $this->{$variable} === true) {
+            $setting = $this->{$variable};
+        } else {
+            foreach ($this->parent_configs as $parent_config) { // the immediate parent first, base last
+                if (!isset($parent_config->{$variable})) {
+                    continue;
+                }
+                if (is_array($parent_config->{$variable}) or $parent_config->{$variable} === true) {
+                    $setting = $parent_config->{$variable};
+                    break;
+                }
+            }
+        }
+        return $setting;
+    }
+
+    /**
+     * Returns the content of the one huge javascript file merged from all theme javascript files.
+     *
+     * @param bool $type
+     * @return string
+     */
+    public function javascript_content($type) {
+        $jsfiles = $this->javascript_files($type);
+        $js = '';
+        foreach ($jsfiles as $jsfile) {
+            $js .= file_get_contents($jsfile)."\n";
+        }
+        return $js;
+    }
+
+    /**
+     * Post processes CSS.
+     *
+     * This method post processes all of the CSS before it is served for this theme.
+     * This is done so that things such as image URL's can be swapped in and to
+     * run any specific CSS post process method the theme has requested.
+     * This allows themes to use CSS settings.
+     *
+     * @param string $css The CSS to process.
+     * @return string The processed CSS.
+     */
+    public function post_process($css) {
+        // now resolve all image locations
+        if (preg_match_all('/\[\[pix:([a-z0-9_]+\|)?([^\]]+)\]\]/', $css, $matches, PREG_SET_ORDER)) {
+            $replaced = array();
+            foreach ($matches as $match) {
+                if (isset($replaced[$match[0]])) {
+                    continue;
+                }
+                $replaced[$match[0]] = true;
+                $imagename = $match[2];
+                $component = rtrim($match[1], '|');
+                $imageurl = $this->image_url($imagename, $component)->out(false);
+                 // we do not need full url because the image.php is always in the same dir
+                $imageurl = preg_replace('|^http.?://[^/]+|', '', $imageurl);
+                $css = str_replace($match[0], $imageurl, $css);
+            }
+        }
+
+        // Now resolve all font locations.
+        if (preg_match_all('/\[\[font:([a-z0-9_]+\|)?([^\]]+)\]\]/', $css, $matches, PREG_SET_ORDER)) {
+            $replaced = array();
+            foreach ($matches as $match) {
+                if (isset($replaced[$match[0]])) {
+                    continue;
+                }
+                $replaced[$match[0]] = true;
+                $fontname = $match[2];
+                $component = rtrim($match[1], '|');
+                $fonturl = $this->font_url($fontname, $component)->out(false);
+                // We do not need full url because the font.php is always in the same dir.
+                $fonturl = preg_replace('|^http.?://[^/]+|', '', $fonturl);
+                $css = str_replace($match[0], $fonturl, $css);
+            }
+        }
+
+        // Now resolve all theme settings or do any other postprocessing.
+        // This needs to be done before calling core parser, since the parser strips [[settings]] tags.
+        $csspostprocess = $this->csspostprocess;
+        if ($csspostprocess && function_exists($csspostprocess)) {
+            $css = $csspostprocess($css, $this);
+        }
+
+        // Post processing using an object representation of CSS.
+        $treeprocessor = $this->get_css_tree_post_processor();
+        $needsparsing = !empty($treeprocessor) || !empty($this->rtlmode);
+        if ($needsparsing) {
+
+            // We might need more memory/time to do this, so let's play safe.
+            raise_memory_limit(MEMORY_EXTRA);
+            core_php_time_limit::raise(300);
+
+            $parser = new core_cssparser($css);
+            $csstree = $parser->parse();
+            unset($parser);
+
+            if ($this->rtlmode) {
+                $this->rtlize($csstree);
+            }
+
+            if ($treeprocessor) {
+                $treeprocessor($csstree, $this);
+            }
+
+            $css = $csstree->render();
+            unset($csstree);
+        }
+
+        return $css;
+    }
+
+    /**
+     * Flip a stylesheet to RTL.
+     *
+     * @param mixed $csstree The parsed CSS tree structure to flip.
+     * @return void
+     */
+    protected function rtlize($csstree) {
+        $rtlcss = new core_rtlcss($csstree);
+        $rtlcss->flip();
+    }
+
+    /**
+     * Return the direct URL for an image from the pix folder.
+     *
+     * Use this function sparingly and never for icons. For icons use pix_icon or the pix helper in a mustache template.
+     *
+     * @deprecated since Moodle 3.3
+     * @param string $imagename the name of the icon.
+     * @param string $component specification of one plugin like in get_string()
+     * @return moodle_url
+     */
+    public function pix_url($imagename, $component) {
+        debugging('pix_url is deprecated. Use image_url for images and pix_icon for icons.', DEBUG_DEVELOPER);
+        return $this->image_url($imagename, $component);
+    }
+
+    /**
+     * Return the direct URL for an image from the pix folder.
+     *
+     * Use this function sparingly and never for icons. For icons use pix_icon or the pix helper in a mustache template.
+     *
+     * @param string $imagename the name of the icon.
+     * @param string $component specification of one plugin like in get_string()
+     * @return moodle_url
+     */
+    public function image_url($imagename, $component) {
+        global $CFG;
+
+        $params = array('theme'=>$this->name);
+        $svg = $this->use_svg_icons();
+
+        if (empty($component) or $component === 'moodle' or $component === 'core') {
+            $params['component'] = 'core';
+        } else {
+            $params['component'] = $component;
+        }
+
+        $rev = theme_get_revision();
+        if ($rev != -1) {
+            $params['rev'] = $rev;
+        }
+
+        $params['image'] = $imagename;
+
+        $url = new moodle_url("/theme/image.php");
+        if (!empty($CFG->slasharguments) and $rev > 0) {
+            $path = '/'.$params['theme'].'/'.$params['component'].'/'.$params['rev'].'/'.$params['image'];
+            if (!$svg) {
+                // We add a simple /_s to the start of the path.
+                // The underscore is used to ensure that it isn't a valid theme name.
+                $path = '/_s'.$path;
+            }
+            $url->set_slashargument($path, 'noparam', true);
+        } else {
+            if (!$svg) {
+                // We add an SVG param so that we know not to serve SVG images.
+                // We do this because all modern browsers support SVG and this param will one day be removed.
+                $params['svg'] = '0';
+            }
+            $url->params($params);
+        }
+
+        return $url;
+    }
+
+    /**
+     * Return the URL for a font
+     *
+     * @param string $font the name of the font (including extension).
+     * @param string $component specification of one plugin like in get_string()
+     * @return moodle_url
+     */
+    public function font_url($font, $component) {
+        global $CFG;
+
+        $params = array('theme'=>$this->name);
+
+        if (empty($component) or $component === 'moodle' or $component === 'core') {
+            $params['component'] = 'core';
+        } else {
+            $params['component'] = $component;
+        }
+
+        $rev = theme_get_revision();
+        if ($rev != -1) {
+            $params['rev'] = $rev;
+        }
+
+        $params['font'] = $font;
+
+        $url = new moodle_url("/theme/font.php");
+        if (!empty($CFG->slasharguments) and $rev > 0) {
+            $path = '/'.$params['theme'].'/'.$params['component'].'/'.$params['rev'].'/'.$params['font'];
+            $url->set_slashargument($path, 'noparam', true);
+        } else {
+            $url->params($params);
+        }
+
+        return $url;
+    }
+
+    /**
+     * Returns URL to the stored file via pluginfile.php.
+     *
+     * Note the theme must also implement pluginfile.php handler,
+     * theme revision is used instead of the itemid.
+     *
+     * @param string $setting
+     * @param string $filearea
+     * @return string protocol relative URL or null if not present
+     */
+    public function setting_file_url($setting, $filearea) {
+        global $CFG;
+
+        if (empty($this->settings->$setting)) {
+            return null;
+        }
+
+        $component = 'theme_'.$this->name;
+        $itemid = theme_get_revision();
+        $filepath = $this->settings->$setting;
+        $syscontext = context_system::instance();
+
+        $url = moodle_url::make_file_url("$CFG->wwwroot/pluginfile.php", "/$syscontext->id/$component/$filearea/$itemid".$filepath);
+
+        // Now this is tricky because the we can not hardcode http or https here, lets use the relative link.
+        // Note: unfortunately moodle_url does not support //urls yet.
+
+        $url = preg_replace('|^https?://|i', '//', $url->out(false));
+
+        return $url;
+    }
+
+    /**
+     * Serve the theme setting file.
+     *
+     * @param string $filearea
+     * @param array $args
+     * @param bool $forcedownload
+     * @param array $options
+     * @return bool may terminate if file not found or donotdie not specified
+     */
+    public function setting_file_serve($filearea, $args, $forcedownload, $options) {
+        global $CFG;
+        require_once("$CFG->libdir/filelib.php");
+
+        $syscontext = context_system::instance();
+        $component = 'theme_'.$this->name;
+
+        $revision = array_shift($args);
+        if ($revision < 0) {
+            $lifetime = 0;
+        } else {
+            $lifetime = 60*60*24*60;
+            // By default, theme files must be cache-able by both browsers and proxies.
+            if (!array_key_exists('cacheability', $options)) {
+                $options['cacheability'] = 'public';
+            }
+        }
+
+        $fs = get_file_storage();
+        $relativepath = implode('/', $args);
+
+        $fullpath = "/{$syscontext->id}/{$component}/{$filearea}/0/{$relativepath}";
+        $fullpath = rtrim($fullpath, '/');
+        if ($file = $fs->get_file_by_hash(sha1($fullpath))) {
+            send_stored_file($file, $lifetime, 0, $forcedownload, $options);
+            return true;
+        } else {
+            send_file_not_found();
+        }
+    }
+
+    /**
+     * Resolves the real image location.
+     *
+     * $svg was introduced as an arg in 2.4. It is important because not all supported browsers support the use of SVG
+     * and we need a way in which to turn it off.
+     * By default SVG won't be used unless asked for. This is done for two reasons:
+     *   1. It ensures that we don't serve svg images unless we really want to. The admin has selected to force them, of the users
+     *      browser supports SVG.
+     *   2. We only serve SVG images from locations we trust. This must NOT include any areas where the image may have been uploaded
+     *      by the user due to security concerns.
+     *
+     * @param string $image name of image, may contain relative path
+     * @param string $component
+     * @param bool|null $svg Should SVG images also be looked for? If null, falls back to auto-detection of browser support
+     * @return string full file path
+     */
+    public function resolve_image_location($image, $component, $svg = false) {
+        global $CFG;
+
+        if (!is_bool($svg)) {
+            // If $svg isn't a bool then we need to decide for ourselves.
+            $svg = $this->use_svg_icons();
+        }
+
+        if ($component === 'moodle' or $component === 'core' or empty($component)) {
+            if ($imagefile = $this->image_exists("$this->dir/pix_core/$image", $svg)) {
+                return $imagefile;
+            }
+            foreach (array_reverse($this->parent_configs) as $parent_config) { // base first, the immediate parent last
+                if ($imagefile = $this->image_exists("$parent_config->dir/pix_core/$image", $svg)) {
+                    return $imagefile;
+                }
+            }
+            if ($imagefile = $this->image_exists("$CFG->dataroot/pix/$image", $svg)) {
+                return $imagefile;
+            }
+            if ($imagefile = $this->image_exists("$CFG->dirroot/pix/$image", $svg)) {
+                return $imagefile;
+            }
+            return null;
+
+        } else if ($component === 'theme') { //exception
+            if ($image === 'favicon') {
+                return "$this->dir/pix/favicon.ico";
+            }
+            if ($imagefile = $this->image_exists("$this->dir/pix/$image", $svg)) {
+                return $imagefile;
+            }
+            foreach (array_reverse($this->parent_configs) as $parent_config) { // base first, the immediate parent last
+                if ($imagefile = $this->image_exists("$parent_config->dir/pix/$image", $svg)) {
+                    return $imagefile;
+                }
+            }
+            return null;
+
+        } else {
+            if (strpos($component, '_') === false) {
+                $component = "mod_{$component}";
+            }
+            list($type, $plugin) = explode('_', $component, 2);
+
+            // In Moodle 4.0 we introduced a new image format.
+            // Support that image format here.
+            $candidates = [$image];
+
+            if ($type === 'mod') {
+                if ($image === 'icon' || $image === 'monologo') {
+                    $candidates = ['monologo', 'icon'];
+                    if ($image === 'icon') {
+                        debugging(
+                            "The 'icon' image for activity modules has been replaced with a new 'monologo'. " .
+                                "Please update your calling code to fetch the new icon where possible. " .
+                                "Called for component {$component}.",
+                            DEBUG_DEVELOPER
+                        );
+                    }
+                }
+            }
+            foreach ($candidates as $image) {
+                if ($imagefile = $this->image_exists("$this->dir/pix_plugins/$type/$plugin/$image", $svg)) {
+                    return $imagefile;
+                }
+
+                // Base first, the immediate parent last.
+                foreach (array_reverse($this->parent_configs) as $parentconfig) {
+                    if ($imagefile = $this->image_exists("$parentconfig->dir/pix_plugins/$type/$plugin/$image", $svg)) {
+                        return $imagefile;
+                    }
+                }
+                if ($imagefile = $this->image_exists("$CFG->dataroot/pix_plugins/$type/$plugin/$image", $svg)) {
+                    return $imagefile;
+                }
+                $dir = core_component::get_plugin_directory($type, $plugin);
+                if ($imagefile = $this->image_exists("$dir/pix/$image", $svg)) {
+                    return $imagefile;
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
+     * Resolves the real font location.
+     *
+     * @param string $font name of font file
+     * @param string $component
+     * @return string full file path
+     */
+    public function resolve_font_location($font, $component) {
+        global $CFG;
+
+        if ($component === 'moodle' or $component === 'core' or empty($component)) {
+            if (file_exists("$this->dir/fonts_core/$font")) {
+                return "$this->dir/fonts_core/$font";
+            }
+            foreach (array_reverse($this->parent_configs) as $parent_config) { // Base first, the immediate parent last.
+                if (file_exists("$parent_config->dir/fonts_core/$font")) {
+                    return "$parent_config->dir/fonts_core/$font";
+                }
+            }
+            if (file_exists("$CFG->dataroot/fonts/$font")) {
+                return "$CFG->dataroot/fonts/$font";
+            }
+            if (file_exists("$CFG->dirroot/lib/fonts/$font")) {
+                return "$CFG->dirroot/lib/fonts/$font";
+            }
+            return null;
+
+        } else if ($component === 'theme') { // Exception.
+            if (file_exists("$this->dir/fonts/$font")) {
+                return "$this->dir/fonts/$font";
+            }
+            foreach (array_reverse($this->parent_configs) as $parent_config) { // Base first, the immediate parent last.
+                if (file_exists("$parent_config->dir/fonts/$font")) {
+                    return "$parent_config->dir/fonts/$font";
+                }
+            }
+            return null;
+
+        } else {
+            if (strpos($component, '_') === false) {
+                $component = 'mod_'.$component;
+            }
+            list($type, $plugin) = explode('_', $component, 2);
+
+            if (file_exists("$this->dir/fonts_plugins/$type/$plugin/$font")) {
+                return "$this->dir/fonts_plugins/$type/$plugin/$font";
+            }
+            foreach (array_reverse($this->parent_configs) as $parent_config) { // Base first, the immediate parent last.
+                if (file_exists("$parent_config->dir/fonts_plugins/$type/$plugin/$font")) {
+                    return "$parent_config->dir/fonts_plugins/$type/$plugin/$font";
+                }
+            }
+            if (file_exists("$CFG->dataroot/fonts_plugins/$type/$plugin/$font")) {
+                return "$CFG->dataroot/fonts_plugins/$type/$plugin/$font";
+            }
+            $dir = core_component::get_plugin_directory($type, $plugin);
+            if (file_exists("$dir/fonts/$font")) {
+                return "$dir/fonts/$font";
+            }
+            return null;
+        }
+    }
+
+    /**
+     * Return true if we should look for SVG images as well.
+     *
+     * @return bool
+     */
+    public function use_svg_icons() {
+        if ($this->usesvg === null) {
+            $this->usesvg = core_useragent::supports_svg();
+        }
+
+        return $this->usesvg;
+    }
+
+    /**
+     * Forces the usesvg setting to either true or false, avoiding any decision making.
+     *
+     * This function should only ever be used when absolutely required, and before any generation of image URL's has occurred.
+     * DO NOT ABUSE THIS FUNCTION... not that you'd want to right ;)
+     *
+     * @param bool $setting True to force the use of svg when available, null otherwise.
+     */
+    public function force_svg_use($setting) {
+        $this->usesvg = (bool)$setting;
+    }
+
+    /**
+     * Set to be in RTL mode.
+     *
+     * This will likely be used when post processing the CSS before serving it.
+     *
+     * @param bool $inrtl True when in RTL mode.
+     */
+    public function set_rtl_mode($inrtl = true) {
+        $this->rtlmode = $inrtl;
+    }
+
+    /**
+     * Checks if source maps are supported
+     *
+     * @param bool $themedesigner True if theme designer is enabled.
+     * @return boolean True if source maps are supported.
+     */
+    public function supports_source_maps($themedesigner): bool {
+        if (empty($this->rtlmode) && $themedesigner) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Whether the theme is being served in RTL mode.
+     *
+     * @return bool True when in RTL mode.
+     */
+    public function get_rtl_mode() {
+        return $this->rtlmode;
+    }
+
+    /**
+     * Checks if file with any image extension exists.
+     *
+     * The order to these images was adjusted prior to the release of 2.4
+     * At that point the were the following image counts in Moodle core:
+     *
+     *     - png = 667 in pix dirs (1499 total)
+     *     - gif = 385 in pix dirs (606 total)
+     *     - jpg = 62  in pix dirs (74 total)
+     *     - jpeg = 0  in pix dirs (1 total)
+     *
+     * There is work in progress to move towards SVG presently hence that has been prioritiesed.
+     *
+     * @param string $filepath
+     * @param bool $svg If set to true SVG images will also be looked for.
+     * @return string image name with extension
+     */
+    private static function image_exists($filepath, $svg = false) {
+        if ($svg && file_exists("$filepath.svg")) {
+            return "$filepath.svg";
+        } else  if (file_exists("$filepath.png")) {
+            return "$filepath.png";
+        } else if (file_exists("$filepath.gif")) {
+            return "$filepath.gif";
+        } else  if (file_exists("$filepath.jpg")) {
+            return "$filepath.jpg";
+        } else  if (file_exists("$filepath.jpeg")) {
+            return "$filepath.jpeg";
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Loads the theme config from config.php file.
+     *
+     * @param string $themename
+     * @param stdClass $settings from config_plugins table
+     * @param boolean $parentscheck true to also check the parents.    .
+     * @return ?stdClass The theme configuration
+     */
+    private static function find_theme_config($themename, $settings, $parentscheck = true) {
+        // We have to use the variable name $THEME (upper case) because that
+        // is what is used in theme config.php files.
+
+        if (!$dir = theme_config::find_theme_location($themename)) {
+            return null;
+        }
+
+        $THEME = new stdClass();
+        $THEME->name     = $themename;
+        $THEME->dir      = $dir;
+        $THEME->settings = $settings;
+
+        global $CFG; // just in case somebody tries to use $CFG in theme config
+        include("$THEME->dir/config.php");
+
+        // verify the theme configuration is OK
+        if (!is_array($THEME->parents)) {
+            // parents option is mandatory now
+            return null;
+        } else {
+            // We use $parentscheck to only check the direct parents (avoid infinite loop).
+            if ($parentscheck) {
+                // Find all parent theme configs.
+                foreach ($THEME->parents as $parent) {
+                    $parentconfig = theme_config::find_theme_config($parent, $settings, false);
+                    if (empty($parentconfig)) {
+                        return null;
+                    }
+                }
+            }
+        }
+
+        return $THEME;
+    }
+
+    /**
+     * Finds the theme location and verifies the theme has all needed files
+     * and is not obsoleted.
+     *
+     * @param string $themename
+     * @return string full dir path or null if not found
+     */
+    private static function find_theme_location($themename) {
+        global $CFG;
+
+        if (file_exists("$CFG->dirroot/theme/$themename/config.php")) {
+            $dir = "$CFG->dirroot/theme/$themename";
+
+        } else if (!empty($CFG->themedir) and file_exists("$CFG->themedir/$themename/config.php")) {
+            $dir = "$CFG->themedir/$themename";
+
+        } else {
+            return null;
+        }
+
+        if (file_exists("$dir/styles.php")) {
+            //legacy theme - needs to be upgraded - upgrade info is displayed on the admin settings page
+            return null;
+        }
+
+        return $dir;
+    }
+
+    /**
+     * Get the renderer for a part of Moodle for this theme.
+     *
+     * @param moodle_page $page the page we are rendering
+     * @param string $component the name of part of moodle. E.g. 'core', 'quiz', 'qtype_multichoice'.
+     * @param string $subtype optional subtype such as 'news' resulting to 'mod_forum_news'
+     * @param string $target one of rendering target constants
+     * @return renderer_base the requested renderer.
+     */
+    public function get_renderer(moodle_page $page, $component, $subtype = null, $target = null) {
+        if (is_null($this->rf)) {
+            $classname = $this->rendererfactory;
+            $this->rf = new $classname($this);
+        }
+
+        return $this->rf->get_renderer($page, $component, $subtype, $target);
+    }
+
+    /**
+     * Get the information from {@link $layouts} for this type of page.
+     *
+     * @param string $pagelayout the the page layout name.
+     * @return array the appropriate part of {@link $layouts}.
+     */
+    protected function layout_info_for_page($pagelayout) {
+        if (array_key_exists($pagelayout, $this->layouts)) {
+            return $this->layouts[$pagelayout];
+        } else {
+            debugging('Invalid page layout specified: ' . $pagelayout);
+            return $this->layouts['standard'];
+        }
+    }
+
+    /**
+     * Given the settings of this theme, and the page pagelayout, return the
+     * full path of the page layout file to use.
+     *
+     * Used by {@link core_renderer::header()}.
+     *
+     * @param string $pagelayout the the page layout name.
+     * @return string Full path to the lyout file to use
+     */
+    public function layout_file($pagelayout) {
+        global $CFG;
+
+        $layoutinfo = $this->layout_info_for_page($pagelayout);
+        $layoutfile = $layoutinfo['file'];
+
+        if (array_key_exists('theme', $layoutinfo)) {
+            $themes = array($layoutinfo['theme']);
+        } else {
+            $themes = array_merge(array($this->name),$this->parents);
+        }
+
+        foreach ($themes as $theme) {
+            if ($dir = $this->find_theme_location($theme)) {
+                $path = "$dir/layout/$layoutfile";
+
+                // Check the template exists, return general base theme template if not.
+                if (is_readable($path)) {
+                    return $path;
+                }
+            }
+        }
+
+        throw new coding_exception('Can not find layout file for: ' . $pagelayout . ' (' . $layoutfile . ')');
+    }
+
+    /**
+     * Returns auxiliary page layout options specified in layout configuration array.
+     *
+     * @param string $pagelayout
+     * @return array
+     */
+    public function pagelayout_options($pagelayout) {
+        $info = $this->layout_info_for_page($pagelayout);
+        if (!empty($info['options'])) {
+            return $info['options'];
+        }
+        return array();
+    }
+
+    /**
+     * Inform a block_manager about the block regions this theme wants on this
+     * page layout.
+     *
+     * @param string $pagelayout the general type of the page.
+     * @param block_manager $blockmanager the block_manger to set up.
+     */
+    public function setup_blocks($pagelayout, $blockmanager) {
+        $layoutinfo = $this->layout_info_for_page($pagelayout);
+        if (!empty($layoutinfo['regions'])) {
+            $blockmanager->add_regions($layoutinfo['regions'], false);
+            $blockmanager->set_default_region($layoutinfo['defaultregion']);
+        }
+    }
+
+    /**
+     * Gets the visible name for the requested block region.
+     *
+     * @param string $region The region name to get
+     * @param string $theme The theme the region belongs to (may come from the parent theme)
+     * @return string
+     */
+    protected function get_region_name($region, $theme) {
+
+        $stringman = get_string_manager();
+
+        // Check if the name is defined in the theme.
+        if ($stringman->string_exists('region-' . $region, 'theme_' . $theme)) {
+            return get_string('region-' . $region, 'theme_' . $theme);
+        }
+
+        // Check the theme parents.
+        foreach ($this->parents as $parentthemename) {
+            if ($stringman->string_exists('region-' . $region, 'theme_' . $parentthemename)) {
+                return get_string('region-' . $region, 'theme_' . $parentthemename);
+            }
+        }
+
+        // Last resort, try the boost theme for names.
+        return get_string('region-' . $region, 'theme_boost');
+    }
+
+    /**
+     * Get the list of all block regions known to this theme in all templates.
+     *
+     * @return array internal region name => human readable name.
+     */
+    public function get_all_block_regions() {
+        $regions = array();
+        foreach ($this->layouts as $layoutinfo) {
+            foreach ($layoutinfo['regions'] as $region) {
+                $regions[$region] = $this->get_region_name($region, $this->name);
+            }
+        }
+        return $regions;
+    }
+
+    /**
+     * Returns the human readable name of the theme
+     *
+     * @return string
+     */
+    public function get_theme_name() {
+        return get_string('pluginname', 'theme_'.$this->name);
+    }
+
+    /**
+     * Returns the block render method.
+     *
+     * It is set by the theme via:
+     *     $THEME->blockrendermethod = '...';
+     *
+     * It can be one of two values, blocks or blocks_for_region.
+     * It should be set to the method being used by the theme layouts.
+     *
+     * @return string
+     */
+    public function get_block_render_method() {
+        if ($this->blockrendermethod) {
+            // Return the specified block render method.
+            return $this->blockrendermethod;
+        }
+        // Its not explicitly set, check the parent theme configs.
+        foreach ($this->parent_configs as $config) {
+            if (isset($config->blockrendermethod)) {
+                return $config->blockrendermethod;
+            }
+        }
+        // Default it to blocks.
+        return 'blocks';
+    }
+
+    /**
+     * Get the callable for CSS tree post processing.
+     *
+     * @return string|null
+     */
+    public function get_css_tree_post_processor() {
+        $configs = [$this] + $this->parent_configs;
+        foreach ($configs as $config) {
+            if (!empty($config->csstreepostprocessor) && is_callable($config->csstreepostprocessor)) {
+                return $config->csstreepostprocessor;
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/lib/classes/output/url_select.php b/lib/classes/output/url_select.php
new file mode 100644
index 0000000000000..9051e83d0a4a3
--- /dev/null
+++ b/lib/classes/output/url_select.php
@@ -0,0 +1,282 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Simple URL selection widget description.
+ *
+ * @copyright 2009 Petr Skoda
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class url_select implements renderable, templatable {
+    /**
+     * @var array $urls associative array value=>label ex.: array(1=>'One, 2=>Two)
+     *     it is also possible to specify optgroup as complex label array ex.:
+     *         array(array('Odd'=>array(1=>'One', 3=>'Three)), array('Even'=>array(2=>'Two')))
+     *         array(1=>'One', '--1uniquekey'=>array('More'=>array(2=>'Two', 3=>'Three')))
+     */
+    var $urls;
+
+    /**
+     * @var string Selected option
+     */
+    var $selected;
+
+    /**
+     * @var array Nothing selected
+     */
+    var $nothing;
+
+    /**
+     * @var array Extra select field attributes
+     */
+    var $attributes = array();
+
+    /**
+     * @var string Button label
+     */
+    var $label = '';
+
+    /**
+     * @var array Button label's attributes
+     */
+    var $labelattributes = array();
+
+    /**
+     * @var string Wrapping div class
+     */
+    var $class = 'urlselect';
+
+    /**
+     * @var bool True if button disabled, false if normal
+     */
+    var $disabled = false;
+
+    /**
+     * @var string Button tooltip
+     */
+    var $tooltip = null;
+
+    /**
+     * @var string Form id
+     */
+    var $formid = null;
+
+    /**
+     * @var help_icon The help icon for this element.
+     */
+    var $helpicon = null;
+
+    /**
+     * @var string If set, makes button visible with given name for button
+     */
+    var $showbutton = null;
+
+    /**
+     * Constructor
+     * @param array $urls list of options
+     * @param string $selected selected element
+     * @param array $nothing
+     * @param string $formid
+     * @param string $showbutton Set to text of button if it should be visible
+     *   or null if it should be hidden (hidden version always has text 'go')
+     */
+    public function __construct(array $urls, $selected = '', $nothing = array('' => 'choosedots'), $formid = null, $showbutton = null) {
+        $this->urls       = $urls;
+        $this->selected   = $selected;
+        $this->nothing    = $nothing;
+        $this->formid     = $formid;
+        $this->showbutton = $showbutton;
+    }
+
+    /**
+     * Adds help icon.
+     *
+     * @deprecated since Moodle 2.0
+     */
+    public function set_old_help_icon($helppage, $title, $component = 'moodle') {
+        throw new coding_exception('set_old_help_icon() can not be used any more, please see set_help_icon().');
+    }
+
+    /**
+     * Adds help icon.
+     *
+     * @param string $identifier The keyword that defines a help page
+     * @param string $component
+     */
+    public function set_help_icon($identifier, $component = 'moodle') {
+        $this->helpicon = new help_icon($identifier, $component);
+    }
+
+    /**
+     * Sets select's label
+     *
+     * @param string $label
+     * @param array $attributes (optional)
+     */
+    public function set_label($label, $attributes = array()) {
+        $this->label = $label;
+        $this->labelattributes = $attributes;
+    }
+
+    /**
+     * Clean a URL.
+     *
+     * @param string $value The URL.
+     * @return string The cleaned URL.
+     */
+    protected function clean_url($value) {
+        global $CFG;
+
+        if (empty($value)) {
+            // Nothing.
+
+        } else if (strpos($value, $CFG->wwwroot . '/') === 0) {
+            $value = str_replace($CFG->wwwroot, '', $value);
+
+        } else if (strpos($value, '/') !== 0) {
+            debugging("Invalid url_select urls parameter: url '$value' is not local relative url!", DEBUG_DEVELOPER);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Flatten the options for Mustache.
+     *
+     * This also cleans the URLs.
+     *
+     * @param array $options The options.
+     * @param array $nothing The nothing option.
+     * @return array
+     */
+    protected function flatten_options($options, $nothing) {
+        $flattened = [];
+
+        foreach ($options as $value => $option) {
+            if (is_array($option)) {
+                foreach ($option as $groupname => $optoptions) {
+                    if (!isset($flattened[$groupname])) {
+                        $flattened[$groupname] = [
+                            'name' => $groupname,
+                            'isgroup' => true,
+                            'options' => []
+                        ];
+                    }
+                    foreach ($optoptions as $optvalue => $optoption) {
+                        $cleanedvalue = $this->clean_url($optvalue);
+                        $flattened[$groupname]['options'][$cleanedvalue] = [
+                            'name' => $optoption,
+                            'value' => $cleanedvalue,
+                            'selected' => $this->selected == $optvalue,
+                        ];
+                    }
+                }
+
+            } else {
+                $cleanedvalue = $this->clean_url($value);
+                $flattened[$cleanedvalue] = [
+                    'name' => $option,
+                    'value' => $cleanedvalue,
+                    'selected' => $this->selected == $value,
+                ];
+            }
+        }
+
+        if (!empty($nothing)) {
+            $value = key($nothing);
+            $name = reset($nothing);
+            $flattened = [
+                    $value => ['name' => $name, 'value' => $value, 'selected' => $this->selected == $value]
+                ] + $flattened;
+        }
+
+        // Make non-associative array.
+        foreach ($flattened as $key => $value) {
+            if (!empty($value['options'])) {
+                $flattened[$key]['options'] = array_values($value['options']);
+            }
+        }
+        $flattened = array_values($flattened);
+
+        return $flattened;
+    }
+
+    /**
+     * Export for template.
+     *
+     * @param renderer_base $output Renderer.
+     * @return stdClass
+     */
+    public function export_for_template(renderer_base $output) {
+        $attributes = $this->attributes;
+
+        $data = new stdClass();
+        $data->formid = !empty($this->formid) ? $this->formid : html_writer::random_id('url_select_f');
+        $data->classes = $this->class;
+        $data->label = $this->label;
+        $data->disabled = $this->disabled;
+        $data->title = $this->tooltip;
+        $data->id = !empty($attributes['id']) ? $attributes['id'] : html_writer::random_id('url_select');
+        $data->sesskey = sesskey();
+        $data->action = (new moodle_url('/course/jumpto.php'))->out(false);
+
+        // Remove attributes passed as property directly.
+        unset($attributes['class']);
+        unset($attributes['id']);
+        unset($attributes['name']);
+        unset($attributes['title']);
+        unset($attributes['disabled']);
+
+        $data->showbutton = $this->showbutton;
+
+        // Select options.
+        $nothing = false;
+        if (is_string($this->nothing) && $this->nothing !== '') {
+            $nothing = ['' => $this->nothing];
+        } else if (is_array($this->nothing)) {
+            $nothingvalue = reset($this->nothing);
+            if ($nothingvalue === 'choose' || $nothingvalue === 'choosedots') {
+                $nothing = [key($this->nothing) => get_string('choosedots')];
+            } else {
+                $nothing = $this->nothing;
+            }
+        }
+        $data->options = $this->flatten_options($this->urls, $nothing);
+
+        // Label attributes.
+        $data->labelattributes = [];
+        // Unset label attributes that are already in the template.
+        unset($this->labelattributes['for']);
+        // Map the label attributes.
+        foreach ($this->labelattributes as $key => $value) {
+            $data->labelattributes[] = ['name' => $key, 'value' => $value];
+        }
+
+        // Help icon.
+        $data->helpicon = !empty($this->helpicon) ? $this->helpicon->export_for_template($output) : false;
+
+        // Finally all the remaining attributes.
+        $data->attributes = [];
+        foreach ($attributes as $key => $value) {
+            $data->attributes[] = ['name' => $key, 'value' => $value];
+        }
+
+        return $data;
+    }
+}
diff --git a/lib/classes/output/user_picture.php b/lib/classes/output/user_picture.php
new file mode 100644
index 0000000000000..d278e4d2c10e8
--- /dev/null
+++ b/lib/classes/output/user_picture.php
@@ -0,0 +1,302 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Data structure representing a user picture.
+ *
+ * @copyright 2009 Nicolas Connault, 2010 Petr Skoda
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Modle 2.0
+ * @package core
+ * @category output
+ */
+class user_picture implements renderable {
+    /**
+     * @var stdClass A user object with at least fields all columns specified
+     * in $fields array constant set.
+     */
+    public $user;
+
+    /**
+     * @var int The course id. Used when constructing the link to the user's
+     * profile, page course id used if not specified.
+     */
+    public $courseid;
+
+    /**
+     * @var bool Add course profile link to image
+     */
+    public $link = true;
+
+    /**
+     * @var int Size in pixels. Special values are (true/1 = 100px) and (false/0 = 35px) for backward compatibility.
+     * Recommended values (supporting user initials too): 16, 35, 64 and 100.
+     */
+    public $size = 35;
+
+    /**
+     * @var bool Add non-blank alt-text to the image.
+     * Default true, set to false when image alt just duplicates text in screenreaders.
+     */
+    public $alttext = true;
+
+    /**
+     * @var bool Whether or not to open the link in a popup window.
+     */
+    public $popup = false;
+
+    /**
+     * @var string Image class attribute
+     */
+    public $class = 'userpicture';
+
+    /**
+     * @var bool Whether to be visible to screen readers.
+     */
+    public $visibletoscreenreaders = true;
+
+    /**
+     * @var bool Whether to include the fullname in the user picture link.
+     */
+    public $includefullname = false;
+
+    /**
+     * @var mixed Include user authentication token. True indicates to generate a token for current user, and integer value
+     * indicates to generate a token for the user whose id is the value indicated.
+     */
+    public $includetoken = false;
+
+    /**
+     * User picture constructor.
+     *
+     * @param stdClass $user user record with at least id, picture, imagealt, firstname and lastname set.
+     *                 It is recommended to add also contextid of the user for performance reasons.
+     */
+    public function __construct(stdClass $user) {
+        global $DB;
+
+        if (empty($user->id)) {
+            throw new coding_exception('User id is required when printing user avatar image.');
+        }
+
+        // only touch the DB if we are missing data and complain loudly...
+        $needrec = false;
+        foreach (\core_user\fields::get_picture_fields() as $field) {
+            if (!property_exists($user, $field)) {
+                $needrec = true;
+                debugging('Missing '.$field.' property in $user object, this is a performance problem that needs to be fixed by a developer. '
+                    .'Please use the \core_user\fields API to get the full list of required fields.', DEBUG_DEVELOPER);
+                break;
+            }
+        }
+
+        if ($needrec) {
+            $this->user = $DB->get_record('user', array('id' => $user->id),
+                implode(',', \core_user\fields::get_picture_fields()), MUST_EXIST);
+        } else {
+            $this->user = clone($user);
+        }
+    }
+
+    /**
+     * Returns a list of required user fields, useful when fetching required user info from db.
+     *
+     * In some cases we have to fetch the user data together with some other information,
+     * the idalias is useful there because the id would otherwise override the main
+     * id of the result record. Please note it has to be converted back to id before rendering.
+     *
+     * @param string $tableprefix name of database table prefix in query
+     * @param array $extrafields extra fields to be included in result (do not include TEXT columns because it would break SELECT DISTINCT in MSSQL and ORACLE)
+     * @param string $idalias alias of id field
+     * @param string $fieldprefix prefix to add to all columns in their aliases, does not apply to 'id'
+     * @return string
+     * @deprecated since Moodle 3.11 MDL-45242
+     * @see \core_user\fields
+     */
+    public static function fields($tableprefix = '', array $extrafields = NULL, $idalias = 'id', $fieldprefix = '') {
+        debugging('user_picture::fields() is deprecated. Please use the \core_user\fields API instead.', DEBUG_DEVELOPER);
+        $userfields = \core_user\fields::for_userpic();
+        if ($extrafields) {
+            $userfields->including(...$extrafields);
+        }
+        $selects = $userfields->get_sql($tableprefix, false, $fieldprefix, $idalias, false)->selects;
+        if ($tableprefix === '') {
+            // If no table alias is specified, don't add {user}. in front of fields.
+            $selects = str_replace('{user}.', '', $selects);
+        }
+        // Maintain legacy behaviour where the field list was done with 'implode' and no spaces.
+        $selects = str_replace(', ', ',', $selects);
+        return $selects;
+    }
+
+    /**
+     * Extract the aliased user fields from a given record
+     *
+     * Given a record that was previously obtained using {@link self::fields()} with aliases,
+     * this method extracts user related unaliased fields.
+     *
+     * @param stdClass $record containing user picture fields
+     * @param array $extrafields extra fields included in the $record
+     * @param string $idalias alias of the id field
+     * @param string $fieldprefix prefix added to all columns in their aliases, does not apply to 'id'
+     * @return stdClass object with unaliased user fields
+     */
+    public static function unalias(stdClass $record, array $extrafields = null, $idalias = 'id', $fieldprefix = '') {
+
+        if (empty($idalias)) {
+            $idalias = 'id';
+        }
+
+        $return = new stdClass();
+
+        foreach (\core_user\fields::get_picture_fields() as $field) {
+            if ($field === 'id') {
+                if (property_exists($record, $idalias)) {
+                    $return->id = $record->{$idalias};
+                }
+            } else {
+                if (property_exists($record, $fieldprefix.$field)) {
+                    $return->{$field} = $record->{$fieldprefix.$field};
+                }
+            }
+        }
+        // add extra fields if not already there
+        if ($extrafields) {
+            foreach ($extrafields as $e) {
+                if ($e === 'id' or property_exists($return, $e)) {
+                    continue;
+                }
+                $return->{$e} = $record->{$fieldprefix.$e};
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * Works out the URL for the users picture.
+     *
+     * This method is recommended as it avoids costly redirects of user pictures
+     * if requests are made for non-existent files etc.
+     *
+     * @param moodle_page $page
+     * @param renderer_base $renderer
+     * @return moodle_url
+     */
+    public function get_url(moodle_page $page, renderer_base $renderer = null) {
+        global $CFG;
+
+        if (is_null($renderer)) {
+            $renderer = $page->get_renderer('core');
+        }
+
+        // Sort out the filename and size. Size is only required for the gravatar
+        // implementation presently.
+        if (empty($this->size)) {
+            $filename = 'f2';
+            $size = 35;
+        } else if ($this->size === true or $this->size == 1) {
+            $filename = 'f1';
+            $size = 100;
+        } else if ($this->size > 100) {
+            $filename = 'f3';
+            $size = (int)$this->size;
+        } else if ($this->size >= 50) {
+            $filename = 'f1';
+            $size = (int)$this->size;
+        } else {
+            $filename = 'f2';
+            $size = (int)$this->size;
+        }
+
+        $defaulturl = $renderer->image_url('u/'.$filename); // default image
+
+        if ((!empty($CFG->forcelogin) and !isloggedin()) ||
+            (!empty($CFG->forceloginforprofileimage) && (!isloggedin() || isguestuser()))) {
+            // Protect images if login required and not logged in;
+            // also if login is required for profile images and is not logged in or guest
+            // do not use require_login() because it is expensive and not suitable here anyway.
+            return $defaulturl;
+        }
+
+        // First try to detect deleted users - but do not read from database for performance reasons!
+        if (!empty($this->user->deleted) or strpos($this->user->email, '@') === false) {
+            // All deleted users should have email replaced by md5 hash,
+            // all active users are expected to have valid email.
+            return $defaulturl;
+        }
+
+        // Did the user upload a picture?
+        if ($this->user->picture > 0) {
+            if (!empty($this->user->contextid)) {
+                $contextid = $this->user->contextid;
+            } else {
+                $context = context_user::instance($this->user->id, IGNORE_MISSING);
+                if (!$context) {
+                    // This must be an incorrectly deleted user, all other users have context.
+                    return $defaulturl;
+                }
+                $contextid = $context->id;
+            }
+
+            $path = '/';
+            if (clean_param($page->theme->name, PARAM_THEME) == $page->theme->name) {
+                // We append the theme name to the file path if we have it so that
+                // in the circumstance that the profile picture is not available
+                // when the user actually requests it they still get the profile
+                // picture for the correct theme.
+                $path .= $page->theme->name.'/';
+            }
+            // Set the image URL to the URL for the uploaded file and return.
+            $url = moodle_url::make_pluginfile_url(
+                $contextid, 'user', 'icon', null, $path, $filename, false, $this->includetoken);
+            $url->param('rev', $this->user->picture);
+            return $url;
+        }
+
+        if ($this->user->picture == 0 and !empty($CFG->enablegravatar)) {
+            // Normalise the size variable to acceptable bounds
+            if ($size < 1 || $size > 512) {
+                $size = 35;
+            }
+            // Hash the users email address
+            $md5 = md5(strtolower(trim($this->user->email)));
+            // Build a gravatar URL with what we know.
+
+            // Find the best default image URL we can (MDL-35669)
+            if (empty($CFG->gravatardefaulturl)) {
+                $absoluteimagepath = $page->theme->resolve_image_location('u/'.$filename, 'core');
+                if (strpos($absoluteimagepath, $CFG->dirroot) === 0) {
+                    $gravatardefault = $CFG->wwwroot . substr($absoluteimagepath, strlen($CFG->dirroot));
+                } else {
+                    $gravatardefault = $CFG->wwwroot . '/pix/u/' . $filename . '.png';
+                }
+            } else {
+                $gravatardefault = $CFG->gravatardefaulturl;
+            }
+
+            // If the currently requested page is https then we'll return an
+            // https gravatar page.
+            if (is_https()) {
+                return new moodle_url("https://secure.gravatar.com/avatar/{$md5}", array('s' => $size, 'd' => $gravatardefault));
+            } else {
+                return new moodle_url("http://www.gravatar.com/avatar/{$md5}", array('s' => $size, 'd' => $gravatardefault));
+            }
+        }
+
+        return $defaulturl;
+    }
+}
diff --git a/lib/classes/output/xhtml_container_stack.php b/lib/classes/output/xhtml_container_stack.php
new file mode 100644
index 0000000000000..193b90ab36b59
--- /dev/null
+++ b/lib/classes/output/xhtml_container_stack.php
@@ -0,0 +1,153 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This class keeps track of which HTML tags are currently open.
+ *
+ * This makes it much easier to always generate well formed XHTML output, even
+ * if execution terminates abruptly. Any time you output some opening HTML
+ * without the matching closing HTML, you should push the necessary close tags
+ * onto the stack.
+ *
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class xhtml_container_stack {
+    /**
+     * @var array Stores the list of open containers.
+     */
+    protected $opencontainers = array();
+
+    /**
+     * @var array In developer debug mode, stores a stack trace of all opens and
+     * closes, so we can output helpful error messages when there is a mismatch.
+     */
+    protected $log = array();
+
+    /**
+     * @var boolean Store whether we are developer debug mode. We need this in
+     * several places including in the destructor where we may not have access to $CFG.
+     */
+    protected $isdebugging;
+
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        global $CFG;
+        $this->isdebugging = $CFG->debugdeveloper;
+    }
+
+    /**
+     * Push the close HTML for a recently opened container onto the stack.
+     *
+     * @param string $type The type of container. This is checked when {@link pop()}
+     *      is called and must match, otherwise a developer debug warning is output.
+     * @param string $closehtml The HTML required to close the container.
+     */
+    public function push($type, $closehtml) {
+        $container = new stdClass;
+        $container->type = $type;
+        $container->closehtml = $closehtml;
+        if ($this->isdebugging) {
+            $this->log('Open', $type);
+        }
+        array_push($this->opencontainers, $container);
+    }
+
+    /**
+     * Pop the HTML for the next closing container from the stack. The $type
+     * must match the type passed when the container was opened, otherwise a
+     * warning will be output.
+     *
+     * @param string $type The type of container.
+     * @return ?string the HTML required to close the container.
+     */
+    public function pop($type) {
+        if (empty($this->opencontainers)) {
+            debugging('<p>There are no more open containers. This suggests there is a nesting problem.</p>' .
+                    $this->output_log(), DEBUG_DEVELOPER);
+            return;
+        }
+
+        $container = array_pop($this->opencontainers);
+        if ($container->type != $type) {
+            debugging('<p>The type of container to be closed (' . $container->type .
+                    ') does not match the type of the next open container (' . $type .
+                    '). This suggests there is a nesting problem.</p>' .
+                    $this->output_log(), DEBUG_DEVELOPER);
+        }
+        if ($this->isdebugging) {
+            $this->log('Close', $type);
+        }
+        return $container->closehtml;
+    }
+
+    /**
+     * Close all but the last open container. This is useful in places like error
+     * handling, where you want to close all the open containers (apart from <body>)
+     * before outputting the error message.
+     *
+     * @param bool $shouldbenone assert that the stack should be empty now - causes a
+     *      developer debug warning if it isn't.
+     * @return string the HTML required to close any open containers inside <body>.
+     */
+    public function pop_all_but_last($shouldbenone = false) {
+        if ($shouldbenone && count($this->opencontainers) != 1) {
+            debugging('<p>Some HTML tags were opened in the body of the page but not closed.</p>' .
+                    $this->output_log(), DEBUG_DEVELOPER);
+        }
+        $output = '';
+        while (count($this->opencontainers) > 1) {
+            $container = array_pop($this->opencontainers);
+            $output .= $container->closehtml;
+        }
+        return $output;
+    }
+
+    /**
+     * You can call this function if you want to throw away an instance of this
+     * class without properly emptying the stack (for example, in a unit test).
+     * Calling this method stops the destruct method from outputting a developer
+     * debug warning. After calling this method, the instance can no longer be used.
+     */
+    public function discard() {
+        $this->opencontainers = null;
+    }
+
+    /**
+     * Adds an entry to the log.
+     *
+     * @param string $action The name of the action
+     * @param string $type The type of action
+     */
+    protected function log($action, $type) {
+        $this->log[] = '<li>' . $action . ' ' . $type . ' at:' .
+                format_backtrace(debug_backtrace()) . '</li>';
+    }
+
+    /**
+     * Outputs the log's contents as a HTML list.
+     *
+     * @return string HTML list of the log
+     */
+    protected function output_log() {
+        return '<ul>' . implode("\n", $this->log) . '</ul>';
+    }
+}
diff --git a/lib/db/legacyclasses.php b/lib/db/legacyclasses.php
index 75076d95c3217..696ba07dfa058 100644
--- a/lib/db/legacyclasses.php
+++ b/lib/db/legacyclasses.php
@@ -30,6 +30,7 @@
 // The old class name is the key, the path to the file containing the class is the vlaue.
 // The array must be called $legacyclasses.
 $legacyclasses = [
+    // Exception API.
     \bootstrap_renderer::class => 'output/bootstrap_renderer.php',
     \coding_exception::class => 'exception/coding_exception.php',
     \file_serving_exception::class => 'exception/file_serving_exception.php',
@@ -42,4 +43,86 @@
     \require_login_session_timeout_exception::class => 'exception/require_login_session_timeout_exception.php',
     \required_capability_exception::class => 'exception/required_capability_exception.php',
     \webservice_parameter_exception::class => 'exception/webservice_parameter_exception.php',
+
+    // Output API.
+    \theme_config::class => 'output/theme_config.php',
+    \xhtml_container_stack::class => 'output/xhtml_container_stack.php',
+
+    \renderable::class => 'output/renderable.php',
+    \templatable::class => 'output/templatable.php',
+
+    // Output API: Renderer Factories.
+    \renderer_factory::class => 'output/renderer_factory/renderer_factory_interface.php',
+    \renderer_factory_base::class => 'output/renderer_factory/renderer_factory_base.php',
+    \standard_renderer_factory::class => 'output/renderer_factory/standard_renderer_factory.php',
+    \theme_overridden_renderer_factory::class => 'output/renderer_factory/theme_overridden_renderer_factory.php',
+
+    // Output API: Renderers.
+    \renderer_base::class => 'output/renderer_base.php',
+    \plugin_renderer_base::class => 'output/plugin_renderer_base.php',
+    \core_renderer::class => 'output/core_renderer.php',
+    \core_renderer_cli::class => 'output/core_renderer_cli.php',
+    \core_renderer_ajax::class => 'output/core_renderer_ajax.php',
+    \core_renderer_maintenance::class => 'output/core_renderer_maintenance.php',
+    \page_requirements_manager::class => 'output/requirements/page_requirements_manager.php',
+    \YUI_config::class => 'output/requirements/yui.php',
+    \fragment_requirements_manager::class => 'output/requirements/fragment_requirements_manager.php',
+
+    // Output API: components.
+    \file_picker::class => 'output/file_picker.php',
+    \user_picture::class => 'output/user_picture.php',
+    \help_icon::class => 'output/help_icon.php',
+    \pix_icon_font::class => 'output/pix_icon_font.php',
+    \pix_icon_fontawesome::class => 'output/pix_icon_fontawesome.php',
+    \pix_icon::class => 'output/pix_icon.php',
+    \image_icon::class => 'output/image_icon.php',
+    \pix_emoticon::class => 'output/pix_emoticon.php',
+    \single_button::class => 'output/single_button.php',
+    \single_select::class => 'output/single_select.php',
+    \url_select::class => 'output/url_select.php',
+    \action_link::class => 'output/action_link.php',
+    \html_writer::class => 'output/html_writer.php',
+    \js_writer::class => 'output/js_writer.php',
+    \paging_bar::class => 'output/paging_bar.php',
+    \initials_bar::class => 'output/initials_bar.php',
+    \custom_menu_item::class => 'output/custom_menu_item.php',
+    \custom_menu::class => 'output/custom_menu.php',
+    \tabobject::class => 'output/tabobject.php',
+    \context_header::class => 'output/context_header.php',
+    \tabtree::class => 'output/tabtree.php',
+    \action_menu::class => 'output/action_menu.php',
+    \action_menu_filler::class => 'output/action_menu/filler.php',
+    \action_menu_link::class => 'output/action_menu/link.php',
+    \action_menu_link_primary::class => 'output/action_menu/link_primary.php',
+    \action_menu_link_secondary::class => 'output/action_menu/link_secondary.php',
+    \preferences_groups::class => 'output/preferences_groups.php',
+    \preferences_group::class => 'output/preferences_group.php',
+    \progress_bar::class => 'output/progress_bar.php',
+    \component_action::class => 'output/actions/component_action.php',
+    \confirm_action::class => 'output/actions/confirm_action.php',
+    \popup_action::class => 'output/actions/popup_action.php',
+
+    // Block Subsystem.
+    \block_contents::class => [
+        'core_block',
+        'output/block_contents.php',
+    ],
+    \block_move_target::class => [
+        'core_block',
+        'output/block_move_target.php',
+    ],
+
+    // Table Subsystem.
+    \html_table::class => [
+        'core_table',
+        'output/html_table.php',
+    ],
+    \html_table_row::class => [
+        'core_table',
+        'output/html_table_row.php',
+    ],
+    \html_table_cell::class => [
+        'core_table',
+        'output/html_table_cell.php',
+    ],
 ];
diff --git a/lib/form/button.php b/lib/form/button.php
index fdbb4ffe1ea75..b5a44aab17db6 100644
--- a/lib/form/button.php
+++ b/lib/form/button.php
@@ -26,7 +26,6 @@
  */
 
 require_once("HTML/QuickForm/button.php");
-require_once(__DIR__ . '/../outputcomponents.php');
 require_once('templatable_form_element.php');
 
 /**
diff --git a/lib/form/templatable_form_element.php b/lib/form/templatable_form_element.php
index 07fb98e2d7f96..e94e5baf5bc2d 100644
--- a/lib/form/templatable_form_element.php
+++ b/lib/form/templatable_form_element.php
@@ -21,18 +21,6 @@
  * @copyright 2016 Damyon Wiese
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-defined('MOODLE_INTERNAL') || die();
-
-// Some form elements are used before $CFG is created - do not rely on it here.
-require_once(__DIR__ . '/../outputcomponents.php');
-
-/**
- * templatable_form_element trait.
- *
- * @package   core_form
- * @copyright 2016 Damyon Wiese
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
 trait templatable_form_element {
 
     /**
diff --git a/lib/outputactions.php b/lib/outputactions.php
index 04bf469af0607..0fdca282e68ed 100644
--- a/lib/outputactions.php
+++ b/lib/outputactions.php
@@ -14,207 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Classes representing JS event handlers, used by output components.
- *
- * Please see http://docs.moodle.org/en/Developement:How_Moodle_outputs_HTML
- * for an overview.
- *
- * @package core
- * @category output
- * @copyright 2009 Nicolas Connault
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Helper class used by other components that involve an action on the page (URL or JS).
- *
- * @copyright 2009 Nicolas Connault
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class component_action implements templatable {
-
-    /**
-     * @var string $event The DOM event that will trigger this action when caught
-     */
-    public $event;
-
-    /**
-     * @var string A function name to call when the button is clicked
-     * The JS function you create must have two arguments:
-     *      1. The event object
-     *      2. An object/array of arguments ($jsfunctionargs)
-     */
-    public $jsfunction = false;
-
-    /**
-     * @var array An array of arguments to pass to the JS function
-     */
-    public $jsfunctionargs = array();
-
-    /**
-     * Constructor
-     * @param string $event DOM event
-     * @param string $jsfunction An optional JS function. Required if jsfunctionargs is given
-     * @param array $jsfunctionargs An array of arguments to pass to the jsfunction
-     */
-    public function __construct($event, $jsfunction, $jsfunctionargs=array()) {
-        $this->event = $event;
-
-        $this->jsfunction = $jsfunction;
-        $this->jsfunctionargs = $jsfunctionargs;
-
-        if (!empty($this->jsfunctionargs)) {
-            if (empty($this->jsfunction)) {
-                throw new coding_exception('The component_action object needs a jsfunction value to pass the jsfunctionargs to.');
-            }
-        }
-    }
-
-    /**
-     * Export for template.
-     *
-     * @param renderer_base $output The renderer.
-     * @return stdClass
-     */
-    public function export_for_template(renderer_base $output) {
-        $args = !empty($this->jsfunctionargs) ? json_encode($this->jsfunctionargs) : false;
-        return (object) [
-            'event' => $this->event,
-            'jsfunction' => $this->jsfunction,
-            'jsfunctionargs' => $args,
-        ];
-    }
-}
-
-
-/**
- * Confirm action
- *
- * @copyright 2009 Nicolas Connault
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class confirm_action extends component_action {
-    /**
-     * Constructs the confirm action object
-     *
-     * @param string $message The message to display to the user when they are shown
-     *    the confirm dialogue.
-     * @param string $callback Deprecated since 2.7
-     * @param string $continuelabel The string to use for he continue button
-     * @param string $cancellabel The string to use for the cancel button
-     */
-    public function __construct($message, $callback = null, $continuelabel = null, $cancellabel = null) {
-        if ($callback !== null) {
-            debugging('The callback argument to new confirm_action() has been deprecated.' .
-                    ' If you need to use a callback, please write Javascript to use moodle-core-notification-confirmation ' .
-                    'and attach to the provided events.',
-                    DEBUG_DEVELOPER);
-        }
-        parent::__construct('click', 'M.util.show_confirm_dialog', array(
-                'message' => $message,
-                'continuelabel' => $continuelabel, 'cancellabel' => $cancellabel));
-    }
-}
-
-
-/**
- * Component action for a popup window.
- *
- * @copyright 2009 Nicolas Connault
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class popup_action extends component_action {
-
-    /**
-     * @var string The JS function to call for the popup
-     */
-    public $jsfunction = 'openpopup';
-
-    /**
-     * @var array An array of parameters that will be passed to the openpopup JS function
-     */
-    public $params = array(
-            'height' =>  400,
-            'width' => 500,
-            'top' => 0,
-            'left' => 0,
-            'menubar' => false,
-            'location' => false,
-            'scrollbars' => true,
-            'resizable' => true,
-            'toolbar' => true,
-            'status' => true,
-            'directories' => false,
-            'fullscreen' => false,
-            'dependent' => true);
-
-    /**
-     * Constructor
-     *
-     * @param string $event DOM event
-     * @param moodle_url|string $url A moodle_url object, required if no jsfunction is given
-     * @param string $name The JS function to call for the popup (default 'popup')
-     * @param array  $params An array of popup parameters
-     */
-    public function __construct($event, $url, $name='popup', $params=array()) {
-        global $CFG;
-
-        $url = new moodle_url($url);
-
-        if ($name) {
-            $_name = $name;
-            if (($_name = preg_replace("/\s/", '_', $_name)) != $name) {
-                throw new coding_exception('The $name of a popup window shouldn\'t contain spaces - string modified. '. $name .' changed to '. $_name);
-                $name = $_name;
-            }
-        } else {
-            $name = 'popup';
-        }
-
-        foreach ($this->params as $var => $val) {
-            if (array_key_exists($var, $params)) {
-                $this->params[$var] = $params[$var];
-            }
-        }
-
-        $attributes = array('url' => $url->out(false), 'name' => $name, 'options' => $this->get_js_options($params));
-        if (!empty($params['fullscreen'])) {
-            $attributes['fullscreen'] = 1;
-        }
-        parent::__construct($event, $this->jsfunction, $attributes);
-    }
-
-    /**
-     * Returns a string of concatenated option->value pairs used by JS to call the popup window,
-     * based on this object's variables
-     *
-     * @return string String of option->value pairs for JS popup function.
-     */
-    public function get_js_options() {
-        $jsoptions = '';
-
-        foreach ($this->params as $var => $val) {
-            if (is_string($val) || is_int($val)) {
-                $jsoptions .= "$var=$val,";
-            } elseif (is_bool($val)) {
-                $jsoptions .= ($val) ? "$var," : "$var=0,";
-            }
-        }
-
-        $jsoptions = substr($jsoptions, 0, strlen($jsoptions) - 1);
-
-        return $jsoptions;
-    }
-}
+// This file is deprecated, but it should never have been manually included by anything outside of lib/outputlib.php.
+// Throwing an exception here should be fine because removing the manual inclusion should have no impact.
+throw new \core\exception\coding_exception(
+    'This file should not be manually included by any component.',
+);
diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php
index 99d22f8e21c44..0fdca282e68ed 100644
--- a/lib/outputcomponents.php
+++ b/lib/outputcomponents.php
@@ -14,5353 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Classes representing HTML elements, used by $OUTPUT methods
- *
- * Please see http://docs.moodle.org/en/Developement:How_Moodle_outputs_HTML
- * for an overview.
- *
- * @package core
- * @category output
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-use core\output\local\action_menu\subpanel;
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Interface marking other classes as suitable for renderer_base::render()
- *
- * @copyright 2010 Petr Skoda (skodak) info@skodak.org
- * @package core
- * @category output
- */
-interface renderable {
-    // intentionally empty
-}
-
-/**
- * Interface marking other classes having the ability to export their data for use by templates.
- *
- * @copyright 2015 Damyon Wiese
- * @package core
- * @category output
- * @since 2.9
- */
-interface templatable {
-
-    /**
-     * Function to export the renderer data in a format that is suitable for a
-     * mustache template. This means:
-     * 1. No complex types - only stdClass, array, int, string, float, bool
-     * 2. Any additional info that is required for the template is pre-calculated (e.g. capability checks).
-     *
-     * @param renderer_base $output Used to do a final render of any components that need to be rendered for export.
-     * @return stdClass|array
-     */
-    public function export_for_template(renderer_base $output);
-}
-
-/**
- * Data structure representing a file picker.
- *
- * @copyright 2010 Dongsheng Cai
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class file_picker implements renderable {
-
-    /**
-     * @var stdClass An object containing options for the file picker
-     */
-    public $options;
-
-    /**
-     * Constructs a file picker object.
-     *
-     * The following are possible options for the filepicker:
-     *    - accepted_types  (*)
-     *    - return_types    (FILE_INTERNAL)
-     *    - env             (filepicker)
-     *    - client_id       (uniqid)
-     *    - itemid          (0)
-     *    - maxbytes        (-1)
-     *    - maxfiles        (1)
-     *    - buttonname      (false)
-     *
-     * @param stdClass $options An object containing options for the file picker.
-     */
-    public function __construct(stdClass $options) {
-        global $CFG, $USER, $PAGE;
-        require_once($CFG->dirroot. '/repository/lib.php');
-        $defaults = array(
-            'accepted_types'=>'*',
-            'return_types'=>FILE_INTERNAL,
-            'env' => 'filepicker',
-            'client_id' => uniqid(),
-            'itemid' => 0,
-            'maxbytes'=>-1,
-            'maxfiles'=>1,
-            'buttonname'=>false
-        );
-        foreach ($defaults as $key=>$value) {
-            if (empty($options->$key)) {
-                $options->$key = $value;
-            }
-        }
-
-        $options->currentfile = '';
-        if (!empty($options->itemid)) {
-            $fs = get_file_storage();
-            $usercontext = context_user::instance($USER->id);
-            if (empty($options->filename)) {
-                if ($files = $fs->get_area_files($usercontext->id, 'user', 'draft', $options->itemid, 'id DESC', false)) {
-                    $file = reset($files);
-                }
-            } else {
-                $file = $fs->get_file($usercontext->id, 'user', 'draft', $options->itemid, $options->filepath, $options->filename);
-            }
-            if (!empty($file)) {
-                $options->currentfile = html_writer::link(moodle_url::make_draftfile_url($file->get_itemid(), $file->get_filepath(), $file->get_filename()), $file->get_filename());
-            }
-        }
-
-        // initilise options, getting files in root path
-        $this->options = initialise_filepicker($options);
-
-        // copying other options
-        foreach ($options as $name=>$value) {
-            if (!isset($this->options->$name)) {
-                $this->options->$name = $value;
-            }
-        }
-    }
-}
-
-/**
- * Data structure representing a user picture.
- *
- * @copyright 2009 Nicolas Connault, 2010 Petr Skoda
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Modle 2.0
- * @package core
- * @category output
- */
-class user_picture implements renderable {
-    /**
-     * @var stdClass A user object with at least fields all columns specified
-     * in $fields array constant set.
-     */
-    public $user;
-
-    /**
-     * @var int The course id. Used when constructing the link to the user's
-     * profile, page course id used if not specified.
-     */
-    public $courseid;
-
-    /**
-     * @var bool Add course profile link to image
-     */
-    public $link = true;
-
-    /**
-     * @var int Size in pixels. Special values are (true/1 = 100px) and (false/0 = 35px) for backward compatibility.
-     * Recommended values (supporting user initials too): 16, 35, 64 and 100.
-     */
-    public $size = 35;
-
-    /**
-     * @var bool Add non-blank alt-text to the image.
-     * Default true, set to false when image alt just duplicates text in screenreaders.
-     */
-    public $alttext = true;
-
-    /**
-     * @var bool Whether or not to open the link in a popup window.
-     */
-    public $popup = false;
-
-    /**
-     * @var string Image class attribute
-     */
-    public $class = 'userpicture';
-
-    /**
-     * @var bool Whether to be visible to screen readers.
-     */
-    public $visibletoscreenreaders = true;
-
-    /**
-     * @var bool Whether to include the fullname in the user picture link.
-     */
-    public $includefullname = false;
-
-    /**
-     * @var mixed Include user authentication token. True indicates to generate a token for current user, and integer value
-     * indicates to generate a token for the user whose id is the value indicated.
-     */
-    public $includetoken = false;
-
-    /**
-     * User picture constructor.
-     *
-     * @param stdClass $user user record with at least id, picture, imagealt, firstname and lastname set.
-     *                 It is recommended to add also contextid of the user for performance reasons.
-     */
-    public function __construct(stdClass $user) {
-        global $DB;
-
-        if (empty($user->id)) {
-            throw new coding_exception('User id is required when printing user avatar image.');
-        }
-
-        // only touch the DB if we are missing data and complain loudly...
-        $needrec = false;
-        foreach (\core_user\fields::get_picture_fields() as $field) {
-            if (!property_exists($user, $field)) {
-                $needrec = true;
-                debugging('Missing '.$field.' property in $user object, this is a performance problem that needs to be fixed by a developer. '
-                    .'Please use the \core_user\fields API to get the full list of required fields.', DEBUG_DEVELOPER);
-                break;
-            }
-        }
-
-        if ($needrec) {
-            $this->user = $DB->get_record('user', array('id' => $user->id),
-                implode(',', \core_user\fields::get_picture_fields()), MUST_EXIST);
-        } else {
-            $this->user = clone($user);
-        }
-    }
-
-    /**
-     * Returns a list of required user fields, useful when fetching required user info from db.
-     *
-     * In some cases we have to fetch the user data together with some other information,
-     * the idalias is useful there because the id would otherwise override the main
-     * id of the result record. Please note it has to be converted back to id before rendering.
-     *
-     * @param string $tableprefix name of database table prefix in query
-     * @param array $extrafields extra fields to be included in result (do not include TEXT columns because it would break SELECT DISTINCT in MSSQL and ORACLE)
-     * @param string $idalias alias of id field
-     * @param string $fieldprefix prefix to add to all columns in their aliases, does not apply to 'id'
-     * @return string
-     * @deprecated since Moodle 3.11 MDL-45242
-     * @see \core_user\fields
-     */
-    public static function fields($tableprefix = '', array $extrafields = NULL, $idalias = 'id', $fieldprefix = '') {
-        debugging('user_picture::fields() is deprecated. Please use the \core_user\fields API instead.', DEBUG_DEVELOPER);
-        $userfields = \core_user\fields::for_userpic();
-        if ($extrafields) {
-            $userfields->including(...$extrafields);
-        }
-        $selects = $userfields->get_sql($tableprefix, false, $fieldprefix, $idalias, false)->selects;
-        if ($tableprefix === '') {
-            // If no table alias is specified, don't add {user}. in front of fields.
-            $selects = str_replace('{user}.', '', $selects);
-        }
-        // Maintain legacy behaviour where the field list was done with 'implode' and no spaces.
-        $selects = str_replace(', ', ',', $selects);
-        return $selects;
-    }
-
-    /**
-     * Extract the aliased user fields from a given record
-     *
-     * Given a record that was previously obtained using {@link self::fields()} with aliases,
-     * this method extracts user related unaliased fields.
-     *
-     * @param stdClass $record containing user picture fields
-     * @param array $extrafields extra fields included in the $record
-     * @param string $idalias alias of the id field
-     * @param string $fieldprefix prefix added to all columns in their aliases, does not apply to 'id'
-     * @return stdClass object with unaliased user fields
-     */
-    public static function unalias(stdClass $record, array $extrafields = null, $idalias = 'id', $fieldprefix = '') {
-
-        if (empty($idalias)) {
-            $idalias = 'id';
-        }
-
-        $return = new stdClass();
-
-        foreach (\core_user\fields::get_picture_fields() as $field) {
-            if ($field === 'id') {
-                if (property_exists($record, $idalias)) {
-                    $return->id = $record->{$idalias};
-                }
-            } else {
-                if (property_exists($record, $fieldprefix.$field)) {
-                    $return->{$field} = $record->{$fieldprefix.$field};
-                }
-            }
-        }
-        // add extra fields if not already there
-        if ($extrafields) {
-            foreach ($extrafields as $e) {
-                if ($e === 'id' or property_exists($return, $e)) {
-                    continue;
-                }
-                $return->{$e} = $record->{$fieldprefix.$e};
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * Works out the URL for the users picture.
-     *
-     * This method is recommended as it avoids costly redirects of user pictures
-     * if requests are made for non-existent files etc.
-     *
-     * @param moodle_page $page
-     * @param renderer_base $renderer
-     * @return moodle_url
-     */
-    public function get_url(moodle_page $page, renderer_base $renderer = null) {
-        global $CFG;
-
-        if (is_null($renderer)) {
-            $renderer = $page->get_renderer('core');
-        }
-
-        // Sort out the filename and size. Size is only required for the gravatar
-        // implementation presently.
-        if (empty($this->size)) {
-            $filename = 'f2';
-            $size = 35;
-        } else if ($this->size === true or $this->size == 1) {
-            $filename = 'f1';
-            $size = 100;
-        } else if ($this->size > 100) {
-            $filename = 'f3';
-            $size = (int)$this->size;
-        } else if ($this->size >= 50) {
-            $filename = 'f1';
-            $size = (int)$this->size;
-        } else {
-            $filename = 'f2';
-            $size = (int)$this->size;
-        }
-
-        $defaulturl = $renderer->image_url('u/'.$filename); // default image
-
-        if ((!empty($CFG->forcelogin) and !isloggedin()) ||
-            (!empty($CFG->forceloginforprofileimage) && (!isloggedin() || isguestuser()))) {
-            // Protect images if login required and not logged in;
-            // also if login is required for profile images and is not logged in or guest
-            // do not use require_login() because it is expensive and not suitable here anyway.
-            return $defaulturl;
-        }
-
-        // First try to detect deleted users - but do not read from database for performance reasons!
-        if (!empty($this->user->deleted) or strpos($this->user->email, '@') === false) {
-            // All deleted users should have email replaced by md5 hash,
-            // all active users are expected to have valid email.
-            return $defaulturl;
-        }
-
-        // Did the user upload a picture?
-        if ($this->user->picture > 0) {
-            if (!empty($this->user->contextid)) {
-                $contextid = $this->user->contextid;
-            } else {
-                $context = context_user::instance($this->user->id, IGNORE_MISSING);
-                if (!$context) {
-                    // This must be an incorrectly deleted user, all other users have context.
-                    return $defaulturl;
-                }
-                $contextid = $context->id;
-            }
-
-            $path = '/';
-            if (clean_param($page->theme->name, PARAM_THEME) == $page->theme->name) {
-                // We append the theme name to the file path if we have it so that
-                // in the circumstance that the profile picture is not available
-                // when the user actually requests it they still get the profile
-                // picture for the correct theme.
-                $path .= $page->theme->name.'/';
-            }
-            // Set the image URL to the URL for the uploaded file and return.
-            $url = moodle_url::make_pluginfile_url(
-                $contextid, 'user', 'icon', null, $path, $filename, false, $this->includetoken);
-            $url->param('rev', $this->user->picture);
-            return $url;
-        }
-
-        if ($this->user->picture == 0 and !empty($CFG->enablegravatar)) {
-            // Normalise the size variable to acceptable bounds
-            if ($size < 1 || $size > 512) {
-                $size = 35;
-            }
-            // Hash the users email address
-            $md5 = md5(strtolower(trim($this->user->email)));
-            // Build a gravatar URL with what we know.
-
-            // Find the best default image URL we can (MDL-35669)
-            if (empty($CFG->gravatardefaulturl)) {
-                $absoluteimagepath = $page->theme->resolve_image_location('u/'.$filename, 'core');
-                if (strpos($absoluteimagepath, $CFG->dirroot) === 0) {
-                    $gravatardefault = $CFG->wwwroot . substr($absoluteimagepath, strlen($CFG->dirroot));
-                } else {
-                    $gravatardefault = $CFG->wwwroot . '/pix/u/' . $filename . '.png';
-                }
-            } else {
-                $gravatardefault = $CFG->gravatardefaulturl;
-            }
-
-            // If the currently requested page is https then we'll return an
-            // https gravatar page.
-            if (is_https()) {
-                return new moodle_url("https://secure.gravatar.com/avatar/{$md5}", array('s' => $size, 'd' => $gravatardefault));
-            } else {
-                return new moodle_url("http://www.gravatar.com/avatar/{$md5}", array('s' => $size, 'd' => $gravatardefault));
-            }
-        }
-
-        return $defaulturl;
-    }
-}
-
-/**
- * Data structure representing a help icon.
- *
- * @copyright 2010 Petr Skoda (info@skodak.org)
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class help_icon implements renderable, templatable {
-
-    /**
-     * @var string lang pack identifier (without the "_help" suffix),
-     * both get_string($identifier, $component) and get_string($identifier.'_help', $component)
-     * must exist.
-     */
-    public $identifier;
-
-    /**
-     * @var string Component name, the same as in get_string()
-     */
-    public $component;
-
-    /**
-     * @var string Extra descriptive text next to the icon
-     */
-    public $linktext = null;
-
-    /**
-     * @var mixed An object, string or number that can be used within translation strings
-     */
-    public $a = null;
-
-    /**
-     * Constructor
-     *
-     * @param string $identifier string for help page title,
-     *  string with _help suffix is used for the actual help text.
-     *  string with _link suffix is used to create a link to further info (if it exists)
-     * @param string $component
-     * @param string|object|array|int $a An object, string or number that can be used
-     *      within translation strings
-     */
-    public function __construct($identifier, $component, $a = null) {
-        $this->identifier = $identifier;
-        $this->component  = $component;
-        $this->a = $a;
-    }
-
-    /**
-     * Verifies that both help strings exists, shows debug warnings if not
-     */
-    public function diag_strings() {
-        $sm = get_string_manager();
-        if (!$sm->string_exists($this->identifier, $this->component)) {
-            debugging("Help title string does not exist: [$this->identifier, $this->component]");
-        }
-        if (!$sm->string_exists($this->identifier.'_help', $this->component)) {
-            debugging("Help contents string does not exist: [{$this->identifier}_help, $this->component]");
-        }
-    }
-
-    /**
-     * Export this data so it can be used as the context for a mustache template.
-     *
-     * @param renderer_base $output Used to do a final render of any components that need to be rendered for export.
-     * @return stdClass
-     */
-    public function export_for_template(renderer_base $output) {
-        global $CFG;
-
-        $title = get_string($this->identifier, $this->component, $this->a);
-
-        if (empty($this->linktext)) {
-            $alt = get_string('helpprefix2', '', trim($title, ". \t"));
-        } else {
-            $alt = get_string('helpwiththis');
-        }
-
-        $data = get_formatted_help_string($this->identifier, $this->component, false, $this->a);
-
-        $data->alt = $alt;
-        $data->icon = (new pix_icon('help', $alt, 'core', ['class' => 'iconhelp']))->export_for_template($output);
-        $data->linktext = $this->linktext;
-        $data->title = get_string('helpprefix2', '', trim($title, ". \t"));
-
-        $options = [
-            'component' => $this->component,
-            'identifier' => $this->identifier,
-            'lang' => current_language()
-        ];
-
-        // Debugging feature lets you display string identifier and component.
-        if (isset($CFG->debugstringids) && $CFG->debugstringids && optional_param('strings', 0, PARAM_INT)) {
-            $options['strings'] = 1;
-        }
-
-        $data->url = (new moodle_url('/help.php', $options))->out(false);
-        $data->ltr = !right_to_left();
-        return $data;
-    }
-}
-
-
-/**
- * Data structure representing an icon font.
- *
- * @copyright 2016 Damyon Wiese
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package core
- * @category output
- */
-class pix_icon_font implements templatable {
-
-    /**
-     * @var pix_icon $pixicon The original icon.
-     */
-    private $pixicon = null;
-
-    /**
-     * @var string $key The mapped key.
-     */
-    private $key;
-
-    /**
-     * @var bool $mapped The icon could not be mapped.
-     */
-    private $mapped;
-
-    /**
-     * Constructor
-     *
-     * @param pix_icon $pixicon The original icon
-     */
-    public function __construct(pix_icon $pixicon) {
-        global $PAGE;
-
-        $this->pixicon = $pixicon;
-        $this->mapped = false;
-        $iconsystem = \core\output\icon_system::instance();
-
-        $this->key = $iconsystem->remap_icon_name($pixicon->pix, $pixicon->component);
-        if (!empty($this->key)) {
-            $this->mapped = true;
-        }
-    }
-
-    /**
-     * Return true if this pix_icon was successfully mapped to an icon font.
-     *
-     * @return bool
-     */
-    public function is_mapped() {
-        return $this->mapped;
-    }
-
-    /**
-     * Export this data so it can be used as the context for a mustache template.
-     *
-     * @param renderer_base $output Used to do a final render of any components that need to be rendered for export.
-     * @return array
-     */
-    public function export_for_template(renderer_base $output) {
-
-        $pixdata = $this->pixicon->export_for_template($output);
-
-        $title = isset($this->pixicon->attributes['title']) ? $this->pixicon->attributes['title'] : '';
-        $alt = isset($this->pixicon->attributes['alt']) ? $this->pixicon->attributes['alt'] : '';
-        if (empty($title)) {
-            $title = $alt;
-        }
-        $data = array(
-            'extraclasses' => $pixdata['extraclasses'],
-            'title' => $title,
-            'alt' => $alt,
-            'key' => $this->key
-        );
-
-        return $data;
-    }
-}
-
-/**
- * Data structure representing an icon subtype.
- *
- * @copyright 2016 Damyon Wiese
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package core
- * @category output
- */
-class pix_icon_fontawesome extends pix_icon_font {
-
-}
-
-/**
- * Data structure representing an icon.
- *
- * @copyright 2010 Petr Skoda
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class pix_icon implements renderable, templatable {
-
-    /**
-     * @var string The icon name
-     */
-    var $pix;
-
-    /**
-     * @var string The component the icon belongs to.
-     */
-    var $component;
-
-    /**
-     * @var array An array of attributes to use on the icon
-     */
-    var $attributes = array();
-
-    /**
-     * Constructor
-     *
-     * @param string $pix short icon name
-     * @param string $alt The alt text to use for the icon
-     * @param string $component component name
-     * @param array $attributes html attributes
-     */
-    public function __construct($pix, $alt, $component='moodle', array $attributes = null) {
-        global $PAGE;
-
-        $this->pix = $pix;
-        $this->component  = $component;
-        $this->attributes = (array)$attributes;
-
-        if (empty($this->attributes['class'])) {
-            $this->attributes['class'] = '';
-        }
-
-        // Set an additional class for big icons so that they can be styled properly.
-        if (substr($pix, 0, 2) === 'b/') {
-            $this->attributes['class'] .= ' iconsize-big';
-        }
-
-        // If the alt is empty, don't place it in the attributes, otherwise it will override parent alt text.
-        if (!is_null($alt)) {
-            $this->attributes['alt'] = $alt;
-
-            // If there is no title, set it to the attribute.
-            if (!isset($this->attributes['title'])) {
-                $this->attributes['title'] = $this->attributes['alt'];
-            }
-        } else {
-            unset($this->attributes['alt']);
-        }
-
-        if (empty($this->attributes['title'])) {
-            // Remove the title attribute if empty, we probably want to use the parent node's title
-            // and some browsers might overwrite it with an empty title.
-            unset($this->attributes['title']);
-        }
-
-        // Hide icons from screen readers that have no alt.
-        if (empty($this->attributes['alt'])) {
-            $this->attributes['aria-hidden'] = 'true';
-        }
-    }
-
-    /**
-     * Export this data so it can be used as the context for a mustache template.
-     *
-     * @param renderer_base $output Used to do a final render of any components that need to be rendered for export.
-     * @return array
-     */
-    public function export_for_template(renderer_base $output) {
-        $attributes = $this->attributes;
-        $extraclasses = '';
-
-        foreach ($attributes as $key => $item) {
-            if ($key == 'class') {
-                $extraclasses = $item;
-                unset($attributes[$key]);
-                break;
-            }
-        }
-
-        $attributes['src'] = $output->image_url($this->pix, $this->component)->out(false);
-        $templatecontext = array();
-        foreach ($attributes as $name => $value) {
-            $templatecontext[] = array('name' => $name, 'value' => $value);
-        }
-        $title = isset($attributes['title']) ? $attributes['title'] : '';
-        if (empty($title)) {
-            $title = isset($attributes['alt']) ? $attributes['alt'] : '';
-        }
-        $data = array(
-            'attributes' => $templatecontext,
-            'extraclasses' => $extraclasses
-        );
-
-        return $data;
-    }
-
-    /**
-     * Much simpler version of export that will produce the data required to render this pix with the
-     * pix helper in a mustache tag.
-     *
-     * @return array
-     */
-    public function export_for_pix() {
-        $title = isset($this->attributes['title']) ? $this->attributes['title'] : '';
-        if (empty($title)) {
-            $title = isset($this->attributes['alt']) ? $this->attributes['alt'] : '';
-        }
-        return [
-            'key' => $this->pix,
-            'component' => $this->component,
-            'title' => (string) $title,
-        ];
-    }
-}
-
-/**
- * Data structure representing an activity icon.
- *
- * The difference is that activity icons will always render with the standard icon system (no font icons).
- *
- * @copyright 2017 Damyon Wiese
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package core
- */
-class image_icon extends pix_icon {
-}
-
-/**
- * Data structure representing an emoticon image
- *
- * @copyright 2010 David Mudrak
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class pix_emoticon extends pix_icon implements renderable {
-
-    /**
-     * Constructor
-     * @param string $pix short icon name
-     * @param string $alt alternative text
-     * @param string $component emoticon image provider
-     * @param array $attributes explicit HTML attributes
-     */
-    public function __construct($pix, $alt, $component = 'moodle', array $attributes = array()) {
-        if (empty($attributes['class'])) {
-            $attributes['class'] = 'emoticon';
-        }
-        parent::__construct($pix, $alt, $component, $attributes);
-    }
-}
-
-/**
- * Data structure representing a simple form with only one button.
- *
- * @copyright 2009 Petr Skoda
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class single_button implements renderable {
-
-    /**
-     * Possible button types. From boostrap.
-     */
-    const BUTTON_TYPES = [
-        self::BUTTON_PRIMARY,
-        self::BUTTON_SECONDARY,
-        self::BUTTON_SUCCESS,
-        self::BUTTON_DANGER,
-        self::BUTTON_WARNING,
-        self::BUTTON_INFO
-    ];
-
-    /**
-     * Possible button types - Primary.
-     */
-    const BUTTON_PRIMARY = 'primary';
-    /**
-     * Possible button types - Secondary.
-     */
-    const BUTTON_SECONDARY = 'secondary';
-    /**
-     * Possible button types - Danger.
-     */
-    const BUTTON_DANGER = 'danger';
-    /**
-     * Possible button types - Success.
-     */
-    const BUTTON_SUCCESS = 'success';
-    /**
-     * Possible button types - Warning.
-     */
-    const BUTTON_WARNING = 'warning';
-    /**
-     * Possible button types - Info.
-     */
-    const BUTTON_INFO = 'info';
-
-    /**
-     * @var moodle_url Target url
-     */
-    public $url;
-
-    /**
-     * @var string Button label
-     */
-    public $label;
-
-    /**
-     * @var string Form submit method post or get
-     */
-    public $method = 'post';
-
-    /**
-     * @var string Wrapping div class
-     */
-    public $class = 'singlebutton';
-
-    /**
-     * @var string Type of button (from defined types). Used for styling.
-     */
-    protected $type;
-
-    /**
-     * @var bool True if button is primary button. Used for styling.
-     * @deprecated since Moodle 4.2
-     */
-    private $primary = false;
-
-    /**
-     * @var bool True if button disabled, false if normal
-     */
-    public $disabled = false;
-
-    /**
-     * @var string Button tooltip
-     */
-    public $tooltip = null;
-
-    /**
-     * @var string Form id
-     */
-    public $formid;
-
-    /**
-     * @var array List of attached actions
-     */
-    public $actions = array();
-
-    /**
-     * @var array $params URL Params
-     */
-    public $params;
-
-    /**
-     * @var string Action id
-     */
-    public $actionid;
-
-    /**
-     * @var array
-     */
-    protected $attributes = [];
-
-    /**
-     * Constructor
-     *
-     * @param moodle_url $url
-     * @param string $label button text
-     * @param string $method get or post submit method
-     * @param string $type whether this is a primary button or another type, used for styling
-     * @param array $attributes Attributes for the HTML button tag
-     */
-    public function __construct(moodle_url $url, $label, $method = 'post', $type = self::BUTTON_SECONDARY,
-        $attributes = []) {
-        if (is_bool($type)) {
-            debugging('The boolean $primary is deprecated and replaced by $type,
-            use single_button::BUTTON_PRIMARY or self::BUTTON_SECONDARY instead');
-            $type = $type ? self::BUTTON_PRIMARY : self::BUTTON_SECONDARY;
-        }
-        $this->url = clone($url);
-        $this->label = $label;
-        $this->method = $method;
-        $this->type = $type;
-        $this->attributes = $attributes;
-    }
-
-    /**
-     * Shortcut for adding a JS confirm dialog when the button is clicked.
-     * The message must be a yes/no question.
-     *
-     * @param string $confirmmessage The yes/no confirmation question. If "Yes" is clicked, the original action will occur.
-     */
-    public function add_confirm_action($confirmmessage) {
-        $this->add_action(new confirm_action($confirmmessage));
-    }
-
-    /**
-     * Add action to the button.
-     * @param component_action $action
-     */
-    public function add_action(component_action $action) {
-        $this->actions[] = $action;
-    }
-
-    /**
-     * Sets an attribute for the HTML button tag.
-     *
-     * @param  string $name  The attribute name
-     * @param  mixed  $value The value
-     * @return null
-     */
-    public function set_attribute($name, $value) {
-        $this->attributes[$name] = $value;
-    }
-
-    /**
-     * Magic setter method.
-     *
-     * This method manages access to some properties and will display deprecation message when accessing 'primary' property.
-     *
-     * @param string $name
-     * @param mixed $value
-     */
-    public function __set($name, $value) {
-        switch ($name) {
-            case 'primary':
-                debugging('The primary field is deprecated, use the type field instead');
-                // Here just in case we modified the primary field from outside {@see \mod_quiz_renderer::summary_page_controls}.
-                $this->type = $value ? self::BUTTON_PRIMARY : self::BUTTON_SECONDARY;
-                break;
-            case 'type':
-                $this->type = in_array($value, self::BUTTON_TYPES) ? $value : self::BUTTON_SECONDARY;
-                break;
-            default:
-                $this->$name = $value;
-        }
-    }
-
-    /**
-     * Magic method getter.
-     *
-     * This method manages access to some properties and will display deprecation message when accessing 'primary' property.
-     *
-     * @param string $name
-     * @return mixed
-     */
-    public function __get($name) {
-        switch ($name) {
-            case 'primary':
-                debugging('The primary field is deprecated, use type field instead');
-                return $this->type == self::BUTTON_PRIMARY;
-            case 'type':
-                return $this->type;
-            default:
-                return $this->$name;
-        }
-    }
-
-    /**
-     * Export data.
-     *
-     * @param renderer_base $output Renderer.
-     * @return stdClass
-     */
-    public function export_for_template(renderer_base $output) {
-        $url = $this->method === 'get' ? $this->url->out_omit_querystring(true) : $this->url->out_omit_querystring();
-
-        $data = new stdClass();
-        $data->id = html_writer::random_id('single_button');
-        $data->formid = $this->formid;
-        $data->method = $this->method;
-        $data->url = $url === '' ? '#' : $url;
-        $data->label = $this->label;
-        $data->classes = $this->class;
-        $data->disabled = $this->disabled;
-        $data->tooltip = $this->tooltip;
-        $data->type = $this->type;
-        $data->attributes = [];
-        foreach ($this->attributes as $key => $value) {
-            $data->attributes[] = ['name' => $key, 'value' => $value];
-        }
-
-        // Form parameters.
-        $actionurl = new moodle_url($this->url);
-        if ($this->method === 'post') {
-            $actionurl->param('sesskey', sesskey());
-        }
-        $data->params = $actionurl->export_params_for_template();
-
-        // Button actions.
-        $actions = $this->actions;
-        $data->actions = array_map(function($action) use ($output) {
-            return $action->export_for_template($output);
-        }, $actions);
-        $data->hasactions = !empty($data->actions);
-
-        return $data;
-    }
-}
-
-
-/**
- * Simple form with just one select field that gets submitted automatically.
- *
- * If JS not enabled small go button is printed too.
- *
- * @copyright 2009 Petr Skoda
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class single_select implements renderable, templatable {
-
-    /**
-     * @var moodle_url Target url - includes hidden fields
-     */
-    var $url;
-
-    /**
-     * @var string Name of the select element.
-     */
-    var $name;
-
-    /**
-     * @var array $options associative array value=>label ex.: array(1=>'One, 2=>Two)
-     *     it is also possible to specify optgroup as complex label array ex.:
-     *         array(array('Odd'=>array(1=>'One', 3=>'Three)), array('Even'=>array(2=>'Two')))
-     *         array(1=>'One', '--1uniquekey'=>array('More'=>array(2=>'Two', 3=>'Three')))
-     */
-    var $options;
-
-    /**
-     * @var string Selected option
-     */
-    var $selected;
-
-    /**
-     * @var array Nothing selected
-     */
-    var $nothing;
-
-    /**
-     * @var array Extra select field attributes
-     */
-    var $attributes = array();
-
-    /**
-     * @var string Button label
-     */
-    var $label = '';
-
-    /**
-     * @var array Button label's attributes
-     */
-    var $labelattributes = array();
-
-    /**
-     * @var string Form submit method post or get
-     */
-    var $method = 'get';
-
-    /**
-     * @var string Wrapping div class
-     */
-    var $class = 'singleselect';
-
-    /**
-     * @var bool True if button disabled, false if normal
-     */
-    var $disabled = false;
-
-    /**
-     * @var string Button tooltip
-     */
-    var $tooltip = null;
-
-    /**
-     * @var string Form id
-     */
-    var $formid = null;
-
-    /**
-     * @var help_icon The help icon for this element.
-     */
-    var $helpicon = null;
-
-    /** @var component_action[] component action. */
-    public $actions = [];
-
-    /**
-     * Constructor
-     * @param moodle_url $url form action target, includes hidden fields
-     * @param string $name name of selection field - the changing parameter in url
-     * @param array $options list of options
-     * @param string $selected selected element
-     * @param ?array $nothing
-     * @param string $formid
-     */
-    public function __construct(moodle_url $url, $name, array $options, $selected = '', $nothing = array('' => 'choosedots'), $formid = null) {
-        $this->url      = $url;
-        $this->name     = $name;
-        $this->options  = $options;
-        $this->selected = $selected;
-        $this->nothing  = $nothing;
-        $this->formid   = $formid;
-    }
-
-    /**
-     * Shortcut for adding a JS confirm dialog when the button is clicked.
-     * The message must be a yes/no question.
-     *
-     * @param string $confirmmessage The yes/no confirmation question. If "Yes" is clicked, the original action will occur.
-     */
-    public function add_confirm_action($confirmmessage) {
-        $this->add_action(new component_action('submit', 'M.util.show_confirm_dialog', array('message' => $confirmmessage)));
-    }
-
-    /**
-     * Add action to the button.
-     *
-     * @param component_action $action
-     */
-    public function add_action(component_action $action) {
-        $this->actions[] = $action;
-    }
-
-    /**
-     * Adds help icon.
-     *
-     * @deprecated since Moodle 2.0
-     */
-    public function set_old_help_icon($helppage, $title, $component = 'moodle') {
-        throw new coding_exception('set_old_help_icon() can not be used any more, please see set_help_icon().');
-    }
-
-    /**
-     * Adds help icon.
-     *
-     * @param string $identifier The keyword that defines a help page
-     * @param string $component
-     */
-    public function set_help_icon($identifier, $component = 'moodle') {
-        $this->helpicon = new help_icon($identifier, $component);
-    }
-
-    /**
-     * Sets select's label
-     *
-     * @param string $label
-     * @param array $attributes (optional)
-     */
-    public function set_label($label, $attributes = array()) {
-        $this->label = $label;
-        $this->labelattributes = $attributes;
-
-    }
-
-    /**
-     * Export data.
-     *
-     * @param renderer_base $output Renderer.
-     * @return stdClass
-     */
-    public function export_for_template(renderer_base $output) {
-        $attributes = $this->attributes;
-
-        $data = new stdClass();
-        $data->name = $this->name;
-        $data->method = $this->method;
-        $data->action = $this->method === 'get' ? $this->url->out_omit_querystring(true) : $this->url->out_omit_querystring();
-        $data->classes = $this->class;
-        $data->label = $this->label;
-        $data->disabled = $this->disabled;
-        $data->title = $this->tooltip;
-        $data->formid = !empty($this->formid) ? $this->formid : html_writer::random_id('single_select_f');
-        $data->id = !empty($attributes['id']) ? $attributes['id'] : html_writer::random_id('single_select');
-
-        // Select element attributes.
-        // Unset attributes that are already predefined in the template.
-        unset($attributes['id']);
-        unset($attributes['class']);
-        unset($attributes['name']);
-        unset($attributes['title']);
-        unset($attributes['disabled']);
-
-        // Map the attributes.
-        $data->attributes = array_map(function($key) use ($attributes) {
-            return ['name' => $key, 'value' => $attributes[$key]];
-        }, array_keys($attributes));
-
-        // Form parameters.
-        $actionurl = new moodle_url($this->url);
-        if ($this->method === 'post') {
-            $actionurl->param('sesskey', sesskey());
-        }
-        $data->params = $actionurl->export_params_for_template();
-
-        // Select options.
-        $hasnothing = false;
-        if (is_string($this->nothing) && $this->nothing !== '') {
-            $nothing = ['' => $this->nothing];
-            $hasnothing = true;
-            $nothingkey = '';
-        } else if (is_array($this->nothing)) {
-            $nothingvalue = reset($this->nothing);
-            if ($nothingvalue === 'choose' || $nothingvalue === 'choosedots') {
-                $nothing = [key($this->nothing) => get_string('choosedots')];
-            } else {
-                $nothing = $this->nothing;
-            }
-            $hasnothing = true;
-            $nothingkey = key($this->nothing);
-        }
-        if ($hasnothing) {
-            $options = $nothing + $this->options;
-        } else {
-            $options = $this->options;
-        }
-
-        foreach ($options as $value => $name) {
-            if (is_array($options[$value])) {
-                foreach ($options[$value] as $optgroupname => $optgroupvalues) {
-                    $sublist = [];
-                    foreach ($optgroupvalues as $optvalue => $optname) {
-                        $option = [
-                            'value' => $optvalue,
-                            'name' => $optname,
-                            'selected' => strval($this->selected) === strval($optvalue),
-                        ];
-
-                        if ($hasnothing && $nothingkey === $optvalue) {
-                            $option['ignore'] = 'data-ignore';
-                        }
-
-                        $sublist[] = $option;
-                    }
-                    $data->options[] = [
-                        'name' => $optgroupname,
-                        'optgroup' => true,
-                        'options' => $sublist
-                    ];
-                }
-            } else {
-                $option = [
-                    'value' => $value,
-                    'name' => $options[$value],
-                    'selected' => strval($this->selected) === strval($value),
-                    'optgroup' => false
-                ];
-
-                if ($hasnothing && $nothingkey === $value) {
-                    $option['ignore'] = 'data-ignore';
-                }
-
-                $data->options[] = $option;
-            }
-        }
-
-        // Label attributes.
-        $data->labelattributes = [];
-        // Unset label attributes that are already in the template.
-        unset($this->labelattributes['for']);
-        // Map the label attributes.
-        foreach ($this->labelattributes as $key => $value) {
-            $data->labelattributes[] = ['name' => $key, 'value' => $value];
-        }
-
-        // Help icon.
-        $data->helpicon = !empty($this->helpicon) ? $this->helpicon->export_for_template($output) : false;
-
-        return $data;
-    }
-}
-
-/**
- * Simple URL selection widget description.
- *
- * @copyright 2009 Petr Skoda
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class url_select implements renderable, templatable {
-    /**
-     * @var array $urls associative array value=>label ex.: array(1=>'One, 2=>Two)
-     *     it is also possible to specify optgroup as complex label array ex.:
-     *         array(array('Odd'=>array(1=>'One', 3=>'Three)), array('Even'=>array(2=>'Two')))
-     *         array(1=>'One', '--1uniquekey'=>array('More'=>array(2=>'Two', 3=>'Three')))
-     */
-    var $urls;
-
-    /**
-     * @var string Selected option
-     */
-    var $selected;
-
-    /**
-     * @var array Nothing selected
-     */
-    var $nothing;
-
-    /**
-     * @var array Extra select field attributes
-     */
-    var $attributes = array();
-
-    /**
-     * @var string Button label
-     */
-    var $label = '';
-
-    /**
-     * @var array Button label's attributes
-     */
-    var $labelattributes = array();
-
-    /**
-     * @var string Wrapping div class
-     */
-    var $class = 'urlselect';
-
-    /**
-     * @var bool True if button disabled, false if normal
-     */
-    var $disabled = false;
-
-    /**
-     * @var string Button tooltip
-     */
-    var $tooltip = null;
-
-    /**
-     * @var string Form id
-     */
-    var $formid = null;
-
-    /**
-     * @var help_icon The help icon for this element.
-     */
-    var $helpicon = null;
-
-    /**
-     * @var string If set, makes button visible with given name for button
-     */
-    var $showbutton = null;
-
-    /**
-     * Constructor
-     * @param array $urls list of options
-     * @param string $selected selected element
-     * @param array $nothing
-     * @param string $formid
-     * @param string $showbutton Set to text of button if it should be visible
-     *   or null if it should be hidden (hidden version always has text 'go')
-     */
-    public function __construct(array $urls, $selected = '', $nothing = array('' => 'choosedots'), $formid = null, $showbutton = null) {
-        $this->urls       = $urls;
-        $this->selected   = $selected;
-        $this->nothing    = $nothing;
-        $this->formid     = $formid;
-        $this->showbutton = $showbutton;
-    }
-
-    /**
-     * Adds help icon.
-     *
-     * @deprecated since Moodle 2.0
-     */
-    public function set_old_help_icon($helppage, $title, $component = 'moodle') {
-        throw new coding_exception('set_old_help_icon() can not be used any more, please see set_help_icon().');
-    }
-
-    /**
-     * Adds help icon.
-     *
-     * @param string $identifier The keyword that defines a help page
-     * @param string $component
-     */
-    public function set_help_icon($identifier, $component = 'moodle') {
-        $this->helpicon = new help_icon($identifier, $component);
-    }
-
-    /**
-     * Sets select's label
-     *
-     * @param string $label
-     * @param array $attributes (optional)
-     */
-    public function set_label($label, $attributes = array()) {
-        $this->label = $label;
-        $this->labelattributes = $attributes;
-    }
-
-    /**
-     * Clean a URL.
-     *
-     * @param string $value The URL.
-     * @return string The cleaned URL.
-     */
-    protected function clean_url($value) {
-        global $CFG;
-
-        if (empty($value)) {
-            // Nothing.
-
-        } else if (strpos($value, $CFG->wwwroot . '/') === 0) {
-            $value = str_replace($CFG->wwwroot, '', $value);
-
-        } else if (strpos($value, '/') !== 0) {
-            debugging("Invalid url_select urls parameter: url '$value' is not local relative url!", DEBUG_DEVELOPER);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Flatten the options for Mustache.
-     *
-     * This also cleans the URLs.
-     *
-     * @param array $options The options.
-     * @param array $nothing The nothing option.
-     * @return array
-     */
-    protected function flatten_options($options, $nothing) {
-        $flattened = [];
-
-        foreach ($options as $value => $option) {
-            if (is_array($option)) {
-                foreach ($option as $groupname => $optoptions) {
-                    if (!isset($flattened[$groupname])) {
-                        $flattened[$groupname] = [
-                            'name' => $groupname,
-                            'isgroup' => true,
-                            'options' => []
-                        ];
-                    }
-                    foreach ($optoptions as $optvalue => $optoption) {
-                        $cleanedvalue = $this->clean_url($optvalue);
-                        $flattened[$groupname]['options'][$cleanedvalue] = [
-                            'name' => $optoption,
-                            'value' => $cleanedvalue,
-                            'selected' => $this->selected == $optvalue,
-                        ];
-                    }
-                }
-
-            } else {
-                $cleanedvalue = $this->clean_url($value);
-                $flattened[$cleanedvalue] = [
-                    'name' => $option,
-                    'value' => $cleanedvalue,
-                    'selected' => $this->selected == $value,
-                ];
-            }
-        }
-
-        if (!empty($nothing)) {
-            $value = key($nothing);
-            $name = reset($nothing);
-            $flattened = [
-                    $value => ['name' => $name, 'value' => $value, 'selected' => $this->selected == $value]
-                ] + $flattened;
-        }
-
-        // Make non-associative array.
-        foreach ($flattened as $key => $value) {
-            if (!empty($value['options'])) {
-                $flattened[$key]['options'] = array_values($value['options']);
-            }
-        }
-        $flattened = array_values($flattened);
-
-        return $flattened;
-    }
-
-    /**
-     * Export for template.
-     *
-     * @param renderer_base $output Renderer.
-     * @return stdClass
-     */
-    public function export_for_template(renderer_base $output) {
-        $attributes = $this->attributes;
-
-        $data = new stdClass();
-        $data->formid = !empty($this->formid) ? $this->formid : html_writer::random_id('url_select_f');
-        $data->classes = $this->class;
-        $data->label = $this->label;
-        $data->disabled = $this->disabled;
-        $data->title = $this->tooltip;
-        $data->id = !empty($attributes['id']) ? $attributes['id'] : html_writer::random_id('url_select');
-        $data->sesskey = sesskey();
-        $data->action = (new moodle_url('/course/jumpto.php'))->out(false);
-
-        // Remove attributes passed as property directly.
-        unset($attributes['class']);
-        unset($attributes['id']);
-        unset($attributes['name']);
-        unset($attributes['title']);
-        unset($attributes['disabled']);
-
-        $data->showbutton = $this->showbutton;
-
-        // Select options.
-        $nothing = false;
-        if (is_string($this->nothing) && $this->nothing !== '') {
-            $nothing = ['' => $this->nothing];
-        } else if (is_array($this->nothing)) {
-            $nothingvalue = reset($this->nothing);
-            if ($nothingvalue === 'choose' || $nothingvalue === 'choosedots') {
-                $nothing = [key($this->nothing) => get_string('choosedots')];
-            } else {
-                $nothing = $this->nothing;
-            }
-        }
-        $data->options = $this->flatten_options($this->urls, $nothing);
-
-        // Label attributes.
-        $data->labelattributes = [];
-        // Unset label attributes that are already in the template.
-        unset($this->labelattributes['for']);
-        // Map the label attributes.
-        foreach ($this->labelattributes as $key => $value) {
-            $data->labelattributes[] = ['name' => $key, 'value' => $value];
-        }
-
-        // Help icon.
-        $data->helpicon = !empty($this->helpicon) ? $this->helpicon->export_for_template($output) : false;
-
-        // Finally all the remaining attributes.
-        $data->attributes = [];
-        foreach ($attributes as $key => $value) {
-            $data->attributes[] = ['name' => $key, 'value' => $value];
-        }
-
-        return $data;
-    }
-}
-
-/**
- * Data structure describing html link with special action attached.
- *
- * @copyright 2010 Petr Skoda
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class action_link implements renderable {
-
-    /**
-     * @var moodle_url Href url
-     */
-    public $url;
-
-    /**
-     * @var string Link text HTML fragment
-     */
-    public $text;
-
-    /**
-     * @var array HTML attributes
-     */
-    public $attributes;
-
-    /**
-     * @var array List of actions attached to link
-     */
-    public $actions;
-
-    /**
-     * @var pix_icon Optional pix icon to render with the link
-     */
-    public $icon;
-
-    /**
-     * Constructor
-     * @param moodle_url $url
-     * @param string $text HTML fragment
-     * @param component_action $action
-     * @param array $attributes associative array of html link attributes + disabled
-     * @param pix_icon $icon optional pix_icon to render with the link text
-     */
-    public function __construct(moodle_url $url,
-        $text,
-        component_action $action=null,
-        array $attributes=null,
-        pix_icon $icon=null) {
-        $this->url = clone($url);
-        $this->text = $text;
-        if (empty($attributes['id'])) {
-            $attributes['id'] = html_writer::random_id('action_link');
-        }
-        $this->attributes = (array)$attributes;
-        if ($action) {
-            $this->add_action($action);
-        }
-        $this->icon = $icon;
-    }
-
-    /**
-     * Add action to the link.
-     *
-     * @param component_action $action
-     */
-    public function add_action(component_action $action) {
-        $this->actions[] = $action;
-    }
-
-    /**
-     * Adds a CSS class to this action link object
-     * @param string $class
-     */
-    public function add_class($class) {
-        if (empty($this->attributes['class'])) {
-            $this->attributes['class'] = $class;
-        } else {
-            $this->attributes['class'] .= ' ' . $class;
-        }
-    }
-
-    /**
-     * Returns true if the specified class has been added to this link.
-     * @param string $class
-     * @return bool
-     */
-    public function has_class($class) {
-        return strpos(' ' . $this->attributes['class'] . ' ', ' ' . $class . ' ') !== false;
-    }
-
-    /**
-     * Return the rendered HTML for the icon. Useful for rendering action links in a template.
-     * @return string
-     */
-    public function get_icon_html() {
-        global $OUTPUT;
-        if (!$this->icon) {
-            return '';
-        }
-        return $OUTPUT->render($this->icon);
-    }
-
-    /**
-     * Export for template.
-     *
-     * @param renderer_base $output The renderer.
-     * @return stdClass
-     */
-    public function export_for_template(renderer_base $output) {
-        $data = new stdClass();
-        $attributes = $this->attributes;
-
-        $data->id = $attributes['id'];
-        unset($attributes['id']);
-
-        $data->disabled = !empty($attributes['disabled']);
-        unset($attributes['disabled']);
-
-        $data->text = $this->text instanceof renderable ? $output->render($this->text) : (string) $this->text;
-        $data->url = $this->url ? $this->url->out(false) : '';
-        $data->icon = $this->icon ? $this->icon->export_for_pix() : null;
-        $data->classes = isset($attributes['class']) ? $attributes['class'] : '';
-        unset($attributes['class']);
-
-        $data->attributes = array_map(function($key, $value) {
-            return [
-                'name' => $key,
-                'value' => $value
-            ];
-        }, array_keys($attributes), $attributes);
-
-        $data->actions = array_map(function($action) use ($output) {
-            return $action->export_for_template($output);
-        }, !empty($this->actions) ? $this->actions : []);
-        $data->hasactions = !empty($this->actions);
-
-        return $data;
-    }
-}
-
-/**
- * Simple html output class
- *
- * @copyright 2009 Tim Hunt, 2010 Petr Skoda
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class html_writer {
-
-    /**
-     * Outputs a tag with attributes and contents
-     *
-     * @param string $tagname The name of tag ('a', 'img', 'span' etc.)
-     * @param string $contents What goes between the opening and closing tags
-     * @param array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
-     * @return string HTML fragment
-     */
-    public static function tag($tagname, $contents, array $attributes = null) {
-        return self::start_tag($tagname, $attributes) . $contents . self::end_tag($tagname);
-    }
-
-    /**
-     * Outputs an opening tag with attributes
-     *
-     * @param string $tagname The name of tag ('a', 'img', 'span' etc.)
-     * @param array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
-     * @return string HTML fragment
-     */
-    public static function start_tag($tagname, array $attributes = null) {
-        return '<' . $tagname . self::attributes($attributes) . '>';
-    }
-
-    /**
-     * Outputs a closing tag
-     *
-     * @param string $tagname The name of tag ('a', 'img', 'span' etc.)
-     * @return string HTML fragment
-     */
-    public static function end_tag($tagname) {
-        return '</' . $tagname . '>';
-    }
-
-    /**
-     * Outputs an empty tag with attributes
-     *
-     * @param string $tagname The name of tag ('input', 'img', 'br' etc.)
-     * @param array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
-     * @return string HTML fragment
-     */
-    public static function empty_tag($tagname, array $attributes = null) {
-        return '<' . $tagname . self::attributes($attributes) . ' />';
-    }
-
-    /**
-     * Outputs a tag, but only if the contents are not empty
-     *
-     * @param string $tagname The name of tag ('a', 'img', 'span' etc.)
-     * @param string $contents What goes between the opening and closing tags
-     * @param array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
-     * @return string HTML fragment
-     */
-    public static function nonempty_tag($tagname, $contents, array $attributes = null) {
-        if ($contents === '' || is_null($contents)) {
-            return '';
-        }
-        return self::tag($tagname, $contents, $attributes);
-    }
-
-    /**
-     * Outputs a HTML attribute and value
-     *
-     * @param string $name The name of the attribute ('src', 'href', 'class' etc.)
-     * @param string $value The value of the attribute. The value will be escaped with {@link s()}
-     * @return string HTML fragment
-     */
-    public static function attribute($name, $value) {
-        if ($value instanceof moodle_url) {
-            return ' ' . $name . '="' . $value->out() . '"';
-        }
-
-        // special case, we do not want these in output
-        if ($value === null) {
-            return '';
-        }
-
-        // no sloppy trimming here!
-        return ' ' . $name . '="' . s($value) . '"';
-    }
-
-    /**
-     * Outputs a list of HTML attributes and values
-     *
-     * @param array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
-     *       The values will be escaped with {@link s()}
-     * @return string HTML fragment
-     */
-    public static function attributes(array $attributes = null) {
-        $attributes = (array)$attributes;
-        $output = '';
-        foreach ($attributes as $name => $value) {
-            $output .= self::attribute($name, $value);
-        }
-        return $output;
-    }
-
-    /**
-     * Generates a simple image tag with attributes.
-     *
-     * @param string $src The source of image
-     * @param string $alt The alternate text for image
-     * @param array $attributes The tag attributes (array('height' => $max_height, 'class' => 'class1') etc.)
-     * @return string HTML fragment
-     */
-    public static function img($src, $alt, array $attributes = null) {
-        $attributes = (array)$attributes;
-        $attributes['src'] = $src;
-        // In case a null alt text is provided, set it to an empty string.
-        $attributes['alt'] = $alt ?? '';
-        if (array_key_exists('role', $attributes) && core_text::strtolower($attributes['role']) === 'presentation') {
-            // A presentation role is not necessary for the img tag.
-            // If a non-empty alt text is provided, the presentation role will conflict with the alt text.
-            // An empty alt text denotes a decorative image. The presence of a presentation role is redundant.
-            unset($attributes['role']);
-            debugging('The presentation role is not necessary for an img tag.', DEBUG_DEVELOPER);
-        }
-
-        return self::empty_tag('img', $attributes);
-    }
-
-    /**
-     * Generates random html element id.
-     *
-     * @staticvar int $counter
-     * @staticvar string $uniq
-     * @param string $base A string fragment that will be included in the random ID.
-     * @return string A unique ID
-     */
-    public static function random_id($base='random') {
-        static $counter = 0;
-        static $uniq;
-
-        if (!isset($uniq)) {
-            $uniq = uniqid();
-        }
-
-        $counter++;
-        return $base.$uniq.$counter;
-    }
-
-    /**
-     * Generates a simple html link
-     *
-     * @param string|moodle_url $url The URL
-     * @param string $text The text
-     * @param array $attributes HTML attributes
-     * @return string HTML fragment
-     */
-    public static function link($url, $text, array $attributes = null) {
-        $attributes = (array)$attributes;
-        $attributes['href']  = $url;
-        return self::tag('a', $text, $attributes);
-    }
-
-    /**
-     * Generates a simple checkbox with optional label
-     *
-     * @param string $name The name of the checkbox
-     * @param string $value The value of the checkbox
-     * @param bool $checked Whether the checkbox is checked
-     * @param string $label The label for the checkbox
-     * @param array $attributes Any attributes to apply to the checkbox
-     * @param array $labelattributes Any attributes to apply to the label, if present
-     * @return string html fragment
-     */
-    public static function checkbox($name, $value, $checked = true, $label = '',
-        array $attributes = null, array $labelattributes = null) {
-        $attributes = (array) $attributes;
-        $output = '';
-
-        if ($label !== '' and !is_null($label)) {
-            if (empty($attributes['id'])) {
-                $attributes['id'] = self::random_id('checkbox_');
-            }
-        }
-        $attributes['type']    = 'checkbox';
-        $attributes['value']   = $value;
-        $attributes['name']    = $name;
-        $attributes['checked'] = $checked ? 'checked' : null;
-
-        $output .= self::empty_tag('input', $attributes);
-
-        if ($label !== '' and !is_null($label)) {
-            $labelattributes = (array) $labelattributes;
-            $labelattributes['for'] = $attributes['id'];
-            $output .= self::tag('label', $label, $labelattributes);
-        }
-
-        return $output;
-    }
-
-    /**
-     * Generates a simple select yes/no form field
-     *
-     * @param string $name name of select element
-     * @param bool $selected
-     * @param array $attributes - html select element attributes
-     * @return string HTML fragment
-     */
-    public static function select_yes_no($name, $selected=true, array $attributes = null) {
-        $options = array('1'=>get_string('yes'), '0'=>get_string('no'));
-        return self::select($options, $name, $selected, null, $attributes);
-    }
-
-    /**
-     * Generates a simple select form field
-     *
-     * Note this function does HTML escaping on the optgroup labels, but not on the choice labels.
-     *
-     * @param array $options associative array value=>label ex.:
-     *                array(1=>'One, 2=>Two)
-     *              it is also possible to specify optgroup as complex label array ex.:
-     *                array(array('Odd'=>array(1=>'One', 3=>'Three)), array('Even'=>array(2=>'Two')))
-     *                array(1=>'One', '--1uniquekey'=>array('More'=>array(2=>'Two', 3=>'Three')))
-     * @param string $name name of select element
-     * @param string|array $selected value or array of values depending on multiple attribute
-     * @param array|bool|null $nothing add nothing selected option, or false of not added
-     * @param array $attributes html select element attributes
-     * @return string HTML fragment
-     */
-    public static function select(array $options, $name, $selected = '', $nothing = array('' => 'choosedots'), array $attributes = null) {
-        $attributes = (array)$attributes;
-        if (is_array($nothing)) {
-            foreach ($nothing as $k=>$v) {
-                if ($v === 'choose' or $v === 'choosedots') {
-                    $nothing[$k] = get_string('choosedots');
-                }
-            }
-            $options = $nothing + $options; // keep keys, do not override
-
-        } else if (is_string($nothing) and $nothing !== '') {
-            // BC
-            $options = array(''=>$nothing) + $options;
-        }
-
-        // we may accept more values if multiple attribute specified
-        $selected = (array)$selected;
-        foreach ($selected as $k=>$v) {
-            $selected[$k] = (string)$v;
-        }
-
-        if (!isset($attributes['id'])) {
-            $id = 'menu'.$name;
-            // name may contaion [], which would make an invalid id. e.g. numeric question type editing form, assignment quickgrading
-            $id = str_replace('[', '', $id);
-            $id = str_replace(']', '', $id);
-            $attributes['id'] = $id;
-        }
-
-        if (!isset($attributes['class'])) {
-            $class = 'menu'.$name;
-            // name may contaion [], which would make an invalid class. e.g. numeric question type editing form, assignment quickgrading
-            $class = str_replace('[', '', $class);
-            $class = str_replace(']', '', $class);
-            $attributes['class'] = $class;
-        }
-        $attributes['class'] = 'select custom-select ' . $attributes['class']; // Add 'select' selector always.
-
-        $attributes['name'] = $name;
-
-        if (!empty($attributes['disabled'])) {
-            $attributes['disabled'] = 'disabled';
-        } else {
-            unset($attributes['disabled']);
-        }
-
-        $output = '';
-        foreach ($options as $value=>$label) {
-            if (is_array($label)) {
-                // ignore key, it just has to be unique
-                $output .= self::select_optgroup(key($label), current($label), $selected);
-            } else {
-                $output .= self::select_option($label, $value, $selected);
-            }
-        }
-        return self::tag('select', $output, $attributes);
-    }
-
-    /**
-     * Returns HTML to display a select box option.
-     *
-     * @param string $label The label to display as the option.
-     * @param string|int $value The value the option represents
-     * @param array $selected An array of selected options
-     * @return string HTML fragment
-     */
-    private static function select_option($label, $value, array $selected) {
-        $attributes = array();
-        $value = (string)$value;
-        if (in_array($value, $selected, true)) {
-            $attributes['selected'] = 'selected';
-        }
-        $attributes['value'] = $value;
-        return self::tag('option', $label, $attributes);
-    }
-
-    /**
-     * Returns HTML to display a select box option group.
-     *
-     * @param string $groupname The label to use for the group
-     * @param array $options The options in the group
-     * @param array $selected An array of selected values.
-     * @return string HTML fragment.
-     */
-    private static function select_optgroup($groupname, $options, array $selected) {
-        if (empty($options)) {
-            return '';
-        }
-        $attributes = array('label'=>$groupname);
-        $output = '';
-        foreach ($options as $value=>$label) {
-            $output .= self::select_option($label, $value, $selected);
-        }
-        return self::tag('optgroup', $output, $attributes);
-    }
-
-    /**
-     * This is a shortcut for making an hour selector menu.
-     *
-     * @param string $type The type of selector (years, months, days, hours, minutes)
-     * @param string $name fieldname
-     * @param int $currenttime A default timestamp in GMT
-     * @param int $step minute spacing
-     * @param array $attributes - html select element attributes
-     * @param float|int|string $timezone the timezone to use to calculate the time
-     *        {@link https://moodledev.io/docs/apis/subsystems/time#timezone}
-     * @return string HTML fragment
-     */
-    public static function select_time($type, $name, $currenttime = 0, $step = 5, array $attributes = null, $timezone = 99) {
-        global $OUTPUT;
-
-        if (!$currenttime) {
-            $currenttime = time();
-        }
-        $calendartype = \core_calendar\type_factory::get_calendar_instance();
-        $currentdate = $calendartype->timestamp_to_date_array($currenttime, $timezone);
-
-        $userdatetype = $type;
-        $timeunits = array();
-
-        switch ($type) {
-            case 'years':
-                $timeunits = $calendartype->get_years();
-                $userdatetype = 'year';
-                break;
-            case 'months':
-                $timeunits = $calendartype->get_months();
-                $userdatetype = 'month';
-                $currentdate['month'] = (int)$currentdate['mon'];
-                break;
-            case 'days':
-                $timeunits = $calendartype->get_days();
-                $userdatetype = 'mday';
-                break;
-            case 'hours':
-                for ($i=0; $i<=23; $i++) {
-                    $timeunits[$i] = sprintf("%02d",$i);
-                }
-                break;
-            case 'minutes':
-                if ($step != 1) {
-                    $currentdate['minutes'] = ceil($currentdate['minutes']/$step)*$step;
-                }
-
-                for ($i=0; $i<=59; $i+=$step) {
-                    $timeunits[$i] = sprintf("%02d",$i);
-                }
-                break;
-            default:
-                throw new coding_exception("Time type $type is not supported by html_writer::select_time().");
-        }
-
-        $attributes = (array) $attributes;
-        $data = (object) [
-            'name' => $name,
-            'id' => !empty($attributes['id']) ? $attributes['id'] : self::random_id('ts_'),
-            'label' => get_string(substr($type, 0, -1), 'form'),
-            'options' => array_map(function($value) use ($timeunits, $currentdate, $userdatetype) {
-                return [
-                    'name' => $timeunits[$value],
-                    'value' => $value,
-                    'selected' => $currentdate[$userdatetype] == $value
-                ];
-            }, array_keys($timeunits)),
-        ];
-
-        unset($attributes['id']);
-        unset($attributes['name']);
-        $data->attributes = array_map(function($name) use ($attributes) {
-            return [
-                'name' => $name,
-                'value' => $attributes[$name]
-            ];
-        }, array_keys($attributes));
-
-        return $OUTPUT->render_from_template('core/select_time', $data);
-    }
-
-    /**
-     * Shortcut for quick making of lists
-     *
-     * Note: 'list' is a reserved keyword ;-)
-     *
-     * @param array $items
-     * @param array $attributes
-     * @param string $tag ul or ol
-     * @return string
-     */
-    public static function alist(array $items, array $attributes = null, $tag = 'ul') {
-        $output = html_writer::start_tag($tag, $attributes)."\n";
-        foreach ($items as $item) {
-            $output .= html_writer::tag('li', $item)."\n";
-        }
-        $output .= html_writer::end_tag($tag);
-        return $output;
-    }
-
-    /**
-     * Returns hidden input fields created from url parameters.
-     *
-     * @param moodle_url $url
-     * @param array $exclude list of excluded parameters
-     * @return string HTML fragment
-     */
-    public static function input_hidden_params(moodle_url $url, array $exclude = null) {
-        $exclude = (array)$exclude;
-        $params = $url->params();
-        foreach ($exclude as $key) {
-            unset($params[$key]);
-        }
-
-        $output = '';
-        foreach ($params as $key => $value) {
-            $attributes = array('type'=>'hidden', 'name'=>$key, 'value'=>$value);
-            $output .= self::empty_tag('input', $attributes)."\n";
-        }
-        return $output;
-    }
-
-    /**
-     * Generate a script tag containing the the specified code.
-     *
-     * @param string $jscode the JavaScript code
-     * @param moodle_url|string $url optional url of the external script, $code ignored if specified
-     * @return string HTML, the code wrapped in <script> tags.
-     */
-    public static function script($jscode, $url=null) {
-        if ($jscode) {
-            return self::tag('script', "\n//<![CDATA[\n$jscode\n//]]>\n") . "\n";
-
-        } else if ($url) {
-            return self::tag('script', '', ['src' => $url]) . "\n";
-
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * Renders HTML table
-     *
-     * This method may modify the passed instance by adding some default properties if they are not set yet.
-     * If this is not what you want, you should make a full clone of your data before passing them to this
-     * method. In most cases this is not an issue at all so we do not clone by default for performance
-     * and memory consumption reasons.
-     *
-     * @param html_table $table data to be rendered
-     * @return string HTML code
-     */
-    public static function table(html_table $table) {
-        // prepare table data and populate missing properties with reasonable defaults
-        if (!empty($table->align)) {
-            foreach ($table->align as $key => $aa) {
-                if ($aa) {
-                    $table->align[$key] = 'text-align:'. fix_align_rtl($aa) .';';  // Fix for RTL languages
-                } else {
-                    $table->align[$key] = null;
-                }
-            }
-        }
-        if (!empty($table->size)) {
-            foreach ($table->size as $key => $ss) {
-                if ($ss) {
-                    $table->size[$key] = 'width:'. $ss .';';
-                } else {
-                    $table->size[$key] = null;
-                }
-            }
-        }
-        if (!empty($table->wrap)) {
-            foreach ($table->wrap as $key => $ww) {
-                if ($ww) {
-                    $table->wrap[$key] = 'white-space:nowrap;';
-                } else {
-                    $table->wrap[$key] = '';
-                }
-            }
-        }
-        if (!empty($table->head)) {
-            foreach ($table->head as $key => $val) {
-                if (!isset($table->align[$key])) {
-                    $table->align[$key] = null;
-                }
-                if (!isset($table->size[$key])) {
-                    $table->size[$key] = null;
-                }
-                if (!isset($table->wrap[$key])) {
-                    $table->wrap[$key] = null;
-                }
-
-            }
-        }
-        if (empty($table->attributes['class'])) {
-            $table->attributes['class'] = 'generaltable';
-        }
-        if (!empty($table->tablealign)) {
-            $table->attributes['class'] .= ' boxalign' . $table->tablealign;
-        }
-
-        // explicitly assigned properties override those defined via $table->attributes
-        $table->attributes['class'] = trim($table->attributes['class']);
-        $attributes = array_merge($table->attributes, array(
-            'id'            => $table->id,
-            'width'         => $table->width,
-            'summary'       => $table->summary,
-            'cellpadding'   => $table->cellpadding,
-            'cellspacing'   => $table->cellspacing,
-        ));
-        $output = html_writer::start_tag('table', $attributes) . "\n";
-
-        $countcols = 0;
-
-        // Output a caption if present.
-        if (!empty($table->caption)) {
-            $captionattributes = array();
-            if ($table->captionhide) {
-                $captionattributes['class'] = 'accesshide';
-            }
-            $output .= html_writer::tag(
-                'caption',
-                $table->caption,
-                $captionattributes
-            );
-        }
-
-        if (!empty($table->head)) {
-            $countcols = count($table->head);
-
-            $output .= html_writer::start_tag('thead', array()) . "\n";
-            $output .= html_writer::start_tag('tr', array()) . "\n";
-            $keys = array_keys($table->head);
-            $lastkey = end($keys);
-
-            foreach ($table->head as $key => $heading) {
-                // Convert plain string headings into html_table_cell objects
-                if (!($heading instanceof html_table_cell)) {
-                    $headingtext = $heading;
-                    $heading = new html_table_cell();
-                    $heading->text = $headingtext;
-                    $heading->header = true;
-                }
-
-                if ($heading->header !== false) {
-                    $heading->header = true;
-                }
-
-                $tagtype = 'td';
-                if ($heading->header && (string)$heading->text != '') {
-                    $tagtype = 'th';
-                }
-
-                $heading->attributes['class'] .= ' header c' . $key;
-                if (isset($table->headspan[$key]) && $table->headspan[$key] > 1) {
-                    $heading->colspan = $table->headspan[$key];
-                    $countcols += $table->headspan[$key] - 1;
-                }
-
-                if ($key == $lastkey) {
-                    $heading->attributes['class'] .= ' lastcol';
-                }
-                if (isset($table->colclasses[$key])) {
-                    $heading->attributes['class'] .= ' ' . $table->colclasses[$key];
-                }
-                $heading->attributes['class'] = trim($heading->attributes['class']);
-                $attributes = array_merge($heading->attributes, [
-                    'style'     => $table->align[$key] . $table->size[$key] . $heading->style,
-                    'colspan'   => $heading->colspan,
-                ]);
-
-                if ($tagtype == 'th') {
-                    $attributes['scope'] = !empty($heading->scope) ? $heading->scope : 'col';
-                }
-
-                $output .= html_writer::tag($tagtype, $heading->text, $attributes) . "\n";
-            }
-            $output .= html_writer::end_tag('tr') . "\n";
-            $output .= html_writer::end_tag('thead') . "\n";
-
-            if (empty($table->data)) {
-                // For valid XHTML strict every table must contain either a valid tr
-                // or a valid tbody... both of which must contain a valid td
-                $output .= html_writer::start_tag('tbody', array('class' => 'empty'));
-                $output .= html_writer::tag('tr', html_writer::tag('td', '', array('colspan'=>count($table->head))));
-                $output .= html_writer::end_tag('tbody');
-            }
-        }
-
-        if (!empty($table->data)) {
-            $keys       = array_keys($table->data);
-            $lastrowkey = end($keys);
-            $output .= html_writer::start_tag('tbody', array());
-
-            foreach ($table->data as $key => $row) {
-                if (($row === 'hr') && ($countcols)) {
-                    $output .= html_writer::tag('td', html_writer::tag('div', '', array('class' => 'tabledivider')), array('colspan' => $countcols));
-                } else {
-                    // Convert array rows to html_table_rows and cell strings to html_table_cell objects
-                    if (!($row instanceof html_table_row)) {
-                        $newrow = new html_table_row();
-
-                        foreach ($row as $cell) {
-                            if (!($cell instanceof html_table_cell)) {
-                                $cell = new html_table_cell($cell);
-                            }
-                            $newrow->cells[] = $cell;
-                        }
-                        $row = $newrow;
-                    }
-
-                    if (isset($table->rowclasses[$key])) {
-                        $row->attributes['class'] .= ' ' . $table->rowclasses[$key];
-                    }
-
-                    if ($key == $lastrowkey) {
-                        $row->attributes['class'] .= ' lastrow';
-                    }
-
-                    // Explicitly assigned properties should override those defined in the attributes.
-                    $row->attributes['class'] = trim($row->attributes['class']);
-                    $trattributes = array_merge($row->attributes, array(
-                        'id'            => $row->id,
-                        'style'         => $row->style,
-                    ));
-                    $output .= html_writer::start_tag('tr', $trattributes) . "\n";
-                    $keys2 = array_keys($row->cells);
-                    $lastkey = end($keys2);
-
-                    $gotlastkey = false; //flag for sanity checking
-                    foreach ($row->cells as $key => $cell) {
-                        if ($gotlastkey) {
-                            //This should never happen. Why do we have a cell after the last cell?
-                            mtrace("A cell with key ($key) was found after the last key ($lastkey)");
-                        }
-
-                        if (!($cell instanceof html_table_cell)) {
-                            $mycell = new html_table_cell();
-                            $mycell->text = $cell;
-                            $cell = $mycell;
-                        }
-
-                        if (($cell->header === true) && empty($cell->scope)) {
-                            $cell->scope = 'row';
-                        }
-
-                        if (isset($table->colclasses[$key])) {
-                            $cell->attributes['class'] .= ' ' . $table->colclasses[$key];
-                        }
-
-                        $cell->attributes['class'] .= ' cell c' . $key;
-                        if ($key == $lastkey) {
-                            $cell->attributes['class'] .= ' lastcol';
-                            $gotlastkey = true;
-                        }
-                        $tdstyle = '';
-                        $tdstyle .= isset($table->align[$key]) ? $table->align[$key] : '';
-                        $tdstyle .= isset($table->size[$key]) ? $table->size[$key] : '';
-                        $tdstyle .= isset($table->wrap[$key]) ? $table->wrap[$key] : '';
-                        $cell->attributes['class'] = trim($cell->attributes['class']);
-                        $tdattributes = array_merge($cell->attributes, array(
-                            'style' => $tdstyle . $cell->style,
-                            'colspan' => $cell->colspan,
-                            'rowspan' => $cell->rowspan,
-                            'id' => $cell->id,
-                            'abbr' => $cell->abbr,
-                            'scope' => $cell->scope,
-                        ));
-                        $tagtype = 'td';
-                        if ($cell->header === true) {
-                            $tagtype = 'th';
-                        }
-                        $output .= html_writer::tag($tagtype, $cell->text, $tdattributes) . "\n";
-                    }
-                }
-                $output .= html_writer::end_tag('tr') . "\n";
-            }
-            $output .= html_writer::end_tag('tbody') . "\n";
-        }
-        $output .= html_writer::end_tag('table') . "\n";
-
-        if ($table->responsive) {
-            return self::div($output, 'table-responsive');
-        }
-
-        return $output;
-    }
-
-    /**
-     * Renders form element label
-     *
-     * By default, the label is suffixed with a label separator defined in the
-     * current language pack (colon by default in the English lang pack).
-     * Adding the colon can be explicitly disabled if needed. Label separators
-     * are put outside the label tag itself so they are not read by
-     * screenreaders (accessibility).
-     *
-     * Parameter $for explicitly associates the label with a form control. When
-     * set, the value of this attribute must be the same as the value of
-     * the id attribute of the form control in the same document. When null,
-     * the label being defined is associated with the control inside the label
-     * element.
-     *
-     * @param string $text content of the label tag
-     * @param string|null $for id of the element this label is associated with, null for no association
-     * @param bool $colonize add label separator (colon) to the label text, if it is not there yet
-     * @param array $attributes to be inserted in the tab, for example array('accesskey' => 'a')
-     * @return string HTML of the label element
-     */
-    public static function label($text, $for, $colonize = true, array $attributes=array()) {
-        if (!is_null($for)) {
-            $attributes = array_merge($attributes, array('for' => $for));
-        }
-        $text = trim($text ?? '');
-        $label = self::tag('label', $text, $attributes);
-
-        // TODO MDL-12192 $colonize disabled for now yet
-        // if (!empty($text) and $colonize) {
-        //     // the $text may end with the colon already, though it is bad string definition style
-        //     $colon = get_string('labelsep', 'langconfig');
-        //     if (!empty($colon)) {
-        //         $trimmed = trim($colon);
-        //         if ((substr($text, -strlen($trimmed)) == $trimmed) or (substr($text, -1) == ':')) {
-        //             //debugging('The label text should not end with colon or other label separator,
-        //             //           please fix the string definition.', DEBUG_DEVELOPER);
-        //         } else {
-        //             $label .= $colon;
-        //         }
-        //     }
-        // }
-
-        return $label;
-    }
-
-    /**
-     * Combines a class parameter with other attributes. Aids in code reduction
-     * because the class parameter is very frequently used.
-     *
-     * If the class attribute is specified both in the attributes and in the
-     * class parameter, the two values are combined with a space between.
-     *
-     * @param string $class Optional CSS class (or classes as space-separated list)
-     * @param array $attributes Optional other attributes as array
-     * @return array Attributes (or null if still none)
-     */
-    private static function add_class($class = '', array $attributes = null) {
-        if ($class !== '') {
-            $classattribute = array('class' => $class);
-            if ($attributes) {
-                if (array_key_exists('class', $attributes)) {
-                    $attributes['class'] = trim($attributes['class'] . ' ' . $class);
-                } else {
-                    $attributes = $classattribute + $attributes;
-                }
-            } else {
-                $attributes = $classattribute;
-            }
-        }
-        return $attributes;
-    }
-
-    /**
-     * Creates a <div> tag. (Shortcut function.)
-     *
-     * @param string $content HTML content of tag
-     * @param string $class Optional CSS class (or classes as space-separated list)
-     * @param array $attributes Optional other attributes as array
-     * @return string HTML code for div
-     */
-    public static function div($content, $class = '', array $attributes = null) {
-        return self::tag('div', $content, self::add_class($class, $attributes));
-    }
-
-    /**
-     * Starts a <div> tag. (Shortcut function.)
-     *
-     * @param string $class Optional CSS class (or classes as space-separated list)
-     * @param array $attributes Optional other attributes as array
-     * @return string HTML code for open div tag
-     */
-    public static function start_div($class = '', array $attributes = null) {
-        return self::start_tag('div', self::add_class($class, $attributes));
-    }
-
-    /**
-     * Ends a <div> tag. (Shortcut function.)
-     *
-     * @return string HTML code for close div tag
-     */
-    public static function end_div() {
-        return self::end_tag('div');
-    }
-
-    /**
-     * Creates a <span> tag. (Shortcut function.)
-     *
-     * @param string $content HTML content of tag
-     * @param string $class Optional CSS class (or classes as space-separated list)
-     * @param array $attributes Optional other attributes as array
-     * @return string HTML code for span
-     */
-    public static function span($content, $class = '', array $attributes = null) {
-        return self::tag('span', $content, self::add_class($class, $attributes));
-    }
-
-    /**
-     * Starts a <span> tag. (Shortcut function.)
-     *
-     * @param string $class Optional CSS class (or classes as space-separated list)
-     * @param array $attributes Optional other attributes as array
-     * @return string HTML code for open span tag
-     */
-    public static function start_span($class = '', array $attributes = null) {
-        return self::start_tag('span', self::add_class($class, $attributes));
-    }
-
-    /**
-     * Ends a <span> tag. (Shortcut function.)
-     *
-     * @return string HTML code for close span tag
-     */
-    public static function end_span() {
-        return self::end_tag('span');
-    }
-}
-
-/**
- * Simple javascript output class
- *
- * @copyright 2010 Petr Skoda
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class js_writer {
-
-    /**
-     * Returns javascript code calling the function
-     *
-     * @param string $function function name, can be complex like Y.Event.purgeElement
-     * @param array $arguments parameters
-     * @param int $delay execution delay in seconds
-     * @return string JS code fragment
-     */
-    public static function function_call($function, array $arguments = null, $delay=0) {
-        if ($arguments) {
-            $arguments = array_map('json_encode', convert_to_array($arguments));
-            $arguments = implode(', ', $arguments);
-        } else {
-            $arguments = '';
-        }
-        $js = "$function($arguments);";
-
-        if ($delay) {
-            $delay = $delay * 1000; // in miliseconds
-            $js = "setTimeout(function() { $js }, $delay);";
-        }
-        return $js . "\n";
-    }
-
-    /**
-     * Special function which adds Y as first argument of function call.
-     *
-     * @param string $function The function to call
-     * @param array $extraarguments Any arguments to pass to it
-     * @return string Some JS code
-     */
-    public static function function_call_with_Y($function, array $extraarguments = null) {
-        if ($extraarguments) {
-            $extraarguments = array_map('json_encode', convert_to_array($extraarguments));
-            $arguments = 'Y, ' . implode(', ', $extraarguments);
-        } else {
-            $arguments = 'Y';
-        }
-        return "$function($arguments);\n";
-    }
-
-    /**
-     * Returns JavaScript code to initialise a new object
-     *
-     * @param string $var If it is null then no var is assigned the new object.
-     * @param string $class The class to initialise an object for.
-     * @param array $arguments An array of args to pass to the init method.
-     * @param array $requirements Any modules required for this class.
-     * @param int $delay The delay before initialisation. 0 = no delay.
-     * @return string Some JS code
-     */
-    public static function object_init($var, $class, array $arguments = null, array $requirements = null, $delay=0) {
-        if (is_array($arguments)) {
-            $arguments = array_map('json_encode', convert_to_array($arguments));
-            $arguments = implode(', ', $arguments);
-        }
-
-        if ($var === null) {
-            $js = "new $class(Y, $arguments);";
-        } else if (strpos($var, '.')!==false) {
-            $js = "$var = new $class(Y, $arguments);";
-        } else {
-            $js = "var $var = new $class(Y, $arguments);";
-        }
-
-        if ($delay) {
-            $delay = $delay * 1000; // in miliseconds
-            $js = "setTimeout(function() { $js }, $delay);";
-        }
-
-        if (count($requirements) > 0) {
-            $requirements = implode("', '", $requirements);
-            $js = "Y.use('$requirements', function(Y){ $js });";
-        }
-        return $js."\n";
-    }
-
-    /**
-     * Returns code setting value to variable
-     *
-     * @param string $name
-     * @param mixed $value json serialised value
-     * @param bool $usevar add var definition, ignored for nested properties
-     * @return string JS code fragment
-     */
-    public static function set_variable($name, $value, $usevar = true) {
-        $output = '';
-
-        if ($usevar) {
-            if (strpos($name, '.')) {
-                $output .= '';
-            } else {
-                $output .= 'var ';
-            }
-        }
-
-        $output .= "$name = ".json_encode($value).";";
-
-        return $output;
-    }
-
-    /**
-     * Writes event handler attaching code
-     *
-     * @param array|string $selector standard YUI selector for elements, may be
-     *     array or string, element id is in the form "#idvalue"
-     * @param string $event A valid DOM event (click, mousedown, change etc.)
-     * @param string $function The name of the function to call
-     * @param array $arguments An optional array of argument parameters to pass to the function
-     * @return string JS code fragment
-     */
-    public static function event_handler($selector, $event, $function, array $arguments = null) {
-        $selector = json_encode($selector);
-        $output = "Y.on('$event', $function, $selector, null";
-        if (!empty($arguments)) {
-            $output .= ', ' . json_encode($arguments);
-        }
-        return $output . ");\n";
-    }
-}
-
-/**
- * Holds all the information required to render a <table> by {@link core_renderer::table()}
- *
- * Example of usage:
- * $t = new html_table();
- * ... // set various properties of the object $t as described below
- * echo html_writer::table($t);
- *
- * @copyright 2009 David Mudrak <david.mudrak@gmail.com>
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class html_table {
-
-    /**
-     * @var string Value to use for the id attribute of the table
-     */
-    public $id = null;
-
-    /**
-     * @var array Attributes of HTML attributes for the <table> element
-     */
-    public $attributes = array();
-
-    /**
-     * @var array An array of headings. The n-th array item is used as a heading of the n-th column.
-     * For more control over the rendering of the headers, an array of html_table_cell objects
-     * can be passed instead of an array of strings.
-     *
-     * Example of usage:
-     * $t->head = array('Student', 'Grade');
-     */
-    public $head;
-
-    /**
-     * @var array An array that can be used to make a heading span multiple columns.
-     * In this example, {@link html_table:$data} is supposed to have three columns. For the first two columns,
-     * the same heading is used. Therefore, {@link html_table::$head} should consist of two items.
-     *
-     * Example of usage:
-     * $t->headspan = array(2,1);
-     */
-    public $headspan;
-
-    /**
-     * @var array An array of column alignments.
-     * The value is used as CSS 'text-align' property. Therefore, possible
-     * values are 'left', 'right', 'center' and 'justify'. Specify 'right' or 'left' from the perspective
-     * of a left-to-right (LTR) language. For RTL, the values are flipped automatically.
-     *
-     * Examples of usage:
-     * $t->align = array(null, 'right');
-     * or
-     * $t->align[1] = 'right';
-     */
-    public $align;
-
-    /**
-     * @var array The value is used as CSS 'size' property.
-     *
-     * Examples of usage:
-     * $t->size = array('50%', '50%');
-     * or
-     * $t->size[1] = '120px';
-     */
-    public $size;
-
-    /**
-     * @var array An array of wrapping information.
-     * The only possible value is 'nowrap' that sets the
-     * CSS property 'white-space' to the value 'nowrap' in the given column.
-     *
-     * Example of usage:
-     * $t->wrap = array(null, 'nowrap');
-     */
-    public $wrap;
-
-    /**
-     * @var array Array of arrays or html_table_row objects containing the data. Alternatively, if you have
-     * $head specified, the string 'hr' (for horizontal ruler) can be used
-     * instead of an array of cells data resulting in a divider rendered.
-     *
-     * Example of usage with array of arrays:
-     * $row1 = array('Harry Potter', '76 %');
-     * $row2 = array('Hermione Granger', '100 %');
-     * $t->data = array($row1, $row2);
-     *
-     * Example with array of html_table_row objects: (used for more fine-grained control)
-     * $cell1 = new html_table_cell();
-     * $cell1->text = 'Harry Potter';
-     * $cell1->colspan = 2;
-     * $row1 = new html_table_row();
-     * $row1->cells[] = $cell1;
-     * $cell2 = new html_table_cell();
-     * $cell2->text = 'Hermione Granger';
-     * $cell3 = new html_table_cell();
-     * $cell3->text = '100 %';
-     * $row2 = new html_table_row();
-     * $row2->cells = array($cell2, $cell3);
-     * $t->data = array($row1, $row2);
-     */
-    public $data = [];
-
-    /**
-     * @deprecated since Moodle 2.0. Styling should be in the CSS.
-     * @var string Width of the table, percentage of the page preferred.
-     */
-    public $width = null;
-
-    /**
-     * @deprecated since Moodle 2.0. Styling should be in the CSS.
-     * @var string Alignment for the whole table. Can be 'right', 'left' or 'center' (default).
-     */
-    public $tablealign = null;
-
-    /**
-     * @deprecated since Moodle 2.0. Styling should be in the CSS.
-     * @var int Padding on each cell, in pixels
-     */
-    public $cellpadding = null;
-
-    /**
-     * @var int Spacing between cells, in pixels
-     * @deprecated since Moodle 2.0. Styling should be in the CSS.
-     */
-    public $cellspacing = null;
-
-    /**
-     * @var array Array of classes to add to particular rows, space-separated string.
-     * Class 'lastrow' is added automatically for the last row in the table.
-     *
-     * Example of usage:
-     * $t->rowclasses[9] = 'tenth'
-     */
-    public $rowclasses;
-
-    /**
-     * @var array An array of classes to add to every cell in a particular column,
-     * space-separated string. Class 'cell' is added automatically by the renderer.
-     * Classes 'c0' or 'c1' are added automatically for every odd or even column,
-     * respectively. Class 'lastcol' is added automatically for all last cells
-     * in a row.
-     *
-     * Example of usage:
-     * $t->colclasses = array(null, 'grade');
-     */
-    public $colclasses;
-
-    /**
-     * @var string Description of the contents for screen readers.
-     *
-     * The "summary" attribute on the "table" element is not supported in HTML5.
-     * Consider describing the structure of the table in a "caption" element or in a "figure" element containing the table;
-     * or, simplify the structure of the table so that no description is needed.
-     *
-     * @deprecated since Moodle 3.9.
-     */
-    public $summary;
-
-    /**
-     * @var string Caption for the table, typically a title.
-     *
-     * Example of usage:
-     * $t->caption = "TV Guide";
-     */
-    public $caption;
-
-    /**
-     * @var bool Whether to hide the table's caption from sighted users.
-     *
-     * Example of usage:
-     * $t->caption = "TV Guide";
-     * $t->captionhide = true;
-     */
-    public $captionhide = false;
-
-    /** @var bool Whether to make the table to be scrolled horizontally with ease. Make table responsive across all viewports. */
-    public $responsive = true;
-
-    /** @var string class name to add to this html table. */
-    public $class;
-
-    /**
-     * Constructor
-     */
-    public function __construct() {
-        $this->attributes['class'] = '';
-    }
-}
-
-/**
- * Component representing a table row.
- *
- * @copyright 2009 Nicolas Connault
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class html_table_row {
-
-    /**
-     * @var string Value to use for the id attribute of the row.
-     */
-    public $id = null;
-
-    /**
-     * @var array Array of html_table_cell objects
-     */
-    public $cells = array();
-
-    /**
-     * @var string Value to use for the style attribute of the table row
-     */
-    public $style = null;
-
-    /**
-     * @var array Attributes of additional HTML attributes for the <tr> element
-     */
-    public $attributes = array();
-
-    /**
-     * Constructor
-     * @param array $cells
-     */
-    public function __construct(array $cells=null) {
-        $this->attributes['class'] = '';
-        $cells = (array)$cells;
-        foreach ($cells as $cell) {
-            if ($cell instanceof html_table_cell) {
-                $this->cells[] = $cell;
-            } else {
-                $this->cells[] = new html_table_cell($cell);
-            }
-        }
-    }
-}
-
-/**
- * Component representing a table cell.
- *
- * @copyright 2009 Nicolas Connault
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class html_table_cell {
-
-    /**
-     * @var string Value to use for the id attribute of the cell.
-     */
-    public $id = null;
-
-    /**
-     * @var string The contents of the cell.
-     */
-    public $text;
-
-    /**
-     * @var string Abbreviated version of the contents of the cell.
-     */
-    public $abbr = null;
-
-    /**
-     * @var int Number of columns this cell should span.
-     */
-    public $colspan = null;
-
-    /**
-     * @var int Number of rows this cell should span.
-     */
-    public $rowspan = null;
-
-    /**
-     * @var string Defines a way to associate header cells and data cells in a table.
-     */
-    public $scope = null;
-
-    /**
-     * @var bool Whether or not this cell is a header cell.
-     */
-    public $header = null;
-
-    /**
-     * @var string Value to use for the style attribute of the table cell
-     */
-    public $style = null;
-
-    /**
-     * @var array Attributes of additional HTML attributes for the <td> element
-     */
-    public $attributes = array();
-
-    /**
-     * Constructs a table cell
-     *
-     * @param string $text
-     */
-    public function __construct($text = null) {
-        $this->text = $text;
-        $this->attributes['class'] = '';
-    }
-}
-
-/**
- * Component representing a paging bar.
- *
- * @copyright 2009 Nicolas Connault
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class paging_bar implements renderable, templatable {
-
-    /**
-     * @var int The maximum number of pagelinks to display.
-     */
-    public $maxdisplay = 18;
-
-    /**
-     * @var int The total number of entries to be pages through..
-     */
-    public $totalcount;
-
-    /**
-     * @var int The page you are currently viewing.
-     */
-    public $page;
-
-    /**
-     * @var int The number of entries that should be shown per page.
-     */
-    public $perpage;
-
-    /**
-     * @var string|moodle_url If this  is a string then it is the url which will be appended with $pagevar,
-     * an equals sign and the page number.
-     * If this is a moodle_url object then the pagevar param will be replaced by
-     * the page no, for each page.
-     */
-    public $baseurl;
-
-    /**
-     * @var string This is the variable name that you use for the pagenumber in your
-     * code (ie. 'tablepage', 'blogpage', etc)
-     */
-    public $pagevar;
-
-    /**
-     * @var string A HTML link representing the "previous" page.
-     */
-    public $previouslink = null;
-
-    /**
-     * @var string A HTML link representing the "next" page.
-     */
-    public $nextlink = null;
-
-    /**
-     * @var string A HTML link representing the first page.
-     */
-    public $firstlink = null;
-
-    /**
-     * @var string A HTML link representing the last page.
-     */
-    public $lastlink = null;
-
-    /**
-     * @var array An array of strings. One of them is just a string: the current page
-     */
-    public $pagelinks = array();
-
-    /**
-     * Constructor paging_bar with only the required params.
-     *
-     * @param int $totalcount The total number of entries available to be paged through
-     * @param int $page The page you are currently viewing
-     * @param int $perpage The number of entries that should be shown per page
-     * @param string|moodle_url $baseurl url of the current page, the $pagevar parameter is added
-     * @param string $pagevar name of page parameter that holds the page number
-     */
-    public function __construct($totalcount, $page, $perpage, $baseurl, $pagevar = 'page') {
-        $this->totalcount = $totalcount;
-        $this->page       = $page;
-        $this->perpage    = $perpage;
-        $this->baseurl    = $baseurl;
-        $this->pagevar    = $pagevar;
-    }
-
-    /**
-     * Prepares the paging bar for output.
-     *
-     * This method validates the arguments set up for the paging bar and then
-     * produces fragments of HTML to assist display later on.
-     *
-     * @param renderer_base $output
-     * @param moodle_page $page
-     * @param string $target
-     * @throws coding_exception
-     */
-    public function prepare(renderer_base $output, moodle_page $page, $target) {
-        if (!isset($this->totalcount) || is_null($this->totalcount)) {
-            throw new coding_exception('paging_bar requires a totalcount value.');
-        }
-        if (!isset($this->page) || is_null($this->page)) {
-            throw new coding_exception('paging_bar requires a page value.');
-        }
-        if (empty($this->perpage)) {
-            throw new coding_exception('paging_bar requires a perpage value.');
-        }
-        if (empty($this->baseurl)) {
-            throw new coding_exception('paging_bar requires a baseurl value.');
-        }
-
-        if ($this->totalcount > $this->perpage) {
-            $pagenum = $this->page - 1;
-
-            if ($this->page > 0) {
-                $this->previouslink = html_writer::link(new moodle_url($this->baseurl, array($this->pagevar=>$pagenum)), get_string('previous'), array('class'=>'previous'));
-            }
-
-            if ($this->perpage > 0) {
-                $lastpage = ceil($this->totalcount / $this->perpage);
-            } else {
-                $lastpage = 1;
-            }
-
-            if ($this->page > round(($this->maxdisplay/3)*2)) {
-                $currpage = $this->page - round($this->maxdisplay/3);
-
-                $this->firstlink = html_writer::link(new moodle_url($this->baseurl, array($this->pagevar=>0)), '1', array('class'=>'first'));
-            } else {
-                $currpage = 0;
-            }
-
-            $displaycount = $displaypage = 0;
-
-            while ($displaycount < $this->maxdisplay and $currpage < $lastpage) {
-                $displaypage = $currpage + 1;
-
-                if ($this->page == $currpage) {
-                    $this->pagelinks[] = html_writer::span($displaypage, 'current-page');
-                } else {
-                    $pagelink = html_writer::link(new moodle_url($this->baseurl, array($this->pagevar=>$currpage)), $displaypage);
-                    $this->pagelinks[] = $pagelink;
-                }
-
-                $displaycount++;
-                $currpage++;
-            }
-
-            if ($currpage < $lastpage) {
-                $lastpageactual = $lastpage - 1;
-                $this->lastlink = html_writer::link(new moodle_url($this->baseurl, array($this->pagevar=>$lastpageactual)), $lastpage, array('class'=>'last'));
-            }
-
-            $pagenum = $this->page + 1;
-
-            if ($pagenum != $lastpage) {
-                $this->nextlink = html_writer::link(new moodle_url($this->baseurl, array($this->pagevar=>$pagenum)), get_string('next'), array('class'=>'next'));
-            }
-        }
-    }
-
-    /**
-     * Export for template.
-     *
-     * @param renderer_base $output The renderer.
-     * @return stdClass
-     */
-    public function export_for_template(renderer_base $output) {
-        $data = new stdClass();
-        $data->previous = null;
-        $data->next = null;
-        $data->first = null;
-        $data->last = null;
-        $data->label = get_string('page');
-        $data->pages = [];
-        $data->haspages = $this->totalcount > $this->perpage;
-        $data->pagesize = $this->perpage;
-
-        if (!$data->haspages) {
-            return $data;
-        }
-
-        if ($this->page > 0) {
-            $data->previous = [
-                'page' => $this->page,
-                'url' => (new moodle_url($this->baseurl, [$this->pagevar => $this->page - 1]))->out(false)
-            ];
-        }
-
-        $currpage = 0;
-        if ($this->page > round(($this->maxdisplay / 3) * 2)) {
-            $currpage = $this->page - round($this->maxdisplay / 3);
-            $data->first = [
-                'page' => 1,
-                'url' => (new moodle_url($this->baseurl, [$this->pagevar => 0]))->out(false)
-            ];
-        }
-
-        $lastpage = 1;
-        if ($this->perpage > 0) {
-            $lastpage = ceil($this->totalcount / $this->perpage);
-        }
-
-        $displaycount = 0;
-        $displaypage = 0;
-        while ($displaycount < $this->maxdisplay and $currpage < $lastpage) {
-            $displaypage = $currpage + 1;
-
-            $iscurrent = $this->page == $currpage;
-            $link = new moodle_url($this->baseurl, [$this->pagevar => $currpage]);
-
-            $data->pages[] = [
-                'page' => $displaypage,
-                'active' => $iscurrent,
-                'url' => $iscurrent ? null : $link->out(false)
-            ];
-
-            $displaycount++;
-            $currpage++;
-        }
-
-        if ($currpage < $lastpage) {
-            $data->last = [
-                'page' => $lastpage,
-                'url' => (new moodle_url($this->baseurl, [$this->pagevar => $lastpage - 1]))->out(false)
-            ];
-        }
-
-        if ($this->page + 1 != $lastpage) {
-            $data->next = [
-                'page' => $this->page + 2,
-                'url' => (new moodle_url($this->baseurl, [$this->pagevar => $this->page + 1]))->out(false)
-            ];
-        }
-
-        return $data;
-    }
-}
-
-/**
- * Component representing initials bar.
- *
- * @copyright 2017 Ilya Tregubov
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 3.3
- * @package core
- * @category output
- */
-class initials_bar implements renderable, templatable {
-
-    /**
-     * @var string Currently selected letter.
-     */
-    public $current;
-
-    /**
-     * @var string Class name to add to this initial bar.
-     */
-    public $class;
-
-    /**
-     * @var string The name to put in front of this initial bar.
-     */
-    public $title;
-
-    /**
-     * @var string URL parameter name for this initial.
-     */
-    public $urlvar;
-
-    /**
-     * @var moodle_url URL object.
-     */
-    public $url;
-
-    /**
-     * @var array An array of letters in the alphabet.
-     */
-    public $alpha;
-
-    /**
-     * @var bool Omit links if we are doing a mini render.
-     */
-    public $minirender;
-
-    /**
-     * Constructor initials_bar with only the required params.
-     *
-     * @param string $current the currently selected letter.
-     * @param string $class class name to add to this initial bar.
-     * @param string $title the name to put in front of this initial bar.
-     * @param string $urlvar URL parameter name for this initial.
-     * @param string $url URL object.
-     * @param array $alpha of letters in the alphabet.
-     * @param bool $minirender Return a trimmed down view of the initials bar.
-     */
-    public function __construct($current, $class, $title, $urlvar, $url, $alpha = null, bool $minirender = false) {
-        $this->current       = $current;
-        $this->class    = $class;
-        $this->title    = $title;
-        $this->urlvar    = $urlvar;
-        $this->url    = $url;
-        $this->alpha    = $alpha;
-        $this->minirender = $minirender;
-    }
-
-    /**
-     * Export for template.
-     *
-     * @param renderer_base $output The renderer.
-     * @return stdClass
-     */
-    public function export_for_template(renderer_base $output) {
-        $data = new stdClass();
-
-        if ($this->alpha == null) {
-            $this->alpha = explode(',', get_string('alphabet', 'langconfig'));
-        }
-
-        if ($this->current == 'all') {
-            $this->current = '';
-        }
-
-        // We want to find a letter grouping size which suits the language so
-        // find the largest group size which is less than 15 chars.
-        // The choice of 15 chars is the largest number of chars that reasonably
-        // fits on the smallest supported screen size. By always using a max number
-        // of groups which is a factor of 2, we always get nice wrapping, and the
-        // last row is always the shortest.
-        $groupsize = count($this->alpha);
-        $groups = 1;
-        while ($groupsize > 15) {
-            $groups *= 2;
-            $groupsize = ceil(count($this->alpha) / $groups);
-        }
-
-        $groupsizelimit = 0;
-        $groupnumber = 0;
-        foreach ($this->alpha as $letter) {
-            if ($groupsizelimit++ > 0 && $groupsizelimit % $groupsize == 1) {
-                $groupnumber++;
-            }
-            $groupletter = new stdClass();
-            $groupletter->name = $letter;
-            if (!$this->minirender) {
-                $groupletter->url = $this->url->out(false, array($this->urlvar => $letter));
-            } else {
-                $groupletter->input = $letter;
-            }
-            if ($letter == $this->current) {
-                $groupletter->selected = $this->current;
-            }
-            if (!isset($data->group[$groupnumber])) {
-                $data->group[$groupnumber] = new stdClass();
-            }
-            $data->group[$groupnumber]->letter[] = $groupletter;
-        }
-
-        $data->class = $this->class;
-        $data->title = $this->title;
-        if (!$this->minirender) {
-            $data->url = $this->url->out(false, array($this->urlvar => ''));
-        } else {
-            $data->input = 'ALL';
-        }
-        $data->current = $this->current;
-        $data->all = get_string('all');
-
-        return $data;
-    }
-}
-
-/**
- * This class represents how a block appears on a page.
- *
- * During output, each block instance is asked to return a block_contents object,
- * those are then passed to the $OUTPUT->block function for display.
- *
- * contents should probably be generated using a moodle_block_..._renderer.
- *
- * Other block-like things that need to appear on the page, for example the
- * add new block UI, are also represented as block_contents objects.
- *
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class block_contents {
-
-    /** Used when the block cannot be collapsed **/
-    const NOT_HIDEABLE = 0;
-
-    /** Used when the block can be collapsed but currently is not **/
-    const VISIBLE = 1;
-
-    /** Used when the block has been collapsed **/
-    const HIDDEN = 2;
-
-    /**
-     * @var int Used to set $skipid.
-     */
-    protected static $idcounter = 1;
-
-    /**
-     * @var int All the blocks (or things that look like blocks) printed on
-     * a page are given a unique number that can be used to construct id="" attributes.
-     * This is set automatically be the {@link prepare()} method.
-     * Do not try to set it manually.
-     */
-    public $skipid;
-
-    /**
-     * @var int If this is the contents of a real block, this should be set
-     * to the block_instance.id. Otherwise this should be set to 0.
-     */
-    public $blockinstanceid = 0;
-
-    /**
-     * @var int If this is a real block instance, and there is a corresponding
-     * block_position.id for the block on this page, this should be set to that id.
-     * Otherwise it should be 0.
-     */
-    public $blockpositionid = 0;
-
-    /**
-     * @var array An array of attribute => value pairs that are put on the outer div of this
-     * block. {@link $id} and {@link $classes} attributes should be set separately.
-     */
-    public $attributes;
-
-    /**
-     * @var string The title of this block. If this came from user input, it should already
-     * have had format_string() processing done on it. This will be output inside
-     * <h2> tags. Please do not cause invalid XHTML.
-     */
-    public $title = '';
-
-    /**
-     * @var string The label to use when the block does not, or will not have a visible title.
-     * You should never set this as well as title... it will just be ignored.
-     */
-    public $arialabel = '';
-
-    /**
-     * @var string HTML for the content
-     */
-    public $content = '';
-
-    /**
-     * @var array An alternative to $content, it you want a list of things with optional icons.
-     */
-    public $footer = '';
-
-    /**
-     * @var string Any small print that should appear under the block to explain
-     * to the teacher about the block, for example 'This is a sticky block that was
-     * added in the system context.'
-     */
-    public $annotation = '';
-
-    /**
-     * @var int One of the constants NOT_HIDEABLE, VISIBLE, HIDDEN. Whether
-     * the user can toggle whether this block is visible.
-     */
-    public $collapsible = self::NOT_HIDEABLE;
-
-    /**
-     * Set this to true if the block is dockable.
-     * @var bool
-     */
-    public $dockable = false;
-
-    /**
-     * @var array A (possibly empty) array of editing controls. Each element of
-     * this array should be an array('url' => $url, 'icon' => $icon, 'caption' => $caption).
-     * $icon is the icon name. Fed to $OUTPUT->image_url.
-     */
-    public $controls = array();
-
-
-    /**
-     * Create new instance of block content
-     * @param array $attributes
-     */
-    public function __construct(array $attributes = null) {
-        $this->skipid = self::$idcounter;
-        self::$idcounter += 1;
-
-        if ($attributes) {
-            // standard block
-            $this->attributes = $attributes;
-        } else {
-            // simple "fake" blocks used in some modules and "Add new block" block
-            $this->attributes = array('class'=>'block');
-        }
-    }
-
-    /**
-     * Add html class to block
-     *
-     * @param string $class
-     */
-    public function add_class($class) {
-        $this->attributes['class'] .= ' '.$class;
-    }
-
-    /**
-     * Check if the block is a fake block.
-     *
-     * @return boolean
-     */
-    public function is_fake() {
-        return isset($this->attributes['data-block']) && $this->attributes['data-block'] == '_fake';
-    }
-}
-
-
-/**
- * This class represents a target for where a block can go when it is being moved.
- *
- * This needs to be rendered as a form with the given hidden from fields, and
- * clicking anywhere in the form should submit it. The form action should be
- * $PAGE->url.
- *
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class block_move_target {
-
-    /**
-     * @var moodle_url Move url
-     */
-    public $url;
-
-    /**
-     * Constructor
-     * @param moodle_url $url
-     */
-    public function __construct(moodle_url $url) {
-        $this->url  = $url;
-    }
-}
-
-/**
- * Custom menu item
- *
- * This class is used to represent one item within a custom menu that may or may
- * not have children.
- *
- * @copyright 2010 Sam Hemelryk
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class custom_menu_item implements renderable, templatable {
-
-    /**
-     * @var string The text to show for the item
-     */
-    protected $text;
-
-    /**
-     * @var moodle_url The link to give the icon if it has no children
-     */
-    protected $url;
-
-    /**
-     * @var string A title to apply to the item. By default the text
-     */
-    protected $title;
-
-    /**
-     * @var int A sort order for the item, not necessary if you order things in
-     * the CFG var.
-     */
-    protected $sort;
-
-    /**
-     * @var custom_menu_item A reference to the parent for this item or NULL if
-     * it is a top level item
-     */
-    protected $parent;
-
-    /**
-     * @var array A array in which to store children this item has.
-     */
-    protected $children = array();
-
-    /**
-     * @var int A reference to the sort var of the last child that was added
-     */
-    protected $lastsort = 0;
-
-    /** @var array Array of other HTML attributes for the custom menu item. */
-    protected $attributes = [];
-
-    /**
-     * Constructs the new custom menu item
-     *
-     * @param string $text
-     * @param moodle_url $url A moodle url to apply as the link for this item [Optional]
-     * @param string $title A title to apply to this item [Optional]
-     * @param int $sort A sort or to use if we need to sort differently [Optional]
-     * @param custom_menu_item $parent A reference to the parent custom_menu_item this child
-     *        belongs to, only if the child has a parent. [Optional]
-     * @param array $attributes Array of other HTML attributes for the custom menu item.
-     */
-    public function __construct($text, moodle_url $url = null, $title = null, $sort = null, custom_menu_item $parent = null,
-        array $attributes = []) {
-
-        // Use class setter method for text to ensure it's always a string type.
-        $this->set_text($text);
-
-        $this->url = $url;
-        $this->title = $title;
-        $this->sort = (int)$sort;
-        $this->parent = $parent;
-        $this->attributes = $attributes;
-    }
-
-    /**
-     * Adds a custom menu item as a child of this node given its properties.
-     *
-     * @param string $text
-     * @param moodle_url $url
-     * @param string $title
-     * @param int $sort
-     * @param array $attributes Array of other HTML attributes for the custom menu item.
-     * @return custom_menu_item
-     */
-    public function add($text, moodle_url $url = null, $title = null, $sort = null, $attributes = []) {
-        $key = count($this->children);
-        if (empty($sort)) {
-            $sort = $this->lastsort + 1;
-        }
-        $this->children[$key] = new custom_menu_item($text, $url, $title, $sort, $this, $attributes);
-        $this->lastsort = (int)$sort;
-        return $this->children[$key];
-    }
-
-    /**
-     * Removes a custom menu item that is a child or descendant to the current menu.
-     *
-     * Returns true if child was found and removed.
-     *
-     * @param custom_menu_item $menuitem
-     * @return bool
-     */
-    public function remove_child(custom_menu_item $menuitem) {
-        $removed = false;
-        if (($key = array_search($menuitem, $this->children)) !== false) {
-            unset($this->children[$key]);
-            $this->children = array_values($this->children);
-            $removed = true;
-        } else {
-            foreach ($this->children as $child) {
-                if ($removed = $child->remove_child($menuitem)) {
-                    break;
-                }
-            }
-        }
-        return $removed;
-    }
-
-    /**
-     * Returns the text for this item
-     * @return string
-     */
-    public function get_text() {
-        return $this->text;
-    }
-
-    /**
-     * Returns the url for this item
-     * @return moodle_url
-     */
-    public function get_url() {
-        return $this->url;
-    }
-
-    /**
-     * Returns the title for this item
-     * @return string
-     */
-    public function get_title() {
-        return $this->title;
-    }
-
-    /**
-     * Sorts and returns the children for this item
-     * @return array
-     */
-    public function get_children() {
-        $this->sort();
-        return $this->children;
-    }
-
-    /**
-     * Gets the sort order for this child
-     * @return int
-     */
-    public function get_sort_order() {
-        return $this->sort;
-    }
-
-    /**
-     * Gets the parent this child belong to
-     * @return custom_menu_item
-     */
-    public function get_parent() {
-        return $this->parent;
-    }
-
-    /**
-     * Sorts the children this item has
-     */
-    public function sort() {
-        usort($this->children, array('custom_menu','sort_custom_menu_items'));
-    }
-
-    /**
-     * Returns true if this item has any children
-     * @return bool
-     */
-    public function has_children() {
-        return (count($this->children) > 0);
-    }
-
-    /**
-     * Sets the text for the node
-     * @param string $text
-     */
-    public function set_text($text) {
-        $this->text = (string)$text;
-    }
-
-    /**
-     * Sets the title for the node
-     * @param string $title
-     */
-    public function set_title($title) {
-        $this->title = (string)$title;
-    }
-
-    /**
-     * Sets the url for the node
-     * @param moodle_url $url
-     */
-    public function set_url(moodle_url $url) {
-        $this->url = $url;
-    }
-
-    /**
-     * Export this data so it can be used as the context for a mustache template.
-     *
-     * @param renderer_base $output Used to do a final render of any components that need to be rendered for export.
-     * @return stdClass
-     */
-    public function export_for_template(renderer_base $output) {
-        $syscontext = context_system::instance();
-
-        $context = new stdClass();
-        $context->moremenuid = uniqid();
-        $context->text = \core_external\util::format_string($this->text, $syscontext->id);
-        $context->url = $this->url ? $this->url->out() : null;
-        // No need for the title if it's the same with text.
-        if ($this->text !== $this->title) {
-            // Show the title attribute only if it's different from the text.
-            $context->title = \core_external\util::format_string($this->title, $syscontext->id);
-        }
-        $context->sort = $this->sort;
-        if (!empty($this->attributes)) {
-            $context->attributes = $this->attributes;
-        }
-        $context->children = array();
-        if (preg_match("/^#+$/", $this->text)) {
-            $context->divider = true;
-        }
-        $context->haschildren = !empty($this->children) && (count($this->children) > 0);
-        foreach ($this->children as $child) {
-            $child = $child->export_for_template($output);
-            array_push($context->children, $child);
-        }
-
-        return $context;
-    }
-}
-
-/**
- * Custom menu class
- *
- * This class is used to operate a custom menu that can be rendered for the page.
- * The custom menu is built using $CFG->custommenuitems and is a structured collection
- * of custom_menu_item nodes that can be rendered by the core renderer.
- *
- * To configure the custom menu:
- *     Settings: Administration > Appearance > Advanced theme settings
- *
- * @copyright 2010 Sam Hemelryk
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class custom_menu extends custom_menu_item {
-
-    /**
-     * @var string The language we should render for, null disables multilang support.
-     */
-    protected $currentlanguage = null;
-
-    /**
-     * Creates the custom menu
-     *
-     * @param string $definition the menu items definition in syntax required by {@link convert_text_to_menu_nodes()}
-     * @param string $currentlanguage the current language code, null disables multilang support
-     */
-    public function __construct($definition = '', $currentlanguage = null) {
-        $this->currentlanguage = $currentlanguage;
-        parent::__construct('root'); // create virtual root element of the menu
-        if (!empty($definition)) {
-            $this->override_children(self::convert_text_to_menu_nodes($definition, $currentlanguage));
-        }
-    }
-
-    /**
-     * Overrides the children of this custom menu. Useful when getting children
-     * from $CFG->custommenuitems
-     *
-     * @param array $children
-     */
-    public function override_children(array $children) {
-        $this->children = array();
-        foreach ($children as $child) {
-            if ($child instanceof custom_menu_item) {
-                $this->children[] = $child;
-            }
-        }
-    }
-
-    /**
-     * Converts a string into a structured array of custom_menu_items which can
-     * then be added to a custom menu.
-     *
-     * Structure:
-     *     text|url|title|langs
-     * The number of hyphens at the start determines the depth of the item. The
-     * languages are optional, comma separated list of languages the line is for.
-     *
-     * Example structure:
-     *     First level first item|http://www.moodle.com/
-     *     -Second level first item|http://www.moodle.com/partners/
-     *     -Second level second item|http://www.moodle.com/hq/
-     *     --Third level first item|http://www.moodle.com/jobs/
-     *     -Second level third item|http://www.moodle.com/development/
-     *     First level second item|http://www.moodle.com/feedback/
-     *     First level third item
-     *     English only|http://moodle.com|English only item|en
-     *     German only|http://moodle.de|Deutsch|de,de_du,de_kids
-     *
-     *
-     * @static
-     * @param string $text the menu items definition
-     * @param string $language the language code, null disables multilang support
-     * @return array
-     */
-    public static function convert_text_to_menu_nodes($text, $language = null) {
-        $root = new custom_menu();
-        $lastitem = $root;
-        $lastdepth = 0;
-        $hiddenitems = array();
-        $lines = explode("\n", $text);
-        foreach ($lines as $linenumber => $line) {
-            $line = trim($line);
-            if (strlen($line) == 0) {
-                continue;
-            }
-            // Parse item settings.
-            $itemtext = null;
-            $itemurl = null;
-            $itemtitle = null;
-            $itemvisible = true;
-            $settings = explode('|', $line);
-            foreach ($settings as $i => $setting) {
-                $setting = trim($setting);
-                if ($setting !== '') {
-                    switch ($i) {
-                        case 0: // Menu text.
-                            $itemtext = ltrim($setting, '-');
-                            break;
-                        case 1: // URL.
-                            try {
-                                $itemurl = new moodle_url($setting);
-                            } catch (moodle_exception $exception) {
-                                // We're not actually worried about this, we don't want to mess up the display
-                                // just for a wrongly entered URL.
-                                $itemurl = null;
-                            }
-                            break;
-                        case 2: // Title attribute.
-                            $itemtitle = $setting;
-                            break;
-                        case 3: // Language.
-                            if (!empty($language)) {
-                                $itemlanguages = array_map('trim', explode(',', $setting));
-                                $itemvisible &= in_array($language, $itemlanguages);
-                            }
-                            break;
-                    }
-                }
-            }
-            // Get depth of new item.
-            preg_match('/^(\-*)/', $line, $match);
-            $itemdepth = strlen($match[1]) + 1;
-            // Find parent item for new item.
-            while (($lastdepth - $itemdepth) >= 0) {
-                $lastitem = $lastitem->get_parent();
-                $lastdepth--;
-            }
-            $lastitem = $lastitem->add($itemtext, $itemurl, $itemtitle, $linenumber + 1);
-            $lastdepth++;
-            if (!$itemvisible) {
-                $hiddenitems[] = $lastitem;
-            }
-        }
-        foreach ($hiddenitems as $item) {
-            $item->parent->remove_child($item);
-        }
-        return $root->get_children();
-    }
-
-    /**
-     * Sorts two custom menu items
-     *
-     * This function is designed to be used with the usort method
-     *     usort($this->children, array('custom_menu','sort_custom_menu_items'));
-     *
-     * @static
-     * @param custom_menu_item $itema
-     * @param custom_menu_item $itemb
-     * @return int
-     */
-    public static function sort_custom_menu_items(custom_menu_item $itema, custom_menu_item $itemb) {
-        $itema = $itema->get_sort_order();
-        $itemb = $itemb->get_sort_order();
-        if ($itema == $itemb) {
-            return 0;
-        }
-        return ($itema > $itemb) ? +1 : -1;
-    }
-}
-
-/**
- * Stores one tab
- *
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package core
- */
-class tabobject implements renderable, templatable {
-    /** @var string unique id of the tab in this tree, it is used to find selected and/or inactive tabs */
-    var $id;
-    /** @var moodle_url|string link */
-    var $link;
-    /** @var string text on the tab */
-    var $text;
-    /** @var string title under the link, by defaul equals to text */
-    var $title;
-    /** @var bool whether to display a link under the tab name when it's selected */
-    var $linkedwhenselected = false;
-    /** @var bool whether the tab is inactive */
-    var $inactive = false;
-    /** @var bool indicates that this tab's child is selected */
-    var $activated = false;
-    /** @var bool indicates that this tab is selected */
-    var $selected = false;
-    /** @var array stores children tabobjects */
-    var $subtree = array();
-    /** @var int level of tab in the tree, 0 for root (instance of tabtree), 1 for the first row of tabs */
-    var $level = 1;
-
-    /**
-     * Constructor
-     *
-     * @param string $id unique id of the tab in this tree, it is used to find selected and/or inactive tabs
-     * @param string|moodle_url $link
-     * @param string $text text on the tab
-     * @param string $title title under the link, by defaul equals to text
-     * @param bool $linkedwhenselected whether to display a link under the tab name when it's selected
-     */
-    public function __construct($id, $link = null, $text = '', $title = '', $linkedwhenselected = false) {
-        $this->id = $id;
-        $this->link = $link;
-        $this->text = $text;
-        $this->title = $title ? $title : $text;
-        $this->linkedwhenselected = $linkedwhenselected;
-    }
-
-    /**
-     * Travels through tree and finds the tab to mark as selected, all parents are automatically marked as activated
-     *
-     * @param string $selected the id of the selected tab (whatever row it's on),
-     *    if null marks all tabs as unselected
-     * @return bool whether this tab is selected or contains selected tab in its subtree
-     */
-    protected function set_selected($selected) {
-        if ((string)$selected === (string)$this->id) {
-            $this->selected = true;
-            // This tab is selected. No need to travel through subtree.
-            return true;
-        }
-        foreach ($this->subtree as $subitem) {
-            if ($subitem->set_selected($selected)) {
-                // This tab has child that is selected. Mark it as activated. No need to check other children.
-                $this->activated = true;
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Travels through tree and finds a tab with specified id
-     *
-     * @param string $id
-     * @return tabtree|null
-     */
-    public function find($id) {
-        if ((string)$this->id === (string)$id) {
-            return $this;
-        }
-        foreach ($this->subtree as $tab) {
-            if ($obj = $tab->find($id)) {
-                return $obj;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Allows to mark each tab's level in the tree before rendering.
-     *
-     * @param int $level
-     */
-    protected function set_level($level) {
-        $this->level = $level;
-        foreach ($this->subtree as $tab) {
-            $tab->set_level($level + 1);
-        }
-    }
-
-    /**
-     * Export for template.
-     *
-     * @param renderer_base $output Renderer.
-     * @return object
-     */
-    public function export_for_template(renderer_base $output) {
-        if ($this->inactive || ($this->selected && !$this->linkedwhenselected) || $this->activated) {
-            $link = null;
-        } else {
-            $link = $this->link;
-        }
-        $active = $this->activated || $this->selected;
-
-        return (object) [
-            'id' => $this->id,
-            'link' => is_object($link) ? $link->out(false) : $link,
-            'text' => $this->text,
-            'title' => $this->title,
-            'inactive' => !$active && $this->inactive,
-            'active' => $active,
-            'level' => $this->level,
-        ];
-    }
-
-}
-
-/**
- * Renderable for the main page header.
- *
- * @package core
- * @category output
- * @since 2.9
- * @copyright 2015 Adrian Greeve <adrian@moodle.com>
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class context_header implements renderable, templatable {
-
-    /**
-     * @var string $heading Main heading.
-     */
-    public $heading;
-    /**
-     * @var int $headinglevel Main heading 'h' tag level.
-     */
-    public $headinglevel;
-    /**
-     * @var string|null $imagedata HTML code for the picture in the page header.
-     */
-    public $imagedata;
-    /**
-     * @var array $additionalbuttons Additional buttons for the header e.g. Messaging button for the user header.
-     *      array elements - title => alternate text for the image, or if no image is available the button text.
-     *                       url => Link for the button to head to. Should be a moodle_url.
-     *                       image => location to the image, or name of the image in /pix/t/{image name}.
-     *                       linkattributes => additional attributes for the <a href> element.
-     *                       page => page object. Don't include if the image is an external image.
-     */
-    public $additionalbuttons;
-    /**
-     * @var string $prefix A string that is before the title.
-     */
-    public $prefix;
-
-    /**
-     * Constructor.
-     *
-     * @param string $heading Main heading data.
-     * @param int $headinglevel Main heading 'h' tag level.
-     * @param string|null $imagedata HTML code for the picture in the page header.
-     * @param string $additionalbuttons Buttons for the header e.g. Messaging button for the user header.
-     * @param string $prefix Text that precedes the heading.
-     */
-    public function __construct($heading = null, $headinglevel = 1, $imagedata = null, $additionalbuttons = null, $prefix = null) {
-
-        $this->heading = $heading;
-        $this->headinglevel = $headinglevel;
-        $this->imagedata = $imagedata;
-        $this->additionalbuttons = $additionalbuttons;
-        // If we have buttons then format them.
-        if (isset($this->additionalbuttons)) {
-            $this->format_button_images();
-        }
-        $this->prefix = $prefix;
-    }
-
-    /**
-     * Adds an array element for a formatted image.
-     */
-    protected function format_button_images() {
-
-        foreach ($this->additionalbuttons as $buttontype => $button) {
-            $page = $button['page'];
-            // If no image is provided then just use the title.
-            if (!isset($button['image'])) {
-                $this->additionalbuttons[$buttontype]['formattedimage'] = $button['title'];
-            } else {
-                // Check to see if this is an internal Moodle icon.
-                $internalimage = $page->theme->resolve_image_location('t/' . $button['image'], 'moodle');
-                if ($internalimage) {
-                    $this->additionalbuttons[$buttontype]['formattedimage'] = 't/' . $button['image'];
-                } else {
-                    // Treat as an external image.
-                    $this->additionalbuttons[$buttontype]['formattedimage'] = $button['image'];
-                }
-            }
-
-            if (isset($button['linkattributes']['class'])) {
-                $class = $button['linkattributes']['class'] . ' btn';
-            } else {
-                $class = 'btn';
-            }
-            // Add the bootstrap 'btn' class for formatting.
-            $this->additionalbuttons[$buttontype]['linkattributes'] = array_merge($button['linkattributes'],
-                array('class' => $class));
-        }
-    }
-
-    /**
-     * Export for template.
-     *
-     * @param renderer_base $output Renderer.
-     * @return array
-     */
-    public function export_for_template(renderer_base $output): array {
-        // Heading.
-        $headingtext = isset($this->heading) ? $this->heading : $output->get_page()->heading;
-        $heading = $output->heading($headingtext, $this->headinglevel, "h2 mb-0");
-
-        // Buttons.
-        if (isset($this->additionalbuttons)) {
-            $additionalbuttons = [];
-            foreach ($this->additionalbuttons as $button) {
-                if (!isset($button->page)) {
-                    // Include js for messaging.
-                    if ($button['buttontype'] === 'togglecontact') {
-                        \core_message\helper::togglecontact_requirejs();
-                    }
-                    if ($button['buttontype'] === 'message') {
-                        \core_message\helper::messageuser_requirejs();
-                    }
-                }
-                foreach ($button['linkattributes'] as $key => $value) {
-                    $button['attributes'][] = ['name' => $key, 'value' => $value];
-                }
-                $additionalbuttons[] = $button;
-            }
-        }
-
-        return [
-            'heading' => $heading,
-            'headinglevel' => $this->headinglevel,
-            'imagedata' => $this->imagedata,
-            'prefix' => $this->prefix,
-            'hasadditionalbuttons' => !empty($additionalbuttons),
-            'additionalbuttons' => $additionalbuttons ?? [],
-        ];
-    }
-}
-
-/**
- * Stores tabs list
- *
- * Example how to print a single line tabs:
- * $rows = array(
- *    new tabobject(...),
- *    new tabobject(...)
- * );
- * echo $OUTPUT->tabtree($rows, $selectedid);
- *
- * Multiple row tabs may not look good on some devices but if you want to use them
- * you can specify ->subtree for the active tabobject.
- *
- * @copyright 2013 Marina Glancy
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.5
- * @package core
- * @category output
- */
-class tabtree extends tabobject {
-    /**
-     * Constuctor
-     *
-     * It is highly recommended to call constructor when list of tabs is already
-     * populated, this way you ensure that selected and inactive tabs are located
-     * and attribute level is set correctly.
-     *
-     * @param array $tabs array of tabs, each of them may have it's own ->subtree
-     * @param string|null $selected which tab to mark as selected, all parent tabs will
-     *     automatically be marked as activated
-     * @param array|string|null $inactive list of ids of inactive tabs, regardless of
-     *     their level. Note that you can as weel specify tabobject::$inactive for separate instances
-     */
-    public function __construct($tabs, $selected = null, $inactive = null) {
-        $this->subtree = $tabs;
-        if ($selected !== null) {
-            $this->set_selected($selected);
-        }
-        if ($inactive !== null) {
-            if (is_array($inactive)) {
-                foreach ($inactive as $id) {
-                    if ($tab = $this->find($id)) {
-                        $tab->inactive = true;
-                    }
-                }
-            } else if ($tab = $this->find($inactive)) {
-                $tab->inactive = true;
-            }
-        }
-        $this->set_level(0);
-    }
-
-    /**
-     * Export for template.
-     *
-     * @param renderer_base $output Renderer.
-     * @return object
-     */
-    public function export_for_template(renderer_base $output) {
-        $tabs = [];
-        $secondrow = false;
-
-        foreach ($this->subtree as $tab) {
-            $tabs[] = $tab->export_for_template($output);
-            if (!empty($tab->subtree) && ($tab->level == 0 || $tab->selected || $tab->activated)) {
-                $secondrow = new tabtree($tab->subtree);
-            }
-        }
-
-        return (object) [
-            'tabs' => $tabs,
-            'secondrow' => $secondrow ? $secondrow->export_for_template($output) : false
-        ];
-    }
-}
-
-/**
- * An action menu.
- *
- * This action menu component takes a series of primary and secondary actions.
- * The primary actions are displayed permanently and the secondary attributes are displayed within a drop
- * down menu.
- *
- * @package core
- * @category output
- * @copyright 2013 Sam Hemelryk
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class action_menu implements renderable, templatable {
-
-    /**
-     * Top right alignment.
-     */
-    const TL = 1;
-
-    /**
-     * Top right alignment.
-     */
-    const TR = 2;
-
-    /**
-     * Top right alignment.
-     */
-    const BL = 3;
-
-    /**
-     * Top right alignment.
-     */
-    const BR = 4;
-
-    /**
-     * The instance number. This is unique to this instance of the action menu.
-     * @var int
-     */
-    protected $instance = 0;
-
-    /**
-     * An array of primary actions. Please use {@link action_menu::add_primary_action()} to add actions.
-     * @var array
-     */
-    protected $primaryactions = array();
-
-    /**
-     * An array of secondary actions. Please use {@link action_menu::add_secondary_action()} to add actions.
-     * @var array
-     */
-    protected $secondaryactions = array();
-
-    /**
-     * An array of attributes added to the container of the action menu.
-     * Initialised with defaults during construction.
-     * @var array
-     */
-    public $attributes = array();
-    /**
-     * An array of attributes added to the container of the primary actions.
-     * Initialised with defaults during construction.
-     * @var array
-     */
-    public $attributesprimary = array();
-    /**
-     * An array of attributes added to the container of the secondary actions.
-     * Initialised with defaults during construction.
-     * @var array
-     */
-    public $attributessecondary = array();
-
-    /**
-     * The string to use next to the icon for the action icon relating to the secondary (dropdown) menu.
-     * @var array
-     */
-    public $actiontext = null;
-
-    /**
-     * The string to use for the accessible label for the menu.
-     * @var array
-     */
-    public $actionlabel = null;
-
-    /**
-     * An icon to use for the toggling the secondary menu (dropdown).
-     * @var pix_icon
-     */
-    public $actionicon;
-
-    /**
-     * Any text to use for the toggling the secondary menu (dropdown).
-     * @var string
-     */
-    public $menutrigger = '';
-
-    /**
-     * An array of attributes added to the trigger element of the secondary menu.
-     * @var array
-     */
-    public $triggerattributes = [];
-
-    /**
-     * Any extra classes for toggling to the secondary menu.
-     * @var string
-     */
-    public $triggerextraclasses = '';
-
-    /**
-     * Place the action menu before all other actions.
-     * @var bool
-     */
-    public $prioritise = false;
-
-    /**
-     * Dropdown menu alignment class.
-     * @var string
-     */
-    public $dropdownalignment = '';
-
-    /**
-     * Constructs the action menu with the given items.
-     *
-     * @param array $actions An array of actions (action_menu_link|pix_icon|string).
-     */
-    public function __construct(array $actions = array()) {
-        static $initialised = 0;
-        $this->instance = $initialised;
-        $initialised++;
-
-        $this->attributes = array(
-            'id' => 'action-menu-'.$this->instance,
-            'class' => 'moodle-actionmenu',
-            'data-enhance' => 'moodle-core-actionmenu'
-        );
-        $this->attributesprimary = array(
-            'id' => 'action-menu-'.$this->instance.'-menubar',
-            'class' => 'menubar',
-        );
-        $this->attributessecondary = array(
-            'id' => 'action-menu-'.$this->instance.'-menu',
-            'class' => 'menu',
-            'data-rel' => 'menu-content',
-            'aria-labelledby' => 'action-menu-toggle-'.$this->instance,
-            'role' => 'menu'
-        );
-        $this->dropdownalignment = 'dropdown-menu-right';
-        foreach ($actions as $action) {
-            $this->add($action);
-        }
-    }
-
-    /**
-     * Sets the label for the menu trigger.
-     *
-     * @param string $label The text
-     */
-    public function set_action_label($label) {
-        $this->actionlabel = $label;
-    }
-
-    /**
-     * Sets the menu trigger text.
-     *
-     * @param string $trigger The text
-     * @param string $extraclasses Extra classes to style the secondary menu toggle.
-     */
-    public function set_menu_trigger($trigger, $extraclasses = '') {
-        $this->menutrigger = $trigger;
-        $this->triggerextraclasses = $extraclasses;
-    }
-
-    /**
-     * Classes for the trigger menu
-     */
-    const DEFAULT_KEBAB_TRIGGER_CLASSES = 'btn btn-icon d-flex align-items-center justify-content-center no-caret';
-
-    /**
-     * Setup trigger as in the kebab menu.
-     *
-     * @param string|null $triggername
-     * @param core_renderer|null $output
-     * @param string|null $extraclasses extra classes for the trigger {@see self::set_menu_trigger()}
-     * @throws coding_exception
-     */
-    public function set_kebab_trigger(?string $triggername = null, ?core_renderer $output = null,
-        ?string $extraclasses = '') {
-        global $OUTPUT;
-        if (empty($output)) {
-            $output = $OUTPUT;
-        }
-        $label = $triggername ?? get_string('actions');
-        $triggerclasses = self::DEFAULT_KEBAB_TRIGGER_CLASSES . ' ' . $extraclasses;
-        $icon = $output->pix_icon('i/menu', $label);
-        $this->set_menu_trigger($icon, $triggerclasses);
-    }
-
-    /**
-     * Return true if there is at least one visible link in the menu.
-     *
-     * @return bool
-     */
-    public function is_empty() {
-        return !count($this->primaryactions) && !count($this->secondaryactions);
-    }
-
-    /**
-     * Initialises JS required fore the action menu.
-     * The JS is only required once as it manages all action menu's on the page.
-     *
-     * @param moodle_page $page
-     */
-    public function initialise_js(moodle_page $page) {
-        static $initialised = false;
-        if (!$initialised) {
-            $page->requires->yui_module('moodle-core-actionmenu', 'M.core.actionmenu.init');
-            $initialised = true;
-        }
-    }
-
-    /**
-     * Adds an action to this action menu.
-     *
-     * @param action_link|pix_icon|subpanel|string $action
-     */
-    public function add($action) {
-
-        if ($action instanceof subpanel) {
-            $this->add_secondary_subpanel($action);
-        } else if ($action instanceof action_link) {
-            if ($action->primary) {
-                $this->add_primary_action($action);
-            } else {
-                $this->add_secondary_action($action);
-            }
-        } else if ($action instanceof pix_icon) {
-            $this->add_primary_action($action);
-        } else {
-            $this->add_secondary_action($action);
-        }
-    }
-
-    /**
-     * Adds a secondary subpanel.
-     * @param subpanel $subpanel
-     */
-    public function add_secondary_subpanel(subpanel $subpanel) {
-        $this->secondaryactions[] = $subpanel;
-    }
-
-    /**
-     * Adds a primary action to the action menu.
-     *
-     * @param action_menu_link|action_link|pix_icon|string $action
-     */
-    public function add_primary_action($action) {
-        if ($action instanceof action_link || $action instanceof pix_icon) {
-            $action->attributes['role'] = 'menuitem';
-            $action->attributes['tabindex'] = '-1';
-            if ($action instanceof action_menu_link) {
-                $action->actionmenu = $this;
-            }
-        }
-        $this->primaryactions[] = $action;
-    }
-
-    /**
-     * Adds a secondary action to the action menu.
-     *
-     * @param action_link|pix_icon|string $action
-     */
-    public function add_secondary_action($action) {
-        if ($action instanceof action_link || $action instanceof pix_icon) {
-            $action->attributes['role'] = 'menuitem';
-            $action->attributes['tabindex'] = '-1';
-            if ($action instanceof action_menu_link) {
-                $action->actionmenu = $this;
-            }
-        }
-        $this->secondaryactions[] = $action;
-    }
-
-    /**
-     * Returns the primary actions ready to be rendered.
-     *
-     * @param core_renderer $output The renderer to use for getting icons.
-     * @return array
-     */
-    public function get_primary_actions(core_renderer $output = null) {
-        global $OUTPUT;
-        if ($output === null) {
-            $output = $OUTPUT;
-        }
-        $pixicon = $this->actionicon;
-        $linkclasses = array('toggle-display');
-
-        $title = '';
-        if (!empty($this->menutrigger)) {
-            $pixicon = '<b class="caret"></b>';
-            $linkclasses[] = 'textmenu';
-        } else {
-            $title = new lang_string('actionsmenu', 'moodle');
-            $this->actionicon = new pix_icon(
-                't/edit_menu',
-                '',
-                'moodle',
-                array('class' => 'iconsmall actionmenu', 'title' => '')
-            );
-            $pixicon = $this->actionicon;
-        }
-        if ($pixicon instanceof renderable) {
-            $pixicon = $output->render($pixicon);
-            if ($pixicon instanceof pix_icon && isset($pixicon->attributes['alt'])) {
-                $title = $pixicon->attributes['alt'];
-            }
-        }
-        $string = '';
-        if ($this->actiontext) {
-            $string = $this->actiontext;
-        }
-        $label = '';
-        if ($this->actionlabel) {
-            $label = $this->actionlabel;
-        } else {
-            $label = $title;
-        }
-        $actions = $this->primaryactions;
-        $attributes = array(
-            'class' => implode(' ', $linkclasses),
-            'title' => $title,
-            'aria-label' => $label,
-            'id' => 'action-menu-toggle-'.$this->instance,
-            'role' => 'menuitem',
-            'tabindex' => '-1',
-        );
-        $link = html_writer::link('#', $string . $this->menutrigger . $pixicon, $attributes);
-        if ($this->prioritise) {
-            array_unshift($actions, $link);
-        } else {
-            $actions[] = $link;
-        }
-        return $actions;
-    }
-
-    /**
-     * Returns the secondary actions ready to be rendered.
-     * @return array
-     */
-    public function get_secondary_actions() {
-        return $this->secondaryactions;
-    }
-
-    /**
-     * Sets the selector that should be used to find the owning node of this menu.
-     * @param string $selector A CSS/YUI selector to identify the owner of the menu.
-     */
-    public function set_owner_selector($selector) {
-        $this->attributes['data-owner'] = $selector;
-    }
-
-    /**
-     * Sets the alignment of the dialogue in relation to button used to toggle it.
-     *
-     * @deprecated since Moodle 4.0
-     *
-     * @param int $dialogue One of action_menu::TL, action_menu::TR, action_menu::BL, action_menu::BR.
-     * @param int $button One of action_menu::TL, action_menu::TR, action_menu::BL, action_menu::BR.
-     */
-    public function set_alignment($dialogue, $button) {
-        debugging('The method action_menu::set_alignment() is deprecated, use action_menu::set_menu_left()', DEBUG_DEVELOPER);
-        if (isset($this->attributessecondary['data-align'])) {
-            // We've already got one set, lets remove the old class so as to avoid troubles.
-            $class = $this->attributessecondary['class'];
-            $search = 'align-'.$this->attributessecondary['data-align'];
-            $this->attributessecondary['class'] = str_replace($search, '', $class);
-        }
-        $align = $this->get_align_string($dialogue) . '-' . $this->get_align_string($button);
-        $this->attributessecondary['data-align'] = $align;
-        $this->attributessecondary['class'] .= ' align-'.$align;
-    }
-
-    /**
-     * Returns a string to describe the alignment.
-     *
-     * @param int $align One of action_menu::TL, action_menu::TR, action_menu::BL, action_menu::BR.
-     * @return string
-     */
-    protected function get_align_string($align) {
-        switch ($align) {
-            case self::TL :
-                return 'tl';
-            case self::TR :
-                return 'tr';
-            case self::BL :
-                return 'bl';
-            case self::BR :
-                return 'br';
-            default :
-                return 'tl';
-        }
-    }
-
-    /**
-     * Aligns the left corner of the dropdown.
-     *
-     */
-    public function set_menu_left() {
-        $this->dropdownalignment = 'dropdown-menu-left';
-    }
-
-    /**
-     * Sets a constraint for the dialogue.
-     *
-     * The constraint is applied when the dialogue is shown and limits the display of the dialogue to within the
-     * element the constraint identifies.
-     *
-     * This is required whenever the action menu is displayed inside any CSS element with the .no-overflow class
-     * (flexible_table and any of it's child classes are a likely candidate).
-     *
-     * @deprecated since Moodle 4.3
-     * @param string $ancestorselector A snippet of CSS used to identify the ancestor to contrain the dialogue to.
-     */
-    public function set_constraint($ancestorselector) {
-        debugging('The method set_constraint() is deprecated. Please use the set_boundary() method instead.', DEBUG_DEVELOPER);
-        $this->set_boundary('window');
-    }
-
-    /**
-     * Set the overflow constraint boundary of the dropdown menu.
-     * @see https://getbootstrap.com/docs/4.6/components/dropdowns/#options The 'boundary' option in the Bootstrap documentation
-     *
-     * @param string $boundary Accepts the values of 'viewport', 'window', or 'scrollParent'.
-     * @throws coding_exception
-     */
-    public function set_boundary(string $boundary) {
-        if (!in_array($boundary, ['viewport', 'window', 'scrollParent'])) {
-            throw new coding_exception("HTMLElement reference boundaries are not supported." .
-                "Accepted boundaries are 'viewport', 'window', or 'scrollParent'.", DEBUG_DEVELOPER);
-        }
-
-        $this->triggerattributes['data-boundary'] = $boundary;
-    }
-
-    /**
-     * If you call this method the action menu will be displayed but will not be enhanced.
-     *
-     * By not displaying the menu enhanced all items will be displayed in a single row.
-     *
-     * @deprecated since Moodle 3.2
-     */
-    public function do_not_enhance() {
-        debugging('The method action_menu::do_not_enhance() is deprecated, use a list of action_icon instead.', DEBUG_DEVELOPER);
-    }
-
-    /**
-     * Returns true if this action menu will be enhanced.
-     *
-     * @return bool
-     */
-    public function will_be_enhanced() {
-        return isset($this->attributes['data-enhance']);
-    }
-
-    /**
-     * Sets nowrap on items. If true menu items should not wrap lines if they are longer than the available space.
-     *
-     * This property can be useful when the action menu is displayed within a parent element that is either floated
-     * or relatively positioned.
-     * In that situation the width of the menu is determined by the width of the parent element which may not be large
-     * enough for the menu items without them wrapping.
-     * This disables the wrapping so that the menu takes on the width of the longest item.
-     *
-     * @param bool $value If true nowrap gets set, if false it gets removed. Defaults to true.
-     */
-    public function set_nowrap_on_items($value = true) {
-        $class = 'nowrap-items';
-        if (!empty($this->attributes['class'])) {
-            $pos = strpos($this->attributes['class'], $class);
-            if ($value === true && $pos === false) {
-                // The value is true and the class has not been set yet. Add it.
-                $this->attributes['class'] .= ' '.$class;
-            } else if ($value === false && $pos !== false) {
-                // The value is false and the class has been set. Remove it.
-                $this->attributes['class'] = substr($this->attributes['class'], $pos, strlen($class));
-            }
-        } else if ($value) {
-            // The value is true and the class has not been set yet. Add it.
-            $this->attributes['class'] = $class;
-        }
-    }
-
-    /**
-     * Add classes to the action menu for an easier styling.
-     *
-     * @param string $class The class to add to attributes.
-     */
-    public function set_additional_classes(string $class = '') {
-        if (!empty($this->attributes['class'])) {
-            $this->attributes['class'] .= " ".$class;
-        } else {
-            $this->attributes['class'] = $class;
-        }
-    }
-
-    /**
-     * Export for template.
-     *
-     * @param renderer_base $output The renderer.
-     * @return stdClass
-     */
-    public function export_for_template(renderer_base $output) {
-        $data = new stdClass();
-        // Assign a role of menubar to this action menu when:
-        // - it contains 2 or more primary actions; or
-        // - if it contains a primary action and secondary actions.
-        if (count($this->primaryactions) > 1 || (!empty($this->primaryactions) && !empty($this->secondaryactions))) {
-            $this->attributes['role'] = 'menubar';
-        }
-        $attributes = $this->attributes;
-
-        $data->instance = $this->instance;
-
-        $data->classes = isset($attributes['class']) ? $attributes['class'] : '';
-        unset($attributes['class']);
-
-        $data->attributes = array_map(function($key, $value) {
-            return [ 'name' => $key, 'value' => $value ];
-        }, array_keys($attributes), $attributes);
-
-        $data->primary = $this->export_primary_actions_for_template($output);
-        $data->secondary = $this->export_secondary_actions_for_template($output);
-        $data->dropdownalignment = $this->dropdownalignment;
-
-        return $data;
-    }
-
-    /**
-     * Export the primary actions for the template.
-     * @param renderer_base $output
-     * @return stdClass
-     */
-    protected function export_primary_actions_for_template(renderer_base $output): stdClass {
-        $attributes = $this->attributes;
-        $attributesprimary = $this->attributesprimary;
-
-        $primary = new stdClass();
-        $primary->title = '';
-        $primary->prioritise = $this->prioritise;
-
-        $primary->classes = isset($attributesprimary['class']) ? $attributesprimary['class'] : '';
-        unset($attributesprimary['class']);
-
-        $primary->attributes = array_map(function ($key, $value) {
-            return ['name' => $key, 'value' => $value];
-        }, array_keys($attributesprimary), $attributesprimary);
-        $primary->triggerattributes = array_map(function ($key, $value) {
-            return ['name' => $key, 'value' => $value];
-        }, array_keys($this->triggerattributes), $this->triggerattributes);
-
-        $actionicon = $this->actionicon;
-        if (!empty($this->menutrigger)) {
-            $primary->menutrigger = $this->menutrigger;
-            $primary->triggerextraclasses = $this->triggerextraclasses;
-            if ($this->actionlabel) {
-                $primary->title = $this->actionlabel;
-            } else if ($this->actiontext) {
-                $primary->title = $this->actiontext;
-            } else {
-                $primary->title = strip_tags($this->menutrigger);
-            }
-        } else {
-            $primary->title = get_string('actionsmenu');
-            $iconattributes = ['class' => 'iconsmall actionmenu', 'title' => $primary->title];
-            $actionicon = new pix_icon('t/edit_menu', '', 'moodle', $iconattributes);
-        }
-
-        // If the menu trigger is within the menubar, assign a role of menuitem. Otherwise, assign as a button.
-        $primary->triggerrole = 'button';
-        if (isset($attributes['role']) && $attributes['role'] === 'menubar') {
-            $primary->triggerrole = 'menuitem';
-        }
-
-        if ($actionicon instanceof pix_icon) {
-            $primary->icon = $actionicon->export_for_pix();
-            if (!empty($actionicon->attributes['alt'])) {
-                $primary->title = $actionicon->attributes['alt'];
-            }
-        } else {
-            $primary->iconraw = $actionicon ? $output->render($actionicon) : '';
-        }
-
-        $primary->actiontext = $this->actiontext ? (string) $this->actiontext : '';
-        $primary->items = array_map(function ($item) use ($output) {
-            $data = (object) [];
-            if ($item instanceof action_menu_link) {
-                $data->actionmenulink = $item->export_for_template($output);
-            } else if ($item instanceof action_menu_filler) {
-                $data->actionmenufiller = $item->export_for_template($output);
-            } else if ($item instanceof action_link) {
-                $data->actionlink = $item->export_for_template($output);
-            } else if ($item instanceof pix_icon) {
-                $data->pixicon = $item->export_for_template($output);
-            } else {
-                $data->rawhtml = ($item instanceof renderable) ? $output->render($item) : $item;
-            }
-            return $data;
-        }, $this->primaryactions);
-        return $primary;
-    }
-
-    /**
-     * Export the secondary actions for the template.
-     * @param renderer_base $output
-     * @return stdClass
-     */
-    protected function export_secondary_actions_for_template(renderer_base $output): stdClass {
-        $attributessecondary = $this->attributessecondary;
-        $secondary = new stdClass();
-        $secondary->classes = isset($attributessecondary['class']) ? $attributessecondary['class'] : '';
-        unset($attributessecondary['class']);
-
-        $secondary->attributes = array_map(function ($key, $value) {
-            return ['name' => $key, 'value' => $value];
-        }, array_keys($attributessecondary), $attributessecondary);
-        $secondary->items = array_map(function ($item) use ($output) {
-            $data = (object) [
-                'simpleitem' => true,
-            ];
-            if ($item instanceof action_menu_link) {
-                $data->actionmenulink = $item->export_for_template($output);
-                $data->simpleitem = false;
-            } else if ($item instanceof action_menu_filler) {
-                $data->actionmenufiller = $item->export_for_template($output);
-                $data->simpleitem = false;
-            } else if ($item instanceof subpanel) {
-                $data->subpanel = $item->export_for_template($output);
-                $data->simpleitem = false;
-            } else if ($item instanceof action_link) {
-                $data->actionlink = $item->export_for_template($output);
-            } else if ($item instanceof pix_icon) {
-                $data->pixicon = $item->export_for_template($output);
-            } else {
-                $data->rawhtml = ($item instanceof renderable) ? $output->render($item) : $item;
-            }
-            return $data;
-        }, $this->secondaryactions);
-        return $secondary;
-    }
-}
-
-/**
- * An action menu filler
- *
- * @package core
- * @category output
- * @copyright 2013 Andrew Nicols
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class action_menu_filler extends action_link implements renderable {
-
-    /**
-     * True if this is a primary action. False if not.
-     * @var bool
-     */
-    public $primary = true;
-
-    /**
-     * Constructs the object.
-     */
-    public function __construct() {
-        $this->attributes['id'] = html_writer::random_id('action_link');
-    }
-}
-
-/**
- * An action menu action
- *
- * @package core
- * @category output
- * @copyright 2013 Sam Hemelryk
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class action_menu_link extends action_link implements renderable {
-
-    /**
-     * True if this is a primary action. False if not.
-     * @var bool
-     */
-    public $primary = true;
-
-    /**
-     * The action menu this link has been added to.
-     * @var action_menu
-     */
-    public $actionmenu = null;
-
-    /**
-     * The number of instances of this action menu link (and its subclasses).
-     *
-     * @deprecated since Moodle 4.4.
-     * @var int
-     */
-    protected static $instance = 1;
-
-    /**
-     * Constructs the object.
-     *
-     * @param moodle_url $url The URL for the action.
-     * @param pix_icon|null $icon The icon to represent the action.
-     * @param string $text The text to represent the action.
-     * @param bool $primary Whether this is a primary action or not.
-     * @param array $attributes Any attribtues associated with the action.
-     */
-    public function __construct(moodle_url $url, ?pix_icon $icon, $text, $primary = true, array $attributes = array()) {
-        parent::__construct($url, $text, null, $attributes, $icon);
-        $this->primary = (bool)$primary;
-        $this->add_class('menu-action');
-        $this->attributes['role'] = 'menuitem';
-    }
-
-    /**
-     * Export for template.
-     *
-     * @param renderer_base $output The renderer.
-     * @return stdClass
-     */
-    public function export_for_template(renderer_base $output) {
-        $data = parent::export_for_template($output);
-
-        // Ignore what the parent did with the attributes, except for ID and class.
-        $data->attributes = [];
-        $attributes = $this->attributes;
-        unset($attributes['id']);
-        unset($attributes['class']);
-
-        // Handle text being a renderable.
-        if ($this->text instanceof renderable) {
-            $data->text = $this->render($this->text);
-        }
-
-        $data->showtext = (!$this->icon || $this->primary === false);
-
-        $data->icon = null;
-        if ($this->icon) {
-            $icon = $this->icon;
-            if ($this->primary || !$this->actionmenu->will_be_enhanced()) {
-                $attributes['title'] = $data->text;
-            }
-            $data->icon = $icon ? $icon->export_for_pix() : null;
-        }
-
-        $data->disabled = !empty($attributes['disabled']);
-        unset($attributes['disabled']);
-
-        $data->attributes = array_map(function($key, $value) {
-            return [
-                'name' => $key,
-                'value' => $value
-            ];
-        }, array_keys($attributes), $attributes);
-
-        return $data;
-    }
-}
-
-/**
- * A primary action menu action
- *
- * @package core
- * @category output
- * @copyright 2013 Sam Hemelryk
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class action_menu_link_primary extends action_menu_link {
-    /**
-     * Constructs the object.
-     *
-     * @param moodle_url $url
-     * @param pix_icon|null $icon
-     * @param string $text
-     * @param array $attributes
-     */
-    public function __construct(moodle_url $url, ?pix_icon $icon, $text, array $attributes = array()) {
-        parent::__construct($url, $icon, $text, true, $attributes);
-    }
-}
-
-/**
- * A secondary action menu action
- *
- * @package core
- * @category output
- * @copyright 2013 Sam Hemelryk
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class action_menu_link_secondary extends action_menu_link {
-    /**
-     * Constructs the object.
-     *
-     * @param moodle_url $url
-     * @param pix_icon|null $icon
-     * @param string $text
-     * @param array $attributes
-     */
-    public function __construct(moodle_url $url, ?pix_icon $icon, $text, array $attributes = array()) {
-        parent::__construct($url, $icon, $text, false, $attributes);
-    }
-}
-
-/**
- * Represents a set of preferences groups.
- *
- * @package core
- * @category output
- * @copyright 2015 Frédéric Massart - FMCorz.net
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class preferences_groups implements renderable {
-
-    /**
-     * Array of preferences_group.
-     * @var array
-     */
-    public $groups;
-
-    /**
-     * Constructor.
-     * @param array $groups of preferences_group
-     */
-    public function __construct($groups) {
-        $this->groups = $groups;
-    }
-
-}
-
-/**
- * Represents a group of preferences page link.
- *
- * @package core
- * @category output
- * @copyright 2015 Frédéric Massart - FMCorz.net
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class preferences_group implements renderable {
-
-    /**
-     * Title of the group.
-     * @var string
-     */
-    public $title;
-
-    /**
-     * Array of navigation_node.
-     * @var array
-     */
-    public $nodes;
-
-    /**
-     * Constructor.
-     * @param string $title The title.
-     * @param array $nodes of navigation_node.
-     */
-    public function __construct($title, $nodes) {
-        $this->title = $title;
-        $this->nodes = $nodes;
-    }
-}
-
-/**
- * Progress bar class.
- *
- * Manages the display of a progress bar.
- *
- * To use this class.
- * - construct
- * - call create (or use the 3rd param to the constructor)
- * - call update or update_full() or update() repeatedly
- *
- * @copyright 2008 jamiesensei
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package core
- * @category output
- */
-class progress_bar implements renderable, templatable {
-    /** @var string html id */
-    private $html_id;
-    /** @var int total width */
-    private $width;
-    /** @var int last percentage printed */
-    private $percent = 0;
-    /** @var int time when last printed */
-    private $lastupdate = 0;
-    /** @var int when did we start printing this */
-    private $time_start = 0;
-
-    /**
-     * Constructor
-     *
-     * Prints JS code if $autostart true.
-     *
-     * @param string $htmlid The container ID.
-     * @param int $width The suggested width.
-     * @param bool $autostart Whether to start the progress bar right away.
-     */
-    public function __construct($htmlid = '', $width = 500, $autostart = false) {
-        if (!CLI_SCRIPT && !NO_OUTPUT_BUFFERING) {
-            debugging('progress_bar used in a non-CLI script without setting NO_OUTPUT_BUFFERING.', DEBUG_DEVELOPER);
-        }
-
-        if (!empty($htmlid)) {
-            $this->html_id  = $htmlid;
-        } else {
-            $this->html_id  = 'pbar_'.uniqid();
-        }
-
-        $this->width = $width;
-
-        if ($autostart) {
-            $this->create();
-        }
-    }
-
-    /**
-     * Getter for ID
-     * @return string id
-     */
-    public function get_id(): string {
-        return $this->html_id;
-    }
-
-    /**
-     * Create a new progress bar, this function will output html.
-     *
-     * @return void Echo's output
-     */
-    public function create() {
-        global $OUTPUT;
-
-        $this->time_start = microtime(true);
-
-        flush();
-        echo $OUTPUT->render($this);
-        flush();
-    }
-
-    /**
-     * Update the progress bar.
-     *
-     * @param int $percent From 1-100.
-     * @param string $msg The message.
-     * @return void Echo's output
-     * @throws coding_exception
-     */
-    private function _update($percent, $msg) {
-        global $OUTPUT;
-
-        if (empty($this->time_start)) {
-            throw new coding_exception('You must call create() (or use the $autostart ' .
-                'argument to the constructor) before you try updating the progress bar.');
-        }
-
-        $estimate = $this->estimate($percent);
-
-        if ($estimate === null) {
-            // Always do the first and last updates.
-        } else if ($estimate == 0) {
-            // Always do the last updates.
-        } else if ($this->lastupdate + 20 < time()) {
-            // We must update otherwise browser would time out.
-        } else if (round($this->percent, 2) === round($percent, 2)) {
-            // No significant change, no need to update anything.
-            return;
-        }
-
-        $estimatemsg = '';
-        if ($estimate != 0 && is_numeric($estimate)) {
-            // Err on the conservative side and also avoid showing 'now' as the estimate.
-            $estimatemsg = format_time(ceil($estimate));
-        }
-
-        $this->percent = $percent;
-        $this->lastupdate = microtime(true);
-
-        echo $OUTPUT->render_progress_bar_update($this->html_id, $this->percent, $msg, $estimatemsg);
-        flush();
-    }
-
-    /**
-     * Estimate how much time it is going to take.
-     *
-     * @param int $pt From 1-100.
-     * @return mixed Null (unknown), or int.
-     */
-    private function estimate($pt) {
-        if ($this->lastupdate == 0) {
-            return null;
-        }
-        if ($pt < 0.00001) {
-            return null; // We do not know yet how long it will take.
-        }
-        if ($pt > 99.99999) {
-            return 0; // Nearly done, right?
-        }
-        $consumed = microtime(true) - $this->time_start;
-        if ($consumed < 0.001) {
-            return null;
-        }
-
-        return (100 - $pt) * ($consumed / $pt);
-    }
-
-    /**
-     * Update progress bar according percent.
-     *
-     * @param int $percent From 1-100.
-     * @param string $msg The message needed to be shown.
-     */
-    public function update_full($percent, $msg) {
-        $percent = max(min($percent, 100), 0);
-        $this->_update($percent, $msg);
-    }
-
-    /**
-     * Update progress bar according the number of tasks.
-     *
-     * @param int $cur Current task number.
-     * @param int $total Total task number.
-     * @param string $msg The message needed to be shown.
-     */
-    public function update($cur, $total, $msg) {
-        $percent = ($cur / $total) * 100;
-        $this->update_full($percent, $msg);
-    }
-
-    /**
-     * Restart the progress bar.
-     */
-    public function restart() {
-        $this->percent    = 0;
-        $this->lastupdate = 0;
-        $this->time_start = 0;
-    }
-
-    /**
-     * Export for template.
-     *
-     * @param  renderer_base $output The renderer.
-     * @return array
-     */
-    public function export_for_template(renderer_base $output) {
-        return [
-            'id' => $this->html_id,
-            'width' => $this->width,
-        ];
-    }
-}
+// This file is deprecated, but it should never have been manually included by anything outside of lib/outputlib.php.
+// Throwing an exception here should be fine because removing the manual inclusion should have no impact.
+throw new \core\exception\coding_exception(
+    'This file should not be manually included by any component.',
+);
diff --git a/lib/outputfactories.php b/lib/outputfactories.php
index aa28a9e690191..0fdca282e68ed 100644
--- a/lib/outputfactories.php
+++ b/lib/outputfactories.php
@@ -14,436 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Interface and classes for creating appropriate renderers for various parts of Moodle.
- *
- * Please see http://docs.moodle.org/en/Developement:How_Moodle_outputs_HTML
- * for an overview.
- *
- * @copyright 2009 Tim Hunt
- * @license  http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package core
- * @category output
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-/** General rendering target, usually normal browser page */
-define('RENDERER_TARGET_GENERAL', 'general');
-
-/** General rendering target, usually normal browser page, but with limited capacity to avoid API use */
-define('RENDERER_TARGET_MAINTENANCE', 'maintenance');
-
-/** Plain text rendering for CLI scripts and cron */
-define('RENDERER_TARGET_CLI', 'cli');
-
-/** Plain text rendering for Ajax scripts*/
-define('RENDERER_TARGET_AJAX', 'ajax');
-
-/** Plain text rendering intended for sending via email */
-define('RENDERER_TARGET_TEXTEMAIL', 'textemail');
-
-/** Rich text html rendering intended for sending via email */
-define('RENDERER_TARGET_HTMLEMAIL', 'htmlemail');
-
-// note: maybe we could define portfolio export target too
-
-
-/**
- * A renderer factory is just responsible for creating an appropriate renderer
- * for any given part of Moodle.
- *
- * Which renderer factory to use is chose by the current theme, and an instance
- * if created automatically when the theme is set up.
- *
- * A renderer factory must also have a constructor that takes a theme_config object.
- * (See {@link renderer_factory_base::__construct} for an example.)
- *
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-interface renderer_factory {
-
-    /**
-     * Return the renderer for a particular part of Moodle.
-     *
-     * The renderer interfaces are defined by classes called {plugin}_renderer
-     * where {plugin} is the name of the component. The renderers for core Moodle are
-     * defined in lib/renderer.php. For plugins, they will be defined in a file
-     * called renderer.php inside the plugin.
-     *
-     * Renderers will normally want to subclass the renderer_base class.
-     * (However, if you really know what you are doing, you don't have to do that.)
-     *
-     * There is no separate interface definition for renderers. The default
-     * {plugin}_renderer implementation also serves to define the API for
-     * other implementations of the interface, whether or not they subclass it.
-     *
-     * A particular plugin can define multiple renderers if it wishes, using the
-     * $subtype parameter. For example workshop_renderer,
-     * workshop_allocation_manual_renderer etc.
-     *
-     * @param moodle_page $page the page the renderer is outputting content for.
-     * @param string $component name such as 'core', 'mod_forum' or 'qtype_multichoice'.
-     * @param string $subtype optional subtype such as 'news' resulting to 'mod_forum_news'
-     * @param string $target one of rendering target constants
-     * @return renderer_base an object implementing the requested renderer interface.
-     */
-    public function get_renderer(moodle_page $page, $component, $subtype=null, $target=null);
-}
-
-
-/**
- * This is a base class to help you implement the renderer_factory interface.
- *
- * It keeps a cache of renderers that have been constructed, so you only need
- * to construct each one once in you subclass.
- *
- * It also has a method to get the name of, and include the renderer.php with
- * the definition of, the standard renderer class for a given module.
- *
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-abstract class renderer_factory_base implements renderer_factory {
-    /**
-     * @var theme_config The theme we belong to.
-     */
-    protected $theme;
-
-    /**
-     * Constructor.
-     *
-     * @param theme_config $theme the theme we belong to.
-     */
-    public function __construct(theme_config $theme) {
-        $this->theme = $theme;
-    }
-
-    /**
-     * Returns suffix of renderer class expected for given target.
-     *
-     * @param string $target one of the renderer target constants, target is guessed if null used
-     * @return array two element array, first element is target, second the target suffix string
-     */
-    protected function get_target_suffix($target) {
-        if (empty($target) || $target === RENDERER_TARGET_MAINTENANCE) {
-            // If the target hasn't been specified we need to guess the defaults.
-            // We also override the target with the default if the maintenance target has been provided.
-            // This ensures we don't use the maintenance renderer if we are processing a special target.
-            if (defined('PREFERRED_RENDERER_TARGET')) {
-                $target = PREFERRED_RENDERER_TARGET;
-            } else if (CLI_SCRIPT) {
-                $target = RENDERER_TARGET_CLI;
-            } else if (AJAX_SCRIPT) {
-                $target = RENDERER_TARGET_AJAX;
-            }
-        }
-
-        switch ($target) {
-            case RENDERER_TARGET_CLI: $suffix = '_cli'; break;
-            case RENDERER_TARGET_AJAX: $suffix = '_ajax'; break;
-            case RENDERER_TARGET_TEXTEMAIL: $suffix = '_textemail'; break;
-            case RENDERER_TARGET_HTMLEMAIL: $suffix = '_htmlemail'; break;
-            case RENDERER_TARGET_MAINTENANCE: $suffix = '_maintenance'; break;
-            default: $target = RENDERER_TARGET_GENERAL; $suffix = '';
-        }
-
-        return array($target, $suffix);
-    }
-
-    /**
-     * For a given module name, return the possible class names
-     * that defines the renderer interface for that module.
-     *
-     * Newer auto-loaded class names are returned as well as the old style _renderable classnames.
-     *
-     * Also, if it exists, include the renderer.php file for that module, so
-     * the class definition of the default renderer has been loaded.
-     *
-     * @param string $component name such as 'core', 'mod_forum' or 'qtype_multichoice'.
-     * @param string $subtype optional subtype such as 'news' resulting to:
-     *              '\mod_forum\output\news_renderer'
-     *              or '\mod_forum\output\news\renderer'
-     *              or non-autoloaded 'mod_forum_news'
-     * @return array[] Each element of the array is an array with keys:
-     *                 classname - The class name to search
-     *                 autoloaded - Does this classname assume autoloading?
-     *                 validwithprefix - Is this class name valid when a prefix is added to it?
-     *                 validwithoutprefix - Is this class name valid when no prefix is added to it?
-     * @throws coding_exception
-     */
-    protected function standard_renderer_classnames($component, $subtype = null) {
-        global $CFG; // Needed in included files.
-        $classnames = array();
-
-        // Standardize component name ala frankenstyle.
-        list($plugin, $type) = core_component::normalize_component($component);
-        if ($type === null) {
-            $component = $plugin;
-        } else {
-            $component = $plugin.'_'.$type;
-        }
-
-        if ($component !== 'core') {
-            // Renderers are stored in renderer.php files.
-            if (!$compdirectory = core_component::get_component_directory($component)) {
-                throw new coding_exception('Invalid component specified in renderer request', $component);
-            }
-            $rendererfile = $compdirectory . '/renderer.php';
-            if (file_exists($rendererfile)) {
-                include_once($rendererfile);
-            }
-
-        } else if (!empty($subtype)) {
-            $coresubsystems = core_component::get_core_subsystems();
-            if (!array_key_exists($subtype, $coresubsystems)) { // There may be nulls.
-                throw new coding_exception('Invalid core subtype "' . $subtype . '" in renderer request', $subtype);
-            }
-            if ($coresubsystems[$subtype]) {
-                $rendererfile = $coresubsystems[$subtype] . '/renderer.php';
-                if (file_exists($rendererfile)) {
-                    include_once($rendererfile);
-                }
-            }
-        }
-
-        if (empty($subtype)) {
-            // Theme specific auto-loaded name (only valid when prefixed with the theme name).
-            $classnames[] = array(
-                'validwithprefix' => true,
-                'validwithoutprefix' => false,
-                'autoloaded' => true,
-                'classname' => '\\output\\' . $component . '_renderer'
-            );
-
-            // Standard autoloaded plugin name (not valid with a prefix).
-            $classnames[] = array(
-                'validwithprefix' => false,
-                'validwithoutprefix' => true,
-                'autoloaded' => true,
-                'classname' => '\\' . $component . '\\output\\renderer'
-            );
-            // Legacy class name - (valid with or without a prefix).
-            $classnames[] = array(
-                'validwithprefix' => true,
-                'validwithoutprefix' => true,
-                'autoloaded' => false,
-                'classname' => $component . '_renderer'
-            );
-        } else {
-            // Theme specific auto-loaded name (only valid when prefixed with the theme name).
-            $classnames[] = array(
-                'validwithprefix' => true,
-                'validwithoutprefix' => false,
-                'autoloaded' => true,
-                'classname' => '\\output\\' . $component . '\\' . $subtype . '_renderer'
-            );
-            // Version of the above with subtype being a namespace level on it's own.
-            $classnames[] = array(
-                'validwithprefix' => true,
-                'validwithoutprefix' => false,
-                'autoloaded' => true,
-                'classname' => '\\output\\' . $component . '\\' . $subtype . '\\renderer'
-            );
-            // Standard autoloaded plugin name (not valid with a prefix).
-            $classnames[] = array(
-                'validwithprefix' => false,
-                'validwithoutprefix' => true,
-                'autoloaded' => true,
-                'classname' => '\\' . $component . '\\output\\' . $subtype . '_renderer'
-            );
-            // Version of the above with subtype being a namespace level on it's own.
-            $classnames[] = array(
-                'validwithprefix' => false,
-                'validwithoutprefix' => true,
-                'autoloaded' => true,
-                'classname' => '\\' . $component . '\\output\\' . $subtype . '\\renderer'
-            );
-            // Legacy class name - (valid with or without a prefix).
-            $classnames[] = array(
-                'validwithprefix' => true,
-                'validwithoutprefix' => true,
-                'autoloaded' => false,
-                'classname' => $component . '_' . $subtype . '_renderer'
-            );
-        }
-        return $classnames;
-    }
-}
-
-/**
- * This is the default renderer factory for Moodle.
- *
- * It simply returns an instance of the appropriate standard renderer class.
- *
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class standard_renderer_factory extends renderer_factory_base {
-
-    /**
-     * Implement the subclass method
-     *
-     * @param moodle_page $page the page the renderer is outputting content for.
-     * @param string $component name such as 'core', 'mod_forum' or 'qtype_multichoice'.
-     * @param string $subtype optional subtype such as 'news' resulting to 'mod_forum_news'
-     * @param string $target one of rendering target constants
-     * @return renderer_base an object implementing the requested renderer interface.
-     */
-    public function get_renderer(moodle_page $page, $component, $subtype = null, $target = null) {
-        $classnames = $this->standard_renderer_classnames($component, $subtype);
-        $classname = '';
-
-        list($target, $suffix) = $this->get_target_suffix($target);
-        // First look for a version with a suffix.
-        foreach ($classnames as $classnamedetails) {
-            if ($classnamedetails['validwithoutprefix']) {
-                $newclassname = $classnamedetails['classname'] . $suffix;
-                if (class_exists($newclassname)) {
-                    $classname = $newclassname;
-                    break;
-                } else {
-                    $newclassname = $classnamedetails['classname'];
-                    if (class_exists($newclassname)) {
-                        $classname = $newclassname;
-                        break;
-                    }
-                }
-            }
-        }
-        // Now look for a non-suffixed version.
-        if (empty($classname)) {
-            foreach ($classnames as $classnamedetails) {
-                if ($classnamedetails['validwithoutprefix']) {
-                    $newclassname = $classnamedetails['classname'];
-                    if (class_exists($newclassname)) {
-                        $classname = $newclassname;
-                        break;
-                    }
-                }
-            }
-        }
-
-        if (empty($classname)) {
-            // Standard renderer must always exist.
-            throw new coding_exception('Request for an unknown renderer class. Searched for: ' . var_export($classnames, true));
-        }
-
-        return new $classname($page, $target);
-    }
-}
-
-
-/**
- * This is renderer factory allows themes to override the standard renderers using php code.
- *
- * It will load any code from theme/mytheme/renderers.php and
- * theme/parenttheme/renderers.php, if then exist. Then whenever you ask for
- * a renderer for 'component', it will create a mytheme_component_renderer or a
- * parenttheme_component_renderer, instead of a component_renderer,
- * if either of those classes exist.
- *
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class theme_overridden_renderer_factory extends renderer_factory_base {
-
-    /**
-     * @var array An array of renderer prefixes
-     */
-    protected $prefixes = array();
-
-    /**
-     * Constructor.
-     * @param theme_config $theme the theme we are rendering for.
-     */
-    public function __construct(theme_config $theme) {
-        parent::__construct($theme);
-        // Initialise $this->prefixes.
-        $this->prefixes = $theme->renderer_prefixes();
-    }
-
-    /**
-     * Implement the subclass method
-     *
-     * @param moodle_page $page the page the renderer is outputting content for.
-     * @param string $component name such as 'core', 'mod_forum' or 'qtype_multichoice'.
-     * @param string $subtype optional subtype such as 'news' resulting to 'mod_forum_news'
-     * @param string $target one of rendering target constants
-     * @return renderer_base an object implementing the requested renderer interface.
-     */
-    public function get_renderer(moodle_page $page, $component, $subtype = null, $target = null) {
-        $classnames = $this->standard_renderer_classnames($component, $subtype);
-
-        list($target, $suffix) = $this->get_target_suffix($target);
-
-        // Theme lib.php and renderers.php files are loaded automatically
-        // when loading the theme configs.
-
-        // First try the renderers with correct suffix.
-        foreach ($this->prefixes as $prefix) {
-            foreach ($classnames as $classnamedetails) {
-                if ($classnamedetails['validwithprefix']) {
-                    if ($classnamedetails['autoloaded']) {
-                        $newclassname = $prefix . $classnamedetails['classname'] . $suffix;
-                    } else {
-                        $newclassname = $prefix . '_' . $classnamedetails['classname'] . $suffix;
-                    }
-                    if (class_exists($newclassname)) {
-                        return new $newclassname($page, $target);
-                    }
-                }
-            }
-        }
-        foreach ($classnames as $classnamedetails) {
-            if ($classnamedetails['validwithoutprefix']) {
-                $newclassname = $classnamedetails['classname'] . $suffix;
-                if (class_exists($newclassname)) {
-                    // Use the specialised renderer for given target, default renderer might also decide
-                    // to implement support for more targets.
-                    return new $newclassname($page, $target);
-                }
-            }
-        }
-
-        // Then try general renderer.
-        foreach ($this->prefixes as $prefix) {
-            foreach ($classnames as $classnamedetails) {
-                if ($classnamedetails['validwithprefix']) {
-                    if ($classnamedetails['autoloaded']) {
-                        $newclassname = $prefix . $classnamedetails['classname'];
-                    } else {
-                        $newclassname = $prefix . '_' . $classnamedetails['classname'];
-                    }
-                    if (class_exists($newclassname)) {
-                        return new $newclassname($page, $target);
-                    }
-                }
-            }
-        }
-
-        // Final attempt - no prefix or suffix.
-        foreach ($classnames as $classnamedetails) {
-            if ($classnamedetails['validwithoutprefix']) {
-                $newclassname = $classnamedetails['classname'];
-                if (class_exists($newclassname)) {
-                    return new $newclassname($page, $target);
-                }
-            }
-        }
-        throw new coding_exception('Request for an unknown renderer ' . $component . ', ' . $subtype . ', ' . $target);
-    }
-}
+// This file is deprecated, but it should never have been manually included by anything outside of lib/outputlib.php.
+// Throwing an exception here should be fine because removing the manual inclusion should have no impact.
+throw new \core\exception\coding_exception(
+    'This file should not be manually included by any component.',
+);
diff --git a/lib/outputfragmentrequirementslib.php b/lib/outputfragmentrequirementslib.php
index da753ef3332eb..2b6fa039198fa 100644
--- a/lib/outputfragmentrequirementslib.php
+++ b/lib/outputfragmentrequirementslib.php
@@ -14,116 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Library functions to facilitate the use of JavaScript in Moodle.
- *
- * @copyright 2016 Adrian Greeve <adrian@moodle.com>
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package core
- * @category output
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * This requirements manager captures the appropriate html for creating a fragment to
- * be inserted elsewhere.
- *
- * @copyright 2016 Adrian Greeve <adrian@moodle.com>
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 3.1
- * @package core
- * @category output
- */
-class fragment_requirements_manager extends page_requirements_manager {
-
-    /**
-     * Page fragment constructor.
-     */
-    public function __construct() {
-        parent::__construct();
-        // As this is a fragment the header should already be done.
-        $this->headdone = true;
-    }
-
-    /**
-     * Returns js code to load amd module loader, then insert inline script tags
-     * that contain require() calls using RequireJS.
-     *
-     * @return string
-     */
-    protected function get_amd_footercode() {
-        global $CFG;
-        $output = '';
-
-        // First include must be to a module with no dependencies, this prevents multiple requests.
-        $prefix = 'M.util.js_pending("core/first");';
-        $prefix .= "require(['core/first'], function() {\n";
-        $suffix = "\n});";
-        $suffix .= 'M.util.js_complete("core/first");';
-        $output .= html_writer::script($prefix . implode(";\n", $this->amdjscode) . $suffix);
-        return $output;
-    }
-
-
-    /**
-     * Generate any HTML that needs to go at the end of the page.
-     *
-     * @return string the HTML code to to at the end of the page.
-     */
-    public function get_end_code() {
-        global $CFG;
-
-        $output = '';
-
-        // Call amd init functions.
-        $output .= $this->get_amd_footercode();
-
-        // Add other requested modules.
-        $output .= $this->get_extra_modules_code();
-
-        // All the other linked scripts - there should be as few as possible.
-        if ($this->jsincludes['footer']) {
-            foreach ($this->jsincludes['footer'] as $url) {
-                $output .= html_writer::script('', $url);
-            }
-        }
-
-        if (!empty($this->stringsforjs)) {
-            // Add all needed strings.
-            $strings = array();
-            foreach ($this->stringsforjs as $component => $v) {
-                foreach ($v as $indentifier => $langstring) {
-                    $strings[$component][$indentifier] = $langstring->out();
-                }
-            }
-            // Append don't overwrite.
-            $output .= html_writer::script('require(["jquery"], function($) {
-                M.str = $.extend(true, M.str, ' . json_encode($strings) . ');
-            });');
-        }
-
-        // Add variables.
-        if ($this->jsinitvariables['footer']) {
-            $js = '';
-            foreach ($this->jsinitvariables['footer'] as $data) {
-                list($var, $value) = $data;
-                $js .= js_writer::set_variable($var, $value, true);
-            }
-            $output .= html_writer::script($js);
-        }
-
-        $inyuijs = $this->get_javascript_code(false);
-        $ondomreadyjs = $this->get_javascript_code(true);
-        // See if this is still needed when we get to the ajax page.
-        $jsinit = $this->get_javascript_init_code();
-        $handlersjs = $this->get_event_handler_code();
-
-        // There is a global Y, make sure it is available in your scope.
-        $js = "(function() {{$inyuijs}{$ondomreadyjs}{$jsinit}{$handlersjs}})();";
-
-        $output .= html_writer::script($js);
-
-        return $output;
-    }
-}
+// This file is deprecated, but it should never have been manually included by anything outside of lib/pagelib.php.
+// Throwing an exception here should be fine because removing the manual inclusion should have no impact.
+throw new \core\exception\coding_exception(
+    'This file should not be manually included by any component.',
+);
diff --git a/lib/outputlib.php b/lib/outputlib.php
index 2925074bbcc0e..4dbf86e0b3bd7 100644
--- a/lib/outputlib.php
+++ b/lib/outputlib.php
@@ -26,13 +26,23 @@
  * @category output
  */
 
-defined('MOODLE_INTERNAL') || die();
+/** General rendering target, usually normal browser page */
+define('RENDERER_TARGET_GENERAL', 'general');
 
-require_once($CFG->libdir.'/outputcomponents.php');
-require_once($CFG->libdir.'/outputactions.php');
-require_once($CFG->libdir.'/outputfactories.php');
-require_once($CFG->libdir.'/outputrenderers.php');
-require_once($CFG->libdir.'/outputrequirementslib.php');
+/** General rendering target, usually normal browser page, but with limited capacity to avoid API use */
+define('RENDERER_TARGET_MAINTENANCE', 'maintenance');
+
+/** Plain text rendering for CLI scripts and cron */
+define('RENDERER_TARGET_CLI', 'cli');
+
+/** Plain text rendering for Ajax scripts*/
+define('RENDERER_TARGET_AJAX', 'ajax');
+
+/** Plain text rendering intended for sending via email */
+define('RENDERER_TARGET_TEXTEMAIL', 'textemail');
+
+/** Rich text html rendering intended for sending via email */
+define('RENDERER_TARGET_HTMLEMAIL', 'htmlemail');
 
 /**
  * Returns current theme revision number.
@@ -328,2438 +338,35 @@ function theme_delete_used_in_context_cache(string $newtheme, string $oldtheme):
 }
 
 /**
- * This class represents the configuration variables of a Moodle theme.
- *
- * All the variables with access: public below (with a few exceptions that are marked)
- * are the properties you can set in your themes config.php file.
- *
- * There are also some methods and protected variables that are part of the inner
- * workings of Moodle's themes system. If you are just editing a themes config.php
- * file, you can just ignore those, and the following information for developers.
- *
- * Normally, to create an instance of this class, you should use the
- * {@link theme_config::load()} factory method to load a themes config.php file.
- * However, normally you don't need to bother, because moodle_page (that is, $PAGE)
- * will create one for you, accessible as $PAGE->theme.
- *
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
+ * Invalidate all server and client side template caches.
  */
-class theme_config {
-
-    /**
-     * @var string Default theme, used when requested theme not found.
-     */
-    const DEFAULT_THEME = 'boost';
-
-    /** The key under which the SCSS file is stored amongst the CSS files. */
-    const SCSS_KEY = '__SCSS__';
-
-    /**
-     * @var array You can base your theme on other themes by linking to the other theme as
-     * parents. This lets you use the CSS and layouts from the other themes
-     * (see {@link theme_config::$layouts}).
-     * That makes it easy to create a new theme that is similar to another one
-     * but with a few changes. In this themes CSS you only need to override
-     * those rules you want to change.
-     */
-    public $parents;
-
-    /**
-     * @var array The names of all the stylesheets from this theme that you would
-     * like included, in order. Give the names of the files without .css.
-     */
-    public $sheets = array();
-
-    /**
-     * @var array The names of all the stylesheets from parents that should be excluded.
-     * true value may be used to specify all parents or all themes from one parent.
-     * If no value specified value from parent theme used.
-     */
-    public $parents_exclude_sheets = null;
-
-    /**
-     * @var array List of plugin sheets to be excluded.
-     * If no value specified value from parent theme used.
-     */
-    public $plugins_exclude_sheets = null;
-
-    /**
-     * @var array List of style sheets that are included in the text editor bodies.
-     * Sheets from parent themes are used automatically and can not be excluded.
-     */
-    public $editor_sheets = array();
-
-    /**
-     * @var bool Whether a fallback version of the stylesheet will be used
-     * whilst the final version is generated.
-     */
-    public $usefallback = false;
-
-    /**
-     * @var array The names of all the javascript files this theme that you would
-     * like included from head, in order. Give the names of the files without .js.
-     */
-    public $javascripts = array();
-
-    /**
-     * @var array The names of all the javascript files this theme that you would
-     * like included from footer, in order. Give the names of the files without .js.
-     */
-    public $javascripts_footer = array();
-
-    /**
-     * @var array The names of all the javascript files from parents that should
-     * be excluded. true value may be used to specify all parents or all themes
-     * from one parent.
-     * If no value specified value from parent theme used.
-     */
-    public $parents_exclude_javascripts = null;
-
-    /**
-     * @var array Which file to use for each page layout.
-     *
-     * This is an array of arrays. The keys of the outer array are the different layouts.
-     * Pages in Moodle are using several different layouts like 'normal', 'course', 'home',
-     * 'popup', 'form', .... The most reliable way to get a complete list is to look at
-     * {@link http://cvs.moodle.org/moodle/theme/base/config.php?view=markup the base theme config.php file}.
-     * That file also has a good example of how to set this setting.
-     *
-     * For each layout, the value in the outer array is an array that describes
-     * how you want that type of page to look. For example
-     * <pre>
-     *   $THEME->layouts = array(
-     *       // Most pages - if we encounter an unknown or a missing page type, this one is used.
-     *       'standard' => array(
-     *           'theme' = 'mytheme',
-     *           'file' => 'normal.php',
-     *           'regions' => array('side-pre', 'side-post'),
-     *           'defaultregion' => 'side-post'
-     *       ),
-     *       // The site home page.
-     *       'home' => array(
-     *           'theme' = 'mytheme',
-     *           'file' => 'home.php',
-     *           'regions' => array('side-pre', 'side-post'),
-     *           'defaultregion' => 'side-post'
-     *       ),
-     *       // ...
-     *   );
-     * </pre>
-     *
-     * 'theme' name of the theme where is the layout located
-     * 'file' is the layout file to use for this type of page.
-     * layout files are stored in layout subfolder
-     * 'regions' This lists the regions on the page where blocks may appear. For
-     * each region you list here, your layout file must include a call to
-     * <pre>
-     *   echo $OUTPUT->blocks_for_region($regionname);
-     * </pre>
-     * or equivalent so that the blocks are actually visible.
-     *
-     * 'defaultregion' If the list of regions is non-empty, then you must pick
-     * one of the one of them as 'default'. This has two meanings. First, this is
-     * where new blocks are added. Second, if there are any blocks associated with
-     * the page, but in non-existent regions, they appear here. (Imaging, for example,
-     * that someone added blocks using a different theme that used different region
-     * names, and then switched to this theme.)
-     */
-    public $layouts = array();
-
-    /**
-     * @var string Name of the renderer factory class to use. Must implement the
-     * {@link renderer_factory} interface.
-     *
-     * This is an advanced feature. Moodle output is generated by 'renderers',
-     * you can customise the HTML that is output by writing custom renderers,
-     * and then you need to specify 'renderer factory' so that Moodle can find
-     * your renderers.
-     *
-     * There are some renderer factories supplied with Moodle. Please follow these
-     * links to see what they do.
-     * <ul>
-     * <li>{@link standard_renderer_factory} - the default.</li>
-     * <li>{@link theme_overridden_renderer_factory} - use this if you want to write
-     *      your own custom renderers in a lib.php file in this theme (or the parent theme).</li>
-     * </ul>
-     */
-    public $rendererfactory = 'standard_renderer_factory';
-
-    /**
-     * @var string Function to do custom CSS post-processing.
-     *
-     * This is an advanced feature. If you want to do custom post-processing on the
-     * CSS before it is output (for example, to replace certain variable names
-     * with particular values) you can give the name of a function here.
-     */
-    public $csspostprocess = null;
-
-    /**
-     * @var string Function to do custom CSS post-processing on a parsed CSS tree.
-     *
-     * This is an advanced feature. If you want to do custom post-processing on the
-     * CSS before it is output, you can provide the name of the function here. The
-     * function will receive a CSS tree document as first parameter, and the theme_config
-     * object as second parameter. A return value is not required, the tree can
-     * be edited in place.
-     */
-    public $csstreepostprocessor = null;
-
-    /**
-     * @var string Accessibility: Right arrow-like character is
-     * used in the breadcrumb trail, course navigation menu
-     * (previous/next activity), calendar, and search forum block.
-     * If the theme does not set characters, appropriate defaults
-     * are set automatically. Please DO NOT
-     * use &lt; &gt; &raquo; - these are confusing for blind users.
-     */
-    public $rarrow = null;
-
-    /**
-     * @var string Accessibility: Left arrow-like character is
-     * used in the breadcrumb trail, course navigation menu
-     * (previous/next activity), calendar, and search forum block.
-     * If the theme does not set characters, appropriate defaults
-     * are set automatically. Please DO NOT
-     * use &lt; &gt; &raquo; - these are confusing for blind users.
-     */
-    public $larrow = null;
-
-    /**
-     * @var string Accessibility: Up arrow-like character is used in
-     * the book heirarchical navigation.
-     * If the theme does not set characters, appropriate defaults
-     * are set automatically. Please DO NOT
-     * use ^ - this is confusing for blind users.
-     */
-    public $uarrow = null;
-
-    /**
-     * @var string Accessibility: Down arrow-like character.
-     * If the theme does not set characters, appropriate defaults
-     * are set automatically.
-     */
-    public $darrow = null;
-
-    /**
-     * @var bool Some themes may want to disable ajax course editing.
-     */
-    public $enablecourseajax = true;
-
-    /**
-     * @var string Determines served document types
-     *  - 'html5' the only officially supported doctype in Moodle
-     *  - 'xhtml5' may be used in development for validation (not intended for production servers!)
-     *  - 'xhtml' XHTML 1.0 Strict for legacy themes only
-     */
-    public $doctype = 'html5';
-
-    /**
-     * @var string|false requiredblocks If set to a string, will list the block types that cannot be deleted. Defaults to
-     *                                   navigation and settings.
-     */
-    public $requiredblocks = false;
-
-    //==Following properties are not configurable from theme config.php==
-
-    /**
-     * @var string The name of this theme. Set automatically when this theme is
-     * loaded. This can not be set in theme config.php
-     */
-    public $name;
-
-    /**
-     * @var string The folder where this themes files are stored. This is set
-     * automatically. This can not be set in theme config.php
-     */
-    public $dir;
-
-    /**
-     * @var stdClass Theme settings stored in config_plugins table.
-     * This can not be set in theme config.php
-     */
-    public $settings = null;
-
-    /**
-     * @var bool If set to true and the theme enables the dock then  blocks will be able
-     * to be moved to the special dock
-     */
-    public $enable_dock = false;
-
-    /**
-     * @var bool If set to true then this theme will not be shown in the theme selector unless
-     * theme designer mode is turned on.
-     */
-    public $hidefromselector = false;
-
-    /**
-     * @var array list of YUI CSS modules to be included on each page. This may be used
-     * to remove cssreset and use cssnormalise module instead.
-     */
-    public $yuicssmodules = array('cssreset', 'cssfonts', 'cssgrids', 'cssbase');
-
-    /**
-     * An associative array of block manipulations that should be made if the user is using an rtl language.
-     * The key is the original block region, and the value is the block region to change to.
-     * This is used when displaying blocks for regions only.
-     * @var array
-     */
-    public $blockrtlmanipulations = array();
-
-    /**
-     * @var renderer_factory Instance of the renderer_factory implementation
-     * we are using. Implementation detail.
-     */
-    protected $rf = null;
-
-    /**
-     * @var array List of parent config objects.
-     **/
-    protected $parent_configs = array();
-
-    /**
-     * Used to determine whether we can serve SVG images or not.
-     * @var bool
-     */
-    private $usesvg = null;
-
-    /**
-     * Whether in RTL mode or not.
-     * @var bool
-     */
-    protected $rtlmode = false;
-
-    /**
-     * The SCSS file to compile (without .scss), located in the scss/ folder of the theme.
-     * Or a Closure, which receives the theme_config as argument and must
-     * return the SCSS content.
-     * @var string|Closure
-     */
-    public $scss = false;
-
-    /**
-     * Local cache of the SCSS property.
-     * @var false|array
-     */
-    protected $scsscache = null;
-
-    /**
-     * The name of the function to call to get the SCSS code to inject.
-     * @var string
-     */
-    public $extrascsscallback = null;
-
-    /**
-     * The name of the function to call to get SCSS to prepend.
-     * @var string
-     */
-    public $prescsscallback = null;
-
-    /**
-     * Sets the render method that should be used for rendering custom block regions by scripts such as my/index.php
-     * Defaults to {@link core_renderer::blocks_for_region()}
-     * @var string
-     */
-    public $blockrendermethod = null;
-
-    /**
-     * Remember the results of icon remapping for the current page.
-     * @var array
-     */
-    public $remapiconcache = [];
-
-    /**
-     * The name of the function to call to get precompiled CSS.
-     * @var string
-     */
-    public $precompiledcsscallback = null;
-
-    /**
-     * Whether the theme uses course index.
-     * @var bool
-     */
-    public $usescourseindex = false;
-
-    /**
-     * Configuration for the page activity header
-     * @var array
-     */
-    public $activityheaderconfig = [];
-
-    /**
-     * For backward compatibility with old themes.
-     * BLOCK_ADDBLOCK_POSITION_DEFAULT, BLOCK_ADDBLOCK_POSITION_FLATNAV.
-     * @var int
-     */
-    public $addblockposition;
-
-    /**
-     * editor_scss file(s) provided by this theme.
-     * @var array
-     */
-    public $editor_scss;
-
-    /**
-     * Name of the class extending \core\output\icon_system.
-     * @var string
-     */
-    public $iconsystem;
-
-    /**
-     * Theme defines its own editing mode switch.
-     * @var bool
-     */
-    public $haseditswitch = false;
-
-    /**
-     * Allows a theme to customise primary navigation by specifying the list of items to remove.
-     * @var array
-     */
-    public $removedprimarynavitems = [];
-
-    /**
-     * Load the config.php file for a particular theme, and return an instance
-     * of this class. (That is, this is a factory method.)
-     *
-     * @param string $themename the name of the theme.
-     * @return theme_config an instance of this class.
-     */
-    public static function load($themename) {
-        global $CFG;
-
-        // load theme settings from db
-        try {
-            $settings = get_config('theme_'.$themename);
-        } catch (dml_exception $e) {
-            // most probably moodle tables not created yet
-            $settings = new stdClass();
-        }
-
-        if ($config = theme_config::find_theme_config($themename, $settings)) {
-            return new theme_config($config);
-
-        } else if ($themename == theme_config::DEFAULT_THEME) {
-            throw new coding_exception('Default theme '.theme_config::DEFAULT_THEME.' not available or broken!');
-
-        } else if ($config = theme_config::find_theme_config($CFG->theme, $settings)) {
-            debugging('This page should be using theme ' . $themename .
-                    ' which cannot be initialised. Falling back to the site theme ' . $CFG->theme, DEBUG_NORMAL);
-            return new theme_config($config);
-
-        } else {
-            // bad luck, the requested theme has some problems - admin see details in theme config
-            debugging('This page should be using theme ' . $themename .
-                    ' which cannot be initialised. Nor can the site theme ' . $CFG->theme .
-                    '. Falling back to ' . theme_config::DEFAULT_THEME, DEBUG_NORMAL);
-            return new theme_config(theme_config::find_theme_config(theme_config::DEFAULT_THEME, $settings));
-        }
-    }
-
-    /**
-     * Theme diagnostic code. It is very problematic to send debug output
-     * to the actual CSS file, instead this functions is supposed to
-     * diagnose given theme and highlights all potential problems.
-     * This information should be available from the theme selection page
-     * or some other debug page for theme designers.
-     *
-     * @param string $themename
-     * @return array description of problems
-     */
-    public static function diagnose($themename) {
-        //TODO: MDL-21108
-        return array();
-    }
-
-    /**
-     * Private constructor, can be called only from the factory method.
-     * @param stdClass $config
-     */
-    private function __construct($config) {
-        global $CFG; //needed for included lib.php files
-
-        $this->settings = $config->settings;
-        $this->name     = $config->name;
-        $this->dir      = $config->dir;
-
-        if ($this->name != self::DEFAULT_THEME) {
-            $baseconfig = self::find_theme_config(self::DEFAULT_THEME, $this->settings);
-        } else {
-            $baseconfig = $config;
-        }
-
-        // Ensure that each of the configurable properties defined below are also defined at the class level.
-        $configurable = [
-            'parents', 'sheets', 'parents_exclude_sheets', 'plugins_exclude_sheets', 'usefallback',
-            'javascripts', 'javascripts_footer', 'parents_exclude_javascripts',
-            'layouts', 'enablecourseajax', 'requiredblocks',
-            'rendererfactory', 'csspostprocess', 'editor_sheets', 'editor_scss', 'rarrow', 'larrow', 'uarrow', 'darrow',
-            'hidefromselector', 'doctype', 'yuicssmodules', 'blockrtlmanipulations', 'blockrendermethod',
-            'scss', 'extrascsscallback', 'prescsscallback', 'csstreepostprocessor', 'addblockposition',
-            'iconsystem', 'precompiledcsscallback', 'haseditswitch', 'usescourseindex', 'activityheaderconfig',
-            'removedprimarynavitems',
-        ];
-
-        foreach ($config as $key=>$value) {
-            if (in_array($key, $configurable)) {
-                $this->$key = $value;
-            }
-        }
-
-        // verify all parents and load configs and renderers
-        foreach ($this->parents as $parent) {
-            if (!$parent_config = theme_config::find_theme_config($parent, $this->settings)) {
-                // this is not good - better exclude faulty parents
-                continue;
-            }
-            $libfile = $parent_config->dir.'/lib.php';
-            if (is_readable($libfile)) {
-                // theme may store various function here
-                include_once($libfile);
-            }
-            $renderersfile = $parent_config->dir.'/renderers.php';
-            if (is_readable($renderersfile)) {
-                // may contain core and plugin renderers and renderer factory
-                include_once($renderersfile);
-            }
-            $this->parent_configs[$parent] = $parent_config;
-        }
-        $libfile = $this->dir.'/lib.php';
-        if (is_readable($libfile)) {
-            // theme may store various function here
-            include_once($libfile);
-        }
-        $rendererfile = $this->dir.'/renderers.php';
-        if (is_readable($rendererfile)) {
-            // may contain core and plugin renderers and renderer factory
-            include_once($rendererfile);
-        } else {
-            // check if renderers.php file is missnamed renderer.php
-            if (is_readable($this->dir.'/renderer.php')) {
-                debugging('Developer hint: '.$this->dir.'/renderer.php should be renamed to ' . $this->dir."/renderers.php.
-                    See: http://docs.moodle.org/dev/Output_renderers#Theme_renderers.", DEBUG_DEVELOPER);
-            }
-        }
-
-        // cascade all layouts properly
-        foreach ($baseconfig->layouts as $layout=>$value) {
-            if (!isset($this->layouts[$layout])) {
-                foreach ($this->parent_configs as $parent_config) {
-                    if (isset($parent_config->layouts[$layout])) {
-                        $this->layouts[$layout] = $parent_config->layouts[$layout];
-                        continue 2;
-                    }
-                }
-                $this->layouts[$layout] = $value;
-            }
-        }
-
-        //fix arrows if needed
-        $this->check_theme_arrows();
-    }
-
-    /**
-     * Let the theme initialise the page object (usually $PAGE).
-     *
-     * This may be used for example to request jQuery in add-ons.
-     *
-     * @param moodle_page $page
-     */
-    public function init_page(moodle_page $page) {
-        $themeinitfunction = 'theme_'.$this->name.'_page_init';
-        if (function_exists($themeinitfunction)) {
-            $themeinitfunction($page);
-        }
-    }
-
-    /**
-     * Checks if arrows $THEME->rarrow, $THEME->larrow, $THEME->uarrow, $THEME->darrow have been set (theme/-/config.php).
-     * If not it applies sensible defaults.
-     *
-     * Accessibility: right and left arrow Unicode characters for breadcrumb, calendar,
-     * search forum block, etc. Important: these are 'silent' in a screen-reader
-     * (unlike &gt; &raquo;), and must be accompanied by text.
-     */
-    private function check_theme_arrows() {
-        if (!isset($this->rarrow) and !isset($this->larrow)) {
-            // Default, looks good in Win XP/IE 6, Win/Firefox 1.5, Win/Netscape 8...
-            // Also OK in Win 9x/2K/IE 5.x
-            $this->rarrow = '&#x25BA;';
-            $this->larrow = '&#x25C4;';
-            $this->uarrow = '&#x25B2;';
-            $this->darrow = '&#x25BC;';
-            if (empty($_SERVER['HTTP_USER_AGENT'])) {
-                $uagent = '';
-            } else {
-                $uagent = $_SERVER['HTTP_USER_AGENT'];
-            }
-            if (false !== strpos($uagent, 'Opera')
-                || false !== strpos($uagent, 'Mac')) {
-                // Looks good in Win XP/Mac/Opera 8/9, Mac/Firefox 2, Camino, Safari.
-                // Not broken in Mac/IE 5, Mac/Netscape 7 (?).
-                $this->rarrow = '&#x25B6;&#xFE0E;';
-                $this->larrow = '&#x25C0;&#xFE0E;';
-            }
-            elseif ((false !== strpos($uagent, 'Konqueror'))
-                || (false !== strpos($uagent, 'Android')))  {
-                // The fonts on Android don't include the characters required for this to work as expected.
-                // So we use the same ones Konqueror uses.
-                $this->rarrow = '&rarr;';
-                $this->larrow = '&larr;';
-                $this->uarrow = '&uarr;';
-                $this->darrow = '&darr;';
-            }
-            elseif (isset($_SERVER['HTTP_ACCEPT_CHARSET'])
-                && false === stripos($_SERVER['HTTP_ACCEPT_CHARSET'], 'utf-8')) {
-                // (Win/IE 5 doesn't set ACCEPT_CHARSET, but handles Unicode.)
-                // To be safe, non-Unicode browsers!
-                $this->rarrow = '&gt;';
-                $this->larrow = '&lt;';
-                $this->uarrow = '^';
-                $this->darrow = 'v';
-            }
-
-            // RTL support - in RTL languages, swap r and l arrows
-            if (right_to_left()) {
-                $t = $this->rarrow;
-                $this->rarrow = $this->larrow;
-                $this->larrow = $t;
-            }
-        }
-    }
-
-    /**
-     * Returns output renderer prefixes, these are used when looking
-     * for the overridden renderers in themes.
-     *
-     * @return array
-     */
-    public function renderer_prefixes() {
-        global $CFG; // just in case the included files need it
-
-        $prefixes = array('theme_'.$this->name);
-
-        foreach ($this->parent_configs as $parent) {
-            $prefixes[] = 'theme_'.$parent->name;
-        }
-
-        return $prefixes;
-    }
-
-    /**
-     * Returns the stylesheet URL of this editor content
-     *
-     * @param bool $encoded false means use & and true use &amp; in URLs
-     * @return moodle_url
-     */
-    public function editor_css_url($encoded=true) {
-        global $CFG;
-        $rev = theme_get_revision();
-        $type = 'editor';
-        if (right_to_left()) {
-            $type .= '-rtl';
-        }
-
-        if ($rev > -1) {
-            $themesubrevision = theme_get_sub_revision_for_theme($this->name);
-
-            // Provide the sub revision to allow us to invalidate cached theme CSS
-            // on a per theme basis, rather than globally.
-            if ($themesubrevision && $themesubrevision > 0) {
-                $rev .= "_{$themesubrevision}";
-            }
-
-            $url = new moodle_url("/theme/styles.php");
-            if (!empty($CFG->slasharguments)) {
-                $url->set_slashargument("/{$this->name}/{$rev}/{$type}", 'noparam', true);
-            } else {
-                $url->params([
-                    'theme' => $this->name,
-                    'rev' => $rev,
-                    'type' => $type,
-                ]);
-            }
-        } else {
-            $url = new moodle_url('/theme/styles_debug.php', [
-                'theme' => $this->name,
-                'type' => $type,
-            ]);
-        }
-        return $url;
-    }
-
-    /**
-     * Returns the content of the CSS to be used in editor content
-     *
-     * @return array
-     */
-    public function editor_css_files() {
-        $files = array();
-
-        // First editor plugins.
-        $plugins = core_component::get_plugin_list('editor');
-        foreach ($plugins as $plugin => $fulldir) {
-            $sheetfile = "$fulldir/editor_styles.css";
-            if (is_readable($sheetfile)) {
-                $files['plugin_'.$plugin] = $sheetfile;
-            }
-
-            $subplugintypes = core_component::get_subplugins("editor_{$plugin}") ?? [];
-            // Fetch sheets for any editor subplugins.
-            foreach ($subplugintypes as $plugintype => $subplugins) {
-                foreach ($subplugins as $subplugin) {
-                    $plugindir = core_component::get_plugin_directory($plugintype, $subplugin);
-                    $sheetfile = "{$plugindir}/editor_styles.css";
-                    if (is_readable($sheetfile)) {
-                        $files["{$plugintype}_{$subplugin}"] = $sheetfile;
-                    }
-                }
-            }
-        }
-
-        // Then parent themes - base first, the immediate parent last.
-        foreach (array_reverse($this->parent_configs) as $parent_config) {
-            if (empty($parent_config->editor_sheets)) {
-                continue;
-            }
-            foreach ($parent_config->editor_sheets as $sheet) {
-                $sheetfile = "$parent_config->dir/style/$sheet.css";
-                if (is_readable($sheetfile)) {
-                    $files['parent_'.$parent_config->name.'_'.$sheet] = $sheetfile;
-                }
-            }
-        }
-        // Finally this theme.
-        if (!empty($this->editor_sheets)) {
-            foreach ($this->editor_sheets as $sheet) {
-                $sheetfile = "$this->dir/style/$sheet.css";
-                if (is_readable($sheetfile)) {
-                    $files['theme_'.$sheet] = $sheetfile;
-                }
-            }
-        }
-
-        return $files;
-    }
-
-    /**
-     * Compiles and returns the content of the SCSS to be used in editor content
-     *
-     * @return string Compiled CSS from the editor SCSS
-     */
-    public function editor_scss_to_css() {
-        $css = '';
-        $dir = $this->dir;
-        $filenames = [];
-
-        // Use editor_scss file(s) provided by this theme if set.
-        if (!empty($this->editor_scss)) {
-            $filenames = $this->editor_scss;
-        } else {
-            // If no editor_scss set, move up theme hierarchy until one is found (if at all).
-            // This is so child themes only need to set editor_scss if an override is required.
-            foreach (array_reverse($this->parent_configs) as $parentconfig) {
-                if (!empty($parentconfig->editor_scss)) {
-                    $dir = $parentconfig->dir;
-                    $filenames = $parentconfig->editor_scss;
-
-                    // Config found, stop looking.
-                    break;
-                }
-            }
-        }
-
-        if (!empty($filenames)) {
-            $compiler = new core_scss();
-
-            foreach ($filenames as $filename) {
-                $compiler->set_file("{$dir}/scss/{$filename}.scss");
-
-                try {
-                    $css .= $compiler->to_css();
-                } catch (\Exception $e) {
-                    debugging('Error while compiling editor SCSS: ' . $e->getMessage(), DEBUG_DEVELOPER);
-                }
-            }
-        }
-
-        return $css;
-    }
-
-    /**
-     * Get the stylesheet URL of this theme.
-     *
-     * @param moodle_page $page Not used... deprecated?
-     * @return moodle_url[]
-     */
-    public function css_urls(moodle_page $page) {
-        global $CFG;
-
-        $rev = theme_get_revision();
-
-        $urls = array();
-
-        $svg = $this->use_svg_icons();
-        $separate = (core_useragent::is_ie() && !core_useragent::check_ie_version('10'));
-
-        if ($rev > -1) {
-            $filename = right_to_left() ? 'all-rtl' : 'all';
-            $url = new moodle_url("/theme/styles.php");
-            $themesubrevision = theme_get_sub_revision_for_theme($this->name);
-
-            // Provide the sub revision to allow us to invalidate cached theme CSS
-            // on a per theme basis, rather than globally.
-            if ($themesubrevision && $themesubrevision > 0) {
-                $rev .= "_{$themesubrevision}";
-            }
-
-            if (!empty($CFG->slasharguments)) {
-                $slashargs = '';
-                if (!$svg) {
-                    // We add a simple /_s to the start of the path.
-                    // The underscore is used to ensure that it isn't a valid theme name.
-                    $slashargs .= '/_s'.$slashargs;
-                }
-                $slashargs .= '/'.$this->name.'/'.$rev.'/'.$filename;
-                if ($separate) {
-                    $slashargs .= '/chunk0';
-                }
-                $url->set_slashargument($slashargs, 'noparam', true);
-            } else {
-                $params = array('theme' => $this->name, 'rev' => $rev, 'type' => $filename);
-                if (!$svg) {
-                    // We add an SVG param so that we know not to serve SVG images.
-                    // We do this because all modern browsers support SVG and this param will one day be removed.
-                    $params['svg'] = '0';
-                }
-                if ($separate) {
-                    $params['chunk'] = '0';
-                }
-                $url->params($params);
-            }
-            $urls[] = $url;
-
-        } else {
-            $baseurl = new moodle_url('/theme/styles_debug.php');
-
-            $css = $this->get_css_files(true);
-            if (!$svg) {
-                // We add an SVG param so that we know not to serve SVG images.
-                // We do this because all modern browsers support SVG and this param will one day be removed.
-                $baseurl->param('svg', '0');
-            }
-            if (right_to_left()) {
-                $baseurl->param('rtl', 1);
-            }
-            if ($separate) {
-                // We might need to chunk long files.
-                $baseurl->param('chunk', '0');
-            }
-            if (core_useragent::is_ie()) {
-                // Lalala, IE does not allow more than 31 linked CSS files from main document.
-                $urls[] = new moodle_url($baseurl, array('theme'=>$this->name, 'type'=>'ie', 'subtype'=>'plugins'));
-                foreach ($css['parents'] as $parent=>$sheets) {
-                    // We need to serve parents individually otherwise we may easily exceed the style limit IE imposes (4096).
-                    $urls[] = new moodle_url($baseurl, array('theme'=>$this->name,'type'=>'ie', 'subtype'=>'parents', 'sheet'=>$parent));
-                }
-                if ($this->get_scss_property()) {
-                    // No need to define the type as IE here.
-                    $urls[] = new moodle_url($baseurl, array('theme' => $this->name, 'type' => 'scss'));
-                }
-                $urls[] = new moodle_url($baseurl, array('theme'=>$this->name, 'type'=>'ie', 'subtype'=>'theme'));
-
-            } else {
-                foreach ($css['plugins'] as $plugin=>$unused) {
-                    $urls[] = new moodle_url($baseurl, array('theme'=>$this->name,'type'=>'plugin', 'subtype'=>$plugin));
-                }
-                foreach ($css['parents'] as $parent=>$sheets) {
-                    foreach ($sheets as $sheet=>$unused2) {
-                        $urls[] = new moodle_url($baseurl, array('theme'=>$this->name,'type'=>'parent', 'subtype'=>$parent, 'sheet'=>$sheet));
-                    }
-                }
-                foreach ($css['theme'] as $sheet => $filename) {
-                    if ($sheet === self::SCSS_KEY) {
-                        // This is the theme SCSS file.
-                        $urls[] = new moodle_url($baseurl, array('theme' => $this->name, 'type' => 'scss'));
-                    } else {
-                        // Sheet first in order to make long urls easier to read.
-                        $urls[] = new moodle_url($baseurl, array('sheet'=>$sheet, 'theme'=>$this->name, 'type'=>'theme'));
-                    }
-                }
-            }
-        }
-
-        // Allow themes to change the css url to something like theme/mytheme/mycss.php.
-        component_callback('theme_' . $this->name, 'alter_css_urls', [&$urls]);
-        return $urls;
-    }
-
-    /**
-     * Get the whole css stylesheet for production mode.
-     *
-     * NOTE: this method is not expected to be used from any addons.
-     *
-     * @return string CSS markup compressed
-     */
-    public function get_css_content() {
-
-        $csscontent = '';
-        foreach ($this->get_css_files(false) as $type => $value) {
-            foreach ($value as $identifier => $val) {
-                if (is_array($val)) {
-                    foreach ($val as $v) {
-                        $csscontent .= file_get_contents($v) . "\n";
-                    }
-                } else {
-                    if ($type === 'theme' && $identifier === self::SCSS_KEY) {
-                        // We need the content from SCSS because this is the SCSS file from the theme.
-                        if ($compiled = $this->get_css_content_from_scss(false)) {
-                            $csscontent .= $compiled;
-                        } else {
-                            // The compiler failed so default back to any precompiled css that might
-                            // exist.
-                            $csscontent .= $this->get_precompiled_css_content();
-                        }
-                    } else {
-                        $csscontent .= file_get_contents($val) . "\n";
-                    }
-                }
-            }
-        }
-        $csscontent = $this->post_process($csscontent);
-        $csscontent = core_minify::css($csscontent);
-
-        return $csscontent;
-    }
-    /**
-     * Set post processed CSS content cache.
-     *
-     * @param string $csscontent The post processed CSS content.
-     * @return bool True if the content was successfully cached.
-     */
-    public function set_css_content_cache($csscontent) {
-
-        $cache = cache::make('core', 'postprocessedcss');
-        $key = $this->get_css_cache_key();
-
-        return $cache->set($key, $csscontent);
-    }
-
-    /**
-     * Return whether the post processed CSS content has been cached.
-     *
-     * @return bool Whether the post-processed CSS is available in the cache.
-     */
-    public function has_css_cached_content() {
-
-        $key = $this->get_css_cache_key();
-        $cache = cache::make('core', 'postprocessedcss');
-
-        return $cache->has($key);
-    }
-
-    /**
-     * Return cached post processed CSS content.
-     *
-     * @return bool|string The cached css content or false if not found.
-     */
-    public function get_css_cached_content() {
-
-        $key = $this->get_css_cache_key();
-        $cache = cache::make('core', 'postprocessedcss');
-
-        return $cache->get($key);
-    }
-
-    /**
-     * Generate the css content cache key.
-     *
-     * @return string The post processed css cache key.
-     */
-    public function get_css_cache_key() {
-        $nosvg = (!$this->use_svg_icons()) ? 'nosvg_' : '';
-        $rtlmode = ($this->rtlmode == true) ? 'rtl' : 'ltr';
-
-        return $nosvg . $this->name . '_' . $rtlmode;
-    }
-
-    /**
-     * Get the theme designer css markup,
-     * the parameters are coming from css_urls().
-     *
-     * NOTE: this method is not expected to be used from any addons.
-     *
-     * @param string $type
-     * @param string $subtype
-     * @param string $sheet
-     * @return string CSS markup
-     */
-    public function get_css_content_debug($type, $subtype, $sheet) {
-        if ($type === 'scss') {
-            // The SCSS file of the theme is requested.
-            $csscontent = $this->get_css_content_from_scss(true);
-            if ($csscontent !== false) {
-                return $this->post_process($csscontent);
-            }
-            return '';
-        }
-
-        $cssfiles = array();
-        $css = $this->get_css_files(true);
-
-        if ($type === 'ie') {
-            // IE is a sloppy browser with weird limits, sorry.
-            if ($subtype === 'plugins') {
-                $cssfiles = $css['plugins'];
-
-            } else if ($subtype === 'parents') {
-                if (empty($sheet)) {
-                    // Do not bother with the empty parent here.
-                } else {
-                    // Build up the CSS for that parent so we can serve it as one file.
-                    foreach ($css[$subtype][$sheet] as $parent => $css) {
-                        $cssfiles[] = $css;
-                    }
-                }
-            } else if ($subtype === 'theme') {
-                $cssfiles = $css['theme'];
-                foreach ($cssfiles as $key => $value) {
-                    if (in_array($key, [self::SCSS_KEY])) {
-                        // Remove the SCSS file from the theme CSS files.
-                        // The SCSS files use the type 'scss', not 'ie'.
-                        unset($cssfiles[$key]);
-                    }
-                }
-            }
-
-        } else if ($type === 'plugin') {
-            if (isset($css['plugins'][$subtype])) {
-                $cssfiles[] = $css['plugins'][$subtype];
-            }
-
-        } else if ($type === 'parent') {
-            if (isset($css['parents'][$subtype][$sheet])) {
-                $cssfiles[] = $css['parents'][$subtype][$sheet];
-            }
-
-        } else if ($type === 'theme') {
-            if (isset($css['theme'][$sheet])) {
-                $cssfiles[] = $css['theme'][$sheet];
-            }
-        }
-
-        $csscontent = '';
-        foreach ($cssfiles as $file) {
-            $contents = file_get_contents($file);
-            $contents = $this->post_process($contents);
-            $comment = "/** Path: $type $subtype $sheet.' **/\n";
-            $stats = '';
-            $csscontent .= $comment.$stats.$contents."\n\n";
-        }
+function template_reset_all_caches() {
+    global $CFG;
 
-        return $csscontent;
+    $next = time();
+    if (isset($CFG->templaterev) and $next <= $CFG->templaterev and $CFG->templaterev - $next < 60 * 60) {
+        // This resolves problems when reset is requested repeatedly within 1s,
+        // the < 1h condition prevents accidental switching to future dates
+        // because we might not recover from it.
+        $next = $CFG->templaterev + 1;
     }
 
-    /**
-     * Get the whole css stylesheet for editor iframe.
-     *
-     * NOTE: this method is not expected to be used from any addons.
-     *
-     * @return string CSS markup
-     */
-    public function get_css_content_editor() {
-        $css = '';
-        $cssfiles = $this->editor_css_files();
-
-        // If editor has static CSS, include it.
-        foreach ($cssfiles as $file) {
-            $css .= file_get_contents($file)."\n";
-        }
-
-        // If editor has SCSS, compile and include it.
-        if (($convertedscss = $this->editor_scss_to_css())) {
-            $css .= $convertedscss;
-        }
+    set_config('templaterev', $next);
+}
 
-        $output = $this->post_process($css);
+/**
+ * Invalidate all server and client side JS caches.
+ */
+function js_reset_all_caches() {
+    global $CFG;
 
-        return $output;
+    $next = time();
+    if (isset($CFG->jsrev) and $next <= $CFG->jsrev and $CFG->jsrev - $next < 60*60) {
+        // This resolves problems when reset is requested repeatedly within 1s,
+        // the < 1h condition prevents accidental switching to future dates
+        // because we might not recover from it.
+        $next = $CFG->jsrev+1;
     }
 
-    /**
-     * Returns an array of organised CSS files required for this output.
-     *
-     * @param bool $themedesigner
-     * @return array nested array of file paths
-     */
-    protected function get_css_files($themedesigner) {
-        global $CFG;
-
-        $cache = null;
-        $cachekey = 'cssfiles';
-        if ($themedesigner) {
-            require_once($CFG->dirroot.'/lib/csslib.php');
-            // We need some kind of caching here because otherwise the page navigation becomes
-            // way too slow in theme designer mode. Feel free to create full cache definition later...
-            $cache = cache::make_from_params(cache_store::MODE_APPLICATION, 'core', 'themedesigner', array('theme' => $this->name));
-            if ($files = $cache->get($cachekey)) {
-                if ($files['created'] > time() - THEME_DESIGNER_CACHE_LIFETIME) {
-                    unset($files['created']);
-                    return $files;
-                }
-            }
-        }
-
-        $cssfiles = array('plugins'=>array(), 'parents'=>array(), 'theme'=>array());
-
-        // Get all plugin sheets.
-        $excludes = $this->resolve_excludes('plugins_exclude_sheets');
-        if ($excludes !== true) {
-            foreach (core_component::get_plugin_types() as $type=>$unused) {
-                if ($type === 'theme' || (!empty($excludes[$type]) and $excludes[$type] === true)) {
-                    continue;
-                }
-                $plugins = core_component::get_plugin_list($type);
-                foreach ($plugins as $plugin=>$fulldir) {
-                    if (!empty($excludes[$type]) and is_array($excludes[$type])
-                            and in_array($plugin, $excludes[$type])) {
-                        continue;
-                    }
-
-                    // Get the CSS from the plugin.
-                    $sheetfile = "$fulldir/styles.css";
-                    if (is_readable($sheetfile)) {
-                        $cssfiles['plugins'][$type.'_'.$plugin] = $sheetfile;
-                    }
-
-                    // Create a list of candidate sheets from parents (direct parent last) and current theme.
-                    $candidates = array();
-                    foreach (array_reverse($this->parent_configs) as $parent_config) {
-                        $candidates[] = $parent_config->name;
-                    }
-                    $candidates[] = $this->name;
-
-                    // Add the sheets found.
-                    foreach ($candidates as $candidate) {
-                        $sheetthemefile = "$fulldir/styles_{$candidate}.css";
-                        if (is_readable($sheetthemefile)) {
-                            $cssfiles['plugins'][$type.'_'.$plugin.'_'.$candidate] = $sheetthemefile;
-                        }
-                    }
-                }
-            }
-        }
-
-        // Find out wanted parent sheets.
-        $excludes = $this->resolve_excludes('parents_exclude_sheets');
-        if ($excludes !== true) {
-            foreach (array_reverse($this->parent_configs) as $parent_config) { // Base first, the immediate parent last.
-                $parent = $parent_config->name;
-                if (empty($parent_config->sheets) || (!empty($excludes[$parent]) and $excludes[$parent] === true)) {
-                    continue;
-                }
-                foreach ($parent_config->sheets as $sheet) {
-                    if (!empty($excludes[$parent]) && is_array($excludes[$parent])
-                            && in_array($sheet, $excludes[$parent])) {
-                        continue;
-                    }
-
-                    // We never refer to the parent LESS files.
-                    $sheetfile = "$parent_config->dir/style/$sheet.css";
-                    if (is_readable($sheetfile)) {
-                        $cssfiles['parents'][$parent][$sheet] = $sheetfile;
-                    }
-                }
-            }
-        }
-
-
-        // Current theme sheets.
-        // We first add the SCSS file because we want the CSS ones to
-        // be included after the SCSS code.
-        if ($this->get_scss_property()) {
-            $cssfiles['theme'][self::SCSS_KEY] = true;
-        }
-        if (is_array($this->sheets)) {
-            foreach ($this->sheets as $sheet) {
-                $sheetfile = "$this->dir/style/$sheet.css";
-                if (is_readable($sheetfile) && !isset($cssfiles['theme'][$sheet])) {
-                    $cssfiles['theme'][$sheet] = $sheetfile;
-                }
-            }
-        }
-
-        if ($cache) {
-            $files = $cssfiles;
-            $files['created'] = time();
-            $cache->set($cachekey, $files);
-        }
-        return $cssfiles;
-    }
-
-    /**
-     * Return the CSS content generated from the SCSS file.
-     *
-     * @param bool $themedesigner True if theme designer is enabled.
-     * @return bool|string Return false when the compilation failed. Else the compiled string.
-     */
-    protected function get_css_content_from_scss($themedesigner) {
-        global $CFG;
-
-        list($paths, $scss) = $this->get_scss_property();
-        if (!$scss) {
-            throw new coding_exception('The theme did not define a SCSS file, or it is not readable.');
-        }
-
-        // We might need more memory/time to do this, so let's play safe.
-        raise_memory_limit(MEMORY_EXTRA);
-        core_php_time_limit::raise(300);
-
-        // TODO: MDL-62757 When changing anything in this method please do not forget to check
-        // if the validate() method in class admin_setting_configthemepreset needs updating too.
-
-        $cachedir = make_localcache_directory('scsscache-' . $this->name, false);
-        $cacheoptions = [];
-        if ($themedesigner) {
-            $cacheoptions = array(
-                  'cacheDir' => $cachedir,
-                  'prefix' => 'scssphp_',
-                  'forceRefresh' => false,
-            );
-        } else {
-            if (file_exists($cachedir)) {
-                remove_dir($cachedir);
-            }
-        }
-
-        // Set-up the compiler.
-        $compiler = new core_scss($cacheoptions);
-
-        if ($this->supports_source_maps($themedesigner)) {
-            // Enable source maps.
-            $compiler->setSourceMapOptions([
-                'sourceMapBasepath' => str_replace('\\', '/', $CFG->dirroot),
-                'sourceMapRootpath' => $CFG->wwwroot . '/'
-            ]);
-            $compiler->setSourceMap($compiler::SOURCE_MAP_INLINE);
-        }
-
-        $compiler->prepend_raw_scss($this->get_pre_scss_code());
-        if (is_string($scss)) {
-            $compiler->set_file($scss);
-        } else {
-            $compiler->append_raw_scss($scss($this));
-            $compiler->setImportPaths($paths);
-        }
-        $compiler->append_raw_scss($this->get_extra_scss_code());
-
-        try {
-            // Compile!
-            $compiled = $compiler->to_css();
-
-        } catch (\Exception $e) {
-            $compiled = false;
-            debugging('Error while compiling SCSS: ' . $e->getMessage(), DEBUG_DEVELOPER);
-        }
-
-        // Try to save memory.
-        $compiler = null;
-        unset($compiler);
-
-        return $compiled;
-    }
-
-    /**
-     * Return the precompiled CSS if the precompiledcsscallback exists.
-     *
-     * @return string Return compiled css.
-     */
-    public function get_precompiled_css_content() {
-        $configs = array_reverse($this->parent_configs) + [$this];
-        $css = '';
-
-        foreach ($configs as $config) {
-            if (isset($config->precompiledcsscallback)) {
-                $function = $config->precompiledcsscallback;
-                if (function_exists($function)) {
-                    $css .= $function($this);
-                }
-            }
-        }
-        return $css;
-    }
-
-    /**
-     * Get the icon system to use.
-     *
-     * @return string
-     */
-    public function get_icon_system() {
-
-        // Getting all the candidate functions.
-        $system = false;
-        if (isset($this->iconsystem) && \core\output\icon_system::is_valid_system($this->iconsystem)) {
-            return $this->iconsystem;
-        }
-        foreach ($this->parent_configs as $parent_config) {
-            if (isset($parent_config->iconsystem) && \core\output\icon_system::is_valid_system($parent_config->iconsystem)) {
-                return $parent_config->iconsystem;
-            }
-        }
-        return \core\output\icon_system::STANDARD;
-    }
-
-    /**
-     * Return extra SCSS code to add when compiling.
-     *
-     * This is intended to be used by themes to inject some SCSS code
-     * before it gets compiled. If you want to inject variables you
-     * should use {@link self::get_scss_variables()}.
-     *
-     * @return string The SCSS code to inject.
-     */
-    public function get_extra_scss_code() {
-        $content = '';
-
-        // Getting all the candidate functions.
-        $candidates = array();
-        foreach (array_reverse($this->parent_configs) as $parent_config) {
-            if (!isset($parent_config->extrascsscallback)) {
-                continue;
-            }
-            $candidates[] = $parent_config->extrascsscallback;
-        }
-
-        if (isset($this->extrascsscallback)) {
-            $candidates[] = $this->extrascsscallback;
-        }
-
-        // Calling the functions.
-        foreach ($candidates as $function) {
-            if (function_exists($function)) {
-                $content .= "\n/** Extra SCSS from $function **/\n" . $function($this) . "\n";
-            }
-        }
-
-        return $content;
-    }
-
-    /**
-     * SCSS code to prepend when compiling.
-     *
-     * This is intended to be used by themes to inject SCSS code before it gets compiled.
-     *
-     * @return string The SCSS code to inject.
-     */
-    public function get_pre_scss_code() {
-        $content = '';
-
-        // Getting all the candidate functions.
-        $candidates = array();
-        foreach (array_reverse($this->parent_configs) as $parent_config) {
-            if (!isset($parent_config->prescsscallback)) {
-                continue;
-            }
-            $candidates[] = $parent_config->prescsscallback;
-        }
-
-        if (isset($this->prescsscallback)) {
-            $candidates[] = $this->prescsscallback;
-        }
-
-        // Calling the functions.
-        foreach ($candidates as $function) {
-            if (function_exists($function)) {
-                $content .= "\n/** Pre-SCSS from $function **/\n" . $function($this) . "\n";
-            }
-        }
-
-        return $content;
-    }
-
-    /**
-     * Get the SCSS property.
-     *
-     * This resolves whether a SCSS file (or content) has to be used when generating
-     * the stylesheet for the theme. It will look at parents themes and check the
-     * SCSS properties there.
-     *
-     * @return array|false False when SCSS is not used.
-     *         An array with the import paths, and the path to the SCSS file or Closure as second.
-     */
-    public function get_scss_property() {
-        if ($this->scsscache === null) {
-            $configs = [$this] + $this->parent_configs;
-            $scss = null;
-
-            foreach ($configs as $config) {
-                $path = "{$config->dir}/scss";
-
-                // We collect the SCSS property until we've found one.
-                if (empty($scss) && !empty($config->scss)) {
-                    $candidate = is_string($config->scss) ? "{$path}/{$config->scss}.scss" : $config->scss;
-                    if ($candidate instanceof Closure) {
-                        $scss = $candidate;
-                    } else if (is_string($candidate) && is_readable($candidate)) {
-                        $scss = $candidate;
-                    }
-                }
-
-                // We collect the import paths once we've found a SCSS property.
-                if ($scss && is_dir($path)) {
-                    $paths[] = $path;
-                }
-
-            }
-
-            $this->scsscache = $scss !== null ? [$paths, $scss] : false;
-        }
-
-        return $this->scsscache;
-    }
-
-    /**
-     * Generate a URL to the file that serves theme JavaScript files.
-     *
-     * If we determine that the theme has no relevant files, then we return
-     * early with a null value.
-     *
-     * @param bool $inhead true means head url, false means footer
-     * @return moodle_url|null
-     */
-    public function javascript_url($inhead) {
-        global $CFG;
-
-        $rev = theme_get_revision();
-        $params = array('theme'=>$this->name,'rev'=>$rev);
-        $params['type'] = $inhead ? 'head' : 'footer';
-
-        // Return early if there are no files to serve
-        if (count($this->javascript_files($params['type'])) === 0) {
-            return null;
-        }
-
-        if (!empty($CFG->slasharguments) and $rev > 0) {
-            $url = new moodle_url("/theme/javascript.php");
-            $url->set_slashargument('/'.$this->name.'/'.$rev.'/'.$params['type'], 'noparam', true);
-            return $url;
-        } else {
-            return new moodle_url('/theme/javascript.php', $params);
-        }
-    }
-
-    /**
-     * Get the URL's for the JavaScript files used by this theme.
-     * They won't be served directly, instead they'll be mediated through
-     * theme/javascript.php.
-     *
-     * @param string $type Either javascripts_footer, or javascripts
-     * @return array
-     */
-    public function javascript_files($type) {
-        if ($type === 'footer') {
-            $type = 'javascripts_footer';
-        } else {
-            $type = 'javascripts';
-        }
-
-        $js = array();
-        // find out wanted parent javascripts
-        $excludes = $this->resolve_excludes('parents_exclude_javascripts');
-        if ($excludes !== true) {
-            foreach (array_reverse($this->parent_configs) as $parent_config) { // base first, the immediate parent last
-                $parent = $parent_config->name;
-                if (empty($parent_config->$type)) {
-                    continue;
-                }
-                if (!empty($excludes[$parent]) and $excludes[$parent] === true) {
-                    continue;
-                }
-                foreach ($parent_config->$type as $javascript) {
-                    if (!empty($excludes[$parent]) and is_array($excludes[$parent])
-                        and in_array($javascript, $excludes[$parent])) {
-                        continue;
-                    }
-                    $javascriptfile = "$parent_config->dir/javascript/$javascript.js";
-                    if (is_readable($javascriptfile)) {
-                        $js[] = $javascriptfile;
-                    }
-                }
-            }
-        }
-
-        // current theme javascripts
-        if (is_array($this->$type)) {
-            foreach ($this->$type as $javascript) {
-                $javascriptfile = "$this->dir/javascript/$javascript.js";
-                if (is_readable($javascriptfile)) {
-                    $js[] = $javascriptfile;
-                }
-            }
-        }
-        return $js;
-    }
-
-    /**
-     * Resolves an exclude setting to the themes setting is applicable or the
-     * setting of its closest parent.
-     *
-     * @param string $variable The name of the setting the exclude setting to resolve
-     * @param string $default
-     * @return mixed
-     */
-    protected function resolve_excludes($variable, $default = null) {
-        $setting = $default;
-        if (is_array($this->{$variable}) or $this->{$variable} === true) {
-            $setting = $this->{$variable};
-        } else {
-            foreach ($this->parent_configs as $parent_config) { // the immediate parent first, base last
-                if (!isset($parent_config->{$variable})) {
-                    continue;
-                }
-                if (is_array($parent_config->{$variable}) or $parent_config->{$variable} === true) {
-                    $setting = $parent_config->{$variable};
-                    break;
-                }
-            }
-        }
-        return $setting;
-    }
-
-    /**
-     * Returns the content of the one huge javascript file merged from all theme javascript files.
-     *
-     * @param bool $type
-     * @return string
-     */
-    public function javascript_content($type) {
-        $jsfiles = $this->javascript_files($type);
-        $js = '';
-        foreach ($jsfiles as $jsfile) {
-            $js .= file_get_contents($jsfile)."\n";
-        }
-        return $js;
-    }
-
-    /**
-     * Post processes CSS.
-     *
-     * This method post processes all of the CSS before it is served for this theme.
-     * This is done so that things such as image URL's can be swapped in and to
-     * run any specific CSS post process method the theme has requested.
-     * This allows themes to use CSS settings.
-     *
-     * @param string $css The CSS to process.
-     * @return string The processed CSS.
-     */
-    public function post_process($css) {
-        // now resolve all image locations
-        if (preg_match_all('/\[\[pix:([a-z0-9_]+\|)?([^\]]+)\]\]/', $css, $matches, PREG_SET_ORDER)) {
-            $replaced = array();
-            foreach ($matches as $match) {
-                if (isset($replaced[$match[0]])) {
-                    continue;
-                }
-                $replaced[$match[0]] = true;
-                $imagename = $match[2];
-                $component = rtrim($match[1], '|');
-                $imageurl = $this->image_url($imagename, $component)->out(false);
-                 // we do not need full url because the image.php is always in the same dir
-                $imageurl = preg_replace('|^http.?://[^/]+|', '', $imageurl);
-                $css = str_replace($match[0], $imageurl, $css);
-            }
-        }
-
-        // Now resolve all font locations.
-        if (preg_match_all('/\[\[font:([a-z0-9_]+\|)?([^\]]+)\]\]/', $css, $matches, PREG_SET_ORDER)) {
-            $replaced = array();
-            foreach ($matches as $match) {
-                if (isset($replaced[$match[0]])) {
-                    continue;
-                }
-                $replaced[$match[0]] = true;
-                $fontname = $match[2];
-                $component = rtrim($match[1], '|');
-                $fonturl = $this->font_url($fontname, $component)->out(false);
-                // We do not need full url because the font.php is always in the same dir.
-                $fonturl = preg_replace('|^http.?://[^/]+|', '', $fonturl);
-                $css = str_replace($match[0], $fonturl, $css);
-            }
-        }
-
-        // Now resolve all theme settings or do any other postprocessing.
-        // This needs to be done before calling core parser, since the parser strips [[settings]] tags.
-        $csspostprocess = $this->csspostprocess;
-        if ($csspostprocess && function_exists($csspostprocess)) {
-            $css = $csspostprocess($css, $this);
-        }
-
-        // Post processing using an object representation of CSS.
-        $treeprocessor = $this->get_css_tree_post_processor();
-        $needsparsing = !empty($treeprocessor) || !empty($this->rtlmode);
-        if ($needsparsing) {
-
-            // We might need more memory/time to do this, so let's play safe.
-            raise_memory_limit(MEMORY_EXTRA);
-            core_php_time_limit::raise(300);
-
-            $parser = new core_cssparser($css);
-            $csstree = $parser->parse();
-            unset($parser);
-
-            if ($this->rtlmode) {
-                $this->rtlize($csstree);
-            }
-
-            if ($treeprocessor) {
-                $treeprocessor($csstree, $this);
-            }
-
-            $css = $csstree->render();
-            unset($csstree);
-        }
-
-        return $css;
-    }
-
-    /**
-     * Flip a stylesheet to RTL.
-     *
-     * @param mixed $csstree The parsed CSS tree structure to flip.
-     * @return void
-     */
-    protected function rtlize($csstree) {
-        $rtlcss = new core_rtlcss($csstree);
-        $rtlcss->flip();
-    }
-
-    /**
-     * Return the direct URL for an image from the pix folder.
-     *
-     * Use this function sparingly and never for icons. For icons use pix_icon or the pix helper in a mustache template.
-     *
-     * @deprecated since Moodle 3.3
-     * @param string $imagename the name of the icon.
-     * @param string $component specification of one plugin like in get_string()
-     * @return moodle_url
-     */
-    public function pix_url($imagename, $component) {
-        debugging('pix_url is deprecated. Use image_url for images and pix_icon for icons.', DEBUG_DEVELOPER);
-        return $this->image_url($imagename, $component);
-    }
-
-    /**
-     * Return the direct URL for an image from the pix folder.
-     *
-     * Use this function sparingly and never for icons. For icons use pix_icon or the pix helper in a mustache template.
-     *
-     * @param string $imagename the name of the icon.
-     * @param string $component specification of one plugin like in get_string()
-     * @return moodle_url
-     */
-    public function image_url($imagename, $component) {
-        global $CFG;
-
-        $params = array('theme'=>$this->name);
-        $svg = $this->use_svg_icons();
-
-        if (empty($component) or $component === 'moodle' or $component === 'core') {
-            $params['component'] = 'core';
-        } else {
-            $params['component'] = $component;
-        }
-
-        $rev = theme_get_revision();
-        if ($rev != -1) {
-            $params['rev'] = $rev;
-        }
-
-        $params['image'] = $imagename;
-
-        $url = new moodle_url("/theme/image.php");
-        if (!empty($CFG->slasharguments) and $rev > 0) {
-            $path = '/'.$params['theme'].'/'.$params['component'].'/'.$params['rev'].'/'.$params['image'];
-            if (!$svg) {
-                // We add a simple /_s to the start of the path.
-                // The underscore is used to ensure that it isn't a valid theme name.
-                $path = '/_s'.$path;
-            }
-            $url->set_slashargument($path, 'noparam', true);
-        } else {
-            if (!$svg) {
-                // We add an SVG param so that we know not to serve SVG images.
-                // We do this because all modern browsers support SVG and this param will one day be removed.
-                $params['svg'] = '0';
-            }
-            $url->params($params);
-        }
-
-        return $url;
-    }
-
-    /**
-     * Return the URL for a font
-     *
-     * @param string $font the name of the font (including extension).
-     * @param string $component specification of one plugin like in get_string()
-     * @return moodle_url
-     */
-    public function font_url($font, $component) {
-        global $CFG;
-
-        $params = array('theme'=>$this->name);
-
-        if (empty($component) or $component === 'moodle' or $component === 'core') {
-            $params['component'] = 'core';
-        } else {
-            $params['component'] = $component;
-        }
-
-        $rev = theme_get_revision();
-        if ($rev != -1) {
-            $params['rev'] = $rev;
-        }
-
-        $params['font'] = $font;
-
-        $url = new moodle_url("/theme/font.php");
-        if (!empty($CFG->slasharguments) and $rev > 0) {
-            $path = '/'.$params['theme'].'/'.$params['component'].'/'.$params['rev'].'/'.$params['font'];
-            $url->set_slashargument($path, 'noparam', true);
-        } else {
-            $url->params($params);
-        }
-
-        return $url;
-    }
-
-    /**
-     * Returns URL to the stored file via pluginfile.php.
-     *
-     * Note the theme must also implement pluginfile.php handler,
-     * theme revision is used instead of the itemid.
-     *
-     * @param string $setting
-     * @param string $filearea
-     * @return string protocol relative URL or null if not present
-     */
-    public function setting_file_url($setting, $filearea) {
-        global $CFG;
-
-        if (empty($this->settings->$setting)) {
-            return null;
-        }
-
-        $component = 'theme_'.$this->name;
-        $itemid = theme_get_revision();
-        $filepath = $this->settings->$setting;
-        $syscontext = context_system::instance();
-
-        $url = moodle_url::make_file_url("$CFG->wwwroot/pluginfile.php", "/$syscontext->id/$component/$filearea/$itemid".$filepath);
-
-        // Now this is tricky because the we can not hardcode http or https here, lets use the relative link.
-        // Note: unfortunately moodle_url does not support //urls yet.
-
-        $url = preg_replace('|^https?://|i', '//', $url->out(false));
-
-        return $url;
-    }
-
-    /**
-     * Serve the theme setting file.
-     *
-     * @param string $filearea
-     * @param array $args
-     * @param bool $forcedownload
-     * @param array $options
-     * @return bool may terminate if file not found or donotdie not specified
-     */
-    public function setting_file_serve($filearea, $args, $forcedownload, $options) {
-        global $CFG;
-        require_once("$CFG->libdir/filelib.php");
-
-        $syscontext = context_system::instance();
-        $component = 'theme_'.$this->name;
-
-        $revision = array_shift($args);
-        if ($revision < 0) {
-            $lifetime = 0;
-        } else {
-            $lifetime = 60*60*24*60;
-            // By default, theme files must be cache-able by both browsers and proxies.
-            if (!array_key_exists('cacheability', $options)) {
-                $options['cacheability'] = 'public';
-            }
-        }
-
-        $fs = get_file_storage();
-        $relativepath = implode('/', $args);
-
-        $fullpath = "/{$syscontext->id}/{$component}/{$filearea}/0/{$relativepath}";
-        $fullpath = rtrim($fullpath, '/');
-        if ($file = $fs->get_file_by_hash(sha1($fullpath))) {
-            send_stored_file($file, $lifetime, 0, $forcedownload, $options);
-            return true;
-        } else {
-            send_file_not_found();
-        }
-    }
-
-    /**
-     * Resolves the real image location.
-     *
-     * $svg was introduced as an arg in 2.4. It is important because not all supported browsers support the use of SVG
-     * and we need a way in which to turn it off.
-     * By default SVG won't be used unless asked for. This is done for two reasons:
-     *   1. It ensures that we don't serve svg images unless we really want to. The admin has selected to force them, of the users
-     *      browser supports SVG.
-     *   2. We only serve SVG images from locations we trust. This must NOT include any areas where the image may have been uploaded
-     *      by the user due to security concerns.
-     *
-     * @param string $image name of image, may contain relative path
-     * @param string $component
-     * @param bool|null $svg Should SVG images also be looked for? If null, falls back to auto-detection of browser support
-     * @return string full file path
-     */
-    public function resolve_image_location($image, $component, $svg = false) {
-        global $CFG;
-
-        if (!is_bool($svg)) {
-            // If $svg isn't a bool then we need to decide for ourselves.
-            $svg = $this->use_svg_icons();
-        }
-
-        if ($component === 'moodle' or $component === 'core' or empty($component)) {
-            if ($imagefile = $this->image_exists("$this->dir/pix_core/$image", $svg)) {
-                return $imagefile;
-            }
-            foreach (array_reverse($this->parent_configs) as $parent_config) { // base first, the immediate parent last
-                if ($imagefile = $this->image_exists("$parent_config->dir/pix_core/$image", $svg)) {
-                    return $imagefile;
-                }
-            }
-            if ($imagefile = $this->image_exists("$CFG->dataroot/pix/$image", $svg)) {
-                return $imagefile;
-            }
-            if ($imagefile = $this->image_exists("$CFG->dirroot/pix/$image", $svg)) {
-                return $imagefile;
-            }
-            return null;
-
-        } else if ($component === 'theme') { //exception
-            if ($image === 'favicon') {
-                return "$this->dir/pix/favicon.ico";
-            }
-            if ($imagefile = $this->image_exists("$this->dir/pix/$image", $svg)) {
-                return $imagefile;
-            }
-            foreach (array_reverse($this->parent_configs) as $parent_config) { // base first, the immediate parent last
-                if ($imagefile = $this->image_exists("$parent_config->dir/pix/$image", $svg)) {
-                    return $imagefile;
-                }
-            }
-            return null;
-
-        } else {
-            if (strpos($component, '_') === false) {
-                $component = "mod_{$component}";
-            }
-            list($type, $plugin) = explode('_', $component, 2);
-
-            // In Moodle 4.0 we introduced a new image format.
-            // Support that image format here.
-            $candidates = [$image];
-
-            if ($type === 'mod') {
-                if ($image === 'icon' || $image === 'monologo') {
-                    $candidates = ['monologo', 'icon'];
-                    if ($image === 'icon') {
-                        debugging(
-                            "The 'icon' image for activity modules has been replaced with a new 'monologo'. " .
-                                "Please update your calling code to fetch the new icon where possible. " .
-                                "Called for component {$component}.",
-                            DEBUG_DEVELOPER
-                        );
-                    }
-                }
-            }
-            foreach ($candidates as $image) {
-                if ($imagefile = $this->image_exists("$this->dir/pix_plugins/$type/$plugin/$image", $svg)) {
-                    return $imagefile;
-                }
-
-                // Base first, the immediate parent last.
-                foreach (array_reverse($this->parent_configs) as $parentconfig) {
-                    if ($imagefile = $this->image_exists("$parentconfig->dir/pix_plugins/$type/$plugin/$image", $svg)) {
-                        return $imagefile;
-                    }
-                }
-                if ($imagefile = $this->image_exists("$CFG->dataroot/pix_plugins/$type/$plugin/$image", $svg)) {
-                    return $imagefile;
-                }
-                $dir = core_component::get_plugin_directory($type, $plugin);
-                if ($imagefile = $this->image_exists("$dir/pix/$image", $svg)) {
-                    return $imagefile;
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
-     * Resolves the real font location.
-     *
-     * @param string $font name of font file
-     * @param string $component
-     * @return string full file path
-     */
-    public function resolve_font_location($font, $component) {
-        global $CFG;
-
-        if ($component === 'moodle' or $component === 'core' or empty($component)) {
-            if (file_exists("$this->dir/fonts_core/$font")) {
-                return "$this->dir/fonts_core/$font";
-            }
-            foreach (array_reverse($this->parent_configs) as $parent_config) { // Base first, the immediate parent last.
-                if (file_exists("$parent_config->dir/fonts_core/$font")) {
-                    return "$parent_config->dir/fonts_core/$font";
-                }
-            }
-            if (file_exists("$CFG->dataroot/fonts/$font")) {
-                return "$CFG->dataroot/fonts/$font";
-            }
-            if (file_exists("$CFG->dirroot/lib/fonts/$font")) {
-                return "$CFG->dirroot/lib/fonts/$font";
-            }
-            return null;
-
-        } else if ($component === 'theme') { // Exception.
-            if (file_exists("$this->dir/fonts/$font")) {
-                return "$this->dir/fonts/$font";
-            }
-            foreach (array_reverse($this->parent_configs) as $parent_config) { // Base first, the immediate parent last.
-                if (file_exists("$parent_config->dir/fonts/$font")) {
-                    return "$parent_config->dir/fonts/$font";
-                }
-            }
-            return null;
-
-        } else {
-            if (strpos($component, '_') === false) {
-                $component = 'mod_'.$component;
-            }
-            list($type, $plugin) = explode('_', $component, 2);
-
-            if (file_exists("$this->dir/fonts_plugins/$type/$plugin/$font")) {
-                return "$this->dir/fonts_plugins/$type/$plugin/$font";
-            }
-            foreach (array_reverse($this->parent_configs) as $parent_config) { // Base first, the immediate parent last.
-                if (file_exists("$parent_config->dir/fonts_plugins/$type/$plugin/$font")) {
-                    return "$parent_config->dir/fonts_plugins/$type/$plugin/$font";
-                }
-            }
-            if (file_exists("$CFG->dataroot/fonts_plugins/$type/$plugin/$font")) {
-                return "$CFG->dataroot/fonts_plugins/$type/$plugin/$font";
-            }
-            $dir = core_component::get_plugin_directory($type, $plugin);
-            if (file_exists("$dir/fonts/$font")) {
-                return "$dir/fonts/$font";
-            }
-            return null;
-        }
-    }
-
-    /**
-     * Return true if we should look for SVG images as well.
-     *
-     * @return bool
-     */
-    public function use_svg_icons() {
-        if ($this->usesvg === null) {
-            $this->usesvg = core_useragent::supports_svg();
-        }
-
-        return $this->usesvg;
-    }
-
-    /**
-     * Forces the usesvg setting to either true or false, avoiding any decision making.
-     *
-     * This function should only ever be used when absolutely required, and before any generation of image URL's has occurred.
-     * DO NOT ABUSE THIS FUNCTION... not that you'd want to right ;)
-     *
-     * @param bool $setting True to force the use of svg when available, null otherwise.
-     */
-    public function force_svg_use($setting) {
-        $this->usesvg = (bool)$setting;
-    }
-
-    /**
-     * Set to be in RTL mode.
-     *
-     * This will likely be used when post processing the CSS before serving it.
-     *
-     * @param bool $inrtl True when in RTL mode.
-     */
-    public function set_rtl_mode($inrtl = true) {
-        $this->rtlmode = $inrtl;
-    }
-
-    /**
-     * Checks if source maps are supported
-     *
-     * @param bool $themedesigner True if theme designer is enabled.
-     * @return boolean True if source maps are supported.
-     */
-    public function supports_source_maps($themedesigner): bool {
-        if (empty($this->rtlmode) && $themedesigner) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Whether the theme is being served in RTL mode.
-     *
-     * @return bool True when in RTL mode.
-     */
-    public function get_rtl_mode() {
-        return $this->rtlmode;
-    }
-
-    /**
-     * Checks if file with any image extension exists.
-     *
-     * The order to these images was adjusted prior to the release of 2.4
-     * At that point the were the following image counts in Moodle core:
-     *
-     *     - png = 667 in pix dirs (1499 total)
-     *     - gif = 385 in pix dirs (606 total)
-     *     - jpg = 62  in pix dirs (74 total)
-     *     - jpeg = 0  in pix dirs (1 total)
-     *
-     * There is work in progress to move towards SVG presently hence that has been prioritiesed.
-     *
-     * @param string $filepath
-     * @param bool $svg If set to true SVG images will also be looked for.
-     * @return string image name with extension
-     */
-    private static function image_exists($filepath, $svg = false) {
-        if ($svg && file_exists("$filepath.svg")) {
-            return "$filepath.svg";
-        } else  if (file_exists("$filepath.png")) {
-            return "$filepath.png";
-        } else if (file_exists("$filepath.gif")) {
-            return "$filepath.gif";
-        } else  if (file_exists("$filepath.jpg")) {
-            return "$filepath.jpg";
-        } else  if (file_exists("$filepath.jpeg")) {
-            return "$filepath.jpeg";
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Loads the theme config from config.php file.
-     *
-     * @param string $themename
-     * @param stdClass $settings from config_plugins table
-     * @param boolean $parentscheck true to also check the parents.    .
-     * @return ?stdClass The theme configuration
-     */
-    private static function find_theme_config($themename, $settings, $parentscheck = true) {
-        // We have to use the variable name $THEME (upper case) because that
-        // is what is used in theme config.php files.
-
-        if (!$dir = theme_config::find_theme_location($themename)) {
-            return null;
-        }
-
-        $THEME = new stdClass();
-        $THEME->name     = $themename;
-        $THEME->dir      = $dir;
-        $THEME->settings = $settings;
-
-        global $CFG; // just in case somebody tries to use $CFG in theme config
-        include("$THEME->dir/config.php");
-
-        // verify the theme configuration is OK
-        if (!is_array($THEME->parents)) {
-            // parents option is mandatory now
-            return null;
-        } else {
-            // We use $parentscheck to only check the direct parents (avoid infinite loop).
-            if ($parentscheck) {
-                // Find all parent theme configs.
-                foreach ($THEME->parents as $parent) {
-                    $parentconfig = theme_config::find_theme_config($parent, $settings, false);
-                    if (empty($parentconfig)) {
-                        return null;
-                    }
-                }
-            }
-        }
-
-        return $THEME;
-    }
-
-    /**
-     * Finds the theme location and verifies the theme has all needed files
-     * and is not obsoleted.
-     *
-     * @param string $themename
-     * @return string full dir path or null if not found
-     */
-    private static function find_theme_location($themename) {
-        global $CFG;
-
-        if (file_exists("$CFG->dirroot/theme/$themename/config.php")) {
-            $dir = "$CFG->dirroot/theme/$themename";
-
-        } else if (!empty($CFG->themedir) and file_exists("$CFG->themedir/$themename/config.php")) {
-            $dir = "$CFG->themedir/$themename";
-
-        } else {
-            return null;
-        }
-
-        if (file_exists("$dir/styles.php")) {
-            //legacy theme - needs to be upgraded - upgrade info is displayed on the admin settings page
-            return null;
-        }
-
-        return $dir;
-    }
-
-    /**
-     * Get the renderer for a part of Moodle for this theme.
-     *
-     * @param moodle_page $page the page we are rendering
-     * @param string $component the name of part of moodle. E.g. 'core', 'quiz', 'qtype_multichoice'.
-     * @param string $subtype optional subtype such as 'news' resulting to 'mod_forum_news'
-     * @param string $target one of rendering target constants
-     * @return renderer_base the requested renderer.
-     */
-    public function get_renderer(moodle_page $page, $component, $subtype = null, $target = null) {
-        if (is_null($this->rf)) {
-            $classname = $this->rendererfactory;
-            $this->rf = new $classname($this);
-        }
-
-        return $this->rf->get_renderer($page, $component, $subtype, $target);
-    }
-
-    /**
-     * Get the information from {@link $layouts} for this type of page.
-     *
-     * @param string $pagelayout the the page layout name.
-     * @return array the appropriate part of {@link $layouts}.
-     */
-    protected function layout_info_for_page($pagelayout) {
-        if (array_key_exists($pagelayout, $this->layouts)) {
-            return $this->layouts[$pagelayout];
-        } else {
-            debugging('Invalid page layout specified: ' . $pagelayout);
-            return $this->layouts['standard'];
-        }
-    }
-
-    /**
-     * Given the settings of this theme, and the page pagelayout, return the
-     * full path of the page layout file to use.
-     *
-     * Used by {@link core_renderer::header()}.
-     *
-     * @param string $pagelayout the the page layout name.
-     * @return string Full path to the lyout file to use
-     */
-    public function layout_file($pagelayout) {
-        global $CFG;
-
-        $layoutinfo = $this->layout_info_for_page($pagelayout);
-        $layoutfile = $layoutinfo['file'];
-
-        if (array_key_exists('theme', $layoutinfo)) {
-            $themes = array($layoutinfo['theme']);
-        } else {
-            $themes = array_merge(array($this->name),$this->parents);
-        }
-
-        foreach ($themes as $theme) {
-            if ($dir = $this->find_theme_location($theme)) {
-                $path = "$dir/layout/$layoutfile";
-
-                // Check the template exists, return general base theme template if not.
-                if (is_readable($path)) {
-                    return $path;
-                }
-            }
-        }
-
-        throw new coding_exception('Can not find layout file for: ' . $pagelayout . ' (' . $layoutfile . ')');
-    }
-
-    /**
-     * Returns auxiliary page layout options specified in layout configuration array.
-     *
-     * @param string $pagelayout
-     * @return array
-     */
-    public function pagelayout_options($pagelayout) {
-        $info = $this->layout_info_for_page($pagelayout);
-        if (!empty($info['options'])) {
-            return $info['options'];
-        }
-        return array();
-    }
-
-    /**
-     * Inform a block_manager about the block regions this theme wants on this
-     * page layout.
-     *
-     * @param string $pagelayout the general type of the page.
-     * @param block_manager $blockmanager the block_manger to set up.
-     */
-    public function setup_blocks($pagelayout, $blockmanager) {
-        $layoutinfo = $this->layout_info_for_page($pagelayout);
-        if (!empty($layoutinfo['regions'])) {
-            $blockmanager->add_regions($layoutinfo['regions'], false);
-            $blockmanager->set_default_region($layoutinfo['defaultregion']);
-        }
-    }
-
-    /**
-     * Gets the visible name for the requested block region.
-     *
-     * @param string $region The region name to get
-     * @param string $theme The theme the region belongs to (may come from the parent theme)
-     * @return string
-     */
-    protected function get_region_name($region, $theme) {
-
-        $stringman = get_string_manager();
-
-        // Check if the name is defined in the theme.
-        if ($stringman->string_exists('region-' . $region, 'theme_' . $theme)) {
-            return get_string('region-' . $region, 'theme_' . $theme);
-        }
-
-        // Check the theme parents.
-        foreach ($this->parents as $parentthemename) {
-            if ($stringman->string_exists('region-' . $region, 'theme_' . $parentthemename)) {
-                return get_string('region-' . $region, 'theme_' . $parentthemename);
-            }
-        }
-
-        // Last resort, try the boost theme for names.
-        return get_string('region-' . $region, 'theme_boost');
-    }
-
-    /**
-     * Get the list of all block regions known to this theme in all templates.
-     *
-     * @return array internal region name => human readable name.
-     */
-    public function get_all_block_regions() {
-        $regions = array();
-        foreach ($this->layouts as $layoutinfo) {
-            foreach ($layoutinfo['regions'] as $region) {
-                $regions[$region] = $this->get_region_name($region, $this->name);
-            }
-        }
-        return $regions;
-    }
-
-    /**
-     * Returns the human readable name of the theme
-     *
-     * @return string
-     */
-    public function get_theme_name() {
-        return get_string('pluginname', 'theme_'.$this->name);
-    }
-
-    /**
-     * Returns the block render method.
-     *
-     * It is set by the theme via:
-     *     $THEME->blockrendermethod = '...';
-     *
-     * It can be one of two values, blocks or blocks_for_region.
-     * It should be set to the method being used by the theme layouts.
-     *
-     * @return string
-     */
-    public function get_block_render_method() {
-        if ($this->blockrendermethod) {
-            // Return the specified block render method.
-            return $this->blockrendermethod;
-        }
-        // Its not explicitly set, check the parent theme configs.
-        foreach ($this->parent_configs as $config) {
-            if (isset($config->blockrendermethod)) {
-                return $config->blockrendermethod;
-            }
-        }
-        // Default it to blocks.
-        return 'blocks';
-    }
-
-    /**
-     * Get the callable for CSS tree post processing.
-     *
-     * @return string|null
-     */
-    public function get_css_tree_post_processor() {
-        $configs = [$this] + $this->parent_configs;
-        foreach ($configs as $config) {
-            if (!empty($config->csstreepostprocessor) && is_callable($config->csstreepostprocessor)) {
-                return $config->csstreepostprocessor;
-            }
-        }
-        return null;
-    }
-
-}
-
-/**
- * This class keeps track of which HTML tags are currently open.
- *
- * This makes it much easier to always generate well formed XHTML output, even
- * if execution terminates abruptly. Any time you output some opening HTML
- * without the matching closing HTML, you should push the necessary close tags
- * onto the stack.
- *
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class xhtml_container_stack {
-
-    /**
-     * @var array Stores the list of open containers.
-     */
-    protected $opencontainers = array();
-
-    /**
-     * @var array In developer debug mode, stores a stack trace of all opens and
-     * closes, so we can output helpful error messages when there is a mismatch.
-     */
-    protected $log = array();
-
-    /**
-     * @var boolean Store whether we are developer debug mode. We need this in
-     * several places including in the destructor where we may not have access to $CFG.
-     */
-    protected $isdebugging;
-
-    /**
-     * Constructor
-     */
-    public function __construct() {
-        global $CFG;
-        $this->isdebugging = $CFG->debugdeveloper;
-    }
-
-    /**
-     * Push the close HTML for a recently opened container onto the stack.
-     *
-     * @param string $type The type of container. This is checked when {@link pop()}
-     *      is called and must match, otherwise a developer debug warning is output.
-     * @param string $closehtml The HTML required to close the container.
-     */
-    public function push($type, $closehtml) {
-        $container = new stdClass;
-        $container->type = $type;
-        $container->closehtml = $closehtml;
-        if ($this->isdebugging) {
-            $this->log('Open', $type);
-        }
-        array_push($this->opencontainers, $container);
-    }
-
-    /**
-     * Pop the HTML for the next closing container from the stack. The $type
-     * must match the type passed when the container was opened, otherwise a
-     * warning will be output.
-     *
-     * @param string $type The type of container.
-     * @return ?string the HTML required to close the container.
-     */
-    public function pop($type) {
-        if (empty($this->opencontainers)) {
-            debugging('<p>There are no more open containers. This suggests there is a nesting problem.</p>' .
-                    $this->output_log(), DEBUG_DEVELOPER);
-            return;
-        }
-
-        $container = array_pop($this->opencontainers);
-        if ($container->type != $type) {
-            debugging('<p>The type of container to be closed (' . $container->type .
-                    ') does not match the type of the next open container (' . $type .
-                    '). This suggests there is a nesting problem.</p>' .
-                    $this->output_log(), DEBUG_DEVELOPER);
-        }
-        if ($this->isdebugging) {
-            $this->log('Close', $type);
-        }
-        return $container->closehtml;
-    }
-
-    /**
-     * Close all but the last open container. This is useful in places like error
-     * handling, where you want to close all the open containers (apart from <body>)
-     * before outputting the error message.
-     *
-     * @param bool $shouldbenone assert that the stack should be empty now - causes a
-     *      developer debug warning if it isn't.
-     * @return string the HTML required to close any open containers inside <body>.
-     */
-    public function pop_all_but_last($shouldbenone = false) {
-        if ($shouldbenone && count($this->opencontainers) != 1) {
-            debugging('<p>Some HTML tags were opened in the body of the page but not closed.</p>' .
-                    $this->output_log(), DEBUG_DEVELOPER);
-        }
-        $output = '';
-        while (count($this->opencontainers) > 1) {
-            $container = array_pop($this->opencontainers);
-            $output .= $container->closehtml;
-        }
-        return $output;
-    }
-
-    /**
-     * You can call this function if you want to throw away an instance of this
-     * class without properly emptying the stack (for example, in a unit test).
-     * Calling this method stops the destruct method from outputting a developer
-     * debug warning. After calling this method, the instance can no longer be used.
-     */
-    public function discard() {
-        $this->opencontainers = null;
-    }
-
-    /**
-     * Adds an entry to the log.
-     *
-     * @param string $action The name of the action
-     * @param string $type The type of action
-     */
-    protected function log($action, $type) {
-        $this->log[] = '<li>' . $action . ' ' . $type . ' at:' .
-                format_backtrace(debug_backtrace()) . '</li>';
-    }
-
-    /**
-     * Outputs the log's contents as a HTML list.
-     *
-     * @return string HTML list of the log
-     */
-    protected function output_log() {
-        return '<ul>' . implode("\n", $this->log) . '</ul>';
-    }
+    set_config('jsrev', $next);
 }
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 918db5ec79d00..0fdca282e68ed 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -14,5855 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Classes for rendering HTML output for Moodle.
- *
- * Please see {@link http://docs.moodle.org/en/Developement:How_Moodle_outputs_HTML}
- * for an overview.
- *
- * Included in this file are the primary renderer classes:
- *     - renderer_base:         The renderer outline class that all renderers
- *                              should inherit from.
- *     - core_renderer:         The standard HTML renderer.
- *     - core_renderer_cli:     An adaption of the standard renderer for CLI scripts.
- *     - core_renderer_ajax:    An adaption of the standard renderer for AJAX scripts.
- *     - plugin_renderer_base:  A renderer class that should be extended by all
- *                              plugin renderers.
- *
- * @package core
- * @category output
- * @copyright  2009 Tim Hunt
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-use core\di;
-use core\hook\manager as hook_manager;
-use core\hook\output\after_standard_main_region_html_generation;
-use core\hook\output\before_footer_html_generation;
-use core\hook\output\before_html_attributes;
-use core\hook\output\before_http_headers;
-use core\hook\output\before_standard_footer_html_generation;
-use core\hook\output\before_standard_top_of_body_html_generation;
-use core\output\named_templatable;
-use core_completion\cm_completion_details;
-use core_course\output\activity_information;
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Simple base class for Moodle renderers.
- *
- * Tracks the xhtml_container_stack to use, which is passed in in the constructor.
- *
- * Also has methods to facilitate generating HTML output.
- *
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class renderer_base {
-    /**
-     * @var xhtml_container_stack The xhtml_container_stack to use.
-     */
-    protected $opencontainers;
-
-    /**
-     * @var moodle_page The Moodle page the renderer has been created to assist with.
-     */
-    protected $page;
-
-    /**
-     * @var string The requested rendering target.
-     */
-    protected $target;
-
-    /**
-     * @var Mustache_Engine $mustache The mustache template compiler
-     */
-    private $mustache;
-
-    /**
-     * @var array $templatecache The mustache template cache.
-     */
-    protected $templatecache = [];
-
-    /**
-     * Return an instance of the mustache class.
-     *
-     * @since 2.9
-     * @return Mustache_Engine
-     */
-    protected function get_mustache() {
-        global $CFG;
-
-        if ($this->mustache === null) {
-            require_once("{$CFG->libdir}/filelib.php");
-
-            $themename = $this->page->theme->name;
-            $themerev = theme_get_revision();
-
-            // Create new localcache directory.
-            $cachedir = make_localcache_directory("mustache/$themerev/$themename");
-
-            // Remove old localcache directories.
-            $mustachecachedirs = glob("{$CFG->localcachedir}/mustache/*", GLOB_ONLYDIR);
-            foreach ($mustachecachedirs as $localcachedir) {
-                $cachedrev = [];
-                preg_match("/\/mustache\/([0-9]+)$/", $localcachedir, $cachedrev);
-                $cachedrev = isset($cachedrev[1]) ? intval($cachedrev[1]) : 0;
-                if ($cachedrev > 0 && $cachedrev < $themerev) {
-                    fulldelete($localcachedir);
-                }
-            }
-
-            $loader = new \core\output\mustache_filesystem_loader();
-            $stringhelper = new \core\output\mustache_string_helper();
-            $cleanstringhelper = new \core\output\mustache_clean_string_helper();
-            $quotehelper = new \core\output\mustache_quote_helper();
-            $jshelper = new \core\output\mustache_javascript_helper($this->page);
-            $pixhelper = new \core\output\mustache_pix_helper($this);
-            $shortentexthelper = new \core\output\mustache_shorten_text_helper();
-            $userdatehelper = new \core\output\mustache_user_date_helper();
-
-            // We only expose the variables that are exposed to JS templates.
-            $safeconfig = $this->page->requires->get_config_for_javascript($this->page, $this);
-
-            $helpers = array('config' => $safeconfig,
-                             'str' => array($stringhelper, 'str'),
-                             'cleanstr' => array($cleanstringhelper, 'cleanstr'),
-                             'quote' => array($quotehelper, 'quote'),
-                             'js' => array($jshelper, 'help'),
-                             'pix' => array($pixhelper, 'pix'),
-                             'shortentext' => array($shortentexthelper, 'shorten'),
-                             'userdate' => array($userdatehelper, 'transform'),
-                         );
-
-            $this->mustache = new \core\output\mustache_engine(array(
-                'cache' => $cachedir,
-                'escape' => 's',
-                'loader' => $loader,
-                'helpers' => $helpers,
-                'pragmas' => [Mustache_Engine::PRAGMA_BLOCKS],
-                // Don't allow the JavaScript helper to be executed from within another
-                // helper. If it's allowed it can be used by users to inject malicious
-                // JS into the page.
-                'disallowednestedhelpers' => ['js'],
-                // Disable lambda rendering - content in helpers is already rendered, no need to render it again.
-                'disable_lambda_rendering' => true,
-            ));
-
-        }
-
-        return $this->mustache;
-    }
-
-
-    /**
-     * Constructor
-     *
-     * The constructor takes two arguments. The first is the page that the renderer
-     * has been created to assist with, and the second is the target.
-     * The target is an additional identifier that can be used to load different
-     * renderers for different options.
-     *
-     * @param moodle_page $page the page we are doing output for.
-     * @param string $target one of rendering target constants
-     */
-    public function __construct(moodle_page $page, $target) {
-        $this->opencontainers = $page->opencontainers;
-        $this->page = $page;
-        $this->target = $target;
-    }
-
-    /**
-     * Renders a template by name with the given context.
-     *
-     * The provided data needs to be array/stdClass made up of only simple types.
-     * Simple types are array,stdClass,bool,int,float,string
-     *
-     * @since 2.9
-     * @param array|stdClass $context Context containing data for the template.
-     * @return string|boolean
-     */
-    public function render_from_template($templatename, $context) {
-        $mustache = $this->get_mustache();
-
-        if ($mustache->hasHelper('uniqid')) {
-            // Grab a copy of the existing helper to be restored later.
-            $uniqidhelper = $mustache->getHelper('uniqid');
-        } else {
-            // Helper doesn't exist.
-            $uniqidhelper = null;
-        }
-
-        // Provide 1 random value that will not change within a template
-        // but will be different from template to template. This is useful for
-        // e.g. aria attributes that only work with id attributes and must be
-        // unique in a page.
-        $mustache->addHelper('uniqid', new \core\output\mustache_uniqid_helper());
-        if (isset($this->templatecache[$templatename])) {
-            $template = $this->templatecache[$templatename];
-        } else {
-            try {
-                $template = $mustache->loadTemplate($templatename);
-                $this->templatecache[$templatename] = $template;
-            } catch (Mustache_Exception_UnknownTemplateException $e) {
-                throw new moodle_exception('Unknown template: ' . $templatename);
-            }
-        }
-
-        $renderedtemplate = trim($template->render($context));
-
-        // If we had an existing uniqid helper then we need to restore it to allow
-        // handle nested calls of render_from_template.
-        if ($uniqidhelper) {
-            $mustache->addHelper('uniqid', $uniqidhelper);
-        }
-
-        return $renderedtemplate;
-    }
-
-
-    /**
-     * Returns rendered widget.
-     *
-     * The provided widget needs to be an object that extends the renderable
-     * interface.
-     * If will then be rendered by a method based upon the classname for the widget.
-     * For instance a widget of class `crazywidget` will be rendered by a protected
-     * render_crazywidget method of this renderer.
-     * If no render_crazywidget method exists and crazywidget implements templatable,
-     * look for the 'crazywidget' template in the same component and render that.
-     *
-     * @param renderable $widget instance with renderable interface
-     * @return string
-     */
-    public function render(renderable $widget) {
-        $classparts = explode('\\', get_class($widget));
-        // Strip namespaces.
-        $classname = array_pop($classparts);
-        // Remove _renderable suffixes.
-        $classname = preg_replace('/_renderable$/', '', $classname);
-
-        $rendermethod = "render_{$classname}";
-        if (method_exists($this, $rendermethod)) {
-            // Call the render_[widget_name] function.
-            // Note: This has a higher priority than the named_templatable to allow the theme to override the template.
-            return $this->$rendermethod($widget);
-        }
-
-        if ($widget instanceof named_templatable) {
-            // This is a named templatable.
-            // Fetch the template name from the get_template_name function instead.
-            // Note: This has higher priority than the guessed template name.
-            return $this->render_from_template(
-                $widget->get_template_name($this),
-                $widget->export_for_template($this)
-            );
-        }
-
-        if ($widget instanceof templatable) {
-            // Guess the templat ename based on the class name.
-            // Note: There's no benefit to moving this aboved the named_templatable and this approach is more costly.
-            $component = array_shift($classparts);
-            if (!$component) {
-                $component = 'core';
-            }
-            $template = $component . '/' . $classname;
-            $context = $widget->export_for_template($this);
-            return $this->render_from_template($template, $context);
-        }
-        throw new coding_exception("Can not render widget, renderer method ('{$rendermethod}') not found.");
-    }
-
-    /**
-     * Adds a JS action for the element with the provided id.
-     *
-     * This method adds a JS event for the provided component action to the page
-     * and then returns the id that the event has been attached to.
-     * If no id has been provided then a new ID is generated by {@link html_writer::random_id()}
-     *
-     * @param component_action $action
-     * @param string $id
-     * @return string id of element, either original submitted or random new if not supplied
-     */
-    public function add_action_handler(component_action $action, $id = null) {
-        if (!$id) {
-            $id = html_writer::random_id($action->event);
-        }
-        $this->page->requires->event_handler("#$id", $action->event, $action->jsfunction, $action->jsfunctionargs);
-        return $id;
-    }
-
-    /**
-     * Returns true is output has already started, and false if not.
-     *
-     * @return boolean true if the header has been printed.
-     */
-    public function has_started() {
-        return $this->page->state >= moodle_page::STATE_IN_BODY;
-    }
-
-    /**
-     * Given an array or space-separated list of classes, prepares and returns the HTML class attribute value
-     *
-     * @param mixed $classes Space-separated string or array of classes
-     * @return string HTML class attribute value
-     */
-    public static function prepare_classes($classes) {
-        if (is_array($classes)) {
-            return implode(' ', array_unique($classes));
-        }
-        return $classes;
-    }
-
-    /**
-     * Return the direct URL for an image from the pix folder.
-     *
-     * Use this function sparingly and never for icons. For icons use pix_icon or the pix helper in a mustache template.
-     *
-     * @deprecated since Moodle 3.3
-     * @param string $imagename the name of the icon.
-     * @param string $component specification of one plugin like in get_string()
-     * @return moodle_url
-     */
-    public function pix_url($imagename, $component = 'moodle') {
-        debugging('pix_url is deprecated. Use image_url for images and pix_icon for icons.', DEBUG_DEVELOPER);
-        return $this->page->theme->image_url($imagename, $component);
-    }
-
-    /**
-     * Return the moodle_url for an image.
-     *
-     * The exact image location and extension is determined
-     * automatically by searching for gif|png|jpg|jpeg, please
-     * note there can not be diferent images with the different
-     * extension. The imagename is for historical reasons
-     * a relative path name, it may be changed later for core
-     * images. It is recommended to not use subdirectories
-     * in plugin and theme pix directories.
-     *
-     * There are three types of images:
-     * 1/ theme images  - stored in theme/mytheme/pix/,
-     *                    use component 'theme'
-     * 2/ core images   - stored in /pix/,
-     *                    overridden via theme/mytheme/pix_core/
-     * 3/ plugin images - stored in mod/mymodule/pix,
-     *                    overridden via theme/mytheme/pix_plugins/mod/mymodule/,
-     *                    example: image_url('comment', 'mod_glossary')
-     *
-     * @param string $imagename the pathname of the image
-     * @param string $component full plugin name (aka component) or 'theme'
-     * @return moodle_url
-     */
-    public function image_url($imagename, $component = 'moodle') {
-        return $this->page->theme->image_url($imagename, $component);
-    }
-
-    /**
-     * Return the site's logo URL, if any.
-     *
-     * @param int $maxwidth The maximum width, or null when the maximum width does not matter.
-     * @param int $maxheight The maximum height, or null when the maximum height does not matter.
-     * @return moodle_url|false
-     */
-    public function get_logo_url($maxwidth = null, $maxheight = 200) {
-        global $CFG;
-        $logo = get_config('core_admin', 'logo');
-        if (empty($logo)) {
-            return false;
-        }
-
-        // 200px high is the default image size which should be displayed at 100px in the page to account for retina displays.
-        // It's not worth the overhead of detecting and serving 2 different images based on the device.
-
-        // Hide the requested size in the file path.
-        $filepath = ((int) $maxwidth . 'x' . (int) $maxheight) . '/';
-
-        // Use $CFG->themerev to prevent browser caching when the file changes.
-        return moodle_url::make_pluginfile_url(context_system::instance()->id, 'core_admin', 'logo', $filepath,
-            theme_get_revision(), $logo);
-    }
-
-    /**
-     * Return the site's compact logo URL, if any.
-     *
-     * @param int $maxwidth The maximum width, or null when the maximum width does not matter.
-     * @param int $maxheight The maximum height, or null when the maximum height does not matter.
-     * @return moodle_url|false
-     */
-    public function get_compact_logo_url($maxwidth = 300, $maxheight = 300) {
-        global $CFG;
-        $logo = get_config('core_admin', 'logocompact');
-        if (empty($logo)) {
-            return false;
-        }
-
-        // Hide the requested size in the file path.
-        $filepath = ((int) $maxwidth . 'x' . (int) $maxheight) . '/';
-
-        // Use $CFG->themerev to prevent browser caching when the file changes.
-        return moodle_url::make_pluginfile_url(context_system::instance()->id, 'core_admin', 'logocompact', $filepath,
-            theme_get_revision(), $logo);
-    }
-
-    /**
-     * Whether we should display the logo in the navbar.
-     *
-     * We will when there are no main logos, and we have compact logo.
-     *
-     * @return bool
-     */
-    public function should_display_navbar_logo() {
-        $logo = $this->get_compact_logo_url();
-        return !empty($logo);
-    }
-
-    /**
-     * @deprecated since Moodle 4.0
-     */
-    #[\core\attribute\deprecated(null, reason: 'It is no longer used', since: '4.0', final: true)]
-    public function should_display_main_logo() {
-        \core\deprecation::emit_deprecation_if_present([self::class, __FUNCTION__]);
-    }
-
-    /**
-     * Returns the moodle page object.
-     *
-     * @return moodle_page
-     */
-    public function get_page(): moodle_page {
-        return $this->page;
-    }
-}
-
-
-/**
- * Basis for all plugin renderers.
- *
- * @copyright Petr Skoda (skodak)
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class plugin_renderer_base extends renderer_base {
-
-    /**
-     * @var renderer_base|core_renderer A reference to the current renderer.
-     * The renderer provided here will be determined by the page but will in 90%
-     * of cases by the {@link core_renderer}
-     */
-    protected $output;
-
-    /**
-     * Constructor method, calls the parent constructor
-     *
-     * @param moodle_page $page
-     * @param string $target one of rendering target constants
-     */
-    public function __construct(moodle_page $page, $target) {
-        if (empty($target) && $page->pagelayout === 'maintenance') {
-            // If the page is using the maintenance layout then we're going to force the target to maintenance.
-            // This way we'll get a special maintenance renderer that is designed to block access to API's that are likely
-            // unavailable for this page layout.
-            $target = RENDERER_TARGET_MAINTENANCE;
-        }
-        $this->output = $page->get_renderer('core', null, $target);
-        parent::__construct($page, $target);
-    }
-
-    /**
-     * Renders the provided widget and returns the HTML to display it.
-     *
-     * @param renderable $widget instance with renderable interface
-     * @return string
-     */
-    public function render(renderable $widget) {
-        $classname = get_class($widget);
-
-        // Strip namespaces.
-        $classname = preg_replace('/^.*\\\/', '', $classname);
-
-        // Keep a copy at this point, we may need to look for a deprecated method.
-        $deprecatedmethod = "render_{$classname}";
-
-        // Remove _renderable suffixes.
-        $classname = preg_replace('/_renderable$/', '', $classname);
-        $rendermethod = "render_{$classname}";
-
-        if (method_exists($this, $rendermethod)) {
-            // Call the render_[widget_name] function.
-            // Note: This has a higher priority than the named_templatable to allow the theme to override the template.
-            return $this->$rendermethod($widget);
-        }
-
-        if ($widget instanceof named_templatable) {
-            // This is a named templatable.
-            // Fetch the template name from the get_template_name function instead.
-            // Note: This has higher priority than the deprecated method which is not overridable by themes anyway.
-            return $this->render_from_template(
-                $widget->get_template_name($this),
-                $widget->export_for_template($this)
-            );
-        }
-
-        if ($rendermethod !== $deprecatedmethod && method_exists($this, $deprecatedmethod)) {
-            // This is exactly where we don't want to be.
-            // If you have arrived here you have a renderable component within your plugin that has the name
-            // blah_renderable, and you have a render method render_blah_renderable on your plugin.
-            // In 2.8 we revamped output, as part of this change we changed slightly how renderables got rendered
-            // and the _renderable suffix now gets removed when looking for a render method.
-            // You need to change your renderers render_blah_renderable to render_blah.
-            // Until you do this it will not be possible for a theme to override the renderer to override your method.
-            // Please do it ASAP.
-            static $debugged = [];
-            if (!isset($debugged[$deprecatedmethod])) {
-                debugging(sprintf(
-                    'Deprecated call. Please rename your renderables render method from %s to %s.',
-                    $deprecatedmethod,
-                    $rendermethod
-                ), DEBUG_DEVELOPER);
-                $debugged[$deprecatedmethod] = true;
-            }
-            return $this->$deprecatedmethod($widget);
-        }
-
-        // Pass to core renderer if method not found here.
-        // Note: this is not a parent. This is _new_ renderer which respects the requested format, and output type.
-        return $this->output->render($widget);
-    }
-
-    /**
-     * Magic method used to pass calls otherwise meant for the standard renderer
-     * to it to ensure we don't go causing unnecessary grief.
-     *
-     * @param string $method
-     * @param array $arguments
-     * @return mixed
-     */
-    public function __call($method, $arguments) {
-        if (method_exists('renderer_base', $method)) {
-            throw new coding_exception('Protected method called against '.get_class($this).' :: '.$method);
-        }
-        if (method_exists($this->output, $method)) {
-            return call_user_func_array(array($this->output, $method), $arguments);
-        } else {
-            throw new coding_exception('Unknown method called against '.get_class($this).' :: '.$method);
-        }
-    }
-}
-
-
-/**
- * The standard implementation of the core_renderer interface.
- *
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class core_renderer extends renderer_base {
-    /**
-     * Do NOT use, please use <?php echo $OUTPUT->main_content() ?>
-     * in layout files instead.
-     * @deprecated
-     * @var string used in {@link core_renderer::header()}.
-     */
-    const MAIN_CONTENT_TOKEN = '[MAIN CONTENT GOES HERE]';
-
-    /**
-     * @var string Used to pass information from {@link core_renderer::doctype()} to
-     * {@link core_renderer::standard_head_html()}.
-     */
-    protected $contenttype;
-
-    /**
-     * @var string Used by {@link core_renderer::redirect_message()} method to communicate
-     * with {@link core_renderer::header()}.
-     */
-    protected $metarefreshtag = '';
-
-    /**
-     * @var string Unique token for the closing HTML
-     */
-    protected $unique_end_html_token;
-
-    /**
-     * @var string Unique token for performance information
-     */
-    protected $unique_performance_info_token;
-
-    /**
-     * @var string Unique token for the main content.
-     */
-    protected $unique_main_content_token;
-
-    /** @var custom_menu_item language The language menu if created */
-    protected $language = null;
-
-    /** @var string The current selector for an element being streamed into */
-    protected $currentselector = '';
-
-    /** @var string The current element tag which is being streamed into */
-    protected $currentelement = '';
-
-    /**
-     * Constructor
-     *
-     * @param moodle_page $page the page we are doing output for.
-     * @param string $target one of rendering target constants
-     */
-    public function __construct(moodle_page $page, $target) {
-        $this->opencontainers = $page->opencontainers;
-        $this->page = $page;
-        $this->target = $target;
-
-        $this->unique_end_html_token = '%%ENDHTML-'.sesskey().'%%';
-        $this->unique_performance_info_token = '%%PERFORMANCEINFO-'.sesskey().'%%';
-        $this->unique_main_content_token = '[MAIN CONTENT GOES HERE - '.sesskey().']';
-    }
-
-    /**
-     * Get the DOCTYPE declaration that should be used with this page. Designed to
-     * be called in theme layout.php files.
-     *
-     * @return string the DOCTYPE declaration that should be used.
-     */
-    public function doctype() {
-        if ($this->page->theme->doctype === 'html5') {
-            $this->contenttype = 'text/html; charset=utf-8';
-            return "<!DOCTYPE html>\n";
-
-        } else if ($this->page->theme->doctype === 'xhtml5') {
-            $this->contenttype = 'application/xhtml+xml; charset=utf-8';
-            return "<!DOCTYPE html>\n";
-
-        } else {
-            // legacy xhtml 1.0
-            $this->contenttype = 'text/html; charset=utf-8';
-            return ('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' . "\n");
-        }
-    }
-
-    /**
-     * The attributes that should be added to the <html> tag. Designed to
-     * be called in theme layout.php files.
-     *
-     * @return string HTML fragment.
-     */
-    public function htmlattributes() {
-        $return = get_html_lang(true);
-
-        $hook = new before_html_attributes($this);
-
-        if ($this->page->theme->doctype !== 'html5') {
-            $hook->add_attribute('xmlns', 'http://www.w3.org/1999/xhtml');
-        }
-
-        $hook->process_legacy_callbacks();
-        di::get(hook_manager::class)->dispatch($hook);
-
-        foreach ($hook->get_attributes() as $key => $val) {
-            $val = s($val);
-            $return .= " $key=\"$val\"";
-        }
-
-        return $return;
-    }
-
-    /**
-     * The standard tags (meta tags, links to stylesheets and JavaScript, etc.)
-     * that should be included in the <head> tag. Designed to be called in theme
-     * layout.php files.
-     *
-     * @return string HTML fragment.
-     */
-    public function standard_head_html() {
-        global $CFG, $SESSION, $SITE;
-
-        // Before we output any content, we need to ensure that certain
-        // page components are set up.
-
-        // Blocks must be set up early as they may require javascript which
-        // has to be included in the page header before output is created.
-        foreach ($this->page->blocks->get_regions() as $region) {
-            $this->page->blocks->ensure_content_created($region, $this);
-        }
-
-        // Give plugins an opportunity to add any head elements. The callback
-        // must always return a string containing valid html head content.
-
-        $hook = new \core\hook\output\before_standard_head_html_generation($this);
-        $hook->process_legacy_callbacks();
-        di::get(hook_manager::class)->dispatch($hook);
-
-        // Allow a url_rewrite plugin to setup any dynamic head content.
-        if (isset($CFG->urlrewriteclass) && !isset($CFG->upgraderunning)) {
-            $class = $CFG->urlrewriteclass;
-            $hook->add_html($class::html_head_setup());
-        }
-
-        $hook->add_html('<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />' . "\n");
-        $hook->add_html('<meta name="keywords" content="moodle, ' . $this->page->title . '" />' . "\n");
-        // This is only set by the {@link redirect()} method
-        $hook->add_html($this->metarefreshtag);
-
-        // Check if a periodic refresh delay has been set and make sure we arn't
-        // already meta refreshing
-        if ($this->metarefreshtag=='' && $this->page->periodicrefreshdelay!==null) {
-            $hook->add_html(
-                html_writer::empty_tag('meta', [
-                    'http-equiv' => 'refresh',
-                    'content' => $this->page->periodicrefreshdelay . ';url='.$this->page->url->out(),
-                ]),
-            );
-        }
-
-        $output = $hook->get_output();
-
-        // Set up help link popups for all links with the helptooltip class
-        $this->page->requires->js_init_call('M.util.help_popups.setup');
-
-        $focus = $this->page->focuscontrol;
-        if (!empty($focus)) {
-            if (preg_match("#forms\['([a-zA-Z0-9]+)'\].elements\['([a-zA-Z0-9]+)'\]#", $focus, $matches)) {
-                // This is a horrifically bad way to handle focus but it is passed in
-                // through messy formslib::moodleform
-                $this->page->requires->js_function_call('old_onload_focus', array($matches[1], $matches[2]));
-            } else if (strpos($focus, '.')!==false) {
-                // Old style of focus, bad way to do it
-                debugging('This code is using the old style focus event, Please update this code to focus on an element id or the moodleform focus method.', DEBUG_DEVELOPER);
-                $this->page->requires->js_function_call('old_onload_focus', explode('.', $focus, 2));
-            } else {
-                // Focus element with given id
-                $this->page->requires->js_function_call('focuscontrol', array($focus));
-            }
-        }
-
-        // Get the theme stylesheet - this has to be always first CSS, this loads also styles.css from all plugins;
-        // any other custom CSS can not be overridden via themes and is highly discouraged
-        $urls = $this->page->theme->css_urls($this->page);
-        foreach ($urls as $url) {
-            $this->page->requires->css_theme($url);
-        }
-
-        // Get the theme javascript head and footer
-        if ($jsurl = $this->page->theme->javascript_url(true)) {
-            $this->page->requires->js($jsurl, true);
-        }
-        if ($jsurl = $this->page->theme->javascript_url(false)) {
-            $this->page->requires->js($jsurl);
-        }
-
-        // Get any HTML from the page_requirements_manager.
-        $output .= $this->page->requires->get_head_code($this->page, $this);
-
-        // List alternate versions.
-        foreach ($this->page->alternateversions as $type => $alt) {
-            $output .= html_writer::empty_tag('link', array('rel' => 'alternate',
-                    'type' => $type, 'title' => $alt->title, 'href' => $alt->url));
-        }
-
-        // Add noindex tag if relevant page and setting applied.
-        $allowindexing = isset($CFG->allowindexing) ? $CFG->allowindexing : 0;
-        $loginpages = array('login-index', 'login-signup');
-        if ($allowindexing == 2 || ($allowindexing == 0 && in_array($this->page->pagetype, $loginpages))) {
-            if (!isset($CFG->additionalhtmlhead)) {
-                $CFG->additionalhtmlhead = '';
-            }
-            $CFG->additionalhtmlhead .= '<meta name="robots" content="noindex" />';
-        }
-
-        if (!empty($CFG->additionalhtmlhead)) {
-            $output .= "\n".$CFG->additionalhtmlhead;
-        }
-
-        if ($this->page->pagelayout == 'frontpage') {
-            $summary = s(strip_tags(format_text($SITE->summary, FORMAT_HTML)));
-            if (!empty($summary)) {
-                $output .= "<meta name=\"description\" content=\"$summary\" />\n";
-            }
-        }
-
-        return $output;
-    }
-
-    /**
-     * The standard tags (typically skip links) that should be output just inside
-     * the start of the <body> tag. Designed to be called in theme layout.php files.
-     *
-     * @return string HTML fragment.
-     */
-    public function standard_top_of_body_html() {
-        global $CFG;
-        $output = $this->page->requires->get_top_of_body_code($this);
-        if ($this->page->pagelayout !== 'embedded' && !empty($CFG->additionalhtmltopofbody)) {
-            $output .= "\n".$CFG->additionalhtmltopofbody;
-        }
-
-        // Allow components to add content to the top of the body.
-        $hook = new before_standard_top_of_body_html_generation($this, $output);
-        $hook->process_legacy_callbacks();
-        di::get(hook_manager::class)->dispatch($hook);
-        $output = $hook->get_output();
-
-        $output .= $this->maintenance_warning();
-
-        return $output;
-    }
-
-    /**
-     * Scheduled maintenance warning message.
-     *
-     * Note: This is a nasty hack to display maintenance notice, this should be moved
-     *       to some general notification area once we have it.
-     *
-     * @return string
-     */
-    public function maintenance_warning() {
-        global $CFG;
-
-        $output = '';
-        if (isset($CFG->maintenance_later) and $CFG->maintenance_later > time()) {
-            $timeleft = $CFG->maintenance_later - time();
-            // If timeleft less than 30 sec, set the class on block to error to highlight.
-            $errorclass = ($timeleft < 30) ? 'alert-error alert-danger' : 'alert-warning';
-            $output .= $this->box_start($errorclass . ' moodle-has-zindex maintenancewarning m-3 alert');
-            $a = new stdClass();
-            $a->hour = (int)($timeleft / 3600);
-            $a->min = (int)(floor($timeleft / 60) % 60);
-            $a->sec = (int)($timeleft % 60);
-            if ($a->hour > 0) {
-                $output .= get_string('maintenancemodeisscheduledlong', 'admin', $a);
-            } else {
-                $output .= get_string('maintenancemodeisscheduled', 'admin', $a);
-            }
-
-            $output .= $this->box_end();
-            $this->page->requires->yui_module('moodle-core-maintenancemodetimer', 'M.core.maintenancemodetimer',
-                    array(array('timeleftinsec' => $timeleft)));
-            $this->page->requires->strings_for_js(
-                    array('maintenancemodeisscheduled', 'maintenancemodeisscheduledlong', 'sitemaintenance'),
-                    'admin');
-        }
-        return $output;
-    }
-
-    /**
-     * content that should be output in the footer area
-     * of the page. Designed to be called in theme layout.php files.
-     *
-     * @return string HTML fragment.
-     */
-    public function standard_footer_html() {
-        if (during_initial_install()) {
-            // Debugging info can not work before install is finished,
-            // in any case we do not want any links during installation!
-            return '';
-        }
-
-        $hook = new before_standard_footer_html_generation($this);
-        $hook->process_legacy_callbacks();
-        di::get(hook_manager::class)->dispatch($hook);
-        $output = $hook->get_output();
-
-        if ($this->page->devicetypeinuse == 'legacy') {
-            // The legacy theme is in use print the notification
-            $output .= html_writer::tag('div', get_string('legacythemeinuse'), array('class'=>'legacythemeinuse'));
-        }
-
-        // Get links to switch device types (only shown for users not on a default device)
-        $output .= $this->theme_switch_links();
-
-        return $output;
-    }
-
-    /**
-     * Performance information and validation links for debugging.
-     *
-     * @return string HTML fragment.
-     */
-    public function debug_footer_html() {
-        global $CFG, $SCRIPT;
-        $output = '';
-
-        if (during_initial_install()) {
-            // Debugging info can not work before install is finished.
-            return $output;
-        }
-
-        // This function is normally called from a layout.php file
-        // but some of the content won't be known until later, so we return a placeholder
-        // for now. This will be replaced with the real content in the footer.
-        $output .= $this->unique_performance_info_token;
-
-        if (!empty($CFG->debugpageinfo)) {
-            $output .= '<div class="performanceinfo pageinfo">' . get_string('pageinfodebugsummary', 'core_admin',
-                $this->page->debug_summary()) . '</div>';
-        }
-        if (debugging(null, DEBUG_DEVELOPER) and has_capability('moodle/site:config', context_system::instance())) {  // Only in developer mode
-
-            // Add link to profiling report if necessary
-            if (function_exists('profiling_is_running') && profiling_is_running()) {
-                $txt = get_string('profiledscript', 'admin');
-                $title = get_string('profiledscriptview', 'admin');
-                $url = $CFG->wwwroot . '/admin/tool/profiling/index.php?script=' . urlencode($SCRIPT);
-                $link= '<a title="' . $title . '" href="' . $url . '">' . $txt . '</a>';
-                $output .= '<div class="profilingfooter">' . $link . '</div>';
-            }
-            $purgeurl = new moodle_url('/admin/purgecaches.php', array('confirm' => 1,
-                'sesskey' => sesskey(), 'returnurl' => $this->page->url->out_as_local_url(false)));
-            $output .= '<div class="purgecaches">' .
-                    html_writer::link($purgeurl, get_string('purgecaches', 'admin')) . '</div>';
-
-            // Reactive module debug panel.
-            $output .= $this->render_from_template('core/local/reactive/debugpanel', []);
-        }
-        if (!empty($CFG->debugvalidators)) {
-            $siteurl = qualified_me();
-            $nuurl = new moodle_url('https://validator.w3.org/nu/', ['doc' => $siteurl, 'showsource' => 'yes']);
-            $waveurl = new moodle_url('https://wave.webaim.org/report#/' . urlencode($siteurl));
-            $validatorlinks = [
-                html_writer::link($nuurl, get_string('validatehtml')),
-                html_writer::link($waveurl, get_string('wcagcheck'))
-            ];
-            $validatorlinkslist = html_writer::alist($validatorlinks, ['class' => 'list-unstyled ml-1']);
-            $output .= html_writer::div($validatorlinkslist, 'validators');
-        }
-        return $output;
-    }
-
-    /**
-     * Returns standard main content placeholder.
-     * Designed to be called in theme layout.php files.
-     *
-     * @return string HTML fragment.
-     */
-    public function main_content() {
-        // This is here because it is the only place we can inject the "main" role over the entire main content area
-        // without requiring all theme's to manually do it, and without creating yet another thing people need to
-        // remember in the theme.
-        // This is an unfortunate hack. DO NO EVER add anything more here.
-        // DO NOT add classes.
-        // DO NOT add an id.
-        return '<div role="main">'.$this->unique_main_content_token.'</div>';
-    }
-
-    /**
-     * Returns information about an activity.
-     *
-     * @deprecated since Moodle 4.3 MDL-78744
-     * @todo MDL-78926 This method will be deleted in Moodle 4.7
-     * @param cm_info $cminfo The course module information.
-     * @param cm_completion_details $completiondetails The completion details for this activity module.
-     * @param array $activitydates The dates for this activity module.
-     * @return string the activity information HTML.
-     * @throws coding_exception
-     */
-    public function activity_information(cm_info $cminfo, cm_completion_details $completiondetails, array $activitydates): string {
-        debugging('activity_information method is deprecated.', DEBUG_DEVELOPER);
-        if (!$completiondetails->has_completion() && empty($activitydates)) {
-            // No need to render the activity information when there's no completion info and activity dates to show.
-            return '';
-        }
-        $activityinfo = new activity_information($cminfo, $completiondetails, $activitydates);
-        $renderer = $this->page->get_renderer('core', 'course');
-        return $renderer->render($activityinfo);
-    }
-
-    /**
-     * Returns standard navigation between activities in a course.
-     *
-     * @return string the navigation HTML.
-     */
-    public function activity_navigation() {
-        // First we should check if we want to add navigation.
-        $context = $this->page->context;
-        if (($this->page->pagelayout !== 'incourse' && $this->page->pagelayout !== 'frametop')
-            || $context->contextlevel != CONTEXT_MODULE) {
-            return '';
-        }
-
-        // If the activity is in stealth mode, show no links.
-        if ($this->page->cm->is_stealth()) {
-            return '';
-        }
-
-        $course = $this->page->cm->get_course();
-        $courseformat = course_get_format($course);
-
-        // If the theme implements course index and the current course format uses course index and the current
-        // page layout is not 'frametop' (this layout does not support course index), show no links.
-        if ($this->page->theme->usescourseindex && $courseformat->uses_course_index() &&
-                $this->page->pagelayout !== 'frametop') {
-            return '';
-        }
-
-        // Get a list of all the activities in the course.
-        $modules = get_fast_modinfo($course->id)->get_cms();
-
-        // Put the modules into an array in order by the position they are shown in the course.
-        $mods = [];
-        $activitylist = [];
-        foreach ($modules as $module) {
-            // Only add activities the user can access, aren't in stealth mode and have a url (eg. mod_label does not).
-            if (!$module->uservisible || $module->is_stealth() || empty($module->url)) {
-                continue;
-            }
-            $mods[$module->id] = $module;
-
-            // No need to add the current module to the list for the activity dropdown menu.
-            if ($module->id == $this->page->cm->id) {
-                continue;
-            }
-            // Module name.
-            $modname = $module->get_formatted_name();
-            // Display the hidden text if necessary.
-            if (!$module->visible) {
-                $modname .= ' ' . get_string('hiddenwithbrackets');
-            }
-            // Module URL.
-            $linkurl = new moodle_url($module->url, array('forceview' => 1));
-            // Add module URL (as key) and name (as value) to the activity list array.
-            $activitylist[$linkurl->out(false)] = $modname;
-        }
-
-        $nummods = count($mods);
-
-        // If there is only one mod then do nothing.
-        if ($nummods == 1) {
-            return '';
-        }
-
-        // Get an array of just the course module ids used to get the cmid value based on their position in the course.
-        $modids = array_keys($mods);
-
-        // Get the position in the array of the course module we are viewing.
-        $position = array_search($this->page->cm->id, $modids);
-
-        $prevmod = null;
-        $nextmod = null;
-
-        // Check if we have a previous mod to show.
-        if ($position > 0) {
-            $prevmod = $mods[$modids[$position - 1]];
-        }
-
-        // Check if we have a next mod to show.
-        if ($position < ($nummods - 1)) {
-            $nextmod = $mods[$modids[$position + 1]];
-        }
-
-        $activitynav = new \core_course\output\activity_navigation($prevmod, $nextmod, $activitylist);
-        $renderer = $this->page->get_renderer('core', 'course');
-        return $renderer->render($activitynav);
-    }
-
-    /**
-     * The standard tags (typically script tags that are not needed earlier) that
-     * should be output after everything else. Designed to be called in theme layout.php files.
-     *
-     * @return string HTML fragment.
-     */
-    public function standard_end_of_body_html() {
-        global $CFG;
-
-        // This function is normally called from a layout.php file in {@link core_renderer::header()}
-        // but some of the content won't be known until later, so we return a placeholder
-        // for now. This will be replaced with the real content in {@link core_renderer::footer()}.
-        $output = '';
-        if ($this->page->pagelayout !== 'embedded' && !empty($CFG->additionalhtmlfooter)) {
-            $output .= "\n".$CFG->additionalhtmlfooter;
-        }
-        $output .= $this->unique_end_html_token;
-        return $output;
-    }
-
-    /**
-     * The standard HTML that should be output just before the <footer> tag.
-     * Designed to be called in theme layout.php files.
-     *
-     * @return string HTML fragment.
-     */
-    public function standard_after_main_region_html() {
-        global $CFG;
-
-        $hook = new after_standard_main_region_html_generation($this);
-
-        if ($this->page->pagelayout !== 'embedded' && !empty($CFG->additionalhtmlbottomofbody)) {
-            $hook->add_html("\n");
-            $hook->add_html($CFG->additionalhtmlbottomofbody);
-        }
-
-        $hook->process_legacy_callbacks();
-        di::get(hook_manager::class)->dispatch($hook);
-
-        return $hook->get_output();
-    }
-
-    /**
-     * Return the standard string that says whether you are logged in (and switched
-     * roles/logged in as another user).
-     * @param bool $withlinks if false, then don't include any links in the HTML produced.
-     * If not set, the default is the nologinlinks option from the theme config.php file,
-     * and if that is not set, then links are included.
-     * @return string HTML fragment.
-     */
-    public function login_info($withlinks = null) {
-        global $USER, $CFG, $DB, $SESSION;
-
-        if (during_initial_install()) {
-            return '';
-        }
-
-        if (is_null($withlinks)) {
-            $withlinks = empty($this->page->layout_options['nologinlinks']);
-        }
-
-        $course = $this->page->course;
-        if (\core\session\manager::is_loggedinas()) {
-            $realuser = \core\session\manager::get_realuser();
-            $fullname = fullname($realuser);
-            if ($withlinks) {
-                $loginastitle = get_string('loginas');
-                $realuserinfo = " [<a href=\"$CFG->wwwroot/course/loginas.php?id=$course->id&amp;sesskey=".sesskey()."\"";
-                $realuserinfo .= "title =\"".$loginastitle."\">$fullname</a>] ";
-            } else {
-                $realuserinfo = " [$fullname] ";
-            }
-        } else {
-            $realuserinfo = '';
-        }
-
-        $loginpage = $this->is_login_page();
-        $loginurl = get_login_url();
-
-        if (empty($course->id)) {
-            // $course->id is not defined during installation
-            return '';
-        } else if (isloggedin()) {
-            $context = context_course::instance($course->id);
-
-            $fullname = fullname($USER);
-            // Since Moodle 2.0 this link always goes to the public profile page (not the course profile page)
-            if ($withlinks) {
-                $linktitle = get_string('viewprofile');
-                $username = "<a href=\"$CFG->wwwroot/user/profile.php?id=$USER->id\" title=\"$linktitle\">$fullname</a>";
-            } else {
-                $username = $fullname;
-            }
-            if (is_mnet_remote_user($USER) and $idprovider = $DB->get_record('mnet_host', array('id'=>$USER->mnethostid))) {
-                if ($withlinks) {
-                    $username .= " from <a href=\"{$idprovider->wwwroot}\">{$idprovider->name}</a>";
-                } else {
-                    $username .= " from {$idprovider->name}";
-                }
-            }
-            if (isguestuser()) {
-                $loggedinas = $realuserinfo.get_string('loggedinasguest');
-                if (!$loginpage && $withlinks) {
-                    $loggedinas .= " (<a href=\"$loginurl\">".get_string('login').'</a>)';
-                }
-            } else if (is_role_switched($course->id)) { // Has switched roles
-                $rolename = '';
-                if ($role = $DB->get_record('role', array('id'=>$USER->access['rsw'][$context->path]))) {
-                    $rolename = ': '.role_get_name($role, $context);
-                }
-                $loggedinas = get_string('loggedinas', 'moodle', $username).$rolename;
-                if ($withlinks) {
-                    $url = new moodle_url('/course/switchrole.php', array('id'=>$course->id,'sesskey'=>sesskey(), 'switchrole'=>0, 'returnurl'=>$this->page->url->out_as_local_url(false)));
-                    $loggedinas .= ' ('.html_writer::tag('a', get_string('switchrolereturn'), array('href' => $url)).')';
-                }
-            } else {
-                $loggedinas = $realuserinfo.get_string('loggedinas', 'moodle', $username);
-                if ($withlinks) {
-                    $loggedinas .= " (<a href=\"$CFG->wwwroot/login/logout.php?sesskey=".sesskey()."\">".get_string('logout').'</a>)';
-                }
-            }
-        } else {
-            $loggedinas = get_string('loggedinnot', 'moodle');
-            if (!$loginpage && $withlinks) {
-                $loggedinas .= " (<a href=\"$loginurl\">".get_string('login').'</a>)';
-            }
-        }
-
-        $loggedinas = '<div class="logininfo">'.$loggedinas.'</div>';
-
-        if (isset($SESSION->justloggedin)) {
-            unset($SESSION->justloggedin);
-            if (!isguestuser()) {
-                // Include this file only when required.
-                require_once($CFG->dirroot . '/user/lib.php');
-                if (($count = user_count_login_failures($USER)) && !empty($CFG->displayloginfailures)) {
-                    $loggedinas .= '<div class="loginfailures">';
-                    $a = new stdClass();
-                    $a->attempts = $count;
-                    $loggedinas .= get_string('failedloginattempts', '', $a);
-                    if (file_exists("$CFG->dirroot/report/log/index.php") and has_capability('report/log:view', context_system::instance())) {
-                        $loggedinas .= ' ('.html_writer::link(new moodle_url('/report/log/index.php', array('chooselog' => 1,
-                                'id' => 0 , 'modid' => 'site_errors')), get_string('logs')).')';
-                    }
-                    $loggedinas .= '</div>';
-                }
-            }
-        }
-
-        return $loggedinas;
-    }
-
-    /**
-     * Check whether the current page is a login page.
-     *
-     * @since Moodle 2.9
-     * @return bool
-     */
-    protected function is_login_page() {
-        // This is a real bit of a hack, but its a rarety that we need to do something like this.
-        // In fact the login pages should be only these two pages and as exposing this as an option for all pages
-        // could lead to abuse (or at least unneedingly complex code) the hack is the way to go.
-        return in_array(
-            $this->page->url->out_as_local_url(false, array()),
-            array(
-                '/login/index.php',
-                '/login/forgot_password.php',
-            )
-        );
-    }
-
-    /**
-     * Return the 'back' link that normally appears in the footer.
-     *
-     * @return string HTML fragment.
-     */
-    public function home_link() {
-        global $CFG, $SITE;
-
-        if ($this->page->pagetype == 'site-index') {
-            // Special case for site home page - please do not remove
-            return '<div class="sitelink">' .
-                   '<a title="Moodle" class="d-inline-block aalink" href="http://moodle.org/">' .
-                   '<img src="' . $this->image_url('moodlelogo_grayhat') . '" alt="'.get_string('moodlelogo').'" /></a></div>';
-
-        } else if (!empty($CFG->target_release) && $CFG->target_release != $CFG->release) {
-            // Special case for during install/upgrade.
-            return '<div class="sitelink">'.
-                   '<a title="Moodle" href="http://docs.moodle.org/en/Administrator_documentation" onclick="this.target=\'_blank\'">' .
-                   '<img src="' . $this->image_url('moodlelogo_grayhat') . '" alt="'.get_string('moodlelogo').'" /></a></div>';
-
-        } else if ($this->page->course->id == $SITE->id || strpos($this->page->pagetype, 'course-view') === 0) {
-            return '<div class="homelink"><a href="' . $CFG->wwwroot . '/">' .
-                    get_string('home') . '</a></div>';
-
-        } else {
-            return '<div class="homelink"><a href="' . $CFG->wwwroot . '/course/view.php?id=' . $this->page->course->id . '">' .
-                    format_string($this->page->course->shortname, true, array('context' => $this->page->context)) . '</a></div>';
-        }
-    }
-
-    /**
-     * Redirects the user by any means possible given the current state
-     *
-     * This function should not be called directly, it should always be called using
-     * the redirect function in lib/weblib.php
-     *
-     * The redirect function should really only be called before page output has started
-     * however it will allow itself to be called during the state STATE_IN_BODY
-     *
-     * @param string $encodedurl The URL to send to encoded if required
-     * @param string $message The message to display to the user if any
-     * @param int $delay The delay before redirecting a user, if $message has been
-     *         set this is a requirement and defaults to 3, set to 0 no delay
-     * @param boolean $debugdisableredirect this redirect has been disabled for
-     *         debugging purposes. Display a message that explains, and don't
-     *         trigger the redirect.
-     * @param string $messagetype The type of notification to show the message in.
-     *         See constants on \core\output\notification.
-     * @return string The HTML to display to the user before dying, may contain
-     *         meta refresh, javascript refresh, and may have set header redirects
-     */
-    public function redirect_message($encodedurl, $message, $delay, $debugdisableredirect,
-                                     $messagetype = \core\output\notification::NOTIFY_INFO) {
-        global $CFG;
-        $url = str_replace('&amp;', '&', $encodedurl);
-
-        switch ($this->page->state) {
-            case moodle_page::STATE_BEFORE_HEADER :
-                // No output yet it is safe to delivery the full arsenal of redirect methods
-                if (!$debugdisableredirect) {
-                    // Don't use exactly the same time here, it can cause problems when both redirects fire at the same time.
-                    $this->metarefreshtag = '<meta http-equiv="refresh" content="'. $delay .'; url='. $encodedurl .'" />'."\n";
-                    $this->page->requires->js_function_call('document.location.replace', array($url), false, ($delay + 3));
-                }
-                $output = $this->header();
-                break;
-            case moodle_page::STATE_PRINTING_HEADER :
-                // We should hopefully never get here
-                throw new coding_exception('You cannot redirect while printing the page header');
-                break;
-            case moodle_page::STATE_IN_BODY :
-                // We really shouldn't be here but we can deal with this
-                debugging("You should really redirect before you start page output");
-                if (!$debugdisableredirect) {
-                    $this->page->requires->js_function_call('document.location.replace', array($url), false, $delay);
-                }
-                $output = $this->opencontainers->pop_all_but_last();
-                break;
-            case moodle_page::STATE_DONE :
-                // Too late to be calling redirect now
-                throw new coding_exception('You cannot redirect after the entire page has been generated');
-                break;
-        }
-        $output .= $this->notification($message, $messagetype);
-        $output .= '<div class="continuebutton">(<a href="'. $encodedurl .'">'. get_string('continue') .'</a>)</div>';
-        if ($debugdisableredirect) {
-            $output .= '<p><strong>'.get_string('erroroutput', 'error').'</strong></p>';
-        }
-        $output .= $this->footer();
-        return $output;
-    }
-
-    /**
-     * Start output by sending the HTTP headers, and printing the HTML <head>
-     * and the start of the <body>.
-     *
-     * To control what is printed, you should set properties on $PAGE.
-     *
-     * @return string HTML that you must output this, preferably immediately.
-     */
-    public function header() {
-        global $USER, $CFG, $SESSION;
-
-        $hook = new before_http_headers($this);
-        $hook->process_legacy_callbacks();
-        di::get(hook_manager::class)->dispatch($hook);
-
-        if (\core\session\manager::is_loggedinas()) {
-            $this->page->add_body_class('userloggedinas');
-        }
-
-        if (isset($SESSION->justloggedin) && !empty($CFG->displayloginfailures)) {
-            require_once($CFG->dirroot . '/user/lib.php');
-            // Set second parameter to false as we do not want reset the counter, the same message appears on footer.
-            if ($count = user_count_login_failures($USER, false)) {
-                $this->page->add_body_class('loginfailures');
-            }
-        }
-
-        // If the user is logged in, and we're not in initial install,
-        // check to see if the user is role-switched and add the appropriate
-        // CSS class to the body element.
-        if (!during_initial_install() && isloggedin() && is_role_switched($this->page->course->id)) {
-            $this->page->add_body_class('userswitchedrole');
-        }
-
-        // Give themes a chance to init/alter the page object.
-        $this->page->theme->init_page($this->page);
-
-        $this->page->set_state(moodle_page::STATE_PRINTING_HEADER);
-
-        // Find the appropriate page layout file, based on $this->page->pagelayout.
-        $layoutfile = $this->page->theme->layout_file($this->page->pagelayout);
-        // Render the layout using the layout file.
-        $rendered = $this->render_page_layout($layoutfile);
-
-        // Slice the rendered output into header and footer.
-        $cutpos = strpos($rendered, $this->unique_main_content_token);
-        if ($cutpos === false) {
-            $cutpos = strpos($rendered, self::MAIN_CONTENT_TOKEN);
-            $token = self::MAIN_CONTENT_TOKEN;
-        } else {
-            $token = $this->unique_main_content_token;
-        }
-
-        if ($cutpos === false) {
-            throw new coding_exception('page layout file ' . $layoutfile . ' does not contain the main content placeholder, please include "<?php echo $OUTPUT->main_content() ?>" in theme layout file.');
-        }
-
-        $header = substr($rendered, 0, $cutpos);
-        $footer = substr($rendered, $cutpos + strlen($token));
-
-        if (empty($this->contenttype)) {
-            debugging('The page layout file did not call $OUTPUT->doctype()');
-            $header = $this->doctype() . $header;
-        }
-
-        // If this theme version is below 2.4 release and this is a course view page
-        if ((!isset($this->page->theme->settings->version) || $this->page->theme->settings->version < 2012101500) &&
-                $this->page->pagelayout === 'course' && $this->page->url->compare(new moodle_url('/course/view.php'), URL_MATCH_BASE)) {
-            // check if course content header/footer have not been output during render of theme layout
-            $coursecontentheader = $this->course_content_header(true);
-            $coursecontentfooter = $this->course_content_footer(true);
-            if (!empty($coursecontentheader)) {
-                // display debug message and add header and footer right above and below main content
-                // Please note that course header and footer (to be displayed above and below the whole page)
-                // are not displayed in this case at all.
-                // Besides the content header and footer are not displayed on any other course page
-                debugging('The current theme is not optimised for 2.4, the course-specific header and footer defined in course format will not be output', DEBUG_DEVELOPER);
-                $header .= $coursecontentheader;
-                $footer = $coursecontentfooter. $footer;
-            }
-        }
-
-        send_headers($this->contenttype, $this->page->cacheable);
-
-        $this->opencontainers->push('header/footer', $footer);
-        $this->page->set_state(moodle_page::STATE_IN_BODY);
-
-        // If an activity record has been set, activity_header will handle this.
-        if (!$this->page->cm || !empty($this->page->layout_options['noactivityheader'])) {
-            $header .= $this->skip_link_target('maincontent');
-        }
-        return $header;
-    }
-
-    /**
-     * Renders and outputs the page layout file.
-     *
-     * This is done by preparing the normal globals available to a script, and
-     * then including the layout file provided by the current theme for the
-     * requested layout.
-     *
-     * @param string $layoutfile The name of the layout file
-     * @return string HTML code
-     */
-    protected function render_page_layout($layoutfile) {
-        global $CFG, $SITE, $USER;
-        // The next lines are a bit tricky. The point is, here we are in a method
-        // of a renderer class, and this object may, or may not, be the same as
-        // the global $OUTPUT object. When rendering the page layout file, we want to use
-        // this object. However, people writing Moodle code expect the current
-        // renderer to be called $OUTPUT, not $this, so define a variable called
-        // $OUTPUT pointing at $this. The same comment applies to $PAGE and $COURSE.
-        $OUTPUT = $this;
-        $PAGE = $this->page;
-        $COURSE = $this->page->course;
-
-        ob_start();
-        include($layoutfile);
-        $rendered = ob_get_contents();
-        ob_end_clean();
-        return $rendered;
-    }
-
-    /**
-     * Outputs the page's footer
-     *
-     * @return string HTML fragment
-     */
-    public function footer() {
-        global $CFG, $DB, $PERF;
-
-        $hook = new before_footer_html_generation($this);
-        $hook->process_legacy_callbacks();
-        di::get(hook_manager::class)->dispatch($hook);
-        $hook->add_html($this->container_end_all(true));
-        $output = $hook->get_output();
-
-        $footer = $this->opencontainers->pop('header/footer');
-
-        if (debugging() and $DB and $DB->is_transaction_started()) {
-            // TODO: MDL-20625 print warning - transaction will be rolled back
-        }
-
-        // Provide some performance info if required
-        $performanceinfo = '';
-        if (MDL_PERF || (!empty($CFG->perfdebug) && $CFG->perfdebug > 7)) {
-            if (MDL_PERFTOFOOT || debugging() || (!empty($CFG->perfdebug) && $CFG->perfdebug > 7)) {
-                if (NO_OUTPUT_BUFFERING) {
-                    // If the output buffer was off then we render a placeholder and stream the
-                    // performance debugging into it at the very end in the shutdown handler.
-                    $PERF->perfdebugdeferred = true;
-                    $performanceinfo .= html_writer::tag('div',
-                        get_string('perfdebugdeferred', 'admin'),
-                        [
-                            'id' => 'perfdebugfooter',
-                            'style' => 'min-height: 30em',
-                        ]);
-                } else {
-                    $perf = get_performance_info();
-                    $performanceinfo = $perf['html'];
-                }
-            }
-        }
-
-        // We always want performance data when running a performance test, even if the user is redirected to another page.
-        if (MDL_PERF_TEST && strpos($footer, $this->unique_performance_info_token) === false) {
-            $footer = $this->unique_performance_info_token . $footer;
-        }
-        $footer = str_replace($this->unique_performance_info_token, $performanceinfo, $footer);
-
-        // Only show notifications when the current page has a context id.
-        if (!empty($this->page->context->id)) {
-            $this->page->requires->js_call_amd('core/notification', 'init', array(
-                $this->page->context->id,
-                \core\notification::fetch_as_array($this)
-            ));
-        }
-        $footer = str_replace($this->unique_end_html_token, $this->page->requires->get_end_code(), $footer);
-
-        $this->page->set_state(moodle_page::STATE_DONE);
-
-        // Here we remove the closing body and html tags and store them to be added back
-        // in the shutdown handler so we can have valid html with streaming script tags
-        // which are rendered after the visible footer.
-        $tags = '';
-        preg_match('#\<\/body>#i', $footer, $matches);
-        $tags .= $matches[0];
-        $footer = str_replace($matches[0], '', $footer);
-
-        preg_match('#\<\/html>#i', $footer, $matches);
-        $tags .= $matches[0];
-        $footer = str_replace($matches[0], '', $footer);
-
-        $CFG->closingtags = $tags;
-
-        return $output . $footer;
-    }
-
-    /**
-     * Close all but the last open container. This is useful in places like error
-     * handling, where you want to close all the open containers (apart from <body>)
-     * before outputting the error message.
-     *
-     * @param bool $shouldbenone assert that the stack should be empty now - causes a
-     *      developer debug warning if it isn't.
-     * @return string the HTML required to close any open containers inside <body>.
-     */
-    public function container_end_all($shouldbenone = false) {
-        return $this->opencontainers->pop_all_but_last($shouldbenone);
-    }
-
-    /**
-     * Returns course-specific information to be output immediately above content on any course page
-     * (for the current course)
-     *
-     * @param bool $onlyifnotcalledbefore output content only if it has not been output before
-     * @return string
-     */
-    public function course_content_header($onlyifnotcalledbefore = false) {
-        global $CFG;
-        static $functioncalled = false;
-        if ($functioncalled && $onlyifnotcalledbefore) {
-            // we have already output the content header
-            return '';
-        }
-
-        // Output any session notification.
-        $notifications = \core\notification::fetch();
-
-        $bodynotifications = '';
-        foreach ($notifications as $notification) {
-            $bodynotifications .= $this->render_from_template(
-                    $notification->get_template_name(),
-                    $notification->export_for_template($this)
-                );
-        }
-
-        $output = html_writer::span($bodynotifications, 'notifications', array('id' => 'user-notifications'));
-
-        if ($this->page->course->id == SITEID) {
-            // return immediately and do not include /course/lib.php if not necessary
-            return $output;
-        }
-
-        require_once($CFG->dirroot.'/course/lib.php');
-        $functioncalled = true;
-        $courseformat = course_get_format($this->page->course);
-        if (($obj = $courseformat->course_content_header()) !== null) {
-            $output .= html_writer::div($courseformat->get_renderer($this->page)->render($obj), 'course-content-header');
-        }
-        return $output;
-    }
-
-    /**
-     * Returns course-specific information to be output immediately below content on any course page
-     * (for the current course)
-     *
-     * @param bool $onlyifnotcalledbefore output content only if it has not been output before
-     * @return string
-     */
-    public function course_content_footer($onlyifnotcalledbefore = false) {
-        global $CFG;
-        if ($this->page->course->id == SITEID) {
-            // return immediately and do not include /course/lib.php if not necessary
-            return '';
-        }
-        static $functioncalled = false;
-        if ($functioncalled && $onlyifnotcalledbefore) {
-            // we have already output the content footer
-            return '';
-        }
-        $functioncalled = true;
-        require_once($CFG->dirroot.'/course/lib.php');
-        $courseformat = course_get_format($this->page->course);
-        if (($obj = $courseformat->course_content_footer()) !== null) {
-            return html_writer::div($courseformat->get_renderer($this->page)->render($obj), 'course-content-footer');
-        }
-        return '';
-    }
-
-    /**
-     * Returns course-specific information to be output on any course page in the header area
-     * (for the current course)
-     *
-     * @return string
-     */
-    public function course_header() {
-        global $CFG;
-        if ($this->page->course->id == SITEID) {
-            // return immediately and do not include /course/lib.php if not necessary
-            return '';
-        }
-        require_once($CFG->dirroot.'/course/lib.php');
-        $courseformat = course_get_format($this->page->course);
-        if (($obj = $courseformat->course_header()) !== null) {
-            return $courseformat->get_renderer($this->page)->render($obj);
-        }
-        return '';
-    }
-
-    /**
-     * Returns course-specific information to be output on any course page in the footer area
-     * (for the current course)
-     *
-     * @return string
-     */
-    public function course_footer() {
-        global $CFG;
-        if ($this->page->course->id == SITEID) {
-            // return immediately and do not include /course/lib.php if not necessary
-            return '';
-        }
-        require_once($CFG->dirroot.'/course/lib.php');
-        $courseformat = course_get_format($this->page->course);
-        if (($obj = $courseformat->course_footer()) !== null) {
-            return $courseformat->get_renderer($this->page)->render($obj);
-        }
-        return '';
-    }
-
-    /**
-     * Get the course pattern datauri to show on a course card.
-     *
-     * The datauri is an encoded svg that can be passed as a url.
-     * @param int $id Id to use when generating the pattern
-     * @return string datauri
-     */
-    public function get_generated_image_for_id($id) {
-        $color = $this->get_generated_color_for_id($id);
-        $pattern = new \core_geopattern();
-        $pattern->setColor($color);
-        $pattern->patternbyid($id);
-        return $pattern->datauri();
-    }
-
-    /**
-     * Get the course pattern image URL.
-     *
-     * @param context_course $context course context object
-     * @return string URL of the course pattern image in SVG format
-     */
-    public function get_generated_url_for_course(context_course $context): string {
-        return moodle_url::make_pluginfile_url($context->id, 'course', 'generated', null, '/', 'course.svg')->out();
-    }
-
-    /**
-     * Get the course pattern in SVG format to show on a course card.
-     *
-     * @param int $id id to use when generating the pattern
-     * @return string SVG file contents
-     */
-    public function get_generated_svg_for_id(int $id): string {
-        $color = $this->get_generated_color_for_id($id);
-        $pattern = new \core_geopattern();
-        $pattern->setColor($color);
-        $pattern->patternbyid($id);
-        return $pattern->toSVG();
-    }
-
-    /**
-     * Get the course color to show on a course card.
-     *
-     * @param int $id Id to use when generating the color.
-     * @return string hex color code.
-     */
-    public function get_generated_color_for_id($id) {
-        $colornumbers = range(1, 10);
-        $basecolors = [];
-        foreach ($colornumbers as $number) {
-            $basecolors[] = get_config('core_admin', 'coursecolor' . $number);
-        }
-
-        $color = $basecolors[$id % 10];
-        return $color;
-    }
-
-    /**
-     * Returns lang menu or '', this method also checks forcing of languages in courses.
-     *
-     * This function calls {@link core_renderer::render_single_select()} to actually display the language menu.
-     *
-     * @return string The lang menu HTML or empty string
-     */
-    public function lang_menu() {
-        $languagemenu = new \core\output\language_menu($this->page);
-        $data = $languagemenu->export_for_single_select($this);
-        if ($data) {
-            return $this->render_from_template('core/single_select', $data);
-        }
-        return '';
-    }
-
-    /**
-     * Output the row of editing icons for a block, as defined by the controls array.
-     *
-     * @param array $controls an array like {@link block_contents::$controls}.
-     * @param string $blockid The ID given to the block.
-     * @return string HTML fragment.
-     */
-    public function block_controls($actions, $blockid = null) {
-        if (empty($actions)) {
-            return '';
-        }
-        $menu = new action_menu($actions);
-        if ($blockid !== null) {
-            $menu->set_owner_selector('#'.$blockid);
-        }
-        $menu->attributes['class'] .= ' block-control-actions commands';
-        return $this->render($menu);
-    }
-
-    /**
-     * Returns the HTML for a basic textarea field.
-     *
-     * @param string $name Name to use for the textarea element
-     * @param string $id The id to use fort he textarea element
-     * @param string $value Initial content to display in the textarea
-     * @param int $rows Number of rows to display
-     * @param int $cols Number of columns to display
-     * @return string the HTML to display
-     */
-    public function print_textarea($name, $id, $value, $rows, $cols) {
-        editors_head_setup();
-        $editor = editors_get_preferred_editor(FORMAT_HTML);
-        $editor->set_text($value);
-        $editor->use_editor($id, []);
-
-        $context = [
-            'id' => $id,
-            'name' => $name,
-            'value' => $value,
-            'rows' => $rows,
-            'cols' => $cols
-        ];
-
-        return $this->render_from_template('core_form/editor_textarea', $context);
-    }
-
-    /**
-     * Renders an action menu component.
-     *
-     * @param action_menu $menu
-     * @return string HTML
-     */
-    public function render_action_menu(action_menu $menu) {
-
-        // We don't want the class icon there!
-        foreach ($menu->get_secondary_actions() as $action) {
-            if ($action instanceof \action_menu_link && $action->has_class('icon')) {
-                $action->attributes['class'] = preg_replace('/(^|\s+)icon(\s+|$)/i', '', $action->attributes['class']);
-            }
-        }
-
-        if ($menu->is_empty()) {
-            return '';
-        }
-        $context = $menu->export_for_template($this);
-
-        return $this->render_from_template('core/action_menu', $context);
-    }
-
-    /**
-     * Renders a full check API result including summary and details
-     *
-     * @param core\check\check $check the check that was run to get details from
-     * @param core\check\result $result the result of a check
-     * @param bool $includedetails if true, details are included as well
-     * @return string rendered html
-     */
-    protected function render_check_full_result(core\check\check $check, core\check\result $result, bool $includedetails): string {
-        // Initially render just badge itself.
-        $renderedresult = $this->render_from_template($result->get_template_name(), $result->export_for_template($this));
-
-        // Add summary.
-        $renderedresult .= ' ' . $result->get_summary();
-
-        // Wrap in notificaiton.
-        $notificationmap = [
-            \core\check\result::NA => \core\output\notification::NOTIFY_INFO,
-            \core\check\result::OK => \core\output\notification::NOTIFY_SUCCESS,
-            \core\check\result::INFO => \core\output\notification::NOTIFY_INFO,
-            \core\check\result::UNKNOWN => \core\output\notification::NOTIFY_WARNING,
-            \core\check\result::WARNING => \core\output\notification::NOTIFY_WARNING,
-            \core\check\result::ERROR => \core\output\notification::NOTIFY_ERROR,
-            \core\check\result::CRITICAL => \core\output\notification::NOTIFY_ERROR,
-        ];
-
-        // Get type, or default to error.
-        $notificationtype = $notificationmap[$result->get_status()] ?? \core\output\notification::NOTIFY_ERROR;
-        $renderedresult = $this->notification($renderedresult, $notificationtype, false);
-
-        // If adding details, add on new line.
-        if ($includedetails) {
-            $renderedresult .= $result->get_details();
-        }
-
-        // Add the action link.
-        $renderedresult .= $this->render_action_link($check->get_action_link());
-
-        return $renderedresult;
-    }
-
-    /**
-     * Renders a full check API result including summary and details
-     *
-     * @param core\check\check $check the check that was run to get details from
-     * @param core\check\result $result the result of a check
-     * @param bool $includedetails if details should be included
-     * @return string HTML fragment
-     */
-    public function check_full_result(core\check\check $check, core\check\result $result, bool $includedetails = false) {
-        return $this->render_check_full_result($check, $result, $includedetails);
-    }
-
-    /**
-     * Renders a Check API result
-     *
-     * @param core\check\result $result
-     * @return string HTML fragment
-     */
-    protected function render_check_result(core\check\result $result) {
-        return $this->render_from_template($result->get_template_name(), $result->export_for_template($this));
-    }
-
-    /**
-     * Renders a Check API result
-     *
-     * @param core\check\result $result
-     * @return string HTML fragment
-     */
-    public function check_result(core\check\result $result) {
-        return $this->render_check_result($result);
-    }
-
-    /**
-     * Renders an action_menu_link item.
-     *
-     * @param action_menu_link $action
-     * @return string HTML fragment
-     */
-    protected function render_action_menu_link(action_menu_link $action) {
-        return $this->render_from_template('core/action_menu_link', $action->export_for_template($this));
-    }
-
-    /**
-     * Renders a primary action_menu_filler item.
-     *
-     * @param action_menu_filler $action
-     * @return string HTML fragment
-     */
-    protected function render_action_menu_filler(action_menu_filler $action) {
-        return html_writer::span('&nbsp;', 'filler');
-    }
-
-    /**
-     * Renders a primary action_menu_link item.
-     *
-     * @param action_menu_link_primary $action
-     * @return string HTML fragment
-     */
-    protected function render_action_menu_link_primary(action_menu_link_primary $action) {
-        return $this->render_action_menu_link($action);
-    }
-
-    /**
-     * Renders a secondary action_menu_link item.
-     *
-     * @param action_menu_link_secondary $action
-     * @return string HTML fragment
-     */
-    protected function render_action_menu_link_secondary(action_menu_link_secondary $action) {
-        return $this->render_action_menu_link($action);
-    }
-
-    /**
-     * Prints a nice side block with an optional header.
-     *
-     * @param block_contents $bc HTML for the content
-     * @param string $region the region the block is appearing in.
-     * @return string the HTML to be output.
-     */
-    public function block(block_contents $bc, $region) {
-        $bc = clone($bc); // Avoid messing up the object passed in.
-        if (empty($bc->blockinstanceid) || !strip_tags($bc->title)) {
-            $bc->collapsible = block_contents::NOT_HIDEABLE;
-        }
-
-        $id = !empty($bc->attributes['id']) ? $bc->attributes['id'] : uniqid('block-');
-        $context = new stdClass();
-        $context->skipid = $bc->skipid;
-        $context->blockinstanceid = $bc->blockinstanceid ?: uniqid('fakeid-');
-        $context->dockable = $bc->dockable;
-        $context->id = $id;
-        $context->hidden = $bc->collapsible == block_contents::HIDDEN;
-        $context->skiptitle = strip_tags($bc->title);
-        $context->showskiplink = !empty($context->skiptitle);
-        $context->arialabel = $bc->arialabel;
-        $context->ariarole = !empty($bc->attributes['role']) ? $bc->attributes['role'] : 'complementary';
-        $context->class = $bc->attributes['class'];
-        $context->type = $bc->attributes['data-block'];
-        $context->title = $bc->title;
-        $context->content = $bc->content;
-        $context->annotation = $bc->annotation;
-        $context->footer = $bc->footer;
-        $context->hascontrols = !empty($bc->controls);
-        if ($context->hascontrols) {
-            $context->controls = $this->block_controls($bc->controls, $id);
-        }
-
-        return $this->render_from_template('core/block', $context);
-    }
-
-    /**
-     * Render the contents of a block_list.
-     *
-     * @param array $icons the icon for each item.
-     * @param array $items the content of each item.
-     * @return string HTML
-     */
-    public function list_block_contents($icons, $items) {
-        $row = 0;
-        $lis = array();
-        foreach ($items as $key => $string) {
-            $item = html_writer::start_tag('li', array('class' => 'r' . $row));
-            if (!empty($icons[$key])) { //test if the content has an assigned icon
-                $item .= html_writer::tag('div', $icons[$key], array('class' => 'icon column c0'));
-            }
-            $item .= html_writer::tag('div', $string, array('class' => 'column c1'));
-            $item .= html_writer::end_tag('li');
-            $lis[] = $item;
-            $row = 1 - $row; // Flip even/odd.
-        }
-        return html_writer::tag('ul', implode("\n", $lis), array('class' => 'unlist'));
-    }
-
-    /**
-     * Output all the blocks in a particular region.
-     *
-     * @param string $region the name of a region on this page.
-     * @param boolean $fakeblocksonly Output fake block only.
-     * @return string the HTML to be output.
-     */
-    public function blocks_for_region($region, $fakeblocksonly = false) {
-        $blockcontents = $this->page->blocks->get_content_for_region($region, $this);
-        $lastblock = null;
-        $zones = array();
-        foreach ($blockcontents as $bc) {
-            if ($bc instanceof block_contents) {
-                $zones[] = $bc->title;
-            }
-        }
-        $output = '';
-
-        foreach ($blockcontents as $bc) {
-            if ($bc instanceof block_contents) {
-                if ($fakeblocksonly && !$bc->is_fake()) {
-                    // Skip rendering real blocks if we only want to show fake blocks.
-                    continue;
-                }
-                $output .= $this->block($bc, $region);
-                $lastblock = $bc->title;
-            } else if ($bc instanceof block_move_target) {
-                if (!$fakeblocksonly) {
-                    $output .= $this->block_move_target($bc, $zones, $lastblock, $region);
-                }
-            } else {
-                throw new coding_exception('Unexpected type of thing (' . get_class($bc) . ') found in list of block contents.');
-            }
-        }
-        return $output;
-    }
-
-    /**
-     * Output a place where the block that is currently being moved can be dropped.
-     *
-     * @param block_move_target $target with the necessary details.
-     * @param array $zones array of areas where the block can be moved to
-     * @param string $previous the block located before the area currently being rendered.
-     * @param string $region the name of the region
-     * @return string the HTML to be output.
-     */
-    public function block_move_target($target, $zones, $previous, $region) {
-        if ($previous == null) {
-            if (empty($zones)) {
-                // There are no zones, probably because there are no blocks.
-                $regions = $this->page->theme->get_all_block_regions();
-                $position = get_string('moveblockinregion', 'block', $regions[$region]);
-            } else {
-                $position = get_string('moveblockbefore', 'block', $zones[0]);
-            }
-        } else {
-            $position = get_string('moveblockafter', 'block', $previous);
-        }
-        return html_writer::tag('a', html_writer::tag('span', $position, array('class' => 'accesshide')), array('href' => $target->url, 'class' => 'blockmovetarget'));
-    }
-
-    /**
-     * Renders a special html link with attached action
-     *
-     * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_action_link()} instead.
-     *
-     * @param string|moodle_url $url
-     * @param string $text HTML fragment
-     * @param component_action $action
-     * @param array $attributes associative array of html link attributes + disabled
-     * @param pix_icon optional pix icon to render with the link
-     * @return string HTML fragment
-     */
-    public function action_link($url, $text, component_action $action = null, array $attributes = null, $icon = null) {
-        if (!($url instanceof moodle_url)) {
-            $url = new moodle_url($url);
-        }
-        $link = new action_link($url, $text, $action, $attributes, $icon);
-
-        return $this->render($link);
-    }
-
-    /**
-     * Renders an action_link object.
-     *
-     * The provided link is renderer and the HTML returned. At the same time the
-     * associated actions are setup in JS by {@link core_renderer::add_action_handler()}
-     *
-     * @param action_link $link
-     * @return string HTML fragment
-     */
-    protected function render_action_link(action_link $link) {
-        return $this->render_from_template('core/action_link', $link->export_for_template($this));
-    }
-
-    /**
-     * Renders an action_icon.
-     *
-     * This function uses the {@link core_renderer::action_link()} method for the
-     * most part. What it does different is prepare the icon as HTML and use it
-     * as the link text.
-     *
-     * Theme developers: If you want to change how action links and/or icons are rendered,
-     * consider overriding function {@link core_renderer::render_action_link()} and
-     * {@link core_renderer::render_pix_icon()}.
-     *
-     * @param string|moodle_url $url A string URL or moodel_url
-     * @param pix_icon $pixicon
-     * @param component_action $action
-     * @param array $attributes associative array of html link attributes + disabled
-     * @param bool $linktext show title next to image in link
-     * @return string HTML fragment
-     */
-    public function action_icon($url, pix_icon $pixicon, component_action $action = null, array $attributes = null, $linktext=false) {
-        if (!($url instanceof moodle_url)) {
-            $url = new moodle_url($url);
-        }
-        $attributes = (array)$attributes;
-
-        if (empty($attributes['class'])) {
-            // let ppl override the class via $options
-            $attributes['class'] = 'action-icon';
-        }
-
-        if ($linktext) {
-            $text = $pixicon->attributes['alt'];
-            // Set the icon as a decorative image if we're displaying the action text.
-            // Otherwise, the action name will be read twice by assistive technologies.
-            $pixicon->attributes['alt'] = '';
-            $pixicon->attributes['title'] = '';
-            $pixicon->attributes['aria-hidden'] = 'true';
-        } else {
-            $text = '';
-        }
-
-        $icon = $this->render($pixicon);
-
-        return $this->action_link($url, $text.$icon, $action, $attributes);
-    }
-
-   /**
-    * Print a message along with button choices for Continue/Cancel
-    *
-    * If a string or moodle_url is given instead of a single_button, method defaults to post.
-    *
-    * @param string $message The question to ask the user
-    * @param single_button|moodle_url|string $continue The single_button component representing the Continue answer. Can also be a moodle_url or string URL
-    * @param single_button|moodle_url|string $cancel The single_button component representing the Cancel answer. Can also be a moodle_url or string URL
-    * @param array $displayoptions optional extra display options
-    * @return string HTML fragment
-    */
-    public function confirm($message, $continue, $cancel, array $displayoptions = []) {
-
-        // Check existing displayoptions.
-        $displayoptions['confirmtitle'] = $displayoptions['confirmtitle'] ?? get_string('confirm');
-        $displayoptions['continuestr'] = $displayoptions['continuestr'] ?? get_string('continue');
-        $displayoptions['cancelstr'] = $displayoptions['cancelstr'] ?? get_string('cancel');
-
-        if ($continue instanceof single_button) {
-            // Continue button should be primary if set to secondary type as it is the fefault.
-            if ($continue->type === single_button::BUTTON_SECONDARY) {
-                $continue->type = single_button::BUTTON_PRIMARY;
-            }
-        } else if (is_string($continue)) {
-            $continue = new single_button(new moodle_url($continue), $displayoptions['continuestr'], 'post',
-                $displayoptions['type'] ?? single_button::BUTTON_PRIMARY);
-        } else if ($continue instanceof moodle_url) {
-            $continue = new single_button($continue, $displayoptions['continuestr'], 'post',
-                $displayoptions['type'] ?? single_button::BUTTON_PRIMARY);
-        } else {
-            throw new coding_exception('The continue param to $OUTPUT->confirm() must be either a URL (string/moodle_url) or a single_button instance.');
-        }
-
-        if ($cancel instanceof single_button) {
-            // ok
-        } else if (is_string($cancel)) {
-            $cancel = new single_button(new moodle_url($cancel), $displayoptions['cancelstr'], 'get');
-        } else if ($cancel instanceof moodle_url) {
-            $cancel = new single_button($cancel, $displayoptions['cancelstr'], 'get');
-        } else {
-            throw new coding_exception('The cancel param to $OUTPUT->confirm() must be either a URL (string/moodle_url) or a single_button instance.');
-        }
-
-        $attributes = [
-            'role'=>'alertdialog',
-            'aria-labelledby'=>'modal-header',
-            'aria-describedby'=>'modal-body',
-            'aria-modal'=>'true'
-        ];
-
-        $output = $this->box_start('generalbox modal modal-dialog modal-in-page show', 'notice', $attributes);
-        $output .= $this->box_start('modal-content', 'modal-content');
-        $output .= $this->box_start('modal-header px-3', 'modal-header');
-        $output .= html_writer::tag('h4', $displayoptions['confirmtitle']);
-        $output .= $this->box_end();
-        $attributes = [
-            'role'=>'alert',
-            'data-aria-autofocus'=>'true'
-        ];
-        $output .= $this->box_start('modal-body', 'modal-body', $attributes);
-        $output .= html_writer::tag('p', $message);
-        $output .= $this->box_end();
-        $output .= $this->box_start('modal-footer', 'modal-footer');
-        $output .= html_writer::tag('div', $this->render($cancel) . $this->render($continue), ['class' => 'buttons']);
-        $output .= $this->box_end();
-        $output .= $this->box_end();
-        $output .= $this->box_end();
-        return $output;
-    }
-
-    /**
-     * Returns a form with a single button.
-     *
-     * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_single_button()} instead.
-     *
-     * @param string|moodle_url $url
-     * @param string $label button text
-     * @param string $method get or post submit method
-     * @param array $options associative array {disabled, title, etc.}
-     * @return string HTML fragment
-     */
-    public function single_button($url, $label, $method='post', array $options=null) {
-        if (!($url instanceof moodle_url)) {
-            $url = new moodle_url($url);
-        }
-        $button = new single_button($url, $label, $method);
-
-        foreach ((array)$options as $key=>$value) {
-            if (property_exists($button, $key)) {
-                $button->$key = $value;
-            } else {
-                $button->set_attribute($key, $value);
-            }
-        }
-
-        return $this->render($button);
-    }
-
-    /**
-     * Renders a single button widget.
-     *
-     * This will return HTML to display a form containing a single button.
-     *
-     * @param single_button $button
-     * @return string HTML fragment
-     */
-    protected function render_single_button(single_button $button) {
-        return $this->render_from_template('core/single_button', $button->export_for_template($this));
-    }
-
-    /**
-     * Returns a form with a single select widget.
-     *
-     * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_single_select()} instead.
-     *
-     * @param moodle_url $url form action target, includes hidden fields
-     * @param string $name name of selection field - the changing parameter in url
-     * @param array $options list of options
-     * @param string $selected selected element
-     * @param array $nothing
-     * @param string $formid
-     * @param array $attributes other attributes for the single select
-     * @return string HTML fragment
-     */
-    public function single_select($url, $name, array $options, $selected = '',
-                                $nothing = array('' => 'choosedots'), $formid = null, $attributes = array()) {
-        if (!($url instanceof moodle_url)) {
-            $url = new moodle_url($url);
-        }
-        $select = new single_select($url, $name, $options, $selected, $nothing, $formid);
-
-        if (array_key_exists('label', $attributes)) {
-            $select->set_label($attributes['label']);
-            unset($attributes['label']);
-        }
-        $select->attributes = $attributes;
-
-        return $this->render($select);
-    }
-
-    /**
-     * Returns a dataformat selection and download form
-     *
-     * @param string $label A text label
-     * @param moodle_url|string $base The download page url
-     * @param string $name The query param which will hold the type of the download
-     * @param array $params Extra params sent to the download page
-     * @return string HTML fragment
-     */
-    public function download_dataformat_selector($label, $base, $name = 'dataformat', $params = array()) {
-
-        $formats = core_plugin_manager::instance()->get_plugins_of_type('dataformat');
-        $options = array();
-        foreach ($formats as $format) {
-            if ($format->is_enabled()) {
-                $options[] = array(
-                    'value' => $format->name,
-                    'label' => get_string('dataformat', $format->component),
-                );
-            }
-        }
-        $hiddenparams = array();
-        foreach ($params as $key => $value) {
-            $hiddenparams[] = array(
-                'name' => $key,
-                'value' => $value,
-            );
-        }
-        $data = array(
-            'label' => $label,
-            'base' => $base,
-            'name' => $name,
-            'params' => $hiddenparams,
-            'options' => $options,
-            'sesskey' => sesskey(),
-            'submit' => get_string('download'),
-        );
-
-        return $this->render_from_template('core/dataformat_selector', $data);
-    }
-
-
-    /**
-     * Internal implementation of single_select rendering
-     *
-     * @param single_select $select
-     * @return string HTML fragment
-     */
-    protected function render_single_select(single_select $select) {
-        return $this->render_from_template('core/single_select', $select->export_for_template($this));
-    }
-
-    /**
-     * Returns a form with a url select widget.
-     *
-     * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_url_select()} instead.
-     *
-     * @param array $urls list of urls - array('/course/view.php?id=1'=>'Frontpage', ....)
-     * @param string $selected selected element
-     * @param array $nothing
-     * @param string $formid
-     * @return string HTML fragment
-     */
-    public function url_select(array $urls, $selected, $nothing = array('' => 'choosedots'), $formid = null) {
-        $select = new url_select($urls, $selected, $nothing, $formid);
-        return $this->render($select);
-    }
-
-    /**
-     * Internal implementation of url_select rendering
-     *
-     * @param url_select $select
-     * @return string HTML fragment
-     */
-    protected function render_url_select(url_select $select) {
-        return $this->render_from_template('core/url_select', $select->export_for_template($this));
-    }
-
-    /**
-     * Returns a string containing a link to the user documentation.
-     * Also contains an icon by default. Shown to teachers and admin only.
-     *
-     * @param string $path The page link after doc root and language, no leading slash.
-     * @param string $text The text to be displayed for the link
-     * @param boolean $forcepopup Whether to force a popup regardless of the value of $CFG->doctonewwindow
-     * @param array $attributes htm attributes
-     * @return string
-     */
-    public function doc_link($path, $text = '', $forcepopup = false, array $attributes = []) {
-        global $CFG;
-
-        $icon = $this->pix_icon('book', '', 'moodle', array('class' => 'iconhelp icon-pre'));
-
-        $attributes['href'] = new moodle_url(get_docs_url($path));
-        $newwindowicon = '';
-        if (!empty($CFG->doctonewwindow) || $forcepopup) {
-            $attributes['target'] = '_blank';
-            $newwindowicon = $this->pix_icon('i/externallink', get_string('opensinnewwindow'), 'moodle',
-            ['class' => 'fa fa-externallink fa-fw']);
-        }
-
-        return html_writer::tag('a', $icon . $text . $newwindowicon, $attributes);
-    }
-
-    /**
-     * Return HTML for an image_icon.
-     *
-     * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_image_icon()} instead.
-     *
-     * @param string $pix short pix name
-     * @param string $alt mandatory alt attribute
-     * @param string $component standard compoennt name like 'moodle', 'mod_forum', etc.
-     * @param array $attributes htm attributes
-     * @return string HTML fragment
-     */
-    public function image_icon($pix, $alt, $component='moodle', array $attributes = null) {
-        $icon = new image_icon($pix, $alt, $component, $attributes);
-        return $this->render($icon);
-    }
-
-    /**
-     * Renders a pix_icon widget and returns the HTML to display it.
-     *
-     * @param image_icon $icon
-     * @return string HTML fragment
-     */
-    protected function render_image_icon(image_icon $icon) {
-        $system = \core\output\icon_system::instance(\core\output\icon_system::STANDARD);
-        return $system->render_pix_icon($this, $icon);
-    }
-
-    /**
-     * Return HTML for a pix_icon.
-     *
-     * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_pix_icon()} instead.
-     *
-     * @param string $pix short pix name
-     * @param string $alt mandatory alt attribute
-     * @param string $component standard compoennt name like 'moodle', 'mod_forum', etc.
-     * @param array $attributes htm lattributes
-     * @return string HTML fragment
-     */
-    public function pix_icon($pix, $alt, $component='moodle', array $attributes = null) {
-        $icon = new pix_icon($pix, $alt, $component, $attributes);
-        return $this->render($icon);
-    }
-
-    /**
-     * Renders a pix_icon widget and returns the HTML to display it.
-     *
-     * @param pix_icon $icon
-     * @return string HTML fragment
-     */
-    protected function render_pix_icon(pix_icon $icon) {
-        $system = \core\output\icon_system::instance();
-        return $system->render_pix_icon($this, $icon);
-    }
-
-    /**
-     * Return HTML to display an emoticon icon.
-     *
-     * @param pix_emoticon $emoticon
-     * @return string HTML fragment
-     */
-    protected function render_pix_emoticon(pix_emoticon $emoticon) {
-        $system = \core\output\icon_system::instance(\core\output\icon_system::STANDARD);
-        return $system->render_pix_icon($this, $emoticon);
-    }
-
-    /**
-     * Produces the html that represents this rating in the UI
-     *
-     * @param rating $rating the page object on which this rating will appear
-     * @return string
-     */
-    function render_rating(rating $rating) {
-        global $CFG, $USER;
-
-        if ($rating->settings->aggregationmethod == RATING_AGGREGATE_NONE) {
-            return null;//ratings are turned off
-        }
-
-        $ratingmanager = new rating_manager();
-        // Initialise the JavaScript so ratings can be done by AJAX.
-        $ratingmanager->initialise_rating_javascript($this->page);
-
-        $strrate = get_string("rate", "rating");
-        $ratinghtml = ''; //the string we'll return
-
-        // permissions check - can they view the aggregate?
-        if ($rating->user_can_view_aggregate()) {
-
-            $aggregatelabel = $ratingmanager->get_aggregate_label($rating->settings->aggregationmethod);
-            $aggregatelabel = html_writer::tag('span', $aggregatelabel, array('class'=>'rating-aggregate-label'));
-            $aggregatestr   = $rating->get_aggregate_string();
-
-            $aggregatehtml  = html_writer::tag('span', $aggregatestr, array('id' => 'ratingaggregate'.$rating->itemid, 'class' => 'ratingaggregate')).' ';
-            if ($rating->count > 0) {
-                $countstr = "({$rating->count})";
-            } else {
-                $countstr = '-';
-            }
-            $aggregatehtml .= html_writer::tag('span', $countstr, array('id'=>"ratingcount{$rating->itemid}", 'class' => 'ratingcount')).' ';
-
-            if ($rating->settings->permissions->viewall && $rating->settings->pluginpermissions->viewall) {
-
-                $nonpopuplink = $rating->get_view_ratings_url();
-                $popuplink = $rating->get_view_ratings_url(true);
-
-                $action = new popup_action('click', $popuplink, 'ratings', array('height' => 400, 'width' => 600));
-                $aggregatehtml = $this->action_link($nonpopuplink, $aggregatehtml, $action);
-            }
-
-            $ratinghtml .= html_writer::tag('span', $aggregatelabel . $aggregatehtml, array('class' => 'rating-aggregate-container'));
-        }
-
-        $formstart = null;
-        // if the item doesn't belong to the current user, the user has permission to rate
-        // and we're within the assessable period
-        if ($rating->user_can_rate()) {
-
-            $rateurl = $rating->get_rate_url();
-            $inputs = $rateurl->params();
-
-            //start the rating form
-            $formattrs = array(
-                'id'     => "postrating{$rating->itemid}",
-                'class'  => 'postratingform',
-                'method' => 'post',
-                'action' => $rateurl->out_omit_querystring()
-            );
-            $formstart  = html_writer::start_tag('form', $formattrs);
-            $formstart .= html_writer::start_tag('div', array('class' => 'ratingform'));
-
-            // add the hidden inputs
-            foreach ($inputs as $name => $value) {
-                $attributes = array('type' => 'hidden', 'class' => 'ratinginput', 'name' => $name, 'value' => $value);
-                $formstart .= html_writer::empty_tag('input', $attributes);
-            }
-
-            if (empty($ratinghtml)) {
-                $ratinghtml .= $strrate.': ';
-            }
-            $ratinghtml = $formstart.$ratinghtml;
-
-            $scalearray = array(RATING_UNSET_RATING => $strrate.'...') + $rating->settings->scale->scaleitems;
-            $scaleattrs = array('class'=>'postratingmenu ratinginput','id'=>'menurating'.$rating->itemid);
-            $ratinghtml .= html_writer::label($rating->rating, 'menurating'.$rating->itemid, false, array('class' => 'accesshide'));
-            $ratinghtml .= html_writer::select($scalearray, 'rating', $rating->rating, false, $scaleattrs);
-
-            //output submit button
-            $ratinghtml .= html_writer::start_tag('span', array('class'=>"ratingsubmit"));
-
-            $attributes = array('type' => 'submit', 'class' => 'postratingmenusubmit', 'id' => 'postratingsubmit'.$rating->itemid, 'value' => s(get_string('rate', 'rating')));
-            $ratinghtml .= html_writer::empty_tag('input', $attributes);
-
-            if (!$rating->settings->scale->isnumeric) {
-                // If a global scale, try to find current course ID from the context
-                if (empty($rating->settings->scale->courseid) and $coursecontext = $rating->context->get_course_context(false)) {
-                    $courseid = $coursecontext->instanceid;
-                } else {
-                    $courseid = $rating->settings->scale->courseid;
-                }
-                $ratinghtml .= $this->help_icon_scale($courseid, $rating->settings->scale);
-            }
-            $ratinghtml .= html_writer::end_tag('span');
-            $ratinghtml .= html_writer::end_tag('div');
-            $ratinghtml .= html_writer::end_tag('form');
-        }
-
-        return $ratinghtml;
-    }
-
-    /**
-     * Centered heading with attached help button (same title text)
-     * and optional icon attached.
-     *
-     * @param string $text A heading text
-     * @param string $helpidentifier The keyword that defines a help page
-     * @param string $component component name
-     * @param string|moodle_url $icon
-     * @param string $iconalt icon alt text
-     * @param int $level The level of importance of the heading. Defaulting to 2
-     * @param string $classnames A space-separated list of CSS classes. Defaulting to null
-     * @return string HTML fragment
-     */
-    public function heading_with_help($text, $helpidentifier, $component = 'moodle', $icon = '', $iconalt = '', $level = 2, $classnames = null) {
-        $image = '';
-        if ($icon) {
-            $image = $this->pix_icon($icon, $iconalt, $component, array('class'=>'icon iconlarge'));
-        }
-
-        $help = '';
-        if ($helpidentifier) {
-            $help = $this->help_icon($helpidentifier, $component);
-        }
-
-        return $this->heading($image.$text.$help, $level, $classnames);
-    }
-
-    /**
-     * Returns HTML to display a help icon.
-     *
-     * @deprecated since Moodle 2.0
-     */
-    public function old_help_icon($helpidentifier, $title, $component = 'moodle', $linktext = '') {
-        throw new coding_exception('old_help_icon() can not be used any more, please see help_icon().');
-    }
-
-    /**
-     * Returns HTML to display a help icon.
-     *
-     * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_help_icon()} instead.
-     *
-     * @param string $identifier The keyword that defines a help page
-     * @param string $component component name
-     * @param string|bool $linktext true means use $title as link text, string means link text value
-     * @param string|object|array|int $a An object, string or number that can be used
-     *      within translation strings
-     * @return string HTML fragment
-     */
-    public function help_icon($identifier, $component = 'moodle', $linktext = '', $a = null) {
-        $icon = new help_icon($identifier, $component, $a);
-        $icon->diag_strings();
-        if ($linktext === true) {
-            $icon->linktext = get_string($icon->identifier, $icon->component, $a);
-        } else if (!empty($linktext)) {
-            $icon->linktext = $linktext;
-        }
-        return $this->render($icon);
-    }
-
-    /**
-     * Implementation of user image rendering.
-     *
-     * @param help_icon $helpicon A help icon instance
-     * @return string HTML fragment
-     */
-    protected function render_help_icon(help_icon $helpicon) {
-        $context = $helpicon->export_for_template($this);
-        return $this->render_from_template('core/help_icon', $context);
-    }
-
-    /**
-     * Returns HTML to display a scale help icon.
-     *
-     * @param int $courseid
-     * @param stdClass $scale instance
-     * @return string HTML fragment
-     */
-    public function help_icon_scale($courseid, stdClass $scale) {
-        global $CFG;
-
-        $title = get_string('helpprefix2', '', $scale->name) .' ('.get_string('newwindow').')';
-
-        $icon = $this->pix_icon('help', get_string('scales'), 'moodle', array('class'=>'iconhelp'));
-
-        $scaleid = abs($scale->id);
-
-        $link = new moodle_url('/course/scales.php', array('id' => $courseid, 'list' => true, 'scaleid' => $scaleid));
-        $action = new popup_action('click', $link, 'ratingscale');
-
-        return html_writer::tag('span', $this->action_link($link, $icon, $action), array('class' => 'helplink'));
-    }
-
-    /**
-     * Creates and returns a spacer image with optional line break.
-     *
-     * @param array $attributes Any HTML attributes to add to the spaced.
-     * @param bool $br Include a BR after the spacer.... DON'T USE THIS. Don't be
-     *     laxy do it with CSS which is a much better solution.
-     * @return string HTML fragment
-     */
-    public function spacer(array $attributes = null, $br = false) {
-        $attributes = (array)$attributes;
-        if (empty($attributes['width'])) {
-            $attributes['width'] = 1;
-        }
-        if (empty($attributes['height'])) {
-            $attributes['height'] = 1;
-        }
-        $attributes['class'] = 'spacer';
-
-        $output = $this->pix_icon('spacer', '', 'moodle', $attributes);
-
-        if (!empty($br)) {
-            $output .= '<br />';
-        }
-
-        return $output;
-    }
-
-    /**
-     * Returns HTML to display the specified user's avatar.
-     *
-     * User avatar may be obtained in two ways:
-     * <pre>
-     * // Option 1: (shortcut for simple cases, preferred way)
-     * // $user has come from the DB and has fields id, picture, imagealt, firstname and lastname
-     * $OUTPUT->user_picture($user, array('popup'=>true));
-     *
-     * // Option 2:
-     * $userpic = new user_picture($user);
-     * // Set properties of $userpic
-     * $userpic->popup = true;
-     * $OUTPUT->render($userpic);
-     * </pre>
-     *
-     * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_user_picture()} instead.
-     *
-     * @param stdClass $user Object with at least fields id, picture, imagealt, firstname, lastname
-     *     If any of these are missing, the database is queried. Avoid this
-     *     if at all possible, particularly for reports. It is very bad for performance.
-     * @param array $options associative array with user picture options, used only if not a user_picture object,
-     *     options are:
-     *     - courseid=$this->page->course->id (course id of user profile in link)
-     *     - size=35 (size of image)
-     *     - link=true (make image clickable - the link leads to user profile)
-     *     - popup=false (open in popup)
-     *     - alttext=true (add image alt attribute)
-     *     - class = image class attribute (default 'userpicture')
-     *     - visibletoscreenreaders=true (whether to be visible to screen readers)
-     *     - includefullname=false (whether to include the user's full name together with the user picture)
-     *     - includetoken = false (whether to use a token for authentication. True for current user, int value for other user id)
-     * @return string HTML fragment
-     */
-    public function user_picture(stdClass $user, array $options = null) {
-        $userpicture = new user_picture($user);
-        foreach ((array)$options as $key=>$value) {
-            if (property_exists($userpicture, $key)) {
-                $userpicture->$key = $value;
-            }
-        }
-        return $this->render($userpicture);
-    }
-
-    /**
-     * Internal implementation of user image rendering.
-     *
-     * @param user_picture $userpicture
-     * @return string
-     */
-    protected function render_user_picture(user_picture $userpicture) {
-        global $CFG;
-
-        $user = $userpicture->user;
-        $canviewfullnames = has_capability('moodle/site:viewfullnames', $this->page->context);
-
-        $alt = '';
-        if ($userpicture->alttext) {
-            if (!empty($user->imagealt)) {
-                $alt = trim($user->imagealt);
-            }
-        }
-
-        // If the user picture is being rendered as a link but without the full name, an empty alt text for the user picture
-        // would mean that the link displayed will not have any discernible text. This becomes an accessibility issue,
-        // especially to screen reader users. Use the user's full name by default for the user picture's alt-text if this is
-        // the case.
-        if ($userpicture->link && !$userpicture->includefullname && empty($alt)) {
-            $alt = fullname($user);
-        }
-
-        if (empty($userpicture->size)) {
-            $size = 35;
-        } else if ($userpicture->size === true or $userpicture->size == 1) {
-            $size = 100;
-        } else {
-            $size = $userpicture->size;
-        }
-
-        $class = $userpicture->class;
-
-        if ($user->picture == 0) {
-            $class .= ' defaultuserpic';
-        }
-
-        $src = $userpicture->get_url($this->page, $this);
-
-        $attributes = array('src' => $src, 'class' => $class, 'width' => $size, 'height' => $size);
-        if (!$userpicture->visibletoscreenreaders) {
-            $alt = '';
-        }
-        $attributes['alt'] = $alt;
-
-        if (!empty($alt)) {
-            $attributes['title'] = $alt;
-        }
-
-        // Get the image html output first, auto generated based on initials if one isn't already set.
-        if ($user->picture == 0 && empty($CFG->enablegravatar) && !defined('BEHAT_SITE_RUNNING')) {
-            $initials = \core_user::get_initials($user);
-            $fullname = fullname($userpicture->user, $canviewfullnames);
-            // Don't modify in corner cases where neither the firstname nor the lastname appears.
-            $output = html_writer::tag(
-                'span', $initials,
-                [
-                    'class' => 'userinitials size-' . $size,
-                    'title' => $fullname,
-                    'aria-label' => $fullname,
-                    'role' => 'img',
-                ]
-            );
-        } else {
-            $output = html_writer::empty_tag('img', $attributes);
-        }
-
-        // Show fullname together with the picture when desired.
-        if ($userpicture->includefullname) {
-            $output .= fullname($userpicture->user, $canviewfullnames);
-        }
-
-        if (empty($userpicture->courseid)) {
-            $courseid = $this->page->course->id;
-        } else {
-            $courseid = $userpicture->courseid;
-        }
-        if ($courseid == SITEID) {
-            $url = new moodle_url('/user/profile.php', array('id' => $user->id));
-        } else {
-            $url = new moodle_url('/user/view.php', array('id' => $user->id, 'course' => $courseid));
-        }
-
-        // Then wrap it in link if needed. Also we don't wrap it in link if the link redirects to itself.
-        if (!$userpicture->link ||
-                ($this->page->has_set_url() && $this->page->url == $url)) { // Protect against unset page->url.
-            return $output;
-        }
-
-        $attributes = array('href' => $url, 'class' => 'd-inline-block aabtn');
-        if (!$userpicture->visibletoscreenreaders) {
-            $attributes['tabindex'] = '-1';
-            $attributes['aria-hidden'] = 'true';
-        }
-
-        if ($userpicture->popup) {
-            $id = html_writer::random_id('userpicture');
-            $attributes['id'] = $id;
-            $this->add_action_handler(new popup_action('click', $url), $id);
-        }
-
-        return html_writer::tag('a', $output, $attributes);
-    }
-
-    /**
-     * @deprecated since Moodle 4.3
-     */
-    public function htmllize_file_tree() {
-        throw new coding_exception('This function is deprecated and no longer relevant.');
-    }
-
-    /**
-     * Returns HTML to display the file picker
-     *
-     * <pre>
-     * $OUTPUT->file_picker($options);
-     * </pre>
-     *
-     * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_file_picker()} instead.
-     *
-     * @param stdClass $options file manager options
-     *   options are:
-     *       maxbytes=>-1,
-     *       itemid=>0,
-     *       client_id=>uniqid(),
-     *       acepted_types=>'*',
-     *       return_types=>FILE_INTERNAL,
-     *       context=>current page context
-     * @return string HTML fragment
-     */
-    public function file_picker($options) {
-        $fp = new file_picker($options);
-        return $this->render($fp);
-    }
-
-    /**
-     * Internal implementation of file picker rendering.
-     *
-     * @param file_picker $fp
-     * @return string
-     */
-    public function render_file_picker(file_picker $fp) {
-        $options = $fp->options;
-        $client_id = $options->client_id;
-        $strsaved = get_string('filesaved', 'repository');
-        $straddfile = get_string('openpicker', 'repository');
-        $strloading  = get_string('loading', 'repository');
-        $strdndenabled = get_string('dndenabled_inbox', 'moodle');
-        $strdroptoupload = get_string('droptoupload', 'moodle');
-        $iconprogress = $this->pix_icon('i/loading_small', $strloading).'';
-
-        $currentfile = $options->currentfile;
-        if (empty($currentfile)) {
-            $currentfile = '';
-        } else {
-            $currentfile .= ' - ';
-        }
-        if ($options->maxbytes) {
-            $size = $options->maxbytes;
-        } else {
-            $size = get_max_upload_file_size();
-        }
-        if ($size == -1) {
-            $maxsize = '';
-        } else {
-            $maxsize = get_string('maxfilesize', 'moodle', display_size($size, 0));
-        }
-        if ($options->buttonname) {
-            $buttonname = ' name="' . $options->buttonname . '"';
-        } else {
-            $buttonname = '';
-        }
-        $html = <<<EOD
-<div class="filemanager-loading mdl-align" id='filepicker-loading-{$client_id}'>
-$iconprogress
-</div>
-<div id="filepicker-wrapper-{$client_id}" class="mdl-left w-100" style="display:none">
-    <div>
-        <input type="button" class="btn btn-secondary fp-btn-choose" id="filepicker-button-{$client_id}" value="{$straddfile}"{$buttonname}/>
-        <span> $maxsize </span>
-    </div>
-EOD;
-        if ($options->env != 'url') {
-            $html .= <<<EOD
-    <div id="file_info_{$client_id}" class="mdl-left filepicker-filelist" style="position: relative">
-    <div class="filepicker-filename">
-        <div class="filepicker-container">$currentfile
-            <div class="dndupload-message">$strdndenabled <br/>
-                <div class="dndupload-arrow d-flex"><i class="fa fa-arrow-circle-o-down fa-3x m-auto"></i></div>
-            </div>
-        </div>
-        <div class="dndupload-progressbars"></div>
-    </div>
-    <div>
-        <div class="dndupload-target">{$strdroptoupload}<br/>
-            <div class="dndupload-arrow d-flex"><i class="fa fa-arrow-circle-o-down fa-3x m-auto"></i></div>
-        </div>
-    </div>
-    </div>
-EOD;
-        }
-        $html .= '</div>';
-        return $html;
-    }
-
-    /**
-     * @deprecated since Moodle 3.2
-     */
-    public function update_module_button() {
-        throw new coding_exception('core_renderer::update_module_button() can not be used anymore. Activity ' .
-            'modules should not add the edit module button, the link is already available in the Administration block. ' .
-            'Themes can choose to display the link in the buttons row consistently for all module types.');
-    }
-
-    /**
-     * Returns HTML to display a "Turn editing on/off" button in a form.
-     *
-     * @param moodle_url $url The URL + params to send through when clicking the button
-     * @param string $method
-     * @return ?string HTML the button
-     */
-    public function edit_button(moodle_url $url, string $method = 'post') {
-
-        if ($this->page->theme->haseditswitch == true) {
-            return;
-        }
-        $url->param('sesskey', sesskey());
-        if ($this->page->user_is_editing()) {
-            $url->param('edit', 'off');
-            $editstring = get_string('turneditingoff');
-        } else {
-            $url->param('edit', 'on');
-            $editstring = get_string('turneditingon');
-        }
-
-        return $this->single_button($url, $editstring, $method);
-    }
-
-    /**
-     * Create a navbar switch for toggling editing mode.
-     *
-     * @return ?string Html containing the edit switch
-     */
-    public function edit_switch() {
-        if ($this->page->user_allowed_editing()) {
-
-            $temp = (object) [
-                'legacyseturl' => (new moodle_url('/editmode.php'))->out(false),
-                'pagecontextid' => $this->page->context->id,
-                'pageurl' => $this->page->url,
-                'sesskey' => sesskey(),
-            ];
-            if ($this->page->user_is_editing()) {
-                $temp->checked = true;
-            }
-            return $this->render_from_template('core/editswitch', $temp);
-        }
-    }
-
-    /**
-     * Returns HTML to display a simple button to close a window
-     *
-     * @param string $text The lang string for the button's label (already output from get_string())
-     * @return string html fragment
-     */
-    public function close_window_button($text='') {
-        if (empty($text)) {
-            $text = get_string('closewindow');
-        }
-        $button = new single_button(new moodle_url('#'), $text, 'get');
-        $button->add_action(new component_action('click', 'close_window'));
-
-        return $this->container($this->render($button), 'closewindow');
-    }
-
-    /**
-     * Output an error message. By default wraps the error message in <span class="error">.
-     * If the error message is blank, nothing is output.
-     *
-     * @param string $message the error message.
-     * @return string the HTML to output.
-     */
-    public function error_text($message) {
-        if (empty($message)) {
-            return '';
-        }
-        $message = $this->pix_icon('i/warning', get_string('error'), '', array('class' => 'icon icon-pre', 'title'=>'')) . $message;
-        return html_writer::tag('span', $message, array('class' => 'error'));
-    }
-
-    /**
-     * Do not call this function directly.
-     *
-     * To terminate the current script with a fatal error, throw an exception.
-     * Doing this will then call this function to display the error, before terminating the execution.
-     *
-     * @param string $message The message to output
-     * @param string $moreinfourl URL where more info can be found about the error
-     * @param string $link Link for the Continue button
-     * @param array $backtrace The execution backtrace
-     * @param string $debuginfo Debugging information
-     * @return string the HTML to output.
-     */
-    public function fatal_error($message, $moreinfourl, $link, $backtrace, $debuginfo = null, $errorcode = "") {
-        global $CFG;
-
-        $output = '';
-        $obbuffer = '';
-
-        if ($this->has_started()) {
-            // we can not always recover properly here, we have problems with output buffering,
-            // html tables, etc.
-            $output .= $this->opencontainers->pop_all_but_last();
-
-        } else {
-            // It is really bad if library code throws exception when output buffering is on,
-            // because the buffered text would be printed before our start of page.
-            // NOTE: this hack might be behave unexpectedly in case output buffering is enabled in PHP.ini
-            error_reporting(0); // disable notices from gzip compression, etc.
-            while (ob_get_level() > 0) {
-                $buff = ob_get_clean();
-                if ($buff === false) {
-                    break;
-                }
-                $obbuffer .= $buff;
-            }
-            error_reporting($CFG->debug);
-
-            // Output not yet started.
-            $protocol = (isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0');
-            if (empty($_SERVER['HTTP_RANGE'])) {
-                @header($protocol . ' 404 Not Found');
-            } else if (core_useragent::check_safari_ios_version(602) && !empty($_SERVER['HTTP_X_PLAYBACK_SESSION_ID'])) {
-                // Coax iOS 10 into sending the session cookie.
-                @header($protocol . ' 403 Forbidden');
-            } else {
-                // Must stop byteserving attempts somehow,
-                // this is weird but Chrome PDF viewer can be stopped only with 407!
-                @header($protocol . ' 407 Proxy Authentication Required');
-            }
-
-            $this->page->set_context(null); // ugly hack - make sure page context is set to something, we do not want bogus warnings here
-            $this->page->set_url('/'); // no url
-            //$this->page->set_pagelayout('base'); //TODO: MDL-20676 blocks on error pages are weird, unfortunately it somehow detect the pagelayout from URL :-(
-            $this->page->set_title(get_string('error'));
-            $this->page->set_heading($this->page->course->fullname);
-            // No need to display the activity header when encountering an error.
-            $this->page->activityheader->disable();
-            $output .= $this->header();
-        }
-
-        $message = '<p class="errormessage">' . s($message) . '</p>'.
-                '<p class="errorcode"><a href="' . s($moreinfourl) . '">' .
-                get_string('moreinformation') . '</a></p>';
-        if (empty($CFG->rolesactive)) {
-            $message .= '<p class="errormessage">' . get_string('installproblem', 'error') . '</p>';
-            //It is usually not possible to recover from errors triggered during installation, you may need to create a new database or use a different database prefix for new installation.
-        }
-        $output .= $this->box($message, 'errorbox alert alert-danger', null, array('data-rel' => 'fatalerror'));
-
-        if ($CFG->debugdeveloper) {
-            $labelsep = get_string('labelsep', 'langconfig');
-            if (!empty($debuginfo)) {
-                $debuginfo = s($debuginfo); // removes all nasty JS
-                $debuginfo = str_replace("\n", '<br />', $debuginfo); // keep newlines
-                $label = get_string('debuginfo', 'debug') . $labelsep;
-                $output .= $this->notification("<strong>$label</strong> " . $debuginfo, 'notifytiny');
-            }
-            if (!empty($backtrace)) {
-                $label = get_string('stacktrace', 'debug') . $labelsep;
-                $output .= $this->notification("<strong>$label</strong> " . format_backtrace($backtrace), 'notifytiny');
-            }
-            if ($obbuffer !== '' ) {
-                $label = get_string('outputbuffer', 'debug') . $labelsep;
-                $output .= $this->notification("<strong>$label</strong> " . s($obbuffer), 'notifytiny');
-            }
-        }
-
-        if (empty($CFG->rolesactive)) {
-            // continue does not make much sense if moodle is not installed yet because error is most probably not recoverable
-        } else if (!empty($link)) {
-            $output .= $this->continue_button($link);
-        }
-
-        $output .= $this->footer();
-
-        // Padding to encourage IE to display our error page, rather than its own.
-        $output .= str_repeat(' ', 512);
-
-        return $output;
-    }
-
-    /**
-     * Output a notification (that is, a status message about something that has just happened).
-     *
-     * Note: \core\notification::add() may be more suitable for your usage.
-     *
-     * @param string $message The message to print out.
-     * @param ?string $type   The type of notification. See constants on \core\output\notification.
-     * @param bool $closebutton Whether to show a close icon to remove the notification (default true).
-     * @return string the HTML to output.
-     */
-    public function notification($message, $type = null, $closebutton = true) {
-        $typemappings = [
-            // Valid types.
-            'success'           => \core\output\notification::NOTIFY_SUCCESS,
-            'info'              => \core\output\notification::NOTIFY_INFO,
-            'warning'           => \core\output\notification::NOTIFY_WARNING,
-            'error'             => \core\output\notification::NOTIFY_ERROR,
-
-            // Legacy types mapped to current types.
-            'notifyproblem'     => \core\output\notification::NOTIFY_ERROR,
-            'notifytiny'        => \core\output\notification::NOTIFY_ERROR,
-            'notifyerror'       => \core\output\notification::NOTIFY_ERROR,
-            'notifysuccess'     => \core\output\notification::NOTIFY_SUCCESS,
-            'notifymessage'     => \core\output\notification::NOTIFY_INFO,
-            'notifyredirect'    => \core\output\notification::NOTIFY_INFO,
-            'redirectmessage'   => \core\output\notification::NOTIFY_INFO,
-        ];
-
-        $extraclasses = [];
-
-        if ($type) {
-            if (strpos($type, ' ') === false) {
-                // No spaces in the list of classes, therefore no need to loop over and determine the class.
-                if (isset($typemappings[$type])) {
-                    $type = $typemappings[$type];
-                } else {
-                    // The value provided did not match a known type. It must be an extra class.
-                    $extraclasses = [$type];
-                }
-            } else {
-                // Identify what type of notification this is.
-                $classarray = explode(' ', self::prepare_classes($type));
-
-                // Separate out the type of notification from the extra classes.
-                foreach ($classarray as $class) {
-                    if (isset($typemappings[$class])) {
-                        $type = $typemappings[$class];
-                    } else {
-                        $extraclasses[] = $class;
-                    }
-                }
-            }
-        }
-
-        $notification = new \core\output\notification($message, $type, $closebutton);
-        if (count($extraclasses)) {
-            $notification->set_extra_classes($extraclasses);
-        }
-
-        // Return the rendered template.
-        return $this->render_from_template($notification->get_template_name(), $notification->export_for_template($this));
-    }
-
-    /**
-     * @deprecated since Moodle 3.1 MDL-30811 - please do not use this function any more.
-     */
-    public function notify_problem() {
-        throw new coding_exception('core_renderer::notify_problem() can not be used any more, '.
-            'please use \core\notification::add(), or \core\output\notification as required.');
-    }
-
-    /**
-     * @deprecated since Moodle 3.1 MDL-30811 - please do not use this function any more.
-     */
-    public function notify_success() {
-        throw new coding_exception('core_renderer::notify_success() can not be used any more, '.
-            'please use \core\notification::add(), or \core\output\notification as required.');
-    }
-
-    /**
-     * @deprecated since Moodle 3.1 MDL-30811 - please do not use this function any more.
-     */
-    public function notify_message() {
-        throw new coding_exception('core_renderer::notify_message() can not be used any more, '.
-            'please use \core\notification::add(), or \core\output\notification as required.');
-    }
-
-    /**
-     * @deprecated since Moodle 3.1 MDL-30811 - please do not use this function any more.
-     */
-    public function notify_redirect() {
-        throw new coding_exception('core_renderer::notify_redirect() can not be used any more, '.
-            'please use \core\notification::add(), or \core\output\notification as required.');
-    }
-
-    /**
-     * Render a notification (that is, a status message about something that has
-     * just happened).
-     *
-     * @param \core\output\notification $notification the notification to print out
-     * @return string the HTML to output.
-     */
-    protected function render_notification(\core\output\notification $notification) {
-        return $this->render_from_template($notification->get_template_name(), $notification->export_for_template($this));
-    }
-
-    /**
-     * Returns HTML to display a continue button that goes to a particular URL.
-     *
-     * @param string|moodle_url $url The url the button goes to.
-     * @return string the HTML to output.
-     */
-    public function continue_button($url) {
-        if (!($url instanceof moodle_url)) {
-            $url = new moodle_url($url);
-        }
-        $button = new single_button($url, get_string('continue'), 'get', single_button::BUTTON_PRIMARY);
-        $button->class = 'continuebutton';
-
-        return $this->render($button);
-    }
-
-    /**
-     * Returns HTML to display a single paging bar to provide access to other pages  (usually in a search)
-     *
-     * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_paging_bar()} instead.
-     *
-     * @param int $totalcount The total number of entries available to be paged through
-     * @param int $page The page you are currently viewing
-     * @param int $perpage The number of entries that should be shown per page
-     * @param string|moodle_url $baseurl url of the current page, the $pagevar parameter is added
-     * @param string $pagevar name of page parameter that holds the page number
-     * @return string the HTML to output.
-     */
-    public function paging_bar($totalcount, $page, $perpage, $baseurl, $pagevar = 'page') {
-        $pb = new paging_bar($totalcount, $page, $perpage, $baseurl, $pagevar);
-        return $this->render($pb);
-    }
-
-    /**
-     * Returns HTML to display the paging bar.
-     *
-     * @param paging_bar $pagingbar
-     * @return string the HTML to output.
-     */
-    protected function render_paging_bar(paging_bar $pagingbar) {
-        // Any more than 10 is not usable and causes weird wrapping of the pagination.
-        $pagingbar->maxdisplay = 10;
-        return $this->render_from_template('core/paging_bar', $pagingbar->export_for_template($this));
-    }
-
-    /**
-     * Returns HTML to display initials bar to provide access to other pages  (usually in a search)
-     *
-     * @param string $current the currently selected letter.
-     * @param string $class class name to add to this initial bar.
-     * @param string $title the name to put in front of this initial bar.
-     * @param string $urlvar URL parameter name for this initial.
-     * @param string $url URL object.
-     * @param array $alpha of letters in the alphabet.
-     * @param bool $minirender Return a trimmed down view of the initials bar.
-     * @return string the HTML to output.
-     */
-    public function initials_bar($current, $class, $title, $urlvar, $url, $alpha = null, bool $minirender = false) {
-        $ib = new initials_bar($current, $class, $title, $urlvar, $url, $alpha, $minirender);
-        return $this->render($ib);
-    }
-
-    /**
-     * Internal implementation of initials bar rendering.
-     *
-     * @param initials_bar $initialsbar
-     * @return string
-     */
-    protected function render_initials_bar(initials_bar $initialsbar) {
-        return $this->render_from_template('core/initials_bar', $initialsbar->export_for_template($this));
-    }
-
-    /**
-     * Output the place a skip link goes to.
-     *
-     * @param string $id The target name from the corresponding $PAGE->requires->skip_link_to($target) call.
-     * @return string the HTML to output.
-     */
-    public function skip_link_target($id = null) {
-        return html_writer::span('', '', array('id' => $id));
-    }
-
-    /**
-     * Outputs a heading
-     *
-     * @param string $text The text of the heading
-     * @param int $level The level of importance of the heading. Defaulting to 2
-     * @param string $classes A space-separated list of CSS classes. Defaulting to null
-     * @param string $id An optional ID
-     * @return string the HTML to output.
-     */
-    public function heading($text, $level = 2, $classes = null, $id = null) {
-        $level = (integer) $level;
-        if ($level < 1 or $level > 6) {
-            throw new coding_exception('Heading level must be an integer between 1 and 6.');
-        }
-        return html_writer::tag('h' . $level, $text, array('id' => $id, 'class' => renderer_base::prepare_classes($classes)));
-    }
-
-    /**
-     * Outputs a box.
-     *
-     * @param string $contents The contents of the box
-     * @param string $classes A space-separated list of CSS classes
-     * @param string $id An optional ID
-     * @param array $attributes An array of other attributes to give the box.
-     * @return string the HTML to output.
-     */
-    public function box($contents, $classes = 'generalbox', $id = null, $attributes = array()) {
-        return $this->box_start($classes, $id, $attributes) . $contents . $this->box_end();
-    }
-
-    /**
-     * Outputs the opening section of a box.
-     *
-     * @param string $classes A space-separated list of CSS classes
-     * @param string $id An optional ID
-     * @param array $attributes An array of other attributes to give the box.
-     * @return string the HTML to output.
-     */
-    public function box_start($classes = 'generalbox', $id = null, $attributes = array()) {
-        $this->opencontainers->push('box', html_writer::end_tag('div'));
-        $attributes['id'] = $id;
-        $attributes['class'] = 'box py-3 ' . renderer_base::prepare_classes($classes);
-        return html_writer::start_tag('div', $attributes);
-    }
-
-    /**
-     * Outputs the closing section of a box.
-     *
-     * @return string the HTML to output.
-     */
-    public function box_end() {
-        return $this->opencontainers->pop('box');
-    }
-
-    /**
-     * Outputs a paragraph.
-     *
-     * @param string $contents The contents of the paragraph
-     * @param string|null $classes A space-separated list of CSS classes
-     * @param string|null $id An optional ID
-     * @return string the HTML to output.
-     */
-    public function paragraph(string $contents, ?string $classes = null, ?string $id = null): string {
-        return html_writer::tag(
-            'p',
-            $contents,
-            ['id' => $id, 'class' => renderer_base::prepare_classes($classes)]
-        );
-    }
-
-    /**
-     * Outputs a screen reader only inline text.
-     *
-     * @param string $contents The contents of the paragraph
-     * @return string the HTML to output.
-     */
-    public function sr_text(string $contents): string {
-        return html_writer::tag(
-            'span',
-            $contents,
-            ['class' => 'sr-only']
-        ) . ' ';
-    }
-
-    /**
-     * Outputs a container.
-     *
-     * @param string $contents The contents of the box
-     * @param string $classes A space-separated list of CSS classes
-     * @param string $id An optional ID
-     * @param array $attributes Optional other attributes as array
-     * @return string the HTML to output.
-     */
-    public function container($contents, $classes = null, $id = null, $attributes = []) {
-        return $this->container_start($classes, $id, $attributes) . $contents . $this->container_end();
-    }
-
-    /**
-     * Outputs the opening section of a container.
-     *
-     * @param string $classes A space-separated list of CSS classes
-     * @param string $id An optional ID
-     * @param array $attributes Optional other attributes as array
-     * @return string the HTML to output.
-     */
-    public function container_start($classes = null, $id = null, $attributes = []) {
-        $this->opencontainers->push('container', html_writer::end_tag('div'));
-        $attributes = array_merge(['id' => $id, 'class' => renderer_base::prepare_classes($classes)], $attributes);
-        return html_writer::start_tag('div', $attributes);
-    }
-
-    /**
-     * Outputs the closing section of a container.
-     *
-     * @return string the HTML to output.
-     */
-    public function container_end() {
-        return $this->opencontainers->pop('container');
-    }
-
-    /**
-     * Make nested HTML lists out of the items
-     *
-     * The resulting list will look something like this:
-     *
-     * <pre>
-     * <<ul>>
-     * <<li>><div class='tree_item parent'>(item contents)</div>
-     *      <<ul>
-     *      <<li>><div class='tree_item'>(item contents)</div><</li>>
-     *      <</ul>>
-     * <</li>>
-     * <</ul>>
-     * </pre>
-     *
-     * @param array $items
-     * @param array $attrs html attributes passed to the top ofs the list
-     * @return string HTML
-     */
-    public function tree_block_contents($items, $attrs = array()) {
-        // exit if empty, we don't want an empty ul element
-        if (empty($items)) {
-            return '';
-        }
-        // array of nested li elements
-        $lis = array();
-        foreach ($items as $item) {
-            // this applies to the li item which contains all child lists too
-            $content = $item->content($this);
-            $liclasses = array($item->get_css_type());
-            if (!$item->forceopen || (!$item->forceopen && $item->collapse) || ($item->children->count()==0  && $item->nodetype==navigation_node::NODETYPE_BRANCH)) {
-                $liclasses[] = 'collapsed';
-            }
-            if ($item->isactive === true) {
-                $liclasses[] = 'current_branch';
-            }
-            $liattr = array('class'=>join(' ',$liclasses));
-            // class attribute on the div item which only contains the item content
-            $divclasses = array('tree_item');
-            if ($item->children->count()>0  || $item->nodetype==navigation_node::NODETYPE_BRANCH) {
-                $divclasses[] = 'branch';
-            } else {
-                $divclasses[] = 'leaf';
-            }
-            if (!empty($item->classes) && count($item->classes)>0) {
-                $divclasses[] = join(' ', $item->classes);
-            }
-            $divattr = array('class'=>join(' ', $divclasses));
-            if (!empty($item->id)) {
-                $divattr['id'] = $item->id;
-            }
-            $content = html_writer::tag('p', $content, $divattr) . $this->tree_block_contents($item->children);
-            if (!empty($item->preceedwithhr) && $item->preceedwithhr===true) {
-                $content = html_writer::empty_tag('hr') . $content;
-            }
-            $content = html_writer::tag('li', $content, $liattr);
-            $lis[] = $content;
-        }
-        return html_writer::tag('ul', implode("\n", $lis), $attrs);
-    }
-
-    /**
-     * Returns a search box.
-     *
-     * @param  string $id     The search box wrapper div id, defaults to an autogenerated one.
-     * @return string         HTML with the search form hidden by default.
-     */
-    public function search_box($id = false) {
-        global $CFG;
-
-        // Accessing $CFG directly as using \core_search::is_global_search_enabled would
-        // result in an extra included file for each site, even the ones where global search
-        // is disabled.
-        if (empty($CFG->enableglobalsearch) || !has_capability('moodle/search:query', context_system::instance())) {
-            return '';
-        }
-
-        $data = [
-            'action' => new moodle_url('/search/index.php'),
-            'hiddenfields' => (object) ['name' => 'context', 'value' => $this->page->context->id],
-            'inputname' => 'q',
-            'searchstring' => get_string('search'),
-            ];
-        return $this->render_from_template('core/search_input_navbar', $data);
-    }
-
-    /**
-     * Allow plugins to provide some content to be rendered in the navbar.
-     * The plugin must define a PLUGIN_render_navbar_output function that returns
-     * the HTML they wish to add to the navbar.
-     *
-     * @return string HTML for the navbar
-     */
-    public function navbar_plugin_output() {
-        $output = '';
-
-        // Give subsystems an opportunity to inject extra html content. The callback
-        // must always return a string containing valid html.
-        foreach (\core_component::get_core_subsystems() as $name => $path) {
-            if ($path) {
-                $output .= component_callback($name, 'render_navbar_output', [$this], '');
-            }
-        }
-
-        if ($pluginsfunction = get_plugins_with_function('render_navbar_output')) {
-            foreach ($pluginsfunction as $plugintype => $plugins) {
-                foreach ($plugins as $pluginfunction) {
-                    $output .= $pluginfunction($this);
-                }
-            }
-        }
-
-        return $output;
-    }
-
-    /**
-     * Construct a user menu, returning HTML that can be echoed out by a
-     * layout file.
-     *
-     * @param stdClass $user A user object, usually $USER.
-     * @param bool $withlinks true if a dropdown should be built.
-     * @return string HTML fragment.
-     */
-    public function user_menu($user = null, $withlinks = null) {
-        global $USER, $CFG;
-        require_once($CFG->dirroot . '/user/lib.php');
-
-        if (is_null($user)) {
-            $user = $USER;
-        }
-
-        // Note: this behaviour is intended to match that of core_renderer::login_info,
-        // but should not be considered to be good practice; layout options are
-        // intended to be theme-specific. Please don't copy this snippet anywhere else.
-        if (is_null($withlinks)) {
-            $withlinks = empty($this->page->layout_options['nologinlinks']);
-        }
-
-        // Add a class for when $withlinks is false.
-        $usermenuclasses = 'usermenu';
-        if (!$withlinks) {
-            $usermenuclasses .= ' withoutlinks';
-        }
-
-        $returnstr = "";
-
-        // If during initial install, return the empty return string.
-        if (during_initial_install()) {
-            return $returnstr;
-        }
-
-        $loginpage = $this->is_login_page();
-        $loginurl = get_login_url();
-
-        // Get some navigation opts.
-        $opts = user_get_user_navigation_info($user, $this->page);
-
-        if (!empty($opts->unauthenticateduser)) {
-            $returnstr = get_string($opts->unauthenticateduser['content'], 'moodle');
-            // If not logged in, show the typical not-logged-in string.
-            if (!$loginpage && (!$opts->unauthenticateduser['guest'] || $withlinks)) {
-                $returnstr .= " (<a href=\"$loginurl\">" . get_string('login') . '</a>)';
-            }
-
-            return html_writer::div(
-                html_writer::span(
-                    $returnstr,
-                    'login nav-link'
-                ),
-                $usermenuclasses
-            );
-        }
-
-        $avatarclasses = "avatars";
-        $avatarcontents = html_writer::span($opts->metadata['useravatar'], 'avatar current');
-        $usertextcontents = $opts->metadata['userfullname'];
-
-        // Other user.
-        if (!empty($opts->metadata['asotheruser'])) {
-            $avatarcontents .= html_writer::span(
-                $opts->metadata['realuseravatar'],
-                'avatar realuser'
-            );
-            $usertextcontents = $opts->metadata['realuserfullname'];
-            $usertextcontents .= html_writer::tag(
-                'span',
-                get_string(
-                    'loggedinas',
-                    'moodle',
-                    html_writer::span(
-                        $opts->metadata['userfullname'],
-                        'value'
-                    )
-                ),
-                array('class' => 'meta viewingas')
-            );
-        }
-
-        // Role.
-        if (!empty($opts->metadata['asotherrole'])) {
-            $role = core_text::strtolower(preg_replace('#[ ]+#', '-', trim($opts->metadata['rolename'])));
-            $usertextcontents .= html_writer::span(
-                $opts->metadata['rolename'],
-                'meta role role-' . $role
-            );
-        }
-
-        // User login failures.
-        if (!empty($opts->metadata['userloginfail'])) {
-            $usertextcontents .= html_writer::span(
-                $opts->metadata['userloginfail'],
-                'meta loginfailures'
-            );
-        }
-
-        // MNet.
-        if (!empty($opts->metadata['asmnetuser'])) {
-            $mnet = strtolower(preg_replace('#[ ]+#', '-', trim($opts->metadata['mnetidprovidername'])));
-            $usertextcontents .= html_writer::span(
-                $opts->metadata['mnetidprovidername'],
-                'meta mnet mnet-' . $mnet
-            );
-        }
-
-        $returnstr .= html_writer::span(
-            html_writer::span($usertextcontents, 'usertext mr-1') .
-            html_writer::span($avatarcontents, $avatarclasses),
-            'userbutton'
-        );
-
-        // Create a divider (well, a filler).
-        $divider = new action_menu_filler();
-        $divider->primary = false;
-
-        $am = new action_menu();
-        $am->set_menu_trigger(
-            $returnstr,
-            'nav-link'
-        );
-        $am->set_action_label(get_string('usermenu'));
-        $am->set_nowrap_on_items();
-        if ($withlinks) {
-            $navitemcount = count($opts->navitems);
-            $idx = 0;
-            foreach ($opts->navitems as $key => $value) {
-
-                switch ($value->itemtype) {
-                    case 'divider':
-                        // If the nav item is a divider, add one and skip link processing.
-                        $am->add($divider);
-                        break;
-
-                    case 'invalid':
-                        // Silently skip invalid entries (should we post a notification?).
-                        break;
-
-                    case 'link':
-                        // Process this as a link item.
-                        $pix = null;
-                        if (isset($value->pix) && !empty($value->pix)) {
-                            $pix = new pix_icon($value->pix, '', null, array('class' => 'iconsmall'));
-                        } else if (isset($value->imgsrc) && !empty($value->imgsrc)) {
-                            $value->title = html_writer::img(
-                                $value->imgsrc,
-                                $value->title,
-                                array('class' => 'iconsmall')
-                            ) . $value->title;
-                        }
-
-                        $al = new action_menu_link_secondary(
-                            $value->url,
-                            $pix,
-                            $value->title,
-                            array('class' => 'icon')
-                        );
-                        if (!empty($value->titleidentifier)) {
-                            $al->attributes['data-title'] = $value->titleidentifier;
-                        }
-                        $am->add($al);
-                        break;
-                }
-
-                $idx++;
-
-                // Add dividers after the first item and before the last item.
-                if ($idx == 1 || $idx == $navitemcount - 1) {
-                    $am->add($divider);
-                }
-            }
-        }
-
-        return html_writer::div(
-            $this->render($am),
-            $usermenuclasses
-        );
-    }
-
-    /**
-     * Secure layout login info.
-     *
-     * @return string
-     */
-    public function secure_layout_login_info() {
-        if (get_config('core', 'logininfoinsecurelayout')) {
-            return $this->login_info(false);
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * Returns the language menu in the secure layout.
-     *
-     * No custom menu items are passed though, such that it will render only the language selection.
-     *
-     * @return string
-     */
-    public function secure_layout_language_menu() {
-        if (get_config('core', 'langmenuinsecurelayout')) {
-            $custommenu = new custom_menu('', current_language());
-            return $this->render_custom_menu($custommenu);
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * This renders the navbar.
-     * Uses bootstrap compatible html.
-     */
-    public function navbar() {
-        return $this->render_from_template('core/navbar', $this->page->navbar);
-    }
-
-    /**
-     * Renders a breadcrumb navigation node object.
-     *
-     * @param breadcrumb_navigation_node $item The navigation node to render.
-     * @return string HTML fragment
-     */
-    protected function render_breadcrumb_navigation_node(breadcrumb_navigation_node $item) {
-
-        if ($item->action instanceof moodle_url) {
-            $content = $item->get_content();
-            $title = $item->get_title();
-            $attributes = array();
-            $attributes['itemprop'] = 'url';
-            if ($title !== '') {
-                $attributes['title'] = $title;
-            }
-            if ($item->hidden) {
-                $attributes['class'] = 'dimmed_text';
-            }
-            if ($item->is_last()) {
-                $attributes['aria-current'] = 'page';
-            }
-            $content = html_writer::tag('span', $content, array('itemprop' => 'title'));
-            $content = html_writer::link($item->action, $content, $attributes);
-
-            $attributes = array();
-            $attributes['itemscope'] = '';
-            $attributes['itemtype'] = 'http://data-vocabulary.org/Breadcrumb';
-            $content = html_writer::tag('span', $content, $attributes);
-
-        } else {
-            $content = $this->render_navigation_node($item);
-        }
-        return $content;
-    }
-
-    /**
-     * Renders a navigation node object.
-     *
-     * @param navigation_node $item The navigation node to render.
-     * @return string HTML fragment
-     */
-    protected function render_navigation_node(navigation_node $item) {
-        $content = $item->get_content();
-        $title = $item->get_title();
-        if ($item->icon instanceof renderable && !$item->hideicon) {
-            $icon = $this->render($item->icon);
-            $content = $icon.$content; // use CSS for spacing of icons
-        }
-        if ($item->helpbutton !== null) {
-            $content = trim($item->helpbutton).html_writer::tag('span', $content, array('class'=>'clearhelpbutton', 'tabindex'=>'0'));
-        }
-        if ($content === '') {
-            return '';
-        }
-        if ($item->action instanceof action_link) {
-            $link = $item->action;
-            if ($item->hidden) {
-                $link->add_class('dimmed');
-            }
-            if (!empty($content)) {
-                // Providing there is content we will use that for the link content.
-                $link->text = $content;
-            }
-            $content = $this->render($link);
-        } else if ($item->action instanceof moodle_url) {
-            $attributes = array();
-            if ($title !== '') {
-                $attributes['title'] = $title;
-            }
-            if ($item->hidden) {
-                $attributes['class'] = 'dimmed_text';
-            }
-            $content = html_writer::link($item->action, $content, $attributes);
-
-        } else if (is_string($item->action) || empty($item->action)) {
-            $attributes = array('tabindex'=>'0'); //add tab support to span but still maintain character stream sequence.
-            if ($title !== '') {
-                $attributes['title'] = $title;
-            }
-            if ($item->hidden) {
-                $attributes['class'] = 'dimmed_text';
-            }
-            $content = html_writer::tag('span', $content, $attributes);
-        }
-        return $content;
-    }
-
-    /**
-     * Accessibility: Right arrow-like character is
-     * used in the breadcrumb trail, course navigation menu
-     * (previous/next activity), calendar, and search forum block.
-     * If the theme does not set characters, appropriate defaults
-     * are set automatically. Please DO NOT
-     * use &lt; &gt; &raquo; - these are confusing for blind users.
-     *
-     * @return string
-     */
-    public function rarrow() {
-        return $this->page->theme->rarrow;
-    }
-
-    /**
-     * Accessibility: Left arrow-like character is
-     * used in the breadcrumb trail, course navigation menu
-     * (previous/next activity), calendar, and search forum block.
-     * If the theme does not set characters, appropriate defaults
-     * are set automatically. Please DO NOT
-     * use &lt; &gt; &raquo; - these are confusing for blind users.
-     *
-     * @return string
-     */
-    public function larrow() {
-        return $this->page->theme->larrow;
-    }
-
-    /**
-     * Accessibility: Up arrow-like character is used in
-     * the book heirarchical navigation.
-     * If the theme does not set characters, appropriate defaults
-     * are set automatically. Please DO NOT
-     * use ^ - this is confusing for blind users.
-     *
-     * @return string
-     */
-    public function uarrow() {
-        return $this->page->theme->uarrow;
-    }
-
-    /**
-     * Accessibility: Down arrow-like character.
-     * If the theme does not set characters, appropriate defaults
-     * are set automatically.
-     *
-     * @return string
-     */
-    public function darrow() {
-        return $this->page->theme->darrow;
-    }
-
-    /**
-     * Returns the custom menu if one has been set
-     *
-     * A custom menu can be configured by browsing to a theme's settings page
-     * and then configuring the custommenu config setting as described.
-     *
-     * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_custom_menu()} instead.
-     *
-     * @param string $custommenuitems - custom menuitems set by theme instead of global theme settings
-     * @return string
-     */
-    public function custom_menu($custommenuitems = '') {
-        global $CFG;
-
-        if (empty($custommenuitems) && !empty($CFG->custommenuitems)) {
-            $custommenuitems = $CFG->custommenuitems;
-        }
-        $custommenu = new custom_menu($custommenuitems, current_language());
-        return $this->render_custom_menu($custommenu);
-    }
-
-    /**
-     * We want to show the custom menus as a list of links in the footer on small screens.
-     * Just return the menu object exported so we can render it differently.
-     */
-    public function custom_menu_flat() {
-        global $CFG;
-        $custommenuitems = '';
-
-        if (empty($custommenuitems) && !empty($CFG->custommenuitems)) {
-            $custommenuitems = $CFG->custommenuitems;
-        }
-        $custommenu = new custom_menu($custommenuitems, current_language());
-        $langs = get_string_manager()->get_list_of_translations();
-        $haslangmenu = $this->lang_menu() != '';
-
-        if ($haslangmenu) {
-            $strlang = get_string('language');
-            $currentlang = current_language();
-            if (isset($langs[$currentlang])) {
-                $currentlang = $langs[$currentlang];
-            } else {
-                $currentlang = $strlang;
-            }
-            $this->language = $custommenu->add($currentlang, new moodle_url('#'), $strlang, 10000);
-            foreach ($langs as $langtype => $langname) {
-                $this->language->add($langname, new moodle_url($this->page->url, array('lang' => $langtype)), $langname);
-            }
-        }
-
-        return $custommenu->export_for_template($this);
-    }
-
-    /**
-     * Renders a custom menu object (located in outputcomponents.php)
-     *
-     * The custom menu this method produces makes use of the YUI3 menunav widget
-     * and requires very specific html elements and classes.
-     *
-     * @staticvar int $menucount
-     * @param custom_menu $menu
-     * @return string
-     */
-    protected function render_custom_menu(custom_menu $menu) {
-        global $CFG;
-
-        $langs = get_string_manager()->get_list_of_translations();
-        $haslangmenu = $this->lang_menu() != '';
-
-        if (!$menu->has_children() && !$haslangmenu) {
-            return '';
-        }
-
-        if ($haslangmenu) {
-            $strlang = get_string('language');
-            $currentlang = current_language();
-            if (isset($langs[$currentlang])) {
-                $currentlangstr = $langs[$currentlang];
-            } else {
-                $currentlangstr = $strlang;
-            }
-            $this->language = $menu->add($currentlangstr, new moodle_url('#'), $strlang, 10000);
-            foreach ($langs as $langtype => $langname) {
-                $attributes = [];
-                // Set the lang attribute for languages different from the page's current language.
-                if ($langtype !== $currentlang) {
-                    $attributes[] = [
-                        'key' => 'lang',
-                        'value' => get_html_lang_attribute_value($langtype),
-                    ];
-                }
-                $this->language->add($langname, new moodle_url($this->page->url, ['lang' => $langtype]), null, null, $attributes);
-            }
-        }
-
-        $content = '';
-        foreach ($menu->get_children() as $item) {
-            $context = $item->export_for_template($this);
-            $content .= $this->render_from_template('core/custom_menu_item', $context);
-        }
-
-        return $content;
-    }
-
-    /**
-     * Renders a custom menu node as part of a submenu
-     *
-     * The custom menu this method produces makes use of the YUI3 menunav widget
-     * and requires very specific html elements and classes.
-     *
-     * @see core:renderer::render_custom_menu()
-     *
-     * @staticvar int $submenucount
-     * @param custom_menu_item $menunode
-     * @return string
-     */
-    protected function render_custom_menu_item(custom_menu_item $menunode) {
-        // Required to ensure we get unique trackable id's
-        static $submenucount = 0;
-        if ($menunode->has_children()) {
-            // If the child has menus render it as a sub menu
-            $submenucount++;
-            $content = html_writer::start_tag('li');
-            if ($menunode->get_url() !== null) {
-                $url = $menunode->get_url();
-            } else {
-                $url = '#cm_submenu_'.$submenucount;
-            }
-            $content .= html_writer::link($url, $menunode->get_text(), array('class'=>'yui3-menu-label', 'title'=>$menunode->get_title()));
-            $content .= html_writer::start_tag('div', array('id'=>'cm_submenu_'.$submenucount, 'class'=>'yui3-menu custom_menu_submenu'));
-            $content .= html_writer::start_tag('div', array('class'=>'yui3-menu-content'));
-            $content .= html_writer::start_tag('ul');
-            foreach ($menunode->get_children() as $menunode) {
-                $content .= $this->render_custom_menu_item($menunode);
-            }
-            $content .= html_writer::end_tag('ul');
-            $content .= html_writer::end_tag('div');
-            $content .= html_writer::end_tag('div');
-            $content .= html_writer::end_tag('li');
-        } else {
-            // The node doesn't have children so produce a final menuitem.
-            // Also, if the node's text matches '####', add a class so we can treat it as a divider.
-            $content = '';
-            if (preg_match("/^#+$/", $menunode->get_text())) {
-
-                // This is a divider.
-                $content = html_writer::start_tag('li', array('class' => 'yui3-menuitem divider'));
-            } else {
-                $content = html_writer::start_tag(
-                    'li',
-                    array(
-                        'class' => 'yui3-menuitem'
-                    )
-                );
-                if ($menunode->get_url() !== null) {
-                    $url = $menunode->get_url();
-                } else {
-                    $url = '#';
-                }
-                $content .= html_writer::link(
-                    $url,
-                    $menunode->get_text(),
-                    array('class' => 'yui3-menuitem-content', 'title' => $menunode->get_title())
-                );
-            }
-            $content .= html_writer::end_tag('li');
-        }
-        // Return the sub menu
-        return $content;
-    }
-
-    /**
-     * Renders theme links for switching between default and other themes.
-     *
-     * @return string
-     */
-    protected function theme_switch_links() {
-
-        $actualdevice = core_useragent::get_device_type();
-        $currentdevice = $this->page->devicetypeinuse;
-        $switched = ($actualdevice != $currentdevice);
-
-        if (!$switched && $currentdevice == 'default' && $actualdevice == 'default') {
-            // The user is using the a default device and hasn't switched so don't shown the switch
-            // device links.
-            return '';
-        }
-
-        if ($switched) {
-            $linktext = get_string('switchdevicerecommended');
-            $devicetype = $actualdevice;
-        } else {
-            $linktext = get_string('switchdevicedefault');
-            $devicetype = 'default';
-        }
-        $linkurl = new moodle_url('/theme/switchdevice.php', array('url' => $this->page->url, 'device' => $devicetype, 'sesskey' => sesskey()));
-
-        $content  = html_writer::start_tag('div', array('id' => 'theme_switch_link'));
-        $content .= html_writer::link($linkurl, $linktext, array('rel' => 'nofollow'));
-        $content .= html_writer::end_tag('div');
-
-        return $content;
-    }
-
-    /**
-     * Renders tabs
-     *
-     * This function replaces print_tabs() used before Moodle 2.5 but with slightly different arguments
-     *
-     * Theme developers: In order to change how tabs are displayed please override functions
-     * {@link core_renderer::render_tabtree()} and/or {@link core_renderer::render_tabobject()}
-     *
-     * @param array $tabs array of tabs, each of them may have it's own ->subtree
-     * @param string|null $selected which tab to mark as selected, all parent tabs will
-     *     automatically be marked as activated
-     * @param array|string|null $inactive list of ids of inactive tabs, regardless of
-     *     their level. Note that you can as weel specify tabobject::$inactive for separate instances
-     * @return string
-     */
-    final public function tabtree($tabs, $selected = null, $inactive = null) {
-        return $this->render(new tabtree($tabs, $selected, $inactive));
-    }
-
-    /**
-     * Renders tabtree
-     *
-     * @param tabtree $tabtree
-     * @return string
-     */
-    protected function render_tabtree(tabtree $tabtree) {
-        if (empty($tabtree->subtree)) {
-            return '';
-        }
-        $data = $tabtree->export_for_template($this);
-        return $this->render_from_template('core/tabtree', $data);
-    }
-
-    /**
-     * Renders tabobject (part of tabtree)
-     *
-     * This function is called from {@link core_renderer::render_tabtree()}
-     * and also it calls itself when printing the $tabobject subtree recursively.
-     *
-     * Property $tabobject->level indicates the number of row of tabs.
-     *
-     * @param tabobject $tabobject
-     * @return string HTML fragment
-     */
-    protected function render_tabobject(tabobject $tabobject) {
-        $str = '';
-
-        // Print name of the current tab.
-        if ($tabobject instanceof tabtree) {
-            // No name for tabtree root.
-        } else if ($tabobject->inactive || $tabobject->activated || ($tabobject->selected && !$tabobject->linkedwhenselected)) {
-            // Tab name without a link. The <a> tag is used for styling.
-            $str .= html_writer::tag('a', html_writer::span($tabobject->text), array('class' => 'nolink moodle-has-zindex'));
-        } else {
-            // Tab name with a link.
-            if (!($tabobject->link instanceof moodle_url)) {
-                // backward compartibility when link was passed as quoted string
-                $str .= "<a href=\"$tabobject->link\" title=\"$tabobject->title\"><span>$tabobject->text</span></a>";
-            } else {
-                $str .= html_writer::link($tabobject->link, html_writer::span($tabobject->text), array('title' => $tabobject->title));
-            }
-        }
-
-        if (empty($tabobject->subtree)) {
-            if ($tabobject->selected) {
-                $str .= html_writer::tag('div', '&nbsp;', array('class' => 'tabrow'. ($tabobject->level + 1). ' empty'));
-            }
-            return $str;
-        }
-
-        // Print subtree.
-        if ($tabobject->level == 0 || $tabobject->selected || $tabobject->activated) {
-            $str .= html_writer::start_tag('ul', array('class' => 'tabrow'. $tabobject->level));
-            $cnt = 0;
-            foreach ($tabobject->subtree as $tab) {
-                $liclass = '';
-                if (!$cnt) {
-                    $liclass .= ' first';
-                }
-                if ($cnt == count($tabobject->subtree) - 1) {
-                    $liclass .= ' last';
-                }
-                if ((empty($tab->subtree)) && (!empty($tab->selected))) {
-                    $liclass .= ' onerow';
-                }
-
-                if ($tab->selected) {
-                    $liclass .= ' here selected';
-                } else if ($tab->activated) {
-                    $liclass .= ' here active';
-                }
-
-                // This will recursively call function render_tabobject() for each item in subtree.
-                $str .= html_writer::tag('li', $this->render($tab), array('class' => trim($liclass)));
-                $cnt++;
-            }
-            $str .= html_writer::end_tag('ul');
-        }
-
-        return $str;
-    }
-
-    /**
-     * Get the HTML for blocks in the given region.
-     *
-     * @since Moodle 2.5.1 2.6
-     * @param string $region The region to get HTML for.
-     * @param array $classes Wrapping tag classes.
-     * @param string $tag Wrapping tag.
-     * @param boolean $fakeblocksonly Include fake blocks only.
-     * @return string HTML.
-     */
-    public function blocks($region, $classes = array(), $tag = 'aside', $fakeblocksonly = false) {
-        $displayregion = $this->page->apply_theme_region_manipulations($region);
-        $classes = (array)$classes;
-        $classes[] = 'block-region';
-        $attributes = array(
-            'id' => 'block-region-'.preg_replace('#[^a-zA-Z0-9_\-]+#', '-', $displayregion),
-            'class' => join(' ', $classes),
-            'data-blockregion' => $displayregion,
-            'data-droptarget' => '1'
-        );
-        if ($this->page->blocks->region_has_content($displayregion, $this)) {
-            $content = html_writer::tag('h2', get_string('blocks'), ['class' => 'sr-only']) .
-                $this->blocks_for_region($displayregion, $fakeblocksonly);
-        } else {
-            $content = html_writer::tag('h2', get_string('blocks'), ['class' => 'sr-only']);
-        }
-        return html_writer::tag($tag, $content, $attributes);
-    }
-
-    /**
-     * Renders a custom block region.
-     *
-     * Use this method if you want to add an additional block region to the content of the page.
-     * Please note this should only be used in special situations.
-     * We want to leave the theme is control where ever possible!
-     *
-     * This method must use the same method that the theme uses within its layout file.
-     * As such it asks the theme what method it is using.
-     * It can be one of two values, blocks or blocks_for_region (deprecated).
-     *
-     * @param string $regionname The name of the custom region to add.
-     * @return string HTML for the block region.
-     */
-    public function custom_block_region($regionname) {
-        if ($this->page->theme->get_block_render_method() === 'blocks') {
-            return $this->blocks($regionname);
-        } else {
-            return $this->blocks_for_region($regionname);
-        }
-    }
-
-    /**
-     * Returns the CSS classes to apply to the body tag.
-     *
-     * @since Moodle 2.5.1 2.6
-     * @param array $additionalclasses Any additional classes to apply.
-     * @return string
-     */
-    public function body_css_classes(array $additionalclasses = array()) {
-        return $this->page->bodyclasses . ' ' . implode(' ', $additionalclasses);
-    }
-
-    /**
-     * The ID attribute to apply to the body tag.
-     *
-     * @since Moodle 2.5.1 2.6
-     * @return string
-     */
-    public function body_id() {
-        return $this->page->bodyid;
-    }
-
-    /**
-     * Returns HTML attributes to use within the body tag. This includes an ID and classes.
-     *
-     * @since Moodle 2.5.1 2.6
-     * @param string|array $additionalclasses Any additional classes to give the body tag,
-     * @return string
-     */
-    public function body_attributes($additionalclasses = array()) {
-        if (!is_array($additionalclasses)) {
-            $additionalclasses = explode(' ', $additionalclasses);
-        }
-        return ' id="'. $this->body_id().'" class="'.$this->body_css_classes($additionalclasses).'"';
-    }
-
-    /**
-     * Gets HTML for the page heading.
-     *
-     * @since Moodle 2.5.1 2.6
-     * @param string $tag The tag to encase the heading in. h1 by default.
-     * @return string HTML.
-     */
-    public function page_heading($tag = 'h1') {
-        return html_writer::tag($tag, $this->page->heading);
-    }
-
-    /**
-     * Gets the HTML for the page heading button.
-     *
-     * @since Moodle 2.5.1 2.6
-     * @return string HTML.
-     */
-    public function page_heading_button() {
-        return $this->page->button;
-    }
-
-    /**
-     * Returns the Moodle docs link to use for this page.
-     *
-     * @since Moodle 2.5.1 2.6
-     * @param string $text
-     * @return string
-     */
-    public function page_doc_link($text = null) {
-        if ($text === null) {
-            $text = get_string('moodledocslink');
-        }
-        $path = page_get_doc_link_path($this->page);
-        if (!$path) {
-            return '';
-        }
-        return $this->doc_link($path, $text);
-    }
-
-    /**
-     * Returns the HTML for the site support email link
-     *
-     * @param array $customattribs Array of custom attributes for the support email anchor tag.
-     * @param bool $embed Set to true if you want to embed the link in other inline content.
-     * @return string The html code for the support email link.
-     */
-    public function supportemail(array $customattribs = [], bool $embed = false): string {
-        global $CFG;
-
-        // Do not provide a link to contact site support if it is unavailable to this user. This would be where the site has
-        // disabled support, or limited it to authenticated users and the current user is a guest or not logged in.
-        if (!isset($CFG->supportavailability) ||
-                $CFG->supportavailability == CONTACT_SUPPORT_DISABLED ||
-                ($CFG->supportavailability == CONTACT_SUPPORT_AUTHENTICATED && (!isloggedin() || isguestuser()))) {
-            return '';
-        }
-
-        $label = get_string('contactsitesupport', 'admin');
-        $icon = $this->pix_icon('t/email', '');
-
-        if (!$embed) {
-            $content = $icon . $label;
-        } else {
-            $content = $label;
-        }
-
-        if (!empty($CFG->supportpage)) {
-            $attributes = ['href' => $CFG->supportpage, 'target' => 'blank'];
-            $content .= $this->pix_icon('i/externallink', '', 'moodle', ['class' => 'ml-1']);
-        } else {
-            $attributes = ['href' => $CFG->wwwroot . '/user/contactsitesupport.php'];
-        }
-
-        $attributes += $customattribs;
-
-        return html_writer::tag('a', $content, $attributes);
-    }
-
-    /**
-     * Returns the services and support link for the help pop-up.
-     *
-     * @return string
-     */
-    public function services_support_link(): string {
-        global $CFG;
-
-        if (during_initial_install() ||
-            (isset($CFG->showservicesandsupportcontent) && $CFG->showservicesandsupportcontent == false) ||
-            !is_siteadmin()) {
-            return '';
-        }
-
-        $liferingicon = $this->pix_icon('t/life-ring', '', 'moodle', ['class' => 'fa fa-life-ring']);
-        $newwindowicon = $this->pix_icon('i/externallink', get_string('opensinnewwindow'), 'moodle', ['class' => 'ml-1']);
-        $link = !empty($CFG->servicespage)
-            ? $CFG->servicespage
-            : 'https://moodle.com/help/?utm_source=CTA-banner&utm_medium=platform&utm_campaign=name~Moodle4+cat~lms+mp~no';
-        $content = $liferingicon . get_string('moodleservicesandsupport') . $newwindowicon;
-
-        return html_writer::tag('a', $content, ['target' => '_blank', 'href' => $link]);
-    }
-
-    /**
-     * Helper function to decide whether to show the help popover header or not.
-     *
-     * @return bool
-     */
-    public function has_popover_links(): bool {
-        return !empty($this->services_support_link()) || !empty($this->page_doc_link()) || !empty($this->supportemail());
-    }
-
-    /**
-     * Helper function to decide whether to show the communication link or not.
-     *
-     * @return bool
-     */
-    public function has_communication_links(): bool {
-        if (during_initial_install() || !core_communication\api::is_available()) {
-            return false;
-        }
-        return !empty($this->communication_link());
-    }
-
-    /**
-     * Returns the communication link, complete with html.
-     *
-     * @return string
-     */
-    public function communication_link(): string {
-        $link = $this->communication_url() ?? '';
-        $commicon = $this->pix_icon('t/messages-o', '', 'moodle', ['class' => 'fa fa-comments']);
-        $newwindowicon = $this->pix_icon('i/externallink', get_string('opensinnewwindow'), 'moodle', ['class' => 'ml-1']);
-        $content = $commicon . get_string('communicationroomlink', 'course') . $newwindowicon;
-        $html = html_writer::tag('a', $content, ['target' => '_blank', 'href' => $link]);
-
-        return !empty($link) ? $html : '';
-    }
-
-    /**
-     * Returns the communication url for a given instance if it exists.
-     *
-     * @return string
-     */
-    public function communication_url(): string {
-        global $COURSE;
-        return \core_communication\helper::get_course_communication_url($COURSE);
-    }
-
-    /**
-     * Returns the page heading menu.
-     *
-     * @since Moodle 2.5.1 2.6
-     * @return string HTML.
-     */
-    public function page_heading_menu() {
-        return $this->page->headingmenu;
-    }
-
-    /**
-     * Returns the title to use on the page.
-     *
-     * @since Moodle 2.5.1 2.6
-     * @return string
-     */
-    public function page_title() {
-        return $this->page->title;
-    }
-
-    /**
-     * Returns the moodle_url for the favicon.
-     *
-     * @since Moodle 2.5.1 2.6
-     * @return moodle_url The moodle_url for the favicon
-     */
-    public function favicon() {
-        $logo = null;
-        if (!during_initial_install()) {
-            $logo = get_config('core_admin', 'favicon');
-        }
-        if (empty($logo)) {
-            return $this->image_url('favicon', 'theme');
-        }
-
-        // Use $CFG->themerev to prevent browser caching when the file changes.
-        return moodle_url::make_pluginfile_url(context_system::instance()->id, 'core_admin', 'favicon', '64x64/',
-            theme_get_revision(), $logo);
-    }
-
-    /**
-     * Renders preferences groups.
-     *
-     * @param  preferences_groups $renderable The renderable
-     * @return string The output.
-     */
-    public function render_preferences_groups(preferences_groups $renderable) {
-        return $this->render_from_template('core/preferences_groups', $renderable);
-    }
-
-    /**
-     * Renders preferences group.
-     *
-     * @param  preferences_group $renderable The renderable
-     * @return string The output.
-     */
-    public function render_preferences_group(preferences_group $renderable) {
-        $html = '';
-        $html .= html_writer::start_tag('div', array('class' => 'col-sm-4 preferences-group'));
-        $html .= $this->heading($renderable->title, 3);
-        $html .= html_writer::start_tag('ul');
-        foreach ($renderable->nodes as $node) {
-            if ($node->has_children()) {
-                debugging('Preferences nodes do not support children', DEBUG_DEVELOPER);
-            }
-            $html .= html_writer::tag('li', $this->render($node));
-        }
-        $html .= html_writer::end_tag('ul');
-        $html .= html_writer::end_tag('div');
-        return $html;
-    }
-
-    public function context_header($headerinfo = null, $headinglevel = 1) {
-        global $DB, $USER, $CFG, $SITE;
-        require_once($CFG->dirroot . '/user/lib.php');
-        $context = $this->page->context;
-        $heading = null;
-        $imagedata = null;
-        $subheader = null;
-        $userbuttons = null;
-
-        // Make sure to use the heading if it has been set.
-        if (isset($headerinfo['heading'])) {
-            $heading = $headerinfo['heading'];
-        } else {
-            $heading = $this->page->heading;
-        }
-
-        // The user context currently has images and buttons. Other contexts may follow.
-        if ((isset($headerinfo['user']) || $context->contextlevel == CONTEXT_USER) && $this->page->pagetype !== 'my-index') {
-            if (isset($headerinfo['user'])) {
-                $user = $headerinfo['user'];
-            } else {
-                // Look up the user information if it is not supplied.
-                $user = $DB->get_record('user', array('id' => $context->instanceid));
-            }
-
-            // If the user context is set, then use that for capability checks.
-            if (isset($headerinfo['usercontext'])) {
-                $context = $headerinfo['usercontext'];
-            }
-
-            // Only provide user information if the user is the current user, or a user which the current user can view.
-            // When checking user_can_view_profile(), either:
-            // If the page context is course, check the course context (from the page object) or;
-            // If page context is NOT course, then check across all courses.
-            $course = ($this->page->context->contextlevel == CONTEXT_COURSE) ? $this->page->course : null;
-
-            if (user_can_view_profile($user, $course)) {
-                // Use the user's full name if the heading isn't set.
-                if (empty($heading)) {
-                    $heading = fullname($user);
-                }
-
-                $imagedata = $this->user_picture($user, array('size' => 100));
-
-                // Check to see if we should be displaying a message button.
-                if (!empty($CFG->messaging) && has_capability('moodle/site:sendmessage', $context)) {
-                    $userbuttons = array(
-                        'messages' => array(
-                            'buttontype' => 'message',
-                            'title' => get_string('message', 'message'),
-                            'url' => new moodle_url('/message/index.php', array('id' => $user->id)),
-                            'image' => 'message',
-                            'linkattributes' => \core_message\helper::messageuser_link_params($user->id),
-                            'page' => $this->page
-                        )
-                    );
-
-                    if ($USER->id != $user->id) {
-                        $iscontact = \core_message\api::is_contact($USER->id, $user->id);
-                        $isrequested = \core_message\api::get_contact_requests_between_users($USER->id, $user->id);
-                        $contacturlaction = '';
-                        $linkattributes = \core_message\helper::togglecontact_link_params(
-                            $user,
-                            $iscontact,
-                            true,
-                            !empty($isrequested),
-                        );
-                        // If the user is not a contact.
-                        if (!$iscontact) {
-                            if ($isrequested) {
-                                // We just need the first request.
-                                $requests = array_shift($isrequested);
-                                if ($requests->userid == $USER->id) {
-                                    // If the user has requested to be a contact.
-                                    $contacttitle = 'contactrequestsent';
-                                } else {
-                                    // If the user has been requested to be a contact.
-                                    $contacttitle = 'waitingforcontactaccept';
-                                }
-                                $linkattributes = array_merge($linkattributes, [
-                                    'class' => 'disabled',
-                                    'tabindex' => '-1',
-                                ]);
-                            } else {
-                                // If the user is not a contact and has not requested to be a contact.
-                                $contacttitle = 'addtoyourcontacts';
-                                $contacturlaction = 'addcontact';
-                            }
-                            $contactimage = 'addcontact';
-                        } else {
-                            // If the user is a contact.
-                            $contacttitle = 'removefromyourcontacts';
-                            $contacturlaction = 'removecontact';
-                            $contactimage = 'removecontact';
-                        }
-                        $userbuttons['togglecontact'] = array(
-                                'buttontype' => 'togglecontact',
-                                'title' => get_string($contacttitle, 'message'),
-                                'url' => new moodle_url('/message/index.php', array(
-                                        'user1' => $USER->id,
-                                        'user2' => $user->id,
-                                        $contacturlaction => $user->id,
-                                        'sesskey' => sesskey())
-                                ),
-                                'image' => $contactimage,
-                                'linkattributes' => $linkattributes,
-                                'page' => $this->page
-                            );
-                    }
-                }
-            } else {
-                $heading = null;
-            }
-        }
-
-        // Return the heading wrapped in an sr-only element so it is only visible to screen-readers for nocontextheader layouts.
-        if (!empty($this->page->layout_options['nocontextheader'])) {
-            return html_writer::div($heading, 'sr-only');
-        }
-
-        $contextheader = new context_header($heading, $headinglevel, $imagedata, $userbuttons);
-        return $this->render($contextheader);
-    }
-
-    /**
-     * Renders the skip links for the page.
-     *
-     * @param array $links List of skip links.
-     * @return string HTML for the skip links.
-     */
-    public function render_skip_links($links) {
-        $context = [ 'links' => []];
-
-        foreach ($links as $url => $text) {
-            $context['links'][] = [ 'url' => $url, 'text' => $text];
-        }
-
-        return $this->render_from_template('core/skip_links', $context);
-    }
-
-    /**
-     * Wrapper for header elements.
-     *
-     * @return string HTML to display the main header.
-     */
-    public function full_header() {
-        $pagetype = $this->page->pagetype;
-        $homepage = get_home_page();
-        $homepagetype = null;
-        // Add a special case since /my/courses is a part of the /my subsystem.
-        if ($homepage == HOMEPAGE_MY || $homepage == HOMEPAGE_MYCOURSES) {
-            $homepagetype = 'my-index';
-        } else if ($homepage == HOMEPAGE_SITE) {
-            $homepagetype = 'site-index';
-        }
-        if ($this->page->include_region_main_settings_in_header_actions() &&
-                !$this->page->blocks->is_block_present('settings')) {
-            // Only include the region main settings if the page has requested it and it doesn't already have
-            // the settings block on it. The region main settings are included in the settings block and
-            // duplicating the content causes behat failures.
-            $this->page->add_header_action(html_writer::div(
-                $this->region_main_settings_menu(),
-                'd-print-none',
-                ['id' => 'region-main-settings-menu']
-            ));
-        }
-
-        $header = new stdClass();
-        $header->settingsmenu = $this->context_header_settings_menu();
-        $header->contextheader = $this->context_header();
-        $header->hasnavbar = empty($this->page->layout_options['nonavbar']);
-        $header->navbar = $this->navbar();
-        $header->pageheadingbutton = $this->page_heading_button();
-        $header->courseheader = $this->course_header();
-        $header->headeractions = $this->page->get_header_actions();
-        if (!empty($pagetype) && !empty($homepagetype) && $pagetype == $homepagetype) {
-            $header->welcomemessage = \core_user::welcome_message();
-        }
-        return $this->render_from_template('core/full_header', $header);
-    }
-
-    /**
-     * This is an optional menu that can be added to a layout by a theme. It contains the
-     * menu for the course administration, only on the course main page.
-     *
-     * @return string
-     */
-    public function context_header_settings_menu() {
-        $context = $this->page->context;
-        $menu = new action_menu();
-
-        $items = $this->page->navbar->get_items();
-        $currentnode = end($items);
-
-        $showcoursemenu = false;
-        $showfrontpagemenu = false;
-        $showusermenu = false;
-
-        // We are on the course home page.
-        if (($context->contextlevel == CONTEXT_COURSE) &&
-                !empty($currentnode) &&
-                ($currentnode->type == navigation_node::TYPE_COURSE || $currentnode->type == navigation_node::TYPE_SECTION)) {
-            $showcoursemenu = true;
-        }
-
-        $courseformat = course_get_format($this->page->course);
-        // This is a single activity course format, always show the course menu on the activity main page.
-        if ($context->contextlevel == CONTEXT_MODULE &&
-                !$courseformat->has_view_page()) {
-
-            $this->page->navigation->initialise();
-            $activenode = $this->page->navigation->find_active_node();
-            // If the settings menu has been forced then show the menu.
-            if ($this->page->is_settings_menu_forced()) {
-                $showcoursemenu = true;
-            } else if (!empty($activenode) && ($activenode->type == navigation_node::TYPE_ACTIVITY ||
-                            $activenode->type == navigation_node::TYPE_RESOURCE)) {
-
-                // We only want to show the menu on the first page of the activity. This means
-                // the breadcrumb has no additional nodes.
-                if ($currentnode && ($currentnode->key == $activenode->key && $currentnode->type == $activenode->type)) {
-                    $showcoursemenu = true;
-                }
-            }
-        }
-
-        // This is the site front page.
-        if ($context->contextlevel == CONTEXT_COURSE &&
-                !empty($currentnode) &&
-                $currentnode->key === 'home') {
-            $showfrontpagemenu = true;
-        }
-
-        // This is the user profile page.
-        if ($context->contextlevel == CONTEXT_USER &&
-                !empty($currentnode) &&
-                ($currentnode->key === 'myprofile')) {
-            $showusermenu = true;
-        }
-
-        if ($showfrontpagemenu) {
-            $settingsnode = $this->page->settingsnav->find('frontpage', navigation_node::TYPE_SETTING);
-            if ($settingsnode) {
-                // Build an action menu based on the visible nodes from this navigation tree.
-                $skipped = $this->build_action_menu_from_navigation($menu, $settingsnode, false, true);
-
-                // We only add a list to the full settings menu if we didn't include every node in the short menu.
-                if ($skipped) {
-                    $text = get_string('morenavigationlinks');
-                    $url = new moodle_url('/course/admin.php', array('courseid' => $this->page->course->id));
-                    $link = new action_link($url, $text, null, null, new pix_icon('t/edit', $text));
-                    $menu->add_secondary_action($link);
-                }
-            }
-        } else if ($showcoursemenu) {
-            $settingsnode = $this->page->settingsnav->find('courseadmin', navigation_node::TYPE_COURSE);
-            if ($settingsnode) {
-                // Build an action menu based on the visible nodes from this navigation tree.
-                $skipped = $this->build_action_menu_from_navigation($menu, $settingsnode, false, true);
-
-                // We only add a list to the full settings menu if we didn't include every node in the short menu.
-                if ($skipped) {
-                    $text = get_string('morenavigationlinks');
-                    $url = new moodle_url('/course/admin.php', array('courseid' => $this->page->course->id));
-                    $link = new action_link($url, $text, null, null, new pix_icon('t/edit', $text));
-                    $menu->add_secondary_action($link);
-                }
-            }
-        } else if ($showusermenu) {
-            // Get the course admin node from the settings navigation.
-            $settingsnode = $this->page->settingsnav->find('useraccount', navigation_node::TYPE_CONTAINER);
-            if ($settingsnode) {
-                // Build an action menu based on the visible nodes from this navigation tree.
-                $this->build_action_menu_from_navigation($menu, $settingsnode);
-            }
-        }
-
-        return $this->render($menu);
-    }
-
-    /**
-     * Take a node in the nav tree and make an action menu out of it.
-     * The links are injected in the action menu.
-     *
-     * @param action_menu $menu
-     * @param navigation_node $node
-     * @param boolean $indent
-     * @param boolean $onlytopleafnodes
-     * @return boolean nodesskipped - True if nodes were skipped in building the menu
-     */
-    protected function build_action_menu_from_navigation(action_menu $menu,
-            navigation_node $node,
-            $indent = false,
-            $onlytopleafnodes = false) {
-        $skipped = false;
-        // Build an action menu based on the visible nodes from this navigation tree.
-        foreach ($node->children as $menuitem) {
-            if ($menuitem->display) {
-                if ($onlytopleafnodes && $menuitem->children->count()) {
-                    $skipped = true;
-                    continue;
-                }
-                if ($menuitem->action) {
-                    if ($menuitem->action instanceof action_link) {
-                        $link = $menuitem->action;
-                        // Give preference to setting icon over action icon.
-                        if (!empty($menuitem->icon)) {
-                            $link->icon = $menuitem->icon;
-                        }
-                    } else {
-                        $link = new action_link($menuitem->action, $menuitem->text, null, null, $menuitem->icon);
-                    }
-                } else {
-                    if ($onlytopleafnodes) {
-                        $skipped = true;
-                        continue;
-                    }
-                    $link = new action_link(new moodle_url('#'), $menuitem->text, null, ['disabled' => true], $menuitem->icon);
-                }
-                if ($indent) {
-                    $link->add_class('ml-4');
-                }
-                if (!empty($menuitem->classes)) {
-                    $link->add_class(implode(" ", $menuitem->classes));
-                }
-
-                $menu->add_secondary_action($link);
-                $skipped = $skipped || $this->build_action_menu_from_navigation($menu, $menuitem, true);
-            }
-        }
-        return $skipped;
-    }
-
-    /**
-     * This is an optional menu that can be added to a layout by a theme. It contains the
-     * menu for the most specific thing from the settings block. E.g. Module administration.
-     *
-     * @return string
-     */
-    public function region_main_settings_menu() {
-        $context = $this->page->context;
-        $menu = new action_menu();
-
-        if ($context->contextlevel == CONTEXT_MODULE) {
-
-            $this->page->navigation->initialise();
-            $node = $this->page->navigation->find_active_node();
-            $buildmenu = false;
-            // If the settings menu has been forced then show the menu.
-            if ($this->page->is_settings_menu_forced()) {
-                $buildmenu = true;
-            } else if (!empty($node) && ($node->type == navigation_node::TYPE_ACTIVITY ||
-                            $node->type == navigation_node::TYPE_RESOURCE)) {
-
-                $items = $this->page->navbar->get_items();
-                $navbarnode = end($items);
-                // We only want to show the menu on the first page of the activity. This means
-                // the breadcrumb has no additional nodes.
-                if ($navbarnode && ($navbarnode->key === $node->key && $navbarnode->type == $node->type)) {
-                    $buildmenu = true;
-                }
-            }
-            if ($buildmenu) {
-                // Get the course admin node from the settings navigation.
-                $node = $this->page->settingsnav->find('modulesettings', navigation_node::TYPE_SETTING);
-                if ($node) {
-                    // Build an action menu based on the visible nodes from this navigation tree.
-                    $this->build_action_menu_from_navigation($menu, $node);
-                }
-            }
-
-        } else if ($context->contextlevel == CONTEXT_COURSECAT) {
-            // For course category context, show category settings menu, if we're on the course category page.
-            if ($this->page->pagetype === 'course-index-category') {
-                $node = $this->page->settingsnav->find('categorysettings', navigation_node::TYPE_CONTAINER);
-                if ($node) {
-                    // Build an action menu based on the visible nodes from this navigation tree.
-                    $this->build_action_menu_from_navigation($menu, $node);
-                }
-            }
-
-        } else {
-            $items = $this->page->navbar->get_items();
-            $navbarnode = end($items);
-
-            if ($navbarnode && ($navbarnode->key === 'participants')) {
-                $node = $this->page->settingsnav->find('users', navigation_node::TYPE_CONTAINER);
-                if ($node) {
-                    // Build an action menu based on the visible nodes from this navigation tree.
-                    $this->build_action_menu_from_navigation($menu, $node);
-                }
-
-            }
-        }
-        return $this->render($menu);
-    }
-
-    /**
-     * Displays the list of tags associated with an entry
-     *
-     * @param array $tags list of instances of core_tag or stdClass
-     * @param string $label label to display in front, by default 'Tags' (get_string('tags')), set to null
-     *               to use default, set to '' (empty string) to omit the label completely
-     * @param string $classes additional classes for the enclosing div element
-     * @param int $limit limit the number of tags to display, if size of $tags is more than this limit the "more" link
-     *               will be appended to the end, JS will toggle the rest of the tags
-     * @param context $pagecontext specify if needed to overwrite the current page context for the view tag link
-     * @param bool $accesshidelabel if true, the label should have class="accesshide" added.
-     * @return string
-     */
-    public function tag_list($tags, $label = null, $classes = '', $limit = 10,
-            $pagecontext = null, $accesshidelabel = false) {
-        $list = new \core_tag\output\taglist($tags, $label, $classes, $limit, $pagecontext, $accesshidelabel);
-        return $this->render_from_template('core_tag/taglist', $list->export_for_template($this));
-    }
-
-    /**
-     * Renders element for inline editing of any value
-     *
-     * @param \core\output\inplace_editable $element
-     * @return string
-     */
-    public function render_inplace_editable(\core\output\inplace_editable $element) {
-        return $this->render_from_template('core/inplace_editable', $element->export_for_template($this));
-    }
-
-    /**
-     * Renders a bar chart.
-     *
-     * @param \core\chart_bar $chart The chart.
-     * @return string
-     */
-    public function render_chart_bar(\core\chart_bar $chart) {
-        return $this->render_chart($chart);
-    }
-
-    /**
-     * Renders a line chart.
-     *
-     * @param \core\chart_line $chart The chart.
-     * @return string
-     */
-    public function render_chart_line(\core\chart_line $chart) {
-        return $this->render_chart($chart);
-    }
-
-    /**
-     * Renders a pie chart.
-     *
-     * @param \core\chart_pie $chart The chart.
-     * @return string
-     */
-    public function render_chart_pie(\core\chart_pie $chart) {
-        return $this->render_chart($chart);
-    }
-
-    /**
-     * Renders a chart.
-     *
-     * @param \core\chart_base $chart The chart.
-     * @param bool $withtable Whether to include a data table with the chart.
-     * @return string
-     */
-    public function render_chart(\core\chart_base $chart, $withtable = true) {
-        $chartdata = json_encode($chart);
-        return $this->render_from_template('core/chart', (object) [
-            'chartdata' => $chartdata,
-            'withtable' => $withtable
-        ]);
-    }
-
-    /**
-     * Renders the login form.
-     *
-     * @param \core_auth\output\login $form The renderable.
-     * @return string
-     */
-    public function render_login(\core_auth\output\login $form) {
-        global $CFG, $SITE;
-
-        $context = $form->export_for_template($this);
-
-        $context->errorformatted = $this->error_text($context->error);
-        $url = $this->get_logo_url();
-        if ($url) {
-            $url = $url->out(false);
-        }
-        $context->logourl = $url;
-        $context->sitename = format_string($SITE->fullname, true,
-                ['context' => context_course::instance(SITEID), "escape" => false]);
-
-        return $this->render_from_template('core/loginform', $context);
-    }
-
-    /**
-     * Renders an mform element from a template.
-     *
-     * @param HTML_QuickForm_element $element element
-     * @param bool $required if input is required field
-     * @param bool $advanced if input is an advanced field
-     * @param string $error error message to display
-     * @param bool $ingroup True if this element is rendered as part of a group
-     * @return mixed string|bool
-     */
-    public function mform_element($element, $required, $advanced, $error, $ingroup) {
-        $templatename = 'core_form/element-' . $element->getType();
-        if ($ingroup) {
-            $templatename .= "-inline";
-        }
-        try {
-            // We call this to generate a file not found exception if there is no template.
-            // We don't want to call export_for_template if there is no template.
-            core\output\mustache_template_finder::get_template_filepath($templatename);
-
-            if ($element instanceof templatable) {
-                $elementcontext = $element->export_for_template($this);
-
-                $helpbutton = '';
-                if (method_exists($element, 'getHelpButton')) {
-                    $helpbutton = $element->getHelpButton();
-                }
-                $label = $element->getLabel();
-                $text = '';
-                if (method_exists($element, 'getText')) {
-                    // There currently exists code that adds a form element with an empty label.
-                    // If this is the case then set the label to the description.
-                    if (empty($label)) {
-                        $label = $element->getText();
-                    } else {
-                        $text = $element->getText();
-                    }
-                }
-
-                // Generate the form element wrapper ids and names to pass to the template.
-                // This differs between group and non-group elements.
-                if ($element->getType() === 'group') {
-                    // Group element.
-                    // The id will be something like 'fgroup_id_NAME'. E.g. fgroup_id_mygroup.
-                    $elementcontext['wrapperid'] = $elementcontext['id'];
-
-                    // Ensure group elements pass through the group name as the element name.
-                    $elementcontext['name'] = $elementcontext['groupname'];
-                } else {
-                    // Non grouped element.
-                    // Creates an id like 'fitem_id_NAME'. E.g. fitem_id_mytextelement.
-                    $elementcontext['wrapperid'] = 'fitem_' . $elementcontext['id'];
-                }
-
-                $context = array(
-                    'element' => $elementcontext,
-                    'label' => $label,
-                    'text' => $text,
-                    'required' => $required,
-                    'advanced' => $advanced,
-                    'helpbutton' => $helpbutton,
-                    'error' => $error
-                );
-                return $this->render_from_template($templatename, $context);
-            }
-        } catch (Exception $e) {
-            // No template for this element.
-            return false;
-        }
-    }
-
-    /**
-     * Render the login signup form into a nice template for the theme.
-     *
-     * @param moodleform $form
-     * @return string
-     */
-    public function render_login_signup_form($form) {
-        global $SITE;
-
-        $context = $form->export_for_template($this);
-        $url = $this->get_logo_url();
-        if ($url) {
-            $url = $url->out(false);
-        }
-        $context['logourl'] = $url;
-        $context['sitename'] = format_string($SITE->fullname, true,
-                ['context' => context_course::instance(SITEID), "escape" => false]);
-
-        return $this->render_from_template('core/signup_form_layout', $context);
-    }
-
-    /**
-     * Render the verify age and location page into a nice template for the theme.
-     *
-     * @param \core_auth\output\verify_age_location_page $page The renderable
-     * @return string
-     */
-    protected function render_verify_age_location_page($page) {
-        $context = $page->export_for_template($this);
-
-        return $this->render_from_template('core/auth_verify_age_location_page', $context);
-    }
-
-    /**
-     * Render the digital minor contact information page into a nice template for the theme.
-     *
-     * @param \core_auth\output\digital_minor_page $page The renderable
-     * @return string
-     */
-    protected function render_digital_minor_page($page) {
-        $context = $page->export_for_template($this);
-
-        return $this->render_from_template('core/auth_digital_minor_page', $context);
-    }
-
-    /**
-     * Renders a progress bar.
-     *
-     * Do not use $OUTPUT->render($bar), instead use progress_bar::create().
-     *
-     * @param  progress_bar $bar The bar.
-     * @return string HTML fragment
-     */
-    public function render_progress_bar(progress_bar $bar) {
-        $data = $bar->export_for_template($this);
-        return $this->render_from_template('core/progress_bar', $data);
-    }
-
-    /**
-     * Renders an update to a progress bar.
-     *
-     * Note: This does not cleanly map to a renderable class and should
-     * never be used directly.
-     *
-     * @param  string $id
-     * @param  float $percent
-     * @param  string $msg Message
-     * @param  string $estimate time remaining message
-     * @return string ascii fragment
-     */
-    public function render_progress_bar_update(string $id, float $percent, string $msg, string $estimate): string {
-        return html_writer::script(js_writer::function_call('updateProgressBar', [
-            $id,
-            round($percent, 1),
-            $msg,
-            $estimate,
-        ]));
-    }
-
-    /**
-     * Renders element for a toggle-all checkbox.
-     *
-     * @param \core\output\checkbox_toggleall $element
-     * @return string
-     */
-    public function render_checkbox_toggleall(\core\output\checkbox_toggleall $element) {
-        return $this->render_from_template($element->get_template(), $element->export_for_template($this));
-    }
-
-    /**
-     * Renders the tertiary nav for the participants page
-     *
-     * @param object $course The course we are operating within
-     * @param string|null $renderedbuttons Any additional buttons/content to be displayed in line with the nav
-     * @return string
-     */
-    public function render_participants_tertiary_nav(object $course, ?string $renderedbuttons = null) {
-        $actionbar = new \core\output\participants_action_bar($course, $this->page, $renderedbuttons);
-        $content = $this->render_from_template('core_course/participants_actionbar', $actionbar->export_for_template($this));
-        return $content ?: "";
-    }
-
-    /**
-     * Renders release information in the footer popup
-     * @return ?string Moodle release info.
-     */
-    public function moodle_release() {
-        global $CFG;
-        if (!during_initial_install() && is_siteadmin()) {
-            return $CFG->release;
-        }
-    }
-
-    /**
-     * Generate the add block button when editing mode is turned on and the user can edit blocks.
-     *
-     * @param string $region where new blocks should be added.
-     * @return string html for the add block button.
-     */
-    public function addblockbutton($region = ''): string {
-        $addblockbutton = '';
-        $regions = $this->page->blocks->get_regions();
-        if (count($regions) == 0) {
-            return '';
-        }
-        if (isset($this->page->theme->addblockposition) &&
-                $this->page->user_is_editing() &&
-                $this->page->user_can_edit_blocks() &&
-                $this->page->pagelayout !== 'mycourses'
-        ) {
-            $params = ['bui_addblock' => '', 'sesskey' => sesskey()];
-            if (!empty($region)) {
-                $params['bui_blockregion'] = $region;
-            }
-            $url = new moodle_url($this->page->url, $params);
-            $addblockbutton = $this->render_from_template('core/add_block_button',
-                [
-                    'link' => $url->out(false),
-                    'escapedlink' => "?{$url->get_query_string(false)}",
-                    'pagehash' => $this->page->get_edited_page_hash(),
-                    'blockregion' => $region,
-                    // The following parameters are not used since Moodle 4.2 but are
-                    // still passed for backward-compatibility.
-                    'pageType' => $this->page->pagetype,
-                    'pageLayout' => $this->page->pagelayout,
-                    'subPage' => $this->page->subpage,
-                ]
-            );
-        }
-        return $addblockbutton;
-    }
-
-    /**
-     * Prepares an element for streaming output
-     *
-     * This must be used with NO_OUTPUT_BUFFERING set to true. After using this method
-     * any subsequent prints or echos to STDOUT result in the outputted content magically
-     * being appended inside that element rather than where the current html would be
-     * normally. This enables pages which take some time to render incremental content to
-     * first output a fully formed html page, including the footer, and to then stream
-     * into an element such as the main content div. This fixes a class of page layout
-     * bugs and reduces layout shift issues and was inspired by Facebook BigPipe.
-     *
-     * Some use cases such as a simple page which loads content via ajax could be swapped
-     * to this method wich saves another http request and its network latency resulting
-     * in both lower server load and better front end performance.
-     *
-     * You should consider giving the element you stream into a minimum height to further
-     * reduce layout shift as the content initally streams into the element.
-     *
-     * You can safely finish the output without closing the streamed element. You can also
-     * call this method again to swap the target of the streaming to a new element as
-     * often as you want.
-
-     * https://www.youtube.com/watch?v=LLRig4s1_yA&t=1022s
-     * Watch this video segment to explain how and why this 'One Weird Trick' works.
-     *
-     * @param string $selector where new content should be appended
-     * @param string $element which contains the streamed content
-     * @return string html to be written
-     */
-    public function select_element_for_append(string $selector = '#region-main [role=main]', string $element = 'div') {
-
-        if (!CLI_SCRIPT && !NO_OUTPUT_BUFFERING) {
-            throw new coding_exception('select_element_for_append used in a non-CLI script without setting NO_OUTPUT_BUFFERING.',
-                DEBUG_DEVELOPER);
-        }
-
-        // We are already streaming into this element so don't change anything.
-        if ($this->currentselector === $selector && $this->currentelement === $element) {
-            return;
-        }
-
-        // If we have a streaming element close it before starting a new one.
-        $html = $this->close_element_for_append();
-
-        $this->currentselector = $selector;
-        $this->currentelement = $element;
-
-        // Create an unclosed element for the streamed content to append into.
-        $id = uniqid();
-        $html .= html_writer::start_tag($element, ['id' => $id]);
-        $html .= html_writer::tag('script', "document.querySelector('$selector').append(document.getElementById('$id'))");
-        $html .= "\n";
-        return $html;
-    }
-
-    /**
-     * This closes any opened stream elements
-     *
-     * @return string html to be written
-     */
-    public function close_element_for_append() {
-        $html = '';
-        if ($this->currentselector !== '') {
-            $html .= html_writer::end_tag($this->currentelement);
-            $html .= "\n";
-            $this->currentelement = '';
-        }
-        return $html;
-    }
-
-    /**
-     * A companion method to select_element_for_append
-     *
-     * This must be used with NO_OUTPUT_BUFFERING set to true.
-     *
-     * This is similar but instead of appending into the element it replaces
-     * the content in the element. Depending on the 3rd argument it can replace
-     * the innerHTML or the outerHTML which can be useful to completely remove
-     * the element if needed.
-     *
-     * @param string $selector where new content should be replaced
-     * @param string $html A chunk of well formed html
-     * @param bool $outer Wether it replaces the innerHTML or the outerHTML
-     * @return string html to be written
-     */
-    public function select_element_for_replace(string $selector, string $html, bool $outer = false) {
-
-        if (!CLI_SCRIPT && !NO_OUTPUT_BUFFERING) {
-            throw new coding_exception('select_element_for_replace used in a non-CLI script without setting NO_OUTPUT_BUFFERING.',
-                DEBUG_DEVELOPER);
-        }
-
-        // Escape html for use inside a javascript string.
-        $html = addslashes_js($html);
-        $property = $outer ? 'outerHTML' : 'innerHTML';
-        $output = html_writer::tag('script', "document.querySelector('$selector').$property = '$html';");
-        $output .= "\n";
-        return $output;
-    }
-}
-
-/**
- * A renderer that generates output for command-line scripts.
- *
- * The implementation of this renderer is probably incomplete.
- *
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class core_renderer_cli extends core_renderer {
-
-    /**
-     * @var array $progressmaximums stores the largest percentage for a progress bar.
-     * @return string ascii fragment
-     */
-    private $progressmaximums = [];
-
-    /**
-     * Returns the page header.
-     *
-     * @return string HTML fragment
-     */
-    public function header() {
-        return $this->page->heading . "\n";
-    }
-
-    /**
-     * Renders a Check API result
-     *
-     * To aid in CLI consistency this status is NOT translated and the visual
-     * width is always exactly 10 chars.
-     *
-     * @param core\check\result $result
-     * @return string HTML fragment
-     */
-    protected function render_check_result(core\check\result $result) {
-        $status = $result->get_status();
-
-        $labels = [
-            core\check\result::NA        => '      ' . cli_ansi_format('<colour:darkGray>' ) . ' NA ',
-            core\check\result::OK        => '      ' . cli_ansi_format('<colour:green>') . ' OK ',
-            core\check\result::INFO      => '    '   . cli_ansi_format('<colour:blue>' ) . ' INFO ',
-            core\check\result::UNKNOWN   => ' '      . cli_ansi_format('<colour:darkGray>' ) . ' UNKNOWN ',
-            core\check\result::WARNING   => ' '      . cli_ansi_format('<colour:black><bgcolour:yellow>') . ' WARNING ',
-            core\check\result::ERROR     => '   '    . cli_ansi_format('<bgcolour:red>') . ' ERROR ',
-            core\check\result::CRITICAL  => ''       . cli_ansi_format('<bgcolour:red>') . ' CRITICAL ',
-        ];
-        $string = $labels[$status] . cli_ansi_format('<colour:normal>');
-        return $string;
-    }
-
-    /**
-     * Renders a Check API result
-     *
-     * @param core\check\result $result
-     * @return string fragment
-     */
-    public function check_result(core\check\result $result) {
-        return $this->render_check_result($result);
-    }
-
-    /**
-     * Renders a progress bar.
-     *
-     * Do not use $OUTPUT->render($bar), instead use progress_bar::create().
-     *
-     * @param  progress_bar $bar The bar.
-     * @return string ascii fragment
-     */
-    public function render_progress_bar(progress_bar $bar) {
-        global $CFG;
-
-        $size = 55; // The width of the progress bar in chars.
-        $ascii = "\n";
-
-        if (stream_isatty(STDOUT)) {
-            require_once($CFG->libdir.'/clilib.php');
-
-            $ascii .= "[" . str_repeat(' ', $size) . "] 0% \n";
-            return cli_ansi_format($ascii);
-        }
-
-        $this->progressmaximums[$bar->get_id()] = 0;
-        $ascii .= '[';
-        return $ascii;
-    }
-
-    /**
-     * Renders an update to a progress bar.
-     *
-     * Note: This does not cleanly map to a renderable class and should
-     * never be used directly.
-     *
-     * @param  string $id
-     * @param  float $percent
-     * @param  string $msg Message
-     * @param  string $estimate time remaining message
-     * @return string ascii fragment
-     */
-    public function render_progress_bar_update(string $id, float $percent, string $msg, string $estimate): string {
-        $size = 55; // The width of the progress bar in chars.
-        $ascii = '';
-
-        // If we are rendering to a terminal then we can safely use ansii codes
-        // to move the cursor and redraw the complete progress bar each time
-        // it is updated.
-        if (stream_isatty(STDOUT)) {
-            $colour = $percent == 100 ? 'green' : 'blue';
-
-            $done = $percent * $size * 0.01;
-            $whole = floor($done);
-            $bar = "<colour:$colour>";
-            $bar .= str_repeat('█', $whole);
-
-            if ($whole < $size) {
-                // By using unicode chars for partial blocks we can have higher
-                // precision progress bar.
-                $fraction = floor(($done - $whole) * 8);
-                $bar .= core_text::substr(' ▏▎▍▌▋▊▉', $fraction, 1);
-
-                // Fill the rest of the empty bar.
-                $bar .= str_repeat(' ', $size - $whole - 1);
-            }
-
-            $bar .= '<colour:normal>';
-
-            if ($estimate) {
-                $estimate = "- $estimate";
-            }
-
-            $ascii .= '<cursor:up>';
-            $ascii .= '<cursor:up>';
-            $ascii .= sprintf("[$bar] %3.1f%% %-22s\n", $percent, $estimate);
-            $ascii .= sprintf("%-80s\n", $msg);
-            return cli_ansi_format($ascii);
-        }
-
-        // If we are not rendering to a tty, ie when piped to another command
-        // or on windows we need to progressively render the progress bar
-        // which can only ever go forwards.
-        $done = round($percent * $size * 0.01);
-        $delta = max(0, $done - $this->progressmaximums[$id]);
-
-        $ascii .= str_repeat('#', $delta);
-        if ($percent >= 100 && $delta > 0) {
-            $ascii .= sprintf("] %3.1f%%", $percent) . "\n$msg\n";
-        }
-        $this->progressmaximums[$id] += $delta;
-        return $ascii;
-    }
-
-    /**
-     * Returns a template fragment representing a Heading.
-     *
-     * @param string $text The text of the heading
-     * @param int $level The level of importance of the heading
-     * @param string $classes A space-separated list of CSS classes
-     * @param string $id An optional ID
-     * @return string A template fragment for a heading
-     */
-    public function heading($text, $level = 2, $classes = 'main', $id = null) {
-        $text .= "\n";
-        switch ($level) {
-            case 1:
-                return '=>' . $text;
-            case 2:
-                return '-->' . $text;
-            default:
-                return $text;
-        }
-    }
-
-    /**
-     * Returns a template fragment representing a fatal error.
-     *
-     * @param string $message The message to output
-     * @param string $moreinfourl URL where more info can be found about the error
-     * @param string $link Link for the Continue button
-     * @param array $backtrace The execution backtrace
-     * @param string $debuginfo Debugging information
-     * @return string A template fragment for a fatal error
-     */
-    public function fatal_error($message, $moreinfourl, $link, $backtrace, $debuginfo = null, $errorcode = "") {
-        global $CFG;
-
-        $output = "!!! $message !!!\n";
-
-        if ($CFG->debugdeveloper) {
-            if (!empty($debuginfo)) {
-                $output .= $this->notification($debuginfo, 'notifytiny');
-            }
-            if (!empty($backtrace)) {
-                $output .= $this->notification('Stack trace: ' . format_backtrace($backtrace, true), 'notifytiny');
-            }
-        }
-
-        return $output;
-    }
-
-    /**
-     * Returns a template fragment representing a notification.
-     *
-     * @param string $message The message to print out.
-     * @param string $type    The type of notification. See constants on \core\output\notification.
-     * @param bool $closebutton Whether to show a close icon to remove the notification (default true).
-     * @return string A template fragment for a notification
-     */
-    public function notification($message, $type = null, $closebutton = true) {
-        $message = clean_text($message);
-        if ($type === 'notifysuccess' || $type === 'success') {
-            return "++ $message ++\n";
-        }
-        return "!! $message !!\n";
-    }
-
-    /**
-     * There is no footer for a cli request, however we must override the
-     * footer method to prevent the default footer.
-     */
-    public function footer() {}
-
-    /**
-     * Render a notification (that is, a status message about something that has
-     * just happened).
-     *
-     * @param \core\output\notification $notification the notification to print out
-     * @return string plain text output
-     */
-    public function render_notification(\core\output\notification $notification) {
-        return $this->notification($notification->get_message(), $notification->get_message_type());
-    }
-}
-
-
-/**
- * A renderer that generates output for ajax scripts.
- *
- * This renderer prevents accidental sends back only json
- * encoded error messages, all other output is ignored.
- *
- * @copyright 2010 Petr Skoda
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class core_renderer_ajax extends core_renderer {
-
-    /**
-     * Returns a template fragment representing a fatal error.
-     *
-     * @param string $message The message to output
-     * @param string $moreinfourl URL where more info can be found about the error
-     * @param string $link Link for the Continue button
-     * @param array $backtrace The execution backtrace
-     * @param string $debuginfo Debugging information
-     * @return string A template fragment for a fatal error
-     */
-    public function fatal_error($message, $moreinfourl, $link, $backtrace, $debuginfo = null, $errorcode = "") {
-        global $CFG;
-
-        $this->page->set_context(null); // ugly hack - make sure page context is set to something, we do not want bogus warnings here
-
-        $e = new stdClass();
-        $e->error      = $message;
-        $e->errorcode  = $errorcode;
-        $e->stacktrace = NULL;
-        $e->debuginfo  = NULL;
-        $e->reproductionlink = NULL;
-        if (!empty($CFG->debug) and $CFG->debug >= DEBUG_DEVELOPER) {
-            $link = (string) $link;
-            if ($link) {
-                $e->reproductionlink = $link;
-            }
-            if (!empty($debuginfo)) {
-                $e->debuginfo = $debuginfo;
-            }
-            if (!empty($backtrace)) {
-                $e->stacktrace = format_backtrace($backtrace, true);
-            }
-        }
-        $this->header();
-        return json_encode($e);
-    }
-
-    /**
-     * Used to display a notification.
-     * For the AJAX notifications are discarded.
-     *
-     * @param string $message The message to print out.
-     * @param string $type    The type of notification. See constants on \core\output\notification.
-     * @param bool $closebutton Whether to show a close icon to remove the notification (default true).
-     */
-    public function notification($message, $type = null, $closebutton = true) {
-    }
-
-    /**
-     * Used to display a redirection message.
-     * AJAX redirections should not occur and as such redirection messages
-     * are discarded.
-     *
-     * @param moodle_url|string $encodedurl
-     * @param string $message
-     * @param int $delay
-     * @param bool $debugdisableredirect
-     * @param string $messagetype The type of notification to show the message in.
-     *         See constants on \core\output\notification.
-     */
-    public function redirect_message($encodedurl, $message, $delay, $debugdisableredirect,
-                                     $messagetype = \core\output\notification::NOTIFY_INFO) {}
-
-    /**
-     * Prepares the start of an AJAX output.
-     */
-    public function header() {
-        // unfortunately YUI iframe upload does not support application/json
-        if (!empty($_FILES)) {
-            @header('Content-type: text/plain; charset=utf-8');
-            if (!core_useragent::supports_json_contenttype()) {
-                @header('X-Content-Type-Options: nosniff');
-            }
-        } else if (!core_useragent::supports_json_contenttype()) {
-            @header('Content-type: text/plain; charset=utf-8');
-            @header('X-Content-Type-Options: nosniff');
-        } else {
-            @header('Content-type: application/json; charset=utf-8');
-        }
-
-        // Headers to make it not cacheable and json
-        @header('Cache-Control: no-store, no-cache, must-revalidate');
-        @header('Cache-Control: post-check=0, pre-check=0', false);
-        @header('Pragma: no-cache');
-        @header('Expires: Mon, 20 Aug 1969 09:23:00 GMT');
-        @header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
-        @header('Accept-Ranges: none');
-    }
-
-    /**
-     * There is no footer for an AJAX request, however we must override the
-     * footer method to prevent the default footer.
-     */
-    public function footer() {}
-
-    /**
-     * No need for headers in an AJAX request... this should never happen.
-     * @param string $text
-     * @param int $level
-     * @param string $classes
-     * @param string $id
-     */
-    public function heading($text, $level = 2, $classes = 'main', $id = null) {}
-}
-
-
-
-/**
- * The maintenance renderer.
- *
- * The purpose of this renderer is to block out the core renderer methods that are not usable when the site
- * is running a maintenance related task.
- * It must always extend the core_renderer as we switch from the core_renderer to this renderer in a couple of places.
- *
- * @since Moodle 2.6
- * @package core
- * @category output
- * @copyright 2013 Sam Hemelryk
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class core_renderer_maintenance extends core_renderer {
-
-    /**
-     * Initialises the renderer instance.
-     *
-     * @param moodle_page $page
-     * @param string $target
-     * @throws coding_exception
-     */
-    public function __construct(moodle_page $page, $target) {
-        if ($target !== RENDERER_TARGET_MAINTENANCE || $page->pagelayout !== 'maintenance') {
-            throw new coding_exception('Invalid request for the maintenance renderer.');
-        }
-        parent::__construct($page, $target);
-    }
-
-    /**
-     * Does nothing. The maintenance renderer cannot produce blocks.
-     *
-     * @param block_contents $bc
-     * @param string $region
-     * @return string
-     */
-    public function block(block_contents $bc, $region) {
-        return '';
-    }
-
-    /**
-     * Does nothing. The maintenance renderer cannot produce blocks.
-     *
-     * @param string $region
-     * @param array $classes
-     * @param string $tag
-     * @param boolean $fakeblocksonly
-     * @return string
-     */
-    public function blocks($region, $classes = array(), $tag = 'aside', $fakeblocksonly = false) {
-        return '';
-    }
-
-    /**
-     * Does nothing. The maintenance renderer cannot produce blocks.
-     *
-     * @param string $region
-     * @param boolean $fakeblocksonly Output fake block only.
-     * @return string
-     */
-    public function blocks_for_region($region, $fakeblocksonly = false) {
-        return '';
-    }
-
-    /**
-     * Does nothing. The maintenance renderer cannot produce a course content header.
-     *
-     * @param bool $onlyifnotcalledbefore
-     * @return string
-     */
-    public function course_content_header($onlyifnotcalledbefore = false) {
-        return '';
-    }
-
-    /**
-     * Does nothing. The maintenance renderer cannot produce a course content footer.
-     *
-     * @param bool $onlyifnotcalledbefore
-     * @return string
-     */
-    public function course_content_footer($onlyifnotcalledbefore = false) {
-        return '';
-    }
-
-    /**
-     * Does nothing. The maintenance renderer cannot produce a course header.
-     *
-     * @return string
-     */
-    public function course_header() {
-        return '';
-    }
-
-    /**
-     * Does nothing. The maintenance renderer cannot produce a course footer.
-     *
-     * @return string
-     */
-    public function course_footer() {
-        return '';
-    }
-
-    /**
-     * Does nothing. The maintenance renderer cannot produce a custom menu.
-     *
-     * @param string $custommenuitems
-     * @return string
-     */
-    public function custom_menu($custommenuitems = '') {
-        return '';
-    }
-
-    /**
-     * Does nothing. The maintenance renderer cannot produce a file picker.
-     *
-     * @param array $options
-     * @return string
-     */
-    public function file_picker($options) {
-        return '';
-    }
-
-    /**
-     * Overridden confirm message for upgrades.
-     *
-     * @param string $message The question to ask the user
-     * @param single_button|moodle_url|string $continue The single_button component representing the Continue answer.
-     * @param single_button|moodle_url|string $cancel The single_button component representing the Cancel answer.
-     * @param array $displayoptions optional extra display options
-     * @return string HTML fragment
-     */
-    public function confirm($message, $continue, $cancel, array $displayoptions = []) {
-        // We need plain styling of confirm boxes on upgrade because we don't know which stylesheet we have (it could be
-        // from any previous version of Moodle).
-        if ($continue instanceof single_button) {
-            $continue->type = single_button::BUTTON_PRIMARY;
-        } else if (is_string($continue)) {
-            $continue = new single_button(new moodle_url($continue), get_string('continue'), 'post',
-                $displayoptions['type'] ?? single_button::BUTTON_PRIMARY);
-        } else if ($continue instanceof moodle_url) {
-            $continue = new single_button($continue, get_string('continue'), 'post',
-                $displayoptions['type'] ?? single_button::BUTTON_PRIMARY);
-        } else {
-            throw new coding_exception('The continue param to $OUTPUT->confirm() must be either a URL' .
-                                       ' (string/moodle_url) or a single_button instance.');
-        }
-
-        if ($cancel instanceof single_button) {
-            $output = '';
-        } else if (is_string($cancel)) {
-            $cancel = new single_button(new moodle_url($cancel), get_string('cancel'), 'get');
-        } else if ($cancel instanceof moodle_url) {
-            $cancel = new single_button($cancel, get_string('cancel'), 'get');
-        } else {
-            throw new coding_exception('The cancel param to $OUTPUT->confirm() must be either a URL' .
-                                       ' (string/moodle_url) or a single_button instance.');
-        }
-
-        $output = $this->box_start('generalbox', 'notice');
-        $output .= html_writer::tag('h4', get_string('confirm'));
-        $output .= html_writer::tag('p', $message);
-        $output .= html_writer::tag('div', $this->render($cancel) . $this->render($continue), ['class' => 'buttons']);
-        $output .= $this->box_end();
-        return $output;
-    }
-
-    /**
-     * Does nothing. The maintenance renderer does not support JS.
-     *
-     * @param block_contents $bc
-     */
-    public function init_block_hider_js(block_contents $bc) {
-        // Does nothing.
-    }
-
-    /**
-     * Does nothing. The maintenance renderer cannot produce language menus.
-     *
-     * @return string
-     */
-    public function lang_menu() {
-        return '';
-    }
-
-    /**
-     * Does nothing. The maintenance renderer has no need for login information.
-     *
-     * @param mixed $withlinks
-     * @return string
-     */
-    public function login_info($withlinks = null) {
-        return '';
-    }
-
-    /**
-     * Secure login info.
-     *
-     * @return string
-     */
-    public function secure_login_info() {
-        return $this->login_info(false);
-    }
-
-    /**
-     * Does nothing. The maintenance renderer cannot produce user pictures.
-     *
-     * @param stdClass $user
-     * @param array $options
-     * @return string
-     */
-    public function user_picture(stdClass $user, array $options = null) {
-        return '';
-    }
-}
+// This file is deprecated, but it should never have been manually included by anything outside of lib/outputlib.php.
+// Throwing an exception here should be fine because removing the manual inclusion should have no impact.
+throw new \core\exception\coding_exception(
+    'This file should not be manually included by any component.',
+);
diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php
index 6ca4c759613c1..0fdca282e68ed 100644
--- a/lib/outputrequirementslib.php
+++ b/lib/outputrequirementslib.php
@@ -14,2184 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Library functions to facilitate the use of JavaScript in Moodle.
- *
- * Note: you can find history of this file in lib/ajax/ajaxlib.php
- *
- * @copyright 2009 Tim Hunt, 2010 Petr Skoda
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package core
- * @category output
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * This class tracks all the things that are needed by the current page.
- *
- * Normally, the only instance of this  class you will need to work with is the
- * one accessible via $PAGE->requires.
- *
- * Typical usage would be
- * <pre>
- *     $PAGE->requires->js_call_amd('mod_forum/view', 'init');
- * </pre>
- *
- * It also supports obsoleted coding style with/without YUI3 modules.
- * <pre>
- *     $PAGE->requires->js_init_call('M.mod_forum.init_view');
- *     $PAGE->requires->css('/mod/mymod/userstyles.php?id='.$id); // not overridable via themes!
- *     $PAGE->requires->js('/mod/mymod/script.js');
- *     $PAGE->requires->js('/mod/mymod/small_but_urgent.js', true);
- *     $PAGE->requires->js_function_call('init_mymod', array($data), true);
- * </pre>
- *
- * There are some natural restrictions on some methods. For example, {@link css()}
- * can only be called before the <head> tag is output. See the comments on the
- * individual methods for details.
- *
- * @copyright 2009 Tim Hunt, 2010 Petr Skoda
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.0
- * @package core
- * @category output
- */
-class page_requirements_manager {
-
-    /**
-     * @var array List of string available from JS
-     */
-    protected $stringsforjs = array();
-
-    /**
-     * @var array List of get_string $a parameters - used for validation only.
-     */
-    protected $stringsforjs_as = array();
-
-    /**
-     * @var array List of JS variables to be initialised
-     */
-    protected $jsinitvariables = array('head'=>array(), 'footer'=>array());
-
-    /**
-     * @var array Included JS scripts
-     */
-    protected $jsincludes = array('head'=>array(), 'footer'=>array());
-
-    /**
-     * @var array Inline scripts using RequireJS module loading.
-     */
-    protected $amdjscode = array('');
-
-    /**
-     * @var array List of needed function calls
-     */
-    protected $jscalls = array('normal'=>array(), 'ondomready'=>array());
-
-    /**
-     * @var array List of skip links, those are needed for accessibility reasons
-     */
-    protected $skiplinks = array();
-
-    /**
-     * @var array Javascript code used for initialisation of page, it should
-     * be relatively small
-     */
-    protected $jsinitcode = array();
-
-    /**
-     * @var array of moodle_url Theme sheets, initialised only from core_renderer
-     */
-    protected $cssthemeurls = array();
-
-    /**
-     * @var array of moodle_url List of custom theme sheets, these are strongly discouraged!
-     * Useful mostly only for CSS submitted by teachers that is not part of the theme.
-     */
-    protected $cssurls = array();
-
-    /**
-     * @var array List of requested event handlers
-     */
-    protected $eventhandlers = array();
-
-    /**
-     * @var array Extra modules
-     */
-    protected $extramodules = array();
-
-    /**
-     * @var array trackes the names of bits of HTML that are only required once
-     * per page. See {@link has_one_time_item_been_created()},
-     * {@link set_one_time_item_created()} and {@link should_create_one_time_item_now()}.
-     */
-    protected $onetimeitemsoutput = array();
-
-    /**
-     * @var bool Flag indicated head stuff already printed
-     */
-    protected $headdone = false;
-
-    /**
-     * @var bool Flag indicating top of body already printed
-     */
-    protected $topofbodydone = false;
-
-    /**
-     * @var stdClass YUI PHPLoader instance responsible for YUI3 loading from PHP only
-     */
-    protected $yui3loader;
-
-    /**
-     * @var YUI_config default YUI loader configuration
-     */
-    protected $YUI_config;
-
-    /**
-     * @var array $yuicssmodules
-     */
-    protected $yuicssmodules = array();
-
-    /**
-     * @var array Some config vars exposed in JS, please no secret stuff there
-     */
-    protected $M_cfg;
-
-    /**
-     * @var array list of requested jQuery plugins
-     */
-    protected $jqueryplugins = array();
-
-    /**
-     * @var array list of jQuery plugin overrides
-     */
-    protected $jquerypluginoverrides = array();
-
-    /**
-     * Page requirements constructor.
-     */
-    public function __construct() {
-        global $CFG;
-
-        // You may need to set up URL rewrite rule because oversized URLs might not be allowed by web server.
-        $sep = empty($CFG->yuislasharguments) ? '?' : '/';
-
-        $this->yui3loader = new stdClass();
-        $this->YUI_config = new YUI_config();
-
-        // Set up some loader options.
-        $this->yui3loader->local_base = $CFG->wwwroot . '/lib/yuilib/'. $CFG->yui3version . '/';
-        $this->yui3loader->local_comboBase = $CFG->wwwroot . '/theme/yui_combo.php'.$sep;
-
-        $this->yui3loader->base = $this->yui3loader->local_base;
-        $this->yui3loader->comboBase = $this->yui3loader->local_comboBase;
-
-        // Enable combo loader? This significantly helps with caching and performance!
-        $this->yui3loader->combine = !empty($CFG->yuicomboloading);
-
-        $jsrev = $this->get_jsrev();
-
-        // Set up JS YUI loader helper object.
-        $this->YUI_config->base         = $this->yui3loader->base;
-        $this->YUI_config->comboBase    = $this->yui3loader->comboBase;
-        $this->YUI_config->combine      = $this->yui3loader->combine;
-
-        // If we've had to patch any YUI modules between releases, we must override the YUI configuration to include them.
-        if (!empty($CFG->yuipatchedmodules) && !empty($CFG->yuipatchlevel)) {
-            $this->YUI_config->define_patched_core_modules($this->yui3loader->local_comboBase,
-                    $CFG->yui3version,
-                    $CFG->yuipatchlevel,
-                    $CFG->yuipatchedmodules);
-        }
-
-        $configname = $this->YUI_config->set_config_source('lib/yui/config/yui2.js');
-        $this->YUI_config->add_group('yui2', array(
-            // Loader configuration for our 2in3.
-            'base' => $CFG->wwwroot . '/lib/yuilib/2in3/' . $CFG->yui2version . '/build/',
-            'comboBase' => $CFG->wwwroot . '/theme/yui_combo.php'.$sep,
-            'combine' => $this->yui3loader->combine,
-            'ext' => false,
-            'root' => '2in3/' . $CFG->yui2version .'/build/',
-            'patterns' => array(
-                'yui2-' => array(
-                    'group' => 'yui2',
-                    'configFn' => $configname,
-                )
-            )
-        ));
-        $configname = $this->YUI_config->set_config_source('lib/yui/config/moodle.js');
-        $this->YUI_config->add_group('moodle', array(
-            'name' => 'moodle',
-            'base' => $CFG->wwwroot . '/theme/yui_combo.php' . $sep . 'm/' . $jsrev . '/',
-            'combine' => $this->yui3loader->combine,
-            'comboBase' => $CFG->wwwroot . '/theme/yui_combo.php'.$sep,
-            'ext' => false,
-            'root' => 'm/'.$jsrev.'/', // Add the rev to the root path so that we can control caching.
-            'patterns' => array(
-                'moodle-' => array(
-                    'group' => 'moodle',
-                    'configFn' => $configname,
-                )
-            )
-        ));
-
-        $this->YUI_config->add_group('gallery', array(
-            'name' => 'gallery',
-            'base' => $CFG->wwwroot . '/lib/yuilib/gallery/',
-            'combine' => $this->yui3loader->combine,
-            'comboBase' => $CFG->wwwroot . '/theme/yui_combo.php' . $sep,
-            'ext' => false,
-            'root' => 'gallery/' . $jsrev . '/',
-            'patterns' => array(
-                'gallery-' => array(
-                    'group' => 'gallery',
-                )
-            )
-        ));
-
-        // Set some more loader options applying to groups too.
-        if ($CFG->debugdeveloper) {
-            // When debugging is enabled, we want to load the non-minified (RAW) versions of YUI library modules rather
-            // than the DEBUG versions as these generally generate too much logging for our purposes.
-            // However we do want the DEBUG versions of our Moodle-specific modules.
-            // To debug a YUI-specific issue, change the yui3loader->filter value to DEBUG.
-            $this->YUI_config->filter = 'RAW';
-            $this->YUI_config->groups['moodle']['filter'] = 'DEBUG';
-
-            // We use the yui3loader->filter setting when writing the YUI3 seed scripts into the header.
-            $this->yui3loader->filter = $this->YUI_config->filter;
-            $this->YUI_config->debug = true;
-        } else {
-            $this->yui3loader->filter = null;
-            $this->YUI_config->groups['moodle']['filter'] = null;
-            $this->YUI_config->debug = false;
-        }
-
-        // Include the YUI config log filters.
-        if (!empty($CFG->yuilogexclude) && is_array($CFG->yuilogexclude)) {
-            $this->YUI_config->logExclude = $CFG->yuilogexclude;
-        }
-        if (!empty($CFG->yuiloginclude) && is_array($CFG->yuiloginclude)) {
-            $this->YUI_config->logInclude = $CFG->yuiloginclude;
-        }
-        if (!empty($CFG->yuiloglevel)) {
-            $this->YUI_config->logLevel = $CFG->yuiloglevel;
-        }
-
-        // Add the moodle group's module data.
-        $this->YUI_config->add_moodle_metadata();
-
-        // Every page should include definition of following modules.
-        $this->js_module($this->find_module('core_filepicker'));
-        $this->js_module($this->find_module('core_comment'));
-    }
-
-    /**
-     * Return the safe config values that get set for javascript in "M.cfg".
-     *
-     * @since 2.9
-     * @return array List of safe config values that are available to javascript.
-     */
-    public function get_config_for_javascript(moodle_page $page, renderer_base $renderer) {
-        global $CFG;
-
-        if (empty($this->M_cfg)) {
-
-            $iconsystem = \core\output\icon_system::instance();
-
-            // It is possible that the $page->context is null, so we can't use $page->context->id.
-            $contextid = null;
-            $contextinstanceid = null;
-            if (!is_null($page->context)) {
-                $contextid = $page->context->id;
-                $contextinstanceid = $page->context->instanceid;
-                $courseid = $page->course->id;
-                $coursecontext = context_course::instance($courseid);
-            }
-
-            $this->M_cfg = array(
-                'wwwroot'               => $CFG->wwwroot,
-                'homeurl'               => $page->navigation->action,
-                'sesskey'               => sesskey(),
-                'sessiontimeout'        => $CFG->sessiontimeout,
-                'sessiontimeoutwarning' => $CFG->sessiontimeoutwarning,
-                'themerev'              => theme_get_revision(),
-                'slasharguments'        => (int)(!empty($CFG->slasharguments)),
-                'theme'                 => $page->theme->name,
-                'iconsystemmodule'      => $iconsystem->get_amd_name(),
-                'jsrev'                 => $this->get_jsrev(),
-                'admin'                 => $CFG->admin,
-                'svgicons'              => $page->theme->use_svg_icons(),
-                'usertimezone'          => usertimezone(),
-                'language'              => current_language(),
-                'courseId'              => isset($courseid) ? (int) $courseid : 0,
-                'courseContextId'       => isset($coursecontext) ? $coursecontext->id : 0,
-                'contextid'             => $contextid,
-                'contextInstanceId'     => (int) $contextinstanceid,
-                'langrev'               => get_string_manager()->get_revision(),
-                'templaterev'           => $this->get_templaterev(),
-                'siteId'                => (int) SITEID,
-            );
-            if ($CFG->debugdeveloper) {
-                $this->M_cfg['developerdebug'] = true;
-            }
-            if (defined('BEHAT_SITE_RUNNING')) {
-                $this->M_cfg['behatsiterunning'] = true;
-            }
-
-        }
-        return $this->M_cfg;
-    }
-
-    /**
-     * Initialise with the bits of JavaScript that every Moodle page should have.
-     *
-     * @param moodle_page $page
-     * @param core_renderer $renderer
-     */
-    protected function init_requirements_data(moodle_page $page, core_renderer $renderer) {
-        global $CFG;
-
-        // Init the js config.
-        $this->get_config_for_javascript($page, $renderer);
-
-        // Accessibility stuff.
-        $this->skip_link_to('maincontent', get_string('tocontent', 'access'));
-
-        // Add strings used on many pages.
-        $this->string_for_js('confirmation', 'admin');
-        $this->string_for_js('cancel', 'moodle');
-        $this->string_for_js('yes', 'moodle');
-
-        // Alter links in top frame to break out of frames.
-        if ($page->pagelayout === 'frametop') {
-            $this->js_init_call('M.util.init_frametop');
-        }
-
-        // Include block drag/drop if editing is on
-        if ($page->user_is_editing()) {
-            $params = array(
-                'regions' => $page->blocks->get_regions(),
-                'pagehash' => $page->get_edited_page_hash(),
-            );
-            if (!empty($page->cm->id)) {
-                $params['cmid'] = $page->cm->id;
-            }
-            // Strings for drag and drop.
-            $this->strings_for_js(array('movecontent',
-                                        'tocontent',
-                                        'emptydragdropregion'),
-                                  'moodle');
-            $page->requires->yui_module('moodle-core-blocks', 'M.core_blocks.init_dragdrop', array($params), null, true);
-            $page->requires->js_call_amd('core_block/edit', 'init', ['pagehash' => $page->get_edited_page_hash()]);
-        }
-
-        // Include the YUI CSS Modules.
-        $page->requires->set_yuicssmodules($page->theme->yuicssmodules);
-    }
-
-    /**
-     * Determine the correct JS Revision to use for this load.
-     *
-     * @return int the jsrev to use.
-     */
-    public function get_jsrev() {
-        global $CFG;
-
-        if (empty($CFG->cachejs)) {
-            $jsrev = -1;
-        } else if (empty($CFG->jsrev)) {
-            $jsrev = 1;
-        } else {
-            $jsrev = $CFG->jsrev;
-        }
-
-        return $jsrev;
-    }
-
-    /**
-     * Determine the correct Template revision to use for this load.
-     *
-     * @return int the templaterev to use.
-     */
-    protected function get_templaterev() {
-        global $CFG;
-
-        if (empty($CFG->cachetemplates)) {
-            $templaterev = -1;
-        } else if (empty($CFG->templaterev)) {
-            $templaterev = 1;
-        } else {
-            $templaterev = $CFG->templaterev;
-        }
-
-        return $templaterev;
-    }
-
-    /**
-     * Ensure that the specified JavaScript file is linked to from this page.
-     *
-     * NOTE: This function is to be used in RARE CASES ONLY, please store your JS in module.js file
-     * and use $PAGE->requires->js_init_call() instead or use /yui/ subdirectories for YUI modules.
-     *
-     * By default the link is put at the end of the page, since this gives best page-load performance.
-     *
-     * Even if a particular script is requested more than once, it will only be linked
-     * to once.
-     *
-     * @param string|moodle_url $url The path to the .js file, relative to $CFG->dirroot / $CFG->wwwroot.
-     *      For example '/mod/mymod/customscripts.js'; use moodle_url for external scripts
-     * @param bool $inhead initialise in head
-     */
-    public function js($url, $inhead = false) {
-        if ($url == '/question/qengine.js') {
-            debugging('The question/qengine.js has been deprecated. ' .
-                'Please use core_question/question_engine', DEBUG_DEVELOPER);
-        }
-        $url = $this->js_fix_url($url);
-        $where = $inhead ? 'head' : 'footer';
-        $this->jsincludes[$where][$url->out()] = $url;
-    }
-
-    /**
-     * Request inclusion of jQuery library in the page.
-     *
-     * NOTE: this should not be used in official Moodle distribution!
-     *
-     * {@link https://moodledev.io/docs/guides/javascript/jquery}
-     */
-    public function jquery() {
-        $this->jquery_plugin('jquery');
-    }
-
-    /**
-     * Request inclusion of jQuery plugin.
-     *
-     * NOTE: this should not be used in official Moodle distribution!
-     *
-     * jQuery plugins are located in plugin/jquery/* subdirectory,
-     * plugin/jquery/plugins.php lists all available plugins.
-     *
-     * Included core plugins:
-     *   - jQuery UI
-     *
-     * Add-ons may include extra jQuery plugins in jquery/ directory,
-     * plugins.php file defines the mapping between plugin names and
-     * necessary page includes.
-     *
-     * Examples:
-     * <code>
-     *   // file: mod/xxx/view.php
-     *   $PAGE->requires->jquery();
-     *   $PAGE->requires->jquery_plugin('ui');
-     *   $PAGE->requires->jquery_plugin('ui-css');
-     * </code>
-     *
-     * <code>
-     *   // file: theme/yyy/lib.php
-     *   function theme_yyy_page_init(moodle_page $page) {
-     *       $page->requires->jquery();
-     *       $page->requires->jquery_plugin('ui');
-     *       $page->requires->jquery_plugin('ui-css');
-     *   }
-     * </code>
-     *
-     * <code>
-     *   // file: blocks/zzz/block_zzz.php
-     *   public function get_required_javascript() {
-     *       parent::get_required_javascript();
-     *       $this->page->requires->jquery();
-     *       $page->requires->jquery_plugin('ui');
-     *       $page->requires->jquery_plugin('ui-css');
-     *   }
-     * </code>
-     *
-     * {@link https://moodledev.io/docs/guides/javascript/jquery}
-     *
-     * @param string $plugin name of the jQuery plugin as defined in jquery/plugins.php
-     * @param string $component name of the component
-     * @return bool success
-     */
-    public function jquery_plugin($plugin, $component = 'core') {
-        global $CFG;
-
-        if ($this->headdone) {
-            debugging('Can not add jQuery plugins after starting page output!');
-            return false;
-        }
-
-        if ($component !== 'core' and in_array($plugin, array('jquery', 'ui', 'ui-css'))) {
-            debugging("jQuery plugin '$plugin' is included in Moodle core, other components can not use the same name.", DEBUG_DEVELOPER);
-            $component = 'core';
-        } else if ($component !== 'core' and strpos($component, '_') === false) {
-            // Let's normalise the legacy activity names, Frankenstyle rulez!
-            $component = 'mod_' . $component;
-        }
-
-        if (empty($this->jqueryplugins) and ($component !== 'core' or $plugin !== 'jquery')) {
-            // Make sure the jQuery itself is always loaded first,
-            // the order of all other plugins depends on order of $PAGE_>requires->.
-            $this->jquery_plugin('jquery', 'core');
-        }
-
-        if (isset($this->jqueryplugins[$plugin])) {
-            // No problem, we already have something, first Moodle plugin to register the jQuery plugin wins.
-            return true;
-        }
-
-        $componentdir = core_component::get_component_directory($component);
-        if (!file_exists($componentdir) or !file_exists("$componentdir/jquery/plugins.php")) {
-            debugging("Can not load jQuery plugin '$plugin', missing plugins.php in component '$component'.", DEBUG_DEVELOPER);
-            return false;
-        }
-
-        $plugins = array();
-        require("$componentdir/jquery/plugins.php");
-
-        if (!isset($plugins[$plugin])) {
-            debugging("jQuery plugin '$plugin' can not be found in component '$component'.", DEBUG_DEVELOPER);
-            return false;
-        }
-
-        $this->jqueryplugins[$plugin] = new stdClass();
-        $this->jqueryplugins[$plugin]->plugin    = $plugin;
-        $this->jqueryplugins[$plugin]->component = $component;
-        $this->jqueryplugins[$plugin]->urls      = array();
-
-        foreach ($plugins[$plugin]['files'] as $file) {
-            if ($CFG->debugdeveloper) {
-                if (!file_exists("$componentdir/jquery/$file")) {
-                    debugging("Invalid file '$file' specified in jQuery plugin '$plugin' in component '$component'");
-                    continue;
-                }
-                $file = str_replace('.min.css', '.css', $file);
-                $file = str_replace('.min.js', '.js', $file);
-            }
-            if (!file_exists("$componentdir/jquery/$file")) {
-                debugging("Invalid file '$file' specified in jQuery plugin '$plugin' in component '$component'");
-                continue;
-            }
-            if (!empty($CFG->slasharguments)) {
-                $url = new moodle_url("/theme/jquery.php");
-                $url->set_slashargument("/$component/$file");
-
-            } else {
-                // This is not really good, we need slasharguments for relative links, this means no caching...
-                $path = realpath("$componentdir/jquery/$file");
-                if (strpos($path, $CFG->dirroot) === 0) {
-                    $url = $CFG->wwwroot.preg_replace('/^'.preg_quote($CFG->dirroot, '/').'/', '', $path);
-                    // Replace all occurences of backslashes characters in url to forward slashes.
-                    $url = str_replace('\\', '/', $url);
-                    $url = new moodle_url($url);
-                } else {
-                    // Bad luck, fix your server!
-                    debugging("Moodle jQuery integration requires 'slasharguments' setting to be enabled.");
-                    continue;
-                }
-            }
-            $this->jqueryplugins[$plugin]->urls[] = $url;
-        }
-
-        return true;
-    }
-
-    /**
-     * Request replacement of one jQuery plugin by another.
-     *
-     * This is useful when themes want to replace the jQuery UI theme,
-     * the problem is that theme can not prevent others from including the core ui-css plugin.
-     *
-     * Example:
-     *  1/ generate new jQuery UI theme and place it into theme/yourtheme/jquery/
-     *  2/ write theme/yourtheme/jquery/plugins.php
-     *  3/ init jQuery from theme
-     *
-     * <code>
-     *   // file theme/yourtheme/lib.php
-     *   function theme_yourtheme_page_init($page) {
-     *       $page->requires->jquery_plugin('yourtheme-ui-css', 'theme_yourtheme');
-     *       $page->requires->jquery_override_plugin('ui-css', 'yourtheme-ui-css');
-     *   }
-     * </code>
-     *
-     * This code prevents loading of standard 'ui-css' which my be requested by other plugins,
-     * the 'yourtheme-ui-css' gets loaded only if some other code requires jquery.
-     *
-     * {@link https://moodledev.io/docs/guides/javascript/jquery}
-     *
-     * @param string $oldplugin original plugin
-     * @param string $newplugin the replacement
-     */
-    public function jquery_override_plugin($oldplugin, $newplugin) {
-        if ($this->headdone) {
-            debugging('Can not override jQuery plugins after starting page output!');
-            return;
-        }
-        $this->jquerypluginoverrides[$oldplugin] = $newplugin;
-    }
-
-    /**
-     * Return jQuery related markup for page start.
-     * @return string
-     */
-    protected function get_jquery_headcode() {
-        if (empty($this->jqueryplugins['jquery'])) {
-            // If nobody requested jQuery then do not bother to load anything.
-            // This may be useful for themes that want to override 'ui-css' only if requested by something else.
-            return '';
-        }
-
-        $included = array();
-        $urls = array();
-
-        foreach ($this->jqueryplugins as $name => $unused) {
-            if (isset($included[$name])) {
-                continue;
-            }
-            if (array_key_exists($name, $this->jquerypluginoverrides)) {
-                // The following loop tries to resolve the replacements,
-                // use max 100 iterations to prevent infinite loop resulting
-                // in blank page.
-                $cyclic = true;
-                $oldname = $name;
-                for ($i=0; $i<100; $i++) {
-                    $name = $this->jquerypluginoverrides[$name];
-                    if (!array_key_exists($name, $this->jquerypluginoverrides)) {
-                        $cyclic = false;
-                        break;
-                    }
-                }
-                if ($cyclic) {
-                    // We can not do much with cyclic references here, let's use the old plugin.
-                    $name = $oldname;
-                    debugging("Cyclic overrides detected for jQuery plugin '$name'");
-
-                } else if (empty($name)) {
-                    // Developer requested removal of the plugin.
-                    continue;
-
-                } else if (!isset($this->jqueryplugins[$name])) {
-                    debugging("Unknown jQuery override plugin '$name' detected");
-                    $name = $oldname;
-
-                } else if (isset($included[$name])) {
-                    // The plugin was already included, easy.
-                    continue;
-                }
-            }
-
-            $plugin = $this->jqueryplugins[$name];
-            $urls = array_merge($urls, $plugin->urls);
-            $included[$name] = true;
-        }
-
-        $output = '';
-        $attributes = array('rel' => 'stylesheet', 'type' => 'text/css');
-        foreach ($urls as $url) {
-            if (preg_match('/\.js$/', $url)) {
-                $output .= html_writer::script('', $url);
-            } else if (preg_match('/\.css$/', $url)) {
-                $attributes['href'] = $url;
-                $output .= html_writer::empty_tag('link', $attributes) . "\n";
-            }
-        }
-
-        return $output;
-    }
-
-    /**
-     * Returns the actual url through which a JavaScript file is served.
-     *
-     * @param moodle_url|string $url full moodle url, or shortened path to script.
-     * @throws coding_exception if the given $url isn't a shortened url starting with / or a moodle_url instance.
-     * @return moodle_url
-     */
-    protected function js_fix_url($url) {
-        global $CFG;
-
-        if ($url instanceof moodle_url) {
-            // If the URL is external to Moodle, it won't be handled by Moodle (!).
-            if ($url->is_local_url()) {
-                $localurl = $url->out_as_local_url();
-                // Check if the URL points to a Moodle PHP resource.
-                if (strpos($localurl, '.php') !== false) {
-                    // It's a Moodle PHP resource e.g. a resource already served by the proper Moodle Handler.
-                    return $url;
-                }
-                // It's a local resource: we need to further examine it.
-                return $this->js_fix_url($url->out_as_local_url(false));
-            }
-            // The URL is not a Moodle resource.
-            return $url;
-        } else if (null !== $url && strpos($url, '/') === 0) {
-            // Fix the admin links if needed.
-            if ($CFG->admin !== 'admin') {
-                if (strpos($url, "/admin/") === 0) {
-                    $url = preg_replace("|^/admin/|", "/$CFG->admin/", $url);
-                }
-            }
-            if (debugging()) {
-                // Check file existence only when in debug mode.
-                if (!file_exists($CFG->dirroot . strtok($url, '?'))) {
-                    throw new coding_exception('Attempt to require a JavaScript file that does not exist.', $url);
-                }
-            }
-            if (substr($url, -3) === '.js') {
-                $jsrev = $this->get_jsrev();
-                if (empty($CFG->slasharguments)) {
-                    return new moodle_url('/lib/javascript.php', ['rev' => $jsrev, 'jsfile' => $url]);
-                } else {
-                    $returnurl = new moodle_url('/lib/javascript.php');
-                    $returnurl->set_slashargument('/'.$jsrev.$url);
-                    return $returnurl;
-                }
-            } else {
-                return new moodle_url($url);
-            }
-        } else {
-            throw new coding_exception('Invalid JS url, it has to be shortened url starting with / or moodle_url instance.', $url);
-        }
-    }
-
-    /**
-     * Find out if JS module present and return details.
-     *
-     * @param string $component name of component in frankenstyle, ex: core_group, mod_forum
-     * @return array description of module or null if not found
-     */
-    protected function find_module($component) {
-        global $CFG, $PAGE;
-
-        $module = null;
-
-        if (strpos($component, 'core_') === 0) {
-            // Must be some core stuff - list here is not complete, this is just the stuff used from multiple places
-            // so that we do nto have to repeat the definition of these modules over and over again.
-            switch($component) {
-                case 'core_filepicker':
-                    $module = array('name'     => 'core_filepicker',
-                                    'fullpath' => '/repository/filepicker.js',
-                                    'requires' => array(
-                                        'base', 'node', 'node-event-simulate', 'json', 'async-queue', 'io-base', 'io-upload-iframe', 'io-form',
-                                        'yui2-treeview', 'panel', 'cookie', 'datatable', 'datatable-sort', 'resize-plugin', 'dd-plugin',
-                                        'escape', 'moodle-core_filepicker', 'moodle-core-notification-dialogue'
-                                    ),
-                                    'strings'  => array(array('lastmodified', 'moodle'), array('name', 'moodle'), array('type', 'repository'), array('size', 'repository'),
-                                                        array('invalidjson', 'repository'), array('error', 'moodle'), array('info', 'moodle'),
-                                                        array('nofilesattached', 'repository'), array('filepicker', 'repository'), array('logout', 'repository'),
-                                                        array('nofilesavailable', 'repository'), array('norepositoriesavailable', 'repository'),
-                                                        array('fileexistsdialogheader', 'repository'), array('fileexistsdialog_editor', 'repository'),
-                                                        array('fileexistsdialog_filemanager', 'repository'), array('renameto', 'repository'),
-                                                        array('referencesexist', 'repository'), array('select', 'repository')
-                                                    ));
-                    break;
-                case 'core_comment':
-                    $module = array('name'     => 'core_comment',
-                                    'fullpath' => '/comment/comment.js',
-                                    'requires' => array('base', 'io-base', 'node', 'json', 'yui2-animation', 'overlay', 'escape'),
-                                    'strings' => array(array('confirmdeletecomments', 'admin'), array('yes', 'moodle'), array('no', 'moodle'))
-                                );
-                    break;
-                case 'core_role':
-                    $module = array('name'     => 'core_role',
-                                    'fullpath' => '/admin/roles/module.js',
-                                    'requires' => array('node', 'cookie'));
-                    break;
-                case 'core_completion':
-                    break;
-                case 'core_message':
-                    $module = array('name'     => 'core_message',
-                                    'requires' => array('base', 'node', 'event', 'node-event-simulate'),
-                                    'fullpath' => '/message/module.js');
-                    break;
-                case 'core_group':
-                    $module = array('name'     => 'core_group',
-                                    'fullpath' => '/group/module.js',
-                                    'requires' => array('node', 'overlay', 'event-mouseenter'));
-                    break;
-                case 'core_question_engine':
-                    $module = array('name'     => 'core_question_engine',
-                                    'fullpath' => '/question/qengine.js',
-                                    'requires' => array('node', 'event'));
-                    break;
-                case 'core_rating':
-                    $module = array('name'     => 'core_rating',
-                                    'fullpath' => '/rating/module.js',
-                                    'requires' => array('node', 'event', 'overlay', 'io-base', 'json'));
-                    break;
-                case 'core_dndupload':
-                    $module = array('name'     => 'core_dndupload',
-                                    'fullpath' => '/lib/form/dndupload.js',
-                                    'requires' => array('node', 'event', 'json', 'core_filepicker'),
-                                    'strings'  => array(array('uploadformlimit', 'moodle'), array('droptoupload', 'moodle'), array('maxfilesreached', 'moodle'),
-                                                        array('dndenabled_inbox', 'moodle'), array('fileexists', 'moodle'), array('maxbytesfile', 'error'),
-                                                        array('sizegb', 'moodle'), array('sizemb', 'moodle'), array('sizekb', 'moodle'), array('sizeb', 'moodle'),
-                                                        array('maxareabytesreached', 'moodle'), array('serverconnection', 'error'),
-                                                        array('changesmadereallygoaway', 'moodle'), array('complete', 'moodle')
-                                                    ));
-                    break;
-            }
-
-        } else {
-            if ($dir = core_component::get_component_directory($component)) {
-                if (file_exists("$dir/module.js")) {
-                    if (strpos($dir, $CFG->dirroot.'/') === 0) {
-                        $dir = substr($dir, strlen($CFG->dirroot));
-                        $module = array('name'=>$component, 'fullpath'=>"$dir/module.js", 'requires' => array());
-                    }
-                }
-            }
-        }
-
-        return $module;
-    }
-
-    /**
-     * Append YUI3 module to default YUI3 JS loader.
-     * The structure of module array is described at {@link http://developer.yahoo.com/yui/3/yui/}
-     *
-     * @param string|array $module name of module (details are autodetected), or full module specification as array
-     * @return void
-     */
-    public function js_module($module) {
-        global $CFG;
-
-        if (empty($module)) {
-            throw new coding_exception('Missing YUI3 module name or full description.');
-        }
-
-        if (is_string($module)) {
-            $module = $this->find_module($module);
-        }
-
-        if (empty($module) or empty($module['name']) or empty($module['fullpath'])) {
-            throw new coding_exception('Missing YUI3 module details.');
-        }
-
-        $module['fullpath'] = $this->js_fix_url($module['fullpath'])->out(false);
-        // Add all needed strings.
-        if (!empty($module['strings'])) {
-            foreach ($module['strings'] as $string) {
-                $identifier = $string[0];
-                $component = isset($string[1]) ? $string[1] : 'moodle';
-                $a = isset($string[2]) ? $string[2] : null;
-                $this->string_for_js($identifier, $component, $a);
-            }
-        }
-        unset($module['strings']);
-
-        // Process module requirements and attempt to load each. This allows
-        // moodle modules to require each other.
-        if (!empty($module['requires'])){
-            foreach ($module['requires'] as $requirement) {
-                $rmodule = $this->find_module($requirement);
-                if (is_array($rmodule)) {
-                    $this->js_module($rmodule);
-                }
-            }
-        }
-
-        if ($this->headdone) {
-            $this->extramodules[$module['name']] = $module;
-        } else {
-            $this->YUI_config->add_module_config($module['name'], $module);
-        }
-    }
-
-    /**
-     * Returns true if the module has already been loaded.
-     *
-     * @param string|array $module
-     * @return bool True if the module has already been loaded
-     */
-    protected function js_module_loaded($module) {
-        if (is_string($module)) {
-            $modulename = $module;
-        } else {
-            $modulename = $module['name'];
-        }
-        return array_key_exists($modulename, $this->YUI_config->modules) ||
-               array_key_exists($modulename, $this->extramodules);
-    }
-
-    /**
-     * Ensure that the specified CSS file is linked to from this page.
-     *
-     * Because stylesheet links must go in the <head> part of the HTML, you must call
-     * this function before {@link get_head_code()} is called. That normally means before
-     * the call to print_header. If you call it when it is too late, an exception
-     * will be thrown.
-     *
-     * Even if a particular style sheet is requested more than once, it will only
-     * be linked to once.
-     *
-     * Please note use of this feature is strongly discouraged,
-     * it is suitable only for places where CSS is submitted directly by teachers.
-     * (Students must not be allowed to submit any external CSS because it may
-     * contain embedded javascript!). Example of correct use is mod/data.
-     *
-     * @param string $stylesheet The path to the .css file, relative to $CFG->wwwroot.
-     *   For example:
-     *      $PAGE->requires->css('mod/data/css.php?d='.$data->id);
-     */
-    public function css($stylesheet) {
-        global $CFG;
-
-        if ($this->headdone) {
-            throw new coding_exception('Cannot require a CSS file after &lt;head> has been printed.', $stylesheet);
-        }
-
-        if ($stylesheet instanceof moodle_url) {
-            // ok
-        } else if (strpos($stylesheet, '/') === 0) {
-            $stylesheet = new moodle_url($stylesheet);
-        } else {
-            throw new coding_exception('Invalid stylesheet parameter.', $stylesheet);
-        }
-
-        $this->cssurls[$stylesheet->out()] = $stylesheet;
-    }
-
-    /**
-     * Add theme stylesheet to page - do not use from plugin code,
-     * this should be called only from the core renderer!
-     *
-     * @param moodle_url $stylesheet
-     * @return void
-     */
-    public function css_theme(moodle_url $stylesheet) {
-        $this->cssthemeurls[] = $stylesheet;
-    }
-
-    /**
-     * Ensure that a skip link to a given target is printed at the top of the <body>.
-     *
-     * You must call this function before {@link get_top_of_body_code()}, (if not, an exception
-     * will be thrown). That normally means you must call this before the call to print_header.
-     *
-     * If you ask for a particular skip link to be printed, it is then your responsibility
-     * to ensure that the appropriate <a name="..."> tag is printed in the body of the
-     * page, so that the skip link goes somewhere.
-     *
-     * Even if a particular skip link is requested more than once, only one copy of it will be output.
-     *
-     * @param string $target the name of anchor this link should go to. For example 'maincontent'.
-     * @param string $linktext The text to use for the skip link. Normally get_string('skipto', 'access', ...);
-     */
-    public function skip_link_to($target, $linktext) {
-        if ($this->topofbodydone) {
-            debugging('Page header already printed, can not add skip links any more, code needs to be fixed.');
-            return;
-        }
-        $this->skiplinks[$target] = $linktext;
-    }
-
-    /**
-     * !!!DEPRECATED!!! please use js_init_call() if possible
-     * Ensure that the specified JavaScript function is called from an inline script
-     * somewhere on this page.
-     *
-     * By default the call will be put in a script tag at the
-     * end of the page after initialising Y instance, since this gives best page-load
-     * performance and allows you to use YUI3 library.
-     *
-     * If you request that a particular function is called several times, then
-     * that is what will happen (unlike linking to a CSS or JS file, where only
-     * one link will be output).
-     *
-     * The main benefit of the method is the automatic encoding of all function parameters.
-     *
-     * @deprecated
-     *
-     * @param string $function the name of the JavaScritp function to call. Can
-     *      be a compound name like 'Y.Event.purgeElement'. Can also be
-     *      used to create and object by using a 'function name' like 'new user_selector'.
-     * @param array $arguments and array of arguments to be passed to the function.
-     *      When generating the function call, this will be escaped using json_encode,
-     *      so passing objects and arrays should work.
-     * @param bool $ondomready If tru the function is only called when the dom is
-     *      ready for manipulation.
-     * @param int $delay The delay before the function is called.
-     */
-    public function js_function_call($function, array $arguments = null, $ondomready = false, $delay = 0) {
-        $where = $ondomready ? 'ondomready' : 'normal';
-        $this->jscalls[$where][] = array($function, $arguments, $delay);
-    }
-
-    /**
-     * This function appends a block of code to the AMD specific javascript block executed
-     * in the page footer, just after loading the requirejs library.
-     *
-     * The code passed here can rely on AMD module loading, e.g. require('jquery', function($) {...});
-     *
-     * @param string $code The JS code to append.
-     */
-    public function js_amd_inline($code) {
-        $this->amdjscode[] = $code;
-    }
-
-    /**
-     * Load an AMD module and eventually call its method.
-     *
-     * This function creates a minimal inline JS snippet that requires an AMD module and eventually calls a single
-     * function from the module with given arguments. If it is called multiple times, it will be create multiple
-     * snippets.
-     *
-     * @param string $fullmodule The name of the AMD module to load, formatted as <component name>/<module name>.
-     * @param string $func Optional function from the module to call, defaults to just loading the AMD module.
-     * @param array $params The params to pass to the function (will be serialized into JSON).
-     */
-    public function js_call_amd($fullmodule, $func = null, $params = array()) {
-        global $CFG;
-
-        $modulepath = explode('/', $fullmodule);
-
-        $modname = clean_param(array_shift($modulepath), PARAM_COMPONENT);
-        foreach ($modulepath as $module) {
-            $modname .= '/' . clean_param($module, PARAM_ALPHANUMEXT);
-        }
-
-        $functioncode = [];
-        if ($func !== null) {
-            $func = clean_param($func, PARAM_ALPHANUMEXT);
-
-            $jsonparams = array();
-            foreach ($params as $param) {
-                $jsonparams[] = json_encode($param);
-            }
-            $strparams = implode(', ', $jsonparams);
-            if ($CFG->debugdeveloper) {
-                $toomanyparamslimit = 1024;
-                if (strlen($strparams) > $toomanyparamslimit) {
-                    debugging('Too much data passed as arguments to js_call_amd("' . $fullmodule . '", "' . $func .
-                        '"). Generally there are better ways to pass lots of data from PHP to JavaScript, for example via Ajax, ' .
-                        'data attributes, ... . This warning is triggered if the argument string becomes longer than ' .
-                        $toomanyparamslimit . ' characters.', DEBUG_DEVELOPER);
-                }
-            }
-
-            $functioncode[] = "amd.{$func}({$strparams});";
-        }
-
-        $functioncode[] = "M.util.js_complete('{$modname}');";
-
-        $initcode = implode(' ', $functioncode);
-        $js = "M.util.js_pending('{$modname}'); require(['{$modname}'], function(amd) {{$initcode}});";
-
-        $this->js_amd_inline($js);
-    }
-
-    /**
-     * Creates a JavaScript function call that requires one or more modules to be loaded.
-     *
-     * This function can be used to include all of the standard YUI module types within JavaScript:
-     *     - YUI3 modules    [node, event, io]
-     *     - YUI2 modules    [yui2-*]
-     *     - Moodle modules  [moodle-*]
-     *     - Gallery modules [gallery-*]
-     *
-     * Before writing new code that makes extensive use of YUI, you should consider it's replacement AMD/JQuery.
-     * @see js_call_amd()
-     *
-     * @param array|string $modules One or more modules
-     * @param string $function The function to call once modules have been loaded
-     * @param array $arguments An array of arguments to pass to the function
-     * @param string $galleryversion Deprecated: The gallery version to use
-     * @param bool $ondomready
-     */
-    public function yui_module($modules, $function, array $arguments = null, $galleryversion = null, $ondomready = false) {
-        if (!is_array($modules)) {
-            $modules = array($modules);
-        }
-
-        if ($galleryversion != null) {
-            debugging('The galleryversion parameter to yui_module has been deprecated since Moodle 2.3.');
-        }
-
-        $jscode = 'Y.use('.join(',', array_map('json_encode', convert_to_array($modules))).',function() {'.js_writer::function_call($function, $arguments).'});';
-        if ($ondomready) {
-            $jscode = "Y.on('domready', function() { $jscode });";
-        }
-        $this->jsinitcode[] = $jscode;
-    }
-
-    /**
-     * Set the CSS Modules to be included from YUI.
-     *
-     * @param array $modules The list of YUI CSS Modules to include.
-     */
-    public function set_yuicssmodules(array $modules = array()) {
-        $this->yuicssmodules = $modules;
-    }
-
-    /**
-     * Ensure that the specified JavaScript function is called from an inline script
-     * from page footer.
-     *
-     * @param string $function the name of the JavaScritp function to with init code,
-     *      usually something like 'M.mod_mymodule.init'
-     * @param array $extraarguments and array of arguments to be passed to the function.
-     *      The first argument is always the YUI3 Y instance with all required dependencies
-     *      already loaded.
-     * @param bool $ondomready wait for dom ready (helps with some IE problems when modifying DOM)
-     * @param array $module JS module specification array
-     */
-    public function js_init_call($function, array $extraarguments = null, $ondomready = false, array $module = null) {
-        $jscode = js_writer::function_call_with_Y($function, $extraarguments);
-        if (!$module) {
-            // Detect module automatically.
-            if (preg_match('/M\.([a-z0-9]+_[^\.]+)/', $function, $matches)) {
-                $module = $this->find_module($matches[1]);
-            }
-        }
-
-        $this->js_init_code($jscode, $ondomready, $module);
-    }
-
-    /**
-     * Add short static javascript code fragment to page footer.
-     * This is intended primarily for loading of js modules and initialising page layout.
-     * Ideally the JS code fragment should be stored in plugin renderer so that themes
-     * may override it.
-     *
-     * @param string $jscode
-     * @param bool $ondomready wait for dom ready (helps with some IE problems when modifying DOM)
-     * @param array $module JS module specification array
-     */
-    public function js_init_code($jscode, $ondomready = false, array $module = null) {
-        $jscode = trim($jscode, " ;\n"). ';';
-
-        $uniqid = html_writer::random_id();
-        $startjs = " M.util.js_pending('" . $uniqid . "');";
-        $endjs = " M.util.js_complete('" . $uniqid . "');";
-
-        if ($module) {
-            $this->js_module($module);
-            $modulename = $module['name'];
-            $jscode = "$startjs Y.use('$modulename', function(Y) { $jscode $endjs });";
-        }
-
-        if ($ondomready) {
-            $jscode = "$startjs Y.on('domready', function() { $jscode $endjs });";
-        }
-
-        $this->jsinitcode[] = $jscode;
-    }
-
-    /**
-     * Make a language string available to JavaScript.
-     *
-     * All the strings will be available in a M.str object in the global namespace.
-     * So, for example, after a call to $PAGE->requires->string_for_js('course', 'moodle');
-     * then the JavaScript variable M.str.moodle.course will be 'Course', or the
-     * equivalent in the current language.
-     *
-     * The arguments to this function are just like the arguments to get_string
-     * except that $component is not optional, and there are some aspects to consider
-     * when the string contains {$a} placeholder.
-     *
-     * If the string does not contain any {$a} placeholder, you can simply use
-     * M.str.component.identifier to obtain it. If you prefer, you can call
-     * M.util.get_string(identifier, component) to get the same result.
-     *
-     * If you need to use {$a} placeholders, there are two options. Either the
-     * placeholder should be substituted in PHP on server side or it should
-     * be substituted in Javascript at client side.
-     *
-     * To substitute the placeholder at server side, just provide the required
-     * value for the placeholder when you require the string. Because each string
-     * is only stored once in the JavaScript (based on $identifier and $module)
-     * you cannot get the same string with two different values of $a. If you try,
-     * an exception will be thrown. Once the placeholder is substituted, you can
-     * use M.str or M.util.get_string() as shown above:
-     *
-     *     // Require the string in PHP and replace the placeholder.
-     *     $PAGE->requires->string_for_js('fullnamedisplay', 'moodle', $USER);
-     *     // Use the result of the substitution in Javascript.
-     *     alert(M.str.moodle.fullnamedisplay);
-     *
-     * To substitute the placeholder at client side, use M.util.get_string()
-     * function. It implements the same logic as {@link get_string()}:
-     *
-     *     // Require the string in PHP but keep {$a} as it is.
-     *     $PAGE->requires->string_for_js('fullnamedisplay', 'moodle');
-     *     // Provide the values on the fly in Javascript.
-     *     user = { firstname : 'Harry', lastname : 'Potter' }
-     *     alert(M.util.get_string('fullnamedisplay', 'moodle', user);
-     *
-     * If you do need the same string expanded with different $a values in PHP
-     * on server side, then the solution is to put them in your own data structure
-     * (e.g. and array) that you pass to JavaScript with {@link data_for_js()}.
-     *
-     * @param string $identifier the desired string.
-     * @param string $component the language file to look in.
-     * @param mixed $a any extra data to add into the string (optional).
-     */
-    public function string_for_js($identifier, $component, $a = null) {
-        if (!$component) {
-            throw new coding_exception('The $component parameter is required for page_requirements_manager::string_for_js().');
-        }
-        if (isset($this->stringsforjs_as[$component][$identifier]) and $this->stringsforjs_as[$component][$identifier] !== $a) {
-            throw new coding_exception("Attempt to re-define already required string '$identifier' " .
-                    "from lang file '$component' with different \$a parameter?");
-        }
-        if (!isset($this->stringsforjs[$component][$identifier])) {
-            $this->stringsforjs[$component][$identifier] = new lang_string($identifier, $component, $a);
-            $this->stringsforjs_as[$component][$identifier] = $a;
-        }
-    }
-
-    /**
-     * Make an array of language strings available for JS.
-     *
-     * This function calls the above function {@link string_for_js()} for each requested
-     * string in the $identifiers array that is passed to the argument for a single module
-     * passed in $module.
-     *
-     * <code>
-     * $PAGE->requires->strings_for_js(array('one', 'two', 'three'), 'mymod', array('a', null, 3));
-     *
-     * // The above is identical to calling:
-     *
-     * $PAGE->requires->string_for_js('one', 'mymod', 'a');
-     * $PAGE->requires->string_for_js('two', 'mymod');
-     * $PAGE->requires->string_for_js('three', 'mymod', 3);
-     * </code>
-     *
-     * @param array $identifiers An array of desired strings
-     * @param string $component The module to load for
-     * @param mixed $a This can either be a single variable that gets passed as extra
-     *         information for every string or it can be an array of mixed data where the
-     *         key for the data matches that of the identifier it is meant for.
-     *
-     */
-    public function strings_for_js($identifiers, $component, $a = null) {
-        foreach ($identifiers as $key => $identifier) {
-            if (is_array($a) && array_key_exists($key, $a)) {
-                $extra = $a[$key];
-            } else {
-                $extra = $a;
-            }
-            $this->string_for_js($identifier, $component, $extra);
-        }
-    }
-
-    /**
-     * !!!!!!DEPRECATED!!!!!! please use js_init_call() for everything now.
-     *
-     * Make some data from PHP available to JavaScript code.
-     *
-     * For example, if you call
-     * <pre>
-     *      $PAGE->requires->data_for_js('mydata', array('name' => 'Moodle'));
-     * </pre>
-     * then in JavsScript mydata.name will be 'Moodle'.
-     *
-     * @deprecated
-     * @param string $variable the the name of the JavaScript variable to assign the data to.
-     *      Will probably work if you use a compound name like 'mybuttons.button[1]', but this
-     *      should be considered an experimental feature.
-     * @param mixed $data The data to pass to JavaScript. This will be escaped using json_encode,
-     *      so passing objects and arrays should work.
-     * @param bool $inhead initialise in head
-     * @return void
-     */
-    public function data_for_js($variable, $data, $inhead=false) {
-        $where = $inhead ? 'head' : 'footer';
-        $this->jsinitvariables[$where][] = array($variable, $data);
-    }
-
-    /**
-     * Creates a YUI event handler.
-     *
-     * @param mixed $selector standard YUI selector for elements, may be array or string, element id is in the form "#idvalue"
-     * @param string $event A valid DOM event (click, mousedown, change etc.)
-     * @param string $function The name of the function to call
-     * @param array  $arguments An optional array of argument parameters to pass to the function
-     */
-    public function event_handler($selector, $event, $function, array $arguments = null) {
-        $this->eventhandlers[] = array('selector'=>$selector, 'event'=>$event, 'function'=>$function, 'arguments'=>$arguments);
-    }
-
-    /**
-     * Returns code needed for registering of event handlers.
-     * @return string JS code
-     */
-    protected function get_event_handler_code() {
-        $output = '';
-        foreach ($this->eventhandlers as $h) {
-            $output .= js_writer::event_handler($h['selector'], $h['event'], $h['function'], $h['arguments']);
-        }
-        return $output;
-    }
-
-    /**
-     * Get the inline JavaScript code that need to appear in a particular place.
-     * @param bool $ondomready
-     * @return string
-     */
-    protected function get_javascript_code($ondomready) {
-        $where = $ondomready ? 'ondomready' : 'normal';
-        $output = '';
-        if ($this->jscalls[$where]) {
-            foreach ($this->jscalls[$where] as $data) {
-                $output .= js_writer::function_call($data[0], $data[1], $data[2]);
-            }
-            if (!empty($ondomready)) {
-                $output = "    Y.on('domready', function() {\n$output\n});";
-            }
-        }
-        return $output;
-    }
-
-    /**
-     * Returns js code to be executed when Y is available.
-     * @return string
-     */
-    protected function get_javascript_init_code() {
-        if (count($this->jsinitcode)) {
-            return implode("\n", $this->jsinitcode) . "\n";
-        }
-        return '';
-    }
-
-    /**
-     * Returns js code to load amd module loader, then insert inline script tags
-     * that contain require() calls using RequireJS.
-     * @return string
-     */
-    protected function get_amd_footercode() {
-        global $CFG;
-        $output = '';
-
-        // We will cache JS if cachejs is not set, or it is true.
-        $cachejs = !isset($CFG->cachejs) || $CFG->cachejs;
-        $jsrev = $this->get_jsrev();
-
-        $jsloader = new moodle_url('/lib/javascript.php');
-        $jsloader->set_slashargument('/' . $jsrev . '/');
-        $requirejsloader = new moodle_url('/lib/requirejs.php');
-        $requirejsloader->set_slashargument('/' . $jsrev . '/');
-
-        $requirejsconfig = file_get_contents($CFG->dirroot . '/lib/requirejs/moodle-config.js');
-
-        // No extension required unless slash args is disabled.
-        $jsextension = '.js';
-        if (!empty($CFG->slasharguments)) {
-            $jsextension = '';
-        }
-
-        $minextension = '.min';
-        if (!$cachejs) {
-            $minextension = '';
-        }
-
-        $requirejsconfig = str_replace('[BASEURL]', $requirejsloader, $requirejsconfig);
-        $requirejsconfig = str_replace('[JSURL]', $jsloader, $requirejsconfig);
-        $requirejsconfig = str_replace('[JSMIN]', $minextension, $requirejsconfig);
-        $requirejsconfig = str_replace('[JSEXT]', $jsextension, $requirejsconfig);
-
-        $output .= html_writer::script($requirejsconfig);
-        if ($cachejs) {
-            $output .= html_writer::script('', $this->js_fix_url('/lib/requirejs/require.min.js'));
-        } else {
-            $output .= html_writer::script('', $this->js_fix_url('/lib/requirejs/require.js'));
-        }
-
-        // First include must be to a module with no dependencies, this prevents multiple requests.
-        $prefix = <<<EOF
-M.util.js_pending("core/first");
-require(['core/first'], function() {
-
-EOF;
-
-        if (during_initial_install()) {
-            // Do not run a prefetch during initial install as the DB is not available to service WS calls.
-            $prefetch = '';
-        } else {
-            $prefetch = "require(['core/prefetch'])\n";
-        }
-
-        $suffix = <<<EOF
-
-    M.util.js_complete("core/first");
-});
-EOF;
-
-        $output .= html_writer::script($prefix . $prefetch . implode(";\n", $this->amdjscode) . $suffix);
-        return $output;
-    }
-
-    /**
-     * Returns basic YUI3 CSS code.
-     *
-     * @return string
-     */
-    protected function get_yui3lib_headcss() {
-        global $CFG;
-
-        $yuiformat = '-min';
-        if ($this->yui3loader->filter === 'RAW') {
-            $yuiformat = '';
-        }
-
-        $code = '';
-        if ($this->yui3loader->combine) {
-            if (!empty($this->yuicssmodules)) {
-                $modules = array();
-                foreach ($this->yuicssmodules as $module) {
-                    $modules[] = "$CFG->yui3version/$module/$module-min.css";
-                }
-                $code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->comboBase.implode('&amp;', $modules).'" />';
-            }
-            $code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->local_comboBase.'rollup/'.$CFG->yui3version.'/yui-moodlesimple' . $yuiformat . '.css" />';
-
-        } else {
-            if (!empty($this->yuicssmodules)) {
-                foreach ($this->yuicssmodules as $module) {
-                    $code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->base.$module.'/'.$module.'-min.css" />';
-                }
-            }
-            $code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->local_comboBase.'rollup/'.$CFG->yui3version.'/yui-moodlesimple' . $yuiformat . '.css" />';
-        }
-
-        if ($this->yui3loader->filter === 'RAW') {
-            $code = str_replace('-min.css', '.css', $code);
-        } else if ($this->yui3loader->filter === 'DEBUG') {
-            $code = str_replace('-min.css', '.css', $code);
-        }
-        return $code;
-    }
-
-    /**
-     * Returns basic YUI3 JS loading code.
-     *
-     * @return string
-     */
-    protected function get_yui3lib_headcode() {
-        global $CFG;
-
-        $jsrev = $this->get_jsrev();
-
-        $yuiformat = '-min';
-        if ($this->yui3loader->filter === 'RAW') {
-            $yuiformat = '';
-        }
-
-        $format = '-min';
-        if ($this->YUI_config->groups['moodle']['filter'] === 'DEBUG') {
-            $format = '-debug';
-        }
-
-        $rollupversion = $CFG->yui3version;
-        if (!empty($CFG->yuipatchlevel)) {
-            $rollupversion .= '_' . $CFG->yuipatchlevel;
-        }
-
-        $baserollups = array(
-            'rollup/' . $rollupversion . "/yui-moodlesimple{$yuiformat}.js",
-        );
-
-        if ($this->yui3loader->combine) {
-            return '<script src="' .
-                    $this->yui3loader->local_comboBase .
-                    implode('&amp;', $baserollups) .
-                    '"></script>';
-        } else {
-            $code = '';
-            foreach ($baserollups as $rollup) {
-                $code .= '<script src="'.$this->yui3loader->local_comboBase.$rollup.'"></script>';
-            }
-            return $code;
-        }
-
-    }
-
-    /**
-     * Returns html tags needed for inclusion of theme CSS.
-     *
-     * @return string
-     */
-    protected function get_css_code() {
-        // First of all the theme CSS, then any custom CSS
-        // Please note custom CSS is strongly discouraged,
-        // because it can not be overridden by themes!
-        // It is suitable only for things like mod/data which accepts CSS from teachers.
-        $attributes = array('rel'=>'stylesheet', 'type'=>'text/css');
-
-        // Add the YUI code first. We want this to be overridden by any Moodle CSS.
-        $code = $this->get_yui3lib_headcss();
-
-        // This line of code may look funny but it is currently required in order
-        // to avoid MASSIVE display issues in Internet Explorer.
-        // As of IE8 + YUI3.1.1 the reference stylesheet (firstthemesheet) gets
-        // ignored whenever another resource is added until such time as a redraw
-        // is forced, usually by moving the mouse over the affected element.
-        $code .= html_writer::tag('script', '/** Required in order to fix style inclusion problems in IE with YUI **/', array('id'=>'firstthemesheet', 'type'=>'text/css'));
-
-        $urls = $this->cssthemeurls + $this->cssurls;
-        foreach ($urls as $url) {
-            $attributes['href'] = $url;
-            $code .= html_writer::empty_tag('link', $attributes) . "\n";
-            // This id is needed in first sheet only so that theme may override YUI sheets loaded on the fly.
-            unset($attributes['id']);
-        }
-
-        return $code;
-    }
-
-    /**
-     * Adds extra modules specified after printing of page header.
-     *
-     * @return string
-     */
-    protected function get_extra_modules_code() {
-        if (empty($this->extramodules)) {
-            return '';
-        }
-        return html_writer::script(js_writer::function_call('M.yui.add_module', array($this->extramodules)));
-    }
-
-    /**
-     * Generate any HTML that needs to go inside the <head> tag.
-     *
-     * Normally, this method is called automatically by the code that prints the
-     * <head> tag. You should not normally need to call it in your own code.
-     *
-     * @param moodle_page $page
-     * @param core_renderer $renderer
-     * @return string the HTML code to to inside the <head> tag.
-     */
-    public function get_head_code(moodle_page $page, core_renderer $renderer) {
-        global $CFG;
-
-        // Note: the $page and $output are not stored here because it would
-        // create circular references in memory which prevents garbage collection.
-        $this->init_requirements_data($page, $renderer);
-
-        $output = '';
-
-        // Add all standard CSS for this page.
-        $output .= $this->get_css_code();
-
-        // Set up the M namespace.
-        $js = "var M = {}; M.yui = {};\n";
-
-        // Capture the time now ASAP during page load. This minimises the lag when
-        // we try to relate times on the server to times in the browser.
-        // An example of where this is used is the quiz countdown timer.
-        $js .= "M.pageloadstarttime = new Date();\n";
-
-        // Add a subset of Moodle configuration to the M namespace.
-        $js .= js_writer::set_variable('M.cfg', $this->M_cfg, false);
-
-        // Set up global YUI3 loader object - this should contain all code needed by plugins.
-        // Note: in JavaScript just use "YUI().use('overlay', function(Y) { .... });",
-        //       this needs to be done before including any other script.
-        $js .= $this->YUI_config->get_config_functions();
-        $js .= js_writer::set_variable('YUI_config', $this->YUI_config, false) . "\n";
-        $js .= "M.yui.loader = {modules: {}};\n"; // Backwards compatibility only, not used any more.
-        $js = $this->YUI_config->update_header_js($js);
-
-        $output .= html_writer::script($js);
-
-        // Add variables.
-        if ($this->jsinitvariables['head']) {
-            $js = '';
-            foreach ($this->jsinitvariables['head'] as $data) {
-                list($var, $value) = $data;
-                $js .= js_writer::set_variable($var, $value, true);
-            }
-            $output .= html_writer::script($js);
-        }
-
-        // Mark head sending done, it is not possible to anything there.
-        $this->headdone = true;
-
-        return $output;
-    }
-
-    /**
-     * Generate any HTML that needs to go at the start of the <body> tag.
-     *
-     * Normally, this method is called automatically by the code that prints the
-     * <head> tag. You should not normally need to call it in your own code.
-     *
-     * @param renderer_base $renderer
-     * @return string the HTML code to go at the start of the <body> tag.
-     */
-    public function get_top_of_body_code(renderer_base $renderer) {
-        global $CFG;
-
-        // First the skip links.
-        $output = $renderer->render_skip_links($this->skiplinks);
-
-        // Include the Polyfills.
-        $output .= html_writer::script('', $this->js_fix_url('/lib/polyfills/polyfill.js'));
-
-        // YUI3 JS needs to be loaded early in the body. It should be cached well by the browser.
-        $output .= $this->get_yui3lib_headcode();
-
-        // Add hacked jQuery support, it is not intended for standard Moodle distribution!
-        $output .= $this->get_jquery_headcode();
-
-        // Link our main JS file, all core stuff should be there.
-        $output .= html_writer::script('', $this->js_fix_url('/lib/javascript-static.js'));
-
-        // All the other linked things from HEAD - there should be as few as possible.
-        if ($this->jsincludes['head']) {
-            foreach ($this->jsincludes['head'] as $url) {
-                $output .= html_writer::script('', $url);
-            }
-        }
-
-        // Then the clever trick for hiding of things not needed when JS works.
-        $output .= html_writer::script("document.body.className += ' jsenabled';") . "\n";
-        $this->topofbodydone = true;
-        return $output;
-    }
-
-    /**
-     * Generate any HTML that needs to go at the end of the page.
-     *
-     * Normally, this method is called automatically by the code that prints the
-     * page footer. You should not normally need to call it in your own code.
-     *
-     * @return string the HTML code to to at the end of the page.
-     */
-    public function get_end_code() {
-        global $CFG;
-        $output = '';
-
-        // Set the log level for the JS logging.
-        $logconfig = new stdClass();
-        $logconfig->level = 'warn';
-        if ($CFG->debugdeveloper) {
-            $logconfig->level = 'trace';
-        }
-        $this->js_call_amd('core/log', 'setConfig', array($logconfig));
-        // Add any global JS that needs to run on all pages.
-        $this->js_call_amd('core/page_global', 'init');
-        $this->js_call_amd('core/utility');
-
-        // Call amd init functions.
-        $output .= $this->get_amd_footercode();
-
-        // Add other requested modules.
-        $output .= $this->get_extra_modules_code();
-
-        $this->js_init_code('M.util.js_complete("init");', true);
-
-        // All the other linked scripts - there should be as few as possible.
-        if ($this->jsincludes['footer']) {
-            foreach ($this->jsincludes['footer'] as $url) {
-                $output .= html_writer::script('', $url);
-            }
-        }
-
-        // Add all needed strings.
-        // First add core strings required for some dialogues.
-        $this->strings_for_js(array(
-            'confirm',
-            'yes',
-            'no',
-            'areyousure',
-            'closebuttontitle',
-            'unknownerror',
-            'error',
-            'file',
-            'url',
-            // TODO MDL-70830 shortforms should preload the collapseall/expandall strings properly.
-            'collapseall',
-            'expandall',
-        ), 'moodle');
-        $this->strings_for_js(array(
-            'debuginfo',
-            'line',
-            'stacktrace',
-        ), 'debug');
-        $this->string_for_js('labelsep', 'langconfig');
-        if (!empty($this->stringsforjs)) {
-            $strings = array();
-            foreach ($this->stringsforjs as $component=>$v) {
-                foreach($v as $indentifier => $langstring) {
-                    $strings[$component][$indentifier] = $langstring->out();
-                }
-            }
-            $output .= html_writer::script(js_writer::set_variable('M.str', $strings));
-        }
-
-        // Add variables.
-        if ($this->jsinitvariables['footer']) {
-            $js = '';
-            foreach ($this->jsinitvariables['footer'] as $data) {
-                list($var, $value) = $data;
-                $js .= js_writer::set_variable($var, $value, true);
-            }
-            $output .= html_writer::script($js);
-        }
-
-        $inyuijs = $this->get_javascript_code(false);
-        $ondomreadyjs = $this->get_javascript_code(true);
-        $jsinit = $this->get_javascript_init_code();
-        $handlersjs = $this->get_event_handler_code();
-
-        // There is a global Y, make sure it is available in your scope.
-        $js = "(function() {{$inyuijs}{$ondomreadyjs}{$jsinit}{$handlersjs}})();";
-
-        $output .= html_writer::script($js);
-
-        return $output;
-    }
-
-    /**
-     * Have we already output the code in the <head> tag?
-     *
-     * @return bool
-     */
-    public function is_head_done() {
-        return $this->headdone;
-    }
-
-    /**
-     * Have we already output the code at the start of the <body> tag?
-     *
-     * @return bool
-     */
-    public function is_top_of_body_done() {
-        return $this->topofbodydone;
-    }
-
-    /**
-     * Should we generate a bit of content HTML that is only required once  on
-     * this page (e.g. the contents of the modchooser), now? Basically, we call
-     * {@link has_one_time_item_been_created()}, and if the thing has not already
-     * been output, we return true to tell the caller to generate it, and also
-     * call {@link set_one_time_item_created()} to record the fact that it is
-     * about to be generated.
-     *
-     * That is, a typical usage pattern (in a renderer method) is:
-     * <pre>
-     * if (!$this->page->requires->should_create_one_time_item_now($thing)) {
-     *     return '';
-     * }
-     * // Else generate it.
-     * </pre>
-     *
-     * @param string $thing identifier for the bit of content. Should be of the form
-     *      frankenstyle_things, e.g. core_course_modchooser.
-     * @return bool if true, the caller should generate that bit of output now, otherwise don't.
-     */
-    public function should_create_one_time_item_now($thing) {
-        if ($this->has_one_time_item_been_created($thing)) {
-            return false;
-        }
-
-        $this->set_one_time_item_created($thing);
-        return true;
-    }
-
-    /**
-     * Has a particular bit of HTML that is only required once  on this page
-     * (e.g. the contents of the modchooser) already been generated?
-     *
-     * Normally, you can use the {@link should_create_one_time_item_now()} helper
-     * method rather than calling this method directly.
-     *
-     * @param string $thing identifier for the bit of content. Should be of the form
-     *      frankenstyle_things, e.g. core_course_modchooser.
-     * @return bool whether that bit of output has been created.
-     */
-    public function has_one_time_item_been_created($thing) {
-        return isset($this->onetimeitemsoutput[$thing]);
-    }
-
-    /**
-     * Indicate that a particular bit of HTML that is only required once on this
-     * page (e.g. the contents of the modchooser) has been generated (or is about to be)?
-     *
-     * Normally, you can use the {@link should_create_one_time_item_now()} helper
-     * method rather than calling this method directly.
-     *
-     * @param string $thing identifier for the bit of content. Should be of the form
-     *      frankenstyle_things, e.g. core_course_modchooser.
-     */
-    public function set_one_time_item_created($thing) {
-        if ($this->has_one_time_item_been_created($thing)) {
-            throw new coding_exception($thing . ' is only supposed to be ouput ' .
-                    'once per page, but it seems to be being output again.');
-        }
-        return $this->onetimeitemsoutput[$thing] = true;
-    }
-}
-
-/**
- * This class represents the YUI configuration.
- *
- * @copyright 2013 Andrew Nicols
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since Moodle 2.5
- * @package core
- * @category output
- */
-class YUI_config {
-    /**
-     * These settings must be public so that when the object is converted to json they are exposed.
-     * Note: Some of these are camelCase because YUI uses camelCase variable names.
-     *
-     * The settings are described and documented in the YUI API at:
-     * - http://yuilibrary.com/yui/docs/api/classes/config.html
-     * - http://yuilibrary.com/yui/docs/api/classes/Loader.html
-     */
-    public $debug = false;
-    public $base;
-    public $comboBase;
-    public $combine;
-    public $filter = null;
-    public $insertBefore = 'firstthemesheet';
-    public $groups = array();
-    public $modules = array();
-    /** @var array The log sources that should be not be logged. */
-    public $logInclude = [];
-    /** @var array Tog sources that should be logged. */
-    public $logExclude = [];
-    /** @var string The minimum log level for YUI logging statements. */
-    public $logLevel;
-
-    /**
-     * @var array List of functions used by the YUI Loader group pattern recognition.
-     */
-    protected $jsconfigfunctions = array();
-
-    /**
-     * Create a new group within the YUI_config system.
-     *
-     * @param string $name The name of the group. This must be unique and
-     * not previously used.
-     * @param array $config The configuration for this group.
-     * @return void
-     */
-    public function add_group($name, $config) {
-        if (isset($this->groups[$name])) {
-            throw new coding_exception("A YUI configuration group for '{$name}' already exists. To make changes to this group use YUI_config->update_group().");
-        }
-        $this->groups[$name] = $config;
-    }
-
-    /**
-     * Update an existing group configuration
-     *
-     * Note, any existing configuration for that group will be wiped out.
-     * This includes module configuration.
-     *
-     * @param string $name The name of the group. This must be unique and
-     * not previously used.
-     * @param array $config The configuration for this group.
-     * @return void
-     */
-    public function update_group($name, $config) {
-        if (!isset($this->groups[$name])) {
-            throw new coding_exception('The Moodle YUI module does not exist. You must define the moodle module config using YUI_config->add_module_config first.');
-        }
-        $this->groups[$name] = $config;
-    }
-
-    /**
-     * Set the value of a configuration function used by the YUI Loader's pattern testing.
-     *
-     * Only the body of the function should be passed, and not the whole function wrapper.
-     *
-     * The JS function your write will be passed a single argument 'name' containing the
-     * name of the module being loaded.
-     *
-     * @param $function String the body of the JavaScript function. This should be used i
-     * @return string the name of the function to use in the group pattern configuration.
-     */
-    public function set_config_function($function) {
-        $configname = 'yui' . (count($this->jsconfigfunctions) + 1) . 'ConfigFn';
-        if (isset($this->jsconfigfunctions[$configname])) {
-            throw new coding_exception("A YUI config function with this name already exists. Config function names must be unique.");
-        }
-        $this->jsconfigfunctions[$configname] = $function;
-        return '@' . $configname . '@';
-    }
-
-    /**
-     * Allow setting of the config function described in {@see set_config_function} from a file.
-     * The contents of this file are then passed to set_config_function.
-     *
-     * When jsrev is positive, the function is minified and stored in a MUC cache for subsequent uses.
-     *
-     * @param $file The path to the JavaScript function used for YUI configuration.
-     * @return string the name of the function to use in the group pattern configuration.
-     */
-    public function set_config_source($file) {
-        global $CFG;
-        $cache = cache::make('core', 'yuimodules');
-
-        // Attempt to get the metadata from the cache.
-        $keyname = 'configfn_' . $file;
-        $fullpath = $CFG->dirroot . '/' . $file;
-        if (!isset($CFG->jsrev) || $CFG->jsrev == -1) {
-            $cache->delete($keyname);
-            $configfn = file_get_contents($fullpath);
-        } else {
-            $configfn = $cache->get($keyname);
-            if ($configfn === false) {
-                require_once($CFG->libdir . '/jslib.php');
-                $configfn = core_minify::js_files(array($fullpath));
-                $cache->set($keyname, $configfn);
-            }
-        }
-        return $this->set_config_function($configfn);
-    }
-
-    /**
-     * Retrieve the list of JavaScript functions for YUI_config groups.
-     *
-     * @return string The complete set of config functions
-     */
-    public function get_config_functions() {
-        $configfunctions = '';
-        foreach ($this->jsconfigfunctions as $functionname => $function) {
-            $configfunctions .= "var {$functionname} = function(me) {";
-            $configfunctions .= $function;
-            $configfunctions .= "};\n";
-        }
-        return $configfunctions;
-    }
-
-    /**
-     * Update the header JavaScript with any required modification for the YUI Loader.
-     *
-     * @param $js String The JavaScript to manipulate.
-     * @return string the modified JS string.
-     */
-    public function update_header_js($js) {
-        // Update the names of the the configFn variables.
-        // The PHP json_encode function cannot handle literal names so we have to wrap
-        // them in @ and then replace them with literals of the same function name.
-        foreach ($this->jsconfigfunctions as $functionname => $function) {
-            $js = str_replace('"@' . $functionname . '@"', $functionname, $js);
-        }
-        return $js;
-    }
-
-    /**
-     * Add configuration for a specific module.
-     *
-     * @param string $name The name of the module to add configuration for.
-     * @param array $config The configuration for the specified module.
-     * @param string $group The name of the group to add configuration for.
-     * If not specified, then this module is added to the global
-     * configuration.
-     * @return void
-     */
-    public function add_module_config($name, $config, $group = null) {
-        if ($group) {
-            if (!isset($this->groups[$name])) {
-                throw new coding_exception('The Moodle YUI module does not exist. You must define the moodle module config using YUI_config->add_module_config first.');
-            }
-            if (!isset($this->groups[$group]['modules'])) {
-                $this->groups[$group]['modules'] = array();
-            }
-            $modules = &$this->groups[$group]['modules'];
-        } else {
-            $modules = &$this->modules;
-        }
-        $modules[$name] = $config;
-    }
-
-    /**
-     * Add the moodle YUI module metadata for the moodle group to the YUI_config instance.
-     *
-     * If js caching is disabled, metadata will not be served causing YUI to calculate
-     * module dependencies as each module is loaded.
-     *
-     * If metadata does not exist it will be created and stored in a MUC entry.
-     *
-     * @return void
-     */
-    public function add_moodle_metadata() {
-        global $CFG;
-        if (!isset($this->groups['moodle'])) {
-            throw new coding_exception('The Moodle YUI module does not exist. You must define the moodle module config using YUI_config->add_module_config first.');
-        }
-
-        if (!isset($this->groups['moodle']['modules'])) {
-            $this->groups['moodle']['modules'] = array();
-        }
-
-        $cache = cache::make('core', 'yuimodules');
-        if (!isset($CFG->jsrev) || $CFG->jsrev == -1) {
-            $metadata = array();
-            $metadata = $this->get_moodle_metadata();
-            $cache->delete('metadata');
-        } else {
-            // Attempt to get the metadata from the cache.
-            if (!$metadata = $cache->get('metadata')) {
-                $metadata = $this->get_moodle_metadata();
-                $cache->set('metadata', $metadata);
-            }
-        }
-
-        // Merge with any metadata added specific to this page which was added manually.
-        $this->groups['moodle']['modules'] = array_merge($this->groups['moodle']['modules'],
-                $metadata);
-    }
-
-    /**
-     * Determine the module metadata for all moodle YUI modules.
-     *
-     * This works through all modules capable of serving YUI modules, and attempts to get
-     * metadata for each of those modules.
-     *
-     * @return array of module metadata
-     */
-    private function get_moodle_metadata() {
-        $moodlemodules = array();
-        // Core isn't a plugin type or subsystem - handle it seperately.
-        if ($module = $this->get_moodle_path_metadata(core_component::get_component_directory('core'))) {
-            $moodlemodules = array_merge($moodlemodules, $module);
-        }
-
-        // Handle other core subsystems.
-        $subsystems = core_component::get_core_subsystems();
-        foreach ($subsystems as $subsystem => $path) {
-            if (is_null($path)) {
-                continue;
-            }
-            if ($module = $this->get_moodle_path_metadata($path)) {
-                $moodlemodules = array_merge($moodlemodules, $module);
-            }
-        }
-
-        // And finally the plugins.
-        $plugintypes = core_component::get_plugin_types();
-        foreach ($plugintypes as $plugintype => $pathroot) {
-            $pluginlist = core_component::get_plugin_list($plugintype);
-            foreach ($pluginlist as $plugin => $path) {
-                if ($module = $this->get_moodle_path_metadata($path)) {
-                    $moodlemodules = array_merge($moodlemodules, $module);
-                }
-            }
-        }
-
-        return $moodlemodules;
-    }
-
-    /**
-     * Helper function process and return the YUI metadata for all of the modules under the specified path.
-     *
-     * @param string $path the UNC path to the YUI src directory.
-     * @return array the complete array for frankenstyle directory.
-     */
-    private function get_moodle_path_metadata($path) {
-        // Add module metadata is stored in frankenstyle_modname/yui/src/yui_modname/meta/yui_modname.json.
-        $baseyui = $path . '/yui/src';
-        $modules = array();
-        if (is_dir($baseyui)) {
-            $items = new DirectoryIterator($baseyui);
-            foreach ($items as $item) {
-                if ($item->isDot() or !$item->isDir()) {
-                    continue;
-                }
-                $metafile = realpath($baseyui . '/' . $item . '/meta/' . $item . '.json');
-                if (!is_readable($metafile)) {
-                    continue;
-                }
-                $metadata = file_get_contents($metafile);
-                $modules = array_merge($modules, (array) json_decode($metadata));
-            }
-        }
-        return $modules;
-    }
-
-    /**
-     * Define YUI modules which we have been required to patch between releases.
-     *
-     * We must do this because we aggressively cache content on the browser, and we must also override use of the
-     * external CDN which will serve the true authoritative copy of the code without our patches.
-     *
-     * @param string $combobase The local combobase
-     * @param string $yuiversion The current YUI version
-     * @param int $patchlevel The patch level we're working to for YUI
-     * @param array $patchedmodules An array containing the names of the patched modules
-     * @return void
-     */
-    public function define_patched_core_modules($combobase, $yuiversion, $patchlevel, $patchedmodules) {
-        // The version we use is suffixed with a patchlevel so that we can get additional revisions between YUI releases.
-        $subversion = $yuiversion . '_' . $patchlevel;
-
-        if ($this->comboBase == $combobase) {
-            // If we are using the local combobase in the loader, we can add a group and still make use of the combo
-            // loader. We just need to specify a different root which includes a slightly different YUI version number
-            // to include our patchlevel.
-            $patterns = array();
-            $modules = array();
-            foreach ($patchedmodules as $modulename) {
-                // We must define the pattern and module here so that the loader uses our group configuration instead of
-                // the standard module definition. We may lose some metadata provided by upstream but this will be
-                // loaded when the module is loaded anyway.
-                $patterns[$modulename] = array(
-                    'group' => 'yui-patched',
-                );
-                $modules[$modulename] = array();
-            }
-
-            // Actually add the patch group here.
-            $this->add_group('yui-patched', array(
-                'combine' => true,
-                'root' => $subversion . '/',
-                'patterns' => $patterns,
-                'modules' => $modules,
-            ));
-
-        } else {
-            // The CDN is in use - we need to instead use the local combobase for this module and override the modules
-            // definition. We cannot use the local base - we must use the combobase because we cannot invalidate the
-            // local base in browser caches.
-            $fullpathbase = $combobase . $subversion . '/';
-            foreach ($patchedmodules as $modulename) {
-                $this->modules[$modulename] = array(
-                    'fullpath' => $fullpathbase . $modulename . '/' . $modulename . '-min.js'
-                );
-            }
-        }
-    }
-}
-
-/**
- * Invalidate all server and client side template caches.
- */
-function template_reset_all_caches() {
-    global $CFG;
-
-    $next = time();
-    if (isset($CFG->templaterev) and $next <= $CFG->templaterev and $CFG->templaterev - $next < 60 * 60) {
-        // This resolves problems when reset is requested repeatedly within 1s,
-        // the < 1h condition prevents accidental switching to future dates
-        // because we might not recover from it.
-        $next = $CFG->templaterev + 1;
-    }
-
-    set_config('templaterev', $next);
-}
-
-/**
- * Invalidate all server and client side JS caches.
- */
-function js_reset_all_caches() {
-    global $CFG;
-
-    $next = time();
-    if (isset($CFG->jsrev) and $next <= $CFG->jsrev and $CFG->jsrev - $next < 60*60) {
-        // This resolves problems when reset is requested repeatedly within 1s,
-        // the < 1h condition prevents accidental switching to future dates
-        // because we might not recover from it.
-        $next = $CFG->jsrev+1;
-    }
-
-    set_config('jsrev', $next);
-}
+// This file is deprecated, but it should never have been manually included by anything outside of lib/outputlib.php.
+// Throwing an exception here should be fine because removing the manual inclusion should have no impact.
+throw new \core\exception\coding_exception(
+    'This file should not be manually included by any component.',
+);
diff --git a/lib/pagelib.php b/lib/pagelib.php
index cd649a39d7a2f..169e0354a15fa 100644
--- a/lib/pagelib.php
+++ b/lib/pagelib.php
@@ -1034,9 +1034,6 @@ public function has_navbar() {
      * by the get_fragment() web service and not for use elsewhere.
      */
     public function start_collecting_javascript_requirements() {
-        global $CFG;
-        require_once($CFG->libdir.'/outputfragmentrequirementslib.php');
-
         // Check that the requirements manager has not already been switched.
         if (get_class($this->_requires) == 'fragment_requirements_manager') {
             throw new coding_exception('JavaScript collection has already been started.');
diff --git a/lib/table/classes/output/html_table.php b/lib/table/classes/output/html_table.php
new file mode 100644
index 0000000000000..86cc3a3b4e2b5
--- /dev/null
+++ b/lib/table/classes/output/html_table.php
@@ -0,0 +1,207 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Holds all the information required to render a <table> by {@link core_renderer::table()}
+ *
+ * Example of usage:
+ * $t = new html_table();
+ * ... // set various properties of the object $t as described below
+ * echo html_writer::table($t);
+ *
+ * @copyright 2009 David Mudrak <david.mudrak@gmail.com>
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class html_table {
+
+    /**
+     * @var string Value to use for the id attribute of the table
+     */
+    public $id = null;
+
+    /**
+     * @var array Attributes of HTML attributes for the <table> element
+     */
+    public $attributes = array();
+
+    /**
+     * @var array An array of headings. The n-th array item is used as a heading of the n-th column.
+     * For more control over the rendering of the headers, an array of html_table_cell objects
+     * can be passed instead of an array of strings.
+     *
+     * Example of usage:
+     * $t->head = array('Student', 'Grade');
+     */
+    public $head;
+
+    /**
+     * @var array An array that can be used to make a heading span multiple columns.
+     * In this example, {@link html_table:$data} is supposed to have three columns. For the first two columns,
+     * the same heading is used. Therefore, {@link html_table::$head} should consist of two items.
+     *
+     * Example of usage:
+     * $t->headspan = array(2,1);
+     */
+    public $headspan;
+
+    /**
+     * @var array An array of column alignments.
+     * The value is used as CSS 'text-align' property. Therefore, possible
+     * values are 'left', 'right', 'center' and 'justify'. Specify 'right' or 'left' from the perspective
+     * of a left-to-right (LTR) language. For RTL, the values are flipped automatically.
+     *
+     * Examples of usage:
+     * $t->align = array(null, 'right');
+     * or
+     * $t->align[1] = 'right';
+     */
+    public $align;
+
+    /**
+     * @var array The value is used as CSS 'size' property.
+     *
+     * Examples of usage:
+     * $t->size = array('50%', '50%');
+     * or
+     * $t->size[1] = '120px';
+     */
+    public $size;
+
+    /**
+     * @var array An array of wrapping information.
+     * The only possible value is 'nowrap' that sets the
+     * CSS property 'white-space' to the value 'nowrap' in the given column.
+     *
+     * Example of usage:
+     * $t->wrap = array(null, 'nowrap');
+     */
+    public $wrap;
+
+    /**
+     * @var array Array of arrays or html_table_row objects containing the data. Alternatively, if you have
+     * $head specified, the string 'hr' (for horizontal ruler) can be used
+     * instead of an array of cells data resulting in a divider rendered.
+     *
+     * Example of usage with array of arrays:
+     * $row1 = array('Harry Potter', '76 %');
+     * $row2 = array('Hermione Granger', '100 %');
+     * $t->data = array($row1, $row2);
+     *
+     * Example with array of html_table_row objects: (used for more fine-grained control)
+     * $cell1 = new html_table_cell();
+     * $cell1->text = 'Harry Potter';
+     * $cell1->colspan = 2;
+     * $row1 = new html_table_row();
+     * $row1->cells[] = $cell1;
+     * $cell2 = new html_table_cell();
+     * $cell2->text = 'Hermione Granger';
+     * $cell3 = new html_table_cell();
+     * $cell3->text = '100 %';
+     * $row2 = new html_table_row();
+     * $row2->cells = array($cell2, $cell3);
+     * $t->data = array($row1, $row2);
+     */
+    public $data = [];
+
+    /**
+     * @deprecated since Moodle 2.0. Styling should be in the CSS.
+     * @var string Width of the table, percentage of the page preferred.
+     */
+    public $width = null;
+
+    /**
+     * @deprecated since Moodle 2.0. Styling should be in the CSS.
+     * @var string Alignment for the whole table. Can be 'right', 'left' or 'center' (default).
+     */
+    public $tablealign = null;
+
+    /**
+     * @deprecated since Moodle 2.0. Styling should be in the CSS.
+     * @var int Padding on each cell, in pixels
+     */
+    public $cellpadding = null;
+
+    /**
+     * @var int Spacing between cells, in pixels
+     * @deprecated since Moodle 2.0. Styling should be in the CSS.
+     */
+    public $cellspacing = null;
+
+    /**
+     * @var array Array of classes to add to particular rows, space-separated string.
+     * Class 'lastrow' is added automatically for the last row in the table.
+     *
+     * Example of usage:
+     * $t->rowclasses[9] = 'tenth'
+     */
+    public $rowclasses;
+
+    /**
+     * @var array An array of classes to add to every cell in a particular column,
+     * space-separated string. Class 'cell' is added automatically by the renderer.
+     * Classes 'c0' or 'c1' are added automatically for every odd or even column,
+     * respectively. Class 'lastcol' is added automatically for all last cells
+     * in a row.
+     *
+     * Example of usage:
+     * $t->colclasses = array(null, 'grade');
+     */
+    public $colclasses;
+
+    /**
+     * @var string Description of the contents for screen readers.
+     *
+     * The "summary" attribute on the "table" element is not supported in HTML5.
+     * Consider describing the structure of the table in a "caption" element or in a "figure" element containing the table;
+     * or, simplify the structure of the table so that no description is needed.
+     *
+     * @deprecated since Moodle 3.9.
+     */
+    public $summary;
+
+    /**
+     * @var string Caption for the table, typically a title.
+     *
+     * Example of usage:
+     * $t->caption = "TV Guide";
+     */
+    public $caption;
+
+    /**
+     * @var bool Whether to hide the table's caption from sighted users.
+     *
+     * Example of usage:
+     * $t->caption = "TV Guide";
+     * $t->captionhide = true;
+     */
+    public $captionhide = false;
+
+    /** @var bool Whether to make the table to be scrolled horizontally with ease. Make table responsive across all viewports. */
+    public $responsive = true;
+
+    /** @var string class name to add to this html table. */
+    public $class;
+
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        $this->attributes['class'] = '';
+    }
+}
diff --git a/lib/table/classes/output/html_table_cell.php b/lib/table/classes/output/html_table_cell.php
new file mode 100644
index 0000000000000..bc4c8ab31fb58
--- /dev/null
+++ b/lib/table/classes/output/html_table_cell.php
@@ -0,0 +1,82 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Component representing a table cell.
+ *
+ * @copyright 2009 Nicolas Connault
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class html_table_cell {
+
+    /**
+     * @var string Value to use for the id attribute of the cell.
+     */
+    public $id = null;
+
+    /**
+     * @var string The contents of the cell.
+     */
+    public $text;
+
+    /**
+     * @var string Abbreviated version of the contents of the cell.
+     */
+    public $abbr = null;
+
+    /**
+     * @var int Number of columns this cell should span.
+     */
+    public $colspan = null;
+
+    /**
+     * @var int Number of rows this cell should span.
+     */
+    public $rowspan = null;
+
+    /**
+     * @var string Defines a way to associate header cells and data cells in a table.
+     */
+    public $scope = null;
+
+    /**
+     * @var bool Whether or not this cell is a header cell.
+     */
+    public $header = null;
+
+    /**
+     * @var string Value to use for the style attribute of the table cell
+     */
+    public $style = null;
+
+    /**
+     * @var array Attributes of additional HTML attributes for the <td> element
+     */
+    public $attributes = array();
+
+    /**
+     * Constructs a table cell
+     *
+     * @param string $text
+     */
+    public function __construct($text = null) {
+        $this->text = $text;
+        $this->attributes['class'] = '';
+    }
+}
diff --git a/lib/table/classes/output/html_table_row.php b/lib/table/classes/output/html_table_row.php
new file mode 100644
index 0000000000000..8a0a366bd17ff
--- /dev/null
+++ b/lib/table/classes/output/html_table_row.php
@@ -0,0 +1,63 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Component representing a table row.
+ *
+ * @copyright 2009 Nicolas Connault
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @since Moodle 2.0
+ * @package core
+ * @category output
+ */
+class html_table_row {
+
+    /**
+     * @var string Value to use for the id attribute of the row.
+     */
+    public $id = null;
+
+    /**
+     * @var array Array of html_table_cell objects
+     */
+    public $cells = array();
+
+    /**
+     * @var string Value to use for the style attribute of the table row
+     */
+    public $style = null;
+
+    /**
+     * @var array Attributes of additional HTML attributes for the <tr> element
+     */
+    public $attributes = array();
+
+    /**
+     * Constructor
+     * @param array $cells
+     */
+    public function __construct(array $cells=null) {
+        $this->attributes['class'] = '';
+        $cells = (array)$cells;
+        foreach ($cells as $cell) {
+            if ($cell instanceof html_table_cell) {
+                $this->cells[] = $cell;
+            } else {
+                $this->cells[] = new html_table_cell($cell);
+            }
+        }
+    }
+}
diff --git a/lib/tests/coverage.php b/lib/tests/coverage.php
index 0c8faeeff833b..2d6961cdd8cee 100644
--- a/lib/tests/coverage.php
+++ b/lib/tests/coverage.php
@@ -82,13 +82,7 @@
         'myprofilelib.php',
         'navigationlib.php',
         'oauthlib.php',
-        'outputactions.php',
-        'outputcomponents.php',
-        'outputfactories.php',
-        'outputfragmentrequirementslib.php',
         'outputlib.php',
-        'outputrenderers.php',
-        'outputrequirementslib.php',
         'pagelib.php',
         'pdflib.php',
         'phpminimumversionlib.php',
diff --git a/lib/tests/fixtures/test_renderer_factory.php b/lib/tests/fixtures/test_renderer_factory.php
index 4d32622c496d7..fcfb0d06c8099 100644
--- a/lib/tests/fixtures/test_renderer_factory.php
+++ b/lib/tests/fixtures/test_renderer_factory.php
@@ -14,20 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Test factory for lib/outputfactories.php.
- *
- * @package   core
- * @category  phpunit
- * @copyright 2014 Damyon Wiese
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-require_once($CFG->libdir . '/outputfactories.php');
-
 /**
  * This is renderer factory testing of the classname autoloading.
  *
diff --git a/lib/tests/html_writer_test.php b/lib/tests/html_writer_test.php
index f40b823ee7b41..7823a0def9daf 100644
--- a/lib/tests/html_writer_test.php
+++ b/lib/tests/html_writer_test.php
@@ -14,20 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Unit tests for the html_writer class.
- *
- * @package   core
- * @category  phpunit
- * @copyright 2010 Tim Hunt
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-require_once($CFG->libdir . '/outputcomponents.php');
-
 /**
  * Unit tests for the html_writer class.
  *
@@ -36,8 +22,7 @@
  * @covers \html_writer
  * @coversDefaultClass \html_writer
  */
-class html_writer_test extends basic_testcase {
-
+final class html_writer_test extends basic_testcase {
     /**
      * @covers ::start_tag
      */
diff --git a/lib/tests/outputcomponents_test.php b/lib/tests/outputcomponents_test.php
index 7ba5b6c794431..444351e9f7917 100644
--- a/lib/tests/outputcomponents_test.php
+++ b/lib/tests/outputcomponents_test.php
@@ -27,11 +27,6 @@
 use url_select;
 use user_picture;
 
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-require_once($CFG->libdir . '/outputcomponents.php');
-
 /**
  * Unit tests for lib/outputcomponents.php.
  *
@@ -40,8 +35,7 @@
  * @copyright 2011 David Mudrak <david@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class outputcomponents_test extends \advanced_testcase {
-
+final class outputcomponents_test extends \advanced_testcase {
     /**
      * Tests user_picture::fields.
      *
diff --git a/lib/tests/outputfactories_test.php b/lib/tests/outputfactories_test.php
index b0e17ba0333db..f235de37a8cf0 100644
--- a/lib/tests/outputfactories_test.php
+++ b/lib/tests/outputfactories_test.php
@@ -18,12 +18,6 @@
 
 use test_output_factory;
 
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-require_once($CFG->libdir . '/outputfactories.php');
-require_once($CFG->libdir . '/tests/fixtures/test_renderer_factory.php');
-
 /**
  * Unit tests for lib/outputfactories.php.
  *
@@ -32,7 +26,15 @@
  * @copyright 2014 Damyon Wiese
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class outputfactories_test extends \advanced_testcase {
+final class outputfactories_test extends \advanced_testcase {
+    #[\Override]
+    public static function setUpBeforeClass(): void {
+        global $CFG;
+
+        require_once($CFG->libdir . '/tests/fixtures/test_renderer_factory.php');
+
+        parent::setUpBeforeClass();
+    }
 
     public function test_nonautoloaded_classnames(): void {
         global $PAGE;
diff --git a/lib/tests/outputrequirementslib_test.php b/lib/tests/outputrequirementslib_test.php
index 2209b5670666b..32535a6a17fb9 100644
--- a/lib/tests/outputrequirementslib_test.php
+++ b/lib/tests/outputrequirementslib_test.php
@@ -16,12 +16,6 @@
 
 namespace core;
 
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-require_once($CFG->libdir . '/outputrequirementslib.php');
-
-
 /**
  * Unit tests for lib/outputrequirementslibphp.
  *
@@ -30,7 +24,7 @@
  * @copyright 2012 Petr Škoda
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class outputrequirementslib_test extends \advanced_testcase {
+final class outputrequirementslib_test extends \advanced_testcase {
     public function test_string_for_js(): void {
         $this->resetAfterTest();
 
diff --git a/mod/wiki/parser/utils.php b/mod/wiki/parser/utils.php
index f489ffd43608f..cb65a369bff0e 100644
--- a/mod/wiki/parser/utils.php
+++ b/mod/wiki/parser/utils.php
@@ -9,8 +9,6 @@
  * @package mod_wiki
  */
 
-require_once($CFG->dirroot . "/lib/outputcomponents.php");
-
 class parser_utils {
 
     public static function h($tag, $text = null, $options = array(), $escape_text = false) {
@@ -95,4 +93,3 @@ public static function wiki_parser_real_path($url) {
         return $url;
     }
 }
-

From 6c61700d0e66cadb0dde128a44f9cefae406d852 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 13 Jun 2024 11:26:21 +0800
Subject: [PATCH 064/119] MDL-82183 core_table: Move tablelib classes to
 core_table

---
 lib/db/legacyclasses.php                      |   16 +
 lib/table/classes/base_export_format.php      |   95 +
 .../classes/dataformat_export_format.php      |  148 ++
 lib/table/classes/flexible_table.php          | 1997 ++++++++++++++
 lib/table/classes/sql_table.php               |  205 ++
 lib/tablelib.php                              | 2361 -----------------
 6 files changed, 2461 insertions(+), 2361 deletions(-)
 create mode 100644 lib/table/classes/base_export_format.php
 create mode 100644 lib/table/classes/dataformat_export_format.php
 create mode 100644 lib/table/classes/flexible_table.php
 create mode 100644 lib/table/classes/sql_table.php

diff --git a/lib/db/legacyclasses.php b/lib/db/legacyclasses.php
index 696ba07dfa058..a9b0ec84beb06 100644
--- a/lib/db/legacyclasses.php
+++ b/lib/db/legacyclasses.php
@@ -125,4 +125,20 @@
         'core_table',
         'output/html_table_cell.php',
     ],
+    \flexible_table::class => [
+        'core_table',
+        'flexible_table.php',
+    ],
+    \table_sql::class => [
+        'core_table',
+        'sql_table.php',
+    ],
+    \table_default_export_format_parent::class => [
+        'core_table',
+        'base_export_format.php',
+    ],
+    \table_dataformat_export_format::class => [
+        'core_table',
+        'dataformat_export_format.php',
+    ],
 ];
diff --git a/lib/table/classes/base_export_format.php b/lib/table/classes/base_export_format.php
new file mode 100644
index 0000000000000..40abfc8b22f41
--- /dev/null
+++ b/lib/table/classes/base_export_format.php
@@ -0,0 +1,95 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+
+require_once("{$CFG->libdir}/tablelib.php");
+
+/**
+ * @package   moodlecore
+ * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class table_default_export_format_parent {
+    /**
+     * @var flexible_table or child class reference pointing to table class
+     * object from which to export data.
+     */
+    var $table;
+
+    /**
+     * @var bool output started. Keeps track of whether any output has been
+     * started yet.
+     */
+    var $documentstarted = false;
+
+    /**
+     * Constructor
+     *
+     * @param flexible_table $table
+     */
+    public function __construct(&$table) {
+        $this->table =& $table;
+    }
+
+    /**
+     * Old syntax of class constructor. Deprecated in PHP7.
+     *
+     * @deprecated since Moodle 3.1
+     */
+    public function table_default_export_format_parent(&$table) {
+        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
+        self::__construct($table);
+    }
+
+    function set_table(&$table) {
+        $this->table =& $table;
+    }
+
+    function add_data($row) {
+        return false;
+    }
+
+    function add_seperator() {
+        return false;
+    }
+
+    function document_started() {
+        return $this->documentstarted;
+    }
+    /**
+     * Given text in a variety of format codings, this function returns
+     * the text as safe HTML or as plain text dependent on what is appropriate
+     * for the download format. The default removes all tags.
+     */
+    function format_text($text, $format=FORMAT_MOODLE, $options=NULL, $courseid=NULL) {
+        //use some whitespace to indicate where there was some line spacing.
+        $text = str_replace(array('</p>', "\n", "\r"), '   ', $text);
+        return html_entity_decode(strip_tags($text), ENT_COMPAT);
+    }
+
+    /**
+     * Format a row of data, removing HTML tags and entities from each of the cells
+     *
+     * @param array $row
+     * @return array
+     */
+    public function format_data(array $row): array {
+        return array_map([$this, 'format_text'], $row);
+    }
+}
diff --git a/lib/table/classes/dataformat_export_format.php b/lib/table/classes/dataformat_export_format.php
new file mode 100644
index 0000000000000..aca76e0734240
--- /dev/null
+++ b/lib/table/classes/dataformat_export_format.php
@@ -0,0 +1,148 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+
+require_once("{$CFG->libdir}/tablelib.php");
+
+use core\dataformat;
+
+/**
+ * Dataformat exporter
+ *
+ * @package    core
+ * @subpackage tablelib
+ * @copyright  2016 Brendan Heywood (brendan@catalyst-au.net)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class table_dataformat_export_format extends table_default_export_format_parent {
+
+    /** @var \core\dataformat\base $dataformat */
+    protected $dataformat;
+
+    /** @var int $rownum */
+    protected $rownum = 0;
+
+    /** @var array $columns */
+    protected $columns;
+
+    /**
+     * Constructor
+     *
+     * @param string $table An sql table
+     * @param string $dataformat type of dataformat for export
+     */
+    public function __construct(&$table, $dataformat) {
+        parent::__construct($table);
+
+        if (ob_get_length()) {
+            throw new coding_exception("Output can not be buffered before instantiating table_dataformat_export_format");
+        }
+
+        $this->dataformat = dataformat::get_format_instance($dataformat);
+
+        // The dataformat export time to first byte could take a while to generate...
+        set_time_limit(0);
+
+        // Close the session so that the users other tabs in the same session are not blocked.
+        \core\session\manager::write_close();
+    }
+
+    /**
+     * Whether the current dataformat supports export of HTML
+     *
+     * @return bool
+     */
+    public function supports_html(): bool {
+        return $this->dataformat->supports_html();
+    }
+
+    /**
+     * Start document
+     *
+     * @param string $filename
+     * @param string $sheettitle
+     */
+    public function start_document($filename, $sheettitle) {
+        $this->documentstarted = true;
+        $this->dataformat->set_filename($filename);
+        $this->dataformat->send_http_headers();
+        $this->dataformat->set_sheettitle($sheettitle);
+        $this->dataformat->start_output();
+    }
+
+    /**
+     * Start export
+     *
+     * @param string $sheettitle optional spreadsheet worksheet title
+     */
+    public function start_table($sheettitle) {
+        $this->dataformat->set_sheettitle($sheettitle);
+    }
+
+    /**
+     * Output headers
+     *
+     * @param array $headers
+     */
+    public function output_headers($headers) {
+        $this->columns = $this->format_data($headers);
+        if (method_exists($this->dataformat, 'write_header')) {
+            error_log('The function write_header() does not support multiple sheets. In order to support multiple sheets you ' .
+                'must implement start_output() and start_sheet() and remove write_header() in your dataformat.');
+            $this->dataformat->write_header($this->columns);
+        } else {
+            $this->dataformat->start_sheet($this->columns);
+        }
+    }
+
+    /**
+     * Add a row of data
+     *
+     * @param array $row One record of data
+     */
+    public function add_data($row) {
+        if (!$this->supports_html()) {
+            $row = $this->format_data($row);
+        }
+
+        $this->dataformat->write_record($row, $this->rownum++);
+        return true;
+    }
+
+    /**
+     * Finish export
+     */
+    public function finish_table() {
+        if (method_exists($this->dataformat, 'write_footer')) {
+            error_log('The function write_footer() does not support multiple sheets. In order to support multiple sheets you ' .
+                'must implement close_sheet() and close_output() and remove write_footer() in your dataformat.');
+            $this->dataformat->write_footer($this->columns);
+        } else {
+            $this->dataformat->close_sheet($this->columns);
+        }
+    }
+
+    /**
+     * Finish download
+     */
+    public function finish_document() {
+        $this->dataformat->close_output();
+        exit();
+    }
+}
diff --git a/lib/table/classes/flexible_table.php b/lib/table/classes/flexible_table.php
new file mode 100644
index 0000000000000..cf683e4702323
--- /dev/null
+++ b/lib/table/classes/flexible_table.php
@@ -0,0 +1,1997 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+use core_table\local\filter\filterset;
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+
+require_once("{$CFG->libdir}/tablelib.php");
+
+/**
+ * Flexible table implementation.
+ *
+ * @package   core_table
+ * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class flexible_table {
+
+    var $uniqueid        = NULL;
+    var $attributes      = array();
+    var $headers         = array();
+
+    /**
+     * @var string A column which should be considered as a header column.
+     */
+    protected $headercolumn = null;
+
+    /**
+     * @var string For create header with help icon.
+     */
+    private $helpforheaders = array();
+    var $columns         = array();
+    var $column_style    = array();
+    var $column_class    = array();
+    var $column_suppress = array();
+    var $column_nosort   = array('userpic');
+    private $column_textsort = array();
+
+    /**
+     * @var array The sticky attribute of each table column.
+     */
+    protected $columnsticky = [];
+
+    /** @var boolean Stores if setup has already been called on this flixible table. */
+    var $setup           = false;
+    var $baseurl         = NULL;
+    var $request         = array();
+
+    /** @var string[] Columns that are expected to contain a users fullname.  */
+    protected $userfullnamecolumns = ['fullname'];
+
+    /** @var array[] Attributes for each column  */
+    private $columnsattributes = [];
+
+    /**
+     * @var bool Whether or not to store table properties in the user_preferences table.
+     */
+    private $persistent = false;
+    var $is_collapsible = false;
+    var $is_sortable    = false;
+
+    /**
+     * @var array The fields to sort.
+     */
+    protected $sortdata;
+
+    /** @var string The manually set first name initial preference */
+    protected $ifirst;
+
+    /** @var string The manually set last name initial preference */
+    protected $ilast;
+
+    var $use_pages      = false;
+    var $use_initials   = false;
+
+    var $maxsortkeys = 2;
+    var $pagesize    = 30;
+    var $currpage    = 0;
+    var $totalrows   = 0;
+    var $currentrow  = 0;
+    var $sort_default_column = NULL;
+    var $sort_default_order  = SORT_ASC;
+
+    /** @var integer The defeult per page size for the table. */
+    private $defaultperpage = 30;
+
+    /**
+     * Array of positions in which to display download controls.
+     */
+    var $showdownloadbuttonsat= array(TABLE_P_TOP);
+
+    /**
+     * @var string Key of field returned by db query that is the id field of the
+     * user table or equivalent.
+     */
+    public $useridfield = 'id';
+
+    /**
+     * @var string which download plugin to use. Default '' means none - print
+     * html table with paging. Property set by is_downloading which typically
+     * passes in cleaned data from $
+     */
+    var $download  = '';
+
+    /**
+     * @var bool whether data is downloadable from table. Determines whether
+     * to display download buttons. Set by method downloadable().
+     */
+    var $downloadable = false;
+
+    /**
+     * @var bool Has start output been called yet?
+     */
+    var $started_output = false;
+
+    /** @var table_dataformat_export_format */
+    var $exportclass = null;
+
+    /**
+     * @var array For storing user-customised table properties in the user_preferences db table.
+     */
+    private $prefs = array();
+
+    /** @var string $sheettitle */
+    protected $sheettitle;
+
+    /** @var string $filename */
+    protected $filename;
+
+    /** @var array $hiddencolumns List of hidden columns. */
+    protected $hiddencolumns;
+
+    /** @var bool $resetting Whether the table preferences is resetting. */
+    protected $resetting;
+
+    /**
+     * @var string $caption The caption of table
+     */
+    public $caption;
+
+    /**
+     * @var array $captionattributes The caption attributes of table
+     */
+    public $captionattributes;
+
+    /**
+     * @var filterset The currently applied filerset
+     * This is required for dynamic tables, but can be used by other tables too if desired.
+     */
+    protected $filterset = null;
+
+    /**
+     * Constructor
+     * @param string $uniqueid all tables have to have a unique id, this is used
+     *      as a key when storing table properties like sort order in the session.
+     */
+    function __construct($uniqueid) {
+        $this->uniqueid = $uniqueid;
+        $this->request  = array(
+            TABLE_VAR_SORT   => 'tsort',
+            TABLE_VAR_HIDE   => 'thide',
+            TABLE_VAR_SHOW   => 'tshow',
+            TABLE_VAR_IFIRST => 'tifirst',
+            TABLE_VAR_ILAST  => 'tilast',
+            TABLE_VAR_PAGE   => 'page',
+            TABLE_VAR_RESET  => 'treset',
+            TABLE_VAR_DIR    => 'tdir',
+        );
+    }
+
+    /**
+     * Call this to pass the download type. Use :
+     *         $download = optional_param('download', '', PARAM_ALPHA);
+     * To get the download type. We assume that if you call this function with
+     * params that this table's data is downloadable, so we call is_downloadable
+     * for you (even if the param is '', which means no download this time.
+     * Also you can call this method with no params to get the current set
+     * download type.
+     * @param string|null $download type of dataformat for export.
+     * @param string $filename filename for downloads without file extension.
+     * @param string $sheettitle title for downloaded data.
+     * @return string download dataformat type.
+     */
+    function is_downloading($download = null, $filename='', $sheettitle='') {
+        if ($download!==null) {
+            $this->sheettitle = $sheettitle;
+            $this->is_downloadable(true);
+            $this->download = $download;
+            $this->filename = clean_filename($filename);
+            $this->export_class_instance();
+        }
+        return $this->download;
+    }
+
+    /**
+     * Get, and optionally set, the export class.
+     * @param table_dataformat_export_format $exportclass (optional) if passed, set the table to use this export class.
+     * @return table_dataformat_export_format the export class in use (after any set).
+     */
+    function export_class_instance($exportclass = null) {
+        if (!is_null($exportclass)) {
+            $this->started_output = true;
+            $this->exportclass = $exportclass;
+            $this->exportclass->table = $this;
+        } else if (is_null($this->exportclass) && !empty($this->download)) {
+            $this->exportclass = new table_dataformat_export_format($this, $this->download);
+            if (!$this->exportclass->document_started()) {
+                $this->exportclass->start_document($this->filename, $this->sheettitle);
+            }
+        }
+        return $this->exportclass;
+    }
+
+    /**
+     * Probably don't need to call this directly. Calling is_downloading with a
+     * param automatically sets table as downloadable.
+     *
+     * @param bool $downloadable optional param to set whether data from
+     * table is downloadable. If ommitted this function can be used to get
+     * current state of table.
+     * @return bool whether table data is set to be downloadable.
+     */
+    function is_downloadable($downloadable = null) {
+        if ($downloadable !== null) {
+            $this->downloadable = $downloadable;
+        }
+        return $this->downloadable;
+    }
+
+    /**
+     * Call with boolean true to store table layout changes in the user_preferences table.
+     * Note: user_preferences.value has a maximum length of 1333 characters.
+     * Call with no parameter to get current state of table persistence.
+     *
+     * @param bool $persistent Optional parameter to set table layout persistence.
+     * @return bool Whether or not the table layout preferences will persist.
+     */
+    public function is_persistent($persistent = null) {
+        if ($persistent == true) {
+            $this->persistent = true;
+        }
+        return $this->persistent;
+    }
+
+    /**
+     * Where to show download buttons.
+     * @param array $showat array of postions in which to show download buttons.
+     * Containing TABLE_P_TOP and/or TABLE_P_BOTTOM
+     */
+    function show_download_buttons_at($showat) {
+        $this->showdownloadbuttonsat = $showat;
+    }
+
+    /**
+     * Sets the is_sortable variable to the given boolean, sort_default_column to
+     * the given string, and the sort_default_order to the given integer.
+     * @param bool $bool
+     * @param string $defaultcolumn
+     * @param int $defaultorder
+     * @return void
+     */
+    function sortable($bool, $defaultcolumn = NULL, $defaultorder = SORT_ASC) {
+        $this->is_sortable = $bool;
+        $this->sort_default_column = $defaultcolumn;
+        $this->sort_default_order  = $defaultorder;
+    }
+
+    /**
+     * Use text sorting functions for this column (required for text columns with Oracle).
+     * Be warned that you cannot use this with column aliases. You can only do this
+     * with real columns. See MDL-40481 for an example.
+     * @param string column name
+     */
+    function text_sorting($column) {
+        $this->column_textsort[] = $column;
+    }
+
+    /**
+     * Do not sort using this column
+     * @param string column name
+     */
+    function no_sorting($column) {
+        $this->column_nosort[] = $column;
+    }
+
+    /**
+     * Is the column sortable?
+     * @param string column name, null means table
+     * @return bool
+     */
+    function is_sortable($column = null) {
+        if (empty($column)) {
+            return $this->is_sortable;
+        }
+        if (!$this->is_sortable) {
+            return false;
+        }
+        return !in_array($column, $this->column_nosort);
+    }
+
+    /**
+     * Sets the is_collapsible variable to the given boolean.
+     * @param bool $bool
+     * @return void
+     */
+    function collapsible($bool) {
+        $this->is_collapsible = $bool;
+    }
+
+    /**
+     * Sets the use_pages variable to the given boolean.
+     * @param bool $bool
+     * @return void
+     */
+    function pageable($bool) {
+        $this->use_pages = $bool;
+    }
+
+    /**
+     * Sets the use_initials variable to the given boolean.
+     * @param bool $bool
+     * @return void
+     */
+    function initialbars($bool) {
+        $this->use_initials = $bool;
+    }
+
+    /**
+     * Sets the pagesize variable to the given integer, the totalrows variable
+     * to the given integer, and the use_pages variable to true.
+     * @param int $perpage
+     * @param int $total
+     * @return void
+     */
+    function pagesize($perpage, $total) {
+        $this->pagesize  = $perpage;
+        $this->totalrows = $total;
+        $this->use_pages = true;
+    }
+
+    /**
+     * Assigns each given variable in the array to the corresponding index
+     * in the request class variable.
+     * @param array $variables
+     * @return void
+     */
+    function set_control_variables($variables) {
+        foreach ($variables as $what => $variable) {
+            if (isset($this->request[$what])) {
+                $this->request[$what] = $variable;
+            }
+        }
+    }
+
+    /**
+     * Gives the given $value to the $attribute index of $this->attributes.
+     * @param string $attribute
+     * @param mixed $value
+     * @return void
+     */
+    function set_attribute($attribute, $value) {
+        $this->attributes[$attribute] = $value;
+    }
+
+    /**
+     * What this method does is set the column so that if the same data appears in
+     * consecutive rows, then it is not repeated.
+     *
+     * For example, in the quiz overview report, the fullname column is set to be suppressed, so
+     * that when one student has made multiple attempts, their name is only printed in the row
+     * for their first attempt.
+     * @param int $column the index of a column.
+     */
+    function column_suppress($column) {
+        if (isset($this->column_suppress[$column])) {
+            $this->column_suppress[$column] = true;
+        }
+    }
+
+    /**
+     * Sets the given $column index to the given $classname in $this->column_class.
+     * @param int $column
+     * @param string $classname
+     * @return void
+     */
+    function column_class($column, $classname) {
+        if (isset($this->column_class[$column])) {
+            $this->column_class[$column] = ' '.$classname; // This space needed so that classnames don't run together in the HTML
+        }
+    }
+
+    /**
+     * Sets the given $column index and $property index to the given $value in $this->column_style.
+     * @param int $column
+     * @param string $property
+     * @param mixed $value
+     * @return void
+     */
+    function column_style($column, $property, $value) {
+        if (isset($this->column_style[$column])) {
+            $this->column_style[$column][$property] = $value;
+        }
+    }
+
+    /**
+     * Sets a sticky attribute to a column.
+     * @param string $column Column name
+     * @param bool $sticky
+     */
+    public function column_sticky(string $column, bool $sticky = true): void {
+        if (isset($this->columnsticky[$column])) {
+            $this->columnsticky[$column] = $sticky == true ? ' sticky-column' : '';
+        }
+    }
+
+    /**
+     * Sets the given $attributes to $this->columnsattributes.
+     * Column attributes will be added to every cell in the column.
+     *
+     * @param array[] $attributes e.g. ['c0_firstname' => ['data-foo' => 'bar']]
+     */
+    public function set_columnsattributes(array $attributes): void {
+        $this->columnsattributes = $attributes;
+    }
+
+    /**
+     * Sets all columns' $propertys to the given $value in $this->column_style.
+     * @param int $property
+     * @param string $value
+     * @return void
+     */
+    function column_style_all($property, $value) {
+        foreach (array_keys($this->columns) as $column) {
+            $this->column_style[$column][$property] = $value;
+        }
+    }
+
+    /**
+     * Sets $this->baseurl.
+     * @param moodle_url|string $url the url with params needed to call up this page
+     */
+    function define_baseurl($url) {
+        $this->baseurl = new moodle_url($url);
+    }
+
+    /**
+     * @param array $columns an array of identifying names for columns. If
+     * columns are sorted then column names must correspond to a field in sql.
+     */
+    function define_columns($columns) {
+        $this->columns = array();
+        $this->column_style = array();
+        $this->column_class = array();
+        $this->columnsticky = [];
+        $this->columnsattributes = [];
+        $colnum = 0;
+
+        foreach ($columns as $column) {
+            $this->columns[$column]         = $colnum++;
+            $this->column_style[$column]    = array();
+            $this->column_class[$column]    = '';
+            $this->columnsticky[$column]    = '';
+            $this->columnsattributes[$column] = [];
+            $this->column_suppress[$column] = false;
+        }
+    }
+
+    /**
+     * @param array $headers numerical keyed array of displayed string titles
+     * for each column.
+     */
+    function define_headers($headers) {
+        $this->headers = $headers;
+    }
+
+    /**
+     * Mark a specific column as being a table header using the column name defined in define_columns.
+     *
+     * Note: Only one column can be a header, and it will be rendered using a th tag.
+     *
+     * @param   string  $column
+     */
+    public function define_header_column(string $column) {
+        $this->headercolumn = $column;
+    }
+
+    /**
+     * Defines a help icon for the header
+     *
+     * Always use this function if you need to create header with sorting and help icon.
+     *
+     * @param renderable[] $helpicons An array of renderable objects to be used as help icons
+     */
+    public function define_help_for_headers($helpicons) {
+        $this->helpforheaders = $helpicons;
+    }
+
+    /**
+     * Mark the table preferences to be reset.
+     */
+    public function mark_table_to_reset(): void {
+        $this->resetting = true;
+    }
+
+    /**
+     * Is the table marked for reset preferences?
+     *
+     * @return bool True if the table is marked to reset, false otherwise.
+     */
+    protected function is_resetting_preferences(): bool {
+        if ($this->resetting === null) {
+            $this->resetting = optional_param($this->request[TABLE_VAR_RESET], false, PARAM_BOOL);
+        }
+
+        return $this->resetting;
+}
+
+    /**
+     * Must be called after table is defined. Use methods above first. Cannot
+     * use functions below till after calling this method.
+     */
+    function setup() {
+
+        if (empty($this->columns) || empty($this->uniqueid)) {
+            return false;
+        }
+
+        $this->initialise_table_preferences();
+
+        if (empty($this->baseurl)) {
+            debugging('You should set baseurl when using flexible_table.');
+            global $PAGE;
+            $this->baseurl = $PAGE->url;
+        }
+
+        if ($this->currpage == null) {
+            $this->currpage = optional_param($this->request[TABLE_VAR_PAGE], 0, PARAM_INT);
+        }
+
+        $this->setup = true;
+
+        // Always introduce the "flexible" class for the table if not specified
+        if (empty($this->attributes)) {
+            $this->attributes['class'] = 'flexible table table-striped table-hover';
+        } else if (!isset($this->attributes['class'])) {
+            $this->attributes['class'] = 'flexible table table-striped table-hover';
+        } else if (!in_array('flexible', explode(' ', $this->attributes['class']))) {
+            $this->attributes['class'] = trim('flexible table table-striped table-hover ' . $this->attributes['class']);
+        }
+    }
+
+    /**
+     * Get the order by clause from the session or user preferences, for the table with id $uniqueid.
+     * @param string $uniqueid the identifier for a table.
+     * @return string SQL fragment that can be used in an ORDER BY clause.
+     */
+    public static function get_sort_for_table($uniqueid) {
+        global $SESSION;
+        if (isset($SESSION->flextable[$uniqueid])) {
+            $prefs = $SESSION->flextable[$uniqueid];
+        } else if (!$prefs = json_decode(get_user_preferences("flextable_{$uniqueid}", ''), true)) {
+            return '';
+        }
+
+        if (empty($prefs['sortby'])) {
+            return '';
+        }
+        if (empty($prefs['textsort'])) {
+            $prefs['textsort'] = array();
+        }
+
+        return self::construct_order_by($prefs['sortby'], $prefs['textsort']);
+    }
+
+    /**
+     * Prepare an an order by clause from the list of columns to be sorted.
+     * @param array $cols column name => SORT_ASC or SORT_DESC
+     * @return string SQL fragment that can be used in an ORDER BY clause.
+     */
+    public static function construct_order_by($cols, $textsortcols=array()) {
+        global $DB;
+        $bits = array();
+
+        foreach ($cols as $column => $order) {
+            if (in_array($column, $textsortcols)) {
+                $column = $DB->sql_order_by_text($column);
+            }
+            if ($order == SORT_ASC) {
+                $bits[] = $DB->sql_order_by_null($column);
+            } else {
+                $bits[] = $DB->sql_order_by_null($column, SORT_DESC);
+            }
+        }
+
+        return implode(', ', $bits);
+    }
+
+    /**
+     * @return string SQL fragment that can be used in an ORDER BY clause.
+     */
+    public function get_sql_sort() {
+        return self::construct_order_by($this->get_sort_columns(), $this->column_textsort);
+    }
+
+    /**
+     * Whether the current table contains any fullname columns
+     *
+     * @return bool
+     */
+    private function contains_fullname_columns(): bool {
+        $fullnamecolumns = array_intersect_key($this->columns, array_flip($this->userfullnamecolumns));
+
+        return !empty($fullnamecolumns);
+    }
+
+    /**
+     * Get the columns to sort by, in the form required by {@link construct_order_by()}.
+     * @return array column name => SORT_... constant.
+     */
+    public function get_sort_columns() {
+        if (!$this->setup) {
+            throw new coding_exception('Cannot call get_sort_columns until you have called setup.');
+        }
+
+        if (empty($this->prefs['sortby'])) {
+            return array();
+        }
+        foreach ($this->prefs['sortby'] as $column => $notused) {
+            if (isset($this->columns[$column])) {
+                continue; // This column is OK.
+            }
+            if (in_array($column, \core_user\fields::get_name_fields()) && $this->contains_fullname_columns()) {
+                continue; // This column is OK.
+            }
+            // This column is not OK.
+            unset($this->prefs['sortby'][$column]);
+        }
+
+        return $this->prefs['sortby'];
+    }
+
+    /**
+     * @return int the offset for LIMIT clause of SQL
+     */
+    function get_page_start() {
+        if (!$this->use_pages) {
+            return '';
+        }
+        return $this->currpage * $this->pagesize;
+    }
+
+    /**
+     * @return int the pagesize for LIMIT clause of SQL
+     */
+    function get_page_size() {
+        if (!$this->use_pages) {
+            return '';
+        }
+        return $this->pagesize;
+    }
+
+    /**
+     * @return array sql to add to where statement.
+     */
+    function get_sql_where() {
+        global $DB;
+
+        $conditions = array();
+        $params = array();
+
+        if ($this->contains_fullname_columns()) {
+            static $i = 0;
+            $i++;
+
+            if (!empty($this->prefs['i_first'])) {
+                $conditions[] = $DB->sql_like('firstname', ':ifirstc'.$i, false, false);
+                $params['ifirstc'.$i] = $this->prefs['i_first'].'%';
+            }
+            if (!empty($this->prefs['i_last'])) {
+                $conditions[] = $DB->sql_like('lastname', ':ilastc'.$i, false, false);
+                $params['ilastc'.$i] = $this->prefs['i_last'].'%';
+            }
+        }
+
+        return array(implode(" AND ", $conditions), $params);
+    }
+
+    /**
+     * Add a row of data to the table. This function takes an array or object with
+     * column names as keys or property names.
+     *
+     * It ignores any elements with keys that are not defined as columns. It
+     * puts in empty strings into the row when there is no element in the passed
+     * array corresponding to a column in the table. It puts the row elements in
+     * the proper order (internally row table data is stored by in arrays with
+     * a numerical index corresponding to the column number).
+     *
+     * @param object|array $rowwithkeys array keys or object property names are column names,
+     *                                      as defined in call to define_columns.
+     * @param string $classname CSS class name to add to this row's tr tag.
+     */
+    function add_data_keyed($rowwithkeys, $classname = '') {
+        $this->add_data($this->get_row_from_keyed($rowwithkeys), $classname);
+    }
+
+    /**
+     * Add a number of rows to the table at once. And optionally finish output after they have been added.
+     *
+     * @param (object|array|null)[] $rowstoadd Array of rows to add to table, a null value in array adds a separator row. Or a
+     *                                  object or array is added to table. We expect properties for the row array as would be
+     *                                  passed to add_data_keyed.
+     * @param bool     $finish
+     */
+    public function format_and_add_array_of_rows($rowstoadd, $finish = true) {
+        foreach ($rowstoadd as $row) {
+            if (is_null($row)) {
+                $this->add_separator();
+            } else {
+                $this->add_data_keyed($this->format_row($row));
+            }
+        }
+        if ($finish) {
+            $this->finish_output(!$this->is_downloading());
+        }
+    }
+
+    /**
+     * Add a seperator line to table.
+     */
+    function add_separator() {
+        if (!$this->setup) {
+            return false;
+        }
+        $this->add_data(NULL);
+    }
+
+    /**
+     * This method actually directly echoes the row passed to it now or adds it
+     * to the download. If this is the first row and start_output has not
+     * already been called this method also calls start_output to open the table
+     * or send headers for the downloaded.
+     * Can be used as before. print_html now calls finish_html to close table.
+     *
+     * @param array $row a numerically keyed row of data to add to the table.
+     * @param string $classname CSS class name to add to this row's tr tag.
+     * @return bool success.
+     */
+    function add_data($row, $classname = '') {
+        if (!$this->setup) {
+            return false;
+        }
+        if (!$this->started_output) {
+            $this->start_output();
+        }
+        if ($this->exportclass!==null) {
+            if ($row === null) {
+                $this->exportclass->add_seperator();
+            } else {
+                $this->exportclass->add_data($row);
+            }
+        } else {
+            $this->print_row($row, $classname);
+        }
+        return true;
+    }
+
+    /**
+     * You should call this to finish outputting the table data after adding
+     * data to the table with add_data or add_data_keyed.
+     *
+     */
+    function finish_output($closeexportclassdoc = true) {
+        if ($this->exportclass!==null) {
+            $this->exportclass->finish_table();
+            if ($closeexportclassdoc) {
+                $this->exportclass->finish_document();
+            }
+        } else {
+            $this->finish_html();
+        }
+    }
+
+    /**
+     * Hook that can be overridden in child classes to wrap a table in a form
+     * for example. Called only when there is data to display and not
+     * downloading.
+     */
+    function wrap_html_start() {
+    }
+
+    /**
+     * Hook that can be overridden in child classes to wrap a table in a form
+     * for example. Called only when there is data to display and not
+     * downloading.
+     */
+    function wrap_html_finish() {
+    }
+
+    /**
+     * Call appropriate methods on this table class to perform any processing on values before displaying in table.
+     * Takes raw data from the database and process it into human readable format, perhaps also adding html linking when
+     * displaying table as html, adding a div wrap, etc.
+     *
+     * See for example col_fullname below which will be called for a column whose name is 'fullname'.
+     *
+     * @param array|object $row row of data from db used to make one row of the table.
+     * @return array one row for the table, added using add_data_keyed method.
+     */
+    function format_row($row) {
+        if (is_array($row)) {
+            $row = (object)$row;
+        }
+        $formattedrow = array();
+        foreach (array_keys($this->columns) as $column) {
+            $colmethodname = 'col_'.$column;
+            if (method_exists($this, $colmethodname)) {
+                $formattedcolumn = $this->$colmethodname($row);
+            } else {
+                $formattedcolumn = $this->other_cols($column, $row);
+                if ($formattedcolumn===NULL) {
+                    $formattedcolumn = $row->$column;
+                }
+            }
+            $formattedrow[$column] = $formattedcolumn;
+        }
+        return $formattedrow;
+    }
+
+    /**
+     * Fullname is treated as a special columname in tablelib and should always
+     * be treated the same as the fullname of a user.
+     * @uses $this->useridfield if the userid field is not expected to be id
+     * then you need to override $this->useridfield to point at the correct
+     * field for the user id.
+     *
+     * @param object $row the data from the db containing all fields from the
+     *                    users table necessary to construct the full name of the user in
+     *                    current language.
+     * @return string contents of cell in column 'fullname', for this row.
+     */
+    function col_fullname($row) {
+        global $COURSE;
+
+        $name = fullname($row, has_capability('moodle/site:viewfullnames', $this->get_context()));
+        if ($this->download) {
+            return $name;
+        }
+
+        $userid = $row->{$this->useridfield};
+        if ($COURSE->id == SITEID) {
+            $profileurl = new moodle_url('/user/profile.php', array('id' => $userid));
+        } else {
+            $profileurl = new moodle_url('/user/view.php',
+                    array('id' => $userid, 'course' => $COURSE->id));
+        }
+        return html_writer::link($profileurl, $name);
+    }
+
+    /**
+     * You can override this method in a child class. See the description of
+     * build_table which calls this method.
+     */
+    function other_cols($column, $row) {
+        if (isset($row->$column) && ($column === 'email' || $column === 'idnumber') &&
+                (!$this->is_downloading() || $this->export_class_instance()->supports_html())) {
+            // Columns email and idnumber may potentially contain malicious characters, escape them by default.
+            // This function will not be executed if the child class implements col_email() or col_idnumber().
+            return s($row->$column);
+        }
+        return NULL;
+    }
+
+    /**
+     * Used from col_* functions when text is to be displayed. Does the
+     * right thing - either converts text to html or strips any html tags
+     * depending on if we are downloading and what is the download type. Params
+     * are the same as format_text function in weblib.php but some default
+     * options are changed.
+     */
+    function format_text($text, $format=FORMAT_MOODLE, $options=NULL, $courseid=NULL) {
+        if (!$this->is_downloading()) {
+            if (is_null($options)) {
+                $options = new stdClass;
+            }
+            //some sensible defaults
+            if (!isset($options->para)) {
+                $options->para = false;
+            }
+            if (!isset($options->newlines)) {
+                $options->newlines = false;
+            }
+            if (!isset($options->filter)) {
+                $options->filter = false;
+            }
+            return format_text($text, $format, $options);
+        } else {
+            $eci = $this->export_class_instance();
+            return $eci->format_text($text, $format, $options, $courseid);
+        }
+    }
+    /**
+     * This method is deprecated although the old api is still supported.
+     * @deprecated 1.9.2 - Jun 2, 2008
+     */
+    function print_html() {
+        if (!$this->setup) {
+            return false;
+        }
+        $this->finish_html();
+    }
+
+    /**
+     * This function is not part of the public api.
+     * @return string initial of first name we are currently filtering by
+     */
+    function get_initial_first() {
+        if (!$this->use_initials) {
+            return NULL;
+        }
+
+        return $this->prefs['i_first'];
+    }
+
+    /**
+     * This function is not part of the public api.
+     * @return string initial of last name we are currently filtering by
+     */
+    function get_initial_last() {
+        if (!$this->use_initials) {
+            return NULL;
+        }
+
+        return $this->prefs['i_last'];
+    }
+
+    /**
+     * Helper function, used by {@link print_initials_bar()} to output one initial bar.
+     * @param array $alpha of letters in the alphabet.
+     * @param string $current the currently selected letter.
+     * @param string $class class name to add to this initial bar.
+     * @param string $title the name to put in front of this initial bar.
+     * @param string $urlvar URL parameter name for this initial.
+     *
+     * @deprecated since Moodle 3.3
+     */
+    protected function print_one_initials_bar($alpha, $current, $class, $title, $urlvar) {
+
+        debugging('Method print_one_initials_bar() is no longer used and has been deprecated, ' .
+            'to print initials bar call print_initials_bar()', DEBUG_DEVELOPER);
+
+        echo html_writer::start_tag('div', array('class' => 'initialbar ' . $class)) .
+            $title . ' : ';
+        if ($current) {
+            echo html_writer::link($this->baseurl->out(false, array($urlvar => '')), get_string('all'));
+        } else {
+            echo html_writer::tag('strong', get_string('all'));
+        }
+
+        foreach ($alpha as $letter) {
+            if ($letter === $current) {
+                echo html_writer::tag('strong', $letter);
+            } else {
+                echo html_writer::link($this->baseurl->out(false, array($urlvar => $letter)), $letter);
+            }
+        }
+
+        echo html_writer::end_tag('div');
+    }
+
+    /**
+     * This function is not part of the public api.
+     */
+    function print_initials_bar() {
+        global $OUTPUT;
+
+        $ifirst = $this->get_initial_first();
+        $ilast = $this->get_initial_last();
+        if (is_null($ifirst)) {
+            $ifirst = '';
+        }
+        if (is_null($ilast)) {
+            $ilast = '';
+        }
+
+        if ((!empty($ifirst) || !empty($ilast) || $this->use_initials) && $this->contains_fullname_columns()) {
+            $prefixfirst = $this->request[TABLE_VAR_IFIRST];
+            $prefixlast = $this->request[TABLE_VAR_ILAST];
+            echo $OUTPUT->initials_bar($ifirst, 'firstinitial', get_string('firstname'), $prefixfirst, $this->baseurl);
+            echo $OUTPUT->initials_bar($ilast, 'lastinitial', get_string('lastname'), $prefixlast, $this->baseurl);
+        }
+
+    }
+
+    /**
+     * This function is not part of the public api.
+     */
+    function print_nothing_to_display() {
+        global $OUTPUT;
+
+        // Render the dynamic table header.
+        echo $this->get_dynamic_table_html_start();
+
+        // Render button to allow user to reset table preferences.
+        echo $this->render_reset_button();
+
+        $this->print_initials_bar();
+
+        echo $OUTPUT->notification(get_string('nothingtodisplay'), 'info', false);
+
+        // Render the dynamic table footer.
+        echo $this->get_dynamic_table_html_end();
+    }
+
+    /**
+     * This function is not part of the public api.
+     */
+    function get_row_from_keyed($rowwithkeys) {
+        if (is_object($rowwithkeys)) {
+            $rowwithkeys = (array)$rowwithkeys;
+        }
+        $row = array();
+        foreach (array_keys($this->columns) as $column) {
+            if (isset($rowwithkeys[$column])) {
+                $row [] = $rowwithkeys[$column];
+            } else {
+                $row[] ='';
+            }
+        }
+        return $row;
+    }
+
+    /**
+     * Get the html for the download buttons
+     *
+     * Usually only use internally
+     */
+    public function download_buttons() {
+        global $OUTPUT;
+
+        if ($this->is_downloadable() && !$this->is_downloading()) {
+            return $OUTPUT->download_dataformat_selector(get_string('downloadas', 'table'),
+                    $this->baseurl->out_omit_querystring(), 'download', $this->baseurl->params());
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * This function is not part of the public api.
+     * You don't normally need to call this. It is called automatically when
+     * needed when you start adding data to the table.
+     *
+     */
+    function start_output() {
+        $this->started_output = true;
+        if ($this->exportclass!==null) {
+            $this->exportclass->start_table($this->sheettitle);
+            $this->exportclass->output_headers($this->headers);
+        } else {
+            $this->start_html();
+            $this->print_headers();
+            echo html_writer::start_tag('tbody');
+        }
+    }
+
+    /**
+     * This function is not part of the public api.
+     */
+    function print_row($row, $classname = '') {
+        echo $this->get_row_html($row, $classname);
+    }
+
+    /**
+     * Generate html code for the passed row.
+     *
+     * @param array $row Row data.
+     * @param string $classname classes to add.
+     *
+     * @return string $html html code for the row passed.
+     */
+    public function get_row_html($row, $classname = '') {
+        static $suppress_lastrow = NULL;
+        $rowclasses = array();
+
+        if ($classname) {
+            $rowclasses[] = $classname;
+        }
+
+        $rowid = $this->uniqueid . '_r' . $this->currentrow;
+        $html = '';
+
+        $html .= html_writer::start_tag('tr', array('class' => implode(' ', $rowclasses), 'id' => $rowid));
+
+        // If we have a separator, print it
+        if ($row === NULL) {
+            $colcount = count($this->columns);
+            $html .= html_writer::tag('td', html_writer::tag('div', '',
+                    array('class' => 'tabledivider')), array('colspan' => $colcount));
+
+        } else {
+            $html .= $this->get_row_cells_html($rowid, $row, $suppress_lastrow);
+        }
+
+        $html .= html_writer::end_tag('tr');
+
+        $suppress_enabled = array_sum($this->column_suppress);
+        if ($suppress_enabled) {
+            $suppress_lastrow = $row;
+        }
+        $this->currentrow++;
+        return $html;
+    }
+
+    /**
+     * Generate html code for the row cells.
+     *
+     * @param string $rowid
+     * @param array $row
+     * @param array|null $suppresslastrow
+     * @return string
+     */
+    public function get_row_cells_html(string $rowid, array $row, ?array $suppresslastrow): string {
+        $html = '';
+        $colbyindex = array_flip($this->columns);
+        foreach ($row as $index => $data) {
+            $column = $colbyindex[$index];
+
+            $columnattributes = $this->columnsattributes[$column] ?? [];
+            if (isset($columnattributes['class'])) {
+                $this->column_class($column, $columnattributes['class']);
+                unset($columnattributes['class']);
+            }
+
+            $attributes = [
+                'class' => "cell c{$index}" . $this->column_class[$column] . $this->columnsticky[$column],
+                'id' => "{$rowid}_c{$index}",
+                'style' => $this->make_styles_string($this->column_style[$column]),
+            ];
+
+            $celltype = 'td';
+            if ($this->headercolumn && $column == $this->headercolumn) {
+                $celltype = 'th';
+                $attributes['scope'] = 'row';
+            }
+
+            $attributes += $columnattributes;
+
+            if (empty($this->prefs['collapse'][$column])) {
+                if ($this->column_suppress[$column] && $suppresslastrow !== null && $suppresslastrow[$index] === $data) {
+                    $content = '&nbsp;';
+                } else {
+                    $content = $data;
+                }
+            } else {
+                $content = '&nbsp;';
+            }
+
+            $html .= html_writer::tag($celltype, $content, $attributes);
+        }
+        return $html;
+    }
+
+    /**
+     * This function is not part of the public api.
+     */
+    function finish_html() {
+        global $OUTPUT, $PAGE;
+
+        if (!$this->started_output) {
+            //no data has been added to the table.
+            $this->print_nothing_to_display();
+
+        } else {
+            // Print empty rows to fill the table to the current pagesize.
+            // This is done so the header aria-controls attributes do not point to
+            // non existant elements.
+            $emptyrow = array_fill(0, count($this->columns), '');
+            while ($this->currentrow < $this->pagesize) {
+                $this->print_row($emptyrow, 'emptyrow');
+            }
+
+            echo html_writer::end_tag('tbody');
+            echo html_writer::end_tag('table');
+            echo html_writer::end_tag('div');
+            $this->wrap_html_finish();
+
+            // Paging bar
+            if(in_array(TABLE_P_BOTTOM, $this->showdownloadbuttonsat)) {
+                echo $this->download_buttons();
+            }
+
+            if($this->use_pages) {
+                $pagingbar = new paging_bar($this->totalrows, $this->currpage, $this->pagesize, $this->baseurl);
+                $pagingbar->pagevar = $this->request[TABLE_VAR_PAGE];
+                echo $OUTPUT->render($pagingbar);
+            }
+
+            // Render the dynamic table footer.
+            echo $this->get_dynamic_table_html_end();
+        }
+    }
+
+    /**
+     * Generate the HTML for the collapse/uncollapse icon. This is a helper method
+     * used by {@link print_headers()}.
+     * @param string $column the column name, index into various names.
+     * @param int $index numerical index of the column.
+     * @return string HTML fragment.
+     */
+    protected function show_hide_link($column, $index) {
+        global $OUTPUT;
+        // Some headers contain <br /> tags, do not include in title, hence the
+        // strip tags.
+
+        $ariacontrols = '';
+        for ($i = 0; $i < $this->pagesize; $i++) {
+            $ariacontrols .= $this->uniqueid . '_r' . $i . '_c' . $index . ' ';
+        }
+
+        $ariacontrols = trim($ariacontrols);
+
+        if (!empty($this->prefs['collapse'][$column])) {
+            $linkattributes = [
+                'title' => get_string('show') . ' ' . strip_tags($this->headers[$index]),
+                'aria-expanded' => 'false',
+                'aria-controls' => $ariacontrols,
+                'data-action' => 'show',
+                'data-column' => $column,
+                'role' => 'button',
+            ];
+            return html_writer::link($this->baseurl->out(false, array($this->request[TABLE_VAR_SHOW] => $column)),
+                    $OUTPUT->pix_icon('t/switch_plus', null), $linkattributes);
+
+        } else if ($this->headers[$index] !== NULL) {
+            $linkattributes = [
+                'title' => get_string('hide') . ' ' . strip_tags($this->headers[$index]),
+                'aria-expanded' => 'true',
+                'aria-controls' => $ariacontrols,
+                'data-action' => 'hide',
+                'data-column' => $column,
+                'role' => 'button',
+            ];
+            return html_writer::link($this->baseurl->out(false, array($this->request[TABLE_VAR_HIDE] => $column)),
+                    $OUTPUT->pix_icon('t/switch_minus', null), $linkattributes);
+        }
+    }
+
+    /**
+     * This function is not part of the public api.
+     */
+    function print_headers() {
+        global $CFG, $OUTPUT;
+
+        // Set the primary sort column/order where possible, so that sort links/icons are correct.
+        [
+            'sortby' => $primarysortcolumn,
+            'sortorder' => $primarysortorder,
+        ] = $this->get_primary_sort_order();
+
+        echo html_writer::start_tag('thead');
+        echo html_writer::start_tag('tr');
+        foreach ($this->columns as $column => $index) {
+
+            $icon_hide = '';
+            if ($this->is_collapsible) {
+                $icon_hide = $this->show_hide_link($column, $index);
+            }
+            switch ($column) {
+
+                case 'userpic':
+                    // do nothing, do not display sortable links
+                    break;
+
+                default:
+
+                    if (array_search($column, $this->userfullnamecolumns) !== false) {
+                        // Check the full name display for sortable fields.
+                        if (has_capability('moodle/site:viewfullnames', $this->get_context())) {
+                            $nameformat = $CFG->alternativefullnameformat;
+                        } else {
+                            $nameformat = $CFG->fullnamedisplay;
+                        }
+
+                        if ($nameformat == 'language') {
+                            $nameformat = get_string('fullnamedisplay');
+                        }
+
+                        $requirednames = order_in_string(\core_user\fields::get_name_fields(), $nameformat);
+
+                        if (!empty($requirednames)) {
+                            if ($this->is_sortable($column)) {
+                                // Done this way for the possibility of more than two sortable full name display fields.
+                                $this->headers[$index] = '';
+                                foreach ($requirednames as $name) {
+                                    $sortname = $this->sort_link(get_string($name),
+                                        $name, $primarysortcolumn === $name, $primarysortorder);
+                                    $this->headers[$index] .= $sortname . ' / ';
+                                }
+                                $helpicon = '';
+                                if (isset($this->helpforheaders[$index])) {
+                                    $helpicon = $OUTPUT->render($this->helpforheaders[$index]);
+                                }
+                                $this->headers[$index] = substr($this->headers[$index], 0, -3) . $helpicon;
+                            }
+                        }
+                    } else if ($this->is_sortable($column)) {
+                        $helpicon = '';
+                        if (isset($this->helpforheaders[$index])) {
+                            $helpicon = $OUTPUT->render($this->helpforheaders[$index]);
+                        }
+                        $this->headers[$index] = $this->sort_link($this->headers[$index],
+                                $column, $primarysortcolumn == $column, $primarysortorder) . $helpicon;
+                    }
+            }
+
+            $attributes = array(
+                'class' => 'header c' . $index . $this->column_class[$column] . $this->columnsticky[$column],
+                'scope' => 'col',
+            );
+            if ($this->headers[$index] === NULL) {
+                $content = '&nbsp;';
+            } else if (!empty($this->prefs['collapse'][$column])) {
+                $content = $icon_hide;
+            } else {
+                if (is_array($this->column_style[$column])) {
+                    $attributes['style'] = $this->make_styles_string($this->column_style[$column]);
+                }
+                $helpicon = '';
+                if (isset($this->helpforheaders[$index]) && !$this->is_sortable($column)) {
+                    $helpicon  = $OUTPUT->render($this->helpforheaders[$index]);
+                }
+                $content = $this->headers[$index] . $helpicon . html_writer::tag('div',
+                        $icon_hide, array('class' => 'commands'));
+            }
+            echo html_writer::tag('th', $content, $attributes);
+        }
+
+        echo html_writer::end_tag('tr');
+        echo html_writer::end_tag('thead');
+    }
+
+    /**
+     * Calculate the preferences for sort order based on user-supplied values and get params.
+     */
+    protected function set_sorting_preferences(): void {
+        $sortdata = $this->sortdata;
+
+        if ($sortdata === null) {
+            $sortdata = $this->prefs['sortby'];
+
+            $sortorder = optional_param($this->request[TABLE_VAR_DIR], $this->sort_default_order, PARAM_INT);
+            $sortby = optional_param($this->request[TABLE_VAR_SORT], '', PARAM_ALPHANUMEXT);
+
+            if (array_key_exists($sortby, $sortdata)) {
+                // This key already exists somewhere. Change its sortorder and bring it to the top.
+                unset($sortdata[$sortby]);
+            }
+            $sortdata = array_merge([$sortby => $sortorder], $sortdata);
+        }
+
+        $usernamefields = \core_user\fields::get_name_fields();
+        $sortdata = array_filter($sortdata, function($sortby) use ($usernamefields) {
+            $isvalidsort = $sortby && $this->is_sortable($sortby);
+            $isvalidsort = $isvalidsort && empty($this->prefs['collapse'][$sortby]);
+            $isrealcolumn = isset($this->columns[$sortby]);
+            $isfullnamefield = $this->contains_fullname_columns() && in_array($sortby, $usernamefields);
+
+            return $isvalidsort && ($isrealcolumn || $isfullnamefield);
+        }, ARRAY_FILTER_USE_KEY);
+
+        // Finally, make sure that no more than $this->maxsortkeys are present into the array.
+        $sortdata = array_slice($sortdata, 0, $this->maxsortkeys);
+
+        // If a default order is defined and it is not in the current list of order by columns, add it at the end.
+        // This prevents results from being returned in a random order if the only order by column contains equal values.
+        if (!empty($this->sort_default_column) && !array_key_exists($this->sort_default_column, $sortdata)) {
+            $sortdata = array_merge($sortdata, [$this->sort_default_column => $this->sort_default_order]);
+        }
+
+        // Apply the sortdata to the preference.
+        $this->prefs['sortby'] = $sortdata;
+    }
+
+    /**
+     * Fill in the preferences for the initials bar.
+     */
+    protected function set_initials_preferences(): void {
+        $ifirst = $this->ifirst;
+        $ilast = $this->ilast;
+
+        if ($ifirst === null) {
+            $ifirst = optional_param($this->request[TABLE_VAR_IFIRST], null, PARAM_RAW);
+        }
+
+        if ($ilast === null) {
+            $ilast = optional_param($this->request[TABLE_VAR_ILAST], null, PARAM_RAW);
+        }
+
+        if (!is_null($ifirst) && ($ifirst === '' || strpos(get_string('alphabet', 'langconfig'), $ifirst) !== false)) {
+            $this->prefs['i_first'] = $ifirst;
+        }
+
+        if (!is_null($ilast) && ($ilast === '' || strpos(get_string('alphabet', 'langconfig'), $ilast) !== false)) {
+            $this->prefs['i_last'] = $ilast;
+        }
+
+    }
+
+    /**
+     * Set hide and show preferences.
+     */
+    protected function set_hide_show_preferences(): void {
+
+        if ($this->hiddencolumns !== null) {
+            $this->prefs['collapse'] = array_fill_keys(array_filter($this->hiddencolumns, function($column) {
+                return array_key_exists($column, $this->columns);
+            }), true);
+        } else {
+            if ($column = optional_param($this->request[TABLE_VAR_HIDE], '', PARAM_ALPHANUMEXT)) {
+                if (isset($this->columns[$column])) {
+                    $this->prefs['collapse'][$column] = true;
+                }
+            }
+        }
+
+        if ($column = optional_param($this->request[TABLE_VAR_SHOW], '', PARAM_ALPHANUMEXT)) {
+            unset($this->prefs['collapse'][$column]);
+        }
+
+        foreach (array_keys($this->prefs['collapse']) as $column) {
+            if (array_key_exists($column, $this->prefs['sortby'])) {
+                unset($this->prefs['sortby'][$column]);
+            }
+        }
+    }
+
+    /**
+     * Set the list of hidden columns.
+     *
+     * @param array $columns The list of hidden columns.
+     */
+    public function set_hidden_columns(array $columns): void {
+        $this->hiddencolumns = $columns;
+    }
+
+    /**
+     * Initialise table preferences.
+     */
+    protected function initialise_table_preferences(): void {
+        global $SESSION;
+
+        // Load any existing user preferences.
+        if ($this->persistent) {
+            $this->prefs = json_decode(get_user_preferences("flextable_{$this->uniqueid}", ''), true);
+            $oldprefs = $this->prefs;
+        } else if (isset($SESSION->flextable[$this->uniqueid])) {
+            $this->prefs = $SESSION->flextable[$this->uniqueid];
+            $oldprefs = $this->prefs;
+        }
+
+        // Set up default preferences if needed.
+        if (!$this->prefs || $this->is_resetting_preferences()) {
+            $this->prefs = [
+                'collapse' => [],
+                'sortby'   => [],
+                'i_first'  => '',
+                'i_last'   => '',
+                'textsort' => $this->column_textsort,
+            ];
+        }
+
+        if (!isset($oldprefs)) {
+            $oldprefs = $this->prefs;
+        }
+
+        // Save user preferences if they have changed.
+        if ($this->is_resetting_preferences()) {
+            $this->sortdata = null;
+            $this->ifirst = null;
+            $this->ilast = null;
+        }
+
+        if (($showcol = optional_param($this->request[TABLE_VAR_SHOW], '', PARAM_ALPHANUMEXT)) &&
+            isset($this->columns[$showcol])) {
+            $this->prefs['collapse'][$showcol] = false;
+        } else if (($hidecol = optional_param($this->request[TABLE_VAR_HIDE], '', PARAM_ALPHANUMEXT)) &&
+            isset($this->columns[$hidecol])) {
+            $this->prefs['collapse'][$hidecol] = true;
+            if (array_key_exists($hidecol, $this->prefs['sortby'])) {
+                unset($this->prefs['sortby'][$hidecol]);
+            }
+        }
+
+        $this->set_hide_show_preferences();
+        $this->set_sorting_preferences();
+        $this->set_initials_preferences();
+
+        // Now, reduce the width of collapsed columns and remove the width from columns that should be expanded.
+        foreach (array_keys($this->columns) as $column) {
+            if (!empty($this->prefs['collapse'][$column])) {
+                $this->column_style[$column]['width'] = '10px';
+            } else {
+                unset($this->column_style[$column]['width']);
+            }
+        }
+
+        if (empty($this->baseurl)) {
+            debugging('You should set baseurl when using flexible_table.');
+            global $PAGE;
+            $this->baseurl = $PAGE->url;
+        }
+
+        if ($this->currpage == null) {
+            $this->currpage = optional_param($this->request[TABLE_VAR_PAGE], 0, PARAM_INT);
+        }
+
+        $this->save_preferences($oldprefs);
+    }
+
+    /**
+     * Save preferences.
+     *
+     * @param array $oldprefs Old preferences to compare against.
+     */
+    protected function save_preferences($oldprefs): void {
+        global $SESSION;
+
+        if ($this->prefs != $oldprefs) {
+            if ($this->persistent) {
+                set_user_preference('flextable_' . $this->uniqueid, json_encode($this->prefs));
+            } else {
+                $SESSION->flextable[$this->uniqueid] = $this->prefs;
+            }
+        }
+        unset($oldprefs);
+    }
+
+    /**
+     * Set the preferred table sorting attributes.
+     *
+     * @param string $sortby The field to sort by.
+     * @param int $sortorder The sort order.
+     */
+    public function set_sortdata(array $sortdata): void {
+        $this->sortdata = [];
+        foreach ($sortdata as $sortitem) {
+            if (!array_key_exists($sortitem['sortby'], $this->sortdata)) {
+                $this->sortdata[$sortitem['sortby']] = (int) $sortitem['sortorder'];
+            }
+        }
+    }
+
+    /**
+     * Get the default per page.
+     *
+     * @return int
+     */
+    public function get_default_per_page(): int {
+        return $this->defaultperpage;
+    }
+
+    /**
+     * Set the default per page.
+     *
+     * @param int $defaultperpage
+     */
+    public function set_default_per_page(int $defaultperpage): void {
+        $this->defaultperpage = $defaultperpage;
+    }
+
+    /**
+     * Set the preferred first name initial in an initials bar.
+     *
+     * @param string $initial The character to set
+     */
+    public function set_first_initial(string $initial): void {
+        $this->ifirst = $initial;
+    }
+
+    /**
+     * Set the preferred last name initial in an initials bar.
+     *
+     * @param string $initial The character to set
+     */
+    public function set_last_initial(string $initial): void {
+        $this->ilast = $initial;
+    }
+
+    /**
+     * Set the page number.
+     *
+     * @param int $pagenumber The page number.
+     */
+    public function set_page_number(int $pagenumber): void {
+        $this->currpage = $pagenumber - 1;
+    }
+
+    /**
+     * Generate the HTML for the sort icon. This is a helper method used by {@link sort_link()}.
+     * @param bool $isprimary whether an icon is needed (it is only needed for the primary sort column.)
+     * @param int $order SORT_ASC or SORT_DESC
+     * @return string HTML fragment.
+     */
+    protected function sort_icon($isprimary, $order) {
+        global $OUTPUT;
+
+        if (!$isprimary) {
+            return '';
+        }
+
+        if ($order == SORT_ASC) {
+            return $OUTPUT->pix_icon('t/sort_asc', get_string('asc'));
+        } else {
+            return $OUTPUT->pix_icon('t/sort_desc', get_string('desc'));
+        }
+    }
+
+    /**
+     * Generate the correct tool tip for changing the sort order. This is a
+     * helper method used by {@link sort_link()}.
+     * @param bool $isprimary whether the is column is the current primary sort column.
+     * @param int $order SORT_ASC or SORT_DESC
+     * @return string the correct title.
+     */
+    protected function sort_order_name($isprimary, $order) {
+        if ($isprimary && $order != SORT_ASC) {
+            return get_string('desc');
+        } else {
+            return get_string('asc');
+        }
+    }
+
+    /**
+     * Generate the HTML for the sort link. This is a helper method used by {@link print_headers()}.
+     * @param string $text the text for the link.
+     * @param string $column the column name, may be a fake column like 'firstname' or a real one.
+     * @param bool $isprimary whether the is column is the current primary sort column.
+     * @param int $order SORT_ASC or SORT_DESC
+     * @return string HTML fragment.
+     */
+    protected function sort_link($text, $column, $isprimary, $order) {
+        // If we are already sorting by this column, switch direction.
+        if (array_key_exists($column, $this->prefs['sortby'])) {
+            $sortorder = $this->prefs['sortby'][$column] == SORT_ASC ? SORT_DESC : SORT_ASC;
+        } else {
+            $sortorder = $order;
+        }
+
+        $params = [
+            $this->request[TABLE_VAR_SORT] => $column,
+            $this->request[TABLE_VAR_DIR] => $sortorder,
+        ];
+
+        return html_writer::link($this->baseurl->out(false, $params),
+                $text . get_accesshide(get_string('sortby') . ' ' .
+                $text . ' ' . $this->sort_order_name($isprimary, $order)),
+                [
+                    'data-sortable' => $this->is_sortable($column),
+                    'data-sortby' => $column,
+                    'data-sortorder' => $sortorder,
+                    'role' => 'button',
+                ]) . ' ' . $this->sort_icon($isprimary, $order);
+    }
+
+    /**
+     * Return primary sorting column/order, either the first preferred "sortby" value or defaults defined for the table
+     *
+     * @return array
+     */
+    protected function get_primary_sort_order(): array {
+        if (reset($this->prefs['sortby'])) {
+            return $this->get_sort_order();
+        }
+
+        return [
+            'sortby' => $this->sort_default_column,
+            'sortorder' => $this->sort_default_order,
+        ];
+    }
+
+    /**
+     * Return sorting attributes values.
+     *
+     * @return array
+     */
+    protected function get_sort_order(): array {
+        $sortbys = $this->prefs['sortby'];
+        $sortby = key($sortbys);
+
+        return [
+            'sortby' => $sortby,
+            'sortorder' => $sortbys[$sortby],
+        ];
+    }
+
+    /**
+     * Get dynamic class component.
+     *
+     * @return string
+     */
+    protected function get_component() {
+        $tableclass = explode("\\", get_class($this));
+        return reset($tableclass);
+    }
+
+    /**
+     * Get dynamic class handler.
+     *
+     * @return string
+     */
+    protected function get_handler() {
+        $tableclass = explode("\\", get_class($this));
+        return end($tableclass);
+    }
+
+    /**
+     * Get the dynamic table start wrapper.
+     * If this is not a dynamic table, then an empty string is returned making this safe to blindly call.
+     *
+     * @return string
+     */
+    protected function get_dynamic_table_html_start(): string {
+        if (is_a($this, \core_table\dynamic::class)) {
+            $sortdata = array_map(function($sortby, $sortorder) {
+                return [
+                    'sortby' => $sortby,
+                    'sortorder' => $sortorder,
+                ];
+            }, array_keys($this->prefs['sortby']), array_values($this->prefs['sortby']));;
+
+            return html_writer::start_tag('div', [
+                'class' => 'table-dynamic position-relative',
+                'data-region' => 'core_table/dynamic',
+                'data-table-handler' => $this->get_handler(),
+                'data-table-component' => $this->get_component(),
+                'data-table-uniqueid' => $this->uniqueid,
+                'data-table-filters' => json_encode($this->get_filterset()),
+                'data-table-sort-data' => json_encode($sortdata),
+                'data-table-first-initial' => $this->prefs['i_first'],
+                'data-table-last-initial' => $this->prefs['i_last'],
+                'data-table-page-number' => $this->currpage + 1,
+                'data-table-page-size' => $this->pagesize,
+                'data-table-default-per-page' => $this->get_default_per_page(),
+                'data-table-hidden-columns' => json_encode(array_keys($this->prefs['collapse'])),
+                'data-table-total-rows' => $this->totalrows,
+            ]);
+        }
+
+        return '';
+    }
+
+    /**
+     * Get the dynamic table end wrapper.
+     * If this is not a dynamic table, then an empty string is returned making this safe to blindly call.
+     *
+     * @return string
+     */
+    protected function get_dynamic_table_html_end(): string {
+        global $PAGE;
+
+        if (is_a($this, \core_table\dynamic::class)) {
+            $output = '';
+
+            $perpageurl = new moodle_url($PAGE->url);
+
+            // Generate "Show all/Show per page" link.
+            if ($this->pagesize == TABLE_SHOW_ALL_PAGE_SIZE && $this->totalrows > $this->get_default_per_page()) {
+                $perpagesize = $this->get_default_per_page();
+                $perpagestring = get_string('showperpage', '', $this->get_default_per_page());
+            } else if ($this->pagesize < $this->totalrows) {
+                $perpagesize = TABLE_SHOW_ALL_PAGE_SIZE;
+                $perpagestring = get_string('showall', '', $this->totalrows);
+            }
+            if (isset($perpagesize) && isset($perpagestring)) {
+                $perpageurl->param('perpage', $perpagesize);
+                $output .= html_writer::link(
+                    $perpageurl,
+                    $perpagestring,
+                    [
+                        'data-action' => 'showcount',
+                        'data-target-page-size' => $perpagesize,
+                    ]
+                );
+            }
+
+            $PAGE->requires->js_call_amd('core_table/dynamic', 'init');
+            $output .= html_writer::end_tag('div');
+            return $output;
+        }
+
+        return '';
+    }
+
+    /**
+     * This function is not part of the public api.
+     */
+    function start_html() {
+        global $OUTPUT;
+
+        // Render the dynamic table header.
+        echo $this->get_dynamic_table_html_start();
+
+        // Render button to allow user to reset table preferences.
+        echo $this->render_reset_button();
+
+        // Do we need to print initial bars?
+        $this->print_initials_bar();
+
+        // Paging bar
+        if ($this->use_pages) {
+            $pagingbar = new paging_bar($this->totalrows, $this->currpage, $this->pagesize, $this->baseurl);
+            $pagingbar->pagevar = $this->request[TABLE_VAR_PAGE];
+            echo $OUTPUT->render($pagingbar);
+        }
+
+        if (in_array(TABLE_P_TOP, $this->showdownloadbuttonsat)) {
+            echo $this->download_buttons();
+        }
+
+        $this->wrap_html_start();
+        // Start of main data table
+
+        echo html_writer::start_tag('div', array('class' => 'no-overflow'));
+        echo html_writer::start_tag('table', $this->attributes) . $this->render_caption();
+    }
+
+    /**
+     * This function set caption for table.
+     *
+     * @param string $caption Caption of table.
+     * @param array|null $captionattributes Caption attributes of table.
+     */
+    public function set_caption(string $caption, ?array $captionattributes): void {
+        $this->caption = $caption;
+        $this->captionattributes = $captionattributes;
+    }
+
+    /**
+     * This function renders a table caption.
+     *
+     * @return string $output Caption of table.
+     */
+    public function render_caption(): string {
+        if ($this->caption === null) {
+            return '';
+        }
+
+        return html_writer::tag(
+            'caption',
+            $this->caption,
+            $this->captionattributes,
+        );
+    }
+
+    /**
+     * This function is not part of the public api.
+     * @param array $styles CSS-property => value
+     * @return string values suitably to go in a style="" attribute in HTML.
+     */
+    function make_styles_string($styles) {
+        if (empty($styles)) {
+            return null;
+        }
+
+        $string = '';
+        foreach($styles as $property => $value) {
+            $string .= $property . ':' . $value . ';';
+        }
+        return $string;
+    }
+
+    /**
+     * Generate the HTML for the table preferences reset button.
+     *
+     * @return string HTML fragment, empty string if no need to reset
+     */
+    protected function render_reset_button() {
+
+        if (!$this->can_be_reset()) {
+            return '';
+        }
+
+        $url = $this->baseurl->out(false, array($this->request[TABLE_VAR_RESET] => 1));
+
+        $html  = html_writer::start_div('resettable mdl-right');
+        $html .= html_writer::link($url, get_string('resettable'), ['role' => 'button']);
+        $html .= html_writer::end_div();
+
+        return $html;
+    }
+
+    /**
+     * Are there some table preferences that can be reset?
+     *
+     * If true, then the "reset table preferences" widget should be displayed.
+     *
+     * @return bool
+     */
+    protected function can_be_reset() {
+        // Loop through preferences and make sure they are empty or set to the default value.
+        foreach ($this->prefs as $prefname => $prefval) {
+            if ($prefname === 'sortby' and !empty($this->sort_default_column)) {
+                // Check if the actual sorting differs from the default one.
+                if (empty($prefval) or $prefval !== array($this->sort_default_column => $this->sort_default_order)) {
+                    return true;
+                }
+
+            } else if ($prefname === 'collapse' and !empty($prefval)) {
+                // Check if there are some collapsed columns (all are expanded by default).
+                foreach ($prefval as $columnname => $iscollapsed) {
+                    if ($iscollapsed) {
+                        return true;
+                    }
+                }
+
+            } else if (!empty($prefval)) {
+                // For all other cases, we just check if some preference is set.
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the context for the table.
+     *
+     * Note: This function _must_ be overridden by dynamic tables to ensure that the context is correctly determined
+     * from the filterset parameters.
+     *
+     * @return context
+     */
+    public function get_context(): context {
+        global $PAGE;
+
+        if (is_a($this, \core_table\dynamic::class)) {
+            throw new coding_exception('The get_context function must be defined for a dynamic table');
+        }
+
+        return $PAGE->context;
+    }
+
+    /**
+     * Set the filterset in the table class.
+     *
+     * The use of filtersets is a requirement for dynamic tables, but can be used by other tables too if desired.
+     *
+     * @param filterset $filterset The filterset object to get filters and table parameters from
+     */
+    public function set_filterset(filterset $filterset): void {
+        $this->filterset = $filterset;
+
+        $this->guess_base_url();
+    }
+
+    /**
+     * Get the currently defined filterset.
+     *
+     * @return filterset
+     */
+    public function get_filterset(): ?filterset {
+        return $this->filterset;
+    }
+
+    /**
+     * Get the class used as a filterset.
+     *
+     * @return string
+     */
+    public static function get_filterset_class(): string {
+        return static::class . '_filterset';
+    }
+
+    /**
+     * Attempt to guess the base URL.
+     */
+    public function guess_base_url(): void {
+        if (is_a($this, \core_table\dynamic::class)) {
+            throw new coding_exception('The guess_base_url function must be defined for a dynamic table');
+        }
+    }
+}
diff --git a/lib/table/classes/sql_table.php b/lib/table/classes/sql_table.php
new file mode 100644
index 0000000000000..21771010c68ed
--- /dev/null
+++ b/lib/table/classes/sql_table.php
@@ -0,0 +1,205 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+
+require_once("{$CFG->libdir}/tablelib.php");
+
+/**
+ * A table whose data is provided by SQL queries.
+ *
+ * @package   moodlecore
+ * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class table_sql extends flexible_table {
+
+    public $countsql = NULL;
+    public $countparams = NULL;
+    /**
+     * @var object sql for querying db. Has fields 'fields', 'from', 'where', 'params'.
+     */
+    public $sql = NULL;
+    /**
+     * @var array|\Traversable Data fetched from the db.
+     */
+    public $rawdata = NULL;
+
+    /**
+     * @var bool Overriding default for this.
+     */
+    public $is_sortable    = true;
+    /**
+     * @var bool Overriding default for this.
+     */
+    public $is_collapsible = true;
+
+    /**
+     * @param string $uniqueid a string identifying this table.Used as a key in
+     *                          session  vars.
+     */
+    function __construct($uniqueid) {
+        parent::__construct($uniqueid);
+        // some sensible defaults
+        $this->set_attribute('class', 'generaltable generalbox');
+    }
+
+    /**
+     * Build the table from the fetched data.
+     *
+     * Take the data returned from the db_query and go through all the rows
+     * processing each col using either col_{columnname} method or other_cols
+     * method or if other_cols returns NULL then put the data straight into the
+     * table.
+     *
+     * After calling this function, don't forget to call close_recordset.
+     */
+    public function build_table() {
+        if (!$this->rawdata) {
+            return;
+        }
+
+        foreach ($this->rawdata as $row) {
+            $formattedrow = $this->format_row($row);
+            $this->add_data_keyed($formattedrow, $this->get_row_class($row));
+        }
+    }
+
+    /**
+     * Closes recordset (for use after building the table).
+     */
+    public function close_recordset() {
+        if ($this->rawdata && ($this->rawdata instanceof \core\dml\recordset_walk ||
+                $this->rawdata instanceof moodle_recordset)) {
+            $this->rawdata->close();
+            $this->rawdata = null;
+        }
+    }
+
+    /**
+     * Get any extra classes names to add to this row in the HTML.
+     * @param $row array the data for this row.
+     * @return string added to the class="" attribute of the tr.
+     */
+    function get_row_class($row) {
+        return '';
+    }
+
+    /**
+     * This is only needed if you want to use different sql to count rows.
+     * Used for example when perhaps all db JOINS are not needed when counting
+     * records. You don't need to call this function the count_sql
+     * will be generated automatically.
+     *
+     * We need to count rows returned by the db seperately to the query itself
+     * as we need to know how many pages of data we have to display.
+     */
+    function set_count_sql($sql, array $params = NULL) {
+        $this->countsql = $sql;
+        $this->countparams = $params;
+    }
+
+    /**
+     * Set the sql to query the db. Query will be :
+     *      SELECT $fields FROM $from WHERE $where
+     * Of course you can use sub-queries, JOINS etc. by putting them in the
+     * appropriate clause of the query.
+     */
+    function set_sql($fields, $from, $where, array $params = array()) {
+        $this->sql = new stdClass();
+        $this->sql->fields = $fields;
+        $this->sql->from = $from;
+        $this->sql->where = $where;
+        $this->sql->params = $params;
+    }
+
+    /**
+     * Query the db. Store results in the table object for use by build_table.
+     *
+     * @param int $pagesize size of page for paginated displayed table.
+     * @param bool $useinitialsbar do you want to use the initials bar. Bar
+     * will only be used if there is a fullname column defined for the table.
+     */
+    function query_db($pagesize, $useinitialsbar=true) {
+        global $DB;
+        if (!$this->is_downloading()) {
+            if ($this->countsql === NULL) {
+                $this->countsql = 'SELECT COUNT(1) FROM '.$this->sql->from.' WHERE '.$this->sql->where;
+                $this->countparams = $this->sql->params;
+            }
+            $grandtotal = $DB->count_records_sql($this->countsql, $this->countparams);
+            if ($useinitialsbar && !$this->is_downloading()) {
+                $this->initialbars(true);
+            }
+
+            list($wsql, $wparams) = $this->get_sql_where();
+            if ($wsql) {
+                $this->countsql .= ' AND '.$wsql;
+                $this->countparams = array_merge($this->countparams, $wparams);
+
+                $this->sql->where .= ' AND '.$wsql;
+                $this->sql->params = array_merge($this->sql->params, $wparams);
+
+                $total  = $DB->count_records_sql($this->countsql, $this->countparams);
+            } else {
+                $total = $grandtotal;
+            }
+
+            $this->pagesize($pagesize, $total);
+        }
+
+        // Fetch the attempts
+        $sort = $this->get_sql_sort();
+        if ($sort) {
+            $sort = "ORDER BY $sort";
+        }
+        $sql = "SELECT
+                {$this->sql->fields}
+                FROM {$this->sql->from}
+                WHERE {$this->sql->where}
+                {$sort}";
+
+        if (!$this->is_downloading()) {
+            $this->rawdata = $DB->get_records_sql($sql, $this->sql->params, $this->get_page_start(), $this->get_page_size());
+        } else {
+            $this->rawdata = $DB->get_records_sql($sql, $this->sql->params);
+        }
+    }
+
+    /**
+     * Convenience method to call a number of methods for you to display the
+     * table.
+     */
+    function out($pagesize, $useinitialsbar, $downloadhelpbutton='') {
+        global $DB;
+        if (!$this->columns) {
+            $onerow = $DB->get_record_sql("SELECT {$this->sql->fields} FROM {$this->sql->from} WHERE {$this->sql->where}",
+                $this->sql->params, IGNORE_MULTIPLE);
+            //if columns is not set then define columns as the keys of the rows returned
+            //from the db.
+            $this->define_columns(array_keys((array)$onerow));
+            $this->define_headers(array_keys((array)$onerow));
+        }
+        $this->pagesize = $pagesize;
+        $this->setup();
+        $this->query_db($pagesize, $useinitialsbar);
+        $this->build_table();
+        $this->close_recordset();
+        $this->finish_output();
+    }
+}
diff --git a/lib/tablelib.php b/lib/tablelib.php
index 4954b4fd8028c..0e4900c04ad31 100644
--- a/lib/tablelib.php
+++ b/lib/tablelib.php
@@ -22,9 +22,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
-defined('MOODLE_INTERNAL') || die();
-
 /**#@+
  * These constants relate to the table's handling of URL parameters.
  */
@@ -50,2361 +47,3 @@
  * Constant that defines the 'Show all' page size.
  */
 define('TABLE_SHOW_ALL_PAGE_SIZE', 5000);
-
-use core\dataformat;
-use core_table\local\filter\filterset;
-
-/**
- * @package   moodlecore
- * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class flexible_table {
-
-    var $uniqueid        = NULL;
-    var $attributes      = array();
-    var $headers         = array();
-
-    /**
-     * @var string A column which should be considered as a header column.
-     */
-    protected $headercolumn = null;
-
-    /**
-     * @var string For create header with help icon.
-     */
-    private $helpforheaders = array();
-    var $columns         = array();
-    var $column_style    = array();
-    var $column_class    = array();
-    var $column_suppress = array();
-    var $column_nosort   = array('userpic');
-    private $column_textsort = array();
-
-    /**
-     * @var array The sticky attribute of each table column.
-     */
-    protected $columnsticky = [];
-
-    /** @var boolean Stores if setup has already been called on this flixible table. */
-    var $setup           = false;
-    var $baseurl         = NULL;
-    var $request         = array();
-
-    /** @var string[] Columns that are expected to contain a users fullname.  */
-    protected $userfullnamecolumns = ['fullname'];
-
-    /** @var array[] Attributes for each column  */
-    private $columnsattributes = [];
-
-    /**
-     * @var bool Whether or not to store table properties in the user_preferences table.
-     */
-    private $persistent = false;
-    var $is_collapsible = false;
-    var $is_sortable    = false;
-
-    /**
-     * @var array The fields to sort.
-     */
-    protected $sortdata;
-
-    /** @var string The manually set first name initial preference */
-    protected $ifirst;
-
-    /** @var string The manually set last name initial preference */
-    protected $ilast;
-
-    var $use_pages      = false;
-    var $use_initials   = false;
-
-    var $maxsortkeys = 2;
-    var $pagesize    = 30;
-    var $currpage    = 0;
-    var $totalrows   = 0;
-    var $currentrow  = 0;
-    var $sort_default_column = NULL;
-    var $sort_default_order  = SORT_ASC;
-
-    /** @var integer The defeult per page size for the table. */
-    private $defaultperpage = 30;
-
-    /**
-     * Array of positions in which to display download controls.
-     */
-    var $showdownloadbuttonsat= array(TABLE_P_TOP);
-
-    /**
-     * @var string Key of field returned by db query that is the id field of the
-     * user table or equivalent.
-     */
-    public $useridfield = 'id';
-
-    /**
-     * @var string which download plugin to use. Default '' means none - print
-     * html table with paging. Property set by is_downloading which typically
-     * passes in cleaned data from $
-     */
-    var $download  = '';
-
-    /**
-     * @var bool whether data is downloadable from table. Determines whether
-     * to display download buttons. Set by method downloadable().
-     */
-    var $downloadable = false;
-
-    /**
-     * @var bool Has start output been called yet?
-     */
-    var $started_output = false;
-
-    /** @var table_dataformat_export_format */
-    var $exportclass = null;
-
-    /**
-     * @var array For storing user-customised table properties in the user_preferences db table.
-     */
-    private $prefs = array();
-
-    /** @var string $sheettitle */
-    protected $sheettitle;
-
-    /** @var string $filename */
-    protected $filename;
-
-    /** @var array $hiddencolumns List of hidden columns. */
-    protected $hiddencolumns;
-
-    /** @var bool $resetting Whether the table preferences is resetting. */
-    protected $resetting;
-
-    /**
-     * @var string $caption The caption of table
-     */
-    public $caption;
-
-    /**
-     * @var array $captionattributes The caption attributes of table
-     */
-    public $captionattributes;
-
-    /**
-     * @var filterset The currently applied filerset
-     * This is required for dynamic tables, but can be used by other tables too if desired.
-     */
-    protected $filterset = null;
-
-    /**
-     * Constructor
-     * @param string $uniqueid all tables have to have a unique id, this is used
-     *      as a key when storing table properties like sort order in the session.
-     */
-    function __construct($uniqueid) {
-        $this->uniqueid = $uniqueid;
-        $this->request  = array(
-            TABLE_VAR_SORT   => 'tsort',
-            TABLE_VAR_HIDE   => 'thide',
-            TABLE_VAR_SHOW   => 'tshow',
-            TABLE_VAR_IFIRST => 'tifirst',
-            TABLE_VAR_ILAST  => 'tilast',
-            TABLE_VAR_PAGE   => 'page',
-            TABLE_VAR_RESET  => 'treset',
-            TABLE_VAR_DIR    => 'tdir',
-        );
-    }
-
-    /**
-     * Call this to pass the download type. Use :
-     *         $download = optional_param('download', '', PARAM_ALPHA);
-     * To get the download type. We assume that if you call this function with
-     * params that this table's data is downloadable, so we call is_downloadable
-     * for you (even if the param is '', which means no download this time.
-     * Also you can call this method with no params to get the current set
-     * download type.
-     * @param string|null $download type of dataformat for export.
-     * @param string $filename filename for downloads without file extension.
-     * @param string $sheettitle title for downloaded data.
-     * @return string download dataformat type.
-     */
-    function is_downloading($download = null, $filename='', $sheettitle='') {
-        if ($download!==null) {
-            $this->sheettitle = $sheettitle;
-            $this->is_downloadable(true);
-            $this->download = $download;
-            $this->filename = clean_filename($filename);
-            $this->export_class_instance();
-        }
-        return $this->download;
-    }
-
-    /**
-     * Get, and optionally set, the export class.
-     * @param table_dataformat_export_format $exportclass (optional) if passed, set the table to use this export class.
-     * @return table_dataformat_export_format the export class in use (after any set).
-     */
-    function export_class_instance($exportclass = null) {
-        if (!is_null($exportclass)) {
-            $this->started_output = true;
-            $this->exportclass = $exportclass;
-            $this->exportclass->table = $this;
-        } else if (is_null($this->exportclass) && !empty($this->download)) {
-            $this->exportclass = new table_dataformat_export_format($this, $this->download);
-            if (!$this->exportclass->document_started()) {
-                $this->exportclass->start_document($this->filename, $this->sheettitle);
-            }
-        }
-        return $this->exportclass;
-    }
-
-    /**
-     * Probably don't need to call this directly. Calling is_downloading with a
-     * param automatically sets table as downloadable.
-     *
-     * @param bool $downloadable optional param to set whether data from
-     * table is downloadable. If ommitted this function can be used to get
-     * current state of table.
-     * @return bool whether table data is set to be downloadable.
-     */
-    function is_downloadable($downloadable = null) {
-        if ($downloadable !== null) {
-            $this->downloadable = $downloadable;
-        }
-        return $this->downloadable;
-    }
-
-    /**
-     * Call with boolean true to store table layout changes in the user_preferences table.
-     * Note: user_preferences.value has a maximum length of 1333 characters.
-     * Call with no parameter to get current state of table persistence.
-     *
-     * @param bool $persistent Optional parameter to set table layout persistence.
-     * @return bool Whether or not the table layout preferences will persist.
-     */
-    public function is_persistent($persistent = null) {
-        if ($persistent == true) {
-            $this->persistent = true;
-        }
-        return $this->persistent;
-    }
-
-    /**
-     * Where to show download buttons.
-     * @param array $showat array of postions in which to show download buttons.
-     * Containing TABLE_P_TOP and/or TABLE_P_BOTTOM
-     */
-    function show_download_buttons_at($showat) {
-        $this->showdownloadbuttonsat = $showat;
-    }
-
-    /**
-     * Sets the is_sortable variable to the given boolean, sort_default_column to
-     * the given string, and the sort_default_order to the given integer.
-     * @param bool $bool
-     * @param string $defaultcolumn
-     * @param int $defaultorder
-     * @return void
-     */
-    function sortable($bool, $defaultcolumn = NULL, $defaultorder = SORT_ASC) {
-        $this->is_sortable = $bool;
-        $this->sort_default_column = $defaultcolumn;
-        $this->sort_default_order  = $defaultorder;
-    }
-
-    /**
-     * Use text sorting functions for this column (required for text columns with Oracle).
-     * Be warned that you cannot use this with column aliases. You can only do this
-     * with real columns. See MDL-40481 for an example.
-     * @param string column name
-     */
-    function text_sorting($column) {
-        $this->column_textsort[] = $column;
-    }
-
-    /**
-     * Do not sort using this column
-     * @param string column name
-     */
-    function no_sorting($column) {
-        $this->column_nosort[] = $column;
-    }
-
-    /**
-     * Is the column sortable?
-     * @param string column name, null means table
-     * @return bool
-     */
-    function is_sortable($column = null) {
-        if (empty($column)) {
-            return $this->is_sortable;
-        }
-        if (!$this->is_sortable) {
-            return false;
-        }
-        return !in_array($column, $this->column_nosort);
-    }
-
-    /**
-     * Sets the is_collapsible variable to the given boolean.
-     * @param bool $bool
-     * @return void
-     */
-    function collapsible($bool) {
-        $this->is_collapsible = $bool;
-    }
-
-    /**
-     * Sets the use_pages variable to the given boolean.
-     * @param bool $bool
-     * @return void
-     */
-    function pageable($bool) {
-        $this->use_pages = $bool;
-    }
-
-    /**
-     * Sets the use_initials variable to the given boolean.
-     * @param bool $bool
-     * @return void
-     */
-    function initialbars($bool) {
-        $this->use_initials = $bool;
-    }
-
-    /**
-     * Sets the pagesize variable to the given integer, the totalrows variable
-     * to the given integer, and the use_pages variable to true.
-     * @param int $perpage
-     * @param int $total
-     * @return void
-     */
-    function pagesize($perpage, $total) {
-        $this->pagesize  = $perpage;
-        $this->totalrows = $total;
-        $this->use_pages = true;
-    }
-
-    /**
-     * Assigns each given variable in the array to the corresponding index
-     * in the request class variable.
-     * @param array $variables
-     * @return void
-     */
-    function set_control_variables($variables) {
-        foreach ($variables as $what => $variable) {
-            if (isset($this->request[$what])) {
-                $this->request[$what] = $variable;
-            }
-        }
-    }
-
-    /**
-     * Gives the given $value to the $attribute index of $this->attributes.
-     * @param string $attribute
-     * @param mixed $value
-     * @return void
-     */
-    function set_attribute($attribute, $value) {
-        $this->attributes[$attribute] = $value;
-    }
-
-    /**
-     * What this method does is set the column so that if the same data appears in
-     * consecutive rows, then it is not repeated.
-     *
-     * For example, in the quiz overview report, the fullname column is set to be suppressed, so
-     * that when one student has made multiple attempts, their name is only printed in the row
-     * for their first attempt.
-     * @param int $column the index of a column.
-     */
-    function column_suppress($column) {
-        if (isset($this->column_suppress[$column])) {
-            $this->column_suppress[$column] = true;
-        }
-    }
-
-    /**
-     * Sets the given $column index to the given $classname in $this->column_class.
-     * @param int $column
-     * @param string $classname
-     * @return void
-     */
-    function column_class($column, $classname) {
-        if (isset($this->column_class[$column])) {
-            $this->column_class[$column] = ' '.$classname; // This space needed so that classnames don't run together in the HTML
-        }
-    }
-
-    /**
-     * Sets the given $column index and $property index to the given $value in $this->column_style.
-     * @param int $column
-     * @param string $property
-     * @param mixed $value
-     * @return void
-     */
-    function column_style($column, $property, $value) {
-        if (isset($this->column_style[$column])) {
-            $this->column_style[$column][$property] = $value;
-        }
-    }
-
-    /**
-     * Sets a sticky attribute to a column.
-     * @param string $column Column name
-     * @param bool $sticky
-     */
-    public function column_sticky(string $column, bool $sticky = true): void {
-        if (isset($this->columnsticky[$column])) {
-            $this->columnsticky[$column] = $sticky == true ? ' sticky-column' : '';
-        }
-    }
-
-    /**
-     * Sets the given $attributes to $this->columnsattributes.
-     * Column attributes will be added to every cell in the column.
-     *
-     * @param array[] $attributes e.g. ['c0_firstname' => ['data-foo' => 'bar']]
-     */
-    public function set_columnsattributes(array $attributes): void {
-        $this->columnsattributes = $attributes;
-    }
-
-    /**
-     * Sets all columns' $propertys to the given $value in $this->column_style.
-     * @param int $property
-     * @param string $value
-     * @return void
-     */
-    function column_style_all($property, $value) {
-        foreach (array_keys($this->columns) as $column) {
-            $this->column_style[$column][$property] = $value;
-        }
-    }
-
-    /**
-     * Sets $this->baseurl.
-     * @param moodle_url|string $url the url with params needed to call up this page
-     */
-    function define_baseurl($url) {
-        $this->baseurl = new moodle_url($url);
-    }
-
-    /**
-     * @param array $columns an array of identifying names for columns. If
-     * columns are sorted then column names must correspond to a field in sql.
-     */
-    function define_columns($columns) {
-        $this->columns = array();
-        $this->column_style = array();
-        $this->column_class = array();
-        $this->columnsticky = [];
-        $this->columnsattributes = [];
-        $colnum = 0;
-
-        foreach ($columns as $column) {
-            $this->columns[$column]         = $colnum++;
-            $this->column_style[$column]    = array();
-            $this->column_class[$column]    = '';
-            $this->columnsticky[$column]    = '';
-            $this->columnsattributes[$column] = [];
-            $this->column_suppress[$column] = false;
-        }
-    }
-
-    /**
-     * @param array $headers numerical keyed array of displayed string titles
-     * for each column.
-     */
-    function define_headers($headers) {
-        $this->headers = $headers;
-    }
-
-    /**
-     * Mark a specific column as being a table header using the column name defined in define_columns.
-     *
-     * Note: Only one column can be a header, and it will be rendered using a th tag.
-     *
-     * @param   string  $column
-     */
-    public function define_header_column(string $column) {
-        $this->headercolumn = $column;
-    }
-
-    /**
-     * Defines a help icon for the header
-     *
-     * Always use this function if you need to create header with sorting and help icon.
-     *
-     * @param renderable[] $helpicons An array of renderable objects to be used as help icons
-     */
-    public function define_help_for_headers($helpicons) {
-        $this->helpforheaders = $helpicons;
-    }
-
-    /**
-     * Mark the table preferences to be reset.
-     */
-    public function mark_table_to_reset(): void {
-        $this->resetting = true;
-    }
-
-    /**
-     * Is the table marked for reset preferences?
-     *
-     * @return bool True if the table is marked to reset, false otherwise.
-     */
-    protected function is_resetting_preferences(): bool {
-        if ($this->resetting === null) {
-            $this->resetting = optional_param($this->request[TABLE_VAR_RESET], false, PARAM_BOOL);
-        }
-
-        return $this->resetting;
-}
-
-    /**
-     * Must be called after table is defined. Use methods above first. Cannot
-     * use functions below till after calling this method.
-     */
-    function setup() {
-
-        if (empty($this->columns) || empty($this->uniqueid)) {
-            return false;
-        }
-
-        $this->initialise_table_preferences();
-
-        if (empty($this->baseurl)) {
-            debugging('You should set baseurl when using flexible_table.');
-            global $PAGE;
-            $this->baseurl = $PAGE->url;
-        }
-
-        if ($this->currpage == null) {
-            $this->currpage = optional_param($this->request[TABLE_VAR_PAGE], 0, PARAM_INT);
-        }
-
-        $this->setup = true;
-
-        // Always introduce the "flexible" class for the table if not specified
-        if (empty($this->attributes)) {
-            $this->attributes['class'] = 'flexible table table-striped table-hover';
-        } else if (!isset($this->attributes['class'])) {
-            $this->attributes['class'] = 'flexible table table-striped table-hover';
-        } else if (!in_array('flexible', explode(' ', $this->attributes['class']))) {
-            $this->attributes['class'] = trim('flexible table table-striped table-hover ' . $this->attributes['class']);
-        }
-    }
-
-    /**
-     * Get the order by clause from the session or user preferences, for the table with id $uniqueid.
-     * @param string $uniqueid the identifier for a table.
-     * @return string SQL fragment that can be used in an ORDER BY clause.
-     */
-    public static function get_sort_for_table($uniqueid) {
-        global $SESSION;
-        if (isset($SESSION->flextable[$uniqueid])) {
-            $prefs = $SESSION->flextable[$uniqueid];
-        } else if (!$prefs = json_decode(get_user_preferences("flextable_{$uniqueid}", ''), true)) {
-            return '';
-        }
-
-        if (empty($prefs['sortby'])) {
-            return '';
-        }
-        if (empty($prefs['textsort'])) {
-            $prefs['textsort'] = array();
-        }
-
-        return self::construct_order_by($prefs['sortby'], $prefs['textsort']);
-    }
-
-    /**
-     * Prepare an an order by clause from the list of columns to be sorted.
-     * @param array $cols column name => SORT_ASC or SORT_DESC
-     * @return string SQL fragment that can be used in an ORDER BY clause.
-     */
-    public static function construct_order_by($cols, $textsortcols=array()) {
-        global $DB;
-        $bits = array();
-
-        foreach ($cols as $column => $order) {
-            if (in_array($column, $textsortcols)) {
-                $column = $DB->sql_order_by_text($column);
-            }
-            if ($order == SORT_ASC) {
-                $bits[] = $DB->sql_order_by_null($column);
-            } else {
-                $bits[] = $DB->sql_order_by_null($column, SORT_DESC);
-            }
-        }
-
-        return implode(', ', $bits);
-    }
-
-    /**
-     * @return string SQL fragment that can be used in an ORDER BY clause.
-     */
-    public function get_sql_sort() {
-        return self::construct_order_by($this->get_sort_columns(), $this->column_textsort);
-    }
-
-    /**
-     * Whether the current table contains any fullname columns
-     *
-     * @return bool
-     */
-    private function contains_fullname_columns(): bool {
-        $fullnamecolumns = array_intersect_key($this->columns, array_flip($this->userfullnamecolumns));
-
-        return !empty($fullnamecolumns);
-    }
-
-    /**
-     * Get the columns to sort by, in the form required by {@link construct_order_by()}.
-     * @return array column name => SORT_... constant.
-     */
-    public function get_sort_columns() {
-        if (!$this->setup) {
-            throw new coding_exception('Cannot call get_sort_columns until you have called setup.');
-        }
-
-        if (empty($this->prefs['sortby'])) {
-            return array();
-        }
-        foreach ($this->prefs['sortby'] as $column => $notused) {
-            if (isset($this->columns[$column])) {
-                continue; // This column is OK.
-            }
-            if (in_array($column, \core_user\fields::get_name_fields()) && $this->contains_fullname_columns()) {
-                continue; // This column is OK.
-            }
-            // This column is not OK.
-            unset($this->prefs['sortby'][$column]);
-        }
-
-        return $this->prefs['sortby'];
-    }
-
-    /**
-     * @return int the offset for LIMIT clause of SQL
-     */
-    function get_page_start() {
-        if (!$this->use_pages) {
-            return '';
-        }
-        return $this->currpage * $this->pagesize;
-    }
-
-    /**
-     * @return int the pagesize for LIMIT clause of SQL
-     */
-    function get_page_size() {
-        if (!$this->use_pages) {
-            return '';
-        }
-        return $this->pagesize;
-    }
-
-    /**
-     * @return array sql to add to where statement.
-     */
-    function get_sql_where() {
-        global $DB;
-
-        $conditions = array();
-        $params = array();
-
-        if ($this->contains_fullname_columns()) {
-            static $i = 0;
-            $i++;
-
-            if (!empty($this->prefs['i_first'])) {
-                $conditions[] = $DB->sql_like('firstname', ':ifirstc'.$i, false, false);
-                $params['ifirstc'.$i] = $this->prefs['i_first'].'%';
-            }
-            if (!empty($this->prefs['i_last'])) {
-                $conditions[] = $DB->sql_like('lastname', ':ilastc'.$i, false, false);
-                $params['ilastc'.$i] = $this->prefs['i_last'].'%';
-            }
-        }
-
-        return array(implode(" AND ", $conditions), $params);
-    }
-
-    /**
-     * Add a row of data to the table. This function takes an array or object with
-     * column names as keys or property names.
-     *
-     * It ignores any elements with keys that are not defined as columns. It
-     * puts in empty strings into the row when there is no element in the passed
-     * array corresponding to a column in the table. It puts the row elements in
-     * the proper order (internally row table data is stored by in arrays with
-     * a numerical index corresponding to the column number).
-     *
-     * @param object|array $rowwithkeys array keys or object property names are column names,
-     *                                      as defined in call to define_columns.
-     * @param string $classname CSS class name to add to this row's tr tag.
-     */
-    function add_data_keyed($rowwithkeys, $classname = '') {
-        $this->add_data($this->get_row_from_keyed($rowwithkeys), $classname);
-    }
-
-    /**
-     * Add a number of rows to the table at once. And optionally finish output after they have been added.
-     *
-     * @param (object|array|null)[] $rowstoadd Array of rows to add to table, a null value in array adds a separator row. Or a
-     *                                  object or array is added to table. We expect properties for the row array as would be
-     *                                  passed to add_data_keyed.
-     * @param bool     $finish
-     */
-    public function format_and_add_array_of_rows($rowstoadd, $finish = true) {
-        foreach ($rowstoadd as $row) {
-            if (is_null($row)) {
-                $this->add_separator();
-            } else {
-                $this->add_data_keyed($this->format_row($row));
-            }
-        }
-        if ($finish) {
-            $this->finish_output(!$this->is_downloading());
-        }
-    }
-
-    /**
-     * Add a seperator line to table.
-     */
-    function add_separator() {
-        if (!$this->setup) {
-            return false;
-        }
-        $this->add_data(NULL);
-    }
-
-    /**
-     * This method actually directly echoes the row passed to it now or adds it
-     * to the download. If this is the first row and start_output has not
-     * already been called this method also calls start_output to open the table
-     * or send headers for the downloaded.
-     * Can be used as before. print_html now calls finish_html to close table.
-     *
-     * @param array $row a numerically keyed row of data to add to the table.
-     * @param string $classname CSS class name to add to this row's tr tag.
-     * @return bool success.
-     */
-    function add_data($row, $classname = '') {
-        if (!$this->setup) {
-            return false;
-        }
-        if (!$this->started_output) {
-            $this->start_output();
-        }
-        if ($this->exportclass!==null) {
-            if ($row === null) {
-                $this->exportclass->add_seperator();
-            } else {
-                $this->exportclass->add_data($row);
-            }
-        } else {
-            $this->print_row($row, $classname);
-        }
-        return true;
-    }
-
-    /**
-     * You should call this to finish outputting the table data after adding
-     * data to the table with add_data or add_data_keyed.
-     *
-     */
-    function finish_output($closeexportclassdoc = true) {
-        if ($this->exportclass!==null) {
-            $this->exportclass->finish_table();
-            if ($closeexportclassdoc) {
-                $this->exportclass->finish_document();
-            }
-        } else {
-            $this->finish_html();
-        }
-    }
-
-    /**
-     * Hook that can be overridden in child classes to wrap a table in a form
-     * for example. Called only when there is data to display and not
-     * downloading.
-     */
-    function wrap_html_start() {
-    }
-
-    /**
-     * Hook that can be overridden in child classes to wrap a table in a form
-     * for example. Called only when there is data to display and not
-     * downloading.
-     */
-    function wrap_html_finish() {
-    }
-
-    /**
-     * Call appropriate methods on this table class to perform any processing on values before displaying in table.
-     * Takes raw data from the database and process it into human readable format, perhaps also adding html linking when
-     * displaying table as html, adding a div wrap, etc.
-     *
-     * See for example col_fullname below which will be called for a column whose name is 'fullname'.
-     *
-     * @param array|object $row row of data from db used to make one row of the table.
-     * @return array one row for the table, added using add_data_keyed method.
-     */
-    function format_row($row) {
-        if (is_array($row)) {
-            $row = (object)$row;
-        }
-        $formattedrow = array();
-        foreach (array_keys($this->columns) as $column) {
-            $colmethodname = 'col_'.$column;
-            if (method_exists($this, $colmethodname)) {
-                $formattedcolumn = $this->$colmethodname($row);
-            } else {
-                $formattedcolumn = $this->other_cols($column, $row);
-                if ($formattedcolumn===NULL) {
-                    $formattedcolumn = $row->$column;
-                }
-            }
-            $formattedrow[$column] = $formattedcolumn;
-        }
-        return $formattedrow;
-    }
-
-    /**
-     * Fullname is treated as a special columname in tablelib and should always
-     * be treated the same as the fullname of a user.
-     * @uses $this->useridfield if the userid field is not expected to be id
-     * then you need to override $this->useridfield to point at the correct
-     * field for the user id.
-     *
-     * @param object $row the data from the db containing all fields from the
-     *                    users table necessary to construct the full name of the user in
-     *                    current language.
-     * @return string contents of cell in column 'fullname', for this row.
-     */
-    function col_fullname($row) {
-        global $COURSE;
-
-        $name = fullname($row, has_capability('moodle/site:viewfullnames', $this->get_context()));
-        if ($this->download) {
-            return $name;
-        }
-
-        $userid = $row->{$this->useridfield};
-        if ($COURSE->id == SITEID) {
-            $profileurl = new moodle_url('/user/profile.php', array('id' => $userid));
-        } else {
-            $profileurl = new moodle_url('/user/view.php',
-                    array('id' => $userid, 'course' => $COURSE->id));
-        }
-        return html_writer::link($profileurl, $name);
-    }
-
-    /**
-     * You can override this method in a child class. See the description of
-     * build_table which calls this method.
-     */
-    function other_cols($column, $row) {
-        if (isset($row->$column) && ($column === 'email' || $column === 'idnumber') &&
-                (!$this->is_downloading() || $this->export_class_instance()->supports_html())) {
-            // Columns email and idnumber may potentially contain malicious characters, escape them by default.
-            // This function will not be executed if the child class implements col_email() or col_idnumber().
-            return s($row->$column);
-        }
-        return NULL;
-    }
-
-    /**
-     * Used from col_* functions when text is to be displayed. Does the
-     * right thing - either converts text to html or strips any html tags
-     * depending on if we are downloading and what is the download type. Params
-     * are the same as format_text function in weblib.php but some default
-     * options are changed.
-     */
-    function format_text($text, $format=FORMAT_MOODLE, $options=NULL, $courseid=NULL) {
-        if (!$this->is_downloading()) {
-            if (is_null($options)) {
-                $options = new stdClass;
-            }
-            //some sensible defaults
-            if (!isset($options->para)) {
-                $options->para = false;
-            }
-            if (!isset($options->newlines)) {
-                $options->newlines = false;
-            }
-            if (!isset($options->filter)) {
-                $options->filter = false;
-            }
-            return format_text($text, $format, $options);
-        } else {
-            $eci = $this->export_class_instance();
-            return $eci->format_text($text, $format, $options, $courseid);
-        }
-    }
-    /**
-     * This method is deprecated although the old api is still supported.
-     * @deprecated 1.9.2 - Jun 2, 2008
-     */
-    function print_html() {
-        if (!$this->setup) {
-            return false;
-        }
-        $this->finish_html();
-    }
-
-    /**
-     * This function is not part of the public api.
-     * @return string initial of first name we are currently filtering by
-     */
-    function get_initial_first() {
-        if (!$this->use_initials) {
-            return NULL;
-        }
-
-        return $this->prefs['i_first'];
-    }
-
-    /**
-     * This function is not part of the public api.
-     * @return string initial of last name we are currently filtering by
-     */
-    function get_initial_last() {
-        if (!$this->use_initials) {
-            return NULL;
-        }
-
-        return $this->prefs['i_last'];
-    }
-
-    /**
-     * Helper function, used by {@link print_initials_bar()} to output one initial bar.
-     * @param array $alpha of letters in the alphabet.
-     * @param string $current the currently selected letter.
-     * @param string $class class name to add to this initial bar.
-     * @param string $title the name to put in front of this initial bar.
-     * @param string $urlvar URL parameter name for this initial.
-     *
-     * @deprecated since Moodle 3.3
-     */
-    protected function print_one_initials_bar($alpha, $current, $class, $title, $urlvar) {
-
-        debugging('Method print_one_initials_bar() is no longer used and has been deprecated, ' .
-            'to print initials bar call print_initials_bar()', DEBUG_DEVELOPER);
-
-        echo html_writer::start_tag('div', array('class' => 'initialbar ' . $class)) .
-            $title . ' : ';
-        if ($current) {
-            echo html_writer::link($this->baseurl->out(false, array($urlvar => '')), get_string('all'));
-        } else {
-            echo html_writer::tag('strong', get_string('all'));
-        }
-
-        foreach ($alpha as $letter) {
-            if ($letter === $current) {
-                echo html_writer::tag('strong', $letter);
-            } else {
-                echo html_writer::link($this->baseurl->out(false, array($urlvar => $letter)), $letter);
-            }
-        }
-
-        echo html_writer::end_tag('div');
-    }
-
-    /**
-     * This function is not part of the public api.
-     */
-    function print_initials_bar() {
-        global $OUTPUT;
-
-        $ifirst = $this->get_initial_first();
-        $ilast = $this->get_initial_last();
-        if (is_null($ifirst)) {
-            $ifirst = '';
-        }
-        if (is_null($ilast)) {
-            $ilast = '';
-        }
-
-        if ((!empty($ifirst) || !empty($ilast) || $this->use_initials) && $this->contains_fullname_columns()) {
-            $prefixfirst = $this->request[TABLE_VAR_IFIRST];
-            $prefixlast = $this->request[TABLE_VAR_ILAST];
-            echo $OUTPUT->initials_bar($ifirst, 'firstinitial', get_string('firstname'), $prefixfirst, $this->baseurl);
-            echo $OUTPUT->initials_bar($ilast, 'lastinitial', get_string('lastname'), $prefixlast, $this->baseurl);
-        }
-
-    }
-
-    /**
-     * This function is not part of the public api.
-     */
-    function print_nothing_to_display() {
-        global $OUTPUT;
-
-        // Render the dynamic table header.
-        echo $this->get_dynamic_table_html_start();
-
-        // Render button to allow user to reset table preferences.
-        echo $this->render_reset_button();
-
-        $this->print_initials_bar();
-
-        echo $OUTPUT->notification(get_string('nothingtodisplay'), 'info', false);
-
-        // Render the dynamic table footer.
-        echo $this->get_dynamic_table_html_end();
-    }
-
-    /**
-     * This function is not part of the public api.
-     */
-    function get_row_from_keyed($rowwithkeys) {
-        if (is_object($rowwithkeys)) {
-            $rowwithkeys = (array)$rowwithkeys;
-        }
-        $row = array();
-        foreach (array_keys($this->columns) as $column) {
-            if (isset($rowwithkeys[$column])) {
-                $row [] = $rowwithkeys[$column];
-            } else {
-                $row[] ='';
-            }
-        }
-        return $row;
-    }
-
-    /**
-     * Get the html for the download buttons
-     *
-     * Usually only use internally
-     */
-    public function download_buttons() {
-        global $OUTPUT;
-
-        if ($this->is_downloadable() && !$this->is_downloading()) {
-            return $OUTPUT->download_dataformat_selector(get_string('downloadas', 'table'),
-                    $this->baseurl->out_omit_querystring(), 'download', $this->baseurl->params());
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * This function is not part of the public api.
-     * You don't normally need to call this. It is called automatically when
-     * needed when you start adding data to the table.
-     *
-     */
-    function start_output() {
-        $this->started_output = true;
-        if ($this->exportclass!==null) {
-            $this->exportclass->start_table($this->sheettitle);
-            $this->exportclass->output_headers($this->headers);
-        } else {
-            $this->start_html();
-            $this->print_headers();
-            echo html_writer::start_tag('tbody');
-        }
-    }
-
-    /**
-     * This function is not part of the public api.
-     */
-    function print_row($row, $classname = '') {
-        echo $this->get_row_html($row, $classname);
-    }
-
-    /**
-     * Generate html code for the passed row.
-     *
-     * @param array $row Row data.
-     * @param string $classname classes to add.
-     *
-     * @return string $html html code for the row passed.
-     */
-    public function get_row_html($row, $classname = '') {
-        static $suppress_lastrow = NULL;
-        $rowclasses = array();
-
-        if ($classname) {
-            $rowclasses[] = $classname;
-        }
-
-        $rowid = $this->uniqueid . '_r' . $this->currentrow;
-        $html = '';
-
-        $html .= html_writer::start_tag('tr', array('class' => implode(' ', $rowclasses), 'id' => $rowid));
-
-        // If we have a separator, print it
-        if ($row === NULL) {
-            $colcount = count($this->columns);
-            $html .= html_writer::tag('td', html_writer::tag('div', '',
-                    array('class' => 'tabledivider')), array('colspan' => $colcount));
-
-        } else {
-            $html .= $this->get_row_cells_html($rowid, $row, $suppress_lastrow);
-        }
-
-        $html .= html_writer::end_tag('tr');
-
-        $suppress_enabled = array_sum($this->column_suppress);
-        if ($suppress_enabled) {
-            $suppress_lastrow = $row;
-        }
-        $this->currentrow++;
-        return $html;
-    }
-
-    /**
-     * Generate html code for the row cells.
-     *
-     * @param string $rowid
-     * @param array $row
-     * @param array|null $suppresslastrow
-     * @return string
-     */
-    public function get_row_cells_html(string $rowid, array $row, ?array $suppresslastrow): string {
-        $html = '';
-        $colbyindex = array_flip($this->columns);
-        foreach ($row as $index => $data) {
-            $column = $colbyindex[$index];
-
-            $columnattributes = $this->columnsattributes[$column] ?? [];
-            if (isset($columnattributes['class'])) {
-                $this->column_class($column, $columnattributes['class']);
-                unset($columnattributes['class']);
-            }
-
-            $attributes = [
-                'class' => "cell c{$index}" . $this->column_class[$column] . $this->columnsticky[$column],
-                'id' => "{$rowid}_c{$index}",
-                'style' => $this->make_styles_string($this->column_style[$column]),
-            ];
-
-            $celltype = 'td';
-            if ($this->headercolumn && $column == $this->headercolumn) {
-                $celltype = 'th';
-                $attributes['scope'] = 'row';
-            }
-
-            $attributes += $columnattributes;
-
-            if (empty($this->prefs['collapse'][$column])) {
-                if ($this->column_suppress[$column] && $suppresslastrow !== null && $suppresslastrow[$index] === $data) {
-                    $content = '&nbsp;';
-                } else {
-                    $content = $data;
-                }
-            } else {
-                $content = '&nbsp;';
-            }
-
-            $html .= html_writer::tag($celltype, $content, $attributes);
-        }
-        return $html;
-    }
-
-    /**
-     * This function is not part of the public api.
-     */
-    function finish_html() {
-        global $OUTPUT, $PAGE;
-
-        if (!$this->started_output) {
-            //no data has been added to the table.
-            $this->print_nothing_to_display();
-
-        } else {
-            // Print empty rows to fill the table to the current pagesize.
-            // This is done so the header aria-controls attributes do not point to
-            // non existant elements.
-            $emptyrow = array_fill(0, count($this->columns), '');
-            while ($this->currentrow < $this->pagesize) {
-                $this->print_row($emptyrow, 'emptyrow');
-            }
-
-            echo html_writer::end_tag('tbody');
-            echo html_writer::end_tag('table');
-            echo html_writer::end_tag('div');
-            $this->wrap_html_finish();
-
-            // Paging bar
-            if(in_array(TABLE_P_BOTTOM, $this->showdownloadbuttonsat)) {
-                echo $this->download_buttons();
-            }
-
-            if($this->use_pages) {
-                $pagingbar = new paging_bar($this->totalrows, $this->currpage, $this->pagesize, $this->baseurl);
-                $pagingbar->pagevar = $this->request[TABLE_VAR_PAGE];
-                echo $OUTPUT->render($pagingbar);
-            }
-
-            // Render the dynamic table footer.
-            echo $this->get_dynamic_table_html_end();
-        }
-    }
-
-    /**
-     * Generate the HTML for the collapse/uncollapse icon. This is a helper method
-     * used by {@link print_headers()}.
-     * @param string $column the column name, index into various names.
-     * @param int $index numerical index of the column.
-     * @return string HTML fragment.
-     */
-    protected function show_hide_link($column, $index) {
-        global $OUTPUT;
-        // Some headers contain <br /> tags, do not include in title, hence the
-        // strip tags.
-
-        $ariacontrols = '';
-        for ($i = 0; $i < $this->pagesize; $i++) {
-            $ariacontrols .= $this->uniqueid . '_r' . $i . '_c' . $index . ' ';
-        }
-
-        $ariacontrols = trim($ariacontrols);
-
-        if (!empty($this->prefs['collapse'][$column])) {
-            $linkattributes = [
-                'title' => get_string('show') . ' ' . strip_tags($this->headers[$index]),
-                'aria-expanded' => 'false',
-                'aria-controls' => $ariacontrols,
-                'data-action' => 'show',
-                'data-column' => $column,
-                'role' => 'button',
-            ];
-            return html_writer::link($this->baseurl->out(false, array($this->request[TABLE_VAR_SHOW] => $column)),
-                    $OUTPUT->pix_icon('t/switch_plus', null), $linkattributes);
-
-        } else if ($this->headers[$index] !== NULL) {
-            $linkattributes = [
-                'title' => get_string('hide') . ' ' . strip_tags($this->headers[$index]),
-                'aria-expanded' => 'true',
-                'aria-controls' => $ariacontrols,
-                'data-action' => 'hide',
-                'data-column' => $column,
-                'role' => 'button',
-            ];
-            return html_writer::link($this->baseurl->out(false, array($this->request[TABLE_VAR_HIDE] => $column)),
-                    $OUTPUT->pix_icon('t/switch_minus', null), $linkattributes);
-        }
-    }
-
-    /**
-     * This function is not part of the public api.
-     */
-    function print_headers() {
-        global $CFG, $OUTPUT;
-
-        // Set the primary sort column/order where possible, so that sort links/icons are correct.
-        [
-            'sortby' => $primarysortcolumn,
-            'sortorder' => $primarysortorder,
-        ] = $this->get_primary_sort_order();
-
-        echo html_writer::start_tag('thead');
-        echo html_writer::start_tag('tr');
-        foreach ($this->columns as $column => $index) {
-
-            $icon_hide = '';
-            if ($this->is_collapsible) {
-                $icon_hide = $this->show_hide_link($column, $index);
-            }
-            switch ($column) {
-
-                case 'userpic':
-                    // do nothing, do not display sortable links
-                    break;
-
-                default:
-
-                    if (array_search($column, $this->userfullnamecolumns) !== false) {
-                        // Check the full name display for sortable fields.
-                        if (has_capability('moodle/site:viewfullnames', $this->get_context())) {
-                            $nameformat = $CFG->alternativefullnameformat;
-                        } else {
-                            $nameformat = $CFG->fullnamedisplay;
-                        }
-
-                        if ($nameformat == 'language') {
-                            $nameformat = get_string('fullnamedisplay');
-                        }
-
-                        $requirednames = order_in_string(\core_user\fields::get_name_fields(), $nameformat);
-
-                        if (!empty($requirednames)) {
-                            if ($this->is_sortable($column)) {
-                                // Done this way for the possibility of more than two sortable full name display fields.
-                                $this->headers[$index] = '';
-                                foreach ($requirednames as $name) {
-                                    $sortname = $this->sort_link(get_string($name),
-                                        $name, $primarysortcolumn === $name, $primarysortorder);
-                                    $this->headers[$index] .= $sortname . ' / ';
-                                }
-                                $helpicon = '';
-                                if (isset($this->helpforheaders[$index])) {
-                                    $helpicon = $OUTPUT->render($this->helpforheaders[$index]);
-                                }
-                                $this->headers[$index] = substr($this->headers[$index], 0, -3) . $helpicon;
-                            }
-                        }
-                    } else if ($this->is_sortable($column)) {
-                        $helpicon = '';
-                        if (isset($this->helpforheaders[$index])) {
-                            $helpicon = $OUTPUT->render($this->helpforheaders[$index]);
-                        }
-                        $this->headers[$index] = $this->sort_link($this->headers[$index],
-                                $column, $primarysortcolumn == $column, $primarysortorder) . $helpicon;
-                    }
-            }
-
-            $attributes = array(
-                'class' => 'header c' . $index . $this->column_class[$column] . $this->columnsticky[$column],
-                'scope' => 'col',
-            );
-            if ($this->headers[$index] === NULL) {
-                $content = '&nbsp;';
-            } else if (!empty($this->prefs['collapse'][$column])) {
-                $content = $icon_hide;
-            } else {
-                if (is_array($this->column_style[$column])) {
-                    $attributes['style'] = $this->make_styles_string($this->column_style[$column]);
-                }
-                $helpicon = '';
-                if (isset($this->helpforheaders[$index]) && !$this->is_sortable($column)) {
-                    $helpicon  = $OUTPUT->render($this->helpforheaders[$index]);
-                }
-                $content = $this->headers[$index] . $helpicon . html_writer::tag('div',
-                        $icon_hide, array('class' => 'commands'));
-            }
-            echo html_writer::tag('th', $content, $attributes);
-        }
-
-        echo html_writer::end_tag('tr');
-        echo html_writer::end_tag('thead');
-    }
-
-    /**
-     * Calculate the preferences for sort order based on user-supplied values and get params.
-     */
-    protected function set_sorting_preferences(): void {
-        $sortdata = $this->sortdata;
-
-        if ($sortdata === null) {
-            $sortdata = $this->prefs['sortby'];
-
-            $sortorder = optional_param($this->request[TABLE_VAR_DIR], $this->sort_default_order, PARAM_INT);
-            $sortby = optional_param($this->request[TABLE_VAR_SORT], '', PARAM_ALPHANUMEXT);
-
-            if (array_key_exists($sortby, $sortdata)) {
-                // This key already exists somewhere. Change its sortorder and bring it to the top.
-                unset($sortdata[$sortby]);
-            }
-            $sortdata = array_merge([$sortby => $sortorder], $sortdata);
-        }
-
-        $usernamefields = \core_user\fields::get_name_fields();
-        $sortdata = array_filter($sortdata, function($sortby) use ($usernamefields) {
-            $isvalidsort = $sortby && $this->is_sortable($sortby);
-            $isvalidsort = $isvalidsort && empty($this->prefs['collapse'][$sortby]);
-            $isrealcolumn = isset($this->columns[$sortby]);
-            $isfullnamefield = $this->contains_fullname_columns() && in_array($sortby, $usernamefields);
-
-            return $isvalidsort && ($isrealcolumn || $isfullnamefield);
-        }, ARRAY_FILTER_USE_KEY);
-
-        // Finally, make sure that no more than $this->maxsortkeys are present into the array.
-        $sortdata = array_slice($sortdata, 0, $this->maxsortkeys);
-
-        // If a default order is defined and it is not in the current list of order by columns, add it at the end.
-        // This prevents results from being returned in a random order if the only order by column contains equal values.
-        if (!empty($this->sort_default_column) && !array_key_exists($this->sort_default_column, $sortdata)) {
-            $sortdata = array_merge($sortdata, [$this->sort_default_column => $this->sort_default_order]);
-        }
-
-        // Apply the sortdata to the preference.
-        $this->prefs['sortby'] = $sortdata;
-    }
-
-    /**
-     * Fill in the preferences for the initials bar.
-     */
-    protected function set_initials_preferences(): void {
-        $ifirst = $this->ifirst;
-        $ilast = $this->ilast;
-
-        if ($ifirst === null) {
-            $ifirst = optional_param($this->request[TABLE_VAR_IFIRST], null, PARAM_RAW);
-        }
-
-        if ($ilast === null) {
-            $ilast = optional_param($this->request[TABLE_VAR_ILAST], null, PARAM_RAW);
-        }
-
-        if (!is_null($ifirst) && ($ifirst === '' || strpos(get_string('alphabet', 'langconfig'), $ifirst) !== false)) {
-            $this->prefs['i_first'] = $ifirst;
-        }
-
-        if (!is_null($ilast) && ($ilast === '' || strpos(get_string('alphabet', 'langconfig'), $ilast) !== false)) {
-            $this->prefs['i_last'] = $ilast;
-        }
-
-    }
-
-    /**
-     * Set hide and show preferences.
-     */
-    protected function set_hide_show_preferences(): void {
-
-        if ($this->hiddencolumns !== null) {
-            $this->prefs['collapse'] = array_fill_keys(array_filter($this->hiddencolumns, function($column) {
-                return array_key_exists($column, $this->columns);
-            }), true);
-        } else {
-            if ($column = optional_param($this->request[TABLE_VAR_HIDE], '', PARAM_ALPHANUMEXT)) {
-                if (isset($this->columns[$column])) {
-                    $this->prefs['collapse'][$column] = true;
-                }
-            }
-        }
-
-        if ($column = optional_param($this->request[TABLE_VAR_SHOW], '', PARAM_ALPHANUMEXT)) {
-            unset($this->prefs['collapse'][$column]);
-        }
-
-        foreach (array_keys($this->prefs['collapse']) as $column) {
-            if (array_key_exists($column, $this->prefs['sortby'])) {
-                unset($this->prefs['sortby'][$column]);
-            }
-        }
-    }
-
-    /**
-     * Set the list of hidden columns.
-     *
-     * @param array $columns The list of hidden columns.
-     */
-    public function set_hidden_columns(array $columns): void {
-        $this->hiddencolumns = $columns;
-    }
-
-    /**
-     * Initialise table preferences.
-     */
-    protected function initialise_table_preferences(): void {
-        global $SESSION;
-
-        // Load any existing user preferences.
-        if ($this->persistent) {
-            $this->prefs = json_decode(get_user_preferences("flextable_{$this->uniqueid}", ''), true);
-            $oldprefs = $this->prefs;
-        } else if (isset($SESSION->flextable[$this->uniqueid])) {
-            $this->prefs = $SESSION->flextable[$this->uniqueid];
-            $oldprefs = $this->prefs;
-        }
-
-        // Set up default preferences if needed.
-        if (!$this->prefs || $this->is_resetting_preferences()) {
-            $this->prefs = [
-                'collapse' => [],
-                'sortby'   => [],
-                'i_first'  => '',
-                'i_last'   => '',
-                'textsort' => $this->column_textsort,
-            ];
-        }
-
-        if (!isset($oldprefs)) {
-            $oldprefs = $this->prefs;
-        }
-
-        // Save user preferences if they have changed.
-        if ($this->is_resetting_preferences()) {
-            $this->sortdata = null;
-            $this->ifirst = null;
-            $this->ilast = null;
-        }
-
-        if (($showcol = optional_param($this->request[TABLE_VAR_SHOW], '', PARAM_ALPHANUMEXT)) &&
-            isset($this->columns[$showcol])) {
-            $this->prefs['collapse'][$showcol] = false;
-        } else if (($hidecol = optional_param($this->request[TABLE_VAR_HIDE], '', PARAM_ALPHANUMEXT)) &&
-            isset($this->columns[$hidecol])) {
-            $this->prefs['collapse'][$hidecol] = true;
-            if (array_key_exists($hidecol, $this->prefs['sortby'])) {
-                unset($this->prefs['sortby'][$hidecol]);
-            }
-        }
-
-        $this->set_hide_show_preferences();
-        $this->set_sorting_preferences();
-        $this->set_initials_preferences();
-
-        // Now, reduce the width of collapsed columns and remove the width from columns that should be expanded.
-        foreach (array_keys($this->columns) as $column) {
-            if (!empty($this->prefs['collapse'][$column])) {
-                $this->column_style[$column]['width'] = '10px';
-            } else {
-                unset($this->column_style[$column]['width']);
-            }
-        }
-
-        if (empty($this->baseurl)) {
-            debugging('You should set baseurl when using flexible_table.');
-            global $PAGE;
-            $this->baseurl = $PAGE->url;
-        }
-
-        if ($this->currpage == null) {
-            $this->currpage = optional_param($this->request[TABLE_VAR_PAGE], 0, PARAM_INT);
-        }
-
-        $this->save_preferences($oldprefs);
-    }
-
-    /**
-     * Save preferences.
-     *
-     * @param array $oldprefs Old preferences to compare against.
-     */
-    protected function save_preferences($oldprefs): void {
-        global $SESSION;
-
-        if ($this->prefs != $oldprefs) {
-            if ($this->persistent) {
-                set_user_preference('flextable_' . $this->uniqueid, json_encode($this->prefs));
-            } else {
-                $SESSION->flextable[$this->uniqueid] = $this->prefs;
-            }
-        }
-        unset($oldprefs);
-    }
-
-    /**
-     * Set the preferred table sorting attributes.
-     *
-     * @param string $sortby The field to sort by.
-     * @param int $sortorder The sort order.
-     */
-    public function set_sortdata(array $sortdata): void {
-        $this->sortdata = [];
-        foreach ($sortdata as $sortitem) {
-            if (!array_key_exists($sortitem['sortby'], $this->sortdata)) {
-                $this->sortdata[$sortitem['sortby']] = (int) $sortitem['sortorder'];
-            }
-        }
-    }
-
-    /**
-     * Get the default per page.
-     *
-     * @return int
-     */
-    public function get_default_per_page(): int {
-        return $this->defaultperpage;
-    }
-
-    /**
-     * Set the default per page.
-     *
-     * @param int $defaultperpage
-     */
-    public function set_default_per_page(int $defaultperpage): void {
-        $this->defaultperpage = $defaultperpage;
-    }
-
-    /**
-     * Set the preferred first name initial in an initials bar.
-     *
-     * @param string $initial The character to set
-     */
-    public function set_first_initial(string $initial): void {
-        $this->ifirst = $initial;
-    }
-
-    /**
-     * Set the preferred last name initial in an initials bar.
-     *
-     * @param string $initial The character to set
-     */
-    public function set_last_initial(string $initial): void {
-        $this->ilast = $initial;
-    }
-
-    /**
-     * Set the page number.
-     *
-     * @param int $pagenumber The page number.
-     */
-    public function set_page_number(int $pagenumber): void {
-        $this->currpage = $pagenumber - 1;
-    }
-
-    /**
-     * Generate the HTML for the sort icon. This is a helper method used by {@link sort_link()}.
-     * @param bool $isprimary whether an icon is needed (it is only needed for the primary sort column.)
-     * @param int $order SORT_ASC or SORT_DESC
-     * @return string HTML fragment.
-     */
-    protected function sort_icon($isprimary, $order) {
-        global $OUTPUT;
-
-        if (!$isprimary) {
-            return '';
-        }
-
-        if ($order == SORT_ASC) {
-            return $OUTPUT->pix_icon('t/sort_asc', get_string('asc'));
-        } else {
-            return $OUTPUT->pix_icon('t/sort_desc', get_string('desc'));
-        }
-    }
-
-    /**
-     * Generate the correct tool tip for changing the sort order. This is a
-     * helper method used by {@link sort_link()}.
-     * @param bool $isprimary whether the is column is the current primary sort column.
-     * @param int $order SORT_ASC or SORT_DESC
-     * @return string the correct title.
-     */
-    protected function sort_order_name($isprimary, $order) {
-        if ($isprimary && $order != SORT_ASC) {
-            return get_string('desc');
-        } else {
-            return get_string('asc');
-        }
-    }
-
-    /**
-     * Generate the HTML for the sort link. This is a helper method used by {@link print_headers()}.
-     * @param string $text the text for the link.
-     * @param string $column the column name, may be a fake column like 'firstname' or a real one.
-     * @param bool $isprimary whether the is column is the current primary sort column.
-     * @param int $order SORT_ASC or SORT_DESC
-     * @return string HTML fragment.
-     */
-    protected function sort_link($text, $column, $isprimary, $order) {
-        // If we are already sorting by this column, switch direction.
-        if (array_key_exists($column, $this->prefs['sortby'])) {
-            $sortorder = $this->prefs['sortby'][$column] == SORT_ASC ? SORT_DESC : SORT_ASC;
-        } else {
-            $sortorder = $order;
-        }
-
-        $params = [
-            $this->request[TABLE_VAR_SORT] => $column,
-            $this->request[TABLE_VAR_DIR] => $sortorder,
-        ];
-
-        return html_writer::link($this->baseurl->out(false, $params),
-                $text . get_accesshide(get_string('sortby') . ' ' .
-                $text . ' ' . $this->sort_order_name($isprimary, $order)),
-                [
-                    'data-sortable' => $this->is_sortable($column),
-                    'data-sortby' => $column,
-                    'data-sortorder' => $sortorder,
-                    'role' => 'button',
-                ]) . ' ' . $this->sort_icon($isprimary, $order);
-    }
-
-    /**
-     * Return primary sorting column/order, either the first preferred "sortby" value or defaults defined for the table
-     *
-     * @return array
-     */
-    protected function get_primary_sort_order(): array {
-        if (reset($this->prefs['sortby'])) {
-            return $this->get_sort_order();
-        }
-
-        return [
-            'sortby' => $this->sort_default_column,
-            'sortorder' => $this->sort_default_order,
-        ];
-    }
-
-    /**
-     * Return sorting attributes values.
-     *
-     * @return array
-     */
-    protected function get_sort_order(): array {
-        $sortbys = $this->prefs['sortby'];
-        $sortby = key($sortbys);
-
-        return [
-            'sortby' => $sortby,
-            'sortorder' => $sortbys[$sortby],
-        ];
-    }
-
-    /**
-     * Get dynamic class component.
-     *
-     * @return string
-     */
-    protected function get_component() {
-        $tableclass = explode("\\", get_class($this));
-        return reset($tableclass);
-    }
-
-    /**
-     * Get dynamic class handler.
-     *
-     * @return string
-     */
-    protected function get_handler() {
-        $tableclass = explode("\\", get_class($this));
-        return end($tableclass);
-    }
-
-    /**
-     * Get the dynamic table start wrapper.
-     * If this is not a dynamic table, then an empty string is returned making this safe to blindly call.
-     *
-     * @return string
-     */
-    protected function get_dynamic_table_html_start(): string {
-        if (is_a($this, \core_table\dynamic::class)) {
-            $sortdata = array_map(function($sortby, $sortorder) {
-                return [
-                    'sortby' => $sortby,
-                    'sortorder' => $sortorder,
-                ];
-            }, array_keys($this->prefs['sortby']), array_values($this->prefs['sortby']));;
-
-            return html_writer::start_tag('div', [
-                'class' => 'table-dynamic position-relative',
-                'data-region' => 'core_table/dynamic',
-                'data-table-handler' => $this->get_handler(),
-                'data-table-component' => $this->get_component(),
-                'data-table-uniqueid' => $this->uniqueid,
-                'data-table-filters' => json_encode($this->get_filterset()),
-                'data-table-sort-data' => json_encode($sortdata),
-                'data-table-first-initial' => $this->prefs['i_first'],
-                'data-table-last-initial' => $this->prefs['i_last'],
-                'data-table-page-number' => $this->currpage + 1,
-                'data-table-page-size' => $this->pagesize,
-                'data-table-default-per-page' => $this->get_default_per_page(),
-                'data-table-hidden-columns' => json_encode(array_keys($this->prefs['collapse'])),
-                'data-table-total-rows' => $this->totalrows,
-            ]);
-        }
-
-        return '';
-    }
-
-    /**
-     * Get the dynamic table end wrapper.
-     * If this is not a dynamic table, then an empty string is returned making this safe to blindly call.
-     *
-     * @return string
-     */
-    protected function get_dynamic_table_html_end(): string {
-        global $PAGE;
-
-        if (is_a($this, \core_table\dynamic::class)) {
-            $output = '';
-
-            $perpageurl = new moodle_url($PAGE->url);
-
-            // Generate "Show all/Show per page" link.
-            if ($this->pagesize == TABLE_SHOW_ALL_PAGE_SIZE && $this->totalrows > $this->get_default_per_page()) {
-                $perpagesize = $this->get_default_per_page();
-                $perpagestring = get_string('showperpage', '', $this->get_default_per_page());
-            } else if ($this->pagesize < $this->totalrows) {
-                $perpagesize = TABLE_SHOW_ALL_PAGE_SIZE;
-                $perpagestring = get_string('showall', '', $this->totalrows);
-            }
-            if (isset($perpagesize) && isset($perpagestring)) {
-                $perpageurl->param('perpage', $perpagesize);
-                $output .= html_writer::link(
-                    $perpageurl,
-                    $perpagestring,
-                    [
-                        'data-action' => 'showcount',
-                        'data-target-page-size' => $perpagesize,
-                    ]
-                );
-            }
-
-            $PAGE->requires->js_call_amd('core_table/dynamic', 'init');
-            $output .= html_writer::end_tag('div');
-            return $output;
-        }
-
-        return '';
-    }
-
-    /**
-     * This function is not part of the public api.
-     */
-    function start_html() {
-        global $OUTPUT;
-
-        // Render the dynamic table header.
-        echo $this->get_dynamic_table_html_start();
-
-        // Render button to allow user to reset table preferences.
-        echo $this->render_reset_button();
-
-        // Do we need to print initial bars?
-        $this->print_initials_bar();
-
-        // Paging bar
-        if ($this->use_pages) {
-            $pagingbar = new paging_bar($this->totalrows, $this->currpage, $this->pagesize, $this->baseurl);
-            $pagingbar->pagevar = $this->request[TABLE_VAR_PAGE];
-            echo $OUTPUT->render($pagingbar);
-        }
-
-        if (in_array(TABLE_P_TOP, $this->showdownloadbuttonsat)) {
-            echo $this->download_buttons();
-        }
-
-        $this->wrap_html_start();
-        // Start of main data table
-
-        echo html_writer::start_tag('div', array('class' => 'no-overflow'));
-        echo html_writer::start_tag('table', $this->attributes) . $this->render_caption();
-    }
-
-    /**
-     * This function set caption for table.
-     *
-     * @param string $caption Caption of table.
-     * @param array|null $captionattributes Caption attributes of table.
-     */
-    public function set_caption(string $caption, ?array $captionattributes): void {
-        $this->caption = $caption;
-        $this->captionattributes = $captionattributes;
-    }
-
-    /**
-     * This function renders a table caption.
-     *
-     * @return string $output Caption of table.
-     */
-    public function render_caption(): string {
-        if ($this->caption === null) {
-            return '';
-        }
-
-        return html_writer::tag(
-            'caption',
-            $this->caption,
-            $this->captionattributes,
-        );
-    }
-
-    /**
-     * This function is not part of the public api.
-     * @param array $styles CSS-property => value
-     * @return string values suitably to go in a style="" attribute in HTML.
-     */
-    function make_styles_string($styles) {
-        if (empty($styles)) {
-            return null;
-        }
-
-        $string = '';
-        foreach($styles as $property => $value) {
-            $string .= $property . ':' . $value . ';';
-        }
-        return $string;
-    }
-
-    /**
-     * Generate the HTML for the table preferences reset button.
-     *
-     * @return string HTML fragment, empty string if no need to reset
-     */
-    protected function render_reset_button() {
-
-        if (!$this->can_be_reset()) {
-            return '';
-        }
-
-        $url = $this->baseurl->out(false, array($this->request[TABLE_VAR_RESET] => 1));
-
-        $html  = html_writer::start_div('resettable mdl-right');
-        $html .= html_writer::link($url, get_string('resettable'), ['role' => 'button']);
-        $html .= html_writer::end_div();
-
-        return $html;
-    }
-
-    /**
-     * Are there some table preferences that can be reset?
-     *
-     * If true, then the "reset table preferences" widget should be displayed.
-     *
-     * @return bool
-     */
-    protected function can_be_reset() {
-        // Loop through preferences and make sure they are empty or set to the default value.
-        foreach ($this->prefs as $prefname => $prefval) {
-            if ($prefname === 'sortby' and !empty($this->sort_default_column)) {
-                // Check if the actual sorting differs from the default one.
-                if (empty($prefval) or $prefval !== array($this->sort_default_column => $this->sort_default_order)) {
-                    return true;
-                }
-
-            } else if ($prefname === 'collapse' and !empty($prefval)) {
-                // Check if there are some collapsed columns (all are expanded by default).
-                foreach ($prefval as $columnname => $iscollapsed) {
-                    if ($iscollapsed) {
-                        return true;
-                    }
-                }
-
-            } else if (!empty($prefval)) {
-                // For all other cases, we just check if some preference is set.
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the context for the table.
-     *
-     * Note: This function _must_ be overridden by dynamic tables to ensure that the context is correctly determined
-     * from the filterset parameters.
-     *
-     * @return context
-     */
-    public function get_context(): context {
-        global $PAGE;
-
-        if (is_a($this, \core_table\dynamic::class)) {
-            throw new coding_exception('The get_context function must be defined for a dynamic table');
-        }
-
-        return $PAGE->context;
-    }
-
-    /**
-     * Set the filterset in the table class.
-     *
-     * The use of filtersets is a requirement for dynamic tables, but can be used by other tables too if desired.
-     *
-     * @param filterset $filterset The filterset object to get filters and table parameters from
-     */
-    public function set_filterset(filterset $filterset): void {
-        $this->filterset = $filterset;
-
-        $this->guess_base_url();
-    }
-
-    /**
-     * Get the currently defined filterset.
-     *
-     * @return filterset
-     */
-    public function get_filterset(): ?filterset {
-        return $this->filterset;
-    }
-
-    /**
-     * Get the class used as a filterset.
-     *
-     * @return string
-     */
-    public static function get_filterset_class(): string {
-        return static::class . '_filterset';
-    }
-
-    /**
-     * Attempt to guess the base URL.
-     */
-    public function guess_base_url(): void {
-        if (is_a($this, \core_table\dynamic::class)) {
-            throw new coding_exception('The guess_base_url function must be defined for a dynamic table');
-        }
-    }
-}
-
-
-/**
- * @package   moodlecore
- * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class table_sql extends flexible_table {
-
-    public $countsql = NULL;
-    public $countparams = NULL;
-    /**
-     * @var object sql for querying db. Has fields 'fields', 'from', 'where', 'params'.
-     */
-    public $sql = NULL;
-    /**
-     * @var array|\Traversable Data fetched from the db.
-     */
-    public $rawdata = NULL;
-
-    /**
-     * @var bool Overriding default for this.
-     */
-    public $is_sortable    = true;
-    /**
-     * @var bool Overriding default for this.
-     */
-    public $is_collapsible = true;
-
-    /**
-     * @param string $uniqueid a string identifying this table.Used as a key in
-     *                          session  vars.
-     */
-    function __construct($uniqueid) {
-        parent::__construct($uniqueid);
-        // some sensible defaults
-        $this->set_attribute('class', 'generaltable generalbox');
-    }
-
-    /**
-     * Build the table from the fetched data.
-     *
-     * Take the data returned from the db_query and go through all the rows
-     * processing each col using either col_{columnname} method or other_cols
-     * method or if other_cols returns NULL then put the data straight into the
-     * table.
-     *
-     * After calling this function, don't forget to call close_recordset.
-     */
-    public function build_table() {
-        if (!$this->rawdata) {
-            return;
-        }
-
-        foreach ($this->rawdata as $row) {
-            $formattedrow = $this->format_row($row);
-            $this->add_data_keyed($formattedrow, $this->get_row_class($row));
-        }
-    }
-
-    /**
-     * Closes recordset (for use after building the table).
-     */
-    public function close_recordset() {
-        if ($this->rawdata && ($this->rawdata instanceof \core\dml\recordset_walk ||
-                $this->rawdata instanceof moodle_recordset)) {
-            $this->rawdata->close();
-            $this->rawdata = null;
-        }
-    }
-
-    /**
-     * Get any extra classes names to add to this row in the HTML.
-     * @param $row array the data for this row.
-     * @return string added to the class="" attribute of the tr.
-     */
-    function get_row_class($row) {
-        return '';
-    }
-
-    /**
-     * This is only needed if you want to use different sql to count rows.
-     * Used for example when perhaps all db JOINS are not needed when counting
-     * records. You don't need to call this function the count_sql
-     * will be generated automatically.
-     *
-     * We need to count rows returned by the db seperately to the query itself
-     * as we need to know how many pages of data we have to display.
-     */
-    function set_count_sql($sql, array $params = NULL) {
-        $this->countsql = $sql;
-        $this->countparams = $params;
-    }
-
-    /**
-     * Set the sql to query the db. Query will be :
-     *      SELECT $fields FROM $from WHERE $where
-     * Of course you can use sub-queries, JOINS etc. by putting them in the
-     * appropriate clause of the query.
-     */
-    function set_sql($fields, $from, $where, array $params = array()) {
-        $this->sql = new stdClass();
-        $this->sql->fields = $fields;
-        $this->sql->from = $from;
-        $this->sql->where = $where;
-        $this->sql->params = $params;
-    }
-
-    /**
-     * Query the db. Store results in the table object for use by build_table.
-     *
-     * @param int $pagesize size of page for paginated displayed table.
-     * @param bool $useinitialsbar do you want to use the initials bar. Bar
-     * will only be used if there is a fullname column defined for the table.
-     */
-    function query_db($pagesize, $useinitialsbar=true) {
-        global $DB;
-        if (!$this->is_downloading()) {
-            if ($this->countsql === NULL) {
-                $this->countsql = 'SELECT COUNT(1) FROM '.$this->sql->from.' WHERE '.$this->sql->where;
-                $this->countparams = $this->sql->params;
-            }
-            $grandtotal = $DB->count_records_sql($this->countsql, $this->countparams);
-            if ($useinitialsbar && !$this->is_downloading()) {
-                $this->initialbars(true);
-            }
-
-            list($wsql, $wparams) = $this->get_sql_where();
-            if ($wsql) {
-                $this->countsql .= ' AND '.$wsql;
-                $this->countparams = array_merge($this->countparams, $wparams);
-
-                $this->sql->where .= ' AND '.$wsql;
-                $this->sql->params = array_merge($this->sql->params, $wparams);
-
-                $total  = $DB->count_records_sql($this->countsql, $this->countparams);
-            } else {
-                $total = $grandtotal;
-            }
-
-            $this->pagesize($pagesize, $total);
-        }
-
-        // Fetch the attempts
-        $sort = $this->get_sql_sort();
-        if ($sort) {
-            $sort = "ORDER BY $sort";
-        }
-        $sql = "SELECT
-                {$this->sql->fields}
-                FROM {$this->sql->from}
-                WHERE {$this->sql->where}
-                {$sort}";
-
-        if (!$this->is_downloading()) {
-            $this->rawdata = $DB->get_records_sql($sql, $this->sql->params, $this->get_page_start(), $this->get_page_size());
-        } else {
-            $this->rawdata = $DB->get_records_sql($sql, $this->sql->params);
-        }
-    }
-
-    /**
-     * Convenience method to call a number of methods for you to display the
-     * table.
-     */
-    function out($pagesize, $useinitialsbar, $downloadhelpbutton='') {
-        global $DB;
-        if (!$this->columns) {
-            $onerow = $DB->get_record_sql("SELECT {$this->sql->fields} FROM {$this->sql->from} WHERE {$this->sql->where}",
-                $this->sql->params, IGNORE_MULTIPLE);
-            //if columns is not set then define columns as the keys of the rows returned
-            //from the db.
-            $this->define_columns(array_keys((array)$onerow));
-            $this->define_headers(array_keys((array)$onerow));
-        }
-        $this->pagesize = $pagesize;
-        $this->setup();
-        $this->query_db($pagesize, $useinitialsbar);
-        $this->build_table();
-        $this->close_recordset();
-        $this->finish_output();
-    }
-}
-
-
-/**
- * @package   moodlecore
- * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class table_default_export_format_parent {
-    /**
-     * @var flexible_table or child class reference pointing to table class
-     * object from which to export data.
-     */
-    var $table;
-
-    /**
-     * @var bool output started. Keeps track of whether any output has been
-     * started yet.
-     */
-    var $documentstarted = false;
-
-    /**
-     * Constructor
-     *
-     * @param flexible_table $table
-     */
-    public function __construct(&$table) {
-        $this->table =& $table;
-    }
-
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function table_default_export_format_parent(&$table) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($table);
-    }
-
-    function set_table(&$table) {
-        $this->table =& $table;
-    }
-
-    function add_data($row) {
-        return false;
-    }
-
-    function add_seperator() {
-        return false;
-    }
-
-    function document_started() {
-        return $this->documentstarted;
-    }
-    /**
-     * Given text in a variety of format codings, this function returns
-     * the text as safe HTML or as plain text dependent on what is appropriate
-     * for the download format. The default removes all tags.
-     */
-    function format_text($text, $format=FORMAT_MOODLE, $options=NULL, $courseid=NULL) {
-        //use some whitespace to indicate where there was some line spacing.
-        $text = str_replace(array('</p>', "\n", "\r"), '   ', $text);
-        return html_entity_decode(strip_tags($text), ENT_COMPAT);
-    }
-
-    /**
-     * Format a row of data, removing HTML tags and entities from each of the cells
-     *
-     * @param array $row
-     * @return array
-     */
-    public function format_data(array $row): array {
-        return array_map([$this, 'format_text'], $row);
-    }
-}
-
-/**
- * Dataformat exporter
- *
- * @package    core
- * @subpackage tablelib
- * @copyright  2016 Brendan Heywood (brendan@catalyst-au.net)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class table_dataformat_export_format extends table_default_export_format_parent {
-
-    /** @var \core\dataformat\base $dataformat */
-    protected $dataformat;
-
-    /** @var int $rownum */
-    protected $rownum = 0;
-
-    /** @var array $columns */
-    protected $columns;
-
-    /**
-     * Constructor
-     *
-     * @param string $table An sql table
-     * @param string $dataformat type of dataformat for export
-     */
-    public function __construct(&$table, $dataformat) {
-        parent::__construct($table);
-
-        if (ob_get_length()) {
-            throw new coding_exception("Output can not be buffered before instantiating table_dataformat_export_format");
-        }
-
-        $this->dataformat = dataformat::get_format_instance($dataformat);
-
-        // The dataformat export time to first byte could take a while to generate...
-        set_time_limit(0);
-
-        // Close the session so that the users other tabs in the same session are not blocked.
-        \core\session\manager::write_close();
-    }
-
-    /**
-     * Whether the current dataformat supports export of HTML
-     *
-     * @return bool
-     */
-    public function supports_html(): bool {
-        return $this->dataformat->supports_html();
-    }
-
-    /**
-     * Start document
-     *
-     * @param string $filename
-     * @param string $sheettitle
-     */
-    public function start_document($filename, $sheettitle) {
-        $this->documentstarted = true;
-        $this->dataformat->set_filename($filename);
-        $this->dataformat->send_http_headers();
-        $this->dataformat->set_sheettitle($sheettitle);
-        $this->dataformat->start_output();
-    }
-
-    /**
-     * Start export
-     *
-     * @param string $sheettitle optional spreadsheet worksheet title
-     */
-    public function start_table($sheettitle) {
-        $this->dataformat->set_sheettitle($sheettitle);
-    }
-
-    /**
-     * Output headers
-     *
-     * @param array $headers
-     */
-    public function output_headers($headers) {
-        $this->columns = $this->format_data($headers);
-        if (method_exists($this->dataformat, 'write_header')) {
-            error_log('The function write_header() does not support multiple sheets. In order to support multiple sheets you ' .
-                'must implement start_output() and start_sheet() and remove write_header() in your dataformat.');
-            $this->dataformat->write_header($this->columns);
-        } else {
-            $this->dataformat->start_sheet($this->columns);
-        }
-    }
-
-    /**
-     * Add a row of data
-     *
-     * @param array $row One record of data
-     */
-    public function add_data($row) {
-        if (!$this->supports_html()) {
-            $row = $this->format_data($row);
-        }
-
-        $this->dataformat->write_record($row, $this->rownum++);
-        return true;
-    }
-
-    /**
-     * Finish export
-     */
-    public function finish_table() {
-        if (method_exists($this->dataformat, 'write_footer')) {
-            error_log('The function write_footer() does not support multiple sheets. In order to support multiple sheets you ' .
-                'must implement close_sheet() and close_output() and remove write_footer() in your dataformat.');
-            $this->dataformat->write_footer($this->columns);
-        } else {
-            $this->dataformat->close_sheet($this->columns);
-        }
-    }
-
-    /**
-     * Finish download
-     */
-    public function finish_document() {
-        $this->dataformat->close_output();
-        exit();
-    }
-}

From ff0fd2764a79221c3a5f5d3a36606a0017d78a55 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 13 Jun 2024 12:26:24 +0800
Subject: [PATCH 065/119] MDL-82183 core: Update namespace of moved output
 classes

---
 blocks/classes/output/block_contents.php      |   8 +-
 blocks/classes/output/block_move_target.php   |  24 +--
 lib/classes/output/action_link.php            |  12 +-
 lib/classes/output/action_menu.php            |  14 +-
 lib/classes/output/action_menu/filler.php     |  14 +-
 lib/classes/output/action_menu/link.php       |  17 +-
 .../output/action_menu/link_primary.php       |  12 +-
 .../output/action_menu/link_secondary.php     |  12 +-
 .../output/actions/component_action.php       |  12 ++
 lib/classes/output/actions/confirm_action.php |   7 +
 lib/classes/output/actions/popup_action.php   |  15 +-
 lib/classes/output/activity_header.php        |   4 +-
 lib/classes/output/checkbox_toggleall.php     |   5 -
 lib/classes/output/choicelist.php             |   7 +-
 lib/classes/output/chooser.php                |   4 -
 lib/classes/output/chooser_item.php           |   8 +-
 lib/classes/output/chooser_section.php        |   4 -
 lib/classes/output/comboboxsearch.php         |   5 +-
 lib/classes/output/context_header.php         |   9 +-
 lib/classes/output/core_renderer.php          | 147 +++++++++++-------
 lib/classes/output/core_renderer_ajax.php     |  23 ++-
 lib/classes/output/core_renderer_cli.php      |  40 +++--
 .../output/core_renderer_maintenance.php      |  13 ++
 lib/classes/output/custom_menu.php            |  11 +-
 lib/classes/output/custom_menu_item.php       |  11 ++
 lib/classes/output/datafilter.php             |   4 +-
 lib/classes/output/dynamic_tabs.php           |   2 -
 lib/classes/output/dynamic_tabs/base.php      |   4 +-
 lib/classes/output/file_picker.php            |  12 +-
 lib/classes/output/help_icon.php              |  11 +-
 lib/classes/output/html_writer.php            |  55 ++++---
 lib/classes/output/icon_system.php            |  14 --
 .../output/icon_system_fontawesome.php        |  14 --
 lib/classes/output/icon_system_standard.php   |  16 --
 lib/classes/output/image_icon.php             |   7 +
 lib/classes/output/initials_bar.php           |  11 +-
 lib/classes/output/inplace_editable.php       |  13 --
 lib/classes/output/js_writer.php              |   8 +-
 lib/classes/output/language_menu.php          |   2 +-
 .../output/local/action_menu/subpanel.php     |   6 +-
 lib/classes/output/local/dropdown/dialog.php  |   2 +-
 .../output/mustache_clean_string_helper.php   |  10 +-
 lib/classes/output/mustache_engine.php        |   2 +-
 .../output/mustache_filesystem_loader.php     |  12 +-
 .../output/mustache_helper_collection.php     |   8 +-
 .../output/mustache_javascript_helper.php     |   1 +
 lib/classes/output/mustache_pix_helper.php    |  14 +-
 .../output/mustache_shorten_text_helper.php   |  14 +-
 lib/classes/output/mustache_string_helper.php |   9 --
 .../output/mustache_template_finder.php       |  15 +-
 .../mustache_template_source_loader.php       |  11 --
 .../output/mustache_user_date_helper.php      |  12 --
 lib/classes/output/named_templatable.php      |   7 +-
 lib/classes/output/notification.php           |   2 +-
 lib/classes/output/paging_bar.php             |  13 +-
 .../output/participants_action_bar.php        |   4 +-
 lib/classes/output/pix_emoticon.php           |   7 +
 lib/classes/output/pix_icon.php               |   7 +
 lib/classes/output/pix_icon_font.php          |  10 +-
 lib/classes/output/pix_icon_fontawesome.php   |   7 +
 lib/classes/output/plugin_renderer_base.php   |  11 +-
 lib/classes/output/preferences_group.php      |   7 +
 lib/classes/output/preferences_groups.php     |   7 +
 lib/classes/output/progress_bar.php           |   9 ++
 lib/classes/output/renderable.php             |   7 +
 lib/classes/output/renderer_base.php          |  41 +++--
 .../renderer_factory_base.php                 |  24 ++-
 .../renderer_factory_interface.php            |  13 +-
 .../standard_renderer_factory.php             |  12 +-
 .../theme_overridden_renderer_factory.php     |  12 ++
 .../fragment_requirements_manager.php         |  11 +-
 .../page_requirements_manager.php             |  24 ++-
 lib/classes/output/requirements/yui.php       |  15 +-
 lib/classes/output/select_menu.php            |   4 +-
 lib/classes/output/single_button.php          |  13 +-
 lib/classes/output/single_select.php          |  12 ++
 lib/classes/output/sticky_footer.php          |   2 -
 lib/classes/output/tabobject.php              |   9 ++
 lib/classes/output/tabtree.php                |   9 +-
 lib/classes/output/templatable.php            |  11 +-
 lib/classes/output/theme_config.php           |  55 +++++--
 lib/classes/output/url_select.php             |  11 ++
 lib/classes/output/user_picture.php           |  14 +-
 lib/classes/output/xhtml_container_stack.php  |  11 +-
 lib/pagelib.php                               |   1 +
 lib/table/classes/base_export_format.php      |  13 +-
 .../classes/dataformat_export_format.php      |  12 +-
 lib/table/classes/flexible_table.php          |  29 +++-
 lib/table/classes/output/html_table.php       |   7 +
 lib/table/classes/output/html_table_cell.php  |   8 +-
 lib/table/classes/output/html_table_row.php   |   8 +-
 lib/table/classes/sql_table.php               |  14 +-
 lib/{ => table}/tests/tablelib_test.php       |   5 +-
 .../xhtml_container_stack_test.php            |  12 +-
 lib/tests/outputcomponents_test.php           |   2 +-
 95 files changed, 824 insertions(+), 415 deletions(-)
 rename lib/{ => table}/tests/tablelib_test.php (99%)
 rename lib/tests/{ => output}/xhtml_container_stack_test.php (95%)

diff --git a/blocks/classes/output/block_contents.php b/blocks/classes/output/block_contents.php
index a18800bbe1bba..aeb1297110204 100644
--- a/blocks/classes/output/block_contents.php
+++ b/blocks/classes/output/block_contents.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core_block\output;
+
 /**
  * This class represents how a block appears on a page.
  *
@@ -32,7 +34,6 @@
  * @category output
  */
 class block_contents {
-
     /** Used when the block cannot be collapsed **/
     const NOT_HIDEABLE = 0;
 
@@ -159,3 +160,8 @@ public function is_fake() {
         return isset($this->attributes['data-block']) && $this->attributes['data-block'] == '_fake';
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(block_contents::class, \block_contents::class);
diff --git a/blocks/classes/output/block_move_target.php b/blocks/classes/output/block_move_target.php
index c0312747b8bc7..d698ac21c7d09 100644
--- a/blocks/classes/output/block_move_target.php
+++ b/blocks/classes/output/block_move_target.php
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core_block\output;
+
+use moodle_url;
+
 /**
  * This class represents a target for where a block can go when it is being moved.
  *
@@ -28,17 +32,19 @@
  * @category output
  */
 class block_move_target {
-
     /**
-     * @var moodle_url Move url
-     */
-    public $url;
-
-    /**
-     * Constructor
+     * Constructor.
+     *
      * @param moodle_url $url
      */
-    public function __construct(moodle_url $url) {
-        $this->url  = $url;
+    public function __construct(
+        /** @var moodle_url Move url */
+        public moodle_url $url,
+    ) {
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(block_move_target::class, \block_move_target::class);
diff --git a/lib/classes/output/action_link.php b/lib/classes/output/action_link.php
index ae006adfe278a..bb094108d0509 100644
--- a/lib/classes/output/action_link.php
+++ b/lib/classes/output/action_link.php
@@ -14,6 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use core\output\actions\component_action;
+use moodle_url;
+use stdClass;
+
 /**
  * Data structure describing html link with special action attached.
  *
@@ -24,7 +30,6 @@
  * @category output
  */
 class action_link implements renderable {
-
     /**
      * @var moodle_url Href url
      */
@@ -154,3 +159,8 @@ public function export_for_template(renderer_base $output) {
         return $data;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(action_link::class, \action_link::class);
diff --git a/lib/classes/output/action_menu.php b/lib/classes/output/action_menu.php
index 2906f1c86fa89..1bbdeb22cc2dc 100644
--- a/lib/classes/output/action_menu.php
+++ b/lib/classes/output/action_menu.php
@@ -14,7 +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 core\output;
+
+use core\exception\coding_exception;
 use core\output\local\action_menu\subpanel;
+use core\output\action_menu\link as action_menu_link;
+use core\output\action_menu\filler as action_menu_filler;
+use lang_string;
+use moodle_page;
+use stdClass;
 
 /**
  * An action menu.
@@ -29,7 +37,6 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class action_menu implements renderable, templatable {
-
     /**
      * Top right alignment.
      */
@@ -664,3 +671,8 @@ protected function export_secondary_actions_for_template(renderer_base $output):
         return $secondary;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(action_menu::class, \action_menu::class);
diff --git a/lib/classes/output/action_menu/filler.php b/lib/classes/output/action_menu/filler.php
index 2a2fe9a0d00ad..1d8863ebb87b0 100644
--- a/lib/classes/output/action_menu/filler.php
+++ b/lib/classes/output/action_menu/filler.php
@@ -14,6 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\action_menu;
+
+use core\output\action_link;
+use core\output\html_writer;
+use core\output\renderable;
+
 /**
  * An action menu filler
  *
@@ -22,8 +28,7 @@
  * @copyright 2013 Andrew Nicols
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class action_menu_filler extends action_link implements renderable {
-
+class filler extends action_link implements renderable {
     /**
      * True if this is a primary action. False if not.
      * @var bool
@@ -37,3 +42,8 @@ public function __construct() {
         $this->attributes['id'] = html_writer::random_id('action_link');
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(filler::class, \action_menu_filler::class);
diff --git a/lib/classes/output/action_menu/link.php b/lib/classes/output/action_menu/link.php
index d91abd646bc00..af440be5ec384 100644
--- a/lib/classes/output/action_menu/link.php
+++ b/lib/classes/output/action_menu/link.php
@@ -14,6 +14,16 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\action_menu;
+
+use core\output\action_menu;
+use core\output\action_link;
+use core\output\pix_icon;
+use core\output\renderable;
+use core\output\renderer_base;
+use moodle_url;
+use stdClass;
+
 /**
  * An action menu action
  *
@@ -22,7 +32,7 @@
  * @copyright 2013 Sam Hemelryk
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class action_menu_link extends action_link implements renderable {
+class link extends action_link implements renderable {
 
     /**
      * True if this is a primary action. False if not.
@@ -104,3 +114,8 @@ public function export_for_template(renderer_base $output) {
         return $data;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(link::class, \action_menu_link::class);
diff --git a/lib/classes/output/action_menu/link_primary.php b/lib/classes/output/action_menu/link_primary.php
index 7359fbe4d6173..3a251d9302368 100644
--- a/lib/classes/output/action_menu/link_primary.php
+++ b/lib/classes/output/action_menu/link_primary.php
@@ -14,6 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\action_menu;
+
+use core\output\pix_icon;
+use moodle_url;
+
 /**
  * A primary action menu action
  *
@@ -22,7 +27,7 @@
  * @copyright 2013 Sam Hemelryk
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class action_menu_link_primary extends action_menu_link {
+class link_primary extends link {
     /**
      * Constructs the object.
      *
@@ -35,3 +40,8 @@ public function __construct(moodle_url $url, ?pix_icon $icon, $text, array $attr
         parent::__construct($url, $icon, $text, true, $attributes);
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(link_primary::class, \action_menu_link_primary::class);
diff --git a/lib/classes/output/action_menu/link_secondary.php b/lib/classes/output/action_menu/link_secondary.php
index 45780a1f9ea02..5f71598ac1590 100644
--- a/lib/classes/output/action_menu/link_secondary.php
+++ b/lib/classes/output/action_menu/link_secondary.php
@@ -14,6 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\action_menu;
+
+use core\output\pix_icon;
+use moodle_url;
+
 /**
  * A secondary action menu action
  *
@@ -22,7 +27,7 @@
  * @copyright 2013 Sam Hemelryk
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class action_menu_link_secondary extends action_menu_link {
+class link_secondary extends link {
     /**
      * Constructs the object.
      *
@@ -35,3 +40,8 @@ public function __construct(moodle_url $url, ?pix_icon $icon, $text, array $attr
         parent::__construct($url, $icon, $text, false, $attributes);
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(link_secondary::class, \action_menu_link_secondary::class);
diff --git a/lib/classes/output/actions/component_action.php b/lib/classes/output/actions/component_action.php
index 72bb07c048003..39b73c218f6ed 100644
--- a/lib/classes/output/actions/component_action.php
+++ b/lib/classes/output/actions/component_action.php
@@ -14,6 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\actions;
+
+use core\exception\coding_exception;
+use core\output\renderer_base;
+use core\output\templatable;
+use stdClass;
+
 /**
  * Helper class used by other components that involve an action on the page (URL or JS).
  *
@@ -77,3 +84,8 @@ public function export_for_template(renderer_base $output) {
         ];
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(component_action::class, \component_action::class);
diff --git a/lib/classes/output/actions/confirm_action.php b/lib/classes/output/actions/confirm_action.php
index 5ce5b5bfed763..e49d80b3963f4 100644
--- a/lib/classes/output/actions/confirm_action.php
+++ b/lib/classes/output/actions/confirm_action.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\actions;
+
 /**
  * Confirm action
  *
@@ -45,3 +47,8 @@ public function __construct($message, $callback = null, $continuelabel = null, $
                 'continuelabel' => $continuelabel, 'cancellabel' => $cancellabel));
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(confirm_action::class, \confirm_action::class);
diff --git a/lib/classes/output/actions/popup_action.php b/lib/classes/output/actions/popup_action.php
index 4c0bdc49c4e08..bf1d20af3a655 100644
--- a/lib/classes/output/actions/popup_action.php
+++ b/lib/classes/output/actions/popup_action.php
@@ -13,6 +13,12 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core\output\actions;
+
+use core\exception\coding_exception;
+use moodle_url;
+
 /**
  * Component action for a popup window.
  *
@@ -62,7 +68,9 @@ public function __construct($event, $url, $name='popup', $params=array()) {
         if ($name) {
             $_name = $name;
             if (($_name = preg_replace("/\s/", '_', $_name)) != $name) {
-                throw new coding_exception('The $name of a popup window shouldn\'t contain spaces - string modified. '. $name .' changed to '. $_name);
+                throw new coding_exception(
+                    'The $name of a popup window shouldn\'t contain spaces - string modified. ' . $name . ' changed to ' . $_name,
+                );
                 $name = $_name;
             }
         } else {
@@ -104,3 +112,8 @@ public function get_js_options() {
         return $jsoptions;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(popup_action::class, \popup_action::class);
diff --git a/lib/classes/output/activity_header.php b/lib/classes/output/activity_header.php
index b2fa9522db1ef..10c4b7f0c2431 100644
--- a/lib/classes/output/activity_header.php
+++ b/lib/classes/output/activity_header.php
@@ -17,8 +17,6 @@
 namespace core\output;
 
 use moodle_page;
-use renderer_base;
-use url_select;
 
 /**
  * Data structure representing standard components displayed on the activity header.
@@ -31,7 +29,7 @@
  * @package core
  * @category output
  */
-class activity_header implements \renderable, \templatable {
+class activity_header implements renderable, templatable {
     /** @var moodle_page $page The current page we are looking at */
     protected $page;
     /** @var string $title The title to be displayed in the header. Defaults to activityrecord name. */
diff --git a/lib/classes/output/checkbox_toggleall.php b/lib/classes/output/checkbox_toggleall.php
index 5a900b89101a0..3484de9101587 100644
--- a/lib/classes/output/checkbox_toggleall.php
+++ b/lib/classes/output/checkbox_toggleall.php
@@ -23,12 +23,8 @@
  */
 
 namespace core\output;
-defined('MOODLE_INTERNAL') || die();
 
-use renderable;
-use renderer_base;
 use stdClass;
-use templatable;
 
 /**
  * The checkbox-toggleall renderable class.
@@ -38,7 +34,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class checkbox_toggleall implements renderable, templatable {
-
     /** @var string The name of the group of checkboxes to be toggled. */
     protected $togglegroup;
 
diff --git a/lib/classes/output/choicelist.php b/lib/classes/output/choicelist.php
index e01d949badb5e..57d9bdc71eed3 100644
--- a/lib/classes/output/choicelist.php
+++ b/lib/classes/output/choicelist.php
@@ -16,10 +16,6 @@
 
 namespace core\output;
 
-use renderable;
-use renderer_base;
-use core\output\named_templatable;
-
 /**
  * A generic user choice output class.
  *
@@ -30,8 +26,7 @@
  * @copyright  2023 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class choicelist implements renderable, named_templatable {
-
+class choicelist implements named_templatable, renderable {
     /** @var object[] The user choices. */
     protected $options = [];
 
diff --git a/lib/classes/output/chooser.php b/lib/classes/output/chooser.php
index d63831fe4d004..268e4285c4307 100644
--- a/lib/classes/output/chooser.php
+++ b/lib/classes/output/chooser.php
@@ -23,14 +23,10 @@
  */
 
 namespace core\output;
-defined('MOODLE_INTERNAL') || die();
 
 use lang_string;
 use moodle_url;
-use renderer_base;
-use renderable;
 use stdClass;
-use templatable;
 
 /**
  * The chooser renderable class.
diff --git a/lib/classes/output/chooser_item.php b/lib/classes/output/chooser_item.php
index d6392c52b96af..e1a7e99281a0f 100644
--- a/lib/classes/output/chooser_item.php
+++ b/lib/classes/output/chooser_item.php
@@ -24,13 +24,9 @@
 
 namespace core\output;
 
-use coding_exception;
-use context;
-use pix_icon;
-use renderer_base;
-use renderable;
+use core\exception\coding_exception;
+use core\context;
 use stdClass;
-use templatable;
 
 /**
  * The chooser_item renderable class.
diff --git a/lib/classes/output/chooser_section.php b/lib/classes/output/chooser_section.php
index ec2f270c33fe4..ed071058cc0fd 100644
--- a/lib/classes/output/chooser_section.php
+++ b/lib/classes/output/chooser_section.php
@@ -23,13 +23,9 @@
  */
 
 namespace core\output;
-defined('MOODLE_INTERNAL') || die();
 
 use lang_string;
-use renderer_base;
-use renderable;
 use stdClass;
-use templatable;
 
 /**
  * The chooser_section renderable class.
diff --git a/lib/classes/output/comboboxsearch.php b/lib/classes/output/comboboxsearch.php
index 0f9a18025339a..b8ec7ea8b79a3 100644
--- a/lib/classes/output/comboboxsearch.php
+++ b/lib/classes/output/comboboxsearch.php
@@ -16,10 +16,7 @@
 
 namespace core\output;
 
-use moodle_exception;
-use renderable;
-use renderer_base;
-use templatable;
+use core\exception\moodle_exception;
 
 /**
  * Renderable class for the comboboxsearch.
diff --git a/lib/classes/output/context_header.php b/lib/classes/output/context_header.php
index e1c02d8614c6c..fc6a056118fef 100644
--- a/lib/classes/output/context_header.php
+++ b/lib/classes/output/context_header.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
 /**
  * Renderable for the main page header.
  *
@@ -24,7 +26,7 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class context_header implements renderable, templatable {
-    /**
+/**
      * @var string $heading Main heading.
      */
     public $heading;
@@ -145,3 +147,8 @@ public function export_for_template(renderer_base $output): array {
         ];
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(context_header::class, \context_header::class);
diff --git a/lib/classes/output/core_renderer.php b/lib/classes/output/core_renderer.php
index df1de09d58403..038ef4a7c5d14 100644
--- a/lib/classes/output/core_renderer.php
+++ b/lib/classes/output/core_renderer.php
@@ -14,7 +14,24 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use breadcrumb_navigation_node;
+use cm_info;
+use core_block\output\block_contents;
+use core_block\output\block_move_target;
+use core_completion\cm_completion_details;
+use core\context;
+use core_course\output\activity_information;
+use core_tag\output\taglist;
+use core_text;
+use core_useragent;
+use core\check\check as check_check;
+use core\check\result as check_result;
+use core\context\system as context_system;
+use core\context\course as context_course;
 use core\di;
+use core\exception\coding_exception;
 use core\hook\manager as hook_manager;
 use core\hook\output\after_standard_main_region_html_generation;
 use core\hook\output\before_footer_html_generation;
@@ -22,8 +39,21 @@
 use core\hook\output\before_http_headers;
 use core\hook\output\before_standard_footer_html_generation;
 use core\hook\output\before_standard_top_of_body_html_generation;
-use core_completion\cm_completion_details;
-use core_course\output\activity_information;
+use core\output\action_menu\link as action_menu_link;
+use core\output\action_menu\link_primary as action_menu_link_primary;
+use core\output\actions\component_action;
+use core\output\actions\popup_action;
+use core\output\action_menu\filler as action_menu_filler;
+use core\plugin_manager;
+use core\output\action_menu\link_secondary as action_menu_link_secondary;
+use moodleform;
+use moodle_page;
+use moodle_url;
+use navigation_node;
+use rating;
+use rating_manager;
+use stdClass;
+use HTML_QuickForm_element;
 
 /**
  * The standard implementation of the core_renderer interface.
@@ -753,8 +783,14 @@ public function home_link() {
      * @return string The HTML to display to the user before dying, may contain
      *         meta refresh, javascript refresh, and may have set header redirects
      */
-    public function redirect_message($encodedurl, $message, $delay, $debugdisableredirect,
-                                     $messagetype = \core\output\notification::NOTIFY_INFO) {
+
+    public function redirect_message(
+        $encodedurl,
+        $message,
+        $delay,
+        $debugdisableredirect,
+        $messagetype = notification::NOTIFY_INFO,
+    ) {
         global $CFG;
         $url = str_replace('&amp;', '&', $encodedurl);
 
@@ -1178,7 +1214,7 @@ public function get_generated_color_for_id($id) {
      * @return string The lang menu HTML or empty string
      */
     public function lang_menu() {
-        $languagemenu = new \core\output\language_menu($this->page);
+        $languagemenu = new language_menu($this->page);
         $data = $languagemenu->export_for_single_select($this);
         if ($data) {
             return $this->render_from_template('core/single_select', $data);
@@ -1258,12 +1294,12 @@ public function render_action_menu(action_menu $menu) {
     /**
      * Renders a full check API result including summary and details
      *
-     * @param core\check\check $check the check that was run to get details from
-     * @param core\check\result $result the result of a check
+     * @param check_check $check the check that was run to get details from
+     * @param check_result $result the result of a check
      * @param bool $includedetails if true, details are included as well
      * @return string rendered html
      */
-    protected function render_check_full_result(core\check\check $check, core\check\result $result, bool $includedetails): string {
+    protected function render_check_full_result(check_check $check, check_result $result, bool $includedetails): string {
         // Initially render just badge itself.
         $renderedresult = $this->render_from_template($result->get_template_name(), $result->export_for_template($this));
 
@@ -1272,17 +1308,17 @@ protected function render_check_full_result(core\check\check $check, core\check\
 
         // Wrap in notificaiton.
         $notificationmap = [
-            \core\check\result::NA => \core\output\notification::NOTIFY_INFO,
-            \core\check\result::OK => \core\output\notification::NOTIFY_SUCCESS,
-            \core\check\result::INFO => \core\output\notification::NOTIFY_INFO,
-            \core\check\result::UNKNOWN => \core\output\notification::NOTIFY_WARNING,
-            \core\check\result::WARNING => \core\output\notification::NOTIFY_WARNING,
-            \core\check\result::ERROR => \core\output\notification::NOTIFY_ERROR,
-            \core\check\result::CRITICAL => \core\output\notification::NOTIFY_ERROR,
+            check_result::NA => notification::NOTIFY_INFO,
+            check_result::OK => notification::NOTIFY_SUCCESS,
+            check_result::INFO => notification::NOTIFY_INFO,
+            check_result::UNKNOWN => notification::NOTIFY_WARNING,
+            check_result::WARNING => notification::NOTIFY_WARNING,
+            check_result::ERROR => notification::NOTIFY_ERROR,
+            check_result::CRITICAL => notification::NOTIFY_ERROR,
         ];
 
         // Get type, or default to error.
-        $notificationtype = $notificationmap[$result->get_status()] ?? \core\output\notification::NOTIFY_ERROR;
+        $notificationtype = $notificationmap[$result->get_status()] ?? notification::NOTIFY_ERROR;
         $renderedresult = $this->notification($renderedresult, $notificationtype, false);
 
         // If adding details, add on new line.
@@ -1299,32 +1335,32 @@ protected function render_check_full_result(core\check\check $check, core\check\
     /**
      * Renders a full check API result including summary and details
      *
-     * @param core\check\check $check the check that was run to get details from
-     * @param core\check\result $result the result of a check
+     * @param check_check $check the check that was run to get details from
+     * @param check_result $result the result of a check
      * @param bool $includedetails if details should be included
      * @return string HTML fragment
      */
-    public function check_full_result(core\check\check $check, core\check\result $result, bool $includedetails = false) {
+    public function check_full_result(check_check $check, check_result $result, bool $includedetails = false) {
         return $this->render_check_full_result($check, $result, $includedetails);
     }
 
     /**
      * Renders a Check API result
      *
-     * @param core\check\result $result
+     * @param check_result $result
      * @return string HTML fragment
      */
-    protected function render_check_result(core\check\result $result) {
+    protected function render_check_result(check_result $result) {
         return $this->render_from_template($result->get_template_name(), $result->export_for_template($this));
     }
 
     /**
      * Renders a Check API result
      *
-     * @param core\check\result $result
+     * @param check_result $result
      * @return string HTML fragment
      */
-    public function check_result(core\check\result $result) {
+    public function check_result(check_result $result) {
         return $this->render_check_result($result);
     }
 
@@ -1721,10 +1757,9 @@ public function single_select($url, $name, array $options, $selected = '',
      * @param array $params Extra params sent to the download page
      * @return string HTML fragment
      */
-    public function download_dataformat_selector($label, $base, $name = 'dataformat', $params = array()) {
-
-        $formats = core_plugin_manager::instance()->get_plugins_of_type('dataformat');
-        $options = array();
+    public function download_dataformat_selector($label, $base, $name = 'dataformat', $params = []) {
+        $formats = plugin_manager::instance()->get_plugins_of_type('dataformat');
+        $options = [];
         foreach ($formats as $format) {
             if ($format->is_enabled()) {
                 $options[] = array(
@@ -1841,7 +1876,7 @@ public function image_icon($pix, $alt, $component='moodle', array $attributes =
      * @return string HTML fragment
      */
     protected function render_image_icon(image_icon $icon) {
-        $system = \core\output\icon_system::instance(\core\output\icon_system::STANDARD);
+        $system = icon_system::instance(icon_system::STANDARD);
         return $system->render_pix_icon($this, $icon);
     }
 
@@ -1869,7 +1904,7 @@ public function pix_icon($pix, $alt, $component='moodle', array $attributes = nu
      * @return string HTML fragment
      */
     protected function render_pix_icon(pix_icon $icon) {
-        $system = \core\output\icon_system::instance();
+        $system = icon_system::instance();
         return $system->render_pix_icon($this, $icon);
     }
 
@@ -1880,7 +1915,7 @@ protected function render_pix_icon(pix_icon $icon) {
      * @return string HTML fragment
      */
     protected function render_pix_emoticon(pix_emoticon $emoticon) {
-        $system = \core\output\icon_system::instance(\core\output\icon_system::STANDARD);
+        $system = icon_system::instance(icon_system::STANDARD);
         return $system->render_pix_icon($this, $emoticon);
     }
 
@@ -2556,26 +2591,26 @@ public function fatal_error($message, $moreinfourl, $link, $backtrace, $debuginf
      * Note: \core\notification::add() may be more suitable for your usage.
      *
      * @param string $message The message to print out.
-     * @param ?string $type   The type of notification. See constants on \core\output\notification.
+     * @param ?string $type   The type of notification. See constants on notification.
      * @param bool $closebutton Whether to show a close icon to remove the notification (default true).
      * @return string the HTML to output.
      */
     public function notification($message, $type = null, $closebutton = true) {
         $typemappings = [
             // Valid types.
-            'success'           => \core\output\notification::NOTIFY_SUCCESS,
-            'info'              => \core\output\notification::NOTIFY_INFO,
-            'warning'           => \core\output\notification::NOTIFY_WARNING,
-            'error'             => \core\output\notification::NOTIFY_ERROR,
+            'success'           => notification::NOTIFY_SUCCESS,
+            'info'              => notification::NOTIFY_INFO,
+            'warning'           => notification::NOTIFY_WARNING,
+            'error'             => notification::NOTIFY_ERROR,
 
             // Legacy types mapped to current types.
-            'notifyproblem'     => \core\output\notification::NOTIFY_ERROR,
-            'notifytiny'        => \core\output\notification::NOTIFY_ERROR,
-            'notifyerror'       => \core\output\notification::NOTIFY_ERROR,
-            'notifysuccess'     => \core\output\notification::NOTIFY_SUCCESS,
-            'notifymessage'     => \core\output\notification::NOTIFY_INFO,
-            'notifyredirect'    => \core\output\notification::NOTIFY_INFO,
-            'redirectmessage'   => \core\output\notification::NOTIFY_INFO,
+            'notifyproblem'     => notification::NOTIFY_ERROR,
+            'notifytiny'        => notification::NOTIFY_ERROR,
+            'notifyerror'       => notification::NOTIFY_ERROR,
+            'notifysuccess'     => notification::NOTIFY_SUCCESS,
+            'notifymessage'     => notification::NOTIFY_INFO,
+            'notifyredirect'    => notification::NOTIFY_INFO,
+            'redirectmessage'   => notification::NOTIFY_INFO,
         ];
 
         $extraclasses = [];
@@ -2604,7 +2639,7 @@ public function notification($message, $type = null, $closebutton = true) {
             }
         }
 
-        $notification = new \core\output\notification($message, $type, $closebutton);
+        $notification = new notification($message, $type, $closebutton);
         if (count($extraclasses)) {
             $notification->set_extra_classes($extraclasses);
         }
@@ -2649,10 +2684,10 @@ public function notify_redirect() {
      * Render a notification (that is, a status message about something that has
      * just happened).
      *
-     * @param \core\output\notification $notification the notification to print out
+     * @param notification $notification the notification to print out
      * @return string the HTML to output.
      */
-    protected function render_notification(\core\output\notification $notification) {
+    protected function render_notification(notification $notification) {
         return $this->render_from_template($notification->get_template_name(), $notification->export_for_template($this));
     }
 
@@ -3843,7 +3878,7 @@ public function has_popover_links(): bool {
      * @return bool
      */
     public function has_communication_links(): bool {
-        if (during_initial_install() || !core_communication\api::is_available()) {
+        if (during_initial_install() || !\core_communication\api::is_available()) {
             return false;
         }
         return !empty($this->communication_link());
@@ -4358,17 +4393,17 @@ public function region_main_settings_menu() {
      */
     public function tag_list($tags, $label = null, $classes = '', $limit = 10,
             $pagecontext = null, $accesshidelabel = false) {
-        $list = new \core_tag\output\taglist($tags, $label, $classes, $limit, $pagecontext, $accesshidelabel);
+        $list = new taglist($tags, $label, $classes, $limit, $pagecontext, $accesshidelabel);
         return $this->render_from_template('core_tag/taglist', $list->export_for_template($this));
     }
 
     /**
      * Renders element for inline editing of any value
      *
-     * @param \core\output\inplace_editable $element
+     * @param inplace_editable $element
      * @return string
      */
-    public function render_inplace_editable(\core\output\inplace_editable $element) {
+    public function render_inplace_editable(inplace_editable $element) {
         return $this->render_from_template('core/inplace_editable', $element->export_for_template($this));
     }
 
@@ -4458,7 +4493,7 @@ public function mform_element($element, $required, $advanced, $error, $ingroup)
         try {
             // We call this to generate a file not found exception if there is no template.
             // We don't want to call export_for_template if there is no template.
-            core\output\mustache_template_finder::get_template_filepath($templatename);
+            mustache_template_finder::get_template_filepath($templatename);
 
             if ($element instanceof templatable) {
                 $elementcontext = $element->export_for_template($this);
@@ -4505,7 +4540,7 @@ public function mform_element($element, $required, $advanced, $error, $ingroup)
                 );
                 return $this->render_from_template($templatename, $context);
             }
-        } catch (Exception $e) {
+        } catch (\Exception $e) {
             // No template for this element.
             return false;
         }
@@ -4593,10 +4628,10 @@ public function render_progress_bar_update(string $id, float $percent, string $m
     /**
      * Renders element for a toggle-all checkbox.
      *
-     * @param \core\output\checkbox_toggleall $element
+     * @param checkbox_toggleall $element
      * @return string
      */
-    public function render_checkbox_toggleall(\core\output\checkbox_toggleall $element) {
+    public function render_checkbox_toggleall(checkbox_toggleall $element) {
         return $this->render_from_template($element->get_template(), $element->export_for_template($this));
     }
 
@@ -4608,7 +4643,7 @@ public function render_checkbox_toggleall(\core\output\checkbox_toggleall $eleme
      * @return string
      */
     public function render_participants_tertiary_nav(object $course, ?string $renderedbuttons = null) {
-        $actionbar = new \core\output\participants_action_bar($course, $this->page, $renderedbuttons);
+        $actionbar = new participants_action_bar($course, $this->page, $renderedbuttons);
         $content = $this->render_from_template('core_course/participants_actionbar', $actionbar->export_for_template($this));
         return $content ?: "";
     }
@@ -4763,3 +4798,7 @@ public function select_element_for_replace(string $selector, string $html, bool
         return $output;
     }
 }
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(core_renderer::class, \core_renderer::class);
diff --git a/lib/classes/output/core_renderer_ajax.php b/lib/classes/output/core_renderer_ajax.php
index 61e0ac12912ed..a70a42b2ed16d 100644
--- a/lib/classes/output/core_renderer_ajax.php
+++ b/lib/classes/output/core_renderer_ajax.php
@@ -14,6 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use core_useragent;
+use moodle_url;
+use stdClass;
+
 /**
  * A renderer that generates output for ajax scripts.
  *
@@ -27,7 +33,6 @@
  * @category output
  */
 class core_renderer_ajax extends core_renderer {
-
     /**
      * Returns a template fragment representing a fatal error.
      *
@@ -88,14 +93,19 @@ public function notification($message, $type = null, $closebutton = true) {
      * @param string $messagetype The type of notification to show the message in.
      *         See constants on \core\output\notification.
      */
-    public function redirect_message($encodedurl, $message, $delay, $debugdisableredirect,
-                                     $messagetype = \core\output\notification::NOTIFY_INFO) {}
+    public function redirect_message(
+        $encodedurl,
+        $message,
+        $delay,
+        $debugdisableredirect,
+        $messagetype = notification::NOTIFY_INFO,
+    ) {}
 
     /**
      * Prepares the start of an AJAX output.
      */
     public function header() {
-        // unfortunately YUI iframe upload does not support application/json
+        // Unfortunately YUI iframe upload does not support application/json.
         if (!empty($_FILES)) {
             @header('Content-type: text/plain; charset=utf-8');
             if (!core_useragent::supports_json_contenttype()) {
@@ -132,3 +142,8 @@ public function footer() {}
      */
     public function heading($text, $level = 2, $classes = 'main', $id = null) {}
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(core_renderer_ajax::class, \core_renderer_ajax::class);
diff --git a/lib/classes/output/core_renderer_cli.php b/lib/classes/output/core_renderer_cli.php
index 21b0bb113ebea..1de38c598a194 100644
--- a/lib/classes/output/core_renderer_cli.php
+++ b/lib/classes/output/core_renderer_cli.php
@@ -14,6 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use core_text;
+use core\check\result as check_result;
+
 /**
  * A renderer that generates output for command-line scripts.
  *
@@ -26,7 +31,6 @@
  * @category output
  */
 class core_renderer_cli extends core_renderer {
-
     /**
      * @var array $progressmaximums stores the largest percentage for a progress bar.
      * @return string ascii fragment
@@ -48,20 +52,20 @@ public function header() {
      * To aid in CLI consistency this status is NOT translated and the visual
      * width is always exactly 10 chars.
      *
-     * @param core\check\result $result
+     * @param check_result $result
      * @return string HTML fragment
      */
-    protected function render_check_result(core\check\result $result) {
+    protected function render_check_result(check_result $result) {
         $status = $result->get_status();
 
         $labels = [
-            core\check\result::NA        => '      ' . cli_ansi_format('<colour:darkGray>' ) . ' NA ',
-            core\check\result::OK        => '      ' . cli_ansi_format('<colour:green>') . ' OK ',
-            core\check\result::INFO      => '    '   . cli_ansi_format('<colour:blue>' ) . ' INFO ',
-            core\check\result::UNKNOWN   => ' '      . cli_ansi_format('<colour:darkGray>' ) . ' UNKNOWN ',
-            core\check\result::WARNING   => ' '      . cli_ansi_format('<colour:black><bgcolour:yellow>') . ' WARNING ',
-            core\check\result::ERROR     => '   '    . cli_ansi_format('<bgcolour:red>') . ' ERROR ',
-            core\check\result::CRITICAL  => ''       . cli_ansi_format('<bgcolour:red>') . ' CRITICAL ',
+            check_result::NA        => '      ' . cli_ansi_format('<colour:darkGray>' ) . ' NA ',
+            check_result::OK        => '      ' . cli_ansi_format('<colour:green>') . ' OK ',
+            check_result::INFO      => '    '   . cli_ansi_format('<colour:blue>' ) . ' INFO ',
+            check_result::UNKNOWN   => ' '      . cli_ansi_format('<colour:darkGray>' ) . ' UNKNOWN ',
+            check_result::WARNING   => ' '      . cli_ansi_format('<colour:black><bgcolour:yellow>') . ' WARNING ',
+            check_result::ERROR     => '   '    . cli_ansi_format('<bgcolour:red>') . ' ERROR ',
+            check_result::CRITICAL  => ''       . cli_ansi_format('<bgcolour:red>') . ' CRITICAL ',
         ];
         $string = $labels[$status] . cli_ansi_format('<colour:normal>');
         return $string;
@@ -70,10 +74,10 @@ protected function render_check_result(core\check\result $result) {
     /**
      * Renders a Check API result
      *
-     * @param core\check\result $result
+     * @param check_result $result
      * @return string fragment
      */
-    public function check_result(core\check\result $result) {
+    public function check_result(check_result $result) {
         return $this->render_check_result($result);
     }
 
@@ -235,16 +239,22 @@ public function notification($message, $type = null, $closebutton = true) {
      * There is no footer for a cli request, however we must override the
      * footer method to prevent the default footer.
      */
-    public function footer() {}
+    public function footer() {
+    }
 
     /**
      * Render a notification (that is, a status message about something that has
      * just happened).
      *
-     * @param \core\output\notification $notification the notification to print out
+     * @param notification $notification the notification to print out
      * @return string plain text output
      */
-    public function render_notification(\core\output\notification $notification) {
+    public function render_notification(notification $notification) {
         return $this->notification($notification->get_message(), $notification->get_message_type());
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(core_renderer_cli::class, \core_renderer_cli::class);
diff --git a/lib/classes/output/core_renderer_maintenance.php b/lib/classes/output/core_renderer_maintenance.php
index 641922cb3681a..1aee2863dc04b 100644
--- a/lib/classes/output/core_renderer_maintenance.php
+++ b/lib/classes/output/core_renderer_maintenance.php
@@ -14,6 +14,14 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use core_block\output\block_contents;
+use core\exception\coding_exception;
+use moodle_page;
+use moodle_url;
+use stdClass;
+
 /**
  * The maintenance renderer.
  *
@@ -227,3 +235,8 @@ public function user_picture(stdClass $user, array $options = null) {
         return '';
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(core_renderer_maintenance::class, \core_renderer_maintenance::class);
diff --git a/lib/classes/output/custom_menu.php b/lib/classes/output/custom_menu.php
index 1ed34eea65929..67ab20ee60d4a 100644
--- a/lib/classes/output/custom_menu.php
+++ b/lib/classes/output/custom_menu.php
@@ -14,6 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use core\exception\moodle_exception;
+use moodle_url;
+
 /**
  * Custom menu class
  *
@@ -31,7 +36,6 @@
  * @category output
  */
 class custom_menu extends custom_menu_item {
-
     /**
      * @var string The language we should render for, null disables multilang support.
      */
@@ -177,3 +181,8 @@ public static function sort_custom_menu_items(custom_menu_item $itema, custom_me
         return ($itema > $itemb) ? +1 : -1;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(custom_menu::class, \custom_menu::class);
diff --git a/lib/classes/output/custom_menu_item.php b/lib/classes/output/custom_menu_item.php
index 560cf2a3ec6f4..314cfeebeb827 100644
--- a/lib/classes/output/custom_menu_item.php
+++ b/lib/classes/output/custom_menu_item.php
@@ -14,6 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use core\context\system as context_system;
+use moodle_url;
+use stdClass;
+
 /**
  * Custom menu item
  *
@@ -259,3 +265,8 @@ public function export_for_template(renderer_base $output) {
         return $context;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(custom_menu_item::class, \custom_menu_item::class);
diff --git a/lib/classes/output/datafilter.php b/lib/classes/output/datafilter.php
index ea28136d45ba1..04973ef3d939d 100644
--- a/lib/classes/output/datafilter.php
+++ b/lib/classes/output/datafilter.php
@@ -16,10 +16,8 @@
 
 namespace core\output;
 
-use context;
-use renderable;
+use core\context;
 use stdClass;
-use templatable;
 
 /**
  * The filter renderable class.
diff --git a/lib/classes/output/dynamic_tabs.php b/lib/classes/output/dynamic_tabs.php
index c2592bb8134d4..1dbb26df2e642 100644
--- a/lib/classes/output/dynamic_tabs.php
+++ b/lib/classes/output/dynamic_tabs.php
@@ -19,8 +19,6 @@
 namespace core\output;
 
 use core\output\dynamic_tabs\base;
-use renderer_base;
-use templatable;
 
 /**
  * Class dynamic tabs
diff --git a/lib/classes/output/dynamic_tabs/base.php b/lib/classes/output/dynamic_tabs/base.php
index 2396ee645ec3b..477b73587ec67 100644
--- a/lib/classes/output/dynamic_tabs/base.php
+++ b/lib/classes/output/dynamic_tabs/base.php
@@ -18,8 +18,8 @@
 
 namespace core\output\dynamic_tabs;
 
-use moodle_exception;
-use templatable;
+use core\exception\moodle_exception;
+use core\output\templatable;
 
 /**
  * Class tab_base
diff --git a/lib/classes/output/file_picker.php b/lib/classes/output/file_picker.php
index 785b0d9a69f4f..783e29fe71c5b 100644
--- a/lib/classes/output/file_picker.php
+++ b/lib/classes/output/file_picker.php
@@ -14,6 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use core\context\user as context_user;
+use moodle_url;
+use stdClass;
+
 /**
  * Data structure representing a file picker.
  *
@@ -24,7 +30,6 @@
  * @category output
  */
 class file_picker implements renderable {
-
     /**
      * @var stdClass An object containing options for the file picker
      */
@@ -91,3 +96,8 @@ public function __construct(stdClass $options) {
         }
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(file_picker::class, \file_picker::class);
diff --git a/lib/classes/output/help_icon.php b/lib/classes/output/help_icon.php
index 9fee559cad5e3..6c36b1cf918be 100644
--- a/lib/classes/output/help_icon.php
+++ b/lib/classes/output/help_icon.php
@@ -14,6 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use moodle_url;
+use stdClass;
+
 /**
  * Data structure representing a help icon.
  *
@@ -24,7 +29,6 @@
  * @category output
  */
 class help_icon implements renderable, templatable {
-
     /**
      * @var string lang pack identifier (without the "_help" suffix),
      * both get_string($identifier, $component) and get_string($identifier.'_help', $component)
@@ -116,3 +120,8 @@ public function export_for_template(renderer_base $output) {
         return $data;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(help_icon::class, \help_icon::class);
diff --git a/lib/classes/output/html_writer.php b/lib/classes/output/html_writer.php
index 9d595335d325a..3f00022d876d7 100644
--- a/lib/classes/output/html_writer.php
+++ b/lib/classes/output/html_writer.php
@@ -14,6 +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 core\output;
+
+use core\exception\coding_exception;
+use core_table\output\html_table;
+use core_table\output\html_table_cell;
+use core_table\output\html_table_row;
+use core_text;
+use moodle_url;
+
 /**
  * Simple html output class
  *
@@ -24,7 +33,6 @@
  * @category output
  */
 class html_writer {
-
     /**
      * Outputs a tag with attributes and contents
      *
@@ -434,11 +442,11 @@ public static function select_time($type, $name, $currenttime = 0, $step = 5, ar
      * @return string
      */
     public static function alist(array $items, array $attributes = null, $tag = 'ul') {
-        $output = html_writer::start_tag($tag, $attributes)."\n";
+        $output = self::start_tag($tag, $attributes)."\n";
         foreach ($items as $item) {
-            $output .= html_writer::tag('li', $item)."\n";
+            $output .= self::tag('li', $item)."\n";
         }
-        $output .= html_writer::end_tag($tag);
+        $output .= self::end_tag($tag);
         return $output;
     }
 
@@ -553,7 +561,7 @@ public static function table(html_table $table) {
             'cellpadding'   => $table->cellpadding,
             'cellspacing'   => $table->cellspacing,
         ));
-        $output = html_writer::start_tag('table', $attributes) . "\n";
+        $output = self::start_tag('table', $attributes) . "\n";
 
         $countcols = 0;
 
@@ -563,7 +571,7 @@ public static function table(html_table $table) {
             if ($table->captionhide) {
                 $captionattributes['class'] = 'accesshide';
             }
-            $output .= html_writer::tag(
+            $output .= self::tag(
                 'caption',
                 $table->caption,
                 $captionattributes
@@ -573,8 +581,8 @@ public static function table(html_table $table) {
         if (!empty($table->head)) {
             $countcols = count($table->head);
 
-            $output .= html_writer::start_tag('thead', array()) . "\n";
-            $output .= html_writer::start_tag('tr', array()) . "\n";
+            $output .= self::start_tag('thead', array()) . "\n";
+            $output .= self::start_tag('tr', array()) . "\n";
             $keys = array_keys($table->head);
             $lastkey = end($keys);
 
@@ -618,28 +626,28 @@ public static function table(html_table $table) {
                     $attributes['scope'] = !empty($heading->scope) ? $heading->scope : 'col';
                 }
 
-                $output .= html_writer::tag($tagtype, $heading->text, $attributes) . "\n";
+                $output .= self::tag($tagtype, $heading->text, $attributes) . "\n";
             }
-            $output .= html_writer::end_tag('tr') . "\n";
-            $output .= html_writer::end_tag('thead') . "\n";
+            $output .= self::end_tag('tr') . "\n";
+            $output .= self::end_tag('thead') . "\n";
 
             if (empty($table->data)) {
                 // For valid XHTML strict every table must contain either a valid tr
                 // or a valid tbody... both of which must contain a valid td
-                $output .= html_writer::start_tag('tbody', array('class' => 'empty'));
-                $output .= html_writer::tag('tr', html_writer::tag('td', '', array('colspan'=>count($table->head))));
-                $output .= html_writer::end_tag('tbody');
+                $output .= self::start_tag('tbody', array('class' => 'empty'));
+                $output .= self::tag('tr', self::tag('td', '', array('colspan'=>count($table->head))));
+                $output .= self::end_tag('tbody');
             }
         }
 
         if (!empty($table->data)) {
             $keys       = array_keys($table->data);
             $lastrowkey = end($keys);
-            $output .= html_writer::start_tag('tbody', array());
+            $output .= self::start_tag('tbody', array());
 
             foreach ($table->data as $key => $row) {
                 if (($row === 'hr') && ($countcols)) {
-                    $output .= html_writer::tag('td', html_writer::tag('div', '', array('class' => 'tabledivider')), array('colspan' => $countcols));
+                    $output .= self::tag('td', self::tag('div', '', array('class' => 'tabledivider')), array('colspan' => $countcols));
                 } else {
                     // Convert array rows to html_table_rows and cell strings to html_table_cell objects
                     if (!($row instanceof html_table_row)) {
@@ -668,7 +676,7 @@ public static function table(html_table $table) {
                         'id'            => $row->id,
                         'style'         => $row->style,
                     ));
-                    $output .= html_writer::start_tag('tr', $trattributes) . "\n";
+                    $output .= self::start_tag('tr', $trattributes) . "\n";
                     $keys2 = array_keys($row->cells);
                     $lastkey = end($keys2);
 
@@ -715,14 +723,14 @@ public static function table(html_table $table) {
                         if ($cell->header === true) {
                             $tagtype = 'th';
                         }
-                        $output .= html_writer::tag($tagtype, $cell->text, $tdattributes) . "\n";
+                        $output .= self::tag($tagtype, $cell->text, $tdattributes) . "\n";
                     }
                 }
-                $output .= html_writer::end_tag('tr') . "\n";
+                $output .= self::end_tag('tr') . "\n";
             }
-            $output .= html_writer::end_tag('tbody') . "\n";
+            $output .= self::end_tag('tbody') . "\n";
         }
-        $output .= html_writer::end_tag('table') . "\n";
+        $output .= self::end_tag('table') . "\n";
 
         if ($table->responsive) {
             return self::div($output, 'table-responsive');
@@ -868,3 +876,8 @@ public static function end_span() {
         return self::end_tag('span');
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(html_writer::class, \html_writer::class);
diff --git a/lib/classes/output/icon_system.php b/lib/classes/output/icon_system.php
index d690bc6272fd6..c9f6b5a1488e8 100644
--- a/lib/classes/output/icon_system.php
+++ b/lib/classes/output/icon_system.php
@@ -14,22 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Contains class \core\output\icon_system
- *
- * @package    core
- * @category   output
- * @copyright  2016 Damyon Wiese
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace core\output;
 
-use renderer_base;
-use pix_icon;
-
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Class allowing different systems for mapping and rendering icons.
  *
diff --git a/lib/classes/output/icon_system_fontawesome.php b/lib/classes/output/icon_system_fontawesome.php
index 767949bd80396..0b9053a25900e 100644
--- a/lib/classes/output/icon_system_fontawesome.php
+++ b/lib/classes/output/icon_system_fontawesome.php
@@ -14,22 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Contains class \core\output\icon_system
- *
- * @package    core
- * @category   output
- * @copyright  2016 Damyon Wiese
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace core\output;
 
-use renderer_base;
-use pix_icon;
-
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Class allowing different systems for mapping and rendering icons.
  *
diff --git a/lib/classes/output/icon_system_standard.php b/lib/classes/output/icon_system_standard.php
index c9a2f77e18da0..cc0d1500915f9 100644
--- a/lib/classes/output/icon_system_standard.php
+++ b/lib/classes/output/icon_system_standard.php
@@ -14,22 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Contains class \core\output\icon_system_standard
- *
- * @package    core
- * @category   output
- * @copyright  2016 Damyon Wiese
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace core\output;
 
-use renderer_base;
-use pix_icon;
-
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Standard icon rendering. No mapping - img tags used.
  *
@@ -39,7 +25,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class icon_system_standard extends icon_system {
-
     public function render_pix_icon(renderer_base $output, pix_icon $icon) {
         $data = $icon->export_for_template($output);
         return $output->render_from_template('core/pix_icon', $data);
@@ -50,4 +35,3 @@ public function get_amd_name() {
     }
 
 }
-
diff --git a/lib/classes/output/image_icon.php b/lib/classes/output/image_icon.php
index 805b655d1b6bc..76e6bce00c482 100644
--- a/lib/classes/output/image_icon.php
+++ b/lib/classes/output/image_icon.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
 /**
  * Data structure representing an activity icon.
  *
@@ -25,3 +27,8 @@
  */
 class image_icon extends pix_icon {
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(image_icon::class, \image_icon::class);
diff --git a/lib/classes/output/initials_bar.php b/lib/classes/output/initials_bar.php
index e7c48a903ac93..453b843d24561 100644
--- a/lib/classes/output/initials_bar.php
+++ b/lib/classes/output/initials_bar.php
@@ -14,6 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use moodle_url;
+use stdClass;
+
 /**
  * Component representing initials bar.
  *
@@ -24,7 +29,6 @@
  * @category output
  */
 class initials_bar implements renderable, templatable {
-
     /**
      * @var string Currently selected letter.
      */
@@ -146,3 +150,8 @@ public function export_for_template(renderer_base $output) {
         return $data;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(initials_bar::class, \initials_bar::class);
diff --git a/lib/classes/output/inplace_editable.php b/lib/classes/output/inplace_editable.php
index 2488fa085d869..6c94c474418ca 100644
--- a/lib/classes/output/inplace_editable.php
+++ b/lib/classes/output/inplace_editable.php
@@ -14,21 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Contains class \core\output\inplace_editable
- *
- * @package    core
- * @category   output
- * @copyright  2016 Marina Glancy
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace core\output;
 
-use templatable;
-use renderable;
 use lang_string;
-use pix_icon;
 
 /**
  * Class allowing to quick edit a title inline
@@ -53,7 +41,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class inplace_editable implements templatable, renderable {
-
     /**
      * @var string component responsible for diplsying/updating
      */
diff --git a/lib/classes/output/js_writer.php b/lib/classes/output/js_writer.php
index 348fb79c0e481..a98d078b98020 100644
--- a/lib/classes/output/js_writer.php
+++ b/lib/classes/output/js_writer.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
 /**
  * Simple javascript output class
  *
@@ -24,7 +26,6 @@
  * @category output
  */
 class js_writer {
-
     /**
      * Returns javascript code calling the function
      *
@@ -145,3 +146,8 @@ public static function event_handler($selector, $event, $function, array $argume
         return $output . ");\n";
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(js_writer::class, \js_writer::class);
diff --git a/lib/classes/output/language_menu.php b/lib/classes/output/language_menu.php
index b6a0fbc63e0d8..c45ed73447804 100644
--- a/lib/classes/output/language_menu.php
+++ b/lib/classes/output/language_menu.php
@@ -33,7 +33,7 @@
  * @copyright  2021 Adrian Greeve <adrian@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class language_menu implements \renderable, \templatable {
+class language_menu implements renderable, templatable {
 
     /** @var \moodle_page $page the moodle page that the languague menu belongs to */
     protected $page;
diff --git a/lib/classes/output/local/action_menu/subpanel.php b/lib/classes/output/local/action_menu/subpanel.php
index cfcca6d6bb191..d0a92624c3adf 100644
--- a/lib/classes/output/local/action_menu/subpanel.php
+++ b/lib/classes/output/local/action_menu/subpanel.php
@@ -16,9 +16,9 @@
 
 namespace core\output\local\action_menu;
 
-use action_link;
-use pix_icon;
-use renderable;
+use core\output\action_link;
+use core\output\pix_icon;
+use core\output\renderable;
 use stdClass;
 
 /**
diff --git a/lib/classes/output/local/dropdown/dialog.php b/lib/classes/output/local/dropdown/dialog.php
index 5ba3852197956..cf0a20b0cd442 100644
--- a/lib/classes/output/local/dropdown/dialog.php
+++ b/lib/classes/output/local/dropdown/dialog.php
@@ -17,7 +17,7 @@
 namespace core\output\local\dropdown;
 
 use core\output\named_templatable;
-use renderable;
+use core\output\renderable;
 
 /**
  * Class to render a dropdown dialog element.
diff --git a/lib/classes/output/mustache_clean_string_helper.php b/lib/classes/output/mustache_clean_string_helper.php
index 144cd62e2a5ff..a067490ca18c5 100644
--- a/lib/classes/output/mustache_clean_string_helper.php
+++ b/lib/classes/output/mustache_clean_string_helper.php
@@ -14,15 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Mustache helper to load strings from string_manager and perform HTML escaping on them.
- *
- * @package    core
- * @category   output
- * @copyright  2021 Shamim Rezaie <shamim@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace core\output;
 
 use Mustache_LambdaHelper;
@@ -30,6 +21,7 @@
 /**
  * This class will load language strings in a template.
  *
+ * @package core
  * @copyright  2021 Shamim Rezaie <shamim@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since      4.0
diff --git a/lib/classes/output/mustache_engine.php b/lib/classes/output/mustache_engine.php
index ada43c20c7776..60a7933e74ede 100644
--- a/lib/classes/output/mustache_engine.php
+++ b/lib/classes/output/mustache_engine.php
@@ -68,7 +68,7 @@ public function __construct(array $options = []) {
     /**
      * Get the current set of Mustache helpers.
      *
-     * @see Mustache_Engine::setHelpers
+     * @see \Mustache_Engine::setHelpers
      *
      * @return \Mustache_HelperCollection
      */
diff --git a/lib/classes/output/mustache_filesystem_loader.php b/lib/classes/output/mustache_filesystem_loader.php
index 7cfdc2143bf54..84266836b8cda 100644
--- a/lib/classes/output/mustache_filesystem_loader.php
+++ b/lib/classes/output/mustache_filesystem_loader.php
@@ -14,22 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Perform some custom name mapping for template file names (strip leading component/).
- *
- * @package    core
- * @category   output
- * @copyright  2015 Damyon Wiese
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace core\output;
 
-use coding_exception;
-
 /**
  * Perform some custom name mapping for template file names.
  *
+ * @package core
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since      2.9
diff --git a/lib/classes/output/mustache_helper_collection.php b/lib/classes/output/mustache_helper_collection.php
index e2f7b332eb9d9..2a6f33213a749 100644
--- a/lib/classes/output/mustache_helper_collection.php
+++ b/lib/classes/output/mustache_helper_collection.php
@@ -14,18 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Custom Moodle helper collection for mustache.
- *
- * @copyright  2019 Ryan Wyllie <ryan@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace core\output;
 
 /**
  * Custom Moodle helper collection for mustache.
  *
+ * @package core
  * @copyright  2019 Ryan Wyllie <ryan@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/lib/classes/output/mustache_javascript_helper.php b/lib/classes/output/mustache_javascript_helper.php
index 173860d088a05..cf163b67a640f 100644
--- a/lib/classes/output/mustache_javascript_helper.php
+++ b/lib/classes/output/mustache_javascript_helper.php
@@ -19,6 +19,7 @@
 /**
  * Store a list of JS calls to insert at the end of the page.
  *
+ * @package core
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since      2.9
diff --git a/lib/classes/output/mustache_pix_helper.php b/lib/classes/output/mustache_pix_helper.php
index 9bc374d14144a..1942f97e8f9e1 100644
--- a/lib/classes/output/mustache_pix_helper.php
+++ b/lib/classes/output/mustache_pix_helper.php
@@ -14,29 +14,18 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Mustache helper render pix icons.
- *
- * @package    core
- * @category   output
- * @copyright  2015 Damyon Wiese
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace core\output;
 
 use Mustache_LambdaHelper;
-use renderer_base;
 
 /**
  * This class will call pix_icon with the section content.
  *
+ * @package core
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since      2.9
  */
 class mustache_pix_helper {
-
     /** @var renderer_base $renderer A reference to the renderer in use */
     private $renderer;
 
@@ -80,4 +69,3 @@ public function pix($text, Mustache_LambdaHelper $helper) {
         return trim($this->renderer->pix_icon($key, $text, $component));
     }
 }
-
diff --git a/lib/classes/output/mustache_shorten_text_helper.php b/lib/classes/output/mustache_shorten_text_helper.php
index 8a47064790350..510ca47211734 100644
--- a/lib/classes/output/mustache_shorten_text_helper.php
+++ b/lib/classes/output/mustache_shorten_text_helper.php
@@ -14,25 +14,14 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Mustache helper shorten text.
- *
- * @package    core
- * @category   output
- * @copyright  2017 Ryan Wyllie <ryan@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace core\output;
 
-defined('MOODLE_INTERNAL') || die();
-
 use Mustache_LambdaHelper;
-use renderer_base;
 
 /**
  * This class will call shorten_text with the section content.
  *
+ * @package core
  * @copyright  2017 Ryan Wyllie <ryan@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -62,4 +51,3 @@ public function shorten($args, Mustache_LambdaHelper $helper) {
         return shorten_text($text, $length);
     }
 }
-
diff --git a/lib/classes/output/mustache_string_helper.php b/lib/classes/output/mustache_string_helper.php
index 0241be530595e..f0d78c24d9348 100644
--- a/lib/classes/output/mustache_string_helper.php
+++ b/lib/classes/output/mustache_string_helper.php
@@ -14,15 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Mustache helper to load strings from string_manager.
- *
- * @package    core
- * @category   output
- * @copyright  2015 Damyon Wiese
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace core\output;
 
 use Mustache_LambdaHelper;
diff --git a/lib/classes/output/mustache_template_finder.php b/lib/classes/output/mustache_template_finder.php
index 263725833e3f7..babc77d1e8d29 100644
--- a/lib/classes/output/mustache_template_finder.php
+++ b/lib/classes/output/mustache_template_finder.php
@@ -14,21 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * List the valid locations to search for a template with a given name.
- *
- * @package    core
- * @category   output
- * @copyright  2015 Damyon Wiese
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace core\output;
 
-use coding_exception;
-use moodle_exception;
+use core\exception\coding_exception;
+use core\exception\moodle_exception;
 use core_component;
-use theme_config;
 
 /**
  * Get information about valid locations for mustache templates.
@@ -38,7 +28,6 @@
  * @since      2.9
  */
 class mustache_template_finder {
-
     /**
      * Helper function for getting a list of valid template directories for a specific component.
      *
diff --git a/lib/classes/output/mustache_template_source_loader.php b/lib/classes/output/mustache_template_source_loader.php
index b71dc4f5c636e..9c054a3864344 100644
--- a/lib/classes/output/mustache_template_source_loader.php
+++ b/lib/classes/output/mustache_template_source_loader.php
@@ -14,19 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Load template source strings.
- *
- * @package    core
- * @category   output
- * @copyright  2018 Ryan Wyllie <ryan@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace core\output;
 
-defined('MOODLE_INTERNAL') || die();
-
 use \Mustache_Tokenizer;
 
 /**
diff --git a/lib/classes/output/mustache_user_date_helper.php b/lib/classes/output/mustache_user_date_helper.php
index 8f02aee3256c8..5ff809a1f1fdf 100644
--- a/lib/classes/output/mustache_user_date_helper.php
+++ b/lib/classes/output/mustache_user_date_helper.php
@@ -14,19 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Mustache helper that will convert a timestamp to a date string.
- *
- * @package    core
- * @category   output
- * @copyright  2017 Ryan Wyllie <ryan@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace core\output;
 
-defined('MOODLE_INTERNAL') || die();
-
 use Mustache_LambdaHelper;
 
 /**
@@ -36,7 +25,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class mustache_user_date_helper {
-
     /**
      * Read a timestamp and format from the string.
      *
diff --git a/lib/classes/output/named_templatable.php b/lib/classes/output/named_templatable.php
index 2404e509c95fb..c9373b70ac9e5 100644
--- a/lib/classes/output/named_templatable.php
+++ b/lib/classes/output/named_templatable.php
@@ -16,8 +16,6 @@
 
 namespace core\output;
 
-use templatable;
-
 /**
  * A subset of templatable which provides the name of the template to use.
  *
@@ -26,12 +24,11 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 interface named_templatable extends templatable {
-
     /**
      * Get the name of the template to use for this templatable.
      *
-     * @param \renderer_base $renderer The renderer requesting the template name
+     * @param renderer_base $renderer The renderer requesting the template name
      * @return string
      */
-    public function get_template_name(\renderer_base $renderer): string;
+    public function get_template_name(renderer_base $renderer): string;
 }
diff --git a/lib/classes/output/notification.php b/lib/classes/output/notification.php
index b15ef75976199..ba74371a7302c 100644
--- a/lib/classes/output/notification.php
+++ b/lib/classes/output/notification.php
@@ -33,7 +33,7 @@
  * @package core
  * @category output
  */
-class notification implements \renderable, \templatable {
+class notification implements renderable, templatable {
 
     /**
      * A notification of level 'success'.
diff --git a/lib/classes/output/paging_bar.php b/lib/classes/output/paging_bar.php
index bc6a47c632c7a..0d204731dc61f 100644
--- a/lib/classes/output/paging_bar.php
+++ b/lib/classes/output/paging_bar.php
@@ -14,6 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use core\exception\coding_exception;
+use moodle_page;
+use moodle_url;
+use stdClass;
+
 /**
  * Component representing a paging bar.
  *
@@ -24,7 +31,6 @@
  * @category output
  */
 class paging_bar implements renderable, templatable {
-
     /**
      * @var int The maximum number of pagelinks to display.
      */
@@ -253,3 +259,8 @@ public function export_for_template(renderer_base $output) {
         return $data;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(paging_bar::class, \paging_bar::class);
diff --git a/lib/classes/output/participants_action_bar.php b/lib/classes/output/participants_action_bar.php
index 4195649e8a880..9ddb022a93485 100644
--- a/lib/classes/output/participants_action_bar.php
+++ b/lib/classes/output/participants_action_bar.php
@@ -16,7 +16,7 @@
 
 namespace core\output;
 
-use context_course;
+use core\context\course as context_course;
 use moodle_page;
 use navigation_node;
 use moodle_url;
@@ -28,7 +28,7 @@
  * @copyright  2021 Peter Dias
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class participants_action_bar implements \renderable {
+class participants_action_bar implements renderable {
     /** @var object $course The course we are dealing with. */
     private $course;
     /** @var moodle_page $page The current page. */
diff --git a/lib/classes/output/pix_emoticon.php b/lib/classes/output/pix_emoticon.php
index 5740c729f251f..000092cb596c3 100644
--- a/lib/classes/output/pix_emoticon.php
+++ b/lib/classes/output/pix_emoticon.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
 /**
  * Data structure representing an emoticon image
  *
@@ -38,3 +40,8 @@ public function __construct($pix, $alt, $component = 'moodle', array $attributes
         parent::__construct($pix, $alt, $component, $attributes);
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(pix_emoticon::class, \pix_emoticon::class);
diff --git a/lib/classes/output/pix_icon.php b/lib/classes/output/pix_icon.php
index 0106e7c0d52b8..1ceaaebb58588 100644
--- a/lib/classes/output/pix_icon.php
+++ b/lib/classes/output/pix_icon.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
 /**
  * Data structure representing an icon.
  *
@@ -141,3 +143,8 @@ public function export_for_pix() {
         ];
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(pix_icon::class, \pix_icon::class);
diff --git a/lib/classes/output/pix_icon_font.php b/lib/classes/output/pix_icon_font.php
index 280853de86ae8..dce04f6146298 100644
--- a/lib/classes/output/pix_icon_font.php
+++ b/lib/classes/output/pix_icon_font.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
 /**
  * Data structure representing an icon font.
  *
@@ -23,7 +25,6 @@
  * @category output
  */
 class pix_icon_font implements templatable {
-
     /**
      * @var pix_icon $pixicon The original icon.
      */
@@ -49,7 +50,7 @@ public function __construct(pix_icon $pixicon) {
 
         $this->pixicon = $pixicon;
         $this->mapped = false;
-        $iconsystem = \core\output\icon_system::instance();
+        $iconsystem = icon_system::instance();
 
         $this->key = $iconsystem->remap_icon_name($pixicon->pix, $pixicon->component);
         if (!empty($this->key)) {
@@ -91,3 +92,8 @@ public function export_for_template(renderer_base $output) {
         return $data;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(pix_icon_font::class, \pix_icon_font::class);
diff --git a/lib/classes/output/pix_icon_fontawesome.php b/lib/classes/output/pix_icon_fontawesome.php
index 8cab6924e5c30..77f15233d8ad6 100644
--- a/lib/classes/output/pix_icon_fontawesome.php
+++ b/lib/classes/output/pix_icon_fontawesome.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
 /**
  * Data structure representing an icon subtype.
  *
@@ -24,3 +26,8 @@
  */
 class pix_icon_fontawesome extends pix_icon_font {
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(pix_icon_fontawesome::class, \pix_icon_fontawesome::class);
diff --git a/lib/classes/output/plugin_renderer_base.php b/lib/classes/output/plugin_renderer_base.php
index 922d867a867ca..df6b94df22d8e 100644
--- a/lib/classes/output/plugin_renderer_base.php
+++ b/lib/classes/output/plugin_renderer_base.php
@@ -14,6 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use core\exception\coding_exception;
+use moodle_page;
+
 /**
  * Basis for all plugin renderers.
  *
@@ -24,7 +29,6 @@
  * @category output
  */
 class plugin_renderer_base extends renderer_base {
-
     /**
      * @var renderer_base|core_renderer A reference to the current renderer.
      * The renderer provided here will be determined by the page but will in 90%
@@ -129,3 +133,8 @@ public function __call($method, $arguments) {
         }
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(plugin_renderer_base::class, \plugin_renderer_base::class);
diff --git a/lib/classes/output/preferences_group.php b/lib/classes/output/preferences_group.php
index bc8a5d0d7a71b..4ab98a1d8218f 100644
--- a/lib/classes/output/preferences_group.php
+++ b/lib/classes/output/preferences_group.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
 /**
  * Represents a group of preferences page link.
  *
@@ -45,3 +47,8 @@ public function __construct($title, $nodes) {
         $this->nodes = $nodes;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(preferences_group::class, \preferences_group::class);
diff --git a/lib/classes/output/preferences_groups.php b/lib/classes/output/preferences_groups.php
index 6bdcf936fb060..3b40bb4baa85a 100644
--- a/lib/classes/output/preferences_groups.php
+++ b/lib/classes/output/preferences_groups.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
 /**
  * Represents a set of preferences groups.
  *
@@ -37,3 +39,8 @@ public function __construct($groups) {
         $this->groups = $groups;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(preferences_groups::class, \preferences_groups::class);
diff --git a/lib/classes/output/progress_bar.php b/lib/classes/output/progress_bar.php
index a674ec87d28c7..b0b3476777c88 100644
--- a/lib/classes/output/progress_bar.php
+++ b/lib/classes/output/progress_bar.php
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use core\exception\coding_exception;
+
 /**
  * Progress bar class.
  *
@@ -202,3 +206,8 @@ public function export_for_template(renderer_base $output) {
         ];
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(progress_bar::class, \progress_bar::class);
diff --git a/lib/classes/output/renderable.php b/lib/classes/output/renderable.php
index 7c1a065146b5a..d9a3263dbc64f 100644
--- a/lib/classes/output/renderable.php
+++ b/lib/classes/output/renderable.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
 /**
  * Interface marking other classes as suitable for renderer_base::render()
  *
@@ -24,3 +26,8 @@
 interface renderable {
     // intentionally empty
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(renderable::class, \renderable::class);
diff --git a/lib/classes/output/renderer_base.php b/lib/classes/output/renderer_base.php
index c33c12bfafe92..faef38979102e 100644
--- a/lib/classes/output/renderer_base.php
+++ b/lib/classes/output/renderer_base.php
@@ -14,7 +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/>.
 
-use core\output\named_templatable;
+namespace core\output;
+
+use core\context\system as context_system;
+use core\exception\moodle_exception;
+use core\exception\coding_exception;
+use core\output\actions\component_action;
+use moodle_page;
+use moodle_url;
+use Mustache_Exception_UnknownTemplateException;
 
 /**
  * Simple base class for Moodle renderers.
@@ -46,7 +54,7 @@ class renderer_base {
     protected $target;
 
     /**
-     * @var Mustache_Engine $mustache The mustache template compiler
+     * @var \Mustache_Engine The mustache template compiler
      */
     private $mustache;
 
@@ -59,7 +67,7 @@ class renderer_base {
      * Return an instance of the mustache class.
      *
      * @since 2.9
-     * @return Mustache_Engine
+     * @return \Mustache_Engine
      */
     protected function get_mustache() {
         global $CFG;
@@ -84,14 +92,14 @@ protected function get_mustache() {
                 }
             }
 
-            $loader = new \core\output\mustache_filesystem_loader();
-            $stringhelper = new \core\output\mustache_string_helper();
-            $cleanstringhelper = new \core\output\mustache_clean_string_helper();
-            $quotehelper = new \core\output\mustache_quote_helper();
-            $jshelper = new \core\output\mustache_javascript_helper($this->page);
-            $pixhelper = new \core\output\mustache_pix_helper($this);
-            $shortentexthelper = new \core\output\mustache_shorten_text_helper();
-            $userdatehelper = new \core\output\mustache_user_date_helper();
+            $loader = new mustache_filesystem_loader();
+            $stringhelper = new mustache_string_helper();
+            $cleanstringhelper = new mustache_clean_string_helper();
+            $quotehelper = new mustache_quote_helper();
+            $jshelper = new mustache_javascript_helper($this->page);
+            $pixhelper = new mustache_pix_helper($this);
+            $shortentexthelper = new mustache_shorten_text_helper();
+            $userdatehelper = new mustache_user_date_helper();
 
             // We only expose the variables that are exposed to JS templates.
             $safeconfig = $this->page->requires->get_config_for_javascript($this->page, $this);
@@ -106,12 +114,12 @@ protected function get_mustache() {
                              'userdate' => array($userdatehelper, 'transform'),
                          );
 
-            $this->mustache = new \core\output\mustache_engine(array(
+            $this->mustache = new mustache_engine(array(
                 'cache' => $cachedir,
                 'escape' => 's',
                 'loader' => $loader,
                 'helpers' => $helpers,
-                'pragmas' => [Mustache_Engine::PRAGMA_BLOCKS],
+                'pragmas' => [\Mustache_Engine::PRAGMA_BLOCKS],
                 // Don't allow the JavaScript helper to be executed from within another
                 // helper. If it's allowed it can be used by users to inject malicious
                 // JS into the page.
@@ -168,7 +176,7 @@ public function render_from_template($templatename, $context) {
         // but will be different from template to template. This is useful for
         // e.g. aria attributes that only work with id attributes and must be
         // unique in a page.
-        $mustache->addHelper('uniqid', new \core\output\mustache_uniqid_helper());
+        $mustache->addHelper('uniqid', new mustache_uniqid_helper());
         if (isset($this->templatecache[$templatename])) {
             $template = $this->templatecache[$templatename];
         } else {
@@ -404,3 +412,8 @@ public function get_page(): moodle_page {
         return $this->page;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(renderer_base::class, \renderer_base::class);
diff --git a/lib/classes/output/renderer_factory/renderer_factory_base.php b/lib/classes/output/renderer_factory/renderer_factory_base.php
index 73367d34bf067..16009bd8cabcb 100644
--- a/lib/classes/output/renderer_factory/renderer_factory_base.php
+++ b/lib/classes/output/renderer_factory/renderer_factory_base.php
@@ -14,6 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\renderer_factory;
+
+use core_component;
+use core\exception\coding_exception;
+use core\output\theme_config;
+
 /**
  * This is a base class to help you implement the renderer_factory interface.
  *
@@ -29,19 +35,16 @@
  * @package core
  * @category output
  */
-abstract class renderer_factory_base implements renderer_factory {
-    /**
-     * @var theme_config The theme we belong to.
-     */
-    protected $theme;
-
+abstract class renderer_factory_base implements renderer_factory_interface {
     /**
      * Constructor.
      *
      * @param theme_config $theme the theme we belong to.
      */
-    public function __construct(theme_config $theme) {
-        $this->theme = $theme;
+    public function __construct(
+        /** @var theme_config The theme we belong to */
+        protected theme_config $theme,
+    ) {
     }
 
     /**
@@ -195,3 +198,8 @@ protected function standard_renderer_classnames($component, $subtype = null) {
         return $classnames;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(renderer_factory_base::class, \renderer_factory_base::class);
diff --git a/lib/classes/output/renderer_factory/renderer_factory_interface.php b/lib/classes/output/renderer_factory/renderer_factory_interface.php
index 0b4631443ba55..9707182c517d1 100644
--- a/lib/classes/output/renderer_factory/renderer_factory_interface.php
+++ b/lib/classes/output/renderer_factory/renderer_factory_interface.php
@@ -14,6 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\renderer_factory;
+
+use moodle_page;
+use core\output\renderer_base;
+
 /**
  * A renderer factory is just responsible for creating an appropriate renderer
  * for any given part of Moodle.
@@ -30,8 +35,7 @@
  * @package core
  * @category output
  */
-interface renderer_factory {
-
+interface renderer_factory_interface {
     /**
      * Return the renderer for a particular part of Moodle.
      *
@@ -59,3 +63,8 @@ interface renderer_factory {
      */
     public function get_renderer(moodle_page $page, $component, $subtype=null, $target=null);
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(renderer_factory_interface::class, \renderer_factory::class);
diff --git a/lib/classes/output/renderer_factory/standard_renderer_factory.php b/lib/classes/output/renderer_factory/standard_renderer_factory.php
index 4256dd115636d..ac2651d992aa3 100644
--- a/lib/classes/output/renderer_factory/standard_renderer_factory.php
+++ b/lib/classes/output/renderer_factory/standard_renderer_factory.php
@@ -14,6 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\renderer_factory;
+
+use core\exception\coding_exception;
+use core\output\renderer_base;
+use moodle_page;
+
 /**
  * This is the default renderer factory for Moodle.
  *
@@ -26,7 +32,6 @@
  * @category output
  */
 class standard_renderer_factory extends renderer_factory_base {
-
     /**
      * Implement the subclass method
      *
@@ -78,3 +83,8 @@ public function get_renderer(moodle_page $page, $component, $subtype = null, $ta
         return new $classname($page, $target);
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(standard_renderer_factory::class, \standard_renderer_factory::class);
diff --git a/lib/classes/output/renderer_factory/theme_overridden_renderer_factory.php b/lib/classes/output/renderer_factory/theme_overridden_renderer_factory.php
index 81487f1e6c6bc..3e7cc10bfacad 100644
--- a/lib/classes/output/renderer_factory/theme_overridden_renderer_factory.php
+++ b/lib/classes/output/renderer_factory/theme_overridden_renderer_factory.php
@@ -14,6 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\renderer_factory;
+
+use core\exception\coding_exception;
+use core\output\renderer_base;
+use core\output\theme_config;
+use moodle_page;
+
 /**
  * This is renderer factory allows themes to override the standard renderers using php code.
  *
@@ -116,3 +123,8 @@ public function get_renderer(moodle_page $page, $component, $subtype = null, $ta
         throw new coding_exception('Request for an unknown renderer ' . $component . ', ' . $subtype . ', ' . $target);
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(theme_overridden_renderer_factory::class, \theme_overridden_renderer_factory::class);
diff --git a/lib/classes/output/requirements/fragment_requirements_manager.php b/lib/classes/output/requirements/fragment_requirements_manager.php
index 840d3b55f2f6c..9a71fe77f597c 100644
--- a/lib/classes/output/requirements/fragment_requirements_manager.php
+++ b/lib/classes/output/requirements/fragment_requirements_manager.php
@@ -14,6 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\requirements;
+
+use html_writer;
+use js_writer;
+
 /**
  * This requirements manager captures the appropriate html for creating a fragment to
  * be inserted elsewhere.
@@ -54,7 +59,6 @@ protected function get_amd_footercode() {
         return $output;
     }
 
-
     /**
      * Generate any HTML that needs to go at the end of the page.
      *
@@ -116,3 +120,8 @@ public function get_end_code() {
         return $output;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(fragment_requirements_manager::class, \fragment_requirements_manager::class);
diff --git a/lib/classes/output/requirements/page_requirements_manager.php b/lib/classes/output/requirements/page_requirements_manager.php
index 5e68103dfd524..f19999b558edd 100644
--- a/lib/classes/output/requirements/page_requirements_manager.php
+++ b/lib/classes/output/requirements/page_requirements_manager.php
@@ -14,6 +14,20 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\requirements;
+
+use core_component;
+use core\context\course as context_course;
+use core\exception\coding_exception;
+use core\output\core_renderer;
+use core\output\js_writer;
+use core\output\html_writer;
+use core\output\renderer_base;
+use lang_string;
+use moodle_page;
+use moodle_url;
+use stdClass;
+
 /**
  * This class tracks all the things that are needed by the current page.
  *
@@ -45,7 +59,6 @@
  * @category output
  */
 class page_requirements_manager {
-
     /**
      * @var array List of string available from JS
      */
@@ -131,7 +144,7 @@ class page_requirements_manager {
     protected $yui3loader;
 
     /**
-     * @var YUI_config default YUI loader configuration
+     * @var yui default YUI loader configuration
      */
     protected $YUI_config;
 
@@ -165,7 +178,7 @@ public function __construct() {
         $sep = empty($CFG->yuislasharguments) ? '?' : '/';
 
         $this->yui3loader = new stdClass();
-        $this->YUI_config = new YUI_config();
+        $this->YUI_config = new yui();
 
         // Set up some loader options.
         $this->yui3loader->local_base = $CFG->wwwroot . '/lib/yuilib/'. $CFG->yui3version . '/';
@@ -1812,3 +1825,8 @@ public function set_one_time_item_created($thing) {
         return $this->onetimeitemsoutput[$thing] = true;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(page_requirements_manager::class, \page_requirements_manager::class);
diff --git a/lib/classes/output/requirements/yui.php b/lib/classes/output/requirements/yui.php
index 272753aa4fe10..367177fc80bae 100644
--- a/lib/classes/output/requirements/yui.php
+++ b/lib/classes/output/requirements/yui.php
@@ -14,6 +14,14 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\requirements;
+
+use cache;
+use core_component;
+use core_minify;
+use core\exception\coding_exception;
+use DirectoryIterator;
+
 /**
  * This class represents the YUI configuration.
  *
@@ -23,7 +31,7 @@
  * @package core
  * @category output
  */
-class YUI_config {
+class yui {
     /**
      * These settings must be public so that when the object is converted to json they are exposed.
      * Note: Some of these are camelCase because YUI uses camelCase variable names.
@@ -349,3 +357,8 @@ public function define_patched_core_modules($combobase, $yuiversion, $patchlevel
         }
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(yui::class, \YUI_config::class);
diff --git a/lib/classes/output/select_menu.php b/lib/classes/output/select_menu.php
index eb487911d1761..ee512815299cf 100644
--- a/lib/classes/output/select_menu.php
+++ b/lib/classes/output/select_menu.php
@@ -18,8 +18,6 @@
 
 namespace core\output;
 
-use renderer_base;
-
 /**
  * A single-select combobox widget that is functionally similar to an HTML select element.
  *
@@ -28,7 +26,7 @@
  * @copyright 2022 Shamim Rezaie <shamim@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class select_menu implements \renderable, \templatable {
+class select_menu implements renderable, templatable {
     /** @var array List of options. */
     protected $options;
 
diff --git a/lib/classes/output/single_button.php b/lib/classes/output/single_button.php
index 83de95439b320..c2dbfb607de1b 100644
--- a/lib/classes/output/single_button.php
+++ b/lib/classes/output/single_button.php
@@ -14,6 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use core\output\actions\confirm_action;
+use core\output\actions\component_action;
+use moodle_url;
+use stdClass;
+
 /**
  * Data structure representing a simple form with only one button.
  *
@@ -24,7 +31,6 @@
  * @category output
  */
 class single_button implements renderable {
-
     /**
      * Possible button types. From boostrap.
      */
@@ -264,3 +270,8 @@ public function export_for_template(renderer_base $output) {
         return $data;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(single_button::class, \single_button::class);
diff --git a/lib/classes/output/single_select.php b/lib/classes/output/single_select.php
index 4645e7bd8b79d..6e7954eab42d5 100644
--- a/lib/classes/output/single_select.php
+++ b/lib/classes/output/single_select.php
@@ -14,6 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use core\exception\coding_exception;
+use core\output\actions\component_action;
+use moodle_url;
+use stdClass;
+
 /**
  * Simple form with just one select field that gets submitted automatically.
  *
@@ -287,3 +294,8 @@ public function export_for_template(renderer_base $output) {
         return $data;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(single_select::class, \single_select::class);
diff --git a/lib/classes/output/sticky_footer.php b/lib/classes/output/sticky_footer.php
index a007c2b060ee1..fdb88d5725109 100644
--- a/lib/classes/output/sticky_footer.php
+++ b/lib/classes/output/sticky_footer.php
@@ -16,8 +16,6 @@
 
 namespace core\output;
 
-use renderable;
-
 /**
  * Class to render a sticky footer element.
  *
diff --git a/lib/classes/output/tabobject.php b/lib/classes/output/tabobject.php
index 305d5b30a7597..7d7fa86583360 100644
--- a/lib/classes/output/tabobject.php
+++ b/lib/classes/output/tabobject.php
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use moodle_url;
+
 /**
  * Stores one tab
  *
@@ -138,3 +142,8 @@ public function export_for_template(renderer_base $output) {
     }
 
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(tabobject::class, \tabobject::class);
diff --git a/lib/classes/output/tabtree.php b/lib/classes/output/tabtree.php
index ca31e32ea7e51..62a58a25694a8 100644
--- a/lib/classes/output/tabtree.php
+++ b/lib/classes/output/tabtree.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
 /**
  * Stores tabs list
  *
@@ -70,7 +72,7 @@ public function __construct($tabs, $selected = null, $inactive = null) {
      * Export for template.
      *
      * @param renderer_base $output Renderer.
-     * @return object
+     * @return \stdClass
      */
     public function export_for_template(renderer_base $output) {
         $tabs = [];
@@ -89,3 +91,8 @@ public function export_for_template(renderer_base $output) {
         ];
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(tabtree::class, \tabtree::class);
diff --git a/lib/classes/output/templatable.php b/lib/classes/output/templatable.php
index 8a05b61e43e89..007335e697f32 100644
--- a/lib/classes/output/templatable.php
+++ b/lib/classes/output/templatable.php
@@ -14,16 +14,18 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
 /**
  * Interface marking other classes having the ability to export their data for use by templates.
  *
  * @copyright 2015 Damyon Wiese
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @package core
  * @category output
  * @since 2.9
  */
 interface templatable {
-
     /**
      * Function to export the renderer data in a format that is suitable for a
      * mustache template. This means:
@@ -31,7 +33,12 @@ interface templatable {
      * 2. Any additional info that is required for the template is pre-calculated (e.g. capability checks).
      *
      * @param renderer_base $output Used to do a final render of any components that need to be rendered for export.
-     * @return stdClass|array
+     * @return \stdClass|array
      */
     public function export_for_template(renderer_base $output);
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(templatable::class, \templatable::class);
diff --git a/lib/classes/output/theme_config.php b/lib/classes/output/theme_config.php
index d162a454fea91..4edc1b6569779 100644
--- a/lib/classes/output/theme_config.php
+++ b/lib/classes/output/theme_config.php
@@ -14,6 +14,25 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use cache;
+use cache_store;
+use core_component;
+use core_cssparser;
+use core_minify;
+use core_php_time_limit;
+use core_rtlcss;
+use core_scss;
+use core_useragent;
+use core\context\system as context_system;
+use core\exception\coding_exception;
+use core\output\renderer_factory\standard_renderer_factory;
+use dml_exception;
+use moodle_page;
+use moodle_url;
+use stdClass;
+
 /**
  * This class represents the configuration variables of a Moodle theme.
  *
@@ -172,7 +191,7 @@ class theme_config {
      *      your own custom renderers in a lib.php file in this theme (or the parent theme).</li>
      * </ul>
      */
-    public $rendererfactory = 'standard_renderer_factory';
+    public $rendererfactory = standard_renderer_factory::class;
 
     /**
      * @var string Function to do custom CSS post-processing.
@@ -424,23 +443,23 @@ public static function load($themename) {
             $settings = new stdClass();
         }
 
-        if ($config = theme_config::find_theme_config($themename, $settings)) {
-            return new theme_config($config);
+        if ($config = self::find_theme_config($themename, $settings)) {
+            return new self($config);
 
-        } else if ($themename == theme_config::DEFAULT_THEME) {
-            throw new coding_exception('Default theme '.theme_config::DEFAULT_THEME.' not available or broken!');
+        } else if ($themename == self::DEFAULT_THEME) {
+            throw new coding_exception('Default theme '.self::DEFAULT_THEME.' not available or broken!');
 
-        } else if ($config = theme_config::find_theme_config($CFG->theme, $settings)) {
+        } else if ($config = self::find_theme_config($CFG->theme, $settings)) {
             debugging('This page should be using theme ' . $themename .
                     ' which cannot be initialised. Falling back to the site theme ' . $CFG->theme, DEBUG_NORMAL);
-            return new theme_config($config);
+            return new self($config);
 
         } else {
             // bad luck, the requested theme has some problems - admin see details in theme config
             debugging('This page should be using theme ' . $themename .
                     ' which cannot be initialised. Nor can the site theme ' . $CFG->theme .
-                    '. Falling back to ' . theme_config::DEFAULT_THEME, DEBUG_NORMAL);
-            return new theme_config(theme_config::find_theme_config(theme_config::DEFAULT_THEME, $settings));
+                    '. Falling back to ' . self::DEFAULT_THEME, DEBUG_NORMAL);
+            return new self(self::find_theme_config(self::DEFAULT_THEME, $settings));
         }
     }
 
@@ -496,7 +515,7 @@ private function __construct($config) {
 
         // verify all parents and load configs and renderers
         foreach ($this->parents as $parent) {
-            if (!$parent_config = theme_config::find_theme_config($parent, $this->settings)) {
+            if (!$parent_config = self::find_theme_config($parent, $this->settings)) {
                 // this is not good - better exclude faulty parents
                 continue;
             }
@@ -1286,15 +1305,15 @@ public function get_icon_system() {
 
         // Getting all the candidate functions.
         $system = false;
-        if (isset($this->iconsystem) && \core\output\icon_system::is_valid_system($this->iconsystem)) {
+        if (isset($this->iconsystem) && icon_system::is_valid_system($this->iconsystem)) {
             return $this->iconsystem;
         }
         foreach ($this->parent_configs as $parent_config) {
-            if (isset($parent_config->iconsystem) && \core\output\icon_system::is_valid_system($parent_config->iconsystem)) {
+            if (isset($parent_config->iconsystem) && icon_system::is_valid_system($parent_config->iconsystem)) {
                 return $parent_config->iconsystem;
             }
         }
-        return \core\output\icon_system::STANDARD;
+        return icon_system::STANDARD;
     }
 
     /**
@@ -1386,7 +1405,7 @@ public function get_scss_property() {
                 // We collect the SCSS property until we've found one.
                 if (empty($scss) && !empty($config->scss)) {
                     $candidate = is_string($config->scss) ? "{$path}/{$config->scss}.scss" : $config->scss;
-                    if ($candidate instanceof Closure) {
+                    if ($candidate instanceof \Closure) {
                         $scss = $candidate;
                     } else if (is_string($candidate) && is_readable($candidate)) {
                         $scss = $candidate;
@@ -2060,7 +2079,7 @@ private static function find_theme_config($themename, $settings, $parentscheck =
         // We have to use the variable name $THEME (upper case) because that
         // is what is used in theme config.php files.
 
-        if (!$dir = theme_config::find_theme_location($themename)) {
+        if (!$dir = self::find_theme_location($themename)) {
             return null;
         }
 
@@ -2081,7 +2100,7 @@ private static function find_theme_config($themename, $settings, $parentscheck =
             if ($parentscheck) {
                 // Find all parent theme configs.
                 foreach ($THEME->parents as $parent) {
-                    $parentconfig = theme_config::find_theme_config($parent, $settings, false);
+                    $parentconfig = self::find_theme_config($parent, $settings, false);
                     if (empty($parentconfig)) {
                         return null;
                     }
@@ -2310,3 +2329,7 @@ public function get_css_tree_post_processor() {
     }
 
 }
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(theme_config::class, \theme_config::class);
diff --git a/lib/classes/output/url_select.php b/lib/classes/output/url_select.php
index 9051e83d0a4a3..0f043fa08154c 100644
--- a/lib/classes/output/url_select.php
+++ b/lib/classes/output/url_select.php
@@ -14,6 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use core\exception\coding_exception;
+use moodle_url;
+use stdClass;
+
 /**
  * Simple URL selection widget description.
  *
@@ -280,3 +286,8 @@ public function export_for_template(renderer_base $output) {
         return $data;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(url_select::class, \url_select::class);
diff --git a/lib/classes/output/user_picture.php b/lib/classes/output/user_picture.php
index d278e4d2c10e8..a7947b6430c87 100644
--- a/lib/classes/output/user_picture.php
+++ b/lib/classes/output/user_picture.php
@@ -14,6 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use core\context\user as context_user;
+use moodle_page;
+use moodle_url;
+use stdClass;
+
 /**
  * Data structure representing a user picture.
  *
@@ -33,7 +40,7 @@ class user_picture implements renderable {
     /**
      * @var int The course id. Used when constructing the link to the user's
      * profile, page course id used if not specified.
-     */
+    */
     public $courseid;
 
     /**
@@ -300,3 +307,8 @@ public function get_url(moodle_page $page, renderer_base $renderer = null) {
         return $defaulturl;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(user_picture::class, \user_picture::class);
diff --git a/lib/classes/output/xhtml_container_stack.php b/lib/classes/output/xhtml_container_stack.php
index 193b90ab36b59..64e7192397b65 100644
--- a/lib/classes/output/xhtml_container_stack.php
+++ b/lib/classes/output/xhtml_container_stack.php
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use stdClass;
+
 /**
  * This class keeps track of which HTML tags are currently open.
  *
@@ -62,7 +66,7 @@ public function __construct() {
      * @param string $closehtml The HTML required to close the container.
      */
     public function push($type, $closehtml) {
-        $container = new stdClass;
+        $container = new stdClass();
         $container->type = $type;
         $container->closehtml = $closehtml;
         if ($this->isdebugging) {
@@ -151,3 +155,8 @@ protected function output_log() {
         return '<ul>' . implode("\n", $this->log) . '</ul>';
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(xhtml_container_stack::class, \xhtml_container_stack::class);
diff --git a/lib/pagelib.php b/lib/pagelib.php
index 169e0354a15fa..1c4d00195095f 100644
--- a/lib/pagelib.php
+++ b/lib/pagelib.php
@@ -31,6 +31,7 @@
 use core\navigation\views\secondary;
 use core\navigation\output\primary as primaryoutput;
 use core\output\activity_header;
+use core\output\xhtml_container_stack;
 
 /**
  * $PAGE is a central store of information about the current page we are
diff --git a/lib/table/classes/base_export_format.php b/lib/table/classes/base_export_format.php
index 40abfc8b22f41..22b29fd89dbf1 100644
--- a/lib/table/classes/base_export_format.php
+++ b/lib/table/classes/base_export_format.php
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core_table;
+
+use flexible_table;
+
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
@@ -21,11 +25,13 @@
 require_once("{$CFG->libdir}/tablelib.php");
 
 /**
+ * The table base export format.
+ *
  * @package   moodlecore
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class table_default_export_format_parent {
+class base_export_format {
     /**
      * @var flexible_table or child class reference pointing to table class
      * object from which to export data.
@@ -93,3 +99,8 @@ public function format_data(array $row): array {
         return array_map([$this, 'format_text'], $row);
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(base_export_format::class, \table_default_export_format_parent::class);
diff --git a/lib/table/classes/dataformat_export_format.php b/lib/table/classes/dataformat_export_format.php
index aca76e0734240..4d2922728cfd7 100644
--- a/lib/table/classes/dataformat_export_format.php
+++ b/lib/table/classes/dataformat_export_format.php
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core_table;
+
+use core\exception\coding_exception;
+
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
@@ -30,8 +34,7 @@
  * @copyright  2016 Brendan Heywood (brendan@catalyst-au.net)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class table_dataformat_export_format extends table_default_export_format_parent {
-
+class dataformat_export_format extends base_export_format {
     /** @var \core\dataformat\base $dataformat */
     protected $dataformat;
 
@@ -146,3 +149,8 @@ public function finish_document() {
         exit();
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(dataformat_export_format::class, \table_dataformat_export_format::class);
diff --git a/lib/table/classes/flexible_table.php b/lib/table/classes/flexible_table.php
index cf683e4702323..3950b5770ce97 100644
--- a/lib/table/classes/flexible_table.php
+++ b/lib/table/classes/flexible_table.php
@@ -14,7 +14,16 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core_table;
+
+use core\context;
 use core_table\local\filter\filterset;
+use core\exception\coding_exception;
+use core\output\renderable;
+use html_writer;
+use moodle_url;
+use paging_bar;
+use stdClass;
 
 defined('MOODLE_INTERNAL') || die();
 
@@ -128,7 +137,7 @@ class flexible_table {
      */
     var $started_output = false;
 
-    /** @var table_dataformat_export_format */
+    /** @var dataformat_export_format */
     var $exportclass = null;
 
     /**
@@ -209,8 +218,8 @@ function is_downloading($download = null, $filename='', $sheettitle='') {
 
     /**
      * Get, and optionally set, the export class.
-     * @param table_dataformat_export_format $exportclass (optional) if passed, set the table to use this export class.
-     * @return table_dataformat_export_format the export class in use (after any set).
+     * @param dataformat_export_format $exportclass (optional) if passed, set the table to use this export class.
+     * @return dataformat_export_format the export class in use (after any set).
      */
     function export_class_instance($exportclass = null) {
         if (!is_null($exportclass)) {
@@ -218,7 +227,7 @@ function export_class_instance($exportclass = null) {
             $this->exportclass = $exportclass;
             $this->exportclass->table = $this;
         } else if (is_null($this->exportclass) && !empty($this->download)) {
-            $this->exportclass = new table_dataformat_export_format($this, $this->download);
+            $this->exportclass = new dataformat_export_format($this, $this->download);
             if (!$this->exportclass->document_started()) {
                 $this->exportclass->start_document($this->filename, $this->sheettitle);
             }
@@ -1735,7 +1744,7 @@ protected function get_handler() {
      * @return string
      */
     protected function get_dynamic_table_html_start(): string {
-        if (is_a($this, \core_table\dynamic::class)) {
+        if (is_a($this, dynamic::class)) {
             $sortdata = array_map(function($sortby, $sortorder) {
                 return [
                     'sortby' => $sortby,
@@ -1773,7 +1782,7 @@ protected function get_dynamic_table_html_start(): string {
     protected function get_dynamic_table_html_end(): string {
         global $PAGE;
 
-        if (is_a($this, \core_table\dynamic::class)) {
+        if (is_a($this, dynamic::class)) {
             $output = '';
 
             $perpageurl = new moodle_url($PAGE->url);
@@ -1948,7 +1957,7 @@ protected function can_be_reset() {
     public function get_context(): context {
         global $PAGE;
 
-        if (is_a($this, \core_table\dynamic::class)) {
+        if (is_a($this, dynamic::class)) {
             throw new coding_exception('The get_context function must be defined for a dynamic table');
         }
 
@@ -1990,8 +1999,12 @@ public static function get_filterset_class(): string {
      * Attempt to guess the base URL.
      */
     public function guess_base_url(): void {
-        if (is_a($this, \core_table\dynamic::class)) {
+        if (is_a($this, dynamic::class)) {
             throw new coding_exception('The guess_base_url function must be defined for a dynamic table');
         }
     }
 }
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(flexible_table::class, \flexible_table::class);
diff --git a/lib/table/classes/output/html_table.php b/lib/table/classes/output/html_table.php
index 86cc3a3b4e2b5..c04ef01bc7e8b 100644
--- a/lib/table/classes/output/html_table.php
+++ b/lib/table/classes/output/html_table.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core_table\output;
+
 /**
  * Holds all the information required to render a <table> by {@link core_renderer::table()}
  *
@@ -205,3 +207,8 @@ public function __construct() {
         $this->attributes['class'] = '';
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(html_table::class, \html_table::class);
diff --git a/lib/table/classes/output/html_table_cell.php b/lib/table/classes/output/html_table_cell.php
index bc4c8ab31fb58..038fb27ad5083 100644
--- a/lib/table/classes/output/html_table_cell.php
+++ b/lib/table/classes/output/html_table_cell.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core_table\output;
+
 /**
  * Component representing a table cell.
  *
@@ -24,7 +26,6 @@
  * @category output
  */
 class html_table_cell {
-
     /**
      * @var string Value to use for the id attribute of the cell.
      */
@@ -80,3 +81,8 @@ public function __construct($text = null) {
         $this->attributes['class'] = '';
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(html_table_cell::class, \html_table_cell::class);
diff --git a/lib/table/classes/output/html_table_row.php b/lib/table/classes/output/html_table_row.php
index 8a0a366bd17ff..6b92c0a5486ec 100644
--- a/lib/table/classes/output/html_table_row.php
+++ b/lib/table/classes/output/html_table_row.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core_table\output;
+
 /**
  * Component representing a table row.
  *
@@ -24,7 +26,6 @@
  * @category output
  */
 class html_table_row {
-
     /**
      * @var string Value to use for the id attribute of the row.
      */
@@ -61,3 +62,8 @@ public function __construct(array $cells=null) {
         }
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(html_table_row::class, \html_table_row::class);
diff --git a/lib/table/classes/sql_table.php b/lib/table/classes/sql_table.php
index 21771010c68ed..00e26153535db 100644
--- a/lib/table/classes/sql_table.php
+++ b/lib/table/classes/sql_table.php
@@ -14,6 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core_table;
+
+use flexible_table;
+use moodle_recordset;
+use stdClass;
+
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
@@ -27,8 +33,7 @@
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class table_sql extends flexible_table {
-
+class sql_table extends flexible_table {
     public $countsql = NULL;
     public $countparams = NULL;
     /**
@@ -203,3 +208,8 @@ function out($pagesize, $useinitialsbar, $downloadhelpbutton='') {
         $this->finish_output();
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(sql_table::class, \table_sql::class);
diff --git a/lib/tests/tablelib_test.php b/lib/table/tests/tablelib_test.php
similarity index 99%
rename from lib/tests/tablelib_test.php
rename to lib/table/tests/tablelib_test.php
index 1325a5dc5d2c4..922a341ec0707 100644
--- a/lib/tests/tablelib_test.php
+++ b/lib/table/tests/tablelib_test.php
@@ -14,9 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace core;
+namespace core_table;
 
-use flexible_table;
 use testable_flexible_table;
 
 defined('MOODLE_INTERNAL') || die();
@@ -28,7 +27,7 @@
 /**
  * Test some of tablelib.
  *
- * @package    core
+ * @package    core_table
  * @category   test
  * @copyright  2013 Damyon Wiese <damyon@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/tests/xhtml_container_stack_test.php b/lib/tests/output/xhtml_container_stack_test.php
similarity index 95%
rename from lib/tests/xhtml_container_stack_test.php
rename to lib/tests/output/xhtml_container_stack_test.php
index 4827ba3440728..756674af76356 100644
--- a/lib/tests/xhtml_container_stack_test.php
+++ b/lib/tests/output/xhtml_container_stack_test.php
@@ -14,14 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace core;
-
-use xhtml_container_stack;
-
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-require_once($CFG->libdir . '/outputlib.php');
+namespace core\output;
 
 /**
  * Unit tests for the xhtml_container_stack class.
@@ -32,8 +25,9 @@
  * @category  test
  * @copyright 2009 Tim Hunt
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \core\output\xhtml_container_stacks
  */
-class xhtml_container_stack_test extends \advanced_testcase {
+final class xhtml_container_stack_test extends \advanced_testcase {
     public function test_push_then_pop(): void {
         // Set up.
         $stack = new xhtml_container_stack();
diff --git a/lib/tests/outputcomponents_test.php b/lib/tests/outputcomponents_test.php
index 444351e9f7917..15af70b24c973 100644
--- a/lib/tests/outputcomponents_test.php
+++ b/lib/tests/outputcomponents_test.php
@@ -25,7 +25,7 @@
 use single_select;
 use theme_config;
 use url_select;
-use user_picture;
+use core\output\user_picture;
 
 /**
  * Unit tests for lib/outputcomponents.php.

From 9043dc75bfc2e6e54ada663774a63d563f6590a4 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 13 Jun 2024 17:06:56 +0800
Subject: [PATCH 066/119] MDL-82183 core: Coding style fixes for core\output

---
 blocks/classes/output/block_contents.php      |  23 +-
 blocks/classes/output/block_move_target.php   |   2 +-
 lib/classes/output/action_link.php            |  22 +-
 lib/classes/output/action_menu.php            |  81 +-
 lib/classes/output/action_menu/link.php       |   9 +-
 .../output/action_menu/link_primary.php       |   2 +-
 .../output/action_menu/link_secondary.php     |   2 +-
 .../output/actions/component_action.php       |   5 +-
 lib/classes/output/actions/confirm_action.php |  14 +-
 lib/classes/output/actions/popup_action.php   |  43 +-
 lib/classes/output/activity_header.php        |   6 +-
 lib/classes/output/choicelist.php             |   6 +-
 lib/classes/output/chooser.php                |   6 +-
 lib/classes/output/chooser_item.php           |  13 +-
 lib/classes/output/chooser_section.php        |   4 +-
 lib/classes/output/comboboxsearch.php         |  14 +-
 lib/classes/output/context_header.php         |  27 +-
 lib/classes/output/core_renderer.php          | 767 ++++++++++--------
 lib/classes/output/core_renderer_ajax.php     |  25 +-
 lib/classes/output/core_renderer_cli.php      |  12 +-
 .../output/core_renderer_maintenance.php      |  22 +-
 lib/classes/output/custom_menu.php            |   6 +-
 lib/classes/output/custom_menu_item.php       |  54 +-
 lib/classes/output/datafilter.php             |   3 +-
 lib/classes/output/dynamic_tabs.php           |   3 +-
 lib/classes/output/dynamic_tabs/base.php      |   1 -
 lib/classes/output/external.php               |  43 +-
 lib/classes/output/file_picker.php            |  30 +-
 lib/classes/output/help_icon.php              |   4 +-
 lib/classes/output/html_writer.php            | 246 +++---
 lib/classes/output/icon_system_font.php       |   4 -
 .../output/icon_system_fontawesome.php        |   8 +-
 lib/classes/output/icon_system_standard.php   |   3 +-
 lib/classes/output/initials_bar.php           |   4 +-
 lib/classes/output/inplace_editable.php       |  30 +-
 lib/classes/output/js_writer.php              |  28 +-
 lib/classes/output/language_menu.php          |   4 +-
 .../output/local/action_menu/subpanel.php     |   2 +-
 lib/classes/output/local/dropdown/status.php  |   1 -
 .../output/mustache_clean_string_helper.php   |   1 -
 lib/classes/output/mustache_engine.php        |   5 +-
 .../output/mustache_filesystem_loader.php     |   5 +-
 .../output/mustache_helper_collection.php     |  11 +-
 .../output/mustache_javascript_helper.php     |   1 -
 lib/classes/output/mustache_quote_helper.php  |   1 -
 .../output/mustache_shorten_text_helper.php   |   3 +-
 lib/classes/output/mustache_string_helper.php |   2 +-
 .../output/mustache_template_finder.php       |   7 +-
 .../mustache_template_source_loader.php       |  37 +-
 lib/classes/output/mustache_uniqid_helper.php |   1 -
 .../output/mustache_user_date_helper.php      |   3 +-
 lib/classes/output/notification.php           |  14 +-
 lib/classes/output/paging_bar.php             |  46 +-
 .../output/participants_action_bar.php        |  20 +-
 lib/classes/output/pix_emoticon.php           |   2 +-
 lib/classes/output/pix_icon.php               |  26 +-
 lib/classes/output/pix_icon_font.php          |   6 +-
 lib/classes/output/plugin_renderer_base.php   |   8 +-
 lib/classes/output/progress_bar.php           |  32 +-
 lib/classes/output/renderable.php             |   3 +-
 lib/classes/output/renderer_base.php          |  49 +-
 .../renderer_factory_base.php                 |  81 +-
 .../renderer_factory_interface.php            |   4 +-
 .../standard_renderer_factory.php             |   2 +-
 .../theme_overridden_renderer_factory.php     |   4 +-
 .../fragment_requirements_manager.php         |   5 +-
 .../page_requirements_manager.php             | 459 ++++++-----
 lib/classes/output/requirements/yui.php       |  77 +-
 lib/classes/output/select_menu.php            |   2 +-
 lib/classes/output/single_button.php          |  15 +-
 lib/classes/output/single_select.php          |  49 +-
 lib/classes/output/sticky_footer.php          |   1 -
 lib/classes/output/tabobject.php              |  22 +-
 lib/classes/output/tabtree.php                |   2 +-
 lib/classes/output/theme_config.php           | 365 +++++----
 lib/classes/output/theme_usage.php            |   3 -
 lib/classes/output/url_rewriter.php           |   6 -
 lib/classes/output/url_select.php             |  36 +-
 lib/classes/output/user_picture.php           |  98 ++-
 lib/classes/output/xhtml_container_stack.php  |   8 +-
 lib/outputactions.php                         |   2 +
 lib/outputcomponents.php                      |   2 +
 lib/outputfactories.php                       |   2 +
 lib/outputfragmentrequirementslib.php         |   4 +-
 lib/outputlib.php                             |  23 +-
 lib/outputrenderers.php                       |   2 +
 lib/outputrequirementslib.php                 |   2 +
 lib/table/classes/base_export_format.php      |  46 +-
 .../classes/dataformat_export_format.php      |   2 +-
 lib/table/classes/flexible_table.php          | 430 +++++-----
 lib/table/classes/output/html_table.php       |  17 +-
 lib/table/classes/output/html_table_cell.php  |   4 +-
 lib/table/classes/output/html_table_row.php   |  11 +-
 lib/table/classes/sql_table.php               |  99 ++-
 lib/tests/{ => output}/html_writer_test.php   | 199 +++--
 95 files changed, 2184 insertions(+), 1762 deletions(-)
 rename lib/tests/{ => output}/html_writer_test.php (56%)

diff --git a/blocks/classes/output/block_contents.php b/blocks/classes/output/block_contents.php
index aeb1297110204..6d8f7850e4c24 100644
--- a/blocks/classes/output/block_contents.php
+++ b/blocks/classes/output/block_contents.php
@@ -30,7 +30,7 @@
  * @copyright 2009 Tim Hunt
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since Moodle 2.0
- * @package core
+ * @package core_block
  * @category output
  */
 class block_contents {
@@ -51,7 +51,7 @@ class block_contents {
     /**
      * @var int All the blocks (or things that look like blocks) printed on
      * a page are given a unique number that can be used to construct id="" attributes.
-     * This is set automatically be the {@link prepare()} method.
+     * This is set automatically be the {@see prepare()} method.
      * Do not try to set it manually.
      */
     public $skipid;
@@ -71,7 +71,7 @@ class block_contents {
 
     /**
      * @var array An array of attribute => value pairs that are put on the outer div of this
-     * block. {@link $id} and {@link $classes} attributes should be set separately.
+     * block. {@see $id} and {@see $classes} attributes should be set separately.
      */
     public $attributes;
 
@@ -122,23 +122,24 @@ class block_contents {
      * this array should be an array('url' => $url, 'icon' => $icon, 'caption' => $caption).
      * $icon is the icon name. Fed to $OUTPUT->image_url.
      */
-    public $controls = array();
+    public $controls = [];
 
 
     /**
-     * Create new instance of block content
-     * @param array $attributes
+     * Create new instance of block content.
+     *
+     * @param null|array $attributes
      */
-    public function __construct(array $attributes = null) {
+    public function __construct(?array $attributes = null) {
         $this->skipid = self::$idcounter;
         self::$idcounter += 1;
 
         if ($attributes) {
-            // standard block
+            // Standard block.
             $this->attributes = $attributes;
         } else {
-            // simple "fake" blocks used in some modules and "Add new block" block
-            $this->attributes = array('class'=>'block');
+            // Simple "fake" blocks used in some modules and "Add new block" block.
+            $this->attributes = ['class' => 'block'];
         }
     }
 
@@ -148,7 +149,7 @@ public function __construct(array $attributes = null) {
      * @param string $class
      */
     public function add_class($class) {
-        $this->attributes['class'] .= ' '.$class;
+        $this->attributes['class'] .= ' ' . $class;
     }
 
     /**
diff --git a/blocks/classes/output/block_move_target.php b/blocks/classes/output/block_move_target.php
index d698ac21c7d09..d305a901daa04 100644
--- a/blocks/classes/output/block_move_target.php
+++ b/blocks/classes/output/block_move_target.php
@@ -28,7 +28,7 @@
  * @copyright 2009 Tim Hunt
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since Moodle 2.0
- * @package core
+ * @package core_block
  * @category output
  */
 class block_move_target {
diff --git a/lib/classes/output/action_link.php b/lib/classes/output/action_link.php
index bb094108d0509..c34d69ef17a8e 100644
--- a/lib/classes/output/action_link.php
+++ b/lib/classes/output/action_link.php
@@ -59,15 +59,17 @@ class action_link implements renderable {
      * Constructor
      * @param moodle_url $url
      * @param string $text HTML fragment
-     * @param component_action $action
-     * @param array $attributes associative array of html link attributes + disabled
-     * @param pix_icon $icon optional pix_icon to render with the link text
+     * @param null|component_action $action
+     * @param null|array $attributes associative array of html link attributes + disabled
+     * @param null|pix_icon $icon optional pix_icon to render with the link text
      */
-    public function __construct(moodle_url $url,
+    public function __construct(
+        moodle_url $url,
         $text,
-        component_action $action=null,
-        array $attributes=null,
-        pix_icon $icon=null) {
+        ?component_action $action = null,
+        ?array $attributes = null,
+        ?pix_icon $icon = null
+    ) {
         $this->url = clone($url);
         $this->text = $text;
         if (empty($attributes['id'])) {
@@ -144,14 +146,14 @@ public function export_for_template(renderer_base $output) {
         $data->classes = isset($attributes['class']) ? $attributes['class'] : '';
         unset($attributes['class']);
 
-        $data->attributes = array_map(function($key, $value) {
+        $data->attributes = array_map(function ($key, $value) {
             return [
                 'name' => $key,
-                'value' => $value
+                'value' => $value,
             ];
         }, array_keys($attributes), $attributes);
 
-        $data->actions = array_map(function($action) use ($output) {
+        $data->actions = array_map(function ($action) use ($output) {
             return $action->export_for_template($output);
         }, !empty($this->actions) ? $this->actions : []);
         $data->hasactions = !empty($this->actions);
diff --git a/lib/classes/output/action_menu.php b/lib/classes/output/action_menu.php
index 1bbdeb22cc2dc..588753e652e4f 100644
--- a/lib/classes/output/action_menu.php
+++ b/lib/classes/output/action_menu.php
@@ -64,35 +64,35 @@ class action_menu implements renderable, templatable {
     protected $instance = 0;
 
     /**
-     * An array of primary actions. Please use {@link action_menu::add_primary_action()} to add actions.
+     * An array of primary actions. Please use {@see action_menu::add_primary_action()} to add actions.
      * @var array
      */
-    protected $primaryactions = array();
+    protected $primaryactions = [];
 
     /**
-     * An array of secondary actions. Please use {@link action_menu::add_secondary_action()} to add actions.
+     * An array of secondary actions. Please use {@see action_menu::add_secondary_action()} to add actions.
      * @var array
      */
-    protected $secondaryactions = array();
+    protected $secondaryactions = [];
 
     /**
      * An array of attributes added to the container of the action menu.
      * Initialised with defaults during construction.
      * @var array
      */
-    public $attributes = array();
+    public $attributes = [];
     /**
      * An array of attributes added to the container of the primary actions.
      * Initialised with defaults during construction.
      * @var array
      */
-    public $attributesprimary = array();
+    public $attributesprimary = [];
     /**
      * An array of attributes added to the container of the secondary actions.
      * Initialised with defaults during construction.
      * @var array
      */
-    public $attributessecondary = array();
+    public $attributessecondary = [];
 
     /**
      * The string to use next to the icon for the action icon relating to the secondary (dropdown) menu.
@@ -147,27 +147,27 @@ class action_menu implements renderable, templatable {
      *
      * @param array $actions An array of actions (action_menu_link|pix_icon|string).
      */
-    public function __construct(array $actions = array()) {
+    public function __construct(array $actions = []) {
         static $initialised = 0;
         $this->instance = $initialised;
         $initialised++;
 
-        $this->attributes = array(
-            'id' => 'action-menu-'.$this->instance,
+        $this->attributes = [
+            'id' => 'action-menu-' . $this->instance,
             'class' => 'moodle-actionmenu',
-            'data-enhance' => 'moodle-core-actionmenu'
-        );
-        $this->attributesprimary = array(
-            'id' => 'action-menu-'.$this->instance.'-menubar',
+            'data-enhance' => 'moodle-core-actionmenu',
+        ];
+        $this->attributesprimary = [
+            'id' => 'action-menu-' . $this->instance . '-menubar',
             'class' => 'menubar',
-        );
-        $this->attributessecondary = array(
-            'id' => 'action-menu-'.$this->instance.'-menu',
+        ];
+        $this->attributessecondary = [
+            'id' => 'action-menu-' . $this->instance . '-menu',
             'class' => 'menu',
             'data-rel' => 'menu-content',
-            'aria-labelledby' => 'action-menu-toggle-'.$this->instance,
-            'role' => 'menu'
-        );
+            'aria-labelledby' => 'action-menu-toggle-' . $this->instance,
+            'role' => 'menu',
+        ];
         $this->dropdownalignment = 'dropdown-menu-right';
         foreach ($actions as $action) {
             $this->add($action);
@@ -207,8 +207,11 @@ public function set_menu_trigger($trigger, $extraclasses = '') {
      * @param string|null $extraclasses extra classes for the trigger {@see self::set_menu_trigger()}
      * @throws coding_exception
      */
-    public function set_kebab_trigger(?string $triggername = null, ?core_renderer $output = null,
-        ?string $extraclasses = '') {
+    public function set_kebab_trigger(
+        ?string $triggername = null,
+        ?core_renderer $output = null,
+        ?string $extraclasses = ''
+    ) {
         global $OUTPUT;
         if (empty($output)) {
             $output = $OUTPUT;
@@ -307,16 +310,16 @@ public function add_secondary_action($action) {
     /**
      * Returns the primary actions ready to be rendered.
      *
-     * @param core_renderer $output The renderer to use for getting icons.
+     * @param null|core_renderer $output The renderer to use for getting icons.
      * @return array
      */
-    public function get_primary_actions(core_renderer $output = null) {
+    public function get_primary_actions(?core_renderer $output = null) {
         global $OUTPUT;
         if ($output === null) {
             $output = $OUTPUT;
         }
         $pixicon = $this->actionicon;
-        $linkclasses = array('toggle-display');
+        $linkclasses = ['toggle-display'];
 
         $title = '';
         if (!empty($this->menutrigger)) {
@@ -328,7 +331,7 @@ public function get_primary_actions(core_renderer $output = null) {
                 't/edit_menu',
                 '',
                 'moodle',
-                array('class' => 'iconsmall actionmenu', 'title' => '')
+                ['class' => 'iconsmall actionmenu', 'title' => '']
             );
             $pixicon = $this->actionicon;
         }
@@ -349,14 +352,14 @@ public function get_primary_actions(core_renderer $output = null) {
             $label = $title;
         }
         $actions = $this->primaryactions;
-        $attributes = array(
+        $attributes = [
             'class' => implode(' ', $linkclasses),
             'title' => $title,
             'aria-label' => $label,
-            'id' => 'action-menu-toggle-'.$this->instance,
+            'id' => 'action-menu-toggle-' . $this->instance,
             'role' => 'menuitem',
             'tabindex' => '-1',
-        );
+        ];
         $link = html_writer::link('#', $string . $this->menutrigger . $pixicon, $attributes);
         if ($this->prioritise) {
             array_unshift($actions, $link);
@@ -395,12 +398,12 @@ public function set_alignment($dialogue, $button) {
         if (isset($this->attributessecondary['data-align'])) {
             // We've already got one set, lets remove the old class so as to avoid troubles.
             $class = $this->attributessecondary['class'];
-            $search = 'align-'.$this->attributessecondary['data-align'];
+            $search = 'align-' . $this->attributessecondary['data-align'];
             $this->attributessecondary['class'] = str_replace($search, '', $class);
         }
         $align = $this->get_align_string($dialogue) . '-' . $this->get_align_string($button);
         $this->attributessecondary['data-align'] = $align;
-        $this->attributessecondary['class'] .= ' align-'.$align;
+        $this->attributessecondary['class'] .= ' align-' . $align;
     }
 
     /**
@@ -411,15 +414,15 @@ public function set_alignment($dialogue, $button) {
      */
     protected function get_align_string($align) {
         switch ($align) {
-            case self::TL :
+            case self::TL:
                 return 'tl';
-            case self::TR :
+            case self::TR:
                 return 'tr';
-            case self::BL :
+            case self::BL:
                 return 'bl';
-            case self::BR :
+            case self::BR:
                 return 'br';
-            default :
+            default:
                 return 'tl';
         }
     }
@@ -502,7 +505,7 @@ public function set_nowrap_on_items($value = true) {
             $pos = strpos($this->attributes['class'], $class);
             if ($value === true && $pos === false) {
                 // The value is true and the class has not been set yet. Add it.
-                $this->attributes['class'] .= ' '.$class;
+                $this->attributes['class'] .= ' ' . $class;
             } else if ($value === false && $pos !== false) {
                 // The value is false and the class has been set. Remove it.
                 $this->attributes['class'] = substr($this->attributes['class'], $pos, strlen($class));
@@ -520,7 +523,7 @@ public function set_nowrap_on_items($value = true) {
      */
     public function set_additional_classes(string $class = '') {
         if (!empty($this->attributes['class'])) {
-            $this->attributes['class'] .= " ".$class;
+            $this->attributes['class'] .= " " . $class;
         } else {
             $this->attributes['class'] = $class;
         }
@@ -547,7 +550,7 @@ public function export_for_template(renderer_base $output) {
         $data->classes = isset($attributes['class']) ? $attributes['class'] : '';
         unset($attributes['class']);
 
-        $data->attributes = array_map(function($key, $value) {
+        $data->attributes = array_map(function ($key, $value) {
             return [ 'name' => $key, 'value' => $value ];
         }, array_keys($attributes), $attributes);
 
diff --git a/lib/classes/output/action_menu/link.php b/lib/classes/output/action_menu/link.php
index af440be5ec384..ea6b2da25f2f9 100644
--- a/lib/classes/output/action_menu/link.php
+++ b/lib/classes/output/action_menu/link.php
@@ -33,7 +33,6 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class link extends action_link implements renderable {
-
     /**
      * True if this is a primary action. False if not.
      * @var bool
@@ -49,8 +48,8 @@ class link extends action_link implements renderable {
     /**
      * The number of instances of this action menu link (and its subclasses).
      *
-     * @deprecated since Moodle 4.4.
      * @var int
+     * @deprecated since Moodle 4.4.
      */
     protected static $instance = 1;
 
@@ -63,7 +62,7 @@ class link extends action_link implements renderable {
      * @param bool $primary Whether this is a primary action or not.
      * @param array $attributes Any attribtues associated with the action.
      */
-    public function __construct(moodle_url $url, ?pix_icon $icon, $text, $primary = true, array $attributes = array()) {
+    public function __construct(moodle_url $url, ?pix_icon $icon, $text, $primary = true, array $attributes = []) {
         parent::__construct($url, $text, null, $attributes, $icon);
         $this->primary = (bool)$primary;
         $this->add_class('menu-action');
@@ -104,10 +103,10 @@ public function export_for_template(renderer_base $output) {
         $data->disabled = !empty($attributes['disabled']);
         unset($attributes['disabled']);
 
-        $data->attributes = array_map(function($key, $value) {
+        $data->attributes = array_map(function ($key, $value) {
             return [
                 'name' => $key,
-                'value' => $value
+                'value' => $value,
             ];
         }, array_keys($attributes), $attributes);
 
diff --git a/lib/classes/output/action_menu/link_primary.php b/lib/classes/output/action_menu/link_primary.php
index 3a251d9302368..c7d314b98ce24 100644
--- a/lib/classes/output/action_menu/link_primary.php
+++ b/lib/classes/output/action_menu/link_primary.php
@@ -36,7 +36,7 @@ class link_primary extends link {
      * @param string $text
      * @param array $attributes
      */
-    public function __construct(moodle_url $url, ?pix_icon $icon, $text, array $attributes = array()) {
+    public function __construct(moodle_url $url, ?pix_icon $icon, $text, array $attributes = []) {
         parent::__construct($url, $icon, $text, true, $attributes);
     }
 }
diff --git a/lib/classes/output/action_menu/link_secondary.php b/lib/classes/output/action_menu/link_secondary.php
index 5f71598ac1590..dac7767f2ef58 100644
--- a/lib/classes/output/action_menu/link_secondary.php
+++ b/lib/classes/output/action_menu/link_secondary.php
@@ -36,7 +36,7 @@ class link_secondary extends link {
      * @param string $text
      * @param array $attributes
      */
-    public function __construct(moodle_url $url, ?pix_icon $icon, $text, array $attributes = array()) {
+    public function __construct(moodle_url $url, ?pix_icon $icon, $text, array $attributes = []) {
         parent::__construct($url, $icon, $text, false, $attributes);
     }
 }
diff --git a/lib/classes/output/actions/component_action.php b/lib/classes/output/actions/component_action.php
index 39b73c218f6ed..e8af7e60dbfc2 100644
--- a/lib/classes/output/actions/component_action.php
+++ b/lib/classes/output/actions/component_action.php
@@ -31,7 +31,6 @@
  * @category output
  */
 class component_action implements templatable {
-
     /**
      * @var string $event The DOM event that will trigger this action when caught
      */
@@ -48,7 +47,7 @@ class component_action implements templatable {
     /**
      * @var array An array of arguments to pass to the JS function
      */
-    public $jsfunctionargs = array();
+    public $jsfunctionargs = [];
 
     /**
      * Constructor
@@ -56,7 +55,7 @@ class component_action implements templatable {
      * @param string $jsfunction An optional JS function. Required if jsfunctionargs is given
      * @param array $jsfunctionargs An array of arguments to pass to the jsfunction
      */
-    public function __construct($event, $jsfunction, $jsfunctionargs=array()) {
+    public function __construct($event, $jsfunction, $jsfunctionargs = []) {
         $this->event = $event;
 
         $this->jsfunction = $jsfunction;
diff --git a/lib/classes/output/actions/confirm_action.php b/lib/classes/output/actions/confirm_action.php
index e49d80b3963f4..f18ce1c1fbdcc 100644
--- a/lib/classes/output/actions/confirm_action.php
+++ b/lib/classes/output/actions/confirm_action.php
@@ -37,14 +37,18 @@ class confirm_action extends component_action {
      */
     public function __construct($message, $callback = null, $continuelabel = null, $cancellabel = null) {
         if ($callback !== null) {
-            debugging('The callback argument to new confirm_action() has been deprecated.' .
+            debugging(
+                'The callback argument to new confirm_action() has been deprecated.' .
                     ' If you need to use a callback, please write Javascript to use moodle-core-notification-confirmation ' .
                     'and attach to the provided events.',
-                    DEBUG_DEVELOPER);
+                DEBUG_DEVELOPER,
+            );
         }
-        parent::__construct('click', 'M.util.show_confirm_dialog', array(
-                'message' => $message,
-                'continuelabel' => $continuelabel, 'cancellabel' => $cancellabel));
+        parent::__construct('click', 'M.util.show_confirm_dialog', [
+            'message' => $message,
+            'continuelabel' => $continuelabel,
+            'cancellabel' => $cancellabel,
+        ]);
     }
 }
 
diff --git a/lib/classes/output/actions/popup_action.php b/lib/classes/output/actions/popup_action.php
index bf1d20af3a655..9dcd3291f0a98 100644
--- a/lib/classes/output/actions/popup_action.php
+++ b/lib/classes/output/actions/popup_action.php
@@ -37,20 +37,21 @@ class popup_action extends component_action {
     /**
      * @var array An array of parameters that will be passed to the openpopup JS function
      */
-    public $params = array(
-            'height' =>  400,
-            'width' => 500,
-            'top' => 0,
-            'left' => 0,
-            'menubar' => false,
-            'location' => false,
-            'scrollbars' => true,
-            'resizable' => true,
-            'toolbar' => true,
-            'status' => true,
-            'directories' => false,
-            'fullscreen' => false,
-            'dependent' => true);
+    public $params = [
+        'height' => 400,
+        'width' => 500,
+        'top' => 0,
+        'left' => 0,
+        'menubar' => false,
+        'location' => false,
+        'scrollbars' => true,
+        'resizable' => true,
+        'toolbar' => true,
+        'status' => true,
+        'directories' => false,
+        'fullscreen' => false,
+        'dependent' => true,
+    ];
 
     /**
      * Constructor
@@ -60,18 +61,18 @@ class popup_action extends component_action {
      * @param string $name The JS function to call for the popup (default 'popup')
      * @param array  $params An array of popup parameters
      */
-    public function __construct($event, $url, $name='popup', $params=array()) {
+    public function __construct($event, $url, $name = 'popup', $params = []) {
         global $CFG;
 
         $url = new moodle_url($url);
 
         if ($name) {
-            $_name = $name;
-            if (($_name = preg_replace("/\s/", '_', $_name)) != $name) {
+            $checkname = $name;
+            if (($checkname = preg_replace("/\s/", '_', $checkname)) != $name) {
                 throw new coding_exception(
-                    'The $name of a popup window shouldn\'t contain spaces - string modified. ' . $name . ' changed to ' . $_name,
+                    "The {$name} of a popup window shouldn't contain spaces - string modified. {$name} changed to {$checkname}",
                 );
-                $name = $_name;
+                $name = $checkname;
             }
         } else {
             $name = 'popup';
@@ -83,7 +84,7 @@ public function __construct($event, $url, $name='popup', $params=array()) {
             }
         }
 
-        $attributes = array('url' => $url->out(false), 'name' => $name, 'options' => $this->get_js_options($params));
+        $attributes = ['url' => $url->out(false), 'name' => $name, 'options' => $this->get_js_options($params)];
         if (!empty($params['fullscreen'])) {
             $attributes['fullscreen'] = 1;
         }
@@ -102,7 +103,7 @@ public function get_js_options() {
         foreach ($this->params as $var => $val) {
             if (is_string($val) || is_int($val)) {
                 $jsoptions .= "$var=$val,";
-            } elseif (is_bool($val)) {
+            } else if (is_bool($val)) {
                 $jsoptions .= ($val) ? "$var," : "$var=0,";
             }
         }
diff --git a/lib/classes/output/activity_header.php b/lib/classes/output/activity_header.php
index 10c4b7f0c2431..01bfd47093192 100644
--- a/lib/classes/output/activity_header.php
+++ b/lib/classes/output/activity_header.php
@@ -64,8 +64,10 @@ public function __construct(moodle_page $page, \stdClass $user) {
                 $this->title = format_string($page->activityrecord->name);
             }
 
-            if (empty($layoutoptions['nodescription']) && !empty($page->activityrecord->intro) &&
-                    trim($page->activityrecord->intro)) {
+            if (
+                empty($layoutoptions['nodescription']) && !empty($page->activityrecord->intro) &&
+                    trim($page->activityrecord->intro)
+            ) {
                 $this->description = format_module_intro($this->page->activityname, $page->activityrecord, $page->cm->id);
             }
         }
diff --git a/lib/classes/output/choicelist.php b/lib/classes/output/choicelist.php
index 57d9bdc71eed3..65a47919a541c 100644
--- a/lib/classes/output/choicelist.php
+++ b/lib/classes/output/choicelist.php
@@ -97,13 +97,13 @@ public function count_options(): int {
      * @return \stdClass[]
      */
     public function get_selectable_options(): array {
-        $selectableOptions = [];
+        $selectableoptions = [];
         foreach ($this->options as $option) {
             if ($option['value'] !== $this->selected && !$option['disabled']) {
-                $selectableOptions[] = (object) $option;
+                $selectableoptions[] = (object) $option;
             }
         }
-        return $selectableOptions;
+        return $selectableoptions;
     }
 
     /**
diff --git a/lib/classes/output/chooser.php b/lib/classes/output/chooser.php
index 268e4285c4307..0f7c86df65aa4 100644
--- a/lib/classes/output/chooser.php
+++ b/lib/classes/output/chooser.php
@@ -36,7 +36,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class chooser implements renderable, templatable {
-
     /** @var moodle_url The form action URL. */
     public $actionurl;
     /** @var lang_string The instructions to display. */
@@ -81,7 +80,7 @@ public function add_param($name, $value, $id = null) {
         $this->params[] = [
             'name' => $name,
             'value' => $value,
-            'id' => $id
+            'id' => $id,
         ];
     }
 
@@ -120,11 +119,10 @@ public function export_for_template(renderer_base $output) {
         $data->sesskey = sesskey();
         $data->title = (string) $this->title;
 
-        $data->sections = array_map(function($section) use ($output) {
+        $data->sections = array_map(function ($section) use ($output) {
             return $section->export_for_template($output);
         }, $this->sections);
 
         return $data;
     }
-
 }
diff --git a/lib/classes/output/chooser_item.php b/lib/classes/output/chooser_item.php
index e1a7e99281a0f..c90d6f115b881 100644
--- a/lib/classes/output/chooser_item.php
+++ b/lib/classes/output/chooser_item.php
@@ -36,7 +36,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class chooser_item implements renderable, templatable {
-
     /** @var string An identifier for the item. */
     public $id;
     /** @var string The label of this item. */
@@ -89,11 +88,17 @@ public function export_for_template(renderer_base $output) {
 
         $data->description = '';
         if (!empty($this->description)) {
-            list($data->description) = \core_external\util::format_text((string) $this->description, FORMAT_MARKDOWN,
-                $this->context->id, null, null, null, $options);
+            [$data->description] = \core_external\util::format_text(
+                (string) $this->description,
+                FORMAT_MARKDOWN,
+                $this->context->id,
+                null,
+                null,
+                null,
+                $options
+            );
         }
 
         return $data;
     }
-
 }
diff --git a/lib/classes/output/chooser_section.php b/lib/classes/output/chooser_section.php
index ed071058cc0fd..b4e85d245812b 100644
--- a/lib/classes/output/chooser_section.php
+++ b/lib/classes/output/chooser_section.php
@@ -35,7 +35,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class chooser_section implements renderable, templatable {
-
     /** @var string $id An identifier for the section. */
     public $id;
     /** @var lang_string $label The label of the section. */
@@ -66,10 +65,9 @@ public function export_for_template(renderer_base $output) {
         $data = new stdClass();
         $data->id = $this->id;
         $data->label = (string) $this->label;
-        $data->items = array_map(function($item) use ($output) {
+        $data->items = array_map(function ($item) use ($output) {
             return $item->export_for_template($output);
         }, array_values($this->items));
         return $data;
     }
-
 }
diff --git a/lib/classes/output/comboboxsearch.php b/lib/classes/output/comboboxsearch.php
index b8ec7ea8b79a3..f0120c8874a89 100644
--- a/lib/classes/output/comboboxsearch.php
+++ b/lib/classes/output/comboboxsearch.php
@@ -21,12 +21,11 @@
 /**
  * Renderable class for the comboboxsearch.
  *
- * @package    core_output
+ * @package    core
  * @copyright  2022 Mathew May <Mathew.solutions>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class comboboxsearch implements renderable, templatable {
-
     /** @var bool $renderlater Should the dropdown render straightaway? We sometimes need to output the component without all of the
      * data and leave the rendering of any defaults and actual data to the caller. We will give you a basic placeholder that can
      * then be easily replaced.*/
@@ -50,7 +49,7 @@ class comboboxsearch implements renderable, templatable {
     /** @var null|string $buttonheader If the button item in the tertiary nav needs an extra top header for context. */
     protected $buttonheader;
 
-    /** @var boolean $usesbutton Whether to provide a A11y button. */
+    /** @var bool $usesbutton Whether to provide a A11y button. */
     protected $usesbutton;
 
     /** @var null|string $label The label of the combobox. */
@@ -96,15 +95,16 @@ public function __construct(
             throw new moodle_exception(
                 'incorrectdropdownvars',
                 'core',
-                '', null,
+                '',
+                null,
                 'Dropdown content must be set to render later.'
             );
         }
 
         if ($usebutton && !$label) {
             debugging(
-                    'You have requested to use the button but have not provided a label for the combobox.',
-                    DEBUG_DEVELOPER
+                'You have requested to use the button but have not provided a label for the combobox.',
+                DEBUG_DEVELOPER
             );
         }
 
@@ -137,7 +137,7 @@ public function __construct(
     public function export_for_template(renderer_base $output): array {
         return [
             'renderlater' => $this->renderlater,
-            'buttoncontent' => $this->buttoncontent ,
+            'buttoncontent' => $this->buttoncontent,
             'dropdowncontent' => $this->dropdowncontent,
             'parentclasses' => $this->parentclasses,
             'buttonclasses' => $this->buttonclasses,
diff --git a/lib/classes/output/context_header.php b/lib/classes/output/context_header.php
index fc6a056118fef..b3030ced3afcd 100644
--- a/lib/classes/output/context_header.php
+++ b/lib/classes/output/context_header.php
@@ -26,18 +26,15 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class context_header implements renderable, templatable {
-/**
-     * @var string $heading Main heading.
-     */
+    /** @var string $heading Main heading */
     public $heading;
-    /**
-     * @var int $headinglevel Main heading 'h' tag level.
-     */
+
+    /** @var int $headinglevel Main heading 'h' tag level */
     public $headinglevel;
-    /**
-     * @var string|null $imagedata HTML code for the picture in the page header.
-     */
+
+    /** @var string|null $imagedata HTML code for the picture in the page header */
     public $imagedata;
+
     /**
      * @var array $additionalbuttons Additional buttons for the header e.g. Messaging button for the user header.
      *      array elements - title => alternate text for the image, or if no image is available the button text.
@@ -47,9 +44,8 @@ class context_header implements renderable, templatable {
      *                       page => page object. Don't include if the image is an external image.
      */
     public $additionalbuttons;
-    /**
-     * @var string $prefix A string that is before the title.
-     */
+
+    /** @var string $prefix A string that is before the title */
     public $prefix;
 
     /**
@@ -62,7 +58,6 @@ class context_header implements renderable, templatable {
      * @param string $prefix Text that precedes the heading.
      */
     public function __construct($heading = null, $headinglevel = 1, $imagedata = null, $additionalbuttons = null, $prefix = null) {
-
         $this->heading = $heading;
         $this->headinglevel = $headinglevel;
         $this->imagedata = $imagedata;
@@ -101,8 +96,10 @@ protected function format_button_images() {
                 $class = 'btn';
             }
             // Add the bootstrap 'btn' class for formatting.
-            $this->additionalbuttons[$buttontype]['linkattributes'] = array_merge($button['linkattributes'],
-                array('class' => $class));
+            $this->additionalbuttons[$buttontype]['linkattributes'] = array_merge(
+                $button['linkattributes'],
+                ['class' => $class]
+            );
         }
     }
 
diff --git a/lib/classes/output/core_renderer.php b/lib/classes/output/core_renderer.php
index 038ef4a7c5d14..e56a8dbeeea8e 100644
--- a/lib/classes/output/core_renderer.php
+++ b/lib/classes/output/core_renderer.php
@@ -69,36 +69,36 @@ class core_renderer extends renderer_base {
      * Do NOT use, please use <?php echo $OUTPUT->main_content() ?>
      * in layout files instead.
      * @deprecated
-     * @var string used in {@link core_renderer::header()}.
+     * @var string used in {@see core_renderer::header()}.
      */
     const MAIN_CONTENT_TOKEN = '[MAIN CONTENT GOES HERE]';
 
     /**
-     * @var string Used to pass information from {@link core_renderer::doctype()} to
-     * {@link core_renderer::standard_head_html()}.
+     * @var string Used to pass information from {@see core_renderer::doctype()} to
+     * @see core_renderer::standard_head_html()
      */
     protected $contenttype;
 
     /**
-     * @var string Used by {@link core_renderer::redirect_message()} method to communicate
-     * with {@link core_renderer::header()}.
+     * @var string Used by {@see core_renderer::redirect_message()} method to communicate
+     * with {@see core_renderer::header()}.
      */
     protected $metarefreshtag = '';
 
     /**
      * @var string Unique token for the closing HTML
      */
-    protected $unique_end_html_token;
+    protected $unique_end_html_token; // phpcs:ignore moodle.NamingConventions.ValidVariableName.MemberNameUnderscore
 
     /**
      * @var string Unique token for performance information
      */
-    protected $unique_performance_info_token;
+    protected $unique_performance_info_token; // phpcs:ignore moodle.NamingConventions.ValidVariableName.MemberNameUnderscore
 
     /**
      * @var string Unique token for the main content.
      */
-    protected $unique_main_content_token;
+    protected $unique_main_content_token; // phpcs:ignore moodle.NamingConventions.ValidVariableName.MemberNameUnderscore
 
     /** @var custom_menu_item language The language menu if created */
     protected $language = null;
@@ -120,9 +120,9 @@ public function __construct(moodle_page $page, $target) {
         $this->page = $page;
         $this->target = $target;
 
-        $this->unique_end_html_token = '%%ENDHTML-'.sesskey().'%%';
-        $this->unique_performance_info_token = '%%PERFORMANCEINFO-'.sesskey().'%%';
-        $this->unique_main_content_token = '[MAIN CONTENT GOES HERE - '.sesskey().']';
+        $this->unique_end_html_token = '%%ENDHTML-' . sesskey() . '%%';
+        $this->unique_performance_info_token = '%%PERFORMANCEINFO-' . sesskey() . '%%';
+        $this->unique_main_content_token = '[MAIN CONTENT GOES HERE - ' . sesskey() . ']';
     }
 
     /**
@@ -135,11 +135,9 @@ public function doctype() {
         if ($this->page->theme->doctype === 'html5') {
             $this->contenttype = 'text/html; charset=utf-8';
             return "<!DOCTYPE html>\n";
-
         } else if ($this->page->theme->doctype === 'xhtml5') {
             $this->contenttype = 'application/xhtml+xml; charset=utf-8';
             return "<!DOCTYPE html>\n";
-
         } else {
             // legacy xhtml 1.0
             $this->contenttype = 'text/html; charset=utf-8';
@@ -207,16 +205,16 @@ public function standard_head_html() {
 
         $hook->add_html('<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />' . "\n");
         $hook->add_html('<meta name="keywords" content="moodle, ' . $this->page->title . '" />' . "\n");
-        // This is only set by the {@link redirect()} method
+        // This is only set by the {@see redirect()} method
         $hook->add_html($this->metarefreshtag);
 
         // Check if a periodic refresh delay has been set and make sure we arn't
         // already meta refreshing
-        if ($this->metarefreshtag=='' && $this->page->periodicrefreshdelay!==null) {
+        if ($this->metarefreshtag == '' && $this->page->periodicrefreshdelay !== null) {
             $hook->add_html(
                 html_writer::empty_tag('meta', [
                     'http-equiv' => 'refresh',
-                    'content' => $this->page->periodicrefreshdelay . ';url='.$this->page->url->out(),
+                    'content' => $this->page->periodicrefreshdelay . ';url=' . $this->page->url->out(),
                 ]),
             );
         }
@@ -231,14 +229,14 @@ public function standard_head_html() {
             if (preg_match("#forms\['([a-zA-Z0-9]+)'\].elements\['([a-zA-Z0-9]+)'\]#", $focus, $matches)) {
                 // This is a horrifically bad way to handle focus but it is passed in
                 // through messy formslib::moodleform
-                $this->page->requires->js_function_call('old_onload_focus', array($matches[1], $matches[2]));
-            } else if (strpos($focus, '.')!==false) {
+                $this->page->requires->js_function_call('old_onload_focus', [$matches[1], $matches[2]]);
+            } else if (strpos($focus, '.') !== false) {
                 // Old style of focus, bad way to do it
                 debugging('This code is using the old style focus event, Please update this code to focus on an element id or the moodleform focus method.', DEBUG_DEVELOPER);
                 $this->page->requires->js_function_call('old_onload_focus', explode('.', $focus, 2));
             } else {
                 // Focus element with given id
-                $this->page->requires->js_function_call('focuscontrol', array($focus));
+                $this->page->requires->js_function_call('focuscontrol', [$focus]);
             }
         }
 
@@ -262,13 +260,17 @@ public function standard_head_html() {
 
         // List alternate versions.
         foreach ($this->page->alternateversions as $type => $alt) {
-            $output .= html_writer::empty_tag('link', array('rel' => 'alternate',
-                    'type' => $type, 'title' => $alt->title, 'href' => $alt->url));
+            $output .= html_writer::empty_tag('link', [
+                'rel' => 'alternate',
+                'type' => $type,
+                'title' => $alt->title,
+                'href' => $alt->url,
+            ]);
         }
 
         // Add noindex tag if relevant page and setting applied.
         $allowindexing = isset($CFG->allowindexing) ? $CFG->allowindexing : 0;
-        $loginpages = array('login-index', 'login-signup');
+        $loginpages = ['login-index', 'login-signup'];
         if ($allowindexing == 2 || ($allowindexing == 0 && in_array($this->page->pagetype, $loginpages))) {
             if (!isset($CFG->additionalhtmlhead)) {
                 $CFG->additionalhtmlhead = '';
@@ -277,7 +279,7 @@ public function standard_head_html() {
         }
 
         if (!empty($CFG->additionalhtmlhead)) {
-            $output .= "\n".$CFG->additionalhtmlhead;
+            $output .= "\n" . $CFG->additionalhtmlhead;
         }
 
         if ($this->page->pagelayout == 'frontpage') {
@@ -300,7 +302,7 @@ public function standard_top_of_body_html() {
         global $CFG;
         $output = $this->page->requires->get_top_of_body_code($this);
         if ($this->page->pagelayout !== 'embedded' && !empty($CFG->additionalhtmltopofbody)) {
-            $output .= "\n".$CFG->additionalhtmltopofbody;
+            $output .= "\n" . $CFG->additionalhtmltopofbody;
         }
 
         // Allow components to add content to the top of the body.
@@ -342,11 +344,15 @@ public function maintenance_warning() {
             }
 
             $output .= $this->box_end();
-            $this->page->requires->yui_module('moodle-core-maintenancemodetimer', 'M.core.maintenancemodetimer',
-                    array(array('timeleftinsec' => $timeleft)));
+            $this->page->requires->yui_module(
+                'moodle-core-maintenancemodetimer',
+                'M.core.maintenancemodetimer',
+                [['timeleftinsec' => $timeleft]]
+            );
             $this->page->requires->strings_for_js(
-                    array('maintenancemodeisscheduled', 'maintenancemodeisscheduledlong', 'sitemaintenance'),
-                    'admin');
+                ['maintenancemodeisscheduled', 'maintenancemodeisscheduledlong', 'sitemaintenance'],
+                'admin'
+            );
         }
         return $output;
     }
@@ -371,7 +377,7 @@ public function standard_footer_html() {
 
         if ($this->page->devicetypeinuse == 'legacy') {
             // The legacy theme is in use print the notification
-            $output .= html_writer::tag('div', get_string('legacythemeinuse'), array('class'=>'legacythemeinuse'));
+            $output .= html_writer::tag('div', get_string('legacythemeinuse'), ['class' => 'legacythemeinuse']);
         }
 
         // Get links to switch device types (only shown for users not on a default device)
@@ -400,21 +406,26 @@ public function debug_footer_html() {
         $output .= $this->unique_performance_info_token;
 
         if (!empty($CFG->debugpageinfo)) {
-            $output .= '<div class="performanceinfo pageinfo">' . get_string('pageinfodebugsummary', 'core_admin',
-                $this->page->debug_summary()) . '</div>';
+            $output .= '<div class="performanceinfo pageinfo">' . get_string(
+                'pageinfodebugsummary',
+                'core_admin',
+                $this->page->debug_summary()
+            ) . '</div>';
         }
         if (debugging(null, DEBUG_DEVELOPER) and has_capability('moodle/site:config', context_system::instance())) {  // Only in developer mode
-
             // Add link to profiling report if necessary
             if (function_exists('profiling_is_running') && profiling_is_running()) {
                 $txt = get_string('profiledscript', 'admin');
                 $title = get_string('profiledscriptview', 'admin');
                 $url = $CFG->wwwroot . '/admin/tool/profiling/index.php?script=' . urlencode($SCRIPT);
-                $link= '<a title="' . $title . '" href="' . $url . '">' . $txt . '</a>';
+                $link = '<a title="' . $title . '" href="' . $url . '">' . $txt . '</a>';
                 $output .= '<div class="profilingfooter">' . $link . '</div>';
             }
-            $purgeurl = new moodle_url('/admin/purgecaches.php', array('confirm' => 1,
-                'sesskey' => sesskey(), 'returnurl' => $this->page->url->out_as_local_url(false)));
+            $purgeurl = new moodle_url('/admin/purgecaches.php', [
+                'confirm' => 1,
+                'sesskey' => sesskey(),
+                'returnurl' => $this->page->url->out_as_local_url(false),
+            ]);
             $output .= '<div class="purgecaches">' .
                     html_writer::link($purgeurl, get_string('purgecaches', 'admin')) . '</div>';
 
@@ -427,7 +438,7 @@ public function debug_footer_html() {
             $waveurl = new moodle_url('https://wave.webaim.org/report#/' . urlencode($siteurl));
             $validatorlinks = [
                 html_writer::link($nuurl, get_string('validatehtml')),
-                html_writer::link($waveurl, get_string('wcagcheck'))
+                html_writer::link($waveurl, get_string('wcagcheck')),
             ];
             $validatorlinkslist = html_writer::alist($validatorlinks, ['class' => 'list-unstyled ml-1']);
             $output .= html_writer::div($validatorlinkslist, 'validators');
@@ -448,7 +459,7 @@ public function main_content() {
         // This is an unfortunate hack. DO NO EVER add anything more here.
         // DO NOT add classes.
         // DO NOT add an id.
-        return '<div role="main">'.$this->unique_main_content_token.'</div>';
+        return '<div role="main">' . $this->unique_main_content_token . '</div>';
     }
 
     /**
@@ -481,8 +492,10 @@ public function activity_information(cm_info $cminfo, cm_completion_details $com
     public function activity_navigation() {
         // First we should check if we want to add navigation.
         $context = $this->page->context;
-        if (($this->page->pagelayout !== 'incourse' && $this->page->pagelayout !== 'frametop')
-            || $context->contextlevel != CONTEXT_MODULE) {
+        if (
+            ($this->page->pagelayout !== 'incourse' && $this->page->pagelayout !== 'frametop')
+            || $context->contextlevel != CONTEXT_MODULE
+        ) {
             return '';
         }
 
@@ -496,8 +509,10 @@ public function activity_navigation() {
 
         // If the theme implements course index and the current course format uses course index and the current
         // page layout is not 'frametop' (this layout does not support course index), show no links.
-        if ($this->page->theme->usescourseindex && $courseformat->uses_course_index() &&
-                $this->page->pagelayout !== 'frametop') {
+        if (
+            $this->page->theme->usescourseindex && $courseformat->uses_course_index() &&
+                $this->page->pagelayout !== 'frametop'
+        ) {
             return '';
         }
 
@@ -525,7 +540,7 @@ public function activity_navigation() {
                 $modname .= ' ' . get_string('hiddenwithbrackets');
             }
             // Module URL.
-            $linkurl = new moodle_url($module->url, array('forceview' => 1));
+            $linkurl = new moodle_url($module->url, ['forceview' => 1]);
             // Add module URL (as key) and name (as value) to the activity list array.
             $activitylist[$linkurl->out(false)] = $modname;
         }
@@ -570,12 +585,12 @@ public function activity_navigation() {
     public function standard_end_of_body_html() {
         global $CFG;
 
-        // This function is normally called from a layout.php file in {@link core_renderer::header()}
+        // This function is normally called from a layout.php file in {@see core_renderer::header()}
         // but some of the content won't be known until later, so we return a placeholder
-        // for now. This will be replaced with the real content in {@link core_renderer::footer()}.
+        // for now. This will be replaced with the real content in {@see core_renderer::footer()}.
         $output = '';
         if ($this->page->pagelayout !== 'embedded' && !empty($CFG->additionalhtmlfooter)) {
-            $output .= "\n".$CFG->additionalhtmlfooter;
+            $output .= "\n" . $CFG->additionalhtmlfooter;
         }
         $output .= $this->unique_end_html_token;
         return $output;
@@ -628,8 +643,8 @@ public function login_info($withlinks = null) {
             $fullname = fullname($realuser);
             if ($withlinks) {
                 $loginastitle = get_string('loginas');
-                $realuserinfo = " [<a href=\"$CFG->wwwroot/course/loginas.php?id=$course->id&amp;sesskey=".sesskey()."\"";
-                $realuserinfo .= "title =\"".$loginastitle."\">$fullname</a>] ";
+                $realuserinfo = " [<a href=\"$CFG->wwwroot/course/loginas.php?id=$course->id&amp;sesskey=" . sesskey() . "\"";
+                $realuserinfo .= "title =\"" . $loginastitle . "\">$fullname</a>] ";
             } else {
                 $realuserinfo = " [$fullname] ";
             }
@@ -654,7 +669,7 @@ public function login_info($withlinks = null) {
             } else {
                 $username = $fullname;
             }
-            if (is_mnet_remote_user($USER) and $idprovider = $DB->get_record('mnet_host', array('id'=>$USER->mnethostid))) {
+            if (is_mnet_remote_user($USER) and $idprovider = $DB->get_record('mnet_host', ['id' => $USER->mnethostid])) {
                 if ($withlinks) {
                     $username .= " from <a href=\"{$idprovider->wwwroot}\">{$idprovider->name}</a>";
                 } else {
@@ -662,34 +677,34 @@ public function login_info($withlinks = null) {
                 }
             }
             if (isguestuser()) {
-                $loggedinas = $realuserinfo.get_string('loggedinasguest');
+                $loggedinas = $realuserinfo . get_string('loggedinasguest');
                 if (!$loginpage && $withlinks) {
-                    $loggedinas .= " (<a href=\"$loginurl\">".get_string('login').'</a>)';
+                    $loggedinas .= " (<a href=\"$loginurl\">" . get_string('login') . '</a>)';
                 }
             } else if (is_role_switched($course->id)) { // Has switched roles
                 $rolename = '';
-                if ($role = $DB->get_record('role', array('id'=>$USER->access['rsw'][$context->path]))) {
-                    $rolename = ': '.role_get_name($role, $context);
+                if ($role = $DB->get_record('role', ['id' => $USER->access['rsw'][$context->path]])) {
+                    $rolename = ': ' . role_get_name($role, $context);
                 }
-                $loggedinas = get_string('loggedinas', 'moodle', $username).$rolename;
+                $loggedinas = get_string('loggedinas', 'moodle', $username) . $rolename;
                 if ($withlinks) {
-                    $url = new moodle_url('/course/switchrole.php', array('id'=>$course->id,'sesskey'=>sesskey(), 'switchrole'=>0, 'returnurl'=>$this->page->url->out_as_local_url(false)));
-                    $loggedinas .= ' ('.html_writer::tag('a', get_string('switchrolereturn'), array('href' => $url)).')';
+                    $url = new moodle_url('/course/switchrole.php', ['id' => $course->id, 'sesskey' => sesskey(), 'switchrole' => 0, 'returnurl' => $this->page->url->out_as_local_url(false)]);
+                    $loggedinas .= ' (' . html_writer::tag('a', get_string('switchrolereturn'), ['href' => $url]) . ')';
                 }
             } else {
-                $loggedinas = $realuserinfo.get_string('loggedinas', 'moodle', $username);
+                $loggedinas = $realuserinfo . get_string('loggedinas', 'moodle', $username);
                 if ($withlinks) {
-                    $loggedinas .= " (<a href=\"$CFG->wwwroot/login/logout.php?sesskey=".sesskey()."\">".get_string('logout').'</a>)';
+                    $loggedinas .= " (<a href=\"$CFG->wwwroot/login/logout.php?sesskey=" . sesskey() . "\">" . get_string('logout') . '</a>)';
                 }
             }
         } else {
             $loggedinas = get_string('loggedinnot', 'moodle');
             if (!$loginpage && $withlinks) {
-                $loggedinas .= " (<a href=\"$loginurl\">".get_string('login').'</a>)';
+                $loggedinas .= " (<a href=\"$loginurl\">" . get_string('login') . '</a>)';
             }
         }
 
-        $loggedinas = '<div class="logininfo">'.$loggedinas.'</div>';
+        $loggedinas = '<div class="logininfo">' . $loggedinas . '</div>';
 
         if (isset($SESSION->justloggedin)) {
             unset($SESSION->justloggedin);
@@ -702,8 +717,11 @@ public function login_info($withlinks = null) {
                     $a->attempts = $count;
                     $loggedinas .= get_string('failedloginattempts', '', $a);
                     if (file_exists("$CFG->dirroot/report/log/index.php") and has_capability('report/log:view', context_system::instance())) {
-                        $loggedinas .= ' ('.html_writer::link(new moodle_url('/report/log/index.php', array('chooselog' => 1,
-                                'id' => 0 , 'modid' => 'site_errors')), get_string('logs')).')';
+                        $loggedinas .= ' (' . html_writer::link(new moodle_url('/report/log/index.php', [
+                            'chooselog' => 1,
+                            'id' => 0,
+                            'modid' => 'site_errors',
+                        ]), get_string('logs')) . ')';
                     }
                     $loggedinas .= '</div>';
                 }
@@ -724,11 +742,11 @@ protected function is_login_page() {
         // In fact the login pages should be only these two pages and as exposing this as an option for all pages
         // could lead to abuse (or at least unneedingly complex code) the hack is the way to go.
         return in_array(
-            $this->page->url->out_as_local_url(false, array()),
-            array(
+            $this->page->url->out_as_local_url(false, []),
+            [
                 '/login/index.php',
                 '/login/forgot_password.php',
-            )
+            ]
         );
     }
 
@@ -744,21 +762,18 @@ public function home_link() {
             // Special case for site home page - please do not remove
             return '<div class="sitelink">' .
                    '<a title="Moodle" class="d-inline-block aalink" href="http://moodle.org/">' .
-                   '<img src="' . $this->image_url('moodlelogo_grayhat') . '" alt="'.get_string('moodlelogo').'" /></a></div>';
-
+                   '<img src="' . $this->image_url('moodlelogo_grayhat') . '" alt="' . get_string('moodlelogo') . '" /></a></div>';
         } else if (!empty($CFG->target_release) && $CFG->target_release != $CFG->release) {
             // Special case for during install/upgrade.
-            return '<div class="sitelink">'.
+            return '<div class="sitelink">' .
                    '<a title="Moodle" href="http://docs.moodle.org/en/Administrator_documentation" onclick="this.target=\'_blank\'">' .
-                   '<img src="' . $this->image_url('moodlelogo_grayhat') . '" alt="'.get_string('moodlelogo').'" /></a></div>';
-
+                   '<img src="' . $this->image_url('moodlelogo_grayhat') . '" alt="' . get_string('moodlelogo') . '" /></a></div>';
         } else if ($this->page->course->id == $SITE->id || strpos($this->page->pagetype, 'course-view') === 0) {
             return '<div class="homelink"><a href="' . $CFG->wwwroot . '/">' .
                     get_string('home') . '</a></div>';
-
         } else {
             return '<div class="homelink"><a href="' . $CFG->wwwroot . '/course/view.php?id=' . $this->page->course->id . '">' .
-                    format_string($this->page->course->shortname, true, array('context' => $this->page->context)) . '</a></div>';
+                    format_string($this->page->course->shortname, true, ['context' => $this->page->context]) . '</a></div>';
         }
     }
 
@@ -783,7 +798,6 @@ public function home_link() {
      * @return string The HTML to display to the user before dying, may contain
      *         meta refresh, javascript refresh, and may have set header redirects
      */
-
     public function redirect_message(
         $encodedurl,
         $message,
@@ -795,36 +809,36 @@ public function redirect_message(
         $url = str_replace('&amp;', '&', $encodedurl);
 
         switch ($this->page->state) {
-            case moodle_page::STATE_BEFORE_HEADER :
+            case moodle_page::STATE_BEFORE_HEADER:
                 // No output yet it is safe to delivery the full arsenal of redirect methods
                 if (!$debugdisableredirect) {
                     // Don't use exactly the same time here, it can cause problems when both redirects fire at the same time.
-                    $this->metarefreshtag = '<meta http-equiv="refresh" content="'. $delay .'; url='. $encodedurl .'" />'."\n";
-                    $this->page->requires->js_function_call('document.location.replace', array($url), false, ($delay + 3));
+                    $this->metarefreshtag = '<meta http-equiv="refresh" content="' . $delay . '; url=' . $encodedurl . '" />' . "\n";
+                    $this->page->requires->js_function_call('document.location.replace', [$url], false, ($delay + 3));
                 }
                 $output = $this->header();
                 break;
-            case moodle_page::STATE_PRINTING_HEADER :
+            case moodle_page::STATE_PRINTING_HEADER:
                 // We should hopefully never get here
                 throw new coding_exception('You cannot redirect while printing the page header');
                 break;
-            case moodle_page::STATE_IN_BODY :
+            case moodle_page::STATE_IN_BODY:
                 // We really shouldn't be here but we can deal with this
                 debugging("You should really redirect before you start page output");
                 if (!$debugdisableredirect) {
-                    $this->page->requires->js_function_call('document.location.replace', array($url), false, $delay);
+                    $this->page->requires->js_function_call('document.location.replace', [$url], false, $delay);
                 }
                 $output = $this->opencontainers->pop_all_but_last();
                 break;
-            case moodle_page::STATE_DONE :
+            case moodle_page::STATE_DONE:
                 // Too late to be calling redirect now
                 throw new coding_exception('You cannot redirect after the entire page has been generated');
                 break;
         }
         $output .= $this->notification($message, $messagetype);
-        $output .= '<div class="continuebutton">(<a href="'. $encodedurl .'">'. get_string('continue') .'</a>)</div>';
+        $output .= '<div class="continuebutton">(<a href="' . $encodedurl . '">' . get_string('continue') . '</a>)</div>';
         if ($debugdisableredirect) {
-            $output .= '<p><strong>'.get_string('erroroutput', 'error').'</strong></p>';
+            $output .= '<p><strong>' . get_string('erroroutput', 'error') . '</strong></p>';
         }
         $output .= $this->footer();
         return $output;
@@ -896,8 +910,10 @@ public function header() {
         }
 
         // If this theme version is below 2.4 release and this is a course view page
-        if ((!isset($this->page->theme->settings->version) || $this->page->theme->settings->version < 2012101500) &&
-                $this->page->pagelayout === 'course' && $this->page->url->compare(new moodle_url('/course/view.php'), URL_MATCH_BASE)) {
+        if (
+            (!isset($this->page->theme->settings->version) || $this->page->theme->settings->version < 2012101500) &&
+                $this->page->pagelayout === 'course' && $this->page->url->compare(new moodle_url('/course/view.php'), URL_MATCH_BASE)
+        ) {
             // check if course content header/footer have not been output during render of theme layout
             $coursecontentheader = $this->course_content_header(true);
             $coursecontentfooter = $this->course_content_footer(true);
@@ -908,7 +924,7 @@ public function header() {
                 // Besides the content header and footer are not displayed on any other course page
                 debugging('The current theme is not optimised for 2.4, the course-specific header and footer defined in course format will not be output', DEBUG_DEVELOPER);
                 $header .= $coursecontentheader;
-                $footer = $coursecontentfooter. $footer;
+                $footer = $coursecontentfooter . $footer;
             }
         }
 
@@ -981,12 +997,14 @@ public function footer() {
                     // If the output buffer was off then we render a placeholder and stream the
                     // performance debugging into it at the very end in the shutdown handler.
                     $PERF->perfdebugdeferred = true;
-                    $performanceinfo .= html_writer::tag('div',
+                    $performanceinfo .= html_writer::tag(
+                        'div',
                         get_string('perfdebugdeferred', 'admin'),
                         [
                             'id' => 'perfdebugfooter',
                             'style' => 'min-height: 30em',
-                        ]);
+                        ]
+                    );
                 } else {
                     $perf = get_performance_info();
                     $performanceinfo = $perf['html'];
@@ -1002,10 +1020,10 @@ public function footer() {
 
         // Only show notifications when the current page has a context id.
         if (!empty($this->page->context->id)) {
-            $this->page->requires->js_call_amd('core/notification', 'init', array(
+            $this->page->requires->js_call_amd('core/notification', 'init', [
                 $this->page->context->id,
-                \core\notification::fetch_as_array($this)
-            ));
+                \core\notification::fetch_as_array($this),
+            ]);
         }
         $footer = str_replace($this->unique_end_html_token, $this->page->requires->get_end_code(), $footer);
 
@@ -1062,19 +1080,19 @@ public function course_content_header($onlyifnotcalledbefore = false) {
         $bodynotifications = '';
         foreach ($notifications as $notification) {
             $bodynotifications .= $this->render_from_template(
-                    $notification->get_template_name(),
-                    $notification->export_for_template($this)
-                );
+                $notification->get_template_name(),
+                $notification->export_for_template($this)
+            );
         }
 
-        $output = html_writer::span($bodynotifications, 'notifications', array('id' => 'user-notifications'));
+        $output = html_writer::span($bodynotifications, 'notifications', ['id' => 'user-notifications']);
 
         if ($this->page->course->id == SITEID) {
             // return immediately and do not include /course/lib.php if not necessary
             return $output;
         }
 
-        require_once($CFG->dirroot.'/course/lib.php');
+        require_once($CFG->dirroot . '/course/lib.php');
         $functioncalled = true;
         $courseformat = course_get_format($this->page->course);
         if (($obj = $courseformat->course_content_header()) !== null) {
@@ -1102,7 +1120,7 @@ public function course_content_footer($onlyifnotcalledbefore = false) {
             return '';
         }
         $functioncalled = true;
-        require_once($CFG->dirroot.'/course/lib.php');
+        require_once($CFG->dirroot . '/course/lib.php');
         $courseformat = course_get_format($this->page->course);
         if (($obj = $courseformat->course_content_footer()) !== null) {
             return html_writer::div($courseformat->get_renderer($this->page)->render($obj), 'course-content-footer');
@@ -1122,7 +1140,7 @@ public function course_header() {
             // return immediately and do not include /course/lib.php if not necessary
             return '';
         }
-        require_once($CFG->dirroot.'/course/lib.php');
+        require_once($CFG->dirroot . '/course/lib.php');
         $courseformat = course_get_format($this->page->course);
         if (($obj = $courseformat->course_header()) !== null) {
             return $courseformat->get_renderer($this->page)->render($obj);
@@ -1142,7 +1160,7 @@ public function course_footer() {
             // return immediately and do not include /course/lib.php if not necessary
             return '';
         }
-        require_once($CFG->dirroot.'/course/lib.php');
+        require_once($CFG->dirroot . '/course/lib.php');
         $courseformat = course_get_format($this->page->course);
         if (($obj = $courseformat->course_footer()) !== null) {
             return $courseformat->get_renderer($this->page)->render($obj);
@@ -1209,7 +1227,7 @@ public function get_generated_color_for_id($id) {
     /**
      * Returns lang menu or '', this method also checks forcing of languages in courses.
      *
-     * This function calls {@link core_renderer::render_single_select()} to actually display the language menu.
+     * This function calls {@see core_renderer::render_single_select()} to actually display the language menu.
      *
      * @return string The lang menu HTML or empty string
      */
@@ -1225,8 +1243,8 @@ public function lang_menu() {
     /**
      * Output the row of editing icons for a block, as defined by the controls array.
      *
-     * @param array $controls an array like {@link block_contents::$controls}.
-     * @param string $blockid The ID given to the block.
+     * @param array $actions an array like {@see block_contents::$controls}.
+     * @param null|string $blockid The ID given to the block.
      * @return string HTML fragment.
      */
     public function block_controls($actions, $blockid = null) {
@@ -1235,7 +1253,7 @@ public function block_controls($actions, $blockid = null) {
         }
         $menu = new action_menu($actions);
         if ($blockid !== null) {
-            $menu->set_owner_selector('#'.$blockid);
+            $menu->set_owner_selector('#' . $blockid);
         }
         $menu->attributes['class'] .= ' block-control-actions commands';
         return $this->render($menu);
@@ -1262,7 +1280,7 @@ public function print_textarea($name, $id, $value, $rows, $cols) {
             'name' => $name,
             'value' => $value,
             'rows' => $rows,
-            'cols' => $cols
+            'cols' => $cols,
         ];
 
         return $this->render_from_template('core_form/editor_textarea', $context);
@@ -1451,18 +1469,18 @@ public function block(block_contents $bc, $region) {
      */
     public function list_block_contents($icons, $items) {
         $row = 0;
-        $lis = array();
+        $lis = [];
         foreach ($items as $key => $string) {
-            $item = html_writer::start_tag('li', array('class' => 'r' . $row));
-            if (!empty($icons[$key])) { //test if the content has an assigned icon
-                $item .= html_writer::tag('div', $icons[$key], array('class' => 'icon column c0'));
+            $item = html_writer::start_tag('li', ['class' => 'r' . $row]);
+            if (!empty($icons[$key])) { // test if the content has an assigned icon
+                $item .= html_writer::tag('div', $icons[$key], ['class' => 'icon column c0']);
             }
-            $item .= html_writer::tag('div', $string, array('class' => 'column c1'));
+            $item .= html_writer::tag('div', $string, ['class' => 'column c1']);
             $item .= html_writer::end_tag('li');
             $lis[] = $item;
             $row = 1 - $row; // Flip even/odd.
         }
-        return html_writer::tag('ul', implode("\n", $lis), array('class' => 'unlist'));
+        return html_writer::tag('ul', implode("\n", $lis), ['class' => 'unlist']);
     }
 
     /**
@@ -1475,7 +1493,7 @@ public function list_block_contents($icons, $items) {
     public function blocks_for_region($region, $fakeblocksonly = false) {
         $blockcontents = $this->page->blocks->get_content_for_region($region, $this);
         $lastblock = null;
-        $zones = array();
+        $zones = [];
         foreach ($blockcontents as $bc) {
             if ($bc instanceof block_contents) {
                 $zones[] = $bc->title;
@@ -1523,23 +1541,23 @@ public function block_move_target($target, $zones, $previous, $region) {
         } else {
             $position = get_string('moveblockafter', 'block', $previous);
         }
-        return html_writer::tag('a', html_writer::tag('span', $position, array('class' => 'accesshide')), array('href' => $target->url, 'class' => 'blockmovetarget'));
+        return html_writer::tag('a', html_writer::tag('span', $position, ['class' => 'accesshide']), ['href' => $target->url, 'class' => 'blockmovetarget']);
     }
 
     /**
      * Renders a special html link with attached action
      *
      * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_action_link()} instead.
+     * {@see core_renderer::render_action_link()} instead.
      *
      * @param string|moodle_url $url
      * @param string $text HTML fragment
-     * @param component_action $action
-     * @param array $attributes associative array of html link attributes + disabled
-     * @param pix_icon optional pix icon to render with the link
+     * @param null|component_action $action
+     * @param null|array $attributes associative array of html link attributes + disabled
+     * @param null|pix_icon optional pix icon to render with the link
      * @return string HTML fragment
      */
-    public function action_link($url, $text, component_action $action = null, array $attributes = null, $icon = null) {
+    public function action_link($url, $text, ?component_action $action = null, ?array $attributes = null, $icon = null) {
         if (!($url instanceof moodle_url)) {
             $url = new moodle_url($url);
         }
@@ -1552,7 +1570,7 @@ public function action_link($url, $text, component_action $action = null, array
      * Renders an action_link object.
      *
      * The provided link is renderer and the HTML returned. At the same time the
-     * associated actions are setup in JS by {@link core_renderer::add_action_handler()}
+     * associated actions are setup in JS by {@see core_renderer::add_action_handler()}
      *
      * @param action_link $link
      * @return string HTML fragment
@@ -1564,22 +1582,28 @@ protected function render_action_link(action_link $link) {
     /**
      * Renders an action_icon.
      *
-     * This function uses the {@link core_renderer::action_link()} method for the
+     * This function uses the {@see core_renderer::action_link()} method for the
      * most part. What it does different is prepare the icon as HTML and use it
      * as the link text.
      *
      * Theme developers: If you want to change how action links and/or icons are rendered,
-     * consider overriding function {@link core_renderer::render_action_link()} and
-     * {@link core_renderer::render_pix_icon()}.
+     * consider overriding function {@see core_renderer::render_action_link()} and
+     * {@see core_renderer::render_pix_icon()}.
      *
      * @param string|moodle_url $url A string URL or moodel_url
      * @param pix_icon $pixicon
-     * @param component_action $action
-     * @param array $attributes associative array of html link attributes + disabled
+     * @param null|component_action $action
+     * @param null|array $attributes associative array of html link attributes + disabled
      * @param bool $linktext show title next to image in link
      * @return string HTML fragment
      */
-    public function action_icon($url, pix_icon $pixicon, component_action $action = null, array $attributes = null, $linktext=false) {
+    public function action_icon(
+        $url,
+        pix_icon $pixicon,
+        ?component_action $action = null,
+        ?array $attributes = null,
+        $linktext = false,
+    ) {
         if (!($url instanceof moodle_url)) {
             $url = new moodle_url($url);
         }
@@ -1603,7 +1627,7 @@ public function action_icon($url, pix_icon $pixicon, component_action $action =
 
         $icon = $this->render($pixicon);
 
-        return $this->action_link($url, $text.$icon, $action, $attributes);
+        return $this->action_link($url, $text . $icon, $action, $attributes);
     }
 
    /**
@@ -1630,11 +1654,19 @@ public function confirm($message, $continue, $cancel, array $displayoptions = []
                 $continue->type = single_button::BUTTON_PRIMARY;
             }
         } else if (is_string($continue)) {
-            $continue = new single_button(new moodle_url($continue), $displayoptions['continuestr'], 'post',
-                $displayoptions['type'] ?? single_button::BUTTON_PRIMARY);
+            $continue = new single_button(
+                new moodle_url($continue),
+                $displayoptions['continuestr'],
+                'post',
+                $displayoptions['type'] ?? single_button::BUTTON_PRIMARY
+            );
         } else if ($continue instanceof moodle_url) {
-            $continue = new single_button($continue, $displayoptions['continuestr'], 'post',
-                $displayoptions['type'] ?? single_button::BUTTON_PRIMARY);
+            $continue = new single_button(
+                $continue,
+                $displayoptions['continuestr'],
+                'post',
+                $displayoptions['type'] ?? single_button::BUTTON_PRIMARY
+            );
         } else {
             throw new coding_exception('The continue param to $OUTPUT->confirm() must be either a URL (string/moodle_url) or a single_button instance.');
         }
@@ -1650,10 +1682,10 @@ public function confirm($message, $continue, $cancel, array $displayoptions = []
         }
 
         $attributes = [
-            'role'=>'alertdialog',
-            'aria-labelledby'=>'modal-header',
-            'aria-describedby'=>'modal-body',
-            'aria-modal'=>'true'
+            'role' => 'alertdialog',
+            'aria-labelledby' => 'modal-header',
+            'aria-describedby' => 'modal-body',
+            'aria-modal' => 'true',
         ];
 
         $output = $this->box_start('generalbox modal modal-dialog modal-in-page show', 'notice', $attributes);
@@ -1662,8 +1694,8 @@ public function confirm($message, $continue, $cancel, array $displayoptions = []
         $output .= html_writer::tag('h4', $displayoptions['confirmtitle']);
         $output .= $this->box_end();
         $attributes = [
-            'role'=>'alert',
-            'data-aria-autofocus'=>'true'
+            'role' => 'alert',
+            'data-aria-autofocus' => 'true',
         ];
         $output .= $this->box_start('modal-body', 'modal-body', $attributes);
         $output .= html_writer::tag('p', $message);
@@ -1680,21 +1712,21 @@ public function confirm($message, $continue, $cancel, array $displayoptions = []
      * Returns a form with a single button.
      *
      * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_single_button()} instead.
+     * {@see core_renderer::render_single_button()} instead.
      *
      * @param string|moodle_url $url
      * @param string $label button text
      * @param string $method get or post submit method
-     * @param array $options associative array {disabled, title, etc.}
+     * @param null|array $options associative array {disabled, title, etc.}
      * @return string HTML fragment
      */
-    public function single_button($url, $label, $method='post', array $options=null) {
+    public function single_button($url, $label, $method = 'post', ?array $options = null) {
         if (!($url instanceof moodle_url)) {
             $url = new moodle_url($url);
         }
         $button = new single_button($url, $label, $method);
 
-        foreach ((array)$options as $key=>$value) {
+        foreach ((array)$options as $key => $value) {
             if (property_exists($button, $key)) {
                 $button->$key = $value;
             } else {
@@ -1721,7 +1753,7 @@ protected function render_single_button(single_button $button) {
      * Returns a form with a single select widget.
      *
      * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_single_select()} instead.
+     * {@see core_renderer::render_single_select()} instead.
      *
      * @param moodle_url $url form action target, includes hidden fields
      * @param string $name name of selection field - the changing parameter in url
@@ -1732,8 +1764,15 @@ protected function render_single_button(single_button $button) {
      * @param array $attributes other attributes for the single select
      * @return string HTML fragment
      */
-    public function single_select($url, $name, array $options, $selected = '',
-                                $nothing = array('' => 'choosedots'), $formid = null, $attributes = array()) {
+    public function single_select(
+        $url,
+        $name,
+        array $options,
+        $selected = '',
+        $nothing = ['' => 'choosedots'],
+        $formid = null,
+        $attributes = []
+    ) {
         if (!($url instanceof moodle_url)) {
             $url = new moodle_url($url);
         }
@@ -1762,20 +1801,20 @@ public function download_dataformat_selector($label, $base, $name = 'dataformat'
         $options = [];
         foreach ($formats as $format) {
             if ($format->is_enabled()) {
-                $options[] = array(
+                $options[] = [
                     'value' => $format->name,
                     'label' => get_string('dataformat', $format->component),
-                );
+                ];
             }
         }
-        $hiddenparams = array();
+        $hiddenparams = [];
         foreach ($params as $key => $value) {
-            $hiddenparams[] = array(
+            $hiddenparams[] = [
                 'name' => $key,
                 'value' => $value,
-            );
+            ];
         }
-        $data = array(
+        $data = [
             'label' => $label,
             'base' => $base,
             'name' => $name,
@@ -1783,7 +1822,7 @@ public function download_dataformat_selector($label, $base, $name = 'dataformat'
             'options' => $options,
             'sesskey' => sesskey(),
             'submit' => get_string('download'),
-        );
+        ];
 
         return $this->render_from_template('core/dataformat_selector', $data);
     }
@@ -1803,7 +1842,7 @@ protected function render_single_select(single_select $select) {
      * Returns a form with a url select widget.
      *
      * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_url_select()} instead.
+     * {@see core_renderer::render_url_select()} instead.
      *
      * @param array $urls list of urls - array('/course/view.php?id=1'=>'Frontpage', ....)
      * @param string $selected selected element
@@ -1811,7 +1850,7 @@ protected function render_single_select(single_select $select) {
      * @param string $formid
      * @return string HTML fragment
      */
-    public function url_select(array $urls, $selected, $nothing = array('' => 'choosedots'), $formid = null) {
+    public function url_select(array $urls, $selected, $nothing = ['' => 'choosedots'], $formid = null) {
         $select = new url_select($urls, $selected, $nothing, $formid);
         return $this->render($select);
     }
@@ -1839,14 +1878,18 @@ protected function render_url_select(url_select $select) {
     public function doc_link($path, $text = '', $forcepopup = false, array $attributes = []) {
         global $CFG;
 
-        $icon = $this->pix_icon('book', '', 'moodle', array('class' => 'iconhelp icon-pre'));
+        $icon = $this->pix_icon('book', '', 'moodle', ['class' => 'iconhelp icon-pre']);
 
         $attributes['href'] = new moodle_url(get_docs_url($path));
         $newwindowicon = '';
         if (!empty($CFG->doctonewwindow) || $forcepopup) {
             $attributes['target'] = '_blank';
-            $newwindowicon = $this->pix_icon('i/externallink', get_string('opensinnewwindow'), 'moodle',
-            ['class' => 'fa fa-externallink fa-fw']);
+            $newwindowicon = $this->pix_icon(
+                'i/externallink',
+                get_string('opensinnewwindow'),
+                'moodle',
+                ['class' => 'fa fa-externallink fa-fw']
+            );
         }
 
         return html_writer::tag('a', $icon . $text . $newwindowicon, $attributes);
@@ -1856,15 +1899,15 @@ public function doc_link($path, $text = '', $forcepopup = false, array $attribut
      * Return HTML for an image_icon.
      *
      * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_image_icon()} instead.
+     * {@see core_renderer::render_image_icon()} instead.
      *
      * @param string $pix short pix name
      * @param string $alt mandatory alt attribute
      * @param string $component standard compoennt name like 'moodle', 'mod_forum', etc.
-     * @param array $attributes htm attributes
+     * @param null|array $attributes htm attributes
      * @return string HTML fragment
      */
-    public function image_icon($pix, $alt, $component='moodle', array $attributes = null) {
+    public function image_icon($pix, $alt, $component = 'moodle', ?array $attributes = null) {
         $icon = new image_icon($pix, $alt, $component, $attributes);
         return $this->render($icon);
     }
@@ -1884,15 +1927,15 @@ protected function render_image_icon(image_icon $icon) {
      * Return HTML for a pix_icon.
      *
      * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_pix_icon()} instead.
+     * {@see core_renderer::render_pix_icon()} instead.
      *
      * @param string $pix short pix name
      * @param string $alt mandatory alt attribute
      * @param string $component standard compoennt name like 'moodle', 'mod_forum', etc.
-     * @param array $attributes htm lattributes
+     * @param null|array $attributes htm lattributes
      * @return string HTML fragment
      */
-    public function pix_icon($pix, $alt, $component='moodle', array $attributes = null) {
+    public function pix_icon($pix, $alt, $component = 'moodle', ?array $attributes = null) {
         $icon = new pix_icon($pix, $alt, $component, $attributes);
         return $this->render($icon);
     }
@@ -1929,7 +1972,7 @@ function render_rating(rating $rating) {
         global $CFG, $USER;
 
         if ($rating->settings->aggregationmethod == RATING_AGGREGATE_NONE) {
-            return null;//ratings are turned off
+            return null;// ratings are turned off
         }
 
         $ratingmanager = new rating_manager();
@@ -1937,73 +1980,70 @@ function render_rating(rating $rating) {
         $ratingmanager->initialise_rating_javascript($this->page);
 
         $strrate = get_string("rate", "rating");
-        $ratinghtml = ''; //the string we'll return
+        $ratinghtml = ''; // the string we'll return
 
         // permissions check - can they view the aggregate?
         if ($rating->user_can_view_aggregate()) {
-
             $aggregatelabel = $ratingmanager->get_aggregate_label($rating->settings->aggregationmethod);
-            $aggregatelabel = html_writer::tag('span', $aggregatelabel, array('class'=>'rating-aggregate-label'));
+            $aggregatelabel = html_writer::tag('span', $aggregatelabel, ['class' => 'rating-aggregate-label']);
             $aggregatestr   = $rating->get_aggregate_string();
 
-            $aggregatehtml  = html_writer::tag('span', $aggregatestr, array('id' => 'ratingaggregate'.$rating->itemid, 'class' => 'ratingaggregate')).' ';
+            $aggregatehtml  = html_writer::tag('span', $aggregatestr, ['id' => 'ratingaggregate' . $rating->itemid, 'class' => 'ratingaggregate']) . ' ';
             if ($rating->count > 0) {
                 $countstr = "({$rating->count})";
             } else {
                 $countstr = '-';
             }
-            $aggregatehtml .= html_writer::tag('span', $countstr, array('id'=>"ratingcount{$rating->itemid}", 'class' => 'ratingcount')).' ';
+            $aggregatehtml .= html_writer::tag('span', $countstr, ['id' => "ratingcount{$rating->itemid}", 'class' => 'ratingcount']) . ' ';
 
             if ($rating->settings->permissions->viewall && $rating->settings->pluginpermissions->viewall) {
-
                 $nonpopuplink = $rating->get_view_ratings_url();
                 $popuplink = $rating->get_view_ratings_url(true);
 
-                $action = new popup_action('click', $popuplink, 'ratings', array('height' => 400, 'width' => 600));
+                $action = new popup_action('click', $popuplink, 'ratings', ['height' => 400, 'width' => 600]);
                 $aggregatehtml = $this->action_link($nonpopuplink, $aggregatehtml, $action);
             }
 
-            $ratinghtml .= html_writer::tag('span', $aggregatelabel . $aggregatehtml, array('class' => 'rating-aggregate-container'));
+            $ratinghtml .= html_writer::tag('span', $aggregatelabel . $aggregatehtml, ['class' => 'rating-aggregate-container']);
         }
 
         $formstart = null;
         // if the item doesn't belong to the current user, the user has permission to rate
         // and we're within the assessable period
         if ($rating->user_can_rate()) {
-
             $rateurl = $rating->get_rate_url();
             $inputs = $rateurl->params();
 
-            //start the rating form
-            $formattrs = array(
+            // start the rating form
+            $formattrs = [
                 'id'     => "postrating{$rating->itemid}",
                 'class'  => 'postratingform',
                 'method' => 'post',
-                'action' => $rateurl->out_omit_querystring()
-            );
+                'action' => $rateurl->out_omit_querystring(),
+            ];
             $formstart  = html_writer::start_tag('form', $formattrs);
-            $formstart .= html_writer::start_tag('div', array('class' => 'ratingform'));
+            $formstart .= html_writer::start_tag('div', ['class' => 'ratingform']);
 
             // add the hidden inputs
             foreach ($inputs as $name => $value) {
-                $attributes = array('type' => 'hidden', 'class' => 'ratinginput', 'name' => $name, 'value' => $value);
+                $attributes = ['type' => 'hidden', 'class' => 'ratinginput', 'name' => $name, 'value' => $value];
                 $formstart .= html_writer::empty_tag('input', $attributes);
             }
 
             if (empty($ratinghtml)) {
-                $ratinghtml .= $strrate.': ';
+                $ratinghtml .= $strrate . ': ';
             }
-            $ratinghtml = $formstart.$ratinghtml;
+            $ratinghtml = $formstart . $ratinghtml;
 
-            $scalearray = array(RATING_UNSET_RATING => $strrate.'...') + $rating->settings->scale->scaleitems;
-            $scaleattrs = array('class'=>'postratingmenu ratinginput','id'=>'menurating'.$rating->itemid);
-            $ratinghtml .= html_writer::label($rating->rating, 'menurating'.$rating->itemid, false, array('class' => 'accesshide'));
+            $scalearray = [RATING_UNSET_RATING => $strrate . '...'] + $rating->settings->scale->scaleitems;
+            $scaleattrs = ['class' => 'postratingmenu ratinginput', 'id' => 'menurating' . $rating->itemid];
+            $ratinghtml .= html_writer::label($rating->rating, 'menurating' . $rating->itemid, false, ['class' => 'accesshide']);
             $ratinghtml .= html_writer::select($scalearray, 'rating', $rating->rating, false, $scaleattrs);
 
-            //output submit button
-            $ratinghtml .= html_writer::start_tag('span', array('class'=>"ratingsubmit"));
+            // output submit button
+            $ratinghtml .= html_writer::start_tag('span', ['class' => "ratingsubmit"]);
 
-            $attributes = array('type' => 'submit', 'class' => 'postratingmenusubmit', 'id' => 'postratingsubmit'.$rating->itemid, 'value' => s(get_string('rate', 'rating')));
+            $attributes = ['type' => 'submit', 'class' => 'postratingmenusubmit', 'id' => 'postratingsubmit' . $rating->itemid, 'value' => s(get_string('rate', 'rating'))];
             $ratinghtml .= html_writer::empty_tag('input', $attributes);
 
             if (!$rating->settings->scale->isnumeric) {
@@ -2039,7 +2079,7 @@ function render_rating(rating $rating) {
     public function heading_with_help($text, $helpidentifier, $component = 'moodle', $icon = '', $iconalt = '', $level = 2, $classnames = null) {
         $image = '';
         if ($icon) {
-            $image = $this->pix_icon($icon, $iconalt, $component, array('class'=>'icon iconlarge'));
+            $image = $this->pix_icon($icon, $iconalt, $component, ['class' => 'icon iconlarge']);
         }
 
         $help = '';
@@ -2047,7 +2087,7 @@ public function heading_with_help($text, $helpidentifier, $component = 'moodle',
             $help = $this->help_icon($helpidentifier, $component);
         }
 
-        return $this->heading($image.$text.$help, $level, $classnames);
+        return $this->heading($image . $text . $help, $level, $classnames);
     }
 
     /**
@@ -2063,7 +2103,7 @@ public function old_help_icon($helpidentifier, $title, $component = 'moodle', $l
      * Returns HTML to display a help icon.
      *
      * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_help_icon()} instead.
+     * {@see core_renderer::render_help_icon()} instead.
      *
      * @param string $identifier The keyword that defines a help page
      * @param string $component component name
@@ -2104,27 +2144,27 @@ protected function render_help_icon(help_icon $helpicon) {
     public function help_icon_scale($courseid, stdClass $scale) {
         global $CFG;
 
-        $title = get_string('helpprefix2', '', $scale->name) .' ('.get_string('newwindow').')';
+        $title = get_string('helpprefix2', '', $scale->name) . ' (' . get_string('newwindow') . ')';
 
-        $icon = $this->pix_icon('help', get_string('scales'), 'moodle', array('class'=>'iconhelp'));
+        $icon = $this->pix_icon('help', get_string('scales'), 'moodle', ['class' => 'iconhelp']);
 
         $scaleid = abs($scale->id);
 
-        $link = new moodle_url('/course/scales.php', array('id' => $courseid, 'list' => true, 'scaleid' => $scaleid));
+        $link = new moodle_url('/course/scales.php', ['id' => $courseid, 'list' => true, 'scaleid' => $scaleid]);
         $action = new popup_action('click', $link, 'ratingscale');
 
-        return html_writer::tag('span', $this->action_link($link, $icon, $action), array('class' => 'helplink'));
+        return html_writer::tag('span', $this->action_link($link, $icon, $action), ['class' => 'helplink']);
     }
 
     /**
      * Creates and returns a spacer image with optional line break.
      *
-     * @param array $attributes Any HTML attributes to add to the spaced.
+     * @param null|array $attributes Any HTML attributes to add to the spaced.
      * @param bool $br Include a BR after the spacer.... DON'T USE THIS. Don't be
      *     laxy do it with CSS which is a much better solution.
      * @return string HTML fragment
      */
-    public function spacer(array $attributes = null, $br = false) {
+    public function spacer(?array $attributes = null, $br = false) {
         $attributes = (array)$attributes;
         if (empty($attributes['width'])) {
             $attributes['width'] = 1;
@@ -2160,12 +2200,12 @@ public function spacer(array $attributes = null, $br = false) {
      * </pre>
      *
      * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_user_picture()} instead.
+     * {@see core_renderer::render_user_picture()} instead.
      *
      * @param stdClass $user Object with at least fields id, picture, imagealt, firstname, lastname
      *     If any of these are missing, the database is queried. Avoid this
      *     if at all possible, particularly for reports. It is very bad for performance.
-     * @param array $options associative array with user picture options, used only if not a user_picture object,
+     * @param null|array $options associative array with user picture options, used only if not a user_picture object,
      *     options are:
      *     - courseid=$this->page->course->id (course id of user profile in link)
      *     - size=35 (size of image)
@@ -2178,9 +2218,9 @@ public function spacer(array $attributes = null, $br = false) {
      *     - includetoken = false (whether to use a token for authentication. True for current user, int value for other user id)
      * @return string HTML fragment
      */
-    public function user_picture(stdClass $user, array $options = null) {
+    public function user_picture(stdClass $user, ?array $options = null) {
         $userpicture = new user_picture($user);
-        foreach ((array)$options as $key=>$value) {
+        foreach ((array)$options as $key => $value) {
             if (property_exists($userpicture, $key)) {
                 $userpicture->$key = $value;
             }
@@ -2231,7 +2271,7 @@ protected function render_user_picture(user_picture $userpicture) {
 
         $src = $userpicture->get_url($this->page, $this);
 
-        $attributes = array('src' => $src, 'class' => $class, 'width' => $size, 'height' => $size);
+        $attributes = ['src' => $src, 'class' => $class, 'width' => $size, 'height' => $size];
         if (!$userpicture->visibletoscreenreaders) {
             $alt = '';
         }
@@ -2247,7 +2287,8 @@ protected function render_user_picture(user_picture $userpicture) {
             $fullname = fullname($userpicture->user, $canviewfullnames);
             // Don't modify in corner cases where neither the firstname nor the lastname appears.
             $output = html_writer::tag(
-                'span', $initials,
+                'span',
+                $initials,
                 [
                     'class' => 'userinitials size-' . $size,
                     'title' => $fullname,
@@ -2270,18 +2311,20 @@ protected function render_user_picture(user_picture $userpicture) {
             $courseid = $userpicture->courseid;
         }
         if ($courseid == SITEID) {
-            $url = new moodle_url('/user/profile.php', array('id' => $user->id));
+            $url = new moodle_url('/user/profile.php', ['id' => $user->id]);
         } else {
-            $url = new moodle_url('/user/view.php', array('id' => $user->id, 'course' => $courseid));
+            $url = new moodle_url('/user/view.php', ['id' => $user->id, 'course' => $courseid]);
         }
 
         // Then wrap it in link if needed. Also we don't wrap it in link if the link redirects to itself.
-        if (!$userpicture->link ||
-                ($this->page->has_set_url() && $this->page->url == $url)) { // Protect against unset page->url.
+        if (
+            !$userpicture->link ||
+                ($this->page->has_set_url() && $this->page->url == $url)
+        ) { // Protect against unset page->url.
             return $output;
         }
 
-        $attributes = array('href' => $url, 'class' => 'd-inline-block aabtn');
+        $attributes = ['href' => $url, 'class' => 'd-inline-block aabtn'];
         if (!$userpicture->visibletoscreenreaders) {
             $attributes['tabindex'] = '-1';
             $attributes['aria-hidden'] = 'true';
@@ -2311,7 +2354,7 @@ public function htmllize_file_tree() {
      * </pre>
      *
      * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_file_picker()} instead.
+     * {@see core_renderer::render_file_picker()} instead.
      *
      * @param stdClass $options file manager options
      *   options are:
@@ -2342,7 +2385,7 @@ public function render_file_picker(file_picker $fp) {
         $strloading  = get_string('loading', 'repository');
         $strdndenabled = get_string('dndenabled_inbox', 'moodle');
         $strdroptoupload = get_string('droptoupload', 'moodle');
-        $iconprogress = $this->pix_icon('i/loading_small', $strloading).'';
+        $iconprogress = $this->pix_icon('i/loading_small', $strloading) . '';
 
         $currentfile = $options->currentfile;
         if (empty($currentfile)) {
@@ -2438,7 +2481,6 @@ public function edit_button(moodle_url $url, string $method = 'post') {
      */
     public function edit_switch() {
         if ($this->page->user_allowed_editing()) {
-
             $temp = (object) [
                 'legacyseturl' => (new moodle_url('/editmode.php'))->out(false),
                 'pagecontextid' => $this->page->context->id,
@@ -2458,7 +2500,7 @@ public function edit_switch() {
      * @param string $text The lang string for the button's label (already output from get_string())
      * @return string html fragment
      */
-    public function close_window_button($text='') {
+    public function close_window_button($text = '') {
         if (empty($text)) {
             $text = get_string('closewindow');
         }
@@ -2479,8 +2521,8 @@ public function error_text($message) {
         if (empty($message)) {
             return '';
         }
-        $message = $this->pix_icon('i/warning', get_string('error'), '', array('class' => 'icon icon-pre', 'title'=>'')) . $message;
-        return html_writer::tag('span', $message, array('class' => 'error'));
+        $message = $this->pix_icon('i/warning', get_string('error'), '', ['class' => 'icon icon-pre', 'title' => '']) . $message;
+        return html_writer::tag('span', $message, ['class' => 'error']);
     }
 
     /**
@@ -2493,7 +2535,8 @@ public function error_text($message) {
      * @param string $moreinfourl URL where more info can be found about the error
      * @param string $link Link for the Continue button
      * @param array $backtrace The execution backtrace
-     * @param string $debuginfo Debugging information
+     * @param null|string $debuginfo Debugging information
+     * @param string $errorcode
      * @return string the HTML to output.
      */
     public function fatal_error($message, $moreinfourl, $link, $backtrace, $debuginfo = null, $errorcode = "") {
@@ -2506,7 +2549,6 @@ public function fatal_error($message, $moreinfourl, $link, $backtrace, $debuginf
             // we can not always recover properly here, we have problems with output buffering,
             // html tables, etc.
             $output .= $this->opencontainers->pop_all_but_last();
-
         } else {
             // It is really bad if library code throws exception when output buffering is on,
             // because the buffered text would be printed before our start of page.
@@ -2536,7 +2578,7 @@ public function fatal_error($message, $moreinfourl, $link, $backtrace, $debuginf
 
             $this->page->set_context(null); // ugly hack - make sure page context is set to something, we do not want bogus warnings here
             $this->page->set_url('/'); // no url
-            //$this->page->set_pagelayout('base'); //TODO: MDL-20676 blocks on error pages are weird, unfortunately it somehow detect the pagelayout from URL :-(
+            // $this->page->set_pagelayout('base'); //TODO: MDL-20676 blocks on error pages are weird, unfortunately it somehow detect the pagelayout from URL :-(
             $this->page->set_title(get_string('error'));
             $this->page->set_heading($this->page->course->fullname);
             // No need to display the activity header when encountering an error.
@@ -2544,14 +2586,14 @@ public function fatal_error($message, $moreinfourl, $link, $backtrace, $debuginf
             $output .= $this->header();
         }
 
-        $message = '<p class="errormessage">' . s($message) . '</p>'.
+        $message = '<p class="errormessage">' . s($message) . '</p>' .
                 '<p class="errorcode"><a href="' . s($moreinfourl) . '">' .
                 get_string('moreinformation') . '</a></p>';
         if (empty($CFG->rolesactive)) {
             $message .= '<p class="errormessage">' . get_string('installproblem', 'error') . '</p>';
-            //It is usually not possible to recover from errors triggered during installation, you may need to create a new database or use a different database prefix for new installation.
+            // It is usually not possible to recover from errors triggered during installation, you may need to create a new database or use a different database prefix for new installation.
         }
-        $output .= $this->box($message, 'errorbox alert alert-danger', null, array('data-rel' => 'fatalerror'));
+        $output .= $this->box($message, 'errorbox alert alert-danger', null, ['data-rel' => 'fatalerror']);
 
         if ($CFG->debugdeveloper) {
             $labelsep = get_string('labelsep', 'langconfig');
@@ -2565,7 +2607,7 @@ public function fatal_error($message, $moreinfourl, $link, $backtrace, $debuginf
                 $label = get_string('stacktrace', 'debug') . $labelsep;
                 $output .= $this->notification("<strong>$label</strong> " . format_backtrace($backtrace), 'notifytiny');
             }
-            if ($obbuffer !== '' ) {
+            if ($obbuffer !== '') {
                 $label = get_string('outputbuffer', 'debug') . $labelsep;
                 $output .= $this->notification("<strong>$label</strong> " . s($obbuffer), 'notifytiny');
             }
@@ -2652,7 +2694,7 @@ public function notification($message, $type = null, $closebutton = true) {
      * @deprecated since Moodle 3.1 MDL-30811 - please do not use this function any more.
      */
     public function notify_problem() {
-        throw new coding_exception('core_renderer::notify_problem() can not be used any more, '.
+        throw new coding_exception('core_renderer::notify_problem() can not be used any more, ' .
             'please use \core\notification::add(), or \core\output\notification as required.');
     }
 
@@ -2660,7 +2702,7 @@ public function notify_problem() {
      * @deprecated since Moodle 3.1 MDL-30811 - please do not use this function any more.
      */
     public function notify_success() {
-        throw new coding_exception('core_renderer::notify_success() can not be used any more, '.
+        throw new coding_exception('core_renderer::notify_success() can not be used any more, ' .
             'please use \core\notification::add(), or \core\output\notification as required.');
     }
 
@@ -2668,7 +2710,7 @@ public function notify_success() {
      * @deprecated since Moodle 3.1 MDL-30811 - please do not use this function any more.
      */
     public function notify_message() {
-        throw new coding_exception('core_renderer::notify_message() can not be used any more, '.
+        throw new coding_exception('core_renderer::notify_message() can not be used any more, ' .
             'please use \core\notification::add(), or \core\output\notification as required.');
     }
 
@@ -2676,7 +2718,7 @@ public function notify_message() {
      * @deprecated since Moodle 3.1 MDL-30811 - please do not use this function any more.
      */
     public function notify_redirect() {
-        throw new coding_exception('core_renderer::notify_redirect() can not be used any more, '.
+        throw new coding_exception('core_renderer::notify_redirect() can not be used any more, ' .
             'please use \core\notification::add(), or \core\output\notification as required.');
     }
 
@@ -2711,7 +2753,7 @@ public function continue_button($url) {
      * Returns HTML to display a single paging bar to provide access to other pages  (usually in a search)
      *
      * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_paging_bar()} instead.
+     * {@see core_renderer::render_paging_bar()} instead.
      *
      * @param int $totalcount The total number of entries available to be paged through
      * @param int $page The page you are currently viewing
@@ -2771,7 +2813,7 @@ protected function render_initials_bar(initials_bar $initialsbar) {
      * @return string the HTML to output.
      */
     public function skip_link_target($id = null) {
-        return html_writer::span('', '', array('id' => $id));
+        return html_writer::span('', '', ['id' => $id]);
     }
 
     /**
@@ -2784,11 +2826,11 @@ public function skip_link_target($id = null) {
      * @return string the HTML to output.
      */
     public function heading($text, $level = 2, $classes = null, $id = null) {
-        $level = (integer) $level;
+        $level = (int) $level;
         if ($level < 1 or $level > 6) {
             throw new coding_exception('Heading level must be an integer between 1 and 6.');
         }
-        return html_writer::tag('h' . $level, $text, array('id' => $id, 'class' => renderer_base::prepare_classes($classes)));
+        return html_writer::tag('h' . $level, $text, ['id' => $id, 'class' => renderer_base::prepare_classes($classes)]);
     }
 
     /**
@@ -2800,7 +2842,7 @@ public function heading($text, $level = 2, $classes = null, $id = null) {
      * @param array $attributes An array of other attributes to give the box.
      * @return string the HTML to output.
      */
-    public function box($contents, $classes = 'generalbox', $id = null, $attributes = array()) {
+    public function box($contents, $classes = 'generalbox', $id = null, $attributes = []) {
         return $this->box_start($classes, $id, $attributes) . $contents . $this->box_end();
     }
 
@@ -2812,7 +2854,7 @@ public function box($contents, $classes = 'generalbox', $id = null, $attributes
      * @param array $attributes An array of other attributes to give the box.
      * @return string the HTML to output.
      */
-    public function box_start($classes = 'generalbox', $id = null, $attributes = array()) {
+    public function box_start($classes = 'generalbox', $id = null, $attributes = []) {
         $this->opencontainers->push('box', html_writer::end_tag('div'));
         $attributes['id'] = $id;
         $attributes['class'] = 'box py-3 ' . renderer_base::prepare_classes($classes);
@@ -2913,40 +2955,40 @@ public function container_end() {
      * @param array $attrs html attributes passed to the top ofs the list
      * @return string HTML
      */
-    public function tree_block_contents($items, $attrs = array()) {
+    public function tree_block_contents($items, $attrs = []) {
         // exit if empty, we don't want an empty ul element
         if (empty($items)) {
             return '';
         }
         // array of nested li elements
-        $lis = array();
+        $lis = [];
         foreach ($items as $item) {
             // this applies to the li item which contains all child lists too
             $content = $item->content($this);
-            $liclasses = array($item->get_css_type());
-            if (!$item->forceopen || (!$item->forceopen && $item->collapse) || ($item->children->count()==0  && $item->nodetype==navigation_node::NODETYPE_BRANCH)) {
+            $liclasses = [$item->get_css_type()];
+            if (!$item->forceopen || (!$item->forceopen && $item->collapse) || ($item->children->count() == 0  && $item->nodetype == navigation_node::NODETYPE_BRANCH)) {
                 $liclasses[] = 'collapsed';
             }
             if ($item->isactive === true) {
                 $liclasses[] = 'current_branch';
             }
-            $liattr = array('class'=>join(' ',$liclasses));
+            $liattr = ['class' => join(' ', $liclasses)];
             // class attribute on the div item which only contains the item content
-            $divclasses = array('tree_item');
-            if ($item->children->count()>0  || $item->nodetype==navigation_node::NODETYPE_BRANCH) {
+            $divclasses = ['tree_item'];
+            if ($item->children->count() > 0  || $item->nodetype == navigation_node::NODETYPE_BRANCH) {
                 $divclasses[] = 'branch';
             } else {
                 $divclasses[] = 'leaf';
             }
-            if (!empty($item->classes) && count($item->classes)>0) {
+            if (!empty($item->classes) && count($item->classes) > 0) {
                 $divclasses[] = join(' ', $item->classes);
             }
-            $divattr = array('class'=>join(' ', $divclasses));
+            $divattr = ['class' => join(' ', $divclasses)];
             if (!empty($item->id)) {
                 $divattr['id'] = $item->id;
             }
             $content = html_writer::tag('p', $content, $divattr) . $this->tree_block_contents($item->children);
-            if (!empty($item->preceedwithhr) && $item->preceedwithhr===true) {
+            if (!empty($item->preceedwithhr) && $item->preceedwithhr === true) {
                 $content = html_writer::empty_tag('hr') . $content;
             }
             $content = html_writer::tag('li', $content, $liattr);
@@ -3088,7 +3130,7 @@ public function user_menu($user = null, $withlinks = null) {
                         'value'
                     )
                 ),
-                array('class' => 'meta viewingas')
+                ['class' => 'meta viewingas']
             );
         }
 
@@ -3139,7 +3181,6 @@ public function user_menu($user = null, $withlinks = null) {
             $navitemcount = count($opts->navitems);
             $idx = 0;
             foreach ($opts->navitems as $key => $value) {
-
                 switch ($value->itemtype) {
                     case 'divider':
                         // If the nav item is a divider, add one and skip link processing.
@@ -3154,12 +3195,12 @@ public function user_menu($user = null, $withlinks = null) {
                         // Process this as a link item.
                         $pix = null;
                         if (isset($value->pix) && !empty($value->pix)) {
-                            $pix = new pix_icon($value->pix, '', null, array('class' => 'iconsmall'));
+                            $pix = new pix_icon($value->pix, '', null, ['class' => 'iconsmall']);
                         } else if (isset($value->imgsrc) && !empty($value->imgsrc)) {
                             $value->title = html_writer::img(
                                 $value->imgsrc,
                                 $value->title,
-                                array('class' => 'iconsmall')
+                                ['class' => 'iconsmall']
                             ) . $value->title;
                         }
 
@@ -3167,7 +3208,7 @@ public function user_menu($user = null, $withlinks = null) {
                             $value->url,
                             $pix,
                             $value->title,
-                            array('class' => 'icon')
+                            ['class' => 'icon']
                         );
                         if (!empty($value->titleidentifier)) {
                             $al->attributes['data-title'] = $value->titleidentifier;
@@ -3239,7 +3280,7 @@ protected function render_breadcrumb_navigation_node(breadcrumb_navigation_node
         if ($item->action instanceof moodle_url) {
             $content = $item->get_content();
             $title = $item->get_title();
-            $attributes = array();
+            $attributes = [];
             $attributes['itemprop'] = 'url';
             if ($title !== '') {
                 $attributes['title'] = $title;
@@ -3250,14 +3291,13 @@ protected function render_breadcrumb_navigation_node(breadcrumb_navigation_node
             if ($item->is_last()) {
                 $attributes['aria-current'] = 'page';
             }
-            $content = html_writer::tag('span', $content, array('itemprop' => 'title'));
+            $content = html_writer::tag('span', $content, ['itemprop' => 'title']);
             $content = html_writer::link($item->action, $content, $attributes);
 
-            $attributes = array();
+            $attributes = [];
             $attributes['itemscope'] = '';
             $attributes['itemtype'] = 'http://data-vocabulary.org/Breadcrumb';
             $content = html_writer::tag('span', $content, $attributes);
-
         } else {
             $content = $this->render_navigation_node($item);
         }
@@ -3275,10 +3315,10 @@ protected function render_navigation_node(navigation_node $item) {
         $title = $item->get_title();
         if ($item->icon instanceof renderable && !$item->hideicon) {
             $icon = $this->render($item->icon);
-            $content = $icon.$content; // use CSS for spacing of icons
+            $content = $icon . $content; // use CSS for spacing of icons
         }
         if ($item->helpbutton !== null) {
-            $content = trim($item->helpbutton).html_writer::tag('span', $content, array('class'=>'clearhelpbutton', 'tabindex'=>'0'));
+            $content = trim($item->helpbutton) . html_writer::tag('span', $content, ['class' => 'clearhelpbutton', 'tabindex' => '0']);
         }
         if ($content === '') {
             return '';
@@ -3294,7 +3334,7 @@ protected function render_navigation_node(navigation_node $item) {
             }
             $content = $this->render($link);
         } else if ($item->action instanceof moodle_url) {
-            $attributes = array();
+            $attributes = [];
             if ($title !== '') {
                 $attributes['title'] = $title;
             }
@@ -3302,9 +3342,8 @@ protected function render_navigation_node(navigation_node $item) {
                 $attributes['class'] = 'dimmed_text';
             }
             $content = html_writer::link($item->action, $content, $attributes);
-
         } else if (is_string($item->action) || empty($item->action)) {
-            $attributes = array('tabindex'=>'0'); //add tab support to span but still maintain character stream sequence.
+            $attributes = ['tabindex' => '0']; // add tab support to span but still maintain character stream sequence.
             if ($title !== '') {
                 $attributes['title'] = $title;
             }
@@ -3375,7 +3414,7 @@ public function darrow() {
      * and then configuring the custommenu config setting as described.
      *
      * Theme developers: DO NOT OVERRIDE! Please override function
-     * {@link core_renderer::render_custom_menu()} instead.
+     * {@see core_renderer::render_custom_menu()} instead.
      *
      * @param string $custommenuitems - custom menuitems set by theme instead of global theme settings
      * @return string
@@ -3415,7 +3454,7 @@ public function custom_menu_flat() {
             }
             $this->language = $custommenu->add($currentlang, new moodle_url('#'), $strlang, 10000);
             foreach ($langs as $langtype => $langname) {
-                $this->language->add($langname, new moodle_url($this->page->url, array('lang' => $langtype)), $langname);
+                $this->language->add($langname, new moodle_url($this->page->url, ['lang' => $langtype]), $langname);
             }
         }
 
@@ -3495,11 +3534,11 @@ protected function render_custom_menu_item(custom_menu_item $menunode) {
             if ($menunode->get_url() !== null) {
                 $url = $menunode->get_url();
             } else {
-                $url = '#cm_submenu_'.$submenucount;
+                $url = '#cm_submenu_' . $submenucount;
             }
-            $content .= html_writer::link($url, $menunode->get_text(), array('class'=>'yui3-menu-label', 'title'=>$menunode->get_title()));
-            $content .= html_writer::start_tag('div', array('id'=>'cm_submenu_'.$submenucount, 'class'=>'yui3-menu custom_menu_submenu'));
-            $content .= html_writer::start_tag('div', array('class'=>'yui3-menu-content'));
+            $content .= html_writer::link($url, $menunode->get_text(), ['class' => 'yui3-menu-label', 'title' => $menunode->get_title()]);
+            $content .= html_writer::start_tag('div', ['id' => 'cm_submenu_' . $submenucount, 'class' => 'yui3-menu custom_menu_submenu']);
+            $content .= html_writer::start_tag('div', ['class' => 'yui3-menu-content']);
             $content .= html_writer::start_tag('ul');
             foreach ($menunode->get_children() as $menunode) {
                 $content .= $this->render_custom_menu_item($menunode);
@@ -3513,15 +3552,14 @@ protected function render_custom_menu_item(custom_menu_item $menunode) {
             // Also, if the node's text matches '####', add a class so we can treat it as a divider.
             $content = '';
             if (preg_match("/^#+$/", $menunode->get_text())) {
-
                 // This is a divider.
-                $content = html_writer::start_tag('li', array('class' => 'yui3-menuitem divider'));
+                $content = html_writer::start_tag('li', ['class' => 'yui3-menuitem divider']);
             } else {
                 $content = html_writer::start_tag(
                     'li',
-                    array(
-                        'class' => 'yui3-menuitem'
-                    )
+                    [
+                        'class' => 'yui3-menuitem',
+                    ]
                 );
                 if ($menunode->get_url() !== null) {
                     $url = $menunode->get_url();
@@ -3531,7 +3569,7 @@ protected function render_custom_menu_item(custom_menu_item $menunode) {
                 $content .= html_writer::link(
                     $url,
                     $menunode->get_text(),
-                    array('class' => 'yui3-menuitem-content', 'title' => $menunode->get_title())
+                    ['class' => 'yui3-menuitem-content', 'title' => $menunode->get_title()]
                 );
             }
             $content .= html_writer::end_tag('li');
@@ -3564,10 +3602,10 @@ protected function theme_switch_links() {
             $linktext = get_string('switchdevicedefault');
             $devicetype = 'default';
         }
-        $linkurl = new moodle_url('/theme/switchdevice.php', array('url' => $this->page->url, 'device' => $devicetype, 'sesskey' => sesskey()));
+        $linkurl = new moodle_url('/theme/switchdevice.php', ['url' => $this->page->url, 'device' => $devicetype, 'sesskey' => sesskey()]);
 
-        $content  = html_writer::start_tag('div', array('id' => 'theme_switch_link'));
-        $content .= html_writer::link($linkurl, $linktext, array('rel' => 'nofollow'));
+        $content  = html_writer::start_tag('div', ['id' => 'theme_switch_link']);
+        $content .= html_writer::link($linkurl, $linktext, ['rel' => 'nofollow']);
         $content .= html_writer::end_tag('div');
 
         return $content;
@@ -3579,7 +3617,7 @@ protected function theme_switch_links() {
      * This function replaces print_tabs() used before Moodle 2.5 but with slightly different arguments
      *
      * Theme developers: In order to change how tabs are displayed please override functions
-     * {@link core_renderer::render_tabtree()} and/or {@link core_renderer::render_tabobject()}
+     * {@see core_renderer::render_tabtree()} and/or {@see core_renderer::render_tabobject()}
      *
      * @param array $tabs array of tabs, each of them may have it's own ->subtree
      * @param string|null $selected which tab to mark as selected, all parent tabs will
@@ -3609,7 +3647,7 @@ protected function render_tabtree(tabtree $tabtree) {
     /**
      * Renders tabobject (part of tabtree)
      *
-     * This function is called from {@link core_renderer::render_tabtree()}
+     * This function is called from {@see core_renderer::render_tabtree()}
      * and also it calls itself when printing the $tabobject subtree recursively.
      *
      * Property $tabobject->level indicates the number of row of tabs.
@@ -3625,27 +3663,27 @@ protected function render_tabobject(tabobject $tabobject) {
             // No name for tabtree root.
         } else if ($tabobject->inactive || $tabobject->activated || ($tabobject->selected && !$tabobject->linkedwhenselected)) {
             // Tab name without a link. The <a> tag is used for styling.
-            $str .= html_writer::tag('a', html_writer::span($tabobject->text), array('class' => 'nolink moodle-has-zindex'));
+            $str .= html_writer::tag('a', html_writer::span($tabobject->text), ['class' => 'nolink moodle-has-zindex']);
         } else {
             // Tab name with a link.
             if (!($tabobject->link instanceof moodle_url)) {
                 // backward compartibility when link was passed as quoted string
                 $str .= "<a href=\"$tabobject->link\" title=\"$tabobject->title\"><span>$tabobject->text</span></a>";
             } else {
-                $str .= html_writer::link($tabobject->link, html_writer::span($tabobject->text), array('title' => $tabobject->title));
+                $str .= html_writer::link($tabobject->link, html_writer::span($tabobject->text), ['title' => $tabobject->title]);
             }
         }
 
         if (empty($tabobject->subtree)) {
             if ($tabobject->selected) {
-                $str .= html_writer::tag('div', '&nbsp;', array('class' => 'tabrow'. ($tabobject->level + 1). ' empty'));
+                $str .= html_writer::tag('div', '&nbsp;', ['class' => 'tabrow' . ($tabobject->level + 1) . ' empty']);
             }
             return $str;
         }
 
         // Print subtree.
         if ($tabobject->level == 0 || $tabobject->selected || $tabobject->activated) {
-            $str .= html_writer::start_tag('ul', array('class' => 'tabrow'. $tabobject->level));
+            $str .= html_writer::start_tag('ul', ['class' => 'tabrow' . $tabobject->level]);
             $cnt = 0;
             foreach ($tabobject->subtree as $tab) {
                 $liclass = '';
@@ -3666,7 +3704,7 @@ protected function render_tabobject(tabobject $tabobject) {
                 }
 
                 // This will recursively call function render_tabobject() for each item in subtree.
-                $str .= html_writer::tag('li', $this->render($tab), array('class' => trim($liclass)));
+                $str .= html_writer::tag('li', $this->render($tab), ['class' => trim($liclass)]);
                 $cnt++;
             }
             $str .= html_writer::end_tag('ul');
@@ -3685,16 +3723,16 @@ protected function render_tabobject(tabobject $tabobject) {
      * @param boolean $fakeblocksonly Include fake blocks only.
      * @return string HTML.
      */
-    public function blocks($region, $classes = array(), $tag = 'aside', $fakeblocksonly = false) {
+    public function blocks($region, $classes = [], $tag = 'aside', $fakeblocksonly = false) {
         $displayregion = $this->page->apply_theme_region_manipulations($region);
         $classes = (array)$classes;
         $classes[] = 'block-region';
-        $attributes = array(
-            'id' => 'block-region-'.preg_replace('#[^a-zA-Z0-9_\-]+#', '-', $displayregion),
+        $attributes = [
+            'id' => 'block-region-' . preg_replace('#[^a-zA-Z0-9_\-]+#', '-', $displayregion),
             'class' => join(' ', $classes),
             'data-blockregion' => $displayregion,
-            'data-droptarget' => '1'
-        );
+            'data-droptarget' => '1',
+        ];
         if ($this->page->blocks->region_has_content($displayregion, $this)) {
             $content = html_writer::tag('h2', get_string('blocks'), ['class' => 'sr-only']) .
                 $this->blocks_for_region($displayregion, $fakeblocksonly);
@@ -3733,7 +3771,7 @@ public function custom_block_region($regionname) {
      * @param array $additionalclasses Any additional classes to apply.
      * @return string
      */
-    public function body_css_classes(array $additionalclasses = array()) {
+    public function body_css_classes(array $additionalclasses = []) {
         return $this->page->bodyclasses . ' ' . implode(' ', $additionalclasses);
     }
 
@@ -3754,11 +3792,11 @@ public function body_id() {
      * @param string|array $additionalclasses Any additional classes to give the body tag,
      * @return string
      */
-    public function body_attributes($additionalclasses = array()) {
+    public function body_attributes($additionalclasses = []) {
         if (!is_array($additionalclasses)) {
             $additionalclasses = explode(' ', $additionalclasses);
         }
-        return ' id="'. $this->body_id().'" class="'.$this->body_css_classes($additionalclasses).'"';
+        return ' id="' . $this->body_id() . '" class="' . $this->body_css_classes($additionalclasses) . '"';
     }
 
     /**
@@ -3812,9 +3850,11 @@ public function supportemail(array $customattribs = [], bool $embed = false): st
 
         // Do not provide a link to contact site support if it is unavailable to this user. This would be where the site has
         // disabled support, or limited it to authenticated users and the current user is a guest or not logged in.
-        if (!isset($CFG->supportavailability) ||
+        if (
+            !isset($CFG->supportavailability) ||
                 $CFG->supportavailability == CONTACT_SUPPORT_DISABLED ||
-                ($CFG->supportavailability == CONTACT_SUPPORT_AUTHENTICATED && (!isloggedin() || isguestuser()))) {
+                ($CFG->supportavailability == CONTACT_SUPPORT_AUTHENTICATED && (!isloggedin() || isguestuser()))
+        ) {
             return '';
         }
 
@@ -3847,9 +3887,11 @@ public function supportemail(array $customattribs = [], bool $embed = false): st
     public function services_support_link(): string {
         global $CFG;
 
-        if (during_initial_install() ||
+        if (
+            during_initial_install() ||
             (isset($CFG->showservicesandsupportcontent) && $CFG->showservicesandsupportcontent == false) ||
-            !is_siteadmin()) {
+            !is_siteadmin()
+        ) {
             return '';
         }
 
@@ -3945,8 +3987,14 @@ public function favicon() {
         }
 
         // Use $CFG->themerev to prevent browser caching when the file changes.
-        return moodle_url::make_pluginfile_url(context_system::instance()->id, 'core_admin', 'favicon', '64x64/',
-            theme_get_revision(), $logo);
+        return moodle_url::make_pluginfile_url(
+            context_system::instance()->id,
+            'core_admin',
+            'favicon',
+            '64x64/',
+            theme_get_revision(),
+            $logo
+        );
     }
 
     /**
@@ -3967,7 +4015,7 @@ public function render_preferences_groups(preferences_groups $renderable) {
      */
     public function render_preferences_group(preferences_group $renderable) {
         $html = '';
-        $html .= html_writer::start_tag('div', array('class' => 'col-sm-4 preferences-group'));
+        $html .= html_writer::start_tag('div', ['class' => 'col-sm-4 preferences-group']);
         $html .= $this->heading($renderable->title, 3);
         $html .= html_writer::start_tag('ul');
         foreach ($renderable->nodes as $node) {
@@ -4003,7 +4051,7 @@ public function context_header($headerinfo = null, $headinglevel = 1) {
                 $user = $headerinfo['user'];
             } else {
                 // Look up the user information if it is not supplied.
-                $user = $DB->get_record('user', array('id' => $context->instanceid));
+                $user = $DB->get_record('user', ['id' => $context->instanceid]);
             }
 
             // If the user context is set, then use that for capability checks.
@@ -4023,20 +4071,20 @@ public function context_header($headerinfo = null, $headinglevel = 1) {
                     $heading = fullname($user);
                 }
 
-                $imagedata = $this->user_picture($user, array('size' => 100));
+                $imagedata = $this->user_picture($user, ['size' => 100]);
 
                 // Check to see if we should be displaying a message button.
                 if (!empty($CFG->messaging) && has_capability('moodle/site:sendmessage', $context)) {
-                    $userbuttons = array(
-                        'messages' => array(
+                    $userbuttons = [
+                        'messages' => [
                             'buttontype' => 'message',
                             'title' => get_string('message', 'message'),
-                            'url' => new moodle_url('/message/index.php', array('id' => $user->id)),
+                            'url' => new moodle_url('/message/index.php', ['id' => $user->id]),
                             'image' => 'message',
                             'linkattributes' => \core_message\helper::messageuser_link_params($user->id),
-                            'page' => $this->page
-                        )
-                    );
+                            'page' => $this->page,
+                        ],
+                    ];
 
                     if ($USER->id != $user->id) {
                         $iscontact = \core_message\api::is_contact($USER->id, $user->id);
@@ -4076,19 +4124,19 @@ public function context_header($headerinfo = null, $headinglevel = 1) {
                             $contacturlaction = 'removecontact';
                             $contactimage = 'removecontact';
                         }
-                        $userbuttons['togglecontact'] = array(
+                        $userbuttons['togglecontact'] = [
                                 'buttontype' => 'togglecontact',
                                 'title' => get_string($contacttitle, 'message'),
-                                'url' => new moodle_url('/message/index.php', array(
-                                        'user1' => $USER->id,
-                                        'user2' => $user->id,
-                                        $contacturlaction => $user->id,
-                                        'sesskey' => sesskey())
-                                ),
+                                'url' => new moodle_url('/message/index.php', [
+                                    'user1' => $USER->id,
+                                    'user2' => $user->id,
+                                    $contacturlaction => $user->id,
+                                    'sesskey' => sesskey(),
+                                ]),
                                 'image' => $contactimage,
                                 'linkattributes' => $linkattributes,
-                                'page' => $this->page
-                            );
+                                'page' => $this->page,
+                            ];
                     }
                 }
             } else {
@@ -4136,8 +4184,10 @@ public function full_header() {
         } else if ($homepage == HOMEPAGE_SITE) {
             $homepagetype = 'site-index';
         }
-        if ($this->page->include_region_main_settings_in_header_actions() &&
-                !$this->page->blocks->is_block_present('settings')) {
+        if (
+            $this->page->include_region_main_settings_in_header_actions() &&
+                !$this->page->blocks->is_block_present('settings')
+        ) {
             // Only include the region main settings if the page has requested it and it doesn't already have
             // the settings block on it. The region main settings are included in the settings block and
             // duplicating the content causes behat failures.
@@ -4180,25 +4230,29 @@ public function context_header_settings_menu() {
         $showusermenu = false;
 
         // We are on the course home page.
-        if (($context->contextlevel == CONTEXT_COURSE) &&
+        if (
+            ($context->contextlevel == CONTEXT_COURSE) &&
                 !empty($currentnode) &&
-                ($currentnode->type == navigation_node::TYPE_COURSE || $currentnode->type == navigation_node::TYPE_SECTION)) {
+                ($currentnode->type == navigation_node::TYPE_COURSE || $currentnode->type == navigation_node::TYPE_SECTION)
+        ) {
             $showcoursemenu = true;
         }
 
         $courseformat = course_get_format($this->page->course);
         // This is a single activity course format, always show the course menu on the activity main page.
-        if ($context->contextlevel == CONTEXT_MODULE &&
-                !$courseformat->has_view_page()) {
-
+        if (
+            $context->contextlevel == CONTEXT_MODULE &&
+                !$courseformat->has_view_page()
+        ) {
             $this->page->navigation->initialise();
             $activenode = $this->page->navigation->find_active_node();
             // If the settings menu has been forced then show the menu.
             if ($this->page->is_settings_menu_forced()) {
                 $showcoursemenu = true;
-            } else if (!empty($activenode) && ($activenode->type == navigation_node::TYPE_ACTIVITY ||
-                            $activenode->type == navigation_node::TYPE_RESOURCE)) {
-
+            } else if (
+                !empty($activenode) && ($activenode->type == navigation_node::TYPE_ACTIVITY ||
+                            $activenode->type == navigation_node::TYPE_RESOURCE)
+            ) {
                 // We only want to show the menu on the first page of the activity. This means
                 // the breadcrumb has no additional nodes.
                 if ($currentnode && ($currentnode->key == $activenode->key && $currentnode->type == $activenode->type)) {
@@ -4208,16 +4262,20 @@ public function context_header_settings_menu() {
         }
 
         // This is the site front page.
-        if ($context->contextlevel == CONTEXT_COURSE &&
+        if (
+            $context->contextlevel == CONTEXT_COURSE &&
                 !empty($currentnode) &&
-                $currentnode->key === 'home') {
+                $currentnode->key === 'home'
+        ) {
             $showfrontpagemenu = true;
         }
 
         // This is the user profile page.
-        if ($context->contextlevel == CONTEXT_USER &&
+        if (
+            $context->contextlevel == CONTEXT_USER &&
                 !empty($currentnode) &&
-                ($currentnode->key === 'myprofile')) {
+                ($currentnode->key === 'myprofile')
+        ) {
             $showusermenu = true;
         }
 
@@ -4230,7 +4288,7 @@ public function context_header_settings_menu() {
                 // We only add a list to the full settings menu if we didn't include every node in the short menu.
                 if ($skipped) {
                     $text = get_string('morenavigationlinks');
-                    $url = new moodle_url('/course/admin.php', array('courseid' => $this->page->course->id));
+                    $url = new moodle_url('/course/admin.php', ['courseid' => $this->page->course->id]);
                     $link = new action_link($url, $text, null, null, new pix_icon('t/edit', $text));
                     $menu->add_secondary_action($link);
                 }
@@ -4244,7 +4302,7 @@ public function context_header_settings_menu() {
                 // We only add a list to the full settings menu if we didn't include every node in the short menu.
                 if ($skipped) {
                     $text = get_string('morenavigationlinks');
-                    $url = new moodle_url('/course/admin.php', array('courseid' => $this->page->course->id));
+                    $url = new moodle_url('/course/admin.php', ['courseid' => $this->page->course->id]);
                     $link = new action_link($url, $text, null, null, new pix_icon('t/edit', $text));
                     $menu->add_secondary_action($link);
                 }
@@ -4271,10 +4329,12 @@ public function context_header_settings_menu() {
      * @param boolean $onlytopleafnodes
      * @return boolean nodesskipped - True if nodes were skipped in building the menu
      */
-    protected function build_action_menu_from_navigation(action_menu $menu,
-            navigation_node $node,
-            $indent = false,
-            $onlytopleafnodes = false) {
+    protected function build_action_menu_from_navigation(
+        action_menu $menu,
+        navigation_node $node,
+        $indent = false,
+        $onlytopleafnodes = false
+    ) {
         $skipped = false;
         // Build an action menu based on the visible nodes from this navigation tree.
         foreach ($node->children as $menuitem) {
@@ -4325,16 +4385,16 @@ public function region_main_settings_menu() {
         $menu = new action_menu();
 
         if ($context->contextlevel == CONTEXT_MODULE) {
-
             $this->page->navigation->initialise();
             $node = $this->page->navigation->find_active_node();
             $buildmenu = false;
             // If the settings menu has been forced then show the menu.
             if ($this->page->is_settings_menu_forced()) {
                 $buildmenu = true;
-            } else if (!empty($node) && ($node->type == navigation_node::TYPE_ACTIVITY ||
-                            $node->type == navigation_node::TYPE_RESOURCE)) {
-
+            } else if (
+                !empty($node) && ($node->type == navigation_node::TYPE_ACTIVITY ||
+                            $node->type == navigation_node::TYPE_RESOURCE)
+            ) {
                 $items = $this->page->navbar->get_items();
                 $navbarnode = end($items);
                 // We only want to show the menu on the first page of the activity. This means
@@ -4351,7 +4411,6 @@ public function region_main_settings_menu() {
                     $this->build_action_menu_from_navigation($menu, $node);
                 }
             }
-
         } else if ($context->contextlevel == CONTEXT_COURSECAT) {
             // For course category context, show category settings menu, if we're on the course category page.
             if ($this->page->pagetype === 'course-index-category') {
@@ -4361,7 +4420,6 @@ public function region_main_settings_menu() {
                     $this->build_action_menu_from_navigation($menu, $node);
                 }
             }
-
         } else {
             $items = $this->page->navbar->get_items();
             $navbarnode = end($items);
@@ -4372,7 +4430,6 @@ public function region_main_settings_menu() {
                     // Build an action menu based on the visible nodes from this navigation tree.
                     $this->build_action_menu_from_navigation($menu, $node);
                 }
-
             }
         }
         return $this->render($menu);
@@ -4391,8 +4448,14 @@ public function region_main_settings_menu() {
      * @param bool $accesshidelabel if true, the label should have class="accesshide" added.
      * @return string
      */
-    public function tag_list($tags, $label = null, $classes = '', $limit = 10,
-            $pagecontext = null, $accesshidelabel = false) {
+    public function tag_list(
+        $tags,
+        $label = null,
+        $classes = '',
+        $limit = 10,
+        $pagecontext = null,
+        $accesshidelabel = false
+    ) {
         $list = new taglist($tags, $label, $classes, $limit, $pagecontext, $accesshidelabel);
         return $this->render_from_template('core_tag/taglist', $list->export_for_template($this));
     }
@@ -4448,7 +4511,7 @@ public function render_chart(\core\chart_base $chart, $withtable = true) {
         $chartdata = json_encode($chart);
         return $this->render_from_template('core/chart', (object) [
             'chartdata' => $chartdata,
-            'withtable' => $withtable
+            'withtable' => $withtable,
         ]);
     }
 
@@ -4469,8 +4532,11 @@ public function render_login(\core_auth\output\login $form) {
             $url = $url->out(false);
         }
         $context->logourl = $url;
-        $context->sitename = format_string($SITE->fullname, true,
-                ['context' => context_course::instance(SITEID), "escape" => false]);
+        $context->sitename = format_string(
+            $SITE->fullname,
+            true,
+            ['context' => context_course::instance(SITEID), "escape" => false]
+        );
 
         return $this->render_from_template('core/loginform', $context);
     }
@@ -4529,15 +4595,15 @@ public function mform_element($element, $required, $advanced, $error, $ingroup)
                     $elementcontext['wrapperid'] = 'fitem_' . $elementcontext['id'];
                 }
 
-                $context = array(
+                $context = [
                     'element' => $elementcontext,
                     'label' => $label,
                     'text' => $text,
                     'required' => $required,
                     'advanced' => $advanced,
                     'helpbutton' => $helpbutton,
-                    'error' => $error
-                );
+                    'error' => $error,
+                ];
                 return $this->render_from_template($templatename, $context);
             }
         } catch (\Exception $e) {
@@ -4561,8 +4627,11 @@ public function render_login_signup_form($form) {
             $url = $url->out(false);
         }
         $context['logourl'] = $url;
-        $context['sitename'] = format_string($SITE->fullname, true,
-                ['context' => context_course::instance(SITEID), "escape" => false]);
+        $context['sitename'] = format_string(
+            $SITE->fullname,
+            true,
+            ['context' => context_course::instance(SITEID), "escape" => false]
+        );
 
         return $this->render_from_template('core/signup_form_layout', $context);
     }
@@ -4671,7 +4740,8 @@ public function addblockbutton($region = ''): string {
         if (count($regions) == 0) {
             return '';
         }
-        if (isset($this->page->theme->addblockposition) &&
+        if (
+            isset($this->page->theme->addblockposition) &&
                 $this->page->user_is_editing() &&
                 $this->page->user_can_edit_blocks() &&
                 $this->page->pagelayout !== 'mycourses'
@@ -4681,7 +4751,8 @@ public function addblockbutton($region = ''): string {
                 $params['bui_blockregion'] = $region;
             }
             $url = new moodle_url($this->page->url, $params);
-            $addblockbutton = $this->render_from_template('core/add_block_button',
+            $addblockbutton = $this->render_from_template(
+                'core/add_block_button',
                 [
                     'link' => $url->out(false),
                     'escapedlink' => "?{$url->get_query_string(false)}",
@@ -4730,8 +4801,10 @@ public function addblockbutton($region = ''): string {
     public function select_element_for_append(string $selector = '#region-main [role=main]', string $element = 'div') {
 
         if (!CLI_SCRIPT && !NO_OUTPUT_BUFFERING) {
-            throw new coding_exception('select_element_for_append used in a non-CLI script without setting NO_OUTPUT_BUFFERING.',
-                DEBUG_DEVELOPER);
+            throw new coding_exception(
+                'select_element_for_append used in a non-CLI script without setting NO_OUTPUT_BUFFERING.',
+                DEBUG_DEVELOPER
+            );
         }
 
         // We are already streaming into this element so don't change anything.
@@ -4786,8 +4859,10 @@ public function close_element_for_append() {
     public function select_element_for_replace(string $selector, string $html, bool $outer = false) {
 
         if (!CLI_SCRIPT && !NO_OUTPUT_BUFFERING) {
-            throw new coding_exception('select_element_for_replace used in a non-CLI script without setting NO_OUTPUT_BUFFERING.',
-                DEBUG_DEVELOPER);
+            throw new coding_exception(
+                'select_element_for_replace used in a non-CLI script without setting NO_OUTPUT_BUFFERING.',
+                DEBUG_DEVELOPER
+            );
         }
 
         // Escape html for use inside a javascript string.
diff --git a/lib/classes/output/core_renderer_ajax.php b/lib/classes/output/core_renderer_ajax.php
index a70a42b2ed16d..41c9786c45429 100644
--- a/lib/classes/output/core_renderer_ajax.php
+++ b/lib/classes/output/core_renderer_ajax.php
@@ -40,21 +40,23 @@ class core_renderer_ajax extends core_renderer {
      * @param string $moreinfourl URL where more info can be found about the error
      * @param string $link Link for the Continue button
      * @param array $backtrace The execution backtrace
-     * @param string $debuginfo Debugging information
+     * @param null|string $debuginfo Debugging information
+     * @param string $errorcode
      * @return string A template fragment for a fatal error
      */
     public function fatal_error($message, $moreinfourl, $link, $backtrace, $debuginfo = null, $errorcode = "") {
         global $CFG;
 
-        $this->page->set_context(null); // ugly hack - make sure page context is set to something, we do not want bogus warnings here
+        // Ugly hack - make sure page context is set to something, we do not want bogus warnings here.
+        $this->page->set_context(null);
 
         $e = new stdClass();
         $e->error      = $message;
         $e->errorcode  = $errorcode;
-        $e->stacktrace = NULL;
-        $e->debuginfo  = NULL;
-        $e->reproductionlink = NULL;
-        if (!empty($CFG->debug) and $CFG->debug >= DEBUG_DEVELOPER) {
+        $e->stacktrace = null;
+        $e->debuginfo  = null;
+        $e->reproductionlink = null;
+        if (!empty($CFG->debug) && $CFG->debug >= DEBUG_DEVELOPER) {
             $link = (string) $link;
             if ($link) {
                 $e->reproductionlink = $link;
@@ -99,7 +101,8 @@ public function redirect_message(
         $delay,
         $debugdisableredirect,
         $messagetype = notification::NOTIFY_INFO,
-    ) {}
+    ) {
+    }
 
     /**
      * Prepares the start of an AJAX output.
@@ -118,7 +121,7 @@ public function header() {
             @header('Content-type: application/json; charset=utf-8');
         }
 
-        // Headers to make it not cacheable and json
+        // Headers to make it not cacheable and json.
         @header('Cache-Control: no-store, no-cache, must-revalidate');
         @header('Cache-Control: post-check=0, pre-check=0', false);
         @header('Pragma: no-cache');
@@ -131,7 +134,8 @@ public function header() {
      * There is no footer for an AJAX request, however we must override the
      * footer method to prevent the default footer.
      */
-    public function footer() {}
+    public function footer() {
+    }
 
     /**
      * No need for headers in an AJAX request... this should never happen.
@@ -140,7 +144,8 @@ public function footer() {}
      * @param string $classes
      * @param string $id
      */
-    public function heading($text, $level = 2, $classes = 'main', $id = null) {}
+    public function heading($text, $level = 2, $classes = 'main', $id = null) {
+    }
 }
 
 // Alias this class to the old name.
diff --git a/lib/classes/output/core_renderer_cli.php b/lib/classes/output/core_renderer_cli.php
index 1de38c598a194..d277966bd2a44 100644
--- a/lib/classes/output/core_renderer_cli.php
+++ b/lib/classes/output/core_renderer_cli.php
@@ -33,7 +33,6 @@
 class core_renderer_cli extends core_renderer {
     /**
      * @var array $progressmaximums stores the largest percentage for a progress bar.
-     * @return string ascii fragment
      */
     private $progressmaximums = [];
 
@@ -59,10 +58,10 @@ protected function render_check_result(check_result $result) {
         $status = $result->get_status();
 
         $labels = [
-            check_result::NA        => '      ' . cli_ansi_format('<colour:darkGray>' ) . ' NA ',
+            check_result::NA        => '      ' . cli_ansi_format('<colour:darkGray>') . ' NA ',
             check_result::OK        => '      ' . cli_ansi_format('<colour:green>') . ' OK ',
-            check_result::INFO      => '    '   . cli_ansi_format('<colour:blue>' ) . ' INFO ',
-            check_result::UNKNOWN   => ' '      . cli_ansi_format('<colour:darkGray>' ) . ' UNKNOWN ',
+            check_result::INFO      => '    '   . cli_ansi_format('<colour:blue>') . ' INFO ',
+            check_result::UNKNOWN   => ' '      . cli_ansi_format('<colour:darkGray>') . ' UNKNOWN ',
             check_result::WARNING   => ' '      . cli_ansi_format('<colour:black><bgcolour:yellow>') . ' WARNING ',
             check_result::ERROR     => '   '    . cli_ansi_format('<bgcolour:red>') . ' ERROR ',
             check_result::CRITICAL  => ''       . cli_ansi_format('<bgcolour:red>') . ' CRITICAL ',
@@ -96,7 +95,7 @@ public function render_progress_bar(progress_bar $bar) {
         $ascii = "\n";
 
         if (stream_isatty(STDOUT)) {
-            require_once($CFG->libdir.'/clilib.php');
+            require_once($CFG->libdir . '/clilib.php');
 
             $ascii .= "[" . str_repeat(' ', $size) . "] 0% \n";
             return cli_ansi_format($ascii);
@@ -199,7 +198,8 @@ public function heading($text, $level = 2, $classes = 'main', $id = null) {
      * @param string $moreinfourl URL where more info can be found about the error
      * @param string $link Link for the Continue button
      * @param array $backtrace The execution backtrace
-     * @param string $debuginfo Debugging information
+     * @param null|string $debuginfo Debugging information
+     * @param string $errorcode
      * @return string A template fragment for a fatal error
      */
     public function fatal_error($message, $moreinfourl, $link, $backtrace, $debuginfo = null, $errorcode = "") {
diff --git a/lib/classes/output/core_renderer_maintenance.php b/lib/classes/output/core_renderer_maintenance.php
index 1aee2863dc04b..50b4153cb95e6 100644
--- a/lib/classes/output/core_renderer_maintenance.php
+++ b/lib/classes/output/core_renderer_maintenance.php
@@ -70,7 +70,7 @@ public function block(block_contents $bc, $region) {
      * @param boolean $fakeblocksonly
      * @return string
      */
-    public function blocks($region, $classes = array(), $tag = 'aside', $fakeblocksonly = false) {
+    public function blocks($region, $classes = [], $tag = 'aside', $fakeblocksonly = false) {
         return '';
     }
 
@@ -158,11 +158,19 @@ public function confirm($message, $continue, $cancel, array $displayoptions = []
         if ($continue instanceof single_button) {
             $continue->type = single_button::BUTTON_PRIMARY;
         } else if (is_string($continue)) {
-            $continue = new single_button(new moodle_url($continue), get_string('continue'), 'post',
-                $displayoptions['type'] ?? single_button::BUTTON_PRIMARY);
+            $continue = new single_button(
+                new moodle_url($continue),
+                get_string('continue'),
+                'post',
+                $displayoptions['type'] ?? single_button::BUTTON_PRIMARY
+            );
         } else if ($continue instanceof moodle_url) {
-            $continue = new single_button($continue, get_string('continue'), 'post',
-                $displayoptions['type'] ?? single_button::BUTTON_PRIMARY);
+            $continue = new single_button(
+                $continue,
+                get_string('continue'),
+                'post',
+                $displayoptions['type'] ?? single_button::BUTTON_PRIMARY
+            );
         } else {
             throw new coding_exception('The continue param to $OUTPUT->confirm() must be either a URL' .
                                        ' (string/moodle_url) or a single_button instance.');
@@ -228,10 +236,10 @@ public function secure_login_info() {
      * Does nothing. The maintenance renderer cannot produce user pictures.
      *
      * @param stdClass $user
-     * @param array $options
+     * @param null|array $options
      * @return string
      */
-    public function user_picture(stdClass $user, array $options = null) {
+    public function user_picture(stdClass $user, ?array $options = null) {
         return '';
     }
 }
diff --git a/lib/classes/output/custom_menu.php b/lib/classes/output/custom_menu.php
index 67ab20ee60d4a..5357df2b78d03 100644
--- a/lib/classes/output/custom_menu.php
+++ b/lib/classes/output/custom_menu.php
@@ -44,7 +44,7 @@ class custom_menu extends custom_menu_item {
     /**
      * Creates the custom menu
      *
-     * @param string $definition the menu items definition in syntax required by {@link convert_text_to_menu_nodes()}
+     * @param string $definition the menu items definition in syntax required by {@see convert_text_to_menu_nodes()}
      * @param string $currentlanguage the current language code, null disables multilang support
      */
     public function __construct($definition = '', $currentlanguage = null) {
@@ -62,7 +62,7 @@ public function __construct($definition = '', $currentlanguage = null) {
      * @param array $children
      */
     public function override_children(array $children) {
-        $this->children = array();
+        $this->children = [];
         foreach ($children as $child) {
             if ($child instanceof custom_menu_item) {
                 $this->children[] = $child;
@@ -100,7 +100,7 @@ public static function convert_text_to_menu_nodes($text, $language = null) {
         $root = new custom_menu();
         $lastitem = $root;
         $lastdepth = 0;
-        $hiddenitems = array();
+        $hiddenitems = [];
         $lines = explode("\n", $text);
         foreach ($lines as $linenumber => $line) {
             $line = trim($line);
diff --git a/lib/classes/output/custom_menu_item.php b/lib/classes/output/custom_menu_item.php
index 314cfeebeb827..c1e1a389530fc 100644
--- a/lib/classes/output/custom_menu_item.php
+++ b/lib/classes/output/custom_menu_item.php
@@ -33,17 +33,11 @@
  * @category output
  */
 class custom_menu_item implements renderable, templatable {
-
     /**
      * @var string The text to show for the item
      */
     protected $text;
 
-    /**
-     * @var moodle_url The link to give the icon if it has no children
-     */
-    protected $url;
-
     /**
      * @var string A title to apply to the item. By default the text
      */
@@ -55,60 +49,66 @@ class custom_menu_item implements renderable, templatable {
      */
     protected $sort;
 
-    /**
-     * @var custom_menu_item A reference to the parent for this item or NULL if
-     * it is a top level item
-     */
-    protected $parent;
-
     /**
      * @var array A array in which to store children this item has.
      */
-    protected $children = array();
+    protected $children = [];
 
     /**
      * @var int A reference to the sort var of the last child that was added
      */
     protected $lastsort = 0;
 
-    /** @var array Array of other HTML attributes for the custom menu item. */
-    protected $attributes = [];
-
     /**
      * Constructs the new custom menu item
      *
      * @param string $text
-     * @param moodle_url $url A moodle url to apply as the link for this item [Optional]
+     * @param null|moodle_url $url A moodle url to apply as the link for this item [Optional]
      * @param string $title A title to apply to this item [Optional]
      * @param int $sort A sort or to use if we need to sort differently [Optional]
-     * @param custom_menu_item $parent A reference to the parent custom_menu_item this child
+     * @param null|custom_menu_item $parent A reference to the parent custom_menu_item this child
      *        belongs to, only if the child has a parent. [Optional]
      * @param array $attributes Array of other HTML attributes for the custom menu item.
      */
-    public function __construct($text, moodle_url $url = null, $title = null, $sort = null, custom_menu_item $parent = null,
-        array $attributes = []) {
+    public function __construct(
+        $text,
+        /** @var moodle_url The link to give the icon if it has no children */
+        protected ?moodle_url $url = null,
+        $title = null,
+        $sort = null,
+        /**
+         * @var custom_menu_item A reference to the parent for this item or NULL if
+         * it is a top level item
+         */
+        protected ?custom_menu_item $parent = null,
+        /** @var array Array of other HTML attributes for the custom menu item. */
+        protected array $attributes = [],
+    ) {
 
         // Use class setter method for text to ensure it's always a string type.
         $this->set_text($text);
 
-        $this->url = $url;
         $this->title = $title;
         $this->sort = (int)$sort;
-        $this->parent = $parent;
-        $this->attributes = $attributes;
     }
 
     /**
      * Adds a custom menu item as a child of this node given its properties.
      *
      * @param string $text
-     * @param moodle_url $url
+     * @param null|moodle_url $url
      * @param string $title
      * @param int $sort
      * @param array $attributes Array of other HTML attributes for the custom menu item.
      * @return custom_menu_item
      */
-    public function add($text, moodle_url $url = null, $title = null, $sort = null, $attributes = []) {
+    public function add(
+        $text,
+        ?moodle_url $url = null,
+        $title = null,
+        $sort = null,
+        $attributes = [],
+    ) {
         $key = count($this->children);
         if (empty($sort)) {
             $sort = $this->lastsort + 1;
@@ -195,7 +195,7 @@ public function get_parent() {
      * Sorts the children this item has
      */
     public function sort() {
-        usort($this->children, array('custom_menu','sort_custom_menu_items'));
+        usort($this->children, ['custom_menu', 'sort_custom_menu_items']);
     }
 
     /**
@@ -252,7 +252,7 @@ public function export_for_template(renderer_base $output) {
         if (!empty($this->attributes)) {
             $context->attributes = $this->attributes;
         }
-        $context->children = array();
+        $context->children = [];
         if (preg_match("/^#+$/", $this->text)) {
             $context->divider = true;
         }
diff --git a/lib/classes/output/datafilter.php b/lib/classes/output/datafilter.php
index 04973ef3d939d..e8cef3acf2dfe 100644
--- a/lib/classes/output/datafilter.php
+++ b/lib/classes/output/datafilter.php
@@ -28,7 +28,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 abstract class datafilter implements renderable, templatable {
-
     /** @var int None of the following match */
     public const JOINTYPE_NONE = 0;
 
@@ -108,7 +107,7 @@ protected function get_filter_object(
             'values' => $values,
             'filteroptions' => $filteroptions,
             'required' => $required,
-            'joinlist' => json_encode($joinlist)
+            'joinlist' => json_encode($joinlist),
         ];
     }
 }
diff --git a/lib/classes/output/dynamic_tabs.php b/lib/classes/output/dynamic_tabs.php
index 1dbb26df2e642..c739934b0d190 100644
--- a/lib/classes/output/dynamic_tabs.php
+++ b/lib/classes/output/dynamic_tabs.php
@@ -28,7 +28,6 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class dynamic_tabs implements templatable {
-
     /** @var base[]  */
     protected $tabs = [];
 
@@ -60,7 +59,7 @@ public function add_tab(base $tab): void {
      */
     public function export_for_template(renderer_base $output): array {
         $data = [
-            'tabs' => []
+            'tabs' => [],
         ];
 
         foreach ($this->tabs as $tab) {
diff --git a/lib/classes/output/dynamic_tabs/base.php b/lib/classes/output/dynamic_tabs/base.php
index 477b73587ec67..213148be34bb0 100644
--- a/lib/classes/output/dynamic_tabs/base.php
+++ b/lib/classes/output/dynamic_tabs/base.php
@@ -29,7 +29,6 @@
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 abstract class base implements templatable {
-
     /** @var array */
     protected $data;
 
diff --git a/lib/classes/output/external.php b/lib/classes/output/external.php
index b9c24e049c3c2..181faf9d6caa1 100644
--- a/lib/classes/output/external.php
+++ b/lib/classes/output/external.php
@@ -39,13 +39,12 @@ class external extends external_api {
      * @return external_function_parameters
      */
     public static function load_template_parameters() {
-        return new external_function_parameters(
-                array('component' => new external_value(PARAM_COMPONENT, 'component containing the template'),
-                      'template' => new external_value(PARAM_SAFEPATH, 'name of the template'),
-                      'themename' => new external_value(PARAM_ALPHANUMEXT, 'The current theme.'),
-                      'includecomments' => new external_value(PARAM_BOOL, 'Include comments or not', VALUE_DEFAULT, false)
-                         )
-            );
+        return new external_function_parameters([
+            'component' => new external_value(PARAM_COMPONENT, 'component containing the template'),
+            'template' => new external_value(PARAM_SAFEPATH, 'name of the template'),
+            'themename' => new external_value(PARAM_ALPHANUMEXT, 'The current theme.'),
+            'includecomments' => new external_value(PARAM_BOOL, 'Include comments or not', VALUE_DEFAULT, false),
+        ]);
     }
 
     /**
@@ -60,11 +59,15 @@ public static function load_template($component, $template, $themename, $include
         global $DB, $CFG, $PAGE;
 
         $PAGE->set_context(context_system::instance());
-        $params = self::validate_parameters(self::load_template_parameters(),
-                                            array('component' => $component,
-                                                  'template' => $template,
-                                                  'themename' => $themename,
-                                                  'includecomments' => $includecomments));
+        $params = self::validate_parameters(
+            self::load_template_parameters(),
+            [
+                'component' => $component,
+                'template' => $template,
+                'themename' => $themename,
+                'includecomments' => $includecomments,
+            ],
+        );
 
         $loader = new mustache_template_source_loader();
         // Will throw exceptions if the template does not exist.
@@ -72,7 +75,7 @@ public static function load_template($component, $template, $themename, $include
             $params['component'],
             $params['template'],
             $params['themename'],
-            $params['includecomments']
+            $params['includecomments'],
         );
     }
 
@@ -108,7 +111,7 @@ public static function load_template_with_dependencies_parameters() {
      * @param string $themename The name of the current theme.
      * @param bool $includecomments Whether to strip comments from the template source.
      * @param string $lang moodle translation language, null means use current.
-     * @return string the template
+     * @return array the template
      */
     public static function load_template_with_dependencies(
         string $component,
@@ -126,7 +129,7 @@ public static function load_template_with_dependencies(
                 'template' => $template,
                 'themename' => $themename,
                 'includecomments' => $includecomments,
-                'lang' => $lang
+                'lang' => $lang,
             ]
         );
 
@@ -141,14 +144,14 @@ public static function load_template_with_dependencies(
             [],
             $params['lang']
         );
-        $formatdependencies = function($dependency) {
+        $formatdependencies = function ($dependency) {
             $results = [];
             foreach ($dependency as $dependencycomponent => $dependencyvalues) {
                 foreach ($dependencyvalues as $dependencyname => $dependencyvalue) {
                     array_push($results, [
                         'component' => $dependencycomponent,
                         'name' => $dependencyname,
-                        'value' => $dependencyvalue
+                        'value' => $dependencyvalue,
                     ]);
                 }
             }
@@ -159,7 +162,7 @@ public static function load_template_with_dependencies(
         // by external functions (because they don't support dynamic keys).
         return [
             'templates' => $formatdependencies($dependencies['templates']),
-            'strings' => $formatdependencies($dependencies['strings'])
+            'strings' => $formatdependencies($dependencies['strings']),
         ];
     }
 
@@ -172,12 +175,12 @@ public static function load_template_with_dependencies_returns() {
         $resourcestructure = new external_single_structure([
             'component' => new external_value(PARAM_COMPONENT, 'component containing the resource'),
             'name' => new external_value(PARAM_TEXT, 'name of the resource'),
-            'value' => new external_value(PARAM_RAW, 'resource value')
+            'value' => new external_value(PARAM_RAW, 'resource value'),
         ]);
 
         return new external_single_structure([
             'templates' => new external_multiple_structure($resourcestructure),
-            'strings' => new external_multiple_structure($resourcestructure)
+            'strings' => new external_multiple_structure($resourcestructure),
         ]);
     }
 
diff --git a/lib/classes/output/file_picker.php b/lib/classes/output/file_picker.php
index 783e29fe71c5b..2a3bdd3e0d3c6 100644
--- a/lib/classes/output/file_picker.php
+++ b/lib/classes/output/file_picker.php
@@ -52,18 +52,18 @@ class file_picker implements renderable {
      */
     public function __construct(stdClass $options) {
         global $CFG, $USER, $PAGE;
-        require_once($CFG->dirroot. '/repository/lib.php');
-        $defaults = array(
-            'accepted_types'=>'*',
-            'return_types'=>FILE_INTERNAL,
+        require_once($CFG->dirroot . '/repository/lib.php');
+        $defaults = [
+            'accepted_types' => '*',
+            'return_types' => FILE_INTERNAL,
             'env' => 'filepicker',
             'client_id' => uniqid(),
             'itemid' => 0,
-            'maxbytes'=>-1,
-            'maxfiles'=>1,
-            'buttonname'=>false
-        );
-        foreach ($defaults as $key=>$value) {
+            'maxbytes' => -1,
+            'maxfiles' => 1,
+            'buttonname' => false,
+        ];
+        foreach ($defaults as $key => $value) {
             if (empty($options->$key)) {
                 $options->$key = $value;
             }
@@ -81,15 +81,19 @@ public function __construct(stdClass $options) {
                 $file = $fs->get_file($usercontext->id, 'user', 'draft', $options->itemid, $options->filepath, $options->filename);
             }
             if (!empty($file)) {
-                $options->currentfile = html_writer::link(moodle_url::make_draftfile_url($file->get_itemid(), $file->get_filepath(), $file->get_filename()), $file->get_filename());
+                $options->currentfile = html_writer::link(moodle_url::make_draftfile_url(
+                    $file->get_itemid(),
+                    $file->get_filepath(),
+                    $file->get_filename(),
+                ), $file->get_filename());
             }
         }
 
-        // initilise options, getting files in root path
+        // Initialise options, getting files in root path.
         $this->options = initialise_filepicker($options);
 
-        // copying other options
-        foreach ($options as $name=>$value) {
+        // Copying other options.
+        foreach ($options as $name => $value) {
             if (!isset($this->options->$name)) {
                 $this->options->$name = $value;
             }
diff --git a/lib/classes/output/help_icon.php b/lib/classes/output/help_icon.php
index 6c36b1cf918be..4fd2beec17f20 100644
--- a/lib/classes/output/help_icon.php
+++ b/lib/classes/output/help_icon.php
@@ -75,7 +75,7 @@ public function diag_strings() {
         if (!$sm->string_exists($this->identifier, $this->component)) {
             debugging("Help title string does not exist: [$this->identifier, $this->component]");
         }
-        if (!$sm->string_exists($this->identifier.'_help', $this->component)) {
+        if (!$sm->string_exists($this->identifier . '_help', $this->component)) {
             debugging("Help contents string does not exist: [{$this->identifier}_help, $this->component]");
         }
     }
@@ -107,7 +107,7 @@ public function export_for_template(renderer_base $output) {
         $options = [
             'component' => $this->component,
             'identifier' => $this->identifier,
-            'lang' => current_language()
+            'lang' => current_language(),
         ];
 
         // Debugging feature lets you display string identifier and component.
diff --git a/lib/classes/output/html_writer.php b/lib/classes/output/html_writer.php
index 3f00022d876d7..f9331da60387e 100644
--- a/lib/classes/output/html_writer.php
+++ b/lib/classes/output/html_writer.php
@@ -38,10 +38,10 @@ class html_writer {
      *
      * @param string $tagname The name of tag ('a', 'img', 'span' etc.)
      * @param string $contents What goes between the opening and closing tags
-     * @param array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
+     * @param null|array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
      * @return string HTML fragment
      */
-    public static function tag($tagname, $contents, array $attributes = null) {
+    public static function tag($tagname, $contents, ?array $attributes = null) {
         return self::start_tag($tagname, $attributes) . $contents . self::end_tag($tagname);
     }
 
@@ -49,10 +49,10 @@ public static function tag($tagname, $contents, array $attributes = null) {
      * Outputs an opening tag with attributes
      *
      * @param string $tagname The name of tag ('a', 'img', 'span' etc.)
-     * @param array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
+     * @param null|array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
      * @return string HTML fragment
      */
-    public static function start_tag($tagname, array $attributes = null) {
+    public static function start_tag($tagname, ?array $attributes = null) {
         return '<' . $tagname . self::attributes($attributes) . '>';
     }
 
@@ -70,10 +70,10 @@ public static function end_tag($tagname) {
      * Outputs an empty tag with attributes
      *
      * @param string $tagname The name of tag ('input', 'img', 'br' etc.)
-     * @param array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
+     * @param null|array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
      * @return string HTML fragment
      */
-    public static function empty_tag($tagname, array $attributes = null) {
+    public static function empty_tag($tagname, ?array $attributes = null) {
         return '<' . $tagname . self::attributes($attributes) . ' />';
     }
 
@@ -82,10 +82,10 @@ public static function empty_tag($tagname, array $attributes = null) {
      *
      * @param string $tagname The name of tag ('a', 'img', 'span' etc.)
      * @param string $contents What goes between the opening and closing tags
-     * @param array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
+     * @param null|array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
      * @return string HTML fragment
      */
-    public static function nonempty_tag($tagname, $contents, array $attributes = null) {
+    public static function nonempty_tag($tagname, $contents, ?array $attributes = null) {
         if ($contents === '' || is_null($contents)) {
             return '';
         }
@@ -96,7 +96,7 @@ public static function nonempty_tag($tagname, $contents, array $attributes = nul
      * Outputs a HTML attribute and value
      *
      * @param string $name The name of the attribute ('src', 'href', 'class' etc.)
-     * @param string $value The value of the attribute. The value will be escaped with {@link s()}
+     * @param string $value The value of the attribute. The value will be escaped with {@see s()}
      * @return string HTML fragment
      */
     public static function attribute($name, $value) {
@@ -104,23 +104,23 @@ public static function attribute($name, $value) {
             return ' ' . $name . '="' . $value->out() . '"';
         }
 
-        // special case, we do not want these in output
+        // Special case, we do not want these in output.
         if ($value === null) {
             return '';
         }
 
-        // no sloppy trimming here!
+        // No sloppy trimming here!
         return ' ' . $name . '="' . s($value) . '"';
     }
 
     /**
      * Outputs a list of HTML attributes and values
      *
-     * @param array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
-     *       The values will be escaped with {@link s()}
+     * @param null|array $attributes The tag attributes (array('src' => $url, 'class' => 'class1') etc.)
+     *       The values will be escaped with {@see s()}
      * @return string HTML fragment
      */
-    public static function attributes(array $attributes = null) {
+    public static function attributes(?array $attributes = null) {
         $attributes = (array)$attributes;
         $output = '';
         foreach ($attributes as $name => $value) {
@@ -134,10 +134,10 @@ public static function attributes(array $attributes = null) {
      *
      * @param string $src The source of image
      * @param string $alt The alternate text for image
-     * @param array $attributes The tag attributes (array('height' => $max_height, 'class' => 'class1') etc.)
+     * @param null|array $attributes The tag attributes (array('height' => $max_height, 'class' => 'class1') etc.)
      * @return string HTML fragment
      */
-    public static function img($src, $alt, array $attributes = null) {
+    public static function img($src, $alt, ?array $attributes = null) {
         $attributes = (array)$attributes;
         $attributes['src'] = $src;
         // In case a null alt text is provided, set it to an empty string.
@@ -161,7 +161,7 @@ public static function img($src, $alt, array $attributes = null) {
      * @param string $base A string fragment that will be included in the random ID.
      * @return string A unique ID
      */
-    public static function random_id($base='random') {
+    public static function random_id($base = 'random') {
         static $counter = 0;
         static $uniq;
 
@@ -170,7 +170,7 @@ public static function random_id($base='random') {
         }
 
         $counter++;
-        return $base.$uniq.$counter;
+        return $base . $uniq . $counter;
     }
 
     /**
@@ -178,10 +178,10 @@ public static function random_id($base='random') {
      *
      * @param string|moodle_url $url The URL
      * @param string $text The text
-     * @param array $attributes HTML attributes
+     * @param null|array $attributes HTML attributes
      * @return string HTML fragment
      */
-    public static function link($url, $text, array $attributes = null) {
+    public static function link($url, $text, ?array $attributes = null) {
         $attributes = (array)$attributes;
         $attributes['href']  = $url;
         return self::tag('a', $text, $attributes);
@@ -194,16 +194,22 @@ public static function link($url, $text, array $attributes = null) {
      * @param string $value The value of the checkbox
      * @param bool $checked Whether the checkbox is checked
      * @param string $label The label for the checkbox
-     * @param array $attributes Any attributes to apply to the checkbox
-     * @param array $labelattributes Any attributes to apply to the label, if present
+     * @param null|array $attributes Any attributes to apply to the checkbox
+     * @param null|array $labelattributes Any attributes to apply to the label, if present
      * @return string html fragment
      */
-    public static function checkbox($name, $value, $checked = true, $label = '',
-        array $attributes = null, array $labelattributes = null) {
+    public static function checkbox(
+        $name,
+        $value,
+        $checked = true,
+        $label = '',
+        ?array $attributes = null,
+        ?array $labelattributes = null,
+    ) {
         $attributes = (array) $attributes;
         $output = '';
 
-        if ($label !== '' and !is_null($label)) {
+        if ($label !== '' && !is_null($label)) {
             if (empty($attributes['id'])) {
                 $attributes['id'] = self::random_id('checkbox_');
             }
@@ -215,7 +221,7 @@ public static function checkbox($name, $value, $checked = true, $label = '',
 
         $output .= self::empty_tag('input', $attributes);
 
-        if ($label !== '' and !is_null($label)) {
+        if ($label !== '' && !is_null($label)) {
             $labelattributes = (array) $labelattributes;
             $labelattributes['for'] = $attributes['id'];
             $output .= self::tag('label', $label, $labelattributes);
@@ -229,11 +235,11 @@ public static function checkbox($name, $value, $checked = true, $label = '',
      *
      * @param string $name name of select element
      * @param bool $selected
-     * @param array $attributes - html select element attributes
+     * @param null|array $attributes - html select element attributes
      * @return string HTML fragment
      */
-    public static function select_yes_no($name, $selected=true, array $attributes = null) {
-        $options = array('1'=>get_string('yes'), '0'=>get_string('no'));
+    public static function select_yes_no($name, $selected = true, ?array $attributes = null) {
+        $options = ['1' => get_string('yes'), '0' => get_string('no')];
         return self::select($options, $name, $selected, null, $attributes);
     }
 
@@ -250,41 +256,46 @@ public static function select_yes_no($name, $selected=true, array $attributes =
      * @param string $name name of select element
      * @param string|array $selected value or array of values depending on multiple attribute
      * @param array|bool|null $nothing add nothing selected option, or false of not added
-     * @param array $attributes html select element attributes
+     * @param null|array $attributes html select element attributes
      * @return string HTML fragment
      */
-    public static function select(array $options, $name, $selected = '', $nothing = array('' => 'choosedots'), array $attributes = null) {
+    public static function select(
+        array $options,
+        $name,
+        $selected = '',
+        $nothing = ['' => 'choosedots'],
+        ?array $attributes = null,
+    ) {
         $attributes = (array)$attributes;
         if (is_array($nothing)) {
-            foreach ($nothing as $k=>$v) {
-                if ($v === 'choose' or $v === 'choosedots') {
+            foreach ($nothing as $k => $v) {
+                if ($v === 'choose' || $v === 'choosedots') {
                     $nothing[$k] = get_string('choosedots');
                 }
             }
-            $options = $nothing + $options; // keep keys, do not override
-
-        } else if (is_string($nothing) and $nothing !== '') {
-            // BC
-            $options = array(''=>$nothing) + $options;
+            $options = $nothing + $options; // Keep keys, do not override.
+        } else if (is_string($nothing) && $nothing !== '') {
+            // BC.
+            $options = ['' => $nothing] + $options;
         }
 
-        // we may accept more values if multiple attribute specified
+        // We may accept more values if multiple attribute specified.
         $selected = (array)$selected;
-        foreach ($selected as $k=>$v) {
+        foreach ($selected as $k => $v) {
             $selected[$k] = (string)$v;
         }
 
         if (!isset($attributes['id'])) {
-            $id = 'menu'.$name;
-            // name may contaion [], which would make an invalid id. e.g. numeric question type editing form, assignment quickgrading
+            $id = 'menu' . $name;
+            // Name may contain [], which would make an invalid id. e.g. numeric question type editing form, assignment quickgrading.
             $id = str_replace('[', '', $id);
             $id = str_replace(']', '', $id);
             $attributes['id'] = $id;
         }
 
         if (!isset($attributes['class'])) {
-            $class = 'menu'.$name;
-            // name may contaion [], which would make an invalid class. e.g. numeric question type editing form, assignment quickgrading
+            $class = 'menu' . $name;
+            // Name may contain [], which would make an invalid class. e.g. numeric question type editing form, assignment quickgrading.
             $class = str_replace('[', '', $class);
             $class = str_replace(']', '', $class);
             $attributes['class'] = $class;
@@ -300,9 +311,9 @@ public static function select(array $options, $name, $selected = '', $nothing =
         }
 
         $output = '';
-        foreach ($options as $value=>$label) {
+        foreach ($options as $value => $label) {
             if (is_array($label)) {
-                // ignore key, it just has to be unique
+                // Ignore key, it just has to be unique.
                 $output .= self::select_optgroup(key($label), current($label), $selected);
             } else {
                 $output .= self::select_option($label, $value, $selected);
@@ -320,7 +331,7 @@ public static function select(array $options, $name, $selected = '', $nothing =
      * @return string HTML fragment
      */
     private static function select_option($label, $value, array $selected) {
-        $attributes = array();
+        $attributes = [];
         $value = (string)$value;
         if (in_array($value, $selected, true)) {
             $attributes['selected'] = 'selected';
@@ -341,9 +352,9 @@ private static function select_optgroup($groupname, $options, array $selected) {
         if (empty($options)) {
             return '';
         }
-        $attributes = array('label'=>$groupname);
+        $attributes = ['label' => $groupname];
         $output = '';
-        foreach ($options as $value=>$label) {
+        foreach ($options as $value => $label) {
             $output .= self::select_option($label, $value, $selected);
         }
         return self::tag('optgroup', $output, $attributes);
@@ -356,12 +367,12 @@ private static function select_optgroup($groupname, $options, array $selected) {
      * @param string $name fieldname
      * @param int $currenttime A default timestamp in GMT
      * @param int $step minute spacing
-     * @param array $attributes - html select element attributes
+     * @param null|array $attributes - html select element attributes
      * @param float|int|string $timezone the timezone to use to calculate the time
      *        {@link https://moodledev.io/docs/apis/subsystems/time#timezone}
      * @return string HTML fragment
      */
-    public static function select_time($type, $name, $currenttime = 0, $step = 5, array $attributes = null, $timezone = 99) {
+    public static function select_time($type, $name, $currenttime = 0, $step = 5, ?array $attributes = null, $timezone = 99) {
         global $OUTPUT;
 
         if (!$currenttime) {
@@ -371,7 +382,7 @@ public static function select_time($type, $name, $currenttime = 0, $step = 5, ar
         $currentdate = $calendartype->timestamp_to_date_array($currenttime, $timezone);
 
         $userdatetype = $type;
-        $timeunits = array();
+        $timeunits = [];
 
         switch ($type) {
             case 'years':
@@ -388,17 +399,17 @@ public static function select_time($type, $name, $currenttime = 0, $step = 5, ar
                 $userdatetype = 'mday';
                 break;
             case 'hours':
-                for ($i=0; $i<=23; $i++) {
-                    $timeunits[$i] = sprintf("%02d",$i);
+                for ($i = 0; $i <= 23; $i++) {
+                    $timeunits[$i] = sprintf("%02d", $i);
                 }
                 break;
             case 'minutes':
                 if ($step != 1) {
-                    $currentdate['minutes'] = ceil($currentdate['minutes']/$step)*$step;
+                    $currentdate['minutes'] = ceil($currentdate['minutes'] / $step) * $step;
                 }
 
-                for ($i=0; $i<=59; $i+=$step) {
-                    $timeunits[$i] = sprintf("%02d",$i);
+                for ($i = 0; $i <= 59; $i += $step) {
+                    $timeunits[$i] = sprintf("%02d", $i);
                 }
                 break;
             default:
@@ -410,21 +421,21 @@ public static function select_time($type, $name, $currenttime = 0, $step = 5, ar
             'name' => $name,
             'id' => !empty($attributes['id']) ? $attributes['id'] : self::random_id('ts_'),
             'label' => get_string(substr($type, 0, -1), 'form'),
-            'options' => array_map(function($value) use ($timeunits, $currentdate, $userdatetype) {
+            'options' => array_map(function ($value) use ($timeunits, $currentdate, $userdatetype) {
                 return [
                     'name' => $timeunits[$value],
                     'value' => $value,
-                    'selected' => $currentdate[$userdatetype] == $value
+                    'selected' => $currentdate[$userdatetype] == $value,
                 ];
             }, array_keys($timeunits)),
         ];
 
         unset($attributes['id']);
         unset($attributes['name']);
-        $data->attributes = array_map(function($name) use ($attributes) {
+        $data->attributes = array_map(function ($name) use ($attributes) {
             return [
                 'name' => $name,
-                'value' => $attributes[$name]
+                'value' => $attributes[$name],
             ];
         }, array_keys($attributes));
 
@@ -437,14 +448,14 @@ public static function select_time($type, $name, $currenttime = 0, $step = 5, ar
      * Note: 'list' is a reserved keyword ;-)
      *
      * @param array $items
-     * @param array $attributes
+     * @param null|array $attributes
      * @param string $tag ul or ol
      * @return string
      */
-    public static function alist(array $items, array $attributes = null, $tag = 'ul') {
-        $output = self::start_tag($tag, $attributes)."\n";
+    public static function alist(array $items, ?array $attributes = null, $tag = 'ul') {
+        $output = self::start_tag($tag, $attributes) . "\n";
         foreach ($items as $item) {
-            $output .= self::tag('li', $item)."\n";
+            $output .= self::tag('li', $item) . "\n";
         }
         $output .= self::end_tag($tag);
         return $output;
@@ -454,10 +465,10 @@ public static function alist(array $items, array $attributes = null, $tag = 'ul'
      * Returns hidden input fields created from url parameters.
      *
      * @param moodle_url $url
-     * @param array $exclude list of excluded parameters
+     * @param null|array $exclude list of excluded parameters
      * @return string HTML fragment
      */
-    public static function input_hidden_params(moodle_url $url, array $exclude = null) {
+    public static function input_hidden_params(moodle_url $url, ?array $exclude = null) {
         $exclude = (array)$exclude;
         $params = $url->params();
         foreach ($exclude as $key) {
@@ -466,8 +477,8 @@ public static function input_hidden_params(moodle_url $url, array $exclude = nul
 
         $output = '';
         foreach ($params as $key => $value) {
-            $attributes = array('type'=>'hidden', 'name'=>$key, 'value'=>$value);
-            $output .= self::empty_tag('input', $attributes)."\n";
+            $attributes = ['type' => 'hidden', 'name' => $key, 'value' => $value];
+            $output .= self::empty_tag('input', $attributes) . "\n";
         }
         return $output;
     }
@@ -479,13 +490,11 @@ public static function input_hidden_params(moodle_url $url, array $exclude = nul
      * @param moodle_url|string $url optional url of the external script, $code ignored if specified
      * @return string HTML, the code wrapped in <script> tags.
      */
-    public static function script($jscode, $url=null) {
+    public static function script($jscode, $url = null) {
         if ($jscode) {
             return self::tag('script', "\n//<![CDATA[\n$jscode\n//]]>\n") . "\n";
-
         } else if ($url) {
             return self::tag('script', '', ['src' => $url]) . "\n";
-
         } else {
             return '';
         }
@@ -503,11 +512,11 @@ public static function script($jscode, $url=null) {
      * @return string HTML code
      */
     public static function table(html_table $table) {
-        // prepare table data and populate missing properties with reasonable defaults
+        // Prepare table data and populate missing properties with reasonable defaults.
         if (!empty($table->align)) {
             foreach ($table->align as $key => $aa) {
                 if ($aa) {
-                    $table->align[$key] = 'text-align:'. fix_align_rtl($aa) .';';  // Fix for RTL languages
+                    $table->align[$key] = 'text-align:' . fix_align_rtl($aa) . ';';  // Fix for RTL languages.
                 } else {
                     $table->align[$key] = null;
                 }
@@ -516,7 +525,7 @@ public static function table(html_table $table) {
         if (!empty($table->size)) {
             foreach ($table->size as $key => $ss) {
                 if ($ss) {
-                    $table->size[$key] = 'width:'. $ss .';';
+                    $table->size[$key] = 'width:' . $ss . ';';
                 } else {
                     $table->size[$key] = null;
                 }
@@ -542,7 +551,6 @@ public static function table(html_table $table) {
                 if (!isset($table->wrap[$key])) {
                     $table->wrap[$key] = null;
                 }
-
             }
         }
         if (empty($table->attributes['class'])) {
@@ -552,22 +560,22 @@ public static function table(html_table $table) {
             $table->attributes['class'] .= ' boxalign' . $table->tablealign;
         }
 
-        // explicitly assigned properties override those defined via $table->attributes
+        // Explicitly assigned properties override those defined via $table->attributes.
         $table->attributes['class'] = trim($table->attributes['class']);
-        $attributes = array_merge($table->attributes, array(
+        $attributes = array_merge($table->attributes, [
             'id'            => $table->id,
             'width'         => $table->width,
             'summary'       => $table->summary,
             'cellpadding'   => $table->cellpadding,
             'cellspacing'   => $table->cellspacing,
-        ));
+        ]);
         $output = self::start_tag('table', $attributes) . "\n";
 
         $countcols = 0;
 
         // Output a caption if present.
         if (!empty($table->caption)) {
-            $captionattributes = array();
+            $captionattributes = [];
             if ($table->captionhide) {
                 $captionattributes['class'] = 'accesshide';
             }
@@ -581,13 +589,13 @@ public static function table(html_table $table) {
         if (!empty($table->head)) {
             $countcols = count($table->head);
 
-            $output .= self::start_tag('thead', array()) . "\n";
-            $output .= self::start_tag('tr', array()) . "\n";
+            $output .= self::start_tag('thead', []) . "\n";
+            $output .= self::start_tag('tr', []) . "\n";
             $keys = array_keys($table->head);
             $lastkey = end($keys);
 
             foreach ($table->head as $key => $heading) {
-                // Convert plain string headings into html_table_cell objects
+                // Convert plain string headings into html_table_cell objects.
                 if (!($heading instanceof html_table_cell)) {
                     $headingtext = $heading;
                     $heading = new html_table_cell();
@@ -633,9 +641,9 @@ public static function table(html_table $table) {
 
             if (empty($table->data)) {
                 // For valid XHTML strict every table must contain either a valid tr
-                // or a valid tbody... both of which must contain a valid td
-                $output .= self::start_tag('tbody', array('class' => 'empty'));
-                $output .= self::tag('tr', self::tag('td', '', array('colspan'=>count($table->head))));
+                // or a valid tbody... both of which must contain a valid td.
+                $output .= self::start_tag('tbody', ['class' => 'empty']);
+                $output .= self::tag('tr', self::tag('td', '', ['colspan' => count($table->head)]));
                 $output .= self::end_tag('tbody');
             }
         }
@@ -643,13 +651,13 @@ public static function table(html_table $table) {
         if (!empty($table->data)) {
             $keys       = array_keys($table->data);
             $lastrowkey = end($keys);
-            $output .= self::start_tag('tbody', array());
+            $output .= self::start_tag('tbody', []);
 
             foreach ($table->data as $key => $row) {
                 if (($row === 'hr') && ($countcols)) {
-                    $output .= self::tag('td', self::tag('div', '', array('class' => 'tabledivider')), array('colspan' => $countcols));
+                    $output .= self::tag('td', self::tag('div', '', ['class' => 'tabledivider']), ['colspan' => $countcols]);
                 } else {
-                    // Convert array rows to html_table_rows and cell strings to html_table_cell objects
+                    // Convert array rows to html_table_rows and cell strings to html_table_cell objects.
                     if (!($row instanceof html_table_row)) {
                         $newrow = new html_table_row();
 
@@ -672,18 +680,18 @@ public static function table(html_table $table) {
 
                     // Explicitly assigned properties should override those defined in the attributes.
                     $row->attributes['class'] = trim($row->attributes['class']);
-                    $trattributes = array_merge($row->attributes, array(
+                    $trattributes = array_merge($row->attributes, [
                         'id'            => $row->id,
                         'style'         => $row->style,
-                    ));
+                    ]);
                     $output .= self::start_tag('tr', $trattributes) . "\n";
                     $keys2 = array_keys($row->cells);
                     $lastkey = end($keys2);
 
-                    $gotlastkey = false; //flag for sanity checking
+                    $gotlastkey = false; // Flag for sanity checking.
                     foreach ($row->cells as $key => $cell) {
                         if ($gotlastkey) {
-                            //This should never happen. Why do we have a cell after the last cell?
+                            // This should never happen. Why do we have a cell after the last cell?
                             mtrace("A cell with key ($key) was found after the last key ($lastkey)");
                         }
 
@@ -711,14 +719,14 @@ public static function table(html_table $table) {
                         $tdstyle .= isset($table->size[$key]) ? $table->size[$key] : '';
                         $tdstyle .= isset($table->wrap[$key]) ? $table->wrap[$key] : '';
                         $cell->attributes['class'] = trim($cell->attributes['class']);
-                        $tdattributes = array_merge($cell->attributes, array(
+                        $tdattributes = array_merge($cell->attributes, [
                             'style' => $tdstyle . $cell->style,
                             'colspan' => $cell->colspan,
                             'rowspan' => $cell->rowspan,
                             'id' => $cell->id,
                             'abbr' => $cell->abbr,
                             'scope' => $cell->scope,
-                        ));
+                        ]);
                         $tagtype = 'td';
                         if ($cell->header === true) {
                             $tagtype = 'th';
@@ -760,26 +768,26 @@ public static function table(html_table $table) {
      * @param array $attributes to be inserted in the tab, for example array('accesskey' => 'a')
      * @return string HTML of the label element
      */
-    public static function label($text, $for, $colonize = true, array $attributes=array()) {
+    public static function label($text, $for, $colonize = true, array $attributes = []) {
         if (!is_null($for)) {
-            $attributes = array_merge($attributes, array('for' => $for));
+            $attributes = array_merge($attributes, ['for' => $for]);
         }
         $text = trim($text ?? '');
         $label = self::tag('label', $text, $attributes);
 
         // TODO MDL-12192 $colonize disabled for now yet
         // if (!empty($text) and $colonize) {
-        //     // the $text may end with the colon already, though it is bad string definition style
-        //     $colon = get_string('labelsep', 'langconfig');
-        //     if (!empty($colon)) {
-        //         $trimmed = trim($colon);
-        //         if ((substr($text, -strlen($trimmed)) == $trimmed) or (substr($text, -1) == ':')) {
-        //             //debugging('The label text should not end with colon or other label separator,
-        //             //           please fix the string definition.', DEBUG_DEVELOPER);
-        //         } else {
-        //             $label .= $colon;
-        //         }
-        //     }
+        // the $text may end with the colon already, though it is bad string definition style
+        // $colon = get_string('labelsep', 'langconfig');
+        // if (!empty($colon)) {
+        // $trimmed = trim($colon);
+        // if ((substr($text, -strlen($trimmed)) == $trimmed) or (substr($text, -1) == ':')) {
+        // debugging('The label text should not end with colon or other label separator,
+        // please fix the string definition.', DEBUG_DEVELOPER);
+        // } else {
+        // $label .= $colon;
+        // }
+        // }
         // }
 
         return $label;
@@ -793,12 +801,12 @@ public static function label($text, $for, $colonize = true, array $attributes=ar
      * class parameter, the two values are combined with a space between.
      *
      * @param string $class Optional CSS class (or classes as space-separated list)
-     * @param array $attributes Optional other attributes as array
+     * @param null|array $attributes Optional other attributes as array
      * @return array Attributes (or null if still none)
      */
-    private static function add_class($class = '', array $attributes = null) {
+    private static function add_class($class = '', ?array $attributes = null) {
         if ($class !== '') {
-            $classattribute = array('class' => $class);
+            $classattribute = ['class' => $class];
             if ($attributes) {
                 if (array_key_exists('class', $attributes)) {
                     $attributes['class'] = trim($attributes['class'] . ' ' . $class);
@@ -817,10 +825,10 @@ private static function add_class($class = '', array $attributes = null) {
      *
      * @param string $content HTML content of tag
      * @param string $class Optional CSS class (or classes as space-separated list)
-     * @param array $attributes Optional other attributes as array
+     * @param null|array $attributes Optional other attributes as array
      * @return string HTML code for div
      */
-    public static function div($content, $class = '', array $attributes = null) {
+    public static function div($content, $class = '', ?array $attributes = null) {
         return self::tag('div', $content, self::add_class($class, $attributes));
     }
 
@@ -828,10 +836,10 @@ public static function div($content, $class = '', array $attributes = null) {
      * Starts a <div> tag. (Shortcut function.)
      *
      * @param string $class Optional CSS class (or classes as space-separated list)
-     * @param array $attributes Optional other attributes as array
+     * @param null|array $attributes Optional other attributes as array
      * @return string HTML code for open div tag
      */
-    public static function start_div($class = '', array $attributes = null) {
+    public static function start_div($class = '', ?array $attributes = null) {
         return self::start_tag('div', self::add_class($class, $attributes));
     }
 
@@ -849,10 +857,10 @@ public static function end_div() {
      *
      * @param string $content HTML content of tag
      * @param string $class Optional CSS class (or classes as space-separated list)
-     * @param array $attributes Optional other attributes as array
+     * @param null|array $attributes Optional other attributes as array
      * @return string HTML code for span
      */
-    public static function span($content, $class = '', array $attributes = null) {
+    public static function span($content, $class = '', ?array $attributes = null) {
         return self::tag('span', $content, self::add_class($class, $attributes));
     }
 
@@ -860,10 +868,10 @@ public static function span($content, $class = '', array $attributes = null) {
      * Starts a <span> tag. (Shortcut function.)
      *
      * @param string $class Optional CSS class (or classes as space-separated list)
-     * @param array $attributes Optional other attributes as array
+     * @param null|array $attributes Optional other attributes as array
      * @return string HTML code for open span tag
      */
-    public static function start_span($class = '', array $attributes = null) {
+    public static function start_span($class = '', ?array $attributes = null) {
         return self::start_tag('span', self::add_class($class, $attributes));
     }
 
diff --git a/lib/classes/output/icon_system_font.php b/lib/classes/output/icon_system_font.php
index 08a8273dd6626..a7ef86e3d43aa 100644
--- a/lib/classes/output/icon_system_font.php
+++ b/lib/classes/output/icon_system_font.php
@@ -25,8 +25,6 @@
 
 namespace core\output;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Class allowing different systems for mapping and rendering icons.
  *
@@ -41,6 +39,4 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 abstract class icon_system_font extends icon_system {
-
 }
-
diff --git a/lib/classes/output/icon_system_fontawesome.php b/lib/classes/output/icon_system_fontawesome.php
index 0b9053a25900e..88b10d6e23b9b 100644
--- a/lib/classes/output/icon_system_fontawesome.php
+++ b/lib/classes/output/icon_system_fontawesome.php
@@ -30,7 +30,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class icon_system_fontawesome extends icon_system_font {
-
     /**
      * @var array $map Cached map of moodle icon names to font awesome icon names.
      */
@@ -459,7 +458,7 @@ public function get_icon_name_map() {
 
             // Create different mapping keys for different icon system classes, there may be several different
             // themes on the same site.
-            $mapkey = 'mapping_'.preg_replace('/[^a-zA-Z0-9_]/', '_', get_class($this));
+            $mapkey = 'mapping_' . preg_replace('/[^a-zA-Z0-9_]/', '_', get_class($this));
             $this->map = $cache->get($mapkey);
 
             if (empty($this->map)) {
@@ -476,16 +475,16 @@ public function get_icon_name_map() {
                 }
                 $cache->set($mapkey, $this->map);
             }
-
         }
         return $this->map;
     }
 
-
+    #[\Override]
     public function get_amd_name() {
         return 'core/icon_system_fontawesome';
     }
 
+    #[\Override]
     public function render_pix_icon(renderer_base $output, pix_icon $icon) {
         $subtype = 'pix_icon_fontawesome';
         $subpix = new $subtype($icon);
@@ -507,5 +506,4 @@ public function render_pix_icon(renderer_base $output, pix_icon $icon) {
 
         return $output->render_from_template('core/pix_icon_fontawesome', $data);
     }
-
 }
diff --git a/lib/classes/output/icon_system_standard.php b/lib/classes/output/icon_system_standard.php
index cc0d1500915f9..9e5e49a24148e 100644
--- a/lib/classes/output/icon_system_standard.php
+++ b/lib/classes/output/icon_system_standard.php
@@ -25,13 +25,14 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class icon_system_standard extends icon_system {
+    #[\Override]
     public function render_pix_icon(renderer_base $output, pix_icon $icon) {
         $data = $icon->export_for_template($output);
         return $output->render_from_template('core/pix_icon', $data);
     }
 
+    #[\Override]
     public function get_amd_name() {
         return 'core/icon_system_standard';
     }
-
 }
diff --git a/lib/classes/output/initials_bar.php b/lib/classes/output/initials_bar.php
index 453b843d24561..aeec9b56b145b 100644
--- a/lib/classes/output/initials_bar.php
+++ b/lib/classes/output/initials_bar.php
@@ -124,7 +124,7 @@ public function export_for_template(renderer_base $output) {
             $groupletter = new stdClass();
             $groupletter->name = $letter;
             if (!$this->minirender) {
-                $groupletter->url = $this->url->out(false, array($this->urlvar => $letter));
+                $groupletter->url = $this->url->out(false, [$this->urlvar => $letter]);
             } else {
                 $groupletter->input = $letter;
             }
@@ -140,7 +140,7 @@ public function export_for_template(renderer_base $output) {
         $data->class = $this->class;
         $data->title = $this->title;
         if (!$this->minirender) {
-            $data->url = $this->url->out(false, array($this->urlvar => ''));
+            $data->url = $this->url->out(false, [$this->urlvar => '']);
         } else {
             $data->input = 'ALL';
         }
diff --git a/lib/classes/output/inplace_editable.php b/lib/classes/output/inplace_editable.php
index 6c94c474418ca..302ffe28e79fb 100644
--- a/lib/classes/output/inplace_editable.php
+++ b/lib/classes/output/inplace_editable.php
@@ -40,7 +40,7 @@
  * @copyright  2016 Marina Glancy
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class inplace_editable implements templatable, renderable {
+class inplace_editable implements renderable, templatable {
     /**
      * @var string component responsible for diplsying/updating
      */
@@ -101,7 +101,8 @@ class inplace_editable implements templatable, renderable {
      * Constructor.
      *
      * @param string $component name of the component or plugin responsible for the updating of the value (must declare callback)
-     * @param string $itemtype type of the item inside the component - each component/plugin may implement multiple inplace-editable elements
+     * @param string $itemtype type of the item inside the component
+     *                         Each component/plugin may implement multiple inplace-editable elements.
      * @param int $itemid identifier of the item that can be edited in-place
      * @param bool $editable whether this value is editable (check capabilities and editing mode), if false, only "displayvalue"
      *              will be displayed without anything else
@@ -112,8 +113,17 @@ class inplace_editable implements templatable, renderable {
      * @param lang_string|string $editlabel label for the input element in the editing mode (for screenreaders)
      * @param pix_icon|null $editicon icon to use to toggle editing
      */
-    public function __construct($component, $itemtype, $itemid, $editable,
-            $displayvalue, $value = null, $edithint = null, $editlabel = null, ?pix_icon $editicon = null) {
+    public function __construct(
+        $component,
+        $itemtype,
+        $itemid,
+        $editable,
+        $displayvalue,
+        $value = null,
+        $edithint = null,
+        $editlabel = null,
+        ?pix_icon $editicon = null
+    ) {
         $this->component = $component;
         $this->itemtype = $itemtype;
         $this->itemid = $itemid;
@@ -138,7 +148,7 @@ public function __construct($component, $itemtype, $itemid, $editable,
      */
     public function set_type_toggle($options = null) {
         if ($options === null) {
-            $options = array(0, 1);
+            $options = [0, 1];
         }
         $options = array_values($options);
         $idx = array_search($this->value, $options, true);
@@ -235,16 +245,16 @@ protected function get_linkeverything() {
      */
     public function export_for_template(\renderer_base $output) {
         if (!$this->editable) {
-            return array(
-                'displayvalue' => (string)$this->displayvalue
-            );
+            return [
+                'displayvalue' => (string)$this->displayvalue,
+            ];
         }
 
         if ($this->editicon === null) {
             $this->editicon = new pix_icon('t/editstring', (string) $this->edithint);
         }
 
-        return array(
+        return [
             'component' => $this->component,
             'itemtype' => $this->itemtype,
             'itemid' => $this->itemid,
@@ -256,7 +266,7 @@ public function export_for_template(\renderer_base $output) {
             'type' => $this->type,
             'options' => $this->options,
             'linkeverything' => $this->get_linkeverything() ? 1 : 0,
-        );
+        ];
     }
 
     /**
diff --git a/lib/classes/output/js_writer.php b/lib/classes/output/js_writer.php
index a98d078b98020..9095a91cd8a54 100644
--- a/lib/classes/output/js_writer.php
+++ b/lib/classes/output/js_writer.php
@@ -30,11 +30,11 @@ class js_writer {
      * Returns javascript code calling the function
      *
      * @param string $function function name, can be complex like Y.Event.purgeElement
-     * @param array $arguments parameters
+     * @param null|array $arguments parameters
      * @param int $delay execution delay in seconds
      * @return string JS code fragment
      */
-    public static function function_call($function, array $arguments = null, $delay=0) {
+    public static function function_call($function, ?array $arguments = null, $delay = 0) {
         if ($arguments) {
             $arguments = array_map('json_encode', convert_to_array($arguments));
             $arguments = implode(', ', $arguments);
@@ -44,7 +44,7 @@ public static function function_call($function, array $arguments = null, $delay=
         $js = "$function($arguments);";
 
         if ($delay) {
-            $delay = $delay * 1000; // in miliseconds
+            $delay = $delay * 1000; // Delay in miliseconds.
             $js = "setTimeout(function() { $js }, $delay);";
         }
         return $js . "\n";
@@ -54,10 +54,10 @@ public static function function_call($function, array $arguments = null, $delay=
      * Special function which adds Y as first argument of function call.
      *
      * @param string $function The function to call
-     * @param array $extraarguments Any arguments to pass to it
+     * @param null|array $extraarguments Any arguments to pass to it
      * @return string Some JS code
      */
-    public static function function_call_with_Y($function, array $extraarguments = null) {
+    public static function function_call_with_y($function, ?array $extraarguments = null) {
         if ($extraarguments) {
             $extraarguments = array_map('json_encode', convert_to_array($extraarguments));
             $arguments = 'Y, ' . implode(', ', $extraarguments);
@@ -72,12 +72,12 @@ public static function function_call_with_Y($function, array $extraarguments = n
      *
      * @param string $var If it is null then no var is assigned the new object.
      * @param string $class The class to initialise an object for.
-     * @param array $arguments An array of args to pass to the init method.
-     * @param array $requirements Any modules required for this class.
+     * @param null|array $arguments An array of args to pass to the init method.
+     * @param null|array $requirements Any modules required for this class.
      * @param int $delay The delay before initialisation. 0 = no delay.
      * @return string Some JS code
      */
-    public static function object_init($var, $class, array $arguments = null, array $requirements = null, $delay=0) {
+    public static function object_init($var, $class, ?array $arguments = null, ?array $requirements = null, $delay = 0) {
         if (is_array($arguments)) {
             $arguments = array_map('json_encode', convert_to_array($arguments));
             $arguments = implode(', ', $arguments);
@@ -85,14 +85,14 @@ public static function object_init($var, $class, array $arguments = null, array
 
         if ($var === null) {
             $js = "new $class(Y, $arguments);";
-        } else if (strpos($var, '.')!==false) {
+        } else if (strpos($var, '.') !== false) {
             $js = "$var = new $class(Y, $arguments);";
         } else {
             $js = "var $var = new $class(Y, $arguments);";
         }
 
         if ($delay) {
-            $delay = $delay * 1000; // in miliseconds
+            $delay = $delay * 1000; // Delay in miliseconds.
             $js = "setTimeout(function() { $js }, $delay);";
         }
 
@@ -100,7 +100,7 @@ public static function object_init($var, $class, array $arguments = null, array
             $requirements = implode("', '", $requirements);
             $js = "Y.use('$requirements', function(Y){ $js });";
         }
-        return $js."\n";
+        return $js . "\n";
     }
 
     /**
@@ -122,7 +122,7 @@ public static function set_variable($name, $value, $usevar = true) {
             }
         }
 
-        $output .= "$name = ".json_encode($value).";";
+        $output .= "$name = " . json_encode($value) . ";";
 
         return $output;
     }
@@ -134,10 +134,10 @@ public static function set_variable($name, $value, $usevar = true) {
      *     array or string, element id is in the form "#idvalue"
      * @param string $event A valid DOM event (click, mousedown, change etc.)
      * @param string $function The name of the function to call
-     * @param array $arguments An optional array of argument parameters to pass to the function
+     * @param null|array $arguments An optional array of argument parameters to pass to the function
      * @return string JS code fragment
      */
-    public static function event_handler($selector, $event, $function, array $arguments = null) {
+    public static function event_handler($selector, $event, $function, ?array $arguments = null) {
         $selector = json_encode($selector);
         $output = "Y.on('$event', $function, $selector, null";
         if (!empty($arguments)) {
diff --git a/lib/classes/output/language_menu.php b/lib/classes/output/language_menu.php
index c45ed73447804..58304899cffc1 100644
--- a/lib/classes/output/language_menu.php
+++ b/lib/classes/output/language_menu.php
@@ -34,7 +34,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class language_menu implements renderable, templatable {
-
     /** @var \moodle_page $page the moodle page that the languague menu belongs to */
     protected $page;
 
@@ -67,7 +66,7 @@ protected function show_language_menu(): bool {
             return false;
         }
 
-        if ($this->page->course != SITEID and !empty($this->page->course->lang)) {
+        if ($this->page->course != SITEID && !empty($this->page->course->lang)) {
             // Do not show lang menu if language forced.
             return false;
         }
@@ -175,5 +174,4 @@ public function export_for_single_select(\renderer_base $output): ?\stdClass {
         $singleselect->class = 'langmenu';
         return $singleselect->export_for_template($output);
     }
-
 }
diff --git a/lib/classes/output/local/action_menu/subpanel.php b/lib/classes/output/local/action_menu/subpanel.php
index d0a92624c3adf..9724ea8f4c493 100644
--- a/lib/classes/output/local/action_menu/subpanel.php
+++ b/lib/classes/output/local/action_menu/subpanel.php
@@ -24,7 +24,7 @@
 /**
  * Interface to a subpanel implementation.
  *
- * @package    core_admin
+ * @package    core
  * @copyright  2023 Ferran Recio <ferran@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/lib/classes/output/local/dropdown/status.php b/lib/classes/output/local/dropdown/status.php
index 98381e1ea96d2..34ccf0d5e5504 100644
--- a/lib/classes/output/local/dropdown/status.php
+++ b/lib/classes/output/local/dropdown/status.php
@@ -30,7 +30,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class status extends dialog {
-
     /**
      * @var choicelist content of dialog.
      */
diff --git a/lib/classes/output/mustache_clean_string_helper.php b/lib/classes/output/mustache_clean_string_helper.php
index a067490ca18c5..3cda336720b94 100644
--- a/lib/classes/output/mustache_clean_string_helper.php
+++ b/lib/classes/output/mustache_clean_string_helper.php
@@ -27,7 +27,6 @@
  * @since      4.0
  */
 class mustache_clean_string_helper {
-
     /** @var mustache_string_helper A string helper instance that is being used internally for fetching strings */
     private $stringhelper;
 
diff --git a/lib/classes/output/mustache_engine.php b/lib/classes/output/mustache_engine.php
index 60a7933e74ede..5bea960264d79 100644
--- a/lib/classes/output/mustache_engine.php
+++ b/lib/classes/output/mustache_engine.php
@@ -19,6 +19,7 @@
  *
  * @copyright  2019 Ryan Wyllie <ryan@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
  */
 
 namespace core\output;
@@ -28,6 +29,7 @@
  *
  * @copyright  2019 Ryan Wyllie <ryan@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
  */
 class mustache_engine extends \Mustache_Engine {
     /**
@@ -72,8 +74,7 @@ public function __construct(array $options = []) {
      *
      * @return \Mustache_HelperCollection
      */
-    public function getHelpers()
-    {
+    public function gethelpers() {
         if (!isset($this->helpers)) {
             $this->helpers = new mustache_helper_collection(null, $this->disallowednestedhelpers);
         }
diff --git a/lib/classes/output/mustache_filesystem_loader.php b/lib/classes/output/mustache_filesystem_loader.php
index 84266836b8cda..bebebc1dcfe40 100644
--- a/lib/classes/output/mustache_filesystem_loader.php
+++ b/lib/classes/output/mustache_filesystem_loader.php
@@ -25,7 +25,6 @@
  * @since      2.9
  */
 class mustache_filesystem_loader extends \Mustache_Loader_FilesystemLoader {
-
     /**
      * Provide a default no-args constructor (we don't really need anything).
      */
@@ -39,7 +38,7 @@ public function __construct() {
      * @param string $name
      * @return string Template file name
      */
-    protected function getFileName($name) {
+    protected function getfilename($name) {
         // Call the Moodle template finder.
         return mustache_template_finder::get_template_filepath($name);
     }
@@ -52,7 +51,7 @@ protected function getFileName($name) {
      *
      * @return bool Whether to check `is_dir` and `file_exists`
      */
-    protected function shouldCheckPath() {
+    protected function shouldcheckpath() {
         return true;
     }
 
diff --git a/lib/classes/output/mustache_helper_collection.php b/lib/classes/output/mustache_helper_collection.php
index 2a6f33213a749..092ecbf29da96 100644
--- a/lib/classes/output/mustache_helper_collection.php
+++ b/lib/classes/output/mustache_helper_collection.php
@@ -24,7 +24,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class mustache_helper_collection extends \Mustache_HelperCollection {
-
     /**
      * @var string[] Names of helpers that aren't allowed to be called within other helpers.
      */
@@ -67,7 +66,7 @@ public function add($name, $helper) {
         $disallowedlist = $this->disallowednestedhelpers;
 
         if (is_callable($helper) && !empty($disallowedlist)) {
-            $helper = function($source, \Mustache_LambdaHelper $lambdahelper) use ($helper, $disallowedlist) {
+            $helper = function ($source, \Mustache_LambdaHelper $lambdahelper) use ($helper, $disallowedlist) {
 
                 // Temporarily override the disallowed helpers to return nothing
                 // so that they can't be executed from within other helpers.
@@ -105,7 +104,7 @@ private function disable_helpers($names) {
                 $function = $this->get($name);
                 // Null out the helper. Must call parent::add here to avoid
                 // a recursion problem.
-                parent::add($name, function() {
+                parent::add($name, function () {
                     return '';
                 });
 
@@ -149,11 +148,11 @@ public function strip_disallowed_helpers($disallowedlist, $string) {
             $endtoken = '\/';
         }
 
-        $regexes = array_map(function($name) use ($starttoken, $endtoken) {
+        $regexes = array_map(function ($name) use ($starttoken, $endtoken) {
             // We only strip out the name of the helper (excluding delimiters)
             // the user is able to change the delimeters on a per template
             // basis so they may not be curly braces.
-            return '/\s*' . $starttoken . '\s*'. $name . '\W+.*' . $endtoken . '\s*' . $name . '\s*/';
+            return '/\s*' . $starttoken . '\s*' . $name . '\W+.*' . $endtoken . '\s*' . $name . '\s*/';
         }, $disallowedlist);
 
         // This will strip out unwanted helpers from the $source string
@@ -163,7 +162,7 @@ public function strip_disallowed_helpers($disallowedlist, $string) {
         // "core, move, {{#js}} some nasty JS hack {{/js}}"
         // After:
         // "core, move, {{}}".
-        return preg_replace_callback($regexes, function() {
+        return preg_replace_callback($regexes, function () {
             return '';
         }, $string);
     }
diff --git a/lib/classes/output/mustache_javascript_helper.php b/lib/classes/output/mustache_javascript_helper.php
index cf163b67a640f..eb3ce6df69ff4 100644
--- a/lib/classes/output/mustache_javascript_helper.php
+++ b/lib/classes/output/mustache_javascript_helper.php
@@ -25,7 +25,6 @@
  * @since      2.9
  */
 class mustache_javascript_helper {
-
     /** @var \moodle_page $page - Page used to get requirement manager */
     private $page = null;
 
diff --git a/lib/classes/output/mustache_quote_helper.php b/lib/classes/output/mustache_quote_helper.php
index 5cb9cbad91876..3ecca9e10160c 100644
--- a/lib/classes/output/mustache_quote_helper.php
+++ b/lib/classes/output/mustache_quote_helper.php
@@ -32,7 +32,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class mustache_quote_helper {
-
     /**
      * Wrap content in quotes, and escape all special JSON characters used.
      *
diff --git a/lib/classes/output/mustache_shorten_text_helper.php b/lib/classes/output/mustache_shorten_text_helper.php
index 510ca47211734..b7151fa985f54 100644
--- a/lib/classes/output/mustache_shorten_text_helper.php
+++ b/lib/classes/output/mustache_shorten_text_helper.php
@@ -26,7 +26,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class mustache_shorten_text_helper {
-
     /**
      * Read a length and text component from the string.
      *
@@ -40,7 +39,7 @@ class mustache_shorten_text_helper {
      */
     public function shorten($args, Mustache_LambdaHelper $helper) {
         // Split the text into an array of variables.
-        list($length, $text) = explode(',', $args, 2);
+        [$length, $text] = explode(',', $args, 2);
         $length = trim($length);
         $text = trim($text);
 
diff --git a/lib/classes/output/mustache_string_helper.php b/lib/classes/output/mustache_string_helper.php
index f0d78c24d9348..453c49a970b03 100644
--- a/lib/classes/output/mustache_string_helper.php
+++ b/lib/classes/output/mustache_string_helper.php
@@ -25,9 +25,9 @@
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since      2.9
+ * @package core
  */
 class mustache_string_helper {
-
     /**
      * Read a lang string from a template and get it from get_string.
      *
diff --git a/lib/classes/output/mustache_template_finder.php b/lib/classes/output/mustache_template_finder.php
index babc77d1e8d29..e10f9c6246e83 100644
--- a/lib/classes/output/mustache_template_finder.php
+++ b/lib/classes/output/mustache_template_finder.php
@@ -26,6 +26,7 @@
  * @copyright  2015 Damyon Wiese
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since      2.9
+ * @package core
  */
 class mustache_template_finder {
     /**
@@ -48,14 +49,14 @@ public static function get_template_directories_for_component($component, $theme
         $themename = clean_param($themename, PARAM_COMPONENT);
 
         // Validate the component.
-        $dirs = array();
+        $dirs = [];
         $compdirectory = core_component::get_component_directory($component);
         if (!$compdirectory) {
             throw new coding_exception("Component was not valid: " . s($component));
         }
 
         // Find the parent themes.
-        $parents = array();
+        $parents = [];
         if ($themename === $PAGE->theme->name) {
             $parents = $PAGE->theme->parents;
         } else {
@@ -97,7 +98,7 @@ public static function get_template_filepath($name, $themename = '') {
                                        ' (' . s($name) . ' requested) ');
         }
 
-        list($component, $templatename) = explode('/', $name, 2);
+        [$component, $templatename] = explode('/', $name, 2);
         $component = clean_param($component, PARAM_COMPONENT);
 
         $dirs = self::get_template_directories_for_component($component, $themename);
diff --git a/lib/classes/output/mustache_template_source_loader.php b/lib/classes/output/mustache_template_source_loader.php
index 9c054a3864344..d5cb7e5a6218f 100644
--- a/lib/classes/output/mustache_template_source_loader.php
+++ b/lib/classes/output/mustache_template_source_loader.php
@@ -16,16 +16,16 @@
 
 namespace core\output;
 
-use \Mustache_Tokenizer;
+use Mustache_Tokenizer;
 
 /**
  * Load template source strings.
  *
  * @copyright  2018 Ryan Wyllie <ryan@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
  */
 class mustache_template_source_loader {
-
     /** @var $gettemplatesource Callback function to load the template source from full name */
     private $gettemplatesource = null;
 
@@ -44,7 +44,7 @@ public function __construct(callable $gettemplatesource = null) {
             $this->gettemplatesource = $gettemplatesource;
         } else {
             // By default we will pull the template from disk.
-            $this->gettemplatesource = function($component, $name, $themename) {
+            $this->gettemplatesource = function ($component, $name, $themename) {
                 $fulltemplatename = $component . '/' . $name;
                 $filename = mustache_template_finder::get_template_filepath($fulltemplatename, $themename);
                 return file_get_contents($filename);
@@ -150,7 +150,7 @@ public function load_with_dependencies(
         // Get the requested template source.
         $templatesource = $this->load($templatecomponent, $templatename, $themename, $includecomments);
         // This is a helper function to save a value in one of the result arrays (either $templates or $strings).
-        $save = function(array $results, array $seenlist, string $component, string $id, $value) use ($lang) {
+        $save = function (array $results, array $seenlist, string $component, string $id, $value) use ($lang) {
             if (!isset($results[$component])) {
                 // If the results list doesn't already contain this component then initialise it.
                 $results[$component] = [];
@@ -165,7 +165,7 @@ public function load_with_dependencies(
         };
         // This is a helper function for processing a dependency. Does stuff like ignore duplicate processing,
         // common result formatting etc.
-        $handler = function(array $dependency, array $ignorelist, callable $processcallback) use ($lang) {
+        $handler = function (array $dependency, array $ignorelist, callable $processcallback) use ($lang) {
             foreach ($dependency as $component => $ids) {
                 foreach ($ids as $id) {
                     $dependencyid = "$component/$id";
@@ -182,7 +182,7 @@ public function load_with_dependencies(
         };
 
         // Save this template as the first result in the $templates result array.
-        list($templates, $seentemplates) = $save($templates, $seentemplates, $templatecomponent, $templatename, $templatesource);
+        [$templates, $seentemplates] = $save($templates, $seentemplates, $templatecomponent, $templatename, $templatesource);
 
         // Check the template for any dependencies that need to be loaded.
         $dependencies = $this->scan_template_source_for_dependencies($templatesource);
@@ -194,10 +194,10 @@ public function load_with_dependencies(
             $seenstrings,
             // Include $strings and $seenstrings by reference so that their values can be updated
             // outside of this anonymous function.
-            function($component, $id) use ($save, &$strings, &$seenstrings, $lang) {
+            function ($component, $id) use ($save, &$strings, &$seenstrings, $lang) {
                 $string = get_string_manager()->get_string($id, $component, null, $lang);
                 // Save the string in the $strings results array.
-                list($strings, $seenstrings) = $save($strings, $seenstrings, $component, $id, $string);
+                [$strings, $seenstrings] = $save($strings, $seenstrings, $component, $id, $string);
             }
         );
 
@@ -208,7 +208,10 @@ function($component, $id) use ($save, &$strings, &$seenstrings, $lang) {
             $seentemplates,
             // Include $strings, $seenstrings, $templates, and $seentemplates by reference so that their values can be updated
             // outside of this anonymous function.
-            function($component, $id) use (
+            function (
+                $component,
+                $id
+            ) use (
                 $themename,
                 $includecomments,
                 &$seentemplates,
@@ -232,14 +235,14 @@ function($component, $id) use (
                 foreach ($subdependencies['templates'] as $component => $ids) {
                     foreach ($ids as $id => $value) {
                         // Include the child themes in our results.
-                        list($templates, $seentemplates) = $save($templates, $seentemplates, $component, $id, $value);
+                        [$templates, $seentemplates] = $save($templates, $seentemplates, $component, $id, $value);
                     }
                 };
 
                 foreach ($subdependencies['strings'] as $component => $ids) {
                     foreach ($ids as $id => $value) {
                         // Include any strings that the child templates need in our results.
-                        list($strings, $seenstrings) = $save($strings, $seenstrings, $component, $id, $value);
+                        [$strings, $seenstrings] = $save($strings, $seenstrings, $component, $id, $value);
                     }
                 }
             }
@@ -247,7 +250,7 @@ function($component, $id) use (
 
         return [
             'templates' => $templates,
-            'strings' => $strings
+            'strings' => $strings,
         ];
     }
 
@@ -280,7 +283,7 @@ protected function scan_template_source_for_dependencies(string $source): array
         $tokens = $tokenizer->scan($source);
         $templates = [];
         $strings = [];
-        $addtodependencies = function($dependencies, $component, $id) {
+        $addtodependencies = function ($dependencies, $component, $id) {
             $id = trim($id);
             $component = trim($component);
 
@@ -302,16 +305,16 @@ protected function scan_template_source_for_dependencies(string $source): array
             if ($name) {
                 switch ($type) {
                     case Mustache_Tokenizer::T_PARTIAL:
-                        list($component, $id) = explode('/', $name, 2);
+                        [$component, $id] = explode('/', $name, 2);
                         $templates = $addtodependencies($templates, $component, $id);
                         break;
                     case Mustache_Tokenizer::T_PARENT:
-                        list($component, $id) = explode('/', $name, 2);
+                        [$component, $id] = explode('/', $name, 2);
                         $templates = $addtodependencies($templates, $component, $id);
                         break;
                     case Mustache_Tokenizer::T_SECTION:
                         if ($name == 'str') {
-                            list($id, $component) = $this->get_string_identifiers($tokens, $index);
+                            [$id, $component] = $this->get_string_identifiers($tokens, $index);
 
                             if ($id) {
                                 $strings = $addtodependencies($strings, $component, $id);
@@ -324,7 +327,7 @@ protected function scan_template_source_for_dependencies(string $source): array
 
         return [
             'templates' => $templates,
-            'strings' => $strings
+            'strings' => $strings,
         ];
     }
 
diff --git a/lib/classes/output/mustache_uniqid_helper.php b/lib/classes/output/mustache_uniqid_helper.php
index 0dbb773e9ca81..28c3272c81f1b 100644
--- a/lib/classes/output/mustache_uniqid_helper.php
+++ b/lib/classes/output/mustache_uniqid_helper.php
@@ -34,7 +34,6 @@
  * @since      2.9
  */
 class mustache_uniqid_helper {
-
     /** @var string $uniqid The unique id */
     private $uniqid = null;
 
diff --git a/lib/classes/output/mustache_user_date_helper.php b/lib/classes/output/mustache_user_date_helper.php
index 5ff809a1f1fdf..a087624ec67b9 100644
--- a/lib/classes/output/mustache_user_date_helper.php
+++ b/lib/classes/output/mustache_user_date_helper.php
@@ -23,6 +23,7 @@
  *
  * @copyright  2017 Ryan Wyllie <ryan@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
  */
 class mustache_user_date_helper {
     /**
@@ -40,7 +41,7 @@ class mustache_user_date_helper {
      */
     public function transform($args, Mustache_LambdaHelper $helper) {
         // Split the text into an array of variables.
-        list($timestamp, $format) = explode(',', $args, 2);
+        [$timestamp, $format] = explode(',', $args, 2);
         $timestamp = trim($timestamp);
         $format = trim($format);
 
diff --git a/lib/classes/output/notification.php b/lib/classes/output/notification.php
index ba74371a7302c..4226929ae5997 100644
--- a/lib/classes/output/notification.php
+++ b/lib/classes/output/notification.php
@@ -34,7 +34,6 @@
  * @category output
  */
 class notification implements renderable, templatable {
-
     /**
      * A notification of level 'success'.
      */
@@ -78,7 +77,7 @@ class notification implements renderable, templatable {
     /**
      * @var array $extraclasses A list of any extra classes that may be required.
      */
-    protected $extraclasses = array();
+    protected $extraclasses = [];
 
     /**
      * Notification constructor.
@@ -129,7 +128,7 @@ public function set_show_closebutton($button = false) {
      * @param array $classes
      * @return $this
      */
-    public function set_extra_classes($classes = array()) {
+    public function set_extra_classes($classes = []) {
         $this->extraclasses = $classes;
 
         return $this;
@@ -160,7 +159,7 @@ public function get_message_type() {
      * @return array data context for a mustache template
      */
     public function export_for_template(\renderer_base $output) {
-        return array(
+        return [
             'message'       => clean_text($this->message),
             'extraclasses'  => implode(' ', $this->extraclasses),
             'announce'      => $this->announce,
@@ -169,9 +168,14 @@ public function export_for_template(\renderer_base $output) {
             'isinfo'            => $this->messagetype === 'info',
             'iswarning'         => $this->messagetype === 'warning',
             'iserror'           => $this->messagetype === 'error',
-        );
+        ];
     }
 
+    /**
+     * Get the name of the template to use for this templatable.
+     *
+     * @return string
+     */
     public function get_template_name() {
         $templatemappings = [
             // Current types mapped to template names.
diff --git a/lib/classes/output/paging_bar.php b/lib/classes/output/paging_bar.php
index 0d204731dc61f..e334885a062dc 100644
--- a/lib/classes/output/paging_bar.php
+++ b/lib/classes/output/paging_bar.php
@@ -88,7 +88,7 @@ class paging_bar implements renderable, templatable {
     /**
      * @var array An array of strings. One of them is just a string: the current page
      */
-    public $pagelinks = array();
+    public $pagelinks = [];
 
     /**
      * Constructor paging_bar with only the required params.
@@ -136,7 +136,11 @@ public function prepare(renderer_base $output, moodle_page $page, $target) {
             $pagenum = $this->page - 1;
 
             if ($this->page > 0) {
-                $this->previouslink = html_writer::link(new moodle_url($this->baseurl, array($this->pagevar=>$pagenum)), get_string('previous'), array('class'=>'previous'));
+                $this->previouslink = html_writer::link(
+                    new moodle_url($this->baseurl, [$this->pagevar => $pagenum]),
+                    get_string('previous'),
+                    ['class' => 'previous'],
+                );
             }
 
             if ($this->perpage > 0) {
@@ -145,23 +149,27 @@ public function prepare(renderer_base $output, moodle_page $page, $target) {
                 $lastpage = 1;
             }
 
-            if ($this->page > round(($this->maxdisplay/3)*2)) {
-                $currpage = $this->page - round($this->maxdisplay/3);
+            if ($this->page > round(($this->maxdisplay / 3) * 2)) {
+                $currpage = $this->page - round($this->maxdisplay / 3);
 
-                $this->firstlink = html_writer::link(new moodle_url($this->baseurl, array($this->pagevar=>0)), '1', array('class'=>'first'));
+                $this->firstlink = html_writer::link(
+                    new moodle_url($this->baseurl, [$this->pagevar => 0]),
+                    '1',
+                    ['class' => 'first'],
+                );
             } else {
                 $currpage = 0;
             }
 
             $displaycount = $displaypage = 0;
 
-            while ($displaycount < $this->maxdisplay and $currpage < $lastpage) {
+            while ($displaycount < $this->maxdisplay && $currpage < $lastpage) {
                 $displaypage = $currpage + 1;
 
                 if ($this->page == $currpage) {
                     $this->pagelinks[] = html_writer::span($displaypage, 'current-page');
                 } else {
-                    $pagelink = html_writer::link(new moodle_url($this->baseurl, array($this->pagevar=>$currpage)), $displaypage);
+                    $pagelink = html_writer::link(new moodle_url($this->baseurl, [$this->pagevar => $currpage]), $displaypage);
                     $this->pagelinks[] = $pagelink;
                 }
 
@@ -171,13 +179,21 @@ public function prepare(renderer_base $output, moodle_page $page, $target) {
 
             if ($currpage < $lastpage) {
                 $lastpageactual = $lastpage - 1;
-                $this->lastlink = html_writer::link(new moodle_url($this->baseurl, array($this->pagevar=>$lastpageactual)), $lastpage, array('class'=>'last'));
+                $this->lastlink = html_writer::link(
+                    new moodle_url($this->baseurl, [$this->pagevar => $lastpageactual]),
+                    $lastpage,
+                    ['class' => 'last'],
+                );
             }
 
             $pagenum = $this->page + 1;
 
             if ($pagenum != $lastpage) {
-                $this->nextlink = html_writer::link(new moodle_url($this->baseurl, array($this->pagevar=>$pagenum)), get_string('next'), array('class'=>'next'));
+                $this->nextlink = html_writer::link(
+                    new moodle_url($this->baseurl, [$this->pagevar => $pagenum]),
+                    get_string('next'),
+                    ['class' => 'next'],
+                );
             }
         }
     }
@@ -206,7 +222,7 @@ public function export_for_template(renderer_base $output) {
         if ($this->page > 0) {
             $data->previous = [
                 'page' => $this->page,
-                'url' => (new moodle_url($this->baseurl, [$this->pagevar => $this->page - 1]))->out(false)
+                'url' => (new moodle_url($this->baseurl, [$this->pagevar => $this->page - 1]))->out(false),
             ];
         }
 
@@ -215,7 +231,7 @@ public function export_for_template(renderer_base $output) {
             $currpage = $this->page - round($this->maxdisplay / 3);
             $data->first = [
                 'page' => 1,
-                'url' => (new moodle_url($this->baseurl, [$this->pagevar => 0]))->out(false)
+                'url' => (new moodle_url($this->baseurl, [$this->pagevar => 0]))->out(false),
             ];
         }
 
@@ -226,7 +242,7 @@ public function export_for_template(renderer_base $output) {
 
         $displaycount = 0;
         $displaypage = 0;
-        while ($displaycount < $this->maxdisplay and $currpage < $lastpage) {
+        while ($displaycount < $this->maxdisplay && $currpage < $lastpage) {
             $displaypage = $currpage + 1;
 
             $iscurrent = $this->page == $currpage;
@@ -235,7 +251,7 @@ public function export_for_template(renderer_base $output) {
             $data->pages[] = [
                 'page' => $displaypage,
                 'active' => $iscurrent,
-                'url' => $iscurrent ? null : $link->out(false)
+                'url' => $iscurrent ? null : $link->out(false),
             ];
 
             $displaycount++;
@@ -245,14 +261,14 @@ public function export_for_template(renderer_base $output) {
         if ($currpage < $lastpage) {
             $data->last = [
                 'page' => $lastpage,
-                'url' => (new moodle_url($this->baseurl, [$this->pagevar => $lastpage - 1]))->out(false)
+                'url' => (new moodle_url($this->baseurl, [$this->pagevar => $lastpage - 1]))->out(false),
             ];
         }
 
         if ($this->page + 1 != $lastpage) {
             $data->next = [
                 'page' => $this->page + 2,
-                'url' => (new moodle_url($this->baseurl, [$this->pagevar => $this->page + 1]))->out(false)
+                'url' => (new moodle_url($this->baseurl, [$this->pagevar => $this->page + 1]))->out(false),
             ];
         }
 
diff --git a/lib/classes/output/participants_action_bar.php b/lib/classes/output/participants_action_bar.php
index 9ddb022a93485..0477ff4dfc05d 100644
--- a/lib/classes/output/participants_action_bar.php
+++ b/lib/classes/output/participants_action_bar.php
@@ -72,7 +72,7 @@ protected function get_ordered_nodes(): array {
                 'renameroles',
             ],
             'groups:group' => [
-                'groups'
+                'groups',
             ],
             'permissions:role' => [
                 'override',
@@ -98,8 +98,10 @@ protected function get_content_for_select(): array {
 
         $formattedcontent = [];
         $enrolmentsheading = get_string('enrolments', 'enrol');
-        if ($this->page->context->contextlevel != CONTEXT_MODULE &&
-                $this->page->context->contextlevel != CONTEXT_COURSECAT) {
+        if (
+            $this->page->context->contextlevel != CONTEXT_MODULE &&
+                $this->page->context->contextlevel != CONTEXT_COURSECAT
+        ) {
             // Pre-populate the formatted tertiary nav items with the "Enrolled users" node if user can view the participants page.
             $coursecontext = context_course::instance($this->course->id);
             $canviewparticipants = course_can_view_participants($coursecontext);
@@ -108,14 +110,14 @@ protected function get_content_for_select(): array {
                 $formattedcontent[] = [
                     $enrolmentsheading => [
                         $participantsurl => get_string('enrolledusers', 'enrol'),
-                    ]
+                    ],
                 ];
             }
         }
 
         $nodes = $this->get_ordered_nodes();
         foreach ($nodes as $description => $content) {
-            list($stringid, $location) = explode(':', $description);
+            [$stringid, $location] = explode(':', $description);
             $heading = get_string($stringid, $location);
             $items = [];
             foreach ($content as $key) {
@@ -129,7 +131,7 @@ protected function get_content_for_select(): array {
                         $params = ['id' => $this->course->id];
                         $items += [
                             (new moodle_url('/group/groupings.php', $params))->out() => get_string('groupings', 'group'),
-                            (new moodle_url('/group/overview.php', $params))->out() => get_string('overview', 'group')
+                            (new moodle_url('/group/overview.php', $params))->out() => get_string('overview', 'group'),
                         ];
                     }
                 }
@@ -145,8 +147,10 @@ protected function get_content_for_select(): array {
         }
 
         // If we are accessing a page from a module/category context additional nodes will not be visible.
-        if ($this->page->context->contextlevel != CONTEXT_MODULE &&
-                $this->page->context->contextlevel != CONTEXT_COURSECAT) {
+        if (
+            $this->page->context->contextlevel != CONTEXT_MODULE &&
+                $this->page->context->contextlevel != CONTEXT_COURSECAT
+        ) {
             // Need to do some funky code here to find out if we have added third party navigation nodes.
             $thirdpartynodearray = $this->get_thirdparty_node_array() ?: [];
             $formattedcontent = array_merge($formattedcontent, $thirdpartynodearray);
diff --git a/lib/classes/output/pix_emoticon.php b/lib/classes/output/pix_emoticon.php
index 000092cb596c3..9b089abe6f7f0 100644
--- a/lib/classes/output/pix_emoticon.php
+++ b/lib/classes/output/pix_emoticon.php
@@ -33,7 +33,7 @@ class pix_emoticon extends pix_icon implements renderable {
      * @param string $component emoticon image provider
      * @param array $attributes explicit HTML attributes
      */
-    public function __construct($pix, $alt, $component = 'moodle', array $attributes = array()) {
+    public function __construct($pix, $alt, $component = 'moodle', array $attributes = []) {
         if (empty($attributes['class'])) {
             $attributes['class'] = 'emoticon';
         }
diff --git a/lib/classes/output/pix_icon.php b/lib/classes/output/pix_icon.php
index 1ceaaebb58588..d01bc06e3b10b 100644
--- a/lib/classes/output/pix_icon.php
+++ b/lib/classes/output/pix_icon.php
@@ -26,21 +26,20 @@
  * @category output
  */
 class pix_icon implements renderable, templatable {
-
     /**
      * @var string The icon name
      */
-    var $pix;
+    public $pix;
 
     /**
      * @var string The component the icon belongs to.
      */
-    var $component;
+    public $component;
 
     /**
      * @var array An array of attributes to use on the icon
      */
-    var $attributes = array();
+    public $attributes = [];
 
     /**
      * Constructor
@@ -48,9 +47,14 @@ class pix_icon implements renderable, templatable {
      * @param string $pix short icon name
      * @param string $alt The alt text to use for the icon
      * @param string $component component name
-     * @param array $attributes html attributes
+     * @param null|array $attributes html attributes
      */
-    public function __construct($pix, $alt, $component='moodle', array $attributes = null) {
+    public function __construct(
+        $pix,
+        $alt,
+        $component = 'moodle',
+        ?array $attributes = null,
+    ) {
         global $PAGE;
 
         $this->pix = $pix;
@@ -109,18 +113,18 @@ public function export_for_template(renderer_base $output) {
         }
 
         $attributes['src'] = $output->image_url($this->pix, $this->component)->out(false);
-        $templatecontext = array();
+        $templatecontext = [];
         foreach ($attributes as $name => $value) {
-            $templatecontext[] = array('name' => $name, 'value' => $value);
+            $templatecontext[] = ['name' => $name, 'value' => $value];
         }
         $title = isset($attributes['title']) ? $attributes['title'] : '';
         if (empty($title)) {
             $title = isset($attributes['alt']) ? $attributes['alt'] : '';
         }
-        $data = array(
+        $data = [
             'attributes' => $templatecontext,
-            'extraclasses' => $extraclasses
-        );
+            'extraclasses' => $extraclasses,
+        ];
 
         return $data;
     }
diff --git a/lib/classes/output/pix_icon_font.php b/lib/classes/output/pix_icon_font.php
index dce04f6146298..2366b4c190042 100644
--- a/lib/classes/output/pix_icon_font.php
+++ b/lib/classes/output/pix_icon_font.php
@@ -82,12 +82,12 @@ public function export_for_template(renderer_base $output) {
         if (empty($title)) {
             $title = $alt;
         }
-        $data = array(
+        $data = [
             'extraclasses' => $pixdata['extraclasses'],
             'title' => $title,
             'alt' => $alt,
-            'key' => $this->key
-        );
+            'key' => $this->key,
+        ];
 
         return $data;
     }
diff --git a/lib/classes/output/plugin_renderer_base.php b/lib/classes/output/plugin_renderer_base.php
index df6b94df22d8e..8d1be78b0f24a 100644
--- a/lib/classes/output/plugin_renderer_base.php
+++ b/lib/classes/output/plugin_renderer_base.php
@@ -32,7 +32,7 @@ class plugin_renderer_base extends renderer_base {
     /**
      * @var renderer_base|core_renderer A reference to the current renderer.
      * The renderer provided here will be determined by the page but will in 90%
-     * of cases by the {@link core_renderer}
+     * of cases by the {@see core_renderer}
      */
     protected $output;
 
@@ -124,12 +124,12 @@ public function render(renderable $widget) {
      */
     public function __call($method, $arguments) {
         if (method_exists('renderer_base', $method)) {
-            throw new coding_exception('Protected method called against '.get_class($this).' :: '.$method);
+            throw new coding_exception('Protected method called against ' . get_class($this) . ' :: ' . $method);
         }
         if (method_exists($this->output, $method)) {
-            return call_user_func_array(array($this->output, $method), $arguments);
+            return call_user_func_array([$this->output, $method], $arguments);
         } else {
-            throw new coding_exception('Unknown method called against '.get_class($this).' :: '.$method);
+            throw new coding_exception('Unknown method called against ' . get_class($this) . ' :: ' . $method);
         }
     }
 }
diff --git a/lib/classes/output/progress_bar.php b/lib/classes/output/progress_bar.php
index b0b3476777c88..93cb60545e094 100644
--- a/lib/classes/output/progress_bar.php
+++ b/lib/classes/output/progress_bar.php
@@ -35,7 +35,7 @@
  */
 class progress_bar implements renderable, templatable {
     /** @var string html id */
-    private $html_id;
+    private $htmlid;
     /** @var int total width */
     private $width;
     /** @var int last percentage printed */
@@ -43,7 +43,7 @@ class progress_bar implements renderable, templatable {
     /** @var int time when last printed */
     private $lastupdate = 0;
     /** @var int when did we start printing this */
-    private $time_start = 0;
+    private $timestart = 0;
 
     /**
      * Constructor
@@ -60,9 +60,9 @@ public function __construct($htmlid = '', $width = 500, $autostart = false) {
         }
 
         if (!empty($htmlid)) {
-            $this->html_id  = $htmlid;
+            $this->htmlid  = $htmlid;
         } else {
-            $this->html_id  = 'pbar_'.uniqid();
+            $this->htmlid  = 'pbar_' . uniqid();
         }
 
         $this->width = $width;
@@ -77,7 +77,7 @@ public function __construct($htmlid = '', $width = 500, $autostart = false) {
      * @return string id
      */
     public function get_id(): string {
-        return $this->html_id;
+        return $this->htmlid;
     }
 
     /**
@@ -88,7 +88,7 @@ public function get_id(): string {
     public function create() {
         global $OUTPUT;
 
-        $this->time_start = microtime(true);
+        $this->timestart = microtime(true);
 
         flush();
         echo $OUTPUT->render($this);
@@ -103,21 +103,21 @@ public function create() {
      * @return void Echo's output
      * @throws coding_exception
      */
-    private function _update($percent, $msg) {
+    private function update_raw($percent, $msg) {
         global $OUTPUT;
 
-        if (empty($this->time_start)) {
+        if (empty($this->timestart)) {
             throw new coding_exception('You must call create() (or use the $autostart ' .
                 'argument to the constructor) before you try updating the progress bar.');
         }
 
         $estimate = $this->estimate($percent);
 
-        if ($estimate === null) {
+        if ($estimate === null) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedIf
             // Always do the first and last updates.
-        } else if ($estimate == 0) {
+        } else if ($estimate == 0) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedIf
             // Always do the last updates.
-        } else if ($this->lastupdate + 20 < time()) {
+        } else if ($this->lastupdate + 20 < time()) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedIf
             // We must update otherwise browser would time out.
         } else if (round($this->percent, 2) === round($percent, 2)) {
             // No significant change, no need to update anything.
@@ -133,7 +133,7 @@ private function _update($percent, $msg) {
         $this->percent = $percent;
         $this->lastupdate = microtime(true);
 
-        echo $OUTPUT->render_progress_bar_update($this->html_id, $this->percent, $msg, $estimatemsg);
+        echo $OUTPUT->render_progress_bar_update($this->htmlid, $this->percent, $msg, $estimatemsg);
         flush();
     }
 
@@ -153,7 +153,7 @@ private function estimate($pt) {
         if ($pt > 99.99999) {
             return 0; // Nearly done, right?
         }
-        $consumed = microtime(true) - $this->time_start;
+        $consumed = microtime(true) - $this->timestart;
         if ($consumed < 0.001) {
             return null;
         }
@@ -169,7 +169,7 @@ private function estimate($pt) {
      */
     public function update_full($percent, $msg) {
         $percent = max(min($percent, 100), 0);
-        $this->_update($percent, $msg);
+        $this->update_raw($percent, $msg);
     }
 
     /**
@@ -190,7 +190,7 @@ public function update($cur, $total, $msg) {
     public function restart() {
         $this->percent    = 0;
         $this->lastupdate = 0;
-        $this->time_start = 0;
+        $this->timestart = 0;
     }
 
     /**
@@ -201,7 +201,7 @@ public function restart() {
      */
     public function export_for_template(renderer_base $output) {
         return [
-            'id' => $this->html_id,
+            'id' => $this->htmlid,
             'width' => $this->width,
         ];
     }
diff --git a/lib/classes/output/renderable.php b/lib/classes/output/renderable.php
index d9a3263dbc64f..58419ffd6e7af 100644
--- a/lib/classes/output/renderable.php
+++ b/lib/classes/output/renderable.php
@@ -20,11 +20,12 @@
  * Interface marking other classes as suitable for renderer_base::render()
  *
  * @copyright 2010 Petr Skoda (skodak) info@skodak.org
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @package core
  * @category output
  */
 interface renderable {
-    // intentionally empty
+    // Intentionally empty.
 }
 
 // Alias this class to the old name.
diff --git a/lib/classes/output/renderer_base.php b/lib/classes/output/renderer_base.php
index faef38979102e..00910c3eaab92 100644
--- a/lib/classes/output/renderer_base.php
+++ b/lib/classes/output/renderer_base.php
@@ -22,6 +22,7 @@
 use core\output\actions\component_action;
 use moodle_page;
 use moodle_url;
+use stdClass;
 use Mustache_Exception_UnknownTemplateException;
 
 /**
@@ -104,17 +105,17 @@ protected function get_mustache() {
             // We only expose the variables that are exposed to JS templates.
             $safeconfig = $this->page->requires->get_config_for_javascript($this->page, $this);
 
-            $helpers = array('config' => $safeconfig,
-                             'str' => array($stringhelper, 'str'),
-                             'cleanstr' => array($cleanstringhelper, 'cleanstr'),
-                             'quote' => array($quotehelper, 'quote'),
-                             'js' => array($jshelper, 'help'),
-                             'pix' => array($pixhelper, 'pix'),
-                             'shortentext' => array($shortentexthelper, 'shorten'),
-                             'userdate' => array($userdatehelper, 'transform'),
-                         );
-
-            $this->mustache = new mustache_engine(array(
+            $helpers = ['config' => $safeconfig,
+                             'str' => [$stringhelper, 'str'],
+                             'cleanstr' => [$cleanstringhelper, 'cleanstr'],
+                             'quote' => [$quotehelper, 'quote'],
+                             'js' => [$jshelper, 'help'],
+                             'pix' => [$pixhelper, 'pix'],
+                             'shortentext' => [$shortentexthelper, 'shorten'],
+                             'userdate' => [$userdatehelper, 'transform'],
+                         ];
+
+            $this->mustache = new mustache_engine([
                 'cache' => $cachedir,
                 'escape' => 's',
                 'loader' => $loader,
@@ -126,8 +127,7 @@ protected function get_mustache() {
                 'disallowednestedhelpers' => ['js'],
                 // Disable lambda rendering - content in helpers is already rendered, no need to render it again.
                 'disable_lambda_rendering' => true,
-            ));
-
+            ]);
         }
 
         return $this->mustache;
@@ -158,6 +158,7 @@ public function __construct(moodle_page $page, $target) {
      * Simple types are array,stdClass,bool,int,float,string
      *
      * @since 2.9
+     * @param string $templatename The template to render
      * @param array|stdClass $context Context containing data for the template.
      * @return string|boolean
      */
@@ -257,7 +258,7 @@ public function render(renderable $widget) {
      *
      * This method adds a JS event for the provided component action to the page
      * and then returns the id that the event has been attached to.
-     * If no id has been provided then a new ID is generated by {@link html_writer::random_id()}
+     * If no id has been provided then a new ID is generated by {@see html_writer::random_id()}
      *
      * @param component_action $action
      * @param string $id
@@ -357,8 +358,14 @@ public function get_logo_url($maxwidth = null, $maxheight = 200) {
         $filepath = ((int) $maxwidth . 'x' . (int) $maxheight) . '/';
 
         // Use $CFG->themerev to prevent browser caching when the file changes.
-        return moodle_url::make_pluginfile_url(context_system::instance()->id, 'core_admin', 'logo', $filepath,
-            theme_get_revision(), $logo);
+        return moodle_url::make_pluginfile_url(
+            context_system::instance()->id,
+            'core_admin',
+            'logo',
+            $filepath,
+            theme_get_revision(),
+            $logo
+        );
     }
 
     /**
@@ -379,8 +386,14 @@ public function get_compact_logo_url($maxwidth = 300, $maxheight = 300) {
         $filepath = ((int) $maxwidth . 'x' . (int) $maxheight) . '/';
 
         // Use $CFG->themerev to prevent browser caching when the file changes.
-        return moodle_url::make_pluginfile_url(context_system::instance()->id, 'core_admin', 'logocompact', $filepath,
-            theme_get_revision(), $logo);
+        return moodle_url::make_pluginfile_url(
+            context_system::instance()->id,
+            'core_admin',
+            'logocompact',
+            $filepath,
+            theme_get_revision(),
+            $logo
+        );
     }
 
     /**
diff --git a/lib/classes/output/renderer_factory/renderer_factory_base.php b/lib/classes/output/renderer_factory/renderer_factory_base.php
index 16009bd8cabcb..03911db7e028e 100644
--- a/lib/classes/output/renderer_factory/renderer_factory_base.php
+++ b/lib/classes/output/renderer_factory/renderer_factory_base.php
@@ -68,15 +68,27 @@ protected function get_target_suffix($target) {
         }
 
         switch ($target) {
-            case RENDERER_TARGET_CLI: $suffix = '_cli'; break;
-            case RENDERER_TARGET_AJAX: $suffix = '_ajax'; break;
-            case RENDERER_TARGET_TEXTEMAIL: $suffix = '_textemail'; break;
-            case RENDERER_TARGET_HTMLEMAIL: $suffix = '_htmlemail'; break;
-            case RENDERER_TARGET_MAINTENANCE: $suffix = '_maintenance'; break;
-            default: $target = RENDERER_TARGET_GENERAL; $suffix = '';
+            case RENDERER_TARGET_CLI:
+                $suffix = '_cli';
+                break;
+            case RENDERER_TARGET_AJAX:
+                $suffix = '_ajax';
+                break;
+            case RENDERER_TARGET_TEXTEMAIL:
+                $suffix = '_textemail';
+                break;
+            case RENDERER_TARGET_HTMLEMAIL:
+                $suffix = '_htmlemail';
+                break;
+            case RENDERER_TARGET_MAINTENANCE:
+                $suffix = '_maintenance';
+                break;
+            default:
+                $target = RENDERER_TARGET_GENERAL;
+                $suffix = '';
         }
 
-        return array($target, $suffix);
+        return [$target, $suffix];
     }
 
     /**
@@ -102,14 +114,14 @@ protected function get_target_suffix($target) {
      */
     protected function standard_renderer_classnames($component, $subtype = null) {
         global $CFG; // Needed in included files.
-        $classnames = array();
+        $classnames = [];
 
         // Standardize component name ala frankenstyle.
-        list($plugin, $type) = core_component::normalize_component($component);
+        [$plugin, $type] = core_component::normalize_component($component);
         if ($type === null) {
             $component = $plugin;
         } else {
-            $component = $plugin.'_'.$type;
+            $component = $plugin . '_' . $type;
         }
 
         if ($component !== 'core') {
@@ -121,7 +133,6 @@ protected function standard_renderer_classnames($component, $subtype = null) {
             if (file_exists($rendererfile)) {
                 include_once($rendererfile);
             }
-
         } else if (!empty($subtype)) {
             $coresubsystems = core_component::get_core_subsystems();
             if (!array_key_exists($subtype, $coresubsystems)) { // There may be nulls.
@@ -137,63 +148,63 @@ protected function standard_renderer_classnames($component, $subtype = null) {
 
         if (empty($subtype)) {
             // Theme specific auto-loaded name (only valid when prefixed with the theme name).
-            $classnames[] = array(
+            $classnames[] = [
                 'validwithprefix' => true,
                 'validwithoutprefix' => false,
                 'autoloaded' => true,
-                'classname' => '\\output\\' . $component . '_renderer'
-            );
+                'classname' => '\\output\\' . $component . '_renderer',
+            ];
 
             // Standard autoloaded plugin name (not valid with a prefix).
-            $classnames[] = array(
+            $classnames[] = [
                 'validwithprefix' => false,
                 'validwithoutprefix' => true,
                 'autoloaded' => true,
-                'classname' => '\\' . $component . '\\output\\renderer'
-            );
+                'classname' => '\\' . $component . '\\output\\renderer',
+            ];
             // Legacy class name - (valid with or without a prefix).
-            $classnames[] = array(
+            $classnames[] = [
                 'validwithprefix' => true,
                 'validwithoutprefix' => true,
                 'autoloaded' => false,
-                'classname' => $component . '_renderer'
-            );
+                'classname' => $component . '_renderer',
+            ];
         } else {
             // Theme specific auto-loaded name (only valid when prefixed with the theme name).
-            $classnames[] = array(
+            $classnames[] = [
                 'validwithprefix' => true,
                 'validwithoutprefix' => false,
                 'autoloaded' => true,
-                'classname' => '\\output\\' . $component . '\\' . $subtype . '_renderer'
-            );
+                'classname' => '\\output\\' . $component . '\\' . $subtype . '_renderer',
+            ];
             // Version of the above with subtype being a namespace level on it's own.
-            $classnames[] = array(
+            $classnames[] = [
                 'validwithprefix' => true,
                 'validwithoutprefix' => false,
                 'autoloaded' => true,
-                'classname' => '\\output\\' . $component . '\\' . $subtype . '\\renderer'
-            );
+                'classname' => '\\output\\' . $component . '\\' . $subtype . '\\renderer',
+            ];
             // Standard autoloaded plugin name (not valid with a prefix).
-            $classnames[] = array(
+            $classnames[] = [
                 'validwithprefix' => false,
                 'validwithoutprefix' => true,
                 'autoloaded' => true,
-                'classname' => '\\' . $component . '\\output\\' . $subtype . '_renderer'
-            );
+                'classname' => '\\' . $component . '\\output\\' . $subtype . '_renderer',
+            ];
             // Version of the above with subtype being a namespace level on it's own.
-            $classnames[] = array(
+            $classnames[] = [
                 'validwithprefix' => false,
                 'validwithoutprefix' => true,
                 'autoloaded' => true,
-                'classname' => '\\' . $component . '\\output\\' . $subtype . '\\renderer'
-            );
+                'classname' => '\\' . $component . '\\output\\' . $subtype . '\\renderer',
+            ];
             // Legacy class name - (valid with or without a prefix).
-            $classnames[] = array(
+            $classnames[] = [
                 'validwithprefix' => true,
                 'validwithoutprefix' => true,
                 'autoloaded' => false,
-                'classname' => $component . '_' . $subtype . '_renderer'
-            );
+                'classname' => $component . '_' . $subtype . '_renderer',
+            ];
         }
         return $classnames;
     }
diff --git a/lib/classes/output/renderer_factory/renderer_factory_interface.php b/lib/classes/output/renderer_factory/renderer_factory_interface.php
index 9707182c517d1..792e5be1487e2 100644
--- a/lib/classes/output/renderer_factory/renderer_factory_interface.php
+++ b/lib/classes/output/renderer_factory/renderer_factory_interface.php
@@ -27,7 +27,7 @@
  * if created automatically when the theme is set up.
  *
  * A renderer factory must also have a constructor that takes a theme_config object.
- * (See {@link renderer_factory_base::__construct} for an example.)
+ * (See {@see renderer_factory_base::__construct} for an example.)
  *
  * @copyright 2009 Tim Hunt
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -61,7 +61,7 @@ interface renderer_factory_interface {
      * @param string $target one of rendering target constants
      * @return renderer_base an object implementing the requested renderer interface.
      */
-    public function get_renderer(moodle_page $page, $component, $subtype=null, $target=null);
+    public function get_renderer(moodle_page $page, $component, $subtype = null, $target = null);
 }
 
 // Alias this class to the old name.
diff --git a/lib/classes/output/renderer_factory/standard_renderer_factory.php b/lib/classes/output/renderer_factory/standard_renderer_factory.php
index ac2651d992aa3..d3201ef2c0f8e 100644
--- a/lib/classes/output/renderer_factory/standard_renderer_factory.php
+++ b/lib/classes/output/renderer_factory/standard_renderer_factory.php
@@ -45,7 +45,7 @@ public function get_renderer(moodle_page $page, $component, $subtype = null, $ta
         $classnames = $this->standard_renderer_classnames($component, $subtype);
         $classname = '';
 
-        list($target, $suffix) = $this->get_target_suffix($target);
+        [$target, $suffix] = $this->get_target_suffix($target);
         // First look for a version with a suffix.
         foreach ($classnames as $classnamedetails) {
             if ($classnamedetails['validwithoutprefix']) {
diff --git a/lib/classes/output/renderer_factory/theme_overridden_renderer_factory.php b/lib/classes/output/renderer_factory/theme_overridden_renderer_factory.php
index 3e7cc10bfacad..04d41c5b1464a 100644
--- a/lib/classes/output/renderer_factory/theme_overridden_renderer_factory.php
+++ b/lib/classes/output/renderer_factory/theme_overridden_renderer_factory.php
@@ -40,7 +40,7 @@ class theme_overridden_renderer_factory extends renderer_factory_base {
     /**
      * @var array An array of renderer prefixes
      */
-    protected $prefixes = array();
+    protected $prefixes = [];
 
     /**
      * Constructor.
@@ -64,7 +64,7 @@ public function __construct(theme_config $theme) {
     public function get_renderer(moodle_page $page, $component, $subtype = null, $target = null) {
         $classnames = $this->standard_renderer_classnames($component, $subtype);
 
-        list($target, $suffix) = $this->get_target_suffix($target);
+        [$target, $suffix] = $this->get_target_suffix($target);
 
         // Theme lib.php and renderers.php files are loaded automatically
         // when loading the theme configs.
diff --git a/lib/classes/output/requirements/fragment_requirements_manager.php b/lib/classes/output/requirements/fragment_requirements_manager.php
index 9a71fe77f597c..5240c34ca49cf 100644
--- a/lib/classes/output/requirements/fragment_requirements_manager.php
+++ b/lib/classes/output/requirements/fragment_requirements_manager.php
@@ -30,7 +30,6 @@
  * @category output
  */
 class fragment_requirements_manager extends page_requirements_manager {
-
     /**
      * Page fragment constructor.
      */
@@ -84,7 +83,7 @@ public function get_end_code() {
 
         if (!empty($this->stringsforjs)) {
             // Add all needed strings.
-            $strings = array();
+            $strings = [];
             foreach ($this->stringsforjs as $component => $v) {
                 foreach ($v as $indentifier => $langstring) {
                     $strings[$component][$indentifier] = $langstring->out();
@@ -100,7 +99,7 @@ public function get_end_code() {
         if ($this->jsinitvariables['footer']) {
             $js = '';
             foreach ($this->jsinitvariables['footer'] as $data) {
-                list($var, $value) = $data;
+                [$var, $value] = $data;
                 $js .= js_writer::set_variable($var, $value, true);
             }
             $output .= html_writer::script($js);
diff --git a/lib/classes/output/requirements/page_requirements_manager.php b/lib/classes/output/requirements/page_requirements_manager.php
index f19999b558edd..a417d4e9ac6c2 100644
--- a/lib/classes/output/requirements/page_requirements_manager.php
+++ b/lib/classes/output/requirements/page_requirements_manager.php
@@ -48,7 +48,7 @@
  *     $PAGE->requires->js_function_call('init_mymod', array($data), true);
  * </pre>
  *
- * There are some natural restrictions on some methods. For example, {@link css()}
+ * There are some natural restrictions on some methods. For example, {@see css()}
  * can only be called before the <head> tag is output. See the comments on the
  * individual methods for details.
  *
@@ -62,71 +62,71 @@ class page_requirements_manager {
     /**
      * @var array List of string available from JS
      */
-    protected $stringsforjs = array();
+    protected $stringsforjs = [];
 
     /**
      * @var array List of get_string $a parameters - used for validation only.
      */
-    protected $stringsforjs_as = array();
+    protected $stringsforjs_as = []; // phpcs:ignore moodle.NamingConventions.ValidVariableName.MemberNameUnderscore
 
     /**
      * @var array List of JS variables to be initialised
      */
-    protected $jsinitvariables = array('head'=>array(), 'footer'=>array());
+    protected $jsinitvariables = ['head' => [], 'footer' => []];
 
     /**
      * @var array Included JS scripts
      */
-    protected $jsincludes = array('head'=>array(), 'footer'=>array());
+    protected $jsincludes = ['head' => [], 'footer' => []];
 
     /**
      * @var array Inline scripts using RequireJS module loading.
      */
-    protected $amdjscode = array('');
+    protected $amdjscode = [''];
 
     /**
      * @var array List of needed function calls
      */
-    protected $jscalls = array('normal'=>array(), 'ondomready'=>array());
+    protected $jscalls = ['normal' => [], 'ondomready' => []];
 
     /**
      * @var array List of skip links, those are needed for accessibility reasons
      */
-    protected $skiplinks = array();
+    protected $skiplinks = [];
 
     /**
      * @var array Javascript code used for initialisation of page, it should
      * be relatively small
      */
-    protected $jsinitcode = array();
+    protected $jsinitcode = [];
 
     /**
      * @var array of moodle_url Theme sheets, initialised only from core_renderer
      */
-    protected $cssthemeurls = array();
+    protected $cssthemeurls = [];
 
     /**
      * @var array of moodle_url List of custom theme sheets, these are strongly discouraged!
      * Useful mostly only for CSS submitted by teachers that is not part of the theme.
      */
-    protected $cssurls = array();
+    protected $cssurls = [];
 
     /**
      * @var array List of requested event handlers
      */
-    protected $eventhandlers = array();
+    protected $eventhandlers = [];
 
     /**
      * @var array Extra modules
      */
-    protected $extramodules = array();
+    protected $extramodules = [];
 
     /**
      * @var array trackes the names of bits of HTML that are only required once
-     * per page. See {@link has_one_time_item_been_created()},
-     * {@link set_one_time_item_created()} and {@link should_create_one_time_item_now()}.
+     * per page. See {@see has_one_time_item_been_created()},
+     * {@see set_one_time_item_created()} and {@see should_create_one_time_item_now()}.
      */
-    protected $onetimeitemsoutput = array();
+    protected $onetimeitemsoutput = [];
 
     /**
      * @var bool Flag indicated head stuff already printed
@@ -146,27 +146,27 @@ class page_requirements_manager {
     /**
      * @var yui default YUI loader configuration
      */
-    protected $YUI_config;
+    protected $YUI_config; // phpcs:ignore moodle.NamingConventions.ValidVariableName.MemberNameUnderscore
 
     /**
      * @var array $yuicssmodules
      */
-    protected $yuicssmodules = array();
+    protected $yuicssmodules = [];
 
     /**
      * @var array Some config vars exposed in JS, please no secret stuff there
      */
-    protected $M_cfg;
+    protected $M_cfg; // phpcs:ignore moodle.NamingConventions.ValidVariableName.MemberNameUnderscore
 
     /**
      * @var array list of requested jQuery plugins
      */
-    protected $jqueryplugins = array();
+    protected $jqueryplugins = [];
 
     /**
      * @var array list of jQuery plugin overrides
      */
-    protected $jquerypluginoverrides = array();
+    protected $jquerypluginoverrides = [];
 
     /**
      * Page requirements constructor.
@@ -181,8 +181,8 @@ public function __construct() {
         $this->YUI_config = new yui();
 
         // Set up some loader options.
-        $this->yui3loader->local_base = $CFG->wwwroot . '/lib/yuilib/'. $CFG->yui3version . '/';
-        $this->yui3loader->local_comboBase = $CFG->wwwroot . '/theme/yui_combo.php'.$sep;
+        $this->yui3loader->local_base = $CFG->wwwroot . '/lib/yuilib/' . $CFG->yui3version . '/';
+        $this->yui3loader->local_comboBase = $CFG->wwwroot . '/theme/yui_combo.php' . $sep;
 
         $this->yui3loader->base = $this->yui3loader->local_base;
         $this->yui3loader->comboBase = $this->yui3loader->local_comboBase;
@@ -199,56 +199,58 @@ public function __construct() {
 
         // If we've had to patch any YUI modules between releases, we must override the YUI configuration to include them.
         if (!empty($CFG->yuipatchedmodules) && !empty($CFG->yuipatchlevel)) {
-            $this->YUI_config->define_patched_core_modules($this->yui3loader->local_comboBase,
-                    $CFG->yui3version,
-                    $CFG->yuipatchlevel,
-                    $CFG->yuipatchedmodules);
+            $this->YUI_config->define_patched_core_modules(
+                $this->yui3loader->local_comboBase,
+                $CFG->yui3version,
+                $CFG->yuipatchlevel,
+                $CFG->yuipatchedmodules
+            );
         }
 
         $configname = $this->YUI_config->set_config_source('lib/yui/config/yui2.js');
-        $this->YUI_config->add_group('yui2', array(
+        $this->YUI_config->add_group('yui2', [
             // Loader configuration for our 2in3.
             'base' => $CFG->wwwroot . '/lib/yuilib/2in3/' . $CFG->yui2version . '/build/',
-            'comboBase' => $CFG->wwwroot . '/theme/yui_combo.php'.$sep,
+            'comboBase' => $CFG->wwwroot . '/theme/yui_combo.php' . $sep,
             'combine' => $this->yui3loader->combine,
             'ext' => false,
-            'root' => '2in3/' . $CFG->yui2version .'/build/',
-            'patterns' => array(
-                'yui2-' => array(
+            'root' => '2in3/' . $CFG->yui2version . '/build/',
+            'patterns' => [
+                'yui2-' => [
                     'group' => 'yui2',
                     'configFn' => $configname,
-                )
-            )
-        ));
+                ],
+            ],
+        ]);
         $configname = $this->YUI_config->set_config_source('lib/yui/config/moodle.js');
-        $this->YUI_config->add_group('moodle', array(
+        $this->YUI_config->add_group('moodle', [
             'name' => 'moodle',
             'base' => $CFG->wwwroot . '/theme/yui_combo.php' . $sep . 'm/' . $jsrev . '/',
             'combine' => $this->yui3loader->combine,
-            'comboBase' => $CFG->wwwroot . '/theme/yui_combo.php'.$sep,
+            'comboBase' => $CFG->wwwroot . '/theme/yui_combo.php' . $sep,
             'ext' => false,
-            'root' => 'm/'.$jsrev.'/', // Add the rev to the root path so that we can control caching.
-            'patterns' => array(
-                'moodle-' => array(
+            'root' => 'm/' . $jsrev . '/', // Add the rev to the root path so that we can control caching.
+            'patterns' => [
+                'moodle-' => [
                     'group' => 'moodle',
                     'configFn' => $configname,
-                )
-            )
-        ));
+                ],
+            ],
+        ]);
 
-        $this->YUI_config->add_group('gallery', array(
+        $this->YUI_config->add_group('gallery', [
             'name' => 'gallery',
             'base' => $CFG->wwwroot . '/lib/yuilib/gallery/',
             'combine' => $this->yui3loader->combine,
             'comboBase' => $CFG->wwwroot . '/theme/yui_combo.php' . $sep,
             'ext' => false,
             'root' => 'gallery/' . $jsrev . '/',
-            'patterns' => array(
-                'gallery-' => array(
+            'patterns' => [
+                'gallery-' => [
                     'group' => 'gallery',
-                )
-            )
-        ));
+                ],
+            ],
+        ]);
 
         // Set some more loader options applying to groups too.
         if ($CFG->debugdeveloper) {
@@ -291,13 +293,14 @@ public function __construct() {
      * Return the safe config values that get set for javascript in "M.cfg".
      *
      * @since 2.9
+     * @param moodle_page $page The page to add JS to
+     * @param renderer_base $renderer The renderer to use
      * @return array List of safe config values that are available to javascript.
      */
     public function get_config_for_javascript(moodle_page $page, renderer_base $renderer) {
         global $CFG;
 
         if (empty($this->M_cfg)) {
-
             $iconsystem = \core\output\icon_system::instance();
 
             // It is possible that the $page->context is null, so we can't use $page->context->id.
@@ -310,7 +313,7 @@ public function get_config_for_javascript(moodle_page $page, renderer_base $rend
                 $coursecontext = context_course::instance($courseid);
             }
 
-            $this->M_cfg = array(
+            $this->M_cfg = [
                 'wwwroot'               => $CFG->wwwroot,
                 'homeurl'               => $page->navigation->action,
                 'sesskey'               => sesskey(),
@@ -332,14 +335,13 @@ public function get_config_for_javascript(moodle_page $page, renderer_base $rend
                 'langrev'               => get_string_manager()->get_revision(),
                 'templaterev'           => $this->get_templaterev(),
                 'siteId'                => (int) SITEID,
-            );
+            ];
             if ($CFG->debugdeveloper) {
                 $this->M_cfg['developerdebug'] = true;
             }
             if (defined('BEHAT_SITE_RUNNING')) {
                 $this->M_cfg['behatsiterunning'] = true;
             }
-
         }
         return $this->M_cfg;
     }
@@ -369,21 +371,25 @@ protected function init_requirements_data(moodle_page $page, core_renderer $rend
             $this->js_init_call('M.util.init_frametop');
         }
 
-        // Include block drag/drop if editing is on
+        // Include block drag/drop if editing is on.
         if ($page->user_is_editing()) {
-            $params = array(
+            $params = [
                 'regions' => $page->blocks->get_regions(),
                 'pagehash' => $page->get_edited_page_hash(),
-            );
+            ];
             if (!empty($page->cm->id)) {
                 $params['cmid'] = $page->cm->id;
             }
             // Strings for drag and drop.
-            $this->strings_for_js(array('movecontent',
-                                        'tocontent',
-                                        'emptydragdropregion'),
-                                  'moodle');
-            $page->requires->yui_module('moodle-core-blocks', 'M.core_blocks.init_dragdrop', array($params), null, true);
+            $this->strings_for_js(
+                [
+                    'movecontent',
+                    'tocontent',
+                    'emptydragdropregion',
+                ],
+                'moodle',
+            );
+            $page->requires->yui_module('moodle-core-blocks', 'M.core_blocks.init_dragdrop', [$params], null, true);
             $page->requires->js_call_amd('core_block/edit', 'init', ['pagehash' => $page->get_edited_page_hash()]);
         }
 
@@ -459,7 +465,7 @@ public function js($url, $inhead = false) {
      *
      * NOTE: this should not be used in official Moodle distribution!
      *
-     * {@link https://moodledev.io/docs/guides/javascript/jquery}
+     * @link https://moodledev.io/docs/guides/javascript/jquery
      */
     public function jquery() {
         $this->jquery_plugin('jquery');
@@ -521,15 +527,18 @@ public function jquery_plugin($plugin, $component = 'core') {
             return false;
         }
 
-        if ($component !== 'core' and in_array($plugin, array('jquery', 'ui', 'ui-css'))) {
-            debugging("jQuery plugin '$plugin' is included in Moodle core, other components can not use the same name.", DEBUG_DEVELOPER);
+        if ($component !== 'core' && in_array($plugin, ['jquery', 'ui', 'ui-css'])) {
+            debugging(
+                "jQuery plugin '$plugin' is included in Moodle core, other components can not use the same name.",
+                DEBUG_DEVELOPER,
+            );
             $component = 'core';
-        } else if ($component !== 'core' and strpos($component, '_') === false) {
+        } else if ($component !== 'core' && strpos($component, '_') === false) {
             // Let's normalise the legacy activity names, Frankenstyle rulez!
             $component = 'mod_' . $component;
         }
 
-        if (empty($this->jqueryplugins) and ($component !== 'core' or $plugin !== 'jquery')) {
+        if (empty($this->jqueryplugins) && ($component !== 'core' || $plugin !== 'jquery')) {
             // Make sure the jQuery itself is always loaded first,
             // the order of all other plugins depends on order of $PAGE_>requires->.
             $this->jquery_plugin('jquery', 'core');
@@ -541,12 +550,12 @@ public function jquery_plugin($plugin, $component = 'core') {
         }
 
         $componentdir = core_component::get_component_directory($component);
-        if (!file_exists($componentdir) or !file_exists("$componentdir/jquery/plugins.php")) {
+        if (!file_exists($componentdir) || !file_exists("$componentdir/jquery/plugins.php")) {
             debugging("Can not load jQuery plugin '$plugin', missing plugins.php in component '$component'.", DEBUG_DEVELOPER);
             return false;
         }
 
-        $plugins = array();
+        $plugins = [];
         require("$componentdir/jquery/plugins.php");
 
         if (!isset($plugins[$plugin])) {
@@ -557,7 +566,7 @@ public function jquery_plugin($plugin, $component = 'core') {
         $this->jqueryplugins[$plugin] = new stdClass();
         $this->jqueryplugins[$plugin]->plugin    = $plugin;
         $this->jqueryplugins[$plugin]->component = $component;
-        $this->jqueryplugins[$plugin]->urls      = array();
+        $this->jqueryplugins[$plugin]->urls      = [];
 
         foreach ($plugins[$plugin]['files'] as $file) {
             if ($CFG->debugdeveloper) {
@@ -575,12 +584,11 @@ public function jquery_plugin($plugin, $component = 'core') {
             if (!empty($CFG->slasharguments)) {
                 $url = new moodle_url("/theme/jquery.php");
                 $url->set_slashargument("/$component/$file");
-
             } else {
                 // This is not really good, we need slasharguments for relative links, this means no caching...
                 $path = realpath("$componentdir/jquery/$file");
                 if (strpos($path, $CFG->dirroot) === 0) {
-                    $url = $CFG->wwwroot.preg_replace('/^'.preg_quote($CFG->dirroot, '/').'/', '', $path);
+                    $url = $CFG->wwwroot . preg_replace('/^' . preg_quote($CFG->dirroot, '/') . '/', '', $path);
                     // Replace all occurences of backslashes characters in url to forward slashes.
                     $url = str_replace('\\', '/', $url);
                     $url = new moodle_url($url);
@@ -618,7 +626,7 @@ public function jquery_plugin($plugin, $component = 'core') {
      * This code prevents loading of standard 'ui-css' which my be requested by other plugins,
      * the 'yourtheme-ui-css' gets loaded only if some other code requires jquery.
      *
-     * {@link https://moodledev.io/docs/guides/javascript/jquery}
+     * @link https://moodledev.io/docs/guides/javascript/jquery
      *
      * @param string $oldplugin original plugin
      * @param string $newplugin the replacement
@@ -642,8 +650,8 @@ protected function get_jquery_headcode() {
             return '';
         }
 
-        $included = array();
-        $urls = array();
+        $included = [];
+        $urls = [];
 
         foreach ($this->jqueryplugins as $name => $unused) {
             if (isset($included[$name])) {
@@ -655,7 +663,7 @@ protected function get_jquery_headcode() {
                 // in blank page.
                 $cyclic = true;
                 $oldname = $name;
-                for ($i=0; $i<100; $i++) {
+                for ($i = 0; $i < 100; $i++) {
                     $name = $this->jquerypluginoverrides[$name];
                     if (!array_key_exists($name, $this->jquerypluginoverrides)) {
                         $cyclic = false;
@@ -666,15 +674,12 @@ protected function get_jquery_headcode() {
                     // We can not do much with cyclic references here, let's use the old plugin.
                     $name = $oldname;
                     debugging("Cyclic overrides detected for jQuery plugin '$name'");
-
                 } else if (empty($name)) {
                     // Developer requested removal of the plugin.
                     continue;
-
                 } else if (!isset($this->jqueryplugins[$name])) {
                     debugging("Unknown jQuery override plugin '$name' detected");
                     $name = $oldname;
-
                 } else if (isset($included[$name])) {
                     // The plugin was already included, easy.
                     continue;
@@ -687,7 +692,7 @@ protected function get_jquery_headcode() {
         }
 
         $output = '';
-        $attributes = array('rel' => 'stylesheet', 'type' => 'text/css');
+        $attributes = ['rel' => 'stylesheet', 'type' => 'text/css'];
         foreach ($urls as $url) {
             if (preg_match('/\.js$/', $url)) {
                 $output .= html_writer::script('', $url);
@@ -743,7 +748,7 @@ protected function js_fix_url($url) {
                     return new moodle_url('/lib/javascript.php', ['rev' => $jsrev, 'jsfile' => $url]);
                 } else {
                     $returnurl = new moodle_url('/lib/javascript.php');
-                    $returnurl->set_slashargument('/'.$jsrev.$url);
+                    $returnurl->set_slashargument('/' . $jsrev . $url);
                     return $returnurl;
                 }
             } else {
@@ -768,77 +773,104 @@ protected function find_module($component) {
         if (strpos($component, 'core_') === 0) {
             // Must be some core stuff - list here is not complete, this is just the stuff used from multiple places
             // so that we do nto have to repeat the definition of these modules over and over again.
-            switch($component) {
+            switch ($component) {
                 case 'core_filepicker':
-                    $module = array('name'     => 'core_filepicker',
-                                    'fullpath' => '/repository/filepicker.js',
-                                    'requires' => array(
-                                        'base', 'node', 'node-event-simulate', 'json', 'async-queue', 'io-base', 'io-upload-iframe', 'io-form',
-                                        'yui2-treeview', 'panel', 'cookie', 'datatable', 'datatable-sort', 'resize-plugin', 'dd-plugin',
-                                        'escape', 'moodle-core_filepicker', 'moodle-core-notification-dialogue'
-                                    ),
-                                    'strings'  => array(array('lastmodified', 'moodle'), array('name', 'moodle'), array('type', 'repository'), array('size', 'repository'),
-                                                        array('invalidjson', 'repository'), array('error', 'moodle'), array('info', 'moodle'),
-                                                        array('nofilesattached', 'repository'), array('filepicker', 'repository'), array('logout', 'repository'),
-                                                        array('nofilesavailable', 'repository'), array('norepositoriesavailable', 'repository'),
-                                                        array('fileexistsdialogheader', 'repository'), array('fileexistsdialog_editor', 'repository'),
-                                                        array('fileexistsdialog_filemanager', 'repository'), array('renameto', 'repository'),
-                                                        array('referencesexist', 'repository'), array('select', 'repository')
-                                                    ));
+                    $module = [
+                        'name' => 'core_filepicker',
+                        'fullpath' => '/repository/filepicker.js',
+                        'requires' => [
+                            'base', 'node', 'node-event-simulate', 'json', 'async-queue', 'io-base', 'io-upload-iframe', 'io-form',
+                            'yui2-treeview', 'panel', 'cookie', 'datatable', 'datatable-sort', 'resize-plugin', 'dd-plugin',
+                            'escape', 'moodle-core_filepicker', 'moodle-core-notification-dialogue',
+                        ],
+                        'strings'  => [
+                            ['lastmodified', 'moodle'],
+                            ['name', 'moodle'],
+                            ['type', 'repository'],
+                            ['size', 'repository'],
+                            ['invalidjson', 'repository'],
+                            ['error', 'moodle'],
+                            ['info', 'moodle'],
+                            ['nofilesattached', 'repository'],
+                            ['filepicker', 'repository'],
+                            ['logout', 'repository'],
+                            ['nofilesavailable', 'repository'],
+                            ['norepositoriesavailable', 'repository'],
+                            ['fileexistsdialogheader', 'repository'],
+                            ['fileexistsdialog_editor', 'repository'],
+                            ['fileexistsdialog_filemanager', 'repository'],
+                            ['renameto', 'repository'],
+                            ['referencesexist', 'repository'],
+                            ['select', 'repository'],
+                        ],
+                    ];
                     break;
                 case 'core_comment':
-                    $module = array('name'     => 'core_comment',
-                                    'fullpath' => '/comment/comment.js',
-                                    'requires' => array('base', 'io-base', 'node', 'json', 'yui2-animation', 'overlay', 'escape'),
-                                    'strings' => array(array('confirmdeletecomments', 'admin'), array('yes', 'moodle'), array('no', 'moodle'))
-                                );
+                    $module = [
+                        'name' => 'core_comment',
+                        'fullpath' => '/comment/comment.js',
+                        'requires' => ['base', 'io-base', 'node', 'json', 'yui2-animation', 'overlay', 'escape'],
+                        'strings' => [['confirmdeletecomments', 'admin'], ['yes', 'moodle'], ['no', 'moodle']],
+                    ];
                     break;
                 case 'core_role':
-                    $module = array('name'     => 'core_role',
-                                    'fullpath' => '/admin/roles/module.js',
-                                    'requires' => array('node', 'cookie'));
+                    $module = [
+                        'name' => 'core_role',
+                        'fullpath' => '/admin/roles/module.js',
+                        'requires' => ['node', 'cookie'],
+                    ];
                     break;
                 case 'core_completion':
                     break;
                 case 'core_message':
-                    $module = array('name'     => 'core_message',
-                                    'requires' => array('base', 'node', 'event', 'node-event-simulate'),
-                                    'fullpath' => '/message/module.js');
+                    $module = [
+                        'name' => 'core_message',
+                        'requires' => ['base', 'node', 'event', 'node-event-simulate'],
+                        'fullpath' => '/message/module.js',
+                    ];
                     break;
                 case 'core_group':
-                    $module = array('name'     => 'core_group',
-                                    'fullpath' => '/group/module.js',
-                                    'requires' => array('node', 'overlay', 'event-mouseenter'));
+                    $module = [
+                        'name' => 'core_group',
+                        'fullpath' => '/group/module.js',
+                        'requires' => ['node', 'overlay', 'event-mouseenter'],
+                    ];
                     break;
                 case 'core_question_engine':
-                    $module = array('name'     => 'core_question_engine',
-                                    'fullpath' => '/question/qengine.js',
-                                    'requires' => array('node', 'event'));
+                    $module = [
+                        'name' => 'core_question_engine',
+                        'fullpath' => '/question/qengine.js',
+                        'requires' => ['node', 'event'],
+                    ];
                     break;
                 case 'core_rating':
-                    $module = array('name'     => 'core_rating',
-                                    'fullpath' => '/rating/module.js',
-                                    'requires' => array('node', 'event', 'overlay', 'io-base', 'json'));
+                    $module = [
+                        'name' => 'core_rating',
+                        'fullpath' => '/rating/module.js',
+                        'requires' => ['node', 'event', 'overlay', 'io-base', 'json'],
+                    ];
                     break;
                 case 'core_dndupload':
-                    $module = array('name'     => 'core_dndupload',
-                                    'fullpath' => '/lib/form/dndupload.js',
-                                    'requires' => array('node', 'event', 'json', 'core_filepicker'),
-                                    'strings'  => array(array('uploadformlimit', 'moodle'), array('droptoupload', 'moodle'), array('maxfilesreached', 'moodle'),
-                                                        array('dndenabled_inbox', 'moodle'), array('fileexists', 'moodle'), array('maxbytesfile', 'error'),
-                                                        array('sizegb', 'moodle'), array('sizemb', 'moodle'), array('sizekb', 'moodle'), array('sizeb', 'moodle'),
-                                                        array('maxareabytesreached', 'moodle'), array('serverconnection', 'error'),
-                                                        array('changesmadereallygoaway', 'moodle'), array('complete', 'moodle')
-                                                    ));
+                    $module = [
+                        'name' => 'core_dndupload',
+                        'fullpath' => '/lib/form/dndupload.js',
+                        'requires' => ['node', 'event', 'json', 'core_filepicker'],
+                        'strings'  => [
+                            ['uploadformlimit', 'moodle'], ['droptoupload', 'moodle'], ['maxfilesreached', 'moodle'],
+                            ['dndenabled_inbox', 'moodle'], ['fileexists', 'moodle'], ['maxbytesfile', 'error'],
+                            ['sizegb', 'moodle'], ['sizemb', 'moodle'], ['sizekb', 'moodle'], ['sizeb', 'moodle'],
+                            ['maxareabytesreached', 'moodle'], ['serverconnection', 'error'],
+                            ['changesmadereallygoaway', 'moodle'], ['complete', 'moodle'],
+                        ],
+                    ];
                     break;
             }
-
         } else {
             if ($dir = core_component::get_component_directory($component)) {
                 if (file_exists("$dir/module.js")) {
-                    if (strpos($dir, $CFG->dirroot.'/') === 0) {
+                    if (strpos($dir, $CFG->dirroot . '/') === 0) {
                         $dir = substr($dir, strlen($CFG->dirroot));
-                        $module = array('name'=>$component, 'fullpath'=>"$dir/module.js", 'requires' => array());
+                        $module = ['name' => $component, 'fullpath' => "$dir/module.js", 'requires' => []];
                     }
                 }
             }
@@ -865,7 +897,7 @@ public function js_module($module) {
             $module = $this->find_module($module);
         }
 
-        if (empty($module) or empty($module['name']) or empty($module['fullpath'])) {
+        if (empty($module) || empty($module['name']) || empty($module['fullpath'])) {
             throw new coding_exception('Missing YUI3 module details.');
         }
 
@@ -883,7 +915,7 @@ public function js_module($module) {
 
         // Process module requirements and attempt to load each. This allows
         // moodle modules to require each other.
-        if (!empty($module['requires'])){
+        if (!empty($module['requires'])) {
             foreach ($module['requires'] as $requirement) {
                 $rmodule = $this->find_module($requirement);
                 if (is_array($rmodule)) {
@@ -919,7 +951,7 @@ protected function js_module_loaded($module) {
      * Ensure that the specified CSS file is linked to from this page.
      *
      * Because stylesheet links must go in the <head> part of the HTML, you must call
-     * this function before {@link get_head_code()} is called. That normally means before
+     * this function before {@see get_head_code()} is called. That normally means before
      * the call to print_header. If you call it when it is too late, an exception
      * will be thrown.
      *
@@ -942,8 +974,9 @@ public function css($stylesheet) {
             throw new coding_exception('Cannot require a CSS file after &lt;head> has been printed.', $stylesheet);
         }
 
+        // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedIf
         if ($stylesheet instanceof moodle_url) {
-            // ok
+            // Ok.
         } else if (strpos($stylesheet, '/') === 0) {
             $stylesheet = new moodle_url($stylesheet);
         } else {
@@ -967,7 +1000,7 @@ public function css_theme(moodle_url $stylesheet) {
     /**
      * Ensure that a skip link to a given target is printed at the top of the <body>.
      *
-     * You must call this function before {@link get_top_of_body_code()}, (if not, an exception
+     * You must call this function before {@see get_top_of_body_code()}, (if not, an exception
      * will be thrown). That normally means you must call this before the call to print_header.
      *
      * If you ask for a particular skip link to be printed, it is then your responsibility
@@ -1007,16 +1040,21 @@ public function skip_link_to($target, $linktext) {
      * @param string $function the name of the JavaScritp function to call. Can
      *      be a compound name like 'Y.Event.purgeElement'. Can also be
      *      used to create and object by using a 'function name' like 'new user_selector'.
-     * @param array $arguments and array of arguments to be passed to the function.
+     * @param null|array $arguments and array of arguments to be passed to the function.
      *      When generating the function call, this will be escaped using json_encode,
      *      so passing objects and arrays should work.
      * @param bool $ondomready If tru the function is only called when the dom is
      *      ready for manipulation.
      * @param int $delay The delay before the function is called.
      */
-    public function js_function_call($function, array $arguments = null, $ondomready = false, $delay = 0) {
+    public function js_function_call(
+        $function,
+        ?array $arguments = null,
+        $ondomready = false,
+        $delay = 0,
+    ) {
         $where = $ondomready ? 'ondomready' : 'normal';
-        $this->jscalls[$where][] = array($function, $arguments, $delay);
+        $this->jscalls[$where][] = [$function, $arguments, $delay];
     }
 
     /**
@@ -1042,7 +1080,7 @@ public function js_amd_inline($code) {
      * @param string $func Optional function from the module to call, defaults to just loading the AMD module.
      * @param array $params The params to pass to the function (will be serialized into JSON).
      */
-    public function js_call_amd($fullmodule, $func = null, $params = array()) {
+    public function js_call_amd($fullmodule, $func = null, $params = []) {
         global $CFG;
 
         $modulepath = explode('/', $fullmodule);
@@ -1056,7 +1094,7 @@ public function js_call_amd($fullmodule, $func = null, $params = array()) {
         if ($func !== null) {
             $func = clean_param($func, PARAM_ALPHANUMEXT);
 
-            $jsonparams = array();
+            $jsonparams = [];
             foreach ($params as $param) {
                 $jsonparams[] = json_encode($param);
             }
@@ -1096,20 +1134,34 @@ public function js_call_amd($fullmodule, $func = null, $params = array()) {
      *
      * @param array|string $modules One or more modules
      * @param string $function The function to call once modules have been loaded
-     * @param array $arguments An array of arguments to pass to the function
-     * @param string $galleryversion Deprecated: The gallery version to use
+     * @param null|array $arguments An array of arguments to pass to the function
+     * @param null|string $galleryversion Deprecated: The gallery version to use
      * @param bool $ondomready
      */
-    public function yui_module($modules, $function, array $arguments = null, $galleryversion = null, $ondomready = false) {
+    public function yui_module(
+        $modules,
+        $function,
+        ?array $arguments = null,
+        $galleryversion = null,
+        $ondomready = false,
+    ) {
         if (!is_array($modules)) {
-            $modules = array($modules);
+            $modules = [$modules];
         }
 
         if ($galleryversion != null) {
             debugging('The galleryversion parameter to yui_module has been deprecated since Moodle 2.3.');
         }
 
-        $jscode = 'Y.use('.join(',', array_map('json_encode', convert_to_array($modules))).',function() {'.js_writer::function_call($function, $arguments).'});';
+        $jscode = 'Y.use(' .
+            join(
+                ',',
+                array_map(
+                    'json_encode',
+                    convert_to_array($modules)
+                )
+            ) .
+            ',function() {' . js_writer::function_call($function, $arguments) . '});';
         if ($ondomready) {
             $jscode = "Y.on('domready', function() { $jscode });";
         }
@@ -1121,7 +1173,7 @@ public function yui_module($modules, $function, array $arguments = null, $galler
      *
      * @param array $modules The list of YUI CSS Modules to include.
      */
-    public function set_yuicssmodules(array $modules = array()) {
+    public function set_yuicssmodules(array $modules = []) {
         $this->yuicssmodules = $modules;
     }
 
@@ -1131,13 +1183,18 @@ public function set_yuicssmodules(array $modules = array()) {
      *
      * @param string $function the name of the JavaScritp function to with init code,
      *      usually something like 'M.mod_mymodule.init'
-     * @param array $extraarguments and array of arguments to be passed to the function.
+     * @param null|array $extraarguments and array of arguments to be passed to the function.
      *      The first argument is always the YUI3 Y instance with all required dependencies
      *      already loaded.
      * @param bool $ondomready wait for dom ready (helps with some IE problems when modifying DOM)
-     * @param array $module JS module specification array
-     */
-    public function js_init_call($function, array $extraarguments = null, $ondomready = false, array $module = null) {
+     * @param null|array $module JS module specification array
+     */
+    public function js_init_call(
+        $function,
+        ?array $extraarguments = null,
+        $ondomready = false,
+        ?array $module = null,
+    ) {
         $jscode = js_writer::function_call_with_Y($function, $extraarguments);
         if (!$module) {
             // Detect module automatically.
@@ -1157,10 +1214,14 @@ public function js_init_call($function, array $extraarguments = null, $ondomread
      *
      * @param string $jscode
      * @param bool $ondomready wait for dom ready (helps with some IE problems when modifying DOM)
-     * @param array $module JS module specification array
+     * @param null|array $module JS module specification array
      */
-    public function js_init_code($jscode, $ondomready = false, array $module = null) {
-        $jscode = trim($jscode, " ;\n"). ';';
+    public function js_init_code(
+        $jscode,
+        $ondomready = false,
+        ?array $module = null,
+    ) {
+        $jscode = trim($jscode, " ;\n") . ';';
 
         $uniqid = html_writer::random_id();
         $startjs = " M.util.js_pending('" . $uniqid . "');";
@@ -1212,7 +1273,7 @@ public function js_init_code($jscode, $ondomready = false, array $module = null)
      *     alert(M.str.moodle.fullnamedisplay);
      *
      * To substitute the placeholder at client side, use M.util.get_string()
-     * function. It implements the same logic as {@link get_string()}:
+     * function. It implements the same logic as {@see get_string()}:
      *
      *     // Require the string in PHP but keep {$a} as it is.
      *     $PAGE->requires->string_for_js('fullnamedisplay', 'moodle');
@@ -1222,7 +1283,7 @@ public function js_init_code($jscode, $ondomready = false, array $module = null)
      *
      * If you do need the same string expanded with different $a values in PHP
      * on server side, then the solution is to put them in your own data structure
-     * (e.g. and array) that you pass to JavaScript with {@link data_for_js()}.
+     * (e.g. and array) that you pass to JavaScript with {@see data_for_js()}.
      *
      * @param string $identifier the desired string.
      * @param string $component the language file to look in.
@@ -1232,9 +1293,11 @@ public function string_for_js($identifier, $component, $a = null) {
         if (!$component) {
             throw new coding_exception('The $component parameter is required for page_requirements_manager::string_for_js().');
         }
-        if (isset($this->stringsforjs_as[$component][$identifier]) and $this->stringsforjs_as[$component][$identifier] !== $a) {
-            throw new coding_exception("Attempt to re-define already required string '$identifier' " .
-                    "from lang file '$component' with different \$a parameter?");
+        if (isset($this->stringsforjs_as[$component][$identifier]) && $this->stringsforjs_as[$component][$identifier] !== $a) {
+            throw new coding_exception(
+                "Attempt to re-define already required string '$identifier' " .
+                    "from lang file '$component' with different \$a parameter?",
+            );
         }
         if (!isset($this->stringsforjs[$component][$identifier])) {
             $this->stringsforjs[$component][$identifier] = new lang_string($identifier, $component, $a);
@@ -1245,7 +1308,7 @@ public function string_for_js($identifier, $component, $a = null) {
     /**
      * Make an array of language strings available for JS.
      *
-     * This function calls the above function {@link string_for_js()} for each requested
+     * This function calls the above function {@see string_for_js()} for each requested
      * string in the $identifiers array that is passed to the argument for a single module
      * passed in $module.
      *
@@ -1297,9 +1360,9 @@ public function strings_for_js($identifiers, $component, $a = null) {
      * @param bool $inhead initialise in head
      * @return void
      */
-    public function data_for_js($variable, $data, $inhead=false) {
+    public function data_for_js($variable, $data, $inhead = false) {
         $where = $inhead ? 'head' : 'footer';
-        $this->jsinitvariables[$where][] = array($variable, $data);
+        $this->jsinitvariables[$where][] = [$variable, $data];
     }
 
     /**
@@ -1308,10 +1371,15 @@ public function data_for_js($variable, $data, $inhead=false) {
      * @param mixed $selector standard YUI selector for elements, may be array or string, element id is in the form "#idvalue"
      * @param string $event A valid DOM event (click, mousedown, change etc.)
      * @param string $function The name of the function to call
-     * @param array  $arguments An optional array of argument parameters to pass to the function
-     */
-    public function event_handler($selector, $event, $function, array $arguments = null) {
-        $this->eventhandlers[] = array('selector'=>$selector, 'event'=>$event, 'function'=>$function, 'arguments'=>$arguments);
+     * @param null|array $arguments An optional array of argument parameters to pass to the function
+     */
+    public function event_handler(
+        $selector,
+        $event,
+        $function,
+        ?array $arguments = null,
+    ) {
+        $this->eventhandlers[] = ['selector' => $selector, 'event' => $event, 'function' => $function, 'arguments' => $arguments];
     }
 
     /**
@@ -1439,21 +1507,27 @@ protected function get_yui3lib_headcss() {
         $code = '';
         if ($this->yui3loader->combine) {
             if (!empty($this->yuicssmodules)) {
-                $modules = array();
+                $modules = [];
                 foreach ($this->yuicssmodules as $module) {
                     $modules[] = "$CFG->yui3version/$module/$module-min.css";
                 }
-                $code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->comboBase.implode('&amp;', $modules).'" />';
+                $code .= '<link rel="stylesheet" type="text/css" href="' .
+                    $this->yui3loader->comboBase . implode('&amp;', $modules) . '" />';
             }
-            $code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->local_comboBase.'rollup/'.$CFG->yui3version.'/yui-moodlesimple' . $yuiformat . '.css" />';
-
+            $code .= '<link rel="stylesheet" type="text/css" href="' .
+                $this->yui3loader->local_comboBase . 'rollup/' . $CFG->yui3version . '/yui-moodlesimple' . $yuiformat .
+                '.css" />';
         } else {
             if (!empty($this->yuicssmodules)) {
                 foreach ($this->yuicssmodules as $module) {
-                    $code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->base.$module.'/'.$module.'-min.css" />';
+                    $code .= '<link rel="stylesheet" type="text/css"href="' .
+                        $this->yui3loader->base . $module . '/' . $module .
+                        '-min.css" />';
                 }
             }
-            $code .= '<link rel="stylesheet" type="text/css" href="'.$this->yui3loader->local_comboBase.'rollup/'.$CFG->yui3version.'/yui-moodlesimple' . $yuiformat . '.css" />';
+            $code .= '<link rel="stylesheet" type="text/css" href="' .
+                $this->yui3loader->local_comboBase . 'rollup/' . $CFG->yui3version . '/yui-moodlesimple' . $yuiformat .
+                '.css" />';
         }
 
         if ($this->yui3loader->filter === 'RAW') {
@@ -1489,9 +1563,9 @@ protected function get_yui3lib_headcode() {
             $rollupversion .= '_' . $CFG->yuipatchlevel;
         }
 
-        $baserollups = array(
+        $baserollups = [
             'rollup/' . $rollupversion . "/yui-moodlesimple{$yuiformat}.js",
-        );
+        ];
 
         if ($this->yui3loader->combine) {
             return '<script src="' .
@@ -1501,11 +1575,10 @@ protected function get_yui3lib_headcode() {
         } else {
             $code = '';
             foreach ($baserollups as $rollup) {
-                $code .= '<script src="'.$this->yui3loader->local_comboBase.$rollup.'"></script>';
+                $code .= '<script src="' . $this->yui3loader->local_comboBase . $rollup . '"></script>';
             }
             return $code;
         }
-
     }
 
     /**
@@ -1518,7 +1591,7 @@ protected function get_css_code() {
         // Please note custom CSS is strongly discouraged,
         // because it can not be overridden by themes!
         // It is suitable only for things like mod/data which accepts CSS from teachers.
-        $attributes = array('rel'=>'stylesheet', 'type'=>'text/css');
+        $attributes = ['rel' => 'stylesheet', 'type' => 'text/css'];
 
         // Add the YUI code first. We want this to be overridden by any Moodle CSS.
         $code = $this->get_yui3lib_headcss();
@@ -1528,7 +1601,11 @@ protected function get_css_code() {
         // As of IE8 + YUI3.1.1 the reference stylesheet (firstthemesheet) gets
         // ignored whenever another resource is added until such time as a redraw
         // is forced, usually by moving the mouse over the affected element.
-        $code .= html_writer::tag('script', '/** Required in order to fix style inclusion problems in IE with YUI **/', array('id'=>'firstthemesheet', 'type'=>'text/css'));
+        $code .= html_writer::tag(
+            'script',
+            '/** Required in order to fix style inclusion problems in IE with YUI **/',
+            ['id' => 'firstthemesheet', 'type' => 'text/css'],
+        );
 
         $urls = $this->cssthemeurls + $this->cssurls;
         foreach ($urls as $url) {
@@ -1550,7 +1627,7 @@ protected function get_extra_modules_code() {
         if (empty($this->extramodules)) {
             return '';
         }
-        return html_writer::script(js_writer::function_call('M.yui.add_module', array($this->extramodules)));
+        return html_writer::script(js_writer::function_call('M.yui.add_module', [$this->extramodules]));
     }
 
     /**
@@ -1588,7 +1665,7 @@ public function get_head_code(moodle_page $page, core_renderer $renderer) {
 
         // Set up global YUI3 loader object - this should contain all code needed by plugins.
         // Note: in JavaScript just use "YUI().use('overlay', function(Y) { .... });",
-        //       this needs to be done before including any other script.
+        // this needs to be done before including any other script.
         $js .= $this->YUI_config->get_config_functions();
         $js .= js_writer::set_variable('YUI_config', $this->YUI_config, false) . "\n";
         $js .= "M.yui.loader = {modules: {}};\n"; // Backwards compatibility only, not used any more.
@@ -1600,7 +1677,7 @@ public function get_head_code(moodle_page $page, core_renderer $renderer) {
         if ($this->jsinitvariables['head']) {
             $js = '';
             foreach ($this->jsinitvariables['head'] as $data) {
-                list($var, $value) = $data;
+                [$var, $value] = $data;
                 $js .= js_writer::set_variable($var, $value, true);
             }
             $output .= html_writer::script($js);
@@ -1670,7 +1747,7 @@ public function get_end_code() {
         if ($CFG->debugdeveloper) {
             $logconfig->level = 'trace';
         }
-        $this->js_call_amd('core/log', 'setConfig', array($logconfig));
+        $this->js_call_amd('core/log', 'setConfig', [$logconfig]);
         // Add any global JS that needs to run on all pages.
         $this->js_call_amd('core/page_global', 'init');
         $this->js_call_amd('core/utility');
@@ -1692,7 +1769,7 @@ public function get_end_code() {
 
         // Add all needed strings.
         // First add core strings required for some dialogues.
-        $this->strings_for_js(array(
+        $this->strings_for_js([
             'confirm',
             'yes',
             'no',
@@ -1705,17 +1782,17 @@ public function get_end_code() {
             // TODO MDL-70830 shortforms should preload the collapseall/expandall strings properly.
             'collapseall',
             'expandall',
-        ), 'moodle');
-        $this->strings_for_js(array(
+        ], 'moodle');
+        $this->strings_for_js([
             'debuginfo',
             'line',
             'stacktrace',
-        ), 'debug');
+        ], 'debug');
         $this->string_for_js('labelsep', 'langconfig');
         if (!empty($this->stringsforjs)) {
-            $strings = array();
-            foreach ($this->stringsforjs as $component=>$v) {
-                foreach($v as $indentifier => $langstring) {
+            $strings = [];
+            foreach ($this->stringsforjs as $component => $v) {
+                foreach ($v as $indentifier => $langstring) {
                     $strings[$component][$indentifier] = $langstring->out();
                 }
             }
@@ -1726,7 +1803,7 @@ public function get_end_code() {
         if ($this->jsinitvariables['footer']) {
             $js = '';
             foreach ($this->jsinitvariables['footer'] as $data) {
-                list($var, $value) = $data;
+                [$var, $value] = $data;
                 $js .= js_writer::set_variable($var, $value, true);
             }
             $output .= html_writer::script($js);
@@ -1766,9 +1843,9 @@ public function is_top_of_body_done() {
     /**
      * Should we generate a bit of content HTML that is only required once  on
      * this page (e.g. the contents of the modchooser), now? Basically, we call
-     * {@link has_one_time_item_been_created()}, and if the thing has not already
+     * {@see has_one_time_item_been_created()}, and if the thing has not already
      * been output, we return true to tell the caller to generate it, and also
-     * call {@link set_one_time_item_created()} to record the fact that it is
+     * call {@see set_one_time_item_created()} to record the fact that it is
      * about to be generated.
      *
      * That is, a typical usage pattern (in a renderer method) is:
@@ -1796,7 +1873,7 @@ public function should_create_one_time_item_now($thing) {
      * Has a particular bit of HTML that is only required once  on this page
      * (e.g. the contents of the modchooser) already been generated?
      *
-     * Normally, you can use the {@link should_create_one_time_item_now()} helper
+     * Normally, you can use the {@see should_create_one_time_item_now()} helper
      * method rather than calling this method directly.
      *
      * @param string $thing identifier for the bit of content. Should be of the form
@@ -1811,7 +1888,7 @@ public function has_one_time_item_been_created($thing) {
      * Indicate that a particular bit of HTML that is only required once on this
      * page (e.g. the contents of the modchooser) has been generated (or is about to be)?
      *
-     * Normally, you can use the {@link should_create_one_time_item_now()} helper
+     * Normally, you can use the {@see should_create_one_time_item_now()} helper
      * method rather than calling this method directly.
      *
      * @param string $thing identifier for the bit of content. Should be of the form
diff --git a/lib/classes/output/requirements/yui.php b/lib/classes/output/requirements/yui.php
index 367177fc80bae..58a695191c28b 100644
--- a/lib/classes/output/requirements/yui.php
+++ b/lib/classes/output/requirements/yui.php
@@ -46,8 +46,8 @@ class yui {
     public $combine;
     public $filter = null;
     public $insertBefore = 'firstthemesheet';
-    public $groups = array();
-    public $modules = array();
+    public $groups = [];
+    public $modules = [];
     /** @var array The log sources that should be not be logged. */
     public $logInclude = [];
     /** @var array Tog sources that should be logged. */
@@ -58,7 +58,7 @@ class yui {
     /**
      * @var array List of functions used by the YUI Loader group pattern recognition.
      */
-    protected $jsconfigfunctions = array();
+    protected $jsconfigfunctions = [];
 
     /**
      * Create a new group within the YUI_config system.
@@ -70,7 +70,10 @@ class yui {
      */
     public function add_group($name, $config) {
         if (isset($this->groups[$name])) {
-            throw new coding_exception("A YUI configuration group for '{$name}' already exists. To make changes to this group use YUI_config->update_group().");
+            throw new coding_exception(
+                "A YUI configuration group for '{$name}' already exists. " .
+                    'To make changes to this group use YUI_config->update_group().',
+            );
         }
         $this->groups[$name] = $config;
     }
@@ -88,7 +91,10 @@ public function add_group($name, $config) {
      */
     public function update_group($name, $config) {
         if (!isset($this->groups[$name])) {
-            throw new coding_exception('The Moodle YUI module does not exist. You must define the moodle module config using YUI_config->add_module_config first.');
+            throw new coding_exception(
+                'The Moodle YUI module does not exist. ' .
+                    'You must define the moodle module config using YUI_config->add_module_config first.',
+            );
         }
         $this->groups[$name] = $config;
     }
@@ -101,13 +107,15 @@ public function update_group($name, $config) {
      * The JS function your write will be passed a single argument 'name' containing the
      * name of the module being loaded.
      *
-     * @param $function String the body of the JavaScript function. This should be used i
+     * @param string $function String the body of the JavaScript function. This should be used i
      * @return string the name of the function to use in the group pattern configuration.
      */
     public function set_config_function($function) {
         $configname = 'yui' . (count($this->jsconfigfunctions) + 1) . 'ConfigFn';
         if (isset($this->jsconfigfunctions[$configname])) {
-            throw new coding_exception("A YUI config function with this name already exists. Config function names must be unique.");
+            throw new coding_exception(
+                "A YUI config function with this name already exists. Config function names must be unique.",
+            );
         }
         $this->jsconfigfunctions[$configname] = $function;
         return '@' . $configname . '@';
@@ -119,7 +127,7 @@ public function set_config_function($function) {
      *
      * When jsrev is positive, the function is minified and stored in a MUC cache for subsequent uses.
      *
-     * @param $file The path to the JavaScript function used for YUI configuration.
+     * @param string $file The path to the JavaScript function used for YUI configuration.
      * @return string the name of the function to use in the group pattern configuration.
      */
     public function set_config_source($file) {
@@ -136,7 +144,7 @@ public function set_config_source($file) {
             $configfn = $cache->get($keyname);
             if ($configfn === false) {
                 require_once($CFG->libdir . '/jslib.php');
-                $configfn = core_minify::js_files(array($fullpath));
+                $configfn = core_minify::js_files([$fullpath]);
                 $cache->set($keyname, $configfn);
             }
         }
@@ -161,7 +169,7 @@ public function get_config_functions() {
     /**
      * Update the header JavaScript with any required modification for the YUI Loader.
      *
-     * @param $js String The JavaScript to manipulate.
+     * @param string $js String The JavaScript to manipulate.
      * @return string the modified JS string.
      */
     public function update_header_js($js) {
@@ -187,10 +195,13 @@ public function update_header_js($js) {
     public function add_module_config($name, $config, $group = null) {
         if ($group) {
             if (!isset($this->groups[$name])) {
-                throw new coding_exception('The Moodle YUI module does not exist. You must define the moodle module config using YUI_config->add_module_config first.');
+                throw new coding_exception(
+                    'The Moodle YUI module does not exist. ' .
+                        'You must define the moodle module config using YUI_config->add_module_config first.',
+                );
             }
             if (!isset($this->groups[$group]['modules'])) {
-                $this->groups[$group]['modules'] = array();
+                $this->groups[$group]['modules'] = [];
             }
             $modules = &$this->groups[$group]['modules'];
         } else {
@@ -212,16 +223,19 @@ public function add_module_config($name, $config, $group = null) {
     public function add_moodle_metadata() {
         global $CFG;
         if (!isset($this->groups['moodle'])) {
-            throw new coding_exception('The Moodle YUI module does not exist. You must define the moodle module config using YUI_config->add_module_config first.');
+            throw new coding_exception(
+                'The Moodle YUI module does not exist. ' .
+                    'You must define the moodle module config using YUI_config->add_module_config first.',
+            );
         }
 
         if (!isset($this->groups['moodle']['modules'])) {
-            $this->groups['moodle']['modules'] = array();
+            $this->groups['moodle']['modules'] = [];
         }
 
         $cache = cache::make('core', 'yuimodules');
         if (!isset($CFG->jsrev) || $CFG->jsrev == -1) {
-            $metadata = array();
+            $metadata = [];
             $metadata = $this->get_moodle_metadata();
             $cache->delete('metadata');
         } else {
@@ -233,8 +247,10 @@ public function add_moodle_metadata() {
         }
 
         // Merge with any metadata added specific to this page which was added manually.
-        $this->groups['moodle']['modules'] = array_merge($this->groups['moodle']['modules'],
-                $metadata);
+        $this->groups['moodle']['modules'] = array_merge(
+            $this->groups['moodle']['modules'],
+            $metadata
+        );
     }
 
     /**
@@ -246,7 +262,7 @@ public function add_moodle_metadata() {
      * @return array of module metadata
      */
     private function get_moodle_metadata() {
-        $moodlemodules = array();
+        $moodlemodules = [];
         // Core isn't a plugin type or subsystem - handle it seperately.
         if ($module = $this->get_moodle_path_metadata(core_component::get_component_directory('core'))) {
             $moodlemodules = array_merge($moodlemodules, $module);
@@ -286,11 +302,11 @@ private function get_moodle_metadata() {
     private function get_moodle_path_metadata($path) {
         // Add module metadata is stored in frankenstyle_modname/yui/src/yui_modname/meta/yui_modname.json.
         $baseyui = $path . '/yui/src';
-        $modules = array();
+        $modules = [];
         if (is_dir($baseyui)) {
             $items = new DirectoryIterator($baseyui);
             foreach ($items as $item) {
-                if ($item->isDot() or !$item->isDir()) {
+                if ($item->isDot() || !$item->isDir()) {
                     continue;
                 }
                 $metafile = realpath($baseyui . '/' . $item . '/meta/' . $item . '.json');
@@ -324,35 +340,34 @@ public function define_patched_core_modules($combobase, $yuiversion, $patchlevel
             // If we are using the local combobase in the loader, we can add a group and still make use of the combo
             // loader. We just need to specify a different root which includes a slightly different YUI version number
             // to include our patchlevel.
-            $patterns = array();
-            $modules = array();
+            $patterns = [];
+            $modules = [];
             foreach ($patchedmodules as $modulename) {
                 // We must define the pattern and module here so that the loader uses our group configuration instead of
                 // the standard module definition. We may lose some metadata provided by upstream but this will be
                 // loaded when the module is loaded anyway.
-                $patterns[$modulename] = array(
+                $patterns[$modulename] = [
                     'group' => 'yui-patched',
-                );
-                $modules[$modulename] = array();
+                ];
+                $modules[$modulename] = [];
             }
 
             // Actually add the patch group here.
-            $this->add_group('yui-patched', array(
+            $this->add_group('yui-patched', [
                 'combine' => true,
                 'root' => $subversion . '/',
                 'patterns' => $patterns,
                 'modules' => $modules,
-            ));
-
+            ]);
         } else {
             // The CDN is in use - we need to instead use the local combobase for this module and override the modules
             // definition. We cannot use the local base - we must use the combobase because we cannot invalidate the
             // local base in browser caches.
             $fullpathbase = $combobase . $subversion . '/';
             foreach ($patchedmodules as $modulename) {
-                $this->modules[$modulename] = array(
-                    'fullpath' => $fullpathbase . $modulename . '/' . $modulename . '-min.js'
-                );
+                $this->modules[$modulename] = [
+                    'fullpath' => $fullpathbase . $modulename . '/' . $modulename . '-min.js',
+                ];
             }
         }
     }
diff --git a/lib/classes/output/select_menu.php b/lib/classes/output/select_menu.php
index ee512815299cf..e642c70b6c69c 100644
--- a/lib/classes/output/select_menu.php
+++ b/lib/classes/output/select_menu.php
@@ -83,7 +83,7 @@ protected function flatten_options(): array {
                             'name' => $groupname,
                             'isgroup' => true,
                             'id' => \html_writer::random_id('select-menu-group'),
-                            'options' => []
+                            'options' => [],
                         ];
                     }
                     foreach ($optoptions as $optvalue => $optoption) {
diff --git a/lib/classes/output/single_button.php b/lib/classes/output/single_button.php
index c2dbfb607de1b..853f8d83f0817 100644
--- a/lib/classes/output/single_button.php
+++ b/lib/classes/output/single_button.php
@@ -40,7 +40,7 @@ class single_button implements renderable {
         self::BUTTON_SUCCESS,
         self::BUTTON_DANGER,
         self::BUTTON_WARNING,
-        self::BUTTON_INFO
+        self::BUTTON_INFO,
     ];
 
     /**
@@ -117,7 +117,7 @@ class single_button implements renderable {
     /**
      * @var array List of attached actions
      */
-    public $actions = array();
+    public $actions = [];
 
     /**
      * @var array $params URL Params
@@ -143,8 +143,13 @@ class single_button implements renderable {
      * @param string $type whether this is a primary button or another type, used for styling
      * @param array $attributes Attributes for the HTML button tag
      */
-    public function __construct(moodle_url $url, $label, $method = 'post', $type = self::BUTTON_SECONDARY,
-        $attributes = []) {
+    public function __construct(
+        moodle_url $url,
+        $label,
+        $method = 'post',
+        $type = self::BUTTON_SECONDARY,
+        $attributes = []
+    ) {
         if (is_bool($type)) {
             debugging('The boolean $primary is deprecated and replaced by $type,
             use single_button::BUTTON_PRIMARY or self::BUTTON_SECONDARY instead');
@@ -262,7 +267,7 @@ public function export_for_template(renderer_base $output) {
 
         // Button actions.
         $actions = $this->actions;
-        $data->actions = array_map(function($action) use ($output) {
+        $data->actions = array_map(function ($action) use ($output) {
             return $action->export_for_template($output);
         }, $actions);
         $data->hasactions = !empty($data->actions);
diff --git a/lib/classes/output/single_select.php b/lib/classes/output/single_select.php
index 6e7954eab42d5..d4bfa8cc084c2 100644
--- a/lib/classes/output/single_select.php
+++ b/lib/classes/output/single_select.php
@@ -33,16 +33,15 @@
  * @category output
  */
 class single_select implements renderable, templatable {
-
     /**
      * @var moodle_url Target url - includes hidden fields
      */
-    var $url;
+    public $url;
 
     /**
      * @var string Name of the select element.
      */
-    var $name;
+    public $name;
 
     /**
      * @var array $options associative array value=>label ex.: array(1=>'One, 2=>Two)
@@ -50,62 +49,62 @@ class single_select implements renderable, templatable {
      *         array(array('Odd'=>array(1=>'One', 3=>'Three)), array('Even'=>array(2=>'Two')))
      *         array(1=>'One', '--1uniquekey'=>array('More'=>array(2=>'Two', 3=>'Three')))
      */
-    var $options;
+    public $options;
 
     /**
      * @var string Selected option
      */
-    var $selected;
+    public $selected;
 
     /**
      * @var array Nothing selected
      */
-    var $nothing;
+    public $nothing;
 
     /**
      * @var array Extra select field attributes
      */
-    var $attributes = array();
+    public $attributes = [];
 
     /**
      * @var string Button label
      */
-    var $label = '';
+    public $label = '';
 
     /**
      * @var array Button label's attributes
      */
-    var $labelattributes = array();
+    public $labelattributes = [];
 
     /**
      * @var string Form submit method post or get
      */
-    var $method = 'get';
+    public $method = 'get';
 
     /**
      * @var string Wrapping div class
      */
-    var $class = 'singleselect';
+    public $class = 'singleselect';
 
     /**
      * @var bool True if button disabled, false if normal
      */
-    var $disabled = false;
+    public $disabled = false;
 
     /**
      * @var string Button tooltip
      */
-    var $tooltip = null;
+    public $tooltip = null;
 
     /**
      * @var string Form id
      */
-    var $formid = null;
+    public $formid = null;
 
     /**
      * @var help_icon The help icon for this element.
      */
-    var $helpicon = null;
+    public $helpicon = null;
 
     /** @var component_action[] component action. */
     public $actions = [];
@@ -119,7 +118,14 @@ class single_select implements renderable, templatable {
      * @param ?array $nothing
      * @param string $formid
      */
-    public function __construct(moodle_url $url, $name, array $options, $selected = '', $nothing = array('' => 'choosedots'), $formid = null) {
+    public function __construct(
+        moodle_url $url,
+        $name,
+        array $options,
+        $selected = '',
+        $nothing = ['' => 'choosedots'],
+        $formid = null,
+    ) {
         $this->url      = $url;
         $this->name     = $name;
         $this->options  = $options;
@@ -135,7 +141,7 @@ public function __construct(moodle_url $url, $name, array $options, $selected =
      * @param string $confirmmessage The yes/no confirmation question. If "Yes" is clicked, the original action will occur.
      */
     public function add_confirm_action($confirmmessage) {
-        $this->add_action(new component_action('submit', 'M.util.show_confirm_dialog', array('message' => $confirmmessage)));
+        $this->add_action(new component_action('submit', 'M.util.show_confirm_dialog', ['message' => $confirmmessage]));
     }
 
     /**
@@ -172,10 +178,9 @@ public function set_help_icon($identifier, $component = 'moodle') {
      * @param string $label
      * @param array $attributes (optional)
      */
-    public function set_label($label, $attributes = array()) {
+    public function set_label($label, $attributes = []) {
         $this->label = $label;
         $this->labelattributes = $attributes;
-
     }
 
     /**
@@ -207,7 +212,7 @@ public function export_for_template(renderer_base $output) {
         unset($attributes['disabled']);
 
         // Map the attributes.
-        $data->attributes = array_map(function($key) use ($attributes) {
+        $data->attributes = array_map(function ($key) use ($attributes) {
             return ['name' => $key, 'value' => $attributes[$key]];
         }, array_keys($attributes));
 
@@ -260,7 +265,7 @@ public function export_for_template(renderer_base $output) {
                     $data->options[] = [
                         'name' => $optgroupname,
                         'optgroup' => true,
-                        'options' => $sublist
+                        'options' => $sublist,
                     ];
                 }
             } else {
@@ -268,7 +273,7 @@ public function export_for_template(renderer_base $output) {
                     'value' => $value,
                     'name' => $options[$value],
                     'selected' => strval($this->selected) === strval($value),
-                    'optgroup' => false
+                    'optgroup' => false,
                 ];
 
                 if ($hasnothing && $nothingkey === $value) {
diff --git a/lib/classes/output/sticky_footer.php b/lib/classes/output/sticky_footer.php
index fdb88d5725109..06e7e3723dab3 100644
--- a/lib/classes/output/sticky_footer.php
+++ b/lib/classes/output/sticky_footer.php
@@ -33,7 +33,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class sticky_footer implements named_templatable, renderable {
-
     /**
      * @var string content of the sticky footer.
      */
diff --git a/lib/classes/output/tabobject.php b/lib/classes/output/tabobject.php
index 7d7fa86583360..d0943e6b16642 100644
--- a/lib/classes/output/tabobject.php
+++ b/lib/classes/output/tabobject.php
@@ -23,28 +23,29 @@
  *
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @package core
+ * @copyright Marina Glancy
  */
 class tabobject implements renderable, templatable {
     /** @var string unique id of the tab in this tree, it is used to find selected and/or inactive tabs */
-    var $id;
+    public $id;
     /** @var moodle_url|string link */
-    var $link;
+    public $link;
     /** @var string text on the tab */
-    var $text;
+    public $text;
     /** @var string title under the link, by defaul equals to text */
-    var $title;
+    public $title;
     /** @var bool whether to display a link under the tab name when it's selected */
-    var $linkedwhenselected = false;
+    public $linkedwhenselected = false;
     /** @var bool whether the tab is inactive */
-    var $inactive = false;
+    public $inactive = false;
     /** @var bool indicates that this tab's child is selected */
-    var $activated = false;
+    public $activated = false;
     /** @var bool indicates that this tab is selected */
-    var $selected = false;
+    public $selected = false;
     /** @var array stores children tabobjects */
-    var $subtree = array();
+    public $subtree = [];
     /** @var int level of tab in the tree, 0 for root (instance of tabtree), 1 for the first row of tabs */
-    var $level = 1;
+    public $level = 1;
 
     /**
      * Constructor
@@ -140,7 +141,6 @@ public function export_for_template(renderer_base $output) {
             'level' => $this->level,
         ];
     }
-
 }
 
 // Alias this class to the old name.
diff --git a/lib/classes/output/tabtree.php b/lib/classes/output/tabtree.php
index 62a58a25694a8..0c47b4cb69bf4 100644
--- a/lib/classes/output/tabtree.php
+++ b/lib/classes/output/tabtree.php
@@ -87,7 +87,7 @@ public function export_for_template(renderer_base $output) {
 
         return (object) [
             'tabs' => $tabs,
-            'secondrow' => $secondrow ? $secondrow->export_for_template($output) : false
+            'secondrow' => $secondrow ? $secondrow->export_for_template($output) : false,
         ];
     }
 }
diff --git a/lib/classes/output/theme_config.php b/lib/classes/output/theme_config.php
index 4edc1b6569779..3a056592ac01d 100644
--- a/lib/classes/output/theme_config.php
+++ b/lib/classes/output/theme_config.php
@@ -33,6 +33,9 @@
 use moodle_url;
 use stdClass;
 
+// phpcs:disable moodle.NamingConventions.ValidVariableName.VariableNameUnderscore
+// phpcs:disable moodle.NamingConventions.ValidVariableName.MemberNameUnderscore
+
 /**
  * This class represents the configuration variables of a Moodle theme.
  *
@@ -44,7 +47,7 @@
  * file, you can just ignore those, and the following information for developers.
  *
  * Normally, to create an instance of this class, you should use the
- * {@link theme_config::load()} factory method to load a themes config.php file.
+ * {@see theme_config::load()} factory method to load a themes config.php file.
  * However, normally you don't need to bother, because moodle_page (that is, $PAGE)
  * will create one for you, accessible as $PAGE->theme.
  *
@@ -54,7 +57,6 @@
  * @category output
  */
 class theme_config {
-
     /**
      * @var string Default theme, used when requested theme not found.
      */
@@ -66,7 +68,7 @@ class theme_config {
     /**
      * @var array You can base your theme on other themes by linking to the other theme as
      * parents. This lets you use the CSS and layouts from the other themes
-     * (see {@link theme_config::$layouts}).
+     * (see {@see theme_config::$layouts}).
      * That makes it easy to create a new theme that is similar to another one
      * but with a few changes. In this themes CSS you only need to override
      * those rules you want to change.
@@ -77,7 +79,7 @@ class theme_config {
      * @var array The names of all the stylesheets from this theme that you would
      * like included, in order. Give the names of the files without .css.
      */
-    public $sheets = array();
+    public $sheets = [];
 
     /**
      * @var array The names of all the stylesheets from parents that should be excluded.
@@ -96,7 +98,7 @@ class theme_config {
      * @var array List of style sheets that are included in the text editor bodies.
      * Sheets from parent themes are used automatically and can not be excluded.
      */
-    public $editor_sheets = array();
+    public $editor_sheets = [];
 
     /**
      * @var bool Whether a fallback version of the stylesheet will be used
@@ -108,13 +110,13 @@ class theme_config {
      * @var array The names of all the javascript files this theme that you would
      * like included from head, in order. Give the names of the files without .js.
      */
-    public $javascripts = array();
+    public $javascripts = [];
 
     /**
      * @var array The names of all the javascript files this theme that you would
      * like included from footer, in order. Give the names of the files without .js.
      */
-    public $javascripts_footer = array();
+    public $javascripts_footer = [];
 
     /**
      * @var array The names of all the javascript files from parents that should
@@ -172,11 +174,11 @@ class theme_config {
      * that someone added blocks using a different theme that used different region
      * names, and then switched to this theme.)
      */
-    public $layouts = array();
+    public $layouts = [];
 
     /**
      * @var string Name of the renderer factory class to use. Must implement the
-     * {@link renderer_factory} interface.
+     * {@see renderer_factory} interface.
      *
      * This is an advanced feature. Moodle output is generated by 'renderers',
      * you can customise the HTML that is output by writing custom renderers,
@@ -186,8 +188,8 @@ class theme_config {
      * There are some renderer factories supplied with Moodle. Please follow these
      * links to see what they do.
      * <ul>
-     * <li>{@link standard_renderer_factory} - the default.</li>
-     * <li>{@link theme_overridden_renderer_factory} - use this if you want to write
+     * <li>{@see standard_renderer_factory} - the default.</li>
+     * <li>{@see theme_overridden_renderer_factory} - use this if you want to write
      *      your own custom renderers in a lib.php file in this theme (or the parent theme).</li>
      * </ul>
      */
@@ -268,7 +270,7 @@ class theme_config {
      */
     public $requiredblocks = false;
 
-    //==Following properties are not configurable from theme config.php==
+    // The Following properties are not configurable from theme config.php.
 
     /**
      * @var string The name of this theme. Set automatically when this theme is
@@ -304,7 +306,7 @@ class theme_config {
      * @var array list of YUI CSS modules to be included on each page. This may be used
      * to remove cssreset and use cssnormalise module instead.
      */
-    public $yuicssmodules = array('cssreset', 'cssfonts', 'cssgrids', 'cssbase');
+    public $yuicssmodules = ['cssreset', 'cssfonts', 'cssgrids', 'cssbase'];
 
     /**
      * An associative array of block manipulations that should be made if the user is using an rtl language.
@@ -312,7 +314,7 @@ class theme_config {
      * This is used when displaying blocks for regions only.
      * @var array
      */
-    public $blockrtlmanipulations = array();
+    public $blockrtlmanipulations = [];
 
     /**
      * @var renderer_factory Instance of the renderer_factory implementation
@@ -323,7 +325,7 @@ class theme_config {
     /**
      * @var array List of parent config objects.
      **/
-    protected $parent_configs = array();
+    protected $parent_configs = [];
 
     /**
      * Used to determine whether we can serve SVG images or not.
@@ -365,7 +367,7 @@ class theme_config {
 
     /**
      * Sets the render method that should be used for rendering custom block regions by scripts such as my/index.php
-     * Defaults to {@link core_renderer::blocks_for_region()}
+     * Defaults to {@see core_renderer::blocks_for_region()}
      * @var string
      */
     public $blockrendermethod = null;
@@ -435,27 +437,24 @@ class theme_config {
     public static function load($themename) {
         global $CFG;
 
-        // load theme settings from db
+        // Load theme settings from db.
         try {
-            $settings = get_config('theme_'.$themename);
+            $settings = get_config('theme_' . $themename);
         } catch (dml_exception $e) {
-            // most probably moodle tables not created yet
+            // Most probably moodle tables not created yet.
             $settings = new stdClass();
         }
 
         if ($config = self::find_theme_config($themename, $settings)) {
             return new self($config);
-
         } else if ($themename == self::DEFAULT_THEME) {
-            throw new coding_exception('Default theme '.self::DEFAULT_THEME.' not available or broken!');
-
+            throw new coding_exception('Default theme ' . self::DEFAULT_THEME . ' not available or broken!');
         } else if ($config = self::find_theme_config($CFG->theme, $settings)) {
             debugging('This page should be using theme ' . $themename .
                     ' which cannot be initialised. Falling back to the site theme ' . $CFG->theme, DEBUG_NORMAL);
             return new self($config);
-
         } else {
-            // bad luck, the requested theme has some problems - admin see details in theme config
+            // Bad luck, the requested theme has some problems - admin see details in theme config.
             debugging('This page should be using theme ' . $themename .
                     ' which cannot be initialised. Nor can the site theme ' . $CFG->theme .
                     '. Falling back to ' . self::DEFAULT_THEME, DEBUG_NORMAL);
@@ -474,8 +473,8 @@ public static function load($themename) {
      * @return array description of problems
      */
     public static function diagnose($themename) {
-        //TODO: MDL-21108
-        return array();
+        // TODO: MDL-21108.
+        return [];
     }
 
     /**
@@ -483,7 +482,7 @@ public static function diagnose($themename) {
      * @param stdClass $config
      */
     private function __construct($config) {
-        global $CFG; //needed for included lib.php files
+        global $CFG; // Needed for included lib.php files.
 
         $this->settings = $config->settings;
         $this->name     = $config->name;
@@ -507,49 +506,49 @@ private function __construct($config) {
             'removedprimarynavitems',
         ];
 
-        foreach ($config as $key=>$value) {
+        foreach ($config as $key => $value) {
             if (in_array($key, $configurable)) {
                 $this->$key = $value;
             }
         }
 
-        // verify all parents and load configs and renderers
+        // Verify all parents and load configs and renderers.
         foreach ($this->parents as $parent) {
             if (!$parent_config = self::find_theme_config($parent, $this->settings)) {
-                // this is not good - better exclude faulty parents
+                // This is not good - better exclude faulty parents.
                 continue;
             }
-            $libfile = $parent_config->dir.'/lib.php';
+            $libfile = $parent_config->dir . '/lib.php';
             if (is_readable($libfile)) {
-                // theme may store various function here
+                // Theme may store various function here.
                 include_once($libfile);
             }
-            $renderersfile = $parent_config->dir.'/renderers.php';
+            $renderersfile = $parent_config->dir . '/renderers.php';
             if (is_readable($renderersfile)) {
-                // may contain core and plugin renderers and renderer factory
+                // May contain core and plugin renderers and renderer factory.
                 include_once($renderersfile);
             }
             $this->parent_configs[$parent] = $parent_config;
         }
-        $libfile = $this->dir.'/lib.php';
+        $libfile = $this->dir . '/lib.php';
         if (is_readable($libfile)) {
-            // theme may store various function here
+            // Theme may store various function here.
             include_once($libfile);
         }
-        $rendererfile = $this->dir.'/renderers.php';
+        $rendererfile = $this->dir . '/renderers.php';
         if (is_readable($rendererfile)) {
-            // may contain core and plugin renderers and renderer factory
+            // May contain core and plugin renderers and renderer factory.
             include_once($rendererfile);
         } else {
-            // check if renderers.php file is missnamed renderer.php
-            if (is_readable($this->dir.'/renderer.php')) {
-                debugging('Developer hint: '.$this->dir.'/renderer.php should be renamed to ' . $this->dir."/renderers.php.
+            // Check if renderers.php file is missnamed renderer.php.
+            if (is_readable($this->dir . '/renderer.php')) {
+                debugging('Developer hint: ' . $this->dir . '/renderer.php should be renamed to ' . $this->dir . "/renderers.php.
                     See: http://docs.moodle.org/dev/Output_renderers#Theme_renderers.", DEBUG_DEVELOPER);
             }
         }
 
-        // cascade all layouts properly
-        foreach ($baseconfig->layouts as $layout=>$value) {
+        // Cascade all layouts properly.
+        foreach ($baseconfig->layouts as $layout => $value) {
             if (!isset($this->layouts[$layout])) {
                 foreach ($this->parent_configs as $parent_config) {
                     if (isset($parent_config->layouts[$layout])) {
@@ -561,7 +560,7 @@ private function __construct($config) {
             }
         }
 
-        //fix arrows if needed
+        // Fix arrows if needed.
         $this->check_theme_arrows();
     }
 
@@ -573,7 +572,7 @@ private function __construct($config) {
      * @param moodle_page $page
      */
     public function init_page(moodle_page $page) {
-        $themeinitfunction = 'theme_'.$this->name.'_page_init';
+        $themeinitfunction = 'theme_' . $this->name . '_page_init';
         if (function_exists($themeinitfunction)) {
             $themeinitfunction($page);
         }
@@ -588,9 +587,9 @@ public function init_page(moodle_page $page) {
      * (unlike &gt; &raquo;), and must be accompanied by text.
      */
     private function check_theme_arrows() {
-        if (!isset($this->rarrow) and !isset($this->larrow)) {
+        if (!isset($this->rarrow) && !isset($this->larrow)) {
             // Default, looks good in Win XP/IE 6, Win/Firefox 1.5, Win/Netscape 8...
-            // Also OK in Win 9x/2K/IE 5.x
+            // Also OK in Win 9x/2K/IE 5.x.
             $this->rarrow = '&#x25BA;';
             $this->larrow = '&#x25C4;';
             $this->uarrow = '&#x25B2;';
@@ -600,25 +599,29 @@ private function check_theme_arrows() {
             } else {
                 $uagent = $_SERVER['HTTP_USER_AGENT'];
             }
-            if (false !== strpos($uagent, 'Opera')
-                || false !== strpos($uagent, 'Mac')) {
+            if (
+                false !== strpos($uagent, 'Opera')
+                || false !== strpos($uagent, 'Mac')
+            ) {
                 // Looks good in Win XP/Mac/Opera 8/9, Mac/Firefox 2, Camino, Safari.
                 // Not broken in Mac/IE 5, Mac/Netscape 7 (?).
                 $this->rarrow = '&#x25B6;&#xFE0E;';
                 $this->larrow = '&#x25C0;&#xFE0E;';
-            }
-            elseif ((false !== strpos($uagent, 'Konqueror'))
-                || (false !== strpos($uagent, 'Android')))  {
+            } else if (
+                (false !== strpos($uagent, 'Konqueror'))
+                || (false !== strpos($uagent, 'Android'))
+            ) {
                 // The fonts on Android don't include the characters required for this to work as expected.
                 // So we use the same ones Konqueror uses.
                 $this->rarrow = '&rarr;';
                 $this->larrow = '&larr;';
                 $this->uarrow = '&uarr;';
                 $this->darrow = '&darr;';
-            }
-            elseif (isset($_SERVER['HTTP_ACCEPT_CHARSET'])
-                && false === stripos($_SERVER['HTTP_ACCEPT_CHARSET'], 'utf-8')) {
-                // (Win/IE 5 doesn't set ACCEPT_CHARSET, but handles Unicode.)
+            } else if (
+                isset($_SERVER['HTTP_ACCEPT_CHARSET'])
+                && false === stripos($_SERVER['HTTP_ACCEPT_CHARSET'], 'utf-8')
+            ) {
+                // Win/IE 5 doesn't set ACCEPT_CHARSET, but handles Unicode.
                 // To be safe, non-Unicode browsers!
                 $this->rarrow = '&gt;';
                 $this->larrow = '&lt;';
@@ -626,7 +629,7 @@ private function check_theme_arrows() {
                 $this->darrow = 'v';
             }
 
-            // RTL support - in RTL languages, swap r and l arrows
+            // RTL support - in RTL languages, swap r and l arrows.
             if (right_to_left()) {
                 $t = $this->rarrow;
                 $this->rarrow = $this->larrow;
@@ -642,12 +645,12 @@ private function check_theme_arrows() {
      * @return array
      */
     public function renderer_prefixes() {
-        global $CFG; // just in case the included files need it
+        global $CFG; // Just in case the included files need it.
 
-        $prefixes = array('theme_'.$this->name);
+        $prefixes = ['theme_' . $this->name];
 
         foreach ($this->parent_configs as $parent) {
-            $prefixes[] = 'theme_'.$parent->name;
+            $prefixes[] = 'theme_' . $parent->name;
         }
 
         return $prefixes;
@@ -659,7 +662,7 @@ public function renderer_prefixes() {
      * @param bool $encoded false means use & and true use &amp; in URLs
      * @return moodle_url
      */
-    public function editor_css_url($encoded=true) {
+    public function editor_css_url($encoded = true) {
         global $CFG;
         $rev = theme_get_revision();
         $type = 'editor';
@@ -701,14 +704,14 @@ public function editor_css_url($encoded=true) {
      * @return array
      */
     public function editor_css_files() {
-        $files = array();
+        $files = [];
 
         // First editor plugins.
         $plugins = core_component::get_plugin_list('editor');
         foreach ($plugins as $plugin => $fulldir) {
             $sheetfile = "$fulldir/editor_styles.css";
             if (is_readable($sheetfile)) {
-                $files['plugin_'.$plugin] = $sheetfile;
+                $files['plugin_' . $plugin] = $sheetfile;
             }
 
             $subplugintypes = core_component::get_subplugins("editor_{$plugin}") ?? [];
@@ -732,7 +735,7 @@ public function editor_css_files() {
             foreach ($parent_config->editor_sheets as $sheet) {
                 $sheetfile = "$parent_config->dir/style/$sheet.css";
                 if (is_readable($sheetfile)) {
-                    $files['parent_'.$parent_config->name.'_'.$sheet] = $sheetfile;
+                    $files['parent_' . $parent_config->name . '_' . $sheet] = $sheetfile;
                 }
             }
         }
@@ -741,7 +744,7 @@ public function editor_css_files() {
             foreach ($this->editor_sheets as $sheet) {
                 $sheetfile = "$this->dir/style/$sheet.css";
                 if (is_readable($sheetfile)) {
-                    $files['theme_'.$sheet] = $sheetfile;
+                    $files['theme_' . $sheet] = $sheetfile;
                 }
             }
         }
@@ -804,7 +807,7 @@ public function css_urls(moodle_page $page) {
 
         $rev = theme_get_revision();
 
-        $urls = array();
+        $urls = [];
 
         $svg = $this->use_svg_icons();
         $separate = (core_useragent::is_ie() && !core_useragent::check_ie_version('10'));
@@ -825,15 +828,15 @@ public function css_urls(moodle_page $page) {
                 if (!$svg) {
                     // We add a simple /_s to the start of the path.
                     // The underscore is used to ensure that it isn't a valid theme name.
-                    $slashargs .= '/_s'.$slashargs;
+                    $slashargs .= '/_s' . $slashargs;
                 }
-                $slashargs .= '/'.$this->name.'/'.$rev.'/'.$filename;
+                $slashargs .= '/' . $this->name . '/' . $rev . '/' . $filename;
                 if ($separate) {
                     $slashargs .= '/chunk0';
                 }
                 $url->set_slashargument($slashargs, 'noparam', true);
             } else {
-                $params = array('theme' => $this->name, 'rev' => $rev, 'type' => $filename);
+                $params = ['theme' => $this->name, 'rev' => $rev, 'type' => $filename];
                 if (!$svg) {
                     // We add an SVG param so that we know not to serve SVG images.
                     // We do this because all modern browsers support SVG and this param will one day be removed.
@@ -845,7 +848,6 @@ public function css_urls(moodle_page $page) {
                 $url->params($params);
             }
             $urls[] = $url;
-
         } else {
             $baseurl = new moodle_url('/theme/styles_debug.php');
 
@@ -864,33 +866,42 @@ public function css_urls(moodle_page $page) {
             }
             if (core_useragent::is_ie()) {
                 // Lalala, IE does not allow more than 31 linked CSS files from main document.
-                $urls[] = new moodle_url($baseurl, array('theme'=>$this->name, 'type'=>'ie', 'subtype'=>'plugins'));
-                foreach ($css['parents'] as $parent=>$sheets) {
+                $urls[] = new moodle_url($baseurl, ['theme' => $this->name, 'type' => 'ie', 'subtype' => 'plugins']);
+                foreach ($css['parents'] as $parent => $sheets) {
                     // We need to serve parents individually otherwise we may easily exceed the style limit IE imposes (4096).
-                    $urls[] = new moodle_url($baseurl, array('theme'=>$this->name,'type'=>'ie', 'subtype'=>'parents', 'sheet'=>$parent));
+                    $urls[] = new moodle_url($baseurl, [
+                        'theme' => $this->name,
+                        'type' => 'ie',
+                        'subtype' => 'parents',
+                        'sheet' => $parent,
+                    ]);
                 }
                 if ($this->get_scss_property()) {
                     // No need to define the type as IE here.
-                    $urls[] = new moodle_url($baseurl, array('theme' => $this->name, 'type' => 'scss'));
+                    $urls[] = new moodle_url($baseurl, ['theme' => $this->name, 'type' => 'scss']);
                 }
-                $urls[] = new moodle_url($baseurl, array('theme'=>$this->name, 'type'=>'ie', 'subtype'=>'theme'));
-
+                $urls[] = new moodle_url($baseurl, ['theme' => $this->name, 'type' => 'ie', 'subtype' => 'theme']);
             } else {
-                foreach ($css['plugins'] as $plugin=>$unused) {
-                    $urls[] = new moodle_url($baseurl, array('theme'=>$this->name,'type'=>'plugin', 'subtype'=>$plugin));
+                foreach ($css['plugins'] as $plugin => $unused) {
+                    $urls[] = new moodle_url($baseurl, ['theme' => $this->name, 'type' => 'plugin', 'subtype' => $plugin]);
                 }
-                foreach ($css['parents'] as $parent=>$sheets) {
-                    foreach ($sheets as $sheet=>$unused2) {
-                        $urls[] = new moodle_url($baseurl, array('theme'=>$this->name,'type'=>'parent', 'subtype'=>$parent, 'sheet'=>$sheet));
+                foreach ($css['parents'] as $parent => $sheets) {
+                    foreach ($sheets as $sheet => $unused2) {
+                        $urls[] = new moodle_url($baseurl, [
+                            'theme' => $this->name,
+                            'type' => 'parent',
+                            'subtype' => $parent,
+                            'sheet' => $sheet,
+                        ]);
                     }
                 }
                 foreach ($css['theme'] as $sheet => $filename) {
                     if ($sheet === self::SCSS_KEY) {
                         // This is the theme SCSS file.
-                        $urls[] = new moodle_url($baseurl, array('theme' => $this->name, 'type' => 'scss'));
+                        $urls[] = new moodle_url($baseurl, ['theme' => $this->name, 'type' => 'scss']);
                     } else {
                         // Sheet first in order to make long urls easier to read.
-                        $urls[] = new moodle_url($baseurl, array('sheet'=>$sheet, 'theme'=>$this->name, 'type'=>'theme'));
+                        $urls[] = new moodle_url($baseurl, ['sheet' => $sheet, 'theme' => $this->name, 'type' => 'theme']);
                     }
                 }
             }
@@ -1011,16 +1022,15 @@ public function get_css_content_debug($type, $subtype, $sheet) {
             return '';
         }
 
-        $cssfiles = array();
+        $cssfiles = [];
         $css = $this->get_css_files(true);
 
         if ($type === 'ie') {
             // IE is a sloppy browser with weird limits, sorry.
             if ($subtype === 'plugins') {
                 $cssfiles = $css['plugins'];
-
             } else if ($subtype === 'parents') {
-                if (empty($sheet)) {
+                if (empty($sheet)) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedIf
                     // Do not bother with the empty parent here.
                 } else {
                     // Build up the CSS for that parent so we can serve it as one file.
@@ -1038,17 +1048,14 @@ public function get_css_content_debug($type, $subtype, $sheet) {
                     }
                 }
             }
-
         } else if ($type === 'plugin') {
             if (isset($css['plugins'][$subtype])) {
                 $cssfiles[] = $css['plugins'][$subtype];
             }
-
         } else if ($type === 'parent') {
             if (isset($css['parents'][$subtype][$sheet])) {
                 $cssfiles[] = $css['parents'][$subtype][$sheet];
             }
-
         } else if ($type === 'theme') {
             if (isset($css['theme'][$sheet])) {
                 $cssfiles[] = $css['theme'][$sheet];
@@ -1061,7 +1068,7 @@ public function get_css_content_debug($type, $subtype, $sheet) {
             $contents = $this->post_process($contents);
             $comment = "/** Path: $type $subtype $sheet.' **/\n";
             $stats = '';
-            $csscontent .= $comment.$stats.$contents."\n\n";
+            $csscontent .= $comment . $stats . $contents . "\n\n";
         }
 
         return $csscontent;
@@ -1080,7 +1087,7 @@ public function get_css_content_editor() {
 
         // If editor has static CSS, include it.
         foreach ($cssfiles as $file) {
-            $css .= file_get_contents($file)."\n";
+            $css .= file_get_contents($file) . "\n";
         }
 
         // If editor has SCSS, compile and include it.
@@ -1105,10 +1112,10 @@ protected function get_css_files($themedesigner) {
         $cache = null;
         $cachekey = 'cssfiles';
         if ($themedesigner) {
-            require_once($CFG->dirroot.'/lib/csslib.php');
+            require_once($CFG->dirroot . '/lib/csslib.php');
             // We need some kind of caching here because otherwise the page navigation becomes
             // way too slow in theme designer mode. Feel free to create full cache definition later...
-            $cache = cache::make_from_params(cache_store::MODE_APPLICATION, 'core', 'themedesigner', array('theme' => $this->name));
+            $cache = cache::make_from_params(cache_store::MODE_APPLICATION, 'core', 'themedesigner', ['theme' => $this->name]);
             if ($files = $cache->get($cachekey)) {
                 if ($files['created'] > time() - THEME_DESIGNER_CACHE_LIFETIME) {
                     unset($files['created']);
@@ -1117,30 +1124,33 @@ protected function get_css_files($themedesigner) {
             }
         }
 
-        $cssfiles = array('plugins'=>array(), 'parents'=>array(), 'theme'=>array());
+        $cssfiles = ['plugins' => [], 'parents' => [], 'theme' => []];
 
         // Get all plugin sheets.
         $excludes = $this->resolve_excludes('plugins_exclude_sheets');
         if ($excludes !== true) {
-            foreach (core_component::get_plugin_types() as $type=>$unused) {
-                if ($type === 'theme' || (!empty($excludes[$type]) and $excludes[$type] === true)) {
+            foreach (core_component::get_plugin_types() as $type => $unused) {
+                if ($type === 'theme' || (!empty($excludes[$type]) && $excludes[$type] === true)) {
                     continue;
                 }
                 $plugins = core_component::get_plugin_list($type);
-                foreach ($plugins as $plugin=>$fulldir) {
-                    if (!empty($excludes[$type]) and is_array($excludes[$type])
-                            and in_array($plugin, $excludes[$type])) {
+                foreach ($plugins as $plugin => $fulldir) {
+                    if (
+                        !empty($excludes[$type])
+                        && is_array($excludes[$type])
+                        && in_array($plugin, $excludes[$type])
+                    ) {
                         continue;
                     }
 
                     // Get the CSS from the plugin.
                     $sheetfile = "$fulldir/styles.css";
                     if (is_readable($sheetfile)) {
-                        $cssfiles['plugins'][$type.'_'.$plugin] = $sheetfile;
+                        $cssfiles['plugins'][$type . '_' . $plugin] = $sheetfile;
                     }
 
                     // Create a list of candidate sheets from parents (direct parent last) and current theme.
-                    $candidates = array();
+                    $candidates = [];
                     foreach (array_reverse($this->parent_configs) as $parent_config) {
                         $candidates[] = $parent_config->name;
                     }
@@ -1150,7 +1160,7 @@ protected function get_css_files($themedesigner) {
                     foreach ($candidates as $candidate) {
                         $sheetthemefile = "$fulldir/styles_{$candidate}.css";
                         if (is_readable($sheetthemefile)) {
-                            $cssfiles['plugins'][$type.'_'.$plugin.'_'.$candidate] = $sheetthemefile;
+                            $cssfiles['plugins'][$type . '_' . $plugin . '_' . $candidate] = $sheetthemefile;
                         }
                     }
                 }
@@ -1162,12 +1172,14 @@ protected function get_css_files($themedesigner) {
         if ($excludes !== true) {
             foreach (array_reverse($this->parent_configs) as $parent_config) { // Base first, the immediate parent last.
                 $parent = $parent_config->name;
-                if (empty($parent_config->sheets) || (!empty($excludes[$parent]) and $excludes[$parent] === true)) {
+                if (empty($parent_config->sheets) || (!empty($excludes[$parent]) && $excludes[$parent] === true)) {
                     continue;
                 }
                 foreach ($parent_config->sheets as $sheet) {
-                    if (!empty($excludes[$parent]) && is_array($excludes[$parent])
-                            && in_array($sheet, $excludes[$parent])) {
+                    if (
+                        !empty($excludes[$parent]) && is_array($excludes[$parent])
+                            && in_array($sheet, $excludes[$parent])
+                    ) {
                         continue;
                     }
 
@@ -1180,7 +1192,6 @@ protected function get_css_files($themedesigner) {
             }
         }
 
-
         // Current theme sheets.
         // We first add the SCSS file because we want the CSS ones to
         // be included after the SCSS code.
@@ -1213,7 +1224,7 @@ protected function get_css_files($themedesigner) {
     protected function get_css_content_from_scss($themedesigner) {
         global $CFG;
 
-        list($paths, $scss) = $this->get_scss_property();
+        [$paths, $scss] = $this->get_scss_property();
         if (!$scss) {
             throw new coding_exception('The theme did not define a SCSS file, or it is not readable.');
         }
@@ -1228,11 +1239,11 @@ protected function get_css_content_from_scss($themedesigner) {
         $cachedir = make_localcache_directory('scsscache-' . $this->name, false);
         $cacheoptions = [];
         if ($themedesigner) {
-            $cacheoptions = array(
+            $cacheoptions = [
                   'cacheDir' => $cachedir,
                   'prefix' => 'scssphp_',
                   'forceRefresh' => false,
-            );
+            ];
         } else {
             if (file_exists($cachedir)) {
                 remove_dir($cachedir);
@@ -1246,7 +1257,7 @@ protected function get_css_content_from_scss($themedesigner) {
             // Enable source maps.
             $compiler->setSourceMapOptions([
                 'sourceMapBasepath' => str_replace('\\', '/', $CFG->dirroot),
-                'sourceMapRootpath' => $CFG->wwwroot . '/'
+                'sourceMapRootpath' => $CFG->wwwroot . '/',
             ]);
             $compiler->setSourceMap($compiler::SOURCE_MAP_INLINE);
         }
@@ -1263,7 +1274,6 @@ protected function get_css_content_from_scss($themedesigner) {
         try {
             // Compile!
             $compiled = $compiler->to_css();
-
         } catch (\Exception $e) {
             $compiled = false;
             debugging('Error while compiling SCSS: ' . $e->getMessage(), DEBUG_DEVELOPER);
@@ -1321,7 +1331,7 @@ public function get_icon_system() {
      *
      * This is intended to be used by themes to inject some SCSS code
      * before it gets compiled. If you want to inject variables you
-     * should use {@link self::get_scss_variables()}.
+     * should use {@see self::get_scss_variables()}.
      *
      * @return string The SCSS code to inject.
      */
@@ -1329,7 +1339,7 @@ public function get_extra_scss_code() {
         $content = '';
 
         // Getting all the candidate functions.
-        $candidates = array();
+        $candidates = [];
         foreach (array_reverse($this->parent_configs) as $parent_config) {
             if (!isset($parent_config->extrascsscallback)) {
                 continue;
@@ -1362,7 +1372,7 @@ public function get_pre_scss_code() {
         $content = '';
 
         // Getting all the candidate functions.
-        $candidates = array();
+        $candidates = [];
         foreach (array_reverse($this->parent_configs) as $parent_config) {
             if (!isset($parent_config->prescsscallback)) {
                 continue;
@@ -1416,7 +1426,6 @@ public function get_scss_property() {
                 if ($scss && is_dir($path)) {
                     $paths[] = $path;
                 }
-
             }
 
             $this->scsscache = $scss !== null ? [$paths, $scss] : false;
@@ -1438,17 +1447,17 @@ public function javascript_url($inhead) {
         global $CFG;
 
         $rev = theme_get_revision();
-        $params = array('theme'=>$this->name,'rev'=>$rev);
+        $params = ['theme' => $this->name, 'rev' => $rev];
         $params['type'] = $inhead ? 'head' : 'footer';
 
-        // Return early if there are no files to serve
+        // Return early if there are no files to serve.
         if (count($this->javascript_files($params['type'])) === 0) {
             return null;
         }
 
-        if (!empty($CFG->slasharguments) and $rev > 0) {
+        if (!empty($CFG->slasharguments) && $rev > 0) {
             $url = new moodle_url("/theme/javascript.php");
-            $url->set_slashargument('/'.$this->name.'/'.$rev.'/'.$params['type'], 'noparam', true);
+            $url->set_slashargument('/' . $this->name . '/' . $rev . '/' . $params['type'], 'noparam', true);
             return $url;
         } else {
             return new moodle_url('/theme/javascript.php', $params);
@@ -1470,21 +1479,24 @@ public function javascript_files($type) {
             $type = 'javascripts';
         }
 
-        $js = array();
-        // find out wanted parent javascripts
+        $js = [];
+        // Find out wanted parent javascripts.
         $excludes = $this->resolve_excludes('parents_exclude_javascripts');
         if ($excludes !== true) {
-            foreach (array_reverse($this->parent_configs) as $parent_config) { // base first, the immediate parent last
+            foreach (array_reverse($this->parent_configs) as $parent_config) { // Base first, the immediate parent last.
                 $parent = $parent_config->name;
                 if (empty($parent_config->$type)) {
                     continue;
                 }
-                if (!empty($excludes[$parent]) and $excludes[$parent] === true) {
+                if (!empty($excludes[$parent]) && $excludes[$parent] === true) {
                     continue;
                 }
                 foreach ($parent_config->$type as $javascript) {
-                    if (!empty($excludes[$parent]) and is_array($excludes[$parent])
-                        and in_array($javascript, $excludes[$parent])) {
+                    if (
+                        !empty($excludes[$parent])
+                        && is_array($excludes[$parent])
+                        && in_array($javascript, $excludes[$parent])
+                    ) {
                         continue;
                     }
                     $javascriptfile = "$parent_config->dir/javascript/$javascript.js";
@@ -1495,7 +1507,7 @@ public function javascript_files($type) {
             }
         }
 
-        // current theme javascripts
+        // Current theme javascripts.
         if (is_array($this->$type)) {
             foreach ($this->$type as $javascript) {
                 $javascriptfile = "$this->dir/javascript/$javascript.js";
@@ -1517,14 +1529,14 @@ public function javascript_files($type) {
      */
     protected function resolve_excludes($variable, $default = null) {
         $setting = $default;
-        if (is_array($this->{$variable}) or $this->{$variable} === true) {
+        if (is_array($this->{$variable}) || $this->{$variable} === true) {
             $setting = $this->{$variable};
         } else {
-            foreach ($this->parent_configs as $parent_config) { // the immediate parent first, base last
+            foreach ($this->parent_configs as $parent_config) { // The immediate parent first, base last.
                 if (!isset($parent_config->{$variable})) {
                     continue;
                 }
-                if (is_array($parent_config->{$variable}) or $parent_config->{$variable} === true) {
+                if (is_array($parent_config->{$variable}) || $parent_config->{$variable} === true) {
                     $setting = $parent_config->{$variable};
                     break;
                 }
@@ -1543,7 +1555,7 @@ public function javascript_content($type) {
         $jsfiles = $this->javascript_files($type);
         $js = '';
         foreach ($jsfiles as $jsfile) {
-            $js .= file_get_contents($jsfile)."\n";
+            $js .= file_get_contents($jsfile) . "\n";
         }
         return $js;
     }
@@ -1560,9 +1572,9 @@ public function javascript_content($type) {
      * @return string The processed CSS.
      */
     public function post_process($css) {
-        // now resolve all image locations
+        // Now resolve all image locations.
         if (preg_match_all('/\[\[pix:([a-z0-9_]+\|)?([^\]]+)\]\]/', $css, $matches, PREG_SET_ORDER)) {
-            $replaced = array();
+            $replaced = [];
             foreach ($matches as $match) {
                 if (isset($replaced[$match[0]])) {
                     continue;
@@ -1571,7 +1583,7 @@ public function post_process($css) {
                 $imagename = $match[2];
                 $component = rtrim($match[1], '|');
                 $imageurl = $this->image_url($imagename, $component)->out(false);
-                 // we do not need full url because the image.php is always in the same dir
+                // We do not need full url because the image.php is always in the same dir.
                 $imageurl = preg_replace('|^http.?://[^/]+|', '', $imageurl);
                 $css = str_replace($match[0], $imageurl, $css);
             }
@@ -1579,7 +1591,7 @@ public function post_process($css) {
 
         // Now resolve all font locations.
         if (preg_match_all('/\[\[font:([a-z0-9_]+\|)?([^\]]+)\]\]/', $css, $matches, PREG_SET_ORDER)) {
-            $replaced = array();
+            $replaced = [];
             foreach ($matches as $match) {
                 if (isset($replaced[$match[0]])) {
                     continue;
@@ -1605,7 +1617,6 @@ public function post_process($css) {
         $treeprocessor = $this->get_css_tree_post_processor();
         $needsparsing = !empty($treeprocessor) || !empty($this->rtlmode);
         if ($needsparsing) {
-
             // We might need more memory/time to do this, so let's play safe.
             raise_memory_limit(MEMORY_EXTRA);
             core_php_time_limit::raise(300);
@@ -1667,10 +1678,10 @@ public function pix_url($imagename, $component) {
     public function image_url($imagename, $component) {
         global $CFG;
 
-        $params = array('theme'=>$this->name);
+        $params = ['theme' => $this->name];
         $svg = $this->use_svg_icons();
 
-        if (empty($component) or $component === 'moodle' or $component === 'core') {
+        if (empty($component) || $component === 'moodle' || $component === 'core') {
             $params['component'] = 'core';
         } else {
             $params['component'] = $component;
@@ -1684,12 +1695,12 @@ public function image_url($imagename, $component) {
         $params['image'] = $imagename;
 
         $url = new moodle_url("/theme/image.php");
-        if (!empty($CFG->slasharguments) and $rev > 0) {
-            $path = '/'.$params['theme'].'/'.$params['component'].'/'.$params['rev'].'/'.$params['image'];
+        if (!empty($CFG->slasharguments) && $rev > 0) {
+            $path = '/' . $params['theme'] . '/' . $params['component'] . '/' . $params['rev'] . '/' . $params['image'];
             if (!$svg) {
                 // We add a simple /_s to the start of the path.
                 // The underscore is used to ensure that it isn't a valid theme name.
-                $path = '/_s'.$path;
+                $path = '/_s' . $path;
             }
             $url->set_slashargument($path, 'noparam', true);
         } else {
@@ -1714,9 +1725,9 @@ public function image_url($imagename, $component) {
     public function font_url($font, $component) {
         global $CFG;
 
-        $params = array('theme'=>$this->name);
+        $params = ['theme' => $this->name];
 
-        if (empty($component) or $component === 'moodle' or $component === 'core') {
+        if (empty($component) || $component === 'moodle' || $component === 'core') {
             $params['component'] = 'core';
         } else {
             $params['component'] = $component;
@@ -1730,8 +1741,8 @@ public function font_url($font, $component) {
         $params['font'] = $font;
 
         $url = new moodle_url("/theme/font.php");
-        if (!empty($CFG->slasharguments) and $rev > 0) {
-            $path = '/'.$params['theme'].'/'.$params['component'].'/'.$params['rev'].'/'.$params['font'];
+        if (!empty($CFG->slasharguments) && $rev > 0) {
+            $path = '/' . $params['theme'] . '/' . $params['component'] . '/' . $params['rev'] . '/' . $params['font'];
             $url->set_slashargument($path, 'noparam', true);
         } else {
             $url->params($params);
@@ -1757,12 +1768,15 @@ public function setting_file_url($setting, $filearea) {
             return null;
         }
 
-        $component = 'theme_'.$this->name;
+        $component = 'theme_' . $this->name;
         $itemid = theme_get_revision();
         $filepath = $this->settings->$setting;
         $syscontext = context_system::instance();
 
-        $url = moodle_url::make_file_url("$CFG->wwwroot/pluginfile.php", "/$syscontext->id/$component/$filearea/$itemid".$filepath);
+        $url = moodle_url::make_file_url(
+            "$CFG->wwwroot/pluginfile.php",
+            "/$syscontext->id/$component/$filearea/$itemid" . $filepath,
+        );
 
         // Now this is tricky because the we can not hardcode http or https here, lets use the relative link.
         // Note: unfortunately moodle_url does not support //urls yet.
@@ -1786,13 +1800,13 @@ public function setting_file_serve($filearea, $args, $forcedownload, $options) {
         require_once("$CFG->libdir/filelib.php");
 
         $syscontext = context_system::instance();
-        $component = 'theme_'.$this->name;
+        $component = 'theme_' . $this->name;
 
         $revision = array_shift($args);
         if ($revision < 0) {
             $lifetime = 0;
         } else {
-            $lifetime = 60*60*24*60;
+            $lifetime = 60 * 60 * 24 * 60;
             // By default, theme files must be cache-able by both browsers and proxies.
             if (!array_key_exists('cacheability', $options)) {
                 $options['cacheability'] = 'public';
@@ -1836,11 +1850,11 @@ public function resolve_image_location($image, $component, $svg = false) {
             $svg = $this->use_svg_icons();
         }
 
-        if ($component === 'moodle' or $component === 'core' or empty($component)) {
+        if ($component === 'moodle' || $component === 'core' || empty($component)) {
             if ($imagefile = $this->image_exists("$this->dir/pix_core/$image", $svg)) {
                 return $imagefile;
             }
-            foreach (array_reverse($this->parent_configs) as $parent_config) { // base first, the immediate parent last
+            foreach (array_reverse($this->parent_configs) as $parent_config) { // Base first, the immediate parent last.
                 if ($imagefile = $this->image_exists("$parent_config->dir/pix_core/$image", $svg)) {
                     return $imagefile;
                 }
@@ -1852,26 +1866,24 @@ public function resolve_image_location($image, $component, $svg = false) {
                 return $imagefile;
             }
             return null;
-
-        } else if ($component === 'theme') { //exception
+        } else if ($component === 'theme') { // Exception.
             if ($image === 'favicon') {
                 return "$this->dir/pix/favicon.ico";
             }
             if ($imagefile = $this->image_exists("$this->dir/pix/$image", $svg)) {
                 return $imagefile;
             }
-            foreach (array_reverse($this->parent_configs) as $parent_config) { // base first, the immediate parent last
+            foreach (array_reverse($this->parent_configs) as $parent_config) { // Base first, the immediate parent last.
                 if ($imagefile = $this->image_exists("$parent_config->dir/pix/$image", $svg)) {
                     return $imagefile;
                 }
             }
             return null;
-
         } else {
             if (strpos($component, '_') === false) {
                 $component = "mod_{$component}";
             }
-            list($type, $plugin) = explode('_', $component, 2);
+            [$type, $plugin] = explode('_', $component, 2);
 
             // In Moodle 4.0 we introduced a new image format.
             // Support that image format here.
@@ -1923,7 +1935,7 @@ public function resolve_image_location($image, $component, $svg = false) {
     public function resolve_font_location($font, $component) {
         global $CFG;
 
-        if ($component === 'moodle' or $component === 'core' or empty($component)) {
+        if ($component === 'moodle' || $component === 'core' || empty($component)) {
             if (file_exists("$this->dir/fonts_core/$font")) {
                 return "$this->dir/fonts_core/$font";
             }
@@ -1939,7 +1951,6 @@ public function resolve_font_location($font, $component) {
                 return "$CFG->dirroot/lib/fonts/$font";
             }
             return null;
-
         } else if ($component === 'theme') { // Exception.
             if (file_exists("$this->dir/fonts/$font")) {
                 return "$this->dir/fonts/$font";
@@ -1950,12 +1961,11 @@ public function resolve_font_location($font, $component) {
                 }
             }
             return null;
-
         } else {
             if (strpos($component, '_') === false) {
-                $component = 'mod_'.$component;
+                $component = 'mod_' . $component;
             }
-            list($type, $plugin) = explode('_', $component, 2);
+            [$type, $plugin] = explode('_', $component, 2);
 
             if (file_exists("$this->dir/fonts_plugins/$type/$plugin/$font")) {
                 return "$this->dir/fonts_plugins/$type/$plugin/$font";
@@ -2054,13 +2064,13 @@ public function get_rtl_mode() {
     private static function image_exists($filepath, $svg = false) {
         if ($svg && file_exists("$filepath.svg")) {
             return "$filepath.svg";
-        } else  if (file_exists("$filepath.png")) {
+        } else if (file_exists("$filepath.png")) {
             return "$filepath.png";
         } else if (file_exists("$filepath.gif")) {
             return "$filepath.gif";
-        } else  if (file_exists("$filepath.jpg")) {
+        } else if (file_exists("$filepath.jpg")) {
             return "$filepath.jpg";
-        } else  if (file_exists("$filepath.jpeg")) {
+        } else if (file_exists("$filepath.jpeg")) {
             return "$filepath.jpeg";
         } else {
             return false;
@@ -2088,12 +2098,12 @@ private static function find_theme_config($themename, $settings, $parentscheck =
         $THEME->dir      = $dir;
         $THEME->settings = $settings;
 
-        global $CFG; // just in case somebody tries to use $CFG in theme config
+        global $CFG; // Just in case somebody tries to use $CFG in theme config.
         include("$THEME->dir/config.php");
 
-        // verify the theme configuration is OK
+        // Verify the theme configuration is OK.
         if (!is_array($THEME->parents)) {
-            // parents option is mandatory now
+            // Parents option is mandatory now.
             return null;
         } else {
             // We use $parentscheck to only check the direct parents (avoid infinite loop).
@@ -2123,16 +2133,14 @@ private static function find_theme_location($themename) {
 
         if (file_exists("$CFG->dirroot/theme/$themename/config.php")) {
             $dir = "$CFG->dirroot/theme/$themename";
-
-        } else if (!empty($CFG->themedir) and file_exists("$CFG->themedir/$themename/config.php")) {
+        } else if (!empty($CFG->themedir) && file_exists("$CFG->themedir/$themename/config.php")) {
             $dir = "$CFG->themedir/$themename";
-
         } else {
             return null;
         }
 
         if (file_exists("$dir/styles.php")) {
-            //legacy theme - needs to be upgraded - upgrade info is displayed on the admin settings page
+            // Legacy theme - needs to be upgraded - upgrade info is displayed on the admin settings page.
             return null;
         }
 
@@ -2158,10 +2166,10 @@ public function get_renderer(moodle_page $page, $component, $subtype = null, $ta
     }
 
     /**
-     * Get the information from {@link $layouts} for this type of page.
+     * Get the information from {@see $layouts} for this type of page.
      *
      * @param string $pagelayout the the page layout name.
-     * @return array the appropriate part of {@link $layouts}.
+     * @return array the appropriate part of {@see $layouts}.
      */
     protected function layout_info_for_page($pagelayout) {
         if (array_key_exists($pagelayout, $this->layouts)) {
@@ -2176,7 +2184,7 @@ protected function layout_info_for_page($pagelayout) {
      * Given the settings of this theme, and the page pagelayout, return the
      * full path of the page layout file to use.
      *
-     * Used by {@link core_renderer::header()}.
+     * Used by {@see core_renderer::header()}.
      *
      * @param string $pagelayout the the page layout name.
      * @return string Full path to the lyout file to use
@@ -2188,9 +2196,9 @@ public function layout_file($pagelayout) {
         $layoutfile = $layoutinfo['file'];
 
         if (array_key_exists('theme', $layoutinfo)) {
-            $themes = array($layoutinfo['theme']);
+            $themes = [$layoutinfo['theme']];
         } else {
-            $themes = array_merge(array($this->name),$this->parents);
+            $themes = array_merge([$this->name], $this->parents);
         }
 
         foreach ($themes as $theme) {
@@ -2218,7 +2226,7 @@ public function pagelayout_options($pagelayout) {
         if (!empty($info['options'])) {
             return $info['options'];
         }
-        return array();
+        return [];
     }
 
     /**
@@ -2269,7 +2277,7 @@ protected function get_region_name($region, $theme) {
      * @return array internal region name => human readable name.
      */
     public function get_all_block_regions() {
-        $regions = array();
+        $regions = [];
         foreach ($this->layouts as $layoutinfo) {
             foreach ($layoutinfo['regions'] as $region) {
                 $regions[$region] = $this->get_region_name($region, $this->name);
@@ -2284,7 +2292,7 @@ public function get_all_block_regions() {
      * @return string
      */
     public function get_theme_name() {
-        return get_string('pluginname', 'theme_'.$this->name);
+        return get_string('pluginname', 'theme_' . $this->name);
     }
 
     /**
@@ -2327,7 +2335,6 @@ public function get_css_tree_post_processor() {
         }
         return null;
     }
-
 }
 // Alias this class to the old name.
 // This file will be autoloaded by the legacyclasses autoload system.
diff --git a/lib/classes/output/theme_usage.php b/lib/classes/output/theme_usage.php
index 21d33dda0460b..19633dc8642b3 100644
--- a/lib/classes/output/theme_usage.php
+++ b/lib/classes/output/theme_usage.php
@@ -25,7 +25,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class theme_usage {
-
     /** @var string The theme usage type for users. */
     public const THEME_USAGE_TYPE_USER = 'user';
 
@@ -61,7 +60,6 @@ public static function is_theme_used_in_any_context(string $themename): int {
         $isused = $cache->get($themename);
 
         if ($isused === false) {
-
             $sqlunions = [];
 
             // For each context, check if the config is enabled and there is at least one use.
@@ -119,7 +117,6 @@ public static function is_theme_used_in_any_context(string $themename): int {
             // Cache the result so we don't have to keep checking for this theme.
             $cache->set($themename, $isused);
             return $isused;
-
         } else {
             return $isused;
         }
diff --git a/lib/classes/output/url_rewriter.php b/lib/classes/output/url_rewriter.php
index eacd434ed2fd3..5cc5270d6a274 100644
--- a/lib/classes/output/url_rewriter.php
+++ b/lib/classes/output/url_rewriter.php
@@ -25,8 +25,6 @@
 
 namespace core\output;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * URL rewriter interface
  *
@@ -36,7 +34,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 interface url_rewriter {
-
     /**
      * Rewrite moodle_urls into another form.
      *
@@ -52,7 +49,4 @@ public static function url_rewrite(\moodle_url $url);
      * @return void
      */
     public static function html_head_setup();
-
-
 }
-
diff --git a/lib/classes/output/url_select.php b/lib/classes/output/url_select.php
index 0f043fa08154c..3068f443ae9d7 100644
--- a/lib/classes/output/url_select.php
+++ b/lib/classes/output/url_select.php
@@ -36,62 +36,62 @@ class url_select implements renderable, templatable {
      *         array(array('Odd'=>array(1=>'One', 3=>'Three)), array('Even'=>array(2=>'Two')))
      *         array(1=>'One', '--1uniquekey'=>array('More'=>array(2=>'Two', 3=>'Three')))
      */
-    var $urls;
+    public $urls;
 
     /**
      * @var string Selected option
      */
-    var $selected;
+    public $selected;
 
     /**
      * @var array Nothing selected
      */
-    var $nothing;
+    public $nothing;
 
     /**
      * @var array Extra select field attributes
      */
-    var $attributes = array();
+    public $attributes = [];
 
     /**
      * @var string Button label
      */
-    var $label = '';
+    public $label = '';
 
     /**
      * @var array Button label's attributes
      */
-    var $labelattributes = array();
+    public $labelattributes = [];
 
     /**
      * @var string Wrapping div class
      */
-    var $class = 'urlselect';
+    public $class = 'urlselect';
 
     /**
      * @var bool True if button disabled, false if normal
      */
-    var $disabled = false;
+    public $disabled = false;
 
     /**
      * @var string Button tooltip
      */
-    var $tooltip = null;
+    public $tooltip = null;
 
     /**
      * @var string Form id
      */
-    var $formid = null;
+    public $formid = null;
 
     /**
      * @var help_icon The help icon for this element.
      */
-    var $helpicon = null;
+    public $helpicon = null;
 
     /**
      * @var string If set, makes button visible with given name for button
      */
-    var $showbutton = null;
+    public $showbutton = null;
 
     /**
      * Constructor
@@ -102,7 +102,7 @@ class url_select implements renderable, templatable {
      * @param string $showbutton Set to text of button if it should be visible
      *   or null if it should be hidden (hidden version always has text 'go')
      */
-    public function __construct(array $urls, $selected = '', $nothing = array('' => 'choosedots'), $formid = null, $showbutton = null) {
+    public function __construct(array $urls, $selected = '', $nothing = ['' => 'choosedots'], $formid = null, $showbutton = null) {
         $this->urls       = $urls;
         $this->selected   = $selected;
         $this->nothing    = $nothing;
@@ -135,7 +135,7 @@ public function set_help_icon($identifier, $component = 'moodle') {
      * @param string $label
      * @param array $attributes (optional)
      */
-    public function set_label($label, $attributes = array()) {
+    public function set_label($label, $attributes = []) {
         $this->label = $label;
         $this->labelattributes = $attributes;
     }
@@ -149,12 +149,11 @@ public function set_label($label, $attributes = array()) {
     protected function clean_url($value) {
         global $CFG;
 
+        // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedIf
         if (empty($value)) {
             // Nothing.
-
         } else if (strpos($value, $CFG->wwwroot . '/') === 0) {
             $value = str_replace($CFG->wwwroot, '', $value);
-
         } else if (strpos($value, '/') !== 0) {
             debugging("Invalid url_select urls parameter: url '$value' is not local relative url!", DEBUG_DEVELOPER);
         }
@@ -181,7 +180,7 @@ protected function flatten_options($options, $nothing) {
                         $flattened[$groupname] = [
                             'name' => $groupname,
                             'isgroup' => true,
-                            'options' => []
+                            'options' => [],
                         ];
                     }
                     foreach ($optoptions as $optvalue => $optoption) {
@@ -193,7 +192,6 @@ protected function flatten_options($options, $nothing) {
                         ];
                     }
                 }
-
             } else {
                 $cleanedvalue = $this->clean_url($value);
                 $flattened[$cleanedvalue] = [
@@ -208,7 +206,7 @@ protected function flatten_options($options, $nothing) {
             $value = key($nothing);
             $name = reset($nothing);
             $flattened = [
-                    $value => ['name' => $name, 'value' => $value, 'selected' => $this->selected == $value]
+                    $value => ['name' => $name, 'value' => $value, 'selected' => $this->selected == $value],
                 ] + $flattened;
         }
 
diff --git a/lib/classes/output/user_picture.php b/lib/classes/output/user_picture.php
index a7947b6430c87..8da6537c5814a 100644
--- a/lib/classes/output/user_picture.php
+++ b/lib/classes/output/user_picture.php
@@ -17,6 +17,7 @@
 namespace core\output;
 
 use core\context\user as context_user;
+use core\exception\coding_exception;
 use moodle_page;
 use moodle_url;
 use stdClass;
@@ -40,7 +41,7 @@ class user_picture implements renderable {
     /**
      * @var int The course id. Used when constructing the link to the user's
      * profile, page course id used if not specified.
-    */
+     */
     public $courseid;
 
     /**
@@ -99,20 +100,28 @@ public function __construct(stdClass $user) {
             throw new coding_exception('User id is required when printing user avatar image.');
         }
 
-        // only touch the DB if we are missing data and complain loudly...
+        // Only touch the DB if we are missing data and complain loudly...
         $needrec = false;
         foreach (\core_user\fields::get_picture_fields() as $field) {
             if (!property_exists($user, $field)) {
                 $needrec = true;
-                debugging('Missing '.$field.' property in $user object, this is a performance problem that needs to be fixed by a developer. '
-                    .'Please use the \core_user\fields API to get the full list of required fields.', DEBUG_DEVELOPER);
+                debugging(
+                    "Missing {$field} property in {$user} object, "
+                        . "this is a performance problem that needs to be fixed by a developer. "
+                        . 'Please use the \core_user\fields API to get the full list of required fields.',
+                    DEBUG_DEVELOPER,
+                );
                 break;
             }
         }
 
         if ($needrec) {
-            $this->user = $DB->get_record('user', array('id' => $user->id),
-                implode(',', \core_user\fields::get_picture_fields()), MUST_EXIST);
+            $this->user = $DB->get_record(
+                'user',
+                ['id' => $user->id],
+                implode(',', \core_user\fields::get_picture_fields()),
+                MUST_EXIST
+            );
         } else {
             $this->user = clone($user);
         }
@@ -126,14 +135,20 @@ public function __construct(stdClass $user) {
      * id of the result record. Please note it has to be converted back to id before rendering.
      *
      * @param string $tableprefix name of database table prefix in query
-     * @param array $extrafields extra fields to be included in result (do not include TEXT columns because it would break SELECT DISTINCT in MSSQL and ORACLE)
+     * @param null|array $extrafields extra fields to be included in result
+     *      Do not include TEXT columns because it would break SELECT DISTINCT in MSSQL and ORACLE.
      * @param string $idalias alias of id field
      * @param string $fieldprefix prefix to add to all columns in their aliases, does not apply to 'id'
      * @return string
      * @deprecated since Moodle 3.11 MDL-45242
      * @see \core_user\fields
      */
-    public static function fields($tableprefix = '', array $extrafields = NULL, $idalias = 'id', $fieldprefix = '') {
+    public static function fields(
+        $tableprefix = '',
+        ?array $extrafields = null,
+        $idalias = 'id',
+        $fieldprefix = '',
+    ) {
         debugging('user_picture::fields() is deprecated. Please use the \core_user\fields API instead.', DEBUG_DEVELOPER);
         $userfields = \core_user\fields::for_userpic();
         if ($extrafields) {
@@ -152,17 +167,21 @@ public static function fields($tableprefix = '', array $extrafields = NULL, $ida
     /**
      * Extract the aliased user fields from a given record
      *
-     * Given a record that was previously obtained using {@link self::fields()} with aliases,
+     * Given a record that was previously obtained using {@see self::fields()} with aliases,
      * this method extracts user related unaliased fields.
      *
      * @param stdClass $record containing user picture fields
-     * @param array $extrafields extra fields included in the $record
+     * @param null|array $extrafields extra fields included in the $record
      * @param string $idalias alias of the id field
      * @param string $fieldprefix prefix added to all columns in their aliases, does not apply to 'id'
      * @return stdClass object with unaliased user fields
      */
-    public static function unalias(stdClass $record, array $extrafields = null, $idalias = 'id', $fieldprefix = '') {
-
+    public static function unalias(
+        stdClass $record,
+        ?array $extrafields = null,
+        $idalias = 'id',
+        $fieldprefix = '',
+    ) {
         if (empty($idalias)) {
             $idalias = 'id';
         }
@@ -175,18 +194,18 @@ public static function unalias(stdClass $record, array $extrafields = null, $ida
                     $return->id = $record->{$idalias};
                 }
             } else {
-                if (property_exists($record, $fieldprefix.$field)) {
-                    $return->{$field} = $record->{$fieldprefix.$field};
+                if (property_exists($record, $fieldprefix . $field)) {
+                    $return->{$field} = $record->{$fieldprefix . $field};
                 }
             }
         }
-        // add extra fields if not already there
+        // Add extra fields if not already there.
         if ($extrafields) {
             foreach ($extrafields as $e) {
-                if ($e === 'id' or property_exists($return, $e)) {
+                if ($e === 'id' || property_exists($return, $e)) {
                     continue;
                 }
-                $return->{$e} = $record->{$fieldprefix.$e};
+                $return->{$e} = $record->{$fieldprefix . $e};
             }
         }
 
@@ -200,10 +219,13 @@ public static function unalias(stdClass $record, array $extrafields = null, $ida
      * if requests are made for non-existent files etc.
      *
      * @param moodle_page $page
-     * @param renderer_base $renderer
+     * @param null|renderer_base $renderer
      * @return moodle_url
      */
-    public function get_url(moodle_page $page, renderer_base $renderer = null) {
+    public function get_url(
+        moodle_page $page,
+        ?renderer_base $renderer = null,
+    ) {
         global $CFG;
 
         if (is_null($renderer)) {
@@ -215,7 +237,7 @@ public function get_url(moodle_page $page, renderer_base $renderer = null) {
         if (empty($this->size)) {
             $filename = 'f2';
             $size = 35;
-        } else if ($this->size === true or $this->size == 1) {
+        } else if ($this->size === true || $this->size == 1) {
             $filename = 'f1';
             $size = 100;
         } else if ($this->size > 100) {
@@ -229,10 +251,12 @@ public function get_url(moodle_page $page, renderer_base $renderer = null) {
             $size = (int)$this->size;
         }
 
-        $defaulturl = $renderer->image_url('u/'.$filename); // default image
+        $defaulturl = $renderer->image_url('u/' . $filename); // Default image.
 
-        if ((!empty($CFG->forcelogin) and !isloggedin()) ||
-            (!empty($CFG->forceloginforprofileimage) && (!isloggedin() || isguestuser()))) {
+        if (
+            (!empty($CFG->forcelogin) && !isloggedin()) ||
+            (!empty($CFG->forceloginforprofileimage) && (!isloggedin() || isguestuser()))
+        ) {
             // Protect images if login required and not logged in;
             // also if login is required for profile images and is not logged in or guest
             // do not use require_login() because it is expensive and not suitable here anyway.
@@ -240,7 +264,7 @@ public function get_url(moodle_page $page, renderer_base $renderer = null) {
         }
 
         // First try to detect deleted users - but do not read from database for performance reasons!
-        if (!empty($this->user->deleted) or strpos($this->user->email, '@') === false) {
+        if (!empty($this->user->deleted) || !str_contains($this->user->email, '@')) {
             // All deleted users should have email replaced by md5 hash,
             // all active users are expected to have valid email.
             return $defaulturl;
@@ -265,27 +289,35 @@ public function get_url(moodle_page $page, renderer_base $renderer = null) {
                 // in the circumstance that the profile picture is not available
                 // when the user actually requests it they still get the profile
                 // picture for the correct theme.
-                $path .= $page->theme->name.'/';
+                $path .= $page->theme->name . '/';
             }
             // Set the image URL to the URL for the uploaded file and return.
             $url = moodle_url::make_pluginfile_url(
-                $contextid, 'user', 'icon', null, $path, $filename, false, $this->includetoken);
+                $contextid,
+                'user',
+                'icon',
+                null,
+                $path,
+                $filename,
+                false,
+                $this->includetoken
+            );
             $url->param('rev', $this->user->picture);
             return $url;
         }
 
-        if ($this->user->picture == 0 and !empty($CFG->enablegravatar)) {
-            // Normalise the size variable to acceptable bounds
+        if ($this->user->picture == 0 && !empty($CFG->enablegravatar)) {
+            // Normalise the size variable to acceptable bounds.
             if ($size < 1 || $size > 512) {
                 $size = 35;
             }
-            // Hash the users email address
+            // Hash the users email address.
             $md5 = md5(strtolower(trim($this->user->email)));
             // Build a gravatar URL with what we know.
 
-            // Find the best default image URL we can (MDL-35669)
+            // Find the best default image URL we can (MDL-35669).
             if (empty($CFG->gravatardefaulturl)) {
-                $absoluteimagepath = $page->theme->resolve_image_location('u/'.$filename, 'core');
+                $absoluteimagepath = $page->theme->resolve_image_location('u/' . $filename, 'core');
                 if (strpos($absoluteimagepath, $CFG->dirroot) === 0) {
                     $gravatardefault = $CFG->wwwroot . substr($absoluteimagepath, strlen($CFG->dirroot));
                 } else {
@@ -298,9 +330,9 @@ public function get_url(moodle_page $page, renderer_base $renderer = null) {
             // If the currently requested page is https then we'll return an
             // https gravatar page.
             if (is_https()) {
-                return new moodle_url("https://secure.gravatar.com/avatar/{$md5}", array('s' => $size, 'd' => $gravatardefault));
+                return new moodle_url("https://secure.gravatar.com/avatar/{$md5}", ['s' => $size, 'd' => $gravatardefault]);
             } else {
-                return new moodle_url("http://www.gravatar.com/avatar/{$md5}", array('s' => $size, 'd' => $gravatardefault));
+                return new moodle_url("http://www.gravatar.com/avatar/{$md5}", ['s' => $size, 'd' => $gravatardefault]);
             }
         }
 
diff --git a/lib/classes/output/xhtml_container_stack.php b/lib/classes/output/xhtml_container_stack.php
index 64e7192397b65..ccb52ac55112a 100644
--- a/lib/classes/output/xhtml_container_stack.php
+++ b/lib/classes/output/xhtml_container_stack.php
@@ -36,16 +36,16 @@ class xhtml_container_stack {
     /**
      * @var array Stores the list of open containers.
      */
-    protected $opencontainers = array();
+    protected $opencontainers = [];
 
     /**
      * @var array In developer debug mode, stores a stack trace of all opens and
      * closes, so we can output helpful error messages when there is a mismatch.
      */
-    protected $log = array();
+    protected $log = [];
 
     /**
-     * @var boolean Store whether we are developer debug mode. We need this in
+     * @var bool Store whether we are developer debug mode. We need this in
      * several places including in the destructor where we may not have access to $CFG.
      */
     protected $isdebugging;
@@ -61,7 +61,7 @@ public function __construct() {
     /**
      * Push the close HTML for a recently opened container onto the stack.
      *
-     * @param string $type The type of container. This is checked when {@link pop()}
+     * @param string $type The type of container. This is checked when {@see pop()}
      *      is called and must match, otherwise a developer debug warning is output.
      * @param string $closehtml The HTML required to close the container.
      */
diff --git a/lib/outputactions.php b/lib/outputactions.php
index 0fdca282e68ed..b7c551871da43 100644
--- a/lib/outputactions.php
+++ b/lib/outputactions.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+defined('MOODLE_INTERNAL') || die();
+
 // This file is deprecated, but it should never have been manually included by anything outside of lib/outputlib.php.
 // Throwing an exception here should be fine because removing the manual inclusion should have no impact.
 throw new \core\exception\coding_exception(
diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php
index 0fdca282e68ed..b7c551871da43 100644
--- a/lib/outputcomponents.php
+++ b/lib/outputcomponents.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+defined('MOODLE_INTERNAL') || die();
+
 // This file is deprecated, but it should never have been manually included by anything outside of lib/outputlib.php.
 // Throwing an exception here should be fine because removing the manual inclusion should have no impact.
 throw new \core\exception\coding_exception(
diff --git a/lib/outputfactories.php b/lib/outputfactories.php
index 0fdca282e68ed..b7c551871da43 100644
--- a/lib/outputfactories.php
+++ b/lib/outputfactories.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+defined('MOODLE_INTERNAL') || die();
+
 // This file is deprecated, but it should never have been manually included by anything outside of lib/outputlib.php.
 // Throwing an exception here should be fine because removing the manual inclusion should have no impact.
 throw new \core\exception\coding_exception(
diff --git a/lib/outputfragmentrequirementslib.php b/lib/outputfragmentrequirementslib.php
index 2b6fa039198fa..b7c551871da43 100644
--- a/lib/outputfragmentrequirementslib.php
+++ b/lib/outputfragmentrequirementslib.php
@@ -14,7 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-// This file is deprecated, but it should never have been manually included by anything outside of lib/pagelib.php.
+defined('MOODLE_INTERNAL') || die();
+
+// This file is deprecated, but it should never have been manually included by anything outside of lib/outputlib.php.
 // Throwing an exception here should be fine because removing the manual inclusion should have no impact.
 throw new \core\exception\coding_exception(
     'This file should not be manually included by any component.',
diff --git a/lib/outputlib.php b/lib/outputlib.php
index 4dbf86e0b3bd7..ef3dd636d8849 100644
--- a/lib/outputlib.php
+++ b/lib/outputlib.php
@@ -59,7 +59,6 @@ function theme_get_revision() {
         } else {
             return $CFG->themerev;
         }
-
     } else {
         return -1;
     }
@@ -99,11 +98,11 @@ function theme_get_next_revision() {
     global $CFG;
 
     $next = time();
-    if (isset($CFG->themerev) and $next <= $CFG->themerev and $CFG->themerev - $next < 60*60) {
+    if (isset($CFG->themerev) && ($next <= $CFG->themerev) && (($CFG->themerev - $next) < 60 * 60)) {
         // This resolves problems when reset is requested repeatedly within 1s,
         // the < 1h condition prevents accidental switching to future dates
         // because we might not recover from it.
-        $next = $CFG->themerev+1;
+        $next = $CFG->themerev + 1;
     }
 
     return $next;
@@ -120,7 +119,7 @@ function theme_get_next_sub_revision_for_theme($themename) {
 
     $next = time();
     $current = theme_get_sub_revision_for_theme($themename);
-    if ($next <= $current and $current - $next < 60 * 60) {
+    if ($next <= $current && $current - $next < 60 * 60) {
         // This resolves problems when reset is requested repeatedly within 1s,
         // the < 1h condition prevents accidental switching to future dates
         // because we might not recover from it.
@@ -160,7 +159,7 @@ function theme_get_config_file_path($themename) {
 
     if (file_exists("{$CFG->dirroot}/theme/{$themename}/config.php")) {
         return "{$CFG->dirroot}/theme/{$themename}/config.php";
-    } else if (!empty($CFG->themedir) and file_exists("{$CFG->themedir}/{$themename}/config.php")) {
+    } else if (!empty($CFG->themedir) && file_exists("{$CFG->themedir}/{$themename}/config.php")) {
         return "{$CFG->themedir}/{$themename}/config.php";
     } else {
         return null;
@@ -191,8 +190,12 @@ function theme_get_css_filename($themename, $globalrevision, $themerevision, $di
  * @param bool           $cache        Should the generated files be stored in local cache.
  * @return array         The built theme content in a multi-dimensional array of name => direction => content
  */
-function theme_build_css_for_themes($themeconfigs = [], $directions = ['rtl', 'ltr'],
-        $cache = true, $mtraceprogress = false): array {
+function theme_build_css_for_themes(
+    $themeconfigs = [],
+    $directions = ['rtl', 'ltr'],
+    $cache = true,
+    $mtraceprogress = false
+): array {
     global $CFG;
 
     if (empty($themeconfigs)) {
@@ -344,7 +347,7 @@ function template_reset_all_caches() {
     global $CFG;
 
     $next = time();
-    if (isset($CFG->templaterev) and $next <= $CFG->templaterev and $CFG->templaterev - $next < 60 * 60) {
+    if (isset($CFG->templaterev) && $next <= $CFG->templaterev && $CFG->templaterev - $next < 60 * 60) {
         // This resolves problems when reset is requested repeatedly within 1s,
         // the < 1h condition prevents accidental switching to future dates
         // because we might not recover from it.
@@ -361,11 +364,11 @@ function js_reset_all_caches() {
     global $CFG;
 
     $next = time();
-    if (isset($CFG->jsrev) and $next <= $CFG->jsrev and $CFG->jsrev - $next < 60*60) {
+    if (isset($CFG->jsrev) && $next <= $CFG->jsrev && $CFG->jsrev - $next < 60 * 60) {
         // This resolves problems when reset is requested repeatedly within 1s,
         // the < 1h condition prevents accidental switching to future dates
         // because we might not recover from it.
-        $next = $CFG->jsrev+1;
+        $next = $CFG->jsrev + 1;
     }
 
     set_config('jsrev', $next);
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index 0fdca282e68ed..b7c551871da43 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+defined('MOODLE_INTERNAL') || die();
+
 // This file is deprecated, but it should never have been manually included by anything outside of lib/outputlib.php.
 // Throwing an exception here should be fine because removing the manual inclusion should have no impact.
 throw new \core\exception\coding_exception(
diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php
index 0fdca282e68ed..b7c551871da43 100644
--- a/lib/outputrequirementslib.php
+++ b/lib/outputrequirementslib.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+defined('MOODLE_INTERNAL') || die();
+
 // This file is deprecated, but it should never have been manually included by anything outside of lib/outputlib.php.
 // Throwing an exception here should be fine because removing the manual inclusion should have no impact.
 throw new \core\exception\coding_exception(
diff --git a/lib/table/classes/base_export_format.php b/lib/table/classes/base_export_format.php
index 22b29fd89dbf1..35653e4c444f8 100644
--- a/lib/table/classes/base_export_format.php
+++ b/lib/table/classes/base_export_format.php
@@ -27,25 +27,23 @@
 /**
  * The table base export format.
  *
- * @package   moodlecore
+ * @package   core_table
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class base_export_format {
     /**
-     * @var flexible_table or child class reference pointing to table class
-     * object from which to export data.
+     * @var flexible_table or child class reference pointing to table class object from which to export data.
      */
-    var $table;
+    public $table;
 
     /**
-     * @var bool output started. Keeps track of whether any output has been
-     * started yet.
+     * @var bool output started. Keeps track of whether any output has been started yet.
      */
-    var $documentstarted = false;
+    public $documentstarted = false;
 
     /**
-     * Constructor
+     * Constructor.
      *
      * @param flexible_table $table
      */
@@ -53,39 +51,37 @@ public function __construct(&$table) {
         $this->table =& $table;
     }
 
-    /**
-     * Old syntax of class constructor. Deprecated in PHP7.
-     *
-     * @deprecated since Moodle 3.1
-     */
-    public function table_default_export_format_parent(&$table) {
-        debugging('Use of class name as constructor is deprecated', DEBUG_DEVELOPER);
-        self::__construct($table);
-    }
-
-    function set_table(&$table) {
+    public function set_table(&$table) {
         $this->table =& $table;
     }
 
-    function add_data($row) {
+    public function add_data($row) {
         return false;
     }
 
-    function add_seperator() {
+    public function add_seperator() {
         return false;
     }
 
-    function document_started() {
+    public function document_started() {
         return $this->documentstarted;
     }
+
     /**
+     * Format the text.
+     *
      * Given text in a variety of format codings, this function returns
      * the text as safe HTML or as plain text dependent on what is appropriate
      * for the download format. The default removes all tags.
+     *
+     * @param string $text
+     * @param int $format
+     * @param null|array $options
+     * @param null|int $courseid
      */
-    function format_text($text, $format=FORMAT_MOODLE, $options=NULL, $courseid=NULL) {
-        //use some whitespace to indicate where there was some line spacing.
-        $text = str_replace(array('</p>', "\n", "\r"), '   ', $text);
+    public function format_text($text, $format = FORMAT_MOODLE, $options = null, $courseid = null) {
+        // Use some whitespace to indicate where there was some line spacing.
+        $text = str_replace(['</p>', "\n", "\r"], '   ', $text);
         return html_entity_decode(strip_tags($text), ENT_COMPAT);
     }
 
diff --git a/lib/table/classes/dataformat_export_format.php b/lib/table/classes/dataformat_export_format.php
index 4d2922728cfd7..fcc84a4a8b5fc 100644
--- a/lib/table/classes/dataformat_export_format.php
+++ b/lib/table/classes/dataformat_export_format.php
@@ -29,7 +29,7 @@
 /**
  * Dataformat exporter
  *
- * @package    core
+ * @package    core_table
  * @subpackage tablelib
  * @copyright  2016 Brendan Heywood (brendan@catalyst-au.net)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/lib/table/classes/flexible_table.php b/lib/table/classes/flexible_table.php
index 3950b5770ce97..65ba85b501353 100644
--- a/lib/table/classes/flexible_table.php
+++ b/lib/table/classes/flexible_table.php
@@ -31,6 +31,8 @@
 
 require_once("{$CFG->libdir}/tablelib.php");
 
+// phpcs:disable moodle.NamingConventions.ValidVariableName.MemberNameUnderscore
+
 /**
  * Flexible table implementation.
  *
@@ -39,10 +41,9 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class flexible_table {
-
-    var $uniqueid        = NULL;
-    var $attributes      = array();
-    var $headers         = array();
+    public $uniqueid        = null;
+    public $attributes      = [];
+    public $headers         = [];
 
     /**
      * @var string A column which should be considered as a header column.
@@ -52,23 +53,23 @@ class flexible_table {
     /**
      * @var string For create header with help icon.
      */
-    private $helpforheaders = array();
-    var $columns         = array();
-    var $column_style    = array();
-    var $column_class    = array();
-    var $column_suppress = array();
-    var $column_nosort   = array('userpic');
-    private $column_textsort = array();
+    private $helpforheaders = [];
+    public $columns         = [];
+    public $column_style    = [];
+    public $column_class    = [];
+    public $column_suppress = [];
+    public $column_nosort   = ['userpic'];
+    private $column_textsort = [];
 
     /**
      * @var array The sticky attribute of each table column.
      */
     protected $columnsticky = [];
 
-    /** @var boolean Stores if setup has already been called on this flixible table. */
-    var $setup           = false;
-    var $baseurl         = NULL;
-    var $request         = array();
+    /** @var bool Stores if setup has already been called on this flixible table. */
+    public $setup           = false;
+    public $baseurl         = null;
+    public $request         = [];
 
     /** @var string[] Columns that are expected to contain a users fullname.  */
     protected $userfullnamecolumns = ['fullname'];
@@ -80,8 +81,8 @@ class flexible_table {
      * @var bool Whether or not to store table properties in the user_preferences table.
      */
     private $persistent = false;
-    var $is_collapsible = false;
-    var $is_sortable    = false;
+    public $is_collapsible = false;
+    public $is_sortable    = false;
 
     /**
      * @var array The fields to sort.
@@ -94,24 +95,24 @@ class flexible_table {
     /** @var string The manually set last name initial preference */
     protected $ilast;
 
-    var $use_pages      = false;
-    var $use_initials   = false;
+    public $use_pages      = false;
+    public $use_initials   = false;
 
-    var $maxsortkeys = 2;
-    var $pagesize    = 30;
-    var $currpage    = 0;
-    var $totalrows   = 0;
-    var $currentrow  = 0;
-    var $sort_default_column = NULL;
-    var $sort_default_order  = SORT_ASC;
+    public $maxsortkeys = 2;
+    public $pagesize    = 30;
+    public $currpage    = 0;
+    public $totalrows   = 0;
+    public $currentrow  = 0;
+    public $sort_default_column = null;
+    public $sort_default_order  = SORT_ASC;
 
-    /** @var integer The defeult per page size for the table. */
+    /** @var int The defeult per page size for the table. */
     private $defaultperpage = 30;
 
     /**
-     * Array of positions in which to display download controls.
+     * @var array Array of positions in which to display download controls.
      */
-    var $showdownloadbuttonsat= array(TABLE_P_TOP);
+    public $showdownloadbuttonsat = [TABLE_P_TOP];
 
     /**
      * @var string Key of field returned by db query that is the id field of the
@@ -124,26 +125,26 @@ class flexible_table {
      * html table with paging. Property set by is_downloading which typically
      * passes in cleaned data from $
      */
-    var $download  = '';
+    public $download  = '';
 
     /**
      * @var bool whether data is downloadable from table. Determines whether
      * to display download buttons. Set by method downloadable().
      */
-    var $downloadable = false;
+    public $downloadable = false;
 
     /**
      * @var bool Has start output been called yet?
      */
-    var $started_output = false;
+    public $started_output = false;
 
     /** @var dataformat_export_format */
-    var $exportclass = null;
+    public $exportclass = null;
 
     /**
      * @var array For storing user-customised table properties in the user_preferences db table.
      */
-    private $prefs = array();
+    private $prefs = [];
 
     /** @var string $sheettitle */
     protected $sheettitle;
@@ -178,9 +179,9 @@ class flexible_table {
      * @param string $uniqueid all tables have to have a unique id, this is used
      *      as a key when storing table properties like sort order in the session.
      */
-    function __construct($uniqueid) {
+    public function __construct($uniqueid) {
         $this->uniqueid = $uniqueid;
-        $this->request  = array(
+        $this->request  = [
             TABLE_VAR_SORT   => 'tsort',
             TABLE_VAR_HIDE   => 'thide',
             TABLE_VAR_SHOW   => 'tshow',
@@ -189,7 +190,7 @@ function __construct($uniqueid) {
             TABLE_VAR_PAGE   => 'page',
             TABLE_VAR_RESET  => 'treset',
             TABLE_VAR_DIR    => 'tdir',
-        );
+        ];
     }
 
     /**
@@ -205,8 +206,8 @@ function __construct($uniqueid) {
      * @param string $sheettitle title for downloaded data.
      * @return string download dataformat type.
      */
-    function is_downloading($download = null, $filename='', $sheettitle='') {
-        if ($download!==null) {
+    public function is_downloading($download = null, $filename = '', $sheettitle = '') {
+        if ($download !== null) {
             $this->sheettitle = $sheettitle;
             $this->is_downloadable(true);
             $this->download = $download;
@@ -221,7 +222,7 @@ function is_downloading($download = null, $filename='', $sheettitle='') {
      * @param dataformat_export_format $exportclass (optional) if passed, set the table to use this export class.
      * @return dataformat_export_format the export class in use (after any set).
      */
-    function export_class_instance($exportclass = null) {
+    public function export_class_instance($exportclass = null) {
         if (!is_null($exportclass)) {
             $this->started_output = true;
             $this->exportclass = $exportclass;
@@ -244,7 +245,7 @@ function export_class_instance($exportclass = null) {
      * current state of table.
      * @return bool whether table data is set to be downloadable.
      */
-    function is_downloadable($downloadable = null) {
+    public function is_downloadable($downloadable = null) {
         if ($downloadable !== null) {
             $this->downloadable = $downloadable;
         }
@@ -271,7 +272,7 @@ public function is_persistent($persistent = null) {
      * @param array $showat array of postions in which to show download buttons.
      * Containing TABLE_P_TOP and/or TABLE_P_BOTTOM
      */
-    function show_download_buttons_at($showat) {
+    public function show_download_buttons_at($showat) {
         $this->showdownloadbuttonsat = $showat;
     }
 
@@ -283,7 +284,7 @@ function show_download_buttons_at($showat) {
      * @param int $defaultorder
      * @return void
      */
-    function sortable($bool, $defaultcolumn = NULL, $defaultorder = SORT_ASC) {
+    public function sortable($bool, $defaultcolumn = null, $defaultorder = SORT_ASC) {
         $this->is_sortable = $bool;
         $this->sort_default_column = $defaultcolumn;
         $this->sort_default_order  = $defaultorder;
@@ -295,7 +296,7 @@ function sortable($bool, $defaultcolumn = NULL, $defaultorder = SORT_ASC) {
      * with real columns. See MDL-40481 for an example.
      * @param string column name
      */
-    function text_sorting($column) {
+    public function text_sorting($column) {
         $this->column_textsort[] = $column;
     }
 
@@ -303,7 +304,7 @@ function text_sorting($column) {
      * Do not sort using this column
      * @param string column name
      */
-    function no_sorting($column) {
+    public function no_sorting($column) {
         $this->column_nosort[] = $column;
     }
 
@@ -312,7 +313,7 @@ function no_sorting($column) {
      * @param string column name, null means table
      * @return bool
      */
-    function is_sortable($column = null) {
+    public function is_sortable($column = null) {
         if (empty($column)) {
             return $this->is_sortable;
         }
@@ -327,7 +328,7 @@ function is_sortable($column = null) {
      * @param bool $bool
      * @return void
      */
-    function collapsible($bool) {
+    public function collapsible($bool) {
         $this->is_collapsible = $bool;
     }
 
@@ -336,7 +337,7 @@ function collapsible($bool) {
      * @param bool $bool
      * @return void
      */
-    function pageable($bool) {
+    public function pageable($bool) {
         $this->use_pages = $bool;
     }
 
@@ -345,7 +346,7 @@ function pageable($bool) {
      * @param bool $bool
      * @return void
      */
-    function initialbars($bool) {
+    public function initialbars($bool) {
         $this->use_initials = $bool;
     }
 
@@ -356,7 +357,7 @@ function initialbars($bool) {
      * @param int $total
      * @return void
      */
-    function pagesize($perpage, $total) {
+    public function pagesize($perpage, $total) {
         $this->pagesize  = $perpage;
         $this->totalrows = $total;
         $this->use_pages = true;
@@ -368,7 +369,7 @@ function pagesize($perpage, $total) {
      * @param array $variables
      * @return void
      */
-    function set_control_variables($variables) {
+    public function set_control_variables($variables) {
         foreach ($variables as $what => $variable) {
             if (isset($this->request[$what])) {
                 $this->request[$what] = $variable;
@@ -382,7 +383,7 @@ function set_control_variables($variables) {
      * @param mixed $value
      * @return void
      */
-    function set_attribute($attribute, $value) {
+    public function set_attribute($attribute, $value) {
         $this->attributes[$attribute] = $value;
     }
 
@@ -395,7 +396,7 @@ function set_attribute($attribute, $value) {
      * for their first attempt.
      * @param int $column the index of a column.
      */
-    function column_suppress($column) {
+    public function column_suppress($column) {
         if (isset($this->column_suppress[$column])) {
             $this->column_suppress[$column] = true;
         }
@@ -407,9 +408,9 @@ function column_suppress($column) {
      * @param string $classname
      * @return void
      */
-    function column_class($column, $classname) {
+    public function column_class($column, $classname) {
         if (isset($this->column_class[$column])) {
-            $this->column_class[$column] = ' '.$classname; // This space needed so that classnames don't run together in the HTML
+            $this->column_class[$column] = ' ' . $classname; // This space needed so that classnames don't run together in the HTML.
         }
     }
 
@@ -420,7 +421,7 @@ function column_class($column, $classname) {
      * @param mixed $value
      * @return void
      */
-    function column_style($column, $property, $value) {
+    public function column_style($column, $property, $value) {
         if (isset($this->column_style[$column])) {
             $this->column_style[$column][$property] = $value;
         }
@@ -453,7 +454,7 @@ public function set_columnsattributes(array $attributes): void {
      * @param string $value
      * @return void
      */
-    function column_style_all($property, $value) {
+    public function column_style_all($property, $value) {
         foreach (array_keys($this->columns) as $column) {
             $this->column_style[$column][$property] = $value;
         }
@@ -463,25 +464,27 @@ function column_style_all($property, $value) {
      * Sets $this->baseurl.
      * @param moodle_url|string $url the url with params needed to call up this page
      */
-    function define_baseurl($url) {
+    public function define_baseurl($url) {
         $this->baseurl = new moodle_url($url);
     }
 
     /**
+     * Define the columns for the table.
+     *
      * @param array $columns an array of identifying names for columns. If
      * columns are sorted then column names must correspond to a field in sql.
      */
-    function define_columns($columns) {
-        $this->columns = array();
-        $this->column_style = array();
-        $this->column_class = array();
+    public function define_columns($columns) {
+        $this->columns = [];
+        $this->column_style = [];
+        $this->column_class = [];
         $this->columnsticky = [];
         $this->columnsattributes = [];
         $colnum = 0;
 
         foreach ($columns as $column) {
             $this->columns[$column]         = $colnum++;
-            $this->column_style[$column]    = array();
+            $this->column_style[$column]    = [];
             $this->column_class[$column]    = '';
             $this->columnsticky[$column]    = '';
             $this->columnsattributes[$column] = [];
@@ -490,10 +493,12 @@ function define_columns($columns) {
     }
 
     /**
+     * Define the headers for the table, replacing any existing header configuration.
+     *
      * @param array $headers numerical keyed array of displayed string titles
      * for each column.
      */
-    function define_headers($headers) {
+    public function define_headers($headers) {
         $this->headers = $headers;
     }
 
@@ -537,14 +542,13 @@ protected function is_resetting_preferences(): bool {
         }
 
         return $this->resetting;
-}
+    }
 
     /**
      * Must be called after table is defined. Use methods above first. Cannot
      * use functions below till after calling this method.
      */
-    function setup() {
-
+    public function setup() {
         if (empty($this->columns) || empty($this->uniqueid)) {
             return false;
         }
@@ -563,7 +567,7 @@ function setup() {
 
         $this->setup = true;
 
-        // Always introduce the "flexible" class for the table if not specified
+        // Always introduce the "flexible" class for the table if not specified.
         if (empty($this->attributes)) {
             $this->attributes['class'] = 'flexible table table-striped table-hover';
         } else if (!isset($this->attributes['class'])) {
@@ -590,7 +594,7 @@ public static function get_sort_for_table($uniqueid) {
             return '';
         }
         if (empty($prefs['textsort'])) {
-            $prefs['textsort'] = array();
+            $prefs['textsort'] = [];
         }
 
         return self::construct_order_by($prefs['sortby'], $prefs['textsort']);
@@ -598,12 +602,13 @@ public static function get_sort_for_table($uniqueid) {
 
     /**
      * Prepare an an order by clause from the list of columns to be sorted.
+     *
      * @param array $cols column name => SORT_ASC or SORT_DESC
      * @return string SQL fragment that can be used in an ORDER BY clause.
      */
-    public static function construct_order_by($cols, $textsortcols=array()) {
+    public static function construct_order_by($cols, $textsortcols = []) {
         global $DB;
-        $bits = array();
+        $bits = [];
 
         foreach ($cols as $column => $order) {
             if (in_array($column, $textsortcols)) {
@@ -620,6 +625,8 @@ public static function construct_order_by($cols, $textsortcols=array()) {
     }
 
     /**
+     * Get the SQL Sort clause for the table.
+     *
      * @return string SQL fragment that can be used in an ORDER BY clause.
      */
     public function get_sql_sort() {
@@ -638,7 +645,7 @@ private function contains_fullname_columns(): bool {
     }
 
     /**
-     * Get the columns to sort by, in the form required by {@link construct_order_by()}.
+     * Get the columns to sort by, in the form required by {@see construct_order_by()}.
      * @return array column name => SORT_... constant.
      */
     public function get_sort_columns() {
@@ -647,7 +654,7 @@ public function get_sort_columns() {
         }
 
         if (empty($this->prefs['sortby'])) {
-            return array();
+            return [];
         }
         foreach ($this->prefs['sortby'] as $column => $notused) {
             if (isset($this->columns[$column])) {
@@ -664,9 +671,11 @@ public function get_sort_columns() {
     }
 
     /**
+     * Get the starting row number for this page.
+     *
      * @return int the offset for LIMIT clause of SQL
      */
-    function get_page_start() {
+    public function get_page_start() {
         if (!$this->use_pages) {
             return '';
         }
@@ -676,7 +685,7 @@ function get_page_start() {
     /**
      * @return int the pagesize for LIMIT clause of SQL
      */
-    function get_page_size() {
+    public function get_page_size() {
         if (!$this->use_pages) {
             return '';
         }
@@ -686,27 +695,27 @@ function get_page_size() {
     /**
      * @return array sql to add to where statement.
      */
-    function get_sql_where() {
+    public function get_sql_where() {
         global $DB;
 
-        $conditions = array();
-        $params = array();
+        $conditions = [];
+        $params = [];
 
         if ($this->contains_fullname_columns()) {
             static $i = 0;
             $i++;
 
             if (!empty($this->prefs['i_first'])) {
-                $conditions[] = $DB->sql_like('firstname', ':ifirstc'.$i, false, false);
-                $params['ifirstc'.$i] = $this->prefs['i_first'].'%';
+                $conditions[] = $DB->sql_like('firstname', ':ifirstc' . $i, false, false);
+                $params['ifirstc' . $i] = $this->prefs['i_first'] . '%';
             }
             if (!empty($this->prefs['i_last'])) {
-                $conditions[] = $DB->sql_like('lastname', ':ilastc'.$i, false, false);
-                $params['ilastc'.$i] = $this->prefs['i_last'].'%';
+                $conditions[] = $DB->sql_like('lastname', ':ilastc' . $i, false, false);
+                $params['ilastc' . $i] = $this->prefs['i_last'] . '%';
             }
         }
 
-        return array(implode(" AND ", $conditions), $params);
+        return [implode(" AND ", $conditions), $params];
     }
 
     /**
@@ -723,7 +732,7 @@ function get_sql_where() {
      *                                      as defined in call to define_columns.
      * @param string $classname CSS class name to add to this row's tr tag.
      */
-    function add_data_keyed($rowwithkeys, $classname = '') {
+    public function add_data_keyed($rowwithkeys, $classname = '') {
         $this->add_data($this->get_row_from_keyed($rowwithkeys), $classname);
     }
 
@@ -751,11 +760,11 @@ public function format_and_add_array_of_rows($rowstoadd, $finish = true) {
     /**
      * Add a seperator line to table.
      */
-    function add_separator() {
+    public function add_separator() {
         if (!$this->setup) {
             return false;
         }
-        $this->add_data(NULL);
+        $this->add_data(null);
     }
 
     /**
@@ -769,14 +778,14 @@ function add_separator() {
      * @param string $classname CSS class name to add to this row's tr tag.
      * @return bool success.
      */
-    function add_data($row, $classname = '') {
+    public function add_data($row, $classname = '') {
         if (!$this->setup) {
             return false;
         }
         if (!$this->started_output) {
             $this->start_output();
         }
-        if ($this->exportclass!==null) {
+        if ($this->exportclass !== null) {
             if ($row === null) {
                 $this->exportclass->add_seperator();
             } else {
@@ -793,8 +802,8 @@ function add_data($row, $classname = '') {
      * data to the table with add_data or add_data_keyed.
      *
      */
-    function finish_output($closeexportclassdoc = true) {
-        if ($this->exportclass!==null) {
+    public function finish_output($closeexportclassdoc = true) {
+        if ($this->exportclass !== null) {
             $this->exportclass->finish_table();
             if ($closeexportclassdoc) {
                 $this->exportclass->finish_document();
@@ -809,7 +818,7 @@ function finish_output($closeexportclassdoc = true) {
      * for example. Called only when there is data to display and not
      * downloading.
      */
-    function wrap_html_start() {
+    public function wrap_html_start() {
     }
 
     /**
@@ -817,7 +826,7 @@ function wrap_html_start() {
      * for example. Called only when there is data to display and not
      * downloading.
      */
-    function wrap_html_finish() {
+    public function wrap_html_finish() {
     }
 
     /**
@@ -830,18 +839,18 @@ function wrap_html_finish() {
      * @param array|object $row row of data from db used to make one row of the table.
      * @return array one row for the table, added using add_data_keyed method.
      */
-    function format_row($row) {
+    public function format_row($row) {
         if (is_array($row)) {
             $row = (object)$row;
         }
-        $formattedrow = array();
+        $formattedrow = [];
         foreach (array_keys($this->columns) as $column) {
-            $colmethodname = 'col_'.$column;
+            $colmethodname = 'col_' . $column;
             if (method_exists($this, $colmethodname)) {
                 $formattedcolumn = $this->$colmethodname($row);
             } else {
                 $formattedcolumn = $this->other_cols($column, $row);
-                if ($formattedcolumn===NULL) {
+                if ($formattedcolumn === null) {
                     $formattedcolumn = $row->$column;
                 }
             }
@@ -862,7 +871,7 @@ function format_row($row) {
      *                    current language.
      * @return string contents of cell in column 'fullname', for this row.
      */
-    function col_fullname($row) {
+    public function col_fullname($row) {
         global $COURSE;
 
         $name = fullname($row, has_capability('moodle/site:viewfullnames', $this->get_context()));
@@ -872,10 +881,12 @@ function col_fullname($row) {
 
         $userid = $row->{$this->useridfield};
         if ($COURSE->id == SITEID) {
-            $profileurl = new moodle_url('/user/profile.php', array('id' => $userid));
+            $profileurl = new moodle_url('/user/profile.php', ['id' => $userid]);
         } else {
-            $profileurl = new moodle_url('/user/view.php',
-                    array('id' => $userid, 'course' => $COURSE->id));
+            $profileurl = new moodle_url(
+                '/user/view.php',
+                ['id' => $userid, 'course' => $COURSE->id]
+            );
         }
         return html_writer::link($profileurl, $name);
     }
@@ -884,14 +895,16 @@ function col_fullname($row) {
      * You can override this method in a child class. See the description of
      * build_table which calls this method.
      */
-    function other_cols($column, $row) {
-        if (isset($row->$column) && ($column === 'email' || $column === 'idnumber') &&
-                (!$this->is_downloading() || $this->export_class_instance()->supports_html())) {
+    public function other_cols($column, $row) {
+        if (
+            isset($row->$column) && ($column === 'email' || $column === 'idnumber') &&
+                (!$this->is_downloading() || $this->export_class_instance()->supports_html())
+        ) {
             // Columns email and idnumber may potentially contain malicious characters, escape them by default.
             // This function will not be executed if the child class implements col_email() or col_idnumber().
             return s($row->$column);
         }
-        return NULL;
+        return null;
     }
 
     /**
@@ -901,12 +914,12 @@ function other_cols($column, $row) {
      * are the same as format_text function in weblib.php but some default
      * options are changed.
      */
-    function format_text($text, $format=FORMAT_MOODLE, $options=NULL, $courseid=NULL) {
+    public function format_text($text, $format = FORMAT_MOODLE, $options = null, $courseid = null) {
         if (!$this->is_downloading()) {
             if (is_null($options)) {
-                $options = new stdClass;
+                $options = new stdClass();
             }
-            //some sensible defaults
+            // Some sensible defaults.
             if (!isset($options->para)) {
                 $options->para = false;
             }
@@ -926,7 +939,7 @@ function format_text($text, $format=FORMAT_MOODLE, $options=NULL, $courseid=NULL
      * This method is deprecated although the old api is still supported.
      * @deprecated 1.9.2 - Jun 2, 2008
      */
-    function print_html() {
+    public function print_html() {
         if (!$this->setup) {
             return false;
         }
@@ -937,9 +950,9 @@ function print_html() {
      * This function is not part of the public api.
      * @return string initial of first name we are currently filtering by
      */
-    function get_initial_first() {
+    public function get_initial_first() {
         if (!$this->use_initials) {
-            return NULL;
+            return null;
         }
 
         return $this->prefs['i_first'];
@@ -949,16 +962,16 @@ function get_initial_first() {
      * This function is not part of the public api.
      * @return string initial of last name we are currently filtering by
      */
-    function get_initial_last() {
+    public function get_initial_last() {
         if (!$this->use_initials) {
-            return NULL;
+            return null;
         }
 
         return $this->prefs['i_last'];
     }
 
     /**
-     * Helper function, used by {@link print_initials_bar()} to output one initial bar.
+     * Helper function, used by {@see print_initials_bar()} to output one initial bar.
      * @param array $alpha of letters in the alphabet.
      * @param string $current the currently selected letter.
      * @param string $class class name to add to this initial bar.
@@ -972,10 +985,10 @@ protected function print_one_initials_bar($alpha, $current, $class, $title, $url
         debugging('Method print_one_initials_bar() is no longer used and has been deprecated, ' .
             'to print initials bar call print_initials_bar()', DEBUG_DEVELOPER);
 
-        echo html_writer::start_tag('div', array('class' => 'initialbar ' . $class)) .
+        echo html_writer::start_tag('div', ['class' => 'initialbar ' . $class]) .
             $title . ' : ';
         if ($current) {
-            echo html_writer::link($this->baseurl->out(false, array($urlvar => '')), get_string('all'));
+            echo html_writer::link($this->baseurl->out(false, [$urlvar => '']), get_string('all'));
         } else {
             echo html_writer::tag('strong', get_string('all'));
         }
@@ -984,7 +997,7 @@ protected function print_one_initials_bar($alpha, $current, $class, $title, $url
             if ($letter === $current) {
                 echo html_writer::tag('strong', $letter);
             } else {
-                echo html_writer::link($this->baseurl->out(false, array($urlvar => $letter)), $letter);
+                echo html_writer::link($this->baseurl->out(false, [$urlvar => $letter]), $letter);
             }
         }
 
@@ -994,7 +1007,7 @@ protected function print_one_initials_bar($alpha, $current, $class, $title, $url
     /**
      * This function is not part of the public api.
      */
-    function print_initials_bar() {
+    public function print_initials_bar() {
         global $OUTPUT;
 
         $ifirst = $this->get_initial_first();
@@ -1012,13 +1025,12 @@ function print_initials_bar() {
             echo $OUTPUT->initials_bar($ifirst, 'firstinitial', get_string('firstname'), $prefixfirst, $this->baseurl);
             echo $OUTPUT->initials_bar($ilast, 'lastinitial', get_string('lastname'), $prefixlast, $this->baseurl);
         }
-
     }
 
     /**
      * This function is not part of the public api.
      */
-    function print_nothing_to_display() {
+    public function print_nothing_to_display() {
         global $OUTPUT;
 
         // Render the dynamic table header.
@@ -1038,16 +1050,16 @@ function print_nothing_to_display() {
     /**
      * This function is not part of the public api.
      */
-    function get_row_from_keyed($rowwithkeys) {
+    public function get_row_from_keyed($rowwithkeys) {
         if (is_object($rowwithkeys)) {
             $rowwithkeys = (array)$rowwithkeys;
         }
-        $row = array();
+        $row = [];
         foreach (array_keys($this->columns) as $column) {
             if (isset($rowwithkeys[$column])) {
-                $row [] = $rowwithkeys[$column];
+                $row[] = $rowwithkeys[$column];
             } else {
-                $row[] ='';
+                $row[] = '';
             }
         }
         return $row;
@@ -1062,8 +1074,12 @@ public function download_buttons() {
         global $OUTPUT;
 
         if ($this->is_downloadable() && !$this->is_downloading()) {
-            return $OUTPUT->download_dataformat_selector(get_string('downloadas', 'table'),
-                    $this->baseurl->out_omit_querystring(), 'download', $this->baseurl->params());
+            return $OUTPUT->download_dataformat_selector(
+                get_string('downloadas', 'table'),
+                $this->baseurl->out_omit_querystring(),
+                'download',
+                $this->baseurl->params()
+            );
         } else {
             return '';
         }
@@ -1075,9 +1091,9 @@ public function download_buttons() {
      * needed when you start adding data to the table.
      *
      */
-    function start_output() {
+    public function start_output() {
         $this->started_output = true;
-        if ($this->exportclass!==null) {
+        if ($this->exportclass !== null) {
             $this->exportclass->start_table($this->sheettitle);
             $this->exportclass->output_headers($this->headers);
         } else {
@@ -1090,7 +1106,7 @@ function start_output() {
     /**
      * This function is not part of the public api.
      */
-    function print_row($row, $classname = '') {
+    public function print_row($row, $classname = '') {
         echo $this->get_row_html($row, $classname);
     }
 
@@ -1103,8 +1119,8 @@ function print_row($row, $classname = '') {
      * @return string $html html code for the row passed.
      */
     public function get_row_html($row, $classname = '') {
-        static $suppress_lastrow = NULL;
-        $rowclasses = array();
+        static $suppresslastrow = null;
+        $rowclasses = [];
 
         if ($classname) {
             $rowclasses[] = $classname;
@@ -1113,23 +1129,25 @@ public function get_row_html($row, $classname = '') {
         $rowid = $this->uniqueid . '_r' . $this->currentrow;
         $html = '';
 
-        $html .= html_writer::start_tag('tr', array('class' => implode(' ', $rowclasses), 'id' => $rowid));
+        $html .= html_writer::start_tag('tr', ['class' => implode(' ', $rowclasses), 'id' => $rowid]);
 
-        // If we have a separator, print it
-        if ($row === NULL) {
+        // If we have a separator, print it.
+        if ($row === null) {
             $colcount = count($this->columns);
-            $html .= html_writer::tag('td', html_writer::tag('div', '',
-                    array('class' => 'tabledivider')), array('colspan' => $colcount));
-
+            $html .= html_writer::tag('td', html_writer::tag(
+                'div',
+                '',
+                ['class' => 'tabledivider']
+            ), ['colspan' => $colcount]);
         } else {
-            $html .= $this->get_row_cells_html($rowid, $row, $suppress_lastrow);
+            $html .= $this->get_row_cells_html($rowid, $row, $suppresslastrow);
         }
 
         $html .= html_writer::end_tag('tr');
 
-        $suppress_enabled = array_sum($this->column_suppress);
-        if ($suppress_enabled) {
-            $suppress_lastrow = $row;
+        $suppressenabled = array_sum($this->column_suppress);
+        if ($suppressenabled) {
+            $suppresslastrow = $row;
         }
         $this->currentrow++;
         return $html;
@@ -1187,13 +1205,12 @@ public function get_row_cells_html(string $rowid, array $row, ?array $suppressla
     /**
      * This function is not part of the public api.
      */
-    function finish_html() {
+    public function finish_html() {
         global $OUTPUT, $PAGE;
 
         if (!$this->started_output) {
-            //no data has been added to the table.
+            // No data has been added to the table.
             $this->print_nothing_to_display();
-
         } else {
             // Print empty rows to fill the table to the current pagesize.
             // This is done so the header aria-controls attributes do not point to
@@ -1208,12 +1225,12 @@ function finish_html() {
             echo html_writer::end_tag('div');
             $this->wrap_html_finish();
 
-            // Paging bar
-            if(in_array(TABLE_P_BOTTOM, $this->showdownloadbuttonsat)) {
+            // Paging bar.
+            if (in_array(TABLE_P_BOTTOM, $this->showdownloadbuttonsat)) {
                 echo $this->download_buttons();
             }
 
-            if($this->use_pages) {
+            if ($this->use_pages) {
                 $pagingbar = new paging_bar($this->totalrows, $this->currpage, $this->pagesize, $this->baseurl);
                 $pagingbar->pagevar = $this->request[TABLE_VAR_PAGE];
                 echo $OUTPUT->render($pagingbar);
@@ -1226,7 +1243,7 @@ function finish_html() {
 
     /**
      * Generate the HTML for the collapse/uncollapse icon. This is a helper method
-     * used by {@link print_headers()}.
+     * used by {@see print_headers()}.
      * @param string $column the column name, index into various names.
      * @param int $index numerical index of the column.
      * @return string HTML fragment.
@@ -1252,10 +1269,12 @@ protected function show_hide_link($column, $index) {
                 'data-column' => $column,
                 'role' => 'button',
             ];
-            return html_writer::link($this->baseurl->out(false, array($this->request[TABLE_VAR_SHOW] => $column)),
-                    $OUTPUT->pix_icon('t/switch_plus', null), $linkattributes);
-
-        } else if ($this->headers[$index] !== NULL) {
+            return html_writer::link(
+                $this->baseurl->out(false, [$this->request[TABLE_VAR_SHOW] => $column]),
+                $OUTPUT->pix_icon('t/switch_plus', null),
+                $linkattributes
+            );
+        } else if ($this->headers[$index] !== null) {
             $linkattributes = [
                 'title' => get_string('hide') . ' ' . strip_tags($this->headers[$index]),
                 'aria-expanded' => 'true',
@@ -1264,15 +1283,18 @@ protected function show_hide_link($column, $index) {
                 'data-column' => $column,
                 'role' => 'button',
             ];
-            return html_writer::link($this->baseurl->out(false, array($this->request[TABLE_VAR_HIDE] => $column)),
-                    $OUTPUT->pix_icon('t/switch_minus', null), $linkattributes);
+            return html_writer::link(
+                $this->baseurl->out(false, [$this->request[TABLE_VAR_HIDE] => $column]),
+                $OUTPUT->pix_icon('t/switch_minus', null),
+                $linkattributes
+            );
         }
     }
 
     /**
      * This function is not part of the public api.
      */
-    function print_headers() {
+    public function print_headers() {
         global $CFG, $OUTPUT;
 
         // Set the primary sort column/order where possible, so that sort links/icons are correct.
@@ -1284,19 +1306,16 @@ function print_headers() {
         echo html_writer::start_tag('thead');
         echo html_writer::start_tag('tr');
         foreach ($this->columns as $column => $index) {
-
-            $icon_hide = '';
+            $iconhide = '';
             if ($this->is_collapsible) {
-                $icon_hide = $this->show_hide_link($column, $index);
+                $iconhide = $this->show_hide_link($column, $index);
             }
             switch ($column) {
-
                 case 'userpic':
-                    // do nothing, do not display sortable links
+                    // Do nothing, do not display sortable links.
                     break;
 
                 default:
-
                     if (array_search($column, $this->userfullnamecolumns) !== false) {
                         // Check the full name display for sortable fields.
                         if (has_capability('moodle/site:viewfullnames', $this->get_context())) {
@@ -1316,8 +1335,12 @@ function print_headers() {
                                 // Done this way for the possibility of more than two sortable full name display fields.
                                 $this->headers[$index] = '';
                                 foreach ($requirednames as $name) {
-                                    $sortname = $this->sort_link(get_string($name),
-                                        $name, $primarysortcolumn === $name, $primarysortorder);
+                                    $sortname = $this->sort_link(
+                                        get_string($name),
+                                        $name,
+                                        $primarysortcolumn === $name,
+                                        $primarysortorder
+                                    );
                                     $this->headers[$index] .= $sortname . ' / ';
                                 }
                                 $helpicon = '';
@@ -1332,19 +1355,23 @@ function print_headers() {
                         if (isset($this->helpforheaders[$index])) {
                             $helpicon = $OUTPUT->render($this->helpforheaders[$index]);
                         }
-                        $this->headers[$index] = $this->sort_link($this->headers[$index],
-                                $column, $primarysortcolumn == $column, $primarysortorder) . $helpicon;
+                        $this->headers[$index] = $this->sort_link(
+                            $this->headers[$index],
+                            $column,
+                            $primarysortcolumn == $column,
+                            $primarysortorder
+                        ) . $helpicon;
                     }
             }
 
-            $attributes = array(
+            $attributes = [
                 'class' => 'header c' . $index . $this->column_class[$column] . $this->columnsticky[$column],
                 'scope' => 'col',
-            );
-            if ($this->headers[$index] === NULL) {
+            ];
+            if ($this->headers[$index] === null) {
                 $content = '&nbsp;';
             } else if (!empty($this->prefs['collapse'][$column])) {
-                $content = $icon_hide;
+                $content = $iconhide;
             } else {
                 if (is_array($this->column_style[$column])) {
                     $attributes['style'] = $this->make_styles_string($this->column_style[$column]);
@@ -1353,8 +1380,11 @@ function print_headers() {
                 if (isset($this->helpforheaders[$index]) && !$this->is_sortable($column)) {
                     $helpicon  = $OUTPUT->render($this->helpforheaders[$index]);
                 }
-                $content = $this->headers[$index] . $helpicon . html_writer::tag('div',
-                        $icon_hide, array('class' => 'commands'));
+                $content = $this->headers[$index] . $helpicon . html_writer::tag(
+                    'div',
+                    $iconhide,
+                    ['class' => 'commands']
+                );
             }
             echo html_writer::tag('th', $content, $attributes);
         }
@@ -1383,7 +1413,7 @@ protected function set_sorting_preferences(): void {
         }
 
         $usernamefields = \core_user\fields::get_name_fields();
-        $sortdata = array_filter($sortdata, function($sortby) use ($usernamefields) {
+        $sortdata = array_filter($sortdata, function ($sortby) use ($usernamefields) {
             $isvalidsort = $sortby && $this->is_sortable($sortby);
             $isvalidsort = $isvalidsort && empty($this->prefs['collapse'][$sortby]);
             $isrealcolumn = isset($this->columns[$sortby]);
@@ -1427,7 +1457,6 @@ protected function set_initials_preferences(): void {
         if (!is_null($ilast) && ($ilast === '' || strpos(get_string('alphabet', 'langconfig'), $ilast) !== false)) {
             $this->prefs['i_last'] = $ilast;
         }
-
     }
 
     /**
@@ -1436,7 +1465,7 @@ protected function set_initials_preferences(): void {
     protected function set_hide_show_preferences(): void {
 
         if ($this->hiddencolumns !== null) {
-            $this->prefs['collapse'] = array_fill_keys(array_filter($this->hiddencolumns, function($column) {
+            $this->prefs['collapse'] = array_fill_keys(array_filter($this->hiddencolumns, function ($column) {
                 return array_key_exists($column, $this->columns);
             }), true);
         } else {
@@ -1504,11 +1533,15 @@ protected function initialise_table_preferences(): void {
             $this->ilast = null;
         }
 
-        if (($showcol = optional_param($this->request[TABLE_VAR_SHOW], '', PARAM_ALPHANUMEXT)) &&
-            isset($this->columns[$showcol])) {
+        if (
+            ($showcol = optional_param($this->request[TABLE_VAR_SHOW], '', PARAM_ALPHANUMEXT)) &&
+            isset($this->columns[$showcol])
+        ) {
             $this->prefs['collapse'][$showcol] = false;
-        } else if (($hidecol = optional_param($this->request[TABLE_VAR_HIDE], '', PARAM_ALPHANUMEXT)) &&
-            isset($this->columns[$hidecol])) {
+        } else if (
+            ($hidecol = optional_param($this->request[TABLE_VAR_HIDE], '', PARAM_ALPHANUMEXT)) &&
+            isset($this->columns[$hidecol])
+        ) {
             $this->prefs['collapse'][$hidecol] = true;
             if (array_key_exists($hidecol, $this->prefs['sortby'])) {
                 unset($this->prefs['sortby'][$hidecol]);
@@ -1620,7 +1653,7 @@ public function set_page_number(int $pagenumber): void {
     }
 
     /**
-     * Generate the HTML for the sort icon. This is a helper method used by {@link sort_link()}.
+     * Generate the HTML for the sort icon. This is a helper method used by {@see sort_link()}.
      * @param bool $isprimary whether an icon is needed (it is only needed for the primary sort column.)
      * @param int $order SORT_ASC or SORT_DESC
      * @return string HTML fragment.
@@ -1641,7 +1674,7 @@ protected function sort_icon($isprimary, $order) {
 
     /**
      * Generate the correct tool tip for changing the sort order. This is a
-     * helper method used by {@link sort_link()}.
+     * helper method used by {@see sort_link()}.
      * @param bool $isprimary whether the is column is the current primary sort column.
      * @param int $order SORT_ASC or SORT_DESC
      * @return string the correct title.
@@ -1655,7 +1688,7 @@ protected function sort_order_name($isprimary, $order) {
     }
 
     /**
-     * Generate the HTML for the sort link. This is a helper method used by {@link print_headers()}.
+     * Generate the HTML for the sort link. This is a helper method used by {@see print_headers()}.
      * @param string $text the text for the link.
      * @param string $column the column name, may be a fake column like 'firstname' or a real one.
      * @param bool $isprimary whether the is column is the current primary sort column.
@@ -1675,15 +1708,17 @@ protected function sort_link($text, $column, $isprimary, $order) {
             $this->request[TABLE_VAR_DIR] => $sortorder,
         ];
 
-        return html_writer::link($this->baseurl->out(false, $params),
-                $text . get_accesshide(get_string('sortby') . ' ' .
+        return html_writer::link(
+            $this->baseurl->out(false, $params),
+            $text . get_accesshide(get_string('sortby') . ' ' .
                 $text . ' ' . $this->sort_order_name($isprimary, $order)),
-                [
+            [
                     'data-sortable' => $this->is_sortable($column),
                     'data-sortby' => $column,
                     'data-sortorder' => $sortorder,
                     'role' => 'button',
-                ]) . ' ' . $this->sort_icon($isprimary, $order);
+            ]
+        ) . ' ' . $this->sort_icon($isprimary, $order);
     }
 
     /**
@@ -1745,12 +1780,13 @@ protected function get_handler() {
      */
     protected function get_dynamic_table_html_start(): string {
         if (is_a($this, dynamic::class)) {
-            $sortdata = array_map(function($sortby, $sortorder) {
+            $sortdata = array_map(function ($sortby, $sortorder) {
                 return [
                     'sortby' => $sortby,
                     'sortorder' => $sortorder,
                 ];
-            }, array_keys($this->prefs['sortby']), array_values($this->prefs['sortby']));;
+            }, array_keys($this->prefs['sortby']), array_values($this->prefs['sortby']));
+            ;
 
             return html_writer::start_tag('div', [
                 'class' => 'table-dynamic position-relative',
@@ -1818,7 +1854,7 @@ protected function get_dynamic_table_html_end(): string {
     /**
      * This function is not part of the public api.
      */
-    function start_html() {
+    public function start_html() {
         global $OUTPUT;
 
         // Render the dynamic table header.
@@ -1830,7 +1866,7 @@ function start_html() {
         // Do we need to print initial bars?
         $this->print_initials_bar();
 
-        // Paging bar
+        // Paging bar.
         if ($this->use_pages) {
             $pagingbar = new paging_bar($this->totalrows, $this->currpage, $this->pagesize, $this->baseurl);
             $pagingbar->pagevar = $this->request[TABLE_VAR_PAGE];
@@ -1842,9 +1878,9 @@ function start_html() {
         }
 
         $this->wrap_html_start();
-        // Start of main data table
+        // Start of main data table.
 
-        echo html_writer::start_tag('div', array('class' => 'no-overflow'));
+        echo html_writer::start_tag('div', ['class' => 'no-overflow']);
         echo html_writer::start_tag('table', $this->attributes) . $this->render_caption();
     }
 
@@ -1881,13 +1917,13 @@ public function render_caption(): string {
      * @param array $styles CSS-property => value
      * @return string values suitably to go in a style="" attribute in HTML.
      */
-    function make_styles_string($styles) {
+    public function make_styles_string($styles) {
         if (empty($styles)) {
             return null;
         }
 
         $string = '';
-        foreach($styles as $property => $value) {
+        foreach ($styles as $property => $value) {
             $string .= $property . ':' . $value . ';';
         }
         return $string;
@@ -1904,7 +1940,7 @@ protected function render_reset_button() {
             return '';
         }
 
-        $url = $this->baseurl->out(false, array($this->request[TABLE_VAR_RESET] => 1));
+        $url = $this->baseurl->out(false, [$this->request[TABLE_VAR_RESET] => 1]);
 
         $html  = html_writer::start_div('resettable mdl-right');
         $html .= html_writer::link($url, get_string('resettable'), ['role' => 'button']);
@@ -1923,20 +1959,18 @@ protected function render_reset_button() {
     protected function can_be_reset() {
         // Loop through preferences and make sure they are empty or set to the default value.
         foreach ($this->prefs as $prefname => $prefval) {
-            if ($prefname === 'sortby' and !empty($this->sort_default_column)) {
+            if ($prefname === 'sortby' && !empty($this->sort_default_column)) {
                 // Check if the actual sorting differs from the default one.
-                if (empty($prefval) or $prefval !== array($this->sort_default_column => $this->sort_default_order)) {
+                if (empty($prefval) || ($prefval !== [$this->sort_default_column => $this->sort_default_order])) {
                     return true;
                 }
-
-            } else if ($prefname === 'collapse' and !empty($prefval)) {
+            } else if ($prefname === 'collapse' && !empty($prefval)) {
                 // Check if there are some collapsed columns (all are expanded by default).
                 foreach ($prefval as $columnname => $iscollapsed) {
                     if ($iscollapsed) {
                         return true;
                     }
                 }
-
             } else if (!empty($prefval)) {
                 // For all other cases, we just check if some preference is set.
                 return true;
diff --git a/lib/table/classes/output/html_table.php b/lib/table/classes/output/html_table.php
index c04ef01bc7e8b..8ec95880ca0aa 100644
--- a/lib/table/classes/output/html_table.php
+++ b/lib/table/classes/output/html_table.php
@@ -17,7 +17,7 @@
 namespace core_table\output;
 
 /**
- * Holds all the information required to render a <table> by {@link core_renderer::table()}
+ * Holds all the information required to render a <table> by {@see core_renderer::table()}
  *
  * Example of usage:
  * $t = new html_table();
@@ -27,11 +27,10 @@
  * @copyright 2009 David Mudrak <david.mudrak@gmail.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since Moodle 2.0
- * @package core
+ * @package core_table
  * @category output
  */
 class html_table {
-
     /**
      * @var string Value to use for the id attribute of the table
      */
@@ -40,7 +39,7 @@ class html_table {
     /**
      * @var array Attributes of HTML attributes for the <table> element
      */
-    public $attributes = array();
+    public $attributes = [];
 
     /**
      * @var array An array of headings. The n-th array item is used as a heading of the n-th column.
@@ -54,8 +53,8 @@ class html_table {
 
     /**
      * @var array An array that can be used to make a heading span multiple columns.
-     * In this example, {@link html_table:$data} is supposed to have three columns. For the first two columns,
-     * the same heading is used. Therefore, {@link html_table::$head} should consist of two items.
+     * In this example, {@see html_table:$data} is supposed to have three columns. For the first two columns,
+     * the same heading is used. Therefore, {@see html_table::$head} should consist of two items.
      *
      * Example of usage:
      * $t->headspan = array(2,1);
@@ -122,20 +121,20 @@ class html_table {
     public $data = [];
 
     /**
-     * @deprecated since Moodle 2.0. Styling should be in the CSS.
      * @var string Width of the table, percentage of the page preferred.
+     * @deprecated since Moodle 2.0. Styling should be in the CSS.
      */
     public $width = null;
 
     /**
-     * @deprecated since Moodle 2.0. Styling should be in the CSS.
      * @var string Alignment for the whole table. Can be 'right', 'left' or 'center' (default).
+     * @deprecated since Moodle 2.0. Styling should be in the CSS.
      */
     public $tablealign = null;
 
     /**
-     * @deprecated since Moodle 2.0. Styling should be in the CSS.
      * @var int Padding on each cell, in pixels
+     * @deprecated since Moodle 2.0. Styling should be in the CSS.
      */
     public $cellpadding = null;
 
diff --git a/lib/table/classes/output/html_table_cell.php b/lib/table/classes/output/html_table_cell.php
index 038fb27ad5083..7f44cd96a524a 100644
--- a/lib/table/classes/output/html_table_cell.php
+++ b/lib/table/classes/output/html_table_cell.php
@@ -22,7 +22,7 @@
  * @copyright 2009 Nicolas Connault
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since Moodle 2.0
- * @package core
+ * @package core_table
  * @category output
  */
 class html_table_cell {
@@ -69,7 +69,7 @@ class html_table_cell {
     /**
      * @var array Attributes of additional HTML attributes for the <td> element
      */
-    public $attributes = array();
+    public $attributes = [];
 
     /**
      * Constructs a table cell
diff --git a/lib/table/classes/output/html_table_row.php b/lib/table/classes/output/html_table_row.php
index 6b92c0a5486ec..b70a7dcd400e9 100644
--- a/lib/table/classes/output/html_table_row.php
+++ b/lib/table/classes/output/html_table_row.php
@@ -22,7 +22,7 @@
  * @copyright 2009 Nicolas Connault
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since Moodle 2.0
- * @package core
+ * @package core_table
  * @category output
  */
 class html_table_row {
@@ -34,7 +34,7 @@ class html_table_row {
     /**
      * @var array Array of html_table_cell objects
      */
-    public $cells = array();
+    public $cells = [];
 
     /**
      * @var string Value to use for the style attribute of the table row
@@ -44,13 +44,14 @@ class html_table_row {
     /**
      * @var array Attributes of additional HTML attributes for the <tr> element
      */
-    public $attributes = array();
+    public $attributes = [];
 
     /**
      * Constructor
-     * @param array $cells
+     *
+     * @param null|array $cells
      */
-    public function __construct(array $cells=null) {
+    public function __construct(?array $cells = null) {
         $this->attributes['class'] = '';
         $cells = (array)$cells;
         foreach ($cells as $cell) {
diff --git a/lib/table/classes/sql_table.php b/lib/table/classes/sql_table.php
index 00e26153535db..815e81aef1fce 100644
--- a/lib/table/classes/sql_table.php
+++ b/lib/table/classes/sql_table.php
@@ -29,38 +29,39 @@
 /**
  * A table whose data is provided by SQL queries.
  *
- * @package   moodlecore
+ * @package   core_table
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class sql_table extends flexible_table {
-    public $countsql = NULL;
-    public $countparams = NULL;
-    /**
-     * @var object sql for querying db. Has fields 'fields', 'from', 'where', 'params'.
-     */
-    public $sql = NULL;
-    /**
-     * @var array|\Traversable Data fetched from the db.
-     */
-    public $rawdata = NULL;
+    /** @var string The SQL query to count records */
+    public $countsql = null;
 
-    /**
-     * @var bool Overriding default for this.
-     */
-    public $is_sortable    = true;
-    /**
-     * @var bool Overriding default for this.
-     */
-    public $is_collapsible = true;
+    /** @var array The parameters for the Count SQL */
+    public $countparams = null;
+
+    /** @var object sql for querying db. Has fields 'fields', 'from', 'where', 'params' */
+    public $sql = null;
+
+    /** @var array|\Traversable Data fetched from the db */
+    public $rawdata = null;
+
+    /** @var bool Overriding default for this */
+
+    public $is_sortable = true; // phpcs:ignore moodle.NamingConventions.ValidVariableName.MemberNameUnderscore
+
+    /** @var bool Overriding default for this */
+    public $is_collapsible = true; // phpcs:ignore moodle.NamingConventions.ValidVariableName.MemberNameUnderscore
 
     /**
+     * Create a new instance of the sql_table.
+     *
      * @param string $uniqueid a string identifying this table.Used as a key in
      *                          session  vars.
      */
-    function __construct($uniqueid) {
+    public function __construct($uniqueid) {
         parent::__construct($uniqueid);
-        // some sensible defaults
+        // Set some sensible defaults.
         $this->set_attribute('class', 'generaltable generalbox');
     }
 
@@ -89,8 +90,10 @@ public function build_table() {
      * Closes recordset (for use after building the table).
      */
     public function close_recordset() {
-        if ($this->rawdata && ($this->rawdata instanceof \core\dml\recordset_walk ||
-                $this->rawdata instanceof moodle_recordset)) {
+        if (
+            $this->rawdata && ($this->rawdata instanceof \core\dml\recordset_walk ||
+                $this->rawdata instanceof moodle_recordset)
+        ) {
             $this->rawdata->close();
             $this->rawdata = null;
         }
@@ -98,14 +101,17 @@ public function close_recordset() {
 
     /**
      * Get any extra classes names to add to this row in the HTML.
-     * @param $row array the data for this row.
+     *
+     * @param array $row the data for this row.
      * @return string added to the class="" attribute of the tr.
      */
-    function get_row_class($row) {
+    public function get_row_class($row) {
         return '';
     }
 
     /**
+     * Set the SQL used to count records.
+     *
      * This is only needed if you want to use different sql to count rows.
      * Used for example when perhaps all db JOINS are not needed when counting
      * records. You don't need to call this function the count_sql
@@ -113,8 +119,11 @@ function get_row_class($row) {
      *
      * We need to count rows returned by the db seperately to the query itself
      * as we need to know how many pages of data we have to display.
+     *
+     * @param string $sql
+     * @param null|array $params
      */
-    function set_count_sql($sql, array $params = NULL) {
+    public function set_count_sql($sql, ?array $params = null) {
         $this->countsql = $sql;
         $this->countparams = $params;
     }
@@ -124,8 +133,13 @@ function set_count_sql($sql, array $params = NULL) {
      *      SELECT $fields FROM $from WHERE $where
      * Of course you can use sub-queries, JOINS etc. by putting them in the
      * appropriate clause of the query.
+     *
+     * @param string $fields
+     * @param string $from
+     * @param string $where
+     * @param array $params
      */
-    function set_sql($fields, $from, $where, array $params = array()) {
+    public function set_sql($fields, $from, $where, array $params = []) {
         $this->sql = new stdClass();
         $this->sql->fields = $fields;
         $this->sql->from = $from;
@@ -140,11 +154,11 @@ function set_sql($fields, $from, $where, array $params = array()) {
      * @param bool $useinitialsbar do you want to use the initials bar. Bar
      * will only be used if there is a fullname column defined for the table.
      */
-    function query_db($pagesize, $useinitialsbar=true) {
+    public function query_db($pagesize, $useinitialsbar = true) {
         global $DB;
         if (!$this->is_downloading()) {
-            if ($this->countsql === NULL) {
-                $this->countsql = 'SELECT COUNT(1) FROM '.$this->sql->from.' WHERE '.$this->sql->where;
+            if ($this->countsql === null) {
+                $this->countsql = 'SELECT COUNT(1) FROM ' . $this->sql->from . ' WHERE ' . $this->sql->where;
                 $this->countparams = $this->sql->params;
             }
             $grandtotal = $DB->count_records_sql($this->countsql, $this->countparams);
@@ -152,12 +166,12 @@ function query_db($pagesize, $useinitialsbar=true) {
                 $this->initialbars(true);
             }
 
-            list($wsql, $wparams) = $this->get_sql_where();
+            [$wsql, $wparams] = $this->get_sql_where();
             if ($wsql) {
-                $this->countsql .= ' AND '.$wsql;
+                $this->countsql .= ' AND ' . $wsql;
                 $this->countparams = array_merge($this->countparams, $wparams);
 
-                $this->sql->where .= ' AND '.$wsql;
+                $this->sql->where .= ' AND ' . $wsql;
                 $this->sql->params = array_merge($this->sql->params, $wparams);
 
                 $total  = $DB->count_records_sql($this->countsql, $this->countparams);
@@ -168,7 +182,7 @@ function query_db($pagesize, $useinitialsbar=true) {
             $this->pagesize($pagesize, $total);
         }
 
-        // Fetch the attempts
+        // Fetch the attempts.
         $sort = $this->get_sql_sort();
         if ($sort) {
             $sort = "ORDER BY $sort";
@@ -189,14 +203,21 @@ function query_db($pagesize, $useinitialsbar=true) {
     /**
      * Convenience method to call a number of methods for you to display the
      * table.
+     *
+     * @param int $pagesize
+     * @param bool $useinitialsbar
+     * @param string $downloadhelpbutton
      */
-    function out($pagesize, $useinitialsbar, $downloadhelpbutton='') {
+    public function out($pagesize, $useinitialsbar, $downloadhelpbutton = '') {
         global $DB;
         if (!$this->columns) {
-            $onerow = $DB->get_record_sql("SELECT {$this->sql->fields} FROM {$this->sql->from} WHERE {$this->sql->where}",
-                $this->sql->params, IGNORE_MULTIPLE);
-            //if columns is not set then define columns as the keys of the rows returned
-            //from the db.
+            $onerow = $DB->get_record_sql(
+                "SELECT {$this->sql->fields} FROM {$this->sql->from} WHERE {$this->sql->where}",
+                $this->sql->params,
+                IGNORE_MULTIPLE
+            );
+            // If columns is not set then define columns as the keys of the rows returned
+            // from the db.
             $this->define_columns(array_keys((array)$onerow));
             $this->define_headers(array_keys((array)$onerow));
         }
diff --git a/lib/tests/html_writer_test.php b/lib/tests/output/html_writer_test.php
similarity index 56%
rename from lib/tests/html_writer_test.php
rename to lib/tests/output/html_writer_test.php
index 7823a0def9daf..afb88b4915e5b 100644
--- a/lib/tests/html_writer_test.php
+++ b/lib/tests/output/html_writer_test.php
@@ -14,15 +14,24 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
+use core_table\output\html_table;
+use core_table\output\html_table_cell;
+use core_table\output\html_table_row;
+
+// phpcs:disable moodle.Commenting.DocblockDescription.Missing
+
 /**
  * Unit tests for the html_writer class.
  *
+ * @package core
  * @copyright 2010 Tim Hunt
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @covers \html_writer
- * @coversDefaultClass \html_writer
+ * @covers \core\output\html_writer
+ * @coversDefaultClass \\core\output\html_writer
  */
-final class html_writer_test extends basic_testcase {
+final class html_writer_test extends \basic_testcase {
     /**
      * @covers ::start_tag
      */
@@ -34,16 +43,20 @@ public function test_start_tag(): void {
      * @covers ::start_tag
      */
     public function test_start_tag_with_attr(): void {
-        $this->assertSame('<div class="frog">',
-            html_writer::start_tag('div', array('class' => 'frog')));
+        $this->assertSame(
+            '<div class="frog">',
+            html_writer::start_tag('div', ['class' => 'frog'])
+        );
     }
 
     /**
      * @covers ::start_tag
      */
     public function test_start_tag_with_attrs(): void {
-        $this->assertSame('<div class="frog" id="mydiv">',
-            html_writer::start_tag('div', array('class' => 'frog', 'id' => 'mydiv')));
+        $this->assertSame(
+            '<div class="frog" id="mydiv">',
+            html_writer::start_tag('div', ['class' => 'frog', 'id' => 'mydiv']),
+        );
     }
 
     /**
@@ -64,48 +77,60 @@ public function test_empty_tag(): void {
      * @covers ::empty_Tag
      */
     public function test_empty_tag_with_attrs(): void {
-        $this->assertSame('<input type="submit" value="frog" />',
-            html_writer::empty_tag('input', array('type' => 'submit', 'value' => 'frog')));
+        $this->assertSame(
+            '<input type="submit" value="frog" />',
+            html_writer::empty_tag('input', ['type' => 'submit', 'value' => 'frog']),
+        );
     }
 
     /**
      * @covers ::nonempty_tag
      */
     public function test_nonempty_tag_with_content(): void {
-        $this->assertSame('<div>Hello world!</div>',
-            html_writer::nonempty_tag('div', 'Hello world!'));
+        $this->assertSame(
+            '<div>Hello world!</div>',
+            html_writer::nonempty_tag('div', 'Hello world!'),
+        );
     }
 
     /**
      * @covers ::nonempty_tag
      */
     public function test_nonempty_tag_empty(): void {
-        $this->assertSame('',
-            html_writer::nonempty_tag('div', ''));
+        $this->assertSame(
+            '',
+            html_writer::nonempty_tag('div', ''),
+        );
     }
 
     /**
      * @covers ::nonempty_tag
      */
     public function test_nonempty_tag_null(): void {
-        $this->assertSame('',
-            html_writer::nonempty_tag('div', null));
+        $this->assertSame(
+            '',
+            html_writer::nonempty_tag('div', null),
+        );
     }
 
     /**
      * @covers ::nonempty_tag
      */
     public function test_nonempty_tag_zero(): void {
-        $this->assertSame('<div class="score">0</div>',
-            html_writer::nonempty_tag('div', 0, array('class' => 'score')));
+        $this->assertSame(
+            '<div class="score">0</div>',
+            html_writer::nonempty_tag('div', 0, ['class' => 'score'])
+        );
     }
 
     /**
      * @covers ::nonempty_tag
      */
     public function test_nonempty_tag_zero_string(): void {
-        $this->assertSame('<div class="score">0</div>',
-            html_writer::nonempty_tag('div', '0', array('class' => 'score')));
+        $this->assertSame(
+            '<div class="score">0</div>',
+            html_writer::nonempty_tag('div', '0', ['class' => 'score'])
+        );
     }
 
     /**
@@ -113,20 +138,30 @@ public function test_nonempty_tag_zero_string(): void {
      */
     public function test_div(): void {
         // All options.
-        $this->assertSame('<div class="frog" id="kermit">ribbit</div>',
-                html_writer::div('ribbit', 'frog', array('id' => 'kermit')));
+        $this->assertSame(
+            '<div class="frog" id="kermit">ribbit</div>',
+            html_writer::div('ribbit', 'frog', ['id' => 'kermit'])
+        );
         // Combine class from attributes and $class.
-        $this->assertSame('<div class="amphibian frog">ribbit</div>',
-                html_writer::div('ribbit', 'frog', array('class' => 'amphibian')));
+        $this->assertSame(
+            '<div class="amphibian frog">ribbit</div>',
+            html_writer::div('ribbit', 'frog', ['class' => 'amphibian'])
+        );
         // Class only.
-        $this->assertSame('<div class="frog">ribbit</div>',
-                html_writer::div('ribbit', 'frog'));
+        $this->assertSame(
+            '<div class="frog">ribbit</div>',
+            html_writer::div('ribbit', 'frog')
+        );
         // Attributes only.
-        $this->assertSame('<div id="kermit">ribbit</div>',
-                html_writer::div('ribbit', '', array('id' => 'kermit')));
+        $this->assertSame(
+            '<div id="kermit">ribbit</div>',
+            html_writer::div('ribbit', '', ['id' => 'kermit'])
+        );
         // No options.
-        $this->assertSame('<div>ribbit</div>',
-                html_writer::div('ribbit'));
+        $this->assertSame(
+            '<div>ribbit</div>',
+            html_writer::div('ribbit')
+        );
     }
 
     /**
@@ -134,20 +169,30 @@ public function test_div(): void {
      */
     public function test_start_div(): void {
         // All options.
-        $this->assertSame('<div class="frog" id="kermit">',
-                html_writer::start_div('frog', array('id' => 'kermit')));
+        $this->assertSame(
+            '<div class="frog" id="kermit">',
+            html_writer::start_div('frog', ['id' => 'kermit'])
+        );
         // Combine class from attributes and $class.
-        $this->assertSame('<div class="amphibian frog">',
-                html_writer::start_div('frog', array('class' => 'amphibian')));
+        $this->assertSame(
+            '<div class="amphibian frog">',
+            html_writer::start_div('frog', ['class' => 'amphibian'])
+        );
         // Class only.
-        $this->assertSame('<div class="frog">',
-                html_writer::start_div('frog'));
+        $this->assertSame(
+            '<div class="frog">',
+            html_writer::start_div('frog')
+        );
         // Attributes only.
-        $this->assertSame('<div id="kermit">',
-                html_writer::start_div('', array('id' => 'kermit')));
+        $this->assertSame(
+            '<div id="kermit">',
+            html_writer::start_div('', ['id' => 'kermit'])
+        );
         // No options.
-        $this->assertSame('<div>',
-                html_writer::start_div());
+        $this->assertSame(
+            '<div>',
+            html_writer::start_div()
+        );
     }
 
     /**
@@ -162,20 +207,30 @@ public function test_end_div(): void {
      */
     public function test_span(): void {
         // All options.
-        $this->assertSame('<span class="frog" id="kermit">ribbit</span>',
-                html_writer::span('ribbit', 'frog', array('id' => 'kermit')));
+        $this->assertSame(
+            '<span class="frog" id="kermit">ribbit</span>',
+            html_writer::span('ribbit', 'frog', ['id' => 'kermit'])
+        );
         // Combine class from attributes and $class.
-        $this->assertSame('<span class="amphibian frog">ribbit</span>',
-                html_writer::span('ribbit', 'frog', array('class' => 'amphibian')));
+        $this->assertSame(
+            '<span class="amphibian frog">ribbit</span>',
+            html_writer::span('ribbit', 'frog', ['class' => 'amphibian'])
+        );
         // Class only.
-        $this->assertSame('<span class="frog">ribbit</span>',
-                html_writer::span('ribbit', 'frog'));
+        $this->assertSame(
+            '<span class="frog">ribbit</span>',
+            html_writer::span('ribbit', 'frog')
+        );
         // Attributes only.
-        $this->assertSame('<span id="kermit">ribbit</span>',
-                html_writer::span('ribbit', '', array('id' => 'kermit')));
+        $this->assertSame(
+            '<span id="kermit">ribbit</span>',
+            html_writer::span('ribbit', '', ['id' => 'kermit'])
+        );
         // No options.
-        $this->assertSame('<span>ribbit</span>',
-                html_writer::span('ribbit'));
+        $this->assertSame(
+            '<span>ribbit</span>',
+            html_writer::span('ribbit')
+        );
     }
 
     /**
@@ -183,20 +238,30 @@ public function test_span(): void {
      */
     public function test_start_span(): void {
         // All options.
-        $this->assertSame('<span class="frog" id="kermit">',
-                html_writer::start_span('frog', array('id' => 'kermit')));
+        $this->assertSame(
+            '<span class="frog" id="kermit">',
+            html_writer::start_span('frog', ['id' => 'kermit'])
+        );
         // Combine class from attributes and $class.
-        $this->assertSame('<span class="amphibian frog">',
-                html_writer::start_span('frog', array('class' => 'amphibian')));
+        $this->assertSame(
+            '<span class="amphibian frog">',
+            html_writer::start_span('frog', ['class' => 'amphibian'])
+        );
         // Class only.
-        $this->assertSame('<span class="frog">',
-                html_writer::start_span('frog'));
+        $this->assertSame(
+            '<span class="frog">',
+            html_writer::start_span('frog')
+        );
         // Attributes only.
-        $this->assertSame('<span id="kermit">',
-                html_writer::start_span('', array('id' => 'kermit')));
+        $this->assertSame(
+            '<span id="kermit">',
+            html_writer::start_span('', ['id' => 'kermit'])
+        );
         // No options.
-        $this->assertSame('<span>',
-                html_writer::start_span());
+        $this->assertSame(
+            '<span>',
+            html_writer::start_span()
+        );
     }
 
     /**
@@ -208,9 +273,9 @@ public function test_end_span(): void {
 
     /**
      * @covers ::table
-     * @covers \html_table_row
-     * @covers \html_table_cell
-     * @covers \html_table
+     * @covers \core_table\output\html_table_row
+     * @covers \core_table\output\html_table_cell
+     * @covers \core_table\output\html_table
      */
     public function test_table(): void {
         $row = new html_table_row();
@@ -268,11 +333,11 @@ public function test_table_hidden_caption(): void {
 
         $table = new html_table();
         $table->id = "whodat";
-        $table->data = array(
-            array('fred', 'MDK'),
-            array('bob',  'Burgers'),
-            array('dave', 'Competitiveness')
-        );
+        $table->data = [
+            ['fred', 'MDK'],
+            ['bob', 'Burgers'],
+            ['dave', 'Competitiveness'],
+        ];
         $table->caption = "Who even knows?";
         $table->captionhide = true;
         $table->responsive = false;

From 70ab95f27f042b03d35e970cff6a6fdcb9725b6c Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Fri, 14 Jun 2024 00:24:11 +0800
Subject: [PATCH 067/119] MDL-82183 core: Document new class locations for
 output API

---
 .upgradenotes/MDL-82183-2024061304200941.yml | 128 +++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 .upgradenotes/MDL-82183-2024061304200941.yml

diff --git a/.upgradenotes/MDL-82183-2024061304200941.yml b/.upgradenotes/MDL-82183-2024061304200941.yml
new file mode 100644
index 0000000000000..85b6df698dde7
--- /dev/null
+++ b/.upgradenotes/MDL-82183-2024061304200941.yml
@@ -0,0 +1,128 @@
+issueNumber: MDL-82183
+notes:
+  core:
+    - message: >
+        The following classes are now also available in the following new
+        locations. They will continue to work in their old locations:
+
+        | Old classname | New classname |
+
+        | --- | --- |
+
+        | `\action_link` | `\core\output\action_link` |
+
+        | `\action_menu_filler` | `\core\output\action_menu\filler` |
+
+        | `\action_menu_link_primary` | `\core\output\action_menu\link_primary` |
+
+        | `\action_menu_link_secondary` | `\core\output\action_menu\link_secondary` |
+
+        | `\action_menu_link` | `\core\output\action_menu\link` |
+
+        | `\action_menu` | `\core\output\action_menu` |
+
+        | `\block_contents` | `\core_block\output\block_contents` |
+
+        | `\block_move_target` | `\core_block\output\block_move_target` |
+
+        | `\component_action` | `\core\output\actions\component_action` |
+
+        | `\confirm_action` | `\core\output\actions\confirm_action` |
+
+        | `\context_header` | `\core\output\context_header` |
+
+        | `\core_renderer_ajax` | `\core\output\core_renderer_ajax` |
+
+        | `\core_renderer_cli` | `\core\output\core_renderer_cli` |
+
+        | `\core_renderer_maintenance` | `\core\output\core_renderer_maintenance` |
+
+        | `\core_renderer` | `\core\output\core_renderer` |
+
+        | `\custom_menu_item` | `\core\output\custom_menu_item` |
+
+        | `\custom_menu` | `\core\output\custom_menu` |
+
+        | `\file_picker` | `\core\output\file_picker` |
+
+        | `\flexible_table` | `\core_table\flexible_table` |
+
+        | `\fragment_requirements_manager` | `\core\output\requirements\fragment_requirements_manager` |
+
+        | `\help_icon` | `\core\output\help_icon` |
+
+        | `\html_table_cell` | `\core_table\output\html_table_cell` |
+
+        | `\html_table_row` | `\core_table\output\html_table_row` |
+
+        | `\html_table` | `\core_table\output\html_table` |
+
+        | `\html_writer` | `\core\output\html_writer` |
+
+        | `\image_icon` | `\core\output\image_icon` |
+
+        | `\initials_bar` | `\core\output\initials_bar` |
+
+        | `\js_writer` | `\core\output\js_writer` |
+
+        | `\page_requirements_manager` | `\core\output\requirements\page_requirements_manager` |
+
+        | `\paging_bar` | `\core\output\paging_bar` |
+
+        | `\pix_emoticon` | `\core\output\pix_emoticon` |
+
+        | `\pix_icon_font` | `\core\output\pix_icon_font` |
+
+        | `\pix_icon_fontawesome` | `\core\output\pix_icon_fontawesome` |
+
+        | `\pix_icon` | `\core\output\pix_icon` |
+
+        | `\plugin_renderer_base` | `\core\output\plugin_renderer_base` |
+
+        | `\popup_action` | `\core\output\actions\popup_action` |
+
+        | `\preferences_group` | `\core\output\preferences_group` |
+
+        | `\preferences_groups` | `\core\output\preferences_groups` |
+
+        | `\progress_bar` | `\core\output\progress_bar` |
+
+        | `\renderable` | `\core\output\renderable` |
+
+        | `\renderer_base` | `\core\output\renderer_base` |
+
+        | `\renderer_factory_base` | `\core\output\renderer_factory\renderer_factory_base` |
+
+        | `\renderer_factory` | `\core\output\renderer_factory\renderer_factory_interface` |
+
+        | `\single_button` | `\core\output\single_button` |
+
+        | `\single_select` | `\core\output\single_select` |
+
+        | `\standard_renderer_factory` | `\core\output\renderer_factory\standard_renderer_factory` |
+
+        | `\table_dataformat_export_format` | `\core_table\dataformat_export_format` |
+
+        | `\table_default_export_format_parent` | `\core_table\base_export_format` |
+
+        | `\table_sql` | `\core_table\sql_table` |
+
+        | `\tabobject` | `\core\output\tabobject` |
+
+        | `\tabtree` | `\core\output\tabtree` |
+
+        | `\templatable` | `\core\output\templatable` |
+
+        | `\theme_config` | `\core\output\theme_config` |
+
+        | `\theme_overridden_renderer_factory` | `\core\output\renderer_factory\theme_overridden_renderer_factory` |
+
+        | `\url_select` | `\core\output\url_select` |
+
+        | `\user_picture` | `\core\output\user_picture` |
+
+        | `\xhtml_container_stack` | `\core\output\xhtml_container_stack` |
+
+        | `\YUI_config` | `\core\output\requirements\yui` |
+
+      type: improved

From 882150bd02a6f9fdc926e3636c85108ed44bb609 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 26 Jun 2024 22:38:47 +0800
Subject: [PATCH 068/119] MDL-82183 core: Move subpanel out of local folder

---
 lib/classes/output/{local => }/action_menu/subpanel.php | 7 ++++++-
 lib/db/legacyclasses.php                                | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)
 rename lib/classes/output/{local => }/action_menu/subpanel.php (89%)

diff --git a/lib/classes/output/local/action_menu/subpanel.php b/lib/classes/output/action_menu/subpanel.php
similarity index 89%
rename from lib/classes/output/local/action_menu/subpanel.php
rename to lib/classes/output/action_menu/subpanel.php
index 9724ea8f4c493..94257d2a097d0 100644
--- a/lib/classes/output/local/action_menu/subpanel.php
+++ b/lib/classes/output/action_menu/subpanel.php
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace core\output\local\action_menu;
+namespace core\output\action_menu;
 
 use core\output\action_link;
 use core\output\pix_icon;
@@ -80,3 +80,8 @@ public function export_for_template(\renderer_base $output): stdClass {
         return $data;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(subpanel::class, \core\output\local\action_menu\subpanel::class);
diff --git a/lib/db/legacyclasses.php b/lib/db/legacyclasses.php
index a9b0ec84beb06..4b3cc962b65b4 100644
--- a/lib/db/legacyclasses.php
+++ b/lib/db/legacyclasses.php
@@ -95,6 +95,7 @@
     \action_menu_link::class => 'output/action_menu/link.php',
     \action_menu_link_primary::class => 'output/action_menu/link_primary.php',
     \action_menu_link_secondary::class => 'output/action_menu/link_secondary.php',
+    \core\output\local\action_menu\subpanel::class => 'output/action_menu/subpanel.php',
     \preferences_groups::class => 'output/preferences_groups.php',
     \preferences_group::class => 'output/preferences_group.php',
     \progress_bar::class => 'output/progress_bar.php',

From 433df29b817478e9dd9f7ab84ee5323e0cc3cd1d Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 26 Jun 2024 09:20:17 +0800
Subject: [PATCH 069/119] MDL-63670 core_message: Tests should not use another
 testcase as base

---
 message/classes/tests/helper.php    |  76 ++++-
 message/tests/api_test.php          | 505 ++++++++++++++++++++--------
 message/tests/event/events_test.php |  72 ++--
 message/tests/messagelib_test.php   |  97 +-----
 4 files changed, 496 insertions(+), 254 deletions(-)

diff --git a/message/classes/tests/helper.php b/message/classes/tests/helper.php
index 5267621be06f9..67836780bee74 100644
--- a/message/classes/tests/helper.php
+++ b/message/classes/tests/helper.php
@@ -24,7 +24,7 @@
 
 namespace core_message\tests;
 
-defined('MOODLE_INTERNAL') || die();
+use stdClass;
 
 /**
  * The helper class providing util methods for testing.
@@ -33,6 +33,80 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class helper {
+    /**
+     * Send a fake message.
+     *
+     * {@link message_send()} does not support transaction, this function will simulate a message
+     * sent from a user to another. We should stop using it once {@link message_send()} will support
+     * transactions. This is not clean at all, this is just used to add rows to the table.
+     *
+     * @param \stdClass $userfrom user object of the one sending the message.
+     * @param \stdClass $userto user object of the one receiving the message.
+     * @param string $message message to send.
+     * @param int $notification if the message is a notification.
+     * @param int $time the time the message was sent
+     * @return int the id of the message
+     */
+    public static function send_fake_message(
+        stdClass $userfrom,
+        stdClass $userto,
+        string $message = 'Hello world!',
+        int $notification = 0,
+        int $time = 0,
+    ): int {
+        global $DB;
+
+        if (empty($time)) {
+            $time = time();
+        }
+
+        if ($notification) {
+            $record = new \stdClass();
+            $record->useridfrom = $userfrom->id;
+            $record->useridto = $userto->id;
+            $record->subject = 'No subject';
+            $record->fullmessage = $message;
+            $record->smallmessage = $message;
+            $record->timecreated = $time;
+
+            return $DB->insert_record('notifications', $record);
+        }
+
+        if ($userfrom->id == $userto->id) {
+            // It's a self conversation.
+            $conversation = \core_message\api::get_self_conversation($userfrom->id);
+            if (empty($conversation)) {
+                $conversation = \core_message\api::create_conversation(
+                    \core_message\api::MESSAGE_CONVERSATION_TYPE_SELF,
+                    [$userfrom->id],
+                );
+            }
+            $conversationid = $conversation->id;
+        } else if (!$conversationid = \core_message\api::get_conversation_between_users([$userfrom->id, $userto->id])) {
+            // It's an individual conversation between two different users.
+            $conversation = \core_message\api::create_conversation(
+                \core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+                [
+                    $userfrom->id,
+                    $userto->id,
+                ]
+            );
+            $conversationid = $conversation->id;
+        }
+
+        // Ok, send the message.
+        $record = (object) [
+            'useridfrom' => $userfrom->id,
+            'conversationid' => $conversationid,
+            'subject' => 'No subject',
+            'fullmessage' => $message,
+            'smallmessage' => $message,
+            'timecreated' => $time,
+        ];
+
+        return $DB->insert_record('messages', $record);
+    }
+
     /**
      * Sends a message to a conversation.
      *
diff --git a/message/tests/api_test.php b/message/tests/api_test.php
index b5801e8e492fd..53d3ad6e4638a 100644
--- a/message/tests/api_test.php
+++ b/message/tests/api_test.php
@@ -18,12 +18,6 @@
 
 use core_message\tests\helper as testhelper;
 
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-
-require_once($CFG->dirroot . '/message/tests/messagelib_test.php');
-
 /**
  * Test message API.
  *
@@ -31,19 +25,32 @@
  * @category test
  * @copyright 2016 Mark Nelson <markn@moodle.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \core_message\api
  */
-class api_test extends messagelib_test {
+final class api_test extends \advanced_testcase {
+    /**
+     * Test set up.
+     *
+     * This is executed before running any test in this file.
+     */
+    public function setUp(): void {
+        parent::setUp();
+
+        $this->resetAfterTest();
+    }
 
     public function test_mark_all_read_for_user_touser(): void {
+        $this->resetAfterTest();
+
         $sender = $this->getDataGenerator()->create_user(array('firstname' => 'Test1', 'lastname' => 'User1'));
         $recipient = $this->getDataGenerator()->create_user(array('firstname' => 'Test2', 'lastname' => 'User2'));
 
-        $this->send_fake_message($sender, $recipient, 'Notification', 1);
-        $this->send_fake_message($sender, $recipient, 'Notification', 1);
-        $this->send_fake_message($sender, $recipient, 'Notification', 1);
-        $this->send_fake_message($sender, $recipient);
-        $this->send_fake_message($sender, $recipient);
-        $this->send_fake_message($sender, $recipient);
+        testhelper::send_fake_message($sender, $recipient, 'Notification', 1);
+        testhelper::send_fake_message($sender, $recipient, 'Notification', 1);
+        testhelper::send_fake_message($sender, $recipient, 'Notification', 1);
+        testhelper::send_fake_message($sender, $recipient);
+        testhelper::send_fake_message($sender, $recipient);
+        testhelper::send_fake_message($sender, $recipient);
 
         $this->assertEquals(1, api::count_unread_conversations($recipient));
 
@@ -55,22 +62,27 @@ public function test_mark_all_read_for_user_touser(): void {
     }
 
     public function test_mark_all_read_for_user_touser_with_fromuser(): void {
+        $this->resetAfterTest();
+
         $sender1 = $this->getDataGenerator()->create_user(array('firstname' => 'Test1', 'lastname' => 'User1'));
         $sender2 = $this->getDataGenerator()->create_user(array('firstname' => 'Test3', 'lastname' => 'User3'));
         $recipient = $this->getDataGenerator()->create_user(array('firstname' => 'Test2', 'lastname' => 'User2'));
-
-        $this->send_fake_message($sender1, $recipient, 'Notification', 1);
-        $this->send_fake_message($sender1, $recipient, 'Notification', 1);
-        $this->send_fake_message($sender1, $recipient, 'Notification', 1);
-        $this->send_fake_message($sender1, $recipient);
-        $this->send_fake_message($sender1, $recipient);
-        $this->send_fake_message($sender1, $recipient);
-        $this->send_fake_message($sender2, $recipient, 'Notification', 1);
-        $this->send_fake_message($sender2, $recipient, 'Notification', 1);
-        $this->send_fake_message($sender2, $recipient, 'Notification', 1);
-        $this->send_fake_message($sender2, $recipient);
-        $this->send_fake_message($sender2, $recipient);
-        $this->send_fake_message($sender2, $recipient);
+        $sender1 = $this->getDataGenerator()->create_user(['firstname' => 'Test1', 'lastname' => 'User1']);
+        $sender2 = $this->getDataGenerator()->create_user(['firstname' => 'Test3', 'lastname' => 'User3']);
+        $recipient = $this->getDataGenerator()->create_user(['firstname' => 'Test2', 'lastname' => 'User2']);
+
+        testhelper::send_fake_message($sender1, $recipient, 'Notification', 1);
+        testhelper::send_fake_message($sender1, $recipient, 'Notification', 1);
+        testhelper::send_fake_message($sender1, $recipient, 'Notification', 1);
+        testhelper::send_fake_message($sender1, $recipient);
+        testhelper::send_fake_message($sender1, $recipient);
+        testhelper::send_fake_message($sender1, $recipient);
+        testhelper::send_fake_message($sender2, $recipient, 'Notification', 1);
+        testhelper::send_fake_message($sender2, $recipient, 'Notification', 1);
+        testhelper::send_fake_message($sender2, $recipient, 'Notification', 1);
+        testhelper::send_fake_message($sender2, $recipient);
+        testhelper::send_fake_message($sender2, $recipient);
+        testhelper::send_fake_message($sender2, $recipient);
 
         $this->assertEquals(2, api::count_unread_conversations($recipient));
 
@@ -87,6 +99,8 @@ public function test_mark_all_read_for_user_touser_with_fromuser(): void {
      */
     public function test_count_blocked_users(): void {
         global $USER;
+        $this->resetAfterTest();
+
 
         // Set this user as the admin.
         $this->setAdminUser();
@@ -509,6 +523,8 @@ public function test_message_search_users_messaging_disabled(): void {
      * Tests getting conversations between 2 users.
      */
     public function test_get_conversations_between_users(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = new \stdClass();
         $user1->firstname = 'User';
@@ -572,6 +588,8 @@ public function test_get_conversations_between_users(): void {
      * Tests getting self-conversations.
      */
     public function test_get_self_conversation(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = new \stdClass();
         $user1->firstname = 'User';
@@ -657,11 +675,11 @@ public function test_search_messages(): void {
         $time = 1;
         testhelper::send_fake_message_to_conversation($user1, $sc->id, 'Test message to self!', $time);
         testhelper::send_fake_message_to_conversation($user1, $gc->id, 'My hero!', $time + 1);
-        $this->send_fake_message($user3, $user1, 'Don\'t block me.', 0, $time + 2);
-        $this->send_fake_message($user1, $user2, 'Yo!', 0, $time + 3);
-        $this->send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 4);
-        $this->send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 5);
-        $this->send_fake_message($user2, $user1, 'Word.', 0, $time + 6);
+        testhelper::send_fake_message($user3, $user1, 'Don\'t block me.', 0, $time + 2);
+        testhelper::send_fake_message($user1, $user2, 'Yo!', 0, $time + 3);
+        testhelper::send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 4);
+        testhelper::send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 5);
+        testhelper::send_fake_message($user2, $user1, 'Word.', 0, $time + 6);
 
         $convid = api::get_conversation_between_users([$user1->id, $user2->id]);
         $conv2id = api::get_conversation_between_users([$user1->id, $user3->id]);
@@ -745,6 +763,8 @@ public function test_search_messages(): void {
      * Test verifying that favourited conversations can be retrieved.
      */
     public function test_get_favourite_conversations(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -759,19 +779,19 @@ public function test_get_favourite_conversations(): void {
 
         // Create some conversations for user1.
         $time = 1;
-        $this->send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
-        $this->send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
-        $this->send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
-        $messageid1 = $this->send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
+        testhelper::send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
+        testhelper::send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
+        testhelper::send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
+        $messageid1 = testhelper::send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
 
-        $this->send_fake_message($user1, $user3, 'Booyah', 0, $time + 5);
-        $this->send_fake_message($user3, $user1, 'Whaaat?', 0, $time + 6);
-        $this->send_fake_message($user1, $user3, 'Nothing.', 0, $time + 7);
-        $messageid2 = $this->send_fake_message($user3, $user1, 'Cool.', 0, $time + 8);
+        testhelper::send_fake_message($user1, $user3, 'Booyah', 0, $time + 5);
+        testhelper::send_fake_message($user3, $user1, 'Whaaat?', 0, $time + 6);
+        testhelper::send_fake_message($user1, $user3, 'Nothing.', 0, $time + 7);
+        $messageid2 = testhelper::send_fake_message($user3, $user1, 'Cool.', 0, $time + 8);
 
-        $this->send_fake_message($user1, $user4, 'Hey mate, you see the new messaging UI in Moodle?', 0, $time + 9);
-        $this->send_fake_message($user4, $user1, 'Yah brah, it\'s pretty rad.', 0, $time + 10);
-        $messageid3 = $this->send_fake_message($user1, $user4, 'Dope.', 0, $time + 11);
+        testhelper::send_fake_message($user1, $user4, 'Hey mate, you see the new messaging UI in Moodle?', 0, $time + 9);
+        testhelper::send_fake_message($user4, $user1, 'Yah brah, it\'s pretty rad.', 0, $time + 10);
+        $messageid3 = testhelper::send_fake_message($user1, $user4, 'Dope.', 0, $time + 11);
 
         // Favourite the first 2 conversations for user1.
         $convoids = [];
@@ -804,6 +824,8 @@ public function test_get_favourite_conversations(): void {
      * Tests retrieving favourite conversations with a limit and offset to ensure pagination works correctly.
      */
     public function test_get_favourite_conversations_limit_offset(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -818,19 +840,19 @@ public function test_get_favourite_conversations_limit_offset(): void {
 
         // Create some conversations for user1.
         $time = 1;
-        $this->send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
-        $this->send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
-        $this->send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
-        $messageid1 = $this->send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
+        testhelper::send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
+        testhelper::send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
+        testhelper::send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
+        $messageid1 = testhelper::send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
 
-        $this->send_fake_message($user1, $user3, 'Booyah', 0, $time + 5);
-        $this->send_fake_message($user3, $user1, 'Whaaat?', 0, $time + 6);
-        $this->send_fake_message($user1, $user3, 'Nothing.', 0, $time + 7);
-        $messageid2 = $this->send_fake_message($user3, $user1, 'Cool.', 0, $time + 8);
+        testhelper::send_fake_message($user1, $user3, 'Booyah', 0, $time + 5);
+        testhelper::send_fake_message($user3, $user1, 'Whaaat?', 0, $time + 6);
+        testhelper::send_fake_message($user1, $user3, 'Nothing.', 0, $time + 7);
+        $messageid2 = testhelper::send_fake_message($user3, $user1, 'Cool.', 0, $time + 8);
 
-        $this->send_fake_message($user1, $user4, 'Hey mate, you see the new messaging UI in Moodle?', 0, $time + 9);
-        $this->send_fake_message($user4, $user1, 'Yah brah, it\'s pretty rad.', 0, $time + 10);
-        $messageid3 = $this->send_fake_message($user1, $user4, 'Dope.', 0, $time + 11);
+        testhelper::send_fake_message($user1, $user4, 'Hey mate, you see the new messaging UI in Moodle?', 0, $time + 9);
+        testhelper::send_fake_message($user4, $user1, 'Yah brah, it\'s pretty rad.', 0, $time + 10);
+        $messageid3 = testhelper::send_fake_message($user1, $user4, 'Dope.', 0, $time + 11);
 
         // Favourite the all conversations for user1.
         $convoids = [];
@@ -858,6 +880,8 @@ public function test_get_favourite_conversations_limit_offset(): void {
      * Tests retrieving favourite conversations when a conversation contains a deleted user.
      */
     public function test_get_favourite_conversations_with_deleted_user(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -865,15 +889,15 @@ public function test_get_favourite_conversations_with_deleted_user(): void {
 
         // Send some messages back and forth, have some different conversations with different users.
         $time = 1;
-        $this->send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
-        $this->send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
-        $this->send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
-        $this->send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
+        testhelper::send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
+        testhelper::send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
+        testhelper::send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
+        testhelper::send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
 
-        $this->send_fake_message($user1, $user3, 'Booyah', 0, $time + 5);
-        $this->send_fake_message($user3, $user1, 'Whaaat?', 0, $time + 6);
-        $this->send_fake_message($user1, $user3, 'Nothing.', 0, $time + 7);
-        $this->send_fake_message($user3, $user1, 'Cool.', 0, $time + 8);
+        testhelper::send_fake_message($user1, $user3, 'Booyah', 0, $time + 5);
+        testhelper::send_fake_message($user3, $user1, 'Whaaat?', 0, $time + 6);
+        testhelper::send_fake_message($user1, $user3, 'Nothing.', 0, $time + 7);
+        testhelper::send_fake_message($user3, $user1, 'Cool.', 0, $time + 8);
 
         // Favourite the all conversations for user1.
         $convoids = [];
@@ -904,6 +928,8 @@ public function test_get_favourite_conversations_with_deleted_user(): void {
      * Test confirming that conversations can be marked as favourites.
      */
     public function test_set_favourite_conversation(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -911,15 +937,15 @@ public function test_set_favourite_conversation(): void {
 
         // Send some messages back and forth, have some different conversations with different users.
         $time = 1;
-        $this->send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
-        $this->send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
-        $this->send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
-        $this->send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
+        testhelper::send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
+        testhelper::send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
+        testhelper::send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
+        testhelper::send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
 
-        $this->send_fake_message($user1, $user3, 'Booyah', 0, $time + 5);
-        $this->send_fake_message($user3, $user1, 'Whaaat?', 0, $time + 6);
-        $this->send_fake_message($user1, $user3, 'Nothing.', 0, $time + 7);
-        $this->send_fake_message($user3, $user1, 'Cool.', 0, $time + 8);
+        testhelper::send_fake_message($user1, $user3, 'Booyah', 0, $time + 5);
+        testhelper::send_fake_message($user3, $user1, 'Whaaat?', 0, $time + 6);
+        testhelper::send_fake_message($user1, $user3, 'Nothing.', 0, $time + 7);
+        testhelper::send_fake_message($user3, $user1, 'Cool.', 0, $time + 8);
 
         // Favourite the first conversation as user 1.
         $conversationid1 = api::get_conversation_between_users([$user1->id, $user2->id]);
@@ -942,6 +968,8 @@ public function test_set_favourite_conversation(): void {
      * Test verifying that trying to mark a non-existent conversation as a favourite, results in an exception.
      */
     public function test_set_favourite_conversation_nonexistent_conversation(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         // Try to favourite a non-existent conversation.
@@ -953,6 +981,8 @@ public function test_set_favourite_conversation_nonexistent_conversation(): void
      * Test verifying that a conversation cannot be marked as favourite unless the user is a member of that conversation.
      */
     public function test_set_favourite_conversation_non_member(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -960,15 +990,15 @@ public function test_set_favourite_conversation_non_member(): void {
 
         // Send some messages back and forth, have some different conversations with different users.
         $time = 1;
-        $this->send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
-        $this->send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
-        $this->send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
-        $this->send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
+        testhelper::send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
+        testhelper::send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
+        testhelper::send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
+        testhelper::send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
 
-        $this->send_fake_message($user1, $user3, 'Booyah', 0, $time + 5);
-        $this->send_fake_message($user3, $user1, 'Whaaat?', 0, $time + 6);
-        $this->send_fake_message($user1, $user3, 'Nothing.', 0, $time + 7);
-        $this->send_fake_message($user3, $user1, 'Cool.', 0, $time + 8);
+        testhelper::send_fake_message($user1, $user3, 'Booyah', 0, $time + 5);
+        testhelper::send_fake_message($user3, $user1, 'Whaaat?', 0, $time + 6);
+        testhelper::send_fake_message($user1, $user3, 'Nothing.', 0, $time + 7);
+        testhelper::send_fake_message($user3, $user1, 'Cool.', 0, $time + 8);
 
         // Try to favourite the first conversation as user 3, who is not a member.
         $conversationid1 = api::get_conversation_between_users([$user1->id, $user2->id]);
@@ -980,6 +1010,8 @@ public function test_set_favourite_conversation_non_member(): void {
      * Test confirming that those conversations marked as favourites can be unfavourited.
      */
     public function test_unset_favourite_conversation(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -987,15 +1019,15 @@ public function test_unset_favourite_conversation(): void {
 
         // Send some messages back and forth, have some different conversations with different users.
         $time = 1;
-        $this->send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
-        $this->send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
-        $this->send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
-        $this->send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
+        testhelper::send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
+        testhelper::send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
+        testhelper::send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
+        testhelper::send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
 
-        $this->send_fake_message($user1, $user3, 'Booyah', 0, $time + 5);
-        $this->send_fake_message($user3, $user1, 'Whaaat?', 0, $time + 6);
-        $this->send_fake_message($user1, $user3, 'Nothing.', 0, $time + 7);
-        $this->send_fake_message($user3, $user1, 'Cool.', 0, $time + 8);
+        testhelper::send_fake_message($user1, $user3, 'Booyah', 0, $time + 5);
+        testhelper::send_fake_message($user3, $user1, 'Whaaat?', 0, $time + 6);
+        testhelper::send_fake_message($user1, $user3, 'Nothing.', 0, $time + 7);
+        testhelper::send_fake_message($user3, $user1, 'Cool.', 0, $time + 8);
 
         // Favourite the first conversation as user 1 and the second as user 3.
         $conversationid1 = api::get_conversation_between_users([$user1->id, $user2->id]);
@@ -1023,16 +1055,18 @@ public function test_unset_favourite_conversation(): void {
      * Test verifying that a valid conversation cannot be unset as a favourite if it's not marked as a favourite.
      */
     public function test_unset_favourite_conversation_not_favourite(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
         // Send some messages back and forth, have some different conversations with different users.
         $time = 1;
-        $this->send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
-        $this->send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
-        $this->send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
-        $this->send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
+        testhelper::send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
+        testhelper::send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
+        testhelper::send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
+        testhelper::send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
 
         // Now try to unfavourite the conversation as user 1.
         $conversationid1 = api::get_conversation_between_users([$user1->id, $user2->id]);
@@ -1044,6 +1078,8 @@ public function test_unset_favourite_conversation_not_favourite(): void {
      * Test verifying that a non-existent conversation cannot be unset as a favourite.
      */
     public function test_unset_favourite_conversation_non_existent_conversation(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
 
@@ -1126,6 +1162,8 @@ protected function create_conversation_test_data() {
      * Test verifying get_conversations when no limits, offsets, type filters or favourite restrictions are used.
      */
     public function test_get_conversations_no_restrictions(): void {
+        $this->resetAfterTest();
+
         global $DB;
 
         $user1 = self::getDataGenerator()->create_user();
@@ -1251,6 +1289,8 @@ public function test_get_conversations_no_restrictions(): void {
      */
     public function test_get_conversations_message_format(): void {
         global $DB;
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -1278,6 +1318,8 @@ public function test_get_conversations_message_format(): void {
      * Test verifying get_conversations identifies if a conversation is muted or not.
      */
     public function test_get_conversations_some_muted(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -1324,6 +1366,8 @@ public function test_get_conversations_some_muted(): void {
      * Tests retrieving conversations with a limit and offset to ensure pagination works correctly.
      */
     public function test_get_conversations_limit_offset(): void {
+        $this->resetAfterTest();
+
         // Get a bunch of conversations, some group, some individual and in different states.
         list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
             $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
@@ -1363,6 +1407,8 @@ public function test_get_conversations_limit_offset(): void {
      * Test verifying the type filtering behaviour of the
      */
     public function test_get_conversations_type_filter(): void {
+        $this->resetAfterTest();
+
         // Get a bunch of conversations, some group, some individual and in different states.
         list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
             $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
@@ -1387,6 +1433,8 @@ public function test_get_conversations_type_filter(): void {
      */
     public function test_get_conversations_self_conversations(): void {
         global $DB;
+        $this->resetAfterTest();
+
 
         // Create a conversation between one user and themself.
         $user1 = self::getDataGenerator()->create_user();
@@ -1447,6 +1495,8 @@ public function test_get_conversations_self_conversations(): void {
      * Tests retrieving conversations when a conversation contains a deleted user.
      */
     public function test_get_conversations_with_deleted_user(): void {
+        $this->resetAfterTest();
+
         // Get a bunch of conversations, some group, some individual and in different states.
         list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
             $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
@@ -1504,6 +1554,8 @@ public function test_get_conversations_with_deleted_user(): void {
      * Test confirming the behaviour of get_conversations() when users delete all messages.
      */
     public function test_get_conversations_deleted_messages(): void {
+        $this->resetAfterTest();
+
         // Get a bunch of conversations, some group, some individual and in different states.
         list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
             $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
@@ -1542,6 +1594,8 @@ public function test_get_conversations_deleted_messages(): void {
      * favourite.
      */
     public function test_get_conversations_favourite_conversations_single(): void {
+        $this->resetAfterTest();
+
         // Get a bunch of conversations, some group, some individual and in different states.
         list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
             $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
@@ -1591,6 +1645,8 @@ public function test_get_conversations_favourite_conversations_single(): void {
      * Test verifying the behaviour of get_conversations() when fetching favourite conversations.
      */
     public function test_get_conversations_favourite_conversations(): void {
+        $this->resetAfterTest();
+
         // Get a bunch of conversations, some group, some individual and in different states.
         list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
             $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
@@ -1659,6 +1715,8 @@ public function test_get_conversations_favourite_conversations(): void {
     public function test_get_conversations_user_in_group_and_individual_chat(): void {
         $this->resetAfterTest();
 
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
@@ -1715,6 +1773,8 @@ public function test_get_conversations_user_in_group_and_individual_chat(): void
      */
     public function test_get_conversations_group_linked(): void {
         global $CFG, $DB;
+        $this->resetAfterTest();
+
 
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
@@ -2070,6 +2130,8 @@ public function get_conversations_mixed_provider() {
      */
     public function test_create_conversation_duplicate_conversations(): void {
         global $DB;
+        $this->resetAfterTest();
+
         $user1 = $this::getDataGenerator()->create_user();
 
         api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_SELF, [$user1->id]);
@@ -2091,6 +2153,10 @@ public function test_create_conversation_duplicate_conversations(): void {
      */
     public function test_get_conversations_mixed($usersdata, $contacts, $messagesdata, $expectations): void {
         global $DB;
+        $this->resetAfterTest();
+
+
+        $this->redirectMessages();
 
         // Create all of the users.
         $users = array();
@@ -2115,7 +2181,7 @@ public function test_get_conversations_mixed($usersdata, $contacts, $messagesdat
             $subject    = $messagedata['subject'];
 
             if (isset($messagedata['state']) && $messagedata['state'] == 'unread') {
-                $messageid = $this->send_fake_message($from, $to, $subject);
+                $messageid = testhelper::send_fake_message($from, $to, $subject);
             } else {
                 // If there is no state, or the state is not 'unread', assume the message is read.
                 $messageid = message_post_message($from, $to, $subject, FORMAT_PLAIN);
@@ -2152,6 +2218,8 @@ public function test_get_conversations_mixed($usersdata, $contacts, $messagesdat
      * Tests retrieving user contacts.
      */
     public function test_get_user_contacts(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
 
@@ -2212,6 +2280,8 @@ public function test_get_user_contacts(): void {
      * Tests retrieving conversation messages.
      */
     public function test_get_conversation_messages(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -2267,6 +2337,8 @@ public function test_get_conversation_messages(): void {
      * Tests retrieving group conversation messages.
      */
     public function test_get_group_conversation_messages(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -2330,6 +2402,8 @@ public function test_get_group_conversation_messages(): void {
      * Test verifying the sorting param for get_conversation_messages is respected().
      */
     public function test_get_conversation_messages_sorting(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -2397,6 +2471,8 @@ public function test_get_conversation_messages_sorting(): void {
      * Test retrieving conversation messages by providing a minimum timecreated value.
      */
     public function test_get_conversation_messages_time_from_only(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -2469,6 +2545,8 @@ public function test_get_conversation_messages_time_from_only(): void {
      * Test retrieving conversation messages by providing a maximum timecreated value.
      */
     public function test_get_conversation_messages_time_to_only(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -2542,6 +2620,8 @@ public function test_get_conversation_messages_time_to_only(): void {
      * Test retrieving conversation messages by providing a minimum and maximum timecreated value.
      */
     public function test_get_conversation_messages_time_from_and_to(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -2591,6 +2671,8 @@ public function test_get_conversation_messages_time_from_and_to(): void {
      * Test retrieving conversation messages by providing a limitfrom value.
      */
     public function test_get_conversation_messages_limitfrom_only(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -2638,6 +2720,8 @@ public function test_get_conversation_messages_limitfrom_only(): void {
      * Test retrieving conversation messages by providing a limitnum value.
      */
     public function test_get_conversation_messages_limitnum(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -2684,6 +2768,8 @@ public function test_get_conversation_messages_limitnum(): void {
      * Tests retrieving most recent conversation message.
      */
     public function test_get_most_recent_conversation_message(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -2717,6 +2803,8 @@ public function test_get_most_recent_conversation_message(): void {
      * Tests checking if a user can mark all messages as read.
      */
     public function test_can_mark_all_messages_as_read(): void {
+        $this->resetAfterTest();
+
         // Set as the admin.
         $this->setAdminUser();
 
@@ -2727,10 +2815,10 @@ public function test_can_mark_all_messages_as_read(): void {
 
         // Send some messages back and forth.
         $time = 1;
-        $this->send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
-        $this->send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
-        $this->send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
-        $this->send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
+        testhelper::send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
+        testhelper::send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
+        testhelper::send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
+        testhelper::send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
 
         $conversationid = api::get_conversation_between_users([$user1->id, $user2->id]);
 
@@ -2754,6 +2842,8 @@ public function test_can_mark_all_messages_as_read(): void {
      * Tests checking if a user can delete a conversation.
      */
     public function test_can_delete_conversation(): void {
+        $this->resetAfterTest();
+
         // Set as the admin.
         $this->setAdminUser();
 
@@ -2763,10 +2853,10 @@ public function test_can_delete_conversation(): void {
 
         // Send some messages back and forth.
         $time = 1;
-        $this->send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
-        $this->send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
-        $this->send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
-        $this->send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
+        testhelper::send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
+        testhelper::send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
+        testhelper::send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
+        testhelper::send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
 
         $conversationid = api::get_conversation_between_users([$user1->id, $user2->id]);
 
@@ -2788,6 +2878,8 @@ public function test_can_delete_conversation(): void {
      */
     public function test_delete_conversation_by_id(): void {
         global $DB;
+        $this->resetAfterTest();
+
 
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
@@ -2802,10 +2894,10 @@ public function test_delete_conversation_by_id(): void {
 
         // Send some messages back and forth.
         $time = 1;
-        $m1id = $this->send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
-        $m2id = $this->send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
-        $m3id = $this->send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
-        $m4id = $this->send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
+        $m1id = testhelper::send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
+        $m2id = testhelper::send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
+        $m3id = testhelper::send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
+        $m4id = testhelper::send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
         $m5id = testhelper::send_fake_message_to_conversation($user1, $sc1->id, 'Hi to myself!', $time + 5);
         $m6id = testhelper::send_fake_message_to_conversation($user2, $sc2->id, 'I am talking with myself', $time + 6);
 
@@ -2877,19 +2969,19 @@ public function test_count_unread_conversations(): void {
         $this->setUser($user1);
 
         // Send some messages back and forth, have some different conversations with different users.
-        $this->send_fake_message($user1, $user2, 'Yo!');
-        $this->send_fake_message($user2, $user1, 'Sup mang?');
-        $this->send_fake_message($user1, $user2, 'Writing PHPUnit tests!');
-        $this->send_fake_message($user2, $user1, 'Word.');
+        testhelper::send_fake_message($user1, $user2, 'Yo!');
+        testhelper::send_fake_message($user2, $user1, 'Sup mang?');
+        testhelper::send_fake_message($user1, $user2, 'Writing PHPUnit tests!');
+        testhelper::send_fake_message($user2, $user1, 'Word.');
 
-        $this->send_fake_message($user1, $user3, 'Booyah');
-        $this->send_fake_message($user3, $user1, 'Whaaat?');
-        $this->send_fake_message($user1, $user3, 'Nothing.');
-        $this->send_fake_message($user3, $user1, 'Cool.');
+        testhelper::send_fake_message($user1, $user3, 'Booyah');
+        testhelper::send_fake_message($user3, $user1, 'Whaaat?');
+        testhelper::send_fake_message($user1, $user3, 'Nothing.');
+        testhelper::send_fake_message($user3, $user1, 'Cool.');
 
-        $this->send_fake_message($user1, $user4, 'Hey mate, you see the new messaging UI in Moodle?');
-        $this->send_fake_message($user4, $user1, 'Yah brah, it\'s pretty rad.');
-        $this->send_fake_message($user1, $user4, 'Dope.');
+        testhelper::send_fake_message($user1, $user4, 'Hey mate, you see the new messaging UI in Moodle?');
+        testhelper::send_fake_message($user4, $user1, 'Yah brah, it\'s pretty rad.');
+        testhelper::send_fake_message($user1, $user4, 'Dope.');
 
         // Check the amount for the current user.
         $this->assertEquals(3, api::count_unread_conversations());
@@ -2914,19 +3006,19 @@ public function test_count_unread_conversations_disabled(): void {
         $this->setUser($user1);
 
         // Send some messages back and forth, have some different conversations with different users.
-        $this->send_fake_message($user1, $user2, 'Yo!');
-        $this->send_fake_message($user2, $user1, 'Sup mang?');
-        $this->send_fake_message($user1, $user2, 'Writing PHPUnit tests!');
-        $this->send_fake_message($user2, $user1, 'Word.');
+        testhelper::send_fake_message($user1, $user2, 'Yo!');
+        testhelper::send_fake_message($user2, $user1, 'Sup mang?');
+        testhelper::send_fake_message($user1, $user2, 'Writing PHPUnit tests!');
+        testhelper::send_fake_message($user2, $user1, 'Word.');
 
-        $this->send_fake_message($user1, $user3, 'Booyah');
-        $this->send_fake_message($user3, $user1, 'Whaaat?');
-        $this->send_fake_message($user1, $user3, 'Nothing.');
-        $this->send_fake_message($user3, $user1, 'Cool.');
+        testhelper::send_fake_message($user1, $user3, 'Booyah');
+        testhelper::send_fake_message($user3, $user1, 'Whaaat?');
+        testhelper::send_fake_message($user1, $user3, 'Nothing.');
+        testhelper::send_fake_message($user3, $user1, 'Cool.');
 
-        $this->send_fake_message($user1, $user4, 'Hey mate, you see the new messaging UI in Moodle?');
-        $this->send_fake_message($user4, $user1, 'Yah brah, it\'s pretty rad.');
-        $this->send_fake_message($user1, $user4, 'Dope.');
+        testhelper::send_fake_message($user1, $user4, 'Hey mate, you see the new messaging UI in Moodle?');
+        testhelper::send_fake_message($user4, $user1, 'Yah brah, it\'s pretty rad.');
+        testhelper::send_fake_message($user1, $user4, 'Dope.');
 
         // Let's disable the last conversation.
         $conversationid = api::get_conversation_between_users([$user1->id, $user4->id]);
@@ -2940,6 +3032,8 @@ public function test_count_unread_conversations_disabled(): void {
      * Tests deleting a conversation.
      */
     public function test_get_all_message_preferences(): void {
+        $this->resetAfterTest();
+
         $user = self::getDataGenerator()->create_user();
         $this->setUser($user);
 
@@ -2959,6 +3053,8 @@ public function test_get_all_message_preferences(): void {
      * Tests the user can send a message.
      */
     public function test_can_send_message(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -2982,6 +3078,8 @@ public function test_can_send_message(): void {
      */
     public function test_can_send_message_without_sendmessage_cap(): void {
         global $DB;
+        $this->resetAfterTest();
+
 
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
@@ -3003,6 +3101,8 @@ public function test_can_send_message_without_sendmessage_cap(): void {
      * Tests the user can send a message when they are contact.
      */
     public function test_can_send_message_when_contact(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -3025,6 +3125,8 @@ public function test_can_send_message_when_contact(): void {
      * has requested messages only from contacts.
      */
     public function test_can_send_message_when_not_contact(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -3043,6 +3145,8 @@ public function test_can_send_message_when_not_contact(): void {
      * Tests the user can't send a message if they are blocked.
      */
     public function test_can_send_message_when_blocked(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -3062,6 +3166,8 @@ public function test_can_send_message_when_blocked(): void {
      * even if they are not a contact and are not members of the same course.
      */
     public function test_can_send_message_site_messaging_setting(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -3111,6 +3217,8 @@ public function test_can_send_message_site_messaging_setting(): void {
      */
     public function test_can_send_message_with_messageanyuser_cap(): void {
         global $DB;
+        $this->resetAfterTest();
+
 
         // Create some users.
         $teacher1 = self::getDataGenerator()->create_user();
@@ -3246,6 +3354,8 @@ public function test_can_send_message_even_if_blocked_shared_course_with_message
      * Verify the expected behaviour of the can_send_message_to_conversation() method for authenticated users with default settings.
      */
     public function test_can_send_message_to_conversation_basic(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -3297,6 +3407,8 @@ public function test_can_send_message_to_conversation_basic(): void {
      */
     public function test_can_send_message_to_conversation_sendmessage_cap(): void {
         global $DB;
+        $this->resetAfterTest();
+
 
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -3345,6 +3457,8 @@ public function test_can_send_message_to_conversation_sendmessage_cap(): void {
      */
     public function test_can_send_message_to_conversation_messageanyuser_cap(): void {
         global $DB;
+        $this->resetAfterTest();
+
 
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -3396,6 +3510,8 @@ public function test_can_send_message_to_conversation_messageanyuser_cap(): void
      * Test verifying that users cannot send messages to conversations they are not a part of.
      */
     public function test_can_send_message_to_conversation_non_member(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -3441,6 +3557,8 @@ public function test_can_send_message_to_conversation_non_member(): void {
      * Test verifying the behaviour of the can_send_message_to_conversation method when privacy is set to contacts only.
      */
     public function test_can_send_message_to_conversation_privacy_contacts_only(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -3484,6 +3602,8 @@ public function test_can_send_message_to_conversation_privacy_contacts_only(): v
      * Test verifying the behaviour of the can_send_message_to_conversation method when privacy is set to contacts / course members.
      */
     public function test_can_send_message_to_conversation_privacy_contacts_course(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -3532,6 +3652,8 @@ public function test_can_send_message_to_conversation_privacy_contacts_course():
      * Test verifying the behaviour of the can_send_message_to_conversation method when privacy is set to any user.
      */
     public function test_can_send_message_to_conversation_privacy_sitewide(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -3586,6 +3708,8 @@ public function test_can_send_message_to_conversation_privacy_sitewide(): void {
      * Test verifying the behaviour of the can_send_message_to_conversation method when a user is blocked.
      */
     public function test_can_send_message_to_conversation_when_blocked(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
@@ -3630,6 +3754,8 @@ public function test_can_send_message_to_conversation_when_blocked(): void {
      * Tests get_user_privacy_messaging_preference method.
      */
     public function test_get_user_privacy_messaging_preference(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -3678,6 +3804,8 @@ public function test_get_user_privacy_messaging_preference(): void {
      * Tes get_message_processor api.
      */
     public function test_get_message_processor(): void {
+        $this->resetAfterTest();
+
         $processors = get_message_processors(true);
         if (empty($processors)) {
             $this->markTestSkipped("No message processors found");
@@ -3713,6 +3841,8 @@ public function test_get_message_processor(): void {
      * Test method update_processor_status.
      */
     public function test_update_processor_status(): void {
+        $this->resetAfterTest();
+
         $processors = get_message_processors();
         if (empty($processors)) {
             $this->markTestSkipped("No message processors found");
@@ -3768,6 +3898,8 @@ public function is_user_enabled() {
      */
     public function test_get_blocked_users(): void {
         global $USER;
+        $this->resetAfterTest();
+
 
         // Set this user as the admin.
         $this->setAdminUser();
@@ -3795,14 +3927,15 @@ public function test_get_blocked_users(): void {
      */
     public function test_mark_message_as_read(): void {
         global $DB;
+        $this->resetAfterTest();
 
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
-        $this->send_fake_message($user1, $user2);
-        $m2id = $this->send_fake_message($user1, $user2);
-        $this->send_fake_message($user2, $user1);
-        $m4id = $this->send_fake_message($user2, $user1);
+        testhelper::send_fake_message($user1, $user2);
+        $m2id = testhelper::send_fake_message($user1, $user2);
+        testhelper::send_fake_message($user2, $user1);
+        $m4id = testhelper::send_fake_message($user2, $user1);
 
         $m2 = $DB->get_record('messages', ['id' => $m2id]);
         $m4 = $DB->get_record('messages', ['id' => $m4id]);
@@ -3835,14 +3968,15 @@ public function test_mark_message_as_read(): void {
      */
     public function test_mark_notification_as_read(): void {
         global $DB;
+        $this->resetAfterTest();
 
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
-        $this->send_fake_message($user1, $user2, 'Notification 1', 1);
-        $n2id = $this->send_fake_message($user1, $user2, 'Notification 2', 1);
-        $this->send_fake_message($user2, $user1, 'Notification 3', 1);
-        $n4id = $this->send_fake_message($user2, $user1, 'Notification 4', 1);
+        testhelper::send_fake_message($user1, $user2, 'Notification 1', 1);
+        $n2id = testhelper::send_fake_message($user1, $user2, 'Notification 2', 1);
+        testhelper::send_fake_message($user2, $user1, 'Notification 3', 1);
+        $n4id = testhelper::send_fake_message($user2, $user1, 'Notification 4', 1);
 
         $n2 = $DB->get_record('notifications', ['id' => $n2id]);
         $n4 = $DB->get_record('notifications', ['id' => $n4id]);
@@ -3863,6 +3997,8 @@ public function test_mark_notification_as_read(): void {
      * Test a conversation is not returned if there is none.
      */
     public function test_get_conversation_between_users_no_conversation(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
@@ -3873,14 +4009,20 @@ public function test_get_conversation_between_users_no_conversation(): void {
      * Test count_conversation_members for non existing conversation.
      */
     public function test_count_conversation_members_no_existing_conversation(): void {
-        $this->assertEquals(0,
-            api::count_conversation_members(0));
+        $this->resetAfterTest();
+
+        $this->assertEquals(
+            0,
+            api::count_conversation_members(0)
+        );
     }
 
     /**
      * Test count_conversation_members for existing conversation.
      */
     public function test_count_conversation_members_existing_conversation(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
@@ -3901,6 +4043,8 @@ public function test_count_conversation_members_existing_conversation(): void {
      * Test add_members_to_conversation for an individual conversation.
      */
     public function test_add_members_to_individual_conversation(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
@@ -3922,6 +4066,8 @@ public function test_add_members_to_individual_conversation(): void {
      * Test add_members_to_conversation for existing conversation.
      */
     public function test_add_members_to_existing_conversation(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
@@ -3944,6 +4090,8 @@ public function test_add_members_to_existing_conversation(): void {
      * Test add_members_to_conversation for non existing conversation.
      */
     public function test_add_members_to_no_existing_conversation(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
 
         // Throw dml_missing_record_exception for non existing conversation.
@@ -3955,6 +4103,8 @@ public function test_add_members_to_no_existing_conversation(): void {
      * Test add_member_to_conversation for non existing user.
      */
     public function test_add_members_to_no_existing_user(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
@@ -3977,6 +4127,8 @@ public function test_add_members_to_no_existing_user(): void {
      * Test add_members_to_conversation for current conversation member.
      */
     public function test_add_members_to_current_conversation_member(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
@@ -3999,6 +4151,8 @@ public function test_add_members_to_current_conversation_member(): void {
      * Test add_members_to_conversation for multiple users.
      */
     public function test_add_members_for_multiple_users(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
@@ -4022,6 +4176,8 @@ public function test_add_members_for_multiple_users(): void {
      * Test add_members_to_conversation for multiple users, included non existing and current conversation members
      */
     public function test_add_members_for_multiple_not_valid_users(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
@@ -4045,6 +4201,8 @@ public function test_add_members_for_multiple_not_valid_users(): void {
      * Test remove_members_from_conversation for individual conversation.
      */
     public function test_remove_members_from_individual_conversation(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
@@ -4065,6 +4223,8 @@ public function test_remove_members_from_individual_conversation(): void {
      * Test remove_members_from_conversation for existing conversation.
      */
     public function test_remove_members_from_existing_conversation(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
@@ -4086,6 +4246,8 @@ public function test_remove_members_from_existing_conversation(): void {
      * Test remove_members_from_conversation for non existing conversation.
      */
     public function test_remove_members_from_no_existing_conversation(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
 
         // Throw dml_missing_record_exception for non existing conversation.
@@ -4097,6 +4259,8 @@ public function test_remove_members_from_no_existing_conversation(): void {
      * Test remove_members_from_conversation for non existing user.
      */
     public function test_remove_members_for_no_existing_user(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
@@ -4118,6 +4282,8 @@ public function test_remove_members_for_no_existing_user(): void {
      * Test remove_members_from_conversation for multiple users.
      */
     public function test_remove_members_for_multiple_users(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
@@ -4142,6 +4308,8 @@ public function test_remove_members_for_multiple_users(): void {
      * Test remove_members_from_conversation for multiple non valid users.
      */
     public function test_remove_members_for_multiple_no_valid_users(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
@@ -4168,6 +4336,8 @@ public function test_remove_members_for_multiple_no_valid_users(): void {
      * Test count_conversation_members for empty conversation.
      */
     public function test_count_conversation_members_empty_conversation(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
@@ -4191,6 +4361,7 @@ public function test_count_conversation_members_empty_conversation(): void {
      */
     public function test_can_create_contact_request(): void {
         global $CFG;
+        $this->resetAfterTest();
 
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -4222,6 +4393,7 @@ public function test_can_create_contact_request(): void {
      */
     public function test_create_contact_request(): void {
         global $DB;
+        $this->resetAfterTest();
 
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -4245,6 +4417,7 @@ public function test_create_contact_request(): void {
      */
     public function test_confirm_contact_request(): void {
         global $DB;
+        $this->resetAfterTest();
 
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -4270,6 +4443,7 @@ public function test_confirm_contact_request(): void {
      */
     public function test_decline_contact_request(): void {
         global $DB;
+        $this->resetAfterTest();
 
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -4287,6 +4461,7 @@ public function test_decline_contact_request(): void {
      */
     public function test_get_contact_requests(): void {
         global $PAGE;
+        $this->resetAfterTest();
 
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -4320,6 +4495,7 @@ public function test_get_contact_requests(): void {
      * Test the get_contact_requests() function when the user has blocked the sender of the request.
      */
     public function test_get_contact_requests_blocked_sender(): void {
+        $this->resetAfterTest();
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
@@ -4370,6 +4546,7 @@ public function test_get_contact_requests_with_limits(): void {
      */
     public function test_add_contact(): void {
         global $DB;
+        $this->resetAfterTest();
 
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -4391,6 +4568,7 @@ public function test_add_contact(): void {
      */
     public function test_remove_contact(): void {
         global $DB;
+        $this->resetAfterTest();
 
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -4406,6 +4584,7 @@ public function test_remove_contact(): void {
      */
     public function test_block_user(): void {
         global $DB;
+        $this->resetAfterTest();
 
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -4427,6 +4606,7 @@ public function test_block_user(): void {
      */
     public function test_unblock_user(): void {
         global $DB;
+        $this->resetAfterTest();
 
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -4442,6 +4622,7 @@ public function test_unblock_user(): void {
      */
     public function test_mute_conversation(): void {
         global $DB;
+        $this->resetAfterTest();
 
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -4473,6 +4654,7 @@ public function test_mute_conversation(): void {
      */
     public function test_unmute_conversation(): void {
         global $DB;
+        $this->resetAfterTest();
 
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -4496,6 +4678,8 @@ public function test_unmute_conversation(): void {
      * Test if a conversation is muted.
      */
     public function test_is_conversation_muted(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
@@ -4519,6 +4703,8 @@ public function test_is_conversation_muted(): void {
      * Test is contact check.
      */
     public function test_is_contact(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
@@ -4534,6 +4720,8 @@ public function test_is_contact(): void {
      * Test get contact.
      */
     public function test_get_contact(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
@@ -4549,6 +4737,8 @@ public function test_get_contact(): void {
      * Test is blocked checked.
      */
     public function test_is_blocked(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
@@ -4565,6 +4755,8 @@ public function test_is_blocked(): void {
      * Test the contact request exist check.
      */
     public function test_does_contact_request_exist(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
@@ -4581,6 +4773,8 @@ public function test_does_contact_request_exist(): void {
      * Test the get_received_contact_requests_count() function.
      */
     public function test_get_received_contact_requests_count(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
@@ -4605,6 +4799,8 @@ public function test_get_received_contact_requests_count(): void {
      * Test the get_received_contact_requests_count() function when the user has blocked the sender of the request.
      */
     public function test_get_received_contact_requests_count_blocked_sender(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
@@ -4622,6 +4818,8 @@ public function test_get_received_contact_requests_count_blocked_sender(): void
      * Test the get_contact_requests_between_users() function.
      */
     public function test_get_contact_requests_between_users(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
@@ -4670,6 +4868,8 @@ public function test_get_contact_requests_between_users(): void {
      * Test the user in conversation check.
      */
     public function test_is_user_in_conversation(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
@@ -4689,6 +4889,8 @@ public function test_is_user_in_conversation(): void {
      * Test the user in conversation check when they are not.
      */
     public function test_is_user_in_conversation_when_not(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
@@ -4710,6 +4912,7 @@ public function test_is_user_in_conversation_when_not(): void {
      */
     public function test_can_create_group_conversation(): void {
         global $CFG;
+        $this->resetAfterTest();
 
         $student = self::getDataGenerator()->create_user();
         $teacher = self::getDataGenerator()->create_user();
@@ -4738,6 +4941,8 @@ public function test_can_create_group_conversation(): void {
      * Test creating an individual conversation.
      */
     public function test_create_conversation_individual(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
@@ -4770,6 +4975,8 @@ public function test_create_conversation_individual(): void {
      * Test creating a group conversation.
      */
     public function test_create_conversation_group(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
@@ -4824,6 +5031,8 @@ public function test_create_conversation_individual_too_many_members(): void {
      * Test create message conversation with area.
      */
     public function test_create_conversation_with_area(): void {
+        $this->resetAfterTest();
+
         $contextid = 111;
         $itemid = 222;
         $name = 'Name of conversation';
@@ -4849,6 +5058,8 @@ public function test_create_conversation_with_area(): void {
      * Test get_conversation_by_area.
      */
     public function test_get_conversation_by_area(): void {
+        $this->resetAfterTest();
+
         $contextid = 111;
         $itemid = 222;
         $name = 'Name of conversation';
@@ -4877,6 +5088,7 @@ public function test_get_conversation_by_area(): void {
      */
     public function test_enable_conversation(): void {
         global $DB;
+        $this->resetAfterTest();
 
         $name = 'Name of conversation';
 
@@ -4898,6 +5110,8 @@ public function test_enable_conversation(): void {
      */
     public function test_disable_conversation(): void {
         global $DB;
+        $this->resetAfterTest();
+
 
         $name = 'Name of conversation';
 
@@ -4919,6 +5133,7 @@ public function test_disable_conversation(): void {
      */
     public function test_update_conversation_name(): void {
         global $DB;
+        $this->resetAfterTest();
 
         $conversation = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP, []);
 
@@ -4935,6 +5150,8 @@ public function test_update_conversation_name(): void {
      * Test returning members in a conversation with no contact requests.
      */
     public function test_get_conversation_members(): void {
+        $this->resetAfterTest();
+
         $lastaccess = new \stdClass();
         $lastaccess->lastaccess = time();
 
@@ -5006,6 +5223,8 @@ public function test_get_conversation_members(): void {
      * Test returning members in a conversation with contact requests.
      */
     public function test_get_conversation_members_with_contact_requests(): void {
+        $this->resetAfterTest();
+
         $lastaccess = new \stdClass();
         $lastaccess->lastaccess = time();
 
@@ -5097,6 +5316,8 @@ public function test_get_conversation_members_with_contact_requests(): void {
      * Test returning members of a self conversation.
      */
     public function test_get_conversation_members_with_self_conversation(): void {
+        $this->resetAfterTest();
+
         $lastaccess = new \stdClass();
         $lastaccess->lastaccess = time();
 
@@ -5124,6 +5345,8 @@ public function test_get_conversation_members_with_self_conversation(): void {
      * Test verifying that messages can be sent to existing individual conversations.
      */
     public function test_send_message_to_conversation_individual_conversation(): void {
+        $this->resetAfterTest();
+
         // Get a bunch of conversations, some group, some individual and in different states.
         list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
             $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
@@ -5174,6 +5397,7 @@ public function test_send_message_to_conversation_individual_conversation(): voi
      * Test verifying that messages can be sent to existing group conversations.
      */
     public function test_send_message_to_conversation_group_conversation(): void {
+        $this->resetAfterTest();
         // Get a bunch of conversations, some group, some individual and in different states.
         list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
             $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
@@ -5225,6 +5449,7 @@ public function test_send_message_to_conversation_group_conversation(): void {
      */
     public function test_send_message_to_conversation_linked_group_conversation(): void {
         global $CFG, $PAGE;
+        $this->resetAfterTest();
 
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
@@ -5287,6 +5512,8 @@ public function test_send_message_to_conversation_linked_group_conversation(): v
      * Test verifying that messages cannot be sent to conversations that don't exist.
      */
     public function test_send_message_to_conversation_non_existent_conversation(): void {
+        $this->resetAfterTest();
+
         // Get a bunch of conversations, some group, some individual and in different states.
         list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
             $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
@@ -5299,6 +5526,8 @@ public function test_send_message_to_conversation_non_existent_conversation(): v
      * Test verifying that messages cannot be sent to conversations by users who are not members.
      */
     public function test_send_message_to_conversation_non_member(): void {
+        $this->resetAfterTest();
+
         // Get a bunch of conversations, some group, some individual and in different states.
         list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
             $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
@@ -5318,6 +5547,8 @@ public function test_send_message_to_conversation_non_member(): void {
      * Test verifying that messages cannot be sent to conversations by users who are not members.
      */
     public function test_send_message_to_conversation_blocked_user(): void {
+        $this->resetAfterTest();
+
         // Get a bunch of conversations, some group, some individual and in different states.
         list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
             $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
@@ -5750,6 +5981,8 @@ public function test_get_conversation_counts(
         $expectedunreadcounts,
         $deletedusers
     ): void {
+        $this->resetAfterTest();
+
         $generator = $this->getDataGenerator();
         $users = [
             $generator->create_user(),
@@ -5827,6 +6060,8 @@ public function test_get_conversation_counts(
      * Test the count_contacts() function.
      */
     public function test_count_contacts(): void {
+        $this->resetAfterTest();
+
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
@@ -6180,6 +6415,8 @@ public function test_delete_message_for_all_users_individual_conversation(): voi
      * messages but keep the return structure to not break when called from the ws.
      */
     public function test_get_conversation_messages_timefrom_higher_than_last_timecreated(): void {
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
diff --git a/message/tests/event/events_test.php b/message/tests/event/events_test.php
index 660245406d807..b004452086c91 100644
--- a/message/tests/event/events_test.php
+++ b/message/tests/event/events_test.php
@@ -25,11 +25,7 @@
 
 namespace core_message\event;
 
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-
-require_once($CFG->dirroot . '/message/tests/messagelib_test.php');
+use core_message\tests\helper as testhelper;
 
 /**
  * Class containing the tests for message related events.
@@ -39,24 +35,15 @@
  * @copyright 2014 Mark Nelson <markn@moodle.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class events_test extends \core_message\messagelib_test {
-
-    /**
-     * Test set up.
-     *
-     * This is executed before running any test in this file.
-     */
-    public function setUp(): void {
-        parent::setUp();
-        $this->resetAfterTest();
-    }
-
+final class events_test extends \advanced_testcase {
     /**
      * Test the message contact added event.
      */
     public function test_message_contact_added(): void {
         global $USER;
 
+        $this->resetAfterTest();
+
         // Set this user as the admin.
         $this->setAdminUser();
 
@@ -82,6 +69,8 @@ public function test_message_contact_added(): void {
     public function test_message_contact_removed(): void {
         global $USER;
 
+        $this->resetAfterTest();
+
         // Set this user as the admin.
         $this->setAdminUser();
 
@@ -110,6 +99,8 @@ public function test_message_contact_removed(): void {
     public function test_message_user_blocked(): void {
         global $USER;
 
+        $this->resetAfterTest();
+
         // Set this user as the admin.
         $this->setAdminUser();
 
@@ -136,6 +127,8 @@ public function test_message_user_blocked(): void {
     public function test_message_user_unblocked(): void {
         global $USER;
 
+        $this->resetAfterTest();
+
         // Set this user as the admin.
         $this->setAdminUser();
 
@@ -197,7 +190,6 @@ public function test_message_sent(): void {
     }
 
     public function test_mesage_sent_without_other_courseid(): void {
-
         // Creating a message_sent event without other[courseid] leads to exception.
         $this->expectException('coding_exception');
         $this->expectExceptionMessage('The \'courseid\' value must be set in other');
@@ -213,6 +205,8 @@ public function test_mesage_sent_without_other_courseid(): void {
     }
 
     public function test_mesage_sent_via_create_from_ids(): void {
+        $this->resetAfterTest();
+
         // Containing courseid.
         $event = \core\event\message_sent::create_from_ids(1, 2, 3, 4);
 
@@ -239,6 +233,8 @@ public function test_mesage_sent_via_create_from_ids(): void {
      * processor code is called during testing.
      */
     public function test_group_message_sent(): void {
+        $this->resetAfterTest();
+
         $event = \core\event\group_message_sent::create([
             'objectid' => 3,
             'userid' => 1,
@@ -307,6 +303,8 @@ public function test_group_message_sent_without_other_conversationid(): void {
      * Test the group message sent event using the create_from_ids() method.
      */
     public function test_group_message_sent_via_create_from_ids(): void {
+        $this->resetAfterTest();
+
         // Fields are: userfromid, conversationid, messageid, courseid.
         $event = \core\event\group_message_sent::create_from_ids(1, 2, 3, 4);
 
@@ -332,11 +330,13 @@ public function test_group_message_sent_via_create_from_ids(): void {
     public function test_message_viewed(): void {
         global $DB;
 
+        $this->resetAfterTest();
+
         // Create users to send messages between.
         $user1 = $this->getDataGenerator()->create_user();
         $user2 = $this->getDataGenerator()->create_user();
 
-        $messageid = $this->send_fake_message($user1, $user2);
+        $messageid = testhelper::send_fake_message($user1, $user2);
 
         // Trigger and capture the event.
         $sink = $this->redirectEvents();
@@ -364,13 +364,15 @@ public function test_message_viewed(): void {
     public function test_message_deleted(): void {
         global $DB, $USER;
 
+        $this->resetAfterTest();
+
         $this->setAdminUser();
 
         // Create users to send messages between.
         $user1 = $this->getDataGenerator()->create_user();
         $user2 = $this->getDataGenerator()->create_user();
 
-        $messageid = $this->send_fake_message($user1, $user2);
+        $messageid = testhelper::send_fake_message($user1, $user2);
 
         // Trigger and capture the event.
         $sink = $this->redirectEvents();
@@ -392,7 +394,7 @@ public function test_message_deleted(): void {
         $this->setUser($user1);
 
         // Create a read message.
-        $messageid = $this->send_fake_message($user1, $user2);
+        $messageid = testhelper::send_fake_message($user1, $user2);
         $m = $DB->get_record('messages', ['id' => $messageid]);
         \core_message\api::mark_message_as_read($user2->id, $m);
 
@@ -420,6 +422,8 @@ public function test_message_deleted(): void {
     public function test_message_deleted_whole_conversation(): void {
         global $DB;
 
+        $this->resetAfterTest();
+
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -430,14 +434,14 @@ public function test_message_deleted_whole_conversation(): void {
         // Send some messages back and forth.
         $time = 1;
         $messages = [];
-        $messages[] = $this->send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
-        $messages[] = $this->send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
-        $messages[] = $this->send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
-        $messages[] = $this->send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
-        $messages[] = $this->send_fake_message($user1, $user2, 'You doing much?', 0, $time + 5);
-        $messages[] = $this->send_fake_message($user2, $user1, 'Nah', 0, $time + 6);
-        $messages[] = $this->send_fake_message($user1, $user2, 'You nubz0r!', 0, $time + 7);
-        $messages[] = $this->send_fake_message($user2, $user1, 'Ouch.', 0, $time + 8);
+        $messages[] = testhelper::send_fake_message($user1, $user2, 'Yo!', 0, $time + 1);
+        $messages[] = testhelper::send_fake_message($user2, $user1, 'Sup mang?', 0, $time + 2);
+        $messages[] = testhelper::send_fake_message($user1, $user2, 'Writing PHPUnit tests!', 0, $time + 3);
+        $messages[] = testhelper::send_fake_message($user2, $user1, 'Word.', 0, $time + 4);
+        $messages[] = testhelper::send_fake_message($user1, $user2, 'You doing much?', 0, $time + 5);
+        $messages[] = testhelper::send_fake_message($user2, $user1, 'Nah', 0, $time + 6);
+        $messages[] = testhelper::send_fake_message($user1, $user2, 'You nubz0r!', 0, $time + 7);
+        $messages[] = testhelper::send_fake_message($user2, $user1, 'Ouch.', 0, $time + 8);
 
         // Mark the last 4 messages as read.
         $m5 = $DB->get_record('messages', ['id' => $messages[4]]);
@@ -489,6 +493,8 @@ public function test_message_deleted_whole_conversation(): void {
      * Test the notification sent event.
      */
     public function test_notification_sent(): void {
+        $this->resetAfterTest();
+
         // Create a course.
         $course = $this->getDataGenerator()->create_course();
 
@@ -497,7 +503,7 @@ public function test_notification_sent(): void {
         $user2 = $this->getDataGenerator()->create_user();
 
         // Send a notification.
-        $notificationid = $this->send_fake_message($user1, $user2, 'Hello world!', 1);
+        $notificationid = testhelper::send_fake_message($user1, $user2, 'Hello world!', 1);
 
         // Containing courseid.
         $event = \core\event\notification_sent::create_from_ids($user1->id, $user2->id, $notificationid, $course->id);
@@ -525,6 +531,8 @@ public function test_notification_sent(): void {
     public function test_notification_sent_with_null_course(): void {
         $event = \core\event\notification_sent::create_from_ids(1, 1, 1, null);
 
+        $this->resetAfterTest();
+
         // Trigger and capture the event.
         $sink = $this->redirectEvents();
         $event->trigger();
@@ -542,12 +550,14 @@ public function test_notification_sent_with_null_course(): void {
     public function test_notification_viewed(): void {
         global $DB;
 
+        $this->resetAfterTest();
+
         // Create users to send notifications between.
         $user1 = $this->getDataGenerator()->create_user();
         $user2 = $this->getDataGenerator()->create_user();
 
         // Send a notification.
-        $notificationid = $this->send_fake_message($user1, $user2, 'Hello world!', 1);
+        $notificationid = testhelper::send_fake_message($user1, $user2, 'Hello world!', 1);
 
         // Trigger and capture the event.
         $sink = $this->redirectEvents();
diff --git a/message/tests/messagelib_test.php b/message/tests/messagelib_test.php
index 15103d9087ab7..888f1a0cef68d 100644
--- a/message/tests/messagelib_test.php
+++ b/message/tests/messagelib_test.php
@@ -18,11 +18,6 @@
 
 use core_message\tests\helper as testhelper;
 
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-require_once($CFG->dirroot . '/message/lib.php');
-
 /**
  * Test api's in message lib.
  *
@@ -31,88 +26,12 @@
  * @copyright 2014 Rajesh Taneja <rajesh@moodle.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class messagelib_test extends \advanced_testcase {
-
-    /** @var phpunit_message_sink keep track of messages. */
-    protected $messagesink = null;
-
-    /**
-     * Test set up.
-     *
-     * This is executed before running any test in this file.
-     */
-    public function setUp(): void {
-        parent::setUp();
-        $this->preventResetByRollback(); // Messaging is not compatible with transactions.
-        $this->messagesink = $this->redirectMessages();
-        $this->resetAfterTest();
-    }
+final class messagelib_test extends \advanced_testcase {
+    public static function setUpBeforeClass(): void {
+        global $CFG;
+        require_once($CFG->dirroot . '/message/lib.php');
 
-    /**
-     * Send a fake message.
-     *
-     * {@link message_send()} does not support transaction, this function will simulate a message
-     * sent from a user to another. We should stop using it once {@link message_send()} will support
-     * transactions. This is not clean at all, this is just used to add rows to the table.
-     *
-     * @param \stdClass $userfrom user object of the one sending the message.
-     * @param \stdClass $userto user object of the one receiving the message.
-     * @param string $message message to send.
-     * @param int $notification if the message is a notification.
-     * @param int $time the time the message was sent
-     * @return int the id of the message
-     */
-    protected function send_fake_message($userfrom, $userto, $message = 'Hello world!', $notification = 0, $time = 0) {
-        global $DB;
-
-        if (empty($time)) {
-            $time = time();
-        }
-
-        if ($notification) {
-            $record = new \stdClass();
-            $record->useridfrom = $userfrom->id;
-            $record->useridto = $userto->id;
-            $record->subject = 'No subject';
-            $record->fullmessage = $message;
-            $record->smallmessage = $message;
-            $record->timecreated = $time;
-
-            return $DB->insert_record('notifications', $record);
-        }
-
-        if ($userfrom->id == $userto->id) {
-            // It's a self conversation.
-            $conversation = \core_message\api::get_self_conversation($userfrom->id);
-            if (empty($conversation)) {
-                $conversation = \core_message\api::create_conversation(
-                    \core_message\api::MESSAGE_CONVERSATION_TYPE_SELF,
-                    [$userfrom->id]
-                );
-            }
-            $conversationid = $conversation->id;
-        } else if (!$conversationid = \core_message\api::get_conversation_between_users([$userfrom->id, $userto->id])) {
-            // It's an individual conversation between two different users.
-            $conversation = \core_message\api::create_conversation(
-                \core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-                [
-                    $userfrom->id,
-                    $userto->id
-                ]
-            );
-            $conversationid = $conversation->id;
-        }
-
-        // Ok, send the message.
-        $record = new \stdClass();
-        $record->useridfrom = $userfrom->id;
-        $record->conversationid = $conversationid;
-        $record->subject = 'No subject';
-        $record->fullmessage = $message;
-        $record->smallmessage = $message;
-        $record->timecreated = $time;
-
-        return $DB->insert_record('messages', $record);
+        parent::setUpBeforeClass();
     }
 
     /**
@@ -141,6 +60,8 @@ public function test_message_get_contacts(): void {
     public function test_message_search_users(): void {
         global $USER;
 
+        $this->resetAfterTest();
+
         // Set this user as the admin.
         $this->setAdminUser();
 
@@ -164,7 +85,7 @@ public function test_message_search_users(): void {
     public function test_message_get_messages(): void {
         global $DB;
 
-        $this->resetAfterTest(true);
+        $this->resetAfterTest();
 
         // Set this user as the admin.
         $this->setAdminUser();
@@ -236,7 +157,7 @@ public function test_message_get_messages(): void {
      * Test message_get_messages with only group conversations between users.
      */
     public function test_message_get_messages_only_group_conversations(): void {
-        $this->resetAfterTest(true);
+        $this->resetAfterTest();
 
         // Set this user as the admin.
         $this->setAdminUser();

From 529be7c9fe056c1364410498b20ad6728e3222a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20B=C3=B6sch?= <luca.boesch@bfh.ch>
Date: Thu, 27 Jun 2024 00:24:36 +0200
Subject: [PATCH 070/119] MDL-81959 qtype_multianswer: Margin between
 checkboxes and text

---
 question/type/multianswer/renderer.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/question/type/multianswer/renderer.php b/question/type/multianswer/renderer.php
index 41d711a51132a..8799cf9f06f71 100644
--- a/question/type/multianswer/renderer.php
+++ b/question/type/multianswer/renderer.php
@@ -616,6 +616,7 @@ public function subquestion(question_attempt $qa, question_display_options $opti
         $inputattributes = array(
             'type' => 'checkbox',
             'value' => 1,
+            'class' => 'form-check-input',
         );
         if ($options->readonly) {
             $inputattributes['disabled'] = 'disabled';
@@ -648,7 +649,7 @@ public function subquestion(question_attempt $qa, question_display_options $opti
                 unset($inputattributes['checked']);
             }
 
-            $class = 'r' . ($value % 2);
+            $class = 'form-check text-wrap text-break';
             if ($options->correctness && $isselected) {
                 $thisfrac = ($ans->fraction > 0) ? $answerfraction : 0;
                 $feedbackimg = $this->feedback_image($thisfrac);
@@ -661,7 +662,7 @@ public function subquestion(question_attempt $qa, question_display_options $opti
             $result .= html_writer::empty_tag('input', $inputattributes);
             $result .= html_writer::tag('label', $subq->format_text($ans->answer,
                                                                     $ans->answerformat, $qa, 'question', 'answer', $ansid),
-                                        array('for' => $inputattributes['id']));
+                                        ['for' => $inputattributes['id'], 'class' => 'form-check-label text-body']);
             $result .= $feedbackimg;
 
             if ($options->feedback && $isselected && trim($ans->feedback)) {
@@ -741,7 +742,7 @@ class qtype_multianswer_multiresponse_horizontal_renderer
     extends qtype_multianswer_multiresponse_vertical_renderer {
 
     protected function choice_wrapper_start($class) {
-        return html_writer::start_tag('td', array('class' => $class));
+        return html_writer::start_tag('td', ['class' => $class . ' form-check-inline']);
     }
 
     protected function choice_wrapper_end() {

From 85a83eb365b369c5da7fd39d5afcee35621e336b Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Thu, 27 Jun 2024 09:02:11 +0800
Subject: [PATCH 071/119] MDL-82183 output: Move render_context_header()

* With \core_renderer in lib/outputrenderers.php moved to its
standalone class in \core\output, the method ::render_context_header()
introduced in MDL-82160 also needs to be moved to the new class.
---
 .upgradenotes/MDL-82160-2024061112162023.yml |  4 ++--
 lib/classes/output/core_renderer.php         | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.upgradenotes/MDL-82160-2024061112162023.yml b/.upgradenotes/MDL-82160-2024061112162023.yml
index 06c5fbf8b1264..e52733da16dca 100644
--- a/.upgradenotes/MDL-82160-2024061112162023.yml
+++ b/.upgradenotes/MDL-82160-2024061112162023.yml
@@ -2,6 +2,6 @@ issueNumber: MDL-82160
 notes:
   theme:
     - message: >-
-        The method `core_renderer::render_context_header` has been deprecated
-        please use core_renderer::render($contextheader) instead
+        The method `\core\output\core_renderer::render_context_header` has been deprecated
+        please use `\core\output\core_renderer::render($contextheader)` instead
       type: deprecated
diff --git a/lib/classes/output/core_renderer.php b/lib/classes/output/core_renderer.php
index e56a8dbeeea8e..8b07c2e4e442a 100644
--- a/lib/classes/output/core_renderer.php
+++ b/lib/classes/output/core_renderer.php
@@ -4153,6 +4153,20 @@ public function context_header($headerinfo = null, $headinglevel = 1) {
         return $this->render($contextheader);
     }
 
+    /**
+     * Renders the header bar.
+     *
+     * @param context_header $contextheader Header bar object.
+     * @return string HTML for the header bar.
+     * @deprecated since 4.5 Please use core_renderer::render($contextheader) instead
+     * @todo MDL-82163 This will be deleted in Moodle 6.0.
+     */
+    #[\core\attribute\deprecated('core_renderer::render($contextheader)', since: '4.5', mdl: 'MDL-82160')]
+    protected function render_context_header(context_header $contextheader) {
+        $context = $contextheader->export_for_template($this);
+        return $this->render_from_template('core/context_header', $context);
+    }
+
     /**
      * Renders the skip links for the page.
      *

From 0c64966ea40e5461d62e56ca8f2a17934c875dc2 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Thu, 27 Jun 2024 09:21:04 +0800
Subject: [PATCH 072/119] MDL-82183 output: Additional fixes

* Use the namespaced classes in imports instead of their aliases
* Add missing imports
* Add moved `\core\output\local\action_menu\subpanel` in the upgrade
  notes
---
 .upgradenotes/MDL-82183-2024061304200941.yml                  | 2 ++
 lib/classes/output/action_menu.php                            | 2 +-
 .../output/requirements/fragment_requirements_manager.php     | 4 ++--
 lib/classes/output/theme_config.php                           | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.upgradenotes/MDL-82183-2024061304200941.yml b/.upgradenotes/MDL-82183-2024061304200941.yml
index 85b6df698dde7..b5a1efe8f97eb 100644
--- a/.upgradenotes/MDL-82183-2024061304200941.yml
+++ b/.upgradenotes/MDL-82183-2024061304200941.yml
@@ -31,6 +31,8 @@ notes:
 
         | `\context_header` | `\core\output\context_header` |
 
+        | `\core\output\local\action_menu\subpanel` | `\core\output\action_menu\subpanel` |
+
         | `\core_renderer_ajax` | `\core\output\core_renderer_ajax` |
 
         | `\core_renderer_cli` | `\core\output\core_renderer_cli` |
diff --git a/lib/classes/output/action_menu.php b/lib/classes/output/action_menu.php
index 588753e652e4f..261054f1f9665 100644
--- a/lib/classes/output/action_menu.php
+++ b/lib/classes/output/action_menu.php
@@ -17,10 +17,10 @@
 namespace core\output;
 
 use core\exception\coding_exception;
+use core\lang_string;
 use core\output\local\action_menu\subpanel;
 use core\output\action_menu\link as action_menu_link;
 use core\output\action_menu\filler as action_menu_filler;
-use lang_string;
 use moodle_page;
 use stdClass;
 
diff --git a/lib/classes/output/requirements/fragment_requirements_manager.php b/lib/classes/output/requirements/fragment_requirements_manager.php
index 5240c34ca49cf..1a4446d64f0dd 100644
--- a/lib/classes/output/requirements/fragment_requirements_manager.php
+++ b/lib/classes/output/requirements/fragment_requirements_manager.php
@@ -16,8 +16,8 @@
 
 namespace core\output\requirements;
 
-use html_writer;
-use js_writer;
+use core\output\html_writer;
+use core\output\js_writer;
 
 /**
  * This requirements manager captures the appropriate html for creating a fragment to
diff --git a/lib/classes/output/theme_config.php b/lib/classes/output/theme_config.php
index 3a056592ac01d..ae937078c932d 100644
--- a/lib/classes/output/theme_config.php
+++ b/lib/classes/output/theme_config.php
@@ -16,6 +16,7 @@
 
 namespace core\output;
 
+use block_manager;
 use cache;
 use cache_store;
 use core_component;
@@ -27,6 +28,7 @@
 use core_useragent;
 use core\context\system as context_system;
 use core\exception\coding_exception;
+use core\output\renderer_factory\renderer_factory_interface as renderer_factory;
 use core\output\renderer_factory\standard_renderer_factory;
 use dml_exception;
 use moodle_page;

From 31461eff5b8d61887871a5fea8033370ab7a6227 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 26 Jun 2024 09:34:47 +0800
Subject: [PATCH 073/119] MDL-63670 core_message: Coding style updates for unit
 tests

---
 message/classes/tests/helper.php    |    4 +-
 message/tests/api_test.php          | 1446 ++++++++++++++++-----------
 message/tests/event/events_test.php |   50 +-
 message/tests/messagelib_test.php   |   41 +-
 4 files changed, 917 insertions(+), 624 deletions(-)

diff --git a/message/classes/tests/helper.php b/message/classes/tests/helper.php
index 67836780bee74..c89634b56a556 100644
--- a/message/classes/tests/helper.php
+++ b/message/classes/tests/helper.php
@@ -36,8 +36,8 @@ class helper {
     /**
      * Send a fake message.
      *
-     * {@link message_send()} does not support transaction, this function will simulate a message
-     * sent from a user to another. We should stop using it once {@link message_send()} will support
+     * {@see message_send()} does not support transaction, this function will simulate a message
+     * sent from a user to another. We should stop using it once {@see message_send()} will support
      * transactions. This is not clean at all, this is just used to add rows to the table.
      *
      * @param \stdClass $userfrom user object of the one sending the message.
diff --git a/message/tests/api_test.php b/message/tests/api_test.php
index 53d3ad6e4638a..d1d3bf806104a 100644
--- a/message/tests/api_test.php
+++ b/message/tests/api_test.php
@@ -42,8 +42,8 @@ public function setUp(): void {
     public function test_mark_all_read_for_user_touser(): void {
         $this->resetAfterTest();
 
-        $sender = $this->getDataGenerator()->create_user(array('firstname' => 'Test1', 'lastname' => 'User1'));
-        $recipient = $this->getDataGenerator()->create_user(array('firstname' => 'Test2', 'lastname' => 'User2'));
+        $sender = $this->getDataGenerator()->create_user(['firstname' => 'Test1', 'lastname' => 'User1']);
+        $recipient = $this->getDataGenerator()->create_user(['firstname' => 'Test2', 'lastname' => 'User2']);
 
         testhelper::send_fake_message($sender, $recipient, 'Notification', 1);
         testhelper::send_fake_message($sender, $recipient, 'Notification', 1);
@@ -64,9 +64,6 @@ public function test_mark_all_read_for_user_touser(): void {
     public function test_mark_all_read_for_user_touser_with_fromuser(): void {
         $this->resetAfterTest();
 
-        $sender1 = $this->getDataGenerator()->create_user(array('firstname' => 'Test1', 'lastname' => 'User1'));
-        $sender2 = $this->getDataGenerator()->create_user(array('firstname' => 'Test3', 'lastname' => 'User3'));
-        $recipient = $this->getDataGenerator()->create_user(array('firstname' => 'Test2', 'lastname' => 'User2'));
         $sender1 = $this->getDataGenerator()->create_user(['firstname' => 'Test1', 'lastname' => 'User1']);
         $sender2 = $this->getDataGenerator()->create_user(['firstname' => 'Test3', 'lastname' => 'User3']);
         $recipient = $this->getDataGenerator()->create_user(['firstname' => 'Test2', 'lastname' => 'User2']);
@@ -101,7 +98,6 @@ public function test_count_blocked_users(): void {
         global $USER;
         $this->resetAfterTest();
 
-
         // Set this user as the admin.
         $this->setAdminUser();
 
@@ -155,18 +151,25 @@ public function test_message_search_users_messagingallusers_disabled(): void {
 
         // Enrol a user as a teacher in the course, and make the teacher role a course contact role.
         $this->getDataGenerator()->enrol_user($users[8]->id, $course2->id, 'editingteacher');
-        $teacherrole = $DB->get_record('role', array('shortname' => 'editingteacher'));
+        $teacherrole = $DB->get_record('role', ['shortname' => 'editingteacher']);
         set_config('coursecontact', $teacherrole->id);
 
         // Create individual conversations between some users, one contact and one non-contact.
-        $ic1 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            [$users[1]->id, $users[2]->id]);
-        $ic2 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            [$users[6]->id, $users[1]->id]);
+        $ic1 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$users[1]->id, $users[2]->id]
+        );
+        $ic2 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$users[6]->id, $users[1]->id]
+        );
 
         // Create a group conversation between 4 users, including a contact and a non-contact.
-        $gc1 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
-            [$users[1]->id, $users[2]->id, $users[4]->id, $users[7]->id], 'Project chat');
+        $gc1 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$users[1]->id, $users[2]->id, $users[4]->id, $users[7]->id],
+            'Project chat'
+        );
 
         // Set as the user performing the search.
         $this->setUser($users[1]);
@@ -204,8 +207,10 @@ public function test_message_search_users_messagingallusers_disabled(): void {
 
         // Verify the correct conversations were returned for the non-contacts.
         $this->assertCount(1, $noncontacts[1]->conversations);
-        $this->assertEquals(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            $noncontacts[1]->conversations[$ic2->id]->type);
+        $this->assertEquals(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            $noncontacts[1]->conversations[$ic2->id]->type
+        );
 
         $this->assertCount(1, $noncontacts[2]->conversations);
         $this->assertEquals(api::MESSAGE_CONVERSATION_TYPE_GROUP, $noncontacts[2]->conversations[$gc1->id]->type);
@@ -247,21 +252,28 @@ public function test_message_search_users_messagingallusers_enabled(): void {
 
         // Enrol a user as a teacher in the course, and make the teacher role a course contact role.
         $this->getDataGenerator()->enrol_user($users[9]->id, $course1->id, 'editingteacher');
-        $teacherrole = $DB->get_record('role', array('shortname' => 'editingteacher'));
+        $teacherrole = $DB->get_record('role', ['shortname' => 'editingteacher']);
         set_config('coursecontact', $teacherrole->id);
 
         // Get self-conversation.
         $selfconversation = api::get_self_conversation($users[1]->id);
 
         // Create individual conversations between some users, one contact and one non-contact.
-        $ic1 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            [$users[1]->id, $users[2]->id]);
-        $ic2 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            [$users[6]->id, $users[1]->id]);
+        $ic1 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$users[1]->id, $users[2]->id]
+        );
+        $ic2 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$users[6]->id, $users[1]->id]
+        );
 
         // Create a group conversation between 5 users, including a contact and a non-contact, and a user NOT in a shared course.
-        $gc1 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
-            [$users[1]->id, $users[2]->id, $users[4]->id, $users[7]->id, $users[8]->id], 'Project chat');
+        $gc1 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$users[1]->id, $users[2]->id, $users[4]->id, $users[7]->id, $users[8]->id],
+            'Project chat'
+        );
 
         // Set as the user performing the search.
         $this->setUser($users[1]);
@@ -303,12 +315,16 @@ public function test_message_search_users_messagingallusers_enabled(): void {
         $this->assertCount(0, $noncontacts[3]->conversations);
 
         // Verify the correct conversations were returned for the non-contacts.
-        $this->assertEquals(api::MESSAGE_CONVERSATION_TYPE_SELF,
-            $noncontacts[0]->conversations[$selfconversation->id]->type);
+        $this->assertEquals(
+            api::MESSAGE_CONVERSATION_TYPE_SELF,
+            $noncontacts[0]->conversations[$selfconversation->id]->type
+        );
 
         $this->assertCount(1, $noncontacts[1]->conversations);
-        $this->assertEquals(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            $noncontacts[1]->conversations[$ic2->id]->type);
+        $this->assertEquals(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            $noncontacts[1]->conversations[$ic2->id]->type
+        );
 
         $this->assertCount(1, $noncontacts[2]->conversations);
         $this->assertEquals(api::MESSAGE_CONVERSATION_TYPE_GROUP, $noncontacts[2]->conversations[$gc1->id]->type);
@@ -561,15 +577,21 @@ public function test_get_conversations_between_users(): void {
         api::add_contact($user6->id, $user1->id);
 
         // Create private conversations with some users.
-        api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            array($user1->id, $user2->id));
-        api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            array($user3->id, $user1->id));
+        api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user2->id]
+        );
+        api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user3->id, $user1->id]
+        );
 
         // Create a group conversation with users.
-        api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
-            array($user1->id, $user2->id, $user3->id, $user4->id),
-            'Project chat');
+        api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user1->id, $user2->id, $user3->id, $user4->id],
+            'Project chat'
+        );
 
         // Check that we retrieved the correct conversations.
         $this->assertCount(2, api::get_conversations_between_users($user1->id, $user2->id));
@@ -611,15 +633,21 @@ public function test_get_self_conversation(): void {
         api::add_contact($user3->id, $user1->id);
 
         // Create private conversations with some users.
-        api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            array($user1->id, $user2->id));
-        api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            array($user3->id, $user1->id));
+        api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user2->id]
+        );
+        api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user3->id, $user1->id]
+        );
 
         // Create a group conversation with users.
-        $gc = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
-            array($user1->id, $user2->id, $user3->id),
-            'Project chat');
+        $gc = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user1->id, $user2->id, $user3->id],
+            'Project chat'
+        );
 
         // Get self-conversations.
         $rsc1 = api::get_self_conversation($user1->id);
@@ -1108,52 +1136,76 @@ protected function create_conversation_test_data() {
         // 5) At least one group conversation having 0 messages, of which user1 IS NOT a member.
 
         // Individual conversation, user1 is a member, last message from other user.
-        $ic1 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            [$user1->id, $user2->id]);
+        $ic1 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user2->id]
+        );
         testhelper::send_fake_message_to_conversation($user1, $ic1->id, 'Message 1', $time);
         testhelper::send_fake_message_to_conversation($user2, $ic1->id, 'Message 2', $time + 1);
 
         // Individual conversation, user1 is a member, last message from user1.
-        $ic2 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            [$user1->id, $user3->id]);
+        $ic2 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user3->id]
+        );
         testhelper::send_fake_message_to_conversation($user3, $ic2->id, 'Message 3', $time + 2);
         testhelper::send_fake_message_to_conversation($user1, $ic2->id, 'Message 4', $time + 3);
 
         // Individual conversation, user1 is not a member.
-        $ic3 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            [$user2->id, $user3->id]);
+        $ic3 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user2->id, $user3->id]
+        );
         testhelper::send_fake_message_to_conversation($user2, $ic3->id, 'Message 5', $time + 4);
         testhelper::send_fake_message_to_conversation($user3, $ic3->id, 'Message 6', $time + 5);
 
         // Group conversation, user1 is not a member.
-        $gc1 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
-            [$user2->id, $user3->id, $user4->id], 'Project discussions');
+        $gc1 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user2->id, $user3->id, $user4->id],
+            'Project discussions'
+        );
         testhelper::send_fake_message_to_conversation($user2, $gc1->id, 'Message 7', $time + 6);
         testhelper::send_fake_message_to_conversation($user4, $gc1->id, 'Message 8', $time + 7);
 
         // Group conversation, user1 is a member, last message from another user.
-        $gc2 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
-            [$user1->id, $user3->id, $user4->id], 'Group chat');
+        $gc2 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user1->id, $user3->id, $user4->id],
+            'Group chat'
+        );
         testhelper::send_fake_message_to_conversation($user1, $gc2->id, 'Message 9', $time + 8);
         testhelper::send_fake_message_to_conversation($user3, $gc2->id, 'Message 10', $time + 9);
         testhelper::send_fake_message_to_conversation($user4, $gc2->id, 'Message 11', $time + 10);
 
         // Group conversation, user1 is a member, last message from user1.
-        $gc3 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
-            [$user1->id, $user2->id, $user3->id, $user4->id], 'Group chat again!');
+        $gc3 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user1->id, $user2->id, $user3->id, $user4->id],
+            'Group chat again!'
+        );
         testhelper::send_fake_message_to_conversation($user4, $gc3->id, 'Message 12', $time + 11);
         testhelper::send_fake_message_to_conversation($user3, $gc3->id, 'Message 13', $time + 12);
         testhelper::send_fake_message_to_conversation($user1, $gc3->id, 'Message 14', $time + 13);
 
         // Empty group conversations (x2), user1 is a member.
-        $gc4 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
-            [$user1->id, $user2->id, $user3->id], 'Empty group');
-        $gc5 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
-            [$user1->id, $user2->id, $user4->id], 'Another empty group');
+        $gc4 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user1->id, $user2->id, $user3->id],
+            'Empty group'
+        );
+        $gc5 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user1->id, $user2->id, $user4->id],
+            'Another empty group'
+        );
 
         // Empty group conversation, user1 is NOT a member.
-        $gc6 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
-            [$user2->id, $user3->id, $user4->id], 'Empty group 3');
+        $gc6 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user2->id, $user3->id, $user4->id],
+            'Empty group 3'
+        );
 
         return [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3, $gc1, $gc2, $gc3, $gc4, $gc5, $gc6];
     }
@@ -1171,8 +1223,8 @@ public function test_get_conversations_no_restrictions(): void {
         $this->assertCount(1, api::get_conversations($user1->id));
 
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
 
         // Get all conversations for user1.
         $conversations = api::get_conversations($user1->id);
@@ -1325,27 +1377,35 @@ public function test_get_conversations_some_muted(): void {
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
 
-        $conversation1 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            [$user1->id, $user2->id]);
+        $conversation1 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user2->id]
+        );
         testhelper::send_fake_message_to_conversation($user1, $conversation1->id, 'Message 1');
         testhelper::send_fake_message_to_conversation($user2, $conversation1->id, 'Message 2');
         api::mute_conversation($user1->id, $conversation1->id);
 
-        $conversation2 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            [$user1->id, $user3->id]);
+        $conversation2 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user3->id]
+        );
         testhelper::send_fake_message_to_conversation($user1, $conversation2->id, 'Message 1');
         testhelper::send_fake_message_to_conversation($user2, $conversation2->id, 'Message 2');
 
-        $conversation3 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
-            [$user1->id, $user2->id]);
+        $conversation3 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user1->id, $user2->id]
+        );
         api::mute_conversation($user1->id, $conversation3->id);
 
-        $conversation4 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_GROUP,
-            [$user1->id, $user3->id]);
+        $conversation4 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user1->id, $user3->id]
+        );
 
         $conversations = api::get_conversations($user1->id);
 
-        usort($conversations, function($first, $second){
+        usort($conversations, function ($first, $second) {
             return $first->id <=> $second->id;
         });
 
@@ -1369,8 +1429,8 @@ public function test_get_conversations_limit_offset(): void {
         $this->resetAfterTest();
 
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
 
         // Get all conversations for user1, limited to 1 result.
         $conversations = api::get_conversations($user1->id, 0, 1);
@@ -1410,17 +1470,25 @@ public function test_get_conversations_type_filter(): void {
         $this->resetAfterTest();
 
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
 
         // Verify we can ask for only individual conversations.
-        $conversations = api::get_conversations($user1->id, 0, 20,
-            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL);
+        $conversations = api::get_conversations(
+            $user1->id,
+            0,
+            20,
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL
+        );
         $this->assertCount(2, $conversations);
 
         // Verify we can ask for only group conversations.
-        $conversations = api::get_conversations($user1->id, 0, 20,
-            api::MESSAGE_CONVERSATION_TYPE_GROUP);
+        $conversations = api::get_conversations(
+            $user1->id,
+            0,
+            20,
+            api::MESSAGE_CONVERSATION_TYPE_GROUP
+        );
         $this->assertCount(4, $conversations);
 
         // Verify an exception is thrown if an unrecognized type is specified.
@@ -1435,7 +1503,6 @@ public function test_get_conversations_self_conversations(): void {
         global $DB;
         $this->resetAfterTest();
 
-
         // Create a conversation between one user and themself.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -1443,10 +1510,14 @@ public function test_get_conversations_self_conversations(): void {
         $user4 = self::getDataGenerator()->create_user();
 
         // Create some individual conversations.
-        $ic1 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            [$user1->id, $user2->id]);
-        $ic2 = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            [$user1->id, $user3->id]);
+        $ic1 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user2->id]
+        );
+        $ic2 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user3->id]
+        );
         testhelper::send_fake_message_to_conversation($user1, $ic1->id, 'Message from user1 to user2');
 
         // Get some self-conversations.
@@ -1471,23 +1542,43 @@ public function test_get_conversations_self_conversations(): void {
         $this->assertCount(1, $conversations);
 
         // Get only private conversations for user1 (empty conversations, like $ic2, are not returned).
-        $conversations = api::get_conversations($user1->id, 0, 20,
-            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL);
+        $conversations = api::get_conversations(
+            $user1->id,
+            0,
+            20,
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL
+        );
         $this->assertCount(1, $conversations);
 
         // Merge self with private conversations for user1.
-        $conversations = api::get_conversations($user1->id, 0, 20,
-            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL, null, true);
+        $conversations = api::get_conversations(
+            $user1->id,
+            0,
+            20,
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            null,
+            true
+        );
         $this->assertCount(2, $conversations);
 
         // Get only private conversations for user2.
-        $conversations = api::get_conversations($user2->id, 0, 20,
-            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL);
+        $conversations = api::get_conversations(
+            $user2->id,
+            0,
+            20,
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL
+        );
         $this->assertCount(1, $conversations);
 
         // Merge self with private conversations for user2.
-        $conversations = api::get_conversations($user2->id, 0, 20,
-            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL, null, true);
+        $conversations = api::get_conversations(
+            $user2->id,
+            0,
+            20,
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            null,
+            true
+        );
         $this->assertCount(2, $conversations);
     }
 
@@ -1498,8 +1589,8 @@ public function test_get_conversations_with_deleted_user(): void {
         $this->resetAfterTest();
 
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
 
         // Delete the second user and retrieve the conversations.
         // We should have 6 still, as conversations with soft-deleted users are still returned.
@@ -1557,8 +1648,8 @@ public function test_get_conversations_deleted_messages(): void {
         $this->resetAfterTest();
 
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
 
         $conversations = api::get_conversations($user1->id);
         // Consider first conversations is self-conversation.
@@ -1597,8 +1688,8 @@ public function test_get_conversations_favourite_conversations_single(): void {
         $this->resetAfterTest();
 
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
 
         // Mark a single conversation as favourites.
         api::set_favourite_conversation($ic2->id, $user1->id);
@@ -1628,8 +1719,13 @@ public function test_get_conversations_favourite_conversations_single(): void {
         }
 
         // Now, try ONLY favourites of type 'group'.
-        $conversations = api::get_conversations($user1->id, 0, 20,
-            api::MESSAGE_CONVERSATION_TYPE_GROUP, true);
+        $conversations = api::get_conversations(
+            $user1->id,
+            0,
+            20,
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            true
+        );
         $this->assertEmpty($conversations);
 
         // And NO favourite conversations.
@@ -1648,8 +1744,8 @@ public function test_get_conversations_favourite_conversations(): void {
         $this->resetAfterTest();
 
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
 
         // Try to get ONLY favourite conversations, when only self-conversation exist.
         $this->assertCount(1, api::get_conversations($user1->id, 0, 20, null, true));
@@ -1690,8 +1786,13 @@ public function test_get_conversations_favourite_conversations(): void {
         }
 
         // Now, try ONLY favourites of type 'group'.
-        $conversations = api::get_conversations($user1->id, 0, 20,
-            api::MESSAGE_CONVERSATION_TYPE_GROUP, true);
+        $conversations = api::get_conversations(
+            $user1->id,
+            0,
+            20,
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            true
+        );
         $this->assertCount(2, $conversations);
         foreach ($conversations as $conv) {
             $this->assertTrue($conv->isfavourite);
@@ -1725,7 +1826,7 @@ public function test_get_conversations_user_in_group_and_individual_chat(): void
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ],
             'Individual conversation'
         );
@@ -1775,7 +1876,6 @@ public function test_get_conversations_group_linked(): void {
         global $CFG, $DB;
         $this->resetAfterTest();
 
-
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -1791,12 +1891,12 @@ public function test_get_conversations_group_linked(): void {
         $group1 = $this->getDataGenerator()->create_group([
             'courseid' => $course1->id,
             'enablemessaging' => 1,
-            'picturepath' => $CFG->dirroot . '/lib/tests/fixtures/gd-logo.png'
+            'picturepath' => $CFG->dirroot . '/lib/tests/fixtures/gd-logo.png',
         ]);
 
         // Add users to group1.
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group1->id, 'userid' => $user1->id));
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group1->id, 'userid' => $user2->id));
+        $this->getDataGenerator()->create_group_member(['groupid' => $group1->id, 'userid' => $user1->id]);
+        $this->getDataGenerator()->create_group_member(['groupid' => $group1->id, 'userid' => $user2->id]);
 
         // Verify the group with the image works as expected.
         $conversations = api::get_conversations($user1->id);
@@ -1812,8 +1912,8 @@ public function test_get_conversations_group_linked(): void {
         ]);
 
         // Add users to group2.
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group2->id, 'userid' => $user2->id));
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group2->id, 'userid' => $user3->id));
+        $this->getDataGenerator()->create_group_member(['groupid' => $group2->id, 'userid' => $user2->id]);
+        $this->getDataGenerator()->create_group_member(['groupid' => $group2->id, 'userid' => $user3->id]);
 
         // Verify the group without any image works as expected too.
         $conversations = api::get_conversations($user3->id);
@@ -1832,297 +1932,298 @@ public function test_get_conversations_group_linked(): void {
     * The data provider for get_conversations_mixed.
     *
     * This provides sets of data to for testing.
+    *
     * @return array
     */
-   public function get_conversations_mixed_provider() {
-       return array(
-            'Test that conversations with messages contacts is correctly ordered.' => array(
-                'users' => array(
+    public static function get_conversations_mixed_provider(): array {
+        return [
+            'Test that conversations with messages contacts is correctly ordered.' => [
+                'users' => [
                     'user1',
                     'user2',
                     'user3',
-                ),
-                'contacts' => array(
-                ),
-                'messages' => array(
-                    array(
+                ],
+                'contacts' => [
+                ],
+                'messages' => [
+                    [
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'subject'       => 'S1',
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user2',
                         'to'            => 'user1',
                         'state'         => 'unread',
                         'subject'       => 'S2',
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'timecreated'   => 0,
                         'subject'       => 'S3',
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user1',
                         'to'            => 'user3',
                         'state'         => 'read',
                         'timemodifier'  => 1,
                         'subject'       => 'S4',
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user3',
                         'to'            => 'user1',
                         'state'         => 'read',
                         'timemodifier'  => 1,
                         'subject'       => 'S5',
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user1',
                         'to'            => 'user3',
                         'state'         => 'read',
                         'timecreated'   => 0,
                         'subject'       => 'S6',
-                    ),
-                ),
-                'expectations' => array(
-                    'user1' => array(
+                    ],
+                ],
+                'expectations' => [
+                    'user1' => [
                         // User1 has conversed most recently with user3. The most recent message is M5.
-                        array(
+                        [
                             'messageposition'   => 0,
                             'with'              => 'user3',
                             'subject'           => '<p>S5</p>',
                             'unreadcount'       => 0,
-                        ),
+                        ],
                         // User1 has also conversed with user2. The most recent message is S2.
-                        array(
+                        [
                             'messageposition'   => 1,
                             'with'              => 'user2',
                             'subject'           => '<p>S2</p>',
                             'unreadcount'       => 1,
-                        ),
-                    ),
-                    'user2' => array(
+                        ],
+                    ],
+                    'user2' => [
                         // User2 has only conversed with user1. Their most recent shared message was S2.
-                        array(
+                        [
                             'messageposition'   => 0,
                             'with'              => 'user1',
                             'subject'           => '<p>S2</p>',
                             'unreadcount'       => 2,
-                        ),
-                    ),
-                    'user3' => array(
+                        ],
+                    ],
+                    'user3' => [
                         // User3 has only conversed with user1. Their most recent shared message was S5.
-                        array(
+                        [
                             'messageposition'   => 0,
                             'with'              => 'user1',
                             'subject'           => '<p>S5</p>',
                             'unreadcount'       => 0,
-                        ),
-                    ),
-                ),
-            ),
-            'Test conversations with a single user, where some messages are read and some are not.' => array(
-                'users' => array(
+                        ],
+                    ],
+                ],
+            ],
+            'Test conversations with a single user, where some messages are read and some are not.' => [
+                'users' => [
                     'user1',
                     'user2',
-                ),
-                'contacts' => array(
-                ),
-                'messages' => array(
-                    array(
+                ],
+                'contacts' => [
+                ],
+                'messages' => [
+                    [
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'read',
                         'subject'       => 'S1',
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user2',
                         'to'            => 'user1',
                         'state'         => 'read',
                         'subject'       => 'S2',
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'timemodifier'  => 1,
                         'subject'       => 'S3',
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'timemodifier'  => 1,
                         'subject'       => 'S4',
-                    ),
-                ),
-                'expectations' => array(
+                    ],
+                ],
+                'expectations' => [
                     // The most recent message between user1 and user2 was S4.
-                    'user1' => array(
-                        array(
+                    'user1' => [
+                        [
                             'messageposition'   => 0,
                             'with'              => 'user2',
                             'subject'           => '<p>S4</p>',
                             'unreadcount'       => 0,
-                        ),
-                    ),
-                    'user2' => array(
+                        ],
+                    ],
+                    'user2' => [
                         // The most recent message between user1 and user2 was S4.
-                        array(
+                        [
                             'messageposition'   => 0,
                             'with'              => 'user1',
                             'subject'           => '<p>S4</p>',
                             'unreadcount'       => 2,
-                        ),
-                    ),
-                ),
-            ),
+                        ],
+                    ],
+                ],
+            ],
             'Test conversations with a single user, where some messages are read and some are not, and messages ' .
-            'are out of order' => array(
+            'are out of order' => [
             // This can happen through a combination of factors including multi-master DB replication with messages
             // read somehow (e.g. API).
-                'users' => array(
+                'users' => [
                     'user1',
                     'user2',
-                ),
-                'contacts' => array(
-                ),
-                'messages' => array(
-                    array(
+                ],
+                'contacts' => [
+                ],
+                'messages' => [
+                    [
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'read',
                         'subject'       => 'S1',
                         'timemodifier'  => 1,
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user2',
                         'to'            => 'user1',
                         'state'         => 'read',
                         'subject'       => 'S2',
                         'timemodifier'  => 2,
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'subject'       => 'S3',
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'subject'       => 'S4',
-                    ),
-                ),
-                'expectations' => array(
+                    ],
+                ],
+                'expectations' => [
                     // The most recent message between user1 and user2 was S2, even though later IDs have not been read.
-                    'user1' => array(
-                        array(
+                    'user1' => [
+                        [
                             'messageposition'   => 0,
                             'with'              => 'user2',
                             'subject'           => '<p>S2</p>',
                             'unreadcount'       => 0,
-                        ),
-                    ),
-                    'user2' => array(
-                        array(
+                        ],
+                    ],
+                    'user2' => [
+                        [
                             'messageposition'   => 0,
                             'with'              => 'user1',
                             'subject'           => '<p>S2</p>',
-                            'unreadcount'       => 2
-                        ),
-                    ),
-                ),
-            ),
-            'Test unread message count is correct for both users' => array(
-                'users' => array(
+                            'unreadcount'       => 2,
+                        ],
+                    ],
+                ],
+            ],
+            'Test unread message count is correct for both users' => [
+                'users' => [
                     'user1',
                     'user2',
-                ),
-                'contacts' => array(
-                ),
-                'messages' => array(
-                    array(
+                ],
+                'contacts' => [
+                ],
+                'messages' => [
+                    [
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'read',
                         'subject'       => 'S1',
                         'timemodifier'  => 1,
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user2',
                         'to'            => 'user1',
                         'state'         => 'read',
                         'subject'       => 'S2',
                         'timemodifier'  => 2,
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'read',
                         'subject'       => 'S3',
                         'timemodifier'  => 3,
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'read',
                         'subject'       => 'S4',
                         'timemodifier'  => 4,
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'subject'       => 'S5',
                         'timemodifier'  => 5,
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user2',
                         'to'            => 'user1',
                         'state'         => 'unread',
                         'subject'       => 'S6',
                         'timemodifier'  => 6,
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'subject'       => 'S7',
                         'timemodifier'  => 7,
-                    ),
-                    array(
+                    ],
+                    [
                         'from'          => 'user1',
                         'to'            => 'user2',
                         'state'         => 'unread',
                         'subject'       => 'S8',
                         'timemodifier'  => 8,
-                    ),
-                ),
-                'expectations' => array(
+                    ],
+                ],
+                'expectations' => [
                     // The most recent message between user1 and user2 was S2, even though later IDs have not been read.
-                    'user1' => array(
-                        array(
+                    'user1' => [
+                        [
                             'messageposition'   => 0,
                             'with'              => 'user2',
                             'subject'           => '<p>S8</p>',
                             'unreadcount'       => 1,
-                        ),
-                    ),
-                    'user2' => array(
-                        array(
+                        ],
+                    ],
+                    'user2' => [
+                        [
                             'messageposition'   => 0,
                             'with'              => 'user1',
                             'subject'           => '<p>S8</p>',
                             'unreadcount'       => 3,
-                        ),
-                    ),
-                ),
-            ),
-        );
+                        ],
+                    ],
+                ],
+            ],
+        ];
     }
 
     /**
@@ -2155,13 +2256,12 @@ public function test_get_conversations_mixed($usersdata, $contacts, $messagesdat
         global $DB;
         $this->resetAfterTest();
 
-
         $this->redirectMessages();
 
         // Create all of the users.
-        $users = array();
+        $users = [];
         foreach ($usersdata as $username) {
-            $users[$username] = $this->getDataGenerator()->create_user(array('username' => $username));
+            $users[$username] = $this->getDataGenerator()->create_user(['username' => $username]);
         }
 
         foreach ($contacts as $username => $contact) {
@@ -2520,8 +2620,14 @@ public function test_get_conversation_messages_time_from_only(): void {
         $this->assertEquals(3, count($members));
 
         // Retrieve the messages from $time + 3, which should only be the 2 last messages.
-        $convmessages = api::get_conversation_messages($user1->id, $conversation->id, 0, 0,
-            'timecreated ASC', $time + 3);
+        $convmessages = api::get_conversation_messages(
+            $user1->id,
+            $conversation->id,
+            0,
+            0,
+            'timecreated ASC',
+            $time + 3
+        );
 
         // Confirm the conversation id is correct.
         $this->assertEquals($conversation->id, $convmessages['id']);
@@ -2570,8 +2676,15 @@ public function test_get_conversation_messages_time_to_only(): void {
         testhelper::send_fake_message_to_conversation($user3, $conversation->id, 'Message 4', $time + 4);
 
         // Retrieve the messages up until $time + 4, which should be all of them.
-        $convmessages = api::get_conversation_messages($user1->id, $conversation->id, 0, 0, 'timecreated ASC',
-            0, $time + 4);
+        $convmessages = api::get_conversation_messages(
+            $user1->id,
+            $conversation->id,
+            0,
+            0,
+            'timecreated ASC',
+            0,
+            $time + 4
+        );
 
         // Confirm the conversation id is correct.
         $this->assertEquals($conversation->id, $convmessages['id']);
@@ -2595,8 +2708,15 @@ public function test_get_conversation_messages_time_to_only(): void {
         $this->assertEquals(3, count($members));
 
         // Retrieve the messages up until $time + 2, which should be the first two.
-        $convmessages = api::get_conversation_messages($user1->id, $conversation->id, 0, 0, 'timecreated ASC',
-            0, $time + 2);
+        $convmessages = api::get_conversation_messages(
+            $user1->id,
+            $conversation->id,
+            0,
+            0,
+            'timecreated ASC',
+            0,
+            $time + 2
+        );
 
         // Confirm the conversation id is correct.
         $this->assertEquals($conversation->id, $convmessages['id']);
@@ -2645,8 +2765,15 @@ public function test_get_conversation_messages_time_from_and_to(): void {
         testhelper::send_fake_message_to_conversation($user3, $conversation->id, 'Message 4', $time + 4);
 
         // Retrieve the messages from $time + 2 up until $time + 3, which should be 2nd and 3rd message.
-        $convmessages = api::get_conversation_messages($user1->id, $conversation->id, 0, 0,
-            'timecreated ASC', $time + 2, $time + 3);
+        $convmessages = api::get_conversation_messages(
+            $user1->id,
+            $conversation->id,
+            0,
+            0,
+            'timecreated ASC',
+            $time + 2,
+            $time + 3
+        );
 
         // Confirm the conversation id is correct.
         $this->assertEquals($conversation->id, $convmessages['id']);
@@ -2666,7 +2793,6 @@ public function test_get_conversation_messages_time_from_and_to(): void {
         $this->assertEquals(2, count($members));
     }
 
-
     /**
      * Test retrieving conversation messages by providing a limitfrom value.
      */
@@ -2880,7 +3006,6 @@ public function test_delete_conversation_by_id(): void {
         global $DB;
         $this->resetAfterTest();
 
-
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -2906,7 +3031,7 @@ public function test_delete_conversation_by_id(): void {
         // Delete the individual conversation between user1 and user2 (only for user1).
         api::delete_conversation_by_id($user1->id, $conversationid);
 
-        $muas = $DB->get_records('message_user_actions', array(), 'timecreated ASC');
+        $muas = $DB->get_records('message_user_actions', [], 'timecreated ASC');
         $this->assertCount(4, $muas);
         // Sort by id.
         ksort($muas);
@@ -2935,7 +3060,7 @@ public function test_delete_conversation_by_id(): void {
         // Delete the self-conversation as user 1.
         api::delete_conversation_by_id($user1->id, $sc1->id);
 
-        $muas = $DB->get_records('message_user_actions', array(), 'timecreated ASC');
+        $muas = $DB->get_records('message_user_actions', [], 'timecreated ASC');
         $this->assertCount(5, $muas);
 
         // Sort by id.
@@ -3080,7 +3205,6 @@ public function test_can_send_message_without_sendmessage_cap(): void {
         global $DB;
         $this->resetAfterTest();
 
-
         // Create some users.
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
@@ -3090,8 +3214,11 @@ public function test_can_send_message_without_sendmessage_cap(): void {
 
         // Remove the capability to send a message.
         $roleids = $DB->get_records_menu('role', null, '', 'shortname, id');
-        unassign_capability('moodle/site:sendmessage', $roleids['user'],
-            \context_system::instance());
+        unassign_capability(
+            'moodle/site:sendmessage',
+            $roleids['user'],
+            \context_system::instance()
+        );
 
         // Check that we can not post a message without the capability.
         $this->assertFalse(api::can_send_message($user2->id, $user1->id));
@@ -3219,7 +3346,6 @@ public function test_can_send_message_with_messageanyuser_cap(): void {
         global $DB;
         $this->resetAfterTest();
 
-
         // Create some users.
         $teacher1 = self::getDataGenerator()->create_user();
         $student1 = self::getDataGenerator()->create_user();
@@ -3282,7 +3408,7 @@ public function test_can_send_message_even_if_blocked_with_message_any_user_cap(
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
-        $authenticateduserrole = $DB->get_record('role', array('shortname' => 'user'));
+        $authenticateduserrole = $DB->get_record('role', ['shortname' => 'user']);
         assign_capability('moodle/site:messageanyuser', CAP_ALLOW, $authenticateduserrole->id, \context_system::instance(), true);
 
         $this->assertTrue(api::can_send_message($user2->id, $user1->id, true));
@@ -3300,7 +3426,7 @@ public function test_can_send_message_even_if_blocked_with_read_all_message_cap(
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
 
-        $authenticateduserrole = $DB->get_record('role', array('shortname' => 'user'));
+        $authenticateduserrole = $DB->get_record('role', ['shortname' => 'user']);
         assign_capability('moodle/site:readallmessages', CAP_ALLOW, $authenticateduserrole->id, \context_system::instance(), true);
 
         $this->assertTrue(api::can_send_message($user2->id, $user1->id, true));
@@ -3333,7 +3459,7 @@ public function test_can_send_message_even_if_blocked_shared_course_with_message
 
         $this->resetAfterTest();
 
-        $editingteacherrole = $DB->get_record('role', array('shortname' => 'editingteacher'));
+        $editingteacherrole = $DB->get_record('role', ['shortname' => 'editingteacher']);
 
         $teacher = self::getDataGenerator()->create_user();
         $student = self::getDataGenerator()->create_user();
@@ -3343,8 +3469,13 @@ public function test_can_send_message_even_if_blocked_shared_course_with_message
         $this->getDataGenerator()->enrol_user($teacher->id, $course->id, $editingteacherrole->id);
         $this->getDataGenerator()->enrol_user($student->id, $course->id);
 
-        assign_capability('moodle/site:messageanyuser', CAP_ALLOW, $editingteacherrole->id,
-            \context_course::instance($course->id), true);
+        assign_capability(
+            'moodle/site:messageanyuser',
+            CAP_ALLOW,
+            $editingteacherrole->id,
+            \context_course::instance($course->id),
+            true
+        );
 
         // Check that the second user can no longer send the first user a message.
         $this->assertTrue(api::can_send_message($student->id, $teacher->id, true));
@@ -3366,7 +3497,7 @@ public function test_can_send_message_to_conversation_basic(): void {
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
 
@@ -3376,7 +3507,7 @@ public function test_can_send_message_to_conversation_basic(): void {
             [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
             ]
         );
 
@@ -3409,7 +3540,6 @@ public function test_can_send_message_to_conversation_sendmessage_cap(): void {
         global $DB;
         $this->resetAfterTest();
 
-
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
@@ -3425,7 +3555,7 @@ public function test_can_send_message_to_conversation_sendmessage_cap(): void {
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
 
@@ -3435,7 +3565,7 @@ public function test_can_send_message_to_conversation_sendmessage_cap(): void {
             [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
             ]
         );
 
@@ -3459,7 +3589,6 @@ public function test_can_send_message_to_conversation_messageanyuser_cap(): void
         global $DB;
         $this->resetAfterTest();
 
-
         $user1 = self::getDataGenerator()->create_user();
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
@@ -3475,7 +3604,7 @@ public function test_can_send_message_to_conversation_messageanyuser_cap(): void
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
 
@@ -3485,7 +3614,7 @@ public function test_can_send_message_to_conversation_messageanyuser_cap(): void
             [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
             ]
         );
 
@@ -3530,7 +3659,7 @@ public function test_can_send_message_to_conversation_non_member(): void {
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
 
@@ -3540,7 +3669,7 @@ public function test_can_send_message_to_conversation_non_member(): void {
             [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
             ]
         );
 
@@ -3569,7 +3698,7 @@ public function test_can_send_message_to_conversation_privacy_contacts_only(): v
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
 
@@ -3579,7 +3708,7 @@ public function test_can_send_message_to_conversation_privacy_contacts_only(): v
             [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
             ]
         );
 
@@ -3617,7 +3746,7 @@ public function test_can_send_message_to_conversation_privacy_contacts_course():
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
 
@@ -3627,7 +3756,7 @@ public function test_can_send_message_to_conversation_privacy_contacts_course():
             [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
             ]
         );
 
@@ -3664,7 +3793,7 @@ public function test_can_send_message_to_conversation_privacy_sitewide(): void {
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
 
@@ -3674,7 +3803,7 @@ public function test_can_send_message_to_conversation_privacy_sitewide(): void {
             [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
             ]
         );
 
@@ -3719,7 +3848,7 @@ public function test_can_send_message_to_conversation_when_blocked(): void {
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
 
@@ -3729,7 +3858,7 @@ public function test_can_send_message_to_conversation_when_blocked(): void {
             [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
             ]
         );
 
@@ -3900,7 +4029,6 @@ public function test_get_blocked_users(): void {
         global $USER;
         $this->resetAfterTest();
 
-
         // Set this user as the admin.
         $this->setAdminUser();
 
@@ -4030,13 +4158,15 @@ public function test_count_conversation_members_existing_conversation(): void {
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
 
-        $this->assertEquals(2,
-            api::count_conversation_members($conversationid));
+        $this->assertEquals(
+            2,
+            api::count_conversation_members($conversationid)
+        );
     }
 
     /**
@@ -4053,7 +4183,7 @@ public function test_add_members_to_individual_conversation(): void {
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
@@ -4076,14 +4206,16 @@ public function test_add_members_to_existing_conversation(): void {
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
 
         $this->assertNull(api::add_members_to_conversation([$user3->id], $conversationid));
-        $this->assertEquals(3,
-            api::count_conversation_members($conversationid));
+        $this->assertEquals(
+            3,
+            api::count_conversation_members($conversationid)
+        );
     }
 
     /**
@@ -4112,15 +4244,17 @@ public function test_add_members_to_no_existing_user(): void {
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
 
         // Don't throw an error for non existing user, but don't add it as a member.
         $this->assertNull(api::add_members_to_conversation([0], $conversationid));
-        $this->assertEquals(2,
-            api::count_conversation_members($conversationid));
+        $this->assertEquals(
+            2,
+            api::count_conversation_members($conversationid)
+        );
     }
 
     /**
@@ -4136,15 +4270,17 @@ public function test_add_members_to_current_conversation_member(): void {
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
 
         // Don't add as a member a user that is already conversation member.
         $this->assertNull(api::add_members_to_conversation([$user1->id], $conversationid));
-        $this->assertEquals(2,
-            api::count_conversation_members($conversationid));
+        $this->assertEquals(
+            2,
+            api::count_conversation_members($conversationid)
+        );
     }
 
     /**
@@ -4162,14 +4298,16 @@ public function test_add_members_for_multiple_users(): void {
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
 
         $this->assertNull(api::add_members_to_conversation([$user3->id, $user4->id], $conversationid));
-        $this->assertEquals(4,
-            api::count_conversation_members($conversationid));
+        $this->assertEquals(
+            4,
+            api::count_conversation_members($conversationid)
+        );
     }
 
     /**
@@ -4186,15 +4324,17 @@ public function test_add_members_for_multiple_not_valid_users(): void {
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
 
         // Don't throw errors, but don't add as members users don't exist or are already conversation members.
         $this->assertNull(api::add_members_to_conversation([$user3->id, $user1->id, 0], $conversationid));
-        $this->assertEquals(3,
-            api::count_conversation_members($conversationid));
+        $this->assertEquals(
+            3,
+            api::count_conversation_members($conversationid)
+        );
     }
 
     /**
@@ -4210,7 +4350,7 @@ public function test_remove_members_from_individual_conversation(): void {
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
@@ -4232,14 +4372,16 @@ public function test_remove_members_from_existing_conversation(): void {
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
 
         $this->assertNull(api::remove_members_from_conversation([$user1->id], $conversationid));
-        $this->assertEquals(1,
-            api::count_conversation_members($conversationid));
+        $this->assertEquals(
+            1,
+            api::count_conversation_members($conversationid)
+        );
     }
 
     /**
@@ -4268,14 +4410,16 @@ public function test_remove_members_for_no_existing_user(): void {
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
 
         $this->assertNull(api::remove_members_from_conversation([0], $conversationid));
-        $this->assertEquals(2,
-            api::count_conversation_members($conversationid));
+        $this->assertEquals(
+            2,
+            api::count_conversation_members($conversationid)
+        );
     }
 
     /**
@@ -4293,15 +4437,17 @@ public function test_remove_members_for_multiple_users(): void {
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
 
         $this->assertNull(api::add_members_to_conversation([$user3->id, $user4->id], $conversationid));
         $this->assertNull(api::remove_members_from_conversation([$user3->id, $user4->id], $conversationid));
-        $this->assertEquals(2,
-            api::count_conversation_members($conversationid));
+        $this->assertEquals(
+            2,
+            api::count_conversation_members($conversationid)
+        );
     }
 
     /**
@@ -4319,7 +4465,7 @@ public function test_remove_members_for_multiple_no_valid_users(): void {
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
@@ -4328,8 +4474,10 @@ public function test_remove_members_for_multiple_no_valid_users(): void {
         $this->assertNull(
             api::remove_members_from_conversation([$user2->id, $user3->id, $user4->id, 0], $conversationid)
         );
-        $this->assertEquals(1,
-            api::count_conversation_members($conversationid));
+        $this->assertEquals(
+            1,
+            api::count_conversation_members($conversationid)
+        );
     }
 
     /**
@@ -4345,15 +4493,17 @@ public function test_count_conversation_members_empty_conversation(): void {
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
 
         $this->assertNull(api::remove_members_from_conversation([$user1->id, $user2->id], $conversationid));
 
-        $this->assertEquals(0,
-            api::count_conversation_members($conversationid));
+        $this->assertEquals(
+            0,
+            api::count_conversation_members($conversationid)
+        );
     }
 
     /**
@@ -4631,7 +4781,7 @@ public function test_mute_conversation(): void {
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
@@ -4663,7 +4813,7 @@ public function test_unmute_conversation(): void {
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
@@ -4687,7 +4837,7 @@ public function test_is_conversation_muted(): void {
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
@@ -4877,7 +5027,7 @@ public function test_is_user_in_conversation(): void {
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
@@ -4899,7 +5049,7 @@ public function test_is_user_in_conversation_when_not(): void {
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ]
         );
         $conversationid = $conversation->id;
@@ -4950,7 +5100,7 @@ public function test_create_conversation_individual(): void {
             api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
             [
                 $user1->id,
-                $user2->id
+                $user2->id,
             ],
             'A conversation name'
         );
@@ -4986,7 +5136,7 @@ public function test_create_conversation_group(): void {
             [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
             ],
             'A conversation name'
         );
@@ -5112,7 +5262,6 @@ public function test_disable_conversation(): void {
         global $DB;
         $this->resetAfterTest();
 
-
         $name = 'Name of conversation';
 
         $conversation = api::create_conversation(
@@ -5141,8 +5290,8 @@ public function test_update_conversation_name(): void {
         api::update_conversation_name($conversation->id, $newname);
 
         $this->assertEquals(
-                $newname,
-                $DB->get_field('message_conversations', 'name', ['id' => $conversation->id])
+            $newname,
+            $DB->get_field('message_conversations', 'name', ['id' => $conversation->id])
         );
     }
 
@@ -5177,7 +5326,7 @@ public function test_get_conversation_members(): void {
             [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
             ]
         );
         $conversationid = $conversation->id;
@@ -5250,7 +5399,7 @@ public function test_get_conversation_members_with_contact_requests(): void {
             [
                 $user1->id,
                 $user2->id,
-                $user3->id
+                $user3->id,
             ]
         );
         $conversationid = $conversation->id;
@@ -5348,8 +5497,8 @@ public function test_send_message_to_conversation_individual_conversation(): voi
         $this->resetAfterTest();
 
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
 
         // Enrol the users into the same course so the privacy checks will pass using default (contact+course members) setting.
         $course = $this->getDataGenerator()->create_course();
@@ -5399,8 +5548,8 @@ public function test_send_message_to_conversation_individual_conversation(): voi
     public function test_send_message_to_conversation_group_conversation(): void {
         $this->resetAfterTest();
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
 
         // Enrol the users into the same course so the privacy checks will pass using default (contact+course members) setting.
         $course = $this->getDataGenerator()->create_course();
@@ -5466,12 +5615,12 @@ public function test_send_message_to_conversation_linked_group_conversation(): v
         $group = $this->getDataGenerator()->create_group([
             'courseid' => $course->id,
             'enablemessaging' => 1,
-            'picturepath' => $CFG->dirroot . '/lib/tests/fixtures/gd-logo.png'
+            'picturepath' => $CFG->dirroot . '/lib/tests/fixtures/gd-logo.png',
         ]);
 
         // Add users to group.
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group->id, 'userid' => $user1->id));
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group->id, 'userid' => $user2->id));
+        $this->getDataGenerator()->create_group_member(['groupid' => $group->id, 'userid' => $user1->id]);
+        $this->getDataGenerator()->create_group_member(['groupid' => $group->id, 'userid' => $user2->id]);
 
         // Verify the group with the image works as expected.
         $conversations = api::get_conversations($user1->id);
@@ -5488,8 +5637,12 @@ public function test_send_message_to_conversation_linked_group_conversation(): v
 
         // Send a message to a group conversation.
         $messagessink = $this->redirectMessages();
-        $message1 = api::send_message_to_conversation($user1->id, $conversations[0]->id,
-            'message to the group', FORMAT_MOODLE);
+        $message1 = api::send_message_to_conversation(
+            $user1->id,
+            $conversations[0]->id,
+            'message to the group',
+            FORMAT_MOODLE
+        );
         $messages = $messagessink->get_messages();
         // Verify the message returned.
         $this->assertInstanceOf(\stdClass::class, $message1);
@@ -5515,8 +5668,8 @@ public function test_send_message_to_conversation_non_existent_conversation(): v
         $this->resetAfterTest();
 
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
 
         $this->expectException(\moodle_exception::class);
         api::send_message_to_conversation($user1->id, 0, 'test', FORMAT_MOODLE);
@@ -5529,8 +5682,8 @@ public function test_send_message_to_conversation_non_member(): void {
         $this->resetAfterTest();
 
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
 
         // Enrol the users into the same course so the privacy checks will pass using default (contact+course members) setting.
         $course = $this->getDataGenerator()->create_course();
@@ -5550,8 +5703,8 @@ public function test_send_message_to_conversation_blocked_user(): void {
         $this->resetAfterTest();
 
         // Get a bunch of conversations, some group, some individual and in different states.
-        list($user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
-            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6) = $this->create_conversation_test_data();
+        [$user1, $user2, $user3, $user4, $ic1, $ic2, $ic3,
+            $gc1, $gc2, $gc3, $gc4, $gc5, $gc6] = $this->create_conversation_test_data();
 
         // Enrol the users into the same course so the privacy checks will pass using default (contact+course members) setting.
         $course = $this->getDataGenerator()->create_course();
@@ -5582,8 +5735,10 @@ public function test_get_conversation_with_muted_conversation(): void {
 
         $this->setUser($user1);
 
-        $conversation = api::create_conversation(api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            [$user1->id, $user2->id]);
+        $conversation = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user2->id]
+        );
 
         $conversation = api::get_conversation($user1->id, $conversation->id);
 
@@ -5600,53 +5755,53 @@ public function test_get_conversation_with_muted_conversation(): void {
     /**
      * Data provider for test_get_conversation_counts().
      */
-    public function get_conversation_counts_test_cases() {
+    public static function get_conversation_counts_test_cases(): array {
         $typeindividual = api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL;
         $typegroup = api::MESSAGE_CONVERSATION_TYPE_GROUP;
         $typeself = api::MESSAGE_CONVERSATION_TYPE_SELF;
-        list($user1, $user2, $user3, $user4, $user5, $user6, $user7, $user8) = [0, 1, 2, 3, 4, 5, 6, 7];
+        [$user1, $user2, $user3, $user4, $user5, $user6, $user7, $user8] = [0, 1, 2, 3, 4, 5, 6, 7];
         $conversations = [
             [
                 'type' => $typeindividual,
                 'users' => [$user1, $user2],
                 'messages' => [$user1, $user2, $user2],
                 'favourites' => [$user1],
-                'enabled' => null // Individual conversations cannot be disabled.
+                'enabled' => null, // Individual conversations cannot be disabled.
             ],
             [
                 'type' => $typeindividual,
                 'users' => [$user1, $user3],
                 'messages' => [$user1, $user3, $user1],
                 'favourites' => [],
-                'enabled' => null // Individual conversations cannot be disabled.
+                'enabled' => null, // Individual conversations cannot be disabled.
             ],
             [
                 'type' => $typegroup,
                 'users' => [$user1, $user2, $user3, $user4],
                 'messages' => [$user1, $user2, $user3, $user4],
                 'favourites' => [],
-                'enabled' => true
+                'enabled' => true,
             ],
             [
                 'type' => $typegroup,
                 'users' => [$user2, $user3, $user4],
                 'messages' => [$user2, $user3, $user4],
                 'favourites' => [],
-                'enabled' => true
+                'enabled' => true,
             ],
             [
                 'type' => $typegroup,
                 'users' => [$user6, $user7],
                 'messages' => [$user6, $user7, $user7],
                 'favourites' => [$user6],
-                'enabled' => false
+                'enabled' => false,
             ],
             [
                 'type' => $typeself,
                 'users' => [$user8],
                 'messages' => [$user8],
                 'favourites' => [],
-                'enabled' => null // Self-conversations cannot be disabled.
+                'enabled' => null, // Self-conversations cannot be disabled.
             ],
         ];
 
@@ -5656,306 +5811,414 @@ public function get_conversation_counts_test_cases() {
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user5],
-                'expectedcounts' => ['favourites' => 1, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => []
+                'expectedcounts' => [
+                    'favourites' => 1,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 0,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [],
             ],
             'No individual conversations, 2 group conversations' => [
                 'conversationConfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user4],
-                'expectedcounts' => ['favourites' => 1, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => []
+                'expectedcounts' => [
+                    'favourites' => 1,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 0,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [],
             ],
             '2 individual conversations (one favourited), 1 group conversation' => [
                 'conversationConfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user1],
-                'expectedcounts' => ['favourites' => 2, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'expectedunreadcounts' => ['favourites' => 1, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => []
+                'expectedcounts' => [
+                    'favourites' => 2,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 1,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [],
             ],
             '1 individual conversation, 2 group conversations' => [
                 'conversationConfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user2],
-                'expectedcounts' => ['favourites' => 1, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => []
+                'expectedcounts' => [
+                    'favourites' => 1,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 0,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [],
             ],
             '2 group conversations only' => [
                 'conversationConfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user4],
-                'expectedcounts' => ['favourites' => 1, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => []
+                'expectedcounts' => [
+                    'favourites' => 1,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 0,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [],
             ],
             'All conversation types, delete a message from individual favourited, messages remaining' => [
                 'conversationConfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [0],
                 'arguments' => [$user1],
-                'expectedcounts' => ['favourites' => 2, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'expectedunreadcounts' => ['favourites' => 1, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => []
+                'expectedcounts' => [
+                    'favourites' => 2,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 1,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [],
             ],
             'All conversation types, delete a message from individual non-favourited, messages remaining' => [
                 'conversationConfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [3],
                 'arguments' => [$user1],
-                'expectedcounts' => ['favourites' => 2, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'expectedunreadcounts' => ['favourites' => 1, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => []
+                'expectedcounts' => [
+                    'favourites' => 2,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 1,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [],
             ],
             'All conversation types, delete all messages from individual favourited, no messages remaining' => [
                 'conversationConfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [0, 1, 2],
                 'arguments' => [$user1],
-                'expectedcounts' => ['favourites' => 1, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => []
+                'expectedcounts' => [
+                    'favourites' => 1,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 0,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [],
             ],
             'All conversation types, delete all messages from individual non-favourited, no messages remaining' => [
                 'conversationConfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [3, 4, 5],
                 'arguments' => [$user1],
-                'expectedcounts' => ['favourites' => 2, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'expectedunreadcounts' => ['favourites' => 1, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => []
+                'expectedcounts' => [
+                    'favourites' => 2,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 1,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [],
             ],
             'All conversation types, delete all messages from individual favourited, no messages remaining, different user' => [
                 'conversationConfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [0, 1, 2],
                 'arguments' => [$user2],
-                'expectedcounts' => ['favourites' => 1, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => []
+                'expectedcounts' => [
+                    'favourites' => 1,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 0,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [],
             ],
             'All conversation types, delete all messages from individual non-favourited, no messages remaining, different user' => [
                 'conversationConfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [3, 4, 5],
                 'arguments' => [$user3],
-                'expectedcounts' => ['favourites' => 1, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => []
+                'expectedcounts' => [
+                    'favourites' => 1,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 0,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 2,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [],
             ],
             'All conversation types, delete some messages from group non-favourited, messages remaining,' => [
                 'conversationConfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [6, 7],
                 'arguments' => [$user1],
-                'expectedcounts' => ['favourites' => 2, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'expectedunreadcounts' => ['favourites' => 1, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => []
+                'expectedcounts' => [
+                    'favourites' => 2,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 1,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [],
             ],
             'All conversation types, delete all messages from group non-favourited, no messages remaining,' => [
                 'conversationConfigs' => $conversations,
                 'deletemessagesuser' => $user1,
                 'deletemessages' => [6, 7, 8, 9],
                 'arguments' => [$user1],
-                'expectedcounts' => ['favourites' => 2, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'expectedunreadcounts' => ['favourites' => 1, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => []
+                'expectedcounts' => [
+                    'favourites' => 2,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 1,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [],
             ],
             'All conversation types, another user soft deleted' => [
                 'conversationConfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user1],
-                'expectedcounts' => ['favourites' => 2, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'expectedunreadcounts' => ['favourites' => 1, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => [$user2]
+                'expectedcounts' => [
+                    'favourites' => 2,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 1,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [$user2],
             ],
             'All conversation types, all group users soft deleted' => [
                 'conversationConfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user1],
-                'expectedcounts' => ['favourites' => 2, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'expectedunreadcounts' => ['favourites' => 1, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => [$user2, $user3, $user4]
+                'expectedcounts' => [
+                    'favourites' => 2,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 1,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 1,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [$user2, $user3, $user4],
             ],
             'Group conversation which is disabled, favourited' => [
                 'conversationConfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user6],
-                'expectedcounts' => ['favourites' => 1, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => []
+                'expectedcounts' => [
+                    'favourites' => 1,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 0,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [],
             ],
             'Group conversation which is disabled, non-favourited' => [
                 'conversationConfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user7],
-                'expectedcounts' => ['favourites' => 1, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => []
+                'expectedcounts' => [
+                    'favourites' => 1,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 0,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [],
             ],
             'Conversation with self' => [
                 'conversationConfigs' => $conversations,
                 'deletemessagesuser' => null,
                 'deletemessages' => [],
                 'arguments' => [$user8],
-                'expectedcounts' => ['favourites' => 0, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 1
-                ]],
-                'expectedunreadcounts' => ['favourites' => 0, 'types' => [
-                    api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
-                    api::MESSAGE_CONVERSATION_TYPE_SELF => 0
-                ]],
-                'deletedusers' => []
+                'expectedcounts' => [
+                    'favourites' => 0,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 1,
+                    ],
+                ],
+                'expectedunreadcounts' => [
+                    'favourites' => 0,
+                    'types' => [
+                        api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_GROUP => 0,
+                        api::MESSAGE_CONVERSATION_TYPE_SELF => 0,
+                    ],
+                ],
+                'deletedusers' => [],
             ],
         ];
     }
@@ -5992,7 +6255,7 @@ public function test_get_conversation_counts(
             $generator->create_user(),
             $generator->create_user(),
             $generator->create_user(),
-            $generator->create_user()
+            $generator->create_user(),
         ];
 
         $deleteuser = !is_null($deletemessagesuser) ? $users[$deletemessagesuser] : null;
@@ -6004,7 +6267,7 @@ public function test_get_conversation_counts(
         foreach ($conversationconfigs as $config) {
             $conversation = api::create_conversation(
                 $config['type'],
-                array_map(function($userindex) use ($users) {
+                array_map(function ($userindex) use ($users) {
                     return $users[$userindex]->id;
                 }, $config['users']),
                 null,
@@ -6018,7 +6281,7 @@ public function test_get_conversation_counts(
 
             // Remove the self conversations created by the generator,
             // so we can choose to set that ourself and honour the original intention of the test.
-            $userids = array_map(function($userindex) use ($users) {
+            $userids = array_map(function ($userindex) use ($users) {
                 return $users[$userindex]->id;
             }, $config['users']);
             foreach ($userids as $userid) {
@@ -6048,12 +6311,18 @@ public function test_get_conversation_counts(
         $counts = api::get_conversation_counts(...$arguments);
 
         $this->assertEquals($expectedcounts['favourites'], $counts['favourites']);
-        $this->assertEquals($expectedcounts['types'][api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL],
-            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL]);
-        $this->assertEquals($expectedcounts['types'][api::MESSAGE_CONVERSATION_TYPE_GROUP],
-            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_GROUP]);
-        $this->assertEquals($expectedcounts['types'][api::MESSAGE_CONVERSATION_TYPE_SELF],
-            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_SELF]);
+        $this->assertEquals(
+            $expectedcounts['types'][api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL],
+            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL]
+        );
+        $this->assertEquals(
+            $expectedcounts['types'][api::MESSAGE_CONVERSATION_TYPE_GROUP],
+            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_GROUP]
+        );
+        $this->assertEquals(
+            $expectedcounts['types'][api::MESSAGE_CONVERSATION_TYPE_SELF],
+            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_SELF]
+        );
     }
 
     /**
@@ -6118,7 +6387,7 @@ public function test_get_unread_conversation_counts(
             $generator->create_user(),
             $generator->create_user(),
             $generator->create_user(),
-            $generator->create_user()
+            $generator->create_user(),
         ];
 
         $deleteuser = !is_null($deletemessagesuser) ? $users[$deletemessagesuser] : null;
@@ -6131,7 +6400,7 @@ public function test_get_unread_conversation_counts(
         foreach ($conversationconfigs as $config) {
             $conversation = api::create_conversation(
                 $config['type'],
-                array_map(function($userindex) use ($users) {
+                array_map(function ($userindex) use ($users) {
                     return $users[$userindex]->id;
                 }, $config['users']),
                 null,
@@ -6164,12 +6433,18 @@ public function test_get_unread_conversation_counts(
         $counts = api::get_unread_conversation_counts(...$arguments);
 
         $this->assertEquals($expectedunreadcounts['favourites'], $counts['favourites']);
-        $this->assertEquals($expectedunreadcounts['types'][api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL],
-            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL]);
-        $this->assertEquals($expectedunreadcounts['types'][api::MESSAGE_CONVERSATION_TYPE_GROUP],
-            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_GROUP]);
-        $this->assertEquals($expectedunreadcounts['types'][api::MESSAGE_CONVERSATION_TYPE_SELF],
-            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_SELF]);
+        $this->assertEquals(
+            $expectedunreadcounts['types'][api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL],
+            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL]
+        );
+        $this->assertEquals(
+            $expectedunreadcounts['types'][api::MESSAGE_CONVERSATION_TYPE_GROUP],
+            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_GROUP]
+        );
+        $this->assertEquals(
+            $expectedunreadcounts['types'][api::MESSAGE_CONVERSATION_TYPE_SELF],
+            $counts['types'][api::MESSAGE_CONVERSATION_TYPE_SELF]
+        );
     }
 
     public function test_delete_all_conversation_data(): void {
@@ -6188,15 +6463,15 @@ public function test_delete_all_conversation_data(): void {
         $this->getDataGenerator()->enrol_user($user1->id, $course1->id);
         $this->getDataGenerator()->enrol_user($user2->id, $course1->id);
 
-        $group1 = $this->getDataGenerator()->create_group(array('courseid' => $course1->id, 'enablemessaging' => 1));
-        $group2 = $this->getDataGenerator()->create_group(array('courseid' => $course1->id, 'enablemessaging' => 1));
+        $group1 = $this->getDataGenerator()->create_group(['courseid' => $course1->id, 'enablemessaging' => 1]);
+        $group2 = $this->getDataGenerator()->create_group(['courseid' => $course1->id, 'enablemessaging' => 1]);
 
         // Add users to both groups.
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group1->id, 'userid' => $user1->id));
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group1->id, 'userid' => $user2->id));
+        $this->getDataGenerator()->create_group_member(['groupid' => $group1->id, 'userid' => $user1->id]);
+        $this->getDataGenerator()->create_group_member(['groupid' => $group1->id, 'userid' => $user2->id]);
 
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group2->id, 'userid' => $user1->id));
-        $this->getDataGenerator()->create_group_member(array('groupid' => $group2->id, 'userid' => $user2->id));
+        $this->getDataGenerator()->create_group_member(['groupid' => $group2->id, 'userid' => $user1->id]);
+        $this->getDataGenerator()->create_group_member(['groupid' => $group2->id, 'userid' => $user2->id]);
 
         $groupconversation1 = api::get_conversation_by_area(
             'core_group',
@@ -6274,11 +6549,19 @@ public function test_delete_all_conversation_data(): void {
 
         // Confirm favourites were deleted for both users.
         $user1service = \core_favourites\service_factory::get_service_for_user_context(\context_user::instance($user1->id));
-        $this->assertFalse($user1service->favourite_exists('core_message', 'message_conversations', $groupconversation1->id,
-            $coursecontext1));
+        $this->assertFalse($user1service->favourite_exists(
+            'core_message',
+            'message_conversations',
+            $groupconversation1->id,
+            $coursecontext1
+        ));
         $user2service = \core_favourites\service_factory::get_service_for_user_context(\context_user::instance($user1->id));
-        $this->assertFalse($user2service->favourite_exists('core_message', 'message_conversations', $groupconversation1->id,
-            $coursecontext1));
+        $this->assertFalse($user2service->favourite_exists(
+            'core_message',
+            'message_conversations',
+            $groupconversation1->id,
+            $coursecontext1
+        ));
     }
 
     /**
@@ -6289,7 +6572,7 @@ public function test_can_delete_message_for_all_users_teacher(): void {
         $this->resetAfterTest(true);
 
         // Create fake data to test it.
-        list($teacher, $student1, $student2, $convgroup, $convindividual) = $this->create_delete_message_test_data();
+        [$teacher, $student1, $student2, $convgroup, $convindividual] = $this->create_delete_message_test_data();
 
         // Allow Teacher can delete messages for all.
         $editingteacher = $DB->get_record('role', ['shortname' => 'editingteacher']);
@@ -6316,7 +6599,7 @@ public function test_can_delete_message_for_all_users_student(): void {
         $this->resetAfterTest(true);
 
         // Create fake data to test it.
-        list($teacher, $student1, $student2, $convgroup, $convindividual) = $this->create_delete_message_test_data();
+        [$teacher, $student1, $student2, $convgroup, $convindividual] = $this->create_delete_message_test_data();
 
         // Set as the first user.
         $this->setUser($student1);
@@ -6340,7 +6623,7 @@ public function test_delete_message_for_all_users_group_conversation(): void {
         $this->resetAfterTest(true);
 
         // Create fake data to test it.
-        list($teacher, $student1, $student2, $convgroup, $convindividual) = $this->create_delete_message_test_data();
+        [$teacher, $student1, $student2, $convgroup, $convindividual] = $this->create_delete_message_test_data();
 
         // Send 3 messages to a group conversation.
         $mgid1 = testhelper::send_fake_message_to_conversation($teacher, $convgroup->id);
@@ -6386,7 +6669,7 @@ public function test_delete_message_for_all_users_individual_conversation(): voi
         $this->resetAfterTest(true);
 
         // Create fake data to test it.
-        list($teacher, $student1, $student2, $convgroup, $convindividual) = $this->create_delete_message_test_data();
+        [$teacher, $student1, $student2, $convgroup, $convindividual] = $this->create_delete_message_test_data();
 
         // Send 2 messages in a individual conversation.
         $mid1 = testhelper::send_fake_message_to_conversation($teacher, $convindividual->id);
@@ -6470,7 +6753,7 @@ protected function create_delete_message_test_data() {
         $this->getDataGenerator()->enrol_user($student2->id, $course->id, 'student');
 
         // Create a group and added the users into.
-        $group1 = $this->getDataGenerator()->create_group(array('courseid' => $course->id));
+        $group1 = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
         groups_add_member($group1->id, $teacher->id);
         groups_add_member($group1->id, $student1->id);
         groups_add_member($group1->id, $student2->id);
@@ -6479,7 +6762,8 @@ protected function create_delete_message_test_data() {
         $convgroup = api::create_conversation(
             api::MESSAGE_CONVERSATION_TYPE_GROUP,
             [$teacher->id, $student1->id, $student2->id],
-            'Group test delete for everyone', api::MESSAGE_CONVERSATION_ENABLED,
+            'Group test delete for everyone',
+            api::MESSAGE_CONVERSATION_ENABLED,
             'core_group',
             'groups',
             $group1->id,
diff --git a/message/tests/event/events_test.php b/message/tests/event/events_test.php
index b004452086c91..bd3c108d4473d 100644
--- a/message/tests/event/events_test.php
+++ b/message/tests/event/events_test.php
@@ -59,7 +59,7 @@ public function test_message_contact_added(): void {
         // Check that the event data is valid.
         $this->assertInstanceOf('\core\event\message_contact_added', $event);
         $this->assertEquals(\context_user::instance(2), $event->get_context());
-        $url = new \moodle_url('/message/index.php', array('user1' => $event->userid, 'user2' => $event->relateduserid));
+        $url = new \moodle_url('/message/index.php', ['user1' => $event->userid, 'user2' => $event->relateduserid]);
         $this->assertEquals($url, $event->get_url());
     }
 
@@ -89,7 +89,7 @@ public function test_message_contact_removed(): void {
         // Check that the event data is valid.
         $this->assertInstanceOf('\core\event\message_contact_removed', $event);
         $this->assertEquals(\context_user::instance(2), $event->get_context());
-        $url = new \moodle_url('/message/index.php', array('user1' => $event->userid, 'user2' => $event->relateduserid));
+        $url = new \moodle_url('/message/index.php', ['user1' => $event->userid, 'user2' => $event->relateduserid]);
         $this->assertEquals($url, $event->get_url());
     }
 
@@ -164,15 +164,15 @@ public function test_message_user_unblocked(): void {
      * conditional check to ensure a fake message is sent during unit tests when calling that particular function.
      */
     public function test_message_sent(): void {
-        $event = \core\event\message_sent::create(array(
+        $event = \core\event\message_sent::create([
             'objectid' => 3,
             'userid' => 1,
             'context'  => \context_system::instance(),
             'relateduserid' => 2,
-            'other' => array(
-                'courseid' => 4
-            )
-        ));
+            'other' => [
+                'courseid' => 4,
+            ],
+        ]);
 
         // Trigger and capturing the event.
         $sink = $this->redirectEvents();
@@ -183,7 +183,7 @@ public function test_message_sent(): void {
         // Check that the event data is valid.
         $this->assertInstanceOf('\core\event\message_sent', $event);
         $this->assertEquals(\context_system::instance(), $event->get_context());
-        $url = new \moodle_url('/message/index.php', array('user1' => $event->userid, 'user2' => $event->relateduserid));
+        $url = new \moodle_url('/message/index.php', ['user1' => $event->userid, 'user2' => $event->relateduserid]);
         $this->assertEquals($url, $event->get_url());
         $this->assertEquals(3, $event->objectid);
         $this->assertEquals(4, $event->other['courseid']);
@@ -194,14 +194,14 @@ public function test_mesage_sent_without_other_courseid(): void {
         $this->expectException('coding_exception');
         $this->expectExceptionMessage('The \'courseid\' value must be set in other');
 
-        $event = \core\event\message_sent::create(array(
+        $event = \core\event\message_sent::create([
             'userid' => 1,
             'context'  => \context_system::instance(),
             'relateduserid' => 2,
-            'other' => array(
+            'other' => [
                 'messageid' => 3,
-            )
-        ));
+            ],
+        ]);
     }
 
     public function test_mesage_sent_via_create_from_ids(): void {
@@ -219,7 +219,7 @@ public function test_mesage_sent_via_create_from_ids(): void {
         // Check that the event data is valid.
         $this->assertInstanceOf('\core\event\message_sent', $event);
         $this->assertEquals(\context_system::instance(), $event->get_context());
-        $url = new \moodle_url('/message/index.php', array('user1' => $event->userid, 'user2' => $event->relateduserid));
+        $url = new \moodle_url('/message/index.php', ['user1' => $event->userid, 'user2' => $event->relateduserid]);
         $this->assertEquals($url, $event->get_url());
         $this->assertEquals(3, $event->objectid);
         $this->assertEquals(4, $event->other['courseid']);
@@ -241,8 +241,8 @@ public function test_group_message_sent(): void {
             'context'  => \context_system::instance(),
             'other' => [
                 'courseid' => 4,
-                'conversationid' => 54
-            ]
+                'conversationid' => 54,
+            ],
         ]);
 
         // Trigger and capture the event.
@@ -275,8 +275,8 @@ public function test_group_message_sent_without_other_courseid(): void {
             'context'  => \context_system::instance(),
             'relateduserid' => 2,
             'other' => [
-                'conversationid' => 34
-            ]
+                'conversationid' => 34,
+            ],
         ]);
     }
 
@@ -295,7 +295,7 @@ public function test_group_message_sent_without_other_conversationid(): void {
             'relateduserid' => 2,
             'other' => [
                 'courseid' => 44,
-            ]
+            ],
         ]);
     }
 
@@ -347,14 +347,14 @@ public function test_message_viewed(): void {
 
         // Get the usage action.
         $mua = $DB->get_record('message_user_actions', ['userid' => $user1->id, 'messageid' => $messageid,
-            'action' => \core_message\api::MESSAGE_ACTION_READ]);
+            'action' => \core_message\api::MESSAGE_ACTION_READ, ]);
 
         // Check that the event data is valid.
         $this->assertInstanceOf('\core\event\message_viewed', $event);
         $this->assertEquals(\context_user::instance($user1->id), $event->get_context());
         $this->assertEquals($mua->id, $event->objectid);
         $this->assertEquals($messageid, $event->other['messageid']);
-        $url = new \moodle_url('/message/index.php', array('user1' => $event->userid, 'user2' => $event->relateduserid));
+        $url = new \moodle_url('/message/index.php', ['user1' => $event->userid, 'user2' => $event->relateduserid]);
         $this->assertEquals($url, $event->get_url());
     }
 
@@ -382,7 +382,7 @@ public function test_message_deleted(): void {
 
         // Get the usage action.
         $mua = $DB->get_record('message_user_actions', ['userid' => $user1->id, 'messageid' => $messageid,
-            'action' => \core_message\api::MESSAGE_ACTION_DELETED]);
+            'action' => \core_message\api::MESSAGE_ACTION_DELETED, ]);
 
         // Check that the event data is valid.
         $this->assertInstanceOf('\core\event\message_deleted', $event);
@@ -406,7 +406,7 @@ public function test_message_deleted(): void {
 
         // Get the usage action.
         $mua = $DB->get_record('message_user_actions', ['userid' => $user2->id, 'messageid' => $messageid,
-            'action' => \core_message\api::MESSAGE_ACTION_DELETED]);
+            'action' => \core_message\api::MESSAGE_ACTION_DELETED, ]);
 
         // Check that the event data is valid.
         $this->assertInstanceOf('\core\event\message_deleted', $event);
@@ -461,7 +461,7 @@ public function test_message_deleted_whole_conversation(): void {
 
         // Get the user actions for the messages deleted by that user.
         $muas = $DB->get_records('message_user_actions', ['userid' => $user1->id,
-            'action' => \core_message\api::MESSAGE_ACTION_DELETED], 'timecreated ASC');
+            'action' => \core_message\api::MESSAGE_ACTION_DELETED, ], 'timecreated ASC');
         $this->assertCount(8, $muas);
 
         // Create a list we can use for testing.
@@ -521,7 +521,7 @@ public function test_notification_sent(): void {
         $this->assertEquals($user2->id, $event->relateduserid);
         $this->assertEquals(\context_system::instance(), $event->get_context());
         $this->assertEquals($course->id, $event->other['courseid']);
-        $url = new \moodle_url('/message/output/popup/notifications.php', array('notificationid' => $event->objectid));
+        $url = new \moodle_url('/message/output/popup/notifications.php', ['notificationid' => $event->objectid]);
         $this->assertEquals($url, $event->get_url());
     }
 
@@ -572,7 +572,7 @@ public function test_notification_viewed(): void {
         $this->assertEquals($user2->id, $event->userid);
         $this->assertEquals($user1->id, $event->relateduserid);
         $this->assertEquals(\context_user::instance($user2->id), $event->get_context());
-        $url = new \moodle_url('/message/output/popup/notifications.php', array('notificationid' => $event->objectid));
+        $url = new \moodle_url('/message/output/popup/notifications.php', ['notificationid' => $event->objectid]);
         $this->assertEquals($url, $event->get_url());
     }
 }
diff --git a/message/tests/messagelib_test.php b/message/tests/messagelib_test.php
index 888f1a0cef68d..212a9d6148f43 100644
--- a/message/tests/messagelib_test.php
+++ b/message/tests/messagelib_test.php
@@ -66,12 +66,12 @@ public function test_message_search_users(): void {
         $this->setAdminUser();
 
         // Create a user to add to the admin's contact list.
-        $user1 = $this->getDataGenerator()->create_user(array('firstname' => 'Test1', 'lastname' => 'user1'));
-        $user2 = $this->getDataGenerator()->create_user(array('firstname' => 'Test2', 'lastname' => 'user2'));
+        $user1 = $this->getDataGenerator()->create_user(['firstname' => 'Test1', 'lastname' => 'user1']);
+        $user2 = $this->getDataGenerator()->create_user(['firstname' => 'Test2', 'lastname' => 'user2']);
 
         // Add users to the admin's contact list.
-        \core_message\api::add_contact($USER->id, $user1->id);
-        \core_message\api::add_contact($USER->id, $user2->id);
+        api::add_contact($USER->id, $user1->id);
+        api::add_contact($USER->id, $user2->id);
 
         $this->assertCount(1, message_search_users(0, 'Test1'));
         $this->assertCount(2, message_search_users(0, 'Test'));
@@ -94,14 +94,18 @@ public function test_message_get_messages(): void {
         $user2 = self::getDataGenerator()->create_user();
         $user3 = self::getDataGenerator()->create_user();
 
-        \core_message\api::add_contact($user1->id, $user2->id);
-        \core_message\api::add_contact($user1->id, $user3->id);
+        api::add_contact($user1->id, $user2->id);
+        api::add_contact($user1->id, $user3->id);
 
         // Create some individual conversations.
-        $ic1 = \core_message\api::create_conversation(\core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            [$user1->id, $user2->id]);
-        $ic2 = \core_message\api::create_conversation(\core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
-            [$user1->id, $user3->id]);
+        $ic1 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user2->id]
+        );
+        $ic2 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL,
+            [$user1->id, $user3->id]
+        );
 
         // Send some messages to individual conversations.
         $im1 = testhelper::send_fake_message_to_conversation($user1, $ic1->id, 'Message 1');
@@ -111,7 +115,7 @@ public function test_message_get_messages(): void {
 
         // Mark a message as read by user2.
         $message = $DB->get_record('messages', ['id' => $im1]);
-        \core_message\api::mark_message_as_read($user2->id, $message);
+        api::mark_message_as_read($user2->id, $message);
 
         // Retrieve unread messages sent from user1 to user2.
         $lastmessages = message_get_messages($user2->id, $user1->id, 0, MESSAGE_GET_UNREAD);
@@ -139,8 +143,11 @@ public function test_message_get_messages(): void {
         $this->assertArrayHasKey($im1, $lastmessages);
 
         // Create some group conversations.
-        $gc1 = \core_message\api::create_conversation(\core_message\api::MESSAGE_CONVERSATION_TYPE_GROUP,
-            [$user1->id, $user2->id, $user3->id], 'Group chat');
+        $gc1 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user1->id, $user2->id, $user3->id],
+            'Group chat'
+        );
 
         // Send some messages to group conversations.
         $gm1 = testhelper::send_fake_message_to_conversation($user1, $gc1->id, 'Group message 1');
@@ -167,8 +174,11 @@ public function test_message_get_messages_only_group_conversations(): void {
         $user3 = self::getDataGenerator()->create_user();
 
         // Create some group conversations.
-        $gc1 = \core_message\api::create_conversation(\core_message\api::MESSAGE_CONVERSATION_TYPE_GROUP,
-            [$user1->id, $user2->id, $user3->id], 'Group chat');
+        $gc1 = api::create_conversation(
+            api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [$user1->id, $user2->id, $user3->id],
+            'Group chat'
+        );
 
         // Send some messages to group conversations.
         $gm1 = testhelper::send_fake_message_to_conversation($user1, $gc1->id, 'Group message 1');
@@ -179,5 +189,4 @@ public function test_message_get_messages_only_group_conversations(): void {
         $lastmessages = message_get_messages($user2->id, $user1->id, 0, MESSAGE_GET_READ_AND_UNREAD);
         $this->assertCount(0, $lastmessages);
     }
-
 }

From b637f8cc4eab28b3a6a9d3fa5af97f7f8b7218bd Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 10 Jun 2024 10:16:24 +0800
Subject: [PATCH 074/119] MDL-81960 core: Coding style fixes

---
 lib/classes/url.php    | 125 +++++++++++++++------------
 lib/tests/url_test.php | 186 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 258 insertions(+), 53 deletions(-)

diff --git a/lib/classes/url.php b/lib/classes/url.php
index a0b9971828031..af29e06d832da 100644
--- a/lib/classes/url.php
+++ b/lib/classes/url.php
@@ -92,7 +92,7 @@ class url {
      * Url parameters as associative array.
      * @var array
      */
-    protected $params = array();
+    protected $params = [];
 
     /**
      * Create new instance of url.
@@ -103,11 +103,15 @@ class url {
      *      query string because it may result in double encoded values. Use the
      *      $params instead. For admin URLs, just use /admin/script.php, this
      *      class takes care of the $CFG->admin issue.
-     * @param array $params these params override current params or add new
+     * @param null|array $params these params override current params or add new
      * @param string $anchor The anchor to use as part of the URL if there is one.
      * @throws moodle_exception
      */
-    public function __construct($url, array $params = null, $anchor = null) {
+    public function __construct(
+        $url,
+        ?array $params = null,
+        $anchor = null,
+    ) {
         global $CFG;
 
         if ($url instanceof self) {
@@ -120,7 +124,6 @@ public function __construct($url, array $params = null, $anchor = null) {
             $this->slashargument = $url->slashargument;
             $this->params = $url->params;
             $this->anchor = $url->anchor;
-
         } else {
             $url = $url ?? '';
             // Detect if anchor used.
@@ -134,7 +137,7 @@ public function __construct($url, array $params = null, $anchor = null) {
 
             // Normalise shortened form of our url ex.: '/course/view.php'.
             if (strpos($url, '/') === 0) {
-                $url = $CFG->wwwroot.$url;
+                $url = $CFG->wwwroot . $url;
             }
 
             if ($CFG->admin !== 'admin') {
@@ -176,11 +179,11 @@ public function __construct($url, array $params = null, $anchor = null) {
      *
      * The added params override existing ones if they have the same name.
      *
-     * @param array $params Defaults to null. If null then returns all params.
+     * @param null|array $params Defaults to null. If null then returns all params.
      * @return array Array of Params for url.
      * @throws coding_exception
      */
-    public function params(array $params = null) {
+    public function params(?array $params = null) {
         $params = (array)$params;
 
         foreach ($params as $key => $value) {
@@ -191,7 +194,7 @@ public function params(array $params = null) {
                 if (is_array($value)) {
                     throw new coding_exception('Url parameters values can not be arrays!');
                 }
-                if (is_object($value) and !method_exists($value, '__toString')) {
+                if (is_object($value) && !method_exists($value, '__toString')) {
                     throw new coding_exception('Url parameters values can not be objects, unless __toString() is defined!');
                 }
             }
@@ -207,13 +210,19 @@ public function params(array $params = null) {
      * Can be called as either remove_params('param1', 'param2')
      * or remove_params(array('param1', 'param2')).
      *
-     * @param string[]|string $params,... either an array of param names, or 1..n string params to remove as args.
+     * @param string[]|string ...$params either an array of param names, or 1..n string params to remove as args.
      * @return array url parameters
      */
-    public function remove_params($params = null) {
-        if (!is_array($params)) {
-            $params = func_get_args();
+    public function remove_params(...$params) {
+        if (empty($params)) {
+            return $this->params;
+        }
+
+        $firstparam = reset($params);
+        if (is_array($firstparam)) {
+            $params = $firstparam;
         }
+
         foreach ($params as $param) {
             unset($this->params[$param]);
         }
@@ -223,12 +232,10 @@ public function remove_params($params = null) {
     /**
      * Remove all url parameters.
      *
-     * @todo remove the unused param.
-     * @param array $params Unused param
-     * @return void
+     * @param array $unused Unused param
      */
-    public function remove_all_params($params = null) {
-        $this->params = array();
+    public function remove_all_params($unused = null) {
+        $this->params = [];
         $this->slashargument = '';
     }
 
@@ -244,7 +251,7 @@ public function remove_all_params($params = null) {
     public function param($paramname, $newvalue = '') {
         if (func_num_args() > 1) {
             // Set new value.
-            $this->params(array($paramname => $newvalue));
+            $this->params([$paramname => $newvalue]);
         }
         if (isset($this->params[$paramname])) {
             return $this->params[$paramname];
@@ -256,11 +263,11 @@ public function param($paramname, $newvalue = '') {
     /**
      * Merges parameters and validates them
      *
-     * @param array $overrideparams
+     * @param null|array $overrideparams
      * @return array merged parameters
      * @throws coding_exception
      */
-    protected function merge_overrideparams(array $overrideparams = null) {
+    protected function merge_overrideparams(?array $overrideparams = null) {
         $overrideparams = (array)$overrideparams;
         $params = $this->params;
         foreach ($overrideparams as $key => $value) {
@@ -270,7 +277,7 @@ protected function merge_overrideparams(array $overrideparams = null) {
             if (is_array($value)) {
                 throw new coding_exception('Overridden parameters values can not be arrays!');
             }
-            if (is_object($value) and !method_exists($value, '__toString')) {
+            if (is_object($value) && !method_exists($value, '__toString')) {
                 throw new coding_exception('Overridden parameters values can not be objects, unless __toString() is defined!');
             }
             $params[$key] = (string)$value;
@@ -284,12 +291,12 @@ protected function merge_overrideparams(array $overrideparams = null) {
      * This method should not be used outside of this method.
      *
      * @param bool $escaped Use &amp; as params separator instead of plain &
-     * @param array $overrideparams params to add to the output params, these
+     * @param null|array $overrideparams params to add to the output params, these
      *      override existing ones with the same name.
      * @return string query string that can be added to a url.
      */
-    public function get_query_string($escaped = true, array $overrideparams = null) {
-        $arr = array();
+    public function get_query_string($escaped = true, ?array $overrideparams = null) {
+        $arr = [];
         if ($overrideparams !== null) {
             $params = $this->merge_overrideparams($overrideparams);
         } else {
@@ -298,11 +305,11 @@ public function get_query_string($escaped = true, array $overrideparams = null)
         foreach ($params as $key => $val) {
             if (is_array($val)) {
                 foreach ($val as $index => $value) {
-                    $arr[] = rawurlencode($key.'['.$index.']')."=".rawurlencode($value);
+                    $arr[] = rawurlencode($key . '[' . $index . ']') . "=" . rawurlencode($value);
                 }
             } else {
                 if (isset($val) && $val !== '') {
-                    $arr[] = rawurlencode($key)."=".rawurlencode($val);
+                    $arr[] = rawurlencode($key) . "=" . rawurlencode($val);
                 } else {
                     $arr[] = rawurlencode($key);
                 }
@@ -327,7 +334,7 @@ public function export_params_for_template(): array {
         foreach ($this->params as $key => $val) {
             if (is_array($val)) {
                 foreach ($val as $index => $value) {
-                    $data[] = ['name' => $key.'['.$index.']', 'value' => $value];
+                    $data[] = ['name' => $key . '[' . $index . ']', 'value' => $value];
                 }
             } else {
                 $data[] = ['name' => $key, 'value' => $val];
@@ -352,15 +359,15 @@ public function __toString() {
      * the returned URL in HTTP headers, you want $escaped=false.
      *
      * @param bool $escaped Use &amp; as params separator instead of plain &
-     * @param array $overrideparams params to add to the output url, these override existing ones with the same name.
+     * @param null|array $overrideparams params to add to the output url, these override existing ones with the same name.
      * @return string Resulting URL
      */
-    public function out($escaped = true, array $overrideparams = null) {
+    public function out($escaped = true, ?array $overrideparams = null) {
 
         global $CFG;
 
         if (!is_bool($escaped)) {
-            debugging('Escape parameter must be of type boolean, '.gettype($escaped).' given instead.');
+            debugging('Escape parameter must be of type boolean, ' . gettype($escaped) . ' given instead.');
         }
 
         $url = $this;
@@ -375,7 +382,6 @@ public function out($escaped = true, array $overrideparams = null) {
         }
 
         return $url->raw_out($escaped, $overrideparams);
-
     }
 
     /**
@@ -384,15 +390,15 @@ public function out($escaped = true, array $overrideparams = null) {
      * This is identical in signature and use to out() but doesn't call the rewrite handler.
      *
      * @param bool $escaped Use &amp; as params separator instead of plain &
-     * @param array $overrideparams params to add to the output url, these override existing ones with the same name.
+     * @param null|array $overrideparams params to add to the output url, these override existing ones with the same name.
      * @return string Resulting URL
      */
-    public function raw_out($escaped = true, array $overrideparams = null) {
+    public function raw_out($escaped = true, ?array $overrideparams = null) {
         if (!is_bool($escaped)) {
-            debugging('Escape parameter must be of type boolean, '.gettype($escaped).' given instead.');
+            debugging('Escape parameter must be of type boolean, ' . gettype($escaped) . ' given instead.');
         }
 
-        $uri = $this->out_omit_querystring().$this->slashargument;
+        $uri = $this->out_omit_querystring() . $this->slashargument;
 
         $querystring = $this->get_query_string($escaped, $overrideparams);
         if ($querystring !== '') {
@@ -463,15 +469,15 @@ public function get_encoded_anchor(): string {
     /**
      * Returns url without parameters, everything before '?'.
      *
-     * @param bool $includeanchor if {@link self::anchor} is defined, should it be returned?
+     * @param bool $includeanchor if {@see self::anchor} is defined, should it be returned?
      * @return string
      */
     public function out_omit_querystring($includeanchor = false) {
 
-        $uri = $this->scheme ? $this->scheme.':'.((strtolower($this->scheme) == 'mailto') ? '':'//'): '';
-        $uri .= $this->user ? $this->user.($this->pass? ':'.$this->pass:'').'@':'';
+        $uri = $this->scheme ? $this->scheme . ':' . ((strtolower($this->scheme) == 'mailto') ? '' : '//') : '';
+        $uri .= $this->user ? $this->user . ($this->pass ? ':' . $this->pass : '') . '@' : '';
         $uri .= $this->host ? $this->host : '';
-        $uri .= $this->port ? ':'.$this->port : '';
+        $uri .= $this->port ? ':' . $this->port : '';
         $uri .= $this->path ? $this->path : '';
         if ($includeanchor) {
             $uri .= $this->get_encoded_anchor();
@@ -575,7 +581,6 @@ public function set_scheme($scheme) {
      * @param string $path usually file path
      * @param string $parameter name of page parameter if slasharguments not supported
      * @param bool $supported usually null, then it depends on $CFG->slasharguments, use true or false for other servers
-     * @return void
      */
     public function set_slashargument($path, $parameter = 'file', $supported = null) {
         global $CFG;
@@ -589,7 +594,6 @@ public function set_slashargument($path, $parameter = 'file', $supported = null)
             $path  = implode('/', $parts);
             $this->slashargument = $path;
             unset($this->params[$parameter]);
-
         } else {
             $this->slashargument = '';
             $this->params[$parameter] = $path;
@@ -627,7 +631,7 @@ public static function from_uri(UriInterface $uri): self {
      * @return self
      */
     public static function make_file_url($urlbase, $path, $forcedownload = false) {
-        $params = array();
+        $params = [];
         if ($forcedownload) {
             $params['forcedownload'] = 1;
         }
@@ -656,8 +660,16 @@ public static function make_file_url($urlbase, $path, $forcedownload = false) {
      *                user who will not be logged in when viewing, then we use a token to authenticate the user.
      * @return url
      */
-    public static function make_pluginfile_url($contextid, $component, $area, $itemid, $pathname, $filename,
-                                               $forcedownload = false, $includetoken = false) {
+    public static function make_pluginfile_url(
+        $contextid,
+        $component,
+        $area,
+        $itemid,
+        $pathname,
+        $filename,
+        $forcedownload = false,
+        $includetoken = false
+    ) {
         global $CFG, $USER;
 
         $path = [];
@@ -704,14 +716,21 @@ public static function make_pluginfile_url($contextid, $component, $area, $itemi
      * @param bool $forcedownload
      * @return url
      */
-    public static function make_webservice_pluginfile_url($contextid, $component, $area, $itemid, $pathname, $filename,
-                                               $forcedownload = false) {
+    public static function make_webservice_pluginfile_url(
+        $contextid,
+        $component,
+        $area,
+        $itemid,
+        $pathname,
+        $filename,
+        $forcedownload = false
+    ) {
         global $CFG;
         $urlbase = "$CFG->wwwroot/webservice/pluginfile.php";
         if ($itemid === null) {
-            return self::make_file_url($urlbase, "/$contextid/$component/$area".$pathname.$filename, $forcedownload);
+            return self::make_file_url($urlbase, "/$contextid/$component/$area" . $pathname . $filename, $forcedownload);
         } else {
-            return self::make_file_url($urlbase, "/$contextid/$component/$area/$itemid".$pathname.$filename, $forcedownload);
+            return self::make_file_url($urlbase, "/$contextid/$component/$area/$itemid" . $pathname . $filename, $forcedownload);
         }
     }
 
@@ -729,7 +748,7 @@ public static function make_draftfile_url($draftid, $pathname, $filename, $force
         $urlbase = "$CFG->wwwroot/draftfile.php";
         $context = context_user::instance($USER->id);
 
-        return self::make_file_url($urlbase, "/$context->id/user/draft/$draftid".$pathname.$filename, $forcedownload);
+        return self::make_file_url($urlbase, "/$context->id/user/draft/$draftid" . $pathname . $filename, $forcedownload);
     }
 
     /**
@@ -744,7 +763,7 @@ public static function make_legacyfile_url($courseid, $filepath, $forcedownload
         global $CFG;
 
         $urlbase = "$CFG->wwwroot/file.php";
-        return self::make_file_url($urlbase, '/'.$courseid.'/'.$filepath, $forcedownload);
+        return self::make_file_url($urlbase, '/' . $courseid . '/' . $filepath, $forcedownload);
     }
 
     /**
@@ -757,7 +776,7 @@ public function is_local_url(): bool {
 
         $url = $this->out();
         // Does URL start with wwwroot? Otherwise, URL isn't relative to wwwroot.
-        return ( ($url === $CFG->wwwroot) || (strpos($url, $CFG->wwwroot.'/') === 0) );
+        return ( ($url === $CFG->wwwroot) || (strpos($url, $CFG->wwwroot . '/') === 0) );
     }
 
     /**
@@ -766,11 +785,11 @@ public function is_local_url(): bool {
      * Can be used for passing around urls with the wwwroot stripped
      *
      * @param boolean $escaped Use &amp; as params separator instead of plain &
-     * @param array $overrideparams params to add to the output url, these override existing ones with the same name.
+     * @param ?array $overrideparams params to add to the output url, these override existing ones with the same name.
      * @return string Resulting URL
      * @throws coding_exception if called on a non-local url
      */
-    public function out_as_local_url($escaped = true, array $overrideparams = null) {
+    public function out_as_local_url($escaped = true, ?array $overrideparams = null) {
         global $CFG;
 
         // URL should be relative to wwwroot. If not then throw exception.
diff --git a/lib/tests/url_test.php b/lib/tests/url_test.php
index 3dfceb7929e63..fd3cc8a5dbba8 100644
--- a/lib/tests/url_test.php
+++ b/lib/tests/url_test.php
@@ -503,4 +503,190 @@ public static function url_fragment_parsing_provider(): array {
             'Quotes become encoded' => ['test with "quotes"', 'test%20with%20%22quotes%22'],
         ];
     }
+
+    /**
+     * Test the coding exceptions when returning URL as relative path from $CFG->wwwroot.
+     *
+     * @param url $url The URL pointing to a web resource.
+     * @param string $exmessage The expected output URL.
+     * @dataProvider out_as_local_url_coding_exception_provider
+     */
+    public function test_out_as_local_url_coding_exception(url $url, string $exmessage): void {
+        $this->expectException(\coding_exception::class);
+        $this->expectExceptionMessage($exmessage);
+        $localurl = $url->out_as_local_url();
+    }
+
+    /**
+     * Data provider for throwing coding exceptions in <u>url::out_as_local_url()</u>.
+     *
+     * @return array
+     */
+    public static function out_as_local_url_coding_exception_provider(): array {
+        return [
+            'Google Maps CDN (HTTPS)' => [
+                new url('https://maps.googleapis.com/maps/api/js', ['key' => 'googlemapkey3', 'sensor' => 'false']),
+                'Coding error detected, it must be fixed by a programmer: out_as_local_url called on a non-local URL',
+            ],
+            'Google Maps CDN (HTTP)' => [
+                new url('http://maps.googleapis.com/maps/api/js', ['key' => 'googlemapkey3', 'sensor' => 'false']),
+                'Coding error detected, it must be fixed by a programmer: out_as_local_url called on a non-local URL',
+            ],
+        ];
+    }
+
+    /**
+     * Test URL as relative path from $CFG->wwwroot.
+     *
+     * @param url $url The URL pointing to a web resource.
+     * @param string $expected The expected local URL.
+     * @param string|null $wwwroot
+     * @dataProvider out_as_local_url_provider
+     */
+    public function test_out_as_local_url(
+        url $url,
+        string $expected,
+        ?string $wwwroot = null,
+    ): void {
+        global $CFG;
+
+        if ($wwwroot !== null) {
+            $CFG->wwwroot = $wwwroot;
+            $this->resetAfterTest(true);
+        }
+        $this->assertEquals($expected, $url->out_as_local_url(false));
+    }
+
+    /**
+     * Data provider for returning local paths via <u>url::out_as_local_url()</u>.
+     *
+     * @return array
+     */
+    public static function out_as_local_url_provider(): array {
+        global $CFG;
+        $wwwroot = rtrim($CFG->wwwroot, '/');
+        $httpswwwroot = str_replace('https://', 'http://', $CFG->wwwroot);
+
+        return [
+            'HTTP URL' => [
+                new url("{$wwwroot}/lib/tests/weblib_test.php"),
+                '/lib/tests/weblib_test.php',
+                $wwwroot,
+            ],
+            'HTTPS URL' => [
+                new url("{$httpswwwroot}/lib/tests/weblib_test.php"),
+                '/lib/tests/weblib_test.php',
+                $httpswwwroot,
+            ],
+            'Plain wwwroot' => [
+                new url($CFG->wwwroot),
+                '',
+            ],
+            'wwwroot With trailing /' => [
+                new url($CFG->wwwroot . '/'),
+                '/',
+            ],
+            'Environment XML file' => [
+                new url('/admin/environment.xml'),
+                '/admin/environment.xml',
+            ],
+            'H5P JS internal resource' => [
+                new url('/h5p/js/embed.js'),
+                '/h5p/js/embed.js',
+            ],
+            'A Moodle JS resource using the full path including the proper JS Handler' => [
+                new url($wwwroot . '/lib/javascript.php/1/lib/editor/tiny/js/tinymce/tinymce.js'),
+                '/lib/javascript.php/1/lib/editor/tiny/js/tinymce/tinymce.js',
+            ],
+        ];
+    }
+
+    /**
+     * Test URL as relative path from $CFG->wwwroot.
+     *
+     * @param url $url The URL pointing to a web resource.
+     * @param bool $expected The expected result.
+     * @dataProvider is_local_url_provider
+     */
+    public function test_is_local_url(url $url, bool $expected): void {
+        $this->assertEquals($expected, $url->is_local_url(), "'{$url}' is not a local URL!");
+    }
+
+    /**
+     * Data provider for testing <u>url::is_local_url()</u>.
+     *
+     * @return array
+     */
+    public static function is_local_url_provider(): array {
+        global $CFG;
+        $wwwroot = rtrim($CFG->wwwroot, '/');
+
+        return [
+            'Google Maps CDN (HTTPS)' => [
+                new url('https://maps.googleapis.com/maps/api/js', ['key' => 'googlemapkey3', 'sensor' => 'false']),
+                false,
+            ],
+            'Google Maps CDN (HTTP)' => [
+                new url('http://maps.googleapis.com/maps/api/js', ['key' => 'googlemapkey3', 'sensor' => 'false']),
+                false,
+            ],
+            'wwwroot' => [
+                new url($wwwroot),
+                true,
+            ],
+            'wwwroot/' => [
+                new url($wwwroot . '/'),
+                true,
+            ],
+            'Environment XML file' => [
+                new url('/admin/environment.xml'),
+                true,
+            ],
+            'H5P JS internal resource' => [
+                new url('/h5p/js/embed.js'),
+                true,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider remove_params_provider
+     */
+    public function test_remove_params($params, $remove, $expected): void {
+        $url = new url('/index.php', $params);
+        if ($remove !== null) {
+            $url->remove_params(...$remove);
+        }
+        $this->assertSame($expected, $url->params());
+    }
+
+    public static function remove_params_provider(): array {
+        return [
+            [
+                ['id' => 1, 'cid' => 2, 'sid' => 3],
+                null,
+                ['id' => '1', 'cid' => '2', 'sid' => '3'],
+            ],
+            [
+                ['id' => 1, 'cid' => 2, 'sid' => 3],
+                [],
+                ['id' => '1', 'cid' => '2', 'sid' => '3'],
+            ],
+            [
+                ['id' => 1, 'cid' => 2, 'sid' => 3],
+                ['other'],
+                ['id' => '1', 'cid' => '2', 'sid' => '3'],
+            ],
+            [
+                ['id' => 1, 'cid' => 2, 'sid' => 3],
+                ['id', 'sid'],
+                ['cid' => '2'],
+            ],
+            [
+                ['id' => 1, 'cid' => 2, 'sid' => 3],
+                [['id', 'sid']],
+                ['cid' => '2'],
+            ],
+        ];
+    }
 }

From 097b3fbee31797f636434985d6fccdcde14aa619 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 10 Jun 2024 11:56:02 +0800
Subject: [PATCH 075/119] MDL-81960 core: Move moodle_url tests to correct
 location

---
 lib/classes/component.php |   1 +
 lib/tests/url_test.php    |  20 ------
 lib/tests/weblib_test.php | 130 --------------------------------------
 3 files changed, 1 insertion(+), 150 deletions(-)

diff --git a/lib/classes/component.php b/lib/classes/component.php
index e7f3eb4b324ff..0169c7e7f774f 100644
--- a/lib/classes/component.php
+++ b/lib/classes/component.php
@@ -390,6 +390,7 @@ protected static function is_cache_valid(array $cache): bool {
         $keyclasses = [
             \core\exception\moodle_exception::class,
             \core\output\bootstrap_renderer::class,
+            \core\url::class,
         ];
         foreach ($keyclasses as $classname) {
             if (!array_key_exists($classname, $cache['classmap'])) {
diff --git a/lib/tests/url_test.php b/lib/tests/url_test.php
index fd3cc8a5dbba8..069dcc4be419a 100644
--- a/lib/tests/url_test.php
+++ b/lib/tests/url_test.php
@@ -175,26 +175,6 @@ public function test_compare_url(): void {
         $this->assertTrue($url1->compare($url2, URL_MATCH_EXACT));
     }
 
-    public function test_out_as_local_url(): void {
-        global $CFG;
-        // Test http url.
-        $url1 = new url('/lib/tests/weblib_test.php');
-        $this->assertSame('/lib/tests/weblib_test.php', $url1->out_as_local_url());
-
-        // Test https url.
-        $httpswwwroot = str_replace("http://", "https://", $CFG->wwwroot);
-        $url2 = new url($httpswwwroot . '/login/profile.php');
-        $this->assertSame('/login/profile.php', $url2->out_as_local_url());
-
-        // Test http url matching wwwroot.
-        $url3 = new url($CFG->wwwroot);
-        $this->assertSame('', $url3->out_as_local_url());
-
-        // Test http url matching wwwroot ending with slash (/).
-        $url3 = new url($CFG->wwwroot . '/');
-        $this->assertSame('/', $url3->out_as_local_url());
-    }
-
     public function test_out_as_local_url_error(): void {
         $url2 = new url('http://www.google.com/lib/tests/weblib_test.php');
         $this->expectException(\coding_exception::class);
diff --git a/lib/tests/weblib_test.php b/lib/tests/weblib_test.php
index 705f962a6d4c6..4de970c12d06b 100644
--- a/lib/tests/weblib_test.php
+++ b/lib/tests/weblib_test.php
@@ -1199,136 +1199,6 @@ public function test_get_html_lang_attribute_value(string $langcode, string $exp
         $this->assertEquals($expected, get_html_lang_attribute_value($langcode));
     }
 
-    /**
-     * Test the coding exceptions when returning URL as relative path from $CFG->wwwroot.
-     *
-     * @param moodle_url $url The URL pointing to a web resource.
-     * @param string $exmessage The expected output URL.
-     * @throws coding_exception If called on a non-local URL.
-     * @see \moodle_url::out_as_local_url()
-     * @covers \moodle_url::out_as_local_url
-     * @dataProvider out_as_local_url_coding_exception_provider
-     */
-    public function test_out_as_local_url_coding_exception(\moodle_url $url, string $exmessage): void {
-        $this->expectException(\coding_exception::class);
-        $this->expectExceptionMessage($exmessage);
-        $localurl = $url->out_as_local_url();
-    }
-
-    /**
-     * Data provider for throwing coding exceptions in <u>\moodle_url::out_as_local_url()</u>.
-     *
-     * @return array
-     * @throws moodle_exception On seriously malformed URLs (<u>parse_url</u>).
-     * @see \moodle_url::out_as_local_url()
-     * @see parse_url()
-     */
-    public function out_as_local_url_coding_exception_provider() {
-        return [
-            'Google Maps CDN (HTTPS)' => [
-                new \moodle_url('https://maps.googleapis.com/maps/api/js', ['key' => 'googlemapkey3', 'sensor' => 'false']),
-                'Coding error detected, it must be fixed by a programmer: out_as_local_url called on a non-local URL'
-            ],
-            'Google Maps CDN (HTTP)' => [
-                new \moodle_url('http://maps.googleapis.com/maps/api/js', ['key' => 'googlemapkey3', 'sensor' => 'false']),
-                'Coding error detected, it must be fixed by a programmer: out_as_local_url called on a non-local URL'
-            ],
-        ];
-    }
-
-    /**
-     * Test URL as relative path from $CFG->wwwroot.
-     *
-     * @param moodle_url $url The URL pointing to a web resource.
-     * @param string $expected The expected local URL.
-     * @throws coding_exception If called on a non-local URL.
-     * @see \moodle_url::out_as_local_url()
-     * @covers \moodle_url::out_as_local_url
-     * @dataProvider out_as_local_url_provider
-     */
-    public function test_out_as_local_url(\moodle_url $url, string $expected): void {
-        $this->assertEquals($expected, $url->out_as_local_url(false));
-    }
-
-    /**
-     * Data provider for returning local paths via <u>\moodle_url::out_as_local_url()</u>.
-     *
-     * @return array
-     * @throws moodle_exception On seriously malformed URLs (<u>parse_url</u>).
-     * @see \moodle_url::out_as_local_url()
-     * @see parse_url()
-     */
-    public function out_as_local_url_provider() {
-        global $CFG;
-        $wwwroot = rtrim($CFG->wwwroot, '/');
-
-        return [
-            'Environment XML file' => [
-                new \moodle_url('/admin/environment.xml'),
-                '/admin/environment.xml'
-            ],
-            'H5P JS internal resource' => [
-                new \moodle_url('/h5p/js/embed.js'),
-                '/h5p/js/embed.js'
-            ],
-            'A Moodle JS resource using the full path including the proper JS Handler' => [
-                new \moodle_url($wwwroot . '/lib/javascript.php/1/lib/editor/tiny/js/tinymce/tinymce.js'),
-                '/lib/javascript.php/1/lib/editor/tiny/js/tinymce/tinymce.js'
-            ],
-        ];
-    }
-
-    /**
-     * Test URL as relative path from $CFG->wwwroot.
-     *
-     * @param moodle_url $url The URL pointing to a web resource.
-     * @param bool $expected The expected result.
-     * @see \moodle_url::is_local_url()
-     * @covers \moodle_url::is_local_url
-     * @dataProvider is_local_url_provider
-     */
-    public function test_is_local_url(\moodle_url $url, bool $expected): void {
-        $this->assertEquals($expected, $url->is_local_url(), "'{$url}' is not a local URL!");
-    }
-
-    /**
-     * Data provider for testing <u>\moodle_url::is_local_url()</u>.
-     *
-     * @return array
-     * @see \moodle_url::is_local_url()
-     */
-    public function is_local_url_provider() {
-        global $CFG;
-        $wwwroot = rtrim($CFG->wwwroot, '/');
-
-        return [
-            'Google Maps CDN (HTTPS)' => [
-                new \moodle_url('https://maps.googleapis.com/maps/api/js', ['key' => 'googlemapkey3', 'sensor' => 'false']),
-                false
-            ],
-            'Google Maps CDN (HTTP)' => [
-                new \moodle_url('http://maps.googleapis.com/maps/api/js', ['key' => 'googlemapkey3', 'sensor' => 'false']),
-                false
-            ],
-            'wwwroot' => [
-                new \moodle_url($wwwroot),
-                true
-            ],
-            'wwwroot/' => [
-                new \moodle_url($wwwroot . '/'),
-                true
-            ],
-            'Environment XML file' => [
-                new \moodle_url('/admin/environment.xml'),
-                true
-            ],
-            'H5P JS internal resource' => [
-                new \moodle_url('/h5p/js/embed.js'),
-                true
-            ],
-        ];
-    }
-
     /**
      * Data provider for strip_querystring tests.
      *

From c8a538de29d7ea0c27a4844ec1b86e707873d5f4 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 11 Jun 2024 12:10:43 +0800
Subject: [PATCH 076/119] MDL-81960 core: Move progress_trace classes to legacy
 autoloader

---
 lib/classes/output/progress_trace.php         |  41 +++
 .../combined_progress_trace.php               |  61 ++++
 .../error_log_progress_trace.php              |  46 +++
 .../html_list_progress_trace.php              |  66 ++++
 .../progress_trace/html_progress_trace.php    |  36 +++
 .../progress_trace/null_progress_trace.php    |  34 ++
 .../progress_trace/progress_trace_buffer.php  |  90 ++++++
 .../progress_trace/text_progress_trace.php    |  35 +++
 lib/db/legacyclasses.php                      |  10 +
 lib/weblib.php                                | 292 ------------------
 10 files changed, 419 insertions(+), 292 deletions(-)
 create mode 100644 lib/classes/output/progress_trace.php
 create mode 100644 lib/classes/output/progress_trace/combined_progress_trace.php
 create mode 100644 lib/classes/output/progress_trace/error_log_progress_trace.php
 create mode 100644 lib/classes/output/progress_trace/html_list_progress_trace.php
 create mode 100644 lib/classes/output/progress_trace/html_progress_trace.php
 create mode 100644 lib/classes/output/progress_trace/null_progress_trace.php
 create mode 100644 lib/classes/output/progress_trace/progress_trace_buffer.php
 create mode 100644 lib/classes/output/progress_trace/text_progress_trace.php

diff --git a/lib/classes/output/progress_trace.php b/lib/classes/output/progress_trace.php
new file mode 100644
index 0000000000000..8259ddb7d7185
--- /dev/null
+++ b/lib/classes/output/progress_trace.php
@@ -0,0 +1,41 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Progress trace class.
+ *
+ * Use this class from long operations where you want to output occasional information about
+ * what is going on, but don't know if, or in what format, the output should be.
+ *
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
+ */
+abstract class progress_trace {
+    /**
+     * Output an progress message in whatever format.
+     *
+     * @param string $message the message to output.
+     * @param integer $depth indent depth for this message.
+     */
+    abstract public function output($message, $depth = 0);
+
+    /**
+     * Called when the processing is finished.
+     */
+    public function finished() {
+    }
+}
diff --git a/lib/classes/output/progress_trace/combined_progress_trace.php b/lib/classes/output/progress_trace/combined_progress_trace.php
new file mode 100644
index 0000000000000..084114de52161
--- /dev/null
+++ b/lib/classes/output/progress_trace/combined_progress_trace.php
@@ -0,0 +1,61 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Special type of trace that can be used for redirecting to multiple other traces.
+ *
+ * @copyright Petr Skoda {@link http://skodak.org}
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
+ */
+class combined_progress_trace extends progress_trace {
+
+    /**
+     * An array of traces.
+     * @var array
+     */
+    protected $traces;
+
+    /**
+     * Constructs a new instance.
+     *
+     * @param array $traces multiple traces
+     */
+    public function __construct(array $traces) {
+        $this->traces = $traces;
+    }
+
+    /**
+     * Output an progress message in whatever format.
+     *
+     * @param string $message the message to output.
+     * @param integer $depth indent depth for this message.
+     */
+    public function output($message, $depth = 0) {
+        foreach ($this->traces as $trace) {
+            $trace->output($message, $depth);
+        }
+    }
+
+    /**
+     * Called when the processing is finished.
+     */
+    public function finished() {
+        foreach ($this->traces as $trace) {
+            $trace->finished();
+        }
+    }
+}
diff --git a/lib/classes/output/progress_trace/error_log_progress_trace.php b/lib/classes/output/progress_trace/error_log_progress_trace.php
new file mode 100644
index 0000000000000..f27d5e791a1fe
--- /dev/null
+++ b/lib/classes/output/progress_trace/error_log_progress_trace.php
@@ -0,0 +1,46 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This subclass of progress_trace outputs to error log.
+ *
+ * @copyright Petr Skoda {@link http://skodak.org}
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
+ */
+class error_log_progress_trace extends progress_trace {
+    /** @var string log prefix */
+    protected $prefix;
+
+    /**
+     * Constructor.
+     * @param string $prefix optional log prefix
+     */
+    public function __construct($prefix = '') {
+        $this->prefix = $prefix;
+    }
+
+    /**
+     * Output the trace message.
+     *
+     * @param string $message
+     * @param int $depth
+     * @return void Output is sent to error log.
+     */
+    public function output($message, $depth = 0) {
+        error_log($this->prefix . str_repeat('  ', $depth) . $message);
+    }
+}
diff --git a/lib/classes/output/progress_trace/html_list_progress_trace.php b/lib/classes/output/progress_trace/html_list_progress_trace.php
new file mode 100644
index 0000000000000..ef1629fb04b12
--- /dev/null
+++ b/lib/classes/output/progress_trace/html_list_progress_trace.php
@@ -0,0 +1,66 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * HTML List Progress Tree
+ *
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
+ */
+class html_list_progress_trace extends progress_trace {
+    /** @var int */
+    protected $currentdepth = -1;
+
+    /**
+     * Echo out the list
+     *
+     * @param string $message The message to display
+     * @param int $depth
+     * @return void Output is echoed
+     */
+    public function output($message, $depth = 0) {
+        $samedepth = true;
+        while ($this->currentdepth > $depth) {
+            echo "</li>\n</ul>\n";
+            $this->currentdepth -= 1;
+            if ($this->currentdepth == $depth) {
+                echo '<li>';
+            }
+            $samedepth = false;
+        }
+        while ($this->currentdepth < $depth) {
+            echo "<ul>\n<li>";
+            $this->currentdepth += 1;
+            $samedepth = false;
+        }
+        if ($samedepth) {
+            echo "</li>\n<li>";
+        }
+        echo htmlspecialchars($message, ENT_COMPAT);
+        flush();
+    }
+
+    /**
+     * Called when the processing is finished.
+     */
+    public function finished() {
+        while ($this->currentdepth >= 0) {
+            echo "</li>\n</ul>\n";
+            $this->currentdepth -= 1;
+        }
+    }
+}
diff --git a/lib/classes/output/progress_trace/html_progress_trace.php b/lib/classes/output/progress_trace/html_progress_trace.php
new file mode 100644
index 0000000000000..93208f62c78d0
--- /dev/null
+++ b/lib/classes/output/progress_trace/html_progress_trace.php
@@ -0,0 +1,36 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This subclass of progress_trace outputs as HTML.
+ *
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
+ */
+class html_progress_trace extends progress_trace {
+    /**
+     * Output the trace message.
+     *
+     * @param string $message
+     * @param int $depth
+     * @return void Output is echo'd
+     */
+    public function output($message, $depth = 0) {
+        echo '<p>', str_repeat('&#160;&#160;', $depth), htmlspecialchars($message, ENT_COMPAT), "</p>\n";
+        flush();
+    }
+}
diff --git a/lib/classes/output/progress_trace/null_progress_trace.php b/lib/classes/output/progress_trace/null_progress_trace.php
new file mode 100644
index 0000000000000..c0b1def26809b
--- /dev/null
+++ b/lib/classes/output/progress_trace/null_progress_trace.php
@@ -0,0 +1,34 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This subclass of progress_trace does not ouput anything.
+ *
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
+ */
+class null_progress_trace extends progress_trace {
+    /**
+     * Does Nothing
+     *
+     * @param string $message
+     * @param int $depth
+     * @return void Does Nothing
+     */
+    public function output($message, $depth = 0) {
+    }
+}
diff --git a/lib/classes/output/progress_trace/progress_trace_buffer.php b/lib/classes/output/progress_trace/progress_trace_buffer.php
new file mode 100644
index 0000000000000..68788c467217f
--- /dev/null
+++ b/lib/classes/output/progress_trace/progress_trace_buffer.php
@@ -0,0 +1,90 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Special type of trace that can be used for catching of output of other traces.
+ *
+ * @copyright Petr Skoda {@link http://skodak.org}
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
+ */
+class progress_trace_buffer extends progress_trace {
+    /** @var progress_trace */
+    protected $trace;
+    /** @var bool do we pass output out */
+    protected $passthrough;
+    /** @var string output buffer */
+    protected $buffer;
+
+    /**
+     * Constructor.
+     *
+     * @param progress_trace $trace
+     * @param bool $passthrough true means output and buffer, false means just buffer and no output
+     */
+    public function __construct(progress_trace $trace, $passthrough = true) {
+        $this->trace       = $trace;
+        $this->passthrough = $passthrough;
+        $this->buffer      = '';
+    }
+
+    /**
+     * Output the trace message.
+     *
+     * @param string $message the message to output.
+     * @param int $depth indent depth for this message.
+     * @return void output stored in buffer
+     */
+    public function output($message, $depth = 0) {
+        ob_start();
+        $this->trace->output($message, $depth);
+        $this->buffer .= ob_get_contents();
+        if ($this->passthrough) {
+            ob_end_flush();
+        } else {
+            ob_end_clean();
+        }
+    }
+
+    /**
+     * Called when the processing is finished.
+     */
+    public function finished() {
+        ob_start();
+        $this->trace->finished();
+        $this->buffer .= ob_get_contents();
+        if ($this->passthrough) {
+            ob_end_flush();
+        } else {
+            ob_end_clean();
+        }
+    }
+
+    /**
+     * Reset internal text buffer.
+     */
+    public function reset_buffer() {
+        $this->buffer = '';
+    }
+
+    /**
+     * Return internal text buffer.
+     * @return string buffered plain text
+     */
+    public function get_buffer() {
+        return $this->buffer;
+    }
+}
diff --git a/lib/classes/output/progress_trace/text_progress_trace.php b/lib/classes/output/progress_trace/text_progress_trace.php
new file mode 100644
index 0000000000000..21ee17f449b4e
--- /dev/null
+++ b/lib/classes/output/progress_trace/text_progress_trace.php
@@ -0,0 +1,35 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This subclass of progress_trace outputs to plain text.
+ *
+ * @copyright 2009 Tim Hunt
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package core
+ */
+class text_progress_trace extends progress_trace {
+    /**
+     * Output the trace message.
+     *
+     * @param string $message
+     * @param int $depth
+     * @return void Output is echo'd
+     */
+    public function output($message, $depth = 0) {
+        mtrace(str_repeat('  ', $depth) . $message);
+    }
+}
diff --git a/lib/db/legacyclasses.php b/lib/db/legacyclasses.php
index 0cc0932271416..bc77cabdbd644 100644
--- a/lib/db/legacyclasses.php
+++ b/lib/db/legacyclasses.php
@@ -43,4 +43,14 @@
     \require_login_session_timeout_exception::class => 'exception/require_login_session_timeout_exception.php',
     \required_capability_exception::class => 'exception/required_capability_exception.php',
     \webservice_parameter_exception::class => 'exception/webservice_parameter_exception.php',
+
+    // The progress_trace classes.
+    \combined_progress_trace::class => 'output/progress_trace/combined_progress_trace.php',
+    \error_log_progress_trace::class => 'output/progress_trace/error_log_progress_trace.php',
+    \html_list_progress_trace::class => 'output/progress_trace/html_list_progress_trace.php',
+    \html_progress_trace::class => 'output/progress_trace/html_progress_trace.php',
+    \null_progress_trace::class => 'output/progress_trace/null_progress_trace.php',
+    \progress_trace::class => 'output/progress_trace.php',
+    \progress_trace_buffer::class => 'output/progress_trace/progress_trace_buffer.php',
+    \text_progress_trace::class => 'output/progress_trace/text_progress_trace.php',
 ];
diff --git a/lib/weblib.php b/lib/weblib.php
index 7e9634c890c18..e1a0bd345afdb 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -79,9 +79,6 @@
  */
 define('URL_MATCH_EXACT', 2);
 
-// TODO MDL-81933 Remove after Moodle 4.5 release.
-require_once($CFG->libdir . '/classes/url.php');
-
 // Functions.
 
 /**
@@ -2591,295 +2588,6 @@ function is_in_popup() {
     return ($inpopup);
 }
 
-/**
- * Progress trace class.
- *
- * Use this class from long operations where you want to output occasional information about
- * what is going on, but don't know if, or in what format, the output should be.
- *
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package core
- */
-abstract class progress_trace {
-    /**
-     * Output an progress message in whatever format.
-     *
-     * @param string $message the message to output.
-     * @param integer $depth indent depth for this message.
-     */
-    abstract public function output($message, $depth = 0);
-
-    /**
-     * Called when the processing is finished.
-     */
-    public function finished() {
-    }
-}
-
-/**
- * This subclass of progress_trace does not ouput anything.
- *
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package core
- */
-class null_progress_trace extends progress_trace {
-    /**
-     * Does Nothing
-     *
-     * @param string $message
-     * @param int $depth
-     * @return void Does Nothing
-     */
-    public function output($message, $depth = 0) {
-    }
-}
-
-/**
- * This subclass of progress_trace outputs to plain text.
- *
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package core
- */
-class text_progress_trace extends progress_trace {
-    /**
-     * Output the trace message.
-     *
-     * @param string $message
-     * @param int $depth
-     * @return void Output is echo'd
-     */
-    public function output($message, $depth = 0) {
-        mtrace(str_repeat('  ', $depth) . $message);
-    }
-}
-
-/**
- * This subclass of progress_trace outputs as HTML.
- *
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package core
- */
-class html_progress_trace extends progress_trace {
-    /**
-     * Output the trace message.
-     *
-     * @param string $message
-     * @param int $depth
-     * @return void Output is echo'd
-     */
-    public function output($message, $depth = 0) {
-        echo '<p>', str_repeat('&#160;&#160;', $depth), htmlspecialchars($message, ENT_COMPAT), "</p>\n";
-        flush();
-    }
-}
-
-/**
- * HTML List Progress Tree
- *
- * @copyright 2009 Tim Hunt
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package core
- */
-class html_list_progress_trace extends progress_trace {
-    /** @var int */
-    protected $currentdepth = -1;
-
-    /**
-     * Echo out the list
-     *
-     * @param string $message The message to display
-     * @param int $depth
-     * @return void Output is echoed
-     */
-    public function output($message, $depth = 0) {
-        $samedepth = true;
-        while ($this->currentdepth > $depth) {
-            echo "</li>\n</ul>\n";
-            $this->currentdepth -= 1;
-            if ($this->currentdepth == $depth) {
-                echo '<li>';
-            }
-            $samedepth = false;
-        }
-        while ($this->currentdepth < $depth) {
-            echo "<ul>\n<li>";
-            $this->currentdepth += 1;
-            $samedepth = false;
-        }
-        if ($samedepth) {
-            echo "</li>\n<li>";
-        }
-        echo htmlspecialchars($message, ENT_COMPAT);
-        flush();
-    }
-
-    /**
-     * Called when the processing is finished.
-     */
-    public function finished() {
-        while ($this->currentdepth >= 0) {
-            echo "</li>\n</ul>\n";
-            $this->currentdepth -= 1;
-        }
-    }
-}
-
-/**
- * This subclass of progress_trace outputs to error log.
- *
- * @copyright Petr Skoda {@link http://skodak.org}
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package core
- */
-class error_log_progress_trace extends progress_trace {
-    /** @var string log prefix */
-    protected $prefix;
-
-    /**
-     * Constructor.
-     * @param string $prefix optional log prefix
-     */
-    public function __construct($prefix = '') {
-        $this->prefix = $prefix;
-    }
-
-    /**
-     * Output the trace message.
-     *
-     * @param string $message
-     * @param int $depth
-     * @return void Output is sent to error log.
-     */
-    public function output($message, $depth = 0) {
-        error_log($this->prefix . str_repeat('  ', $depth) . $message);
-    }
-}
-
-/**
- * Special type of trace that can be used for catching of output of other traces.
- *
- * @copyright Petr Skoda {@link http://skodak.org}
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package core
- */
-class progress_trace_buffer extends progress_trace {
-    /** @var progress_trace */
-    protected $trace;
-    /** @var bool do we pass output out */
-    protected $passthrough;
-    /** @var string output buffer */
-    protected $buffer;
-
-    /**
-     * Constructor.
-     *
-     * @param progress_trace $trace
-     * @param bool $passthrough true means output and buffer, false means just buffer and no output
-     */
-    public function __construct(progress_trace $trace, $passthrough = true) {
-        $this->trace       = $trace;
-        $this->passthrough = $passthrough;
-        $this->buffer      = '';
-    }
-
-    /**
-     * Output the trace message.
-     *
-     * @param string $message the message to output.
-     * @param int $depth indent depth for this message.
-     * @return void output stored in buffer
-     */
-    public function output($message, $depth = 0) {
-        ob_start();
-        $this->trace->output($message, $depth);
-        $this->buffer .= ob_get_contents();
-        if ($this->passthrough) {
-            ob_end_flush();
-        } else {
-            ob_end_clean();
-        }
-    }
-
-    /**
-     * Called when the processing is finished.
-     */
-    public function finished() {
-        ob_start();
-        $this->trace->finished();
-        $this->buffer .= ob_get_contents();
-        if ($this->passthrough) {
-            ob_end_flush();
-        } else {
-            ob_end_clean();
-        }
-    }
-
-    /**
-     * Reset internal text buffer.
-     */
-    public function reset_buffer() {
-        $this->buffer = '';
-    }
-
-    /**
-     * Return internal text buffer.
-     * @return string buffered plain text
-     */
-    public function get_buffer() {
-        return $this->buffer;
-    }
-}
-
-/**
- * Special type of trace that can be used for redirecting to multiple other traces.
- *
- * @copyright Petr Skoda {@link http://skodak.org}
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package core
- */
-class combined_progress_trace extends progress_trace {
-
-    /**
-     * An array of traces.
-     * @var array
-     */
-    protected $traces;
-
-    /**
-     * Constructs a new instance.
-     *
-     * @param array $traces multiple traces
-     */
-    public function __construct(array $traces) {
-        $this->traces = $traces;
-    }
-
-    /**
-     * Output an progress message in whatever format.
-     *
-     * @param string $message the message to output.
-     * @param integer $depth indent depth for this message.
-     */
-    public function output($message, $depth = 0) {
-        foreach ($this->traces as $trace) {
-            $trace->output($message, $depth);
-        }
-    }
-
-    /**
-     * Called when the processing is finished.
-     */
-    public function finished() {
-        foreach ($this->traces as $trace) {
-            $trace->finished();
-        }
-    }
-}
-
 /**
  * Returns a localized sentence in the current language summarizing the current password policy
  *

From a9869ff0a72281918a64f27e2666151981545d7a Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 11 Jun 2024 12:21:36 +0800
Subject: [PATCH 077/119] MDL-81960 core: Coding style update for
 progress_trace

---
 lib/classes/output/progress_trace.php         |  7 ++-
 .../combined_progress_trace.php               | 31 +++++--------
 .../error_log_progress_trace.php              | 23 +++++-----
 .../html_list_progress_trace.php              | 23 ++++------
 .../progress_trace/html_progress_trace.php    | 13 +++---
 .../progress_trace/null_progress_trace.php    | 13 +++---
 .../progress_trace/progress_trace_buffer.php  | 43 ++++++++-----------
 .../progress_trace/text_progress_trace.php    | 13 +++---
 8 files changed, 69 insertions(+), 97 deletions(-)

diff --git a/lib/classes/output/progress_trace.php b/lib/classes/output/progress_trace.php
index 8259ddb7d7185..fdd5d5ecac1f2 100644
--- a/lib/classes/output/progress_trace.php
+++ b/lib/classes/output/progress_trace.php
@@ -29,9 +29,12 @@ abstract class progress_trace {
      * Output an progress message in whatever format.
      *
      * @param string $message the message to output.
-     * @param integer $depth indent depth for this message.
+     * @param int $depth indent depth for this message.
      */
-    abstract public function output($message, $depth = 0);
+    abstract public function output(
+        string $message,
+        int $depth = 0,
+    );
 
     /**
      * Called when the processing is finished.
diff --git a/lib/classes/output/progress_trace/combined_progress_trace.php b/lib/classes/output/progress_trace/combined_progress_trace.php
index 084114de52161..88b34839f482c 100644
--- a/lib/classes/output/progress_trace/combined_progress_trace.php
+++ b/lib/classes/output/progress_trace/combined_progress_trace.php
@@ -22,38 +22,29 @@
  * @package core
  */
 class combined_progress_trace extends progress_trace {
-
-    /**
-     * An array of traces.
-     * @var array
-     */
-    protected $traces;
-
     /**
      * Constructs a new instance.
      *
      * @param array $traces multiple traces
      */
-    public function __construct(array $traces) {
-        $this->traces = $traces;
+    public function __construct(
+        /** @var array The list of traces */
+        protected array $traces,
+    ) {
     }
 
-    /**
-     * Output an progress message in whatever format.
-     *
-     * @param string $message the message to output.
-     * @param integer $depth indent depth for this message.
-     */
-    public function output($message, $depth = 0) {
+    #[\Override]
+    public function output(
+        string $message,
+        int $depth = 0,
+    ): void {
         foreach ($this->traces as $trace) {
             $trace->output($message, $depth);
         }
     }
 
-    /**
-     * Called when the processing is finished.
-     */
-    public function finished() {
+    #[\Override]
+    public function finished(): void {
         foreach ($this->traces as $trace) {
             $trace->finished();
         }
diff --git a/lib/classes/output/progress_trace/error_log_progress_trace.php b/lib/classes/output/progress_trace/error_log_progress_trace.php
index f27d5e791a1fe..2715864bc4d13 100644
--- a/lib/classes/output/progress_trace/error_log_progress_trace.php
+++ b/lib/classes/output/progress_trace/error_log_progress_trace.php
@@ -22,25 +22,22 @@
  * @package core
  */
 class error_log_progress_trace extends progress_trace {
-    /** @var string log prefix */
-    protected $prefix;
-
     /**
      * Constructor.
      * @param string $prefix optional log prefix
      */
-    public function __construct($prefix = '') {
-        $this->prefix = $prefix;
+    public function __construct(
+        /** @var string The prefix to use in the error_log messages */
+        protected string $prefix = '',
+    ) {
     }
 
-    /**
-     * Output the trace message.
-     *
-     * @param string $message
-     * @param int $depth
-     * @return void Output is sent to error log.
-     */
-    public function output($message, $depth = 0) {
+    #[\Override]
+    public function output(
+        string $message,
+        int $depth = 0,
+    ): void {
+        // phpcs:ignore moodle.PHP.ForbiddenFunctions.FoundWithAlternative
         error_log($this->prefix . str_repeat('  ', $depth) . $message);
     }
 }
diff --git a/lib/classes/output/progress_trace/html_list_progress_trace.php b/lib/classes/output/progress_trace/html_list_progress_trace.php
index ef1629fb04b12..b110ea22ae09a 100644
--- a/lib/classes/output/progress_trace/html_list_progress_trace.php
+++ b/lib/classes/output/progress_trace/html_list_progress_trace.php
@@ -22,17 +22,14 @@
  * @package core
  */
 class html_list_progress_trace extends progress_trace {
-    /** @var int */
-    protected $currentdepth = -1;
+    /** @var int The current depth of the trace*/
+    protected int $currentdepth = -1;
 
-    /**
-     * Echo out the list
-     *
-     * @param string $message The message to display
-     * @param int $depth
-     * @return void Output is echoed
-     */
-    public function output($message, $depth = 0) {
+    #[\Override]
+    public function output(
+        string $message,
+        int $depth = 0,
+    ): void {
         $samedepth = true;
         while ($this->currentdepth > $depth) {
             echo "</li>\n</ul>\n";
@@ -54,10 +51,8 @@ public function output($message, $depth = 0) {
         flush();
     }
 
-    /**
-     * Called when the processing is finished.
-     */
-    public function finished() {
+    #[\Override]
+    public function finished(): void {
         while ($this->currentdepth >= 0) {
             echo "</li>\n</ul>\n";
             $this->currentdepth -= 1;
diff --git a/lib/classes/output/progress_trace/html_progress_trace.php b/lib/classes/output/progress_trace/html_progress_trace.php
index 93208f62c78d0..d2772e0a09cd4 100644
--- a/lib/classes/output/progress_trace/html_progress_trace.php
+++ b/lib/classes/output/progress_trace/html_progress_trace.php
@@ -22,14 +22,11 @@
  * @package core
  */
 class html_progress_trace extends progress_trace {
-    /**
-     * Output the trace message.
-     *
-     * @param string $message
-     * @param int $depth
-     * @return void Output is echo'd
-     */
-    public function output($message, $depth = 0) {
+    #[\Override]
+    public function output(
+        string $message,
+        int $depth = 0,
+    ): void {
         echo '<p>', str_repeat('&#160;&#160;', $depth), htmlspecialchars($message, ENT_COMPAT), "</p>\n";
         flush();
     }
diff --git a/lib/classes/output/progress_trace/null_progress_trace.php b/lib/classes/output/progress_trace/null_progress_trace.php
index c0b1def26809b..4579b5837cbe2 100644
--- a/lib/classes/output/progress_trace/null_progress_trace.php
+++ b/lib/classes/output/progress_trace/null_progress_trace.php
@@ -22,13 +22,10 @@
  * @package core
  */
 class null_progress_trace extends progress_trace {
-    /**
-     * Does Nothing
-     *
-     * @param string $message
-     * @param int $depth
-     * @return void Does Nothing
-     */
-    public function output($message, $depth = 0) {
+    #[\Override]
+    public function output(
+        string $message,
+        int $depth = 0,
+    ): void {
     }
 }
diff --git a/lib/classes/output/progress_trace/progress_trace_buffer.php b/lib/classes/output/progress_trace/progress_trace_buffer.php
index 68788c467217f..4bf56c1c7e962 100644
--- a/lib/classes/output/progress_trace/progress_trace_buffer.php
+++ b/lib/classes/output/progress_trace/progress_trace_buffer.php
@@ -22,12 +22,8 @@
  * @package core
  */
 class progress_trace_buffer extends progress_trace {
-    /** @var progress_trace */
-    protected $trace;
-    /** @var bool do we pass output out */
-    protected $passthrough;
     /** @var string output buffer */
-    protected $buffer;
+    protected string $buffer = '';
 
     /**
      * Constructor.
@@ -35,20 +31,20 @@ class progress_trace_buffer extends progress_trace {
      * @param progress_trace $trace
      * @param bool $passthrough true means output and buffer, false means just buffer and no output
      */
-    public function __construct(progress_trace $trace, $passthrough = true) {
-        $this->trace       = $trace;
-        $this->passthrough = $passthrough;
+    public function __construct(
+        /** @var progress_trace The progress_trace to pass content to */
+        protected progress_trace $trace,
+        /** @var bool Whether we pass output out */
+        protected bool $passthrough = true,
+    ) {
         $this->buffer      = '';
     }
 
-    /**
-     * Output the trace message.
-     *
-     * @param string $message the message to output.
-     * @param int $depth indent depth for this message.
-     * @return void output stored in buffer
-     */
-    public function output($message, $depth = 0) {
+    #[\Override]
+    public function output(
+        string $message,
+        int $depth = 0,
+    ): void {
         ob_start();
         $this->trace->output($message, $depth);
         $this->buffer .= ob_get_contents();
@@ -59,10 +55,8 @@ public function output($message, $depth = 0) {
         }
     }
 
-    /**
-     * Called when the processing is finished.
-     */
-    public function finished() {
+    #[\Override]
+    public function finished(): void {
         ob_start();
         $this->trace->finished();
         $this->buffer .= ob_get_contents();
@@ -74,17 +68,18 @@ public function finished() {
     }
 
     /**
-     * Reset internal text buffer.
+     * Reset the internal text buffer.
      */
-    public function reset_buffer() {
+    public function reset_buffer(): void {
         $this->buffer = '';
     }
 
     /**
-     * Return internal text buffer.
+     * Return the internal text buffer.
+     *
      * @return string buffered plain text
      */
-    public function get_buffer() {
+    public function get_buffer(): string {
         return $this->buffer;
     }
 }
diff --git a/lib/classes/output/progress_trace/text_progress_trace.php b/lib/classes/output/progress_trace/text_progress_trace.php
index 21ee17f449b4e..b9ed47c3962e4 100644
--- a/lib/classes/output/progress_trace/text_progress_trace.php
+++ b/lib/classes/output/progress_trace/text_progress_trace.php
@@ -22,14 +22,11 @@
  * @package core
  */
 class text_progress_trace extends progress_trace {
-    /**
-     * Output the trace message.
-     *
-     * @param string $message
-     * @param int $depth
-     * @return void Output is echo'd
-     */
-    public function output($message, $depth = 0) {
+    #[\Override]
+    public function output(
+        string $message,
+        int $depth = 0,
+    ): void {
         mtrace(str_repeat('  ', $depth) . $message);
     }
 }

From b6d08ad1d7fe2e440b81bdf672e2589d25e9933b Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 11 Jun 2024 12:44:38 +0800
Subject: [PATCH 078/119] MDL-81960 core: Update namespace of progress_trace
 classes

---
 .upgradenotes/MDL-81960-2024061004043644.yml  | 26 +++++++++++++++++--
 lib/classes/output/progress_trace.php         |  7 +++++
 .../combined_progress_trace.php               | 11 +++++++-
 .../error_log_progress_trace.php              |  9 +++++++
 .../html_list_progress_trace.php              |  9 +++++++
 .../progress_trace/html_progress_trace.php    |  9 +++++++
 .../progress_trace/null_progress_trace.php    |  9 +++++++
 .../progress_trace/progress_trace_buffer.php  | 11 +++++++-
 .../progress_trace/text_progress_trace.php    |  9 +++++++
 9 files changed, 96 insertions(+), 4 deletions(-)

diff --git a/.upgradenotes/MDL-81960-2024061004043644.yml b/.upgradenotes/MDL-81960-2024061004043644.yml
index 964e907be2519..c371a6aff54bd 100644
--- a/.upgradenotes/MDL-81960-2024061004043644.yml
+++ b/.upgradenotes/MDL-81960-2024061004043644.yml
@@ -2,6 +2,28 @@ issueNumber: MDL-81960
 notes:
   core:
     - message: >-
-        The `\moodle_url` class has been renamed to `\core\url` and now supports
-        autoloading. Existing uses are currently unaffected.
+        The following classes have been renamed and now support autoloading.
+        Existing classes are currently unaffected.
+
+        | Old class name | New class name |
+
+        | --- | --- |
+
+        | `\moodle_url` | `\core\url` |
+
+        | `\progress_trace` | `\core\output\progress_trace` |
+
+        | `\combined_progress_trace` | `\core\output\progress_trace\combined_progress_trace` |
+
+        | `\error_log_progress_trace` | `\core\output\progress_trace\error_log_progress_trace` |
+
+        | `\html_list_progress_trace` | `\core\output\progress_trace\html_list_progress_trace` |
+
+        | `\html_progress_trace` | `\core\output\progress_trace\html_progress_trace` |
+
+        | `\null_progress_trace` | `\core\output\progress_trace\null_progress_trace` |
+
+        | `\progress_trace_buffer` | `\core\output\progress_trace\progress_trace_buffer` |
+
+        | `\text_progress_trace` | `\core\output\progress_trace\text_progress_trace` |
       type: improved
diff --git a/lib/classes/output/progress_trace.php b/lib/classes/output/progress_trace.php
index fdd5d5ecac1f2..8a590b0aebcbb 100644
--- a/lib/classes/output/progress_trace.php
+++ b/lib/classes/output/progress_trace.php
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output;
+
 /**
  * Progress trace class.
  *
@@ -42,3 +44,8 @@ abstract public function output(
     public function finished() {
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(progress_trace::class, \progress_trace::class);
diff --git a/lib/classes/output/progress_trace/combined_progress_trace.php b/lib/classes/output/progress_trace/combined_progress_trace.php
index 88b34839f482c..7027440a4737a 100644
--- a/lib/classes/output/progress_trace/combined_progress_trace.php
+++ b/lib/classes/output/progress_trace/combined_progress_trace.php
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\progress_trace;
+
+use core\output\progress_trace;
+
 /**
  * Special type of trace that can be used for redirecting to multiple other traces.
  *
@@ -21,7 +25,7 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @package core
  */
-class combined_progress_trace extends progress_trace {
+class combined_progress_trace extends \progress_trace {
     /**
      * Constructs a new instance.
      *
@@ -50,3 +54,8 @@ public function finished(): void {
         }
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(combined_progress_trace::class, \combined_progress_trace::class);
diff --git a/lib/classes/output/progress_trace/error_log_progress_trace.php b/lib/classes/output/progress_trace/error_log_progress_trace.php
index 2715864bc4d13..c3f17d87da7e4 100644
--- a/lib/classes/output/progress_trace/error_log_progress_trace.php
+++ b/lib/classes/output/progress_trace/error_log_progress_trace.php
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\progress_trace;
+
+use core\output\progress_trace;
+
 /**
  * This subclass of progress_trace outputs to error log.
  *
@@ -41,3 +45,8 @@ public function output(
         error_log($this->prefix . str_repeat('  ', $depth) . $message);
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(error_log_progress_trace::class, \error_log_progress_trace::class);
diff --git a/lib/classes/output/progress_trace/html_list_progress_trace.php b/lib/classes/output/progress_trace/html_list_progress_trace.php
index b110ea22ae09a..4c21c79a86965 100644
--- a/lib/classes/output/progress_trace/html_list_progress_trace.php
+++ b/lib/classes/output/progress_trace/html_list_progress_trace.php
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\progress_trace;
+
+use core\output\progress_trace;
+
 /**
  * HTML List Progress Tree
  *
@@ -59,3 +63,8 @@ public function finished(): void {
         }
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(html_list_progress_trace::class, \html_list_progress_trace::class);
diff --git a/lib/classes/output/progress_trace/html_progress_trace.php b/lib/classes/output/progress_trace/html_progress_trace.php
index d2772e0a09cd4..eda3587068eb7 100644
--- a/lib/classes/output/progress_trace/html_progress_trace.php
+++ b/lib/classes/output/progress_trace/html_progress_trace.php
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\progress_trace;
+
+use core\output\progress_trace;
+
 /**
  * This subclass of progress_trace outputs as HTML.
  *
@@ -31,3 +35,8 @@ public function output(
         flush();
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(html_progress_trace::class, \html_progress_trace::class);
diff --git a/lib/classes/output/progress_trace/null_progress_trace.php b/lib/classes/output/progress_trace/null_progress_trace.php
index 4579b5837cbe2..6f9af4e60ef85 100644
--- a/lib/classes/output/progress_trace/null_progress_trace.php
+++ b/lib/classes/output/progress_trace/null_progress_trace.php
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\progress_trace;
+
+use core\output\progress_trace;
+
 /**
  * This subclass of progress_trace does not ouput anything.
  *
@@ -29,3 +33,8 @@ public function output(
     ): void {
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(null_progress_trace::class, \null_progress_trace::class);
diff --git a/lib/classes/output/progress_trace/progress_trace_buffer.php b/lib/classes/output/progress_trace/progress_trace_buffer.php
index 4bf56c1c7e962..dd9be00eb3a09 100644
--- a/lib/classes/output/progress_trace/progress_trace_buffer.php
+++ b/lib/classes/output/progress_trace/progress_trace_buffer.php
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\progress_trace;
+
+use core\output\progress_trace;
+
 /**
  * Special type of trace that can be used for catching of output of other traces.
  *
@@ -21,7 +25,7 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @package core
  */
-class progress_trace_buffer extends progress_trace {
+class progress_trace_buffer extends \progress_trace {
     /** @var string output buffer */
     protected string $buffer = '';
 
@@ -83,3 +87,8 @@ public function get_buffer(): string {
         return $this->buffer;
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(progress_trace_buffer::class, \progress_trace_buffer::class);
diff --git a/lib/classes/output/progress_trace/text_progress_trace.php b/lib/classes/output/progress_trace/text_progress_trace.php
index b9ed47c3962e4..94652ab489aa9 100644
--- a/lib/classes/output/progress_trace/text_progress_trace.php
+++ b/lib/classes/output/progress_trace/text_progress_trace.php
@@ -14,6 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace core\output\progress_trace;
+
+use core\output\progress_trace;
+
 /**
  * This subclass of progress_trace outputs to plain text.
  *
@@ -30,3 +34,8 @@ public function output(
         mtrace(str_repeat('  ', $depth) . $message);
     }
 }
+
+// Alias this class to the old name.
+// This file will be autoloaded by the legacyclasses autoload system.
+// In future all uses of this class will be corrected and the legacy references will be removed.
+class_alias(text_progress_trace::class, \text_progress_trace::class);

From e3f795fc72eaa4d4a66328673645646fb34d391a Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 11 Jun 2024 12:44:49 +0800
Subject: [PATCH 079/119] MDL-81960 core: Move progress_trace tests out of
 weblib

---
 .../combined_progress_trace.php               |   4 +-
 .../progress_trace/progress_trace_buffer.php  |   2 +-
 .../html_list_progress_trace_test.php         |  40 +++++++
 .../html_progress_trace_test.php              |  40 +++++++
 .../null_progress_trace_test.php              |  42 +++++++
 .../progress_trace_buffer_test.php            |  55 +++++++++
 .../test_combined_progress_trace_test.php     |  45 ++++++++
 .../text_progress_trace_test.php              |  42 +++++++
 lib/tests/weblib_test.php                     | 106 ------------------
 9 files changed, 267 insertions(+), 109 deletions(-)
 create mode 100644 lib/tests/output/progress_trace/html_list_progress_trace_test.php
 create mode 100644 lib/tests/output/progress_trace/html_progress_trace_test.php
 create mode 100644 lib/tests/output/progress_trace/null_progress_trace_test.php
 create mode 100644 lib/tests/output/progress_trace/progress_trace_buffer_test.php
 create mode 100644 lib/tests/output/progress_trace/test_combined_progress_trace_test.php
 create mode 100644 lib/tests/output/progress_trace/text_progress_trace_test.php

diff --git a/lib/classes/output/progress_trace/combined_progress_trace.php b/lib/classes/output/progress_trace/combined_progress_trace.php
index 7027440a4737a..9344e7a5afa06 100644
--- a/lib/classes/output/progress_trace/combined_progress_trace.php
+++ b/lib/classes/output/progress_trace/combined_progress_trace.php
@@ -25,14 +25,14 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @package core
  */
-class combined_progress_trace extends \progress_trace {
+class combined_progress_trace extends progress_trace {
     /**
      * Constructs a new instance.
      *
      * @param array $traces multiple traces
      */
     public function __construct(
-        /** @var array The list of traces */
+        /** @var progress_trace[] The list of traces */
         protected array $traces,
     ) {
     }
diff --git a/lib/classes/output/progress_trace/progress_trace_buffer.php b/lib/classes/output/progress_trace/progress_trace_buffer.php
index dd9be00eb3a09..85085b9493d9a 100644
--- a/lib/classes/output/progress_trace/progress_trace_buffer.php
+++ b/lib/classes/output/progress_trace/progress_trace_buffer.php
@@ -25,7 +25,7 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @package core
  */
-class progress_trace_buffer extends \progress_trace {
+class progress_trace_buffer extends progress_trace {
     /** @var string output buffer */
     protected string $buffer = '';
 
diff --git a/lib/tests/output/progress_trace/html_list_progress_trace_test.php b/lib/tests/output/progress_trace/html_list_progress_trace_test.php
new file mode 100644
index 0000000000000..f593fe0840337
--- /dev/null
+++ b/lib/tests/output/progress_trace/html_list_progress_trace_test.php
@@ -0,0 +1,40 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core\output\progress_trace;
+
+/**
+ * Tests for \core\progress_trace\html_list_progress_trace.
+ *
+ * @package    core
+ * @category   test
+ * @copyright  2024 Andrew Lyons <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \core\progress_trace\html_list_progress_trace
+ */
+final class html_list_progress_trace_test extends \advanced_testcase {
+    /**
+     * Tests for the trace.
+     */
+    public function test_trace(): void {
+        $trace = new html_list_progress_trace();
+        $trace->output('do');
+        $trace->output('re', 1);
+        $trace->output('mi', 2);
+        $trace->finished();
+        $this->expectOutputString("<ul>\n<li>do<ul>\n<li>re<ul>\n<li>mi</li>\n</ul>\n</li>\n</ul>\n</li>\n</ul>\n");
+    }
+}
diff --git a/lib/tests/output/progress_trace/html_progress_trace_test.php b/lib/tests/output/progress_trace/html_progress_trace_test.php
new file mode 100644
index 0000000000000..ae0bcb25f9c46
--- /dev/null
+++ b/lib/tests/output/progress_trace/html_progress_trace_test.php
@@ -0,0 +1,40 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core\output\progress_trace;
+
+/**
+ * Tests for \core\progress_trace\html_progress_trace.
+ *
+ * @package    core
+ * @category   test
+ * @copyright  2024 Andrew Lyons <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \core\progress_trace\html_progress_trace
+ */
+final class html_progress_trace_test extends \advanced_testcase {
+    /**
+     * Tests for the trace.
+     */
+    public function test_trace(): void {
+        $trace = new html_progress_trace();
+        $trace->output('do');
+        $trace->output('re', 1);
+        $trace->output('mi', 2);
+        $trace->finished();
+        $this->expectOutputString("<p>do</p>\n<p>&#160;&#160;re</p>\n<p>&#160;&#160;&#160;&#160;mi</p>\n");
+    }
+}
diff --git a/lib/tests/output/progress_trace/null_progress_trace_test.php b/lib/tests/output/progress_trace/null_progress_trace_test.php
new file mode 100644
index 0000000000000..6d34a3214aabe
--- /dev/null
+++ b/lib/tests/output/progress_trace/null_progress_trace_test.php
@@ -0,0 +1,42 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core\output\progress_trace;
+
+/**
+ * Tests for \core\progress_trace\null_progress_trace.
+ *
+ * @package    core
+ * @category   test
+ * @copyright  2024 Andrew Lyons <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \core\progress_trace\null_progress_trace
+ */
+final class null_progress_trace_test extends \advanced_testcase {
+    /**
+     * Tests for the trace.
+     */
+    public function test_trace(): void {
+        $trace = new null_progress_trace();
+        $trace->output('do');
+        $trace->output('re', 1);
+        $trace->output('mi', 2);
+        $trace->finished();
+        $output = ob_get_contents();
+        $this->assertSame('', $output);
+        $this->expectOutputString('');
+    }
+}
diff --git a/lib/tests/output/progress_trace/progress_trace_buffer_test.php b/lib/tests/output/progress_trace/progress_trace_buffer_test.php
new file mode 100644
index 0000000000000..53c63ca18b99f
--- /dev/null
+++ b/lib/tests/output/progress_trace/progress_trace_buffer_test.php
@@ -0,0 +1,55 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core\output\progress_trace;
+
+/**
+ * Tests for \core\progress_trace\progress_trace_buffer.
+ *
+ * @package    core
+ * @category   test
+ * @copyright  2024 Andrew Lyons <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \core\progress_trace\progress_trace_buffer
+ */
+final class progress_trace_buffer_test extends \advanced_testcase {
+    /**
+     * Tests for the trace.
+     */
+    public function test_trace(): void {
+        $trace = new progress_trace_buffer(new html_progress_trace());
+        ob_start();
+        $trace->output('do');
+        $trace->output('re', 1);
+        $trace->output('mi', 2);
+        $trace->finished();
+        $output = ob_get_contents();
+        ob_end_clean();
+        $this->assertSame("<p>do</p>\n<p>&#160;&#160;re</p>\n<p>&#160;&#160;&#160;&#160;mi</p>\n", $output);
+        $this->assertSame($output, $trace->get_buffer());
+
+        $trace = new progress_trace_buffer(new html_progress_trace(), false);
+        $trace->output('do');
+        $trace->output('re', 1);
+        $trace->output('mi', 2);
+        $trace->finished();
+        $this->assertSame("<p>do</p>\n<p>&#160;&#160;re</p>\n<p>&#160;&#160;&#160;&#160;mi</p>\n", $trace->get_buffer());
+        $this->assertSame("<p>do</p>\n<p>&#160;&#160;re</p>\n<p>&#160;&#160;&#160;&#160;mi</p>\n", $trace->get_buffer());
+        $trace->reset_buffer();
+        $this->assertSame('', $trace->get_buffer());
+        $this->expectOutputString('');
+    }
+}
diff --git a/lib/tests/output/progress_trace/test_combined_progress_trace_test.php b/lib/tests/output/progress_trace/test_combined_progress_trace_test.php
new file mode 100644
index 0000000000000..663bac655ffbe
--- /dev/null
+++ b/lib/tests/output/progress_trace/test_combined_progress_trace_test.php
@@ -0,0 +1,45 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core\output\progress_trace;
+
+/**
+ * Tests for \core\progress_trace\test_combined_progress_trace.
+ *
+ * @package    core
+ * @category   test
+ * @copyright  2024 Andrew Lyons <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \core\progress_trace\test_combined_progress_trace
+ */
+final class test_combined_progress_trace_test extends \advanced_testcase {
+    /**
+     * Tests for the trace.
+     */
+    public function test_trace(): void {
+        $trace1 = new progress_trace_buffer(new html_progress_trace(), false);
+        $trace2 = new progress_trace_buffer(new text_progress_trace(), false);
+
+        $trace = new combined_progress_trace([$trace1, $trace2]);
+        $trace->output('do');
+        $trace->output('re', 1);
+        $trace->output('mi', 2);
+        $trace->finished();
+        $this->assertSame("<p>do</p>\n<p>&#160;&#160;re</p>\n<p>&#160;&#160;&#160;&#160;mi</p>\n", $trace1->get_buffer());
+        $this->assertSame("do\n  re\n    mi\n", $trace2->get_buffer());
+        $this->expectOutputString('');
+    }
+}
diff --git a/lib/tests/output/progress_trace/text_progress_trace_test.php b/lib/tests/output/progress_trace/text_progress_trace_test.php
new file mode 100644
index 0000000000000..fd8d3fe8ebd8d
--- /dev/null
+++ b/lib/tests/output/progress_trace/text_progress_trace_test.php
@@ -0,0 +1,42 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core\output\progress_trace;
+
+/**
+ * Tests for \core\progress_trace\text_progress_trace.
+ *
+ * @package    core
+ * @category   test
+ * @copyright  2024 Andrew Lyons <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \core\progress_trace\text_progress_trace
+ */
+final class text_progress_trace_test extends \advanced_testcase {
+    /**
+     * Tests for the trace.
+     */
+    public function test_trace(): void {
+        $this->resetAfterTest(false);
+
+        $trace = new text_progress_trace();
+        $trace->output('do');
+        $trace->output('re', 1);
+        $trace->output('mi', 2);
+        $trace->finished();
+        $this->expectOutputString("do\n  re\n    mi\n");
+    }
+}
diff --git a/lib/tests/weblib_test.php b/lib/tests/weblib_test.php
index 4de970c12d06b..1a5d4f845539e 100644
--- a/lib/tests/weblib_test.php
+++ b/lib/tests/weblib_test.php
@@ -510,112 +510,6 @@ public function test_qualified_me(): void {
         $this->assertSame($CFG->wwwroot.'/course/view.php?id=1', qualified_me());
     }
 
-    /**
-     * @covers \null_progress_trace
-     */
-    public function test_null_progress_trace(): void {
-        $this->resetAfterTest(false);
-
-        $trace = new null_progress_trace();
-        $trace->output('do');
-        $trace->output('re', 1);
-        $trace->output('mi', 2);
-        $trace->finished();
-        $output = ob_get_contents();
-        $this->assertSame('', $output);
-        $this->expectOutputString('');
-    }
-
-    /**
-     * @covers \null_progress_trace
-     */
-    public function test_text_progress_trace(): void {
-        $this->resetAfterTest(false);
-
-        $trace = new text_progress_trace();
-        $trace->output('do');
-        $trace->output('re', 1);
-        $trace->output('mi', 2);
-        $trace->finished();
-        $this->expectOutputString("do\n  re\n    mi\n");
-    }
-
-    /**
-     * @covers \html_progress_trace
-     */
-    public function test_html_progress_trace(): void {
-        $this->resetAfterTest(false);
-
-        $trace = new html_progress_trace();
-        $trace->output('do');
-        $trace->output('re', 1);
-        $trace->output('mi', 2);
-        $trace->finished();
-        $this->expectOutputString("<p>do</p>\n<p>&#160;&#160;re</p>\n<p>&#160;&#160;&#160;&#160;mi</p>\n");
-    }
-
-    /**
-     * @covers \html_list_progress_trace
-     */
-    public function test_html_list_progress_trace(): void {
-        $this->resetAfterTest(false);
-
-        $trace = new html_list_progress_trace();
-        $trace->output('do');
-        $trace->output('re', 1);
-        $trace->output('mi', 2);
-        $trace->finished();
-        $this->expectOutputString("<ul>\n<li>do<ul>\n<li>re<ul>\n<li>mi</li>\n</ul>\n</li>\n</ul>\n</li>\n</ul>\n");
-    }
-
-    /**
-     * @covers \progress_trace_buffer
-     */
-    public function test_progress_trace_buffer(): void {
-        $this->resetAfterTest(false);
-
-        $trace = new progress_trace_buffer(new html_progress_trace());
-        ob_start();
-        $trace->output('do');
-        $trace->output('re', 1);
-        $trace->output('mi', 2);
-        $trace->finished();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertSame("<p>do</p>\n<p>&#160;&#160;re</p>\n<p>&#160;&#160;&#160;&#160;mi</p>\n", $output);
-        $this->assertSame($output, $trace->get_buffer());
-
-        $trace = new progress_trace_buffer(new html_progress_trace(), false);
-        $trace->output('do');
-        $trace->output('re', 1);
-        $trace->output('mi', 2);
-        $trace->finished();
-        $this->assertSame("<p>do</p>\n<p>&#160;&#160;re</p>\n<p>&#160;&#160;&#160;&#160;mi</p>\n", $trace->get_buffer());
-        $this->assertSame("<p>do</p>\n<p>&#160;&#160;re</p>\n<p>&#160;&#160;&#160;&#160;mi</p>\n", $trace->get_buffer());
-        $trace->reset_buffer();
-        $this->assertSame('', $trace->get_buffer());
-        $this->expectOutputString('');
-    }
-
-    /**
-     * @covers \combined_progress_trace
-     */
-    public function test_combined_progress_trace(): void {
-        $this->resetAfterTest(false);
-
-        $trace1 = new progress_trace_buffer(new html_progress_trace(), false);
-        $trace2 = new progress_trace_buffer(new text_progress_trace(), false);
-
-        $trace = new combined_progress_trace(array($trace1, $trace2));
-        $trace->output('do');
-        $trace->output('re', 1);
-        $trace->output('mi', 2);
-        $trace->finished();
-        $this->assertSame("<p>do</p>\n<p>&#160;&#160;re</p>\n<p>&#160;&#160;&#160;&#160;mi</p>\n", $trace1->get_buffer());
-        $this->assertSame("do\n  re\n    mi\n", $trace2->get_buffer());
-        $this->expectOutputString('');
-    }
-
     /**
      * @covers ::set_debugging
      */

From 7482013cd2706e018fc8d58051e3a306b102bba6 Mon Sep 17 00:00:00 2001
From: ferranrecio <ferran@moodle.com>
Date: Thu, 30 May 2024 13:05:10 +0200
Subject: [PATCH 080/119] MDL-80191 backup: prepare UI for subsections

Backup and restore settings needs to be refactored before introducing
subsections. With the current code adding two new hierachy levels
(subsections and activities in subsections) will require many
unnecessary lines of code because most of the structure is hard-coded.

With this patch when backup/restore present the course structure uses a
stack to control how mani divs are opened, instead of relying on adhoc
class attributes per each div.

About the tasks for sections and activities, the class has been
refactored. This way when subsections are introduced it will require
less lines of code and the final patch will be more comprehensible.
---
 backup/moodle2/backup_activity_task.class.php |  79 ++++++++---
 backup/moodle2/backup_section_task.class.php  |  70 ++++++++--
 .../moodle2/restore_activity_task.class.php   |  95 ++++++++-----
 backup/moodle2/restore_section_task.class.php |  71 +++++++---
 backup/util/plan/base_task.class.php          |  13 ++
 backup/util/ui/base_moodleform.class.php      | 125 +++++++++---------
 6 files changed, 312 insertions(+), 141 deletions(-)

diff --git a/backup/moodle2/backup_activity_task.class.php b/backup/moodle2/backup_activity_task.class.php
index f0df9d0ab2e6f..bc84291b733bb 100644
--- a/backup/moodle2/backup_activity_task.class.php
+++ b/backup/moodle2/backup_activity_task.class.php
@@ -123,12 +123,12 @@ public function build() {
         }
 
         // Add some extra settings that related processors are going to need
-        $this->add_setting(new backup_activity_generic_setting(backup::VAR_MODID, base_setting::IS_INTEGER, $this->moduleid));
-        $this->add_setting(new backup_activity_generic_setting(backup::VAR_COURSEID, base_setting::IS_INTEGER, $this->get_courseid()));
-        $this->add_setting(new backup_activity_generic_setting(backup::VAR_SECTIONID, base_setting::IS_INTEGER, $this->sectionid));
-        $this->add_setting(new backup_activity_generic_setting(backup::VAR_MODNAME, base_setting::IS_FILENAME, $this->modulename));
-        $this->add_setting(new backup_activity_generic_setting(backup::VAR_ACTIVITYID, base_setting::IS_INTEGER, $this->activityid));
-        $this->add_setting(new backup_activity_generic_setting(backup::VAR_CONTEXTID, base_setting::IS_INTEGER, $this->contextid));
+        $this->add_section_setting(backup::VAR_MODID, base_setting::IS_INTEGER, $this->moduleid);
+        $this->add_section_setting(backup::VAR_COURSEID, base_setting::IS_INTEGER, $this->get_courseid());
+        $this->add_section_setting(backup::VAR_SECTIONID, base_setting::IS_INTEGER, $this->sectionid);
+        $this->add_section_setting(backup::VAR_MODNAME, base_setting::IS_FILENAME, $this->modulename);
+        $this->add_section_setting(backup::VAR_ACTIVITYID, base_setting::IS_INTEGER, $this->activityid);
+        $this->add_section_setting(backup::VAR_CONTEXTID, base_setting::IS_INTEGER, $this->contextid);
 
         // Create the activity directory
         $this->add_step(new create_taskbasepath_directory('create_activity_directory'));
@@ -269,58 +269,99 @@ protected function define_settings() {
         $settingprefix = $this->modulename . '_' . $this->moduleid . '_';
 
         // All these are common settings to be shared by all activities.
+        $activityincluded = $this->add_activity_included_setting($settingprefix);
 
+        if (question_module_uses_questions($this->modulename)) {
+            $questionbank = $this->plan->get_setting('questionbank');
+            $questionbank->add_dependency($activityincluded);
+        }
+
+        $this->add_activity_userinfo_setting($settingprefix, $activityincluded);
+
+        // End of common activity settings, let's add the particular ones.
+        $this->define_my_settings();
+    }
+
+    /**
+     * Add a setting to the task. This method is used to add a setting to the task
+     *
+     * @param int|string $identifier the identifier of the setting
+     * @param string $type the type of the setting
+     * @param string|int $value the value of the setting
+     * @return section_backup_setting the setting added
+     */
+    protected function add_section_setting(int|string $identifier, string $type, string|int $value): activity_backup_setting {
+        $setting = new backup_activity_generic_setting($identifier, $type, $value);
+        $this->add_setting($setting);
+        return $setting;
+    }
+
+    /**
+     * Add the section include setting to the task.
+     *
+     * @param string $settingprefix the identifier of the setting
+     * @return activity_backup_setting the setting added
+     */
+    protected function add_activity_included_setting(string $settingprefix): activity_backup_setting {
         // Define activity_include (to decide if the whole task must be really executed)
         // Dependent of:
         // - activities root setting.
-        // - section_included setting (if exists).
+        // - sectionincluded setting (if exists).
         $settingname = $settingprefix . 'included';
         $activityincluded = new backup_activity_generic_setting($settingname, base_setting::IS_BOOLEAN, true);
         $activityincluded->get_ui()->set_icon(new image_icon('monologo', get_string('pluginname', $this->modulename),
             $this->modulename, array('class' => 'iconlarge icon-post ml-1')));
         $this->add_setting($activityincluded);
+
         // Look for "activities" root setting.
         $activities = $this->plan->get_setting('activities');
         $activities->add_dependency($activityincluded);
 
-        if (question_module_uses_questions($this->modulename)) {
-            $questionbank = $this->plan->get_setting('questionbank');
-            $questionbank->add_dependency($activityincluded);
-        }
-
         // Look for "sectionincluded" section setting (if exists).
         $settingname = 'section_' . $this->sectionid . '_included';
         if ($this->plan->setting_exists($settingname)) {
             $sectionincluded = $this->plan->get_setting($settingname);
             $sectionincluded->add_dependency($activityincluded);
         }
+        return $activityincluded;
+    }
 
-        // Define activityuserinfo. Dependent of:
+    /**
+     * Add the section userinfo setting to the task.
+     *
+     * @param string $settingprefix the identifier of the setting
+     * @param activity_backup_setting $includefield the setting to depend on
+     * @return activity_backup_setting the setting added
+     */
+    protected function add_activity_userinfo_setting(
+        string $settingprefix,
+        activity_backup_setting $includefield
+    ): activity_backup_setting {
+        // Define activity_userinfo. Dependent of:
         // - users root setting.
         // - sectionuserinfo setting (if exists).
-        // - activityincluded setting.
+        // - includefield setting.
         $settingname = $settingprefix . 'userinfo';
         $activityuserinfo = new backup_activity_userinfo_setting($settingname, base_setting::IS_BOOLEAN, true);
+
         $activityuserinfo->get_ui()->set_label('-');
         $activityuserinfo->get_ui()->set_visually_hidden_label(
             get_string('includeuserinfo_instance', 'core_backup', $this->name)
         );
         $this->add_setting($activityuserinfo);
-
         // Look for "users" root setting.
         $users = $this->plan->get_setting('users');
         $users->add_dependency($activityuserinfo);
+
         // Look for "sectionuserinfo" section setting (if exists).
         $settingname = 'section_' . $this->sectionid . '_userinfo';
         if ($this->plan->setting_exists($settingname)) {
             $sectionuserinfo = $this->plan->get_setting($settingname);
             $sectionuserinfo->add_dependency($activityuserinfo);
         }
-        // Look for "activityincluded" setting.
-        $activityincluded->add_dependency($activityuserinfo);
 
-        // End of common activity settings, let's add the particular ones.
-        $this->define_my_settings();
+        $includefield->add_dependency($activityuserinfo);
+        return $activityuserinfo;
     }
 
     /**
diff --git a/backup/moodle2/backup_section_task.class.php b/backup/moodle2/backup_section_task.class.php
index cdd76c85a2f30..16f33a7038704 100644
--- a/backup/moodle2/backup_section_task.class.php
+++ b/backup/moodle2/backup_section_task.class.php
@@ -37,6 +37,11 @@ class backup_section_task extends backup_task {
 
     protected $sectionid;
 
+    /**
+     * @var stdClass $section The database section object.
+     */
+    protected stdClass $section;
+
     /**
      * Constructor - instantiates one object of this class
      */
@@ -48,6 +53,7 @@ public function __construct($name, $sectionid, $plan = null) {
             throw new backup_task_exception('section_task_section_not_found', $sectionid);
         }
 
+        $this->section = $section;
         $this->sectionid  = $sectionid;
 
         parent::__construct($name, $plan);
@@ -72,11 +78,11 @@ public function build() {
 
         // Set the backup::VAR_CONTEXTID setting to course context as far as next steps require that
         $coursectxid = context_course::instance($this->get_courseid())->id;
-        $this->add_setting(new backup_activity_generic_setting(backup::VAR_CONTEXTID, base_setting::IS_INTEGER, $coursectxid));
+        $this->add_section_setting(backup::VAR_CONTEXTID, base_setting::IS_INTEGER, $coursectxid);
 
         // Add some extra settings that related processors are going to need
-        $this->add_setting(new backup_activity_generic_setting(backup::VAR_SECTIONID, base_setting::IS_INTEGER, $this->sectionid));
-        $this->add_setting(new backup_activity_generic_setting(backup::VAR_COURSEID, base_setting::IS_INTEGER, $this->get_courseid()));
+        $this->add_section_setting(backup::VAR_SECTIONID, base_setting::IS_INTEGER, $this->sectionid);
+        $this->add_section_setting(backup::VAR_COURSEID, base_setting::IS_INTEGER, $this->get_courseid());
 
         // Create the section directory
         $this->add_step(new create_taskbasepath_directory('create_section_directory'));
@@ -145,32 +151,74 @@ protected function define_settings() {
         // All the settings related to this activity will include this prefix.
         $settingprefix = 'section_' . $this->sectionid . '_';
 
-        // All these are common settings to be shared by all sections.
+        $incudefield = $this->add_section_included_setting($settingprefix);
+        $this->add_section_userinfo_setting($settingprefix, $incudefield);
+    }
 
-        $section = $DB->get_record('course_sections', array('id' => $this->sectionid), '*', MUST_EXIST);
-        $course = $DB->get_record('course', array('id' => $section->course), '*', MUST_EXIST);
+    /**
+     * Add a setting to the task. This method is used to add a setting to the task
+     *
+     * @param int|string $identifier the identifier of the setting
+     * @param string $type the type of the setting
+     * @param string|int $value the value of the setting
+     * @return section_backup_setting the setting added
+     */
+    protected function add_section_setting(int|string $identifier, string $type, string|int $value): section_backup_setting {
+        $setting = new backup_section_generic_setting($identifier, $type, $value);
+        $this->add_setting($setting);
+        return $setting;
+    }
+
+    /**
+     * Add the section included setting to the task.
+     *
+     * @param string $settingprefix the identifier of the setting
+     * @return section_backup_setting the setting added
+     */
+    protected function add_section_included_setting(string $settingprefix): section_backup_setting {
+        global $DB;
+        $course = $DB->get_record('course', ['id' => $this->section->course], '*', MUST_EXIST);
 
         // Define sectionincluded (to decide if the whole task must be really executed).
         $settingname = $settingprefix . 'included';
+
         $sectionincluded = new backup_section_included_setting($settingname, base_setting::IS_BOOLEAN, true);
-        $sectionincluded->get_ui()->set_label(get_section_name($course, $section));
+
+        $sectionincluded->get_ui()->set_label(get_section_name($course, $this->section));
         $this->add_setting($sectionincluded);
 
+        return $sectionincluded;
+    }
+
+    /**
+     * Add the section userinfo setting to the task.
+     *
+     * @param string $settingprefix the identifier of the setting
+     * @param section_backup_setting $includefield the setting to depend on
+     * @return section_backup_setting the setting added
+     */
+    protected function add_section_userinfo_setting(
+        string $settingprefix,
+        section_backup_setting $includefield
+    ): section_backup_setting {
         // Define sectionuserinfo. Dependent of:
         // - users root setting.
-        // - sectionincluded setting.
+        // - section_included setting.
         $settingname = $settingprefix . 'userinfo';
+
         $sectionuserinfo = new backup_section_userinfo_setting($settingname, base_setting::IS_BOOLEAN, true);
+
         $sectionuserinfo->get_ui()->set_label(get_string('includeuserinfo', 'backup'));
         $sectionuserinfo->get_ui()->set_visually_hidden_label(
-            get_string('section_prefix', 'core_backup', $section->name ?: $section->section)
+            get_string('section_prefix', 'core_backup', $this->section->name ?: $this->section->section)
         );
         $this->add_setting($sectionuserinfo);
-
         // Look for "users" root setting.
         $users = $this->plan->get_setting('users');
         $users->add_dependency($sectionuserinfo);
         // Look for "section_included" section setting.
-        $sectionincluded->add_dependency($sectionuserinfo);
+        $includefield->add_dependency($sectionuserinfo);
+
+        return $sectionuserinfo;
     }
 }
diff --git a/backup/moodle2/restore_activity_task.class.php b/backup/moodle2/restore_activity_task.class.php
index 12f6006f1147f..4948516cd1108 100644
--- a/backup/moodle2/restore_activity_task.class.php
+++ b/backup/moodle2/restore_activity_task.class.php
@@ -288,42 +288,71 @@ public static function define_restore_log_rules() {
      * Define the common setting that any restore activity will have
      */
     protected function define_settings() {
-
         // All the settings related to this activity will include this prefix
         $settingprefix = $this->info->modulename . '_' . $this->info->moduleid . '_';
 
         // All these are common settings to be shared by all activities
+        $activityincluded = $this->add_activity_included_setting($settingprefix);
+        $this->add_activity_userinfo_setting($settingprefix, $activityincluded);
+
+        // End of common activity settings, let's add the particular ones.
+        $this->define_my_settings();
+    }
 
-        // Define activity_include (to decide if the whole task must be really executed)
+    /**
+     * Add the activity included setting to the task.
+     *
+     * @param string $settingprefix the identifier of the setting
+     * @return activity_backup_setting the setting added
+     */
+    protected function add_activity_included_setting(string $settingprefix): activity_backup_setting {
+        // Define activity_included (to decide if the whole task must be really executed)
         // Dependent of:
-        // - activities root setting
-        // - section_included setting (if exists)
+        // - activities root setting.
+        // - sectionincluded setting (if exists).
         $settingname = $settingprefix . 'included';
-        $activity_included = new restore_activity_generic_setting($settingname, base_setting::IS_BOOLEAN, true);
-        $activity_included->get_ui()->set_icon(new image_icon('monologo', get_string('pluginname', $this->modulename),
-            $this->modulename, array('class' => 'iconlarge icon-post ml-1')));
-        $this->add_setting($activity_included);
-        // Look for "activities" root setting
+
+        $activityincluded = new restore_activity_generic_setting($settingname, base_setting::IS_BOOLEAN, true);
+
+        $activityincluded->get_ui()->set_icon(new image_icon('monologo', get_string('pluginname', $this->modulename),
+            $this->modulename, ['class' => 'iconlarge icon-post ml-1']));
+        $this->add_setting($activityincluded);
+        // Look for "activities" root setting.
         $activities = $this->plan->get_setting('activities');
-        $activities->add_dependency($activity_included);
-        // Look for "section_included" section setting (if exists)
+        $activities->add_dependency($activityincluded);
+        // Look for "sectionincluded" section setting (if exists).
         $settingname = 'section_' . $this->info->sectionid . '_included';
         if ($this->plan->setting_exists($settingname)) {
-            $section_included = $this->plan->get_setting($settingname);
-            $section_included->add_dependency($activity_included);
+            $sectionincluded = $this->plan->get_setting($settingname);
+            $sectionincluded->add_dependency($activityincluded);
         }
 
-        // Define activity_userinfo. Dependent of:
-        // - users root setting
-        // - section_userinfo setting (if exists)
-        // - activity_included setting.
+        return $activityincluded;
+    }
+
+    /**
+     * Add the activity userinfo setting to the task.
+     *
+     * @param string $settingprefix the identifier of the setting
+     * @param activity_backup_setting $includefield the activity included setting
+     * @return activity_backup_setting the setting added
+     */
+    protected function add_activity_userinfo_setting(
+        string $settingprefix,
+        activity_backup_setting $includefield
+    ): activity_backup_setting {
+        // Define activityuserinfo. Dependent of:
+        // - users root setting.
+        // - sectionuserinfo setting (if exists).
+        // - activity included setting.
         $settingname = $settingprefix . 'userinfo';
         $defaultvalue = false;
         if (isset($this->info->settings[$settingname]) && $this->info->settings[$settingname]) { // Only enabled when available
             $defaultvalue = true;
         }
 
-        $activity_userinfo = new restore_activity_userinfo_setting($settingname, base_setting::IS_BOOLEAN, $defaultvalue);
+        $activityuserinfo = new restore_activity_userinfo_setting($settingname, base_setting::IS_BOOLEAN, $defaultvalue);
+
         if (!$defaultvalue) {
             // This is a bit hacky, but if there is no user data to restore, then
             // we replace the standard check-box with a select menu with the
@@ -333,30 +362,34 @@ protected function define_settings() {
             // It would probably be better design to have a special UI class
             // setting_ui_checkbox_or_no, rather than this hack, but I am not
             // going to do that today.
-            $activity_userinfo->set_ui(new backup_setting_ui_select($activity_userinfo, '-',
-                    array(0 => get_string('no'))));
+            $activityuserinfo->set_ui(
+                new backup_setting_ui_select(
+                    $activityuserinfo,
+                    '-',
+                    [0 => get_string('no')]
+                )
+            );
         } else {
-            $activity_userinfo->get_ui()->set_label('-');
+            $activityuserinfo->get_ui()->set_label('-');
         }
 
-        $this->add_setting($activity_userinfo);
+        $this->add_setting($activityuserinfo);
 
-        // Look for "users" root setting
+        // Look for "users" root setting.
         $users = $this->plan->get_setting('users');
-        $users->add_dependency($activity_userinfo);
+        $users->add_dependency($activityuserinfo);
 
-        // Look for "section_userinfo" section setting (if exists)
+        // Look for "sectionuserinfo" section setting (if exists).
         $settingname = 'section_' . $this->info->sectionid . '_userinfo';
         if ($this->plan->setting_exists($settingname)) {
-            $section_userinfo = $this->plan->get_setting($settingname);
-            $section_userinfo->add_dependency($activity_userinfo);
+            $sectionuserinfo = $this->plan->get_setting($settingname);
+            $sectionuserinfo->add_dependency($activityuserinfo);
         }
 
-        // Look for "activity_included" setting.
-        $activity_included->add_dependency($activity_userinfo);
+        // Look for "activity included" setting.
+        $includefield->add_dependency($activityuserinfo);
 
-        // End of common activity settings, let's add the particular ones.
-        $this->define_my_settings();
+        return $activityuserinfo;
     }
 
     /**
diff --git a/backup/moodle2/restore_section_task.class.php b/backup/moodle2/restore_section_task.class.php
index 2913836a7b870..924c309c67621 100644
--- a/backup/moodle2/restore_section_task.class.php
+++ b/backup/moodle2/restore_section_task.class.php
@@ -150,36 +150,67 @@ public static function define_decode_rules() {
      * Define the common setting that any restore section will have
      */
     protected function define_settings() {
-
         // All the settings related to this activity will include this prefix
         $settingprefix = 'section_' . $this->info->sectionid . '_';
 
-        // All these are common settings to be shared by all sections
+        // All these are common settings to be shared by all sections.
+        $sectionincluded = $this->add_section_included_setting($settingprefix);
+        $this->add_section_userinfo_setting($settingprefix, $sectionincluded);
+    }
 
-        // Define section_included (to decide if the whole task must be really executed)
+    /**
+     * Add the section included setting to the task.
+     *
+     * @param string $settingprefix the identifier of the setting
+     * @return section_backup_setting the setting added
+     */
+    protected function add_section_included_setting(string $settingprefix): section_backup_setting {
+        global $DB;
+        // Define sectionincluded (to decide if the whole task must be really executed).
         $settingname = $settingprefix . 'included';
-        $section_included = new restore_section_included_setting($settingname, base_setting::IS_BOOLEAN, true);
+
+        $sectionincluded = new restore_section_included_setting($settingname, base_setting::IS_BOOLEAN, true);
+
         if (is_number($this->info->title)) {
             $label = get_string('includesection', 'backup', $this->info->title);
         } elseif (empty($this->info->title)) { // Don't throw error if title is empty, gracefully continue restore.
-            $this->log('Section title missing in backup for section id '.$this->info->sectionid, backup::LOG_WARNING, $this->name);
+            $this->log(
+                'Section title missing in backup for section id ' . $this->info->sectionid,
+                backup::LOG_WARNING,
+                $this->name
+            );
             $label = get_string('unnamedsection', 'backup');
         } else {
             $label = $this->info->title;
         }
-        $section_included->get_ui()->set_label($label);
-        $this->add_setting($section_included);
+        $sectionincluded->get_ui()->set_label($label);
+        $this->add_setting($sectionincluded);
 
-        // Define section_userinfo. Dependent of:
-        // - users root setting
-        // - section_included setting.
+        return $sectionincluded;
+    }
+
+    /**
+     * Add the section userinfo setting to the task.
+     *
+     * @param string $settingprefix the identifier of the setting
+     * @param section_backup_setting $includefield the section included setting
+     * @return section_backup_setting the setting added
+     */
+    protected function add_section_userinfo_setting(
+        string $settingprefix,
+        section_backup_setting $includefield
+    ): section_backup_setting {
+        // Define sectionuserinfo. Dependent of:
+        // - users root setting.
+        // - sectionincluded setting.
         $settingname = $settingprefix . 'userinfo';
         $defaultvalue = false;
         if (isset($this->info->settings[$settingname]) && $this->info->settings[$settingname]) { // Only enabled when available
             $defaultvalue = true;
         }
 
-        $section_userinfo = new restore_section_userinfo_setting($settingname, base_setting::IS_BOOLEAN, $defaultvalue);
+        $sectionuserinfo = new restore_section_userinfo_setting($settingname, base_setting::IS_BOOLEAN, $defaultvalue);
+
         if (!$defaultvalue) {
             // This is a bit hacky, but if there is no user data to restore, then
             // we replace the standard check-box with a select menu with the
@@ -189,19 +220,23 @@ protected function define_settings() {
             // It would probably be better design to have a special UI class
             // setting_ui_checkbox_or_no, rather than this hack, but I am not
             // going to do that today.
-            $section_userinfo->set_ui(new backup_setting_ui_select($section_userinfo, get_string('includeuserinfo','backup'),
-                    array(0 => get_string('no'))));
+            $sectionuserinfo->set_ui(
+                new backup_setting_ui_select($sectionuserinfo,
+                    get_string('includeuserinfo', 'backup'), [0 => get_string('no')])
+            );
         } else {
-            $section_userinfo->get_ui()->set_label(get_string('includeuserinfo','backup'));
+            $sectionuserinfo->get_ui()->set_label(get_string('includeuserinfo', 'backup'));
         }
 
-        $this->add_setting($section_userinfo);
+        $this->add_setting($sectionuserinfo);
 
         // Look for "users" root setting.
         $users = $this->plan->get_setting('users');
-        $users->add_dependency($section_userinfo);
+        $users->add_dependency($sectionuserinfo);
+
+        // Look for "section included" section setting.
+        $includefield->add_dependency($sectionuserinfo);
 
-        // Look for "section_included" section setting.
-        $section_included->add_dependency($section_userinfo);
+        return $sectionuserinfo;
     }
 }
diff --git a/backup/util/plan/base_task.class.php b/backup/util/plan/base_task.class.php
index 37d001e1a7835..148c0bbe88308 100644
--- a/backup/util/plan/base_task.class.php
+++ b/backup/util/plan/base_task.class.php
@@ -103,7 +103,20 @@ public function get_setting($name) {
         }
     }
 
+    /**
+     * Check if a setting with the given name exists.
+     *
+     * This method find first in the current settings and then in the plan settings.
+     *
+     * @param string $name Setting name
+     * @return bool
+     */
     public function setting_exists($name) {
+        foreach ($this->settings as $setting) {
+            if ($setting->get_name() == $name) {
+                return true;
+            }
+        }
         return $this->plan->setting_exists($name);
     }
 
diff --git a/backup/util/ui/base_moodleform.class.php b/backup/util/ui/base_moodleform.class.php
index 88925ce8cdc8e..b607390fa872c 100644
--- a/backup/util/ui/base_moodleform.class.php
+++ b/backup/util/ui/base_moodleform.class.php
@@ -48,22 +48,10 @@ abstract class base_moodleform extends moodleform {
     protected $uistage = null;
 
     /**
-     * True if we have a course div open, false otherwise
-     * @var bool
+     * Group stack to control open and closed div groups.
+     * @var array
      */
-    protected $coursediv = false;
-
-    /**
-     * True if we have a section div open, false otherwise
-     * @var bool
-     */
-    protected $sectiondiv = false;
-
-    /**
-     * True if we have an activity div open, false otherwise
-     * @var bool
-     */
-    protected $activitydiv = false;
+    protected array $groupstack = [];
 
     /**
      * Creates the form
@@ -177,20 +165,12 @@ public function definition_after_data() {
     }
 
     /**
-     * Closes any open divs
+     * Closes any open divs.
      */
     public function close_task_divs() {
-        if ($this->activitydiv) {
-            $this->_form->addElement('html', html_writer::end_tag('div'));
-            $this->activitydiv = false;
-        }
-        if ($this->sectiondiv) {
+        while (!empty($this->groupstack)) {
             $this->_form->addElement('html', html_writer::end_tag('div'));
-            $this->sectiondiv = false;
-        }
-        if ($this->coursediv) {
-            $this->_form->addElement('html', html_writer::end_tag('div'));
-            $this->coursediv = false;
+            array_pop($this->groupstack);
         }
     }
 
@@ -244,7 +224,7 @@ public function add_settings(array $settingstasks) {
                 list($identifier, $component) = $setting->get_help();
                 $this->_form->addHelpButton($setting->get_ui_name(), $identifier, $component);
             }
-            $this->_form->addElement('html', html_writer::end_tag('div'));
+            $this->pop_group();
         }
         $this->_form->setDefaults($defaults);
         return true;
@@ -265,54 +245,32 @@ public function add_heading($name , $text) {
      * @param backup_setting $setting
      */
     protected function add_html_formatting(backup_setting $setting) {
-        $mform = $this->_form;
         $isincludesetting = (strpos($setting->get_name(), '_include') !== false);
         if ($isincludesetting && $setting->get_level() != backup_setting::ROOT_LEVEL) {
             switch ($setting->get_level()) {
                 case backup_setting::COURSE_LEVEL:
-                    if ($this->activitydiv) {
-                        $this->_form->addElement('html', html_writer::end_tag('div'));
-                        $this->activitydiv = false;
-                    }
-                    if ($this->sectiondiv) {
-                        $this->_form->addElement('html', html_writer::end_tag('div'));
-                        $this->sectiondiv = false;
-                    }
-                    if ($this->coursediv) {
-                        $this->_form->addElement('html', html_writer::end_tag('div'));
-                    }
-                    $mform->addElement('html', html_writer::start_tag('div', array('class' => 'grouped_settings course_level')));
-                    $mform->addElement('html', html_writer::start_tag('div', array('class' => 'include_setting course_level')));
-                    $this->coursediv = true;
+                    $this->pop_groups_to('course');
+                    $this->push_group_start('course', 'grouped_settings course_level');
+                    $this->push_group_start(null, 'include_setting course_level');
                     break;
                 case backup_setting::SECTION_LEVEL:
-                    if ($this->activitydiv) {
-                        $this->_form->addElement('html', html_writer::end_tag('div'));
-                        $this->activitydiv = false;
-                    }
-                    if ($this->sectiondiv) {
-                        $this->_form->addElement('html', html_writer::end_tag('div'));
-                    }
-                    $mform->addElement('html', html_writer::start_tag('div', array('class' => 'grouped_settings section_level')));
-                    $mform->addElement('html', html_writer::start_tag('div', array('class' => 'include_setting section_level')));
-                    $this->sectiondiv = true;
+                    $this->pop_groups_to('course');
+                    $this->push_group_start('section', 'grouped_settings section_level');
+                    $this->push_group_start(null, 'include_setting section_level');
                     break;
                 case backup_setting::ACTIVITY_LEVEL:
-                    if ($this->activitydiv) {
-                        $this->_form->addElement('html', html_writer::end_tag('div'));
-                    }
-                    $mform->addElement('html', html_writer::start_tag('div', array('class' => 'grouped_settings activity_level')));
-                    $mform->addElement('html', html_writer::start_tag('div', array('class' => 'include_setting activity_level')));
-                    $this->activitydiv = true;
+                    $this->pop_groups_to('section');
+                    $this->push_group_start('activity', 'grouped_settings activity_level');
+                    $this->push_group_start(null, 'include_setting activity_level');
                     break;
                 default:
-                    $mform->addElement('html', html_writer::start_tag('div', array('class' => 'normal_setting')));
+                    $this->push_group_start(null, 'normal_setting');
                     break;
             }
         } else if ($setting->get_level() == backup_setting::ROOT_LEVEL) {
-            $mform->addElement('html', html_writer::start_tag('div', array('class' => 'root_setting')));
+            $this->push_group_start('root', 'root_setting');
         } else {
-            $mform->addElement('html', html_writer::start_tag('div', array('class' => 'normal_setting')));
+            $this->push_group_start(null, 'normal_setting');
         }
     }
 
@@ -350,12 +308,55 @@ public function add_fixed_setting(backup_setting $setting, base_task $task) {
                 $label .= $OUTPUT->render($labelicon);
             }
             $this->_form->addElement('static', 'static_'.$settingui->get_name(), $label, $settingui->get_static_value().$icon);
-            $this->_form->addElement('html', html_writer::end_tag('div'));
+            $this->pop_group();
         }
         $this->_form->addElement('hidden', $settingui->get_name(), $settingui->get_value());
         $this->_form->setType($settingui->get_name(), $settingui->get_param_validation());
     }
 
+    /**
+     * Pushes a group start to the form.
+     *
+     * This method will create a new group div in the form and add it to the group stack.
+     * The name can be used to close all stacked groups up to a certain group.
+     *
+     * @param string|null $name The name of the group, if any.
+     * @param string $classes The classes to add to the div.
+     */
+    protected function push_group_start(?string $name, string $classes) {
+        $mform = $this->_form;
+        $this->groupstack[] = $name;
+        $mform->addElement('html', html_writer::start_tag('div', ['class' => $classes]));
+    }
+
+    /**
+     * Pops groups from the stack until the given group name is reached.
+     *
+     * @param string $name The name of the group to pop to.
+     */
+    protected function pop_groups_to(string $name) {
+        if (empty($this->groupstack)) {
+            return;
+        }
+        while (!empty($this->groupstack) && end($this->groupstack) !== $name) {
+            $this->pop_group();
+        }
+    }
+
+    /**
+     * Pops a group from the stack and closes the div.
+     *
+     * @return string|null The name of the group that was popped, or null if the stack is empty.
+     */
+    protected function pop_group(): ?string {
+        if (empty($this->groupstack)) {
+            return null;
+        }
+        $mform = $this->_form;
+        $mform->addElement('html', html_writer::end_tag('div'));
+        return array_pop($this->groupstack);
+    }
+
     /**
      * Adds dependencies to the form recursively
      *

From b4f03323886b59b32580aeb416654d742ca25eef Mon Sep 17 00:00:00 2001
From: ferranrecio <ferran@moodle.com>
Date: Thu, 30 May 2024 15:13:31 +0200
Subject: [PATCH 081/119] MDL-80191 backup: delegate section backup and restore

This commit adds all the logic to allow delegate sections backup and
restore. The backup and restore process is quite complex and it is not
designed to have task hierarchy. To solve the subsection problem, the
backup/restore planners do not include delegated sections at a course
level, but they are included when the activity with delegated section is
processed.

To allow restoing, the activity is responsible to store the
component/itemid mapping in the backup_structure_dbops. This way, when
the delegated section is restored (delegated sections are always
processed right after the parent activity) it can use the itemid
mapping.
---
 backup/moodle2/backup_plan_builder.class.php  | 50 ++++++++++-
 backup/moodle2/backup_section_task.class.php  | 38 ++++++++
 backup/moodle2/backup_stepslib.php            | 21 ++++-
 backup/moodle2/restore_plan_builder.class.php | 31 +++++++
 backup/moodle2/restore_stepslib.php           | 90 ++++++++++++++++++-
 .../moodle2/tests/restore_stepslib_test.php   | 12 +--
 .../dbops/backup_controller_dbops.class.php   |  5 +-
 backup/util/dbops/backup_plan_dbops.class.php | 11 +++
 .../format/classes/sectiondelegatemodule.php  | 23 +++++
 lang/en/backup.php                            |  1 +
 10 files changed, 269 insertions(+), 13 deletions(-)

diff --git a/backup/moodle2/backup_plan_builder.class.php b/backup/moodle2/backup_plan_builder.class.php
index 49244870e4e5c..508635997d885 100644
--- a/backup/moodle2/backup_plan_builder.class.php
+++ b/backup/moodle2/backup_plan_builder.class.php
@@ -133,6 +133,9 @@ protected static function build_activity_plan($controller, $id) {
         try {
             $plan->add_task(backup_factory::get_backup_activity_task($controller->get_format(), $id));
 
+            // Some activities may have delegated section integrations.
+            self::build_delegated_section_plan($controller, $id);
+
             // For the given activity, add as many block tasks as necessary
             $blockids = backup_plan_dbops::get_blockids_from_moduleid($id);
             foreach ($blockids as $blockid) {
@@ -150,6 +153,44 @@ protected static function build_activity_plan($controller, $id) {
         }
     }
 
+    /**
+     * Build a course module delegated section backup plan.
+     * @param backup_controller $controller
+     * @param int $cmid the parent course module id.
+     */
+    protected static function build_delegated_section_plan($controller, $cmid) {
+        global $CFG, $DB;
+
+        // Check moduleid exists.
+        if (!$coursemodule = get_coursemodule_from_id(false, $cmid)) {
+            $controller->log(get_string('error_course_module_not_found', 'backup', $cmid), backup::LOG_WARNING);
+        }
+        $classname = 'mod_' . $coursemodule->modname . '\courseformat\sectiondelegate';
+        if (!class_exists($classname)) {
+            return;
+        }
+        $sectionid = null;
+        try {
+            $sectionid = $classname::delegated_section_id($coursemodule);
+        } catch (dml_exception $error) {
+            $controller->log(get_string('error_delegate_section_not_found', 'backup', $cmid), backup::LOG_WARNING);
+            return;
+        }
+
+        $plan = $controller->get_plan();
+        $sectiontask = backup_factory::get_backup_section_task($controller->get_format(), $sectionid);
+        $sectiontask->set_delegated_cm($cmid);
+        $plan->add_task($sectiontask);
+
+        // For the given section, add as many activity tasks as necessary.
+        $coursemodules = backup_plan_dbops::get_modules_from_sectionid($sectionid);
+        foreach ($coursemodules as $coursemodule) {
+            if (plugin_supports('mod', $coursemodule->modname, FEATURE_BACKUP_MOODLE2)) {
+                self::build_activity_plan($controller, $coursemodule->id);
+            }
+        }
+    }
+
     /**
      * Build one 1-section backup
      */
@@ -185,8 +226,13 @@ protected static function build_course_plan($controller, $id) {
 
         // For the given course, add as many section tasks as necessary
         $sections = backup_plan_dbops::get_sections_from_courseid($id);
-        foreach ($sections as $section) {
-            self::build_section_plan($controller, $section);
+        foreach ($sections as $sectionid) {
+            // Delegated sections are not course responsability.
+            $sectiondata = backup_plan_dbops::get_section_from_id($sectionid);
+            if (!empty($sectiondata->component)) {
+                continue;
+            }
+            self::build_section_plan($controller, $sectionid);
         }
 
         // For the given course, add as many block tasks as necessary
diff --git a/backup/moodle2/backup_section_task.class.php b/backup/moodle2/backup_section_task.class.php
index 16f33a7038704..6389c3e6a87ad 100644
--- a/backup/moodle2/backup_section_task.class.php
+++ b/backup/moodle2/backup_section_task.class.php
@@ -42,6 +42,11 @@ class backup_section_task extends backup_task {
      */
     protected stdClass $section;
 
+    /**
+     * @var int|null $delegatedcmid the course module that is delegating this section (if any)
+     */
+    protected ?int $delegatedcmid = null;
+
     /**
      * Constructor - instantiates one object of this class
      */
@@ -59,6 +64,39 @@ public function __construct($name, $sectionid, $plan = null) {
         parent::__construct($name, $plan);
     }
 
+    /**
+     * Set the course module that is delegating this section.
+     *
+     * Delegated section can belong to any kind of plugin. However, when a delegated
+     * section belongs to a course module, the UI will present all settings according.
+     *
+     * @param int $cmid the course module id that is delegating this section
+     */
+    public function set_delegated_cm(int $cmid) {
+        $this->delegatedcmid = $cmid;
+    }
+
+    /**
+     * Get the course module that is delegating this section.
+     *
+     * @return int|null the course module id that is delegating this section
+     */
+    public function get_delegated_cm(): ?int {
+        return $this->delegatedcmid;
+    }
+
+    /**
+     * Get the delegate activity modname (if any).
+     *
+     * @return string|null the modname of the delegated activity
+     */
+    public function get_modname(): ?string {
+        if (empty($this->section->component)) {
+            return null;
+        }
+        return core_component::normalize_component($this->section->component)[1];
+    }
+
     public function get_sectionid() {
         return $this->sectionid;
     }
diff --git a/backup/moodle2/backup_stepslib.php b/backup/moodle2/backup_stepslib.php
index e5496e408743b..a2b99c4b9979d 100644
--- a/backup/moodle2/backup_stepslib.php
+++ b/backup/moodle2/backup_stepslib.php
@@ -119,6 +119,20 @@ protected function prepare_activity_structure($activitystructure) {
         // Return the root element (activity)
         return $activity;
     }
+
+    /**
+     * Set a delegate section itemid mapping.
+     *
+     * @param string $pluginname the name of the plugin that is delegating the section.
+     * @param int $itemid the itemid of the section being delegated.
+     */
+    protected function set_delegated_section_mapping(string $pluginname, int $itemid) {
+        backup_structure_dbops::insert_backup_ids_record(
+            $this->get_backupid(),
+            "course_section::$pluginname::$itemid",
+            $this->task->get_moduleid()
+        );
+    }
 }
 
 /**
@@ -2128,8 +2142,11 @@ protected function define_structure() {
 
         $sections = new backup_nested_element('sections');
 
-        $section = new backup_nested_element('section', null, array(
-            'sectionid', 'title', 'directory'));
+        $section = new backup_nested_element(
+            'section',
+            null,
+            ['sectionid', 'title', 'directory', 'parentcmid', 'modname']
+        );
 
         $course = new backup_nested_element('course', null, array(
             'courseid', 'title', 'directory'));
diff --git a/backup/moodle2/restore_plan_builder.class.php b/backup/moodle2/restore_plan_builder.class.php
index 9246dc41c5a15..b5cb20d6d5e32 100644
--- a/backup/moodle2/restore_plan_builder.class.php
+++ b/backup/moodle2/restore_plan_builder.class.php
@@ -144,6 +144,9 @@ protected static function build_activity_plan($controller, $activityid) {
             $plan->add_task($task);
             $controller->get_progress()->progress();
 
+            // Some activities may have delegated section integrations.
+            self::build_delegated_section_plan($controller, $infoactivity->moduleid);
+
             // For the given activity path, add as many block tasks as necessary
             // TODO: Add blocks, we need to introspect xml here
             $blocks = backup_general_helper::get_blocks_from_path($task->get_taskbasepath());
@@ -161,6 +164,30 @@ protected static function build_activity_plan($controller, $activityid) {
 
     }
 
+    /**
+     * Build a course module delegated section backup plan.
+     * @param restore_controller $controller
+     * @param int $cmid the parent course module id.
+     */
+    protected static function build_delegated_section_plan($controller, $cmid) {
+        $info = $controller->get_info();
+
+        // Find if some section depends on that course module.
+        $delegatedsectionid = null;
+        foreach ($info->sections as $sectionid => $section) {
+            // Delegated sections are not course responsability.
+            if (isset($section->parentcmid) && $section->parentcmid == $cmid) {
+                $delegatedsectionid = $sectionid;
+                break;
+            }
+        }
+
+        if (!$delegatedsectionid) {
+            return;
+        }
+        self::build_section_plan($controller, $delegatedsectionid);
+    }
+
     /**
      * Restore one 1-section backup
      */
@@ -215,6 +242,10 @@ protected static function build_course_plan($controller, $courseid) {
 
         // For the given course, add as many section tasks as necessary
         foreach ($info->sections as $sectionid => $section) {
+            // Delegated sections are not course responsability.
+            if (isset($section->parentcmid) && !empty($section->parentcmid)) {
+                continue;
+            }
             self::build_section_plan($controller, $sectionid);
         }
     }
diff --git a/backup/moodle2/restore_stepslib.php b/backup/moodle2/restore_stepslib.php
index 22015c8200539..98cac314e7335 100644
--- a/backup/moodle2/restore_stepslib.php
+++ b/backup/moodle2/restore_stepslib.php
@@ -1612,8 +1612,28 @@ public function process_section($data) {
         $section->course  = $this->get_courseid();
         $section->section = $data->number;
         $section->timemodified = $data->timemodified ?? 0;
+        $section->component = null;
+        $section->itemid = null;
+
+        $secrec = $DB->get_record(
+            'course_sections',
+            ['course' => $this->get_courseid(), 'section' => $data->number, 'component' => null]
+        );
+        $createsection = empty($secrec);
+
+        // Delegated sections are always restored as new sections.
+        if (!empty($data->component)) {
+            $section->itemid = $this->get_delegated_section_mapping($data->component, $data->itemid);
+            // If the delegate component does not set the mapping id, the section must be converted
+            // into a regular section. Otherwise, it won't be accessible.
+            $createsection = $createsection || $section->itemid !== null;
+            $section->component = ($section->itemid !== null) ? $data->component : null;
+            // The section number will be always the last of the course, no matter the case.
+            $section->section = $this->get_last_section_number($this->get_courseid()) + 1;
+
+        }
         // Section doesn't exist, create it with all the info from backup
-        if (!$secrec = $DB->get_record('course_sections', ['course' => $this->get_courseid(), 'section' => $data->number])) {
+        if ($createsection) {
             $section->name = $data->name;
             $section->summary = $data->summary;
             $section->summaryformat = $data->summaryformat;
@@ -1629,8 +1649,10 @@ public function process_section($data) {
                             $data, true);
                 }
             }
-            $section->component = $data->component ?? null;
-            $section->itemid = $data->itemid ?? null;
+
+            // Delegated sections should be always after the normal sections.
+            $this->displace_delegated_sections_after($section->section);
+
             $newitemid = $DB->insert_record('course_sections', $section);
             $section->id = $newitemid;
 
@@ -1802,6 +1824,57 @@ protected function after_execute() {
         // Add section related files, with 'course_section' itemid to match
         $this->add_related_files('course', 'section', 'course_section');
     }
+
+    /**
+     * Create a delegate section mapping.
+     *
+     * @param string $component the component name (frankenstyle)
+     * @param int $oldsectionid The old section id.
+     * @return int|null The new section id or null if not found.
+     */
+    protected function get_delegated_section_mapping($component, $oldsectionid): ?int {
+        $result = $this->get_mappingid("course_section::$component", $oldsectionid, null);
+        return $result;
+    }
+
+    /**
+     * Displace delegated sections after the given section number.
+     *
+     * @param int $sectionnum The section number.
+     */
+    protected function displace_delegated_sections_after(int $sectionnum): void {
+        global $DB;
+
+        $sectionstomove = $DB->get_records_select(
+            'course_sections',
+            'course = ? AND component IS NOT NULL',
+            [$this->get_courseid()],
+            'section DESC', 'id, section'
+        );
+        foreach ($sectionstomove as $section) {
+            $sectionnum++;
+            $section->section = $sectionnum;
+            $DB->update_record('course_sections', $section);
+        }
+    }
+
+    /**
+     * Get the last section number in the course.
+     *
+     * @param int $courseid The course id.
+     * @param bool $includedelegated If true, include delegated sections in the count.
+     * @return int The last section number.
+     */
+    protected function get_last_section_number(int $courseid, bool $includedelegated = false): int {
+        global $DB;
+
+        $delegtadefilter = $includedelegated ? '' : ' AND component IS NULL';
+
+        return (int) $DB->get_field_sql(
+            'SELECT max(section) from {course_sections} WHERE course = ?' . $delegtadefilter,
+            [$courseid]
+        );
+    }
 }
 
 /**
@@ -4905,6 +4978,17 @@ protected function apply_activity_instance($newitemid) {
         $oldid = $this->task->get_old_activityid();
         $this->set_mapping($modulename, $oldid, $newitemid, true);
     }
+
+    /**
+     * Create a delegate section mapping.
+     *
+     * @param string $component The component name (frankenstyle)
+     * @param int $olditemid The old section id.
+     * @param int $newitemid The new section id.
+     */
+    protected function set_delegated_section_mapping($component, $olditemid, $newitemid) {
+        $this->set_mapping("course_section::$component", $olditemid, $newitemid);
+    }
 }
 
 /**
diff --git a/backup/moodle2/tests/restore_stepslib_test.php b/backup/moodle2/tests/restore_stepslib_test.php
index 6a8eb5e162fa9..d5a2685823c5f 100644
--- a/backup/moodle2/tests/restore_stepslib_test.php
+++ b/backup/moodle2/tests/restore_stepslib_test.php
@@ -103,7 +103,7 @@ protected function restore_replacing_content(string $backupid): int {
     }
 
     /**
-     * Test for the section structure step included elements.
+     * Test for delegate section behaviour.
      *
      * @covers \restore_section_structure_step::process_section
      */
@@ -114,7 +114,7 @@ public function test_restore_section_structure_step(): void {
         $this->setAdminUser();
 
         $course = $this->getDataGenerator()->create_course(['numsections' => 2, 'format' => 'topics']);
-        // Section 2 has an existing delegate class.
+        // Section 2 has an existing delegate class for component that is not an activity.
         course_update_section(
             $course,
             $DB->get_record('course_sections', ['course' => $course->id, 'section' => 2]),
@@ -130,16 +130,18 @@ public function test_restore_section_structure_step(): void {
         $originalsections = get_fast_modinfo($course->id)->get_section_info_all();
         $restoredsections = get_fast_modinfo($newcourseid)->get_section_info_all();
 
-        $this->assertEquals(count($originalsections), count($restoredsections));
+        // Delegated sections depends on the plugin to be backuped and restored.
+        // In this case, the plugin is not backuped and restored, so the section is not restored.
+        $this->assertEquals(3, count($originalsections));
+        $this->assertEquals(2, count($restoredsections));
 
         $validatefields = ['name', 'summary', 'summaryformat', 'visible', 'component', 'itemid'];
 
         $this->assertEquals($originalsections[1]->name, $restoredsections[1]->name);
 
         foreach ($validatefields as $field) {
+            $this->assertEquals($originalsections[0]->$field, $restoredsections[0]->$field);
             $this->assertEquals($originalsections[1]->$field, $restoredsections[1]->$field);
-            $this->assertEquals($originalsections[2]->$field, $restoredsections[2]->$field);
         }
-
     }
 }
diff --git a/backup/util/dbops/backup_controller_dbops.class.php b/backup/util/dbops/backup_controller_dbops.class.php
index 2bc367fd47614..4992fb2e703de 100644
--- a/backup/util/dbops/backup_controller_dbops.class.php
+++ b/backup/util/dbops/backup_controller_dbops.class.php
@@ -268,7 +268,10 @@ private static function get_section_backup_information($task) {
         $contentinfo = array(
             'sectionid'  => $task->get_sectionid(),
             'title'      => $task->get_name(),
-            'directory'  => 'sections/' . 'section_' . $task->get_sectionid());
+            'directory'  => 'sections/' . 'section_' . $task->get_sectionid(),
+            'parentcmid' => $task->get_delegated_cm() ?? '',
+            'modname' => $task->get_modname() ?? '',
+        );
 
         // Now get section settings
         // Calculate prefix to find valid settings
diff --git a/backup/util/dbops/backup_plan_dbops.class.php b/backup/util/dbops/backup_plan_dbops.class.php
index d3a650bf91ef8..4a962ddfa6e18 100644
--- a/backup/util/dbops/backup_plan_dbops.class.php
+++ b/backup/util/dbops/backup_plan_dbops.class.php
@@ -120,6 +120,17 @@ public static function get_sections_from_courseid($courseid) {
         return $sectionsarr;
     }
 
+    /**
+     * Given one section id, returns the full section record.
+     *
+     * @param int $sectionid
+     * @return stdClass
+     */
+    public static function get_section_from_id($sectionid): stdClass {
+        global $DB;
+        return $DB->get_record('course_sections', ['id' => $sectionid]);
+    }
+
     /**
      * Given one course id, return its format in DB
      */
diff --git a/course/format/classes/sectiondelegatemodule.php b/course/format/classes/sectiondelegatemodule.php
index 124ad1b34f85c..61e5a2c736398 100644
--- a/course/format/classes/sectiondelegatemodule.php
+++ b/course/format/classes/sectiondelegatemodule.php
@@ -52,6 +52,29 @@ public function __construct(
         );
     }
 
+    /**
+     * Get the delegated section id controlled by a specific cm.
+     *
+     * This method is used when reverse search is needed bu we cannot access the database.
+     * This happens mostly on backup and restore. Do NOT use for normal operations.
+     *
+     * @param stdClass|cm_info $cm a course module compatible data structure.
+     * @return int the section id.
+     */
+    public static function delegated_section_id(stdClass|cm_info $cm): int {
+        global $DB;
+        return $DB->get_field(
+            'course_sections',
+            'id',
+            [
+                'course' => $cm->course,
+                'component' => explode('\\', static::class)[0],
+                'itemid' => $cm->instance,
+            ],
+            MUST_EXIST
+        );
+    }
+
     /**
      * Get the parent section of the current delegated section.
      *
diff --git a/lang/en/backup.php b/lang/en/backup.php
index 9fa54d69ea646..6f819156d76cc 100644
--- a/lang/en/backup.php
+++ b/lang/en/backup.php
@@ -198,6 +198,7 @@
 $string['enterasearch'] = 'Enter a search';
 $string['error_block_for_module_not_found'] = 'Orphan block instance (id: {$a->bid}) for course module (id: {$a->mid}) found. This block will not be backed up';
 $string['error_course_module_not_found'] = 'Orphan course module (id: {$a}) found. This module will not be backed up.';
+$string['error_delegate_section_not_found'] = 'Missing delegate section form course module (id: {$a}. The section will not be backed up.';
 $string['errorcopyingbackupfile'] = "Failed to copy the backup file to the temporary folder before restoring.";
 $string['errorfilenamerequired'] = 'You must enter a valid filename for this backup';
 $string['errorfilenametoolong'] = 'The filename must be less than 255 characters in length.';

From f736db977727c368bd9d5119fc89815b92c9cda0 Mon Sep 17 00:00:00 2001
From: Stephan Robotta <stephan.robotta@bfh.ch>
Date: Wed, 15 May 2024 14:55:22 +0200
Subject: [PATCH 082/119] MDL-79758 qbank: add filter in pagination links

Contains some minor tweaks by Tim Hunt <T.J.Hunt@open.ac.uk>.
---
 .../editing_add_from_question_bank.feature    | 61 ++++++++++---------
 question/classes/local/bank/view.php          |  3 +
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/mod/quiz/tests/behat/editing_add_from_question_bank.feature b/mod/quiz/tests/behat/editing_add_from_question_bank.feature
index a4140863be769..096f30995f255 100644
--- a/mod/quiz/tests/behat/editing_add_from_question_bank.feature
+++ b/mod/quiz/tests/behat/editing_add_from_question_bank.feature
@@ -45,38 +45,41 @@ Feature: Adding questions to a quiz from the question bank
     And I should not see "question 02 name" in the "categoryquestions" "table"
 
   Scenario: The question modal can be paginated
-    Given the following "questions" exist:
-      | questioncategory | qtype     | name             | user     | questiontext     |
-      | Test questions   | essay     | question 03 name | teacher1 | Question 03 text |
-      | Test questions   | essay     | question 04 name | teacher1 | Question 04 text |
-      | Test questions   | essay     | question 05 name | teacher1 | Question 05 text |
-      | Test questions   | essay     | question 06 name | teacher1 | Question 06 text |
-      | Test questions   | essay     | question 07 name | teacher1 | Question 07 text |
-      | Test questions   | essay     | question 08 name | teacher1 | Question 08 text |
-      | Test questions   | essay     | question 09 name | teacher1 | Question 09 text |
-      | Test questions   | essay     | question 10 name | teacher1 | Question 10 text |
-      | Test questions   | essay     | question 11 name | teacher1 | Question 11 text |
-      | Test questions   | essay     | question 12 name | teacher1 | Question 12 text |
-      | Test questions   | essay     | question 13 name | teacher1 | Question 13 text |
-      | Test questions   | essay     | question 14 name | teacher1 | Question 14 text |
-      | Test questions   | essay     | question 15 name | teacher1 | Question 15 text |
-      | Test questions   | essay     | question 16 name | teacher1 | Question 16 text |
-      | Test questions   | essay     | question 17 name | teacher1 | Question 17 text |
-      | Test questions   | essay     | question 18 name | teacher1 | Question 18 text |
-      | Test questions   | essay     | question 19 name | teacher1 | Question 19 text |
-      | Test questions   | essay     | question 20 name | teacher1 | Question 20 text |
-      | Test questions   | essay     | question 21 name | teacher1 | Question 21 text |
-      | Test questions   | essay     | question 22 name | teacher1 | Question 22 text |
-    And I log in as "teacher1"
-    And I am on the "Quiz 1" "mod_quiz > Edit" page
+    Given the following "question categories" exist:
+      | contextlevel | reference | name           |
+      | Course       | C1        | My collection  |
+    And 45 "questions" exist with the following data:
+      | questioncategory | My collection             |
+      | qtype            | essay                     |
+      | name             | Feature question [count]  |
+      | questiontext     | Write about topic [count] |
+      | user             | teacher1                  |
+    # Sadly, the above step generates questions which sort like FQ1, FQ11, FQ12, ..., FQ19, FQ2, FQ20, ...
+    # so the expected paging behaviour is not immediately intuitive with 20 questions per page.
+    When I am on the "Quiz 1" "mod_quiz > Edit" page logged in as teacher1
     And I open the "last" add to quiz menu
     And I follow "from question bank"
-    And I click on "2" "link" in the ".pagination" "css_element"
-    Then I should see "question 21 name" in the "categoryquestions" "table"
-    And I should see "question 22 name" in the "categoryquestions" "table"
-    And I should not see "question 01 name" in the "categoryquestions" "table"
-    And I click on "1" "link" in the ".pagination" "css_element"
     And I should see "question 01 name" in the "categoryquestions" "table"
+    And I should see "question 02 name" in the "categoryquestions" "table"
+    And I should not see "Feature question" in the "categoryquestions" "table"
+    And I set the field "Category" to "My collection"
+    And I press "Apply filters"
+    And I wait until the page is ready
+    Then I should not see "question 01 name" in the "categoryquestions" "table"
+    And I should see "Feature question 1" in the "categoryquestions" "table"
+    And I should see "Feature question 27" in the "categoryquestions" "table"
+    And I should not see "Feature question 28" in the "categoryquestions" "table"
+    And I click on "2" "link" in the ".pagination" "css_element"
+    And I wait until the page is ready
+    And I should not see "Feature question 27" in the "categoryquestions" "table"
+    And I should see "Feature question 28" in the "categoryquestions" "table"
+    And I should see "Feature question 45" in the "categoryquestions" "table"
+    And I should not see "Feature question 5"
+    And I click on "3" "link" in the ".pagination" "css_element"
+    And I wait until the page is ready
+    And I should not see "Feature question 45" in the "categoryquestions" "table"
+    And I should see "Feature question 5"
+    And I should see "Feature question 9"
 
   Scenario: Questions are added in the right place with multiple sections
     Given the following "questions" exist:
diff --git a/question/classes/local/bank/view.php b/question/classes/local/bank/view.php
index 878ad96756acb..30d4f5354fcde 100644
--- a/question/classes/local/bank/view.php
+++ b/question/classes/local/bank/view.php
@@ -1366,6 +1366,9 @@ public function display_questions($questions, $page = 0, $perpage = DEFAULT_QUES
         }
         // Pagination.
         $pageingurl = new \moodle_url($this->base_url());
+        // TODO MDL-82312: it really should not be necessary to set filter here, and not like this.
+        // This should be handled in baseurl, but it isn't so we do this so Moodle basically works for now.
+        $pageingurl->param('filter', json_encode($this->pagevars['filter']));
         $pagingbar = new \paging_bar($this->totalcount, $page, $perpage, $pageingurl);
         $pagingbar->pagevar = 'qpage';
         echo $OUTPUT->render($pagingbar);

From 24c4541d474f768e1295380b7b3920fa924e9f90 Mon Sep 17 00:00:00 2001
From: Sara Arjona <sara@moodle.com>
Date: Thu, 27 Jun 2024 16:36:42 +0200
Subject: [PATCH 083/119] NOBUG: Add upgrade notes

---
 UPGRADING.md                         | 97 ++++++++++++++++++++++++++++
 grade/report/grader/UPGRADING.md     |  1 -
 grade/report/singleview/UPGRADING.md |  1 -
 grade/report/user/UPGRADING.md       |  1 -
 lib/UPGRADING.md                     | 83 ++++++++++++++++++++++++
 theme/UPGRADING.md                   |  6 ++
 theme/boost/UPGRADING.md             | 10 +++
 7 files changed, 196 insertions(+), 3 deletions(-)
 create mode 100644 theme/boost/UPGRADING.md

diff --git a/UPGRADING.md b/UPGRADING.md
index 98fdb8cb01639..4620fe601b1f2 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -62,6 +62,89 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
     - `\webservice_parameter_exception`
 
   For more information see [MDL-81919](https://tracker.moodle.org/browse/MDL-81919)
+- The following classes have been moved into the `\core` namespace and now support autoloading:
+  - `emoticon_manager`
+  - `lang_string`
+
+  For more information see [MDL-81920](https://tracker.moodle.org/browse/MDL-81920)
+- The following classes have been renamed and now support autoloading. Existing classes are currently unaffected.
+  | Old class name | New class name |
+  | --- | --- |
+  | `\moodle_url` | `\core\url` |
+  | `\progress_trace` | `\core\output\progress_trace` |
+  | `\combined_progress_trace` | `\core\output\progress_trace\combined_progress_trace` |
+  | `\error_log_progress_trace` | `\core\output\progress_trace\error_log_progress_trace` |
+  | `\html_list_progress_trace` | `\core\output\progress_trace\html_list_progress_trace` |
+  | `\html_progress_trace` | `\core\output\progress_trace\html_progress_trace` |
+  | `\null_progress_trace` | `\core\output\progress_trace\null_progress_trace` |
+  | `\progress_trace_buffer` | `\core\output\progress_trace\progress_trace_buffer` |
+  | `\text_progress_trace` | `\core\output\progress_trace\text_progress_trace` |
+
+  For more information see [MDL-81960](https://tracker.moodle.org/browse/MDL-81960)
+- The following classes are now also available in the following new locations. They will continue to work in their old locations:
+  | Old classname | New classname |
+  | --- | --- |
+  | `\action_link` | `\core\output\action_link` |
+  | `\action_menu_filler` | `\core\output\action_menu\filler` |
+  | `\action_menu_link_primary` | `\core\output\action_menu\link_primary` |
+  | `\action_menu_link_secondary` | `\core\output\action_menu\link_secondary` |
+  | `\action_menu_link` | `\core\output\action_menu\link` |
+  | `\action_menu` | `\core\output\action_menu` |
+  | `\block_contents` | `\core_block\output\block_contents` |
+  | `\block_move_target` | `\core_block\output\block_move_target` |
+  | `\component_action` | `\core\output\actions\component_action` |
+  | `\confirm_action` | `\core\output\actions\confirm_action` |
+  | `\context_header` | `\core\output\context_header` |
+  | `\core\output\local\action_menu\subpanel` | `\core\output\action_menu\subpanel` |
+  | `\core_renderer_ajax` | `\core\output\core_renderer_ajax` |
+  | `\core_renderer_cli` | `\core\output\core_renderer_cli` |
+  | `\core_renderer_maintenance` | `\core\output\core_renderer_maintenance` |
+  | `\core_renderer` | `\core\output\core_renderer` |
+  | `\custom_menu_item` | `\core\output\custom_menu_item` |
+  | `\custom_menu` | `\core\output\custom_menu` |
+  | `\file_picker` | `\core\output\file_picker` |
+  | `\flexible_table` | `\core_table\flexible_table` |
+  | `\fragment_requirements_manager` | `\core\output\requirements\fragment_requirements_manager` |
+  | `\help_icon` | `\core\output\help_icon` |
+  | `\html_table_cell` | `\core_table\output\html_table_cell` |
+  | `\html_table_row` | `\core_table\output\html_table_row` |
+  | `\html_table` | `\core_table\output\html_table` |
+  | `\html_writer` | `\core\output\html_writer` |
+  | `\image_icon` | `\core\output\image_icon` |
+  | `\initials_bar` | `\core\output\initials_bar` |
+  | `\js_writer` | `\core\output\js_writer` |
+  | `\page_requirements_manager` | `\core\output\requirements\page_requirements_manager` |
+  | `\paging_bar` | `\core\output\paging_bar` |
+  | `\pix_emoticon` | `\core\output\pix_emoticon` |
+  | `\pix_icon_font` | `\core\output\pix_icon_font` |
+  | `\pix_icon_fontawesome` | `\core\output\pix_icon_fontawesome` |
+  | `\pix_icon` | `\core\output\pix_icon` |
+  | `\plugin_renderer_base` | `\core\output\plugin_renderer_base` |
+  | `\popup_action` | `\core\output\actions\popup_action` |
+  | `\preferences_group` | `\core\output\preferences_group` |
+  | `\preferences_groups` | `\core\output\preferences_groups` |
+  | `\progress_bar` | `\core\output\progress_bar` |
+  | `\renderable` | `\core\output\renderable` |
+  | `\renderer_base` | `\core\output\renderer_base` |
+  | `\renderer_factory_base` | `\core\output\renderer_factory\renderer_factory_base` |
+  | `\renderer_factory` | `\core\output\renderer_factory\renderer_factory_interface` |
+  | `\single_button` | `\core\output\single_button` |
+  | `\single_select` | `\core\output\single_select` |
+  | `\standard_renderer_factory` | `\core\output\renderer_factory\standard_renderer_factory` |
+  | `\table_dataformat_export_format` | `\core_table\dataformat_export_format` |
+  | `\table_default_export_format_parent` | `\core_table\base_export_format` |
+  | `\table_sql` | `\core_table\sql_table` |
+  | `\tabobject` | `\core\output\tabobject` |
+  | `\tabtree` | `\core\output\tabtree` |
+  | `\templatable` | `\core\output\templatable` |
+  | `\theme_config` | `\core\output\theme_config` |
+  | `\theme_overridden_renderer_factory` | `\core\output\renderer_factory\theme_overridden_renderer_factory` |
+  | `\url_select` | `\core\output\url_select` |
+  | `\user_picture` | `\core\output\user_picture` |
+  | `\xhtml_container_stack` | `\core\output\xhtml_container_stack` |
+  | `\YUI_config` | `\core\output\requirements\yui` |
+
+  For more information see [MDL-82183](https://tracker.moodle.org/browse/MDL-82183)
 
 #### Fixed
 
@@ -307,6 +390,12 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
 
   For more information see [MDL-81597](https://tracker.moodle.org/browse/MDL-81597)
 
+#### Deprecated
+
+- The method `\core\output\core_renderer::render_context_header` has been deprecated please use `\core\output\core_renderer::render($contextheader)` instead
+
+  For more information see [MDL-82160](https://tracker.moodle.org/browse/MDL-82160)
+
 ### core_courseformat
 
 #### Added
@@ -355,6 +444,14 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
 
   For more information see [MDL-81749](https://tracker.moodle.org/browse/MDL-81749)
 
+### theme_boost
+
+#### Changed
+
+- Bootstrap .no-gutters class is no longer used, use .g-0  instead.
+
+  For more information see [MDL-81818](https://tracker.moodle.org/browse/MDL-81818)
+
 ### availability
 
 #### Changed
diff --git a/grade/report/grader/UPGRADING.md b/grade/report/grader/UPGRADING.md
index dd347b7501d5e..e3ff2487d963d 100644
--- a/grade/report/grader/UPGRADING.md
+++ b/grade/report/grader/UPGRADING.md
@@ -7,4 +7,3 @@
 - The `gradereport_grader/group` ESM has been deprecated. Please use `core_course/actionbar/group` instead.
 
   For more information see [MDL-80745](https://tracker.moodle.org/browse/MDL-80745)
-
diff --git a/grade/report/singleview/UPGRADING.md b/grade/report/singleview/UPGRADING.md
index 6a803b14c835e..81a92440a906a 100644
--- a/grade/report/singleview/UPGRADING.md
+++ b/grade/report/singleview/UPGRADING.md
@@ -7,4 +7,3 @@
 - The `gradereport_singleview/group` ESM has been deprecated. Please use `core_course/actionbar/group` instead.
 
   For more information see [MDL-80745](https://tracker.moodle.org/browse/MDL-80745)
-
diff --git a/grade/report/user/UPGRADING.md b/grade/report/user/UPGRADING.md
index f51b1c6f5807a..8b6be52ad1456 100644
--- a/grade/report/user/UPGRADING.md
+++ b/grade/report/user/UPGRADING.md
@@ -7,4 +7,3 @@
 - The `gradereport_user/group` ESM has been deprecated. Please use `core_course/actionbar/group` instead.
 
   For more information see [MDL-80745](https://tracker.moodle.org/browse/MDL-80745)
-
diff --git a/lib/UPGRADING.md b/lib/UPGRADING.md
index 457c1804d8958..bacad5f61524b 100644
--- a/lib/UPGRADING.md
+++ b/lib/UPGRADING.md
@@ -54,6 +54,89 @@
     - `\webservice_parameter_exception`
 
   For more information see [MDL-81919](https://tracker.moodle.org/browse/MDL-81919)
+- The following classes have been moved into the `\core` namespace and now support autoloading:
+  - `emoticon_manager`
+  - `lang_string`
+
+  For more information see [MDL-81920](https://tracker.moodle.org/browse/MDL-81920)
+- The following classes have been renamed and now support autoloading. Existing classes are currently unaffected.
+  | Old class name | New class name |
+  | --- | --- |
+  | `\moodle_url` | `\core\url` |
+  | `\progress_trace` | `\core\output\progress_trace` |
+  | `\combined_progress_trace` | `\core\output\progress_trace\combined_progress_trace` |
+  | `\error_log_progress_trace` | `\core\output\progress_trace\error_log_progress_trace` |
+  | `\html_list_progress_trace` | `\core\output\progress_trace\html_list_progress_trace` |
+  | `\html_progress_trace` | `\core\output\progress_trace\html_progress_trace` |
+  | `\null_progress_trace` | `\core\output\progress_trace\null_progress_trace` |
+  | `\progress_trace_buffer` | `\core\output\progress_trace\progress_trace_buffer` |
+  | `\text_progress_trace` | `\core\output\progress_trace\text_progress_trace` |
+
+  For more information see [MDL-81960](https://tracker.moodle.org/browse/MDL-81960)
+- The following classes are now also available in the following new locations. They will continue to work in their old locations:
+  | Old classname | New classname |
+  | --- | --- |
+  | `\action_link` | `\core\output\action_link` |
+  | `\action_menu_filler` | `\core\output\action_menu\filler` |
+  | `\action_menu_link_primary` | `\core\output\action_menu\link_primary` |
+  | `\action_menu_link_secondary` | `\core\output\action_menu\link_secondary` |
+  | `\action_menu_link` | `\core\output\action_menu\link` |
+  | `\action_menu` | `\core\output\action_menu` |
+  | `\block_contents` | `\core_block\output\block_contents` |
+  | `\block_move_target` | `\core_block\output\block_move_target` |
+  | `\component_action` | `\core\output\actions\component_action` |
+  | `\confirm_action` | `\core\output\actions\confirm_action` |
+  | `\context_header` | `\core\output\context_header` |
+  | `\core\output\local\action_menu\subpanel` | `\core\output\action_menu\subpanel` |
+  | `\core_renderer_ajax` | `\core\output\core_renderer_ajax` |
+  | `\core_renderer_cli` | `\core\output\core_renderer_cli` |
+  | `\core_renderer_maintenance` | `\core\output\core_renderer_maintenance` |
+  | `\core_renderer` | `\core\output\core_renderer` |
+  | `\custom_menu_item` | `\core\output\custom_menu_item` |
+  | `\custom_menu` | `\core\output\custom_menu` |
+  | `\file_picker` | `\core\output\file_picker` |
+  | `\flexible_table` | `\core_table\flexible_table` |
+  | `\fragment_requirements_manager` | `\core\output\requirements\fragment_requirements_manager` |
+  | `\help_icon` | `\core\output\help_icon` |
+  | `\html_table_cell` | `\core_table\output\html_table_cell` |
+  | `\html_table_row` | `\core_table\output\html_table_row` |
+  | `\html_table` | `\core_table\output\html_table` |
+  | `\html_writer` | `\core\output\html_writer` |
+  | `\image_icon` | `\core\output\image_icon` |
+  | `\initials_bar` | `\core\output\initials_bar` |
+  | `\js_writer` | `\core\output\js_writer` |
+  | `\page_requirements_manager` | `\core\output\requirements\page_requirements_manager` |
+  | `\paging_bar` | `\core\output\paging_bar` |
+  | `\pix_emoticon` | `\core\output\pix_emoticon` |
+  | `\pix_icon_font` | `\core\output\pix_icon_font` |
+  | `\pix_icon_fontawesome` | `\core\output\pix_icon_fontawesome` |
+  | `\pix_icon` | `\core\output\pix_icon` |
+  | `\plugin_renderer_base` | `\core\output\plugin_renderer_base` |
+  | `\popup_action` | `\core\output\actions\popup_action` |
+  | `\preferences_group` | `\core\output\preferences_group` |
+  | `\preferences_groups` | `\core\output\preferences_groups` |
+  | `\progress_bar` | `\core\output\progress_bar` |
+  | `\renderable` | `\core\output\renderable` |
+  | `\renderer_base` | `\core\output\renderer_base` |
+  | `\renderer_factory_base` | `\core\output\renderer_factory\renderer_factory_base` |
+  | `\renderer_factory` | `\core\output\renderer_factory\renderer_factory_interface` |
+  | `\single_button` | `\core\output\single_button` |
+  | `\single_select` | `\core\output\single_select` |
+  | `\standard_renderer_factory` | `\core\output\renderer_factory\standard_renderer_factory` |
+  | `\table_dataformat_export_format` | `\core_table\dataformat_export_format` |
+  | `\table_default_export_format_parent` | `\core_table\base_export_format` |
+  | `\table_sql` | `\core_table\sql_table` |
+  | `\tabobject` | `\core\output\tabobject` |
+  | `\tabtree` | `\core\output\tabtree` |
+  | `\templatable` | `\core\output\templatable` |
+  | `\theme_config` | `\core\output\theme_config` |
+  | `\theme_overridden_renderer_factory` | `\core\output\renderer_factory\theme_overridden_renderer_factory` |
+  | `\url_select` | `\core\output\url_select` |
+  | `\user_picture` | `\core\output\user_picture` |
+  | `\xhtml_container_stack` | `\core\output\xhtml_container_stack` |
+  | `\YUI_config` | `\core\output\requirements\yui` |
+
+  For more information see [MDL-82183](https://tracker.moodle.org/browse/MDL-82183)
 
 ### Fixed
 
diff --git a/theme/UPGRADING.md b/theme/UPGRADING.md
index c48b4ed5be048..3c29581340b87 100644
--- a/theme/UPGRADING.md
+++ b/theme/UPGRADING.md
@@ -7,3 +7,9 @@
 - New `core/context_header` mustache template has been added. This template can be overridden by themes to modify the context header
 
   For more information see [MDL-81597](https://tracker.moodle.org/browse/MDL-81597)
+
+### Deprecated
+
+- The method `\core\output\core_renderer::render_context_header` has been deprecated please use `\core\output\core_renderer::render($contextheader)` instead
+
+  For more information see [MDL-82160](https://tracker.moodle.org/browse/MDL-82160)
diff --git a/theme/boost/UPGRADING.md b/theme/boost/UPGRADING.md
new file mode 100644
index 0000000000000..4935869857574
--- /dev/null
+++ b/theme/boost/UPGRADING.md
@@ -0,0 +1,10 @@
+# theme_boost Upgrade notes
+
+## 4.5dev
+
+### Changed
+
+- Bootstrap .no-gutters class is no longer used, use .g-0  instead.
+
+  For more information see [MDL-81818](https://tracker.moodle.org/browse/MDL-81818)
+

From 5aef789ac61369ad6641ddd8710477a771176da2 Mon Sep 17 00:00:00 2001
From: Sara Arjona <sara@moodle.com>
Date: Thu, 27 Jun 2024 16:36:42 +0200
Subject: [PATCH 084/119] weekly release 4.5dev

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index 15e3fed13eedf..b9719c5349254 100644
--- a/version.php
+++ b/version.php
@@ -29,9 +29,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2024062500.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2024062700.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
-$release  = '4.5dev (Build: 20240620)'; // Human-friendly version name
+$release  = '4.5dev (Build: 20240627)'; // Human-friendly version name
 $branch   = '405';                     // This version's branch.
 $maturity = MATURITY_ALPHA;             // This version's maturity level.

From e1353c7649c3e18cf3836c5bf9738aa957b313b7 Mon Sep 17 00:00:00 2001
From: Adrian Perez <me@adrianperez.me>
Date: Wed, 22 May 2024 16:41:17 +0200
Subject: [PATCH 085/119] MDL-74251 core: Remove old icon helper classes

---
 .upgradenotes/MDL-74251-2024062716222581.yml             | 7 +++++++
 admin/renderer.php                                       | 2 +-
 admin/tool/analytics/templates/models_list.mustache      | 8 ++++----
 backup/moodle2/backup_activity_task.class.php            | 2 +-
 backup/moodle2/restore_activity_task.class.php           | 2 +-
 backup/util/ui/renderer.php                              | 2 +-
 badges/renderer.php                                      | 4 ++--
 badges/templates/award_badge.mustache                    | 2 +-
 badges/templates/manage_badge.mustache                   | 2 +-
 course/dndupload.js                                      | 2 +-
 course/renderer.php                                      | 4 ++--
 course/templates/activityinstance.mustache               | 2 +-
 course/templates/defaultactivitycompletion.mustache      | 2 +-
 course/tests/behat/activity_chooser.feature              | 4 ++--
 lib/classes/output/core_renderer.php                     | 8 ++++----
 lib/classes/output/help_icon.php                         | 2 +-
 lib/installlib.php                                       | 2 +-
 lib/templates/activity_header.mustache                   | 2 +-
 lib/templates/help_icon.mustache                         | 2 +-
 lib/templates/local/choicelist.mustache                  | 4 ++--
 lib/templates/local/choicelist/option.mustache           | 2 +-
 lib/templates/local/dropdown/status.mustache             | 4 ++--
 lib/templates/loginform.mustache                         | 2 +-
 lib/templates/url_select.mustache                        | 2 +-
 mod/assign/templates/override_actionmenu.mustache        | 2 +-
 mod/assign/templates/user_submission_actionmenu.mustache | 8 ++++----
 mod/feedback/templates/main_action_menu.mustache         | 2 +-
 mod/glossary/templates/standard_action_menu.mustache     | 2 +-
 mod/lesson/templates/edit_action_area.mustache           | 2 +-
 mod/lesson/templates/override_action_menu.mustache       | 2 +-
 mod/lesson/templates/report_action_menu.mustache         | 2 +-
 mod/quiz/classes/output/renderer.php                     | 2 +-
 mod/quiz/templates/add_random_question_form.mustache     | 2 +-
 mod/workshop/renderer.php                                | 4 ++--
 question/classes/local/bank/column_base.php              | 7 ++++---
 question/templates/column_header.mustache                | 2 +-
 repository/filepicker.php                                | 2 +-
 37 files changed, 61 insertions(+), 53 deletions(-)
 create mode 100644 .upgradenotes/MDL-74251-2024062716222581.yml

diff --git a/.upgradenotes/MDL-74251-2024062716222581.yml b/.upgradenotes/MDL-74251-2024062716222581.yml
new file mode 100644
index 0000000000000..0dbfbc8599cda
--- /dev/null
+++ b/.upgradenotes/MDL-74251-2024062716222581.yml
@@ -0,0 +1,7 @@
+issueNumber: MDL-74251
+notes:
+  theme:
+    - message: >-
+        Removed all references to iconhelp, icon-pre, icon-post, iconlarge, and
+        iconsort classes
+      type: removed
diff --git a/admin/renderer.php b/admin/renderer.php
index 0f9333f78e589..6e53a42ad2ed2 100644
--- a/admin/renderer.php
+++ b/admin/renderer.php
@@ -1004,7 +1004,7 @@ protected function release_notes_link() {
     function upgrade_reload($url) {
         return html_writer::empty_tag('br') .
                 html_writer::tag('div',
-                    html_writer::link($url, $this->pix_icon('i/reload', '', '', array('class' => 'icon icon-pre')) .
+                    html_writer::link($url, $this->pix_icon('i/reload', '', '', ['class' => 'icon']) .
                             get_string('reload'), array('title' => get_string('reload'))),
                 array('class' => 'continuebutton')) . html_writer::empty_tag('br');
     }
diff --git a/admin/tool/analytics/templates/models_list.mustache b/admin/tool/analytics/templates/models_list.mustache
index 640a6f1bb1a6e..19e150ff3fccd 100644
--- a/admin/tool/analytics/templates/models_list.mustache
+++ b/admin/tool/analytics/templates/models_list.mustache
@@ -69,7 +69,7 @@
                     "url": "http://example.org/help",
                     "linktext": "",
                     "icon": {
-                        "extraclasses": "iconhelp",
+                        "extraclasses": "",
                         "attributes": [
                             {"name": "src", "value": "../../../pix/help.svg"},
                             {"name": "alt", "value": "Help icon"}
@@ -87,7 +87,7 @@
                             "url": "http://example.org/help",
                             "linktext": "",
                             "icon": {
-                                "extraclasses": "iconhelp",
+                                "extraclasses": "",
                                 "attributes": [
                                     {"name": "src", "value": "../../../pix/help.svg"},
                                     {"name": "alt", "value": "Help icon"}
@@ -103,7 +103,7 @@
                             "url": "http://example.org/help",
                             "linktext": "",
                             "icon": {
-                                "extraclasses": "iconhelp",
+                                "extraclasses": "",
                                 "attributes": [
                                     {"name": "src", "value": "../../../pix/help.svg"},
                                     {"name": "alt", "value": "Help icon"}
@@ -119,7 +119,7 @@
                     "url": "http://example.org/help",
                     "linktext": "",
                     "icon": {
-                        "extraclasses": "iconhelp",
+                        "extraclasses": "",
                         "attributes": [
                             {"name": "src", "value": "../../../pix/help.svg"},
                             {"name": "alt", "value": "Help icon"}
diff --git a/backup/moodle2/backup_activity_task.class.php b/backup/moodle2/backup_activity_task.class.php
index f0df9d0ab2e6f..c98dd4d59835c 100644
--- a/backup/moodle2/backup_activity_task.class.php
+++ b/backup/moodle2/backup_activity_task.class.php
@@ -277,7 +277,7 @@ protected function define_settings() {
         $settingname = $settingprefix . 'included';
         $activityincluded = new backup_activity_generic_setting($settingname, base_setting::IS_BOOLEAN, true);
         $activityincluded->get_ui()->set_icon(new image_icon('monologo', get_string('pluginname', $this->modulename),
-            $this->modulename, array('class' => 'iconlarge icon-post ml-1')));
+            $this->modulename, array('class' => 'ml-1')));
         $this->add_setting($activityincluded);
         // Look for "activities" root setting.
         $activities = $this->plan->get_setting('activities');
diff --git a/backup/moodle2/restore_activity_task.class.php b/backup/moodle2/restore_activity_task.class.php
index 12f6006f1147f..181cfa38583ab 100644
--- a/backup/moodle2/restore_activity_task.class.php
+++ b/backup/moodle2/restore_activity_task.class.php
@@ -301,7 +301,7 @@ protected function define_settings() {
         $settingname = $settingprefix . 'included';
         $activity_included = new restore_activity_generic_setting($settingname, base_setting::IS_BOOLEAN, true);
         $activity_included->get_ui()->set_icon(new image_icon('monologo', get_string('pluginname', $this->modulename),
-            $this->modulename, array('class' => 'iconlarge icon-post ml-1')));
+            $this->modulename, ['class' => 'ml-1']));
         $this->add_setting($activity_included);
         // Look for "activities" root setting
         $activities = $this->plan->get_setting('activities');
diff --git a/backup/util/ui/renderer.php b/backup/util/ui/renderer.php
index 938fd5469efbf..87c137a757a10 100644
--- a/backup/util/ui/renderer.php
+++ b/backup/util/ui/renderer.php
@@ -203,7 +203,7 @@ public function backup_details($details, $nextstageurl) {
                         $table->data = array();
                     }
                     $name = get_string('pluginname', $activity->modulename);
-                    $icon = new image_icon('monologo', '', $activity->modulename, ['class' => 'iconlarge icon-pre']);
+                    $icon = new image_icon('monologo', '', $activity->modulename);
                     $table->data[] = array(
                         $this->output->render($icon).$name,
                         $activity->title,
diff --git a/badges/renderer.php b/badges/renderer.php
index 2651c02cf8208..8740f66f0f350 100644
--- a/badges/renderer.php
+++ b/badges/renderer.php
@@ -783,13 +783,13 @@ protected function helper_sortable_heading($text, $sortid = null, $sortby = null
                 $url = new moodle_url($this->page->url);
                 $url->params(array('sort' => $sortid, 'dir' => 'ASC'));
                 $out .= $this->output->action_icon($url,
-                        new pix_icon('t/sort_asc', get_string('sortbyx', 'core', s($text)), null, array('class' => 'iconsort')));
+                        new pix_icon('t/sort_asc', get_string('sortbyx', 'core', s($text)), null));
             }
             if ($sortby !== $sortid || $sorthow !== 'DESC') {
                 $url = new moodle_url($this->page->url);
                 $url->params(array('sort' => $sortid, 'dir' => 'DESC'));
                 $out .= $this->output->action_icon($url,
-                        new pix_icon('t/sort_desc', get_string('sortbyxreverse', 'core', s($text)), null, array('class' => 'iconsort')));
+                        new pix_icon('t/sort_desc', get_string('sortbyxreverse', 'core', s($text)), null));
             }
         }
         return $out;
diff --git a/badges/templates/award_badge.mustache b/badges/templates/award_badge.mustache
index 0aadf5b802120..ea88840962209 100644
--- a/badges/templates/award_badge.mustache
+++ b/badges/templates/award_badge.mustache
@@ -48,7 +48,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/badges/templates/manage_badge.mustache b/badges/templates/manage_badge.mustache
index 1974521f7cf66..9a5fd160c2862 100644
--- a/badges/templates/manage_badge.mustache
+++ b/badges/templates/manage_badge.mustache
@@ -47,7 +47,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/course/dndupload.js b/course/dndupload.js
index 783a37bcfc956..487f6d700b99d 100644
--- a/course/dndupload.js
+++ b/course/dndupload.js
@@ -549,7 +549,7 @@ M.course_dndupload = {
         resel.div.appendChild(resel.a);
 
         resel.icon.src = M.util.image_url('i/ajaxloader');
-        resel.icon.className = 'activityicon iconlarge';
+        resel.icon.className = 'activityicon';
         resel.a.appendChild(resel.icon);
 
         resel.namespan.className = 'instancename';
diff --git a/course/renderer.php b/course/renderer.php
index 4bfd1a5b1c607..f667bfd11bfd2 100644
--- a/course/renderer.php
+++ b/course/renderer.php
@@ -378,8 +378,8 @@ public function course_section_cm_unavailable_error_message(cm_info $cm) {
         }
 
         $altname = get_accesshide(' ' . $cm->modfullname);
-        $name = html_writer::empty_tag('img', array('src' => $cm->get_icon_url(),
-                'class' => 'iconlarge activityicon', 'alt' => '')) .
+        $name = html_writer::empty_tag('img', ['src' => $cm->get_icon_url(),
+                'class' => 'activityicon', 'alt' => '']) .
             html_writer::tag('span', ' '.$cm->get_formatted_name() . $altname, array('class' => 'instancename'));
         $formattedinfo = \core_availability\info::format_info($cm->availableinfo, $cm->get_course());
         return html_writer::div($name, 'activityinstance-error') .
diff --git a/course/templates/activityinstance.mustache b/course/templates/activityinstance.mustache
index d1af70a3a4d33..1a2b197f9992b 100644
--- a/course/templates/activityinstance.mustache
+++ b/course/templates/activityinstance.mustache
@@ -42,7 +42,7 @@
             <input type="checkbox" id="selectactivity_{{cmid}}" class="mr-1" name="cmid[]" data-section="{{sectionnumber}}" value="{{cmid}}" aria-label="{{#str}}checkactivity, completion, {{{modname}}}{{/str}}">
             {{/canmanage}}
             <a href="{{url}}">
-            <img src="{{icon}}" class="iconlarge activityicon" alt="">
+            <img src="{{icon}}" class="activityicon" alt="">
             <span class="instancename">{{{modname}}}</span>
             </a>
         </div>
diff --git a/course/templates/defaultactivitycompletion.mustache b/course/templates/defaultactivitycompletion.mustache
index d2a64d21855d0..5d1e05dc7c5d6 100644
--- a/course/templates/defaultactivitycompletion.mustache
+++ b/course/templates/defaultactivitycompletion.mustache
@@ -68,7 +68,7 @@
                             {{#pix}} t/expandedchevron, core {{/pix}}
                             <span class="sr-only">{{#str}} collapsecategory, core, {{formatedname}} {{/str}}</span>
                         </span>
-                        <img class="iconlarge activityicon ml-4" src="{{icon}}" alt="" aria-hidden="true">
+                        <img class="activityicon ml-4" src="{{icon}}" alt="" aria-hidden="true">
                         <h2 class="activityname ml-3 mb-0">{{{formattedname}}}</h2>
                     </a>
                 </div>
diff --git a/course/tests/behat/activity_chooser.feature b/course/tests/behat/activity_chooser.feature
index 1d099e6fde8ac..ad6b9115fb13c 100644
--- a/course/tests/behat/activity_chooser.feature
+++ b/course/tests/behat/activity_chooser.feature
@@ -302,7 +302,7 @@ Feature: Display and choose from the available activities in course
     # Confirm more help link exists
     Then "More help" "link" should exist
     # Confirm that corresponding help icon exist
-    And ".iconhelp" "css_element" should exist
+    And ".fa-info-circle" "css_element" should exist
     # Confirm that link opens in new window
     And "Opens in new window" "link" should be visible
     # Confirm the same behaviour for weekly format course
@@ -313,6 +313,6 @@ Feature: Display and choose from the available activities in course
     # Confirm more help link exists
     And "More help" "link" should exist
     # Confirm that corresponding help icon exist
-    And ".iconhelp" "css_element" should exist
+    And ".fa-info-circle" "css_element" should exist
     # Confirm that link opens in new window
     And "Opens in new window" "link" should be visible
diff --git a/lib/classes/output/core_renderer.php b/lib/classes/output/core_renderer.php
index 8b07c2e4e442a..27d63344b7bb7 100644
--- a/lib/classes/output/core_renderer.php
+++ b/lib/classes/output/core_renderer.php
@@ -1878,7 +1878,7 @@ protected function render_url_select(url_select $select) {
     public function doc_link($path, $text = '', $forcepopup = false, array $attributes = []) {
         global $CFG;
 
-        $icon = $this->pix_icon('book', '', 'moodle', ['class' => 'iconhelp icon-pre']);
+        $icon = $this->pix_icon('book', '', 'moodle');
 
         $attributes['href'] = new moodle_url(get_docs_url($path));
         $newwindowicon = '';
@@ -2079,7 +2079,7 @@ function render_rating(rating $rating) {
     public function heading_with_help($text, $helpidentifier, $component = 'moodle', $icon = '', $iconalt = '', $level = 2, $classnames = null) {
         $image = '';
         if ($icon) {
-            $image = $this->pix_icon($icon, $iconalt, $component, ['class' => 'icon iconlarge']);
+            $image = $this->pix_icon($icon, $iconalt, $component);
         }
 
         $help = '';
@@ -2146,7 +2146,7 @@ public function help_icon_scale($courseid, stdClass $scale) {
 
         $title = get_string('helpprefix2', '', $scale->name) . ' (' . get_string('newwindow') . ')';
 
-        $icon = $this->pix_icon('help', get_string('scales'), 'moodle', ['class' => 'iconhelp']);
+        $icon = $this->pix_icon('help', get_string('scales'), 'moodle');
 
         $scaleid = abs($scale->id);
 
@@ -2521,7 +2521,7 @@ public function error_text($message) {
         if (empty($message)) {
             return '';
         }
-        $message = $this->pix_icon('i/warning', get_string('error'), '', ['class' => 'icon icon-pre', 'title' => '']) . $message;
+        $message = $this->pix_icon('i/warning', get_string('error'), '', ['class' => 'icon', 'title' => '']) . $message;
         return html_writer::tag('span', $message, ['class' => 'error']);
     }
 
diff --git a/lib/classes/output/help_icon.php b/lib/classes/output/help_icon.php
index 4fd2beec17f20..91edfc91c83d6 100644
--- a/lib/classes/output/help_icon.php
+++ b/lib/classes/output/help_icon.php
@@ -100,7 +100,7 @@ public function export_for_template(renderer_base $output) {
         $data = get_formatted_help_string($this->identifier, $this->component, false, $this->a);
 
         $data->alt = $alt;
-        $data->icon = (new pix_icon('help', $alt, 'core', ['class' => 'iconhelp']))->export_for_template($output);
+        $data->icon = (new pix_icon('help', $alt, 'core'))->export_for_template($output);
         $data->linktext = $this->linktext;
         $data->title = get_string('helpprefix2', '', trim($title, ". \t"));
 
diff --git a/lib/installlib.php b/lib/installlib.php
index 8e9c5af1ec8c9..416c7e8b8ea49 100644
--- a/lib/installlib.php
+++ b/lib/installlib.php
@@ -162,7 +162,7 @@ function install_helpbutton($url, $title='') {
     echo "<a href=\"javascript:void(0)\" ";
     echo "onclick=\"return window.open('$url','Help','menubar=0,location=0,scrollbars,resizable,width=500,height=400')\"";
     echo ">";
-    echo "<img src=\"pix/help.gif\" class=\"iconhelp\" alt=\"$title\" title=\"$title\"/>";
+    echo "<img src=\"pix/help.gif\" alt=\"$title\" title=\"$title\"/>";
     echo "</a>\n";
 }
 
diff --git a/lib/templates/activity_header.mustache b/lib/templates/activity_header.mustache
index 1e4515cff35ca..484643a18ce62 100644
--- a/lib/templates/activity_header.mustache
+++ b/lib/templates/activity_header.mustache
@@ -42,7 +42,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/lib/templates/help_icon.mustache b/lib/templates/help_icon.mustache
index 5d2f7d08b36cf..e62c95880e27b 100644
--- a/lib/templates/help_icon.mustache
+++ b/lib/templates/help_icon.mustache
@@ -10,7 +10,7 @@
         "linktext": "",
         "icon":{
             "attributes": [
-                {"name": "class", "value": "iconhelp"},
+                {"name": "class", "value": ""},
                 {"name": "src", "value": "../../../pix/help.svg"},
                 {"name": "alt", "value": "Help icon"}
             ]
diff --git a/lib/templates/local/choicelist.mustache b/lib/templates/local/choicelist.mustache
index 73bd2c4a8465f..2eaba17ea158b 100644
--- a/lib/templates/local/choicelist.mustache
+++ b/lib/templates/local/choicelist.mustache
@@ -48,7 +48,7 @@
                 "name": "Second option",
                 "description": "Second option description",
                 "icon": {
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
@@ -64,7 +64,7 @@
                 "name": "Third option",
                 "description": "Third option description",
                 "icon": {
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/lib/templates/local/choicelist/option.mustache b/lib/templates/local/choicelist/option.mustache
index 056cd6338ac4c..74ada8d9c497b 100644
--- a/lib/templates/local/choicelist/option.mustache
+++ b/lib/templates/local/choicelist/option.mustache
@@ -36,7 +36,7 @@
         "name": "Second option",
         "description": "Second option description",
         "icon": {
-            "extraclasses": "iconhelp",
+            "extraclasses": "",
             "attributes": [
                 {"name": "src", "value": "../../../pix/help.svg"},
                 {"name": "alt", "value": "Help icon"}
diff --git a/lib/templates/local/dropdown/status.mustache b/lib/templates/local/dropdown/status.mustache
index 44e254d6e0ebf..38e82f83b7a04 100644
--- a/lib/templates/local/dropdown/status.mustache
+++ b/lib/templates/local/dropdown/status.mustache
@@ -51,7 +51,7 @@
                     "name": "Second option",
                     "description": "Second option description",
                     "icon": {
-                        "extraclasses": "iconhelp",
+                        "extraclasses": "",
                         "attributes": [
                             {"name": "src", "value": "../../../pix/help.svg"},
                             {"name": "alt", "value": "Help icon"}
@@ -67,7 +67,7 @@
                     "name": "Third option",
                     "description": "Third option description",
                     "icon": {
-                        "extraclasses": "iconhelp",
+                        "extraclasses": "",
                         "attributes": [
                             {"name": "src", "value": "../../../pix/help.svg"},
                             {"name": "alt", "value": "Help icon"}
diff --git a/lib/templates/loginform.mustache b/lib/templates/loginform.mustache
index e03d23673f993..f12948067cc22 100644
--- a/lib/templates/loginform.mustache
+++ b/lib/templates/loginform.mustache
@@ -56,7 +56,7 @@
                 "attributes": [
                     {
                         "name": "class",
-                        "value": "iconhelp"
+                        "value": ""
                     },
                     {
                         "name": "alt",
diff --git a/lib/templates/url_select.mustache b/lib/templates/url_select.mustache
index f735afb6fd7aa..7d9b06e80a0f0 100644
--- a/lib/templates/url_select.mustache
+++ b/lib/templates/url_select.mustache
@@ -14,7 +14,7 @@
             "url": "http://example.org/help",
             "linktext": "",
             "icon":{
-                "extraclasses": "iconhelp",
+                "extraclasses": "",
                 "attributes": [
                     {"name": "src", "value": "../../../pix/help.svg"},
                     {"name": "alt", "value": "Help icon"}
diff --git a/mod/assign/templates/override_actionmenu.mustache b/mod/assign/templates/override_actionmenu.mustache
index 0af1734686e1e..07c5b42ddf643 100644
--- a/mod/assign/templates/override_actionmenu.mustache
+++ b/mod/assign/templates/override_actionmenu.mustache
@@ -39,7 +39,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon": {
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/mod/assign/templates/user_submission_actionmenu.mustache b/mod/assign/templates/user_submission_actionmenu.mustache
index 084ae04ed9699..a685379b9635f 100644
--- a/mod/assign/templates/user_submission_actionmenu.mustache
+++ b/mod/assign/templates/user_submission_actionmenu.mustache
@@ -48,7 +48,7 @@
                 "linktext": "",
                 "icon":{
                     "attributes": [
-                        {"name": "class", "value": "iconhelp"},
+                        {"name": "class", "value": ""},
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
                     ]
@@ -76,7 +76,7 @@
                 "linktext": "",
                 "icon":{
                     "attributes": [
-                        {"name": "class", "value": "iconhelp"},
+                        {"name": "class", "value": ""},
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
                     ]
@@ -104,7 +104,7 @@
                 "linktext": "",
                 "icon":{
                     "attributes": [
-                        {"name": "class", "value": "iconhelp"},
+                        {"name": "class", "value": ""},
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
                     ]
@@ -132,7 +132,7 @@
                 "linktext": "",
                 "icon":{
                     "attributes": [
-                        {"name": "class", "value": "iconhelp"},
+                        {"name": "class", "value": ""},
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
                     ]
diff --git a/mod/feedback/templates/main_action_menu.mustache b/mod/feedback/templates/main_action_menu.mustache
index 2a1032560c979..3407a79feccf1 100644
--- a/mod/feedback/templates/main_action_menu.mustache
+++ b/mod/feedback/templates/main_action_menu.mustache
@@ -57,7 +57,7 @@
                     "url": "http://example.org/help",
                     "linktext": "",
                     "icon":{
-                        "extraclasses": "iconhelp",
+                        "extraclasses": "",
                         "attributes": [
                             {"name": "src", "value": "../../../pix/help.svg"},
                             {"name": "alt", "value": "Help icon"}
diff --git a/mod/glossary/templates/standard_action_menu.mustache b/mod/glossary/templates/standard_action_menu.mustache
index f961cce087d85..c46bb7cba9ac5 100644
--- a/mod/glossary/templates/standard_action_menu.mustache
+++ b/mod/glossary/templates/standard_action_menu.mustache
@@ -75,7 +75,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/mod/lesson/templates/edit_action_area.mustache b/mod/lesson/templates/edit_action_area.mustache
index f0278897d6c59..2f4e0a85a3529 100644
--- a/mod/lesson/templates/edit_action_area.mustache
+++ b/mod/lesson/templates/edit_action_area.mustache
@@ -43,7 +43,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/mod/lesson/templates/override_action_menu.mustache b/mod/lesson/templates/override_action_menu.mustache
index 6fd20bb9361b2..177ecf3be9ace 100644
--- a/mod/lesson/templates/override_action_menu.mustache
+++ b/mod/lesson/templates/override_action_menu.mustache
@@ -39,7 +39,7 @@
                 "url": "http://example.org/help",
                 "linktext": "",
                 "icon":{
-                    "extraclasses": "iconhelp",
+                    "extraclasses": "",
                     "attributes": [
                         {"name": "src", "value": "../../../pix/help.svg"},
                         {"name": "alt", "value": "Help icon"}
diff --git a/mod/lesson/templates/report_action_menu.mustache b/mod/lesson/templates/report_action_menu.mustache
index 2ac0ec91bc009..c09d640168393 100644
--- a/mod/lesson/templates/report_action_menu.mustache
+++ b/mod/lesson/templates/report_action_menu.mustache
@@ -38,7 +38,7 @@
             "url": "http://example.org/help",
             "linktext": "",
             "icon":{
-                "extraclasses": "iconhelp",
+                "extraclasses": "",
                 "attributes": [
                     {"name": "src", "value": "../../../pix/help.svg"},
                     {"name": "alt", "value": "Help icon"}
diff --git a/mod/quiz/classes/output/renderer.php b/mod/quiz/classes/output/renderer.php
index 347a19f8530d1..4e70395f1774e 100644
--- a/mod/quiz/classes/output/renderer.php
+++ b/mod/quiz/classes/output/renderer.php
@@ -804,7 +804,7 @@ public function summary_table($attemptobj, $displayoptions) {
             if ($attemptobj->is_question_flagged($slot)) {
                 // Quiz has custom JS manipulating these image tags - so we can't use the pix_icon method here.
                 $flag = html_writer::empty_tag('img', ['src' => $this->image_url('i/flagged'),
-                        'alt' => get_string('flagged', 'question'), 'class' => 'questionflag icon-post']);
+                        'alt' => get_string('flagged', 'question'), 'class' => 'questionflag']);
             }
             if ($attemptobj->can_navigate_to($slot)) {
                 $row = [html_writer::link($attemptobj->attempt_url($slot),
diff --git a/mod/quiz/templates/add_random_question_form.mustache b/mod/quiz/templates/add_random_question_form.mustache
index 5cf4e428c1bd5..701dd49a14a15 100644
--- a/mod/quiz/templates/add_random_question_form.mustache
+++ b/mod/quiz/templates/add_random_question_form.mustache
@@ -39,7 +39,7 @@
             "url": "http://example.org/help",
             "linktext": "",
             "icon": {
-                "extraclasses": "iconhelp",
+                "extraclasses": "",
                 "attributes": [
                     {"name": "src", "value": "../../../pix/help.svg"},
                     {"name": "alt", "value": "Help icon"}
diff --git a/mod/workshop/renderer.php b/mod/workshop/renderer.php
index 20ef24637aa90..3109026b0867e 100644
--- a/mod/workshop/renderer.php
+++ b/mod/workshop/renderer.php
@@ -1022,13 +1022,13 @@ protected function helper_sortable_heading($text, $sortid=null, $sortby=null, $s
                 $url = new moodle_url($this->page->url);
                 $url->params(array('sortby' => $sortid, 'sorthow' => 'ASC'));
                 $out .= $this->output->action_icon($url, new pix_icon('t/sort_asc', get_string('sortasc', 'workshop')),
-                    null, array('class' => 'iconsort sort asc'));
+                    null, ['class' => 'sort asc']);
             }
             if ($sortby !== $sortid or $sorthow !== 'DESC') {
                 $url = new moodle_url($this->page->url);
                 $url->params(array('sortby' => $sortid, 'sorthow' => 'DESC'));
                 $out .= $this->output->action_icon($url, new pix_icon('t/sort_desc', get_string('sortdesc', 'workshop')),
-                    null, array('class' => 'iconsort sort desc'));
+                    null, ['class' => 'sort desc']);
             }
         }
         return $out;
diff --git a/question/classes/local/bank/column_base.php b/question/classes/local/bank/column_base.php
index c4abe2dc8a0e3..3636db7699b4d 100644
--- a/question/classes/local/bank/column_base.php
+++ b/question/classes/local/bank/column_base.php
@@ -221,16 +221,17 @@ protected function make_sort_link($sortname, $title, $tip, $defaultreverse = fal
     }
 
     /**
-     * Get an icon representing the corrent sort state.
+     * Get an icon representing the current sort state.
+     *
      * @param bool $reverse sort is descending, not ascending.
      * @return string HTML image tag.
      */
     protected function get_sort_icon($reverse): string {
         global $OUTPUT;
         if ($reverse) {
-            return $OUTPUT->pix_icon('t/sort_desc', get_string('desc'), '', ['class' => 'iconsort']);
+            return $OUTPUT->pix_icon('t/sort_desc', get_string('desc'));
         } else {
-            return $OUTPUT->pix_icon('t/sort_asc', get_string('asc'), '', ['class' => 'iconsort']);
+            return $OUTPUT->pix_icon('t/sort_asc', get_string('asc'));
         }
     }
 
diff --git a/question/templates/column_header.mustache b/question/templates/column_header.mustache
index 50558ca47a3b6..ec6b516b29044 100644
--- a/question/templates/column_header.mustache
+++ b/question/templates/column_header.mustache
@@ -33,7 +33,7 @@
 
         Sortable column, with a single type of sort (e.g. question type)
             * sortable: true
-            * sortlinks: HTML of the title, in a link to sort by this. E.g. "<a href=\"http:\/\/localhost\/moodle_head\/question\/edit.php?courseid=100000&amp;qbs1=-qbank_viewquestiontype%5Cquestion_type_column&amp;qbs2=qbank_viewquestionname%5Cquestion_name_idnumber_tags_column-name\" title=\"Sort by Question type descending\">\n    T<i class=\"icon fa fa-sort-asc fa-fw iconsort\"  title=\"Ascending\" role=\"img\" aria-label=\"Ascending\"><\/i>\n<\/a>"
+            * sortlinks: HTML of the title, in a link to sort by this. E.g. "<a href=\"http:\/\/localhost\/moodle_head\/question\/edit.php?courseid=100000&amp;qbs1=-qbank_viewquestiontype%5Cquestion_type_column&amp;qbs2=qbank_viewquestionname%5Cquestion_name_idnumber_tags_column-name\" title=\"Sort by Question type descending\">\n    T<i class=\"icon fa fa-sort-asc fa-fw\"  title=\"Ascending\" role=\"img\" aria-label=\"Ascending\"><\/i>\n<\/a>"
 
         Sortable column, with an overall title, and multiple sort types (e.g. question name/idnumber)
             * sortable: true
diff --git a/repository/filepicker.php b/repository/filepicker.php
index 09c1d41ea99ba..fcdb2ab9182b0 100644
--- a/repository/filepicker.php
+++ b/repository/filepicker.php
@@ -398,7 +398,7 @@
         $aurl->params(array('savepath'=>$savepath, 'action' => 'list', 'repo_id' => $info->id, 'draftpath'=>$draftpath));
 
         echo '<li>';
-        echo html_writer::empty_tag('img', array('src'=>$info->icon, 'alt'=>$info->name, 'class'=>'icon icon-pre'));
+        echo html_writer::empty_tag('img', ['src' => $info->icon, 'alt' => $info->name, 'class' => 'icon']);
         echo html_writer::link($aurl, s($info->name));
         echo '</li>';
     }

From 77584dee5c9152f821b3dbf6b45a6bbdcf6ca1bc Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Thu, 27 Jun 2024 23:33:05 +0100
Subject: [PATCH 086/119] MDL-82315 backup: account for null course section
 sequence value.

---
 backup/util/dbops/backup_plan_dbops.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/backup/util/dbops/backup_plan_dbops.class.php b/backup/util/dbops/backup_plan_dbops.class.php
index d3a650bf91ef8..76ea208dc8fd0 100644
--- a/backup/util/dbops/backup_plan_dbops.class.php
+++ b/backup/util/dbops/backup_plan_dbops.class.php
@@ -77,7 +77,6 @@ public static function get_modules_from_sectionid($sectionid) {
         // Get the course and sequence of the section
         $secrec = $DB->get_record('course_sections', array('id' => $sectionid), 'course, sequence');
         $courseid = $secrec->course;
-        $sequence = $secrec->sequence;
 
         // Get the section->sequence contents (it roots the activities order)
         // Get all course modules belonging to requested section
@@ -89,7 +88,7 @@ public static function get_modules_from_sectionid($sectionid) {
              WHERE cm.course = ?
                AND cm.section = ?
                AND cm.deletioninprogress <> 1", array($courseid, $sectionid));
-        foreach (explode(',', $sequence) as $moduleid) {
+        foreach (explode(',', (string) $secrec->sequence) as $moduleid) {
             if (isset($modules[$moduleid])) {
                 $module = array('id' => $modules[$moduleid]->id, 'modname' => $modules[$moduleid]->modname);
                 $modulesarr[] = (object)$module;

From 8223c1cea2a0593361b5bbd02619253e0e636abe Mon Sep 17 00:00:00 2001
From: David Carrillo <davidmc@moodle.com>
Date: Wed, 15 Nov 2023 18:19:37 +0100
Subject: [PATCH 087/119] MDL-80123 admin: Convert admin preset report to
 Report Builder

- Admin presets list has been converted to use Report builder
- Added ability to filter by name in the report
- Added confirmation modal when deleting presets
- Added inplace editable to rename custom presets
---
 .../amd/build/admin_presets_list.min.js       |   3 +
 .../amd/build/admin_presets_list.min.js.map   |   1 +
 .../admin_presets/amd/build/repository.min.js |  10 ++
 .../amd/build/repository.min.js.map           |   1 +
 .../amd/src/admin_presets_list.js             |  82 ++++++++++
 .../tool/admin_presets/amd/src/repository.js  |  39 +++++
 .../classes/external/delete_preset.php        |  71 ++++++++
 .../classes/local/action/base.php             |  19 ++-
 .../classes/output/export_import.php          |   6 +-
 .../local/entities/admin_preset.php           | 149 +++++++++++++++++
 .../local/systemreports/admin_presets.php     | 152 ++++++++++++++++++
 admin/tool/admin_presets/db/services.php      |  37 +++++
 .../lang/en/tool_admin_presets.php            |   3 +-
 admin/tool/admin_presets/lib.php              |  63 ++++++++
 .../tests/behat/apply_presets.feature         |  20 +--
 .../admin_presets/tests/behat/delete.feature  |  26 ++-
 .../tests/behat/export_settings.feature       |   9 +-
 .../tests/behat/import_file.feature           |   8 +-
 .../tests/behat/presets_list.feature          |  32 ++++
 .../tests/behat/revert_changes.feature        |   6 +-
 admin/tool/admin_presets/version.php          |   2 +-
 21 files changed, 683 insertions(+), 56 deletions(-)
 create mode 100644 admin/tool/admin_presets/amd/build/admin_presets_list.min.js
 create mode 100644 admin/tool/admin_presets/amd/build/admin_presets_list.min.js.map
 create mode 100644 admin/tool/admin_presets/amd/build/repository.min.js
 create mode 100644 admin/tool/admin_presets/amd/build/repository.min.js.map
 create mode 100644 admin/tool/admin_presets/amd/src/admin_presets_list.js
 create mode 100644 admin/tool/admin_presets/amd/src/repository.js
 create mode 100644 admin/tool/admin_presets/classes/external/delete_preset.php
 create mode 100644 admin/tool/admin_presets/classes/reportbuilder/local/entities/admin_preset.php
 create mode 100644 admin/tool/admin_presets/classes/reportbuilder/local/systemreports/admin_presets.php
 create mode 100644 admin/tool/admin_presets/db/services.php
 create mode 100644 admin/tool/admin_presets/lib.php
 create mode 100644 admin/tool/admin_presets/tests/behat/presets_list.feature

diff --git a/admin/tool/admin_presets/amd/build/admin_presets_list.min.js b/admin/tool/admin_presets/amd/build/admin_presets_list.min.js
new file mode 100644
index 0000000000000..2697debff79a1
--- /dev/null
+++ b/admin/tool/admin_presets/amd/build/admin_presets_list.min.js
@@ -0,0 +1,3 @@
+define("tool_admin_presets/admin_presets_list",["exports","core/event_dispatcher","core/notification","core/prefetch","core/str","core/pending","core_reportbuilder/local/events","core_reportbuilder/local/selectors","core/toast","tool_admin_presets/repository"],(function(_exports,_event_dispatcher,_notification,_prefetch,_str,_pending,reportEvents,reportSelectors,_toast,_repository){function _getRequireWildcardCache(nodeInterop){if("function"!=typeof WeakMap)return null;var cacheBabelInterop=new WeakMap,cacheNodeInterop=new WeakMap;return(_getRequireWildcardCache=function(nodeInterop){return nodeInterop?cacheNodeInterop:cacheBabelInterop})(nodeInterop)}function _interopRequireWildcard(obj,nodeInterop){if(!nodeInterop&&obj&&obj.__esModule)return obj;if(null===obj||"object"!=typeof obj&&"function"!=typeof obj)return{default:obj};var cache=_getRequireWildcardCache(nodeInterop);if(cache&&cache.has(obj))return cache.get(obj);var newObj={},hasPropertyDescriptor=Object.defineProperty&&Object.getOwnPropertyDescriptor;for(var key in obj)if("default"!==key&&Object.prototype.hasOwnProperty.call(obj,key)){var desc=hasPropertyDescriptor?Object.getOwnPropertyDescriptor(obj,key):null;desc&&(desc.get||desc.set)?Object.defineProperty(newObj,key,desc):newObj[key]=obj[key]}return newObj.default=obj,cache&&cache.set(obj,newObj),newObj}function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj}}Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.init=void 0,_notification=_interopRequireDefault(_notification),_pending=_interopRequireDefault(_pending),reportEvents=_interopRequireWildcard(reportEvents),reportSelectors=_interopRequireWildcard(reportSelectors);_exports.init=()=>{(0,_prefetch.prefetchStrings)("core",["delete"]),(0,_prefetch.prefetchStrings)("tool_admin_presets",["deleteshow","deletepreset","eventpresetdeleted","deletepreviouslyapplied"]),document.addEventListener("click",(event=>{const presetDelete=event.target.closest('[data-action="admin-preset-delete"]');if(presetDelete){event.preventDefault();const triggerElement=presetDelete.closest(".dropdown").querySelector(".dropdown-toggle"),stringid=presetDelete.dataset.presetRollback?"deletepreviouslyapplied":"deletepreset";_notification.default.saveCancelPromise((0,_str.getString)("deleteshow","tool_admin_presets"),(0,_str.getString)(stringid,"tool_admin_presets",presetDelete.dataset.presetName),(0,_str.getString)("delete","core"),{triggerElement:triggerElement}).then((()=>{const pendingPromise=new _pending.default("tool/admin_presets:deletepreset"),reportElement=event.target.closest(reportSelectors.regions.report);return(0,_repository.deletePreset)(presetDelete.dataset.presetId).then((()=>(0,_toast.add)((0,_str.getString)("eventpresetdeleted","tool_admin_presets")))).then((()=>((0,_event_dispatcher.dispatchEvent)(reportEvents.tableReload,{preservePagination:!0},reportElement),pendingPromise.resolve()))).catch(_notification.default.exception)})).catch((()=>{}))}}))}}));
+
+//# sourceMappingURL=admin_presets_list.min.js.map
\ No newline at end of file
diff --git a/admin/tool/admin_presets/amd/build/admin_presets_list.min.js.map b/admin/tool/admin_presets/amd/build/admin_presets_list.min.js.map
new file mode 100644
index 0000000000000..eab530fc24f08
--- /dev/null
+++ b/admin/tool/admin_presets/amd/build/admin_presets_list.min.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"admin_presets_list.min.js","sources":["../src/admin_presets_list.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Admin presets list management\n *\n * @module     tool_admin_presets/admin_presets_list\n * @copyright  2024 David Carrillo <davidmc@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\n\"use strict\";\n\nimport {dispatchEvent} from 'core/event_dispatcher';\nimport Notification from 'core/notification';\nimport {prefetchStrings} from 'core/prefetch';\nimport {getString} from 'core/str';\nimport Pending from 'core/pending';\nimport * as reportEvents from 'core_reportbuilder/local/events';\nimport * as reportSelectors from 'core_reportbuilder/local/selectors';\nimport {add as addToast} from 'core/toast';\nimport {deletePreset} from 'tool_admin_presets/repository';\n\n/**\n * Initialise module\n */\nexport const init = () => {\n    prefetchStrings('core', [\n        'delete',\n    ]);\n\n    prefetchStrings('tool_admin_presets', [\n        'deleteshow',\n        'deletepreset',\n        'eventpresetdeleted',\n        'deletepreviouslyapplied'\n    ]);\n\n    document.addEventListener('click', event => {\n        const presetDelete = event.target.closest('[data-action=\"admin-preset-delete\"]');\n        if (presetDelete) {\n            event.preventDefault();\n\n            // Use triggerElement to return focus to the action menu toggle.\n            const triggerElement = presetDelete.closest('.dropdown').querySelector('.dropdown-toggle');\n            const stringid = presetDelete.dataset.presetRollback ? 'deletepreviouslyapplied' : 'deletepreset';\n\n            /* eslint-disable promise/no-nesting */\n            Notification.saveCancelPromise(\n                getString('deleteshow', 'tool_admin_presets'),\n                getString(stringid, 'tool_admin_presets', presetDelete.dataset.presetName),\n                getString('delete', 'core'),\n                {triggerElement}\n            ).then(() => {\n                const pendingPromise = new Pending('tool/admin_presets:deletepreset');\n                const reportElement = event.target.closest(reportSelectors.regions.report);\n\n                return deletePreset(presetDelete.dataset.presetId)\n                    .then(() => addToast(getString('eventpresetdeleted', 'tool_admin_presets')))\n                    .then(() => {\n                        dispatchEvent(reportEvents.tableReload, {preservePagination: true}, reportElement);\n                        return pendingPromise.resolve();\n                    })\n                    .catch(Notification.exception);\n            }).catch(() => {\n                return;\n            });\n        }\n    });\n};\n"],"names":["document","addEventListener","event","presetDelete","target","closest","preventDefault","triggerElement","querySelector","stringid","dataset","presetRollback","saveCancelPromise","presetName","then","pendingPromise","Pending","reportElement","reportSelectors","regions","report","presetId","reportEvents","tableReload","preservePagination","resolve","catch","Notification","exception"],"mappings":"+qDAsCoB,mCACA,OAAQ,CACpB,yCAGY,qBAAsB,CAClC,aACA,eACA,qBACA,4BAGJA,SAASC,iBAAiB,SAASC,cACzBC,aAAeD,MAAME,OAAOC,QAAQ,0CACtCF,aAAc,CACdD,MAAMI,uBAGAC,eAAiBJ,aAAaE,QAAQ,aAAaG,cAAc,oBACjEC,SAAWN,aAAaO,QAAQC,eAAiB,0BAA4B,qCAGtEC,mBACT,kBAAU,aAAc,uBACxB,kBAAUH,SAAU,qBAAsBN,aAAaO,QAAQG,aAC/D,kBAAU,SAAU,QACpB,CAACN,eAAAA,iBACHO,MAAK,WACGC,eAAiB,IAAIC,iBAAQ,mCAC7BC,cAAgBf,MAAME,OAAOC,QAAQa,gBAAgBC,QAAQC,eAE5D,4BAAajB,aAAaO,QAAQW,UACpCP,MAAK,KAAM,eAAS,kBAAU,qBAAsB,yBACpDA,MAAK,yCACYQ,aAAaC,YAAa,CAACC,oBAAoB,GAAOP,eAC7DF,eAAeU,aAEzBC,MAAMC,sBAAaC,cACzBF,OAAM"}
\ No newline at end of file
diff --git a/admin/tool/admin_presets/amd/build/repository.min.js b/admin/tool/admin_presets/amd/build/repository.min.js
new file mode 100644
index 0000000000000..f744b0da181e0
--- /dev/null
+++ b/admin/tool/admin_presets/amd/build/repository.min.js
@@ -0,0 +1,10 @@
+define("tool_admin_presets/repository",["exports","core/ajax"],(function(_exports,_ajax){var obj;
+/**
+   * Module to handle presets AJAX requests
+   *
+   * @module     tool_admin_presets/repository
+   * @copyright  2024 David Carrillo <davidmc@moodle.com>
+   * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.deletePreset=void 0,_ajax=(obj=_ajax)&&obj.__esModule?obj:{default:obj};_exports.deletePreset=presetId=>{const request={methodname:"tool_admin_presets_delete_preset",args:{id:presetId}};return _ajax.default.call([request])[0]}}));
+
+//# sourceMappingURL=repository.min.js.map
\ No newline at end of file
diff --git a/admin/tool/admin_presets/amd/build/repository.min.js.map b/admin/tool/admin_presets/amd/build/repository.min.js.map
new file mode 100644
index 0000000000000..93c22550445ea
--- /dev/null
+++ b/admin/tool/admin_presets/amd/build/repository.min.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"repository.min.js","sources":["../src/repository.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Module to handle presets AJAX requests\n *\n * @module     tool_admin_presets/repository\n * @copyright  2024 David Carrillo <davidmc@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport Ajax from 'core/ajax';\n\n/**\n * Delete given preset\n *\n * @param {Number} presetId\n * @return {Promise}\n */\nexport const deletePreset = presetId => {\n    const request = {\n        methodname: 'tool_admin_presets_delete_preset',\n        args: {id: presetId}\n    };\n\n    return Ajax.call([request])[0];\n};\n"],"names":["presetId","request","methodname","args","id","Ajax","call"],"mappings":";;;;;;;oKA+B4BA,iBAClBC,QAAU,CACZC,WAAY,mCACZC,KAAM,CAACC,GAAIJ,kBAGRK,cAAKC,KAAK,CAACL,UAAU"}
\ No newline at end of file
diff --git a/admin/tool/admin_presets/amd/src/admin_presets_list.js b/admin/tool/admin_presets/amd/src/admin_presets_list.js
new file mode 100644
index 0000000000000..b76454d231e36
--- /dev/null
+++ b/admin/tool/admin_presets/amd/src/admin_presets_list.js
@@ -0,0 +1,82 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Admin presets list management
+ *
+ * @module     tool_admin_presets/admin_presets_list
+ * @copyright  2024 David Carrillo <davidmc@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+"use strict";
+
+import {dispatchEvent} from 'core/event_dispatcher';
+import Notification from 'core/notification';
+import {prefetchStrings} from 'core/prefetch';
+import {getString} from 'core/str';
+import Pending from 'core/pending';
+import * as reportEvents from 'core_reportbuilder/local/events';
+import * as reportSelectors from 'core_reportbuilder/local/selectors';
+import {add as addToast} from 'core/toast';
+import {deletePreset} from 'tool_admin_presets/repository';
+
+/**
+ * Initialise module
+ */
+export const init = () => {
+    prefetchStrings('core', [
+        'delete',
+    ]);
+
+    prefetchStrings('tool_admin_presets', [
+        'deleteshow',
+        'deletepreset',
+        'eventpresetdeleted',
+        'deletepreviouslyapplied'
+    ]);
+
+    document.addEventListener('click', event => {
+        const presetDelete = event.target.closest('[data-action="admin-preset-delete"]');
+        if (presetDelete) {
+            event.preventDefault();
+
+            // Use triggerElement to return focus to the action menu toggle.
+            const triggerElement = presetDelete.closest('.dropdown').querySelector('.dropdown-toggle');
+            const stringid = presetDelete.dataset.presetRollback ? 'deletepreviouslyapplied' : 'deletepreset';
+
+            /* eslint-disable promise/no-nesting */
+            Notification.saveCancelPromise(
+                getString('deleteshow', 'tool_admin_presets'),
+                getString(stringid, 'tool_admin_presets', presetDelete.dataset.presetName),
+                getString('delete', 'core'),
+                {triggerElement}
+            ).then(() => {
+                const pendingPromise = new Pending('tool/admin_presets:deletepreset');
+                const reportElement = event.target.closest(reportSelectors.regions.report);
+
+                return deletePreset(presetDelete.dataset.presetId)
+                    .then(() => addToast(getString('eventpresetdeleted', 'tool_admin_presets')))
+                    .then(() => {
+                        dispatchEvent(reportEvents.tableReload, {preservePagination: true}, reportElement);
+                        return pendingPromise.resolve();
+                    })
+                    .catch(Notification.exception);
+            }).catch(() => {
+                return;
+            });
+        }
+    });
+};
diff --git a/admin/tool/admin_presets/amd/src/repository.js b/admin/tool/admin_presets/amd/src/repository.js
new file mode 100644
index 0000000000000..ee4b728f2f2d5
--- /dev/null
+++ b/admin/tool/admin_presets/amd/src/repository.js
@@ -0,0 +1,39 @@
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Module to handle presets AJAX requests
+ *
+ * @module     tool_admin_presets/repository
+ * @copyright  2024 David Carrillo <davidmc@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+import Ajax from 'core/ajax';
+
+/**
+ * Delete given preset
+ *
+ * @param {Number} presetId
+ * @return {Promise}
+ */
+export const deletePreset = presetId => {
+    const request = {
+        methodname: 'tool_admin_presets_delete_preset',
+        args: {id: presetId}
+    };
+
+    return Ajax.call([request])[0];
+};
diff --git a/admin/tool/admin_presets/classes/external/delete_preset.php b/admin/tool/admin_presets/classes/external/delete_preset.php
new file mode 100644
index 0000000000000..fc89864eff17c
--- /dev/null
+++ b/admin/tool/admin_presets/classes/external/delete_preset.php
@@ -0,0 +1,71 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace tool_admin_presets\external;
+
+use core_adminpresets\manager;
+use core_external\external_api;
+use core_external\external_function_parameters;
+use core_external\external_value;
+
+/**
+ * External function tool_admin_presets_delete_preset
+ *
+ * @package    tool_admin_presets
+ * @copyright  2024 David Carrillo <davidmc@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class delete_preset extends external_api {
+
+    /**
+     * Describes the parameters.
+     *
+     * @return external_function_parameters
+     */
+    public static function execute_parameters(): external_function_parameters {
+        return new external_function_parameters([
+            'id' => new external_value(PARAM_INT),
+        ]);
+    }
+
+    /**
+     * External function to delete custom presets.
+     *
+     * @param int $id
+     */
+    public static function execute(int $id): void {
+        // Parameter validation.
+        [
+            'id' => $id,
+        ] = self::validate_parameters(self::execute_parameters(), [
+            'id' => $id,
+        ]);
+
+        // Validate context.
+        $context = \context_system::instance();
+        self::validate_context($context);
+
+        require_capability('moodle/site:config', $context);
+
+        (new manager())->delete_preset($id);
+    }
+
+    /**
+     * Describes the data returned from the external function.
+     */
+    public static function execute_returns(): void {
+    }
+}
diff --git a/admin/tool/admin_presets/classes/local/action/base.php b/admin/tool/admin_presets/classes/local/action/base.php
index 86ddd71aa85e0..245f6b2e1e888 100644
--- a/admin/tool/admin_presets/classes/local/action/base.php
+++ b/admin/tool/admin_presets/classes/local/action/base.php
@@ -17,9 +17,7 @@
 namespace tool_admin_presets\local\action;
 
 use context_system;
-use moodle_url;
 use core_adminpresets\manager;
-use tool_admin_presets\output\presets_list;
 use tool_admin_presets\output\export_import;
 
 /**
@@ -41,7 +39,7 @@ class base {
         'preview' => 'preset_previewed',
         'load' => 'preset_loaded',
         'rollback' => 'preset_reverted',
-        'download_xml' => 'preset_downloaded'
+        'download_xml' => 'preset_downloaded',
     ];
 
     /** @var string The main action (delete, export, import, load...). **/
@@ -79,14 +77,19 @@ public function __construct() {
      * actions (preview, load, download, delete and rollback)
      */
     public function show(): void {
-        global $DB, $OUTPUT;
+        global $DB, $OUTPUT, $PAGE;
 
+        $this->outputs = $OUTPUT->container_start('d-flex flex-wrap justify-content-end');
         $options = new export_import();
-        $this->outputs = $OUTPUT->render($options);
+        $this->outputs .= $OUTPUT->render($options);
+        $this->outputs .= $OUTPUT->container_end();
 
-        $presets = $DB->get_records('adminpresets');
-        $list = new presets_list($presets, true);
-        $this->outputs .= $OUTPUT->render($list);
+        $PAGE->requires->js_call_amd('tool_admin_presets/admin_presets_list', 'init');
+
+        $report = \core_reportbuilder\system_report_factory::create(
+            \tool_admin_presets\reportbuilder\local\systemreports\admin_presets::class,
+            $PAGE->context, '', '', 0, []);
+        $this->outputs .= $report->output();
     }
 
     /**
diff --git a/admin/tool/admin_presets/classes/output/export_import.php b/admin/tool/admin_presets/classes/output/export_import.php
index d19934a8a1296..1c8792db82c48 100644
--- a/admin/tool/admin_presets/classes/output/export_import.php
+++ b/admin/tool/admin_presets/classes/output/export_import.php
@@ -43,11 +43,13 @@ class export_import implements renderable, templatable {
     public function export_for_template(renderer_base $output): stdClass {
         $context = new stdClass();
         $exportlink = new \moodle_url('/admin/tool/admin_presets/index.php', ['action' => 'export']);
-        $exportbutton = new \single_button($exportlink, get_string('actionexport', 'tool_admin_presets'), 'get');
+        $exportbutton = new \single_button($exportlink, get_string('actionexport', 'tool_admin_presets'), 'get',
+            \single_button::BUTTON_PRIMARY);
         $context->export = $exportbutton->export_for_template($output);
 
         $importlink = new \moodle_url('/admin/tool/admin_presets/index.php', ['action' => 'import']);
-        $importbutton = new \single_button($importlink, get_string('actionimport', 'tool_admin_presets'), 'get');
+        $importbutton = new \single_button($importlink, get_string('actionimport', 'tool_admin_presets'), 'get',
+            \single_button::BUTTON_PRIMARY);
         $context->import = $importbutton->export_for_template($output);
         return $context;
     }
diff --git a/admin/tool/admin_presets/classes/reportbuilder/local/entities/admin_preset.php b/admin/tool/admin_presets/classes/reportbuilder/local/entities/admin_preset.php
new file mode 100644
index 0000000000000..321572a7a3bf9
--- /dev/null
+++ b/admin/tool/admin_presets/classes/reportbuilder/local/entities/admin_preset.php
@@ -0,0 +1,149 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+declare(strict_types=1);
+
+namespace tool_admin_presets\reportbuilder\local\entities;
+
+use lang_string;
+use core\output\inplace_editable;
+use core_reportbuilder\local\entities\base;
+use core_reportbuilder\local\filters\text;
+use core_reportbuilder\local\report\{column, filter};
+
+/**
+ * Admin preset entity
+ *
+ * @package     tool_admin_presets
+ * @copyright   2024 David Carrillo <davidmc@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class admin_preset extends base {
+
+    /**
+     * Database tables that this entity uses
+     *
+     * @return string[]
+     */
+    protected function get_default_tables(): array {
+        return [
+            'adminpresets',
+        ];
+    }
+
+    /**
+     * The default title for this entity
+     *
+     * @return lang_string
+     */
+    protected function get_default_entity_title(): lang_string {
+        return new lang_string('pluginname', 'tool_admin_presets');
+    }
+
+    /**
+     * Initialise the entity
+     *
+     * @return base
+     */
+    public function initialise(): base {
+        $columns = $this->get_all_columns();
+        foreach ($columns as $column) {
+            $this->add_column($column);
+        }
+
+        // All the filters defined by the entity can also be used as conditions.
+        $filters = $this->get_all_filters();
+        foreach ($filters as $filter) {
+            $this
+                ->add_filter($filter)
+                ->add_condition($filter);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Returns list of all available columns
+     *
+     * @return column[]
+     */
+    protected function get_all_columns(): array {
+        global $DB;
+        $apalias = $this->get_table_alias('adminpresets');
+
+        // Name.
+        $columns[] = (new column(
+            'name',
+            new lang_string('name'),
+            $this->get_entity_name()
+        ))
+            ->add_joins($this->get_joins())
+            ->set_type(column::TYPE_TEXT)
+            ->add_fields("{$apalias}.id, {$apalias}.name, {$apalias}.iscore")
+            ->set_is_sortable(true)
+            ->set_callback(static function(?string $value, \stdClass $row): string {
+                global $OUTPUT;
+                $edithint = get_string('editadminpresetname', 'tool_admin_presets');
+                $displayvalue = format_string($row->name, true, ['context' => \context_system::instance(), 'escape' => false]);
+                $editlabel = get_string('newvaluefor', 'form', $displayvalue);
+                $canedit = (int)$row->iscore === \core_adminpresets\manager::NONCORE_PRESET;
+                $inlineeditable = new inplace_editable('tool_admin_presets', 'presetname', $row->id, $canedit,
+                    $displayvalue, $row->name, $edithint, $editlabel);
+                return $OUTPUT->render($inlineeditable);
+            });
+
+        // Description.
+        $descriptionfieldsql = "{$apalias}.comments";
+        if ($DB->get_dbfamily() === 'oracle') {
+            $descriptionfieldsql = $DB->sql_order_by_text($descriptionfieldsql, 1024);
+        }
+        $columns[] = (new column(
+            'description',
+            new lang_string('description'),
+            $this->get_entity_name()
+        ))
+            ->add_joins($this->get_joins())
+            ->set_type(column::TYPE_LONGTEXT)
+            ->add_field($descriptionfieldsql, 'description')
+            ->set_is_sortable(true)
+            ->set_callback(static function(?string $description, \stdClass $row): string {
+                return format_text($description, FORMAT_HTML, ['context' => \context_system::instance()]);
+            });
+
+        return $columns;
+    }
+
+    /**
+     * Return list of all available filters
+     *
+     * @return filter[]
+     */
+    protected function get_all_filters(): array {
+        $apalias = $this->get_table_alias('adminpresets');
+
+        // Name.
+        $filters[] = (new filter(
+            text::class,
+            'name',
+            new lang_string('name'),
+            $this->get_entity_name(),
+            "{$apalias}.name"
+        ))
+            ->add_joins($this->get_joins());
+
+        return $filters;
+    }
+}
diff --git a/admin/tool/admin_presets/classes/reportbuilder/local/systemreports/admin_presets.php b/admin/tool/admin_presets/classes/reportbuilder/local/systemreports/admin_presets.php
new file mode 100644
index 0000000000000..c9d6227aebca1
--- /dev/null
+++ b/admin/tool/admin_presets/classes/reportbuilder/local/systemreports/admin_presets.php
@@ -0,0 +1,152 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+declare(strict_types=1);
+
+namespace tool_admin_presets\reportbuilder\local\systemreports;
+
+use tool_admin_presets\reportbuilder\local\entities\admin_preset;
+use core_reportbuilder\local\helpers\database;
+use core_reportbuilder\local\report\action;
+use core_reportbuilder\system_report;
+
+/**
+ * Admin presets system report class implementation
+ *
+ * @package    tool_admin_presets
+ * @copyright  2024 David Carrillo <davidmc@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class admin_presets extends system_report {
+
+    /**
+     * Initialise report, we need to set the main table, load our entities and set columns/filters
+     */
+    protected function initialise(): void {
+        // Our main entity, it contains all of the column definitions that we need.
+        $apentity = new admin_preset();
+        $entityalias = $apentity->get_table_alias('adminpresets');
+
+        $this->set_main_table('adminpresets', $entityalias);
+        $this->add_entity($apentity);
+
+        $apappalias = database::generate_alias();
+
+        // We need to join the adminpresets_app table to check if the preset rollback has ben used.
+        $this->add_join("LEFT JOIN {adminpresets_app} {$apappalias} ON {$entityalias}.id = {$apappalias}.adminpresetid");
+
+        // Any columns required by actions should be defined here to ensure they're always available.
+        $this->add_base_fields("{$entityalias}.id, {$entityalias}.name, {$entityalias}.iscore, {$apappalias}.id as appid");
+
+        // Now we can call our helper methods to add the content we want to include in the report.
+        $this->add_columns();
+        $this->add_filters();
+        $this->add_actions();
+
+        // Set if report can be downloaded.
+        $this->set_downloadable(false);
+    }
+
+    /**
+     * Validates access to view this report
+     *
+     * @return bool
+     */
+    protected function can_view(): bool {
+        return has_capability('moodle/site:config', \context_system::instance());
+    }
+
+    /**
+     * Adds the columns we want to display in the report
+     *
+     * They are provided by the entities we previously added in the {@see initialise} method, referencing each by their
+     * unique identifier. If custom columns are needed just for this report, they can be defined here.
+     */
+    public function add_columns(): void {
+        $columns = [
+            'admin_preset:name',
+            'admin_preset:description',
+        ];
+        $this->add_columns_from_entities($columns);
+    }
+
+    /**
+     * Adds the filters we want to display in the report
+     *
+     * They are all provided by the entities we previously added in the {@see initialise} method, referencing each by their
+     * unique identifier
+     */
+    protected function add_filters(): void {
+        $filters = [
+            'admin_preset:name',
+        ];
+        $this->add_filters_from_entities($filters);
+    }
+
+    /**
+     * Add the system report actions. An extra column will be appended to each row, containing all actions added here
+     *
+     * Note the use of ":id" placeholder which will be substituted according to actual values in the row
+     */
+    protected function add_actions(): void {
+
+        // Review settings and apply.
+        $this->add_action((new action(
+            new \moodle_url('/admin/tool/admin_presets/index.php', ['action' => 'load', 'id' => ':id']),
+            new \pix_icon('t/play', '', 'core'),
+            [],
+            false,
+            new \lang_string('applyaction', 'tool_admin_presets')
+        )));
+
+        // Download.
+        $this->add_action((new action(
+            new \moodle_url('/admin/tool/admin_presets/index.php',
+                ['action' => 'export', 'mode' => 'download_xml', 'sesskey' => sesskey(), 'id' => ':id']),
+            new \pix_icon('t/download', '', 'core'),
+            [],
+            false,
+            new \lang_string('download', 'core')
+        )));
+
+        // Delete button won't be displayed for the pre-installed core "Starter" and "Full" presets.
+        $this->add_action((new action(
+            new \moodle_url('/admin/tool/admin_presets/index.php', ['action' => 'delete', 'id' => ':id']),
+            new \pix_icon('i/delete', '', 'core'),
+            [
+                'data-action' => 'admin-preset-delete',
+                'data-preset-name' => ':name',
+                'data-preset-id' => ':id',
+                'data-preset-rollback' => ':appid',
+            ],
+            false,
+            new \lang_string('delete', 'core')
+        ))->add_callback(function(\stdClass $row): bool {
+            return (int)$row->iscore === \core_adminpresets\manager::NONCORE_PRESET;
+        }));
+
+        // Look for preset applications.
+        $this->add_action((new action(
+            new \moodle_url('/admin/tool/admin_presets/index.php', ['action' => 'rollback', 'id' => ':id']),
+            new \pix_icon('i/reload', '', 'core'),
+            [],
+            false,
+            new \lang_string('showhistory', 'tool_admin_presets')
+        ))->add_callback(function(\stdClass $row): bool {
+            return (bool) $row->appid;
+        }));
+    }
+}
diff --git a/admin/tool/admin_presets/db/services.php b/admin/tool/admin_presets/db/services.php
new file mode 100644
index 0000000000000..bbaf386bad195
--- /dev/null
+++ b/admin/tool/admin_presets/db/services.php
@@ -0,0 +1,37 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * External functions and service declaration for Site admin presets
+ *
+ * Documentation: {@link https://moodledev.io/docs/apis/subsystems/external/description}
+ *
+ * @package    tool_admin_presets
+ * @category   webservice
+ * @copyright  2024 David Carrillo <davidmc@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$functions = [
+    'tool_admin_presets_delete_preset' => [
+        'classname' => tool_admin_presets\external\delete_preset::class,
+        'description' => 'Delete a custom preset',
+        'type' => 'write',
+        'ajax' => true,
+    ],
+];
diff --git a/admin/tool/admin_presets/lang/en/tool_admin_presets.php b/admin/tool/admin_presets/lang/en/tool_admin_presets.php
index da5faff64d353..617666c624a1a 100644
--- a/admin/tool/admin_presets/lang/en/tool_admin_presets.php
+++ b/admin/tool/admin_presets/lang/en/tool_admin_presets.php
@@ -34,9 +34,10 @@
 $string['created'] = 'Created';
 $string['currentvalue'] = 'Current value';
 $string['deletepreset'] = 'Are you sure you want to delete the site admin preset {$a}?';
-$string['deletepreviouslyapplied'] = 'This preset has been previously applied. Deleting a preset removes it from your site completely. You will not be able to revert your settings to how they were before applying this preset.';
+$string['deletepreviouslyapplied'] = 'Are you sure you want to delete the site admin preset {$a}?<br><br>This preset has been previously applied. Deleting a preset removes it from your site completely. You will not be able to revert your settings to how they were before applying this preset.';
 $string['deletepresettitle'] = 'Delete {$a} preset?';
 $string['deleteshow'] = 'Delete site admin preset';
+$string['editadminpresetname'] = 'Edit admin preset name';
 $string['eventpresetdeleted'] = 'Preset deleted';
 $string['eventpresetdownloaded'] = 'Preset downloaded';
 $string['eventpresetexported'] = 'Preset created';
diff --git a/admin/tool/admin_presets/lib.php b/admin/tool/admin_presets/lib.php
new file mode 100644
index 0000000000000..439d81073434b
--- /dev/null
+++ b/admin/tool/admin_presets/lib.php
@@ -0,0 +1,63 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Admin presets callbacks
+ *
+ * @package     tool_admin_presets
+ * @copyright   2024 David Carrillo <davidmc@moodle.com>
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+declare(strict_types=1);
+
+use core\output\inplace_editable;
+
+/**
+ * Inplace editable functionality
+ *
+ * @param string $itemtype
+ * @param int $itemid
+ * @param string $newvalue
+ * @return inplace_editable
+ */
+function tool_admin_presets_inplace_editable(string $itemtype, int $itemid, string $newvalue): inplace_editable {
+    global $DB;
+    $context = \context_system::instance();
+    \core_external\external_api::validate_context($context);
+
+    require_capability('moodle/site:config', $context);
+
+    switch ($itemtype) {
+        case 'presetname':
+            $newvalue = clean_param($newvalue, PARAM_TEXT);
+            $edithint = get_string('editadminpresetname', 'tool_admin_presets');
+            $displayvalue = format_string($newvalue, true, ['context' => \context_system::instance(), 'escape' => false]);
+            $editlabel = get_string('newvaluefor', 'form', $displayvalue);
+
+            // Update value in database.
+            $DB->set_field('adminpresets', 'name', $newvalue, [
+                'id' => $itemid,
+                'iscore' => \core_adminpresets\manager::NONCORE_PRESET,
+            ]);
+
+            break;
+        default:
+            throw new \coding_exception('Unexpected admin preset inplace editable item type');
+    }
+
+    return new inplace_editable('tool_admin_presets', $itemtype, $itemid, true, $displayvalue, $newvalue, $edithint, $editlabel);
+}
diff --git a/admin/tool/admin_presets/tests/behat/apply_presets.feature b/admin/tool/admin_presets/tests/behat/apply_presets.feature
index d23231f51c008..1eeac2a2b95a7 100644
--- a/admin/tool/admin_presets/tests/behat/apply_presets.feature
+++ b/admin/tool/admin_presets/tests/behat/apply_presets.feature
@@ -6,9 +6,7 @@ Feature: I can apply presets
 
   Scenario: Default settings are equal to Full preset
     Given I navigate to "Site admin presets" in site administration
-    And I should see "Full"
-    And I open the action menu in "Full" "table_row"
-    When I choose "Review settings and apply" in the open action menu
+    When I press "Review settings and apply" action in the "Full" report row
     Then I should not see "Setting changes"
 
   Scenario: Applying Starter Moodle preset changes status and settings
@@ -26,9 +24,7 @@ Feature: I can apply presets
     And I navigate to "Plugins > Question types > Manage question types" in site administration
     And "Enabled" "icon" should exist in the "Calculated multichoice" "table_row"
     When I navigate to "Site admin presets" in site administration
-    And I should see "Starter"
-    And I open the action menu in "Starter" "table_row"
-    And I choose "Review settings and apply" in the open action menu
+    And I press "Review settings and apply" action in the "Starter" report row
     And I should see "Setting changes"
 #   Checking all the settings to be applied for the Starter (if will help to identify possible regressions).
     And I should see "Activities" in the "Setting changes" "table"
@@ -124,13 +120,11 @@ Feature: I can apply presets
   Scenario: Re-applying Starter Moodle preset does not display setting changes
 #   Apply Starter preset.
     Given I navigate to "Site admin presets" in site administration
-    And I open the action menu in "Starter" "table_row"
-    And I choose "Review settings and apply" in the open action menu
+    When I press "Review settings and apply" action in the "Starter" report row
     And I click on "Apply" "button"
     And I click on "Continue" "button"
 #   When the Starter preset it's applied again, no changes should be displayed.
-    When I open the action menu in "Starter" "table_row"
-    And I choose "Review settings and apply" in the open action menu
+    And I press "Review settings and apply" action in the "Starter" report row
     Then I should not see "Setting changes"
 
   Scenario: Applied exported settings
@@ -139,14 +133,12 @@ Feature: I can apply presets
     And I set the field "Name" to "Current"
     And I click on "Create preset" "button"
     And I should see "Current"
-    And I open the action menu in "Current" "table_row"
-    When I choose "Review settings and apply" in the open action menu
+    When I press "Review settings and apply" action in the "Current" report row
     And I should not see "Setting changes"
     And I click on "Continue" "button"
     And the following config values are set as admin:
       | enabled | 0 | core_competency |
-    And I open the action menu in "Current" "table_row"
-    And I choose "Review settings and apply" in the open action menu
+    And I press "Review settings and apply" action in the "Current" report row
     Then I should see "Setting changes"
     And I should see "Enable competencies" in the "core_competency" "table_row"
     And I click on "Apply" "button"
diff --git a/admin/tool/admin_presets/tests/behat/delete.feature b/admin/tool/admin_presets/tests/behat/delete.feature
index 39d169639cbd8..97538f8ada6e0 100644
--- a/admin/tool/admin_presets/tests/behat/delete.feature
+++ b/admin/tool/admin_presets/tests/behat/delete.feature
@@ -22,30 +22,24 @@ Feature: Admin preset deletion
     And I should not see "Delete"
 
   Scenario: Custom preset settings can be deleted
-    Given I should see "Custom preset"
-    And I open the action menu in "Custom preset" "table_row"
-    When I choose "Delete" in the open action menu
-    And I should see "Are you sure you want to delete the site admin preset Custom preset?"
+    When I press "Delete" action in the "Custom preset" report row
+    Then I should see "Are you sure you want to delete the site admin preset Custom preset?"
     And I should not see "This preset has been previously applied"
-    And I click on "Cancel" "button"
+    And I click on "Cancel" "button" in the ".modal-dialog" "css_element"
     And I should see "Presets allow you to easily switch between different site admin configurations."
-    And "Custom preset" "table_row" should exist
-    And I open the action menu in "Custom preset" "table_row"
-    And I choose "Delete" in the open action menu
+    And I press "Delete" action in the "Custom preset" report row
     And I should not see "This preset has been previously applied"
-    And I click on "Delete" "button"
+    And I click on "Delete" "button" in the ".modal-dialog" "css_element"
     And I should see "Presets allow you to easily switch between different site admin configurations."
-    Then "Custom preset" "table_row" should not exist
+    And I should not see "Custom preset" in the "reportbuilder-table" "table"
 
   Scenario: Delete preset that has been applied
-    Given I open the action menu in "Custom preset" "table_row"
-    And I choose "Review settings and apply" in the open action menu
+    When I press "Review settings and apply" action in the "Custom preset" report row
     And I click on "Apply" "button"
     And I navigate to "Site admin presets" in site administration
-    When I open the action menu in "Custom preset" "table_row"
-    And I choose "Delete" in the open action menu
+    And I press "Delete" action in the "Custom preset" report row
     And I should see "Are you sure you want to delete the site admin preset Custom preset?"
     Then I should see "This preset has been previously applied"
-    And I click on "Delete" "button"
+    And I click on "Delete" "button" in the ".modal-dialog" "css_element"
     And I should see "Presets allow you to easily switch between different site admin configurations"
-    And "Custom preset" "table_row" should not exist
+    And I should not see "Custom preset" in the "reportbuilder-table" "table"
diff --git a/admin/tool/admin_presets/tests/behat/export_settings.feature b/admin/tool/admin_presets/tests/behat/export_settings.feature
index 3cdb61eae6293..65130b039c3d4 100644
--- a/admin/tool/admin_presets/tests/behat/export_settings.feature
+++ b/admin/tool/admin_presets/tests/behat/export_settings.feature
@@ -11,7 +11,7 @@ Feature: I can add a new preset with current settings
     And I set the field "Name" to "Starter"
     And I set the field "Description" to "Non-core starter preset"
     When I click on "Create preset" "button"
-    Then the following should exist in the "Site admin presets table" table:
+    Then the following should exist in the "reportbuilder-table" table:
       | Name    | Description                                                                                                                        |
       | Starter | Moodle with all of the most popular features, including Assignment, Feedback, Forum, H5P, Quiz and Completion tracking.            |
       | Full    | All the Starter features plus External (LTI) tool, SCORM, Workshop, Analytics, Badges, Competencies, Learning plans and lots more. |
@@ -21,13 +21,10 @@ Feature: I can add a new preset with current settings
     Given I click on "Create preset" "button"
     And I set the field "Name" to "Current"
     And I click on "Create preset" "button"
-    And I should see "Current"
-    And I open the action menu in "Current" "table_row"
-    When I choose "Review settings and apply" in the open action menu
+    And I press "Review settings and apply" action in the "Current" report row
     And I should not see "Setting changes"
     And I click on "Continue" "button"
     And the following config values are set as admin:
       | enableportfolios | 1 |
-    And I open the action menu in "Current" "table_row"
-    And I choose "Review settings and apply" in the open action menu
+    And I press "Review settings and apply" action in the "Current" report row
     Then I should see "Setting changes"
diff --git a/admin/tool/admin_presets/tests/behat/import_file.feature b/admin/tool/admin_presets/tests/behat/import_file.feature
index 291c0b5ee027c..e22496dbd740b 100644
--- a/admin/tool/admin_presets/tests/behat/import_file.feature
+++ b/admin/tool/admin_presets/tests/behat/import_file.feature
@@ -20,7 +20,7 @@ Feature: I can upload a preset file
     And I should see "Setting changes"
     And I should see "Unchanged settings"
     And I click on "Continue" "button"
-    Then I should see "Imported preset" in the "Site admin presets table" "table"
+    Then I should see "Imported preset" in the "reportbuilder-table" "table"
     And I navigate to "Advanced features" in site administration
     And the following fields match these values:
       | Enable portfolios | 1 |
@@ -37,8 +37,8 @@ Feature: I can upload a preset file
     And I should see "Renamed preset"
     When I click on "Apply" "button"
     And I click on "Continue" "button"
-    Then I should not see "Imported preset" in the "Site admin presets table" "table"
-    And I should see "Renamed preset" in the "Site admin presets table" "table"
+    Then I should not see "Imported preset" in the "reportbuilder-table" "table"
+    And I should see "Renamed preset" in the "reportbuilder-table" "table"
 
   Scenario: Import settings from an invalid XML file
     Given I set the field "Name" to "Renamed preset"
@@ -71,7 +71,7 @@ Feature: I can upload a preset file
     And I click on "Apply" "button"
     And I should see "Setting changes"
     And I click on "Continue" "button"
-    Then I should see "Renamed preset" in the "Site admin presets table" "table"
+    Then I should see "Renamed preset" in the "reportbuilder-table" "table"
     And I navigate to "Advanced features" in site administration
     And the following fields match these values:
       | Enable portfolios | 1 |
diff --git a/admin/tool/admin_presets/tests/behat/presets_list.feature b/admin/tool/admin_presets/tests/behat/presets_list.feature
new file mode 100644
index 0000000000000..6812fdd78ed13
--- /dev/null
+++ b/admin/tool/admin_presets/tests/behat/presets_list.feature
@@ -0,0 +1,32 @@
+@tool @tool_admin_presets @core_reportbuilder @javascript
+Feature: Manage admin presets list
+  In order to use admin presets
+  As an admin
+  I need to be able to create, edit and delete custom presets
+
+  Scenario: Using filters in the presets list
+    Given I log in as "admin"
+    And I navigate to "Site admin presets" in site administration
+    And I should see "Starter" in the "reportbuilder-table" "table"
+    And I should see "Full" in the "reportbuilder-table" "table"
+    Then I click on "Filters" "button"
+    And I set the following fields in the "Name" "core_reportbuilder > Filter" to these values:
+      | Name operator | Is equal to |
+      | Name value    | Starter     |
+    And I click on "Apply" "button" in the "[data-region='report-filters']" "css_element"
+    And I click on "Filters" "button"
+    And I should see "Starter" in the "reportbuilder-table" "table"
+    And I should not see "Full" in the "reportbuilder-table" "table"
+
+  Scenario: Edit preset name
+    Given I log in as "admin"
+    And I navigate to "Site admin presets" in site administration
+    And I click on "Create preset" "button"
+    And I set the field "Name" to "My preset name"
+    And I click on "Create preset" "button"
+    And I should see "My preset name" in the "reportbuilder-table" "table"
+    Then I click on "Edit admin preset name" "link" in the "My preset name" "table_row"
+    And I set the field "New value for My preset name" to "My edited preset name"
+    And I press the enter key
+    And I should not see "My preset name" in the "reportbuilder-table" "table"
+    And I should see "My edited preset name" in the "reportbuilder-table" "table"
diff --git a/admin/tool/admin_presets/tests/behat/revert_changes.feature b/admin/tool/admin_presets/tests/behat/revert_changes.feature
index f5e417ea7772d..bfb878a16ca04 100644
--- a/admin/tool/admin_presets/tests/behat/revert_changes.feature
+++ b/admin/tool/admin_presets/tests/behat/revert_changes.feature
@@ -4,8 +4,7 @@ Feature: I can revert changes after a load
   Background: Apply Starter Moodle to revert it
     Given I log in as "admin"
     And I navigate to "Site admin presets" in site administration
-    And I open the action menu in "Starter" "table_row"
-    And I choose "Review settings and apply" in the open action menu
+    And I press "Review settings and apply" action in the "Starter" report row
     And I should see "Setting changes"
     And I click on "Apply" "button"
     And I click on "Continue" "button"
@@ -32,8 +31,7 @@ Feature: I can revert changes after a load
     And I navigate to "Plugins > Question types > Manage question types" in site administration
     And "Enabled" "icon" should not exist in the "Calculated multichoice" "table_row"
     And I navigate to "Site admin presets" in site administration
-    And I open the action menu in "Starter" "table_row"
-    And I choose "Show version history" in the open action menu
+    And I press "Show version history" action in the "Starter" report row
     When I click on "Restore this version" "link"
     And I navigate to "Advanced features" in site administration
     Then the field "Enable badges" matches value "1"
diff --git a/admin/tool/admin_presets/version.php b/admin/tool/admin_presets/version.php
index 6753df194437f..6b1ba5fa8c1a4 100644
--- a/admin/tool/admin_presets/version.php
+++ b/admin/tool/admin_presets/version.php
@@ -26,5 +26,5 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'tool_admin_presets';
-$plugin->version = 2024042200;
+$plugin->version = 2024042201;
 $plugin->requires = 2024041600;

From 956c64f0b494ae34fd3610b4c6a04befe068e714 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Thu, 6 Jun 2024 10:40:07 +0100
Subject: [PATCH 088/119] MDL-82114 files: report entity filters for file
 component/area.

---
 .../reportbuilder/local/entities/file.php     | 20 +++++++++++++++++++
 .../reportbuilder/datasource/files_test.php   | 20 +++++++++++++++++--
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/files/classes/reportbuilder/local/entities/file.php b/files/classes/reportbuilder/local/entities/file.php
index 489fe73ef291e..ea6fd5a5eb72d 100644
--- a/files/classes/reportbuilder/local/entities/file.php
+++ b/files/classes/reportbuilder/local/entities/file.php
@@ -425,6 +425,26 @@ protected function get_all_filters(): array {
         ))
             ->add_joins($this->get_joins());
 
+        // Component.
+        $filters[] = (new filter(
+            text::class,
+            'component',
+            new lang_string('plugin'),
+            $this->get_entity_name(),
+            "{$filesalias}.component"
+        ))
+            ->add_joins($this->get_joins());
+
+        // Area.
+        $filters[] = (new filter(
+            text::class,
+            'area',
+            new lang_string('pluginarea'),
+            $this->get_entity_name(),
+            "{$filesalias}.filearea"
+        ))
+            ->add_joins($this->get_joins());
+
         // Time created.
         $filters[] = (new filter(
             date::class,
diff --git a/files/tests/reportbuilder/datasource/files_test.php b/files/tests/reportbuilder/datasource/files_test.php
index 246817fff8509..8bc26ac8a3b8a 100644
--- a/files/tests/reportbuilder/datasource/files_test.php
+++ b/files/tests/reportbuilder/datasource/files_test.php
@@ -36,7 +36,7 @@
  * @copyright   2022 Paul Holden <paulh@moodle.com>
  * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-class files_test extends core_reportbuilder_testcase {
+final class files_test extends core_reportbuilder_testcase {
 
     /**
      * Test default datasource
@@ -205,7 +205,7 @@ public function test_datasource_non_default_columns(): void {
      *
      * @return array[]
      */
-    public function datasource_filters_provider(): array {
+    public static function datasource_filters_provider(): array {
         return [
             // File.
             'Filter directory' => ['file:directory', [
@@ -247,6 +247,22 @@ public function datasource_filters_provider(): array {
                 'file:contenthash_operator' => text::IS_EQUAL_TO,
                 'file:contenthash_value' => 'f00f',
             ], 0],
+            'Filter component' => ['file:component', [
+                'file:component_operator' => text::IS_EQUAL_TO,
+                'file:component_value' => 'course',
+            ], 2],
+            'Filter component (no match)' => ['file:component', [
+                'file:component_operator' => text::IS_EQUAL_TO,
+                'file:component_value' => 'reportbuilder',
+            ], 0],
+            'Filter area' => ['file:area', [
+                'file:area_operator' => text::IS_EQUAL_TO,
+                'file:area_value' => 'summary',
+            ], 2],
+            'Filter area (no match)' => ['file:area', [
+                'file:area_operator' => text::IS_EQUAL_TO,
+                'file:area_value' => 'report',
+            ], 0],
             'Filter time created' => ['file:timecreated', [
                 'file:timecreated_operator' => date::DATE_RANGE,
                 'file:timecreated_from' => 1622502000,

From c03234b5a6fbc1e4803530885fb9f406de0464b4 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Thu, 27 Jun 2024 15:13:01 +0100
Subject: [PATCH 089/119] MDL-82329 course: consistent section permalink on
 view/section pages.

---
 course/amd/build/actions.min.js                       |  2 +-
 course/amd/build/actions.min.js.map                   |  2 +-
 course/amd/src/actions.js                             |  9 +++++----
 .../output/local/content/section/controlmenu.php      |  1 +
 course/format/tests/behat/section_page.feature        | 11 +++++++++--
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/course/amd/build/actions.min.js b/course/amd/build/actions.min.js
index cf01b736161a0..c25032540a337 100644
--- a/course/amd/build/actions.min.js
+++ b/course/amd/build/actions.min.js
@@ -6,6 +6,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @since      3.3
  */
-define("core_course/actions",["jquery","core/ajax","core/templates","core/notification","core/str","core/url","core/yui","core/modal_copy_to_clipboard","core/modal_save_cancel","core/modal_events","core/key_codes","core/log","core_courseformat/courseeditor","core/event_dispatcher","core_course/events"],(function($,ajax,templates,notification,str,url,Y,ModalCopyToClipboard,ModalSaveCancel,ModalEvents,KeyCodes,log,editor,EventDispatcher,CourseEvents){const componentActions=["moveSection","moveCm","addSection","deleteSection","cmDelete","cmDuplicate","sectionHide","sectionShow","cmHide","cmShow","cmStealth","sectionHighlight","sectionUnhighlight","cmMoveRight","cmMoveLeft","cmNoGroups","cmVisibleGroups","cmSeparateGroups"],courseeditor=editor.getCurrentCourseEditor();let formatname;var CSS_EDITINPROGRESS="editinprogress",CSS_EDITINGMOVE="editing_move",SELECTOR={ACTIVITYLI:"li.activity",ACTIONAREA:".actions",ACTIVITYACTION:"a.cm-edit-action",MENU:".moodle-actionmenu[data-enhance=moodle-core-actionmenu]",TOGGLE:".toggle-display,.dropdown-toggle",SECTIONLI:"li.section",SECTIONACTIONMENU:".section_action_menu",SECTIONITEM:'[data-for="section_title"]',ADDSECTIONS:".changenumsections [data-add-sections]",SECTIONBADGES:'[data-region="sectionbadges"]'};Y.use("moodle-course-coursebase",(function(){var courseformatselector=M.course.format.get_section_selector();courseformatselector&&(SELECTOR.SECTIONLI=courseformatselector)}));const dispatchEvent=function(eventName,detail,container,options){return container instanceof Element||void 0===container.get||(container=container.get(0)),EventDispatcher.dispatchEvent(eventName,detail,container,options)};var getModuleId=function(element){const item=element.get(0);if(item.dataset.id)return item.dataset.id;let id;return Y.use("moodle-course-util",(function(Y){id=Y.Moodle.core_course.util.cm.getId(Y.Node(item))})),id},addActivitySpinner=function(activity){activity.addClass(CSS_EDITINPROGRESS);var actionarea=activity.find(SELECTOR.ACTIONAREA).get(0);if(actionarea){var spinner=M.util.add_spinner(Y,Y.Node(actionarea));return spinner.show(),void 0!==activity.data("id")&&courseeditor.dispatch("cmLock",[activity.data("id")],!0),spinner}return null},addSectionSpinner=function(sectionelement){sectionelement.addClass(CSS_EDITINPROGRESS);var actionarea=sectionelement.find(SELECTOR.SECTIONACTIONMENU).get(0);if(actionarea){var spinner=M.util.add_spinner(Y,Y.Node(actionarea));return spinner.show(),void 0!==sectionelement.data("id")&&courseeditor.dispatch("sectionLock",[sectionelement.data("id")],!0),spinner}return null},addSectionLightbox=function(sectionelement){const item=sectionelement.get(0);var lightbox=M.util.add_lightbox(Y,Y.Node(item));return"section"==item.dataset.for&&item.dataset.id&&(courseeditor.dispatch("sectionLock",[item.dataset.id],!0),lightbox.setAttribute("data-state","section"),lightbox.setAttribute("data-state-id",item.dataset.id)),lightbox.show(),lightbox},removeSpinner=function(element,spinner,delay){window.setTimeout((function(){if(element.removeClass(CSS_EDITINPROGRESS),spinner&&spinner.hide(),void 0!==element.data("id")){const mutation="section"===element.data("for")?"sectionLock":"cmLock";courseeditor.dispatch(mutation,[element.data("id")],!1)}}),delay)},removeLightbox=function(lightbox,delay){lightbox&&window.setTimeout((function(){lightbox.hide(),lightbox.getAttribute("data-state")&&courseeditor.dispatch("".concat(lightbox.getAttribute("data-state"),"Lock"),[lightbox.getAttribute("data-state-id")],!1)}),delay)},initActionMenu=function(elementid){Y.use("moodle-course-coursebase",(function(){M.course.coursebase.invoke_function("setup_for_resource","#"+elementid)})),M.core.actionmenu&&M.core.actionmenu.newDOMNode&&M.core.actionmenu.newDOMNode(Y.one("#"+elementid))},editModule=function(moduleElement,cmid,target){var lightbox,action=target.attr("data-action"),spinner=addActivitySpinner(moduleElement),promises=ajax.call([{methodname:"core_course_edit_module",args:{id:cmid,action:action,sectionreturn:target.attr("data-sectionreturn")?target.attr("data-sectionreturn"):null}}],!0);"duplicate"===action&&(lightbox=addSectionLightbox(target.closest(SELECTOR.SECTIONLI))),$.when.apply($,promises).done((function(data){var mainElement,tabables,isInside,foundElement,elementToFocus=(mainElement=moduleElement,tabables=$("a:visible"),isInside=!1,foundElement=null,tabables.each((function(){if($.contains(mainElement[0],this))isInside=!0;else if(isInside)return foundElement=this,!1;return!0})),foundElement);moduleElement.replaceWith(data);let affectedids=[];$("<div>"+data+"</div>").find(SELECTOR.ACTIVITYLI).each((function(index){initActionMenu($(this).attr("id")),0===index&&(!function(elementId,action){var mainelement=$("#"+elementId),selector="[data-action="+action+"]";"groupsseparate"!==action&&"groupsvisible"!==action&&"groupsnone"!==action||(selector="[data-action=groupsseparate],[data-action=groupsvisible],[data-action=groupsnone]"),mainelement.find(selector).is(":visible")?mainelement.find(selector).focus():mainelement.find(SELECTOR.MENU).find(SELECTOR.TOGGLE).focus()}($(this).attr("id"),action),elementToFocus=null),affectedids.push(getModuleId($(this)))})),elementToFocus&&elementToFocus.focus(),removeSpinner(moduleElement,spinner,400),removeLightbox(lightbox,400),moduleElement.trigger($.Event("coursemoduleedited",{ajaxreturn:data,action:action})),courseeditor.dispatch("legacyActivityAction",action,cmid,affectedids)})).fail((function(ex){removeSpinner(moduleElement,spinner),removeLightbox(lightbox);var e=$.Event("coursemoduleeditfailed",{exception:ex,action:action});moduleElement.trigger(e),e.isDefaultPrevented()||notification.exception(ex)}))},refreshModule=function(element,cmid,sectionreturn){void 0===sectionreturn&&(sectionreturn=courseeditor.sectionReturn);const activityElement=$(element);var spinner=addActivitySpinner(activityElement),promises=ajax.call([{methodname:"core_course_get_module",args:{id:cmid,sectionreturn:sectionreturn}}],!0);return new Promise(((resolve,reject)=>{$.when.apply($,promises).done((function(data){removeSpinner(activityElement,spinner,400),replaceActivityHtmlWith(data),resolve(data)})).fail((function(){removeSpinner(activityElement,spinner),reject()}))}))},confirmDeleteModule=function(mainelement,onconfirm){var modtypename=mainelement.attr("class").match(/modtype_([^\s]*)/)[1],modulename=function(element){var name;Y.use("moodle-course-util",(function(Y){name=Y.Moodle.core_course.util.cm.getName(Y.Node(element.get(0)))}));const state=courseeditor.state,cmid=getModuleId(element);var _state$cm$get;return!name&&state&&cmid&&(name=null===(_state$cm$get=state.cm.get(cmid))||void 0===_state$cm$get?void 0:_state$cm$get.name),name}(mainelement);str.get_string("pluginname",modtypename).done((function(pluginname){var plugindata={type:pluginname,name:modulename};str.get_strings([{key:"confirm",component:"core"},{key:null===modulename?"deletechecktype":"deletechecktypename",param:plugindata},{key:"yes"},{key:"no"}]).done((function(s){notification.confirm(s[0],s[1],s[2],s[3],onconfirm)}))}))},replaceActionItem=function(actionitem,image,stringname,stringcomponent,newaction){var stringRequests=[{key:stringname,component:stringcomponent}];return str.get_strings(stringRequests).then((function(strings){return actionitem.find("span.menu-action-text").html(strings[0]),templates.renderPix(image,"core")})).then((function(pixhtml){actionitem.find(".icon").replaceWith(pixhtml),actionitem.attr("data-action",newaction)})).catch(notification.exception)},defaultEditSectionHandler=function(sectionElement,actionItem,data,courseformat,sectionid){var action=actionItem.attr("data-action");if("hide"===action||"show"===action){if("hide"===action?(sectionElement.addClass("hidden"),setSectionBadge(sectionElement[0],"hiddenfromstudents",!0,!1),replaceActionItem(actionItem,"i/show","showfromothers","format_"+courseformat,"show")):(setSectionBadge(sectionElement[0],"hiddenfromstudents",!1,!1),sectionElement.removeClass("hidden"),replaceActionItem(actionItem,"i/hide","hidefromothers","format_"+courseformat,"hide")),void 0!==data.modules)for(var i in data.modules)replaceActivityHtmlWith(data.modules[i]);void 0!==data.section_availability&&sectionElement.find(".section_availability").first().replaceWith(data.section_availability);void 0!==courseeditor.state.section.get(sectionid)&&courseeditor.dispatch("sectionState",[sectionid])}else if("setmarker"===action){var oldmarker=$(SELECTOR.SECTIONLI+".current"),oldActionItem=oldmarker.find(SELECTOR.SECTIONACTIONMENU+" a[data-action=removemarker]");oldmarker.removeClass("current"),replaceActionItem(oldActionItem,"i/marker","highlight","core","setmarker"),sectionElement.addClass("current"),replaceActionItem(actionItem,"i/marked","highlightoff","core","removemarker"),courseeditor.dispatch("legacySectionAction",action,sectionid),setSectionBadge(sectionElement[0],"iscurrent",!0,!0)}else"removemarker"===action&&(sectionElement.removeClass("current"),replaceActionItem(actionItem,"i/marker","highlight","core","setmarker"),courseeditor.dispatch("legacySectionAction",action,sectionid),setSectionBadge(sectionElement[0],"iscurrent",!1,!0))};var replaceActivityHtmlWith=function(activityHTML){$("<div>"+activityHTML+"</div>").find(SELECTOR.ACTIVITYLI).each((function(){var id=$(this).attr("id");let focusedPath=function(id){const element=document.getElementById(id);if(element&&element.contains(document.activeElement))return element.querySelector(SELECTOR.ACTIONAREA).contains(document.activeElement)?"".concat(SELECTOR.ACTIONAREA,' [tabindex="0"]'):document.activeElement.id?"#".concat(document.activeElement.id):void 0}(id);if($(SELECTOR.ACTIVITYLI+"#"+id).replaceWith(activityHTML),initActionMenu(id),focusedPath){var _newItem$querySelecto;null===(_newItem$querySelecto=document.getElementById(id).querySelector(focusedPath))||void 0===_newItem$querySelecto||_newItem$querySelecto.focus()}}))},editSection=function(sectionElement,sectionid,target,courseformat){var action=target.attr("data-action"),sectionreturn=target.attr("data-sectionreturn")?target.attr("data-sectionreturn"):null;if(courseeditor.supportComponents&&componentActions.includes(action))return!1;var spinner=addSectionSpinner(sectionElement),promises=ajax.call([{methodname:"core_course_edit_section",args:{id:sectionid,action:action,sectionreturn:sectionreturn}}],!0),lightbox=addSectionLightbox(sectionElement);return $.when.apply($,promises).done((function(dataencoded){var data=$.parseJSON(dataencoded);removeSpinner(sectionElement,spinner),removeLightbox(lightbox),sectionElement.find(SELECTOR.SECTIONACTIONMENU).find(SELECTOR.TOGGLE).focus();var e=$.Event("coursesectionedited",{ajaxreturn:data,action:action});sectionElement.trigger(e),e.isDefaultPrevented()||defaultEditSectionHandler(sectionElement,target,data,courseformat,sectionid)})).fail((function(ex){removeSpinner(sectionElement,spinner),removeLightbox(lightbox);var e=$.Event("coursesectioneditfailed",{exception:ex,action:action});sectionElement.trigger(e),e.isDefaultPrevented()||notification.exception(ex)})),!0},setSectionBadge=function(sectionElement,badgetype,add,removeOther){const sectionbadges=sectionElement.querySelector(SELECTOR.SECTIONBADGES);if(!sectionbadges)return;const badge=sectionbadges.querySelector('[data-type="'+badgetype+'"]');badge&&(add?(removeOther&&document.querySelectorAll('[data-type="'+badgetype+'"]').forEach((b=>{b.classList.add("d-none")})),badge.classList.remove("d-none")):badge.classList.add("d-none"))};return Y.use("moodle-course-coursebase",(function(){M.course.coursebase.register_module({set_visibility_resource_ui:function(args){var mainelement=$(args.element.getDOMNode()),cmid=getModuleId(mainelement);if(cmid){var sectionreturn=mainelement.find("."+CSS_EDITINGMOVE).attr("data-sectionreturn");refreshModule(mainelement,cmid,sectionreturn)}},updateMovedCmState:params=>{const cm=courseeditor.state.cm.get(params.cmid);void 0!==cm&&courseeditor.dispatch("sectionState",[cm.sectionid]),courseeditor.dispatch("cmState",[params.cmid])},updateMovedSectionState:()=>{courseeditor.dispatch("courseState")}})})),courseeditor.addMutations({legacyActivityAction:function(statemanager,action,cmid,affectedids){const state=statemanager.state,cm=state.cm.get(cmid);if(void 0===cm)return;const section=state.section.get(cm.sectionid);if(void 0!==section){switch(courseeditor.dispatch("cmLock",[cm.id],!0),statemanager.setReadOnly(!1),cm.locked=!1,action){case"delete":section.cmlist=section.cmlist.reduce(((cmlist,current)=>(current!=cmid&&cmlist.push(current),cmlist)),[]),state.cm.delete(cmid);break;case"hide":case"show":case"duplicate":courseeditor.dispatch("cmState",affectedids)}statemanager.setReadOnly(!0)}},legacySectionAction:function(statemanager,action,sectionid){const state=statemanager.state,section=state.section.get(sectionid);if(void 0!==section){switch(statemanager.setReadOnly(!1),section.locked=!0,statemanager.setReadOnly(!0),statemanager.setReadOnly(!1),section.locked=!1,action){case"setmarker":state.section.forEach((current=>{current.id!=sectionid&&(current.current=!1)})),section.current=!0;break;case"removemarker":section.current=!1}statemanager.setReadOnly(!0)}}}),{initCoursePage:function(courseformat){if(formatname=courseformat,$("body").on("click keypress",SELECTOR.ACTIVITYLI+" "+SELECTOR.ACTIVITYACTION+"[data-action]",(function(e){if("keypress"!==e.type||13===e.keyCode){var actionItem=$(this),moduleElement=actionItem.closest(SELECTOR.ACTIVITYLI),action=actionItem.attr("data-action"),moduleId=getModuleId(moduleElement);switch(action){case"moveleft":case"moveright":case"delete":case"duplicate":case"hide":case"stealth":case"show":case"groupsseparate":case"groupsvisible":case"groupsnone":break;default:return}moduleId&&(e.preventDefault(),"delete"===action?confirmDeleteModule(moduleElement,(function(){editModule(moduleElement,moduleId,actionItem)})):editModule(moduleElement,moduleId,actionItem))}})),$("body").on("click keypress",SELECTOR.SECTIONLI+" "+SELECTOR.SECTIONACTIONMENU+"[data-sectionid] a[data-action]",(function(e){if("keypress"===e.type&&13!==e.keyCode)return;var actionItem=$(this),sectionElement=actionItem.closest(SELECTOR.SECTIONLI),sectionId=actionItem.closest(SELECTOR.SECTIONACTIONMENU).attr("data-sectionid");if("permalink"===actionItem.attr("data-action"))return e.preventDefault(),void ModalCopyToClipboard.create({text:actionItem.attr("href")},str.get_string("sectionlink","course"));let isExecuted=!0;var message,onconfirm;actionItem.attr("data-confirm")?(message=actionItem.attr("data-confirm"),onconfirm=function(){isExecuted=editSection(sectionElement,sectionId,actionItem,courseformat)},str.get_strings([{key:"confirm"},{key:"yes"},{key:"no"}]).done((function(s){notification.confirm(s[0],message,s[1],s[2],onconfirm)}))):isExecuted=editSection(sectionElement,sectionId,actionItem,courseformat),isExecuted&&e.preventDefault()})),$("body").on("updated","".concat(SELECTOR.SECTIONITEM," [data-inplaceeditable]"),(function(e){if(e.ajaxreturn&&e.ajaxreturn.itemid){void 0!==courseeditor.state.section.get(e.ajaxreturn.itemid)&&courseeditor.dispatch("sectionState",[e.ajaxreturn.itemid])}})),$("body").on("updated","".concat(SELECTOR.ACTIVITYLI," [data-inplaceeditable]"),(function(e){e.ajaxreturn&&e.ajaxreturn.itemid&&courseeditor.dispatch("cmState",[e.ajaxreturn.itemid])})),courseeditor.supportComponents&&componentActions.includes("addSection"))return;const trigger=$(SELECTOR.ADDSECTIONS),modalTitle=trigger.attr("data-add-sections"),newSections=trigger.attr("data-new-sections");str.get_string("numberweeks").then((function(strNumberSections){var modalBody=$('<div><label for="add_section_numsections"></label> <input id="add_section_numsections" type="number" min="1" max="'+newSections+'" value="1"></div>');return modalBody.find("label").html(strNumberSections),modalBody.html()})).then((body=>ModalSaveCancel.create({body:body,title:modalTitle}))).then((function(modal){var numSections=$(modal.getBody()).find("#add_section_numsections"),addSections=function(){""+parseInt(numSections.val())===numSections.val()&&parseInt(numSections.val())>=1&&(document.location=trigger.attr("href")+"&numsections="+parseInt(numSections.val()))};return modal.setSaveButtonText(modalTitle),modal.getRoot().on(ModalEvents.shown,(function(){numSections.focus().select().on("keydown",(function(e){e.keyCode===KeyCodes.enter&&addSections()}))})),modal.getRoot().on(ModalEvents.save,(function(e){e.preventDefault(),addSections()})),trigger.on("click",(e=>{e.preventDefault(),modal.show()})),modal})).catch(notification.exception)},replaceSectionActionItem:function(sectionelement,selector,image,stringname,stringcomponent,newaction){log.debug("replaceSectionActionItem() is deprecated and will be removed.");var actionitem=sectionelement.find(SELECTOR.SECTIONACTIONMENU+" "+selector);replaceActionItem(actionitem,image,stringname,stringcomponent,newaction)},refreshModule:refreshModule,refreshSection:function(element,sectionid,sectionreturn){void 0===sectionreturn&&(sectionreturn=courseeditor.sectionReturn);const sectionElement=$(element),promises=ajax.call([{methodname:"core_course_edit_section",args:{id:sectionid,action:"refresh",sectionreturn:sectionreturn}}],!0);var spinner=addSectionSpinner(sectionElement);return new Promise(((resolve,reject)=>{$.when.apply($,promises).done((dataencoded=>{removeSpinner(sectionElement,spinner);const data=$.parseJSON(dataencoded),newSectionElement=$(data.content);sectionElement.replaceWith(newSectionElement),$("".concat(SELECTOR.SECTIONLI,"#").concat(sectionid," ").concat(SELECTOR.ACTIVITYLI)).each(((index,activity)=>{initActionMenu(activity.data("id"))}));dispatchEvent(CourseEvents.sectionRefreshed,{ajaxreturn:data,action:"refresh",newSectionElement:newSectionElement.get(0)},newSectionElement).defaultPrevented||defaultEditSectionHandler(newSectionElement,$(SELECTOR.SECTIONLI+"#"+sectionid),data,formatname,sectionid),resolve(data)})).fail((ex=>{dispatchEvent("coursesectionrefreshfailed",{exception:ex,action:"refresh"},sectionElement).defaultPrevented||notification.exception(ex),reject()}))}))}}}));
+define("core_course/actions",["jquery","core/ajax","core/templates","core/notification","core/str","core/url","core/yui","core/modal_copy_to_clipboard","core/modal_save_cancel","core/modal_events","core/key_codes","core/log","core_courseformat/courseeditor","core/event_dispatcher","core_course/events"],(function($,ajax,templates,notification,str,url,Y,ModalCopyToClipboard,ModalSaveCancel,ModalEvents,KeyCodes,log,editor,EventDispatcher,CourseEvents){const componentActions=["moveSection","moveCm","addSection","deleteSection","cmDelete","cmDuplicate","sectionHide","sectionShow","cmHide","cmShow","cmStealth","sectionHighlight","sectionUnhighlight","cmMoveRight","cmMoveLeft","cmNoGroups","cmVisibleGroups","cmSeparateGroups"],courseeditor=editor.getCurrentCourseEditor();let formatname;var CSS_EDITINPROGRESS="editinprogress",CSS_EDITINGMOVE="editing_move",SELECTOR={ACTIVITYLI:"li.activity",ACTIONAREA:".actions",ACTIVITYACTION:"a.cm-edit-action",MENU:".moodle-actionmenu[data-enhance=moodle-core-actionmenu]",TOGGLE:".toggle-display,.dropdown-toggle",SECTIONLI:"li.section",SECTIONACTIONMENU:".section_action_menu",SECTIONACTIONMENUTRIGGER:".section-actions",SECTIONITEM:'[data-for="section_title"]',ADDSECTIONS:".changenumsections [data-add-sections]",SECTIONBADGES:'[data-region="sectionbadges"]'};Y.use("moodle-course-coursebase",(function(){var courseformatselector=M.course.format.get_section_selector();courseformatselector&&(SELECTOR.SECTIONLI=courseformatselector)}));const dispatchEvent=function(eventName,detail,container,options){return container instanceof Element||void 0===container.get||(container=container.get(0)),EventDispatcher.dispatchEvent(eventName,detail,container,options)};var getModuleId=function(element){const item=element.get(0);if(item.dataset.id)return item.dataset.id;let id;return Y.use("moodle-course-util",(function(Y){id=Y.Moodle.core_course.util.cm.getId(Y.Node(item))})),id},addActivitySpinner=function(activity){activity.addClass(CSS_EDITINPROGRESS);var actionarea=activity.find(SELECTOR.ACTIONAREA).get(0);if(actionarea){var spinner=M.util.add_spinner(Y,Y.Node(actionarea));return spinner.show(),void 0!==activity.data("id")&&courseeditor.dispatch("cmLock",[activity.data("id")],!0),spinner}return null},addSectionSpinner=function(sectionelement){sectionelement.addClass(CSS_EDITINPROGRESS);var actionarea=sectionelement.find(SELECTOR.SECTIONACTIONMENU).get(0);if(actionarea){var spinner=M.util.add_spinner(Y,Y.Node(actionarea));return spinner.show(),void 0!==sectionelement.data("id")&&courseeditor.dispatch("sectionLock",[sectionelement.data("id")],!0),spinner}return null},addSectionLightbox=function(sectionelement){const item=sectionelement.get(0);var lightbox=M.util.add_lightbox(Y,Y.Node(item));return"section"==item.dataset.for&&item.dataset.id&&(courseeditor.dispatch("sectionLock",[item.dataset.id],!0),lightbox.setAttribute("data-state","section"),lightbox.setAttribute("data-state-id",item.dataset.id)),lightbox.show(),lightbox},removeSpinner=function(element,spinner,delay){window.setTimeout((function(){if(element.removeClass(CSS_EDITINPROGRESS),spinner&&spinner.hide(),void 0!==element.data("id")){const mutation="section"===element.data("for")?"sectionLock":"cmLock";courseeditor.dispatch(mutation,[element.data("id")],!1)}}),delay)},removeLightbox=function(lightbox,delay){lightbox&&window.setTimeout((function(){lightbox.hide(),lightbox.getAttribute("data-state")&&courseeditor.dispatch("".concat(lightbox.getAttribute("data-state"),"Lock"),[lightbox.getAttribute("data-state-id")],!1)}),delay)},initActionMenu=function(elementid){Y.use("moodle-course-coursebase",(function(){M.course.coursebase.invoke_function("setup_for_resource","#"+elementid)})),M.core.actionmenu&&M.core.actionmenu.newDOMNode&&M.core.actionmenu.newDOMNode(Y.one("#"+elementid))},editModule=function(moduleElement,cmid,target){var lightbox,action=target.attr("data-action"),spinner=addActivitySpinner(moduleElement),promises=ajax.call([{methodname:"core_course_edit_module",args:{id:cmid,action:action,sectionreturn:target.attr("data-sectionreturn")?target.attr("data-sectionreturn"):null}}],!0);"duplicate"===action&&(lightbox=addSectionLightbox(target.closest(SELECTOR.SECTIONLI))),$.when.apply($,promises).done((function(data){var mainElement,tabables,isInside,foundElement,elementToFocus=(mainElement=moduleElement,tabables=$("a:visible"),isInside=!1,foundElement=null,tabables.each((function(){if($.contains(mainElement[0],this))isInside=!0;else if(isInside)return foundElement=this,!1;return!0})),foundElement);moduleElement.replaceWith(data);let affectedids=[];$("<div>"+data+"</div>").find(SELECTOR.ACTIVITYLI).each((function(index){initActionMenu($(this).attr("id")),0===index&&(!function(elementId,action){var mainelement=$("#"+elementId),selector="[data-action="+action+"]";"groupsseparate"!==action&&"groupsvisible"!==action&&"groupsnone"!==action||(selector="[data-action=groupsseparate],[data-action=groupsvisible],[data-action=groupsnone]"),mainelement.find(selector).is(":visible")?mainelement.find(selector).focus():mainelement.find(SELECTOR.MENU).find(SELECTOR.TOGGLE).focus()}($(this).attr("id"),action),elementToFocus=null),affectedids.push(getModuleId($(this)))})),elementToFocus&&elementToFocus.focus(),removeSpinner(moduleElement,spinner,400),removeLightbox(lightbox,400),moduleElement.trigger($.Event("coursemoduleedited",{ajaxreturn:data,action:action})),courseeditor.dispatch("legacyActivityAction",action,cmid,affectedids)})).fail((function(ex){removeSpinner(moduleElement,spinner),removeLightbox(lightbox);var e=$.Event("coursemoduleeditfailed",{exception:ex,action:action});moduleElement.trigger(e),e.isDefaultPrevented()||notification.exception(ex)}))},refreshModule=function(element,cmid,sectionreturn){void 0===sectionreturn&&(sectionreturn=courseeditor.sectionReturn);const activityElement=$(element);var spinner=addActivitySpinner(activityElement),promises=ajax.call([{methodname:"core_course_get_module",args:{id:cmid,sectionreturn:sectionreturn}}],!0);return new Promise(((resolve,reject)=>{$.when.apply($,promises).done((function(data){removeSpinner(activityElement,spinner,400),replaceActivityHtmlWith(data),resolve(data)})).fail((function(){removeSpinner(activityElement,spinner),reject()}))}))},confirmDeleteModule=function(mainelement,onconfirm){var modtypename=mainelement.attr("class").match(/modtype_([^\s]*)/)[1],modulename=function(element){var name;Y.use("moodle-course-util",(function(Y){name=Y.Moodle.core_course.util.cm.getName(Y.Node(element.get(0)))}));const state=courseeditor.state,cmid=getModuleId(element);var _state$cm$get;return!name&&state&&cmid&&(name=null===(_state$cm$get=state.cm.get(cmid))||void 0===_state$cm$get?void 0:_state$cm$get.name),name}(mainelement);str.get_string("pluginname",modtypename).done((function(pluginname){var plugindata={type:pluginname,name:modulename};str.get_strings([{key:"confirm",component:"core"},{key:null===modulename?"deletechecktype":"deletechecktypename",param:plugindata},{key:"yes"},{key:"no"}]).done((function(s){notification.confirm(s[0],s[1],s[2],s[3],onconfirm)}))}))},replaceActionItem=function(actionitem,image,stringname,stringcomponent,newaction){var stringRequests=[{key:stringname,component:stringcomponent}];return str.get_strings(stringRequests).then((function(strings){return actionitem.find("span.menu-action-text").html(strings[0]),templates.renderPix(image,"core")})).then((function(pixhtml){actionitem.find(".icon").replaceWith(pixhtml),actionitem.attr("data-action",newaction)})).catch(notification.exception)},defaultEditSectionHandler=function(sectionElement,actionItem,data,courseformat,sectionid){var action=actionItem.attr("data-action");if("hide"===action||"show"===action){if("hide"===action?(sectionElement.addClass("hidden"),setSectionBadge(sectionElement[0],"hiddenfromstudents",!0,!1),replaceActionItem(actionItem,"i/show","showfromothers","format_"+courseformat,"show")):(setSectionBadge(sectionElement[0],"hiddenfromstudents",!1,!1),sectionElement.removeClass("hidden"),replaceActionItem(actionItem,"i/hide","hidefromothers","format_"+courseformat,"hide")),void 0!==data.modules)for(var i in data.modules)replaceActivityHtmlWith(data.modules[i]);void 0!==data.section_availability&&sectionElement.find(".section_availability").first().replaceWith(data.section_availability);void 0!==courseeditor.state.section.get(sectionid)&&courseeditor.dispatch("sectionState",[sectionid])}else if("setmarker"===action){var oldmarker=$(SELECTOR.SECTIONLI+".current"),oldActionItem=oldmarker.find(SELECTOR.SECTIONACTIONMENU+" a[data-action=removemarker]");oldmarker.removeClass("current"),replaceActionItem(oldActionItem,"i/marker","highlight","core","setmarker"),sectionElement.addClass("current"),replaceActionItem(actionItem,"i/marked","highlightoff","core","removemarker"),courseeditor.dispatch("legacySectionAction",action,sectionid),setSectionBadge(sectionElement[0],"iscurrent",!0,!0)}else"removemarker"===action&&(sectionElement.removeClass("current"),replaceActionItem(actionItem,"i/marker","highlight","core","setmarker"),courseeditor.dispatch("legacySectionAction",action,sectionid),setSectionBadge(sectionElement[0],"iscurrent",!1,!0))};var replaceActivityHtmlWith=function(activityHTML){$("<div>"+activityHTML+"</div>").find(SELECTOR.ACTIVITYLI).each((function(){var id=$(this).attr("id");let focusedPath=function(id){const element=document.getElementById(id);if(element&&element.contains(document.activeElement))return element.querySelector(SELECTOR.ACTIONAREA).contains(document.activeElement)?"".concat(SELECTOR.ACTIONAREA,' [tabindex="0"]'):document.activeElement.id?"#".concat(document.activeElement.id):void 0}(id);if($(SELECTOR.ACTIVITYLI+"#"+id).replaceWith(activityHTML),initActionMenu(id),focusedPath){var _newItem$querySelecto;null===(_newItem$querySelecto=document.getElementById(id).querySelector(focusedPath))||void 0===_newItem$querySelecto||_newItem$querySelecto.focus()}}))},editSection=function(sectionElement,sectionid,target,courseformat){var action=target.attr("data-action"),sectionreturn=target.attr("data-sectionreturn")?target.attr("data-sectionreturn"):null;if(courseeditor.supportComponents&&componentActions.includes(action))return!1;var spinner=addSectionSpinner(sectionElement),promises=ajax.call([{methodname:"core_course_edit_section",args:{id:sectionid,action:action,sectionreturn:sectionreturn}}],!0),lightbox=addSectionLightbox(sectionElement);return $.when.apply($,promises).done((function(dataencoded){var data=$.parseJSON(dataencoded);removeSpinner(sectionElement,spinner),removeLightbox(lightbox),sectionElement.find(SELECTOR.SECTIONACTIONMENU).find(SELECTOR.TOGGLE).focus();var e=$.Event("coursesectionedited",{ajaxreturn:data,action:action});sectionElement.trigger(e),e.isDefaultPrevented()||defaultEditSectionHandler(sectionElement,target,data,courseformat,sectionid)})).fail((function(ex){removeSpinner(sectionElement,spinner),removeLightbox(lightbox);var e=$.Event("coursesectioneditfailed",{exception:ex,action:action});sectionElement.trigger(e),e.isDefaultPrevented()||notification.exception(ex)})),!0},setSectionBadge=function(sectionElement,badgetype,add,removeOther){const sectionbadges=sectionElement.querySelector(SELECTOR.SECTIONBADGES);if(!sectionbadges)return;const badge=sectionbadges.querySelector('[data-type="'+badgetype+'"]');badge&&(add?(removeOther&&document.querySelectorAll('[data-type="'+badgetype+'"]').forEach((b=>{b.classList.add("d-none")})),badge.classList.remove("d-none")):badge.classList.add("d-none"))};return Y.use("moodle-course-coursebase",(function(){M.course.coursebase.register_module({set_visibility_resource_ui:function(args){var mainelement=$(args.element.getDOMNode()),cmid=getModuleId(mainelement);if(cmid){var sectionreturn=mainelement.find("."+CSS_EDITINGMOVE).attr("data-sectionreturn");refreshModule(mainelement,cmid,sectionreturn)}},updateMovedCmState:params=>{const cm=courseeditor.state.cm.get(params.cmid);void 0!==cm&&courseeditor.dispatch("sectionState",[cm.sectionid]),courseeditor.dispatch("cmState",[params.cmid])},updateMovedSectionState:()=>{courseeditor.dispatch("courseState")}})})),courseeditor.addMutations({legacyActivityAction:function(statemanager,action,cmid,affectedids){const state=statemanager.state,cm=state.cm.get(cmid);if(void 0===cm)return;const section=state.section.get(cm.sectionid);if(void 0!==section){switch(courseeditor.dispatch("cmLock",[cm.id],!0),statemanager.setReadOnly(!1),cm.locked=!1,action){case"delete":section.cmlist=section.cmlist.reduce(((cmlist,current)=>(current!=cmid&&cmlist.push(current),cmlist)),[]),state.cm.delete(cmid);break;case"hide":case"show":case"duplicate":courseeditor.dispatch("cmState",affectedids)}statemanager.setReadOnly(!0)}},legacySectionAction:function(statemanager,action,sectionid){const state=statemanager.state,section=state.section.get(sectionid);if(void 0!==section){switch(statemanager.setReadOnly(!1),section.locked=!0,statemanager.setReadOnly(!0),statemanager.setReadOnly(!1),section.locked=!1,action){case"setmarker":state.section.forEach((current=>{current.id!=sectionid&&(current.current=!1)})),section.current=!0;break;case"removemarker":section.current=!1}statemanager.setReadOnly(!0)}}}),{initCoursePage:function(courseformat){if(formatname=courseformat,$("body").on("click keypress",SELECTOR.ACTIVITYLI+" "+SELECTOR.ACTIVITYACTION+"[data-action]",(function(e){if("keypress"!==e.type||13===e.keyCode){var actionItem=$(this),moduleElement=actionItem.closest(SELECTOR.ACTIVITYLI),action=actionItem.attr("data-action"),moduleId=getModuleId(moduleElement);switch(action){case"moveleft":case"moveright":case"delete":case"duplicate":case"hide":case"stealth":case"show":case"groupsseparate":case"groupsvisible":case"groupsnone":break;default:return}moduleId&&(e.preventDefault(),"delete"===action?confirmDeleteModule(moduleElement,(function(){editModule(moduleElement,moduleId,actionItem)})):editModule(moduleElement,moduleId,actionItem))}})),$("body").on("click keypress",SELECTOR.SECTIONACTIONMENUTRIGGER+"[data-sectionid] a[data-action]",(function(e){if("keypress"===e.type&&13!==e.keyCode)return;var actionItem=$(this),sectionElement=actionItem.closest(SELECTOR.SECTIONLI),sectionId=actionItem.closest(SELECTOR.SECTIONACTIONMENUTRIGGER).attr("data-sectionid");if("permalink"===actionItem.attr("data-action"))return e.preventDefault(),void ModalCopyToClipboard.create({text:actionItem.attr("href")},str.get_string("sectionlink","course"));let isExecuted=!0;var message,onconfirm;actionItem.attr("data-confirm")?(message=actionItem.attr("data-confirm"),onconfirm=function(){isExecuted=editSection(sectionElement,sectionId,actionItem,courseformat)},str.get_strings([{key:"confirm"},{key:"yes"},{key:"no"}]).done((function(s){notification.confirm(s[0],message,s[1],s[2],onconfirm)}))):isExecuted=editSection(sectionElement,sectionId,actionItem,courseformat),isExecuted&&e.preventDefault()})),$("body").on("updated","".concat(SELECTOR.SECTIONITEM," [data-inplaceeditable]"),(function(e){if(e.ajaxreturn&&e.ajaxreturn.itemid){void 0!==courseeditor.state.section.get(e.ajaxreturn.itemid)&&courseeditor.dispatch("sectionState",[e.ajaxreturn.itemid])}})),$("body").on("updated","".concat(SELECTOR.ACTIVITYLI," [data-inplaceeditable]"),(function(e){e.ajaxreturn&&e.ajaxreturn.itemid&&courseeditor.dispatch("cmState",[e.ajaxreturn.itemid])})),courseeditor.supportComponents&&componentActions.includes("addSection"))return;const trigger=$(SELECTOR.ADDSECTIONS),modalTitle=trigger.attr("data-add-sections"),newSections=trigger.attr("data-new-sections");str.get_string("numberweeks").then((function(strNumberSections){var modalBody=$('<div><label for="add_section_numsections"></label> <input id="add_section_numsections" type="number" min="1" max="'+newSections+'" value="1"></div>');return modalBody.find("label").html(strNumberSections),modalBody.html()})).then((body=>ModalSaveCancel.create({body:body,title:modalTitle}))).then((function(modal){var numSections=$(modal.getBody()).find("#add_section_numsections"),addSections=function(){""+parseInt(numSections.val())===numSections.val()&&parseInt(numSections.val())>=1&&(document.location=trigger.attr("href")+"&numsections="+parseInt(numSections.val()))};return modal.setSaveButtonText(modalTitle),modal.getRoot().on(ModalEvents.shown,(function(){numSections.focus().select().on("keydown",(function(e){e.keyCode===KeyCodes.enter&&addSections()}))})),modal.getRoot().on(ModalEvents.save,(function(e){e.preventDefault(),addSections()})),trigger.on("click",(e=>{e.preventDefault(),modal.show()})),modal})).catch(notification.exception)},replaceSectionActionItem:function(sectionelement,selector,image,stringname,stringcomponent,newaction){log.debug("replaceSectionActionItem() is deprecated and will be removed.");var actionitem=sectionelement.find(SELECTOR.SECTIONACTIONMENU+" "+selector);replaceActionItem(actionitem,image,stringname,stringcomponent,newaction)},refreshModule:refreshModule,refreshSection:function(element,sectionid,sectionreturn){void 0===sectionreturn&&(sectionreturn=courseeditor.sectionReturn);const sectionElement=$(element),promises=ajax.call([{methodname:"core_course_edit_section",args:{id:sectionid,action:"refresh",sectionreturn:sectionreturn}}],!0);var spinner=addSectionSpinner(sectionElement);return new Promise(((resolve,reject)=>{$.when.apply($,promises).done((dataencoded=>{removeSpinner(sectionElement,spinner);const data=$.parseJSON(dataencoded),newSectionElement=$(data.content);sectionElement.replaceWith(newSectionElement),$("".concat(SELECTOR.SECTIONLI,"#").concat(sectionid," ").concat(SELECTOR.ACTIVITYLI)).each(((index,activity)=>{initActionMenu(activity.data("id"))}));dispatchEvent(CourseEvents.sectionRefreshed,{ajaxreturn:data,action:"refresh",newSectionElement:newSectionElement.get(0)},newSectionElement).defaultPrevented||defaultEditSectionHandler(newSectionElement,$(SELECTOR.SECTIONLI+"#"+sectionid),data,formatname,sectionid),resolve(data)})).fail((ex=>{dispatchEvent("coursesectionrefreshfailed",{exception:ex,action:"refresh"},sectionElement).defaultPrevented||notification.exception(ex),reject()}))}))}}}));
 
 //# sourceMappingURL=actions.min.js.map
\ No newline at end of file
diff --git a/course/amd/build/actions.min.js.map b/course/amd/build/actions.min.js.map
index 94639c1ef9278..a7cf51b9e705d 100644
--- a/course/amd/build/actions.min.js.map
+++ b/course/amd/build/actions.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"actions.min.js","sources":["../src/actions.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Various actions on modules and sections in the editing mode - hiding, duplicating, deleting, etc.\n *\n * @module     core_course/actions\n * @copyright  2016 Marina Glancy\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n * @since      3.3\n */\ndefine(\n    [\n        'jquery',\n        'core/ajax',\n        'core/templates',\n        'core/notification',\n        'core/str',\n        'core/url',\n        'core/yui',\n        'core/modal_copy_to_clipboard',\n        'core/modal_save_cancel',\n        'core/modal_events',\n        'core/key_codes',\n        'core/log',\n        'core_courseformat/courseeditor',\n        'core/event_dispatcher',\n        'core_course/events'\n    ],\n    function(\n        $,\n        ajax,\n        templates,\n        notification,\n        str,\n        url,\n        Y,\n        ModalCopyToClipboard,\n        ModalSaveCancel,\n        ModalEvents,\n        KeyCodes,\n        log,\n        editor,\n        EventDispatcher,\n        CourseEvents\n    ) {\n\n        // Eventually, core_courseformat/local/content/actions will handle all actions for\n        // component compatible formats and the default actions.js won't be necessary anymore.\n        // Meanwhile, we filter the migrated actions.\n        const componentActions = [\n            'moveSection', 'moveCm', 'addSection', 'deleteSection', 'cmDelete', 'cmDuplicate', 'sectionHide', 'sectionShow',\n            'cmHide', 'cmShow', 'cmStealth', 'sectionHighlight', 'sectionUnhighlight', 'cmMoveRight', 'cmMoveLeft',\n            'cmNoGroups', 'cmVisibleGroups', 'cmSeparateGroups',\n        ];\n\n        // The course reactive instance.\n        const courseeditor = editor.getCurrentCourseEditor();\n\n        // The current course format name (loaded on init).\n        let formatname;\n\n        var CSS = {\n            EDITINPROGRESS: 'editinprogress',\n            SECTIONDRAGGABLE: 'sectiondraggable',\n            EDITINGMOVE: 'editing_move'\n        };\n        var SELECTOR = {\n            ACTIVITYLI: 'li.activity',\n            ACTIONAREA: '.actions',\n            ACTIVITYACTION: 'a.cm-edit-action',\n            MENU: '.moodle-actionmenu[data-enhance=moodle-core-actionmenu]',\n            TOGGLE: '.toggle-display,.dropdown-toggle',\n            SECTIONLI: 'li.section',\n            SECTIONACTIONMENU: '.section_action_menu',\n            SECTIONITEM: '[data-for=\"section_title\"]',\n            ADDSECTIONS: '.changenumsections [data-add-sections]',\n            SECTIONBADGES: '[data-region=\"sectionbadges\"]',\n        };\n\n        Y.use('moodle-course-coursebase', function() {\n            var courseformatselector = M.course.format.get_section_selector();\n            if (courseformatselector) {\n                SELECTOR.SECTIONLI = courseformatselector;\n            }\n        });\n\n        /**\n         * Dispatch event wrapper.\n         *\n         * Old jQuery events will be replaced by native events gradually.\n         *\n         * @method dispatchEvent\n         * @param {String} eventName The name of the event\n         * @param {Object} detail Any additional details to pass into the eveent\n         * @param {Node|HTMLElement} container The point at which to dispatch the event\n         * @param {Object} options\n         * @param {Boolean} options.bubbles Whether to bubble up the DOM\n         * @param {Boolean} options.cancelable Whether preventDefault() can be called\n         * @param {Boolean} options.composed Whether the event can bubble across the ShadowDOM boundary\n         * @returns {CustomEvent}\n         */\n        const dispatchEvent = function(eventName, detail, container, options) {\n            // Most actions still uses jQuery node instead of regular HTMLElement.\n            if (!(container instanceof Element) && container.get !== undefined) {\n                container = container.get(0);\n            }\n            return EventDispatcher.dispatchEvent(eventName, detail, container, options);\n        };\n\n        /**\n         * Wrapper for Y.Moodle.core_course.util.cm.getId\n         *\n         * @param {JQuery} element\n         * @returns {Integer}\n         */\n        var getModuleId = function(element) {\n            // Check if we have a data-id first.\n            const item = element.get(0);\n            if (item.dataset.id) {\n                return item.dataset.id;\n            }\n            // Use YUI way if data-id is not present.\n            let id;\n            Y.use('moodle-course-util', function(Y) {\n                id = Y.Moodle.core_course.util.cm.getId(Y.Node(item));\n            });\n            return id;\n        };\n\n        /**\n         * Wrapper for Y.Moodle.core_course.util.cm.getName\n         *\n         * @param {JQuery} element\n         * @returns {String}\n         */\n        var getModuleName = function(element) {\n            var name;\n            Y.use('moodle-course-util', function(Y) {\n                name = Y.Moodle.core_course.util.cm.getName(Y.Node(element.get(0)));\n            });\n            // Check if we have the name in the course state.\n            const state = courseeditor.state;\n            const cmid = getModuleId(element);\n            if (!name && state && cmid) {\n                name = state.cm.get(cmid)?.name;\n            }\n            return name;\n        };\n\n        /**\n         * Wrapper for M.util.add_spinner for an activity\n         *\n         * @param {JQuery} activity\n         * @returns {Node}\n         */\n        var addActivitySpinner = function(activity) {\n            activity.addClass(CSS.EDITINPROGRESS);\n            var actionarea = activity.find(SELECTOR.ACTIONAREA).get(0);\n            if (actionarea) {\n                var spinner = M.util.add_spinner(Y, Y.Node(actionarea));\n                spinner.show();\n                // Lock the activity state element.\n                if (activity.data('id') !== undefined) {\n                    courseeditor.dispatch('cmLock', [activity.data('id')], true);\n                }\n                return spinner;\n            }\n            return null;\n        };\n\n        /**\n         * Wrapper for M.util.add_spinner for a section\n         *\n         * @param {JQuery} sectionelement\n         * @returns {Node}\n         */\n        var addSectionSpinner = function(sectionelement) {\n            sectionelement.addClass(CSS.EDITINPROGRESS);\n            var actionarea = sectionelement.find(SELECTOR.SECTIONACTIONMENU).get(0);\n            if (actionarea) {\n                var spinner = M.util.add_spinner(Y, Y.Node(actionarea));\n                spinner.show();\n                // Lock the section state element.\n                if (sectionelement.data('id') !== undefined) {\n                    courseeditor.dispatch('sectionLock', [sectionelement.data('id')], true);\n                }\n                return spinner;\n            }\n            return null;\n        };\n\n        /**\n         * Wrapper for M.util.add_lightbox\n         *\n         * @param {JQuery} sectionelement\n         * @returns {Node}\n         */\n        var addSectionLightbox = function(sectionelement) {\n            const item = sectionelement.get(0);\n            var lightbox = M.util.add_lightbox(Y, Y.Node(item));\n            if (item.dataset.for == 'section' && item.dataset.id) {\n                courseeditor.dispatch('sectionLock', [item.dataset.id], true);\n                lightbox.setAttribute('data-state', 'section');\n                lightbox.setAttribute('data-state-id', item.dataset.id);\n            }\n            lightbox.show();\n            return lightbox;\n        };\n\n        /**\n         * Removes the spinner element\n         *\n         * @param {JQuery} element\n         * @param {Node} spinner\n         * @param {Number} delay\n         */\n        var removeSpinner = function(element, spinner, delay) {\n            window.setTimeout(function() {\n                element.removeClass(CSS.EDITINPROGRESS);\n                if (spinner) {\n                    spinner.hide();\n                }\n                // Unlock the state element.\n                if (element.data('id') !== undefined) {\n                    const mutation = (element.data('for') === 'section') ? 'sectionLock' : 'cmLock';\n                    courseeditor.dispatch(mutation, [element.data('id')], false);\n                }\n            }, delay);\n        };\n\n        /**\n         * Removes the lightbox element\n         *\n         * @param {Node} lightbox lighbox YUI element returned by addSectionLightbox\n         * @param {Number} delay\n         */\n        var removeLightbox = function(lightbox, delay) {\n            if (lightbox) {\n                window.setTimeout(function() {\n                    lightbox.hide();\n                    // Unlock state if necessary.\n                    if (lightbox.getAttribute('data-state')) {\n                        courseeditor.dispatch(\n                            `${lightbox.getAttribute('data-state')}Lock`,\n                            [lightbox.getAttribute('data-state-id')],\n                            false\n                        );\n                    }\n                }, delay);\n            }\n        };\n\n        /**\n         * Initialise action menu for the element (section or module)\n         *\n         * @param {String} elementid CSS id attribute of the element\n         */\n        var initActionMenu = function(elementid) {\n            // Initialise action menu in the new activity.\n            Y.use('moodle-course-coursebase', function() {\n                M.course.coursebase.invoke_function('setup_for_resource', '#' + elementid);\n            });\n            if (M.core.actionmenu && M.core.actionmenu.newDOMNode) {\n                M.core.actionmenu.newDOMNode(Y.one('#' + elementid));\n            }\n        };\n\n        /**\n         * Returns focus to the element that was clicked or \"Edit\" link if element is no longer visible.\n         *\n         * @param {String} elementId CSS id attribute of the element\n         * @param {String} action data-action property of the element that was clicked\n         */\n        var focusActionItem = function(elementId, action) {\n            var mainelement = $('#' + elementId);\n            var selector = '[data-action=' + action + ']';\n            if (action === 'groupsseparate' || action === 'groupsvisible' || action === 'groupsnone') {\n                // New element will have different data-action.\n                selector = '[data-action=groupsseparate],[data-action=groupsvisible],[data-action=groupsnone]';\n            }\n            if (mainelement.find(selector).is(':visible')) {\n                mainelement.find(selector).focus();\n            } else {\n                // Element not visible, focus the \"Edit\" link.\n                mainelement.find(SELECTOR.MENU).find(SELECTOR.TOGGLE).focus();\n            }\n        };\n\n        /**\n         * Find next <a> after the element\n         *\n         * @param {JQuery} mainElement element that is about to be deleted\n         * @returns {JQuery}\n         */\n        var findNextFocusable = function(mainElement) {\n            var tabables = $(\"a:visible\");\n            var isInside = false;\n            var foundElement = null;\n            tabables.each(function() {\n                if ($.contains(mainElement[0], this)) {\n                    isInside = true;\n                } else if (isInside) {\n                    foundElement = this;\n                    return false; // Returning false in .each() is equivalent to \"break;\" inside the loop in php.\n                }\n                return true;\n            });\n            return foundElement;\n        };\n\n        /**\n         * Performs an action on a module (moving, deleting, duplicating, hiding, etc.)\n         *\n         * @param {JQuery} moduleElement activity element we perform action on\n         * @param {Number} cmid\n         * @param {JQuery} target the element (menu item) that was clicked\n         */\n        var editModule = function(moduleElement, cmid, target) {\n            var action = target.attr('data-action');\n            var spinner = addActivitySpinner(moduleElement);\n            var promises = ajax.call([{\n                methodname: 'core_course_edit_module',\n                args: {id: cmid,\n                    action: action,\n                    sectionreturn: target.attr('data-sectionreturn') ? target.attr('data-sectionreturn') : null\n                }\n            }], true);\n\n            var lightbox;\n            if (action === 'duplicate') {\n                lightbox = addSectionLightbox(target.closest(SELECTOR.SECTIONLI));\n            }\n            $.when.apply($, promises)\n                .done(function(data) {\n                    var elementToFocus = findNextFocusable(moduleElement);\n                    moduleElement.replaceWith(data);\n                    let affectedids = [];\n                    // Initialise action menu for activity(ies) added as a result of this.\n                    $('<div>' + data + '</div>').find(SELECTOR.ACTIVITYLI).each(function(index) {\n                        initActionMenu($(this).attr('id'));\n                        if (index === 0) {\n                            focusActionItem($(this).attr('id'), action);\n                            elementToFocus = null;\n                        }\n                        // Save any activity id in cmids.\n                        affectedids.push(getModuleId($(this)));\n                    });\n                    // In case of activity deletion focus the next focusable element.\n                    if (elementToFocus) {\n                        elementToFocus.focus();\n                    }\n                    // Remove spinner and lightbox with a delay.\n                    removeSpinner(moduleElement, spinner, 400);\n                    removeLightbox(lightbox, 400);\n                    // Trigger event that can be observed by course formats.\n                    moduleElement.trigger($.Event('coursemoduleedited', {ajaxreturn: data, action: action}));\n\n                    // Modify cm state.\n                    courseeditor.dispatch('legacyActivityAction', action, cmid, affectedids);\n\n                }).fail(function(ex) {\n                    // Remove spinner and lightbox.\n                    removeSpinner(moduleElement, spinner);\n                    removeLightbox(lightbox);\n                    // Trigger event that can be observed by course formats.\n                    var e = $.Event('coursemoduleeditfailed', {exception: ex, action: action});\n                    moduleElement.trigger(e);\n                    if (!e.isDefaultPrevented()) {\n                        notification.exception(ex);\n                    }\n                });\n        };\n\n        /**\n         * Requests html for the module via WS core_course_get_module and updates the module on the course page\n         *\n         * Used after d&d of the module to another section\n         *\n         * @param {JQuery|Element} element\n         * @param {Number} cmid\n         * @param {Number} sectionreturn\n         * @return {Promise} the refresh promise\n         */\n        var refreshModule = function(element, cmid, sectionreturn) {\n\n            if (sectionreturn === undefined) {\n                sectionreturn = courseeditor.sectionReturn;\n            }\n\n            const activityElement = $(element);\n            var spinner = addActivitySpinner(activityElement);\n            var promises = ajax.call([{\n                methodname: 'core_course_get_module',\n                args: {id: cmid, sectionreturn: sectionreturn}\n            }], true);\n\n            return new Promise((resolve, reject) => {\n                $.when.apply($, promises)\n                    .done(function(data) {\n                        removeSpinner(activityElement, spinner, 400);\n                        replaceActivityHtmlWith(data);\n                        resolve(data);\n                    }).fail(function() {\n                        removeSpinner(activityElement, spinner);\n                        reject();\n                    });\n            });\n        };\n\n        /**\n         * Requests html for the section via WS core_course_edit_section and updates the section on the course page\n         *\n         * @param {JQuery|Element} element\n         * @param {Number} sectionid\n         * @param {Number} sectionreturn\n         * @return {Promise} the refresh promise\n         */\n        var refreshSection = function(element, sectionid, sectionreturn) {\n\n            if (sectionreturn === undefined) {\n                sectionreturn = courseeditor.sectionReturn;\n            }\n\n            const sectionElement = $(element);\n            const action = 'refresh';\n            const promises = ajax.call([{\n                methodname: 'core_course_edit_section',\n                args: {id: sectionid, action, sectionreturn},\n            }], true);\n\n            var spinner = addSectionSpinner(sectionElement);\n            return new Promise((resolve, reject) => {\n                $.when.apply($, promises)\n                    .done(dataencoded => {\n\n                        removeSpinner(sectionElement, spinner);\n                        const data = $.parseJSON(dataencoded);\n\n                        const newSectionElement = $(data.content);\n                        sectionElement.replaceWith(newSectionElement);\n\n                        // Init modules menus.\n                        $(`${SELECTOR.SECTIONLI}#${sectionid} ${SELECTOR.ACTIVITYLI}`).each(\n                            (index, activity) => {\n                                initActionMenu(activity.data('id'));\n                            }\n                        );\n\n                        // Trigger event that can be observed by course formats.\n                        const event = dispatchEvent(\n                            CourseEvents.sectionRefreshed,\n                            {\n                                ajaxreturn: data,\n                                action: action,\n                                newSectionElement: newSectionElement.get(0),\n                            },\n                            newSectionElement\n                        );\n\n                        if (!event.defaultPrevented) {\n                            defaultEditSectionHandler(\n                                newSectionElement, $(SELECTOR.SECTIONLI + '#' + sectionid),\n                                data,\n                                formatname,\n                                sectionid\n                            );\n                        }\n                        resolve(data);\n                    }).fail(ex => {\n                        // Trigger event that can be observed by course formats.\n                        const event = dispatchEvent(\n                            'coursesectionrefreshfailed',\n                            {exception: ex, action: action},\n                            sectionElement\n                        );\n                        if (!event.defaultPrevented) {\n                            notification.exception(ex);\n                        }\n                        reject();\n                    });\n            });\n        };\n\n        /**\n         * Displays the delete confirmation to delete a module\n         *\n         * @param {JQuery} mainelement activity element we perform action on\n         * @param {function} onconfirm function to execute on confirm\n         */\n        var confirmDeleteModule = function(mainelement, onconfirm) {\n            var modtypename = mainelement.attr('class').match(/modtype_([^\\s]*)/)[1];\n            var modulename = getModuleName(mainelement);\n\n            str.get_string('pluginname', modtypename).done(function(pluginname) {\n                var plugindata = {\n                    type: pluginname,\n                    name: modulename\n                };\n                str.get_strings([\n                    {key: 'confirm', component: 'core'},\n                    {key: modulename === null ? 'deletechecktype' : 'deletechecktypename', param: plugindata},\n                    {key: 'yes'},\n                    {key: 'no'}\n                ]).done(function(s) {\n                        notification.confirm(s[0], s[1], s[2], s[3], onconfirm);\n                    }\n                );\n            });\n        };\n\n        /**\n         * Displays the delete confirmation to delete a section\n         *\n         * @param {String} message confirmation message\n         * @param {function} onconfirm function to execute on confirm\n         */\n        var confirmEditSection = function(message, onconfirm) {\n            str.get_strings([\n                {key: 'confirm'}, // TODO link text\n                {key: 'yes'},\n                {key: 'no'}\n            ]).done(function(s) {\n                    notification.confirm(s[0], message, s[1], s[2], onconfirm);\n                }\n            );\n        };\n\n        /**\n         * Replaces an action menu item with another one (for example Show->Hide, Set marker->Remove marker)\n         *\n         * @param {JQuery} actionitem\n         * @param {String} image new image name (\"i/show\", \"i/hide\", etc.)\n         * @param {String} stringname new string for the action menu item\n         * @param {String} stringcomponent\n         * @param {String} newaction new value for data-action attribute of the link\n         * @return {Promise} promise which is resolved when the replacement has completed\n         */\n        var replaceActionItem = function(actionitem, image, stringname,\n                                           stringcomponent, newaction) {\n\n            var stringRequests = [{key: stringname, component: stringcomponent}];\n            // Do not provide an icon with duplicate, different text to the menu item.\n\n            return str.get_strings(stringRequests).then(function(strings) {\n                actionitem.find('span.menu-action-text').html(strings[0]);\n\n                return templates.renderPix(image, 'core');\n            }).then(function(pixhtml) {\n                actionitem.find('.icon').replaceWith(pixhtml);\n                actionitem.attr('data-action', newaction);\n                return;\n            }).catch(notification.exception);\n        };\n\n        /**\n         * Default post-processing for section AJAX edit actions.\n         *\n         * This can be overridden in course formats by listening to event coursesectionedited:\n         *\n         * $('body').on('coursesectionedited', 'li.section', function(e) {\n         *     var action = e.action,\n         *         sectionElement = $(e.target),\n         *         data = e.ajaxreturn;\n         *     // ... Do some processing here.\n         *     e.preventDefault(); // Prevent default handler.\n         * });\n         *\n         * @param {JQuery} sectionElement\n         * @param {JQuery} actionItem\n         * @param {Object} data\n         * @param {String} courseformat\n         * @param {Number} sectionid\n         */\n        var defaultEditSectionHandler = function(sectionElement, actionItem, data, courseformat, sectionid) {\n            var action = actionItem.attr('data-action');\n            if (action === 'hide' || action === 'show') {\n                if (action === 'hide') {\n                    sectionElement.addClass('hidden');\n                    setSectionBadge(sectionElement[0], 'hiddenfromstudents', true, false);\n                    replaceActionItem(actionItem, 'i/show',\n                        'showfromothers', 'format_' + courseformat, 'show');\n                } else {\n                    setSectionBadge(sectionElement[0], 'hiddenfromstudents', false, false);\n                    sectionElement.removeClass('hidden');\n                    replaceActionItem(actionItem, 'i/hide',\n                        'hidefromothers', 'format_' + courseformat, 'hide');\n                }\n                // Replace the modules with new html (that indicates that they are now hidden or not hidden).\n                if (data.modules !== undefined) {\n                    for (var i in data.modules) {\n                        replaceActivityHtmlWith(data.modules[i]);\n                    }\n                }\n                // Replace the section availability information.\n                if (data.section_availability !== undefined) {\n                    sectionElement.find('.section_availability').first().replaceWith(data.section_availability);\n                }\n                // Modify course state.\n                const section = courseeditor.state.section.get(sectionid);\n                if (section !== undefined) {\n                    courseeditor.dispatch('sectionState', [sectionid]);\n                }\n            } else if (action === 'setmarker') {\n                var oldmarker = $(SELECTOR.SECTIONLI + '.current'),\n                    oldActionItem = oldmarker.find(SELECTOR.SECTIONACTIONMENU + ' ' + 'a[data-action=removemarker]');\n                oldmarker.removeClass('current');\n                replaceActionItem(oldActionItem, 'i/marker',\n                    'highlight', 'core', 'setmarker');\n                sectionElement.addClass('current');\n                replaceActionItem(actionItem, 'i/marked',\n                    'highlightoff', 'core', 'removemarker');\n                courseeditor.dispatch('legacySectionAction', action, sectionid);\n                setSectionBadge(sectionElement[0], 'iscurrent', true, true);\n            } else if (action === 'removemarker') {\n                sectionElement.removeClass('current');\n                replaceActionItem(actionItem, 'i/marker',\n                    'highlight', 'core', 'setmarker');\n                courseeditor.dispatch('legacySectionAction', action, sectionid);\n                setSectionBadge(sectionElement[0], 'iscurrent', false, true);\n            }\n        };\n\n        /**\n         * Get the focused element path in an activity if any.\n         *\n         * This method is used to restore focus when the activity HTML is refreshed.\n         * Only the main course editor elements can be refocused as they are always present\n         * even if the activity content changes.\n         *\n         * @param {String} id the element id the activity element\n         * @return {String|undefined} the inner path of the focused element or undefined\n         */\n        const getActivityFocusedElement = function(id) {\n            const element = document.getElementById(id);\n            if (!element || !element.contains(document.activeElement)) {\n                return undefined;\n            }\n            // Check if the actions menu toggler is focused.\n            if (element.querySelector(SELECTOR.ACTIONAREA).contains(document.activeElement)) {\n                return `${SELECTOR.ACTIONAREA} [tabindex=\"0\"]`;\n            }\n            // Return the current element id if any.\n            if (document.activeElement.id) {\n                return `#${document.activeElement.id}`;\n            }\n            return undefined;\n        };\n\n        /**\n         * Replaces the course module with the new html (used to update module after it was edited or its visibility was changed).\n         *\n         * @param {String} activityHTML\n         */\n        var replaceActivityHtmlWith = function(activityHTML) {\n            $('<div>' + activityHTML + '</div>').find(SELECTOR.ACTIVITYLI).each(function() {\n                // Extract id from the new activity html.\n                var id = $(this).attr('id');\n                // Check if the current focused element is inside the activity.\n                let focusedPath = getActivityFocusedElement(id);\n                // Find the existing element with the same id and replace its contents with new html.\n                $(SELECTOR.ACTIVITYLI + '#' + id).replaceWith(activityHTML);\n                // Initialise action menu.\n                initActionMenu(id);\n                // Re-focus the previous elements.\n                if (focusedPath) {\n                    const newItem = document.getElementById(id);\n                    newItem.querySelector(focusedPath)?.focus();\n                }\n\n            });\n        };\n\n        /**\n         * Performs an action on a module (moving, deleting, duplicating, hiding, etc.)\n         *\n         * @param {JQuery} sectionElement section element we perform action on\n         * @param {Nunmber} sectionid\n         * @param {JQuery} target the element (menu item) that was clicked\n         * @param {String} courseformat\n         * @return {boolean} true the action call is sent to the server or false if it is ignored.\n         */\n        var editSection = function(sectionElement, sectionid, target, courseformat) {\n            var action = target.attr('data-action'),\n                sectionreturn = target.attr('data-sectionreturn') ? target.attr('data-sectionreturn') : null;\n\n            // Filter direct component handled actions.\n            if (courseeditor.supportComponents && componentActions.includes(action)) {\n                return false;\n            }\n\n            var spinner = addSectionSpinner(sectionElement);\n            var promises = ajax.call([{\n                methodname: 'core_course_edit_section',\n                args: {id: sectionid, action: action, sectionreturn: sectionreturn}\n            }], true);\n\n            var lightbox = addSectionLightbox(sectionElement);\n            $.when.apply($, promises)\n                .done(function(dataencoded) {\n                    var data = $.parseJSON(dataencoded);\n                    removeSpinner(sectionElement, spinner);\n                    removeLightbox(lightbox);\n                    sectionElement.find(SELECTOR.SECTIONACTIONMENU).find(SELECTOR.TOGGLE).focus();\n                    // Trigger event that can be observed by course formats.\n                    var e = $.Event('coursesectionedited', {ajaxreturn: data, action: action});\n                    sectionElement.trigger(e);\n                    if (!e.isDefaultPrevented()) {\n                        defaultEditSectionHandler(sectionElement, target, data, courseformat, sectionid);\n                    }\n                }).fail(function(ex) {\n                    // Remove spinner and lightbox.\n                    removeSpinner(sectionElement, spinner);\n                    removeLightbox(lightbox);\n                    // Trigger event that can be observed by course formats.\n                    var e = $.Event('coursesectioneditfailed', {exception: ex, action: action});\n                    sectionElement.trigger(e);\n                    if (!e.isDefaultPrevented()) {\n                        notification.exception(ex);\n                    }\n                });\n            return true;\n        };\n\n        /**\n         * Sets the section badge in the section header.\n         *\n         * @param {JQuery} sectionElement section element we perform action on\n         * @param {String} badgetype the type of badge this is for\n         * @param {bool} add true to add, false to remove\n         * @param {boolean} removeOther in case of adding a badge, whether to remove all other.\n         */\n        var setSectionBadge = function(sectionElement, badgetype, add, removeOther) {\n            const sectionbadges = sectionElement.querySelector(SELECTOR.SECTIONBADGES);\n            if (!sectionbadges) {\n                return;\n            }\n            const badge = sectionbadges.querySelector('[data-type=\"' + badgetype + '\"]');\n            if (!badge) {\n                return;\n            }\n            if (add) {\n                if (removeOther) {\n                    document.querySelectorAll('[data-type=\"' + badgetype + '\"]').forEach((b) => {\n                        b.classList.add('d-none');\n                    });\n                }\n                badge.classList.remove('d-none');\n            } else {\n                badge.classList.add('d-none');\n            }\n        };\n\n        // Register a function to be executed after D&D of an activity.\n        Y.use('moodle-course-coursebase', function() {\n            M.course.coursebase.register_module({\n                // Ignore camelcase eslint rule for the next line because it is an expected name of the callback.\n                // eslint-disable-next-line camelcase\n                set_visibility_resource_ui: function(args) {\n                    var mainelement = $(args.element.getDOMNode());\n                    var cmid = getModuleId(mainelement);\n                    if (cmid) {\n                        var sectionreturn = mainelement.find('.' + CSS.EDITINGMOVE).attr('data-sectionreturn');\n                        refreshModule(mainelement, cmid, sectionreturn);\n                    }\n                },\n                /**\n                 * Update the course state when some cm is moved via YUI.\n                 * @param {*} params\n                 */\n                updateMovedCmState: (params) => {\n                    const state = courseeditor.state;\n\n                    // Update old section.\n                    const cm = state.cm.get(params.cmid);\n                    if (cm !== undefined) {\n                        courseeditor.dispatch('sectionState', [cm.sectionid]);\n                    }\n                    // Update cm state.\n                    courseeditor.dispatch('cmState', [params.cmid]);\n                },\n                /**\n                 * Update the course state when some section is moved via YUI.\n                 */\n                updateMovedSectionState: () => {\n                    courseeditor.dispatch('courseState');\n                },\n            });\n        });\n\n        // From Moodle 4.0 all edit actions are being re-implemented as state mutation.\n        // This means all method from this \"actions\" module will be deprecated when all the course\n        // interface is migrated to reactive components.\n        // Most legacy actions did not provide enough information to regenarate the course so they\n        // use the mutations courseState, sectionState and cmState to get the updated state from\n        // the server. However, some activity actions where we can prevent an extra webservice\n        // call by implementing an adhoc mutation.\n        courseeditor.addMutations({\n            /**\n             * Compatibility function to update Moodle 4.0 course state using legacy actions.\n             *\n             * This method only updates some actions which does not require to use cmState mutation\n             * to get updated data form the server.\n             *\n             * @param {Object} statemanager the current state in read write mode\n             * @param {String} action the performed action\n             * @param {Number} cmid the affected course module id\n             * @param {Array} affectedids all affected cm ids (for duplicate action)\n             */\n            legacyActivityAction: function(statemanager, action, cmid, affectedids) {\n\n                const state = statemanager.state;\n                const cm = state.cm.get(cmid);\n                if (cm === undefined) {\n                    return;\n                }\n                const section = state.section.get(cm.sectionid);\n                if (section === undefined) {\n                    return;\n                }\n\n                // Send the element is locked.\n                courseeditor.dispatch('cmLock', [cm.id], true);\n\n                // Now we do the real mutation.\n                statemanager.setReadOnly(false);\n\n                // This unlocked will take effect when the read only is restored.\n                cm.locked = false;\n\n                switch (action) {\n                    case 'delete':\n                        // Remove from section.\n                        section.cmlist = section.cmlist.reduce(\n                            (cmlist, current) => {\n                                if (current != cmid) {\n                                    cmlist.push(current);\n                                }\n                                return cmlist;\n                            },\n                            []\n                        );\n                        // Delete form list.\n                        state.cm.delete(cmid);\n                        break;\n\n                    case 'hide':\n                    case 'show':\n                    case 'duplicate':\n                        courseeditor.dispatch('cmState', affectedids);\n                        break;\n                }\n                statemanager.setReadOnly(true);\n            },\n            legacySectionAction: function(statemanager, action, sectionid) {\n\n                const state = statemanager.state;\n                const section = state.section.get(sectionid);\n                if (section === undefined) {\n                    return;\n                }\n\n                // Send the element is locked. Reactive events are only triggered when the state\n                // read only mode is restored. We want to notify the interface the element is\n                // locked so we need to do a quick lock operation before performing the rest\n                // of the mutation.\n                statemanager.setReadOnly(false);\n                section.locked = true;\n                statemanager.setReadOnly(true);\n\n                // Now we do the real mutation.\n                statemanager.setReadOnly(false);\n\n                // This locked will take effect when the read only is restored.\n                section.locked = false;\n\n                switch (action) {\n                    case 'setmarker':\n                        // Remove previous marker.\n                        state.section.forEach((current) => {\n                            if (current.id != sectionid) {\n                                current.current = false;\n                            }\n                        });\n                        section.current = true;\n                        break;\n\n                    case 'removemarker':\n                        section.current = false;\n                        break;\n                }\n                statemanager.setReadOnly(true);\n            },\n        });\n\n        return /** @alias module:core_course/actions */ {\n\n            /**\n             * Initialises course page\n             *\n             * @method init\n             * @param {String} courseformat name of the current course format (for fetching strings)\n             */\n            initCoursePage: function(courseformat) {\n\n                formatname = courseformat;\n\n                // Add a handler for course module actions.\n                $('body').on('click keypress', SELECTOR.ACTIVITYLI + ' ' +\n                        SELECTOR.ACTIVITYACTION + '[data-action]', function(e) {\n                    if (e.type === 'keypress' && e.keyCode !== 13) {\n                        return;\n                    }\n                    var actionItem = $(this),\n                        moduleElement = actionItem.closest(SELECTOR.ACTIVITYLI),\n                        action = actionItem.attr('data-action'),\n                        moduleId = getModuleId(moduleElement);\n                    switch (action) {\n                        case 'moveleft':\n                        case 'moveright':\n                        case 'delete':\n                        case 'duplicate':\n                        case 'hide':\n                        case 'stealth':\n                        case 'show':\n                        case 'groupsseparate':\n                        case 'groupsvisible':\n                        case 'groupsnone':\n                            break;\n                        default:\n                            // Nothing to do here!\n                            return;\n                    }\n                    if (!moduleId) {\n                        return;\n                    }\n                    e.preventDefault();\n                    if (action === 'delete') {\n                        // Deleting requires confirmation.\n                        confirmDeleteModule(moduleElement, function() {\n                            editModule(moduleElement, moduleId, actionItem);\n                        });\n                    } else {\n                        editModule(moduleElement, moduleId, actionItem);\n                    }\n                });\n\n                // Add a handler for section show/hide actions.\n                $('body').on('click keypress', SELECTOR.SECTIONLI + ' ' +\n                            SELECTOR.SECTIONACTIONMENU + '[data-sectionid] ' +\n                            'a[data-action]', function(e) {\n                    if (e.type === 'keypress' && e.keyCode !== 13) {\n                        return;\n                    }\n                    var actionItem = $(this),\n                        sectionElement = actionItem.closest(SELECTOR.SECTIONLI),\n                        sectionId = actionItem.closest(SELECTOR.SECTIONACTIONMENU).attr('data-sectionid');\n\n                    if (actionItem.attr('data-action') === 'permalink') {\n                        e.preventDefault();\n                        ModalCopyToClipboard.create({\n                            text: actionItem.attr('href'),\n                        }, str.get_string('sectionlink', 'course')\n                        );\n                        return;\n                    }\n\n                    let isExecuted = true;\n                    if (actionItem.attr('data-confirm')) {\n                        // Action requires confirmation.\n                        confirmEditSection(actionItem.attr('data-confirm'), function() {\n                            isExecuted = editSection(sectionElement, sectionId, actionItem, courseformat);\n                        });\n                    } else {\n                        isExecuted = editSection(sectionElement, sectionId, actionItem, courseformat);\n                    }\n                    // Prevent any other module from capturing the action if it is already in execution.\n                    if (isExecuted) {\n                        e.preventDefault();\n                    }\n                });\n\n                // The section and activity names are edited using inplace editable.\n                // The \"update\" jQuery event must be captured in order to update the course state.\n                $('body').on('updated', `${SELECTOR.SECTIONITEM} [data-inplaceeditable]`, function(e) {\n                    if (e.ajaxreturn && e.ajaxreturn.itemid) {\n                        const state = courseeditor.state;\n                        const section = state.section.get(e.ajaxreturn.itemid);\n                        if (section !== undefined) {\n                            courseeditor.dispatch('sectionState', [e.ajaxreturn.itemid]);\n                        }\n                    }\n                });\n                $('body').on('updated', `${SELECTOR.ACTIVITYLI} [data-inplaceeditable]`, function(e) {\n                    if (e.ajaxreturn && e.ajaxreturn.itemid) {\n                        courseeditor.dispatch('cmState', [e.ajaxreturn.itemid]);\n                    }\n                });\n\n                // Component-based formats don't use modals to create sections.\n                if (courseeditor.supportComponents && componentActions.includes('addSection')) {\n                    return;\n                }\n\n                // Add a handler for \"Add sections\" link to ask for a number of sections to add.\n                const trigger = $(SELECTOR.ADDSECTIONS);\n                const modalTitle = trigger.attr('data-add-sections');\n                const newSections = trigger.attr('data-new-sections');\n                str.get_string('numberweeks')\n                .then(function(strNumberSections) {\n                    var modalBody = $('<div><label for=\"add_section_numsections\"></label> ' +\n                        '<input id=\"add_section_numsections\" type=\"number\" min=\"1\" max=\"' + newSections + '\" value=\"1\"></div>');\n                    modalBody.find('label').html(strNumberSections);\n\n                    return modalBody.html();\n                })\n                .then((body) => ModalSaveCancel.create({\n                    body,\n                    title: modalTitle,\n                }))\n                .then(function(modal) {\n                    var numSections = $(modal.getBody()).find('#add_section_numsections'),\n                    addSections = function() {\n                        // Check if value of the \"Number of sections\" is a valid positive integer and redirect\n                        // to adding a section script.\n                        if ('' + parseInt(numSections.val()) === numSections.val() && parseInt(numSections.val()) >= 1) {\n                            document.location = trigger.attr('href') + '&numsections=' + parseInt(numSections.val());\n                        }\n                    };\n                    modal.setSaveButtonText(modalTitle);\n                    modal.getRoot().on(ModalEvents.shown, function() {\n                        // When modal is shown focus and select the input and add a listener to keypress of \"Enter\".\n                        numSections.focus().select().on('keydown', function(e) {\n                            if (e.keyCode === KeyCodes.enter) {\n                                addSections();\n                            }\n                        });\n                    });\n                    modal.getRoot().on(ModalEvents.save, function(e) {\n                        // When modal \"Add\" button is pressed.\n                        e.preventDefault();\n                        addSections();\n                    });\n\n                    trigger.on('click', (e) => {\n                        e.preventDefault();\n                        modal.show();\n                    });\n\n                    return modal;\n                })\n                .catch(notification.exception);\n            },\n\n            /**\n             * Replaces a section action menu item with another one (for example Show->Hide, Set marker->Remove marker)\n             *\n             * This method can be used by course formats in their listener to the coursesectionedited event\n             *\n             * @deprecated since Moodle 3.9\n             * @param {JQuery} sectionelement\n             * @param {String} selector CSS selector inside the section element, for example \"a[data-action=show]\"\n             * @param {String} image new image name (\"i/show\", \"i/hide\", etc.)\n             * @param {String} stringname new string for the action menu item\n             * @param {String} stringcomponent\n             * @param {String} newaction new value for data-action attribute of the link\n             */\n            replaceSectionActionItem: function(sectionelement, selector, image, stringname,\n                                                    stringcomponent, newaction) {\n                log.debug('replaceSectionActionItem() is deprecated and will be removed.');\n                var actionitem = sectionelement.find(SELECTOR.SECTIONACTIONMENU + ' ' + selector);\n                replaceActionItem(actionitem, image, stringname, stringcomponent, newaction);\n            },\n            // Method to refresh a module.\n            refreshModule,\n            refreshSection,\n        };\n    });\n"],"names":["define","$","ajax","templates","notification","str","url","Y","ModalCopyToClipboard","ModalSaveCancel","ModalEvents","KeyCodes","log","editor","EventDispatcher","CourseEvents","componentActions","courseeditor","getCurrentCourseEditor","formatname","CSS","SELECTOR","ACTIVITYLI","ACTIONAREA","ACTIVITYACTION","MENU","TOGGLE","SECTIONLI","SECTIONACTIONMENU","SECTIONITEM","ADDSECTIONS","SECTIONBADGES","use","courseformatselector","M","course","format","get_section_selector","dispatchEvent","eventName","detail","container","options","Element","undefined","get","getModuleId","element","item","dataset","id","Moodle","core_course","util","cm","getId","Node","addActivitySpinner","activity","addClass","actionarea","find","spinner","add_spinner","show","data","dispatch","addSectionSpinner","sectionelement","addSectionLightbox","lightbox","add_lightbox","for","setAttribute","removeSpinner","delay","window","setTimeout","removeClass","hide","mutation","removeLightbox","getAttribute","initActionMenu","elementid","coursebase","invoke_function","core","actionmenu","newDOMNode","one","editModule","moduleElement","cmid","target","action","attr","promises","call","methodname","args","sectionreturn","closest","when","apply","done","mainElement","tabables","isInside","foundElement","elementToFocus","each","contains","this","replaceWith","affectedids","index","elementId","mainelement","selector","is","focus","focusActionItem","push","trigger","Event","ajaxreturn","fail","ex","e","exception","isDefaultPrevented","refreshModule","sectionReturn","activityElement","Promise","resolve","reject","replaceActivityHtmlWith","confirmDeleteModule","onconfirm","modtypename","match","modulename","name","getName","state","_state$cm$get","getModuleName","get_string","pluginname","plugindata","type","get_strings","key","component","param","s","confirm","replaceActionItem","actionitem","image","stringname","stringcomponent","newaction","stringRequests","then","strings","html","renderPix","pixhtml","catch","defaultEditSectionHandler","sectionElement","actionItem","courseformat","sectionid","setSectionBadge","modules","i","section_availability","first","section","oldmarker","oldActionItem","activityHTML","focusedPath","document","getElementById","activeElement","querySelector","getActivityFocusedElement","editSection","supportComponents","includes","dataencoded","parseJSON","badgetype","add","removeOther","sectionbadges","badge","querySelectorAll","forEach","b","classList","remove","register_module","set_visibility_resource_ui","getDOMNode","updateMovedCmState","params","updateMovedSectionState","addMutations","legacyActivityAction","statemanager","setReadOnly","locked","cmlist","reduce","current","delete","legacySectionAction","initCoursePage","on","keyCode","moduleId","preventDefault","sectionId","create","text","isExecuted","message","itemid","modalTitle","newSections","strNumberSections","modalBody","body","title","modal","numSections","getBody","addSections","parseInt","val","location","setSaveButtonText","getRoot","shown","select","enter","save","replaceSectionActionItem","debug","refreshSection","newSectionElement","content","sectionRefreshed","defaultPrevented"],"mappings":";;;;;;;;AAuBAA,6BACI,CACI,SACA,YACA,iBACA,oBACA,WACA,WACA,WACA,+BACA,yBACA,oBACA,iBACA,WACA,iCACA,wBACA,uBAEJ,SACIC,EACAC,KACAC,UACAC,aACAC,IACAC,IACAC,EACAC,qBACAC,gBACAC,YACAC,SACAC,IACAC,OACAC,gBACAC,oBAMMC,iBAAmB,CACrB,cAAe,SAAU,aAAc,gBAAiB,WAAY,cAAe,cAAe,cAClG,SAAU,SAAU,YAAa,mBAAoB,qBAAsB,cAAe,aAC1F,aAAc,kBAAmB,oBAI/BC,aAAeJ,OAAOK,6BAGxBC,eAEAC,mBACgB,iBADhBA,gBAGa,eAEbC,SAAW,CACXC,WAAY,cACZC,WAAY,WACZC,eAAgB,mBAChBC,KAAM,0DACNC,OAAQ,mCACRC,UAAW,aACXC,kBAAmB,uBACnBC,YAAa,6BACbC,YAAa,yCACbC,cAAe,iCAGnBxB,EAAEyB,IAAI,4BAA4B,eAC1BC,qBAAuBC,EAAEC,OAAOC,OAAOC,uBACvCJ,uBACAZ,SAASM,UAAYM,+BAmBvBK,cAAgB,SAASC,UAAWC,OAAQC,UAAWC,gBAEnDD,qBAAqBE,cAA8BC,IAAlBH,UAAUI,MAC7CJ,UAAYA,UAAUI,IAAI,IAEvB/B,gBAAgBwB,cAAcC,UAAWC,OAAQC,UAAWC,cASnEI,YAAc,SAASC,eAEjBC,KAAOD,QAAQF,IAAI,MACrBG,KAAKC,QAAQC,UACNF,KAAKC,QAAQC,OAGpBA,UACJ3C,EAAEyB,IAAI,sBAAsB,SAASzB,GACjC2C,GAAK3C,EAAE4C,OAAOC,YAAYC,KAAKC,GAAGC,MAAMhD,EAAEiD,KAAKR,UAE5CE,IA6BPO,mBAAqB,SAASC,UAC9BA,SAASC,SAASvC,wBACdwC,WAAaF,SAASG,KAAKxC,SAASE,YAAYsB,IAAI,MACpDe,WAAY,KACRE,QAAU5B,EAAEmB,KAAKU,YAAYxD,EAAGA,EAAEiD,KAAKI,oBAC3CE,QAAQE,YAEoBpB,IAAxBc,SAASO,KAAK,OACdhD,aAAaiD,SAAS,SAAU,CAACR,SAASO,KAAK,QAAQ,GAEpDH,eAEJ,MASPK,kBAAoB,SAASC,gBAC7BA,eAAeT,SAASvC,wBACpBwC,WAAaQ,eAAeP,KAAKxC,SAASO,mBAAmBiB,IAAI,MACjEe,WAAY,KACRE,QAAU5B,EAAEmB,KAAKU,YAAYxD,EAAGA,EAAEiD,KAAKI,oBAC3CE,QAAQE,YAE0BpB,IAA9BwB,eAAeH,KAAK,OACpBhD,aAAaiD,SAAS,cAAe,CAACE,eAAeH,KAAK,QAAQ,GAE/DH,eAEJ,MASPO,mBAAqB,SAASD,sBACxBpB,KAAOoB,eAAevB,IAAI,OAC5ByB,SAAWpC,EAAEmB,KAAKkB,aAAahE,EAAGA,EAAEiD,KAAKR,aACrB,WAApBA,KAAKC,QAAQuB,KAAoBxB,KAAKC,QAAQC,KAC9CjC,aAAaiD,SAAS,cAAe,CAAClB,KAAKC,QAAQC,KAAK,GACxDoB,SAASG,aAAa,aAAc,WACpCH,SAASG,aAAa,gBAAiBzB,KAAKC,QAAQC,KAExDoB,SAASN,OACFM,UAUPI,cAAgB,SAAS3B,QAASe,QAASa,OAC3CC,OAAOC,YAAW,cACd9B,QAAQ+B,YAAY1D,oBAChB0C,SACAA,QAAQiB,YAGenC,IAAvBG,QAAQkB,KAAK,MAAqB,OAC5Be,SAAoC,YAAxBjC,QAAQkB,KAAK,OAAwB,cAAgB,SACvEhD,aAAaiD,SAASc,SAAU,CAACjC,QAAQkB,KAAK,QAAQ,MAE3DU,QASHM,eAAiB,SAASX,SAAUK,OAChCL,UACAM,OAAOC,YAAW,WACdP,SAASS,OAELT,SAASY,aAAa,eACtBjE,aAAaiD,mBACNI,SAASY,aAAa,sBACzB,CAACZ,SAASY,aAAa,mBACvB,KAGTP,QASPQ,eAAiB,SAASC,WAE1B7E,EAAEyB,IAAI,4BAA4B,WAC9BE,EAAEC,OAAOkD,WAAWC,gBAAgB,qBAAsB,IAAMF,cAEhElD,EAAEqD,KAAKC,YAActD,EAAEqD,KAAKC,WAAWC,YACvCvD,EAAEqD,KAAKC,WAAWC,WAAWlF,EAAEmF,IAAI,IAAMN,aAsD7CO,WAAa,SAASC,cAAeC,KAAMC,YAWvCxB,SAVAyB,OAASD,OAAOE,KAAK,eACrBlC,QAAUL,mBAAmBmC,eAC7BK,SAAW/F,KAAKgG,KAAK,CAAC,CACtBC,WAAY,0BACZC,KAAM,CAAClD,GAAI2C,KACPE,OAAQA,OACRM,cAAeP,OAAOE,KAAK,sBAAwBF,OAAOE,KAAK,sBAAwB,SAE3F,GAGW,cAAXD,SACAzB,SAAWD,mBAAmByB,OAAOQ,QAAQjF,SAASM,aAE1D1B,EAAEsG,KAAKC,MAAMvG,EAAGgG,UACXQ,MAAK,SAASxC,UAvCUyC,YACzBC,SACAC,SACAC,aAqCQC,gBAxCiBJ,YAwCkBd,cAvC3Ce,SAAW1G,EAAE,aACb2G,UAAW,EACXC,aAAe,KACnBF,SAASI,MAAK,cACN9G,EAAE+G,SAASN,YAAY,GAAIO,MAC3BL,UAAW,OACR,GAAIA,gBACPC,aAAeI,MACR,SAEJ,KAEJJ,cA4BCjB,cAAcsB,YAAYjD,UACtBkD,YAAc,GAElBlH,EAAE,QAAUgE,KAAO,UAAUJ,KAAKxC,SAASC,YAAYyF,MAAK,SAASK,OACjEjC,eAAelF,EAAEgH,MAAMjB,KAAK,OACd,IAAVoB,SAnEE,SAASC,UAAWtB,YAClCuB,YAAcrH,EAAE,IAAMoH,WACtBE,SAAW,gBAAkBxB,OAAS,IAC3B,mBAAXA,QAA0C,kBAAXA,QAAyC,eAAXA,SAE7DwB,SAAW,qFAEXD,YAAYzD,KAAK0D,UAAUC,GAAG,YAC9BF,YAAYzD,KAAK0D,UAAUE,QAG3BH,YAAYzD,KAAKxC,SAASI,MAAMoC,KAAKxC,SAASK,QAAQ+F,QAyD1CC,CAAgBzH,EAAEgH,MAAMjB,KAAK,MAAOD,QACpCe,eAAiB,MAGrBK,YAAYQ,KAAK7E,YAAY7C,EAAEgH,WAG/BH,gBACAA,eAAeW,QAGnB/C,cAAckB,cAAe9B,QAAS,KACtCmB,eAAeX,SAAU,KAEzBsB,cAAcgC,QAAQ3H,EAAE4H,MAAM,qBAAsB,CAACC,WAAY7D,KAAM8B,OAAQA,UAG/E9E,aAAaiD,SAAS,uBAAwB6B,OAAQF,KAAMsB,gBAE7DY,MAAK,SAASC,IAEbtD,cAAckB,cAAe9B,SAC7BmB,eAAeX,cAEX2D,EAAIhI,EAAE4H,MAAM,yBAA0B,CAACK,UAAWF,GAAIjC,OAAQA,SAClEH,cAAcgC,QAAQK,GACjBA,EAAEE,sBACH/H,aAAa8H,UAAUF,QAenCI,cAAgB,SAASrF,QAAS8C,KAAMQ,oBAElBzD,IAAlByD,gBACAA,cAAgBpF,aAAaoH,qBAG3BC,gBAAkBrI,EAAE8C,aACtBe,QAAUL,mBAAmB6E,iBAC7BrC,SAAW/F,KAAKgG,KAAK,CAAC,CACtBC,WAAY,yBACZC,KAAM,CAAClD,GAAI2C,KAAMQ,cAAeA,kBAChC,UAEG,IAAIkC,SAAQ,CAACC,QAASC,UACzBxI,EAAEsG,KAAKC,MAAMvG,EAAGgG,UACXQ,MAAK,SAASxC,MACXS,cAAc4D,gBAAiBxE,QAAS,KACxC4E,wBAAwBzE,MACxBuE,QAAQvE,SACT8D,MAAK,WACJrD,cAAc4D,gBAAiBxE,SAC/B2E,gBAqFZE,oBAAsB,SAASrB,YAAasB,eACxCC,YAAcvB,YAAYtB,KAAK,SAAS8C,MAAM,oBAAoB,GAClEC,WApWY,SAAShG,aACrBiG,KACJzI,EAAEyB,IAAI,sBAAsB,SAASzB,GACjCyI,KAAOzI,EAAE4C,OAAOC,YAAYC,KAAKC,GAAG2F,QAAQ1I,EAAEiD,KAAKT,QAAQF,IAAI,cAG7DqG,MAAQjI,aAAaiI,MACrBrD,KAAO/C,YAAYC,kCACpBiG,MAAQE,OAASrD,OAClBmD,2BAAOE,MAAM5F,GAAGT,IAAIgD,sCAAbsD,cAAoBH,MAExBA,KAyVUI,CAAc9B,aAE/BjH,IAAIgJ,WAAW,aAAcR,aAAapC,MAAK,SAAS6C,gBAChDC,WAAa,CACbC,KAAMF,WACNN,KAAMD,YAEV1I,IAAIoJ,YAAY,CACZ,CAACC,IAAK,UAAWC,UAAW,QAC5B,CAACD,IAAoB,OAAfX,WAAsB,kBAAoB,sBAAuBa,MAAOL,YAC9E,CAACG,IAAK,OACN,CAACA,IAAK,QACPjD,MAAK,SAASoD,GACTzJ,aAAa0J,QAAQD,EAAE,GAAIA,EAAE,GAAIA,EAAE,GAAIA,EAAE,GAAIjB,kBAiCzDmB,kBAAoB,SAASC,WAAYC,MAAOC,WACjBC,gBAAiBC,eAE5CC,eAAiB,CAAC,CAACX,IAAKQ,WAAYP,UAAWQ,yBAG5C9J,IAAIoJ,YAAYY,gBAAgBC,MAAK,SAASC,gBACjDP,WAAWnG,KAAK,yBAAyB2G,KAAKD,QAAQ,IAE/CpK,UAAUsK,UAAUR,MAAO,WACnCK,MAAK,SAASI,SACbV,WAAWnG,KAAK,SAASqD,YAAYwD,SACrCV,WAAWhE,KAAK,cAAeoE,cAEhCO,MAAMvK,aAAa8H,YAsBtB0C,0BAA4B,SAASC,eAAgBC,WAAY7G,KAAM8G,aAAcC,eACjFjF,OAAS+E,WAAW9E,KAAK,kBACd,SAAXD,QAAgC,SAAXA,OAAmB,IACzB,SAAXA,QACA8E,eAAelH,SAAS,UACxBsH,gBAAgBJ,eAAe,GAAI,sBAAsB,GAAM,GAC/Dd,kBAAkBe,WAAY,SAC1B,iBAAkB,UAAYC,aAAc,UAEhDE,gBAAgBJ,eAAe,GAAI,sBAAsB,GAAO,GAChEA,eAAe/F,YAAY,UAC3BiF,kBAAkBe,WAAY,SAC1B,iBAAkB,UAAYC,aAAc,cAG/BnI,IAAjBqB,KAAKiH,YACA,IAAIC,KAAKlH,KAAKiH,QACfxC,wBAAwBzE,KAAKiH,QAAQC,SAIXvI,IAA9BqB,KAAKmH,sBACLP,eAAehH,KAAK,yBAAyBwH,QAAQnE,YAAYjD,KAAKmH,2BAI1DxI,IADA3B,aAAaiI,MAAMoC,QAAQzI,IAAImI,YAE3C/J,aAAaiD,SAAS,eAAgB,CAAC8G,iBAExC,GAAe,cAAXjF,OAAwB,KAC3BwF,UAAYtL,EAAEoB,SAASM,UAAY,YACnC6J,cAAgBD,UAAU1H,KAAKxC,SAASO,kBAATP,gCACnCkK,UAAUzG,YAAY,WACtBiF,kBAAkByB,cAAe,WAC7B,YAAa,OAAQ,aACzBX,eAAelH,SAAS,WACxBoG,kBAAkBe,WAAY,WAC1B,eAAgB,OAAQ,gBAC5B7J,aAAaiD,SAAS,sBAAuB6B,OAAQiF,WACrDC,gBAAgBJ,eAAe,GAAI,aAAa,GAAM,OACpC,iBAAX9E,SACP8E,eAAe/F,YAAY,WAC3BiF,kBAAkBe,WAAY,WAC1B,YAAa,OAAQ,aACzB7J,aAAaiD,SAAS,sBAAuB6B,OAAQiF,WACrDC,gBAAgBJ,eAAe,GAAI,aAAa,GAAO,SAmC3DnC,wBAA0B,SAAS+C,cACnCxL,EAAE,QAAUwL,aAAe,UAAU5H,KAAKxC,SAASC,YAAYyF,MAAK,eAE5D7D,GAAKjD,EAAEgH,MAAMjB,KAAK,UAElB0F,YA1BsB,SAASxI,UACjCH,QAAU4I,SAASC,eAAe1I,OACnCH,SAAYA,QAAQiE,SAAS2E,SAASE,sBAIvC9I,QAAQ+I,cAAczK,SAASE,YAAYyF,SAAS2E,SAASE,yBACnDxK,SAASE,8BAGnBoK,SAASE,cAAc3I,cACZyI,SAASE,cAAc3I,WAehB6I,CAA0B7I,OAE5CjD,EAAEoB,SAASC,WAAa,IAAM4B,IAAIgE,YAAYuE,cAE9CtG,eAAejC,IAEXwI,YAAa,yDACGC,SAASC,eAAe1I,IAChC4I,cAAcJ,qEAAcjE,aAe5CuE,YAAc,SAASnB,eAAgBG,UAAWlF,OAAQiF,kBACtDhF,OAASD,OAAOE,KAAK,eACrBK,cAAgBP,OAAOE,KAAK,sBAAwBF,OAAOE,KAAK,sBAAwB,QAGxF/E,aAAagL,mBAAqBjL,iBAAiBkL,SAASnG,eACrD,MAGPjC,QAAUK,kBAAkB0G,gBAC5B5E,SAAW/F,KAAKgG,KAAK,CAAC,CACtBC,WAAY,2BACZC,KAAM,CAAClD,GAAI8H,UAAWjF,OAAQA,OAAQM,cAAeA,kBACrD,GAEA/B,SAAWD,mBAAmBwG,uBAClC5K,EAAEsG,KAAKC,MAAMvG,EAAGgG,UACXQ,MAAK,SAAS0F,iBACPlI,KAAOhE,EAAEmM,UAAUD,aACvBzH,cAAcmG,eAAgB/G,SAC9BmB,eAAeX,UACfuG,eAAehH,KAAKxC,SAASO,mBAAmBiC,KAAKxC,SAASK,QAAQ+F,YAElEQ,EAAIhI,EAAE4H,MAAM,sBAAuB,CAACC,WAAY7D,KAAM8B,OAAQA,SAClE8E,eAAejD,QAAQK,GAClBA,EAAEE,sBACHyC,0BAA0BC,eAAgB/E,OAAQ7B,KAAM8G,aAAcC,cAE3EjD,MAAK,SAASC,IAEbtD,cAAcmG,eAAgB/G,SAC9BmB,eAAeX,cAEX2D,EAAIhI,EAAE4H,MAAM,0BAA2B,CAACK,UAAWF,GAAIjC,OAAQA,SACnE8E,eAAejD,QAAQK,GAClBA,EAAEE,sBACH/H,aAAa8H,UAAUF,QAG5B,GAWPiD,gBAAkB,SAASJ,eAAgBwB,UAAWC,IAAKC,mBACrDC,cAAgB3B,eAAeiB,cAAczK,SAASU,mBACvDyK,2BAGCC,MAAQD,cAAcV,cAAc,eAAiBO,UAAY,MAClEI,QAGDH,KACIC,aACAZ,SAASe,iBAAiB,eAAiBL,UAAY,MAAMM,SAASC,IAClEA,EAAEC,UAAUP,IAAI,aAGxBG,MAAMI,UAAUC,OAAO,WAEvBL,MAAMI,UAAUP,IAAI,mBAK5B/L,EAAEyB,IAAI,4BAA4B,WAC9BE,EAAEC,OAAOkD,WAAW0H,gBAAgB,CAGhCC,2BAA4B,SAAS5G,UAC7BkB,YAAcrH,EAAEmG,KAAKrD,QAAQkK,cAC7BpH,KAAO/C,YAAYwE,gBACnBzB,KAAM,KACFQ,cAAgBiB,YAAYzD,KAAK,IAAMzC,iBAAiB4E,KAAK,sBACjEoC,cAAcd,YAAazB,KAAMQ,iBAOzC6G,mBAAqBC,eAIX7J,GAHQrC,aAAaiI,MAGV5F,GAAGT,IAAIsK,OAAOtH,WACpBjD,IAAPU,IACArC,aAAaiD,SAAS,eAAgB,CAACZ,GAAG0H,YAG9C/J,aAAaiD,SAAS,UAAW,CAACiJ,OAAOtH,QAK7CuH,wBAAyB,KACrBnM,aAAaiD,SAAS,qBAYlCjD,aAAaoM,aAAa,CAYtBC,qBAAsB,SAASC,aAAcxH,OAAQF,KAAMsB,mBAEjD+B,MAAQqE,aAAarE,MACrB5F,GAAK4F,MAAM5F,GAAGT,IAAIgD,cACbjD,IAAPU,gBAGEgI,QAAUpC,MAAMoC,QAAQzI,IAAIS,GAAG0H,mBACrBpI,IAAZ0I,gBAKJrK,aAAaiD,SAAS,SAAU,CAACZ,GAAGJ,KAAK,GAGzCqK,aAAaC,aAAY,GAGzBlK,GAAGmK,QAAS,EAEJ1H,YACC,SAEDuF,QAAQoC,OAASpC,QAAQoC,OAAOC,QAC5B,CAACD,OAAQE,WACDA,SAAW/H,MACX6H,OAAO/F,KAAKiG,SAETF,SAEX,IAGJxE,MAAM5F,GAAGuK,OAAOhI,gBAGf,WACA,WACA,YACD5E,aAAaiD,SAAS,UAAWiD,aAGzCoG,aAAaC,aAAY,KAE7BM,oBAAqB,SAASP,aAAcxH,OAAQiF,iBAE1C9B,MAAQqE,aAAarE,MACrBoC,QAAUpC,MAAMoC,QAAQzI,IAAImI,mBAClBpI,IAAZ0I,gBAQJiC,aAAaC,aAAY,GACzBlC,QAAQmC,QAAS,EACjBF,aAAaC,aAAY,GAGzBD,aAAaC,aAAY,GAGzBlC,QAAQmC,QAAS,EAET1H,YACC,YAEDmD,MAAMoC,QAAQqB,SAASiB,UACfA,QAAQ1K,IAAM8H,YACd4C,QAAQA,SAAU,MAG1BtC,QAAQsC,SAAU,YAGjB,eACDtC,QAAQsC,SAAU,EAG1BL,aAAaC,aAAY,OAIe,CAQ5CO,eAAgB,SAAShD,iBAErB5J,WAAa4J,aAGb9K,EAAE,QAAQ+N,GAAG,iBAAkB3M,SAASC,WAAa,IAC7CD,SAASG,eAAiB,iBAAiB,SAASyG,MACzC,aAAXA,EAAEuB,MAAqC,KAAdvB,EAAEgG,aAG3BnD,WAAa7K,EAAEgH,MACfrB,cAAgBkF,WAAWxE,QAAQjF,SAASC,YAC5CyE,OAAS+E,WAAW9E,KAAK,eACzBkI,SAAWpL,YAAY8C,sBACnBG,YACC,eACA,gBACA,aACA,gBACA,WACA,cACA,WACA,qBACA,oBACA,kCAMJmI,WAGLjG,EAAEkG,iBACa,WAAXpI,OAEA4C,oBAAoB/C,eAAe,WAC/BD,WAAWC,cAAesI,SAAUpD,eAGxCnF,WAAWC,cAAesI,SAAUpD,iBAK5C7K,EAAE,QAAQ+N,GAAG,iBAAkB3M,SAASM,UAAY,IACxCN,SAASO,kBADUP,mCAED,SAAS4G,MACpB,aAAXA,EAAEuB,MAAqC,KAAdvB,EAAEgG,mBAG3BnD,WAAa7K,EAAEgH,MACf4D,eAAiBC,WAAWxE,QAAQjF,SAASM,WAC7CyM,UAAYtD,WAAWxE,QAAQjF,SAASO,mBAAmBoE,KAAK,qBAE7B,cAAnC8E,WAAW9E,KAAK,sBAChBiC,EAAEkG,sBACF3N,qBAAqB6N,OAAO,CACxBC,KAAMxD,WAAW9E,KAAK,SACvB3F,IAAIgJ,WAAW,cAAe,eAKjCkF,YAAa,EAlcJ,IAASC,QAAS5F,UAmc3BkC,WAAW9E,KAAK,iBAncEwI,QAqcC1D,WAAW9E,KAAK,gBArcR4C,UAqcyB,WAChD2F,WAAavC,YAAYnB,eAAgBuD,UAAWtD,WAAYC,eArchF1K,IAAIoJ,YAAY,CACZ,CAACC,IAAK,WACN,CAACA,IAAK,OACN,CAACA,IAAK,QACPjD,MAAK,SAASoD,GACTzJ,aAAa0J,QAAQD,EAAE,GAAI2E,QAAS3E,EAAE,GAAIA,EAAE,GAAIjB,eAmc5C2F,WAAavC,YAAYnB,eAAgBuD,UAAWtD,WAAYC,cAGhEwD,YACAtG,EAAEkG,oBAMVlO,EAAE,QAAQ+N,GAAG,oBAAc3M,SAASQ,wCAAsC,SAASoG,MAC3EA,EAAEH,YAAcG,EAAEH,WAAW2G,OAAQ,MAGrB7L,IAFF3B,aAAaiI,MACLoC,QAAQzI,IAAIoF,EAAEH,WAAW2G,SAE3CxN,aAAaiD,SAAS,eAAgB,CAAC+D,EAAEH,WAAW2G,aAIhExO,EAAE,QAAQ+N,GAAG,oBAAc3M,SAASC,uCAAqC,SAAS2G,GAC1EA,EAAEH,YAAcG,EAAEH,WAAW2G,QAC7BxN,aAAaiD,SAAS,UAAW,CAAC+D,EAAEH,WAAW2G,YAKnDxN,aAAagL,mBAAqBjL,iBAAiBkL,SAAS,2BAK1DtE,QAAU3H,EAAEoB,SAASS,aACrB4M,WAAa9G,QAAQ5B,KAAK,qBAC1B2I,YAAc/G,QAAQ5B,KAAK,qBACjC3F,IAAIgJ,WAAW,eACdiB,MAAK,SAASsE,uBACPC,UAAY5O,EAAE,qHACsD0O,YAAc,6BACtFE,UAAUhL,KAAK,SAAS2G,KAAKoE,mBAEtBC,UAAUrE,UAEpBF,MAAMwE,MAASrO,gBAAgB4N,OAAO,CACnCS,KAAAA,KACAC,MAAOL,eAEVpE,MAAK,SAAS0E,WACPC,YAAchP,EAAE+O,MAAME,WAAWrL,KAAK,4BAC1CsL,YAAc,WAGN,GAAKC,SAASH,YAAYI,SAAWJ,YAAYI,OAASD,SAASH,YAAYI,QAAU,IACzF1D,SAAS2D,SAAW1H,QAAQ5B,KAAK,QAAU,gBAAkBoJ,SAASH,YAAYI,gBAG1FL,MAAMO,kBAAkBb,YACxBM,MAAMQ,UAAUxB,GAAGtN,YAAY+O,OAAO,WAElCR,YAAYxH,QAAQiI,SAAS1B,GAAG,WAAW,SAAS/F,GAC5CA,EAAEgG,UAAYtN,SAASgP,OACvBR,oBAIZH,MAAMQ,UAAUxB,GAAGtN,YAAYkP,MAAM,SAAS3H,GAE1CA,EAAEkG,iBACFgB,iBAGJvH,QAAQoG,GAAG,SAAU/F,IACjBA,EAAEkG,iBACFa,MAAMhL,UAGHgL,SAEVrE,MAAMvK,aAAa8H,YAgBxB2H,yBAA0B,SAASzL,eAAgBmD,SAAU0C,MAAOC,WAC5BC,gBAAiBC,WACrDxJ,IAAIkP,MAAM,qEACN9F,WAAa5F,eAAeP,KAAKxC,SAASO,kBAAoB,IAAM2F,UACxEwC,kBAAkBC,WAAYC,MAAOC,WAAYC,gBAAiBC,YAGtEhC,cAAAA,cACA2H,eAjpBiB,SAAShN,QAASiI,UAAW3E,oBAExBzD,IAAlByD,gBACAA,cAAgBpF,aAAaoH,qBAG3BwC,eAAiB5K,EAAE8C,SAEnBkD,SAAW/F,KAAKgG,KAAK,CAAC,CACxBC,WAAY,2BACZC,KAAM,CAAClD,GAAI8H,UAAWjF,OAHX,UAGmBM,cAAAA,kBAC9B,OAEAvC,QAAUK,kBAAkB0G,uBACzB,IAAItC,SAAQ,CAACC,QAASC,UACzBxI,EAAEsG,KAAKC,MAAMvG,EAAGgG,UACXQ,MAAK0F,cAEFzH,cAAcmG,eAAgB/G,eACxBG,KAAOhE,EAAEmM,UAAUD,aAEnB6D,kBAAoB/P,EAAEgE,KAAKgM,SACjCpF,eAAe3D,YAAY8I,mBAG3B/P,YAAKoB,SAASM,sBAAaqJ,sBAAa3J,SAASC,aAAcyF,MAC3D,CAACK,MAAO1D,YACJyB,eAAezB,SAASO,KAAK,UAKvB3B,cACVvB,aAAamP,iBACb,CACIpI,WAAY7D,KACZ8B,OA7BL,UA8BKiK,kBAAmBA,kBAAkBnN,IAAI,IAE7CmN,mBAGOG,kBACPvF,0BACIoF,kBAAmB/P,EAAEoB,SAASM,UAAY,IAAMqJ,WAChD/G,KACA9C,WACA6J,WAGRxC,QAAQvE,SACT8D,MAAKC,KAEU1F,cACV,6BACA,CAAC4F,UAAWF,GAAIjC,OAhDjB,WAiDC8E,gBAEOsF,kBACP/P,aAAa8H,UAAUF,IAE3BS"}
\ No newline at end of file
+{"version":3,"file":"actions.min.js","sources":["../src/actions.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Various actions on modules and sections in the editing mode - hiding, duplicating, deleting, etc.\n *\n * @module     core_course/actions\n * @copyright  2016 Marina Glancy\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n * @since      3.3\n */\ndefine(\n    [\n        'jquery',\n        'core/ajax',\n        'core/templates',\n        'core/notification',\n        'core/str',\n        'core/url',\n        'core/yui',\n        'core/modal_copy_to_clipboard',\n        'core/modal_save_cancel',\n        'core/modal_events',\n        'core/key_codes',\n        'core/log',\n        'core_courseformat/courseeditor',\n        'core/event_dispatcher',\n        'core_course/events'\n    ],\n    function(\n        $,\n        ajax,\n        templates,\n        notification,\n        str,\n        url,\n        Y,\n        ModalCopyToClipboard,\n        ModalSaveCancel,\n        ModalEvents,\n        KeyCodes,\n        log,\n        editor,\n        EventDispatcher,\n        CourseEvents\n    ) {\n\n        // Eventually, core_courseformat/local/content/actions will handle all actions for\n        // component compatible formats and the default actions.js won't be necessary anymore.\n        // Meanwhile, we filter the migrated actions.\n        const componentActions = [\n            'moveSection', 'moveCm', 'addSection', 'deleteSection', 'cmDelete', 'cmDuplicate', 'sectionHide', 'sectionShow',\n            'cmHide', 'cmShow', 'cmStealth', 'sectionHighlight', 'sectionUnhighlight', 'cmMoveRight', 'cmMoveLeft',\n            'cmNoGroups', 'cmVisibleGroups', 'cmSeparateGroups',\n        ];\n\n        // The course reactive instance.\n        const courseeditor = editor.getCurrentCourseEditor();\n\n        // The current course format name (loaded on init).\n        let formatname;\n\n        var CSS = {\n            EDITINPROGRESS: 'editinprogress',\n            SECTIONDRAGGABLE: 'sectiondraggable',\n            EDITINGMOVE: 'editing_move'\n        };\n        var SELECTOR = {\n            ACTIVITYLI: 'li.activity',\n            ACTIONAREA: '.actions',\n            ACTIVITYACTION: 'a.cm-edit-action',\n            MENU: '.moodle-actionmenu[data-enhance=moodle-core-actionmenu]',\n            TOGGLE: '.toggle-display,.dropdown-toggle',\n            SECTIONLI: 'li.section',\n            SECTIONACTIONMENU: '.section_action_menu',\n            SECTIONACTIONMENUTRIGGER: '.section-actions',\n            SECTIONITEM: '[data-for=\"section_title\"]',\n            ADDSECTIONS: '.changenumsections [data-add-sections]',\n            SECTIONBADGES: '[data-region=\"sectionbadges\"]',\n        };\n\n        Y.use('moodle-course-coursebase', function() {\n            var courseformatselector = M.course.format.get_section_selector();\n            if (courseformatselector) {\n                SELECTOR.SECTIONLI = courseformatselector;\n            }\n        });\n\n        /**\n         * Dispatch event wrapper.\n         *\n         * Old jQuery events will be replaced by native events gradually.\n         *\n         * @method dispatchEvent\n         * @param {String} eventName The name of the event\n         * @param {Object} detail Any additional details to pass into the eveent\n         * @param {Node|HTMLElement} container The point at which to dispatch the event\n         * @param {Object} options\n         * @param {Boolean} options.bubbles Whether to bubble up the DOM\n         * @param {Boolean} options.cancelable Whether preventDefault() can be called\n         * @param {Boolean} options.composed Whether the event can bubble across the ShadowDOM boundary\n         * @returns {CustomEvent}\n         */\n        const dispatchEvent = function(eventName, detail, container, options) {\n            // Most actions still uses jQuery node instead of regular HTMLElement.\n            if (!(container instanceof Element) && container.get !== undefined) {\n                container = container.get(0);\n            }\n            return EventDispatcher.dispatchEvent(eventName, detail, container, options);\n        };\n\n        /**\n         * Wrapper for Y.Moodle.core_course.util.cm.getId\n         *\n         * @param {JQuery} element\n         * @returns {Integer}\n         */\n        var getModuleId = function(element) {\n            // Check if we have a data-id first.\n            const item = element.get(0);\n            if (item.dataset.id) {\n                return item.dataset.id;\n            }\n            // Use YUI way if data-id is not present.\n            let id;\n            Y.use('moodle-course-util', function(Y) {\n                id = Y.Moodle.core_course.util.cm.getId(Y.Node(item));\n            });\n            return id;\n        };\n\n        /**\n         * Wrapper for Y.Moodle.core_course.util.cm.getName\n         *\n         * @param {JQuery} element\n         * @returns {String}\n         */\n        var getModuleName = function(element) {\n            var name;\n            Y.use('moodle-course-util', function(Y) {\n                name = Y.Moodle.core_course.util.cm.getName(Y.Node(element.get(0)));\n            });\n            // Check if we have the name in the course state.\n            const state = courseeditor.state;\n            const cmid = getModuleId(element);\n            if (!name && state && cmid) {\n                name = state.cm.get(cmid)?.name;\n            }\n            return name;\n        };\n\n        /**\n         * Wrapper for M.util.add_spinner for an activity\n         *\n         * @param {JQuery} activity\n         * @returns {Node}\n         */\n        var addActivitySpinner = function(activity) {\n            activity.addClass(CSS.EDITINPROGRESS);\n            var actionarea = activity.find(SELECTOR.ACTIONAREA).get(0);\n            if (actionarea) {\n                var spinner = M.util.add_spinner(Y, Y.Node(actionarea));\n                spinner.show();\n                // Lock the activity state element.\n                if (activity.data('id') !== undefined) {\n                    courseeditor.dispatch('cmLock', [activity.data('id')], true);\n                }\n                return spinner;\n            }\n            return null;\n        };\n\n        /**\n         * Wrapper for M.util.add_spinner for a section\n         *\n         * @param {JQuery} sectionelement\n         * @returns {Node}\n         */\n        var addSectionSpinner = function(sectionelement) {\n            sectionelement.addClass(CSS.EDITINPROGRESS);\n            var actionarea = sectionelement.find(SELECTOR.SECTIONACTIONMENU).get(0);\n            if (actionarea) {\n                var spinner = M.util.add_spinner(Y, Y.Node(actionarea));\n                spinner.show();\n                // Lock the section state element.\n                if (sectionelement.data('id') !== undefined) {\n                    courseeditor.dispatch('sectionLock', [sectionelement.data('id')], true);\n                }\n                return spinner;\n            }\n            return null;\n        };\n\n        /**\n         * Wrapper for M.util.add_lightbox\n         *\n         * @param {JQuery} sectionelement\n         * @returns {Node}\n         */\n        var addSectionLightbox = function(sectionelement) {\n            const item = sectionelement.get(0);\n            var lightbox = M.util.add_lightbox(Y, Y.Node(item));\n            if (item.dataset.for == 'section' && item.dataset.id) {\n                courseeditor.dispatch('sectionLock', [item.dataset.id], true);\n                lightbox.setAttribute('data-state', 'section');\n                lightbox.setAttribute('data-state-id', item.dataset.id);\n            }\n            lightbox.show();\n            return lightbox;\n        };\n\n        /**\n         * Removes the spinner element\n         *\n         * @param {JQuery} element\n         * @param {Node} spinner\n         * @param {Number} delay\n         */\n        var removeSpinner = function(element, spinner, delay) {\n            window.setTimeout(function() {\n                element.removeClass(CSS.EDITINPROGRESS);\n                if (spinner) {\n                    spinner.hide();\n                }\n                // Unlock the state element.\n                if (element.data('id') !== undefined) {\n                    const mutation = (element.data('for') === 'section') ? 'sectionLock' : 'cmLock';\n                    courseeditor.dispatch(mutation, [element.data('id')], false);\n                }\n            }, delay);\n        };\n\n        /**\n         * Removes the lightbox element\n         *\n         * @param {Node} lightbox lighbox YUI element returned by addSectionLightbox\n         * @param {Number} delay\n         */\n        var removeLightbox = function(lightbox, delay) {\n            if (lightbox) {\n                window.setTimeout(function() {\n                    lightbox.hide();\n                    // Unlock state if necessary.\n                    if (lightbox.getAttribute('data-state')) {\n                        courseeditor.dispatch(\n                            `${lightbox.getAttribute('data-state')}Lock`,\n                            [lightbox.getAttribute('data-state-id')],\n                            false\n                        );\n                    }\n                }, delay);\n            }\n        };\n\n        /**\n         * Initialise action menu for the element (section or module)\n         *\n         * @param {String} elementid CSS id attribute of the element\n         */\n        var initActionMenu = function(elementid) {\n            // Initialise action menu in the new activity.\n            Y.use('moodle-course-coursebase', function() {\n                M.course.coursebase.invoke_function('setup_for_resource', '#' + elementid);\n            });\n            if (M.core.actionmenu && M.core.actionmenu.newDOMNode) {\n                M.core.actionmenu.newDOMNode(Y.one('#' + elementid));\n            }\n        };\n\n        /**\n         * Returns focus to the element that was clicked or \"Edit\" link if element is no longer visible.\n         *\n         * @param {String} elementId CSS id attribute of the element\n         * @param {String} action data-action property of the element that was clicked\n         */\n        var focusActionItem = function(elementId, action) {\n            var mainelement = $('#' + elementId);\n            var selector = '[data-action=' + action + ']';\n            if (action === 'groupsseparate' || action === 'groupsvisible' || action === 'groupsnone') {\n                // New element will have different data-action.\n                selector = '[data-action=groupsseparate],[data-action=groupsvisible],[data-action=groupsnone]';\n            }\n            if (mainelement.find(selector).is(':visible')) {\n                mainelement.find(selector).focus();\n            } else {\n                // Element not visible, focus the \"Edit\" link.\n                mainelement.find(SELECTOR.MENU).find(SELECTOR.TOGGLE).focus();\n            }\n        };\n\n        /**\n         * Find next <a> after the element\n         *\n         * @param {JQuery} mainElement element that is about to be deleted\n         * @returns {JQuery}\n         */\n        var findNextFocusable = function(mainElement) {\n            var tabables = $(\"a:visible\");\n            var isInside = false;\n            var foundElement = null;\n            tabables.each(function() {\n                if ($.contains(mainElement[0], this)) {\n                    isInside = true;\n                } else if (isInside) {\n                    foundElement = this;\n                    return false; // Returning false in .each() is equivalent to \"break;\" inside the loop in php.\n                }\n                return true;\n            });\n            return foundElement;\n        };\n\n        /**\n         * Performs an action on a module (moving, deleting, duplicating, hiding, etc.)\n         *\n         * @param {JQuery} moduleElement activity element we perform action on\n         * @param {Number} cmid\n         * @param {JQuery} target the element (menu item) that was clicked\n         */\n        var editModule = function(moduleElement, cmid, target) {\n            var action = target.attr('data-action');\n            var spinner = addActivitySpinner(moduleElement);\n            var promises = ajax.call([{\n                methodname: 'core_course_edit_module',\n                args: {id: cmid,\n                    action: action,\n                    sectionreturn: target.attr('data-sectionreturn') ? target.attr('data-sectionreturn') : null\n                }\n            }], true);\n\n            var lightbox;\n            if (action === 'duplicate') {\n                lightbox = addSectionLightbox(target.closest(SELECTOR.SECTIONLI));\n            }\n            $.when.apply($, promises)\n                .done(function(data) {\n                    var elementToFocus = findNextFocusable(moduleElement);\n                    moduleElement.replaceWith(data);\n                    let affectedids = [];\n                    // Initialise action menu for activity(ies) added as a result of this.\n                    $('<div>' + data + '</div>').find(SELECTOR.ACTIVITYLI).each(function(index) {\n                        initActionMenu($(this).attr('id'));\n                        if (index === 0) {\n                            focusActionItem($(this).attr('id'), action);\n                            elementToFocus = null;\n                        }\n                        // Save any activity id in cmids.\n                        affectedids.push(getModuleId($(this)));\n                    });\n                    // In case of activity deletion focus the next focusable element.\n                    if (elementToFocus) {\n                        elementToFocus.focus();\n                    }\n                    // Remove spinner and lightbox with a delay.\n                    removeSpinner(moduleElement, spinner, 400);\n                    removeLightbox(lightbox, 400);\n                    // Trigger event that can be observed by course formats.\n                    moduleElement.trigger($.Event('coursemoduleedited', {ajaxreturn: data, action: action}));\n\n                    // Modify cm state.\n                    courseeditor.dispatch('legacyActivityAction', action, cmid, affectedids);\n\n                }).fail(function(ex) {\n                    // Remove spinner and lightbox.\n                    removeSpinner(moduleElement, spinner);\n                    removeLightbox(lightbox);\n                    // Trigger event that can be observed by course formats.\n                    var e = $.Event('coursemoduleeditfailed', {exception: ex, action: action});\n                    moduleElement.trigger(e);\n                    if (!e.isDefaultPrevented()) {\n                        notification.exception(ex);\n                    }\n                });\n        };\n\n        /**\n         * Requests html for the module via WS core_course_get_module and updates the module on the course page\n         *\n         * Used after d&d of the module to another section\n         *\n         * @param {JQuery|Element} element\n         * @param {Number} cmid\n         * @param {Number} sectionreturn\n         * @return {Promise} the refresh promise\n         */\n        var refreshModule = function(element, cmid, sectionreturn) {\n\n            if (sectionreturn === undefined) {\n                sectionreturn = courseeditor.sectionReturn;\n            }\n\n            const activityElement = $(element);\n            var spinner = addActivitySpinner(activityElement);\n            var promises = ajax.call([{\n                methodname: 'core_course_get_module',\n                args: {id: cmid, sectionreturn: sectionreturn}\n            }], true);\n\n            return new Promise((resolve, reject) => {\n                $.when.apply($, promises)\n                    .done(function(data) {\n                        removeSpinner(activityElement, spinner, 400);\n                        replaceActivityHtmlWith(data);\n                        resolve(data);\n                    }).fail(function() {\n                        removeSpinner(activityElement, spinner);\n                        reject();\n                    });\n            });\n        };\n\n        /**\n         * Requests html for the section via WS core_course_edit_section and updates the section on the course page\n         *\n         * @param {JQuery|Element} element\n         * @param {Number} sectionid\n         * @param {Number} sectionreturn\n         * @return {Promise} the refresh promise\n         */\n        var refreshSection = function(element, sectionid, sectionreturn) {\n\n            if (sectionreturn === undefined) {\n                sectionreturn = courseeditor.sectionReturn;\n            }\n\n            const sectionElement = $(element);\n            const action = 'refresh';\n            const promises = ajax.call([{\n                methodname: 'core_course_edit_section',\n                args: {id: sectionid, action, sectionreturn},\n            }], true);\n\n            var spinner = addSectionSpinner(sectionElement);\n            return new Promise((resolve, reject) => {\n                $.when.apply($, promises)\n                    .done(dataencoded => {\n\n                        removeSpinner(sectionElement, spinner);\n                        const data = $.parseJSON(dataencoded);\n\n                        const newSectionElement = $(data.content);\n                        sectionElement.replaceWith(newSectionElement);\n\n                        // Init modules menus.\n                        $(`${SELECTOR.SECTIONLI}#${sectionid} ${SELECTOR.ACTIVITYLI}`).each(\n                            (index, activity) => {\n                                initActionMenu(activity.data('id'));\n                            }\n                        );\n\n                        // Trigger event that can be observed by course formats.\n                        const event = dispatchEvent(\n                            CourseEvents.sectionRefreshed,\n                            {\n                                ajaxreturn: data,\n                                action: action,\n                                newSectionElement: newSectionElement.get(0),\n                            },\n                            newSectionElement\n                        );\n\n                        if (!event.defaultPrevented) {\n                            defaultEditSectionHandler(\n                                newSectionElement, $(SELECTOR.SECTIONLI + '#' + sectionid),\n                                data,\n                                formatname,\n                                sectionid\n                            );\n                        }\n                        resolve(data);\n                    }).fail(ex => {\n                        // Trigger event that can be observed by course formats.\n                        const event = dispatchEvent(\n                            'coursesectionrefreshfailed',\n                            {exception: ex, action: action},\n                            sectionElement\n                        );\n                        if (!event.defaultPrevented) {\n                            notification.exception(ex);\n                        }\n                        reject();\n                    });\n            });\n        };\n\n        /**\n         * Displays the delete confirmation to delete a module\n         *\n         * @param {JQuery} mainelement activity element we perform action on\n         * @param {function} onconfirm function to execute on confirm\n         */\n        var confirmDeleteModule = function(mainelement, onconfirm) {\n            var modtypename = mainelement.attr('class').match(/modtype_([^\\s]*)/)[1];\n            var modulename = getModuleName(mainelement);\n\n            str.get_string('pluginname', modtypename).done(function(pluginname) {\n                var plugindata = {\n                    type: pluginname,\n                    name: modulename\n                };\n                str.get_strings([\n                    {key: 'confirm', component: 'core'},\n                    {key: modulename === null ? 'deletechecktype' : 'deletechecktypename', param: plugindata},\n                    {key: 'yes'},\n                    {key: 'no'}\n                ]).done(function(s) {\n                        notification.confirm(s[0], s[1], s[2], s[3], onconfirm);\n                    }\n                );\n            });\n        };\n\n        /**\n         * Displays the delete confirmation to delete a section\n         *\n         * @param {String} message confirmation message\n         * @param {function} onconfirm function to execute on confirm\n         */\n        var confirmEditSection = function(message, onconfirm) {\n            str.get_strings([\n                {key: 'confirm'}, // TODO link text\n                {key: 'yes'},\n                {key: 'no'}\n            ]).done(function(s) {\n                    notification.confirm(s[0], message, s[1], s[2], onconfirm);\n                }\n            );\n        };\n\n        /**\n         * Replaces an action menu item with another one (for example Show->Hide, Set marker->Remove marker)\n         *\n         * @param {JQuery} actionitem\n         * @param {String} image new image name (\"i/show\", \"i/hide\", etc.)\n         * @param {String} stringname new string for the action menu item\n         * @param {String} stringcomponent\n         * @param {String} newaction new value for data-action attribute of the link\n         * @return {Promise} promise which is resolved when the replacement has completed\n         */\n        var replaceActionItem = function(actionitem, image, stringname,\n                                           stringcomponent, newaction) {\n\n            var stringRequests = [{key: stringname, component: stringcomponent}];\n            // Do not provide an icon with duplicate, different text to the menu item.\n\n            return str.get_strings(stringRequests).then(function(strings) {\n                actionitem.find('span.menu-action-text').html(strings[0]);\n\n                return templates.renderPix(image, 'core');\n            }).then(function(pixhtml) {\n                actionitem.find('.icon').replaceWith(pixhtml);\n                actionitem.attr('data-action', newaction);\n                return;\n            }).catch(notification.exception);\n        };\n\n        /**\n         * Default post-processing for section AJAX edit actions.\n         *\n         * This can be overridden in course formats by listening to event coursesectionedited:\n         *\n         * $('body').on('coursesectionedited', 'li.section', function(e) {\n         *     var action = e.action,\n         *         sectionElement = $(e.target),\n         *         data = e.ajaxreturn;\n         *     // ... Do some processing here.\n         *     e.preventDefault(); // Prevent default handler.\n         * });\n         *\n         * @param {JQuery} sectionElement\n         * @param {JQuery} actionItem\n         * @param {Object} data\n         * @param {String} courseformat\n         * @param {Number} sectionid\n         */\n        var defaultEditSectionHandler = function(sectionElement, actionItem, data, courseformat, sectionid) {\n            var action = actionItem.attr('data-action');\n            if (action === 'hide' || action === 'show') {\n                if (action === 'hide') {\n                    sectionElement.addClass('hidden');\n                    setSectionBadge(sectionElement[0], 'hiddenfromstudents', true, false);\n                    replaceActionItem(actionItem, 'i/show',\n                        'showfromothers', 'format_' + courseformat, 'show');\n                } else {\n                    setSectionBadge(sectionElement[0], 'hiddenfromstudents', false, false);\n                    sectionElement.removeClass('hidden');\n                    replaceActionItem(actionItem, 'i/hide',\n                        'hidefromothers', 'format_' + courseformat, 'hide');\n                }\n                // Replace the modules with new html (that indicates that they are now hidden or not hidden).\n                if (data.modules !== undefined) {\n                    for (var i in data.modules) {\n                        replaceActivityHtmlWith(data.modules[i]);\n                    }\n                }\n                // Replace the section availability information.\n                if (data.section_availability !== undefined) {\n                    sectionElement.find('.section_availability').first().replaceWith(data.section_availability);\n                }\n                // Modify course state.\n                const section = courseeditor.state.section.get(sectionid);\n                if (section !== undefined) {\n                    courseeditor.dispatch('sectionState', [sectionid]);\n                }\n            } else if (action === 'setmarker') {\n                var oldmarker = $(SELECTOR.SECTIONLI + '.current'),\n                    oldActionItem = oldmarker.find(SELECTOR.SECTIONACTIONMENU + ' ' + 'a[data-action=removemarker]');\n                oldmarker.removeClass('current');\n                replaceActionItem(oldActionItem, 'i/marker',\n                    'highlight', 'core', 'setmarker');\n                sectionElement.addClass('current');\n                replaceActionItem(actionItem, 'i/marked',\n                    'highlightoff', 'core', 'removemarker');\n                courseeditor.dispatch('legacySectionAction', action, sectionid);\n                setSectionBadge(sectionElement[0], 'iscurrent', true, true);\n            } else if (action === 'removemarker') {\n                sectionElement.removeClass('current');\n                replaceActionItem(actionItem, 'i/marker',\n                    'highlight', 'core', 'setmarker');\n                courseeditor.dispatch('legacySectionAction', action, sectionid);\n                setSectionBadge(sectionElement[0], 'iscurrent', false, true);\n            }\n        };\n\n        /**\n         * Get the focused element path in an activity if any.\n         *\n         * This method is used to restore focus when the activity HTML is refreshed.\n         * Only the main course editor elements can be refocused as they are always present\n         * even if the activity content changes.\n         *\n         * @param {String} id the element id the activity element\n         * @return {String|undefined} the inner path of the focused element or undefined\n         */\n        const getActivityFocusedElement = function(id) {\n            const element = document.getElementById(id);\n            if (!element || !element.contains(document.activeElement)) {\n                return undefined;\n            }\n            // Check if the actions menu toggler is focused.\n            if (element.querySelector(SELECTOR.ACTIONAREA).contains(document.activeElement)) {\n                return `${SELECTOR.ACTIONAREA} [tabindex=\"0\"]`;\n            }\n            // Return the current element id if any.\n            if (document.activeElement.id) {\n                return `#${document.activeElement.id}`;\n            }\n            return undefined;\n        };\n\n        /**\n         * Replaces the course module with the new html (used to update module after it was edited or its visibility was changed).\n         *\n         * @param {String} activityHTML\n         */\n        var replaceActivityHtmlWith = function(activityHTML) {\n            $('<div>' + activityHTML + '</div>').find(SELECTOR.ACTIVITYLI).each(function() {\n                // Extract id from the new activity html.\n                var id = $(this).attr('id');\n                // Check if the current focused element is inside the activity.\n                let focusedPath = getActivityFocusedElement(id);\n                // Find the existing element with the same id and replace its contents with new html.\n                $(SELECTOR.ACTIVITYLI + '#' + id).replaceWith(activityHTML);\n                // Initialise action menu.\n                initActionMenu(id);\n                // Re-focus the previous elements.\n                if (focusedPath) {\n                    const newItem = document.getElementById(id);\n                    newItem.querySelector(focusedPath)?.focus();\n                }\n\n            });\n        };\n\n        /**\n         * Performs an action on a module (moving, deleting, duplicating, hiding, etc.)\n         *\n         * @param {JQuery} sectionElement section element we perform action on\n         * @param {Nunmber} sectionid\n         * @param {JQuery} target the element (menu item) that was clicked\n         * @param {String} courseformat\n         * @return {boolean} true the action call is sent to the server or false if it is ignored.\n         */\n        var editSection = function(sectionElement, sectionid, target, courseformat) {\n            var action = target.attr('data-action'),\n                sectionreturn = target.attr('data-sectionreturn') ? target.attr('data-sectionreturn') : null;\n\n            // Filter direct component handled actions.\n            if (courseeditor.supportComponents && componentActions.includes(action)) {\n                return false;\n            }\n\n            var spinner = addSectionSpinner(sectionElement);\n            var promises = ajax.call([{\n                methodname: 'core_course_edit_section',\n                args: {id: sectionid, action: action, sectionreturn: sectionreturn}\n            }], true);\n\n            var lightbox = addSectionLightbox(sectionElement);\n            $.when.apply($, promises)\n                .done(function(dataencoded) {\n                    var data = $.parseJSON(dataencoded);\n                    removeSpinner(sectionElement, spinner);\n                    removeLightbox(lightbox);\n                    sectionElement.find(SELECTOR.SECTIONACTIONMENU).find(SELECTOR.TOGGLE).focus();\n                    // Trigger event that can be observed by course formats.\n                    var e = $.Event('coursesectionedited', {ajaxreturn: data, action: action});\n                    sectionElement.trigger(e);\n                    if (!e.isDefaultPrevented()) {\n                        defaultEditSectionHandler(sectionElement, target, data, courseformat, sectionid);\n                    }\n                }).fail(function(ex) {\n                    // Remove spinner and lightbox.\n                    removeSpinner(sectionElement, spinner);\n                    removeLightbox(lightbox);\n                    // Trigger event that can be observed by course formats.\n                    var e = $.Event('coursesectioneditfailed', {exception: ex, action: action});\n                    sectionElement.trigger(e);\n                    if (!e.isDefaultPrevented()) {\n                        notification.exception(ex);\n                    }\n                });\n            return true;\n        };\n\n        /**\n         * Sets the section badge in the section header.\n         *\n         * @param {JQuery} sectionElement section element we perform action on\n         * @param {String} badgetype the type of badge this is for\n         * @param {bool} add true to add, false to remove\n         * @param {boolean} removeOther in case of adding a badge, whether to remove all other.\n         */\n        var setSectionBadge = function(sectionElement, badgetype, add, removeOther) {\n            const sectionbadges = sectionElement.querySelector(SELECTOR.SECTIONBADGES);\n            if (!sectionbadges) {\n                return;\n            }\n            const badge = sectionbadges.querySelector('[data-type=\"' + badgetype + '\"]');\n            if (!badge) {\n                return;\n            }\n            if (add) {\n                if (removeOther) {\n                    document.querySelectorAll('[data-type=\"' + badgetype + '\"]').forEach((b) => {\n                        b.classList.add('d-none');\n                    });\n                }\n                badge.classList.remove('d-none');\n            } else {\n                badge.classList.add('d-none');\n            }\n        };\n\n        // Register a function to be executed after D&D of an activity.\n        Y.use('moodle-course-coursebase', function() {\n            M.course.coursebase.register_module({\n                // Ignore camelcase eslint rule for the next line because it is an expected name of the callback.\n                // eslint-disable-next-line camelcase\n                set_visibility_resource_ui: function(args) {\n                    var mainelement = $(args.element.getDOMNode());\n                    var cmid = getModuleId(mainelement);\n                    if (cmid) {\n                        var sectionreturn = mainelement.find('.' + CSS.EDITINGMOVE).attr('data-sectionreturn');\n                        refreshModule(mainelement, cmid, sectionreturn);\n                    }\n                },\n                /**\n                 * Update the course state when some cm is moved via YUI.\n                 * @param {*} params\n                 */\n                updateMovedCmState: (params) => {\n                    const state = courseeditor.state;\n\n                    // Update old section.\n                    const cm = state.cm.get(params.cmid);\n                    if (cm !== undefined) {\n                        courseeditor.dispatch('sectionState', [cm.sectionid]);\n                    }\n                    // Update cm state.\n                    courseeditor.dispatch('cmState', [params.cmid]);\n                },\n                /**\n                 * Update the course state when some section is moved via YUI.\n                 */\n                updateMovedSectionState: () => {\n                    courseeditor.dispatch('courseState');\n                },\n            });\n        });\n\n        // From Moodle 4.0 all edit actions are being re-implemented as state mutation.\n        // This means all method from this \"actions\" module will be deprecated when all the course\n        // interface is migrated to reactive components.\n        // Most legacy actions did not provide enough information to regenarate the course so they\n        // use the mutations courseState, sectionState and cmState to get the updated state from\n        // the server. However, some activity actions where we can prevent an extra webservice\n        // call by implementing an adhoc mutation.\n        courseeditor.addMutations({\n            /**\n             * Compatibility function to update Moodle 4.0 course state using legacy actions.\n             *\n             * This method only updates some actions which does not require to use cmState mutation\n             * to get updated data form the server.\n             *\n             * @param {Object} statemanager the current state in read write mode\n             * @param {String} action the performed action\n             * @param {Number} cmid the affected course module id\n             * @param {Array} affectedids all affected cm ids (for duplicate action)\n             */\n            legacyActivityAction: function(statemanager, action, cmid, affectedids) {\n\n                const state = statemanager.state;\n                const cm = state.cm.get(cmid);\n                if (cm === undefined) {\n                    return;\n                }\n                const section = state.section.get(cm.sectionid);\n                if (section === undefined) {\n                    return;\n                }\n\n                // Send the element is locked.\n                courseeditor.dispatch('cmLock', [cm.id], true);\n\n                // Now we do the real mutation.\n                statemanager.setReadOnly(false);\n\n                // This unlocked will take effect when the read only is restored.\n                cm.locked = false;\n\n                switch (action) {\n                    case 'delete':\n                        // Remove from section.\n                        section.cmlist = section.cmlist.reduce(\n                            (cmlist, current) => {\n                                if (current != cmid) {\n                                    cmlist.push(current);\n                                }\n                                return cmlist;\n                            },\n                            []\n                        );\n                        // Delete form list.\n                        state.cm.delete(cmid);\n                        break;\n\n                    case 'hide':\n                    case 'show':\n                    case 'duplicate':\n                        courseeditor.dispatch('cmState', affectedids);\n                        break;\n                }\n                statemanager.setReadOnly(true);\n            },\n            legacySectionAction: function(statemanager, action, sectionid) {\n\n                const state = statemanager.state;\n                const section = state.section.get(sectionid);\n                if (section === undefined) {\n                    return;\n                }\n\n                // Send the element is locked. Reactive events are only triggered when the state\n                // read only mode is restored. We want to notify the interface the element is\n                // locked so we need to do a quick lock operation before performing the rest\n                // of the mutation.\n                statemanager.setReadOnly(false);\n                section.locked = true;\n                statemanager.setReadOnly(true);\n\n                // Now we do the real mutation.\n                statemanager.setReadOnly(false);\n\n                // This locked will take effect when the read only is restored.\n                section.locked = false;\n\n                switch (action) {\n                    case 'setmarker':\n                        // Remove previous marker.\n                        state.section.forEach((current) => {\n                            if (current.id != sectionid) {\n                                current.current = false;\n                            }\n                        });\n                        section.current = true;\n                        break;\n\n                    case 'removemarker':\n                        section.current = false;\n                        break;\n                }\n                statemanager.setReadOnly(true);\n            },\n        });\n\n        return /** @alias module:core_course/actions */ {\n\n            /**\n             * Initialises course page\n             *\n             * @method init\n             * @param {String} courseformat name of the current course format (for fetching strings)\n             */\n            initCoursePage: function(courseformat) {\n\n                formatname = courseformat;\n\n                // Add a handler for course module actions.\n                $('body').on('click keypress', SELECTOR.ACTIVITYLI + ' ' +\n                        SELECTOR.ACTIVITYACTION + '[data-action]', function(e) {\n                    if (e.type === 'keypress' && e.keyCode !== 13) {\n                        return;\n                    }\n                    var actionItem = $(this),\n                        moduleElement = actionItem.closest(SELECTOR.ACTIVITYLI),\n                        action = actionItem.attr('data-action'),\n                        moduleId = getModuleId(moduleElement);\n                    switch (action) {\n                        case 'moveleft':\n                        case 'moveright':\n                        case 'delete':\n                        case 'duplicate':\n                        case 'hide':\n                        case 'stealth':\n                        case 'show':\n                        case 'groupsseparate':\n                        case 'groupsvisible':\n                        case 'groupsnone':\n                            break;\n                        default:\n                            // Nothing to do here!\n                            return;\n                    }\n                    if (!moduleId) {\n                        return;\n                    }\n                    e.preventDefault();\n                    if (action === 'delete') {\n                        // Deleting requires confirmation.\n                        confirmDeleteModule(moduleElement, function() {\n                            editModule(moduleElement, moduleId, actionItem);\n                        });\n                    } else {\n                        editModule(moduleElement, moduleId, actionItem);\n                    }\n                });\n\n                // Add a handler for section action menu.\n                $('body').on('click keypress',\n                            SELECTOR.SECTIONACTIONMENUTRIGGER + '[data-sectionid] ' +\n                            'a[data-action]', function(e) {\n                    if (e.type === 'keypress' && e.keyCode !== 13) {\n                        return;\n                    }\n                    var actionItem = $(this),\n                        sectionElement = actionItem.closest(SELECTOR.SECTIONLI),\n                        sectionId = actionItem.closest(SELECTOR.SECTIONACTIONMENUTRIGGER).attr('data-sectionid');\n\n                    if (actionItem.attr('data-action') === 'permalink') {\n                        e.preventDefault();\n                        ModalCopyToClipboard.create({\n                            text: actionItem.attr('href'),\n                        }, str.get_string('sectionlink', 'course')\n                        );\n                        return;\n                    }\n\n                    let isExecuted = true;\n                    if (actionItem.attr('data-confirm')) {\n                        // Action requires confirmation.\n                        confirmEditSection(actionItem.attr('data-confirm'), function() {\n                            isExecuted = editSection(sectionElement, sectionId, actionItem, courseformat);\n                        });\n                    } else {\n                        isExecuted = editSection(sectionElement, sectionId, actionItem, courseformat);\n                    }\n                    // Prevent any other module from capturing the action if it is already in execution.\n                    if (isExecuted) {\n                        e.preventDefault();\n                    }\n                });\n\n                // The section and activity names are edited using inplace editable.\n                // The \"update\" jQuery event must be captured in order to update the course state.\n                $('body').on('updated', `${SELECTOR.SECTIONITEM} [data-inplaceeditable]`, function(e) {\n                    if (e.ajaxreturn && e.ajaxreturn.itemid) {\n                        const state = courseeditor.state;\n                        const section = state.section.get(e.ajaxreturn.itemid);\n                        if (section !== undefined) {\n                            courseeditor.dispatch('sectionState', [e.ajaxreturn.itemid]);\n                        }\n                    }\n                });\n                $('body').on('updated', `${SELECTOR.ACTIVITYLI} [data-inplaceeditable]`, function(e) {\n                    if (e.ajaxreturn && e.ajaxreturn.itemid) {\n                        courseeditor.dispatch('cmState', [e.ajaxreturn.itemid]);\n                    }\n                });\n\n                // Component-based formats don't use modals to create sections.\n                if (courseeditor.supportComponents && componentActions.includes('addSection')) {\n                    return;\n                }\n\n                // Add a handler for \"Add sections\" link to ask for a number of sections to add.\n                const trigger = $(SELECTOR.ADDSECTIONS);\n                const modalTitle = trigger.attr('data-add-sections');\n                const newSections = trigger.attr('data-new-sections');\n                str.get_string('numberweeks')\n                .then(function(strNumberSections) {\n                    var modalBody = $('<div><label for=\"add_section_numsections\"></label> ' +\n                        '<input id=\"add_section_numsections\" type=\"number\" min=\"1\" max=\"' + newSections + '\" value=\"1\"></div>');\n                    modalBody.find('label').html(strNumberSections);\n\n                    return modalBody.html();\n                })\n                .then((body) => ModalSaveCancel.create({\n                    body,\n                    title: modalTitle,\n                }))\n                .then(function(modal) {\n                    var numSections = $(modal.getBody()).find('#add_section_numsections'),\n                    addSections = function() {\n                        // Check if value of the \"Number of sections\" is a valid positive integer and redirect\n                        // to adding a section script.\n                        if ('' + parseInt(numSections.val()) === numSections.val() && parseInt(numSections.val()) >= 1) {\n                            document.location = trigger.attr('href') + '&numsections=' + parseInt(numSections.val());\n                        }\n                    };\n                    modal.setSaveButtonText(modalTitle);\n                    modal.getRoot().on(ModalEvents.shown, function() {\n                        // When modal is shown focus and select the input and add a listener to keypress of \"Enter\".\n                        numSections.focus().select().on('keydown', function(e) {\n                            if (e.keyCode === KeyCodes.enter) {\n                                addSections();\n                            }\n                        });\n                    });\n                    modal.getRoot().on(ModalEvents.save, function(e) {\n                        // When modal \"Add\" button is pressed.\n                        e.preventDefault();\n                        addSections();\n                    });\n\n                    trigger.on('click', (e) => {\n                        e.preventDefault();\n                        modal.show();\n                    });\n\n                    return modal;\n                })\n                .catch(notification.exception);\n            },\n\n            /**\n             * Replaces a section action menu item with another one (for example Show->Hide, Set marker->Remove marker)\n             *\n             * This method can be used by course formats in their listener to the coursesectionedited event\n             *\n             * @deprecated since Moodle 3.9\n             * @param {JQuery} sectionelement\n             * @param {String} selector CSS selector inside the section element, for example \"a[data-action=show]\"\n             * @param {String} image new image name (\"i/show\", \"i/hide\", etc.)\n             * @param {String} stringname new string for the action menu item\n             * @param {String} stringcomponent\n             * @param {String} newaction new value for data-action attribute of the link\n             */\n            replaceSectionActionItem: function(sectionelement, selector, image, stringname,\n                                                    stringcomponent, newaction) {\n                log.debug('replaceSectionActionItem() is deprecated and will be removed.');\n                var actionitem = sectionelement.find(SELECTOR.SECTIONACTIONMENU + ' ' + selector);\n                replaceActionItem(actionitem, image, stringname, stringcomponent, newaction);\n            },\n            // Method to refresh a module.\n            refreshModule,\n            refreshSection,\n        };\n    });\n"],"names":["define","$","ajax","templates","notification","str","url","Y","ModalCopyToClipboard","ModalSaveCancel","ModalEvents","KeyCodes","log","editor","EventDispatcher","CourseEvents","componentActions","courseeditor","getCurrentCourseEditor","formatname","CSS","SELECTOR","ACTIVITYLI","ACTIONAREA","ACTIVITYACTION","MENU","TOGGLE","SECTIONLI","SECTIONACTIONMENU","SECTIONACTIONMENUTRIGGER","SECTIONITEM","ADDSECTIONS","SECTIONBADGES","use","courseformatselector","M","course","format","get_section_selector","dispatchEvent","eventName","detail","container","options","Element","undefined","get","getModuleId","element","item","dataset","id","Moodle","core_course","util","cm","getId","Node","addActivitySpinner","activity","addClass","actionarea","find","spinner","add_spinner","show","data","dispatch","addSectionSpinner","sectionelement","addSectionLightbox","lightbox","add_lightbox","for","setAttribute","removeSpinner","delay","window","setTimeout","removeClass","hide","mutation","removeLightbox","getAttribute","initActionMenu","elementid","coursebase","invoke_function","core","actionmenu","newDOMNode","one","editModule","moduleElement","cmid","target","action","attr","promises","call","methodname","args","sectionreturn","closest","when","apply","done","mainElement","tabables","isInside","foundElement","elementToFocus","each","contains","this","replaceWith","affectedids","index","elementId","mainelement","selector","is","focus","focusActionItem","push","trigger","Event","ajaxreturn","fail","ex","e","exception","isDefaultPrevented","refreshModule","sectionReturn","activityElement","Promise","resolve","reject","replaceActivityHtmlWith","confirmDeleteModule","onconfirm","modtypename","match","modulename","name","getName","state","_state$cm$get","getModuleName","get_string","pluginname","plugindata","type","get_strings","key","component","param","s","confirm","replaceActionItem","actionitem","image","stringname","stringcomponent","newaction","stringRequests","then","strings","html","renderPix","pixhtml","catch","defaultEditSectionHandler","sectionElement","actionItem","courseformat","sectionid","setSectionBadge","modules","i","section_availability","first","section","oldmarker","oldActionItem","activityHTML","focusedPath","document","getElementById","activeElement","querySelector","getActivityFocusedElement","editSection","supportComponents","includes","dataencoded","parseJSON","badgetype","add","removeOther","sectionbadges","badge","querySelectorAll","forEach","b","classList","remove","register_module","set_visibility_resource_ui","getDOMNode","updateMovedCmState","params","updateMovedSectionState","addMutations","legacyActivityAction","statemanager","setReadOnly","locked","cmlist","reduce","current","delete","legacySectionAction","initCoursePage","on","keyCode","moduleId","preventDefault","sectionId","create","text","isExecuted","message","itemid","modalTitle","newSections","strNumberSections","modalBody","body","title","modal","numSections","getBody","addSections","parseInt","val","location","setSaveButtonText","getRoot","shown","select","enter","save","replaceSectionActionItem","debug","refreshSection","newSectionElement","content","sectionRefreshed","defaultPrevented"],"mappings":";;;;;;;;AAuBAA,6BACI,CACI,SACA,YACA,iBACA,oBACA,WACA,WACA,WACA,+BACA,yBACA,oBACA,iBACA,WACA,iCACA,wBACA,uBAEJ,SACIC,EACAC,KACAC,UACAC,aACAC,IACAC,IACAC,EACAC,qBACAC,gBACAC,YACAC,SACAC,IACAC,OACAC,gBACAC,oBAMMC,iBAAmB,CACrB,cAAe,SAAU,aAAc,gBAAiB,WAAY,cAAe,cAAe,cAClG,SAAU,SAAU,YAAa,mBAAoB,qBAAsB,cAAe,aAC1F,aAAc,kBAAmB,oBAI/BC,aAAeJ,OAAOK,6BAGxBC,eAEAC,mBACgB,iBADhBA,gBAGa,eAEbC,SAAW,CACXC,WAAY,cACZC,WAAY,WACZC,eAAgB,mBAChBC,KAAM,0DACNC,OAAQ,mCACRC,UAAW,aACXC,kBAAmB,uBACnBC,yBAA0B,mBAC1BC,YAAa,6BACbC,YAAa,yCACbC,cAAe,iCAGnBzB,EAAE0B,IAAI,4BAA4B,eAC1BC,qBAAuBC,EAAEC,OAAOC,OAAOC,uBACvCJ,uBACAb,SAASM,UAAYO,+BAmBvBK,cAAgB,SAASC,UAAWC,OAAQC,UAAWC,gBAEnDD,qBAAqBE,cAA8BC,IAAlBH,UAAUI,MAC7CJ,UAAYA,UAAUI,IAAI,IAEvBhC,gBAAgByB,cAAcC,UAAWC,OAAQC,UAAWC,cASnEI,YAAc,SAASC,eAEjBC,KAAOD,QAAQF,IAAI,MACrBG,KAAKC,QAAQC,UACNF,KAAKC,QAAQC,OAGpBA,UACJ5C,EAAE0B,IAAI,sBAAsB,SAAS1B,GACjC4C,GAAK5C,EAAE6C,OAAOC,YAAYC,KAAKC,GAAGC,MAAMjD,EAAEkD,KAAKR,UAE5CE,IA6BPO,mBAAqB,SAASC,UAC9BA,SAASC,SAASxC,wBACdyC,WAAaF,SAASG,KAAKzC,SAASE,YAAYuB,IAAI,MACpDe,WAAY,KACRE,QAAU5B,EAAEmB,KAAKU,YAAYzD,EAAGA,EAAEkD,KAAKI,oBAC3CE,QAAQE,YAEoBpB,IAAxBc,SAASO,KAAK,OACdjD,aAAakD,SAAS,SAAU,CAACR,SAASO,KAAK,QAAQ,GAEpDH,eAEJ,MASPK,kBAAoB,SAASC,gBAC7BA,eAAeT,SAASxC,wBACpByC,WAAaQ,eAAeP,KAAKzC,SAASO,mBAAmBkB,IAAI,MACjEe,WAAY,KACRE,QAAU5B,EAAEmB,KAAKU,YAAYzD,EAAGA,EAAEkD,KAAKI,oBAC3CE,QAAQE,YAE0BpB,IAA9BwB,eAAeH,KAAK,OACpBjD,aAAakD,SAAS,cAAe,CAACE,eAAeH,KAAK,QAAQ,GAE/DH,eAEJ,MASPO,mBAAqB,SAASD,sBACxBpB,KAAOoB,eAAevB,IAAI,OAC5ByB,SAAWpC,EAAEmB,KAAKkB,aAAajE,EAAGA,EAAEkD,KAAKR,aACrB,WAApBA,KAAKC,QAAQuB,KAAoBxB,KAAKC,QAAQC,KAC9ClC,aAAakD,SAAS,cAAe,CAAClB,KAAKC,QAAQC,KAAK,GACxDoB,SAASG,aAAa,aAAc,WACpCH,SAASG,aAAa,gBAAiBzB,KAAKC,QAAQC,KAExDoB,SAASN,OACFM,UAUPI,cAAgB,SAAS3B,QAASe,QAASa,OAC3CC,OAAOC,YAAW,cACd9B,QAAQ+B,YAAY3D,oBAChB2C,SACAA,QAAQiB,YAGenC,IAAvBG,QAAQkB,KAAK,MAAqB,OAC5Be,SAAoC,YAAxBjC,QAAQkB,KAAK,OAAwB,cAAgB,SACvEjD,aAAakD,SAASc,SAAU,CAACjC,QAAQkB,KAAK,QAAQ,MAE3DU,QASHM,eAAiB,SAASX,SAAUK,OAChCL,UACAM,OAAOC,YAAW,WACdP,SAASS,OAELT,SAASY,aAAa,eACtBlE,aAAakD,mBACNI,SAASY,aAAa,sBACzB,CAACZ,SAASY,aAAa,mBACvB,KAGTP,QASPQ,eAAiB,SAASC,WAE1B9E,EAAE0B,IAAI,4BAA4B,WAC9BE,EAAEC,OAAOkD,WAAWC,gBAAgB,qBAAsB,IAAMF,cAEhElD,EAAEqD,KAAKC,YAActD,EAAEqD,KAAKC,WAAWC,YACvCvD,EAAEqD,KAAKC,WAAWC,WAAWnF,EAAEoF,IAAI,IAAMN,aAsD7CO,WAAa,SAASC,cAAeC,KAAMC,YAWvCxB,SAVAyB,OAASD,OAAOE,KAAK,eACrBlC,QAAUL,mBAAmBmC,eAC7BK,SAAWhG,KAAKiG,KAAK,CAAC,CACtBC,WAAY,0BACZC,KAAM,CAAClD,GAAI2C,KACPE,OAAQA,OACRM,cAAeP,OAAOE,KAAK,sBAAwBF,OAAOE,KAAK,sBAAwB,SAE3F,GAGW,cAAXD,SACAzB,SAAWD,mBAAmByB,OAAOQ,QAAQlF,SAASM,aAE1D1B,EAAEuG,KAAKC,MAAMxG,EAAGiG,UACXQ,MAAK,SAASxC,UAvCUyC,YACzBC,SACAC,SACAC,aAqCQC,gBAxCiBJ,YAwCkBd,cAvC3Ce,SAAW3G,EAAE,aACb4G,UAAW,EACXC,aAAe,KACnBF,SAASI,MAAK,cACN/G,EAAEgH,SAASN,YAAY,GAAIO,MAC3BL,UAAW,OACR,GAAIA,gBACPC,aAAeI,MACR,SAEJ,KAEJJ,cA4BCjB,cAAcsB,YAAYjD,UACtBkD,YAAc,GAElBnH,EAAE,QAAUiE,KAAO,UAAUJ,KAAKzC,SAASC,YAAY0F,MAAK,SAASK,OACjEjC,eAAenF,EAAEiH,MAAMjB,KAAK,OACd,IAAVoB,SAnEE,SAASC,UAAWtB,YAClCuB,YAActH,EAAE,IAAMqH,WACtBE,SAAW,gBAAkBxB,OAAS,IAC3B,mBAAXA,QAA0C,kBAAXA,QAAyC,eAAXA,SAE7DwB,SAAW,qFAEXD,YAAYzD,KAAK0D,UAAUC,GAAG,YAC9BF,YAAYzD,KAAK0D,UAAUE,QAG3BH,YAAYzD,KAAKzC,SAASI,MAAMqC,KAAKzC,SAASK,QAAQgG,QAyD1CC,CAAgB1H,EAAEiH,MAAMjB,KAAK,MAAOD,QACpCe,eAAiB,MAGrBK,YAAYQ,KAAK7E,YAAY9C,EAAEiH,WAG/BH,gBACAA,eAAeW,QAGnB/C,cAAckB,cAAe9B,QAAS,KACtCmB,eAAeX,SAAU,KAEzBsB,cAAcgC,QAAQ5H,EAAE6H,MAAM,qBAAsB,CAACC,WAAY7D,KAAM8B,OAAQA,UAG/E/E,aAAakD,SAAS,uBAAwB6B,OAAQF,KAAMsB,gBAE7DY,MAAK,SAASC,IAEbtD,cAAckB,cAAe9B,SAC7BmB,eAAeX,cAEX2D,EAAIjI,EAAE6H,MAAM,yBAA0B,CAACK,UAAWF,GAAIjC,OAAQA,SAClEH,cAAcgC,QAAQK,GACjBA,EAAEE,sBACHhI,aAAa+H,UAAUF,QAenCI,cAAgB,SAASrF,QAAS8C,KAAMQ,oBAElBzD,IAAlByD,gBACAA,cAAgBrF,aAAaqH,qBAG3BC,gBAAkBtI,EAAE+C,aACtBe,QAAUL,mBAAmB6E,iBAC7BrC,SAAWhG,KAAKiG,KAAK,CAAC,CACtBC,WAAY,yBACZC,KAAM,CAAClD,GAAI2C,KAAMQ,cAAeA,kBAChC,UAEG,IAAIkC,SAAQ,CAACC,QAASC,UACzBzI,EAAEuG,KAAKC,MAAMxG,EAAGiG,UACXQ,MAAK,SAASxC,MACXS,cAAc4D,gBAAiBxE,QAAS,KACxC4E,wBAAwBzE,MACxBuE,QAAQvE,SACT8D,MAAK,WACJrD,cAAc4D,gBAAiBxE,SAC/B2E,gBAqFZE,oBAAsB,SAASrB,YAAasB,eACxCC,YAAcvB,YAAYtB,KAAK,SAAS8C,MAAM,oBAAoB,GAClEC,WApWY,SAAShG,aACrBiG,KACJ1I,EAAE0B,IAAI,sBAAsB,SAAS1B,GACjC0I,KAAO1I,EAAE6C,OAAOC,YAAYC,KAAKC,GAAG2F,QAAQ3I,EAAEkD,KAAKT,QAAQF,IAAI,cAG7DqG,MAAQlI,aAAakI,MACrBrD,KAAO/C,YAAYC,kCACpBiG,MAAQE,OAASrD,OAClBmD,2BAAOE,MAAM5F,GAAGT,IAAIgD,sCAAbsD,cAAoBH,MAExBA,KAyVUI,CAAc9B,aAE/BlH,IAAIiJ,WAAW,aAAcR,aAAapC,MAAK,SAAS6C,gBAChDC,WAAa,CACbC,KAAMF,WACNN,KAAMD,YAEV3I,IAAIqJ,YAAY,CACZ,CAACC,IAAK,UAAWC,UAAW,QAC5B,CAACD,IAAoB,OAAfX,WAAsB,kBAAoB,sBAAuBa,MAAOL,YAC9E,CAACG,IAAK,OACN,CAACA,IAAK,QACPjD,MAAK,SAASoD,GACT1J,aAAa2J,QAAQD,EAAE,GAAIA,EAAE,GAAIA,EAAE,GAAIA,EAAE,GAAIjB,kBAiCzDmB,kBAAoB,SAASC,WAAYC,MAAOC,WACjBC,gBAAiBC,eAE5CC,eAAiB,CAAC,CAACX,IAAKQ,WAAYP,UAAWQ,yBAG5C/J,IAAIqJ,YAAYY,gBAAgBC,MAAK,SAASC,gBACjDP,WAAWnG,KAAK,yBAAyB2G,KAAKD,QAAQ,IAE/CrK,UAAUuK,UAAUR,MAAO,WACnCK,MAAK,SAASI,SACbV,WAAWnG,KAAK,SAASqD,YAAYwD,SACrCV,WAAWhE,KAAK,cAAeoE,cAEhCO,MAAMxK,aAAa+H,YAsBtB0C,0BAA4B,SAASC,eAAgBC,WAAY7G,KAAM8G,aAAcC,eACjFjF,OAAS+E,WAAW9E,KAAK,kBACd,SAAXD,QAAgC,SAAXA,OAAmB,IACzB,SAAXA,QACA8E,eAAelH,SAAS,UACxBsH,gBAAgBJ,eAAe,GAAI,sBAAsB,GAAM,GAC/Dd,kBAAkBe,WAAY,SAC1B,iBAAkB,UAAYC,aAAc,UAEhDE,gBAAgBJ,eAAe,GAAI,sBAAsB,GAAO,GAChEA,eAAe/F,YAAY,UAC3BiF,kBAAkBe,WAAY,SAC1B,iBAAkB,UAAYC,aAAc,cAG/BnI,IAAjBqB,KAAKiH,YACA,IAAIC,KAAKlH,KAAKiH,QACfxC,wBAAwBzE,KAAKiH,QAAQC,SAIXvI,IAA9BqB,KAAKmH,sBACLP,eAAehH,KAAK,yBAAyBwH,QAAQnE,YAAYjD,KAAKmH,2BAI1DxI,IADA5B,aAAakI,MAAMoC,QAAQzI,IAAImI,YAE3ChK,aAAakD,SAAS,eAAgB,CAAC8G,iBAExC,GAAe,cAAXjF,OAAwB,KAC3BwF,UAAYvL,EAAEoB,SAASM,UAAY,YACnC8J,cAAgBD,UAAU1H,KAAKzC,SAASO,kBAATP,gCACnCmK,UAAUzG,YAAY,WACtBiF,kBAAkByB,cAAe,WAC7B,YAAa,OAAQ,aACzBX,eAAelH,SAAS,WACxBoG,kBAAkBe,WAAY,WAC1B,eAAgB,OAAQ,gBAC5B9J,aAAakD,SAAS,sBAAuB6B,OAAQiF,WACrDC,gBAAgBJ,eAAe,GAAI,aAAa,GAAM,OACpC,iBAAX9E,SACP8E,eAAe/F,YAAY,WAC3BiF,kBAAkBe,WAAY,WAC1B,YAAa,OAAQ,aACzB9J,aAAakD,SAAS,sBAAuB6B,OAAQiF,WACrDC,gBAAgBJ,eAAe,GAAI,aAAa,GAAO,SAmC3DnC,wBAA0B,SAAS+C,cACnCzL,EAAE,QAAUyL,aAAe,UAAU5H,KAAKzC,SAASC,YAAY0F,MAAK,eAE5D7D,GAAKlD,EAAEiH,MAAMjB,KAAK,UAElB0F,YA1BsB,SAASxI,UACjCH,QAAU4I,SAASC,eAAe1I,OACnCH,SAAYA,QAAQiE,SAAS2E,SAASE,sBAIvC9I,QAAQ+I,cAAc1K,SAASE,YAAY0F,SAAS2E,SAASE,yBACnDzK,SAASE,8BAGnBqK,SAASE,cAAc3I,cACZyI,SAASE,cAAc3I,WAehB6I,CAA0B7I,OAE5ClD,EAAEoB,SAASC,WAAa,IAAM6B,IAAIgE,YAAYuE,cAE9CtG,eAAejC,IAEXwI,YAAa,yDACGC,SAASC,eAAe1I,IAChC4I,cAAcJ,qEAAcjE,aAe5CuE,YAAc,SAASnB,eAAgBG,UAAWlF,OAAQiF,kBACtDhF,OAASD,OAAOE,KAAK,eACrBK,cAAgBP,OAAOE,KAAK,sBAAwBF,OAAOE,KAAK,sBAAwB,QAGxFhF,aAAaiL,mBAAqBlL,iBAAiBmL,SAASnG,eACrD,MAGPjC,QAAUK,kBAAkB0G,gBAC5B5E,SAAWhG,KAAKiG,KAAK,CAAC,CACtBC,WAAY,2BACZC,KAAM,CAAClD,GAAI8H,UAAWjF,OAAQA,OAAQM,cAAeA,kBACrD,GAEA/B,SAAWD,mBAAmBwG,uBAClC7K,EAAEuG,KAAKC,MAAMxG,EAAGiG,UACXQ,MAAK,SAAS0F,iBACPlI,KAAOjE,EAAEoM,UAAUD,aACvBzH,cAAcmG,eAAgB/G,SAC9BmB,eAAeX,UACfuG,eAAehH,KAAKzC,SAASO,mBAAmBkC,KAAKzC,SAASK,QAAQgG,YAElEQ,EAAIjI,EAAE6H,MAAM,sBAAuB,CAACC,WAAY7D,KAAM8B,OAAQA,SAClE8E,eAAejD,QAAQK,GAClBA,EAAEE,sBACHyC,0BAA0BC,eAAgB/E,OAAQ7B,KAAM8G,aAAcC,cAE3EjD,MAAK,SAASC,IAEbtD,cAAcmG,eAAgB/G,SAC9BmB,eAAeX,cAEX2D,EAAIjI,EAAE6H,MAAM,0BAA2B,CAACK,UAAWF,GAAIjC,OAAQA,SACnE8E,eAAejD,QAAQK,GAClBA,EAAEE,sBACHhI,aAAa+H,UAAUF,QAG5B,GAWPiD,gBAAkB,SAASJ,eAAgBwB,UAAWC,IAAKC,mBACrDC,cAAgB3B,eAAeiB,cAAc1K,SAASW,mBACvDyK,2BAGCC,MAAQD,cAAcV,cAAc,eAAiBO,UAAY,MAClEI,QAGDH,KACIC,aACAZ,SAASe,iBAAiB,eAAiBL,UAAY,MAAMM,SAASC,IAClEA,EAAEC,UAAUP,IAAI,aAGxBG,MAAMI,UAAUC,OAAO,WAEvBL,MAAMI,UAAUP,IAAI,mBAK5BhM,EAAE0B,IAAI,4BAA4B,WAC9BE,EAAEC,OAAOkD,WAAW0H,gBAAgB,CAGhCC,2BAA4B,SAAS5G,UAC7BkB,YAActH,EAAEoG,KAAKrD,QAAQkK,cAC7BpH,KAAO/C,YAAYwE,gBACnBzB,KAAM,KACFQ,cAAgBiB,YAAYzD,KAAK,IAAM1C,iBAAiB6E,KAAK,sBACjEoC,cAAcd,YAAazB,KAAMQ,iBAOzC6G,mBAAqBC,eAIX7J,GAHQtC,aAAakI,MAGV5F,GAAGT,IAAIsK,OAAOtH,WACpBjD,IAAPU,IACAtC,aAAakD,SAAS,eAAgB,CAACZ,GAAG0H,YAG9ChK,aAAakD,SAAS,UAAW,CAACiJ,OAAOtH,QAK7CuH,wBAAyB,KACrBpM,aAAakD,SAAS,qBAYlClD,aAAaqM,aAAa,CAYtBC,qBAAsB,SAASC,aAAcxH,OAAQF,KAAMsB,mBAEjD+B,MAAQqE,aAAarE,MACrB5F,GAAK4F,MAAM5F,GAAGT,IAAIgD,cACbjD,IAAPU,gBAGEgI,QAAUpC,MAAMoC,QAAQzI,IAAIS,GAAG0H,mBACrBpI,IAAZ0I,gBAKJtK,aAAakD,SAAS,SAAU,CAACZ,GAAGJ,KAAK,GAGzCqK,aAAaC,aAAY,GAGzBlK,GAAGmK,QAAS,EAEJ1H,YACC,SAEDuF,QAAQoC,OAASpC,QAAQoC,OAAOC,QAC5B,CAACD,OAAQE,WACDA,SAAW/H,MACX6H,OAAO/F,KAAKiG,SAETF,SAEX,IAGJxE,MAAM5F,GAAGuK,OAAOhI,gBAGf,WACA,WACA,YACD7E,aAAakD,SAAS,UAAWiD,aAGzCoG,aAAaC,aAAY,KAE7BM,oBAAqB,SAASP,aAAcxH,OAAQiF,iBAE1C9B,MAAQqE,aAAarE,MACrBoC,QAAUpC,MAAMoC,QAAQzI,IAAImI,mBAClBpI,IAAZ0I,gBAQJiC,aAAaC,aAAY,GACzBlC,QAAQmC,QAAS,EACjBF,aAAaC,aAAY,GAGzBD,aAAaC,aAAY,GAGzBlC,QAAQmC,QAAS,EAET1H,YACC,YAEDmD,MAAMoC,QAAQqB,SAASiB,UACfA,QAAQ1K,IAAM8H,YACd4C,QAAQA,SAAU,MAG1BtC,QAAQsC,SAAU,YAGjB,eACDtC,QAAQsC,SAAU,EAG1BL,aAAaC,aAAY,OAIe,CAQ5CO,eAAgB,SAAShD,iBAErB7J,WAAa6J,aAGb/K,EAAE,QAAQgO,GAAG,iBAAkB5M,SAASC,WAAa,IAC7CD,SAASG,eAAiB,iBAAiB,SAAS0G,MACzC,aAAXA,EAAEuB,MAAqC,KAAdvB,EAAEgG,aAG3BnD,WAAa9K,EAAEiH,MACfrB,cAAgBkF,WAAWxE,QAAQlF,SAASC,YAC5C0E,OAAS+E,WAAW9E,KAAK,eACzBkI,SAAWpL,YAAY8C,sBACnBG,YACC,eACA,gBACA,aACA,gBACA,WACA,cACA,WACA,qBACA,oBACA,kCAMJmI,WAGLjG,EAAEkG,iBACa,WAAXpI,OAEA4C,oBAAoB/C,eAAe,WAC/BD,WAAWC,cAAesI,SAAUpD,eAGxCnF,WAAWC,cAAesI,SAAUpD,iBAK5C9K,EAAE,QAAQgO,GAAG,iBACD5M,SAASQ,yBAATR,mCACkB,SAAS6G,MACpB,aAAXA,EAAEuB,MAAqC,KAAdvB,EAAEgG,mBAG3BnD,WAAa9K,EAAEiH,MACf4D,eAAiBC,WAAWxE,QAAQlF,SAASM,WAC7C0M,UAAYtD,WAAWxE,QAAQlF,SAASQ,0BAA0BoE,KAAK,qBAEpC,cAAnC8E,WAAW9E,KAAK,sBAChBiC,EAAEkG,sBACF5N,qBAAqB8N,OAAO,CACxBC,KAAMxD,WAAW9E,KAAK,SACvB5F,IAAIiJ,WAAW,cAAe,eAKjCkF,YAAa,EAlcJ,IAASC,QAAS5F,UAmc3BkC,WAAW9E,KAAK,iBAncEwI,QAqcC1D,WAAW9E,KAAK,gBArcR4C,UAqcyB,WAChD2F,WAAavC,YAAYnB,eAAgBuD,UAAWtD,WAAYC,eArchF3K,IAAIqJ,YAAY,CACZ,CAACC,IAAK,WACN,CAACA,IAAK,OACN,CAACA,IAAK,QACPjD,MAAK,SAASoD,GACT1J,aAAa2J,QAAQD,EAAE,GAAI2E,QAAS3E,EAAE,GAAIA,EAAE,GAAIjB,eAmc5C2F,WAAavC,YAAYnB,eAAgBuD,UAAWtD,WAAYC,cAGhEwD,YACAtG,EAAEkG,oBAMVnO,EAAE,QAAQgO,GAAG,oBAAc5M,SAASS,wCAAsC,SAASoG,MAC3EA,EAAEH,YAAcG,EAAEH,WAAW2G,OAAQ,MAGrB7L,IAFF5B,aAAakI,MACLoC,QAAQzI,IAAIoF,EAAEH,WAAW2G,SAE3CzN,aAAakD,SAAS,eAAgB,CAAC+D,EAAEH,WAAW2G,aAIhEzO,EAAE,QAAQgO,GAAG,oBAAc5M,SAASC,uCAAqC,SAAS4G,GAC1EA,EAAEH,YAAcG,EAAEH,WAAW2G,QAC7BzN,aAAakD,SAAS,UAAW,CAAC+D,EAAEH,WAAW2G,YAKnDzN,aAAaiL,mBAAqBlL,iBAAiBmL,SAAS,2BAK1DtE,QAAU5H,EAAEoB,SAASU,aACrB4M,WAAa9G,QAAQ5B,KAAK,qBAC1B2I,YAAc/G,QAAQ5B,KAAK,qBACjC5F,IAAIiJ,WAAW,eACdiB,MAAK,SAASsE,uBACPC,UAAY7O,EAAE,qHACsD2O,YAAc,6BACtFE,UAAUhL,KAAK,SAAS2G,KAAKoE,mBAEtBC,UAAUrE,UAEpBF,MAAMwE,MAAStO,gBAAgB6N,OAAO,CACnCS,KAAAA,KACAC,MAAOL,eAEVpE,MAAK,SAAS0E,WACPC,YAAcjP,EAAEgP,MAAME,WAAWrL,KAAK,4BAC1CsL,YAAc,WAGN,GAAKC,SAASH,YAAYI,SAAWJ,YAAYI,OAASD,SAASH,YAAYI,QAAU,IACzF1D,SAAS2D,SAAW1H,QAAQ5B,KAAK,QAAU,gBAAkBoJ,SAASH,YAAYI,gBAG1FL,MAAMO,kBAAkBb,YACxBM,MAAMQ,UAAUxB,GAAGvN,YAAYgP,OAAO,WAElCR,YAAYxH,QAAQiI,SAAS1B,GAAG,WAAW,SAAS/F,GAC5CA,EAAEgG,UAAYvN,SAASiP,OACvBR,oBAIZH,MAAMQ,UAAUxB,GAAGvN,YAAYmP,MAAM,SAAS3H,GAE1CA,EAAEkG,iBACFgB,iBAGJvH,QAAQoG,GAAG,SAAU/F,IACjBA,EAAEkG,iBACFa,MAAMhL,UAGHgL,SAEVrE,MAAMxK,aAAa+H,YAgBxB2H,yBAA0B,SAASzL,eAAgBmD,SAAU0C,MAAOC,WAC5BC,gBAAiBC,WACrDzJ,IAAImP,MAAM,qEACN9F,WAAa5F,eAAeP,KAAKzC,SAASO,kBAAoB,IAAM4F,UACxEwC,kBAAkBC,WAAYC,MAAOC,WAAYC,gBAAiBC,YAGtEhC,cAAAA,cACA2H,eAjpBiB,SAAShN,QAASiI,UAAW3E,oBAExBzD,IAAlByD,gBACAA,cAAgBrF,aAAaqH,qBAG3BwC,eAAiB7K,EAAE+C,SAEnBkD,SAAWhG,KAAKiG,KAAK,CAAC,CACxBC,WAAY,2BACZC,KAAM,CAAClD,GAAI8H,UAAWjF,OAHX,UAGmBM,cAAAA,kBAC9B,OAEAvC,QAAUK,kBAAkB0G,uBACzB,IAAItC,SAAQ,CAACC,QAASC,UACzBzI,EAAEuG,KAAKC,MAAMxG,EAAGiG,UACXQ,MAAK0F,cAEFzH,cAAcmG,eAAgB/G,eACxBG,KAAOjE,EAAEoM,UAAUD,aAEnB6D,kBAAoBhQ,EAAEiE,KAAKgM,SACjCpF,eAAe3D,YAAY8I,mBAG3BhQ,YAAKoB,SAASM,sBAAasJ,sBAAa5J,SAASC,aAAc0F,MAC3D,CAACK,MAAO1D,YACJyB,eAAezB,SAASO,KAAK,UAKvB3B,cACVxB,aAAaoP,iBACb,CACIpI,WAAY7D,KACZ8B,OA7BL,UA8BKiK,kBAAmBA,kBAAkBnN,IAAI,IAE7CmN,mBAGOG,kBACPvF,0BACIoF,kBAAmBhQ,EAAEoB,SAASM,UAAY,IAAMsJ,WAChD/G,KACA/C,WACA8J,WAGRxC,QAAQvE,SACT8D,MAAKC,KAEU1F,cACV,6BACA,CAAC4F,UAAWF,GAAIjC,OAhDjB,WAiDC8E,gBAEOsF,kBACPhQ,aAAa+H,UAAUF,IAE3BS"}
\ No newline at end of file
diff --git a/course/amd/src/actions.js b/course/amd/src/actions.js
index 6a0d35aad0abe..a00bf23daf1aa 100644
--- a/course/amd/src/actions.js
+++ b/course/amd/src/actions.js
@@ -85,6 +85,7 @@ define(
             TOGGLE: '.toggle-display,.dropdown-toggle',
             SECTIONLI: 'li.section',
             SECTIONACTIONMENU: '.section_action_menu',
+            SECTIONACTIONMENUTRIGGER: '.section-actions',
             SECTIONITEM: '[data-for="section_title"]',
             ADDSECTIONS: '.changenumsections [data-add-sections]',
             SECTIONBADGES: '[data-region="sectionbadges"]',
@@ -957,16 +958,16 @@ define(
                     }
                 });
 
-                // Add a handler for section show/hide actions.
-                $('body').on('click keypress', SELECTOR.SECTIONLI + ' ' +
-                            SELECTOR.SECTIONACTIONMENU + '[data-sectionid] ' +
+                // Add a handler for section action menu.
+                $('body').on('click keypress',
+                            SELECTOR.SECTIONACTIONMENUTRIGGER + '[data-sectionid] ' +
                             'a[data-action]', function(e) {
                     if (e.type === 'keypress' && e.keyCode !== 13) {
                         return;
                     }
                     var actionItem = $(this),
                         sectionElement = actionItem.closest(SELECTOR.SECTIONLI),
-                        sectionId = actionItem.closest(SELECTOR.SECTIONACTIONMENU).attr('data-sectionid');
+                        sectionId = actionItem.closest(SELECTOR.SECTIONACTIONMENUTRIGGER).attr('data-sectionid');
 
                     if (actionItem.attr('data-action') === 'permalink') {
                         e.preventDefault();
diff --git a/course/format/classes/output/local/content/section/controlmenu.php b/course/format/classes/output/local/content/section/controlmenu.php
index e7fdb208e381b..ab545516ecbc4 100644
--- a/course/format/classes/output/local/content/section/controlmenu.php
+++ b/course/format/classes/output/local/content/section/controlmenu.php
@@ -119,6 +119,7 @@ public function get_default_action_menu(\renderer_base $output): ?action_menu {
         $menu = new action_menu();
         $menu->set_kebab_trigger(get_string('edit'));
         $menu->attributes['class'] .= ' section-actions';
+        $menu->attributes['data-sectionid'] = $this->section->id;
         foreach ($controls as $value) {
             $url = empty($value['url']) ? '' : $value['url'];
             $icon = empty($value['icon']) ? '' : $value['icon'];
diff --git a/course/format/tests/behat/section_page.feature b/course/format/tests/behat/section_page.feature
index 7cb595f1d8817..f8bd4f93f2d1c 100644
--- a/course/format/tests/behat/section_page.feature
+++ b/course/format/tests/behat/section_page.feature
@@ -101,6 +101,14 @@ Feature: Single section course page
     When I set the field "Edit section name" in the "page-header" "region" to "Custom section name"
     Then "Custom section name" "text" should exist in the ".breadcrumb" "css_element"
 
+  @javascript
+  Scenario: Copy section page permalink URL to clipboard
+    Given I am on the "Course 1 > Section 1" "course > section" page
+    And I turn editing mode on
+    When I choose the "Permalink" item in the "Edit" action menu of the "page-header" "region"
+    And I click on "Copy to clipboard" "link" in the "Permalink" "dialogue"
+    Then I should see "Text copied to clipboard"
+
   Scenario: Blocks are displayed in section page too
     Given I log out
     And the following "blocks" exist:
@@ -115,8 +123,7 @@ Feature: Single section course page
   Scenario: Delete a section from the section page redirects to the main course page
     Given I am on the "C1 > Section 1" "course > section" page
     And I turn editing mode on
-    And I open the action menu in "page-header" "region"
-    When I choose "Delete" in the open action menu
+    When I choose the "Delete" item in the "Edit" action menu of the "page-header" "region"
     And I click on "Delete" "button" in the "Delete section?" "dialogue"
     # Section 1 should be removed.
     Then I should not see "Section 1"

From de2adae485eea8c5f218285361ea78906c0a2751 Mon Sep 17 00:00:00 2001
From: Amaia Anabitarte <amaia@moodle.com>
Date: Thu, 6 Jun 2024 19:03:36 +0200
Subject: [PATCH 090/119] MDL-79971 completion: Don't assume a completed
 activity is viewed

---
 lib/completionlib.php            | 7 ++++---
 lib/tests/completionlib_test.php | 6 ++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/completionlib.php b/lib/completionlib.php
index 95ed97a4f1220..b18d4768b58cc 100644
--- a/lib/completionlib.php
+++ b/lib/completionlib.php
@@ -1631,11 +1631,12 @@ public function get_completion_data(int $coursemoduleid, int $userid, array $def
                 $data->coursemoduleid = $data->cmvcoursemoduleid;
                 $data->userid = $data->cmvuserid;
             }
+            // When reseting all state in the completion, we need to keep current view state.
+            // We cannot assume the activity has been viewed, so we should check if there is any course_modules_viewed already.
+            $data->viewed = is_null($data->cmvuserid) ? 0 : 1;
+
             unset($data->cmvcoursemoduleid);
             unset($data->cmvuserid);
-
-            // When reseting all state in the completion, we need to keep current view state.
-            $data->viewed = 1;
         }
 
         return (array)$data;
diff --git a/lib/tests/completionlib_test.php b/lib/tests/completionlib_test.php
index fe93eed5e7902..77cf230f4c855 100644
--- a/lib/tests/completionlib_test.php
+++ b/lib/tests/completionlib_test.php
@@ -876,6 +876,7 @@ public function test_get_data_successive_calls(): void {
      * @covers ::get_completion_data
      */
     public function test_get_completion_data(): void {
+        $this->setAdminUser();
         $this->setup_data();
         $choicegenerator = $this->getDataGenerator()->get_plugin_generator('mod_choice');
         $choice = $choicegenerator->create_instance([
@@ -905,6 +906,11 @@ public function test_get_completion_data(): void {
         $this->assertEquals(0, $completiondatabeforeview['viewed']);
         $this->assertEquals($cm->id, $completiondatabeforeview['coursemoduleid']);
 
+        // Mark as completed before viewing it.
+        $completioninfo->update_state($cm, COMPLETION_COMPLETE, $this->user->id, true);
+        $completiondatabeforeview = $completioninfo->get_completion_data($cm->id, $this->user->id, $defaultdata);
+        $this->assertEquals(0, $completiondatabeforeview['viewed']);
+
         // Set viewed.
         $completioninfo->set_module_viewed($cm, $this->user->id);
 

From 2d25cf140159663fe78e7280ee79637b8f6411f7 Mon Sep 17 00:00:00 2001
From: Paul Holden <paulh@moodle.com>
Date: Fri, 28 Jun 2024 10:36:48 +0100
Subject: [PATCH 091/119] MDL-82331 reportbuilder: date filtering down to the
 nearest minute.

---
 reportbuilder/classes/local/filters/date.php   | 18 +++++++++++++++++-
 .../tests/local/filters/date_test.php          | 11 ++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/reportbuilder/classes/local/filters/date.php b/reportbuilder/classes/local/filters/date.php
index f7c03935cb2fb..7b8c9a8103acf 100644
--- a/reportbuilder/classes/local/filters/date.php
+++ b/reportbuilder/classes/local/filters/date.php
@@ -19,8 +19,8 @@
 namespace core_reportbuilder\local\filters;
 
 use core\{clock, di};
+use core\lang_string;
 use core_reportbuilder\local\helpers\database;
-use lang_string;
 use MoodleQuickForm;
 
 /**
@@ -70,6 +70,9 @@ class date extends base {
     /** @var int Date after [X relative date unit(s)] */
     public const DATE_AFTER = 10;
 
+    /** @var int Relative date unit for a minute */
+    public const DATE_UNIT_MINUTE = 5;
+
     /** @var int Relative date unit for an hour */
     public const DATE_UNIT_HOUR = 0;
 
@@ -137,6 +140,7 @@ public function setup_form(MoodleQuickForm $mform): void {
         // Unit selector for last and next operators.
         $unitlabel = get_string('filterfieldunit', 'core_reportbuilder', $this->get_header());
         $units = [
+            self::DATE_UNIT_MINUTE => get_string('filterdateminutes', 'core_reportbuilder'),
             self::DATE_UNIT_HOUR => get_string('filterdatehours', 'core_reportbuilder'),
             self::DATE_UNIT_DAY => get_string('filterdatedays', 'core_reportbuilder'),
             self::DATE_UNIT_WEEK => get_string('filterdateweeks', 'core_reportbuilder'),
@@ -274,6 +278,18 @@ private static function get_relative_timeframe(int $operator, int $dateunitvalue
         $datestart = $dateend = di::get(clock::class)->now();
 
         switch ($dateunit) {
+            case self::DATE_UNIT_MINUTE:
+                if ($operator === self::DATE_CURRENT) {
+                    $hour = (int) $datestart->format('G');
+                    $minute = (int) $datestart->format('i');
+                    $datestart = $datestart->setTime($hour, $minute);
+                    $dateend = $dateend->setTime($hour, $minute, 59);
+                } else if ($operator === self::DATE_LAST) {
+                    $datestart = $datestart->modify("-{$dateunitvalue} minute");
+                } else if ($operator === self::DATE_NEXT) {
+                    $dateend = $dateend->modify("+{$dateunitvalue} minute");
+                }
+                break;
             case self::DATE_UNIT_HOUR:
                 if ($operator === self::DATE_CURRENT) {
                     $hour = (int) $datestart->format('G');
diff --git a/reportbuilder/tests/local/filters/date_test.php b/reportbuilder/tests/local/filters/date_test.php
index 572fed4ffc2a0..4b34248061263 100644
--- a/reportbuilder/tests/local/filters/date_test.php
+++ b/reportbuilder/tests/local/filters/date_test.php
@@ -20,8 +20,8 @@
 
 use advanced_testcase;
 use core\clock;
+use core\lang_string;
 use core_reportbuilder\local\report\filter;
-use lang_string;
 
 /**
  * Unit tests for date report filter
@@ -234,33 +234,39 @@ public function test_get_sql_filter_current_week_no_match(int $startweekday, str
      */
     public static function get_sql_filter_relative_provider(): array {
         return [
+            'Before minute' => [date::DATE_BEFORE, 1, date::DATE_UNIT_MINUTE, '-90 second'],
             'Before hour' => [date::DATE_BEFORE, 1, date::DATE_UNIT_HOUR, '-90 minute'],
             'Before day' => [date::DATE_BEFORE, 1, date::DATE_UNIT_DAY, '-25 hour'],
             'Before week' => [date::DATE_BEFORE, 1, date::DATE_UNIT_WEEK, '-10 day'],
             'Before month' => [date::DATE_BEFORE, 1, date::DATE_UNIT_MONTH, '-7 week'],
             'Before year' => [date::DATE_BEFORE, 1, date::DATE_UNIT_YEAR, '-15 month'],
+            'Before two minutes' => [date::DATE_BEFORE, 2, date::DATE_UNIT_MINUTE, '-150 second'],
             'Before two hours' => [date::DATE_BEFORE, 2, date::DATE_UNIT_HOUR, '-150 minute'],
             'Before two days' => [date::DATE_BEFORE, 2, date::DATE_UNIT_DAY, '-50 hour'],
             'Before two weeks' => [date::DATE_BEFORE, 2, date::DATE_UNIT_WEEK, '-20 day'],
             'Before two months' => [date::DATE_BEFORE, 2, date::DATE_UNIT_MONTH, '-15 week'],
             'Before two years' => [date::DATE_BEFORE, 2, date::DATE_UNIT_YEAR, '-30 month'],
 
+            'After minute' => [date::DATE_AFTER, 1, date::DATE_UNIT_MINUTE, '+90 second'],
             'After hour' => [date::DATE_AFTER, 1, date::DATE_UNIT_HOUR, '+90 minute'],
             'After day' => [date::DATE_AFTER, 1, date::DATE_UNIT_DAY, '+25 hour'],
             'After week' => [date::DATE_AFTER, 1, date::DATE_UNIT_WEEK, '+10 day'],
             'After month' => [date::DATE_AFTER, 1, date::DATE_UNIT_MONTH, '+7 week'],
             'After year' => [date::DATE_AFTER, 1, date::DATE_UNIT_YEAR, '+15 month'],
+            'After two minutes' => [date::DATE_AFTER, 2, date::DATE_UNIT_MINUTE, '+150 second'],
             'After two hours' => [date::DATE_AFTER, 2, date::DATE_UNIT_HOUR, '+150 minute'],
             'After two days' => [date::DATE_AFTER, 2, date::DATE_UNIT_DAY, '+50 hour'],
             'After two weeks' => [date::DATE_AFTER, 2, date::DATE_UNIT_WEEK, '+20 day'],
             'After two months' => [date::DATE_AFTER, 2, date::DATE_UNIT_MONTH, '+15 week'],
             'After two years' => [date::DATE_AFTER, 2, date::DATE_UNIT_YEAR, '+30 month'],
 
+            'Last minute' => [date::DATE_LAST, 1, date::DATE_UNIT_MINUTE, '-30 second'],
             'Last hour' => [date::DATE_LAST, 1, date::DATE_UNIT_HOUR, '-30 minute'],
             'Last day' => [date::DATE_LAST, 1, date::DATE_UNIT_DAY, '-6 hour'],
             'Last week' => [date::DATE_LAST, 1, date::DATE_UNIT_WEEK, '-3 day'],
             'Last month' => [date::DATE_LAST, 1, date::DATE_UNIT_MONTH, '-3 week'],
             'Last year' => [date::DATE_LAST, 1, date::DATE_UNIT_YEAR, '-6 month'],
+            'Last two minutes' => [date::DATE_LAST, 2, date::DATE_UNIT_MINUTE, '-90 second'],
             'Last two hours' => [date::DATE_LAST, 2, date::DATE_UNIT_HOUR, '-90 minute'],
             'Last two days' => [date::DATE_LAST, 2, date::DATE_UNIT_DAY, '-25 hour'],
             'Last two weeks' => [date::DATE_LAST, 2, date::DATE_UNIT_WEEK, '-10 day'],
@@ -268,16 +274,19 @@ public static function get_sql_filter_relative_provider(): array {
             'Last two years' => [date::DATE_LAST, 2, date::DATE_UNIT_YEAR, '-15 month'],
 
             // Current week is tested separately.
+            'Current minute' => [date::DATE_CURRENT, null, date::DATE_UNIT_MINUTE],
             'Current hour' => [date::DATE_CURRENT, null, date::DATE_UNIT_HOUR],
             'Current day' => [date::DATE_CURRENT, null, date::DATE_UNIT_DAY],
             'Current month' => [date::DATE_CURRENT, null, date::DATE_UNIT_MONTH],
             'Current year' => [date::DATE_CURRENT, null, date::DATE_UNIT_YEAR],
 
+            'Next minute' => [date::DATE_NEXT, 1, date::DATE_UNIT_MINUTE, '+30 second'],
             'Next hour' => [date::DATE_NEXT, 1, date::DATE_UNIT_HOUR, '+30 minute'],
             'Next day' => [date::DATE_NEXT, 1, date::DATE_UNIT_DAY, '+6 hour'],
             'Next week' => [date::DATE_NEXT, 1, date::DATE_UNIT_WEEK, '+3 day'],
             'Next month' => [date::DATE_NEXT, 1, date::DATE_UNIT_MONTH, '+3 week'],
             'Next year' => [date::DATE_NEXT, 1, date::DATE_UNIT_YEAR, '+6 month'],
+            'Next two minutes' => [date::DATE_NEXT, 2, date::DATE_UNIT_MINUTE, '+90 second'],
             'Next two hours' => [date::DATE_NEXT, 2, date::DATE_UNIT_HOUR, '+90 minute'],
             'Next two days' => [date::DATE_NEXT, 2, date::DATE_UNIT_DAY, '+25 hour'],
             'Next two weeks' => [date::DATE_NEXT, 2, date::DATE_UNIT_WEEK, '+10 day'],

From 34522782830d37e925e61edaf6897540fdbf4ab1 Mon Sep 17 00:00:00 2001
From: Shamim Rezaie <shamim@moodle.com>
Date: Wed, 12 Jun 2024 20:41:36 +1000
Subject: [PATCH 092/119] MDL-80748 core: organizes the properties of the
 flexible_table class

Public properties are now defined first, followed by protected
properties and finally private properties. Previously, they were
scattered.
---
 lib/table/classes/flexible_table.php | 176 ++++++++++++---------------
 1 file changed, 78 insertions(+), 98 deletions(-)

diff --git a/lib/table/classes/flexible_table.php b/lib/table/classes/flexible_table.php
index 65ba85b501353..67422bb7be63d 100644
--- a/lib/table/classes/flexible_table.php
+++ b/lib/table/classes/flexible_table.php
@@ -41,138 +41,118 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 class flexible_table {
-    public $uniqueid        = null;
-    public $attributes      = [];
-    public $headers         = [];
+    public $attributes = [];
+    public $baseurl = null;
 
-    /**
-     * @var string A column which should be considered as a header column.
-     */
-    protected $headercolumn = null;
+    /** @var string The caption of table */
+    public $caption;
 
-    /**
-     * @var string For create header with help icon.
-     */
-    private $helpforheaders = [];
-    public $columns         = [];
-    public $column_style    = [];
-    public $column_class    = [];
+    /** @var array The caption attributes of table */
+    public $captionattributes;
+
+    public $column_class = [];
+    public $column_nosort = ['userpic'];
+    public $column_style = [];
     public $column_suppress = [];
-    public $column_nosort   = ['userpic'];
-    private $column_textsort = [];
+    public $columns = [];
+    public $currentrow = 0;
+    public $currpage = 0;
 
     /**
-     * @var array The sticky attribute of each table column.
+     * Which download plugin to use. Default '' means none - print html table with paging.
+     * Property set by is_downloading which typically passes in cleaned data from $
+     * @var string
      */
-    protected $columnsticky = [];
-
-    /** @var bool Stores if setup has already been called on this flixible table. */
-    public $setup           = false;
-    public $baseurl         = null;
-    public $request         = [];
-
-    /** @var string[] Columns that are expected to contain a users fullname.  */
-    protected $userfullnamecolumns = ['fullname'];
-
-    /** @var array[] Attributes for each column  */
-    private $columnsattributes = [];
+    public $download = '';
 
     /**
-     * @var bool Whether or not to store table properties in the user_preferences table.
+     * Whether data is downloadable from table. Determines whether to display download buttons. Set by method downloadable().
+     * @var bool
      */
-    private $persistent = false;
-    public $is_collapsible = false;
-    public $is_sortable    = false;
+    public $downloadable = false;
 
-    /**
-     * @var array The fields to sort.
-     */
-    protected $sortdata;
+    /** @var dataformat_export_format */
+    public $exportclass = null;
 
-    /** @var string The manually set first name initial preference */
-    protected $ifirst;
+    public $headers = [];
+    public $is_collapsible = false;
+    public $is_sortable = false;
+    public $maxsortkeys = 2;
+    public $pagesize = 30;
+    public $request = [];
 
-    /** @var string The manually set last name initial preference */
-    protected $ilast;
+    /** @var bool Stores if setup has already been called on this flixible table. */
+    public $setup = false;
 
-    public $use_pages      = false;
-    public $use_initials   = false;
+    /** @var int[] Array of positions in which to display download controls. */
+    public $showdownloadbuttonsat = [TABLE_P_TOP];
 
-    public $maxsortkeys = 2;
-    public $pagesize    = 30;
-    public $currpage    = 0;
-    public $totalrows   = 0;
-    public $currentrow  = 0;
     public $sort_default_column = null;
-    public $sort_default_order  = SORT_ASC;
+    public $sort_default_order = SORT_ASC;
 
-    /** @var int The defeult per page size for the table. */
-    private $defaultperpage = 30;
+    /** @var bool Has start output been called yet? */
+    public $started_output = false;
 
-    /**
-     * @var array Array of positions in which to display download controls.
-     */
-    public $showdownloadbuttonsat = [TABLE_P_TOP];
+    public $totalrows = 0;
+    public $uniqueid = null;
+    public $use_initials = false;
+    public $use_pages = false;
 
-    /**
-     * @var string Key of field returned by db query that is the id field of the
-     * user table or equivalent.
-     */
+    /** @var string Key of field returned by db query that is the id field of the user table or equivalent. */
     public $useridfield = 'id';
 
-    /**
-     * @var string which download plugin to use. Default '' means none - print
-     * html table with paging. Property set by is_downloading which typically
-     * passes in cleaned data from $
-     */
-    public $download  = '';
+    /** @var array The sticky attribute of each table column. */
+    protected $columnsticky = [];
 
-    /**
-     * @var bool whether data is downloadable from table. Determines whether
-     * to display download buttons. Set by method downloadable().
-     */
-    public $downloadable = false;
+    /** @var string $filename */
+    protected $filename;
 
     /**
-     * @var bool Has start output been called yet?
+     * The currently applied filerset. This is required for dynamic tables, but can be used by other tables too if desired.
+     * @var filterset
      */
-    public $started_output = false;
+    protected $filterset = null;
 
-    /** @var dataformat_export_format */
-    public $exportclass = null;
+    /** @var string A column which should be considered as a header column. */
+    protected $headercolumn = null;
 
-    /**
-     * @var array For storing user-customised table properties in the user_preferences db table.
-     */
-    private $prefs = [];
+    /** @var string For create header with help icon. */
+    private $helpforheaders = [];
 
-    /** @var string $sheettitle */
-    protected $sheettitle;
+    /** @var array List of hidden columns. */
+    protected $hiddencolumns;
 
-    /** @var string $filename */
-    protected $filename;
+    /** @var string The manually set first name initial preference */
+    protected $ifirst;
 
-    /** @var array $hiddencolumns List of hidden columns. */
-    protected $hiddencolumns;
+    /** @var string The manually set last name initial preference */
+    protected $ilast;
 
-    /** @var bool $resetting Whether the table preferences is resetting. */
+    /** @var bool Whether the table preferences is resetting. */
     protected $resetting;
 
-    /**
-     * @var string $caption The caption of table
-     */
-    public $caption;
+    /** @var string */
+    protected $sheettitle;
 
-    /**
-     * @var array $captionattributes The caption attributes of table
-     */
-    public $captionattributes;
+    /** @var array The fields to sort. */
+    protected $sortdata;
 
-    /**
-     * @var filterset The currently applied filerset
-     * This is required for dynamic tables, but can be used by other tables too if desired.
-     */
-    protected $filterset = null;
+    /** @var string[] Columns that are expected to contain a users fullname.  */
+    protected $userfullnamecolumns = ['fullname'];
+
+    private $column_textsort = [];
+
+    /** @var array[] Attributes for each column  */
+    private $columnsattributes = [];
+
+    /** @var int The default per page size for the table. */
+    private $defaultperpage = 30;
+
+    /** @var bool Whether to store table properties in the user_preferences table. */
+    private $persistent = false;
+
+    /** @var array For storing user-customised table properties in the user_preferences db table. */
+    private $prefs = [];
 
     /**
      * Constructor

From e44d630be2d2444aa3c561894d3a8c5dbcc5c787 Mon Sep 17 00:00:00 2001
From: Shamim Rezaie <shamim@moodle.com>
Date: Wed, 12 Jun 2024 19:38:01 +1000
Subject: [PATCH 093/119] MDL-80748 core: flexible_table can be optionally
 responsive

---
 .upgradenotes/MDL-80748-2024070105545553.yml | 11 +++++++++++
 lib/table/classes/flexible_table.php         | 11 +++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 .upgradenotes/MDL-80748-2024070105545553.yml

diff --git a/.upgradenotes/MDL-80748-2024070105545553.yml b/.upgradenotes/MDL-80748-2024070105545553.yml
new file mode 100644
index 0000000000000..cc380bd12bfb7
--- /dev/null
+++ b/.upgradenotes/MDL-80748-2024070105545553.yml
@@ -0,0 +1,11 @@
+issueNumber: MDL-80748
+notes:
+  core_table:
+    - message: >+
+        A new `$reponsive` property (defaulting to `true`) has been added to the
+        `core_table\flexible_table` class.
+
+        This property allows you to control whether the table is rendered as a
+        responsive table.
+
+      type: improved
diff --git a/lib/table/classes/flexible_table.php b/lib/table/classes/flexible_table.php
index 67422bb7be63d..967006d1ef7a9 100644
--- a/lib/table/classes/flexible_table.php
+++ b/lib/table/classes/flexible_table.php
@@ -101,6 +101,9 @@ class flexible_table {
     /** @var string Key of field returned by db query that is the id field of the user table or equivalent. */
     public $useridfield = 'id';
 
+    /** @var bool Whether to make the table to be scrolled horizontally with ease. Make table responsive across all viewports. */
+    public bool $responsive = true;
+
     /** @var array The sticky attribute of each table column. */
     protected $columnsticky = [];
 
@@ -1202,7 +1205,9 @@ public function finish_html() {
 
             echo html_writer::end_tag('tbody');
             echo html_writer::end_tag('table');
-            echo html_writer::end_tag('div');
+            if ($this->responsive) {
+                echo html_writer::end_tag('div');
+            }
             $this->wrap_html_finish();
 
             // Paging bar.
@@ -1860,7 +1865,9 @@ public function start_html() {
         $this->wrap_html_start();
         // Start of main data table.
 
-        echo html_writer::start_tag('div', ['class' => 'no-overflow']);
+        if ($this->responsive) {
+            echo html_writer::start_tag('div', ['class' => 'no-overflow']);
+        }
         echo html_writer::start_tag('table', $this->attributes) . $this->render_caption();
     }
 

From f5f8fb5ff6fcfc6cfdc152b41401e1a188542918 Mon Sep 17 00:00:00 2001
From: Shamim Rezaie <shamim@moodle.com>
Date: Wed, 12 Jun 2024 22:40:21 +1000
Subject: [PATCH 094/119] MDL-80748 mod_assign: grading table now has a sticky
 header

`position: sticky` doesn't work in responsive tables because responsive
tables have scrollbars, making them the nearest ancestor with a
scrolling mechanism for the sticky header. As a result, the table can no
longer be responsive. This change is actually desired and was intended
for MDL-81860. Since we implemented it here, we can close the other
issue.
---
 mod/assign/locallib.php              | 2 ++
 mod/assign/styles.css                | 9 +++++++++
 theme/boost/scss/moodle/modules.scss | 6 ++++++
 theme/boost/style/moodle.css         | 6 ++++++
 theme/classic/style/moodle.css       | 6 ++++++
 5 files changed, 29 insertions(+)

diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
index 64052b2b70fa4..1178ed9e60469 100644
--- a/mod/assign/locallib.php
+++ b/mod/assign/locallib.php
@@ -4602,6 +4602,7 @@ protected function view_grading_table() {
         // Load and print the table of submissions.
         if ($showquickgrading && $quickgrading) {
             $gradingtable = new assign_grading_table($this, $perpage, $filter, 0, true);
+            $gradingtable->responsive = false;
             $table = $this->get_renderer()->render($gradingtable);
             $page = optional_param('page', null, PARAM_INT);
             $quickformparams = array('cm'=>$this->get_course_module()->id,
@@ -4613,6 +4614,7 @@ protected function view_grading_table() {
             $o .= $this->get_renderer()->render(new assign_form('quickgradingform', $quickgradingform));
         } else {
             $gradingtable = new assign_grading_table($this, $perpage, $filter, 0, false);
+            $gradingtable->responsive = false;
             $o .= $this->get_renderer()->render($gradingtable);
         }
 
diff --git a/mod/assign/styles.css b/mod/assign/styles.css
index 9e63e71dcd6d9..134b3a5b56bee 100644
--- a/mod/assign/styles.css
+++ b/mod/assign/styles.css
@@ -139,6 +139,15 @@
     display: block;
 }
 
+.path-mod-assign .gradingtable table {
+    border-collapse: separate;
+    border-spacing: 0;
+}
+
+.path-mod-assign .gradingtable thead th {
+    background-color: white;
+}
+
 .path-mod-assign .gradingtable tr.selectedrow td {
     background-color: #fec;
 }
diff --git a/theme/boost/scss/moodle/modules.scss b/theme/boost/scss/moodle/modules.scss
index efffa9d030c73..81b63b67067ec 100644
--- a/theme/boost/scss/moodle/modules.scss
+++ b/theme/boost/scss/moodle/modules.scss
@@ -1497,6 +1497,12 @@ $popout-header-height: 4rem;
     background-color: $card-bg;
 }
 
+.path-mod-assign .gradingtable thead tr {
+    position: sticky;
+    top: $navbar-height;
+    z-index: 1;
+}
+
 /**
  * Mod LTI.
  */
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 253667f40f150..561da0f4fcc13 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -34761,6 +34761,12 @@ img.userpicture {
   background-color: #fff;
 }
 
+.path-mod-assign .gradingtable thead tr {
+  position: sticky;
+  top: 60px;
+  z-index: 1;
+}
+
 /**
  * Mod LTI.
  */
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index e58998b898afa..f6b958d94a560 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -34761,6 +34761,12 @@ img.userpicture {
   background-color: #fff;
 }
 
+.path-mod-assign .gradingtable thead tr {
+  position: sticky;
+  top: 50px;
+  z-index: 1;
+}
+
 /**
  * Mod LTI.
  */

From d5a87529148d20cca6d36338c8d9fd744af23ead Mon Sep 17 00:00:00 2001
From: Shamim Rezaie <shamim@moodle.com>
Date: Wed, 26 Jun 2024 16:28:50 +1000
Subject: [PATCH 095/119] MDL-80748 behat: Workaround for elements covered by
 the sticky header

---
 .../grade/tests/behat/availability_grade.feature          | 2 ++
 completion/tests/behat/restrict_activity_by_grade.feature | 2 ++
 .../tests/behat/restrict_section_availability.feature     | 2 ++
 grade/grading/form/rubric/tests/behat/edit_rubric.feature | 6 ++++++
 .../feedback/editpdf/tests/behat/annotate_pdf.feature     | 6 ++++++
 .../editpdf/tests/behat/comment_popup_menu.feature        | 2 ++
 .../editpdf/tests/behat/view_previous_annotations.feature | 2 ++
 mod/assign/tests/behat/allow_another_attempt.feature      | 4 ++++
 mod/assign/tests/behat/assign_settings.feature            | 4 ++++
 mod/assign/tests/behat/assign_table_preferences.feature   | 2 ++
 .../tests/behat/bulk_release_anon_submissions.feature     | 2 ++
 mod/assign/tests/behat/comment_inline.feature             | 2 ++
 mod/assign/tests/behat/display_grade.feature              | 2 ++
 mod/assign/tests/behat/edit_previous_feedback.feature     | 4 ++++
 mod/assign/tests/behat/edit_student_submission.feature    | 2 ++
 mod/assign/tests/behat/grading_app_filters.feature        | 2 ++
 mod/assign/tests/behat/grading_status.feature             | 8 ++++++++
 mod/assign/tests/behat/hide_grader.feature                | 2 ++
 mod/assign/tests/behat/quickgrading.feature               | 4 +++-
 mod/assign/tests/behat/reopen_locked_submission.feature   | 6 ++++++
 mod/assign/tests/behat/rescale_grades.feature             | 2 ++
 mod/assign/tests/behat/steps_blind_marking.feature        | 2 ++
 22 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/availability/condition/grade/tests/behat/availability_grade.feature b/availability/condition/grade/tests/behat/availability_grade.feature
index c8f195fa172be..027cd2d0afa00 100644
--- a/availability/condition/grade/tests/behat/availability_grade.feature
+++ b/availability/condition/grade/tests/behat/availability_grade.feature
@@ -89,7 +89,9 @@ Feature: availability_grade
     # Give the assignment 40%.
     And I follow "View all submissions"
     # Pick the grade link in the row that has s@example.com in it.
+    And I change window size to "large"
     And I click on "Grade" "link" in the "s@example.com" "table_row"
+    And I change window size to "medium"
     And I set the field "Grade out of 100" to "40"
     And I click on "Save changes" "button"
     And I click on "Edit settings" "link"
diff --git a/completion/tests/behat/restrict_activity_by_grade.feature b/completion/tests/behat/restrict_activity_by_grade.feature
index 9f5933a65d07d..2e61589f2a2b3 100644
--- a/completion/tests/behat/restrict_activity_by_grade.feature
+++ b/completion/tests/behat/restrict_activity_by_grade.feature
@@ -45,7 +45,9 @@ Feature: Restrict activity availability through grade conditions
 
     And I am on the "Grade assignment" "assign activity" page logged in as teacher1
     And I follow "View all submissions"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student First" "table_row"
+    And I change window size to "medium"
     And I set the following fields to these values:
       | Grade | 21 |
     And I press "Save changes"
diff --git a/completion/tests/behat/restrict_section_availability.feature b/completion/tests/behat/restrict_section_availability.feature
index 40f6b76560586..5d214815d6c07 100644
--- a/completion/tests/behat/restrict_section_availability.feature
+++ b/completion/tests/behat/restrict_section_availability.feature
@@ -68,7 +68,9 @@ Feature: Restrict sections availability through completion or grade conditions
     And I log out
     And I am on the "Grade assignment" "assign activity" page logged in as teacher1
     And I follow "View all submissions"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student First" "table_row"
+    And I change window size to "medium"
     And I set the following fields to these values:
       | Grade | 21 |
     And I press "Save changes"
diff --git a/grade/grading/form/rubric/tests/behat/edit_rubric.feature b/grade/grading/form/rubric/tests/behat/edit_rubric.feature
index 2c5dc28981824..612bfd534b12d 100644
--- a/grade/grading/form/rubric/tests/behat/edit_rubric.feature
+++ b/grade/grading/form/rubric/tests/behat/edit_rubric.feature
@@ -50,7 +50,9 @@ Feature: Rubrics can be created and edited
     Then I should see "Ready for use"
     # Grading two students.
     And I navigate to "Assignment" in current page administration
+    And I change window size to "large"
     And I go to "Student 1" "Test assignment 1 name" activity advanced grading page
+    And I change window size to "medium"
     And I grade by filling the rubric with:
       | Criterion 1 | 50 | Very good |
     And I press "Save changes"
@@ -66,7 +68,9 @@ Feature: Rubrics can be created and edited
     And I should see "65" in the "Student 1" "table_row"
     # Updating the user grade.
     And I am on the "Test assignment 1 name" "assign activity" page
+    And I change window size to "large"
     And I go to "Student 1" "Test assignment 1 name" activity advanced grading page
+    And I change window size to "medium"
     And I grade by filling the rubric with:
       | Criterion 1 | 20 | Bad, I changed my mind |
       | Criterion 2 | 10 | Mmmm, you can do it better |
@@ -118,7 +122,9 @@ Feature: Rubrics can be created and edited
     And I log out
     # Regrade student.
     And I am on the "Test assignment 1 name" "assign activity" page logged in as teacher1
+    And I change window size to "large"
     And I go to "Student 1" "Test assignment 1 name" activity advanced grading page
+    And I change window size to "medium"
     And I should see "The rubric definition was changed after this student had been graded. The student can not see this rubric until you check the rubric and update the grade."
     And I save the advanced grading form
     And I log out
diff --git a/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature b/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature
index 468db0d79d0d9..c9bd1801c9657 100644
--- a/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature
+++ b/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature
@@ -36,7 +36,9 @@ Feature: In an assignment, teacher can annotate PDF files during grading
 
     When I am on the "Test assignment name" Activity page logged in as teacher1
     And I follow "View all submissions"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Submitted for grading" "table_row"
+    And I change window size to "medium"
     Then I should see "Page 1 of 1"
     And I wait for the complete PDF to load
     And I click on ".linebutton" "css_element"
@@ -54,7 +56,9 @@ Feature: In an assignment, teacher can annotate PDF files during grading
     Then I should see "Page 1 of 1"
     And I am on the "Test assignment name" Activity page logged in as teacher1
     And I follow "View all submissions"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Submitted for grading" "table_row"
+    And I change window size to "medium"
     Then I should see "Page 1 of 3"
     And I wait for the complete PDF to load
     And I click on ".linebutton" "css_element"
@@ -108,7 +112,9 @@ Feature: In an assignment, teacher can annotate PDF files during grading
 
     When I am on the "Test assignment name" Activity page logged in as teacher1
     And I follow "View all submissions"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Submitted for grading" "table_row"
+    And I change window size to "medium"
     Then I should see "Page 1 of 3"
     And I click on ".navigate-next-button" "css_element"
     And I should see "Page 2 of 3"
diff --git a/mod/assign/feedback/editpdf/tests/behat/comment_popup_menu.feature b/mod/assign/feedback/editpdf/tests/behat/comment_popup_menu.feature
index 88116eeeac2bb..57285b5ef12d7 100644
--- a/mod/assign/feedback/editpdf/tests/behat/comment_popup_menu.feature
+++ b/mod/assign/feedback/editpdf/tests/behat/comment_popup_menu.feature
@@ -33,7 +33,9 @@ Feature: Ensure that a comment remains visible if its popup menu is open
 
     And I am on the "Test assignment name" Activity page logged in as teacher1
     And I follow "View all submissions"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Submitted for grading" "table_row"
+    And I change window size to "medium"
     And I wait for the complete PDF to load
 
   Scenario: Add an empty comment and open its menu
diff --git a/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature b/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature
index 2ecbff48824dc..e253a28129f04 100644
--- a/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature
+++ b/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature
@@ -37,7 +37,9 @@ Feature: In an assignment, teacher can view the feedback for a previous attempt.
 
     When I am on the "Test assignment name" Activity page logged in as teacher1
     And I follow "View all submissions"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Submitted for grading" "table_row"
+    And I change window size to "medium"
     Then I should see "Page 1 of 3"
     And I click on ".navigate-next-button" "css_element"
     And I should see "Page 2 of 3"
diff --git a/mod/assign/tests/behat/allow_another_attempt.feature b/mod/assign/tests/behat/allow_another_attempt.feature
index db6be7b01b750..c6c0b2a8f4db1 100644
--- a/mod/assign/tests/behat/allow_another_attempt.feature
+++ b/mod/assign/tests/behat/allow_another_attempt.feature
@@ -34,7 +34,9 @@ Feature: In an assignment, students start a new attempt based on their previous
 
     And I am on the "Test assignment name" Activity page logged in as teacher1
     And I follow "View all submissions"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student 1" "table_row"
+    And I change window size to "medium"
     And I set the following fields to these values:
       | Allow another attempt | 1 |
     And I press "Save changes"
@@ -49,7 +51,9 @@ Feature: In an assignment, students start a new attempt based on their previous
 
     And I am on the "Test assignment name" Activity page logged in as teacher1
     And I follow "View all submissions"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student 1" "table_row"
+    And I change window size to "medium"
     And I should see "I'm the student first submission"
 
   @javascript @_alert
diff --git a/mod/assign/tests/behat/assign_settings.feature b/mod/assign/tests/behat/assign_settings.feature
index 378e4a7c83876..7db8d799b0904 100644
--- a/mod/assign/tests/behat/assign_settings.feature
+++ b/mod/assign/tests/behat/assign_settings.feature
@@ -107,7 +107,9 @@ Feature: Assignments settings can be changed
 
     When I am on the "Test assignment name" Activity page logged in as teacher1
     And I follow "View all submissions"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student 3" "table_row"
+    And I change window size to "medium"
     And I set the field "Grade out of 100" to "40"
     And I set the field "Notify student" to "0"
     And I press "Save changes"
@@ -118,7 +120,9 @@ Feature: Assignments settings can be changed
 
     And I am on the "Test assignment name" Activity page logged in as teacher1
     And I follow "View all submissions"
+    And I change window size to "large"
     And I open the action menu in "Student 3" "table_row"
+    And I change window size to "medium"
     And I follow "Allow another attempt"
 
     And I am on the "Test assignment name" Activity page logged in as student3
diff --git a/mod/assign/tests/behat/assign_table_preferences.feature b/mod/assign/tests/behat/assign_table_preferences.feature
index b36a78815d825..2779e6dc8a0fc 100644
--- a/mod/assign/tests/behat/assign_table_preferences.feature
+++ b/mod/assign/tests/behat/assign_table_preferences.feature
@@ -48,7 +48,9 @@ Feature: In an assignment, teachers can use table preferences.
     And I am on the "Test assignment" Activity page
     And I follow "View all submissions"
     And I click on "T" "link" in the ".lastinitial" "css_element"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student Two" "table_row"
+    And I change window size to "medium"
     And I should see "This is a submission for Student Two"
     And I should see "1 of 1"
     And I follow "Reset table preferences"
diff --git a/mod/assign/tests/behat/bulk_release_anon_submissions.feature b/mod/assign/tests/behat/bulk_release_anon_submissions.feature
index e346305f4c4a5..9a26885c1cecb 100644
--- a/mod/assign/tests/behat/bulk_release_anon_submissions.feature
+++ b/mod/assign/tests/behat/bulk_release_anon_submissions.feature
@@ -49,7 +49,9 @@ Feature: Bulk released grades should not be sent to gradebook while submissions
     And I am on the "Test assignment name" "assign activity" page
     And I follow "View all submissions"
     Then I should see "Not marked" in the "I'm student2's submission" "table_row"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "I'm student2's submission" "table_row"
+    And I change window size to "medium"
     And I set the field "Grade out of 100" to "50"
     And I set the field "Marking workflow state" to "In review"
     And I set the field "Feedback comments" to "Great job!"
diff --git a/mod/assign/tests/behat/comment_inline.feature b/mod/assign/tests/behat/comment_inline.feature
index 5088de82f4f10..3998a1b61fb7b 100644
--- a/mod/assign/tests/behat/comment_inline.feature
+++ b/mod/assign/tests/behat/comment_inline.feature
@@ -33,7 +33,9 @@ Feature: In an assignment, teachers can edit a students submission inline
 
     When I am on the "Test assignment name" Activity page logged in as teacher1
     And I follow "View all submissions"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student 1" "table_row"
+    And I change window size to "medium"
     And I set the following fields to these values:
       | Grade out of 100 | 50 |
       | Feedback comments | I'm the teacher feedback |
diff --git a/mod/assign/tests/behat/display_grade.feature b/mod/assign/tests/behat/display_grade.feature
index 022a75b3c1c78..1942db72dddfd 100644
--- a/mod/assign/tests/behat/display_grade.feature
+++ b/mod/assign/tests/behat/display_grade.feature
@@ -63,7 +63,9 @@ Feature: Check that the assignment grade can be updated correctly
       | groupmode        | 0                           |
     And I am on the "Test assignment name" Activity page logged in as teacher1
     When I follow "View all submissions"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student 1" "table_row"
+    And I change window size to "medium"
     And I set the field "Grade out of 100" to "50"
     And I set the field "Notify student" to "0"
     And I press "Save changes"
diff --git a/mod/assign/tests/behat/edit_previous_feedback.feature b/mod/assign/tests/behat/edit_previous_feedback.feature
index 3a2fe7c7d6ef4..2144ecabbdc48 100644
--- a/mod/assign/tests/behat/edit_previous_feedback.feature
+++ b/mod/assign/tests/behat/edit_previous_feedback.feature
@@ -36,7 +36,9 @@ Feature: In an assignment, teachers can edit feedback for a students previous su
       | Test assignment name  | student2  | I'm the student first submission  |
     And I am on the "Test assignment name" Activity page logged in as teacher1
     And I follow "View all submissions"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student 2" "table_row"
+    And I change window size to "medium"
     And I set the following fields to these values:
       | Grade | 49 |
       | Feedback comments | I'm the teacher first feedback |
@@ -51,7 +53,9 @@ Feature: In an assignment, teachers can edit feedback for a students previous su
 
     And I am on the "Test assignment name" Activity page logged in as teacher1
     And I follow "View all submissions"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student 2" "table_row"
+    And I change window size to "medium"
     And I click on "View a different attempt" "link"
     And I click on "Attempt 1" "radio" in the "View a different attempt" "dialogue"
     And I click on "View" "button" in the "View a different attempt" "dialogue"
diff --git a/mod/assign/tests/behat/edit_student_submission.feature b/mod/assign/tests/behat/edit_student_submission.feature
index 3dd78dcd99014..f21f5244b4922 100644
--- a/mod/assign/tests/behat/edit_student_submission.feature
+++ b/mod/assign/tests/behat/edit_student_submission.feature
@@ -27,7 +27,9 @@ Feature: In an assignment, the administrator can edit students' submissions
 
     And I am on the "Test assignment name" Activity page logged in as admin
     And I follow "View all submissions"
+    And I change window size to "large"
     And I open the action menu in "Student 1" "table_row"
+    And I change window size to "medium"
     And I choose "Edit submission" in the open action menu
     And I set the following fields to these values:
       | Online text | Have you seen the movie Chef? |
diff --git a/mod/assign/tests/behat/grading_app_filters.feature b/mod/assign/tests/behat/grading_app_filters.feature
index c483438d9b22c..5dc9f96a7c0d5 100644
--- a/mod/assign/tests/behat/grading_app_filters.feature
+++ b/mod/assign/tests/behat/grading_app_filters.feature
@@ -50,7 +50,9 @@ Feature: In an assignment, teachers can change filters in the grading app
     And I set the field "filter" to "Not submitted"
     And I set the field "markerfilter" to "Marker 1"
     And I set the field "workflowfilter" to "In marking"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student 1" "table_row"
+    And I change window size to "medium"
     Then the field "filter" matches value "Not submitted"
     And the field "markerfilter" matches value "Marker 1"
     And the field "workflowfilter" matches value "In marking"
diff --git a/mod/assign/tests/behat/grading_status.feature b/mod/assign/tests/behat/grading_status.feature
index 1553d95d1a627..40870f23be32f 100644
--- a/mod/assign/tests/behat/grading_status.feature
+++ b/mod/assign/tests/behat/grading_status.feature
@@ -61,7 +61,9 @@ Feature: View the grading status of an assignment
     And I am on the "Test assignment name" "assign activity" page logged in as teacher1
     And I follow "View all submissions"
     And I should see "In review" in the "Student 1" "table_row"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student 1" "table_row"
+    And I change window size to "medium"
     And I should see "1 of 1"
     And I set the field "Marking workflow state" to "Released"
     And I press "Save changes"
@@ -77,7 +79,9 @@ Feature: View the grading status of an assignment
     And I am on the "Test assignment name" "assign activity" page logged in as teacher1
     And I follow "View all submissions"
     And I should see "Released" in the "Student 1" "table_row"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student 1" "table_row"
+    And I change window size to "medium"
     And I should see "1 of 1"
     And I set the field "Marking workflow state" to "In marking"
     And I set the field "Notify student" to "0"
@@ -88,7 +92,9 @@ Feature: View the grading status of an assignment
     # The grade should also remain displayed as it's stored in the assign DB tables, but the final grade should be empty.
     And "Student 1" row "Grade" column of "generaltable" table should contain "50.00"
     And "Student 1" row "Final grade" column of "generaltable" table should contain "-"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student 1" "table_row"
+    And I change window size to "medium"
     And I click on "Change filters" "link"
     And I set the field "Workflow filter" to "In review"
     And I should see "0 of 0"
@@ -142,7 +148,9 @@ Feature: View the grading status of an assignment
     And I follow "View all submissions"
     And I should see "Graded - resubmitted" in the "Student 1" "table_row"
     And I wait "10" seconds
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student 1" "table_row"
+    And I change window size to "medium"
     And I should see "1 of 1"
     And I set the field "Grade out of 100" to "99.99"
     And I set the field "Feedback comments" to "Even better job! Really."
diff --git a/mod/assign/tests/behat/hide_grader.feature b/mod/assign/tests/behat/hide_grader.feature
index 02c0db80cfa44..87e0c4161d416 100644
--- a/mod/assign/tests/behat/hide_grader.feature
+++ b/mod/assign/tests/behat/hide_grader.feature
@@ -38,7 +38,9 @@ Feature: Hide grader identities identity from students
     And I am on the "Test assignment name" Activity page logged in as teacher1
     And I follow "View all submissions"
     And I should not see "Graded" in the "Student 1" "table_row"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student 1" "table_row"
+    And I change window size to "medium"
     And I set the field "Grade out of 100" to "50"
     And I set the field "Feedback comments" to "Catch for us the foxes."
     And I press "Save changes"
diff --git a/mod/assign/tests/behat/quickgrading.feature b/mod/assign/tests/behat/quickgrading.feature
index 99c2a68f66008..170039cc62a1b 100644
--- a/mod/assign/tests/behat/quickgrading.feature
+++ b/mod/assign/tests/behat/quickgrading.feature
@@ -30,7 +30,9 @@ Feature: In an assignment, teachers grade multiple students on one page
 
     And I am on the "Test assignment name" Activity page logged in as teacher1
     And I follow "View all submissions"
-    When I click on "Grade" "link" in the "Student 1" "table_row"
+    When I change window size to "large"
+    And I click on "Grade" "link" in the "Student 1" "table_row"
+    And I change window size to "medium"
     And I press "Save changes"
     And I am on the "Test assignment name" "assign activity" page
     Then I should see "1" in the "Needs grading" "table_row"
diff --git a/mod/assign/tests/behat/reopen_locked_submission.feature b/mod/assign/tests/behat/reopen_locked_submission.feature
index 3521832d28dac..e6cc548d919eb 100644
--- a/mod/assign/tests/behat/reopen_locked_submission.feature
+++ b/mod/assign/tests/behat/reopen_locked_submission.feature
@@ -35,7 +35,9 @@ Feature: Submissions are unlocked when a new attempt is given
 
     And I am on the "Test assignment name" Activity page logged in as teacher1
     And I follow "View all submissions"
+    And I change window size to "large"
     And I open the action menu in "Student 1" "table_row"
+    And I change window size to "medium"
     And I follow "Prevent submission changes"
     And I should see "Submission changes not allowed"
     And I click on "Quick grading" "checkbox"
@@ -62,10 +64,14 @@ Feature: Submissions are unlocked when a new attempt is given
 
     And I am on the "Test assignment name" Activity page logged in as teacher1
     And I follow "View all submissions"
+    And I change window size to "large"
     When I open the action menu in "Student 1" "table_row"
+    And I change window size to "medium"
     And I follow "Prevent submission changes"
     Then I should see "Submission changes not allowed"
+    And I change window size to "large"
     And I open the action menu in "Student 1" "table_row"
+    And I change window size to "medium"
     And I follow "Allow another attempt"
     And I should see "Reopened"
     And I should not see "Submission changes not allowed"
diff --git a/mod/assign/tests/behat/rescale_grades.feature b/mod/assign/tests/behat/rescale_grades.feature
index 2f5075101b79d..7a3d1dba15600 100644
--- a/mod/assign/tests/behat/rescale_grades.feature
+++ b/mod/assign/tests/behat/rescale_grades.feature
@@ -72,7 +72,9 @@ Feature: Check that the assignment grade can be rescaled when the max grade is c
 
   Scenario: Rescaling should not produce negative grades
     Given I follow "View all submissions"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student 2" "table_row"
+    And I change window size to "medium"
     And I wait until the page is ready
     And I am on the "Test assignment name" "assign activity" page
     And I navigate to "Settings" in current page administration
diff --git a/mod/assign/tests/behat/steps_blind_marking.feature b/mod/assign/tests/behat/steps_blind_marking.feature
index 450ea075df11e..cd00a7c234146 100644
--- a/mod/assign/tests/behat/steps_blind_marking.feature
+++ b/mod/assign/tests/behat/steps_blind_marking.feature
@@ -74,7 +74,9 @@ Feature: Assignments correctly add feedback to the grade report when workflow an
     And I should see "Ready for release" in the "I'm the student's first submission" "table_row"
     And I set the field "Grading action" to "Reveal student identities"
     And I press "Continue"
+    And I change window size to "large"
     And I click on "Grade" "link" in the "Student 1" "table_row"
+    And I change window size to "medium"
     And I set the field "Marking workflow state" to "Released"
     And I press "Save changes"
     And I follow "View all submissions"

From c997f91db6c427fe251b49214c8cbbdd7339940e Mon Sep 17 00:00:00 2001
From: ferranrecio <ferran@moodle.com>
Date: Thu, 30 May 2024 15:51:18 +0200
Subject: [PATCH 096/119] MDL-80191 backup: add subsections to backup form

The patch adds two new levels to the backup form structure: subsection
(a delegated section which parent is a course module) and subactivity
(an activity inside a subsection). Those new elements are displayed as a
inner section below the parent activitiy.

For now the UI is the same as a regular section but future issues will
define how the UX should be. The new two levels have their own classes
to represents settings and have extra dependencies.
---
 backup/moodle2/backup_activity_task.class.php | 33 +++++++-
 backup/moodle2/backup_section_task.class.php  | 39 ++++++++-
 backup/moodle2/backup_settingslib.php         | 79 +++++++++++++++++++
 .../dbops/backup_controller_dbops.class.php   |  4 +-
 backup/util/settings/backup_setting.class.php | 13 ++-
 backup/util/ui/backup_ui_setting.class.php    |  7 +-
 backup/util/ui/base_moodleform.class.php      | 10 +++
 lang/en/backup.php                            |  1 +
 theme/boost/scss/moodle/backup-restore.scss   | 10 ++-
 theme/boost/style/moodle.css                  | 12 +++
 theme/classic/style/moodle.css                | 12 +++
 11 files changed, 207 insertions(+), 13 deletions(-)

diff --git a/backup/moodle2/backup_activity_task.class.php b/backup/moodle2/backup_activity_task.class.php
index bc84291b733bb..5ab96e73632d4 100644
--- a/backup/moodle2/backup_activity_task.class.php
+++ b/backup/moodle2/backup_activity_task.class.php
@@ -38,6 +38,9 @@ abstract class backup_activity_task extends backup_task {
 
     protected $moduleid;
     protected $sectionid;
+
+    /** @var stdClass the section object */
+    protected $section;
     protected $modulename;
     protected $activityid;
     protected $contextid;
@@ -50,6 +53,7 @@ abstract class backup_activity_task extends backup_task {
      * @param backup_plan|null $plan the backup plan instance this task is part of
      */
     public function __construct($name, $moduleid, $plan = null) {
+        global $DB;
 
         // Check moduleid exists
         if (!$coursemodule = get_coursemodule_from_id(false, $moduleid)) {
@@ -65,6 +69,7 @@ public function __construct($name, $moduleid, $plan = null) {
         $this->modulename = $coursemodule->modname;
         $this->activityid = $coursemodule->instance;
         $this->contextid  = context_module::instance($this->moduleid)->id;
+        $this->section = $DB->get_record('course_sections', ['id' => $this->sectionid]);
 
         parent::__construct($name, $plan);
     }
@@ -90,6 +95,16 @@ public function get_modulename() {
         return $this->modulename;
     }
 
+    /**
+     * Return if the activity is inside a subsection.
+     *
+     * @return bool
+     */
+    public function is_in_subsection(): bool {
+        return !empty($this->section->component);
+    }
+
+
     /**
      * @return int the id of the activity instance (id in the activity's instances table)
      */
@@ -291,7 +306,11 @@ protected function define_settings() {
      * @return section_backup_setting the setting added
      */
     protected function add_section_setting(int|string $identifier, string $type, string|int $value): activity_backup_setting {
-        $setting = new backup_activity_generic_setting($identifier, $type, $value);
+        if ($this->is_in_subsection()) {
+            $setting = new backup_subactivity_generic_setting($identifier, $type, $value);
+        } else {
+            $setting = new backup_activity_generic_setting($identifier, $type, $value);
+        }
         $this->add_setting($setting);
         return $setting;
     }
@@ -308,7 +327,11 @@ protected function add_activity_included_setting(string $settingprefix): activit
         // - activities root setting.
         // - sectionincluded setting (if exists).
         $settingname = $settingprefix . 'included';
-        $activityincluded = new backup_activity_generic_setting($settingname, base_setting::IS_BOOLEAN, true);
+        if ($this->is_in_subsection()) {
+            $activityincluded = new backup_subactivity_generic_setting($settingname, base_setting::IS_BOOLEAN, true);
+        } else {
+            $activityincluded = new backup_activity_generic_setting($settingname, base_setting::IS_BOOLEAN, true);
+        }
         $activityincluded->get_ui()->set_icon(new image_icon('monologo', get_string('pluginname', $this->modulename),
             $this->modulename, array('class' => 'iconlarge icon-post ml-1')));
         $this->add_setting($activityincluded);
@@ -342,7 +365,11 @@ protected function add_activity_userinfo_setting(
         // - sectionuserinfo setting (if exists).
         // - includefield setting.
         $settingname = $settingprefix . 'userinfo';
-        $activityuserinfo = new backup_activity_userinfo_setting($settingname, base_setting::IS_BOOLEAN, true);
+        if ($this->is_in_subsection()) {
+            $activityuserinfo = new backup_subactivity_userinfo_setting($settingname, base_setting::IS_BOOLEAN, true);
+        } else {
+            $activityuserinfo = new backup_activity_userinfo_setting($settingname, base_setting::IS_BOOLEAN, true);
+        }
 
         $activityuserinfo->get_ui()->set_label('-');
         $activityuserinfo->get_ui()->set_visually_hidden_label(
diff --git a/backup/moodle2/backup_section_task.class.php b/backup/moodle2/backup_section_task.class.php
index 6389c3e6a87ad..f676fba88dce5 100644
--- a/backup/moodle2/backup_section_task.class.php
+++ b/backup/moodle2/backup_section_task.class.php
@@ -202,7 +202,11 @@ protected function define_settings() {
      * @return section_backup_setting the setting added
      */
     protected function add_section_setting(int|string $identifier, string $type, string|int $value): section_backup_setting {
-        $setting = new backup_section_generic_setting($identifier, $type, $value);
+        if ($this->get_delegated_cm()) {
+            $setting = new backup_subsection_generic_setting($identifier, $type, $value);
+        } else {
+            $setting = new backup_section_generic_setting($identifier, $type, $value);
+        }
         $this->add_setting($setting);
         return $setting;
     }
@@ -220,9 +224,23 @@ protected function add_section_included_setting(string $settingprefix): section_
         // Define sectionincluded (to decide if the whole task must be really executed).
         $settingname = $settingprefix . 'included';
 
-        $sectionincluded = new backup_section_included_setting($settingname, base_setting::IS_BOOLEAN, true);
+        $delegatedcmid = $this->get_delegated_cm();
+        if ($delegatedcmid) {
+            $sectionincluded = new backup_subsection_included_setting($settingname, base_setting::IS_BOOLEAN, true);
+            // Subsections depends on the parent activity included setting.
+            $settingname = $this->get_modname() . '_' . $delegatedcmid . '_included';
+            if ($this->plan->setting_exists($settingname)) {
+                $cmincluded = $this->plan->get_setting($settingname);
+                $cmincluded->add_dependency(
+                    $sectionincluded,
+                );
+            }
+            $sectionincluded->get_ui()->set_label(get_string('subsectioncontent', 'backup'));
+        } else {
+            $sectionincluded = new backup_section_included_setting($settingname, base_setting::IS_BOOLEAN, true);
+            $sectionincluded->get_ui()->set_label(get_section_name($course, $this->section));
+        }
 
-        $sectionincluded->get_ui()->set_label(get_section_name($course, $this->section));
         $this->add_setting($sectionincluded);
 
         return $sectionincluded;
@@ -244,7 +262,20 @@ protected function add_section_userinfo_setting(
         // - section_included setting.
         $settingname = $settingprefix . 'userinfo';
 
-        $sectionuserinfo = new backup_section_userinfo_setting($settingname, base_setting::IS_BOOLEAN, true);
+        $delegatedcmid = $this->get_delegated_cm();
+        if ($delegatedcmid) {
+            $sectionuserinfo = new backup_subsection_userinfo_setting($settingname, base_setting::IS_BOOLEAN, true);
+            // Subsections depends on the parent activity included setting.
+            $settingname = $this->get_modname() . '_' . $delegatedcmid . '_userinfo';
+            if ($this->plan->setting_exists($settingname)) {
+                $cmincluded = $this->plan->get_setting($settingname);
+                $cmincluded->add_dependency(
+                    $sectionuserinfo,
+                );
+            }
+        } else {
+            $sectionuserinfo = new backup_section_userinfo_setting($settingname, base_setting::IS_BOOLEAN, true);
+        }
 
         $sectionuserinfo->get_ui()->set_label(get_string('includeuserinfo', 'backup'));
         $sectionuserinfo->get_ui()->set_visually_hidden_label(
diff --git a/backup/moodle2/backup_settingslib.php b/backup/moodle2/backup_settingslib.php
index 6767d01f05712..770c3813ce596 100644
--- a/backup/moodle2/backup_settingslib.php
+++ b/backup/moodle2/backup_settingslib.php
@@ -185,6 +185,45 @@ class backup_section_included_setting extends section_backup_setting {}
  */
 class backup_section_userinfo_setting extends section_backup_setting {}
 
+/**
+ * Subsection base class (section delegated to a course module).
+ */
+class subsection_backup_setting extends section_backup_setting {
+    /**
+     * Class constructor.
+     *
+     * @param string $name Name of the setting
+     * @param string $vtype Type of the setting, for example base_setting::IS_TEXT
+     * @param mixed $value Value of the setting
+     * @param bool $visibility Is the setting visible in the UI, for example base_setting::VISIBLE
+     * @param int $status Status of the setting with regards to the locking, for example base_setting::NOT_LOCKED
+     */
+    public function __construct($name, $vtype, $value = null, $visibility = self::VISIBLE, $status = self::NOT_LOCKED) {
+        parent::__construct($name, $vtype, $value, $visibility, $status);
+        $this->level = self::SUBSECTION_LEVEL;
+    }
+}
+
+/**
+ * generic section setting to pass various settings between tasks and steps
+ */
+class backup_subsection_generic_setting extends subsection_backup_setting {
+}
+
+/**
+ * Setting to define if one section is included or no. Activities _included
+ * settings depend of them if available
+ */
+class backup_subsection_included_setting extends subsection_backup_setting {
+}
+
+/**
+ * section backup setting to control if section will include
+ * user information or no, depends of @backup_users_setting
+ */
+class backup_subsection_userinfo_setting extends subsection_backup_setting {
+}
+
 
 // Activity backup settings
 
@@ -206,6 +245,46 @@ class backup_activity_included_setting extends activity_backup_setting {}
  */
 class backup_activity_userinfo_setting extends activity_backup_setting {}
 
+/**
+ * Subactivity base class (activity inside a delegated section).
+ */
+class subactivity_backup_setting extends activity_backup_setting {
+    /**
+     * Class constructor.
+     *
+     * @param string $name Name of the setting
+     * @param string $vtype Type of the setting, for example base_setting::IS_TEXT
+     * @param mixed $value Value of the setting
+     * @param bool $visibility Is the setting visible in the UI, for example base_setting::VISIBLE
+     * @param int $status Status of the setting with regards to the locking, for example base_setting::NOT_LOCKED
+     */
+    public function __construct($name, $vtype, $value = null, $visibility = self::VISIBLE, $status = self::NOT_LOCKED) {
+        parent::__construct($name, $vtype, $value, $visibility, $status);
+        $this->level = self::SUBACTIVITY_LEVEL;
+    }
+}
+
+/**
+ * Generic subactivity (activity inside a delegated section) setting to pass various settings between tasks and steps
+ */
+class backup_subactivity_generic_setting extends subactivity_backup_setting {
+}
+
+/**
+ * Subactivity (activity inside a delegated section) backup setting to control if activity will
+ * be included or no, depends of @backup_activities_setting and
+ * optionally parent section included setting
+ */
+class backup_subactivity_included_setting extends subactivity_backup_setting {
+}
+
+/**
+ * Subactivity (activity inside a delegated section) backup setting to control if activity will include
+ * user information or no, depends of @backup_users_setting
+ */
+class backup_subactivity_userinfo_setting extends subactivity_backup_setting {
+}
+
 /**
  * Root setting to control if backup will include content bank content or no
  */
diff --git a/backup/util/dbops/backup_controller_dbops.class.php b/backup/util/dbops/backup_controller_dbops.class.php
index 4992fb2e703de..612daedf8ad1a 100644
--- a/backup/util/dbops/backup_controller_dbops.class.php
+++ b/backup/util/dbops/backup_controller_dbops.class.php
@@ -246,7 +246,7 @@ private static function get_activity_backup_information($task) {
                 continue;
             }
             // Validate level is correct (activity)
-            if ($setting->get_level() != backup_setting::ACTIVITY_LEVEL) {
+            if (!in_array($setting->get_level(), [backup_setting::ACTIVITY_LEVEL, backup_setting::SUBACTIVITY_LEVEL])) {
                 throw new backup_controller_exception('setting_not_activity_level', $setting);
             }
             $settinginfo = array(
@@ -283,7 +283,7 @@ private static function get_section_backup_information($task) {
                 continue;
             }
             // Validate level is correct (section)
-            if ($setting->get_level() != backup_setting::SECTION_LEVEL) {
+            if (!in_array($setting->get_level(), [backup_setting::SECTION_LEVEL, backup_setting::SUBSECTION_LEVEL])) {
                 throw new backup_controller_exception('setting_not_section_level', $setting);
             }
             $settinginfo = array(
diff --git a/backup/util/settings/backup_setting.class.php b/backup/util/settings/backup_setting.class.php
index d32fdc36566d1..7856dd4677410 100644
--- a/backup/util/settings/backup_setting.class.php
+++ b/backup/util/settings/backup_setting.class.php
@@ -37,6 +37,12 @@ abstract class backup_setting extends base_setting implements checksumable {
     const SECTION_LEVEL  = 9;
     const ACTIVITY_LEVEL = 13;
 
+    /** @var int the subsection level. */
+    const SUBSECTION_LEVEL = 17;
+
+    /** @var int the activity inside a subsection level. */
+    const SUBACTIVITY_LEVEL = 21;
+
     /** @var int Level of the setting, eg {@link self::ROOT_LEVEL} */
     protected $level;
 
@@ -96,7 +102,12 @@ public function add_dependency(base_setting $dependentsetting, $type=setting_dep
         }
         // Check the dependency level is >= current level
         if ($dependentsetting->get_level() < $this->level) {
-            throw new backup_setting_exception('cannot_add_upper_level_dependency');
+            throw new backup_setting_exception('cannot_add_upper_level_dependency', [
+                $dependentsetting->get_level(),
+                $dependentsetting->get_name(),
+                $this->level,
+                $this->get_name(),
+            ]);
         }
         parent::add_dependency($dependentsetting, $type, $options);
     }
diff --git a/backup/util/ui/backup_ui_setting.class.php b/backup/util/ui/backup_ui_setting.class.php
index c1f248ff471b5..ed82227e23c8e 100644
--- a/backup/util/ui/backup_ui_setting.class.php
+++ b/backup/util/ui/backup_ui_setting.class.php
@@ -256,9 +256,11 @@ public function __construct(backup_setting $setting, $label = null, array $attri
                 $this->name = 'course_'.$setting->get_name();
                 break;
             case backup_setting::SECTION_LEVEL :
+            case backup_setting::SUBSECTION_LEVEL:
                 $this->name = 'section_'.$setting->get_name();
                 break;
             case backup_setting::ACTIVITY_LEVEL :
+            case backup_setting::SUBACTIVITY_LEVEL:
                 $this->name = 'activity_'.$setting->get_name();
                 break;
         }
@@ -329,9 +331,10 @@ public function get_label(base_task $task = null) {
         // If a task has been provided and the label is not already set meaningfully
         // we will attempt to improve it.
         if (!is_null($task) && $this->label == $this->setting->get_name() && strpos($this->setting->get_name(), '_include') !== false) {
-            if ($this->setting->get_level() == backup_setting::SECTION_LEVEL) {
+            $level = $this->setting->get_level();
+            if ($level == backup_setting::SECTION_LEVEL || $level == backup_setting::SUBSECTION_LEVEL) {
                 $this->label = get_string('includesection', 'backup', $task->get_name());
-            } else if ($this->setting->get_level() == backup_setting::ACTIVITY_LEVEL) {
+            } else if ($level == backup_setting::ACTIVITY_LEVEL || $level == backup_setting::SUBACTIVITY_LEVEL) {
                 $this->label = $task->get_name();
             }
         }
diff --git a/backup/util/ui/base_moodleform.class.php b/backup/util/ui/base_moodleform.class.php
index b607390fa872c..f4a0ed5cebd9b 100644
--- a/backup/util/ui/base_moodleform.class.php
+++ b/backup/util/ui/base_moodleform.class.php
@@ -263,6 +263,16 @@ protected function add_html_formatting(backup_setting $setting) {
                     $this->push_group_start('activity', 'grouped_settings activity_level');
                     $this->push_group_start(null, 'include_setting activity_level');
                     break;
+                case backup_setting::SUBSECTION_LEVEL:
+                    $this->pop_groups_to('section');
+                    $this->push_group_start('subsection', 'grouped_settings subsection_level');
+                    $this->push_group_start(null, 'normal_setting');
+                    break;
+                case backup_setting::SUBACTIVITY_LEVEL:
+                    $this->pop_groups_to('subsection');
+                    $this->push_group_start('subactivity', 'grouped_settings activity_level');
+                    $this->push_group_start(null, 'include_setting activity_level');
+                    break;
                 default:
                     $this->push_group_start(null, 'normal_setting');
                     break;
diff --git a/lang/en/backup.php b/lang/en/backup.php
index 6f819156d76cc..8a9002a0488af 100644
--- a/lang/en/backup.php
+++ b/lang/en/backup.php
@@ -417,6 +417,7 @@
 $string['skipmodifprev'] = 'Skip courses not modified since previous backup';
 $string['skipmodifprevhelp'] = 'Choose whether to skip courses that have not been modified since the last automatic backup. This requires logging to be enabled.';
 $string['status'] = 'Status';
+$string['subsectioncontent'] = 'Subsection content';
 $string['successful'] = 'Backup successful';
 $string['successfulcopy'] = 'Copy successful';
 $string['successfulrestore'] = 'Restore successful';
diff --git a/theme/boost/scss/moodle/backup-restore.scss b/theme/boost/scss/moodle/backup-restore.scss
index ed1a75c4b191a..780a01775247a 100644
--- a/theme/boost/scss/moodle/backup-restore.scss
+++ b/theme/boost/scss/moodle/backup-restore.scss
@@ -12,6 +12,15 @@
             padding: $card-spacer-x;
             margin-bottom: $card-spacer-x;
         }
+
+        &.subsection_level {
+            background-color: $card-bg;
+            @include border-radius($card-border-radius);
+            border: $card-border-width solid $card-border-color;
+            @include clearfix;
+            padding: $card-spacer-x;
+            margin: 0 $card-spacer-x $card-spacer-x $card-spacer-x;
+        }
     }
 
     /* These are long labels with checkboxes on the right. */
@@ -202,4 +211,3 @@
         background: $backup-restore-state12-bg;
     }
 }
-
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index bba2e639d67df..2073f92e35c1a 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -34869,6 +34869,18 @@ img.userpicture {
   clear: both;
   content: "";
 }
+.path-backup .mform .grouped_settings.subsection_level {
+  background-color: #fff;
+  border-radius: 0.5rem;
+  border: 1px solid rgba(0, 0, 0, 0.125);
+  padding: 1.25rem;
+  margin: 0 1.25rem 1.25rem 1.25rem;
+}
+.path-backup .mform .grouped_settings.subsection_level::after {
+  display: block;
+  clear: both;
+  content: "";
+}
 .path-backup .mform .include_setting {
   width: 50%;
   display: inline-block;
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 6607b1a5b66ca..f8e5c56273fae 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -34869,6 +34869,18 @@ img.userpicture {
   clear: both;
   content: "";
 }
+.path-backup .mform .grouped_settings.subsection_level {
+  background-color: #fff;
+  border-radius: 0.25rem;
+  border: 1px solid rgba(0, 0, 0, 0.125);
+  padding: 1.25rem;
+  margin: 0 1.25rem 1.25rem 1.25rem;
+}
+.path-backup .mform .grouped_settings.subsection_level::after {
+  display: block;
+  clear: both;
+  content: "";
+}
 .path-backup .mform .include_setting {
   width: 50%;
   display: inline-block;

From b5f14e895a31915ad9e909e8ca1d6fb8bdb95cd3 Mon Sep 17 00:00:00 2001
From: ferranrecio <ferran@moodle.com>
Date: Thu, 30 May 2024 16:17:26 +0200
Subject: [PATCH 097/119] MDL-80191 backup: add subsections to restore form

This commit adds two new levels to the restore course structure form:
subsection (a delegated section that belongs to a course module) and
subactivity (a course module in a subsection).

Restore form can only use information from the backup file. To allow
activities to know if they are inside a subsection, the backup now
incorporates an "insubsection" attribute. This attribute is used only
for the form display but not for the restore logic.
---
 backup/moodle2/backup_stepslib.php            |  8 +-
 .../moodle2/restore_activity_task.class.php   | 21 ++++-
 backup/moodle2/restore_section_task.class.php | 78 +++++++++++++++----
 backup/moodle2/restore_settingslib.php        | 68 ++++++++++++++++
 .../dbops/backup_controller_dbops.class.php   |  4 +-
 5 files changed, 160 insertions(+), 19 deletions(-)

diff --git a/backup/moodle2/backup_stepslib.php b/backup/moodle2/backup_stepslib.php
index a2b99c4b9979d..e1c6db33da3b9 100644
--- a/backup/moodle2/backup_stepslib.php
+++ b/backup/moodle2/backup_stepslib.php
@@ -2136,9 +2136,11 @@ protected function define_structure() {
 
         $activities = new backup_nested_element('activities');
 
-        $activity = new backup_nested_element('activity', null, array(
-            'moduleid', 'sectionid', 'modulename', 'title',
-            'directory'));
+        $activity = new backup_nested_element(
+            'activity',
+            null,
+            ['moduleid', 'sectionid', 'modulename', 'title', 'directory', 'insubsection']
+        );
 
         $sections = new backup_nested_element('sections');
 
diff --git a/backup/moodle2/restore_activity_task.class.php b/backup/moodle2/restore_activity_task.class.php
index 4948516cd1108..6038fa03d7b79 100644
--- a/backup/moodle2/restore_activity_task.class.php
+++ b/backup/moodle2/restore_activity_task.class.php
@@ -100,6 +100,15 @@ public function get_moduleid() {
         return $this->moduleid;
     }
 
+    /**
+     * Return if the activity is inside a subsection.
+     *
+     * @return bool
+     */
+    public function is_in_subsection(): bool {
+        return !empty($this->info->insubsection);
+    }
+
     /**
      * Returns the old course module id (cmid of activity which will be restored)
      *
@@ -312,7 +321,11 @@ protected function add_activity_included_setting(string $settingprefix): activit
         // - sectionincluded setting (if exists).
         $settingname = $settingprefix . 'included';
 
-        $activityincluded = new restore_activity_generic_setting($settingname, base_setting::IS_BOOLEAN, true);
+        if ($this->is_in_subsection()) {
+            $activityincluded = new restore_subactivity_generic_setting($settingname, base_setting::IS_BOOLEAN, true);
+        } else {
+            $activityincluded = new restore_activity_generic_setting($settingname, base_setting::IS_BOOLEAN, true);
+        }
 
         $activityincluded->get_ui()->set_icon(new image_icon('monologo', get_string('pluginname', $this->modulename),
             $this->modulename, ['class' => 'iconlarge icon-post ml-1']));
@@ -351,7 +364,11 @@ protected function add_activity_userinfo_setting(
             $defaultvalue = true;
         }
 
-        $activityuserinfo = new restore_activity_userinfo_setting($settingname, base_setting::IS_BOOLEAN, $defaultvalue);
+        if ($this->is_in_subsection()) {
+            $activityuserinfo = new restore_subactivity_userinfo_setting($settingname, base_setting::IS_BOOLEAN, $defaultvalue);
+        } else {
+            $activityuserinfo = new restore_activity_userinfo_setting($settingname, base_setting::IS_BOOLEAN, $defaultvalue);
+        }
 
         if (!$defaultvalue) {
             // This is a bit hacky, but if there is no user data to restore, then
diff --git a/backup/moodle2/restore_section_task.class.php b/backup/moodle2/restore_section_task.class.php
index 924c309c67621..a9eb5730d3c83 100644
--- a/backup/moodle2/restore_section_task.class.php
+++ b/backup/moodle2/restore_section_task.class.php
@@ -56,6 +56,30 @@ public function get_taskbasepath() {
         return $this->get_basepath() . '/sections/section_' . $this->info->sectionid;
     }
 
+    /**
+     * Get the course module that is delegating this section.
+     *
+     * @return int|null the course module id that is delegating this section
+     */
+    public function get_delegated_cm(): ?int {
+        if (!isset($this->info->parentcmid) || empty($this->info->parentcmid)) {
+            return null;
+        }
+        return intval($this->info->parentcmid);
+    }
+
+    /**
+     * Get the delegated activity modname if any.
+     *
+     * @return string|null the modname of the delegated activity
+     */
+    public function get_modname(): ?string {
+        if (!isset($this->info->modname) || empty($this->info->modname)) {
+            return null;
+        }
+        return $this->info->modname;
+    }
+
     public function set_sectionid($sectionid) {
         $this->sectionid = $sectionid;
     }
@@ -169,20 +193,35 @@ protected function add_section_included_setting(string $settingprefix): section_
         // Define sectionincluded (to decide if the whole task must be really executed).
         $settingname = $settingprefix . 'included';
 
-        $sectionincluded = new restore_section_included_setting($settingname, base_setting::IS_BOOLEAN, true);
-
-        if (is_number($this->info->title)) {
-            $label = get_string('includesection', 'backup', $this->info->title);
-        } elseif (empty($this->info->title)) { // Don't throw error if title is empty, gracefully continue restore.
-            $this->log(
-                'Section title missing in backup for section id ' . $this->info->sectionid,
-                backup::LOG_WARNING,
-                $this->name
-            );
-            $label = get_string('unnamedsection', 'backup');
+        $delegatedcmid = $this->get_delegated_cm();
+        if ($delegatedcmid) {
+            $sectionincluded = new restore_subsection_included_setting($settingname, base_setting::IS_BOOLEAN, true);
+            // Subsections depends on the parent activity included setting.
+            $settingname = $this->get_modname() . '_' . $delegatedcmid . '_included';
+            if ($this->plan->setting_exists($settingname)) {
+                $cmincluded = $this->plan->get_setting($settingname);
+                $cmincluded->add_dependency(
+                    $sectionincluded,
+                );
+            }
+            $label = get_string('subsectioncontent', 'backup');
         } else {
-            $label = $this->info->title;
+            $sectionincluded = new restore_section_included_setting($settingname, base_setting::IS_BOOLEAN, true);
+
+            if (is_number($this->info->title)) {
+                $label = get_string('includesection', 'backup', $this->info->title);
+            } else if (empty($this->info->title)) { // Don't throw error if title is empty, gracefully continue restore.
+                $this->log(
+                    'Section title missing in backup for section id ' . $this->info->sectionid,
+                    backup::LOG_WARNING,
+                    $this->name
+                );
+                $label = get_string('unnamedsection', 'backup');
+            } else {
+                $label = $this->info->title;
+            }
         }
+
         $sectionincluded->get_ui()->set_label($label);
         $this->add_setting($sectionincluded);
 
@@ -209,7 +248,20 @@ protected function add_section_userinfo_setting(
             $defaultvalue = true;
         }
 
-        $sectionuserinfo = new restore_section_userinfo_setting($settingname, base_setting::IS_BOOLEAN, $defaultvalue);
+        $delegatedcmid = $this->get_delegated_cm();
+        if ($delegatedcmid) {
+            $sectionuserinfo = new restore_subsection_userinfo_setting($settingname, base_setting::IS_BOOLEAN, $defaultvalue);
+            // Subsections depends on the parent activity included setting.
+            $settingname = $this->get_modname() . '_' . $delegatedcmid . '_userinfo';
+            if ($this->plan->setting_exists($settingname)) {
+                $cmincluded = $this->plan->get_setting($settingname);
+                $cmincluded->add_dependency(
+                    $sectionuserinfo,
+                );
+            }
+        } else {
+            $sectionuserinfo = new restore_section_userinfo_setting($settingname, base_setting::IS_BOOLEAN, $defaultvalue);
+        }
 
         if (!$defaultvalue) {
             // This is a bit hacky, but if there is no user data to restore, then
diff --git a/backup/moodle2/restore_settingslib.php b/backup/moodle2/restore_settingslib.php
index cce77a98dece4..f62a7e433c7af 100644
--- a/backup/moodle2/restore_settingslib.php
+++ b/backup/moodle2/restore_settingslib.php
@@ -222,6 +222,39 @@ class restore_section_included_setting extends restore_section_generic_setting {
  */
 class restore_section_userinfo_setting extends restore_section_generic_setting {}
 
+/**
+ * Subsection base class (delegated section).
+ */
+class restore_subsection_generic_setting extends restore_section_generic_setting {
+    /**
+     * Class constructor.
+     *
+     * @param string $name Name of the setting
+     * @param string $vtype Type of the setting, for example base_setting::IS_TEXT
+     * @param mixed $value Value of the setting
+     * @param bool $visibility Is the setting visible in the UI, for example base_setting::VISIBLE
+     * @param int $status Status of the setting with regards to the locking, for example base_setting::NOT_LOCKED
+     */
+    public function __construct($name, $vtype, $value = null, $visibility = self::VISIBLE, $status = self::NOT_LOCKED) {
+        parent::__construct($name, $vtype, $value, $visibility, $status);
+        $this->level = self::SUBSECTION_LEVEL;
+    }
+}
+
+/**
+ * Setting to define if one subsection is included or no.
+ *
+ * Activities _included settings depend of them if available.
+ */
+class restore_subsection_included_setting extends restore_subsection_generic_setting {
+}
+
+/**
+ * Subsection backup setting to control if section will include
+ * user information or no, depends of @restore_users_setting.
+ */
+class restore_subsection_userinfo_setting extends restore_subsection_generic_setting {
+}
 
 // Activity backup settings
 
@@ -243,6 +276,41 @@ class restore_activity_included_setting extends restore_activity_generic_setting
  */
 class restore_activity_userinfo_setting extends restore_activity_generic_setting {}
 
+/**
+ * Generic subactivity setting to pass various settings between tasks and steps
+ */
+class restore_subactivity_generic_setting extends restore_activity_generic_setting {
+    /**
+     * Class constructor.
+     *
+     * @param string $name Name of the setting
+     * @param string $vtype Type of the setting, for example base_setting::IS_TEXT
+     * @param mixed $value Value of the setting
+     * @param bool $visibility Is the setting visible in the UI, for example base_setting::VISIBLE
+     * @param int $status Status of the setting with regards to the locking, for example base_setting::NOT_LOCKED
+     */
+    public function __construct($name, $vtype, $value = null, $visibility = self::VISIBLE, $status = self::NOT_LOCKED) {
+        parent::__construct($name, $vtype, $value, $visibility, $status);
+        $this->level = self::SUBACTIVITY_LEVEL;
+    }
+}
+
+/**
+ * Subactivity backup setting to control if activity will be included or no.
+ *
+ * Depends of restore_activities_setting and optionally parent section included setting.
+ */
+class restore_subactivity_included_setting extends restore_subactivity_generic_setting {
+}
+
+/**
+ * Subactivity backup setting to control if activity will include user information.
+ *
+ * Depends of restore_users_setting.
+ */
+class restore_subactivity_userinfo_setting extends restore_subactivity_generic_setting {
+}
+
 /**
  * root setting to control if restore will create content bank content or no
  */
diff --git a/backup/util/dbops/backup_controller_dbops.class.php b/backup/util/dbops/backup_controller_dbops.class.php
index 612daedf8ad1a..f022b76b70da7 100644
--- a/backup/util/dbops/backup_controller_dbops.class.php
+++ b/backup/util/dbops/backup_controller_dbops.class.php
@@ -234,7 +234,9 @@ private static function get_activity_backup_information($task) {
             'sectionid'  => $task->get_sectionid(),
             'modulename' => $task->get_modulename(),
             'title'      => $task->get_name(),
-            'directory'  => 'activities/' . $task->get_modulename() . '_' . $task->get_moduleid());
+            'directory'  => 'activities/' . $task->get_modulename() . '_' . $task->get_moduleid(),
+            'insubsection' => ($task->is_in_subsection()) ? 1 : '',
+        );
 
         // Now get activity settings
         // Calculate prefix to find valid settings

From bfd07deb2297beaba8d71a7a05c3c1cad4cd9141 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Fri, 21 Jun 2024 13:50:51 +0800
Subject: [PATCH 098/119] MDL-82264 admin: Move $CFG->allcountrycodes outside
 "IP address lookup"

---
 admin/settings/location.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/settings/location.php b/admin/settings/location.php
index 3d6809ad655df..ace2d8712ee8c 100644
--- a/admin/settings/location.php
+++ b/admin/settings/location.php
@@ -39,6 +39,9 @@
         $temp->add(new admin_setting_configtext('defaultcity', new lang_string('defaultcity', 'core_admin'),
             new lang_string('defaultcity_help', 'core_admin'), ''));
 
+        $temp->add(new admin_setting_countrycodes('allcountrycodes', new lang_string('allcountrycodes', 'core_admin'),
+            new lang_string('configallcountrycodes', 'core_admin')));
+
         $temp->add(new admin_setting_heading('iplookup', new lang_string('iplookup', 'core_admin'),
             new lang_string('iplookupinfo', 'core_admin')));
 
@@ -67,9 +70,6 @@
 
         $temp->add(new admin_setting_configtext('googlemapkey3', new lang_string('googlemapkey3', 'core_admin'),
             new lang_string('googlemapkey3_help', 'core_admin'), '', PARAM_RAW, 60));
-
-        $temp->add(new admin_setting_countrycodes('allcountrycodes', new lang_string('allcountrycodes', 'core_admin'),
-            new lang_string('configallcountrycodes', 'core_admin')));
     }
 
     $ADMIN->add('location', $temp);

From 0a7fddefd392de7096c225d246a29691d9ad1afc Mon Sep 17 00:00:00 2001
From: Ilya Tregubov <ilya.a.tregubov@gmail.com>
Date: Tue, 2 Jul 2024 10:15:18 +0800
Subject: [PATCH 099/119] MDL-81647 core: Code style fix.

---
 lib/tests/moodlelib_partial_test.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/tests/moodlelib_partial_test.php b/lib/tests/moodlelib_partial_test.php
index ec0c3d9ea8f72..9f5832e8dc349 100644
--- a/lib/tests/moodlelib_partial_test.php
+++ b/lib/tests/moodlelib_partial_test.php
@@ -53,10 +53,10 @@ public function test_partial_args(
      * @param string $bum The fourth argument.
      */
     public static function example_static_method(
-        $foo,
-        $bar,
-        $baz,
-        $bum
+        string $foo,
+        string $bar,
+        string $baz,
+        string $bum
     ): string {
         return implode('/', [$foo, $bar, $baz, $bum]);
     }
@@ -70,10 +70,10 @@ public static function example_static_method(
      * @param string $bum The fourth argument.
      */
     public function example_instance_method(
-        $foo,
-        $bar,
-        $baz,
-        $bum
+        string $foo,
+        string $bar,
+        string $baz,
+        string $bum
     ): string {
         return implode('/', [$foo, $bar, $baz, $bum]);
     }

From fc5738b7285d2db33da02168bb0b12328c4ef2b2 Mon Sep 17 00:00:00 2001
From: Huong Nguyen <huongnv13@gmail.com>
Date: Tue, 2 Jul 2024 15:10:23 +0700
Subject: [PATCH 100/119] MDL-80797 core: Use `stoppable_trait`

---
 lib/classes/hook/navigation/secondary_extend.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/classes/hook/navigation/secondary_extend.php b/lib/classes/hook/navigation/secondary_extend.php
index eaa6d96348b18..ea25c2d14f6ad 100644
--- a/lib/classes/hook/navigation/secondary_extend.php
+++ b/lib/classes/hook/navigation/secondary_extend.php
@@ -15,6 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 namespace core\hook\navigation;
+use core\hook\stoppable_trait;
 use core\navigation\views\secondary;
 
 /**
@@ -28,6 +29,7 @@
 #[\core\attribute\label('Allows plugins to insert nodes into site secondary navigation')]
 #[\core\attribute\tags('navigation')]
 final class secondary_extend {
+    use stoppable_trait;
 
     /**
      * Creates new hook.

From 1191e5f003279603144d88f579c28e1fe8d1ac4b Mon Sep 17 00:00:00 2001
From: lameze <simey@moodle.com>
Date: Tue, 2 Jul 2024 08:56:17 +0800
Subject: [PATCH 101/119] MDL-82345 behat: change window size to large to avoid
 failures

---
 webservice/tests/behat/manage_tokens.feature | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webservice/tests/behat/manage_tokens.feature b/webservice/tests/behat/manage_tokens.feature
index 9168c97e5fb94..5f09e4af3d447 100644
--- a/webservice/tests/behat/manage_tokens.feature
+++ b/webservice/tests/behat/manage_tokens.feature
@@ -37,6 +37,7 @@ Feature: Manage external services tokens
     And "Copy to clipboard" "button" should not exist
 
     # Delete token.
+    And I change the window size to "large"
     And I press "Delete" action in the "Webservice1" report row
     And I should see "Do you really want to delete this web service token for Firstname1 Lastname1 on the service Moodle mobile web service?"
     And I press "Delete"

From d95b7a38836f193897de4b8f110d49be567f1a10 Mon Sep 17 00:00:00 2001
From: ferranrecio <ferran@moodle.com>
Date: Fri, 28 Jun 2024 12:31:39 +0200
Subject: [PATCH 102/119] MDL-81725 course: Get delegated section from cm_info

---
 lib/modinfolib.php | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/lib/modinfolib.php b/lib/modinfolib.php
index 06ed6cc8ddc65..d2c90a683603f 100644
--- a/lib/modinfolib.php
+++ b/lib/modinfolib.php
@@ -93,6 +93,12 @@ class course_modinfo {
      */
     private $delegatedsections;
 
+    /**
+     * Index of sections delegated by course modules, indexed by course module instance.
+     * @var null|section_info[]
+     */
+    private ?array $delegatedbycm = null;
+
     /**
      * User ID
      * @var int
@@ -139,6 +145,7 @@ class course_modinfo {
         'cms' => 'get_cms',
         'instances' => 'get_instances',
         'groups' => 'get_groups_all',
+        'delegatedbycm' => 'get_sections_delegated_by_cm',
     );
 
     /**
@@ -410,6 +417,33 @@ public function has_delegated_sections(): bool {
         return !empty($this->delegatedsections);
     }
 
+    /**
+     * Gets data about section delegated by course modules.
+     *
+     * @return section_info[] sections array indexed by course module ID
+     */
+    public function get_sections_delegated_by_cm(): array {
+        if (!is_null($this->delegatedbycm)) {
+            return $this->delegatedbycm;
+        }
+        $this->delegatedbycm = [];
+        foreach ($this->delegatedsections as $componentsections) {
+            foreach ($componentsections as $section) {
+                $delegateinstance = $section->get_component_instance();
+                // We only return sections delegated by course modules. Sections delegated to other
+                // types of components must implement their own methods to get the section.
+                if (!$delegateinstance || !($delegateinstance instanceof \core_courseformat\sectiondelegatemodule)) {
+                    continue;
+                }
+                if (!$cm = $delegateinstance->get_cm()) {
+                    continue;
+                }
+                $this->delegatedbycm[$cm->id] = $section;
+            }
+        }
+        return $this->delegatedbycm;
+    }
+
     /**
      * Static cache for generated course_modinfo instances
      *
@@ -2171,6 +2205,19 @@ public function get_course_module_record($additionalfields = false) {
         return $cmrecord;
     }
 
+    /**
+     * Returns the section delegated by this module, if any.
+     *
+     * @return ?section_info
+     */
+    public function get_delegated_section_info(): ?section_info {
+        $delegatedsections = $this->modinfo->get_sections_delegated_by_cm();
+        if (!array_key_exists($this->id, $delegatedsections)) {
+            return null;
+        }
+        return $delegatedsections[$this->id];
+    }
+
     // Set functions
     ////////////////
 

From cdc3ec5a5427a201de510979fd737cfb033fb074 Mon Sep 17 00:00:00 2001
From: Laurent David <lmedavid@gmail.com>
Date: Thu, 23 May 2024 11:36:40 +0200
Subject: [PATCH 103/119] MDL-81725 core_courseformat: Display subsections in
 the course index

* Add subsection into section entry in course index
* Adjust padding
---
 .../build/local/courseeditor/exporter.min.js  |  2 +-
 .../local/courseeditor/exporter.min.js.map    |  2 +-
 .../amd/src/local/courseeditor/exporter.js    |  4 ++
 .../format/classes/output/local/state/cm.php  |  7 ++-
 .../templates/local/courseindex/cm.mustache   | 50 +++++++++++--------
 5 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/course/format/amd/build/local/courseeditor/exporter.min.js b/course/format/amd/build/local/courseeditor/exporter.min.js
index 7ccd06eede53f..b81099fbcd6d6 100644
--- a/course/format/amd/build/local/courseeditor/exporter.min.js
+++ b/course/format/amd/build/local/courseeditor/exporter.min.js
@@ -8,6 +8,6 @@ define("core_courseformat/local/courseeditor/exporter",["exports"],(function(_ex
    * @copyright  2021 Ferran Recio <ferran@moodle.com>
    * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
    */
-class{constructor(reactive){this.reactive=reactive,this.COMPLETIONS=["incomplete","complete","complete","fail"]}course(state){var _state$course$highlig;const data={sections:[],editmode:this.reactive.isEditing,highlighted:null!==(_state$course$highlig=state.course.highlighted)&&void 0!==_state$course$highlig?_state$course$highlig:""};return this.listedSectionIds(state).forEach((sectionid=>{var _state$section$get;const sectioninfo=null!==(_state$section$get=state.section.get(sectionid))&&void 0!==_state$section$get?_state$section$get:{},section=this.section(state,sectioninfo);data.sections.push(section)})),data.hassections=0!=data.sections.length,data}listedSectionIds(state){var _state$course$section;return(null!==(_state$course$section=state.course.sectionlist)&&void 0!==_state$course$section?_state$course$section:[]).filter((sectionid=>{var _state$section$get2;return null===(null!==(_state$section$get2=state.section.get(sectionid))&&void 0!==_state$section$get2?_state$section$get2:{}).component}))}section(state,sectioninfo){var _state$course$highlig2,_sectioninfo$cmlist;const section={...sectioninfo,highlighted:null!==(_state$course$highlig2=state.course.highlighted)&&void 0!==_state$course$highlig2?_state$course$highlig2:"",cms:[]};return(null!==(_sectioninfo$cmlist=sectioninfo.cmlist)&&void 0!==_sectioninfo$cmlist?_sectioninfo$cmlist:[]).forEach((cmid=>{const cminfo=state.cm.get(cmid),cm=this.cm(state,cminfo);section.cms.push(cm)})),section.hascms=0!=section.cms.length,section}cm(state,cminfo){return{...cminfo,isactive:!1}}cmDraggableData(state,cmid){const cminfo=state.cm.get(cmid);if(!cminfo)return null;let nextcmid;const section=state.section.get(cminfo.sectionid),currentindex=null==section?void 0:section.cmlist.indexOf(cminfo.id);return void 0!==currentindex&&(nextcmid=null==section?void 0:section.cmlist[currentindex+1]),{type:"cm",id:cminfo.id,name:cminfo.name,sectionid:cminfo.sectionid,delegatesection:cminfo.delegatesection,nextcmid:nextcmid}}sectionDraggableData(state,sectionid){const sectioninfo=state.section.get(sectionid);return sectioninfo?{type:"section",id:sectioninfo.id,name:sectioninfo.name,number:sectioninfo.number}:null}fileDraggableData(state,dataTransfer){var _dataTransfer$files;const files=[];return(null===(_dataTransfer$files=dataTransfer.files)||void 0===_dataTransfer$files?void 0:_dataTransfer$files.length)>0&&dataTransfer.files.forEach((file=>{files.push(file)})),{type:"files",files:files}}cmCompletion(state,cminfo){const data={statename:"",state:"NaN"};if(void 0!==cminfo.completionstate){var _this$COMPLETIONS$cmi;data.state=cminfo.completionstate,data.hasstate=!0;let statename=null!==(_this$COMPLETIONS$cmi=this.COMPLETIONS[cminfo.completionstate])&&void 0!==_this$COMPLETIONS$cmi?_this$COMPLETIONS$cmi:"NaN";void 0!==cminfo.isoverallcomplete&&!0===cminfo.isoverallcomplete&&(statename="complete"),data["is".concat(statename)]=!0}return data}allItemsArray(state){var _state$course$section2;const items=[];return(null!==(_state$course$section2=state.course.sectionlist)&&void 0!==_state$course$section2?_state$course$section2:[]).forEach((sectionid=>{var _sectioninfo$cmlist2;const sectioninfo=state.section.get(sectionid);items.push({type:"section",id:sectioninfo.id,url:sectioninfo.sectionurl});(null!==(_sectioninfo$cmlist2=sectioninfo.cmlist)&&void 0!==_sectioninfo$cmlist2?_sectioninfo$cmlist2:[]).forEach((cmid=>{const cminfo=state.cm.get(cmid);items.push({type:"cm",id:cminfo.id,url:cminfo.url})}))})),items}canUseStealth(state,cmIds){return cmIds.some((cmId=>{var _cminfo$allowstealth;const cminfo=state.cm.get(cmId);return null!==(_cminfo$allowstealth=null==cminfo?void 0:cminfo.allowstealth)&&void 0!==_cminfo$allowstealth&&_cminfo$allowstealth}))}},_exports.default}));
+class{constructor(reactive){this.reactive=reactive,this.COMPLETIONS=["incomplete","complete","complete","fail"]}course(state){var _state$course$highlig;const data={sections:[],editmode:this.reactive.isEditing,highlighted:null!==(_state$course$highlig=state.course.highlighted)&&void 0!==_state$course$highlig?_state$course$highlig:""};return this.listedSectionIds(state).forEach((sectionid=>{var _state$section$get;const sectioninfo=null!==(_state$section$get=state.section.get(sectionid))&&void 0!==_state$section$get?_state$section$get:{},section=this.section(state,sectioninfo);data.sections.push(section)})),data.hassections=0!=data.sections.length,data}listedSectionIds(state){var _state$course$section;return(null!==(_state$course$section=state.course.sectionlist)&&void 0!==_state$course$section?_state$course$section:[]).filter((sectionid=>{var _state$section$get2;return null===(null!==(_state$section$get2=state.section.get(sectionid))&&void 0!==_state$section$get2?_state$section$get2:{}).component}))}section(state,sectioninfo){var _state$course$highlig2,_sectioninfo$cmlist;const section={...sectioninfo,highlighted:null!==(_state$course$highlig2=state.course.highlighted)&&void 0!==_state$course$highlig2?_state$course$highlig2:"",cms:[]};return(null!==(_sectioninfo$cmlist=sectioninfo.cmlist)&&void 0!==_sectioninfo$cmlist?_sectioninfo$cmlist:[]).forEach((cmid=>{const cminfo=state.cm.get(cmid),cm=this.cm(state,cminfo);section.cms.push(cm)})),section.hascms=0!=section.cms.length,section}cm(state,cminfo){const cm={...cminfo,isactive:!1};if(cminfo.hasdelegatedsection){const sectioninfo=state.section.get(cminfo.delegatesectionid);cm.sectioninfo=this.section(state,sectioninfo)}return cm}cmDraggableData(state,cmid){const cminfo=state.cm.get(cmid);if(!cminfo)return null;let nextcmid;const section=state.section.get(cminfo.sectionid),currentindex=null==section?void 0:section.cmlist.indexOf(cminfo.id);return void 0!==currentindex&&(nextcmid=null==section?void 0:section.cmlist[currentindex+1]),{type:"cm",id:cminfo.id,name:cminfo.name,sectionid:cminfo.sectionid,delegatesection:cminfo.delegatesection,nextcmid:nextcmid}}sectionDraggableData(state,sectionid){const sectioninfo=state.section.get(sectionid);return sectioninfo?{type:"section",id:sectioninfo.id,name:sectioninfo.name,number:sectioninfo.number}:null}fileDraggableData(state,dataTransfer){var _dataTransfer$files;const files=[];return(null===(_dataTransfer$files=dataTransfer.files)||void 0===_dataTransfer$files?void 0:_dataTransfer$files.length)>0&&dataTransfer.files.forEach((file=>{files.push(file)})),{type:"files",files:files}}cmCompletion(state,cminfo){const data={statename:"",state:"NaN"};if(void 0!==cminfo.completionstate){var _this$COMPLETIONS$cmi;data.state=cminfo.completionstate,data.hasstate=!0;let statename=null!==(_this$COMPLETIONS$cmi=this.COMPLETIONS[cminfo.completionstate])&&void 0!==_this$COMPLETIONS$cmi?_this$COMPLETIONS$cmi:"NaN";void 0!==cminfo.isoverallcomplete&&!0===cminfo.isoverallcomplete&&(statename="complete"),data["is".concat(statename)]=!0}return data}allItemsArray(state){var _state$course$section2;const items=[];return(null!==(_state$course$section2=state.course.sectionlist)&&void 0!==_state$course$section2?_state$course$section2:[]).forEach((sectionid=>{var _sectioninfo$cmlist2;const sectioninfo=state.section.get(sectionid);items.push({type:"section",id:sectioninfo.id,url:sectioninfo.sectionurl});(null!==(_sectioninfo$cmlist2=sectioninfo.cmlist)&&void 0!==_sectioninfo$cmlist2?_sectioninfo$cmlist2:[]).forEach((cmid=>{const cminfo=state.cm.get(cmid);items.push({type:"cm",id:cminfo.id,url:cminfo.url})}))})),items}canUseStealth(state,cmIds){return cmIds.some((cmId=>{var _cminfo$allowstealth;const cminfo=state.cm.get(cmId);return null!==(_cminfo$allowstealth=null==cminfo?void 0:cminfo.allowstealth)&&void 0!==_cminfo$allowstealth&&_cminfo$allowstealth}))}},_exports.default}));
 
 //# sourceMappingURL=exporter.min.js.map
\ No newline at end of file
diff --git a/course/format/amd/build/local/courseeditor/exporter.min.js.map b/course/format/amd/build/local/courseeditor/exporter.min.js.map
index 336e22c8dfe10..3eb0a886dfdca 100644
--- a/course/format/amd/build/local/courseeditor/exporter.min.js.map
+++ b/course/format/amd/build/local/courseeditor/exporter.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"exporter.min.js","sources":["../../../src/local/courseeditor/exporter.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Module to export parts of the state and transform them to be used in templates\n * and as draggable data.\n *\n * @module     core_courseformat/local/courseeditor/exporter\n * @class      core_courseformat/local/courseeditor/exporter\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\nexport default class {\n\n    /**\n     * Class constructor.\n     *\n     * @param {CourseEditor} reactive the course editor object\n     */\n    constructor(reactive) {\n        this.reactive = reactive;\n\n        // Completions states are defined in lib/completionlib.php. There are 4 different completion\n        // state values, however, the course index uses the same state for complete and complete_pass.\n        // This is the reason why completed appears twice in the array.\n        this.COMPLETIONS = ['incomplete', 'complete', 'complete', 'fail'];\n    }\n\n    /**\n     * Generate the course export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @returns {Object}\n     */\n    course(state) {\n        // Collect section information from the state.\n        const data = {\n            sections: [],\n            editmode: this.reactive.isEditing,\n            highlighted: state.course.highlighted ?? '',\n        };\n        const sectionlist = this.listedSectionIds(state);\n        sectionlist.forEach(sectionid => {\n            const sectioninfo = state.section.get(sectionid) ?? {};\n            const section = this.section(state, sectioninfo);\n            data.sections.push(section);\n        });\n        data.hassections = (data.sections.length != 0);\n\n        return data;\n    }\n\n    /**\n     * Get the IDs of the sections that are listed as regular sections.\n     * @param {Object} state the current state.\n     * @returns {Number[]} the list of section ids that are listed.\n     */\n    listedSectionIds(state) {\n        const fullSectionList = state.course.sectionlist ?? [];\n        return fullSectionList.filter(sectionid => {\n            const sectioninfo = state.section.get(sectionid) ?? {};\n            // Delegated sections (controlled by a component) are not listed in course.\n            return sectioninfo.component === null;\n        });\n    }\n\n    /**\n     * Generate a section export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} sectioninfo the section state data.\n     * @returns {Object}\n     */\n    section(state, sectioninfo) {\n        const section = {\n            ...sectioninfo,\n            highlighted: state.course.highlighted ?? '',\n            cms: [],\n        };\n        const cmlist = sectioninfo.cmlist ?? [];\n        cmlist.forEach(cmid => {\n            const cminfo = state.cm.get(cmid);\n            const cm = this.cm(state, cminfo);\n            section.cms.push(cm);\n        });\n        section.hascms = (section.cms.length != 0);\n\n        return section;\n    }\n\n    /**\n     * Generate a cm export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} cminfo the course module state data.\n     * @returns {Object}\n     */\n    cm(state, cminfo) {\n        const cm = {\n            ...cminfo,\n            isactive: false,\n        };\n        return cm;\n    }\n\n    /**\n     * Generate a dragable cm data structure.\n     *\n     * This method is used by any draggable course module element to generate drop data\n     * for its reactive/dragdrop instance.\n     *\n     * @param {*} state the state object\n     * @param {*} cmid the cours emodule id\n     * @returns {Object|null}\n     */\n    cmDraggableData(state, cmid) {\n        const cminfo = state.cm.get(cmid);\n        if (!cminfo) {\n            return null;\n        }\n\n        // Drop an activity over the next activity is the same as doing anything.\n        let nextcmid;\n        const section = state.section.get(cminfo.sectionid);\n        const currentindex = section?.cmlist.indexOf(cminfo.id);\n        if (currentindex !== undefined) {\n            nextcmid = section?.cmlist[currentindex + 1];\n        }\n\n        return {\n            type: 'cm',\n            id: cminfo.id,\n            name: cminfo.name,\n            sectionid: cminfo.sectionid,\n            delegatesection: cminfo.delegatesection,\n            nextcmid,\n        };\n    }\n\n    /**\n     * Generate a dragable cm data structure.\n     *\n     * This method is used by any draggable section element to generate drop data\n     * for its reactive/dragdrop instance.\n     *\n     * @param {*} state the state object\n     * @param {*} sectionid the cours section id\n     * @returns {Object|null}\n     */\n    sectionDraggableData(state, sectionid) {\n        const sectioninfo = state.section.get(sectionid);\n        if (!sectioninfo) {\n            return null;\n        }\n        return {\n            type: 'section',\n            id: sectioninfo.id,\n            name: sectioninfo.name,\n            number: sectioninfo.number,\n        };\n    }\n\n    /**\n     * Generate a file draggable structure.\n     *\n     * This method is used when files are dragged on the browser.\n     *\n     * @param {*} state the state object\n     * @param {*} dataTransfer the current data tranfer data\n     * @returns {Object|null}\n     */\n    fileDraggableData(state, dataTransfer) {\n        const files = [];\n        // Browsers do not provide the file list until the drop event.\n        if (dataTransfer.files?.length > 0) {\n            dataTransfer.files.forEach(file => {\n                files.push(file);\n            });\n        }\n        return {\n            type: 'files',\n            files,\n        };\n    }\n\n    /**\n     * Generate a completion export data from the cm element.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} cminfo the course module state data.\n     * @returns {Object}\n     */\n    cmCompletion(state, cminfo) {\n        const data = {\n            statename: '',\n            state: 'NaN',\n        };\n        if (cminfo.completionstate !== undefined) {\n            data.state = cminfo.completionstate;\n            data.hasstate = true;\n            let statename = this.COMPLETIONS[cminfo.completionstate] ?? 'NaN';\n            if (cminfo.isoverallcomplete !== undefined && cminfo.isoverallcomplete === true) {\n                statename = 'complete';\n            }\n            data[`is${statename}`] = true;\n        }\n        return data;\n    }\n\n    /**\n     * Return a sorted list of all sections and cms items in the state.\n     *\n     * @param {Object} state the current state.\n     * @returns {Array} all sections and cms items in the state.\n     */\n    allItemsArray(state) {\n        const items = [];\n        const sectionlist = state.course.sectionlist ?? [];\n        // Add sections.\n        sectionlist.forEach(sectionid => {\n            const sectioninfo = state.section.get(sectionid);\n            items.push({type: 'section', id: sectioninfo.id, url: sectioninfo.sectionurl});\n            // Add cms.\n            const cmlist = sectioninfo.cmlist ?? [];\n            cmlist.forEach(cmid => {\n                const cminfo = state.cm.get(cmid);\n                items.push({type: 'cm', id: cminfo.id, url: cminfo.url});\n            });\n        });\n        return items;\n    }\n\n    /**\n     * Check is some activities of a list can be stealth.\n     *\n     * @param {Object} state the current state.\n     * @param {Number[]} cmIds the module ids to check\n     * @returns {Boolean} if any of the activities can be stealth.\n     */\n    canUseStealth(state, cmIds) {\n        return cmIds.some(cmId => {\n            const cminfo = state.cm.get(cmId);\n            return cminfo?.allowstealth ?? false;\n        });\n    }\n}\n"],"names":["constructor","reactive","COMPLETIONS","course","state","data","sections","editmode","this","isEditing","highlighted","listedSectionIds","forEach","sectionid","sectioninfo","section","get","push","hassections","length","sectionlist","filter","component","cms","cmlist","cmid","cminfo","cm","hascms","isactive","cmDraggableData","nextcmid","currentindex","indexOf","id","undefined","type","name","delegatesection","sectionDraggableData","number","fileDraggableData","dataTransfer","files","file","cmCompletion","statename","completionstate","hasstate","isoverallcomplete","allItemsArray","items","url","sectionurl","canUseStealth","cmIds","some","cmId","allowstealth"],"mappings":";;;;;;;;;;MA+BIA,YAAYC,eACHA,SAAWA,cAKXC,YAAc,CAAC,aAAc,WAAY,WAAY,QAS9DC,OAAOC,uCAEGC,KAAO,CACTC,SAAU,GACVC,SAAUC,KAAKP,SAASQ,UACxBC,0CAAaN,MAAMD,OAAOO,mEAAe,WAEzBF,KAAKG,iBAAiBP,OAC9BQ,SAAQC,yCACVC,uCAAcV,MAAMW,QAAQC,IAAIH,4DAAc,GAC9CE,QAAUP,KAAKO,QAAQX,MAAOU,aACpCT,KAAKC,SAASW,KAAKF,YAEvBV,KAAKa,YAAuC,GAAxBb,KAAKC,SAASa,OAE3Bd,KAQXM,iBAAiBP,sEACWA,MAAMD,OAAOiB,mEAAe,IAC7BC,QAAOR,2CAGO,oCAFbT,MAAMW,QAAQC,IAAIH,8DAAc,IAEjCS,aAW3BP,QAAQX,MAAOU,kEACLC,QAAU,IACTD,YACHJ,2CAAaN,MAAMD,OAAOO,qEAAe,GACzCa,IAAK,uCAEMT,YAAYU,0DAAU,IAC9BZ,SAAQa,aACLC,OAAStB,MAAMuB,GAAGX,IAAIS,MACtBE,GAAKnB,KAAKmB,GAAGvB,MAAOsB,QAC1BX,QAAQQ,IAAIN,KAAKU,OAErBZ,QAAQa,OAAgC,GAAtBb,QAAQQ,IAAIJ,OAEvBJ,QAUXY,GAAGvB,MAAOsB,cACK,IACJA,OACHG,UAAU,GAelBC,gBAAgB1B,MAAOqB,YACbC,OAAStB,MAAMuB,GAAGX,IAAIS,UACvBC,cACM,SAIPK,eACEhB,QAAUX,MAAMW,QAAQC,IAAIU,OAAOb,WACnCmB,aAAejB,MAAAA,eAAAA,QAASS,OAAOS,QAAQP,OAAOQ,gBAC/BC,IAAjBH,eACAD,SAAWhB,MAAAA,eAAAA,QAASS,OAAOQ,aAAe,IAGvC,CACHI,KAAM,KACNF,GAAIR,OAAOQ,GACXG,KAAMX,OAAOW,KACbxB,UAAWa,OAAOb,UAClByB,gBAAiBZ,OAAOY,gBACxBP,SAAAA,UAcRQ,qBAAqBnC,MAAOS,iBAClBC,YAAcV,MAAMW,QAAQC,IAAIH,kBACjCC,YAGE,CACHsB,KAAM,UACNF,GAAIpB,YAAYoB,GAChBG,KAAMvB,YAAYuB,KAClBG,OAAQ1B,YAAY0B,QANb,KAmBfC,kBAAkBrC,MAAOsC,4CACfC,MAAQ,sCAEVD,aAAaC,gEAAOxB,QAAS,GAC7BuB,aAAaC,MAAM/B,SAAQgC,OACvBD,MAAM1B,KAAK2B,SAGZ,CACHR,KAAM,QACNO,MAAAA,OAWRE,aAAazC,MAAOsB,cACVrB,KAAO,CACTyC,UAAW,GACX1C,MAAO,eAEoB+B,IAA3BT,OAAOqB,gBAA+B,2BACtC1C,KAAKD,MAAQsB,OAAOqB,gBACpB1C,KAAK2C,UAAW,MACZF,wCAAYtC,KAAKN,YAAYwB,OAAOqB,wEAAoB,WAC3BZ,IAA7BT,OAAOuB,oBAAgE,IAA7BvB,OAAOuB,oBACjDH,UAAY,YAEhBzC,iBAAUyC,aAAe,SAEtBzC,KASX6C,cAAc9C,wCACJ+C,MAAQ,yCACM/C,MAAMD,OAAOiB,qEAAe,IAEpCR,SAAQC,2CACVC,YAAcV,MAAMW,QAAQC,IAAIH,WACtCsC,MAAMlC,KAAK,CAACmB,KAAM,UAAWF,GAAIpB,YAAYoB,GAAIkB,IAAKtC,YAAYuC,2CAEnDvC,YAAYU,4DAAU,IAC9BZ,SAAQa,aACLC,OAAStB,MAAMuB,GAAGX,IAAIS,MAC5B0B,MAAMlC,KAAK,CAACmB,KAAM,KAAMF,GAAIR,OAAOQ,GAAIkB,IAAK1B,OAAO0B,YAGpDD,MAUXG,cAAclD,MAAOmD,cACVA,MAAMC,MAAKC,sCACR/B,OAAStB,MAAMuB,GAAGX,IAAIyC,0CACrB/B,MAAAA,cAAAA,OAAQgC"}
\ No newline at end of file
+{"version":3,"file":"exporter.min.js","sources":["../../../src/local/courseeditor/exporter.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Module to export parts of the state and transform them to be used in templates\n * and as draggable data.\n *\n * @module     core_courseformat/local/courseeditor/exporter\n * @class      core_courseformat/local/courseeditor/exporter\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\nexport default class {\n\n    /**\n     * Class constructor.\n     *\n     * @param {CourseEditor} reactive the course editor object\n     */\n    constructor(reactive) {\n        this.reactive = reactive;\n\n        // Completions states are defined in lib/completionlib.php. There are 4 different completion\n        // state values, however, the course index uses the same state for complete and complete_pass.\n        // This is the reason why completed appears twice in the array.\n        this.COMPLETIONS = ['incomplete', 'complete', 'complete', 'fail'];\n    }\n\n    /**\n     * Generate the course export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @returns {Object}\n     */\n    course(state) {\n        // Collect section information from the state.\n        const data = {\n            sections: [],\n            editmode: this.reactive.isEditing,\n            highlighted: state.course.highlighted ?? '',\n        };\n        const sectionlist = this.listedSectionIds(state);\n        sectionlist.forEach(sectionid => {\n            const sectioninfo = state.section.get(sectionid) ?? {};\n            const section = this.section(state, sectioninfo);\n            data.sections.push(section);\n        });\n        data.hassections = (data.sections.length != 0);\n\n        return data;\n    }\n\n    /**\n     * Get the IDs of the sections that are listed as regular sections.\n     * @param {Object} state the current state.\n     * @returns {Number[]} the list of section ids that are listed.\n     */\n    listedSectionIds(state) {\n        const fullSectionList = state.course.sectionlist ?? [];\n        return fullSectionList.filter(sectionid => {\n            const sectioninfo = state.section.get(sectionid) ?? {};\n            // Delegated sections (controlled by a component) are not listed in course.\n            return sectioninfo.component === null;\n        });\n    }\n\n    /**\n     * Generate a section export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} sectioninfo the section state data.\n     * @returns {Object}\n     */\n    section(state, sectioninfo) {\n        const section = {\n            ...sectioninfo,\n            highlighted: state.course.highlighted ?? '',\n            cms: [],\n        };\n        const cmlist = sectioninfo.cmlist ?? [];\n        cmlist.forEach(cmid => {\n            const cminfo = state.cm.get(cmid);\n            const cm = this.cm(state, cminfo);\n            section.cms.push(cm);\n        });\n        section.hascms = (section.cms.length != 0);\n\n        return section;\n    }\n\n    /**\n     * Generate a cm export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} cminfo the course module state data.\n     * @returns {Object}\n     */\n    cm(state, cminfo) {\n        const cm = {\n            ...cminfo,\n            isactive: false,\n        };\n        if (cminfo.hasdelegatedsection) {\n            const sectioninfo = state.section.get(cminfo.delegatesectionid);\n            cm.sectioninfo = this.section(state, sectioninfo);\n        }\n        return cm;\n    }\n\n    /**\n     * Generate a dragable cm data structure.\n     *\n     * This method is used by any draggable course module element to generate drop data\n     * for its reactive/dragdrop instance.\n     *\n     * @param {*} state the state object\n     * @param {*} cmid the cours emodule id\n     * @returns {Object|null}\n     */\n    cmDraggableData(state, cmid) {\n        const cminfo = state.cm.get(cmid);\n        if (!cminfo) {\n            return null;\n        }\n\n        // Drop an activity over the next activity is the same as doing anything.\n        let nextcmid;\n        const section = state.section.get(cminfo.sectionid);\n        const currentindex = section?.cmlist.indexOf(cminfo.id);\n        if (currentindex !== undefined) {\n            nextcmid = section?.cmlist[currentindex + 1];\n        }\n\n        return {\n            type: 'cm',\n            id: cminfo.id,\n            name: cminfo.name,\n            sectionid: cminfo.sectionid,\n            delegatesection: cminfo.delegatesection,\n            nextcmid,\n        };\n    }\n\n    /**\n     * Generate a dragable cm data structure.\n     *\n     * This method is used by any draggable section element to generate drop data\n     * for its reactive/dragdrop instance.\n     *\n     * @param {*} state the state object\n     * @param {*} sectionid the cours section id\n     * @returns {Object|null}\n     */\n    sectionDraggableData(state, sectionid) {\n        const sectioninfo = state.section.get(sectionid);\n        if (!sectioninfo) {\n            return null;\n        }\n        return {\n            type: 'section',\n            id: sectioninfo.id,\n            name: sectioninfo.name,\n            number: sectioninfo.number,\n        };\n    }\n\n    /**\n     * Generate a file draggable structure.\n     *\n     * This method is used when files are dragged on the browser.\n     *\n     * @param {*} state the state object\n     * @param {*} dataTransfer the current data tranfer data\n     * @returns {Object|null}\n     */\n    fileDraggableData(state, dataTransfer) {\n        const files = [];\n        // Browsers do not provide the file list until the drop event.\n        if (dataTransfer.files?.length > 0) {\n            dataTransfer.files.forEach(file => {\n                files.push(file);\n            });\n        }\n        return {\n            type: 'files',\n            files,\n        };\n    }\n\n    /**\n     * Generate a completion export data from the cm element.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} cminfo the course module state data.\n     * @returns {Object}\n     */\n    cmCompletion(state, cminfo) {\n        const data = {\n            statename: '',\n            state: 'NaN',\n        };\n        if (cminfo.completionstate !== undefined) {\n            data.state = cminfo.completionstate;\n            data.hasstate = true;\n            let statename = this.COMPLETIONS[cminfo.completionstate] ?? 'NaN';\n            if (cminfo.isoverallcomplete !== undefined && cminfo.isoverallcomplete === true) {\n                statename = 'complete';\n            }\n            data[`is${statename}`] = true;\n        }\n        return data;\n    }\n\n    /**\n     * Return a sorted list of all sections and cms items in the state.\n     *\n     * @param {Object} state the current state.\n     * @returns {Array} all sections and cms items in the state.\n     */\n    allItemsArray(state) {\n        const items = [];\n        const sectionlist = state.course.sectionlist ?? [];\n        // Add sections.\n        sectionlist.forEach(sectionid => {\n            const sectioninfo = state.section.get(sectionid);\n            items.push({type: 'section', id: sectioninfo.id, url: sectioninfo.sectionurl});\n            // Add cms.\n            const cmlist = sectioninfo.cmlist ?? [];\n            cmlist.forEach(cmid => {\n                const cminfo = state.cm.get(cmid);\n                items.push({type: 'cm', id: cminfo.id, url: cminfo.url});\n            });\n        });\n        return items;\n    }\n\n    /**\n     * Check is some activities of a list can be stealth.\n     *\n     * @param {Object} state the current state.\n     * @param {Number[]} cmIds the module ids to check\n     * @returns {Boolean} if any of the activities can be stealth.\n     */\n    canUseStealth(state, cmIds) {\n        return cmIds.some(cmId => {\n            const cminfo = state.cm.get(cmId);\n            return cminfo?.allowstealth ?? false;\n        });\n    }\n}\n"],"names":["constructor","reactive","COMPLETIONS","course","state","data","sections","editmode","this","isEditing","highlighted","listedSectionIds","forEach","sectionid","sectioninfo","section","get","push","hassections","length","sectionlist","filter","component","cms","cmlist","cmid","cminfo","cm","hascms","isactive","hasdelegatedsection","delegatesectionid","cmDraggableData","nextcmid","currentindex","indexOf","id","undefined","type","name","delegatesection","sectionDraggableData","number","fileDraggableData","dataTransfer","files","file","cmCompletion","statename","completionstate","hasstate","isoverallcomplete","allItemsArray","items","url","sectionurl","canUseStealth","cmIds","some","cmId","allowstealth"],"mappings":";;;;;;;;;;MA+BIA,YAAYC,eACHA,SAAWA,cAKXC,YAAc,CAAC,aAAc,WAAY,WAAY,QAS9DC,OAAOC,uCAEGC,KAAO,CACTC,SAAU,GACVC,SAAUC,KAAKP,SAASQ,UACxBC,0CAAaN,MAAMD,OAAOO,mEAAe,WAEzBF,KAAKG,iBAAiBP,OAC9BQ,SAAQC,yCACVC,uCAAcV,MAAMW,QAAQC,IAAIH,4DAAc,GAC9CE,QAAUP,KAAKO,QAAQX,MAAOU,aACpCT,KAAKC,SAASW,KAAKF,YAEvBV,KAAKa,YAAuC,GAAxBb,KAAKC,SAASa,OAE3Bd,KAQXM,iBAAiBP,sEACWA,MAAMD,OAAOiB,mEAAe,IAC7BC,QAAOR,2CAGO,oCAFbT,MAAMW,QAAQC,IAAIH,8DAAc,IAEjCS,aAW3BP,QAAQX,MAAOU,kEACLC,QAAU,IACTD,YACHJ,2CAAaN,MAAMD,OAAOO,qEAAe,GACzCa,IAAK,uCAEMT,YAAYU,0DAAU,IAC9BZ,SAAQa,aACLC,OAAStB,MAAMuB,GAAGX,IAAIS,MACtBE,GAAKnB,KAAKmB,GAAGvB,MAAOsB,QAC1BX,QAAQQ,IAAIN,KAAKU,OAErBZ,QAAQa,OAAgC,GAAtBb,QAAQQ,IAAIJ,OAEvBJ,QAUXY,GAAGvB,MAAOsB,cACAC,GAAK,IACJD,OACHG,UAAU,MAEVH,OAAOI,oBAAqB,OACtBhB,YAAcV,MAAMW,QAAQC,IAAIU,OAAOK,mBAC7CJ,GAAGb,YAAcN,KAAKO,QAAQX,MAAOU,oBAElCa,GAaXK,gBAAgB5B,MAAOqB,YACbC,OAAStB,MAAMuB,GAAGX,IAAIS,UACvBC,cACM,SAIPO,eACElB,QAAUX,MAAMW,QAAQC,IAAIU,OAAOb,WACnCqB,aAAenB,MAAAA,eAAAA,QAASS,OAAOW,QAAQT,OAAOU,gBAC/BC,IAAjBH,eACAD,SAAWlB,MAAAA,eAAAA,QAASS,OAAOU,aAAe,IAGvC,CACHI,KAAM,KACNF,GAAIV,OAAOU,GACXG,KAAMb,OAAOa,KACb1B,UAAWa,OAAOb,UAClB2B,gBAAiBd,OAAOc,gBACxBP,SAAAA,UAcRQ,qBAAqBrC,MAAOS,iBAClBC,YAAcV,MAAMW,QAAQC,IAAIH,kBACjCC,YAGE,CACHwB,KAAM,UACNF,GAAItB,YAAYsB,GAChBG,KAAMzB,YAAYyB,KAClBG,OAAQ5B,YAAY4B,QANb,KAmBfC,kBAAkBvC,MAAOwC,4CACfC,MAAQ,sCAEVD,aAAaC,gEAAO1B,QAAS,GAC7ByB,aAAaC,MAAMjC,SAAQkC,OACvBD,MAAM5B,KAAK6B,SAGZ,CACHR,KAAM,QACNO,MAAAA,OAWRE,aAAa3C,MAAOsB,cACVrB,KAAO,CACT2C,UAAW,GACX5C,MAAO,eAEoBiC,IAA3BX,OAAOuB,gBAA+B,2BACtC5C,KAAKD,MAAQsB,OAAOuB,gBACpB5C,KAAK6C,UAAW,MACZF,wCAAYxC,KAAKN,YAAYwB,OAAOuB,wEAAoB,WAC3BZ,IAA7BX,OAAOyB,oBAAgE,IAA7BzB,OAAOyB,oBACjDH,UAAY,YAEhB3C,iBAAU2C,aAAe,SAEtB3C,KASX+C,cAAchD,wCACJiD,MAAQ,yCACMjD,MAAMD,OAAOiB,qEAAe,IAEpCR,SAAQC,2CACVC,YAAcV,MAAMW,QAAQC,IAAIH,WACtCwC,MAAMpC,KAAK,CAACqB,KAAM,UAAWF,GAAItB,YAAYsB,GAAIkB,IAAKxC,YAAYyC,2CAEnDzC,YAAYU,4DAAU,IAC9BZ,SAAQa,aACLC,OAAStB,MAAMuB,GAAGX,IAAIS,MAC5B4B,MAAMpC,KAAK,CAACqB,KAAM,KAAMF,GAAIV,OAAOU,GAAIkB,IAAK5B,OAAO4B,YAGpDD,MAUXG,cAAcpD,MAAOqD,cACVA,MAAMC,MAAKC,sCACRjC,OAAStB,MAAMuB,GAAGX,IAAI2C,0CACrBjC,MAAAA,cAAAA,OAAQkC"}
\ No newline at end of file
diff --git a/course/format/amd/src/local/courseeditor/exporter.js b/course/format/amd/src/local/courseeditor/exporter.js
index 3b8230b19ded5..072ec8358b5d3 100644
--- a/course/format/amd/src/local/courseeditor/exporter.js
+++ b/course/format/amd/src/local/courseeditor/exporter.js
@@ -112,6 +112,10 @@ export default class {
             ...cminfo,
             isactive: false,
         };
+        if (cminfo.hasdelegatedsection) {
+            const sectioninfo = state.section.get(cminfo.delegatesectionid);
+            cm.sectioninfo = this.section(state, sectioninfo);
+        }
         return cm;
     }
 
diff --git a/course/format/classes/output/local/state/cm.php b/course/format/classes/output/local/state/cm.php
index 65e72d9da085b..b83995a899c45 100644
--- a/course/format/classes/output/local/state/cm.php
+++ b/course/format/classes/output/local/state/cm.php
@@ -68,6 +68,7 @@ public function export_for_template(renderer_base $output): stdClass {
         $section = $this->section;
         $cm = $this->cm;
         $course = $format->get_course();
+        $delegatedsectioninfo = $cm->get_delegated_section_info();
 
         $data = (object)[
             'id' => $cm->id,
@@ -85,9 +86,13 @@ public function export_for_template(renderer_base $output): stdClass {
             'module' => $cm->modname,
             'plugin' => 'mod_' . $cm->modname,
             // Activities with delegate section has some restriction to prevent structure loops.
-            'delegatesection' => sectiondelegate::has_delegate_class('mod_'.$cm->modname),
+            'hasdelegatedsection' => !empty($delegatedsectioninfo),
         ];
 
+        if (!empty($delegatedsectioninfo)) {
+            $data->delegatesectionid = $delegatedsectioninfo->id;
+        }
+
         // Check the user access type to this cm.
         $info = new info_module($cm);
         $data->accessvisible = ($data->visible && $info->is_available_for_all());
diff --git a/course/format/templates/local/courseindex/cm.mustache b/course/format/templates/local/courseindex/cm.mustache
index 1a28fdad05d52..451951e039b66 100644
--- a/course/format/templates/local/courseindex/cm.mustache
+++ b/course/format/templates/local/courseindex/cm.mustache
@@ -37,32 +37,40 @@
         {{#hascmrestrictions}}restrictions{{/hascmrestrictions}}
         {{^accessvisible}}dimmed{{/accessvisible}}
         d-flex
-        {{#indent}} indented {{/indent}}"
+        {{#indent}} indented {{/indent}}
+        {{#hasdelegatedsection}}py-0{{/hasdelegatedsection}}"
     id="course-index-cm-{{id}}"
     data-for="cm"
     data-id="{{id}}"
     role="treeitem"
 >
-    <span class="completioninfo" data-for="cm_completion" data-value="NaN"></span>
-    {{#uservisible}}
-    <a
-        class="courseindex-link text-truncate"
-        {{#url}} href="{{{url}}}" {{/url}}{{^url}} href="#{{{anchor}}}" data-anchor="true" {{/url}}
-        data-for="cm_name"
-        tabindex="-1"
-    >
-        {{{name}}}
-    </a>
-    {{/uservisible}}
-    {{^uservisible}}
-    <a class="courseindex-link text-truncate" href="#{{{anchor}}}" data-for="cm_name" tabindex="-1" data-anchor="true">
-        {{{name}}}
-    </a>
-    {{/uservisible}}
-    <span class="courseindex-locked ml-1" data-for="cm_name">
-        {{#pix}} t/locked, core {{/pix}}
-    </span>
-    <span class="dragicon ml-auto">{{#pix}}i/dragdrop{{/pix}}</span>
+    {{^hasdelegatedsection}}
+        <span class="completioninfo" data-for="cm_completion" data-value="NaN"></span>
+        {{#uservisible}}
+            <a
+                    class="courseindex-link text-truncate"
+                {{#url}} href="{{{url}}}" {{/url}}{{^url}} href="#{{{anchor}}}" data-anchor="true" {{/url}}
+                    data-for="cm_name"
+                    tabindex="-1"
+            >
+                {{{name}}}
+            </a>
+        {{/uservisible}}
+        {{^uservisible}}
+            <a class="courseindex-link text-truncate" href="#{{{anchor}}}" data-for="cm_name" tabindex="-1" data-anchor="true">
+                {{{name}}}
+            </a>
+        {{/uservisible}}
+        <span class="courseindex-locked ml-1" data-for="cm_name">
+            {{#pix}} t/locked, core {{/pix}}
+        </span>
+        <span class="dragicon ml-auto">{{#pix}}i/dragdrop{{/pix}}</span>
+    {{/hasdelegatedsection}}
+    {{#hasdelegatedsection}}
+        {{#sectioninfo}}
+            {{> core_courseformat/local/courseindex/section}}
+        {{/sectioninfo}}
+    {{/hasdelegatedsection}}
 </li>
 {{#js}}
 require(['core_courseformat/local/courseindex/cm'], function(component) {

From e8c66a981531017a9798ff3a55542acd9b15aa64 Mon Sep 17 00:00:00 2001
From: Laurent David <lmedavid@gmail.com>
Date: Wed, 12 Jun 2024 09:11:58 +0200
Subject: [PATCH 104/119] MDL-81725 core_courseformat: Prevent drag and drop
 handling subsections

* Subsection are "modules" and should not be handled as "sections" in the
drag and drop process. Preventing delegated section from being dragged in
the dndsectionitems module fixes the drag and drop issues with subsections
in course index.
---
 .../format/amd/build/local/courseeditor/dndcmitem.min.js  | 2 +-
 .../amd/build/local/courseeditor/dndcmitem.min.js.map     | 2 +-
 .../format/amd/build/local/courseeditor/dndsection.min.js | 2 +-
 .../amd/build/local/courseeditor/dndsection.min.js.map    | 2 +-
 .../amd/build/local/courseeditor/dndsectionitem.min.js    | 2 +-
 .../build/local/courseeditor/dndsectionitem.min.js.map    | 2 +-
 .../format/amd/build/local/courseeditor/exporter.min.js   | 2 +-
 .../amd/build/local/courseeditor/exporter.min.js.map      | 2 +-
 .../amd/build/local/courseindex/sectiontitle.min.js       | 2 +-
 .../amd/build/local/courseindex/sectiontitle.min.js.map   | 2 +-
 course/format/amd/src/local/courseeditor/dndcmitem.js     | 2 +-
 course/format/amd/src/local/courseeditor/dndsection.js    | 8 ++++++--
 .../format/amd/src/local/courseeditor/dndsectionitem.js   | 6 +++---
 course/format/amd/src/local/courseeditor/exporter.js      | 2 +-
 course/format/amd/src/local/courseindex/sectiontitle.js   | 4 ++--
 15 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/course/format/amd/build/local/courseeditor/dndcmitem.min.js b/course/format/amd/build/local/courseeditor/dndcmitem.min.js
index b4fbc16191d10..f744ed4deca3f 100644
--- a/course/format/amd/build/local/courseeditor/dndcmitem.min.js
+++ b/course/format/amd/build/local/courseeditor/dndcmitem.min.js
@@ -10,6 +10,6 @@ define("core_courseformat/local/courseeditor/dndcmitem",["exports","core/reactiv
    * @copyright  2021 Ferran Recio <ferran@moodle.com>
    * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
    */
-class _default extends _reactive.BaseComponent{configDragDrop(cmid){this.id=cmid,this.reactive.isEditing&&this.reactive.supportComponents&&(this.dragdrop=new _reactive.DragDrop(this),this.classes=this.dragdrop.getClasses())}destroy(){void 0!==this.dragdrop&&this.dragdrop.unregister()}setDraggable(value){var _this$dragdrop;null===(_this$dragdrop=this.dragdrop)||void 0===_this$dragdrop||_this$dragdrop.setDraggable(value)}dragStart(dropdata){this.reactive.dispatch("cmDrag",[dropdata.id],!0)}dragEnd(dropdata){this.reactive.dispatch("cmDrag",[dropdata.id],!1)}getDraggableData(){return this.reactive.getExporter().cmDraggableData(this.reactive.state,this.id)}validateDropData(dropdata){if("cm"!==(null==dropdata?void 0:dropdata.type))return!1;if(!0===(null==dropdata?void 0:dropdata.delegatesection)){const mycminfo=this.reactive.get("cm",this.id),mysection=this.reactive.get("section",mycminfo.sectionid);if(null!==(null==mysection?void 0:mysection.component))return!1}return!0}showDropZone(dropdata){dropdata.nextcmid!=this.id&&dropdata.id!=this.id&&this.element.classList.add(this.classes.DROPUP)}hideDropZone(){this.element.classList.remove(this.classes.DROPUP)}drop(dropdata,event){if(dropdata.id!=this.id&&dropdata.nextcmid!=this.id){const mutation=event.altKey?"cmDuplicate":"cmMove";this.reactive.dispatch(mutation,[dropdata.id],null,this.id)}}}return _exports.default=_default,_exports.default}));
+class _default extends _reactive.BaseComponent{configDragDrop(cmid){this.id=cmid,this.reactive.isEditing&&this.reactive.supportComponents&&(this.dragdrop=new _reactive.DragDrop(this),this.classes=this.dragdrop.getClasses())}destroy(){void 0!==this.dragdrop&&this.dragdrop.unregister()}setDraggable(value){var _this$dragdrop;null===(_this$dragdrop=this.dragdrop)||void 0===_this$dragdrop||_this$dragdrop.setDraggable(value)}dragStart(dropdata){this.reactive.dispatch("cmDrag",[dropdata.id],!0)}dragEnd(dropdata){this.reactive.dispatch("cmDrag",[dropdata.id],!1)}getDraggableData(){return this.reactive.getExporter().cmDraggableData(this.reactive.state,this.id)}validateDropData(dropdata){if("cm"!==(null==dropdata?void 0:dropdata.type))return!1;if(!0===(null==dropdata?void 0:dropdata.hasdelegatedsection)){const mycminfo=this.reactive.get("cm",this.id),mysection=this.reactive.get("section",mycminfo.sectionid);if(null!==(null==mysection?void 0:mysection.component))return!1}return!0}showDropZone(dropdata){dropdata.nextcmid!=this.id&&dropdata.id!=this.id&&this.element.classList.add(this.classes.DROPUP)}hideDropZone(){this.element.classList.remove(this.classes.DROPUP)}drop(dropdata,event){if(dropdata.id!=this.id&&dropdata.nextcmid!=this.id){const mutation=event.altKey?"cmDuplicate":"cmMove";this.reactive.dispatch(mutation,[dropdata.id],null,this.id)}}}return _exports.default=_default,_exports.default}));
 
 //# sourceMappingURL=dndcmitem.min.js.map
\ No newline at end of file
diff --git a/course/format/amd/build/local/courseeditor/dndcmitem.min.js.map b/course/format/amd/build/local/courseeditor/dndcmitem.min.js.map
index 800a8464a6c0d..2d37d22abb78f 100644
--- a/course/format/amd/build/local/courseeditor/dndcmitem.min.js.map
+++ b/course/format/amd/build/local/courseeditor/dndcmitem.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"dndcmitem.min.js","sources":["../../../src/local/courseeditor/dndcmitem.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Course index cm component.\n *\n * This component is used to control specific course modules interactions like drag and drop\n * in both course index and course content.\n *\n * @module     core_courseformat/local/courseeditor/dndcmitem\n * @class      core_courseformat/local/courseeditor/dndcmitem\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport {BaseComponent, DragDrop} from 'core/reactive';\n\nexport default class extends BaseComponent {\n\n    /**\n     * Configure the component drag and drop.\n     *\n     * @param {number} cmid course module id\n     */\n    configDragDrop(cmid) {\n\n        this.id = cmid;\n\n        // Drag and drop is only available for components compatible course formats.\n        if (this.reactive.isEditing && this.reactive.supportComponents) {\n            // Init element drag and drop.\n            this.dragdrop = new DragDrop(this);\n            // Save dropzone classes.\n            this.classes = this.dragdrop.getClasses();\n        }\n    }\n\n    /**\n     * Remove all subcomponents dependencies.\n     */\n    destroy() {\n        if (this.dragdrop !== undefined) {\n            this.dragdrop.unregister();\n        }\n    }\n\n    /**\n     * Enable or disable the draggable property.\n     *\n     * @param {bool} value the new draggable value\n     */\n    setDraggable(value) {\n        this.dragdrop?.setDraggable(value);\n    }\n\n    // Drag and drop methods.\n\n    /**\n     * The element drop start hook.\n     *\n     * @param {Object} dropdata the dropdata\n     */\n    dragStart(dropdata) {\n        this.reactive.dispatch('cmDrag', [dropdata.id], true);\n    }\n\n    /**\n     * The element drop end hook.\n     *\n     * @param {Object} dropdata the dropdata\n     */\n    dragEnd(dropdata) {\n        this.reactive.dispatch('cmDrag', [dropdata.id], false);\n    }\n\n    /**\n     * Get the draggable data of this component.\n     *\n     * @returns {Object} exported course module drop data\n     */\n    getDraggableData() {\n        const exporter = this.reactive.getExporter();\n        return exporter.cmDraggableData(this.reactive.state, this.id);\n    }\n\n    /**\n     * Validate if the drop data can be dropped over the component.\n     *\n     * @param {Object} dropdata the exported drop data.\n     * @returns {boolean}\n     */\n    validateDropData(dropdata) {\n        if (dropdata?.type !== 'cm') {\n            return false;\n        }\n        // Prevent delegated sections loops.\n        if (dropdata?.delegatesection === true) {\n            const mycminfo = this.reactive.get('cm', this.id);\n            const mysection = this.reactive.get('section', mycminfo.sectionid);\n            if (mysection?.component !== null) {\n                return false;\n            }\n        }\n        return true;\n    }\n\n    /**\n     * Display the component dropzone.\n     *\n     * @param {Object} dropdata the accepted drop data\n     */\n    showDropZone(dropdata) {\n        // If we are the next cmid of the dragged element we accept the drop because otherwise it\n        // will get captured by the section. However, we won't trigger any mutation.\n        if (dropdata.nextcmid != this.id && dropdata.id != this.id) {\n            this.element.classList.add(this.classes.DROPUP);\n        }\n    }\n\n    /**\n     * Hide the component dropzone.\n     */\n    hideDropZone() {\n        this.element.classList.remove(this.classes.DROPUP);\n    }\n\n    /**\n     * Drop event handler.\n     *\n     * @param {Object} dropdata the accepted drop data\n     * @param {Event} event the drop event\n     */\n    drop(dropdata, event) {\n        // Call the move mutation if necessary.\n        if (dropdata.id != this.id && dropdata.nextcmid != this.id) {\n            const mutation = (event.altKey) ? 'cmDuplicate' : 'cmMove';\n            this.reactive.dispatch(mutation, [dropdata.id], null, this.id);\n        }\n    }\n\n}\n"],"names":["BaseComponent","configDragDrop","cmid","id","this","reactive","isEditing","supportComponents","dragdrop","DragDrop","classes","getClasses","destroy","undefined","unregister","setDraggable","value","dragStart","dropdata","dispatch","dragEnd","getDraggableData","getExporter","cmDraggableData","state","validateDropData","type","delegatesection","mycminfo","get","mysection","sectionid","component","showDropZone","nextcmid","element","classList","add","DROPUP","hideDropZone","remove","drop","event","mutation","altKey"],"mappings":";;;;;;;;;;;;uBA6B6BA,wBAOzBC,eAAeC,WAENC,GAAKD,KAGNE,KAAKC,SAASC,WAAaF,KAAKC,SAASE,yBAEpCC,SAAW,IAAIC,mBAASL,WAExBM,QAAUN,KAAKI,SAASG,cAOrCC,eAC0BC,IAAlBT,KAAKI,eACAA,SAASM,aAStBC,aAAaC,sDACJR,mDAAUO,aAAaC,OAUhCC,UAAUC,eACDb,SAASc,SAAS,SAAU,CAACD,SAASf,KAAK,GAQpDiB,QAAQF,eACCb,SAASc,SAAS,SAAU,CAACD,SAASf,KAAK,GAQpDkB,0BACqBjB,KAAKC,SAASiB,cACfC,gBAAgBnB,KAAKC,SAASmB,MAAOpB,KAAKD,IAS9DsB,iBAAiBP,aACU,QAAnBA,MAAAA,gBAAAA,SAAUQ,aACH,MAGuB,KAA9BR,MAAAA,gBAAAA,SAAUS,iBAA0B,OAC9BC,SAAWxB,KAAKC,SAASwB,IAAI,KAAMzB,KAAKD,IACxC2B,UAAY1B,KAAKC,SAASwB,IAAI,UAAWD,SAASG,cAC3B,QAAzBD,MAAAA,iBAAAA,UAAWE,kBACJ,SAGR,EAQXC,aAAaf,UAGLA,SAASgB,UAAY9B,KAAKD,IAAMe,SAASf,IAAMC,KAAKD,SAC/CgC,QAAQC,UAAUC,IAAIjC,KAAKM,QAAQ4B,QAOhDC,oBACSJ,QAAQC,UAAUI,OAAOpC,KAAKM,QAAQ4B,QAS/CG,KAAKvB,SAAUwB,UAEPxB,SAASf,IAAMC,KAAKD,IAAMe,SAASgB,UAAY9B,KAAKD,GAAI,OAClDwC,SAAYD,MAAME,OAAU,cAAgB,cAC7CvC,SAASc,SAASwB,SAAU,CAACzB,SAASf,IAAK,KAAMC,KAAKD"}
\ No newline at end of file
+{"version":3,"file":"dndcmitem.min.js","sources":["../../../src/local/courseeditor/dndcmitem.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Course index cm component.\n *\n * This component is used to control specific course modules interactions like drag and drop\n * in both course index and course content.\n *\n * @module     core_courseformat/local/courseeditor/dndcmitem\n * @class      core_courseformat/local/courseeditor/dndcmitem\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport {BaseComponent, DragDrop} from 'core/reactive';\n\nexport default class extends BaseComponent {\n\n    /**\n     * Configure the component drag and drop.\n     *\n     * @param {number} cmid course module id\n     */\n    configDragDrop(cmid) {\n\n        this.id = cmid;\n\n        // Drag and drop is only available for components compatible course formats.\n        if (this.reactive.isEditing && this.reactive.supportComponents) {\n            // Init element drag and drop.\n            this.dragdrop = new DragDrop(this);\n            // Save dropzone classes.\n            this.classes = this.dragdrop.getClasses();\n        }\n    }\n\n    /**\n     * Remove all subcomponents dependencies.\n     */\n    destroy() {\n        if (this.dragdrop !== undefined) {\n            this.dragdrop.unregister();\n        }\n    }\n\n    /**\n     * Enable or disable the draggable property.\n     *\n     * @param {bool} value the new draggable value\n     */\n    setDraggable(value) {\n        this.dragdrop?.setDraggable(value);\n    }\n\n    // Drag and drop methods.\n\n    /**\n     * The element drop start hook.\n     *\n     * @param {Object} dropdata the dropdata\n     */\n    dragStart(dropdata) {\n        this.reactive.dispatch('cmDrag', [dropdata.id], true);\n    }\n\n    /**\n     * The element drop end hook.\n     *\n     * @param {Object} dropdata the dropdata\n     */\n    dragEnd(dropdata) {\n        this.reactive.dispatch('cmDrag', [dropdata.id], false);\n    }\n\n    /**\n     * Get the draggable data of this component.\n     *\n     * @returns {Object} exported course module drop data\n     */\n    getDraggableData() {\n        const exporter = this.reactive.getExporter();\n        return exporter.cmDraggableData(this.reactive.state, this.id);\n    }\n\n    /**\n     * Validate if the drop data can be dropped over the component.\n     *\n     * @param {Object} dropdata the exported drop data.\n     * @returns {boolean}\n     */\n    validateDropData(dropdata) {\n        if (dropdata?.type !== 'cm') {\n            return false;\n        }\n        // Prevent delegated sections loops.\n        if (dropdata?.hasdelegatedsection === true) {\n            const mycminfo = this.reactive.get('cm', this.id);\n            const mysection = this.reactive.get('section', mycminfo.sectionid);\n            if (mysection?.component !== null) {\n                return false;\n            }\n        }\n        return true;\n    }\n\n    /**\n     * Display the component dropzone.\n     *\n     * @param {Object} dropdata the accepted drop data\n     */\n    showDropZone(dropdata) {\n        // If we are the next cmid of the dragged element we accept the drop because otherwise it\n        // will get captured by the section. However, we won't trigger any mutation.\n        if (dropdata.nextcmid != this.id && dropdata.id != this.id) {\n            this.element.classList.add(this.classes.DROPUP);\n        }\n    }\n\n    /**\n     * Hide the component dropzone.\n     */\n    hideDropZone() {\n        this.element.classList.remove(this.classes.DROPUP);\n    }\n\n    /**\n     * Drop event handler.\n     *\n     * @param {Object} dropdata the accepted drop data\n     * @param {Event} event the drop event\n     */\n    drop(dropdata, event) {\n        // Call the move mutation if necessary.\n        if (dropdata.id != this.id && dropdata.nextcmid != this.id) {\n            const mutation = (event.altKey) ? 'cmDuplicate' : 'cmMove';\n            this.reactive.dispatch(mutation, [dropdata.id], null, this.id);\n        }\n    }\n\n}\n"],"names":["BaseComponent","configDragDrop","cmid","id","this","reactive","isEditing","supportComponents","dragdrop","DragDrop","classes","getClasses","destroy","undefined","unregister","setDraggable","value","dragStart","dropdata","dispatch","dragEnd","getDraggableData","getExporter","cmDraggableData","state","validateDropData","type","hasdelegatedsection","mycminfo","get","mysection","sectionid","component","showDropZone","nextcmid","element","classList","add","DROPUP","hideDropZone","remove","drop","event","mutation","altKey"],"mappings":";;;;;;;;;;;;uBA6B6BA,wBAOzBC,eAAeC,WAENC,GAAKD,KAGNE,KAAKC,SAASC,WAAaF,KAAKC,SAASE,yBAEpCC,SAAW,IAAIC,mBAASL,WAExBM,QAAUN,KAAKI,SAASG,cAOrCC,eAC0BC,IAAlBT,KAAKI,eACAA,SAASM,aAStBC,aAAaC,sDACJR,mDAAUO,aAAaC,OAUhCC,UAAUC,eACDb,SAASc,SAAS,SAAU,CAACD,SAASf,KAAK,GAQpDiB,QAAQF,eACCb,SAASc,SAAS,SAAU,CAACD,SAASf,KAAK,GAQpDkB,0BACqBjB,KAAKC,SAASiB,cACfC,gBAAgBnB,KAAKC,SAASmB,MAAOpB,KAAKD,IAS9DsB,iBAAiBP,aACU,QAAnBA,MAAAA,gBAAAA,SAAUQ,aACH,MAG2B,KAAlCR,MAAAA,gBAAAA,SAAUS,qBAA8B,OAClCC,SAAWxB,KAAKC,SAASwB,IAAI,KAAMzB,KAAKD,IACxC2B,UAAY1B,KAAKC,SAASwB,IAAI,UAAWD,SAASG,cAC3B,QAAzBD,MAAAA,iBAAAA,UAAWE,kBACJ,SAGR,EAQXC,aAAaf,UAGLA,SAASgB,UAAY9B,KAAKD,IAAMe,SAASf,IAAMC,KAAKD,SAC/CgC,QAAQC,UAAUC,IAAIjC,KAAKM,QAAQ4B,QAOhDC,oBACSJ,QAAQC,UAAUI,OAAOpC,KAAKM,QAAQ4B,QAS/CG,KAAKvB,SAAUwB,UAEPxB,SAASf,IAAMC,KAAKD,IAAMe,SAASgB,UAAY9B,KAAKD,GAAI,OAClDwC,SAAYD,MAAME,OAAU,cAAgB,cAC7CvC,SAASc,SAASwB,SAAU,CAACzB,SAASf,IAAK,KAAMC,KAAKD"}
\ No newline at end of file
diff --git a/course/format/amd/build/local/courseeditor/dndsection.min.js b/course/format/amd/build/local/courseeditor/dndsection.min.js
index 9ef3fc438a101..928f50c95d4b3 100644
--- a/course/format/amd/build/local/courseeditor/dndsection.min.js
+++ b/course/format/amd/build/local/courseeditor/dndsection.min.js
@@ -9,6 +9,6 @@ define("core_courseformat/local/courseeditor/dndsection",["exports","core/reacti
    * @class      core_courseformat/local/courseeditor/dndsection
    * @copyright  2021 Ferran Recio <ferran@moodle.com>
    * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
-   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,_templates=(obj=_templates)&&obj.__esModule?obj:{default:obj},(0,_prefetch.prefetchStrings)("core",["addfilehere"]);class _default extends _reactive.BaseComponent{configState(state){this.id=this.element.dataset.id,this.section=state.section.get(this.id),this.course=state.course}configDragDrop(sectionitem){this.reactive.isEditing&&this.reactive.supportComponents&&(this.sectionitem=sectionitem,this.dragdrop=new _reactive.DragDrop(this),this.classes=this.dragdrop.getClasses())}destroy(){void 0!==this.sectionitem&&this.sectionitem.unregister(),void 0!==this.dragdrop&&this.dragdrop.unregister()}getLastCm(){return null}dragStart(dropdata){this.reactive.dispatch("sectionDrag",[dropdata.id],!0)}dragEnd(dropdata){this.reactive.dispatch("sectionDrag",[dropdata.id],!1)}validateDropData(dropdata){return"files"===(null==dropdata?void 0:dropdata.type)||("cm"===(null==dropdata?void 0:dropdata.type)?null===(_this$section=this.section)||void 0===_this$section||!_this$section.component||!0!==(null==dropdata?void 0:dropdata.delegatesection):"section"===(null==dropdata?void 0:dropdata.type)&&((null==dropdata?void 0:dropdata.id)!=this.id&&(null==dropdata?void 0:dropdata.number)!=this.section.number+1));var _this$section}showDropZone(dropdata){var _this$getLastCm;("files"==dropdata.type&&this.addOverlay({content:(0,_str.getString)("addfilehere","core"),icon:_templates.default.renderPix("t/download","core")}).then((()=>{var _this$dragdrop;null!==(_this$dragdrop=this.dragdrop)&&void 0!==_this$dragdrop&&_this$dragdrop.isDropzoneVisible()||this.removeOverlay()})).catch((error=>{throw error})),"cm"==dropdata.type)&&(null===(_this$getLastCm=this.getLastCm())||void 0===_this$getLastCm||_this$getLastCm.classList.add(this.classes.DROPDOWN));"section"==dropdata.type&&(this.element.classList.remove(this.classes.DROPUP),this.element.classList.add(this.classes.DROPDOWN))}hideDropZone(){var _this$getLastCm2;null===(_this$getLastCm2=this.getLastCm())||void 0===_this$getLastCm2||_this$getLastCm2.classList.remove(this.classes.DROPDOWN),this.element.classList.remove(this.classes.DROPUP),this.element.classList.remove(this.classes.DROPDOWN),this.removeOverlay()}drop(dropdata,event){if("files"!=dropdata.type){if("cm"==dropdata.type){const mutation=event.altKey?"cmDuplicate":"cmMove";this.reactive.dispatch(mutation,[dropdata.id],this.id)}"section"==dropdata.type&&this.reactive.dispatch("sectionMoveAfter",[dropdata.id],this.id)}else this.reactive.uploadFiles(this.section.id,this.section.number,dropdata.files)}}return _exports.default=_default,_exports.default}));
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,_templates=(obj=_templates)&&obj.__esModule?obj:{default:obj},(0,_prefetch.prefetchStrings)("core",["addfilehere"]);class _default extends _reactive.BaseComponent{configState(state){this.id=this.element.dataset.id,this.section=state.section.get(this.id),this.course=state.course}configDragDrop(sectionitem){this.reactive.isEditing&&this.reactive.supportComponents&&(this.sectionitem=sectionitem,this.dragdrop=new _reactive.DragDrop(this),this.classes=this.dragdrop.getClasses())}destroy(){void 0!==this.sectionitem&&this.sectionitem.unregister(),void 0!==this.dragdrop&&this.dragdrop.unregister()}getLastCm(){return null}dragStart(dropdata){this.reactive.dispatch("sectionDrag",[dropdata.id],!0)}dragEnd(dropdata){this.reactive.dispatch("sectionDrag",[dropdata.id],!1)}validateDropData(dropdata){return"files"===(null==dropdata?void 0:dropdata.type)||("cm"===(null==dropdata?void 0:dropdata.type)?null===(_this$section=this.section)||void 0===_this$section||!_this$section.component||!0!==(null==dropdata?void 0:dropdata.hasdelegatedsection):"section"===(null==dropdata?void 0:dropdata.type)&&(null===this.section.component&&((null==dropdata?void 0:dropdata.id)!=this.id&&(null==dropdata?void 0:dropdata.number)!=this.section.number+1)));var _this$section}showDropZone(dropdata){var _this$getLastCm;("files"==dropdata.type&&this.addOverlay({content:(0,_str.getString)("addfilehere","core"),icon:_templates.default.renderPix("t/download","core")}).then((()=>{var _this$dragdrop;null!==(_this$dragdrop=this.dragdrop)&&void 0!==_this$dragdrop&&_this$dragdrop.isDropzoneVisible()||this.removeOverlay()})).catch((error=>{throw error})),"cm"==dropdata.type)&&(null===(_this$getLastCm=this.getLastCm())||void 0===_this$getLastCm||_this$getLastCm.classList.add(this.classes.DROPDOWN));"section"==dropdata.type&&(this.element.classList.remove(this.classes.DROPUP),this.element.classList.add(this.classes.DROPDOWN))}hideDropZone(){var _this$getLastCm2;null===(_this$getLastCm2=this.getLastCm())||void 0===_this$getLastCm2||_this$getLastCm2.classList.remove(this.classes.DROPDOWN),this.element.classList.remove(this.classes.DROPUP),this.element.classList.remove(this.classes.DROPDOWN),this.removeOverlay()}drop(dropdata,event){if("files"!=dropdata.type){if("cm"==dropdata.type){const mutation=event.altKey?"cmDuplicate":"cmMove";this.reactive.dispatch(mutation,[dropdata.id],this.id)}"section"==dropdata.type&&this.reactive.dispatch("sectionMoveAfter",[dropdata.id],this.id)}else this.reactive.uploadFiles(this.section.id,this.section.number,dropdata.files)}}return _exports.default=_default,_exports.default}));
 
 //# sourceMappingURL=dndsection.min.js.map
\ No newline at end of file
diff --git a/course/format/amd/build/local/courseeditor/dndsection.min.js.map b/course/format/amd/build/local/courseeditor/dndsection.min.js.map
index 74e90ffdb8282..7bbd1de85ee47 100644
--- a/course/format/amd/build/local/courseeditor/dndsection.min.js.map
+++ b/course/format/amd/build/local/courseeditor/dndsection.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"dndsection.min.js","sources":["../../../src/local/courseeditor/dndsection.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Course index section component.\n *\n * This component is used to control specific course section interactions like drag and drop\n * in both course index and course content.\n *\n * @module     core_courseformat/local/courseeditor/dndsection\n * @class      core_courseformat/local/courseeditor/dndsection\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport {BaseComponent, DragDrop} from 'core/reactive';\nimport {getString} from 'core/str';\nimport {prefetchStrings} from 'core/prefetch';\nimport Templates from 'core/templates';\n\n// Load global strings.\nprefetchStrings('core', ['addfilehere']);\n\nexport default class extends BaseComponent {\n\n    /**\n     * Save some values form the state.\n     *\n     * @param {Object} state the current state\n     */\n    configState(state) {\n        this.id = this.element.dataset.id;\n        this.section = state.section.get(this.id);\n        this.course = state.course;\n    }\n\n    /**\n     * Register state values and the drag and drop subcomponent.\n     *\n     * @param {BaseComponent} sectionitem section item component\n     */\n    configDragDrop(sectionitem) {\n        // Drag and drop is only available for components compatible course formats.\n        if (this.reactive.isEditing && this.reactive.supportComponents) {\n            // Init the inner dragable element.\n            this.sectionitem = sectionitem;\n            // Init the dropzone.\n            this.dragdrop = new DragDrop(this);\n            // Save dropzone classes.\n            this.classes = this.dragdrop.getClasses();\n        }\n    }\n\n    /**\n     * Remove all subcomponents dependencies.\n     */\n    destroy() {\n        if (this.sectionitem !== undefined) {\n            this.sectionitem.unregister();\n        }\n        if (this.dragdrop !== undefined) {\n            this.dragdrop.unregister();\n        }\n    }\n\n    /**\n     * Get the last CM element of that section.\n     *\n     * @returns {element|null} the las course module element of the section.\n     */\n    getLastCm() {\n        return null;\n    }\n\n    // Drag and drop methods.\n\n    /**\n     * The element drop start hook.\n     *\n     * @param {Object} dropdata the dropdata\n     */\n    dragStart(dropdata) {\n        this.reactive.dispatch('sectionDrag', [dropdata.id], true);\n    }\n\n    /**\n     * The element drop end hook.\n     *\n     * @param {Object} dropdata the dropdata\n     */\n    dragEnd(dropdata) {\n        this.reactive.dispatch('sectionDrag', [dropdata.id], false);\n    }\n\n    /**\n     * Validate if the drop data can be dropped over the component.\n     *\n     * @param {Object} dropdata the exported drop data.\n     * @returns {boolean}\n     */\n    validateDropData(dropdata) {\n        // We accept files.\n        if (dropdata?.type === 'files') {\n            return true;\n        }\n        // We accept any course module unless it can form a subsection loop.\n        if (dropdata?.type === 'cm') {\n            if (this.section?.component && dropdata?.delegatesection === true) {\n                return false;\n            }\n            return true;\n        }\n        // We accept any section but yourself and the next one.\n        if (dropdata?.type === 'section') {\n            return dropdata?.id != this.id && dropdata?.number != this.section.number + 1;\n        }\n        return false;\n    }\n\n    /**\n     * Display the component dropzone.\n     *\n     * @param {Object} dropdata the accepted drop data\n     */\n    showDropZone(dropdata) {\n        if (dropdata.type == 'files') {\n            this.addOverlay({\n                content: getString('addfilehere', 'core'),\n                icon: Templates.renderPix('t/download', 'core'),\n            }).then(() => {\n                // Check if we still need the file dropzone.\n                if (!this.dragdrop?.isDropzoneVisible()) {\n                    this.removeOverlay();\n                }\n                return;\n            }).catch((error) => {\n                throw error;\n            });\n        }\n        if (dropdata.type == 'cm') {\n            this.getLastCm()?.classList.add(this.classes.DROPDOWN);\n        }\n        if (dropdata.type == 'section') {\n            this.element.classList.remove(this.classes.DROPUP);\n            this.element.classList.add(this.classes.DROPDOWN);\n        }\n    }\n\n    /**\n     * Hide the component dropzone.\n     */\n    hideDropZone() {\n        this.getLastCm()?.classList.remove(this.classes.DROPDOWN);\n        this.element.classList.remove(this.classes.DROPUP);\n        this.element.classList.remove(this.classes.DROPDOWN);\n        this.removeOverlay();\n    }\n\n    /**\n     * Drop event handler.\n     *\n     * @param {Object} dropdata the accepted drop data\n     * @param {Event} event the drop event\n     */\n    drop(dropdata, event) {\n        // File handling.\n        if (dropdata.type == 'files') {\n            this.reactive.uploadFiles(\n                this.section.id,\n                this.section.number,\n                dropdata.files\n            );\n            return;\n        }\n        // Call the move mutation.\n        if (dropdata.type == 'cm') {\n            const mutation = (event.altKey) ? 'cmDuplicate' : 'cmMove';\n            this.reactive.dispatch(mutation, [dropdata.id], this.id);\n        }\n        if (dropdata.type == 'section') {\n            this.reactive.dispatch('sectionMoveAfter', [dropdata.id], this.id);\n        }\n    }\n}\n"],"names":["BaseComponent","configState","state","id","this","element","dataset","section","get","course","configDragDrop","sectionitem","reactive","isEditing","supportComponents","dragdrop","DragDrop","classes","getClasses","destroy","undefined","unregister","getLastCm","dragStart","dropdata","dispatch","dragEnd","validateDropData","type","component","delegatesection","number","showDropZone","addOverlay","content","icon","Templates","renderPix","then","_this$dragdrop","isDropzoneVisible","removeOverlay","catch","error","classList","add","DROPDOWN","remove","DROPUP","hideDropZone","drop","event","mutation","altKey","uploadFiles","files"],"mappings":";;;;;;;;;;;iLAiCgB,OAAQ,CAAC,uCAEIA,wBAOzBC,YAAYC,YACHC,GAAKC,KAAKC,QAAQC,QAAQH,QAC1BI,QAAUL,MAAMK,QAAQC,IAAIJ,KAAKD,SACjCM,OAASP,MAAMO,OAQxBC,eAAeC,aAEPP,KAAKQ,SAASC,WAAaT,KAAKQ,SAASE,yBAEpCH,YAAcA,iBAEdI,SAAW,IAAIC,mBAASZ,WAExBa,QAAUb,KAAKW,SAASG,cAOrCC,eAC6BC,IAArBhB,KAAKO,kBACAA,YAAYU,kBAECD,IAAlBhB,KAAKW,eACAA,SAASM,aAStBC,mBACW,KAUXC,UAAUC,eACDZ,SAASa,SAAS,cAAe,CAACD,SAASrB,KAAK,GAQzDuB,QAAQF,eACCZ,SAASa,SAAS,cAAe,CAACD,SAASrB,KAAK,GASzDwB,iBAAiBH,gBAEU,WAAnBA,MAAAA,gBAAAA,SAAUI,QAIS,QAAnBJ,MAAAA,gBAAAA,SAAUI,iCACDrB,iDAASsB,YAA2C,KAA9BL,MAAAA,gBAAAA,SAAUM,iBAMtB,aAAnBN,MAAAA,gBAAAA,SAAUI,SACHJ,MAAAA,gBAAAA,SAAUrB,KAAMC,KAAKD,KAAMqB,MAAAA,gBAAAA,SAAUO,SAAU3B,KAAKG,QAAQwB,OAAS,sBAUpFC,aAAaR,+BACY,SAAjBA,SAASI,WACJK,WAAW,CACZC,SAAS,kBAAU,cAAe,QAClCC,KAAMC,mBAAUC,UAAU,aAAc,UACzCC,MAAK,+CAEClC,KAAKW,oCAALwB,eAAeC,0BACXC,mBAGVC,OAAOC,cACAA,SAGO,MAAjBnB,SAASI,qCACJN,wDAAasB,UAAUC,IAAIzC,KAAKa,QAAQ6B,WAE5B,WAAjBtB,SAASI,YACJvB,QAAQuC,UAAUG,OAAO3C,KAAKa,QAAQ+B,aACtC3C,QAAQuC,UAAUC,IAAIzC,KAAKa,QAAQ6B,WAOhDG,kEACS3B,0DAAasB,UAAUG,OAAO3C,KAAKa,QAAQ6B,eAC3CzC,QAAQuC,UAAUG,OAAO3C,KAAKa,QAAQ+B,aACtC3C,QAAQuC,UAAUG,OAAO3C,KAAKa,QAAQ6B,eACtCL,gBASTS,KAAK1B,SAAU2B,UAEU,SAAjB3B,SAASI,SASQ,MAAjBJ,SAASI,KAAc,OACjBwB,SAAYD,MAAME,OAAU,cAAgB,cAC7CzC,SAASa,SAAS2B,SAAU,CAAC5B,SAASrB,IAAKC,KAAKD,IAEpC,WAAjBqB,SAASI,WACJhB,SAASa,SAAS,mBAAoB,CAACD,SAASrB,IAAKC,KAAKD,cAb1DS,SAAS0C,YACVlD,KAAKG,QAAQJ,GACbC,KAAKG,QAAQwB,OACbP,SAAS+B"}
\ No newline at end of file
+{"version":3,"file":"dndsection.min.js","sources":["../../../src/local/courseeditor/dndsection.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Course index section component.\n *\n * This component is used to control specific course section interactions like drag and drop\n * in both course index and course content.\n *\n * @module     core_courseformat/local/courseeditor/dndsection\n * @class      core_courseformat/local/courseeditor/dndsection\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport {BaseComponent, DragDrop} from 'core/reactive';\nimport {getString} from 'core/str';\nimport {prefetchStrings} from 'core/prefetch';\nimport Templates from 'core/templates';\n\n// Load global strings.\nprefetchStrings('core', ['addfilehere']);\n\nexport default class extends BaseComponent {\n\n    /**\n     * Save some values form the state.\n     *\n     * @param {Object} state the current state\n     */\n    configState(state) {\n        this.id = this.element.dataset.id;\n        this.section = state.section.get(this.id);\n        this.course = state.course;\n    }\n\n    /**\n     * Register state values and the drag and drop subcomponent.\n     *\n     * @param {BaseComponent} sectionitem section item component\n     */\n    configDragDrop(sectionitem) {\n        // Drag and drop is only available for components compatible course formats.\n        if (this.reactive.isEditing && this.reactive.supportComponents) {\n            // Init the inner dragable element.\n            this.sectionitem = sectionitem;\n            // Init the dropzone.\n            this.dragdrop = new DragDrop(this);\n            // Save dropzone classes.\n            this.classes = this.dragdrop.getClasses();\n        }\n    }\n\n    /**\n     * Remove all subcomponents dependencies.\n     */\n    destroy() {\n        if (this.sectionitem !== undefined) {\n            this.sectionitem.unregister();\n        }\n        if (this.dragdrop !== undefined) {\n            this.dragdrop.unregister();\n        }\n    }\n\n    /**\n     * Get the last CM element of that section.\n     *\n     * @returns {element|null} the las course module element of the section.\n     */\n    getLastCm() {\n        return null;\n    }\n\n    // Drag and drop methods.\n\n    /**\n     * The element drop start hook.\n     *\n     * @param {Object} dropdata the dropdata\n     */\n    dragStart(dropdata) {\n        this.reactive.dispatch('sectionDrag', [dropdata.id], true);\n    }\n\n    /**\n     * The element drop end hook.\n     *\n     * @param {Object} dropdata the dropdata\n     */\n    dragEnd(dropdata) {\n        this.reactive.dispatch('sectionDrag', [dropdata.id], false);\n    }\n\n    /**\n     * Validate if the drop data can be dropped over the component.\n     *\n     * @param {Object} dropdata the exported drop data.\n     * @returns {boolean}\n     */\n    validateDropData(dropdata) {\n        // We accept files.\n        if (dropdata?.type === 'files') {\n            return true;\n        }\n        // We accept any course module unless it can form a subsection loop.\n        if (dropdata?.type === 'cm') {\n            if (this.section?.component && dropdata?.hasdelegatedsection === true) {\n                return false;\n            }\n            return true;\n        }\n        if (dropdata?.type === 'section') {\n            // Sections controlled by a plugin cannot accept sections.\n            if (this.section.component !== null) {\n                return false;\n            }\n            // We accept any section but yourself and the next one.\n            return dropdata?.id != this.id && dropdata?.number != this.section.number + 1;\n        }\n        return false;\n    }\n\n    /**\n     * Display the component dropzone.\n     *\n     * @param {Object} dropdata the accepted drop data\n     */\n    showDropZone(dropdata) {\n        if (dropdata.type == 'files') {\n            this.addOverlay({\n                content: getString('addfilehere', 'core'),\n                icon: Templates.renderPix('t/download', 'core'),\n            }).then(() => {\n                // Check if we still need the file dropzone.\n                if (!this.dragdrop?.isDropzoneVisible()) {\n                    this.removeOverlay();\n                }\n                return;\n            }).catch((error) => {\n                throw error;\n            });\n        }\n        if (dropdata.type == 'cm') {\n            this.getLastCm()?.classList.add(this.classes.DROPDOWN);\n        }\n        if (dropdata.type == 'section') {\n            this.element.classList.remove(this.classes.DROPUP);\n            this.element.classList.add(this.classes.DROPDOWN);\n        }\n    }\n\n    /**\n     * Hide the component dropzone.\n     */\n    hideDropZone() {\n        this.getLastCm()?.classList.remove(this.classes.DROPDOWN);\n        this.element.classList.remove(this.classes.DROPUP);\n        this.element.classList.remove(this.classes.DROPDOWN);\n        this.removeOverlay();\n    }\n\n    /**\n     * Drop event handler.\n     *\n     * @param {Object} dropdata the accepted drop data\n     * @param {Event} event the drop event\n     */\n    drop(dropdata, event) {\n        // File handling.\n        if (dropdata.type == 'files') {\n            this.reactive.uploadFiles(\n                this.section.id,\n                this.section.number,\n                dropdata.files\n            );\n            return;\n        }\n        // Call the move mutation.\n        if (dropdata.type == 'cm') {\n            const mutation = (event.altKey) ? 'cmDuplicate' : 'cmMove';\n            this.reactive.dispatch(mutation, [dropdata.id], this.id);\n        }\n        if (dropdata.type == 'section') {\n            this.reactive.dispatch('sectionMoveAfter', [dropdata.id], this.id);\n        }\n    }\n}\n"],"names":["BaseComponent","configState","state","id","this","element","dataset","section","get","course","configDragDrop","sectionitem","reactive","isEditing","supportComponents","dragdrop","DragDrop","classes","getClasses","destroy","undefined","unregister","getLastCm","dragStart","dropdata","dispatch","dragEnd","validateDropData","type","component","hasdelegatedsection","number","showDropZone","addOverlay","content","icon","Templates","renderPix","then","_this$dragdrop","isDropzoneVisible","removeOverlay","catch","error","classList","add","DROPDOWN","remove","DROPUP","hideDropZone","drop","event","mutation","altKey","uploadFiles","files"],"mappings":";;;;;;;;;;;iLAiCgB,OAAQ,CAAC,uCAEIA,wBAOzBC,YAAYC,YACHC,GAAKC,KAAKC,QAAQC,QAAQH,QAC1BI,QAAUL,MAAMK,QAAQC,IAAIJ,KAAKD,SACjCM,OAASP,MAAMO,OAQxBC,eAAeC,aAEPP,KAAKQ,SAASC,WAAaT,KAAKQ,SAASE,yBAEpCH,YAAcA,iBAEdI,SAAW,IAAIC,mBAASZ,WAExBa,QAAUb,KAAKW,SAASG,cAOrCC,eAC6BC,IAArBhB,KAAKO,kBACAA,YAAYU,kBAECD,IAAlBhB,KAAKW,eACAA,SAASM,aAStBC,mBACW,KAUXC,UAAUC,eACDZ,SAASa,SAAS,cAAe,CAACD,SAASrB,KAAK,GAQzDuB,QAAQF,eACCZ,SAASa,SAAS,cAAe,CAACD,SAASrB,KAAK,GASzDwB,iBAAiBH,gBAEU,WAAnBA,MAAAA,gBAAAA,SAAUI,QAIS,QAAnBJ,MAAAA,gBAAAA,SAAUI,iCACDrB,iDAASsB,YAA+C,KAAlCL,MAAAA,gBAAAA,SAAUM,qBAKtB,aAAnBN,MAAAA,gBAAAA,SAAUI,QAEqB,OAA3BxB,KAAKG,QAAQsB,aAIVL,MAAAA,gBAAAA,SAAUrB,KAAMC,KAAKD,KAAMqB,MAAAA,gBAAAA,SAAUO,SAAU3B,KAAKG,QAAQwB,OAAS,uBAUpFC,aAAaR,+BACY,SAAjBA,SAASI,WACJK,WAAW,CACZC,SAAS,kBAAU,cAAe,QAClCC,KAAMC,mBAAUC,UAAU,aAAc,UACzCC,MAAK,+CAEClC,KAAKW,oCAALwB,eAAeC,0BACXC,mBAGVC,OAAOC,cACAA,SAGO,MAAjBnB,SAASI,qCACJN,wDAAasB,UAAUC,IAAIzC,KAAKa,QAAQ6B,WAE5B,WAAjBtB,SAASI,YACJvB,QAAQuC,UAAUG,OAAO3C,KAAKa,QAAQ+B,aACtC3C,QAAQuC,UAAUC,IAAIzC,KAAKa,QAAQ6B,WAOhDG,kEACS3B,0DAAasB,UAAUG,OAAO3C,KAAKa,QAAQ6B,eAC3CzC,QAAQuC,UAAUG,OAAO3C,KAAKa,QAAQ+B,aACtC3C,QAAQuC,UAAUG,OAAO3C,KAAKa,QAAQ6B,eACtCL,gBASTS,KAAK1B,SAAU2B,UAEU,SAAjB3B,SAASI,SASQ,MAAjBJ,SAASI,KAAc,OACjBwB,SAAYD,MAAME,OAAU,cAAgB,cAC7CzC,SAASa,SAAS2B,SAAU,CAAC5B,SAASrB,IAAKC,KAAKD,IAEpC,WAAjBqB,SAASI,WACJhB,SAASa,SAAS,mBAAoB,CAACD,SAASrB,IAAKC,KAAKD,cAb1DS,SAAS0C,YACVlD,KAAKG,QAAQJ,GACbC,KAAKG,QAAQwB,OACbP,SAAS+B"}
\ No newline at end of file
diff --git a/course/format/amd/build/local/courseeditor/dndsectionitem.min.js b/course/format/amd/build/local/courseeditor/dndsectionitem.min.js
index 9d1f2cae8b8b3..faeb137ff7c0e 100644
--- a/course/format/amd/build/local/courseeditor/dndsectionitem.min.js
+++ b/course/format/amd/build/local/courseeditor/dndsectionitem.min.js
@@ -10,6 +10,6 @@ define("core_courseformat/local/courseeditor/dndsectionitem",["exports","core/re
    * @copyright  2021 Ferran Recio <ferran@moodle.com>
    * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
    */
-class _default extends _reactive.BaseComponent{configDragDrop(sectionid,state,fullregion){this.id=sectionid,void 0===this.section&&(this.section=state.section.get(this.id)),void 0===this.course&&(this.course=state.course),this.section.number>0&&(this.getDraggableData=this._getDraggableData),this.fullregion=fullregion,this.reactive.isEditing&&this.reactive.supportComponents&&(this.dragdrop=new _reactive.DragDrop(this),this.classes=this.dragdrop.getClasses())}destroy(){void 0!==this.dragdrop&&this.dragdrop.unregister()}setDraggable(value){var _this$dragdrop;this.getDraggableData&&(null===(_this$dragdrop=this.dragdrop)||void 0===_this$dragdrop||_this$dragdrop.setDraggable(value))}dragStart(dropdata){this.reactive.dispatch("sectionDrag",[dropdata.id],!0)}dragEnd(dropdata){this.reactive.dispatch("sectionDrag",[dropdata.id],!1)}_getDraggableData(){return this.reactive.getExporter().sectionDraggableData(this.reactive.state,this.id)}validateDropData(dropdata){if("cm"===(null==dropdata?void 0:dropdata.type)){var _this$section,_this$section2;if(null!==(_this$section=this.section)&&void 0!==_this$section&&_this$section.component&&!0===(null==dropdata?void 0:dropdata.delegatesection))return!1;const firstcmid=null===(_this$section2=this.section)||void 0===_this$section2?void 0:_this$section2.cmlist[0];return dropdata.id!==firstcmid}return!1}showDropZone(){this.element.classList.add(this.classes.DROPZONE)}hideDropZone(){this.element.classList.remove(this.classes.DROPZONE)}drop(dropdata,event){if("cm"==dropdata.type){var _this$section3;const mutation=event.altKey?"cmDuplicate":"cmMove";this.reactive.dispatch(mutation,[dropdata.id],this.id,null===(_this$section3=this.section)||void 0===_this$section3?void 0:_this$section3.cmlist[0])}}}return _exports.default=_default,_exports.default}));
+class _default extends _reactive.BaseComponent{configDragDrop(sectionid,state,fullregion){this.id=sectionid,void 0===this.section&&(this.section=state.section.get(this.id)),void 0===this.course&&(this.course=state.course),this.section.number>0&&null===this.section.component&&(this.getDraggableData=this._getDraggableData),this.fullregion=fullregion,this.reactive.isEditing&&this.reactive.supportComponents&&(this.dragdrop=new _reactive.DragDrop(this),this.classes=this.dragdrop.getClasses())}destroy(){void 0!==this.dragdrop&&this.dragdrop.unregister()}setDraggable(value){var _this$dragdrop;this.getDraggableData&&(null===(_this$dragdrop=this.dragdrop)||void 0===_this$dragdrop||_this$dragdrop.setDraggable(value))}dragStart(dropdata){this.reactive.dispatch("sectionDrag",[dropdata.id],!0)}dragEnd(dropdata){this.reactive.dispatch("sectionDrag",[dropdata.id],!1)}_getDraggableData(){return this.reactive.getExporter().sectionDraggableData(this.reactive.state,this.id)}validateDropData(dropdata){if("cm"===(null==dropdata?void 0:dropdata.type)){var _this$section,_this$section2;if(null!==(_this$section=this.section)&&void 0!==_this$section&&_this$section.component&&!0===(null==dropdata?void 0:dropdata.hasdelegatedsection))return!1;const firstcmid=null===(_this$section2=this.section)||void 0===_this$section2?void 0:_this$section2.cmlist[0];return dropdata.id!==firstcmid}return!1}showDropZone(){this.element.classList.add(this.classes.DROPZONE)}hideDropZone(){this.element.classList.remove(this.classes.DROPZONE)}drop(dropdata,event){if("cm"==dropdata.type){var _this$section3;const mutation=event.altKey?"cmDuplicate":"cmMove";this.reactive.dispatch(mutation,[dropdata.id],this.id,null===(_this$section3=this.section)||void 0===_this$section3?void 0:_this$section3.cmlist[0])}}}return _exports.default=_default,_exports.default}));
 
 //# sourceMappingURL=dndsectionitem.min.js.map
\ No newline at end of file
diff --git a/course/format/amd/build/local/courseeditor/dndsectionitem.min.js.map b/course/format/amd/build/local/courseeditor/dndsectionitem.min.js.map
index c00ab6e7be108..c1fbdb07d9238 100644
--- a/course/format/amd/build/local/courseeditor/dndsectionitem.min.js.map
+++ b/course/format/amd/build/local/courseeditor/dndsectionitem.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"dndsectionitem.min.js","sources":["../../../src/local/courseeditor/dndsectionitem.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Course index section title draggable component.\n *\n * This component is used to control specific course section interactions like drag and drop\n * in both course index and course content.\n *\n * @module     core_courseformat/local/courseeditor/dndsectionitem\n * @class      core_courseformat/local/courseeditor/dndsectionitem\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport {BaseComponent, DragDrop} from 'core/reactive';\n\nexport default class extends BaseComponent {\n\n    /**\n     * Initial state ready method.\n     *\n     * @param {number} sectionid the section id\n     * @param {Object} state the initial state\n     * @param {Element} fullregion the complete section region to mark as dragged\n     */\n    configDragDrop(sectionid, state, fullregion) {\n\n        this.id = sectionid;\n        if (this.section === undefined) {\n            this.section = state.section.get(this.id);\n        }\n        if (this.course === undefined) {\n            this.course = state.course;\n        }\n\n        // Prevent topic zero from being draggable.\n        if (this.section.number > 0) {\n            this.getDraggableData = this._getDraggableData;\n        }\n\n        this.fullregion = fullregion;\n\n        // Drag and drop is only available for components compatible course formats.\n        if (this.reactive.isEditing && this.reactive.supportComponents) {\n            // Init the dropzone.\n            this.dragdrop = new DragDrop(this);\n            // Save dropzone classes.\n            this.classes = this.dragdrop.getClasses();\n        }\n    }\n\n    /**\n     * Remove all subcomponents dependencies.\n     */\n    destroy() {\n        if (this.dragdrop !== undefined) {\n            this.dragdrop.unregister();\n        }\n    }\n\n    /**\n     * Enable or disable the draggable property.\n     *\n     * @param {bool} value the new draggable value\n     */\n    setDraggable(value) {\n        if (this.getDraggableData) {\n            this.dragdrop?.setDraggable(value);\n        }\n    }\n\n    // Drag and drop methods.\n\n    /**\n     * The element drop start hook.\n     *\n     * @param {Object} dropdata the dropdata\n     */\n    dragStart(dropdata) {\n        this.reactive.dispatch('sectionDrag', [dropdata.id], true);\n    }\n\n    /**\n     * The element end start hook.\n     *\n     * @param {Object} dropdata the dropdata\n     */\n    dragEnd(dropdata) {\n        this.reactive.dispatch('sectionDrag', [dropdata.id], false);\n    }\n\n    /**\n     * Get the draggable data of this component.\n     *\n     * @returns {Object} exported course module drop data\n     */\n    _getDraggableData() {\n        const exporter = this.reactive.getExporter();\n        return exporter.sectionDraggableData(this.reactive.state, this.id);\n    }\n\n    /**\n     * Validate if the drop data can be dropped over the component.\n     *\n     * @param {Object} dropdata the exported drop data.\n     * @returns {boolean}\n     */\n    validateDropData(dropdata) {\n        // Course module validation.\n        if (dropdata?.type === 'cm') {\n            // Prevent content loops with subsections.\n            if (this.section?.component && dropdata?.delegatesection === true) {\n                return false;\n            }\n            // The first section element is already there so we can ignore it.\n            const firstcmid = this.section?.cmlist[0];\n            return dropdata.id !== firstcmid;\n        }\n        return false;\n    }\n\n    /**\n     * Display the component dropzone.\n     */\n    showDropZone() {\n        this.element.classList.add(this.classes.DROPZONE);\n    }\n\n    /**\n     * Hide the component dropzone.\n     */\n    hideDropZone() {\n        this.element.classList.remove(this.classes.DROPZONE);\n    }\n\n    /**\n     * Drop event handler.\n     *\n     * @param {Object} dropdata the accepted drop data\n     * @param {Event} event the drop event\n     */\n    drop(dropdata, event) {\n        // Call the move mutation.\n        if (dropdata.type == 'cm') {\n            const mutation = (event.altKey) ? 'cmDuplicate' : 'cmMove';\n            this.reactive.dispatch(mutation, [dropdata.id], this.id, this.section?.cmlist[0]);\n        }\n    }\n}\n"],"names":["BaseComponent","configDragDrop","sectionid","state","fullregion","id","undefined","this","section","get","course","number","getDraggableData","_getDraggableData","reactive","isEditing","supportComponents","dragdrop","DragDrop","classes","getClasses","destroy","unregister","setDraggable","value","dragStart","dropdata","dispatch","dragEnd","getExporter","sectionDraggableData","validateDropData","type","component","delegatesection","firstcmid","_this$section2","cmlist","showDropZone","element","classList","add","DROPZONE","hideDropZone","remove","drop","event","mutation","altKey","_this$section3"],"mappings":";;;;;;;;;;;;uBA6B6BA,wBASzBC,eAAeC,UAAWC,MAAOC,iBAExBC,GAAKH,eACWI,IAAjBC,KAAKC,eACAA,QAAUL,MAAMK,QAAQC,IAAIF,KAAKF,UAEtBC,IAAhBC,KAAKG,cACAA,OAASP,MAAMO,QAIpBH,KAAKC,QAAQG,OAAS,SACjBC,iBAAmBL,KAAKM,wBAG5BT,WAAaA,WAGdG,KAAKO,SAASC,WAAaR,KAAKO,SAASE,yBAEpCC,SAAW,IAAIC,mBAASX,WAExBY,QAAUZ,KAAKU,SAASG,cAOrCC,eAC0Bf,IAAlBC,KAAKU,eACAA,SAASK,aAStBC,aAAaC,0BACLjB,KAAKK,+CACAK,mDAAUM,aAAaC,QAWpCC,UAAUC,eACDZ,SAASa,SAAS,cAAe,CAACD,SAASrB,KAAK,GAQzDuB,QAAQF,eACCZ,SAASa,SAAS,cAAe,CAACD,SAASrB,KAAK,GAQzDQ,2BACqBN,KAAKO,SAASe,cACfC,qBAAqBvB,KAAKO,SAASX,MAAOI,KAAKF,IASnE0B,iBAAiBL,aAEU,QAAnBA,MAAAA,gBAAAA,SAAUM,MAAe,gEAEhBxB,gDAASyB,YAA2C,KAA9BP,MAAAA,gBAAAA,SAAUQ,wBAC9B,QAGLC,iCAAY5B,KAAKC,yCAAL4B,eAAcC,OAAO,UAChCX,SAASrB,KAAO8B,iBAEpB,EAMXG,oBACSC,QAAQC,UAAUC,IAAIlC,KAAKY,QAAQuB,UAM5CC,oBACSJ,QAAQC,UAAUI,OAAOrC,KAAKY,QAAQuB,UAS/CG,KAAKnB,SAAUoB,UAEU,MAAjBpB,SAASM,KAAc,0BACjBe,SAAYD,MAAME,OAAU,cAAgB,cAC7ClC,SAASa,SAASoB,SAAU,CAACrB,SAASrB,IAAKE,KAAKF,0BAAIE,KAAKC,yCAALyC,eAAcZ,OAAO"}
\ No newline at end of file
+{"version":3,"file":"dndsectionitem.min.js","sources":["../../../src/local/courseeditor/dndsectionitem.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Course index section title draggable component.\n *\n * This component is used to control specific course section interactions like drag and drop\n * in both course index and course content.\n *\n * @module     core_courseformat/local/courseeditor/dndsectionitem\n * @class      core_courseformat/local/courseeditor/dndsectionitem\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport {BaseComponent, DragDrop} from 'core/reactive';\n\nexport default class extends BaseComponent {\n\n    /**\n     * Initial state ready method.\n     *\n     * @param {number} sectionid the section id\n     * @param {Object} state the initial state\n     * @param {Element} fullregion the complete section region to mark as dragged\n     */\n    configDragDrop(sectionid, state, fullregion) {\n\n        this.id = sectionid;\n        if (this.section === undefined) {\n            this.section = state.section.get(this.id);\n        }\n        if (this.course === undefined) {\n            this.course = state.course;\n        }\n\n        // Prevent topic zero and delegated sections from being draggable.\n        if (this.section.number > 0 && this.section.component === null) {\n            this.getDraggableData = this._getDraggableData;\n        }\n\n        this.fullregion = fullregion;\n\n        // Drag and drop is only available for components compatible course formats.\n        if (this.reactive.isEditing && this.reactive.supportComponents) {\n            // Init the dropzone.\n            this.dragdrop = new DragDrop(this);\n            // Save dropzone classes.\n            this.classes = this.dragdrop.getClasses();\n        }\n    }\n\n    /**\n     * Remove all subcomponents dependencies.\n     */\n    destroy() {\n        if (this.dragdrop !== undefined) {\n            this.dragdrop.unregister();\n        }\n    }\n\n    /**\n     * Enable or disable the draggable property.\n     *\n     * @param {bool} value the new draggable value\n     */\n    setDraggable(value) {\n        if (this.getDraggableData) {\n            this.dragdrop?.setDraggable(value);\n        }\n    }\n\n    // Drag and drop methods.\n\n    /**\n     * The element drop start hook.\n     *\n     * @param {Object} dropdata the dropdata\n     */\n    dragStart(dropdata) {\n        this.reactive.dispatch('sectionDrag', [dropdata.id], true);\n    }\n\n    /**\n     * The element end start hook.\n     *\n     * @param {Object} dropdata the dropdata\n     */\n    dragEnd(dropdata) {\n        this.reactive.dispatch('sectionDrag', [dropdata.id], false);\n    }\n\n    /**\n     * Get the draggable data of this component.\n     *\n     * @returns {Object} exported course module drop data\n     */\n    _getDraggableData() {\n        const exporter = this.reactive.getExporter();\n        return exporter.sectionDraggableData(this.reactive.state, this.id);\n    }\n\n    /**\n     * Validate if the drop data can be dropped over the component.\n     *\n     * @param {Object} dropdata the exported drop data.\n     * @returns {boolean}\n     */\n    validateDropData(dropdata) {\n        // Course module validation.\n        if (dropdata?.type === 'cm') {\n            // Prevent content loops with subsections.\n            if (this.section?.component && dropdata?.hasdelegatedsection === true) {\n                return false;\n            }\n            // The first section element is already there so we can ignore it.\n            const firstcmid = this.section?.cmlist[0];\n            return dropdata.id !== firstcmid;\n        }\n        return false;\n    }\n\n    /**\n     * Display the component dropzone.\n     */\n    showDropZone() {\n        this.element.classList.add(this.classes.DROPZONE);\n    }\n\n    /**\n     * Hide the component dropzone.\n     */\n    hideDropZone() {\n        this.element.classList.remove(this.classes.DROPZONE);\n    }\n\n    /**\n     * Drop event handler.\n     *\n     * @param {Object} dropdata the accepted drop data\n     * @param {Event} event the drop event\n     */\n    drop(dropdata, event) {\n        // Call the move mutation.\n        if (dropdata.type == 'cm') {\n            const mutation = (event.altKey) ? 'cmDuplicate' : 'cmMove';\n            this.reactive.dispatch(mutation, [dropdata.id], this.id, this.section?.cmlist[0]);\n        }\n    }\n}\n"],"names":["BaseComponent","configDragDrop","sectionid","state","fullregion","id","undefined","this","section","get","course","number","component","getDraggableData","_getDraggableData","reactive","isEditing","supportComponents","dragdrop","DragDrop","classes","getClasses","destroy","unregister","setDraggable","value","dragStart","dropdata","dispatch","dragEnd","getExporter","sectionDraggableData","validateDropData","type","hasdelegatedsection","firstcmid","_this$section2","cmlist","showDropZone","element","classList","add","DROPZONE","hideDropZone","remove","drop","event","mutation","altKey","_this$section3"],"mappings":";;;;;;;;;;;;uBA6B6BA,wBASzBC,eAAeC,UAAWC,MAAOC,iBAExBC,GAAKH,eACWI,IAAjBC,KAAKC,eACAA,QAAUL,MAAMK,QAAQC,IAAIF,KAAKF,UAEtBC,IAAhBC,KAAKG,cACAA,OAASP,MAAMO,QAIpBH,KAAKC,QAAQG,OAAS,GAAgC,OAA3BJ,KAAKC,QAAQI,iBACnCC,iBAAmBN,KAAKO,wBAG5BV,WAAaA,WAGdG,KAAKQ,SAASC,WAAaT,KAAKQ,SAASE,yBAEpCC,SAAW,IAAIC,mBAASZ,WAExBa,QAAUb,KAAKW,SAASG,cAOrCC,eAC0BhB,IAAlBC,KAAKW,eACAA,SAASK,aAStBC,aAAaC,0BACLlB,KAAKM,+CACAK,mDAAUM,aAAaC,QAWpCC,UAAUC,eACDZ,SAASa,SAAS,cAAe,CAACD,SAAStB,KAAK,GAQzDwB,QAAQF,eACCZ,SAASa,SAAS,cAAe,CAACD,SAAStB,KAAK,GAQzDS,2BACqBP,KAAKQ,SAASe,cACfC,qBAAqBxB,KAAKQ,SAASZ,MAAOI,KAAKF,IASnE2B,iBAAiBL,aAEU,QAAnBA,MAAAA,gBAAAA,SAAUM,MAAe,gEAEhBzB,gDAASI,YAA+C,KAAlCe,MAAAA,gBAAAA,SAAUO,4BAC9B,QAGLC,iCAAY5B,KAAKC,yCAAL4B,eAAcC,OAAO,UAChCV,SAAStB,KAAO8B,iBAEpB,EAMXG,oBACSC,QAAQC,UAAUC,IAAIlC,KAAKa,QAAQsB,UAM5CC,oBACSJ,QAAQC,UAAUI,OAAOrC,KAAKa,QAAQsB,UAS/CG,KAAKlB,SAAUmB,UAEU,MAAjBnB,SAASM,KAAc,0BACjBc,SAAYD,MAAME,OAAU,cAAgB,cAC7CjC,SAASa,SAASmB,SAAU,CAACpB,SAAStB,IAAKE,KAAKF,0BAAIE,KAAKC,yCAALyC,eAAcZ,OAAO"}
\ No newline at end of file
diff --git a/course/format/amd/build/local/courseeditor/exporter.min.js b/course/format/amd/build/local/courseeditor/exporter.min.js
index b81099fbcd6d6..d95aa2806223d 100644
--- a/course/format/amd/build/local/courseeditor/exporter.min.js
+++ b/course/format/amd/build/local/courseeditor/exporter.min.js
@@ -8,6 +8,6 @@ define("core_courseformat/local/courseeditor/exporter",["exports"],(function(_ex
    * @copyright  2021 Ferran Recio <ferran@moodle.com>
    * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
    */
-class{constructor(reactive){this.reactive=reactive,this.COMPLETIONS=["incomplete","complete","complete","fail"]}course(state){var _state$course$highlig;const data={sections:[],editmode:this.reactive.isEditing,highlighted:null!==(_state$course$highlig=state.course.highlighted)&&void 0!==_state$course$highlig?_state$course$highlig:""};return this.listedSectionIds(state).forEach((sectionid=>{var _state$section$get;const sectioninfo=null!==(_state$section$get=state.section.get(sectionid))&&void 0!==_state$section$get?_state$section$get:{},section=this.section(state,sectioninfo);data.sections.push(section)})),data.hassections=0!=data.sections.length,data}listedSectionIds(state){var _state$course$section;return(null!==(_state$course$section=state.course.sectionlist)&&void 0!==_state$course$section?_state$course$section:[]).filter((sectionid=>{var _state$section$get2;return null===(null!==(_state$section$get2=state.section.get(sectionid))&&void 0!==_state$section$get2?_state$section$get2:{}).component}))}section(state,sectioninfo){var _state$course$highlig2,_sectioninfo$cmlist;const section={...sectioninfo,highlighted:null!==(_state$course$highlig2=state.course.highlighted)&&void 0!==_state$course$highlig2?_state$course$highlig2:"",cms:[]};return(null!==(_sectioninfo$cmlist=sectioninfo.cmlist)&&void 0!==_sectioninfo$cmlist?_sectioninfo$cmlist:[]).forEach((cmid=>{const cminfo=state.cm.get(cmid),cm=this.cm(state,cminfo);section.cms.push(cm)})),section.hascms=0!=section.cms.length,section}cm(state,cminfo){const cm={...cminfo,isactive:!1};if(cminfo.hasdelegatedsection){const sectioninfo=state.section.get(cminfo.delegatesectionid);cm.sectioninfo=this.section(state,sectioninfo)}return cm}cmDraggableData(state,cmid){const cminfo=state.cm.get(cmid);if(!cminfo)return null;let nextcmid;const section=state.section.get(cminfo.sectionid),currentindex=null==section?void 0:section.cmlist.indexOf(cminfo.id);return void 0!==currentindex&&(nextcmid=null==section?void 0:section.cmlist[currentindex+1]),{type:"cm",id:cminfo.id,name:cminfo.name,sectionid:cminfo.sectionid,delegatesection:cminfo.delegatesection,nextcmid:nextcmid}}sectionDraggableData(state,sectionid){const sectioninfo=state.section.get(sectionid);return sectioninfo?{type:"section",id:sectioninfo.id,name:sectioninfo.name,number:sectioninfo.number}:null}fileDraggableData(state,dataTransfer){var _dataTransfer$files;const files=[];return(null===(_dataTransfer$files=dataTransfer.files)||void 0===_dataTransfer$files?void 0:_dataTransfer$files.length)>0&&dataTransfer.files.forEach((file=>{files.push(file)})),{type:"files",files:files}}cmCompletion(state,cminfo){const data={statename:"",state:"NaN"};if(void 0!==cminfo.completionstate){var _this$COMPLETIONS$cmi;data.state=cminfo.completionstate,data.hasstate=!0;let statename=null!==(_this$COMPLETIONS$cmi=this.COMPLETIONS[cminfo.completionstate])&&void 0!==_this$COMPLETIONS$cmi?_this$COMPLETIONS$cmi:"NaN";void 0!==cminfo.isoverallcomplete&&!0===cminfo.isoverallcomplete&&(statename="complete"),data["is".concat(statename)]=!0}return data}allItemsArray(state){var _state$course$section2;const items=[];return(null!==(_state$course$section2=state.course.sectionlist)&&void 0!==_state$course$section2?_state$course$section2:[]).forEach((sectionid=>{var _sectioninfo$cmlist2;const sectioninfo=state.section.get(sectionid);items.push({type:"section",id:sectioninfo.id,url:sectioninfo.sectionurl});(null!==(_sectioninfo$cmlist2=sectioninfo.cmlist)&&void 0!==_sectioninfo$cmlist2?_sectioninfo$cmlist2:[]).forEach((cmid=>{const cminfo=state.cm.get(cmid);items.push({type:"cm",id:cminfo.id,url:cminfo.url})}))})),items}canUseStealth(state,cmIds){return cmIds.some((cmId=>{var _cminfo$allowstealth;const cminfo=state.cm.get(cmId);return null!==(_cminfo$allowstealth=null==cminfo?void 0:cminfo.allowstealth)&&void 0!==_cminfo$allowstealth&&_cminfo$allowstealth}))}},_exports.default}));
+class{constructor(reactive){this.reactive=reactive,this.COMPLETIONS=["incomplete","complete","complete","fail"]}course(state){var _state$course$highlig;const data={sections:[],editmode:this.reactive.isEditing,highlighted:null!==(_state$course$highlig=state.course.highlighted)&&void 0!==_state$course$highlig?_state$course$highlig:""};return this.listedSectionIds(state).forEach((sectionid=>{var _state$section$get;const sectioninfo=null!==(_state$section$get=state.section.get(sectionid))&&void 0!==_state$section$get?_state$section$get:{},section=this.section(state,sectioninfo);data.sections.push(section)})),data.hassections=0!=data.sections.length,data}listedSectionIds(state){var _state$course$section;return(null!==(_state$course$section=state.course.sectionlist)&&void 0!==_state$course$section?_state$course$section:[]).filter((sectionid=>{var _state$section$get2;return null===(null!==(_state$section$get2=state.section.get(sectionid))&&void 0!==_state$section$get2?_state$section$get2:{}).component}))}section(state,sectioninfo){var _state$course$highlig2,_sectioninfo$cmlist;const section={...sectioninfo,highlighted:null!==(_state$course$highlig2=state.course.highlighted)&&void 0!==_state$course$highlig2?_state$course$highlig2:"",cms:[]};return(null!==(_sectioninfo$cmlist=sectioninfo.cmlist)&&void 0!==_sectioninfo$cmlist?_sectioninfo$cmlist:[]).forEach((cmid=>{const cminfo=state.cm.get(cmid),cm=this.cm(state,cminfo);section.cms.push(cm)})),section.hascms=0!=section.cms.length,section}cm(state,cminfo){const cm={...cminfo,isactive:!1};if(cminfo.hasdelegatedsection){const sectioninfo=state.section.get(cminfo.delegatesectionid);cm.sectioninfo=this.section(state,sectioninfo)}return cm}cmDraggableData(state,cmid){const cminfo=state.cm.get(cmid);if(!cminfo)return null;let nextcmid;const section=state.section.get(cminfo.sectionid),currentindex=null==section?void 0:section.cmlist.indexOf(cminfo.id);return void 0!==currentindex&&(nextcmid=null==section?void 0:section.cmlist[currentindex+1]),{type:"cm",id:cminfo.id,name:cminfo.name,sectionid:cminfo.sectionid,hasdelegatedsection:cminfo.hasdelegatedsection,nextcmid:nextcmid}}sectionDraggableData(state,sectionid){const sectioninfo=state.section.get(sectionid);return sectioninfo?{type:"section",id:sectioninfo.id,name:sectioninfo.name,number:sectioninfo.number}:null}fileDraggableData(state,dataTransfer){var _dataTransfer$files;const files=[];return(null===(_dataTransfer$files=dataTransfer.files)||void 0===_dataTransfer$files?void 0:_dataTransfer$files.length)>0&&dataTransfer.files.forEach((file=>{files.push(file)})),{type:"files",files:files}}cmCompletion(state,cminfo){const data={statename:"",state:"NaN"};if(void 0!==cminfo.completionstate){var _this$COMPLETIONS$cmi;data.state=cminfo.completionstate,data.hasstate=!0;let statename=null!==(_this$COMPLETIONS$cmi=this.COMPLETIONS[cminfo.completionstate])&&void 0!==_this$COMPLETIONS$cmi?_this$COMPLETIONS$cmi:"NaN";void 0!==cminfo.isoverallcomplete&&!0===cminfo.isoverallcomplete&&(statename="complete"),data["is".concat(statename)]=!0}return data}allItemsArray(state){var _state$course$section2;const items=[];return(null!==(_state$course$section2=state.course.sectionlist)&&void 0!==_state$course$section2?_state$course$section2:[]).forEach((sectionid=>{var _sectioninfo$cmlist2;const sectioninfo=state.section.get(sectionid);items.push({type:"section",id:sectioninfo.id,url:sectioninfo.sectionurl});(null!==(_sectioninfo$cmlist2=sectioninfo.cmlist)&&void 0!==_sectioninfo$cmlist2?_sectioninfo$cmlist2:[]).forEach((cmid=>{const cminfo=state.cm.get(cmid);items.push({type:"cm",id:cminfo.id,url:cminfo.url})}))})),items}canUseStealth(state,cmIds){return cmIds.some((cmId=>{var _cminfo$allowstealth;const cminfo=state.cm.get(cmId);return null!==(_cminfo$allowstealth=null==cminfo?void 0:cminfo.allowstealth)&&void 0!==_cminfo$allowstealth&&_cminfo$allowstealth}))}},_exports.default}));
 
 //# sourceMappingURL=exporter.min.js.map
\ No newline at end of file
diff --git a/course/format/amd/build/local/courseeditor/exporter.min.js.map b/course/format/amd/build/local/courseeditor/exporter.min.js.map
index 3eb0a886dfdca..6f665ee8002ae 100644
--- a/course/format/amd/build/local/courseeditor/exporter.min.js.map
+++ b/course/format/amd/build/local/courseeditor/exporter.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"exporter.min.js","sources":["../../../src/local/courseeditor/exporter.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Module to export parts of the state and transform them to be used in templates\n * and as draggable data.\n *\n * @module     core_courseformat/local/courseeditor/exporter\n * @class      core_courseformat/local/courseeditor/exporter\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\nexport default class {\n\n    /**\n     * Class constructor.\n     *\n     * @param {CourseEditor} reactive the course editor object\n     */\n    constructor(reactive) {\n        this.reactive = reactive;\n\n        // Completions states are defined in lib/completionlib.php. There are 4 different completion\n        // state values, however, the course index uses the same state for complete and complete_pass.\n        // This is the reason why completed appears twice in the array.\n        this.COMPLETIONS = ['incomplete', 'complete', 'complete', 'fail'];\n    }\n\n    /**\n     * Generate the course export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @returns {Object}\n     */\n    course(state) {\n        // Collect section information from the state.\n        const data = {\n            sections: [],\n            editmode: this.reactive.isEditing,\n            highlighted: state.course.highlighted ?? '',\n        };\n        const sectionlist = this.listedSectionIds(state);\n        sectionlist.forEach(sectionid => {\n            const sectioninfo = state.section.get(sectionid) ?? {};\n            const section = this.section(state, sectioninfo);\n            data.sections.push(section);\n        });\n        data.hassections = (data.sections.length != 0);\n\n        return data;\n    }\n\n    /**\n     * Get the IDs of the sections that are listed as regular sections.\n     * @param {Object} state the current state.\n     * @returns {Number[]} the list of section ids that are listed.\n     */\n    listedSectionIds(state) {\n        const fullSectionList = state.course.sectionlist ?? [];\n        return fullSectionList.filter(sectionid => {\n            const sectioninfo = state.section.get(sectionid) ?? {};\n            // Delegated sections (controlled by a component) are not listed in course.\n            return sectioninfo.component === null;\n        });\n    }\n\n    /**\n     * Generate a section export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} sectioninfo the section state data.\n     * @returns {Object}\n     */\n    section(state, sectioninfo) {\n        const section = {\n            ...sectioninfo,\n            highlighted: state.course.highlighted ?? '',\n            cms: [],\n        };\n        const cmlist = sectioninfo.cmlist ?? [];\n        cmlist.forEach(cmid => {\n            const cminfo = state.cm.get(cmid);\n            const cm = this.cm(state, cminfo);\n            section.cms.push(cm);\n        });\n        section.hascms = (section.cms.length != 0);\n\n        return section;\n    }\n\n    /**\n     * Generate a cm export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} cminfo the course module state data.\n     * @returns {Object}\n     */\n    cm(state, cminfo) {\n        const cm = {\n            ...cminfo,\n            isactive: false,\n        };\n        if (cminfo.hasdelegatedsection) {\n            const sectioninfo = state.section.get(cminfo.delegatesectionid);\n            cm.sectioninfo = this.section(state, sectioninfo);\n        }\n        return cm;\n    }\n\n    /**\n     * Generate a dragable cm data structure.\n     *\n     * This method is used by any draggable course module element to generate drop data\n     * for its reactive/dragdrop instance.\n     *\n     * @param {*} state the state object\n     * @param {*} cmid the cours emodule id\n     * @returns {Object|null}\n     */\n    cmDraggableData(state, cmid) {\n        const cminfo = state.cm.get(cmid);\n        if (!cminfo) {\n            return null;\n        }\n\n        // Drop an activity over the next activity is the same as doing anything.\n        let nextcmid;\n        const section = state.section.get(cminfo.sectionid);\n        const currentindex = section?.cmlist.indexOf(cminfo.id);\n        if (currentindex !== undefined) {\n            nextcmid = section?.cmlist[currentindex + 1];\n        }\n\n        return {\n            type: 'cm',\n            id: cminfo.id,\n            name: cminfo.name,\n            sectionid: cminfo.sectionid,\n            delegatesection: cminfo.delegatesection,\n            nextcmid,\n        };\n    }\n\n    /**\n     * Generate a dragable cm data structure.\n     *\n     * This method is used by any draggable section element to generate drop data\n     * for its reactive/dragdrop instance.\n     *\n     * @param {*} state the state object\n     * @param {*} sectionid the cours section id\n     * @returns {Object|null}\n     */\n    sectionDraggableData(state, sectionid) {\n        const sectioninfo = state.section.get(sectionid);\n        if (!sectioninfo) {\n            return null;\n        }\n        return {\n            type: 'section',\n            id: sectioninfo.id,\n            name: sectioninfo.name,\n            number: sectioninfo.number,\n        };\n    }\n\n    /**\n     * Generate a file draggable structure.\n     *\n     * This method is used when files are dragged on the browser.\n     *\n     * @param {*} state the state object\n     * @param {*} dataTransfer the current data tranfer data\n     * @returns {Object|null}\n     */\n    fileDraggableData(state, dataTransfer) {\n        const files = [];\n        // Browsers do not provide the file list until the drop event.\n        if (dataTransfer.files?.length > 0) {\n            dataTransfer.files.forEach(file => {\n                files.push(file);\n            });\n        }\n        return {\n            type: 'files',\n            files,\n        };\n    }\n\n    /**\n     * Generate a completion export data from the cm element.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} cminfo the course module state data.\n     * @returns {Object}\n     */\n    cmCompletion(state, cminfo) {\n        const data = {\n            statename: '',\n            state: 'NaN',\n        };\n        if (cminfo.completionstate !== undefined) {\n            data.state = cminfo.completionstate;\n            data.hasstate = true;\n            let statename = this.COMPLETIONS[cminfo.completionstate] ?? 'NaN';\n            if (cminfo.isoverallcomplete !== undefined && cminfo.isoverallcomplete === true) {\n                statename = 'complete';\n            }\n            data[`is${statename}`] = true;\n        }\n        return data;\n    }\n\n    /**\n     * Return a sorted list of all sections and cms items in the state.\n     *\n     * @param {Object} state the current state.\n     * @returns {Array} all sections and cms items in the state.\n     */\n    allItemsArray(state) {\n        const items = [];\n        const sectionlist = state.course.sectionlist ?? [];\n        // Add sections.\n        sectionlist.forEach(sectionid => {\n            const sectioninfo = state.section.get(sectionid);\n            items.push({type: 'section', id: sectioninfo.id, url: sectioninfo.sectionurl});\n            // Add cms.\n            const cmlist = sectioninfo.cmlist ?? [];\n            cmlist.forEach(cmid => {\n                const cminfo = state.cm.get(cmid);\n                items.push({type: 'cm', id: cminfo.id, url: cminfo.url});\n            });\n        });\n        return items;\n    }\n\n    /**\n     * Check is some activities of a list can be stealth.\n     *\n     * @param {Object} state the current state.\n     * @param {Number[]} cmIds the module ids to check\n     * @returns {Boolean} if any of the activities can be stealth.\n     */\n    canUseStealth(state, cmIds) {\n        return cmIds.some(cmId => {\n            const cminfo = state.cm.get(cmId);\n            return cminfo?.allowstealth ?? false;\n        });\n    }\n}\n"],"names":["constructor","reactive","COMPLETIONS","course","state","data","sections","editmode","this","isEditing","highlighted","listedSectionIds","forEach","sectionid","sectioninfo","section","get","push","hassections","length","sectionlist","filter","component","cms","cmlist","cmid","cminfo","cm","hascms","isactive","hasdelegatedsection","delegatesectionid","cmDraggableData","nextcmid","currentindex","indexOf","id","undefined","type","name","delegatesection","sectionDraggableData","number","fileDraggableData","dataTransfer","files","file","cmCompletion","statename","completionstate","hasstate","isoverallcomplete","allItemsArray","items","url","sectionurl","canUseStealth","cmIds","some","cmId","allowstealth"],"mappings":";;;;;;;;;;MA+BIA,YAAYC,eACHA,SAAWA,cAKXC,YAAc,CAAC,aAAc,WAAY,WAAY,QAS9DC,OAAOC,uCAEGC,KAAO,CACTC,SAAU,GACVC,SAAUC,KAAKP,SAASQ,UACxBC,0CAAaN,MAAMD,OAAOO,mEAAe,WAEzBF,KAAKG,iBAAiBP,OAC9BQ,SAAQC,yCACVC,uCAAcV,MAAMW,QAAQC,IAAIH,4DAAc,GAC9CE,QAAUP,KAAKO,QAAQX,MAAOU,aACpCT,KAAKC,SAASW,KAAKF,YAEvBV,KAAKa,YAAuC,GAAxBb,KAAKC,SAASa,OAE3Bd,KAQXM,iBAAiBP,sEACWA,MAAMD,OAAOiB,mEAAe,IAC7BC,QAAOR,2CAGO,oCAFbT,MAAMW,QAAQC,IAAIH,8DAAc,IAEjCS,aAW3BP,QAAQX,MAAOU,kEACLC,QAAU,IACTD,YACHJ,2CAAaN,MAAMD,OAAOO,qEAAe,GACzCa,IAAK,uCAEMT,YAAYU,0DAAU,IAC9BZ,SAAQa,aACLC,OAAStB,MAAMuB,GAAGX,IAAIS,MACtBE,GAAKnB,KAAKmB,GAAGvB,MAAOsB,QAC1BX,QAAQQ,IAAIN,KAAKU,OAErBZ,QAAQa,OAAgC,GAAtBb,QAAQQ,IAAIJ,OAEvBJ,QAUXY,GAAGvB,MAAOsB,cACAC,GAAK,IACJD,OACHG,UAAU,MAEVH,OAAOI,oBAAqB,OACtBhB,YAAcV,MAAMW,QAAQC,IAAIU,OAAOK,mBAC7CJ,GAAGb,YAAcN,KAAKO,QAAQX,MAAOU,oBAElCa,GAaXK,gBAAgB5B,MAAOqB,YACbC,OAAStB,MAAMuB,GAAGX,IAAIS,UACvBC,cACM,SAIPO,eACElB,QAAUX,MAAMW,QAAQC,IAAIU,OAAOb,WACnCqB,aAAenB,MAAAA,eAAAA,QAASS,OAAOW,QAAQT,OAAOU,gBAC/BC,IAAjBH,eACAD,SAAWlB,MAAAA,eAAAA,QAASS,OAAOU,aAAe,IAGvC,CACHI,KAAM,KACNF,GAAIV,OAAOU,GACXG,KAAMb,OAAOa,KACb1B,UAAWa,OAAOb,UAClB2B,gBAAiBd,OAAOc,gBACxBP,SAAAA,UAcRQ,qBAAqBrC,MAAOS,iBAClBC,YAAcV,MAAMW,QAAQC,IAAIH,kBACjCC,YAGE,CACHwB,KAAM,UACNF,GAAItB,YAAYsB,GAChBG,KAAMzB,YAAYyB,KAClBG,OAAQ5B,YAAY4B,QANb,KAmBfC,kBAAkBvC,MAAOwC,4CACfC,MAAQ,sCAEVD,aAAaC,gEAAO1B,QAAS,GAC7ByB,aAAaC,MAAMjC,SAAQkC,OACvBD,MAAM5B,KAAK6B,SAGZ,CACHR,KAAM,QACNO,MAAAA,OAWRE,aAAa3C,MAAOsB,cACVrB,KAAO,CACT2C,UAAW,GACX5C,MAAO,eAEoBiC,IAA3BX,OAAOuB,gBAA+B,2BACtC5C,KAAKD,MAAQsB,OAAOuB,gBACpB5C,KAAK6C,UAAW,MACZF,wCAAYxC,KAAKN,YAAYwB,OAAOuB,wEAAoB,WAC3BZ,IAA7BX,OAAOyB,oBAAgE,IAA7BzB,OAAOyB,oBACjDH,UAAY,YAEhB3C,iBAAU2C,aAAe,SAEtB3C,KASX+C,cAAchD,wCACJiD,MAAQ,yCACMjD,MAAMD,OAAOiB,qEAAe,IAEpCR,SAAQC,2CACVC,YAAcV,MAAMW,QAAQC,IAAIH,WACtCwC,MAAMpC,KAAK,CAACqB,KAAM,UAAWF,GAAItB,YAAYsB,GAAIkB,IAAKxC,YAAYyC,2CAEnDzC,YAAYU,4DAAU,IAC9BZ,SAAQa,aACLC,OAAStB,MAAMuB,GAAGX,IAAIS,MAC5B4B,MAAMpC,KAAK,CAACqB,KAAM,KAAMF,GAAIV,OAAOU,GAAIkB,IAAK5B,OAAO4B,YAGpDD,MAUXG,cAAcpD,MAAOqD,cACVA,MAAMC,MAAKC,sCACRjC,OAAStB,MAAMuB,GAAGX,IAAI2C,0CACrBjC,MAAAA,cAAAA,OAAQkC"}
\ No newline at end of file
+{"version":3,"file":"exporter.min.js","sources":["../../../src/local/courseeditor/exporter.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Module to export parts of the state and transform them to be used in templates\n * and as draggable data.\n *\n * @module     core_courseformat/local/courseeditor/exporter\n * @class      core_courseformat/local/courseeditor/exporter\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\nexport default class {\n\n    /**\n     * Class constructor.\n     *\n     * @param {CourseEditor} reactive the course editor object\n     */\n    constructor(reactive) {\n        this.reactive = reactive;\n\n        // Completions states are defined in lib/completionlib.php. There are 4 different completion\n        // state values, however, the course index uses the same state for complete and complete_pass.\n        // This is the reason why completed appears twice in the array.\n        this.COMPLETIONS = ['incomplete', 'complete', 'complete', 'fail'];\n    }\n\n    /**\n     * Generate the course export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @returns {Object}\n     */\n    course(state) {\n        // Collect section information from the state.\n        const data = {\n            sections: [],\n            editmode: this.reactive.isEditing,\n            highlighted: state.course.highlighted ?? '',\n        };\n        const sectionlist = this.listedSectionIds(state);\n        sectionlist.forEach(sectionid => {\n            const sectioninfo = state.section.get(sectionid) ?? {};\n            const section = this.section(state, sectioninfo);\n            data.sections.push(section);\n        });\n        data.hassections = (data.sections.length != 0);\n\n        return data;\n    }\n\n    /**\n     * Get the IDs of the sections that are listed as regular sections.\n     * @param {Object} state the current state.\n     * @returns {Number[]} the list of section ids that are listed.\n     */\n    listedSectionIds(state) {\n        const fullSectionList = state.course.sectionlist ?? [];\n        return fullSectionList.filter(sectionid => {\n            const sectioninfo = state.section.get(sectionid) ?? {};\n            // Delegated sections (controlled by a component) are not listed in course.\n            return sectioninfo.component === null;\n        });\n    }\n\n    /**\n     * Generate a section export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} sectioninfo the section state data.\n     * @returns {Object}\n     */\n    section(state, sectioninfo) {\n        const section = {\n            ...sectioninfo,\n            highlighted: state.course.highlighted ?? '',\n            cms: [],\n        };\n        const cmlist = sectioninfo.cmlist ?? [];\n        cmlist.forEach(cmid => {\n            const cminfo = state.cm.get(cmid);\n            const cm = this.cm(state, cminfo);\n            section.cms.push(cm);\n        });\n        section.hascms = (section.cms.length != 0);\n\n        return section;\n    }\n\n    /**\n     * Generate a cm export data from the state.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} cminfo the course module state data.\n     * @returns {Object}\n     */\n    cm(state, cminfo) {\n        const cm = {\n            ...cminfo,\n            isactive: false,\n        };\n        if (cminfo.hasdelegatedsection) {\n            const sectioninfo = state.section.get(cminfo.delegatesectionid);\n            cm.sectioninfo = this.section(state, sectioninfo);\n        }\n        return cm;\n    }\n\n    /**\n     * Generate a dragable cm data structure.\n     *\n     * This method is used by any draggable course module element to generate drop data\n     * for its reactive/dragdrop instance.\n     *\n     * @param {*} state the state object\n     * @param {*} cmid the cours emodule id\n     * @returns {Object|null}\n     */\n    cmDraggableData(state, cmid) {\n        const cminfo = state.cm.get(cmid);\n        if (!cminfo) {\n            return null;\n        }\n\n        // Drop an activity over the next activity is the same as doing anything.\n        let nextcmid;\n        const section = state.section.get(cminfo.sectionid);\n        const currentindex = section?.cmlist.indexOf(cminfo.id);\n        if (currentindex !== undefined) {\n            nextcmid = section?.cmlist[currentindex + 1];\n        }\n\n        return {\n            type: 'cm',\n            id: cminfo.id,\n            name: cminfo.name,\n            sectionid: cminfo.sectionid,\n            hasdelegatedsection: cminfo.hasdelegatedsection,\n            nextcmid,\n        };\n    }\n\n    /**\n     * Generate a dragable cm data structure.\n     *\n     * This method is used by any draggable section element to generate drop data\n     * for its reactive/dragdrop instance.\n     *\n     * @param {*} state the state object\n     * @param {*} sectionid the cours section id\n     * @returns {Object|null}\n     */\n    sectionDraggableData(state, sectionid) {\n        const sectioninfo = state.section.get(sectionid);\n        if (!sectioninfo) {\n            return null;\n        }\n        return {\n            type: 'section',\n            id: sectioninfo.id,\n            name: sectioninfo.name,\n            number: sectioninfo.number,\n        };\n    }\n\n    /**\n     * Generate a file draggable structure.\n     *\n     * This method is used when files are dragged on the browser.\n     *\n     * @param {*} state the state object\n     * @param {*} dataTransfer the current data tranfer data\n     * @returns {Object|null}\n     */\n    fileDraggableData(state, dataTransfer) {\n        const files = [];\n        // Browsers do not provide the file list until the drop event.\n        if (dataTransfer.files?.length > 0) {\n            dataTransfer.files.forEach(file => {\n                files.push(file);\n            });\n        }\n        return {\n            type: 'files',\n            files,\n        };\n    }\n\n    /**\n     * Generate a completion export data from the cm element.\n     *\n     * @param {Object} state the current state.\n     * @param {Object} cminfo the course module state data.\n     * @returns {Object}\n     */\n    cmCompletion(state, cminfo) {\n        const data = {\n            statename: '',\n            state: 'NaN',\n        };\n        if (cminfo.completionstate !== undefined) {\n            data.state = cminfo.completionstate;\n            data.hasstate = true;\n            let statename = this.COMPLETIONS[cminfo.completionstate] ?? 'NaN';\n            if (cminfo.isoverallcomplete !== undefined && cminfo.isoverallcomplete === true) {\n                statename = 'complete';\n            }\n            data[`is${statename}`] = true;\n        }\n        return data;\n    }\n\n    /**\n     * Return a sorted list of all sections and cms items in the state.\n     *\n     * @param {Object} state the current state.\n     * @returns {Array} all sections and cms items in the state.\n     */\n    allItemsArray(state) {\n        const items = [];\n        const sectionlist = state.course.sectionlist ?? [];\n        // Add sections.\n        sectionlist.forEach(sectionid => {\n            const sectioninfo = state.section.get(sectionid);\n            items.push({type: 'section', id: sectioninfo.id, url: sectioninfo.sectionurl});\n            // Add cms.\n            const cmlist = sectioninfo.cmlist ?? [];\n            cmlist.forEach(cmid => {\n                const cminfo = state.cm.get(cmid);\n                items.push({type: 'cm', id: cminfo.id, url: cminfo.url});\n            });\n        });\n        return items;\n    }\n\n    /**\n     * Check is some activities of a list can be stealth.\n     *\n     * @param {Object} state the current state.\n     * @param {Number[]} cmIds the module ids to check\n     * @returns {Boolean} if any of the activities can be stealth.\n     */\n    canUseStealth(state, cmIds) {\n        return cmIds.some(cmId => {\n            const cminfo = state.cm.get(cmId);\n            return cminfo?.allowstealth ?? false;\n        });\n    }\n}\n"],"names":["constructor","reactive","COMPLETIONS","course","state","data","sections","editmode","this","isEditing","highlighted","listedSectionIds","forEach","sectionid","sectioninfo","section","get","push","hassections","length","sectionlist","filter","component","cms","cmlist","cmid","cminfo","cm","hascms","isactive","hasdelegatedsection","delegatesectionid","cmDraggableData","nextcmid","currentindex","indexOf","id","undefined","type","name","sectionDraggableData","number","fileDraggableData","dataTransfer","files","file","cmCompletion","statename","completionstate","hasstate","isoverallcomplete","allItemsArray","items","url","sectionurl","canUseStealth","cmIds","some","cmId","allowstealth"],"mappings":";;;;;;;;;;MA+BIA,YAAYC,eACHA,SAAWA,cAKXC,YAAc,CAAC,aAAc,WAAY,WAAY,QAS9DC,OAAOC,uCAEGC,KAAO,CACTC,SAAU,GACVC,SAAUC,KAAKP,SAASQ,UACxBC,0CAAaN,MAAMD,OAAOO,mEAAe,WAEzBF,KAAKG,iBAAiBP,OAC9BQ,SAAQC,yCACVC,uCAAcV,MAAMW,QAAQC,IAAIH,4DAAc,GAC9CE,QAAUP,KAAKO,QAAQX,MAAOU,aACpCT,KAAKC,SAASW,KAAKF,YAEvBV,KAAKa,YAAuC,GAAxBb,KAAKC,SAASa,OAE3Bd,KAQXM,iBAAiBP,sEACWA,MAAMD,OAAOiB,mEAAe,IAC7BC,QAAOR,2CAGO,oCAFbT,MAAMW,QAAQC,IAAIH,8DAAc,IAEjCS,aAW3BP,QAAQX,MAAOU,kEACLC,QAAU,IACTD,YACHJ,2CAAaN,MAAMD,OAAOO,qEAAe,GACzCa,IAAK,uCAEMT,YAAYU,0DAAU,IAC9BZ,SAAQa,aACLC,OAAStB,MAAMuB,GAAGX,IAAIS,MACtBE,GAAKnB,KAAKmB,GAAGvB,MAAOsB,QAC1BX,QAAQQ,IAAIN,KAAKU,OAErBZ,QAAQa,OAAgC,GAAtBb,QAAQQ,IAAIJ,OAEvBJ,QAUXY,GAAGvB,MAAOsB,cACAC,GAAK,IACJD,OACHG,UAAU,MAEVH,OAAOI,oBAAqB,OACtBhB,YAAcV,MAAMW,QAAQC,IAAIU,OAAOK,mBAC7CJ,GAAGb,YAAcN,KAAKO,QAAQX,MAAOU,oBAElCa,GAaXK,gBAAgB5B,MAAOqB,YACbC,OAAStB,MAAMuB,GAAGX,IAAIS,UACvBC,cACM,SAIPO,eACElB,QAAUX,MAAMW,QAAQC,IAAIU,OAAOb,WACnCqB,aAAenB,MAAAA,eAAAA,QAASS,OAAOW,QAAQT,OAAOU,gBAC/BC,IAAjBH,eACAD,SAAWlB,MAAAA,eAAAA,QAASS,OAAOU,aAAe,IAGvC,CACHI,KAAM,KACNF,GAAIV,OAAOU,GACXG,KAAMb,OAAOa,KACb1B,UAAWa,OAAOb,UAClBiB,oBAAqBJ,OAAOI,oBAC5BG,SAAAA,UAcRO,qBAAqBpC,MAAOS,iBAClBC,YAAcV,MAAMW,QAAQC,IAAIH,kBACjCC,YAGE,CACHwB,KAAM,UACNF,GAAItB,YAAYsB,GAChBG,KAAMzB,YAAYyB,KAClBE,OAAQ3B,YAAY2B,QANb,KAmBfC,kBAAkBtC,MAAOuC,4CACfC,MAAQ,sCAEVD,aAAaC,gEAAOzB,QAAS,GAC7BwB,aAAaC,MAAMhC,SAAQiC,OACvBD,MAAM3B,KAAK4B,SAGZ,CACHP,KAAM,QACNM,MAAAA,OAWRE,aAAa1C,MAAOsB,cACVrB,KAAO,CACT0C,UAAW,GACX3C,MAAO,eAEoBiC,IAA3BX,OAAOsB,gBAA+B,2BACtC3C,KAAKD,MAAQsB,OAAOsB,gBACpB3C,KAAK4C,UAAW,MACZF,wCAAYvC,KAAKN,YAAYwB,OAAOsB,wEAAoB,WAC3BX,IAA7BX,OAAOwB,oBAAgE,IAA7BxB,OAAOwB,oBACjDH,UAAY,YAEhB1C,iBAAU0C,aAAe,SAEtB1C,KASX8C,cAAc/C,wCACJgD,MAAQ,yCACMhD,MAAMD,OAAOiB,qEAAe,IAEpCR,SAAQC,2CACVC,YAAcV,MAAMW,QAAQC,IAAIH,WACtCuC,MAAMnC,KAAK,CAACqB,KAAM,UAAWF,GAAItB,YAAYsB,GAAIiB,IAAKvC,YAAYwC,2CAEnDxC,YAAYU,4DAAU,IAC9BZ,SAAQa,aACLC,OAAStB,MAAMuB,GAAGX,IAAIS,MAC5B2B,MAAMnC,KAAK,CAACqB,KAAM,KAAMF,GAAIV,OAAOU,GAAIiB,IAAK3B,OAAO2B,YAGpDD,MAUXG,cAAcnD,MAAOoD,cACVA,MAAMC,MAAKC,sCACRhC,OAAStB,MAAMuB,GAAGX,IAAI0C,0CACrBhC,MAAAA,cAAAA,OAAQiC"}
\ No newline at end of file
diff --git a/course/format/amd/build/local/courseindex/sectiontitle.min.js b/course/format/amd/build/local/courseindex/sectiontitle.min.js
index d605e049dc5bb..6cbdca4d8abf3 100644
--- a/course/format/amd/build/local/courseindex/sectiontitle.min.js
+++ b/course/format/amd/build/local/courseindex/sectiontitle.min.js
@@ -8,6 +8,6 @@ define("core_courseformat/local/courseindex/sectiontitle",["exports","core_cours
    * @class      core_courseformat/local/courseindex/sectiontitle
    * @copyright  2021 Ferran Recio <ferran@moodle.com>
    * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
-   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,_dndsectionitem=(obj=_dndsectionitem)&&obj.__esModule?obj:{default:obj};class Component extends _dndsectionitem.default{create(descriptor){this.name="courseindex_sectiontitle",this.id=descriptor.id,this.section=descriptor.section,this.course=descriptor.course,this.fullregion=descriptor.fullregion,this.section.number>0&&(this.getDraggableData=this._getDraggableData)}static init(target,selectors){return new this({element:document.getElementById(target),selectors:selectors})}stateReady(state){this.configDragDrop(this.id,state,this.fullregion)}}return _exports.default=Component,_exports.default}));
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,_dndsectionitem=(obj=_dndsectionitem)&&obj.__esModule?obj:{default:obj};class Component extends _dndsectionitem.default{create(descriptor){this.name="courseindex_sectiontitle",this.id=descriptor.id,this.section=descriptor.section,this.course=descriptor.course,this.fullregion=descriptor.fullregion,this.section.number>0&&null===this.section.component&&(this.getDraggableData=this._getDraggableData)}static init(target,selectors){return new this({element:document.getElementById(target),selectors:selectors})}stateReady(state){this.configDragDrop(this.id,state,this.fullregion)}}return _exports.default=Component,_exports.default}));
 
 //# sourceMappingURL=sectiontitle.min.js.map
\ No newline at end of file
diff --git a/course/format/amd/build/local/courseindex/sectiontitle.min.js.map b/course/format/amd/build/local/courseindex/sectiontitle.min.js.map
index 380f36775a2c3..1363f9efedc3c 100644
--- a/course/format/amd/build/local/courseindex/sectiontitle.min.js.map
+++ b/course/format/amd/build/local/courseindex/sectiontitle.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"sectiontitle.min.js","sources":["../../../src/local/courseindex/sectiontitle.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Course index section title component.\n *\n * This component is used to control specific course section interactions like drag and drop.\n *\n * @module     core_courseformat/local/courseindex/sectiontitle\n * @class      core_courseformat/local/courseindex/sectiontitle\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport DndSectionItem from 'core_courseformat/local/courseeditor/dndsectionitem';\n\nexport default class Component extends DndSectionItem {\n\n    /**\n     * Constructor hook.\n     *\n     * @param {Object} descriptor\n     */\n    create(descriptor) {\n        // Optional component name for debugging.\n        this.name = 'courseindex_sectiontitle';\n\n        this.id = descriptor.id;\n        this.section = descriptor.section;\n        this.course = descriptor.course;\n        this.fullregion = descriptor.fullregion;\n\n        // Prevent topic zero from being draggable.\n        if (this.section.number > 0) {\n            this.getDraggableData = this._getDraggableData;\n        }\n    }\n\n    /**\n     * Static method to create a component instance form the mustahce template.\n     *\n     * @param {element|string} target the DOM main element or its ID\n     * @param {object} selectors optional css selector overrides\n     * @return {Component}\n     */\n    static init(target, selectors) {\n        return new this({\n            element: document.getElementById(target),\n            selectors,\n        });\n    }\n\n    /**\n     * Initial state ready method.\n     *\n     * @param {Object} state the initial state\n     */\n    stateReady(state) {\n        this.configDragDrop(this.id, state, this.fullregion);\n    }\n}\n"],"names":["Component","DndSectionItem","create","descriptor","name","id","section","course","fullregion","this","number","getDraggableData","_getDraggableData","target","selectors","element","document","getElementById","stateReady","state","configDragDrop"],"mappings":";;;;;;;;;;mKA4BqBA,kBAAkBC,wBAOnCC,OAAOC,iBAEEC,KAAO,gCAEPC,GAAKF,WAAWE,QAChBC,QAAUH,WAAWG,aACrBC,OAASJ,WAAWI,YACpBC,WAAaL,WAAWK,WAGzBC,KAAKH,QAAQI,OAAS,SACjBC,iBAAmBF,KAAKG,+BAWzBC,OAAQC,kBACT,IAAIL,KAAK,CACZM,QAASC,SAASC,eAAeJ,QACjCC,UAAAA,YASRI,WAAWC,YACFC,eAAeX,KAAKJ,GAAIc,MAAOV,KAAKD"}
\ No newline at end of file
+{"version":3,"file":"sectiontitle.min.js","sources":["../../../src/local/courseindex/sectiontitle.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Course index section title component.\n *\n * This component is used to control specific course section interactions like drag and drop.\n *\n * @module     core_courseformat/local/courseindex/sectiontitle\n * @class      core_courseformat/local/courseindex/sectiontitle\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport DndSectionItem from 'core_courseformat/local/courseeditor/dndsectionitem';\n\nexport default class Component extends DndSectionItem {\n\n    /**\n     * Constructor hook.\n     *\n     * @param {Object} descriptor\n     */\n    create(descriptor) {\n        // Optional component name for debugging.\n        this.name = 'courseindex_sectiontitle';\n\n        this.id = descriptor.id;\n        this.section = descriptor.section;\n        this.course = descriptor.course;\n        this.fullregion = descriptor.fullregion;\n\n        // Prevent topic zero and delegated sections from being draggable.\n        if (this.section.number > 0 && this.section.component === null) {\n            this.getDraggableData = this._getDraggableData;\n        }\n    }\n\n    /**\n     * Static method to create a component instance form the mustahce template.\n     *\n     * @param {element|string} target the DOM main element or its ID\n     * @param {object} selectors optional css selector overrides\n     * @return {Component}\n     */\n    static init(target, selectors) {\n        return new this({\n            element: document.getElementById(target),\n            selectors,\n        });\n    }\n\n    /**\n     * Initial state ready method.\n     *\n     * @param {Object} state the initial state\n     */\n    stateReady(state) {\n        this.configDragDrop(this.id, state, this.fullregion);\n    }\n}\n"],"names":["Component","DndSectionItem","create","descriptor","name","id","section","course","fullregion","this","number","component","getDraggableData","_getDraggableData","target","selectors","element","document","getElementById","stateReady","state","configDragDrop"],"mappings":";;;;;;;;;;mKA4BqBA,kBAAkBC,wBAOnCC,OAAOC,iBAEEC,KAAO,gCAEPC,GAAKF,WAAWE,QAChBC,QAAUH,WAAWG,aACrBC,OAASJ,WAAWI,YACpBC,WAAaL,WAAWK,WAGzBC,KAAKH,QAAQI,OAAS,GAAgC,OAA3BD,KAAKH,QAAQK,iBACnCC,iBAAmBH,KAAKI,+BAWzBC,OAAQC,kBACT,IAAIN,KAAK,CACZO,QAASC,SAASC,eAAeJ,QACjCC,UAAAA,YASRI,WAAWC,YACFC,eAAeZ,KAAKJ,GAAIe,MAAOX,KAAKD"}
\ No newline at end of file
diff --git a/course/format/amd/src/local/courseeditor/dndcmitem.js b/course/format/amd/src/local/courseeditor/dndcmitem.js
index b4b568b3173fa..b886983f4a33b 100644
--- a/course/format/amd/src/local/courseeditor/dndcmitem.js
+++ b/course/format/amd/src/local/courseeditor/dndcmitem.js
@@ -106,7 +106,7 @@ export default class extends BaseComponent {
             return false;
         }
         // Prevent delegated sections loops.
-        if (dropdata?.delegatesection === true) {
+        if (dropdata?.hasdelegatedsection === true) {
             const mycminfo = this.reactive.get('cm', this.id);
             const mysection = this.reactive.get('section', mycminfo.sectionid);
             if (mysection?.component !== null) {
diff --git a/course/format/amd/src/local/courseeditor/dndsection.js b/course/format/amd/src/local/courseeditor/dndsection.js
index 8fe79834661b6..ad0aaf8078ed0 100644
--- a/course/format/amd/src/local/courseeditor/dndsection.js
+++ b/course/format/amd/src/local/courseeditor/dndsection.js
@@ -117,13 +117,17 @@ export default class extends BaseComponent {
         }
         // We accept any course module unless it can form a subsection loop.
         if (dropdata?.type === 'cm') {
-            if (this.section?.component && dropdata?.delegatesection === true) {
+            if (this.section?.component && dropdata?.hasdelegatedsection === true) {
                 return false;
             }
             return true;
         }
-        // We accept any section but yourself and the next one.
         if (dropdata?.type === 'section') {
+            // Sections controlled by a plugin cannot accept sections.
+            if (this.section.component !== null) {
+                return false;
+            }
+            // We accept any section but yourself and the next one.
             return dropdata?.id != this.id && dropdata?.number != this.section.number + 1;
         }
         return false;
diff --git a/course/format/amd/src/local/courseeditor/dndsectionitem.js b/course/format/amd/src/local/courseeditor/dndsectionitem.js
index b280ec5d68e9f..b71b728868b60 100644
--- a/course/format/amd/src/local/courseeditor/dndsectionitem.js
+++ b/course/format/amd/src/local/courseeditor/dndsectionitem.js
@@ -46,8 +46,8 @@ export default class extends BaseComponent {
             this.course = state.course;
         }
 
-        // Prevent topic zero from being draggable.
-        if (this.section.number > 0) {
+        // Prevent topic zero and delegated sections from being draggable.
+        if (this.section.number > 0 && this.section.component === null) {
             this.getDraggableData = this._getDraggableData;
         }
 
@@ -122,7 +122,7 @@ export default class extends BaseComponent {
         // Course module validation.
         if (dropdata?.type === 'cm') {
             // Prevent content loops with subsections.
-            if (this.section?.component && dropdata?.delegatesection === true) {
+            if (this.section?.component && dropdata?.hasdelegatedsection === true) {
                 return false;
             }
             // The first section element is already there so we can ignore it.
diff --git a/course/format/amd/src/local/courseeditor/exporter.js b/course/format/amd/src/local/courseeditor/exporter.js
index 072ec8358b5d3..e7846229f6bbb 100644
--- a/course/format/amd/src/local/courseeditor/exporter.js
+++ b/course/format/amd/src/local/courseeditor/exporter.js
@@ -148,7 +148,7 @@ export default class {
             id: cminfo.id,
             name: cminfo.name,
             sectionid: cminfo.sectionid,
-            delegatesection: cminfo.delegatesection,
+            hasdelegatedsection: cminfo.hasdelegatedsection,
             nextcmid,
         };
     }
diff --git a/course/format/amd/src/local/courseindex/sectiontitle.js b/course/format/amd/src/local/courseindex/sectiontitle.js
index e8e8de7b6f46f..4d419ed244f86 100644
--- a/course/format/amd/src/local/courseindex/sectiontitle.js
+++ b/course/format/amd/src/local/courseindex/sectiontitle.js
@@ -42,8 +42,8 @@ export default class Component extends DndSectionItem {
         this.course = descriptor.course;
         this.fullregion = descriptor.fullregion;
 
-        // Prevent topic zero from being draggable.
-        if (this.section.number > 0) {
+        // Prevent topic zero and delegated sections from being draggable.
+        if (this.section.number > 0 && this.section.component === null) {
             this.getDraggableData = this._getDraggableData;
         }
     }

From 39ccad14d11a93e07d311cb40aabae6fff5f53dd Mon Sep 17 00:00:00 2001
From: Laurent David <lmedavid@gmail.com>
Date: Tue, 2 Jul 2024 14:22:33 +0200
Subject: [PATCH 105/119] MDL-81725 core_courseformat: Fix refreshCompletion on
 subsections

* If completion information on subsection is not present the
refreshCompletion action is raising an exception
---
 course/format/amd/build/local/courseindex/cm.min.js     | 2 +-
 course/format/amd/build/local/courseindex/cm.min.js.map | 2 +-
 course/format/amd/src/local/courseindex/cm.js           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/course/format/amd/build/local/courseindex/cm.min.js b/course/format/amd/build/local/courseindex/cm.min.js
index 47f1a92579d12..3146530c464ac 100644
--- a/course/format/amd/build/local/courseindex/cm.min.js
+++ b/course/format/amd/build/local/courseindex/cm.min.js
@@ -8,6 +8,6 @@ define("core_courseformat/local/courseindex/cm",["exports","core_courseformat/lo
    * @class      core_courseformat/local/courseindex/cm
    * @copyright  2021 Ferran Recio <ferran@moodle.com>
    * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
-   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,_dndcmitem=_interopRequireDefault(_dndcmitem),_templates=_interopRequireDefault(_templates),_prefetch=_interopRequireDefault(_prefetch),_config=_interopRequireDefault(_config),_pending=_interopRequireDefault(_pending);_prefetch.default.prefetchTemplate("core_courseformat/local/courseindex/cmcompletion");class Component extends _dndcmitem.default{create(){this.name="courseindex_cm",this.selectors={CM_NAME:"[data-for='cm_name']",CM_COMPLETION:"[data-for='cm_completion']"},this.classes={CMHIDDEN:"dimmed",LOCKED:"editinprogress",RESTRICTIONS:"restrictions",PAGEITEM:"pageitem",INDENTED:"indented"},this.id=this.element.dataset.id}static init(target,selectors){return new this({element:document.getElementById(target),selectors:selectors})}stateReady(state){this.configDragDrop(this.id);const cm=state.cm.get(this.id),course=state.course;this._refreshCompletion({state:state,element:cm});const anchor=new URL(window.location.href).hash.replace("#","");(window.location.href==cm.url||window.location.href.includes(course.baseurl)&&anchor==cm.anchor)&&this.element.scrollIntoView({block:"center"}),_config.default.contextid!=_config.default.courseContextId&&_config.default.contextInstanceId==this.id&&(this.reactive.dispatch("setPageItem","cm",this.id,!0),this.element.scrollIntoView({block:"center"})),cm.uservisible&&cm.url||this.addEventListener(this.getElement(this.selectors.CM_NAME),"click",this._activityAnchor)}getWatchers(){return[{watch:"cm[".concat(this.id,"]:deleted"),handler:this.remove},{watch:"cm[".concat(this.id,"]:updated"),handler:this._refreshCm},{watch:"cm[".concat(this.id,"].completionstate:updated"),handler:this._refreshCompletion},{watch:"course.pageItem:updated",handler:this._refreshPageItem}]}_refreshCm(_ref){var _element$dragging,_element$locked,_element$hascmrestric;let{element:element}=_ref;this.element.classList.toggle(this.classes.CMHIDDEN,!element.visible),this.getElement(this.selectors.CM_NAME).innerHTML=element.name,this.element.classList.toggle(this.classes.DRAGGING,null!==(_element$dragging=element.dragging)&&void 0!==_element$dragging&&_element$dragging),this.element.classList.toggle(this.classes.LOCKED,null!==(_element$locked=element.locked)&&void 0!==_element$locked&&_element$locked),this.element.classList.toggle(this.classes.RESTRICTIONS,null!==(_element$hascmrestric=element.hascmrestrictions)&&void 0!==_element$hascmrestric&&_element$hascmrestric),this.element.classList.toggle(this.classes.INDENTED,element.indent),this.locked=element.locked}_refreshPageItem(_ref2){let{element:element}=_ref2;if(!element.pageItem)return;const isPageId="cm"==element.pageItem.type&&element.pageItem.id==this.id;this.element.classList.toggle(this.classes.PAGEITEM,isPageId),isPageId&&!this.reactive.isEditing&&this.element.scrollIntoView({block:"nearest"})}async _refreshCompletion(_ref3){let{state:state,element:element}=_ref3;if(this.reactive.isEditing||!element.istrackeduser)return;const completionElement=this.getElement(this.selectors.CM_COMPLETION);if(completionElement.dataset.value==element.completionstate)return;const data=this.reactive.getExporter().cmCompletion(state,element),{html:html,js:js}=await _templates.default.renderForPromise("core_courseformat/local/courseindex/cmcompletion",data);_templates.default.replaceNode(completionElement,html,js)}_activityAnchor(event){const cm=this.reactive.get("cm",this.id);if(document.getElementById(cm.anchor)){this.reactive.dispatch("sectionContentCollapsed",[cm.sectionid],!1);const pendingAnchor=new _pending.default("courseformat/activity:openAnchor");return void setTimeout((()=>{this.reactive.dispatch("setPageItem","cm",cm.id),pendingAnchor.resolve()}),50)}const course=this.reactive.get("course"),section=this.reactive.get("section",cm.sectionid);if(!section)return;const url="".concat(course.baseurl,"&section=").concat(section.number,"#").concat(cm.anchor);event.preventDefault(),window.location=url}}return _exports.default=Component,_exports.default}));
+   */Object.defineProperty(_exports,"__esModule",{value:!0}),_exports.default=void 0,_dndcmitem=_interopRequireDefault(_dndcmitem),_templates=_interopRequireDefault(_templates),_prefetch=_interopRequireDefault(_prefetch),_config=_interopRequireDefault(_config),_pending=_interopRequireDefault(_pending);_prefetch.default.prefetchTemplate("core_courseformat/local/courseindex/cmcompletion");class Component extends _dndcmitem.default{create(){this.name="courseindex_cm",this.selectors={CM_NAME:"[data-for='cm_name']",CM_COMPLETION:"[data-for='cm_completion']"},this.classes={CMHIDDEN:"dimmed",LOCKED:"editinprogress",RESTRICTIONS:"restrictions",PAGEITEM:"pageitem",INDENTED:"indented"},this.id=this.element.dataset.id}static init(target,selectors){return new this({element:document.getElementById(target),selectors:selectors})}stateReady(state){this.configDragDrop(this.id);const cm=state.cm.get(this.id),course=state.course;this._refreshCompletion({state:state,element:cm});const anchor=new URL(window.location.href).hash.replace("#","");(window.location.href==cm.url||window.location.href.includes(course.baseurl)&&anchor==cm.anchor)&&this.element.scrollIntoView({block:"center"}),_config.default.contextid!=_config.default.courseContextId&&_config.default.contextInstanceId==this.id&&(this.reactive.dispatch("setPageItem","cm",this.id,!0),this.element.scrollIntoView({block:"center"})),cm.uservisible&&cm.url||this.addEventListener(this.getElement(this.selectors.CM_NAME),"click",this._activityAnchor)}getWatchers(){return[{watch:"cm[".concat(this.id,"]:deleted"),handler:this.remove},{watch:"cm[".concat(this.id,"]:updated"),handler:this._refreshCm},{watch:"cm[".concat(this.id,"].completionstate:updated"),handler:this._refreshCompletion},{watch:"course.pageItem:updated",handler:this._refreshPageItem}]}_refreshCm(_ref){var _element$dragging,_element$locked,_element$hascmrestric;let{element:element}=_ref;this.element.classList.toggle(this.classes.CMHIDDEN,!element.visible),this.getElement(this.selectors.CM_NAME).innerHTML=element.name,this.element.classList.toggle(this.classes.DRAGGING,null!==(_element$dragging=element.dragging)&&void 0!==_element$dragging&&_element$dragging),this.element.classList.toggle(this.classes.LOCKED,null!==(_element$locked=element.locked)&&void 0!==_element$locked&&_element$locked),this.element.classList.toggle(this.classes.RESTRICTIONS,null!==(_element$hascmrestric=element.hascmrestrictions)&&void 0!==_element$hascmrestric&&_element$hascmrestric),this.element.classList.toggle(this.classes.INDENTED,element.indent),this.locked=element.locked}_refreshPageItem(_ref2){let{element:element}=_ref2;if(!element.pageItem)return;const isPageId="cm"==element.pageItem.type&&element.pageItem.id==this.id;this.element.classList.toggle(this.classes.PAGEITEM,isPageId),isPageId&&!this.reactive.isEditing&&this.element.scrollIntoView({block:"nearest"})}async _refreshCompletion(_ref3){let{state:state,element:element}=_ref3;if(this.reactive.isEditing||!element.istrackeduser)return;const completionElement=this.getElement(this.selectors.CM_COMPLETION);if(!completionElement||completionElement.dataset.value==element.completionstate)return;const data=this.reactive.getExporter().cmCompletion(state,element),{html:html,js:js}=await _templates.default.renderForPromise("core_courseformat/local/courseindex/cmcompletion",data);_templates.default.replaceNode(completionElement,html,js)}_activityAnchor(event){const cm=this.reactive.get("cm",this.id);if(document.getElementById(cm.anchor)){this.reactive.dispatch("sectionContentCollapsed",[cm.sectionid],!1);const pendingAnchor=new _pending.default("courseformat/activity:openAnchor");return void setTimeout((()=>{this.reactive.dispatch("setPageItem","cm",cm.id),pendingAnchor.resolve()}),50)}const course=this.reactive.get("course"),section=this.reactive.get("section",cm.sectionid);if(!section)return;const url="".concat(course.baseurl,"&section=").concat(section.number,"#").concat(cm.anchor);event.preventDefault(),window.location=url}}return _exports.default=Component,_exports.default}));
 
 //# sourceMappingURL=cm.min.js.map
\ No newline at end of file
diff --git a/course/format/amd/build/local/courseindex/cm.min.js.map b/course/format/amd/build/local/courseindex/cm.min.js.map
index 6fff4994e3055..49aed206eca4e 100644
--- a/course/format/amd/build/local/courseindex/cm.min.js.map
+++ b/course/format/amd/build/local/courseindex/cm.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"cm.min.js","sources":["../../../src/local/courseindex/cm.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Course index cm component.\n *\n * This component is used to control specific course modules interactions like drag and drop.\n *\n * @module     core_courseformat/local/courseindex/cm\n * @class      core_courseformat/local/courseindex/cm\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport DndCmItem from 'core_courseformat/local/courseeditor/dndcmitem';\nimport Templates from 'core/templates';\nimport Prefetch from 'core/prefetch';\nimport Config from 'core/config';\nimport Pending from \"core/pending\";\n\n// Prefetch the completion icons template.\nconst completionTemplate = 'core_courseformat/local/courseindex/cmcompletion';\nPrefetch.prefetchTemplate(completionTemplate);\n\nexport default class Component extends DndCmItem {\n\n    /**\n     * Constructor hook.\n     */\n    create() {\n        // Optional component name for debugging.\n        this.name = 'courseindex_cm';\n        // Default query selectors.\n        this.selectors = {\n            CM_NAME: `[data-for='cm_name']`,\n            CM_COMPLETION: `[data-for='cm_completion']`,\n        };\n        // Default classes to toggle on refresh.\n        this.classes = {\n            CMHIDDEN: 'dimmed',\n            LOCKED: 'editinprogress',\n            RESTRICTIONS: 'restrictions',\n            PAGEITEM: 'pageitem',\n            INDENTED: 'indented',\n        };\n        // We need our id to watch specific events.\n        this.id = this.element.dataset.id;\n    }\n\n    /**\n     * Static method to create a component instance form the mustache template.\n     *\n     * @param {element|string} target the DOM main element or its ID\n     * @param {object} selectors optional css selector overrides\n     * @return {Component}\n     */\n    static init(target, selectors) {\n        return new this({\n            element: document.getElementById(target),\n            selectors,\n        });\n    }\n\n    /**\n     * Initial state ready method.\n     *\n     * @param {Object} state the course state.\n     */\n    stateReady(state) {\n        this.configDragDrop(this.id);\n        const cm = state.cm.get(this.id);\n        const course = state.course;\n        // Refresh completion icon.\n        this._refreshCompletion({\n            state,\n            element: cm,\n        });\n        const url = new URL(window.location.href);\n        const anchor = url.hash.replace('#', '');\n        // Check if the current url is the cm url.\n        if (window.location.href == cm.url\n            || (window.location.href.includes(course.baseurl) && anchor == cm.anchor)\n        ) {\n            this.element.scrollIntoView({block: \"center\"});\n        }\n        // Check if this we are displaying this activity page.\n        if (Config.contextid != Config.courseContextId && Config.contextInstanceId == this.id) {\n            this.reactive.dispatch('setPageItem', 'cm', this.id, true);\n            this.element.scrollIntoView({block: \"center\"});\n        }\n        // Add anchor logic if the element is not user visible or the element hasn't URL.\n        if (!cm.uservisible || !cm.url) {\n            this.addEventListener(\n                this.getElement(this.selectors.CM_NAME),\n                'click',\n                this._activityAnchor,\n            );\n        }\n    }\n\n    /**\n     * Component watchers.\n     *\n     * @returns {Array} of watchers\n     */\n    getWatchers() {\n        return [\n            {watch: `cm[${this.id}]:deleted`, handler: this.remove},\n            {watch: `cm[${this.id}]:updated`, handler: this._refreshCm},\n            {watch: `cm[${this.id}].completionstate:updated`, handler: this._refreshCompletion},\n            {watch: `course.pageItem:updated`, handler: this._refreshPageItem},\n        ];\n    }\n\n    /**\n     * Update a course index cm using the state information.\n     *\n     * @param {object} param\n     * @param {Object} param.element details the update details.\n     */\n    _refreshCm({element}) {\n        // Update classes.\n        this.element.classList.toggle(this.classes.CMHIDDEN, !element.visible);\n        this.getElement(this.selectors.CM_NAME).innerHTML = element.name;\n        this.element.classList.toggle(this.classes.DRAGGING, element.dragging ?? false);\n        this.element.classList.toggle(this.classes.LOCKED, element.locked ?? false);\n        this.element.classList.toggle(this.classes.RESTRICTIONS, element.hascmrestrictions ?? false);\n        this.element.classList.toggle(this.classes.INDENTED, element.indent);\n        this.locked = element.locked;\n    }\n\n    /**\n     * Handle a page item update.\n     *\n     * @param {Object} details the update details\n     * @param {Object} details.element the course state data.\n     */\n    _refreshPageItem({element}) {\n        if (!element.pageItem) {\n            return;\n        }\n        const isPageId = (element.pageItem.type == 'cm' && element.pageItem.id == this.id);\n        this.element.classList.toggle(this.classes.PAGEITEM, isPageId);\n        if (isPageId && !this.reactive.isEditing) {\n            this.element.scrollIntoView({block: \"nearest\"});\n        }\n    }\n\n    /**\n     * Update the activity completion icon.\n     *\n     * @param {Object} details the update details\n     * @param {Object} details.state the state data\n     * @param {Object} details.element the element data\n     */\n    async _refreshCompletion({state, element}) {\n        // No completion icons are displayed in edit mode.\n        if (this.reactive.isEditing || !element.istrackeduser) {\n            return;\n        }\n        // Check if the completion value has changed.\n        const completionElement = this.getElement(this.selectors.CM_COMPLETION);\n        if (completionElement.dataset.value == element.completionstate) {\n            return;\n        }\n\n        // Collect section information from the state.\n        const exporter = this.reactive.getExporter();\n        const data = exporter.cmCompletion(state, element);\n\n        const {html, js} = await Templates.renderForPromise(completionTemplate, data);\n        Templates.replaceNode(completionElement, html, js);\n    }\n\n    /**\n     * The activity anchor event.\n     *\n     * @param {Event} event\n     */\n    _activityAnchor(event) {\n        const cm = this.reactive.get('cm', this.id);\n        // If the user cannot access the element but the element is present in the page\n        // the new url should be an anchor link.\n        const element = document.getElementById(cm.anchor);\n        if (element) {\n            // Make sure the section is expanded.\n            this.reactive.dispatch('sectionContentCollapsed', [cm.sectionid], false);\n            // Marc the element as page item once the event is handled.\n            const pendingAnchor = new Pending(`courseformat/activity:openAnchor`);\n            setTimeout(() => {\n                this.reactive.dispatch('setPageItem', 'cm', cm.id);\n                pendingAnchor.resolve();\n            }, 50);\n            return;\n        }\n        // If the element is not present in the page we need to go to the specific section.\n        const course = this.reactive.get('course');\n        const section = this.reactive.get('section', cm.sectionid);\n        if (!section) {\n            return;\n        }\n        const url = `${course.baseurl}&section=${section.number}#${cm.anchor}`;\n        event.preventDefault();\n        window.location = url;\n    }\n}\n"],"names":["prefetchTemplate","Component","DndCmItem","create","name","selectors","CM_NAME","CM_COMPLETION","classes","CMHIDDEN","LOCKED","RESTRICTIONS","PAGEITEM","INDENTED","id","this","element","dataset","target","document","getElementById","stateReady","state","configDragDrop","cm","get","course","_refreshCompletion","anchor","URL","window","location","href","hash","replace","url","includes","baseurl","scrollIntoView","block","Config","contextid","courseContextId","contextInstanceId","reactive","dispatch","uservisible","addEventListener","getElement","_activityAnchor","getWatchers","watch","handler","remove","_refreshCm","_refreshPageItem","classList","toggle","visible","innerHTML","DRAGGING","dragging","locked","hascmrestrictions","indent","pageItem","isPageId","type","isEditing","istrackeduser","completionElement","value","completionstate","data","getExporter","cmCompletion","html","js","Templates","renderForPromise","replaceNode","event","sectionid","pendingAnchor","Pending","setTimeout","resolve","section","number","preventDefault"],"mappings":";;;;;;;;;;iUAkCSA,iBADkB,0DAGNC,kBAAkBC,mBAKnCC,cAESC,KAAO,sBAEPC,UAAY,CACbC,+BACAC,iDAGCC,QAAU,CACXC,SAAU,SACVC,OAAQ,iBACRC,aAAc,eACdC,SAAU,WACVC,SAAU,iBAGTC,GAAKC,KAAKC,QAAQC,QAAQH,eAUvBI,OAAQb,kBACT,IAAIU,KAAK,CACZC,QAASG,SAASC,eAAeF,QACjCb,UAAAA,YASRgB,WAAWC,YACFC,eAAeR,KAAKD,UACnBU,GAAKF,MAAME,GAAGC,IAAIV,KAAKD,IACvBY,OAASJ,MAAMI,YAEhBC,mBAAmB,CACpBL,MAAAA,MACAN,QAASQ,WAGPI,OADM,IAAIC,IAAIC,OAAOC,SAASC,MACjBC,KAAKC,QAAQ,IAAK,KAEjCJ,OAAOC,SAASC,MAAQR,GAAGW,KACvBL,OAAOC,SAASC,KAAKI,SAASV,OAAOW,UAAYT,QAAUJ,GAAGI,cAE7DZ,QAAQsB,eAAe,CAACC,MAAO,WAGpCC,gBAAOC,WAAaD,gBAAOE,iBAAmBF,gBAAOG,mBAAqB5B,KAAKD,UAC1E8B,SAASC,SAAS,cAAe,KAAM9B,KAAKD,IAAI,QAChDE,QAAQsB,eAAe,CAACC,MAAO,YAGnCf,GAAGsB,aAAgBtB,GAAGW,UAClBY,iBACDhC,KAAKiC,WAAWjC,KAAKV,UAAUC,SAC/B,QACAS,KAAKkC,iBAUjBC,oBACW,CACH,CAACC,mBAAapC,KAAKD,gBAAesC,QAASrC,KAAKsC,QAChD,CAACF,mBAAapC,KAAKD,gBAAesC,QAASrC,KAAKuC,YAChD,CAACH,mBAAapC,KAAKD,gCAA+BsC,QAASrC,KAAKY,oBAChE,CAACwB,gCAAkCC,QAASrC,KAAKwC,mBAUzDD,iFAAWtC,QAACA,mBAEHA,QAAQwC,UAAUC,OAAO1C,KAAKP,QAAQC,UAAWO,QAAQ0C,cACzDV,WAAWjC,KAAKV,UAAUC,SAASqD,UAAY3C,QAAQZ,UACvDY,QAAQwC,UAAUC,OAAO1C,KAAKP,QAAQoD,mCAAU5C,QAAQ6C,+DACxD7C,QAAQwC,UAAUC,OAAO1C,KAAKP,QAAQE,+BAAQM,QAAQ8C,yDACtD9C,QAAQwC,UAAUC,OAAO1C,KAAKP,QAAQG,2CAAcK,QAAQ+C,gFAC5D/C,QAAQwC,UAAUC,OAAO1C,KAAKP,QAAQK,SAAUG,QAAQgD,aACxDF,OAAS9C,QAAQ8C,OAS1BP,4BAAiBvC,QAACA,mBACTA,QAAQiD,sBAGPC,SAAqC,MAAzBlD,QAAQiD,SAASE,MAAgBnD,QAAQiD,SAASnD,IAAMC,KAAKD,QAC1EE,QAAQwC,UAAUC,OAAO1C,KAAKP,QAAQI,SAAUsD,UACjDA,WAAanD,KAAK6B,SAASwB,gBACtBpD,QAAQsB,eAAe,CAACC,MAAO,gDAWnBjB,MAACA,MAADN,QAAQA,kBAEzBD,KAAK6B,SAASwB,YAAcpD,QAAQqD,2BAIlCC,kBAAoBvD,KAAKiC,WAAWjC,KAAKV,UAAUE,kBACrD+D,kBAAkBrD,QAAQsD,OAASvD,QAAQwD,6BAMzCC,KADW1D,KAAK6B,SAAS8B,cACTC,aAAarD,MAAON,UAEpC4D,KAACA,KAADC,GAAOA,UAAYC,mBAAUC,iBArJhB,mDAqJqDN,yBAC9DO,YAAYV,kBAAmBM,KAAMC,IAQnD5B,gBAAgBgC,aACNzD,GAAKT,KAAK6B,SAASnB,IAAI,KAAMV,KAAKD,OAGxBK,SAASC,eAAeI,GAAGI,QAC9B,MAEJgB,SAASC,SAAS,0BAA2B,CAACrB,GAAG0D,YAAY,SAE5DC,cAAgB,IAAIC,iEAC1BC,YAAW,UACFzC,SAASC,SAAS,cAAe,KAAMrB,GAAGV,IAC/CqE,cAAcG,YACf,UAID5D,OAASX,KAAK6B,SAASnB,IAAI,UAC3B8D,QAAUxE,KAAK6B,SAASnB,IAAI,UAAWD,GAAG0D,eAC3CK,qBAGCpD,cAAST,OAAOW,4BAAmBkD,QAAQC,mBAAUhE,GAAGI,QAC9DqD,MAAMQ,iBACN3D,OAAOC,SAAWI"}
\ No newline at end of file
+{"version":3,"file":"cm.min.js","sources":["../../../src/local/courseindex/cm.js"],"sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Course index cm component.\n *\n * This component is used to control specific course modules interactions like drag and drop.\n *\n * @module     core_courseformat/local/courseindex/cm\n * @class      core_courseformat/local/courseindex/cm\n * @copyright  2021 Ferran Recio <ferran@moodle.com>\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\nimport DndCmItem from 'core_courseformat/local/courseeditor/dndcmitem';\nimport Templates from 'core/templates';\nimport Prefetch from 'core/prefetch';\nimport Config from 'core/config';\nimport Pending from \"core/pending\";\n\n// Prefetch the completion icons template.\nconst completionTemplate = 'core_courseformat/local/courseindex/cmcompletion';\nPrefetch.prefetchTemplate(completionTemplate);\n\nexport default class Component extends DndCmItem {\n\n    /**\n     * Constructor hook.\n     */\n    create() {\n        // Optional component name for debugging.\n        this.name = 'courseindex_cm';\n        // Default query selectors.\n        this.selectors = {\n            CM_NAME: `[data-for='cm_name']`,\n            CM_COMPLETION: `[data-for='cm_completion']`,\n        };\n        // Default classes to toggle on refresh.\n        this.classes = {\n            CMHIDDEN: 'dimmed',\n            LOCKED: 'editinprogress',\n            RESTRICTIONS: 'restrictions',\n            PAGEITEM: 'pageitem',\n            INDENTED: 'indented',\n        };\n        // We need our id to watch specific events.\n        this.id = this.element.dataset.id;\n    }\n\n    /**\n     * Static method to create a component instance form the mustache template.\n     *\n     * @param {element|string} target the DOM main element or its ID\n     * @param {object} selectors optional css selector overrides\n     * @return {Component}\n     */\n    static init(target, selectors) {\n        return new this({\n            element: document.getElementById(target),\n            selectors,\n        });\n    }\n\n    /**\n     * Initial state ready method.\n     *\n     * @param {Object} state the course state.\n     */\n    stateReady(state) {\n        this.configDragDrop(this.id);\n        const cm = state.cm.get(this.id);\n        const course = state.course;\n        // Refresh completion icon.\n        this._refreshCompletion({\n            state,\n            element: cm,\n        });\n        const url = new URL(window.location.href);\n        const anchor = url.hash.replace('#', '');\n        // Check if the current url is the cm url.\n        if (window.location.href == cm.url\n            || (window.location.href.includes(course.baseurl) && anchor == cm.anchor)\n        ) {\n            this.element.scrollIntoView({block: \"center\"});\n        }\n        // Check if this we are displaying this activity page.\n        if (Config.contextid != Config.courseContextId && Config.contextInstanceId == this.id) {\n            this.reactive.dispatch('setPageItem', 'cm', this.id, true);\n            this.element.scrollIntoView({block: \"center\"});\n        }\n        // Add anchor logic if the element is not user visible or the element hasn't URL.\n        if (!cm.uservisible || !cm.url) {\n            this.addEventListener(\n                this.getElement(this.selectors.CM_NAME),\n                'click',\n                this._activityAnchor,\n            );\n        }\n    }\n\n    /**\n     * Component watchers.\n     *\n     * @returns {Array} of watchers\n     */\n    getWatchers() {\n        return [\n            {watch: `cm[${this.id}]:deleted`, handler: this.remove},\n            {watch: `cm[${this.id}]:updated`, handler: this._refreshCm},\n            {watch: `cm[${this.id}].completionstate:updated`, handler: this._refreshCompletion},\n            {watch: `course.pageItem:updated`, handler: this._refreshPageItem},\n        ];\n    }\n\n    /**\n     * Update a course index cm using the state information.\n     *\n     * @param {object} param\n     * @param {Object} param.element details the update details.\n     */\n    _refreshCm({element}) {\n        // Update classes.\n        this.element.classList.toggle(this.classes.CMHIDDEN, !element.visible);\n        this.getElement(this.selectors.CM_NAME).innerHTML = element.name;\n        this.element.classList.toggle(this.classes.DRAGGING, element.dragging ?? false);\n        this.element.classList.toggle(this.classes.LOCKED, element.locked ?? false);\n        this.element.classList.toggle(this.classes.RESTRICTIONS, element.hascmrestrictions ?? false);\n        this.element.classList.toggle(this.classes.INDENTED, element.indent);\n        this.locked = element.locked;\n    }\n\n    /**\n     * Handle a page item update.\n     *\n     * @param {Object} details the update details\n     * @param {Object} details.element the course state data.\n     */\n    _refreshPageItem({element}) {\n        if (!element.pageItem) {\n            return;\n        }\n        const isPageId = (element.pageItem.type == 'cm' && element.pageItem.id == this.id);\n        this.element.classList.toggle(this.classes.PAGEITEM, isPageId);\n        if (isPageId && !this.reactive.isEditing) {\n            this.element.scrollIntoView({block: \"nearest\"});\n        }\n    }\n\n    /**\n     * Update the activity completion icon.\n     *\n     * @param {Object} details the update details\n     * @param {Object} details.state the state data\n     * @param {Object} details.element the element data\n     */\n    async _refreshCompletion({state, element}) {\n        // No completion icons are displayed in edit mode.\n        if (this.reactive.isEditing || !element.istrackeduser) {\n            return;\n        }\n        // Check if the completion value has changed.\n        const completionElement = this.getElement(this.selectors.CM_COMPLETION);\n        if (!completionElement || completionElement.dataset.value == element.completionstate) {\n            return;\n        }\n\n        // Collect section information from the state.\n        const exporter = this.reactive.getExporter();\n        const data = exporter.cmCompletion(state, element);\n\n        const {html, js} = await Templates.renderForPromise(completionTemplate, data);\n        Templates.replaceNode(completionElement, html, js);\n    }\n\n    /**\n     * The activity anchor event.\n     *\n     * @param {Event} event\n     */\n    _activityAnchor(event) {\n        const cm = this.reactive.get('cm', this.id);\n        // If the user cannot access the element but the element is present in the page\n        // the new url should be an anchor link.\n        const element = document.getElementById(cm.anchor);\n        if (element) {\n            // Make sure the section is expanded.\n            this.reactive.dispatch('sectionContentCollapsed', [cm.sectionid], false);\n            // Marc the element as page item once the event is handled.\n            const pendingAnchor = new Pending(`courseformat/activity:openAnchor`);\n            setTimeout(() => {\n                this.reactive.dispatch('setPageItem', 'cm', cm.id);\n                pendingAnchor.resolve();\n            }, 50);\n            return;\n        }\n        // If the element is not present in the page we need to go to the specific section.\n        const course = this.reactive.get('course');\n        const section = this.reactive.get('section', cm.sectionid);\n        if (!section) {\n            return;\n        }\n        const url = `${course.baseurl}&section=${section.number}#${cm.anchor}`;\n        event.preventDefault();\n        window.location = url;\n    }\n}\n"],"names":["prefetchTemplate","Component","DndCmItem","create","name","selectors","CM_NAME","CM_COMPLETION","classes","CMHIDDEN","LOCKED","RESTRICTIONS","PAGEITEM","INDENTED","id","this","element","dataset","target","document","getElementById","stateReady","state","configDragDrop","cm","get","course","_refreshCompletion","anchor","URL","window","location","href","hash","replace","url","includes","baseurl","scrollIntoView","block","Config","contextid","courseContextId","contextInstanceId","reactive","dispatch","uservisible","addEventListener","getElement","_activityAnchor","getWatchers","watch","handler","remove","_refreshCm","_refreshPageItem","classList","toggle","visible","innerHTML","DRAGGING","dragging","locked","hascmrestrictions","indent","pageItem","isPageId","type","isEditing","istrackeduser","completionElement","value","completionstate","data","getExporter","cmCompletion","html","js","Templates","renderForPromise","replaceNode","event","sectionid","pendingAnchor","Pending","setTimeout","resolve","section","number","preventDefault"],"mappings":";;;;;;;;;;iUAkCSA,iBADkB,0DAGNC,kBAAkBC,mBAKnCC,cAESC,KAAO,sBAEPC,UAAY,CACbC,+BACAC,iDAGCC,QAAU,CACXC,SAAU,SACVC,OAAQ,iBACRC,aAAc,eACdC,SAAU,WACVC,SAAU,iBAGTC,GAAKC,KAAKC,QAAQC,QAAQH,eAUvBI,OAAQb,kBACT,IAAIU,KAAK,CACZC,QAASG,SAASC,eAAeF,QACjCb,UAAAA,YASRgB,WAAWC,YACFC,eAAeR,KAAKD,UACnBU,GAAKF,MAAME,GAAGC,IAAIV,KAAKD,IACvBY,OAASJ,MAAMI,YAEhBC,mBAAmB,CACpBL,MAAAA,MACAN,QAASQ,WAGPI,OADM,IAAIC,IAAIC,OAAOC,SAASC,MACjBC,KAAKC,QAAQ,IAAK,KAEjCJ,OAAOC,SAASC,MAAQR,GAAGW,KACvBL,OAAOC,SAASC,KAAKI,SAASV,OAAOW,UAAYT,QAAUJ,GAAGI,cAE7DZ,QAAQsB,eAAe,CAACC,MAAO,WAGpCC,gBAAOC,WAAaD,gBAAOE,iBAAmBF,gBAAOG,mBAAqB5B,KAAKD,UAC1E8B,SAASC,SAAS,cAAe,KAAM9B,KAAKD,IAAI,QAChDE,QAAQsB,eAAe,CAACC,MAAO,YAGnCf,GAAGsB,aAAgBtB,GAAGW,UAClBY,iBACDhC,KAAKiC,WAAWjC,KAAKV,UAAUC,SAC/B,QACAS,KAAKkC,iBAUjBC,oBACW,CACH,CAACC,mBAAapC,KAAKD,gBAAesC,QAASrC,KAAKsC,QAChD,CAACF,mBAAapC,KAAKD,gBAAesC,QAASrC,KAAKuC,YAChD,CAACH,mBAAapC,KAAKD,gCAA+BsC,QAASrC,KAAKY,oBAChE,CAACwB,gCAAkCC,QAASrC,KAAKwC,mBAUzDD,iFAAWtC,QAACA,mBAEHA,QAAQwC,UAAUC,OAAO1C,KAAKP,QAAQC,UAAWO,QAAQ0C,cACzDV,WAAWjC,KAAKV,UAAUC,SAASqD,UAAY3C,QAAQZ,UACvDY,QAAQwC,UAAUC,OAAO1C,KAAKP,QAAQoD,mCAAU5C,QAAQ6C,+DACxD7C,QAAQwC,UAAUC,OAAO1C,KAAKP,QAAQE,+BAAQM,QAAQ8C,yDACtD9C,QAAQwC,UAAUC,OAAO1C,KAAKP,QAAQG,2CAAcK,QAAQ+C,gFAC5D/C,QAAQwC,UAAUC,OAAO1C,KAAKP,QAAQK,SAAUG,QAAQgD,aACxDF,OAAS9C,QAAQ8C,OAS1BP,4BAAiBvC,QAACA,mBACTA,QAAQiD,sBAGPC,SAAqC,MAAzBlD,QAAQiD,SAASE,MAAgBnD,QAAQiD,SAASnD,IAAMC,KAAKD,QAC1EE,QAAQwC,UAAUC,OAAO1C,KAAKP,QAAQI,SAAUsD,UACjDA,WAAanD,KAAK6B,SAASwB,gBACtBpD,QAAQsB,eAAe,CAACC,MAAO,gDAWnBjB,MAACA,MAADN,QAAQA,kBAEzBD,KAAK6B,SAASwB,YAAcpD,QAAQqD,2BAIlCC,kBAAoBvD,KAAKiC,WAAWjC,KAAKV,UAAUE,mBACpD+D,mBAAqBA,kBAAkBrD,QAAQsD,OAASvD,QAAQwD,6BAM/DC,KADW1D,KAAK6B,SAAS8B,cACTC,aAAarD,MAAON,UAEpC4D,KAACA,KAADC,GAAOA,UAAYC,mBAAUC,iBArJhB,mDAqJqDN,yBAC9DO,YAAYV,kBAAmBM,KAAMC,IAQnD5B,gBAAgBgC,aACNzD,GAAKT,KAAK6B,SAASnB,IAAI,KAAMV,KAAKD,OAGxBK,SAASC,eAAeI,GAAGI,QAC9B,MAEJgB,SAASC,SAAS,0BAA2B,CAACrB,GAAG0D,YAAY,SAE5DC,cAAgB,IAAIC,iEAC1BC,YAAW,UACFzC,SAASC,SAAS,cAAe,KAAMrB,GAAGV,IAC/CqE,cAAcG,YACf,UAID5D,OAASX,KAAK6B,SAASnB,IAAI,UAC3B8D,QAAUxE,KAAK6B,SAASnB,IAAI,UAAWD,GAAG0D,eAC3CK,qBAGCpD,cAAST,OAAOW,4BAAmBkD,QAAQC,mBAAUhE,GAAGI,QAC9DqD,MAAMQ,iBACN3D,OAAOC,SAAWI"}
\ No newline at end of file
diff --git a/course/format/amd/src/local/courseindex/cm.js b/course/format/amd/src/local/courseindex/cm.js
index 22ffe7aeb14ed..c6ee753509750 100644
--- a/course/format/amd/src/local/courseindex/cm.js
+++ b/course/format/amd/src/local/courseindex/cm.js
@@ -172,7 +172,7 @@ export default class Component extends DndCmItem {
         }
         // Check if the completion value has changed.
         const completionElement = this.getElement(this.selectors.CM_COMPLETION);
-        if (completionElement.dataset.value == element.completionstate) {
+        if (!completionElement || completionElement.dataset.value == element.completionstate) {
             return;
         }
 

From cfa85f5e145372590693fabffe4fda73f108cea2 Mon Sep 17 00:00:00 2001
From: lameze <simey@moodle.com>
Date: Wed, 3 Jul 2024 11:33:22 +0800
Subject: [PATCH 106/119] NOBUG: Increase file size to avoid random failures

---
 admin/tool/dataprivacy/tests/behat/dataexport.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/tool/dataprivacy/tests/behat/dataexport.feature b/admin/tool/dataprivacy/tests/behat/dataexport.feature
index 0efed8fed2502..d879654127787 100644
--- a/admin/tool/dataprivacy/tests/behat/dataexport.feature
+++ b/admin/tool/dataprivacy/tests/behat/dataexport.feature
@@ -185,7 +185,7 @@ Feature: Data export from the privacy API
     And I reload the page
     And I should see "Download ready" in the "Victim User 1" "table_row"
     And I open the action menu in "Victim User 1" "table_row"
-    And following "Download" should download between "1" and "170000" bytes
+    And following "Download" should download between "1" and "172000" bytes
     And the following config values are set as admin:
       | privacyrequestexpiry | 1 | tool_dataprivacy |
     And I wait "1" seconds

From b8450de7c5f4e46fb624c28f4a133beb81969e82 Mon Sep 17 00:00:00 2001
From: Huong Nguyen <huongnv13@gmail.com>
Date: Wed, 3 Jul 2024 09:44:48 +0700
Subject: [PATCH 107/119] MDL-82363 Calendar: Responsiveness improvement for
 calendar block

Hide the month name if the screen is too small
---
 theme/boost/scss/moodle/calendar.scss | 5 ++++-
 theme/boost/style/moodle.css          | 5 ++++-
 theme/classic/style/moodle.css        | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/theme/boost/scss/moodle/calendar.scss b/theme/boost/scss/moodle/calendar.scss
index 9991b797caac8..205211dae2ff3 100644
--- a/theme/boost/scss/moodle/calendar.scss
+++ b/theme/boost/scss/moodle/calendar.scss
@@ -628,7 +628,10 @@ table.calendartable caption {
                         .previous,
                         .next {
                             width: 30%;
-                            font-size: 0.8em;
+
+                            .arrow_text {
+                                display: none;
+                            }
                         }
                     }
 
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 253667f40f150..df19af1a43f05 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -27753,7 +27753,10 @@ table.calendartable caption {
   section:not(#region-main) .block.block_calendar_month .maincalendar .calendarwrapper .previous,
   section:not(#region-main) .block.block_calendar_month .maincalendar .calendarwrapper .next {
     width: 30%;
-    font-size: 0.8em;
+  }
+  section:not(#region-main) .block.block_calendar_month .maincalendar .calendarwrapper .previous .arrow_text,
+  section:not(#region-main) .block.block_calendar_month .maincalendar .calendarwrapper .next .arrow_text {
+    display: none;
   }
   section:not(#region-main) .block.block_calendar_month .maincalendar .calendartable.calendarmonth th,
   section:not(#region-main) .block.block_calendar_month .maincalendar .calendartable.calendarmonth td {
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index e58998b898afa..ce1021cb397d8 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -27753,7 +27753,10 @@ table.calendartable caption {
   section:not(#region-main) .block.block_calendar_month .maincalendar .calendarwrapper .previous,
   section:not(#region-main) .block.block_calendar_month .maincalendar .calendarwrapper .next {
     width: 30%;
-    font-size: 0.8em;
+  }
+  section:not(#region-main) .block.block_calendar_month .maincalendar .calendarwrapper .previous .arrow_text,
+  section:not(#region-main) .block.block_calendar_month .maincalendar .calendarwrapper .next .arrow_text {
+    display: none;
   }
   section:not(#region-main) .block.block_calendar_month .maincalendar .calendartable.calendarmonth th,
   section:not(#region-main) .block.block_calendar_month .maincalendar .calendartable.calendarmonth td {

From b92e45cf84ac610c68313c9c2a374f87939cf474 Mon Sep 17 00:00:00 2001
From: David Woloszyn <david.woloszyn@moodle.com>
Date: Wed, 3 Jul 2024 15:36:50 +1000
Subject: [PATCH 108/119] MDL-79716 mod_assign: Send notifications for
 approaching due dates

---
 mod/assign/classes/notification_helper.php    | 270 ++++++++++++++++++
 ...assignment_due_soon_notification_tasks.php |  52 ++++
 ..._due_soon_notification_tasks_for_users.php |  48 ++++
 ...signment_due_soon_notification_to_user.php |  39 +++
 mod/assign/db/messages.php                    |   9 +-
 mod/assign/db/tasks.php                       |  11 +-
 mod/assign/lang/en/assign.php                 |   7 +
 mod/assign/tests/notification_helper_test.php | 240 ++++++++++++++++
 mod/assign/version.php                        |   2 +-
 9 files changed, 675 insertions(+), 3 deletions(-)
 create mode 100644 mod/assign/classes/notification_helper.php
 create mode 100644 mod/assign/classes/task/queue_all_assignment_due_soon_notification_tasks.php
 create mode 100644 mod/assign/classes/task/queue_assignment_due_soon_notification_tasks_for_users.php
 create mode 100644 mod/assign/classes/task/send_assignment_due_soon_notification_to_user.php
 create mode 100644 mod/assign/tests/notification_helper_test.php

diff --git a/mod/assign/classes/notification_helper.php b/mod/assign/classes/notification_helper.php
new file mode 100644
index 0000000000000..80c78519f5d20
--- /dev/null
+++ b/mod/assign/classes/notification_helper.php
@@ -0,0 +1,270 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace mod_assign;
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->dirroot . '/mod/assign/locallib.php');
+
+/**
+ * Helper for sending assignment related notifications.
+ *
+ * @package    mod_assign
+ * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class notification_helper {
+
+    /**
+     * @var int Due soon time interval of 48 hours.
+     */
+    private const INTERVAL_DUE_SOON = (DAYSECS * 2);
+
+    /**
+     * @var string Due soon notification type.
+     */
+    public const TYPE_DUE_SOON = 'assign_due_soon';
+
+    /**
+     * Get all assignments that have an approaching due date (includes users and groups with due date overrides).
+     *
+     * @return \moodle_recordset Returns the matching assignment records.
+     */
+    public static function get_due_soon_assignments(): \moodle_recordset {
+        global $DB;
+
+        $timenow = self::get_time_now();
+        $futuretime = self::get_future_time(self::INTERVAL_DUE_SOON);
+
+        $sql = "SELECT DISTINCT a.id
+                  FROM {assign} a
+                  JOIN {course_modules} cm ON a.id = cm.instance
+                  JOIN {modules} m ON cm.module = m.id AND m.name = :modulename
+             LEFT JOIN {assign_overrides} ao ON a.id = ao.assignid
+                 WHERE (a.duedate < :futuretime OR ao.duedate < :ao_futuretime)
+                   AND (a.duedate > :timenow OR ao.duedate > :ao_timenow)";
+
+        $params = [
+            'timenow' => $timenow,
+            'futuretime' => $futuretime,
+            'ao_timenow' => $timenow,
+            'ao_futuretime' => $futuretime,
+            'modulename' => 'assign',
+        ];
+
+        return $DB->get_recordset_sql($sql, $params);
+    }
+
+    /**
+     * Get all users that have an approaching due date within an assignment.
+     *
+     * @param int $assignmentid The assignment id.
+     * @param string $type The notification type.
+     * @return array The users after all filtering has been applied.
+     */
+    public static function get_users_within_assignment(int $assignmentid, string $type): array {
+        // Get assignment data.
+        $assignmentobj = self::get_assignment_data($assignmentid);
+
+        // Get our assignment users.
+        $users = $assignmentobj->list_participants(0, true);
+
+        foreach ($users as $key => $user) {
+            // Check if the user has submitted already.
+            if ($assignmentobj->get_user_submission($user->id, false)) {
+                unset($users[$key]);
+                continue;
+            }
+
+            // Determine the user's due date with respect to any overrides.
+            $duedate = $assignmentobj->override_exists($user->id)->duedate ?? $assignmentobj->get_instance()->duedate;
+
+            // If the due date has no value, unset this user.
+            if (empty($duedate)) {
+                unset($users[$key]);
+                continue;
+            }
+
+            // Perform some checks depending on the notification type.
+            $match = [];
+            switch ($type) {
+                case self::TYPE_DUE_SOON:
+                    $range = [
+                        'lower' => self::get_time_now(),
+                        'upper' => self::get_future_time(self::INTERVAL_DUE_SOON),
+                    ];
+                    if (!self::is_time_within_range($duedate, $range)) {
+                        unset($users[$key]);
+                        break;
+                    }
+                    $match = [
+                        'assignmentid' => $assignmentid,
+                        'duedate' => $duedate,
+                    ];
+                    break;
+
+                default:
+                    break;
+            }
+
+            // Check if the user has already received this notification.
+            if (self::has_user_been_sent_a_notification_already($user->id, json_encode($match), $type)) {
+                unset($users[$key]);
+            }
+        }
+
+        return $users;
+    }
+
+    /**
+     * Send the due soon notification to the user.
+     *
+     * @param int $assignmentid The assignment id.
+     * @param int $userid The user id.
+     */
+    public static function send_due_soon_notification_to_user(int $assignmentid, int $userid): void {
+        // Get assignment data.
+        $assignmentobj = self::get_assignment_data($assignmentid);
+
+        // Check if the due date still within range.
+        $assignmentobj->update_effective_access($userid);
+        $duedate = $assignmentobj->get_instance($userid)->duedate;
+        $range = [
+            'lower' => self::get_time_now(),
+            'upper' => self::get_future_time(self::INTERVAL_DUE_SOON),
+        ];
+        if (!self::is_time_within_range($duedate, $range)) {
+            return;
+        }
+
+        // Check if the user has submitted already.
+        if ($assignmentobj->get_user_submission($userid, false)) {
+            return;
+        }
+
+        // Build the user's notification message.
+        $user = $assignmentobj->get_participant($userid);
+        $urlparams = [
+            'id' => $assignmentobj->get_course_module()->id,
+            'action' => 'view',
+        ];
+        $url = new \moodle_url('/mod/assign/view.php', $urlparams);
+
+        $stringparams = [
+            'firstname' => $user->firstname,
+            'assignmentname' => $assignmentobj->get_instance()->name,
+            'coursename' => $assignmentobj->get_course()->fullname,
+            'duedate' => userdate($duedate),
+            'url' => $url,
+        ];
+
+        $messagedata = [
+            'user' => \core_user::get_user($user->id),
+            'url' => $url->out(false),
+            'subject' => get_string('assignmentduesoonsubject', 'mod_assign', $stringparams),
+            'assignmentname' => $assignmentobj->get_instance()->name,
+            'html' => get_string('assignmentduesoonhtml', 'mod_assign', $stringparams),
+        ];
+
+        $message = new \core\message\message();
+        $message->component = 'mod_assign';
+        $message->name = self::TYPE_DUE_SOON;
+        $message->userfrom = \core_user::get_noreply_user();
+        $message->userto = $messagedata['user'];
+        $message->subject = $messagedata['subject'];
+        $message->fullmessageformat = FORMAT_HTML;
+        $message->fullmessage = html_to_text($messagedata['html']);
+        $message->fullmessagehtml = $messagedata['html'];
+        $message->smallmessage = $messagedata['subject'];
+        $message->notification = 1;
+        $message->contexturl = $messagedata['url'];
+        $message->contexturlname = $messagedata['assignmentname'];
+        // Use custom data to avoid future notifications being sent again.
+        $message->customdata = [
+            'assignmentid' => $assignmentid,
+            'duedate' => $duedate,
+        ];
+
+        message_send($message);
+    }
+
+    /**
+     * Get the time now.
+     *
+     * @return int The time now as a timestamp.
+     */
+    protected static function get_time_now(): int {
+        return \core\di::get(\core\clock::class)->time();
+    }
+
+    /**
+     * Get a future time.
+     *
+     * @param int $interval Amount of seconds added to the now time.
+     * @return int The time now value plus the interval.
+     */
+    protected static function get_future_time(int $interval): int {
+        return self::get_time_now() + $interval;
+    }
+
+    /**
+     * Check if a time is within the current time now and the future time values.
+     *
+     * @param int $time The timestamp to check.
+     * @param array $range Lower and upper times to check.
+     * @return boolean
+     */
+    protected static function is_time_within_range(int $time, array $range): bool {
+        return ($time > $range['lower'] && $time < $range['upper']);
+    }
+
+    /**
+     * Check if a user has been sent a notification already.
+     *
+     * @param int $userid The user id.
+     * @param string $match The custom data string to match on.
+     * @param string $type The notification/event type to match.
+     * @return bool Returns true if already sent.
+     */
+    protected static function has_user_been_sent_a_notification_already(int $userid, string $match, string $type): bool {
+        global $DB;
+
+        $sql = $DB->sql_compare_text('customdata', 255) . " = " . $DB->sql_compare_text(':match', 255) . "
+            AND useridto = :userid
+            AND component = :component
+            AND eventtype = :eventtype";
+
+        return $DB->count_records_select('notifications', $sql, [
+            'userid' => $userid,
+            'match' => $match,
+            'component' => 'mod_assign',
+            'eventtype' => $type,
+        ]);
+    }
+
+    /**
+     * Get the assignment object, including the course and course module.
+     *
+     * @param int $assignmentid The assignment id.
+     * @return \assign Returns the assign object.
+     */
+    protected static function get_assignment_data(int $assignmentid): \assign {
+        [$course, $assigncm] = get_course_and_cm_from_instance($assignmentid, 'assign');
+        $cmcontext = \context_module::instance($assigncm->id);
+        return new \assign($cmcontext, $assigncm, $course);
+    }
+}
diff --git a/mod/assign/classes/task/queue_all_assignment_due_soon_notification_tasks.php b/mod/assign/classes/task/queue_all_assignment_due_soon_notification_tasks.php
new file mode 100644
index 0000000000000..e36067d15693a
--- /dev/null
+++ b/mod/assign/classes/task/queue_all_assignment_due_soon_notification_tasks.php
@@ -0,0 +1,52 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace mod_assign\task;
+
+use core\task\scheduled_task;
+use mod_assign\notification_helper;
+
+/**
+ * Scheduled task to queue tasks for notifying about assignments with an approaching due date.
+ *
+ * @package    mod_assign
+ * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class queue_all_assignment_due_soon_notification_tasks extends scheduled_task {
+
+    /**
+     * Return the task name.
+     *
+     * @return string The name of the task.
+     */
+    public function get_name(): string {
+        return get_string('sendnotificationduedatesoon', 'mod_assign');
+    }
+
+    /**
+     * Execute the task.
+     */
+    public function execute(): void {
+        $assignments = notification_helper::get_due_soon_assignments();
+        foreach ($assignments as $assignment) {
+            $task = new queue_assignment_due_soon_notification_tasks_for_users();
+            $task->set_custom_data($assignment);
+            \core\task\manager::queue_adhoc_task($task, true);
+        }
+        $assignments->close();
+    }
+}
diff --git a/mod/assign/classes/task/queue_assignment_due_soon_notification_tasks_for_users.php b/mod/assign/classes/task/queue_assignment_due_soon_notification_tasks_for_users.php
new file mode 100644
index 0000000000000..b0fba125671f6
--- /dev/null
+++ b/mod/assign/classes/task/queue_assignment_due_soon_notification_tasks_for_users.php
@@ -0,0 +1,48 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace mod_assign\task;
+
+use core\task\adhoc_task;
+use mod_assign\notification_helper;
+
+/**
+ * Ad-hoc task to queue another task for notifying a user about an approaching due date.
+ *
+ * @package    mod_assign
+ * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class queue_assignment_due_soon_notification_tasks_for_users extends adhoc_task {
+
+    /**
+     * Execute the task.
+     */
+    public function execute(): void {
+        $assignmentid = $this->get_custom_data()->id;
+        $type = notification_helper::TYPE_DUE_SOON;
+        $users = notification_helper::get_users_within_assignment($assignmentid, $type);
+        foreach ($users as $user) {
+            $task = new send_assignment_due_soon_notification_to_user();
+            $task->set_custom_data([
+                'assignmentid' => $assignmentid,
+                'userid' => $user->id,
+            ]);
+            $task->set_userid($user->id);
+            \core\task\manager::queue_adhoc_task($task, true);
+        }
+    }
+}
diff --git a/mod/assign/classes/task/send_assignment_due_soon_notification_to_user.php b/mod/assign/classes/task/send_assignment_due_soon_notification_to_user.php
new file mode 100644
index 0000000000000..80ecd691fc8a6
--- /dev/null
+++ b/mod/assign/classes/task/send_assignment_due_soon_notification_to_user.php
@@ -0,0 +1,39 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace mod_assign\task;
+
+use core\task\adhoc_task;
+use mod_assign\notification_helper;
+
+/**
+ * Ad-hoc task to send a notification to a user about an approaching due date.
+ *
+ * @package    mod_assign
+ * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class send_assignment_due_soon_notification_to_user extends adhoc_task {
+
+    /**
+     * Execute the task.
+     */
+    public function execute(): void {
+        $assignmentid = $this->get_custom_data()->assignmentid;
+        $userid = $this->get_custom_data()->userid;
+        notification_helper::send_due_soon_notification_to_user($assignmentid, $userid);
+    }
+}
diff --git a/mod/assign/db/messages.php b/mod/assign/db/messages.php
index d298e9d287995..1275509e8b956 100644
--- a/mod/assign/db/messages.php
+++ b/mod/assign/db/messages.php
@@ -31,5 +31,12 @@
             'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
         ],
     ],
-
+    // Assignments with a due date soon.
+    'assign_due_soon' => [
+        'defaults' => [
+            'popup' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
+            'email' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
+            'airnotifier' => MESSAGE_PERMITTED + MESSAGE_DEFAULT_ENABLED,
+        ],
+    ],
 );
diff --git a/mod/assign/db/tasks.php b/mod/assign/db/tasks.php
index d13e143899f3d..f845e4ed69cfa 100644
--- a/mod/assign/db/tasks.php
+++ b/mod/assign/db/tasks.php
@@ -30,5 +30,14 @@
         'day' => '*',
         'month' => '*',
         'dayofweek' => '*'
-    )
+    ),
+    [
+        'classname' => '\mod_assign\task\queue_all_assignment_due_soon_notification_tasks',
+        'blocking' => 0,
+        'minute' => 'R',
+        'hour' => '*/2',
+        'day' => '*',
+        'month' => '*',
+        'dayofweek' => '*',
+    ],
 );
diff --git a/mod/assign/lang/en/assign.php b/mod/assign/lang/en/assign.php
index 6939ac3edf163..ded62596673e6 100644
--- a/mod/assign/lang/en/assign.php
+++ b/mod/assign/lang/en/assign.php
@@ -67,6 +67,11 @@
 $string['assign:viewownsubmissionsummary'] = 'View own submission summary';
 $string['assignfeedback'] = 'Feedback plugin';
 $string['assignfeedbackpluginname'] = 'Feedback plugin';
+$string['assignmentduesoonhtml'] = '<p>Hi {$a->firstname},</p>
+<p>The assignment <strong>{$a->assignmentname}</strong> in course {$a->coursename} is due soon.</p>
+<p><strong>Due: {$a->duedate}</strong></p>
+<p><a href="{$a->url}">Go to activity</a></p>';
+$string['assignmentduesoonsubject'] = 'Due on {$a->duedate}: {$a->assignmentname}';
 $string['assignmentisdue'] = 'Assignment is due';
 $string['assignmentmail'] = '{$a->grader} has posted some feedback on your
 assignment submission for \'{$a->assignment}\'
@@ -375,6 +380,7 @@
 $string['maxgrade'] = 'Maximum Grade';
 $string['maxperpage'] = 'Maximum assignments per page';
 $string['maxperpage_help'] = 'The maximum number of assignments a grader can show in the assignment grading page. This setting is useful in preventing timeouts for courses with a large number of participants.';
+$string['messageprovider:assign_due_soon'] = 'Assignment due soon notification';
 $string['messageprovider:assign_notification'] = 'Assignment notifications';
 $string['modulename'] = 'Assignment';
 $string['modulename_help'] = 'The assignment activity module enables a teacher to communicate tasks, collect work and provide grades and feedback.
@@ -521,6 +527,7 @@
 $string['selectuser'] = 'Select {$a}';
 $string['sendlatenotifications'] = 'Notify graders about late submissions';
 $string['sendlatenotifications_help'] = 'If enabled, graders (usually teachers) receive a message whenever a student submits an assignment late. Message methods are configurable.';
+$string['sendnotificationduedatesoon'] = 'Notify user of an approaching assignment due date';
 $string['sendsubmissionreceipts'] = 'Send submission receipt to students';
 $string['sendsubmissionreceipts_help'] = 'This switch enables submission receipts for students. Students will receive a notification every time they successfully submit an assignment.';
 $string['setmarkingallocation'] = 'Set allocated marker';
diff --git a/mod/assign/tests/notification_helper_test.php b/mod/assign/tests/notification_helper_test.php
new file mode 100644
index 0000000000000..0d1f58e7decee
--- /dev/null
+++ b/mod/assign/tests/notification_helper_test.php
@@ -0,0 +1,240 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace mod_assign;
+
+/**
+ * Test class for the assignment notification_helper.
+ *
+ * @package    mod_assign
+ * @category   test
+ * @copyright  2024 David Woloszyn <david.woloszyn@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers \mod_assign\notification_helper
+ */
+final class notification_helper_test extends \advanced_testcase {
+    /**
+     * Run all the tasks related to the notifications.
+     */
+    public function run_notification_helper_tasks(): void {
+        $task = \core\task\manager::get_scheduled_task(\mod_assign\task\queue_all_assignment_due_soon_notification_tasks::class);
+        $task->execute();
+        $clock = $this->mock_clock_with_frozen();
+
+        $adhoctask = \core\task\manager::get_next_adhoc_task($clock->time());
+        if ($adhoctask) {
+            $this->assertInstanceOf(\mod_assign\task\queue_assignment_due_soon_notification_tasks_for_users::class, $adhoctask);
+            $adhoctask->execute();
+            \core\task\manager::adhoc_task_complete($adhoctask);
+        }
+
+        $adhoctask = \core\task\manager::get_next_adhoc_task($clock->time());
+        if ($adhoctask) {
+            $this->assertInstanceOf(\mod_assign\task\send_assignment_due_soon_notification_to_user::class, $adhoctask);
+            $adhoctask->execute();
+            \core\task\manager::adhoc_task_complete($adhoctask);
+        }
+    }
+
+    /**
+     * Test getting assignments with a 'duedate' date within the date range.
+     */
+    public function test_get_due_soon_assignments(): void {
+        $this->resetAfterTest();
+        $generator = $this->getDataGenerator();
+        $helper = \core\di::get(notification_helper::class);
+        $clock = $this->mock_clock_with_frozen();
+
+        // Create an assignment with a due date < 48 hours.
+        $course = $generator->create_course();
+        $generator->create_module('assign', ['course' => $course->id, 'duedate' => $clock->time() + DAYSECS]);
+
+        // Check that we have a result returned.
+        $result = $helper::get_due_soon_assignments();
+        $this->assertTrue($result->valid());
+        $result->close();
+
+        // Time travel 3 days into the future. We should have no assignments in range.
+        $clock->bump(DAYSECS * 3);
+        $result = $helper::get_due_soon_assignments();
+        $this->assertFalse($result->valid());
+        $result->close();
+    }
+
+    /**
+     * Test getting users within an assignment that are within our date range.
+     */
+    public function test_get_users_within_assignment(): void {
+        global $DB;
+        $this->resetAfterTest();
+        $generator = $this->getDataGenerator();
+        $helper = \core\di::get(notification_helper::class);
+        $clock = $this->mock_clock_with_frozen();
+
+        // Create a course and enrol some users.
+        $course = $generator->create_course();
+        $user1 = $generator->create_user();
+        $user2 = $generator->create_user();
+        $user3 = $generator->create_user();
+        $user4 = $generator->create_user();
+        $user5 = $generator->create_user();
+        $user6 = $generator->create_user();
+        $generator->enrol_user($user1->id, $course->id, 'student');
+        $generator->enrol_user($user2->id, $course->id, 'student');
+        $generator->enrol_user($user3->id, $course->id, 'student');
+        $generator->enrol_user($user4->id, $course->id, 'student');
+        $generator->enrol_user($user5->id, $course->id, 'student');
+        $generator->enrol_user($user6->id, $course->id, 'teacher');
+
+        /** @var \mod_assign_generator $assignmentgenerator */
+        $assignmentgenerator = $generator->get_plugin_generator('mod_assign');
+
+        // Create an assignment with a due date < 48 hours.
+        $duedate = $clock->time() + DAYSECS;
+        $assignment = $assignmentgenerator->create_instance([
+            'course' => $course->id,
+            'duedate' => $duedate,
+        ]);
+
+        // User1 will have a user override, giving them an extra 1 hour for 'duedate'.
+        $userduedate = $duedate + HOURSECS;
+        $assignmentgenerator->create_override([
+            'assignid' => $assignment->id,
+            'userid' => $user1->id,
+            'duedate' => $userduedate,
+        ]);
+
+        // User2 and user3 will have a group override, giving them an extra 2 hours for 'duedate'.
+        $groupduedate = $duedate + (HOURSECS * 2);
+        $group = $generator->create_group(['courseid' => $course->id]);
+        $generator->create_group_member(['groupid' => $group->id, 'userid' => $user2->id]);
+        $generator->create_group_member(['groupid' => $group->id, 'userid' => $user3->id]);
+        $assignmentgenerator->create_override([
+            'assignid' => $assignment->id,
+            'groupid' => $group->id,
+            'duedate' => $groupduedate,
+        ]);
+
+        // User4 will have a user override of one extra week, excluding them from the results.
+        $userduedate = $duedate + WEEKSECS;
+        $assignmentgenerator->create_override([
+            'assignid' => $assignment->id,
+            'userid' => $user4->id,
+            'duedate' => $userduedate,
+        ]);
+
+        // User5 will submit the assignment, excluding them from the results.
+        $DB->insert_record('assign_submission', [
+            'assignment' => $assignment->id,
+            'userid' => $user5->id,
+            'status' => 'submitted',
+            'timemodified' => $clock->time(),
+        ]);
+
+        // There should be 3 users with the teacher excluded.
+        $users = $helper::get_users_within_assignment($assignment->id, $helper::TYPE_DUE_SOON);
+        $this->assertCount(3, $users);
+    }
+
+    /**
+     * Test sending the assignment due soon notification to a user.
+     */
+    public function test_send_notification_to_user(): void {
+        global $DB;
+        $this->resetAfterTest();
+        $generator = $this->getDataGenerator();
+        $helper = \core\di::get(notification_helper::class);
+        $clock = $this->mock_clock_with_frozen();
+
+        // Create a course and enrol a user.
+        $course = $generator->create_course();
+        $user1 = $generator->create_user();
+        $generator->enrol_user($user1->id, $course->id, 'student');
+
+        /** @var \mod_assign_generator $assignmentgenerator */
+        $assignmentgenerator = $generator->get_plugin_generator('mod_assign');
+
+        // Create an assignment with a due date < 48 hours.
+        $duedate = $clock->time() + DAYSECS;
+        $assignment = $assignmentgenerator->create_instance([
+            'course' => $course->id,
+            'duedate' => $duedate,
+        ]);
+
+        // Run the tasks.
+        $this->run_notification_helper_tasks();
+
+        // Get the assignment object.
+        [$course, $assigncm] = get_course_and_cm_from_instance($assignment->id, 'assign');
+        $cmcontext = \context_module::instance($assigncm->id);
+        $assignmentobj = new \assign($cmcontext, $assigncm, $course);
+        $duedate = $assignmentobj->get_instance($user1->id)->duedate;
+
+        // Get the notifications that should have been created during the adhoc task.
+        $notifications = $DB->get_records('notifications', ['useridto' => $user1->id]);
+        $this->assertCount(1, $notifications);
+
+        // Check the subject matches.
+        $stringparams = [
+            'duedate' => userdate($duedate),
+            'assignmentname' => $assignment->name,
+            'type' => $helper::TYPE_DUE_SOON,
+        ];
+        $expectedsubject = get_string('assignmentduesoonsubject', 'mod_assign', $stringparams);
+        $this->assertEquals($expectedsubject, reset($notifications)->subject);
+
+        // Run the tasks again.
+        $this->run_notification_helper_tasks();
+
+        // There should still only be one notification because nothing has changed.
+        $notifications = $DB->get_records('notifications', ['useridto' => $user1->id]);
+        $this->assertCount(1, $notifications);
+
+        // Let's modify the 'duedate' for the assignment (it will still be within the 48 hour range).
+        $updatedata = new \stdClass();
+        $updatedata->id = $assignment->id;
+        $updatedata->duedate = $duedate + HOURSECS;
+        $DB->update_record('assign', $updatedata);
+
+        // Run the tasks again.
+        $this->run_notification_helper_tasks();
+
+        // There should now be two notifications.
+        $notifications = $DB->get_records('notifications', ['useridto' => $user1->id]);
+        $this->assertCount(2, $notifications);
+
+        // Let's modify the 'duedate' one more time.
+        $updatedata = new \stdClass();
+        $updatedata->id = $assignment->id;
+        $updatedata->duedate = $duedate + (HOURSECS * 2);
+        $DB->update_record('assign', $updatedata);
+
+        // This time, the user will submit the assignment.
+        $DB->insert_record('assign_submission', [
+            'assignment' => $assignment->id,
+            'userid' => $user1->id,
+            'status' => 'submitted',
+            'timemodified' => $clock->time(),
+        ]);
+
+        // Run the tasks again.
+        $this->run_notification_helper_tasks();
+
+        // No new notification should have been sent.
+        $notifications = $DB->get_records('notifications', ['useridto' => $user1->id]);
+        $this->assertCount(2, $notifications);
+    }
+}
diff --git a/mod/assign/version.php b/mod/assign/version.php
index acd834fe27ea4..84dbc646e119c 100644
--- a/mod/assign/version.php
+++ b/mod/assign/version.php
@@ -25,5 +25,5 @@
 defined('MOODLE_INTERNAL') || die();
 
 $plugin->component = 'mod_assign'; // Full name of the plugin (used for diagnostics).
-$plugin->version  = 2024053100;    // The current module version (Date: YYYYMMDDXX).
+$plugin->version  = 2024070201;    // The current module version (Date: YYYYMMDDXX).
 $plugin->requires = 2024041600;    // Requires this Moodle version.

From 23cafba5e68a9c7de96d509fd6e8a7bc6b672995 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Wed, 3 Jul 2024 13:46:40 +0800
Subject: [PATCH 109/119] MDL-79716 mod_assign: Use $DB->record_exists_select()

---
 mod/assign/classes/notification_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/assign/classes/notification_helper.php b/mod/assign/classes/notification_helper.php
index 80c78519f5d20..04b10a64904df 100644
--- a/mod/assign/classes/notification_helper.php
+++ b/mod/assign/classes/notification_helper.php
@@ -248,7 +248,7 @@ protected static function has_user_been_sent_a_notification_already(int $userid,
             AND component = :component
             AND eventtype = :eventtype";
 
-        return $DB->count_records_select('notifications', $sql, [
+        return $DB->record_exists_select('notifications', $sql, [
             'userid' => $userid,
             'match' => $match,
             'component' => 'mod_assign',

From f06a670a6429b4a4acedc1c2faf92c5a8d20c2dd Mon Sep 17 00:00:00 2001
From: Hieu Nguyen Dang <hnd34@open.ac.uk>
Date: Wed, 3 Jul 2024 13:47:27 +0700
Subject: [PATCH 110/119] MDL-82100 Quiz\report: Show customised question
 numbers

---
 mod/quiz/report/grading/report.php                   |  2 +-
 mod/quiz/report/grading/tests/behat/grading.feature  |  5 +++--
 mod/quiz/report/overview/report.php                  |  2 +-
 mod/quiz/report/overview/tests/behat/basic.feature   | 10 +++++-----
 mod/quiz/report/reportlib.php                        |  1 +
 mod/quiz/report/responses/report.php                 |  6 +++---
 mod/quiz/report/responses/tests/behat/basic.feature  | 11 ++++++-----
 mod/quiz/report/statistics/report.php                |  4 +++-
 mod/quiz/report/statistics/tests/behat/basic.feature | 11 +++++++----
 9 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/mod/quiz/report/grading/report.php b/mod/quiz/report/grading/report.php
index c4828be382d89..24b92619f22b1 100644
--- a/mod/quiz/report/grading/report.php
+++ b/mod/quiz/report/grading/report.php
@@ -383,7 +383,7 @@ protected function display_index($includeauto) {
 
             $row = [];
 
-            $row[] = $this->questions[$counts->slot]->number;
+            $row[] = $this->questions[$counts->slot]->displaynumber;
 
             $row[] = $PAGE->get_renderer('question', 'bank')->qtype_icon($this->questions[$counts->slot]->qtype);
 
diff --git a/mod/quiz/report/grading/tests/behat/grading.feature b/mod/quiz/report/grading/tests/behat/grading.feature
index 8ef6f2c36468e..e72bc9f1bb19f 100644
--- a/mod/quiz/report/grading/tests/behat/grading.feature
+++ b/mod/quiz/report/grading/tests/behat/grading.feature
@@ -55,8 +55,8 @@ Feature: Basic use of the Manual grading report
       | quiz     | Quiz 1 | C1     | quiz1    | 1         | tging    |
       | quiz     | Quiz 2 | C1     | quiz2    | 1         | tging    |
     And quiz "Quiz 1" contains the following questions:
-      | question         | page |
-      | Short answer 001 | 1    |
+      | question         | page | displaynumber |
+      | Short answer 001 | 1    | 1a            |
 
   Scenario: Manual grading report without attempts
     When I am on the "Quiz 1" "mod_quiz > Manual grading report" page logged in as "teacher1"
@@ -98,6 +98,7 @@ Feature: Basic use of the Manual grading report
     And I set the field "Mark" to "0.6"
     And I press "Save and show next"
     And I should see "All selected attempts have been graded. Returning to the list of questions."
+    And "Short answer 001" row "Q #" column of "questionstograde" table should contain "1a"
     And "Short answer 001" row "To grade" column of "questionstograde" table should contain "0"
     And "Short answer 001" row "Already graded" column of "questionstograde" table should contain "1"
 
diff --git a/mod/quiz/report/overview/report.php b/mod/quiz/report/overview/report.php
index 358395d378f18..fb944f5480557 100644
--- a/mod/quiz/report/overview/report.php
+++ b/mod/quiz/report/overview/report.php
@@ -149,7 +149,7 @@ public function display($quiz, $cm, $course) {
             if ($options->slotmarks) {
                 foreach ($questions as $slot => $question) {
                     $columns[] = 'qsgrade' . $slot;
-                    $header = get_string('qbrief', 'quiz', $question->number);
+                    $header = get_string('qbrief', 'quiz', $question->displaynumber);
                     if (!$table->is_downloading()) {
                         $header .= '<br />';
                     } else {
diff --git a/mod/quiz/report/overview/tests/behat/basic.feature b/mod/quiz/report/overview/tests/behat/basic.feature
index 205537cd54395..868eb5d4615c6 100644
--- a/mod/quiz/report/overview/tests/behat/basic.feature
+++ b/mod/quiz/report/overview/tests/behat/basic.feature
@@ -46,10 +46,10 @@ Feature: Basic use of the Grades report
       | Test questions   | truefalse   | TF1   | First question       |
       | Test questions   | truefalse   | TF2   | Second question      |
     And quiz "Quiz 1" contains the following questions:
-      | question | page | maxmark |
-      | Intro    | 1    |         |
-      | TF1      | 1    |         |
-      | TF2      | 1    | 3.0     |
+      | question | page | maxmark | displaynumber |
+      | Intro    | 1    |         |               |
+      | TF1      | 1    |         |               |
+      | TF2      | 1    | 3.0     | 2a            |
     And user "student1" has attempted "Quiz 1" with responses:
       | slot | response |
       |   2  | True     |
@@ -68,7 +68,7 @@ Feature: Basic use of the Grades report
 
     # Verify that the right columns are visible
     And I should see "Q. 1"
-    And I should see "Q. 2"
+    And I should see "Q. 2a"
     And I should not see "Q. 3"
 
     # Check student1's grade
diff --git a/mod/quiz/report/reportlib.php b/mod/quiz/report/reportlib.php
index 9919d8c7c4cf2..21f4a47150cdd 100644
--- a/mod/quiz/report/reportlib.php
+++ b/mod/quiz/report/reportlib.php
@@ -113,6 +113,7 @@ function quiz_report_get_significant_questions($quiz) {
         $slotreport->qtype = $slot->qtype;
         $slotreport->length = $slot->length;
         $slotreport->number = $number;
+        $slotreport->displaynumber = $slot->displaynumber ?? $number;
         $number += $slot->length;
         $slotreport->maxmark = $slot->maxmark;
         $slotreport->category = $slot->category;
diff --git a/mod/quiz/report/responses/report.php b/mod/quiz/report/responses/report.php
index b77a86e5c8302..88291234cd20e 100644
--- a/mod/quiz/report/responses/report.php
+++ b/mod/quiz/report/responses/report.php
@@ -158,15 +158,15 @@ public function display($quiz, $cm, $course) {
             foreach ($questions as $id => $question) {
                 if ($options->showqtext) {
                     $columns[] = 'question' . $id;
-                    $headers[] = get_string('questionx', 'question', $question->number);
+                    $headers[] = get_string('questionx', 'question', $question->displaynumber);
                 }
                 if ($options->showresponses) {
                     $columns[] = 'response' . $id;
-                    $headers[] = get_string('responsex', 'quiz_responses', $question->number);
+                    $headers[] = get_string('responsex', 'quiz_responses', $question->displaynumber);
                 }
                 if ($options->showright) {
                     $columns[] = 'right' . $id;
-                    $headers[] = get_string('rightanswerx', 'quiz_responses', $question->number);
+                    $headers[] = get_string('rightanswerx', 'quiz_responses', $question->displaynumber);
                 }
             }
 
diff --git a/mod/quiz/report/responses/tests/behat/basic.feature b/mod/quiz/report/responses/tests/behat/basic.feature
index 7070b04f48425..c95249461588f 100644
--- a/mod/quiz/report/responses/tests/behat/basic.feature
+++ b/mod/quiz/report/responses/tests/behat/basic.feature
@@ -28,8 +28,8 @@ Feature: Basic use of the Responses report
       | questioncategory | qtype     | name | template |
       | Test questions   | numerical | NQ   | pi3tries |
     And quiz "Quiz 1" contains the following questions:
-      | question | page | maxmark |
-      | NQ       | 1    | 3.0     |
+      | question | page | maxmark | displaynumber |
+      | NQ       | 1    | 3.0     | 1a            |
 
   @javascript
   Scenario: Report works when there are no attempts
@@ -58,13 +58,14 @@ Feature: Basic use of the Responses report
     And I should not see "Student Two"
     And I set the field "Attempts from" to "enrolled users who have, or have not, attempted the quiz"
     And I set the field "Which tries" to "All tries"
+    And I should see "Response 1a"
     And I press "Show report"
-    And "Student OneReview attempt" row "Response 1Sort by Response 1 Ascending" column of "responses" table should contain "1.0"
+    And "Student OneReview attempt" row "Response 1aSort by Response 1a Ascending" column of "responses" table should contain "1.0"
     And "Student OneReview attempt" row "Status" column of "responses" table should contain ""
     And "Finished" row "Grade/100.00Sort by Grade/100.00 Ascending" column of "responses" table should contain "33.33"
-    And "Finished" row "Response 1Sort by Response 1 Ascending" column of "responses" table should contain "3.14"
+    And "Finished" row "Response 1aSort by Response 1a Ascending" column of "responses" table should contain "3.14"
     And "Student Two" row "Status" column of "responses" table should contain "-"
-    And "Student Two" row "Response 1Sort by Response 1 Ascending" column of "responses" table should contain "-"
+    And "Student Two" row "Response 1aSort by Response 1a Ascending" column of "responses" table should contain "-"
 
   @javascript
   Scenario: Report does not allow strange combinations of options
diff --git a/mod/quiz/report/statistics/report.php b/mod/quiz/report/statistics/report.php
index c6151a727eda0..1a7928b1b5936 100644
--- a/mod/quiz/report/statistics/report.php
+++ b/mod/quiz/report/statistics/report.php
@@ -890,11 +890,13 @@ public function load_and_initialise_questions_for_calculations($quiz) {
         $questions = quiz_report_get_significant_questions($quiz);
         $questiondata = [];
         foreach ($questions as $qs => $question) {
+            $displaynumber = $question->displaynumber;
             if ($question->qtype === 'random') {
                 $question->id = 0;
                 $question->name = get_string('random', 'quiz');
                 $question->questiontext = get_string('random', 'quiz');
                 $question->parenttype = 'random';
+                $question->number = $displaynumber;
                 $questiondata[$question->slot] = $question;
             } else if ($question->qtype === 'missingtype') {
                 $question->id = is_numeric($question->id) ? (int) $question->id : 0;
@@ -905,7 +907,7 @@ public function load_and_initialise_questions_for_calculations($quiz) {
                 $q = question_bank::load_question_data($question->id);
                 $q->maxmark = $question->maxmark;
                 $q->slot = $question->slot;
-                $q->number = $question->number;
+                $q->number = $displaynumber;
                 $q->parenttype = null;
                 $questiondata[$question->slot] = $q;
             }
diff --git a/mod/quiz/report/statistics/tests/behat/basic.feature b/mod/quiz/report/statistics/tests/behat/basic.feature
index 3228635443acc..514452bee558e 100644
--- a/mod/quiz/report/statistics/tests/behat/basic.feature
+++ b/mod/quiz/report/statistics/tests/behat/basic.feature
@@ -32,10 +32,10 @@ Feature: Basic use of the Statistics report
       | activity   | name   | course | idnumber |
       | quiz       | Quiz 1 | C1     | quiz1    |
     And quiz "Quiz 1" contains the following questions:
-      | question   | page |
-      | Question A | 1    |
-      | Question B | 1    |
-      | Question C | 2    |
+      | question   | page | displaynumber |
+      | Question A | 1    |               |
+      | Question B | 1    |               |
+      | Question C | 2    | 3c            |
 
   @javascript
   Scenario: Report works when there are no attempts
@@ -64,6 +64,7 @@ Feature: Basic use of the Statistics report
     And "Show chart data" "link" should exist
 
     # Question A statistics breakdown.
+    And "1" row "Q#" column of "questionstatistics" table should contain "1"
     And "1" row "Question name" column of "questionstatistics" table should contain "Question A"
     And "1" row "Attempts" column of "questionstatistics" table should contain "3"
     And "1" row "Facility index" column of "questionstatistics" table should contain "66.67%"
@@ -74,6 +75,7 @@ Feature: Basic use of the Statistics report
     And "1" row "Discrimination index" column of "questionstatistics" table should contain "50.00%"
 
     # Question B statistics breakdown.
+    And "2" row "Q#" column of "questionstatistics" table should contain "2"
     And "2" row "Question name" column of "questionstatistics" table should contain "Question B"
     And "2" row "Attempts" column of "questionstatistics" table should contain "3"
     And "2" row "Facility index" column of "questionstatistics" table should contain "33.33%"
@@ -84,6 +86,7 @@ Feature: Basic use of the Statistics report
     And "2" row "Discrimination index" column of "questionstatistics" table should contain "86.60%"
 
     # Question C statistics breakdown.
+    And "3" row "Q#" column of "questionstatistics" table should contain "3c"
     And "3" row "Question name" column of "questionstatistics" table should contain "Question C"
     And "3" row "Attempts" column of "questionstatistics" table should contain "3"
     And "3" row "Facility index" column of "questionstatistics" table should contain "33.33%"

From f9497ceade09b4d9d1398ebcd73764a1d24f9e62 Mon Sep 17 00:00:00 2001
From: Amaia Anabitarte <amaia@moodle.com>
Date: Wed, 19 Jun 2024 13:56:24 +0200
Subject: [PATCH 111/119] MDL-81771 core_report: Add Report as subsystem

---
 .upgradenotes/MDL-81771-2024062007575085.yml |  5 +++
 lang/en/report.php                           | 26 ++++++++++++++
 lib/components.json                          |  1 +
 lib/tests/component_test.php                 |  2 +-
 report/classes/privacy/provider.php          | 37 ++++++++++++++++++++
 version.php                                  |  2 +-
 6 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 .upgradenotes/MDL-81771-2024062007575085.yml
 create mode 100644 lang/en/report.php
 create mode 100644 report/classes/privacy/provider.php

diff --git a/.upgradenotes/MDL-81771-2024062007575085.yml b/.upgradenotes/MDL-81771-2024062007575085.yml
new file mode 100644
index 0000000000000..3378d8fa53e90
--- /dev/null
+++ b/.upgradenotes/MDL-81771-2024062007575085.yml
@@ -0,0 +1,5 @@
+issueNumber: MDL-81771
+notes:
+  core_report:
+    - message: Report has been added to subsystem components list
+      type: improved
diff --git a/lang/en/report.php b/lang/en/report.php
new file mode 100644
index 0000000000000..a2f9672ab1f3c
--- /dev/null
+++ b/lang/en/report.php
@@ -0,0 +1,26 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Strings for component 'report', language 'en'
+ *
+ * @package   core_report
+ * @copyright 2024 Amaia Anabitarte <amaia@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+$string['privacy:metadata'] = 'The Report system does not store any personal data.';
+
diff --git a/lib/components.json b/lib/components.json
index 651654cc583b4..72680af683e9d 100644
--- a/lib/components.json
+++ b/lib/components.json
@@ -109,6 +109,7 @@
         "privacy": "privacy",
         "question": "question",
         "rating": "rating",
+        "report": "report",
         "reportbuilder": "reportbuilder",
         "repository": "repository",
         "rss": "rss",
diff --git a/lib/tests/component_test.php b/lib/tests/component_test.php
index 97b6a31fdc1be..ebc70af8e7dc6 100644
--- a/lib/tests/component_test.php
+++ b/lib/tests/component_test.php
@@ -32,7 +32,7 @@ final class component_test extends advanced_testcase {
      * this is defined here to annoy devs that try to add more without any thinking,
      * always verify that it does not collide with any existing add-on modules and subplugins!!!
      */
-    const SUBSYSTEMCOUNT = 77;
+    const SUBSYSTEMCOUNT = 78;
 
     public function test_get_core_subsystems(): void {
         global $CFG;
diff --git a/report/classes/privacy/provider.php b/report/classes/privacy/provider.php
new file mode 100644
index 0000000000000..1ff18cb703207
--- /dev/null
+++ b/report/classes/privacy/provider.php
@@ -0,0 +1,37 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_report\privacy;
+
+/**
+ * Privacy Subsystem implementation for core_report.
+ *
+ * @package    core_report
+ * @copyright  2024 Amaia Anabitarte <amaia@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class provider implements \core_privacy\local\metadata\null_provider {
+
+    /**
+     * Get the language string identifier with the component's language
+     * file to explain why this plugin stores no data.
+     *
+     * @return  string
+     */
+    public static function get_reason(): string {
+        return 'privacy:metadata';
+    }
+}
diff --git a/version.php b/version.php
index 7b147de247291..fee642f7ed4d9 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2024070300.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2024070300.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
 $release  = '4.5dev (Build: 20240627)'; // Human-friendly version name

From 6912ddb3c6cbba0e2845b30e2be2cbc50cc3f4e8 Mon Sep 17 00:00:00 2001
From: Amaia Anabitarte <amaia@moodle.com>
Date: Wed, 19 Jun 2024 13:57:07 +0200
Subject: [PATCH 112/119] MDL-81771 report_outline: Add subsections to course
 Activity report

---
 .upgradenotes/MDL-81771-2024062007585494.yml  |   5 +
 report/classes/output/coursestructure.php     | 179 ++++++++++++++++++
 .../outline/classes/output/activitieslist.php | 145 ++++++++++++++
 report/outline/index.php                      | 107 +----------
 report/outline/styles.css                     |  13 +-
 report/outline/templates/activity.mustache    |  63 ++++++
 .../templates/delegatedsection.mustache       |  48 +++++
 report/outline/templates/report.mustache      |  86 +++++++++
 report/outline/templates/section.mustache     |  48 +++++
 theme/boost/scss/moodle/reports.scss          |  22 +++
 theme/boost/style/moodle.css                  |  20 ++
 theme/classic/style/moodle.css                |  20 ++
 12 files changed, 640 insertions(+), 116 deletions(-)
 create mode 100644 .upgradenotes/MDL-81771-2024062007585494.yml
 create mode 100644 report/classes/output/coursestructure.php
 create mode 100644 report/outline/classes/output/activitieslist.php
 create mode 100644 report/outline/templates/activity.mustache
 create mode 100644 report/outline/templates/delegatedsection.mustache
 create mode 100644 report/outline/templates/report.mustache
 create mode 100644 report/outline/templates/section.mustache

diff --git a/.upgradenotes/MDL-81771-2024062007585494.yml b/.upgradenotes/MDL-81771-2024062007585494.yml
new file mode 100644
index 0000000000000..72aec8da6bd0d
--- /dev/null
+++ b/.upgradenotes/MDL-81771-2024062007585494.yml
@@ -0,0 +1,5 @@
+issueNumber: MDL-81771
+notes:
+  core_report:
+    - message: New coursestructure output general class has been created
+      type: improved
diff --git a/report/classes/output/coursestructure.php b/report/classes/output/coursestructure.php
new file mode 100644
index 0000000000000..e5be29b0c8261
--- /dev/null
+++ b/report/classes/output/coursestructure.php
@@ -0,0 +1,179 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_report\output;
+
+/**
+ * Course sections, subsections and activities structure for reports.
+ *
+ * @package    core_report
+ * @copyright  2024 Amaia Anabitarte <amaia@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class coursestructure implements \renderable, \templatable {
+
+    /**
+     * Constructor
+     *
+     * @param \course_modinfo $modinfo
+     */
+    public function __construct(
+        /** @var \course_modinfo $modinfo */
+        protected \course_modinfo $modinfo
+    ) {
+    }
+
+    /**
+     * Exports the data.
+     *
+     * @param \renderer_base $output
+     * @return array|\stdClass
+     */
+    public function export_for_template(\renderer_base $output) {
+
+        $headers = $this->export_headers($output);
+        return [
+                'class' => 'generaltable boxaligncenter',
+                'headers' => $headers,
+                'headerscount' => count($headers),
+                'activities' => $this->export_activities($output),
+        ];
+    }
+
+    /**
+     * Exports activities data.
+     *
+     * @param \renderer_base $output
+     * @return array|\stdClass
+     */
+    public function export_activities(\renderer_base $output) {
+
+        $activities = [];
+
+        $delegatedsections = $this->modinfo->get_sections_delegated_by_cm();
+        $allsections = $this->modinfo->get_sections();
+        foreach ($allsections as $sectionnum => $sectionmodules) {
+            // Add the section row.
+            if ($sectionnum > 0) {
+                $sectioninfo = $this->modinfo->get_section_info($sectionnum);
+
+                // Don't show subsections here. We are showing them in the corresponding module.
+                if ($sectioninfo->is_delegated()) {
+                    continue;
+                }
+
+                if (!$sectioninfo->uservisible) {
+                    continue;
+                }
+
+                $activities[] = $this->export_section_data($output, $sectioninfo, false);
+            }
+
+            // Add section modules and possibly subsections.
+            foreach ($sectionmodules as $cmid) {
+                $cm = $this->modinfo->cms[$cmid];
+
+                // Check if the module is delegating a section.
+                if (array_key_exists($cm->id, $delegatedsections)) {
+                    $subsectioninfo = $delegatedsections[$cm->id];
+                    // Only non-empty are listed in allsections. We don't show empty sections.
+                    if (!array_key_exists($subsectioninfo->sectionnum, $allsections)) {
+                        continue;
+                    }
+
+                    $activities[] = $this->export_section_data($output, $subsectioninfo, true);
+
+                    // Show activities inside the section.
+                    $subsectionmodules = $allsections[$subsectioninfo->sectionnum];
+                    foreach ($subsectionmodules as $subsectioncmid) {
+                        $cm = $this->modinfo->cms[$subsectioncmid];
+                        $activities[] = $this->export_activity_data($output, $cm, true);
+                    }
+                } else {
+                    // It's simply a module.
+                    $activities[] = $this->export_activity_data($output, $cm);
+                }
+            }
+        }
+
+        return $activities;
+    }
+
+    /**
+     * Exports the headers for report table.
+     *
+     * @param \renderer_base $output
+     * @return array
+     */
+    protected function export_headers(\renderer_base $output): array {
+        return [get_string('activity')];
+    }
+
+
+    /**
+     * Exports the data for a single section.
+     *
+     * @param \renderer_base $output
+     * @param \section_info $sectioninfo Section to export information from.
+     * @param bool $isdelegated Whether the section is a delegated subsection or not.
+     * @return array
+     */
+    public function export_section_data(\renderer_base $output, \section_info $sectioninfo, bool $isdelegated = false): array {
+        $datasection = [
+            'issection' => !$isdelegated,
+            'isdelegated' => $isdelegated,
+            'visible' => $sectioninfo->visible,
+            'class' => 'section',
+            'text' => get_section_name($sectioninfo->course, $sectioninfo->sectionnum),
+        ];
+
+        return $datasection;
+    }
+
+    /**
+     * Exports the data for a single activity.
+     *
+     * @param \renderer_base $output
+     * @param \cm_info $cm
+     * @param bool $indelegated Whether the activity is part of a delegated section or not.
+     * @return array
+     */
+    public function export_activity_data(\renderer_base $output, \cm_info $cm, bool $indelegated = false): array {
+        global $CFG;
+
+        if (!$cm->has_view()) {
+            return [];
+        }
+        if (!$cm->uservisible) {
+            return [];
+        }
+
+        $modulename = get_string('modulename', $cm->modname);
+
+        $dataactivity = [
+            'isactivity' => true,
+            'indelegated' => $indelegated,
+            'visible' => $cm->visible,
+            'cells' => [],
+        ];
+        $dataactivity['activitycolumn'] = [
+                'activityicon' => $output->pix_icon('monologo', $modulename, $cm->modname, ['class' => 'icon']),
+                'link' => "$CFG->wwwroot/mod/$cm->modname/view.php?id=$cm->id",
+                'text' => $cm->name,
+        ];
+        return $dataactivity;
+    }
+}
diff --git a/report/outline/classes/output/activitieslist.php b/report/outline/classes/output/activitieslist.php
new file mode 100644
index 0000000000000..f33e7851938aa
--- /dev/null
+++ b/report/outline/classes/output/activitieslist.php
@@ -0,0 +1,145 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace report_outline\output;
+
+use core_report\output\coursestructure;
+use course_modinfo;
+
+/**
+ * Activities list page.
+ *
+ * @package    report_outline
+ * @copyright  2024 Amaia Anabitarte <amaia@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class activitieslist extends coursestructure {
+    /**
+     * Constructor
+     *
+     * @param course_modinfo $modinfo
+     * @param array $views Views information for activity and users.
+     * @param bool $showlastaccess Whether the last access should be shown or not.
+     * @param int $minlog The minimum log time is computed.
+     * @param bool $showblogs Whether related blog entries should be shown or not.
+     */
+    public function __construct(
+            course_modinfo $modinfo,
+            /** @var array $views Views information for activity and users. */
+            protected array $views,
+            /** @var bool $showlastaccess Whether the last access should be shown or not. */
+            protected bool $showlastaccess = true,
+            /** @var int $minlog The minimum log time is computed. */
+            protected int $minlog = 0,
+            /** @var bool $showblogs Whether related blog entries should be shown or not. */
+            protected bool $showblogs = true,
+    ) {
+        $this->modinfo = $modinfo;
+    }
+
+    /**
+     * Exports the data.
+     *
+     * @param \renderer_base $output
+     * @return array|\stdClass
+     */
+    public function export_for_template(\renderer_base $output) {
+        $table = parent::export_for_template($output);
+        $table['id'] = 'outlinereport';
+        $data = [
+            'minlog' => userdate($this->minlog),
+            'table' => $table,
+        ];
+
+        return $data;
+    }
+
+    /**
+     * Exports the headers for report table.
+     *
+     * @param \renderer_base $output
+     * @return array
+     */
+    protected function export_headers(\renderer_base $output): array {
+        $headers = parent::export_headers($output);
+        $headers[] = get_string('views');
+
+        if ($this->showblogs) {
+            $headers[] = get_string('relatedblogentries', 'blog');
+        }
+
+        if ($this->showlastaccess) {
+            $headers[] = get_string('lastaccess');
+        }
+
+        return $headers;
+    }
+
+    /**
+     * Exports the data for a single activity.
+     *
+     * @param \renderer_base $output
+     * @param \cm_info $cm
+     * @param bool $indelegated Whether the activity is part of a delegated section or not.
+     * @return array
+     */
+    public function export_activity_data(\renderer_base $output, \cm_info $cm, bool $indelegated = false): array {
+        global $CFG;
+
+        $data = parent::export_activity_data($output, $cm, $indelegated);
+        if (empty($data) || !in_array('cells', $data)) {
+            return [];
+        }
+
+        if (!empty($this->views[$cm->id]->numviews)) {
+            $numviewscell = get_string('numviews', 'report_outline', $this->views[$cm->id]);
+        } else {
+            $numviewscell = '-';
+        }
+
+        $data['cells'][] = [
+            'activityclass' => 'numviews',
+            'text' => $numviewscell,
+        ];
+
+        if ($this->showblogs) {
+            $cell = ['activityclass' => 'blog'];
+            require_once($CFG->dirroot.'/blog/lib.php');
+            if ($blogcount = blog_get_associated_count($cm->get_course()->id, $cm->id)) {
+                $blogurl = new \moodle_url('/blog/index.php', ['modid' => $cm->id]);
+                $cell['link']  = new \action_link($blogurl, $blogcount);
+            } else {
+                $cell['text'] = '-';
+            }
+            $data['cells'][] = $cell;
+        }
+
+        if ($this->showlastaccess) {
+            if (isset($this->views[$cm->id]->lasttime)) {
+                $timeago = format_time(time() - $this->views[$cm->id]->lasttime);
+                $lastaccesscell = userdate($this->views[$cm->id]->lasttime)." ($timeago)";
+            } else {
+                $lastaccesscell = '';
+            }
+            $data['cells'][] = [
+                    'activityclass' => 'lastaccess',
+                    'text' => $lastaccesscell,
+            ];
+        }
+
+        return $data;
+    }
+}
diff --git a/report/outline/index.php b/report/outline/index.php
index 2078ebb5f669e..6b251ead3e336 100644
--- a/report/outline/index.php
+++ b/report/outline/index.php
@@ -73,6 +73,7 @@
 $event->trigger();
 
 $showlastaccess = true;
+$showblogs = !empty($CFG->enableblogs) && $CFG->useblogassociations;
 $hiddenfields = explode(',', $CFG->hiddenuserfields);
 
 if (array_search('lastaccess', $hiddenfields) !== false and !has_capability('moodle/user:viewhiddendetails', $context)) {
@@ -80,12 +81,6 @@
 }
 
 $stractivityreport = get_string('pluginname', 'report_outline');
-$stractivity       = get_string('activity');
-$strlast           = get_string('lastaccess');
-$strreports        = get_string('reports');
-$strviews          = get_string('views');
-$strrelatedblogentries = get_string('relatedblogentries', 'blog');
-
 $PAGE->set_title($course->shortname .': '. $stractivityreport);
 $PAGE->set_heading($course->fullname);
 echo $OUTPUT->header();
@@ -121,22 +116,6 @@
 
 $filterform->display();
 
-echo $OUTPUT->container(get_string('computedfromlogs', 'admin', userdate($minlog)), 'loginfo');
-
-$outlinetable = new html_table();
-$outlinetable->attributes['class'] = 'generaltable boxaligncenter';
-$outlinetable->cellpadding = 5;
-$outlinetable->id = 'outlinetable';
-$outlinetable->head = array($stractivity, $strviews);
-
-if (!empty($CFG->enableblogs) && $CFG->useblogassociations) {
-    $outlinetable->head[] = $strrelatedblogentries;
-}
-
-if ($showlastaccess) {
-    $outlinetable->head[] = $strlast;
-}
-
 $modinfo = get_fast_modinfo($course);
 
 // If using legacy log then get users from old table.
@@ -220,88 +199,8 @@
     }
 }
 
-$prevsecctionnum = 0;
-foreach ($modinfo->sections as $sectionnum=>$section) {
-    foreach ($section as $cmid) {
-        $cm = $modinfo->cms[$cmid];
-        if (!$cm->has_view()) {
-            continue;
-        }
-        if (!$cm->uservisible) {
-            continue;
-        }
-        if ($prevsecctionnum != $sectionnum) {
-            $sectionrow = new html_table_row();
-            $sectionrow->attributes['class'] = 'section';
-            $sectioncell = new html_table_cell();
-            $sectioncell->colspan = count($outlinetable->head);
-
-            $sectiontitle = get_section_name($course, $sectionnum);
-
-            $sectioncell->text = $OUTPUT->heading($sectiontitle, 3);
-            $sectionrow->cells[] = $sectioncell;
-            $outlinetable->data[] = $sectionrow;
-
-            $prevsecctionnum = $sectionnum;
-        }
-
-        $dimmed = $cm->visible ? '' : 'class="dimmed"';
-        $modulename = get_string('modulename', $cm->modname);
-
-        $reportrow = new html_table_row();
-        $activitycell = new html_table_cell();
-        $activitycell->attributes['class'] = 'activity';
-
-        $activityicon = $OUTPUT->pix_icon('monologo', $modulename, $cm->modname, array('class'=>'icon'));
-
-        $attributes = array();
-        if (!$cm->visible) {
-            $attributes['class'] = 'dimmed';
-        }
-
-        $activitycell->text = $activityicon . html_writer::link("$CFG->wwwroot/mod/$cm->modname/view.php?id=$cm->id", format_string($cm->name), $attributes);
-
-        $reportrow->cells[] = $activitycell;
-
-        $numviewscell = new html_table_cell();
-        $numviewscell->attributes['class'] = 'numviews';
-
-        if (!empty($views[$cm->id]->numviews)) {
-            $numviewscell->text = get_string('numviews', 'report_outline', $views[$cm->id]);
-        } else {
-            $numviewscell->text = '-';
-        }
-
-        $reportrow->cells[] = $numviewscell;
-
-        if (!empty($CFG->enableblogs) && $CFG->useblogassociations) {
-            require_once($CFG->dirroot.'/blog/lib.php');
-            $blogcell = new html_table_cell();
-            $blogcell->attributes['class'] = 'blog';
-            if ($blogcount = blog_get_associated_count($course->id, $cm->id)) {
-                $blogurl = new moodle_url('/blog/index.php', array('modid' => $cm->id));
-                $blogcell->text = html_writer::link($blogurl, $blogcount);
-            } else {
-                $blogcell->text = '-';
-            }
-            $reportrow->cells[] = $blogcell;
-        }
-
-        if ($showlastaccess) {
-            $lastaccesscell = new html_table_cell();
-            $lastaccesscell->attributes['class'] = 'lastaccess';
-
-            if (isset($views[$cm->id]->lasttime)) {
-                $timeago = format_time(time() - $views[$cm->id]->lasttime);
-                $lastaccesscell->text = userdate($views[$cm->id]->lasttime)." ($timeago)";
-            }
-            $reportrow->cells[] = $lastaccesscell;
-        }
-        $outlinetable->data[] = $reportrow;
-    }
-}
-echo html_writer::table($outlinetable);
-
+$activitieslist = new report_outline\output\activitieslist($modinfo, $views, $showlastaccess, $minlog, $showblogs);
+echo $OUTPUT->render_from_template('report_outline/report', $activitieslist->export_for_template($OUTPUT));
 echo $OUTPUT->footer();
 
 
diff --git a/report/outline/styles.css b/report/outline/styles.css
index 9bdcf9d849986..fe95ffe2d0533 100644
--- a/report/outline/styles.css
+++ b/report/outline/styles.css
@@ -1,15 +1,3 @@
-#page-report-outline-index td.numviews {
-    text-align: right;
-}
-
-#page-report-outline-index tr.section {
-    text-align: center;
-}
-
-#page-report-outline-index td.lastaccess {
-    font-size: 0.8em;
-}
-
 #page-report-outline-user .section .content {
     margin-left: 30px;
     margin-right: 30px;
@@ -30,3 +18,4 @@
     border-style: solid;
     padding: 10px;
 }
+
diff --git a/report/outline/templates/activity.mustache b/report/outline/templates/activity.mustache
new file mode 100644
index 0000000000000..208e7b74c08a0
--- /dev/null
+++ b/report/outline/templates/activity.mustache
@@ -0,0 +1,63 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template report_outline/activity
+
+    Template for Activity report activities.
+
+    Classes required for JS:
+    * none
+
+    Data attributes required for JS:
+    * none
+
+    Context variables required for this template:
+    * none
+
+    Example context (json):
+    {
+        "indelegated": true,
+        "visible": true,
+        "class": "activity",
+        "text": "Announcements",
+        "cells": [{
+            "activityclass": "lastaccess",
+            "text": "Friday, 14 June 2024, 5:17 PM"
+        }]
+    }
+}}
+<tr>
+    {{#activitycolumn}}
+        <td class="cell activityname {{#indelegated}}delegated{{/indelegated}}{{^indelegated}}pl-5{{/indelegated}}">
+            {{{ activityicon }}}
+            {{#link}}<a href="{{ link }}">{{/link}}{{{ text }}}{{#link}}</a>{{/link}}
+            {{^visible}}
+            <div class="activity-badges my-1" data-region="visibility">
+                <span class="badge rounded-pill bg-secondary text-dark">{{#pix}}i/show, core{{/pix}}{{#str}}hiddenfromstudents{{/str}}</span>
+            </div>
+            {{/visible}}
+        </td>
+    {{/activitycolumn}}
+    {{#cells}}
+        <td class="cell {{ activityclass }}">
+            {{#text}}{{{ text }}}{{/text}}
+            {{#link}}
+                {{> core/action_link}}
+            {{/link}}
+        </td>
+    {{/cells}}
+</tr>
diff --git a/report/outline/templates/delegatedsection.mustache b/report/outline/templates/delegatedsection.mustache
new file mode 100644
index 0000000000000..979458aba4a76
--- /dev/null
+++ b/report/outline/templates/delegatedsection.mustache
@@ -0,0 +1,48 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template report_outline/delegatedsection
+
+    Template for Activity report sections.
+
+    Classes required for JS:
+    * none
+
+    Data attributes required for JS:
+    * none
+
+    Context variables required for this template:
+    * none
+
+
+Example context (json):
+{
+    "visible": true,
+    "class": "section",
+    "text": "Section 1"
+}
+}}
+<tr class="{{ class }}">
+    <td class="cell lastcol pl-5"{{#headerscount}} colspan="{{headerscount}}"{{/headerscount}}>
+        <h4>{{{ text }}}</h4>
+        {{^visible}}
+        <div class="activity-badges my-1" data-region="visibility">
+            <span class="badge rounded-pill bg-secondary text-dark">{{#pix}}i/show, core{{/pix}}{{#str}}hiddenfromstudents{{/str}}</span>
+        </div>
+        {{/visible}}
+    </td>
+</tr>
diff --git a/report/outline/templates/report.mustache b/report/outline/templates/report.mustache
new file mode 100644
index 0000000000000..6652de3359ba3
--- /dev/null
+++ b/report/outline/templates/report.mustache
@@ -0,0 +1,86 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template report_outline/report
+
+    Template for Activity report.
+
+    Classes required for JS:
+    * none
+
+    Data attributes required for JS:
+    * none
+
+    Context variables required for this template:
+    * none
+
+    Example context (json):
+    {
+        "minlog": "Monday, 29 April 2024, 4:18 PM",
+        "table": {
+            "class": "generaltable boxaligncenter",
+            "id": "outlinereport",
+            "headers": ["Activity", "Views", "Last access"],
+            "headerscount": 3,
+            "actitivities": [{
+                "isactivity": false,
+                "indelegated": true,
+                "visible": true,
+                "class": "activity",
+                "text": "Announcements",
+                "cells": [{
+                    "activityclass": "lastaccess",
+                    "text": "Friday, 14 June 2024, 5:17 PM"
+                }]
+            },
+            {
+                "issection": true,
+                "isdelegated": true,
+                "visible": true,
+                "class": "section",
+                "text": "Section 1"
+            }]
+        }
+    }
+}}
+<div class="loginfo font-lg my-5 pb-2">{{#str}} computedfromlogs, admin, {{{ minlog }}} {{/str}}</div>
+<div class="table-responsive">
+    {{#table}}
+    <table class="{{ class }}"{{#id}} id = "{{ id }}"{{/id}}>
+        <thead>
+        <tr>
+            {{#headers}}
+                <th class="header font-lg" style="" scope="col">{{{ . }}}</th>
+            {{/headers}}
+        </tr>
+        </thead>
+        <tbody>
+            {{#activities}}
+                {{#issection}}
+                    {{>report_outline/section }}
+                {{/issection}}
+                {{#isdelegated}}
+                    {{>report_outline/delegatedsection }}
+                {{/isdelegated}}
+                {{#isactivity}}
+                    {{>report_outline/activity }}
+                {{/isactivity}}
+            {{/activities}}
+        </tbody>
+    </table>
+    {{/table}}
+</div>
diff --git a/report/outline/templates/section.mustache b/report/outline/templates/section.mustache
new file mode 100644
index 0000000000000..d67654f640cc3
--- /dev/null
+++ b/report/outline/templates/section.mustache
@@ -0,0 +1,48 @@
+{{!
+    This file is part of Moodle - http://moodle.org/
+
+    Moodle is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Moodle is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+}}
+{{!
+    @template report_outline/section
+
+    Template for Activity report sections.
+
+    Classes required for JS:
+    * none
+
+    Data attributes required for JS:
+    * none
+
+    Context variables required for this template:
+    * none
+
+
+Example context (json):
+{
+    "visible": true,
+    "class": "section",
+    "text": "Section 1"
+}
+}}
+<tr class="{{ class }}">
+    <td class="cell lastcol"{{#headerscount}} colspan="{{headerscount}}"{{/headerscount}}>
+        <h3>{{{ text }}}</h3>
+        {{^visible}}
+        <div class="activity-badges my-1" data-region="visibility">
+            <span class="badge rounded-pill bg-secondary text-dark">{{#pix}}i/show, core{{/pix}}{{#str}}hiddenfromstudents{{/str}}</span>
+        </div>
+        {{/visible}}
+    </td>
+</tr>
diff --git a/theme/boost/scss/moodle/reports.scss b/theme/boost/scss/moodle/reports.scss
index 79289a17eee56..cad9c3e80141e 100644
--- a/theme/boost/scss/moodle/reports.scss
+++ b/theme/boost/scss/moodle/reports.scss
@@ -12,3 +12,25 @@
 #page-report-participation-index .participationselectform div label[for=menuinstanceid] {
     margin-left: 0; // No left margin for LTR.
 }
+
+// Outline report styles
+#page-report-outline-index .font-lg {
+    font-size: $font-size-base * 1.1;
+}
+#page-report-outline-index .generaltable tbody {
+    tr {
+        background-color: $white;
+    }
+    tr.section {
+        padding-left: map-get($spacers, 5);
+        h3 {
+            font-size: $h5-font-size;
+        }
+        h4 {
+            font-size: $font-size-base * 1.1;
+        }
+    }
+    td.delegated {
+        padding-left: $spacer * 3.5;
+    }
+}
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 2123598433495..f0bc8c06201e1 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -34986,6 +34986,26 @@ img.userpicture {
   margin-left: 0;
 }
 
+#page-report-outline-index .font-lg {
+  font-size: 1.03125rem;
+}
+
+#page-report-outline-index .generaltable tbody tr {
+  background-color: #fff;
+}
+#page-report-outline-index .generaltable tbody tr.section {
+  padding-left: 2rem;
+}
+#page-report-outline-index .generaltable tbody tr.section h3 {
+  font-size: 1.171875rem;
+}
+#page-report-outline-index .generaltable tbody tr.section h4 {
+  font-size: 1.03125rem;
+}
+#page-report-outline-index .generaltable tbody td.delegated {
+  padding-left: 3.5rem;
+}
+
 .path-backup .mform {
   /* These are long labels with checkboxes on the right. */
 }
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 635c48289e5ad..2551635fa507d 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -34986,6 +34986,26 @@ img.userpicture {
   margin-left: 0;
 }
 
+#page-report-outline-index .font-lg {
+  font-size: 1.03125rem;
+}
+
+#page-report-outline-index .generaltable tbody tr {
+  background-color: #fff;
+}
+#page-report-outline-index .generaltable tbody tr.section {
+  padding-left: 2rem;
+}
+#page-report-outline-index .generaltable tbody tr.section h3 {
+  font-size: 1.171875rem;
+}
+#page-report-outline-index .generaltable tbody tr.section h4 {
+  font-size: 1.03125rem;
+}
+#page-report-outline-index .generaltable tbody td.delegated {
+  padding-left: 3.5rem;
+}
+
 .path-backup .mform {
   /* These are long labels with checkboxes on the right. */
 }

From 4abc679c8b6824b6bddc633608e09e9aa12c2f6f Mon Sep 17 00:00:00 2001
From: Huong Nguyen <huongnv13@gmail.com>
Date: Wed, 3 Jul 2024 14:47:10 +0700
Subject: [PATCH 113/119] MDL-82364 mod_quiz: Fix random failures PHPUnit test

 - Fix Clock API is not used correctly. We need to make sure
 not to reset the DI system halfway through a test.
 - Switched to use Message sink to speed up the test, no need
 to query the DB to verify the result anymore.
---
 mod/quiz/tests/notification_helper_test.php | 37 +++++++++++++--------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/mod/quiz/tests/notification_helper_test.php b/mod/quiz/tests/notification_helper_test.php
index b85e7784e2576..3aade56e34af9 100644
--- a/mod/quiz/tests/notification_helper_test.php
+++ b/mod/quiz/tests/notification_helper_test.php
@@ -25,14 +25,14 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @covers \mod_quiz\notification_helper
  */
-class notification_helper_test extends \advanced_testcase {
+final class notification_helper_test extends \advanced_testcase {
     /**
      * Run all the tasks related to the notifications.
      */
-    public function run_notification_helper_tasks(): void {
+    protected function run_notification_helper_tasks(): void {
         $task = \core\task\manager::get_scheduled_task(\mod_quiz\task\queue_all_quiz_open_notification_tasks::class);
         $task->execute();
-        $clock = $this->mock_clock_with_frozen();
+        $clock = \core\di::get(\core\clock::class);
 
         $adhoctask = \core\task\manager::get_next_adhoc_task($clock->time());
         if ($adhoctask) {
@@ -159,6 +159,7 @@ public function test_send_notification_to_user(): void {
         $generator = $this->getDataGenerator();
         $helper = \core\di::get(notification_helper::class);
         $clock = $this->mock_clock_with_frozen();
+        $sink = $this->redirectMessages();
 
         // Create a course and enrol a user.
         $course = $generator->create_course();
@@ -174,6 +175,7 @@ public function test_send_notification_to_user(): void {
             'course' => $course->id,
             'timeopen' => $timeopen,
         ]);
+        $clock->bump(5);
 
         // Get the users within the date range.
         $quizzes = $helper::get_quizzes_within_date_range();
@@ -186,20 +188,23 @@ public function test_send_notification_to_user(): void {
         $this->run_notification_helper_tasks();
 
         // Get the notifications that should have been created during the adhoc task.
-        $notifications = $DB->get_records('notifications', ['useridto' => $user1->id]);
-        $this->assertCount(1, $notifications);
+        $this->assertCount(1, $sink->get_messages());
 
         // Check the subject matches.
+        $messages = $sink->get_messages_by_component('mod_quiz');
+        $message = reset($messages);
         $stringparams = ['timeopen' => userdate($users[$user1->id]->timeopen), 'quizname' => $quiz->name];
         $expectedsubject = get_string('quizopendatesoonsubject', 'mod_quiz', $stringparams);
-        $this->assertEquals($expectedsubject, reset($notifications)->subject);
+        $this->assertEquals($expectedsubject, $message->subject);
+
+        // Clear sink.
+        $sink->clear();
 
         // Run the tasks again.
         $this->run_notification_helper_tasks();
 
-        // There should still only be one notification because nothing has changed.
-        $notifications = $DB->get_records('notifications', ['useridto' => $user1->id]);
-        $this->assertCount(1, $notifications);
+        // There should be no notification because nothing has changed.
+        $this->assertEmpty($sink->get_messages_by_component('mod_quiz'));
 
         // Let's modify the 'timeopen' for the quiz (it will still be within the 48 hour range).
         $updatedata = new \stdClass();
@@ -210,9 +215,10 @@ public function test_send_notification_to_user(): void {
         // Run the tasks again.
         $this->run_notification_helper_tasks();
 
-        // There should now be two notifications.
-        $notifications = $DB->get_records('notifications', ['useridto' => $user1->id]);
-        $this->assertCount(2, $notifications);
+        // There should be a new notification because the 'timeopen' has been updated.
+        $this->assertCount(1, $sink->get_messages_by_component('mod_quiz'));
+        // Clear sink.
+        $sink->clear();
 
         // Let's modify the 'timeopen' one more time.
         $updatedata = new \stdClass();
@@ -230,12 +236,15 @@ public function test_send_notification_to_user(): void {
             'layout' => '',
             'uniqueid' => 123,
         ]);
+        $clock->bump(5);
 
         // Run the tasks again.
         $this->run_notification_helper_tasks();
 
         // No new notification should have been sent.
-        $notifications = $DB->get_records('notifications', ['useridto' => $user1->id]);
-        $this->assertCount(2, $notifications);
+        $this->assertEmpty($sink->get_messages_by_component('mod_quiz'));
+
+        // Clear sink.
+        $sink->clear();
     }
 }

From 9ad6cae1e2f4ee680c37def5255182c3e36e8f89 Mon Sep 17 00:00:00 2001
From: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 4 Jul 2024 11:39:09 +0800
Subject: [PATCH 114/119] MDL-78662 question: Correct upgrade notes

---
 .upgradenotes/MDL-78662-2024070403384202.yml | 7 +++++++
 question/upgrade.txt                         | 3 ---
 2 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 .upgradenotes/MDL-78662-2024070403384202.yml

diff --git a/.upgradenotes/MDL-78662-2024070403384202.yml b/.upgradenotes/MDL-78662-2024070403384202.yml
new file mode 100644
index 0000000000000..268851281f83f
--- /dev/null
+++ b/.upgradenotes/MDL-78662-2024070403384202.yml
@@ -0,0 +1,7 @@
+issueNumber: MDL-78662
+notes:
+  core_question:
+    - message: >
+        A new utility function `format_question_fragment` has been created so
+        that question content can filter based on filters.
+      type: improved
diff --git a/question/upgrade.txt b/question/upgrade.txt
index 7a3599ffaf48d..9cb70a630b594 100644
--- a/question/upgrade.txt
+++ b/question/upgrade.txt
@@ -88,9 +88,6 @@ This files describes API changes for code that uses the question API.
   .question-bank-table. This applies to the same styles to preview on the qbank_columnsortorder admin screen. It is important
   that the styles match on these pages so that the defaults have the expected result in the question bank.
 
-10) A new utility function format_question_fragment is created.
-    format_question_fragment is added so that question content can filter base on filters.
-
 === 4.2 ===
 
 1) The question/qengine.js has been deprecated. We create core_question/question_engine

From d89d9ee420a655011a73d3b52f0b2869d6657c81 Mon Sep 17 00:00:00 2001
From: Huong Nguyen <huongnv13@gmail.com>
Date: Thu, 4 Jul 2024 14:34:13 +0700
Subject: [PATCH 115/119] MDL-79716 mod_assign: Fix random failures PHPUnit
 test

 - Fix Clock API is not used correctly. We need to make sure
 not to reset the DI system halfway through a test.
 - Switched to use Message sink to speed up the test, no need
 to query the DB to verify the result anymore.
 - Used Data generator to create a submission
---
 mod/assign/tests/notification_helper_test.php | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/mod/assign/tests/notification_helper_test.php b/mod/assign/tests/notification_helper_test.php
index 0d1f58e7decee..ea4be6b1e135a 100644
--- a/mod/assign/tests/notification_helper_test.php
+++ b/mod/assign/tests/notification_helper_test.php
@@ -29,10 +29,10 @@ final class notification_helper_test extends \advanced_testcase {
     /**
      * Run all the tasks related to the notifications.
      */
-    public function run_notification_helper_tasks(): void {
+    protected function run_notification_helper_tasks(): void {
         $task = \core\task\manager::get_scheduled_task(\mod_assign\task\queue_all_assignment_due_soon_notification_tasks::class);
         $task->execute();
-        $clock = $this->mock_clock_with_frozen();
+        $clock = \core\di::get(\core\clock::class);
 
         $adhoctask = \core\task\manager::get_next_adhoc_task($clock->time());
         if ($adhoctask) {
@@ -136,10 +136,9 @@ public function test_get_users_within_assignment(): void {
             'duedate' => $userduedate,
         ]);
 
-        // User5 will submit the assignment, excluding them from the results.
-        $DB->insert_record('assign_submission', [
-            'assignment' => $assignment->id,
+        $assignmentgenerator->create_submission([
             'userid' => $user5->id,
+            'assignid' => $assignment->cmid,
             'status' => 'submitted',
             'timemodified' => $clock->time(),
         ]);
@@ -158,6 +157,7 @@ public function test_send_notification_to_user(): void {
         $generator = $this->getDataGenerator();
         $helper = \core\di::get(notification_helper::class);
         $clock = $this->mock_clock_with_frozen();
+        $sink = $this->redirectMessages();
 
         // Create a course and enrol a user.
         $course = $generator->create_course();
@@ -173,6 +173,7 @@ public function test_send_notification_to_user(): void {
             'course' => $course->id,
             'duedate' => $duedate,
         ]);
+        $clock->bump(5);
 
         // Run the tasks.
         $this->run_notification_helper_tasks();
@@ -184,24 +185,27 @@ public function test_send_notification_to_user(): void {
         $duedate = $assignmentobj->get_instance($user1->id)->duedate;
 
         // Get the notifications that should have been created during the adhoc task.
-        $notifications = $DB->get_records('notifications', ['useridto' => $user1->id]);
-        $this->assertCount(1, $notifications);
+        $this->assertCount(1, $sink->get_messages_by_component('mod_assign'));
 
         // Check the subject matches.
+        $messages = $sink->get_messages_by_component('mod_assign');
+        $message = reset($messages);
         $stringparams = [
             'duedate' => userdate($duedate),
             'assignmentname' => $assignment->name,
             'type' => $helper::TYPE_DUE_SOON,
         ];
         $expectedsubject = get_string('assignmentduesoonsubject', 'mod_assign', $stringparams);
-        $this->assertEquals($expectedsubject, reset($notifications)->subject);
+        $this->assertEquals($expectedsubject, $message->subject);
+
+        // Clear sink.
+        $sink->clear();
 
         // Run the tasks again.
         $this->run_notification_helper_tasks();
 
-        // There should still only be one notification because nothing has changed.
-        $notifications = $DB->get_records('notifications', ['useridto' => $user1->id]);
-        $this->assertCount(1, $notifications);
+        // There should be no notification because nothing has changed.
+        $this->assertEmpty($sink->get_messages_by_component('mod_assign'));
 
         // Let's modify the 'duedate' for the assignment (it will still be within the 48 hour range).
         $updatedata = new \stdClass();
@@ -212,9 +216,10 @@ public function test_send_notification_to_user(): void {
         // Run the tasks again.
         $this->run_notification_helper_tasks();
 
-        // There should now be two notifications.
-        $notifications = $DB->get_records('notifications', ['useridto' => $user1->id]);
-        $this->assertCount(2, $notifications);
+        // There should be a new notification because the 'duedate' has been updated.
+        $this->assertCount(1, $sink->get_messages_by_component('mod_assign'));
+        // Clear sink.
+        $sink->clear();
 
         // Let's modify the 'duedate' one more time.
         $updatedata = new \stdClass();
@@ -223,18 +228,21 @@ public function test_send_notification_to_user(): void {
         $DB->update_record('assign', $updatedata);
 
         // This time, the user will submit the assignment.
-        $DB->insert_record('assign_submission', [
-            'assignment' => $assignment->id,
+        $assignmentgenerator->create_submission([
             'userid' => $user1->id,
+            'assignid' => $assignment->cmid,
             'status' => 'submitted',
             'timemodified' => $clock->time(),
         ]);
+        $clock->bump(5);
 
         // Run the tasks again.
         $this->run_notification_helper_tasks();
 
         // No new notification should have been sent.
-        $notifications = $DB->get_records('notifications', ['useridto' => $user1->id]);
-        $this->assertCount(2, $notifications);
+        $this->assertEmpty($sink->get_messages_by_component('mod_assign'));
+
+        // Clear sink.
+        $sink->clear();
     }
 }

From 9cd02299145d508a371b96184e51fec887f63b2c Mon Sep 17 00:00:00 2001
From: Huong Nguyen <huongnv13@gmail.com>
Date: Thu, 4 Jul 2024 15:14:54 +0700
Subject: [PATCH 116/119] MDL-80907 behat: Fix incorrect column selectors

---
 .../form/guide/tests/behat/assign_marking_guide.feature     | 2 +-
 .../form/guide/tests/behat/delete_marking_guide.feature     | 2 +-
 .../tests/behat/h5pactivity_grade_settings.feature          | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/grade/grading/form/guide/tests/behat/assign_marking_guide.feature b/grade/grading/form/guide/tests/behat/assign_marking_guide.feature
index 9336cd303b878..ef8ffce9789d8 100644
--- a/grade/grading/form/guide/tests/behat/assign_marking_guide.feature
+++ b/grade/grading/form/guide/tests/behat/assign_marking_guide.feature
@@ -88,7 +88,7 @@ Feature: Display marking guide information to students
     And I should not see "Grade Critera 2"
     And I am on the "Course 1" "grades > Grader report > View" page
     And the following should exist in the "user-grades" table:
-      | -1-       | -1-                  | -3- |
+      | -1-       | -2-                  | -3- |
       | Student 1 | student1@example.com | 90  |
     And I am on the "Assign 1" "assign activity editing" page
     And I set the following fields to these values:
diff --git a/grade/grading/form/guide/tests/behat/delete_marking_guide.feature b/grade/grading/form/guide/tests/behat/delete_marking_guide.feature
index 06abc20e352fb..4bbc83d886ab1 100644
--- a/grade/grading/form/guide/tests/behat/delete_marking_guide.feature
+++ b/grade/grading/form/guide/tests/behat/delete_marking_guide.feature
@@ -49,5 +49,5 @@ Feature: Teacher can delete marking guide
     And I should not see "Criterion 1"
     And I am on the "Course 1" "grades > Grader report > View" page
     And the following should exist in the "user-grades" table:
-      | -1-         | -1-                  | -3- |
+      | -1-         | -2-                  | -3- |
       | Student One | student1@example.com | 70  |
diff --git a/mod/h5pactivity/tests/behat/h5pactivity_grade_settings.feature b/mod/h5pactivity/tests/behat/h5pactivity_grade_settings.feature
index 537579a2b1bc0..a8a3579e9fb18 100644
--- a/mod/h5pactivity/tests/behat/h5pactivity_grade_settings.feature
+++ b/mod/h5pactivity/tests/behat/h5pactivity_grade_settings.feature
@@ -41,7 +41,7 @@ Feature: Teacher can control h5p activity grading setting
     And I turn editing mode off
     # Confirm that grades are not saved when grade entered is > maximum grade.
     Then the following should exist in the "user-grades" table:
-      | -1-       | -1-                  | -3- |
+      | -1-       | -2-                  | -3- |
       | Student 1 | student1@example.com | -   |
       | Student 2 | student2@example.com | -   |
       | Student 3 | student3@example.com | -   |
@@ -67,7 +67,7 @@ Feature: Teacher can control h5p activity grading setting
     And I turn editing mode off
     # Confirm that corresponding grades are stored for each student.
     And the following should exist in the "user-grades" table:
-      | -1-       | -1-                  | -3- |
+      | -1-       | -2-                  | -3- |
       | Student 1 | student1@example.com | 10  |
       | Student 2 | student2@example.com | 5   |
       | Student 3 | student3@example.com | 0   |
@@ -93,7 +93,7 @@ Feature: Teacher can control h5p activity grading setting
     And I turn editing mode off
     # Confirm that scale set for student is successfully saved.
     Then the following should exist in the "user-grades" table:
-      | -1-       | -1-                  | -3-               |
+      | -1-       | -2-                  | -3-               |
       | Student 1 | student1@example.com | Not yet competent |
       | Student 2 | student2@example.com | Competent         |
       | Student 3 | student3@example.com | -                 |

From 1110e51e583c0b18840f9369a453c59517aa431f Mon Sep 17 00:00:00 2001
From: Huong Nguyen <huongnv13@gmail.com>
Date: Thu, 4 Jul 2024 21:21:01 +0700
Subject: [PATCH 117/119] MDL-80907 qtype_ordering: Fix incorrect Behat column
 selectors

---
 question/type/ordering/tests/behat/usage.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/question/type/ordering/tests/behat/usage.feature b/question/type/ordering/tests/behat/usage.feature
index 03b86285d5330..6f9196a6757fd 100644
--- a/question/type/ordering/tests/behat/usage.feature
+++ b/question/type/ordering/tests/behat/usage.feature
@@ -69,7 +69,7 @@ Feature: Complete an Ordering question attempt
     And I log out
     And I am on the "Course 1" "grades > Grader report > View" page logged in as "teacher1"
     And the following should exist in the "user-grades" table:
-      | -1-       | -1-                  | -3-     |
+      | -1-       | -2-                  | -3-     |
       | Student 1 | student1@example.com | <grade> |
     Examples:
       | question     | styling        | state             | mark                  | grade | expect  | gradedetails      | correct          | partial                    |  incorrect         | type                                         |

From c7af8d8afaae3c319957e5b238e0a65deb036125 Mon Sep 17 00:00:00 2001
From: Ilya Tregubov <ilya.a.tregubov@gmail.com>
Date: Fri, 5 Jul 2024 09:01:53 +0800
Subject: [PATCH 118/119] NOBUG: Add upgrade notes

---
 UPGRADING.md                | 148 +++++++++++++++++++++++-------------
 backup/util/ui/UPGRADING.md |  10 +++
 lib/UPGRADING.md            |   3 +
 lib/table/UPGRADING.md      |  11 +++
 question/UPGRADING.md       |   6 ++
 report/UPGRADING.md         |  13 ++--
 reportbuilder/UPGRADING.md  |   3 +
 theme/UPGRADING.md          |   6 ++
 theme/boost/UPGRADING.md    |   1 -
 9 files changed, 141 insertions(+), 60 deletions(-)
 create mode 100644 backup/util/ui/UPGRADING.md
 create mode 100644 lib/table/UPGRADING.md

diff --git a/UPGRADING.md b/UPGRADING.md
index 4620fe601b1f2..f98a25070cc3c 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -25,6 +25,9 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
 - Final deprecation of print_error(). Use moodle_exception instead.
 
   For more information see [MDL-74484](https://tracker.moodle.org/browse/MDL-74484)
+- Final deprecation of \core\task\manager::ensure_adhoc_task_qos()
+
+  For more information see [MDL-74843](https://tracker.moodle.org/browse/MDL-74843)
 
 #### Changed
 
@@ -177,6 +180,54 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
 
   For more information see [MDL-82191](https://tracker.moodle.org/browse/MDL-82191)
 
+### core_reportbuilder
+
+#### Added
+
+- The return type of the `set_checkbox_toggleall` callback, defined by system reports, can now be null. Use if the checkbox should not be shown for the row.
+
+  For more information see [MDL-52046](https://tracker.moodle.org/browse/MDL-52046)
+- System reports now support native entity column aggregation via each columns `set_aggregation()` method
+
+  For more information see [MDL-76392](https://tracker.moodle.org/browse/MDL-76392)
+- The following external methods now return tags data relevant to each custom report:
+    - `core_reportbuilder_list_reports`
+    - `core_reportbuilder_retrieve_report`
+
+  For more information see [MDL-81433](https://tracker.moodle.org/browse/MDL-81433)
+- Added a new database helper method `sql_replace_parameters` to help ensure uniqueness of parameters within a SQL expression
+
+  For more information see [MDL-81434](https://tracker.moodle.org/browse/MDL-81434)
+
+#### Removed
+
+- The following previously deprecated local helper methods have been removed and can no longer be used:
+    - `audience::get_all_audiences_menu_types`
+    - `report::get_available_columns`
+
+  For more information see [MDL-76690](https://tracker.moodle.org/browse/MDL-76690)
+
+#### Changed
+
+- In order to better support float values in filter forms, the following filter types now cast given SQL prior to comparison:
+    - `duration`
+    - `filesize`
+    - `number`
+
+  For more information see [MDL-81168](https://tracker.moodle.org/browse/MDL-81168)
+- The base datasource `add_all_from_entities` method accepts a new optional parameter to specify which entities to add elements from
+
+  For more information see [MDL-81330](https://tracker.moodle.org/browse/MDL-81330)
+- All time related code has been updated to the PSR-20 Clock interface, as such the following methods no longer accept a `$timenow` parameter (instead please use `\core\clock` dependency injection):
+  - `core_reportbuilder_generator::create_schedule`
+  - `core_reportbuilder\local\helpers\schedule::[create_schedule|calculate_next_send_time]`
+
+  For more information see [MDL-82041](https://tracker.moodle.org/browse/MDL-82041)
+- The following classes have been moved to use the new exception API as a l2 namespace:
+  - `core_reportbuilder\\report_access_exception` => `core_reportbuilder\\exception\\report_access_exception` - `core_reportbuilder\\source_invalid_exception` => `core_reportbuilder\\exception\\source_invalid_exception` - `core_reportbuilder\\source_unavailable_exception` => `core_reportbuilder\\exception\\source_unavailable_exception`
+
+  For more information see [MDL-82133](https://tracker.moodle.org/browse/MDL-82133)
+
 ### mod_assign
 
 #### Added
@@ -229,6 +280,26 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
 
   For more information see [MDL-72786](https://tracker.moodle.org/browse/MDL-72786)
 
+### theme
+
+#### Removed
+
+- Removed all references to iconhelp, icon-pre, icon-post, iconlarge, and iconsort classes
+
+  For more information see [MDL-74251](https://tracker.moodle.org/browse/MDL-74251)
+
+#### Added
+
+- New `core/context_header` mustache template has been added. This template can be overridden by themes to modify the context header
+
+  For more information see [MDL-81597](https://tracker.moodle.org/browse/MDL-81597)
+
+#### Deprecated
+
+- The method `\core\output\core_renderer::render_context_header` has been deprecated please use `\core\output\core_renderer::render($contextheader)` instead
+
+  For more information see [MDL-82160](https://tracker.moodle.org/browse/MDL-82160)
+
 ### core_grades
 
 #### Removed
@@ -245,50 +316,27 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
 
   For more information see [MDL-80745](https://tracker.moodle.org/browse/MDL-80745)
 
-### core_reportbuilder
-
-#### Added
+### core_backup
 
-- System reports now support native entity column aggregation via each columns `set_aggregation()` method
+#### Removed
 
-  For more information see [MDL-76392](https://tracker.moodle.org/browse/MDL-76392)
-- The following external methods now return tags data relevant to each custom report:
-    - `core_reportbuilder_list_reports`
-    - `core_reportbuilder_retrieve_report`
+- Final deprecation and removal of core_backup\copy\copy in backup/util/ui/classes/copy.php. Please use copy_helper from backup/util/helper/copy_helper.class.php instead.
 
-  For more information see [MDL-81433](https://tracker.moodle.org/browse/MDL-81433)
-- Added a new database helper method `sql_replace_parameters` to help ensure uniqueness of parameters within a SQL expression
+  For more information see [MDL-75022](https://tracker.moodle.org/browse/MDL-75022)
 
-  For more information see [MDL-81434](https://tracker.moodle.org/browse/MDL-81434)
+### core_question
 
-#### Removed
+#### Added
 
-- The following previously deprecated local helper methods have been removed and can no longer be used:
-    - `audience::get_all_audiences_menu_types`
-    - `report::get_available_columns`
+- A new utility function `format_question_fragment` has been created so that question content can filter based on filters.
 
-  For more information see [MDL-76690](https://tracker.moodle.org/browse/MDL-76690)
+  For more information see [MDL-78662](https://tracker.moodle.org/browse/MDL-78662)
 
 #### Changed
 
-- In order to better support float values in filter forms, the following filter types now cast given SQL prior to comparison:
-    - `duration`
-    - `filesize`
-    - `number`
-
-  For more information see [MDL-81168](https://tracker.moodle.org/browse/MDL-81168)
-- The base datasource `add_all_from_entities` method accepts a new optional parameter to specify which entities to add elements from
-
-  For more information see [MDL-81330](https://tracker.moodle.org/browse/MDL-81330)
-- All time related code has been updated to the PSR-20 Clock interface, as such the following methods no longer accept a `$timenow` parameter (instead please use `\core\clock` dependency injection):
-  - `core_reportbuilder_generator::create_schedule`
-  - `core_reportbuilder\local\helpers\schedule::[create_schedule|calculate_next_send_time]`
-
-  For more information see [MDL-82041](https://tracker.moodle.org/browse/MDL-82041)
-- The following classes have been moved to use the new exception API as a l2 namespace:
-  - `core_reportbuilder\\report_access_exception` => `core_reportbuilder\\exception\\report_access_exception` - `core_reportbuilder\\source_invalid_exception` => `core_reportbuilder\\exception\\source_invalid_exception` - `core_reportbuilder\\source_unavailable_exception` => `core_reportbuilder\\exception\\source_unavailable_exception`
+- column_base::from_column_name now has an ignoremissing field, which can be used to ignore if the class does not exist, instead of throwing an exception.
 
-  For more information see [MDL-82133](https://tracker.moodle.org/browse/MDL-82133)
+  For more information see [MDL-81125](https://tracker.moodle.org/browse/MDL-81125)
 
 ### core_webservice
 
@@ -330,13 +378,14 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
 
   For more information see [MDL-80745](https://tracker.moodle.org/browse/MDL-80745)
 
-### core_question
+### core_table
 
-#### Changed
+#### Added
 
-- column_base::from_column_name now has an ignoremissing field, which can be used to ignore if the class does not exist, instead of throwing an exception.
+- A new `$reponsive` property (defaulting to `true`) has been added to the `core_table\flexible_table` class.
+  This property allows you to control whether the table is rendered as a responsive table.
 
-  For more information see [MDL-81125](https://tracker.moodle.org/browse/MDL-81125)
+  For more information see [MDL-80748](https://tracker.moodle.org/browse/MDL-80748)
 
 ### mod_data
 
@@ -382,20 +431,6 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
 
   For more information see [MDL-81597](https://tracker.moodle.org/browse/MDL-81597)
 
-### theme
-
-#### Added
-
-- New `core/context_header` mustache template has been added. This template can be overridden by themes to modify the context header
-
-  For more information see [MDL-81597](https://tracker.moodle.org/browse/MDL-81597)
-
-#### Deprecated
-
-- The method `\core\output\core_renderer::render_context_header` has been deprecated please use `\core\output\core_renderer::render($contextheader)` instead
-
-  For more information see [MDL-82160](https://tracker.moodle.org/browse/MDL-82160)
-
 ### core_courseformat
 
 #### Added
@@ -444,6 +479,17 @@ The format of this change log follows the advice given at [Keep a CHANGELOG](htt
 
   For more information see [MDL-81749](https://tracker.moodle.org/browse/MDL-81749)
 
+### core_report
+
+#### Added
+
+- Report has been added to subsystem components list
+
+  For more information see [MDL-81771](https://tracker.moodle.org/browse/MDL-81771)
+- New coursestructure output general class has been created
+
+  For more information see [MDL-81771](https://tracker.moodle.org/browse/MDL-81771)
+
 ### theme_boost
 
 #### Changed
diff --git a/backup/util/ui/UPGRADING.md b/backup/util/ui/UPGRADING.md
new file mode 100644
index 0000000000000..1bbf593c80546
--- /dev/null
+++ b/backup/util/ui/UPGRADING.md
@@ -0,0 +1,10 @@
+# core_backup (subsystem) Upgrade notes
+
+## 4.5dev
+
+### Removed
+
+- Final deprecation and removal of core_backup\copy\copy in backup/util/ui/classes/copy.php. Please use copy_helper from backup/util/helper/copy_helper.class.php instead.
+
+  For more information see [MDL-75022](https://tracker.moodle.org/browse/MDL-75022)
+
diff --git a/lib/UPGRADING.md b/lib/UPGRADING.md
index bacad5f61524b..60793c39bdd3b 100644
--- a/lib/UPGRADING.md
+++ b/lib/UPGRADING.md
@@ -17,6 +17,9 @@
 - Final deprecation of print_error(). Use moodle_exception instead.
 
   For more information see [MDL-74484](https://tracker.moodle.org/browse/MDL-74484)
+- Final deprecation of \core\task\manager::ensure_adhoc_task_qos()
+
+  For more information see [MDL-74843](https://tracker.moodle.org/browse/MDL-74843)
 
 ### Changed
 
diff --git a/lib/table/UPGRADING.md b/lib/table/UPGRADING.md
new file mode 100644
index 0000000000000..e9eb81afec2e4
--- /dev/null
+++ b/lib/table/UPGRADING.md
@@ -0,0 +1,11 @@
+# core_table (subsystem) Upgrade notes
+
+## 4.5dev
+
+### Added
+
+- A new `$reponsive` property (defaulting to `true`) has been added to the `core_table\flexible_table` class.
+  This property allows you to control whether the table is rendered as a responsive table.
+
+  For more information see [MDL-80748](https://tracker.moodle.org/browse/MDL-80748)
+
diff --git a/question/UPGRADING.md b/question/UPGRADING.md
index c43d84b4d79e1..c330b4b9a8744 100644
--- a/question/UPGRADING.md
+++ b/question/UPGRADING.md
@@ -2,6 +2,12 @@
 
 ## 4.5dev
 
+### Added
+
+- A new utility function `format_question_fragment` has been created so that question content can filter based on filters.
+
+  For more information see [MDL-78662](https://tracker.moodle.org/browse/MDL-78662)
+
 ### Changed
 
 - column_base::from_column_name now has an ignoremissing field, which can be used to ignore if the class does not exist, instead of throwing an exception.
diff --git a/report/UPGRADING.md b/report/UPGRADING.md
index c7ddfbc1ff645..8db933b918ed9 100644
--- a/report/UPGRADING.md
+++ b/report/UPGRADING.md
@@ -2,14 +2,11 @@
 
 ## 4.5dev
 
-### Removed
+### Added
 
-- The previously deprecated `report_helper::save_selected_report` method has been removed and can no longer be used
+- Report has been added to subsystem components list
 
-  For more information see [MDL-72353](https://tracker.moodle.org/browse/MDL-72353)
+  For more information see [MDL-81771](https://tracker.moodle.org/browse/MDL-81771)
+- New coursestructure output general class has been created
 
-### Changed
-
-- The `report_helper::print_report_selector` method accepts an additional argument for adding content to the tertiary navigation to align with the report selector
-
-  For more information see [MDL-78773](https://tracker.moodle.org/browse/MDL-78773)
+  For more information see [MDL-81771](https://tracker.moodle.org/browse/MDL-81771)
diff --git a/reportbuilder/UPGRADING.md b/reportbuilder/UPGRADING.md
index ba79a719769fc..005b56d2d272b 100644
--- a/reportbuilder/UPGRADING.md
+++ b/reportbuilder/UPGRADING.md
@@ -4,6 +4,9 @@
 
 ### Added
 
+- The return type of the `set_checkbox_toggleall` callback, defined by system reports, can now be null. Use if the checkbox should not be shown for the row.
+
+  For more information see [MDL-52046](https://tracker.moodle.org/browse/MDL-52046)
 - System reports now support native entity column aggregation via each columns `set_aggregation()` method
 
   For more information see [MDL-76392](https://tracker.moodle.org/browse/MDL-76392)
diff --git a/theme/UPGRADING.md b/theme/UPGRADING.md
index 3c29581340b87..734fffdf42176 100644
--- a/theme/UPGRADING.md
+++ b/theme/UPGRADING.md
@@ -2,6 +2,12 @@
 
 ## 4.5dev
 
+### Removed
+
+- Removed all references to iconhelp, icon-pre, icon-post, iconlarge, and iconsort classes
+
+  For more information see [MDL-74251](https://tracker.moodle.org/browse/MDL-74251)
+
 ### Added
 
 - New `core/context_header` mustache template has been added. This template can be overridden by themes to modify the context header
diff --git a/theme/boost/UPGRADING.md b/theme/boost/UPGRADING.md
index 4935869857574..497709a803f9e 100644
--- a/theme/boost/UPGRADING.md
+++ b/theme/boost/UPGRADING.md
@@ -7,4 +7,3 @@
 - Bootstrap .no-gutters class is no longer used, use .g-0  instead.
 
   For more information see [MDL-81818](https://tracker.moodle.org/browse/MDL-81818)
-

From 7d7a871eddf81cdc1e6f5ea9dda67cf9058dd032 Mon Sep 17 00:00:00 2001
From: Ilya Tregubov <ilya.a.tregubov@gmail.com>
Date: Fri, 5 Jul 2024 09:01:53 +0800
Subject: [PATCH 119/119] weekly release 4.5dev

---
 version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version.php b/version.php
index fee642f7ed4d9..95c817a0cc371 100644
--- a/version.php
+++ b/version.php
@@ -29,9 +29,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2024070300.01;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2024070500.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.
-$release  = '4.5dev (Build: 20240627)'; // Human-friendly version name
+$release  = '4.5dev (Build: 20240705)'; // Human-friendly version name
 $branch   = '405';                     // This version's branch.
 $maturity = MATURITY_ALPHA;             // This version's maturity level.