Moodle release 4.0.11

weekly release 4.0.10+
MDL-77795 mod_bigbluebuttonbn: Change meetingID on duplicate
2023-10-07 11:29:58 +08:00 · 2023-10-06 14:02:34 +02:00 · 2023-10-06 08:49:29 +08:00 · 2023-10-04 14:31:52 +08:00 · 2023-10-04 14:31:52 +08:00 · 2023-10-04 14:31:51 +08:00
876 changed files with 13453 additions and 6553 deletions
@@ -156,7 +156,7 @@ const getThirdPartyLibsList = relativeTo => {
 * @returns {array}
 */
 const getThirdPartyPaths = () => {
-    const DOMParser = require('xmldom').DOMParser;
+    const DOMParser = require('@xmldom/xmldom').DOMParser;
    const fs = require('fs');
    const path = require('path');
    const xpath = require('xpath');
@@ -30,10 +30,9 @@
 * @param {String} srcPath the  matched src path
 * @return {String} The rewritten destination path.
 */
-
 const babelRename = function(destPath, srcPath) {
-    destPath = srcPath.replace('src', 'build');
-    destPath = destPath.replace('.js', '.min.js');
+    destPath = srcPath.replace(`amd/src`, `amd/build`);
+    destPath = destPath.replace(/\.js$/, '.min.js');
    return destPath;
 };

@@ -0,0 +1,78 @@
+<?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/>.
+
+/**
+ * Reset course indentation
+ *
+ * @copyright 2023 Amaia Anabitarte <amaia@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once('../../config.php');
+
+require_admin();
+
+$format = required_param('format', PARAM_PLUGIN);
+$confirm = optional_param('confirm', false, PARAM_BOOL);
+$backurl = new moodle_url('/admin/settings.php', ['section' => 'formatsetting'.$format]);
+
+$PAGE->set_url('/admin/course/resetindentation.php', ['format' => $format]);
+$PAGE->set_context(context_system::instance());
+
+if ($confirm) {
+    require_sesskey();
+    $courses = $DB->get_records('course', ['format' => $format], 'id', 'id');
+    if (!empty($courses)) {
+        $courseids = array_keys($courses);
+        list($courseinsql, $courseparams) = $DB->get_in_or_equal($courseids, SQL_PARAMS_NAMED, 'course');
+        $DB->set_field_select('course_modules', 'indent', '0', "course $courseinsql AND indent <> 0", $courseparams);
+        rebuild_course_cache(0, true);
+    }
+    redirect(
+        $backurl,
+        get_string('resetindentationsuccess', 'admin'),
+        null,
+        \core\output\notification::NOTIFY_SUCCESS
+    );
+}
+
+$strtitle = get_string('resetindentation', 'admin');
+
+$PAGE->set_title($strtitle);
+$PAGE->set_heading($strtitle);
+
+navigation_node::override_active_url(new moodle_url(
+    '/admin/course/resetindentation.php',
+    ['action' => 'confirm', 'format' => $format]
+));
+
+echo $OUTPUT->header();
+
+$displayoptions = ['confirmtitle' => get_string('resetindentation_title', 'admin')];
+$confirmbutton = new single_button(
+    new moodle_url('/admin/course/resetindentation.php', ['confirm' => 1, 'format' => $format, 'sesskey' => sesskey()]),
+    get_string('resetindentation', 'admin'),
+    'post'
+);
+$cancelbutton = new single_button($backurl, get_string('cancel'));
+echo $OUTPUT->confirm(
+    get_string('resetindentation_help', 'admin', ['format' => get_string('pluginname', 'format_'.$format)]),
+    $confirmbutton,
+    $cancelbutton,
+    $displayoptions
+);
+
+echo $OUTPUT->footer();
@@ -3751,6 +3751,7 @@
      <VENDOR name="oracle" version="19" />
    </DATABASE>
    <PHP version="7.4.0" level="required">
+      <RESTRICT function="restrict_php_version_82" message="unsupportedphpversion82" />
    </PHP>
    <PCREUNICODE level="optional">
      <FEEDBACK>
@@ -4109,6 +4110,199 @@
      </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_CHECKS>
+  </MOODLE>
+  <MOODLE version="4.3" requires="3.11.8">
+    <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.0.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_CHECKS>
  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -6,7 +6,7 @@ require_once(__DIR__ . '/../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 include_once($CFG->dirroot.'/mnet/lib.php');

-$sort         = optional_param('sort', 'username', PARAM_ALPHA);
+$sort         = optional_param('sort', 'username', PARAM_ALPHAEXT);
 $dir          = optional_param('dir', 'ASC', PARAM_ALPHA);
 $page         = optional_param('page', 0, PARAM_INT);
 $perpage      = optional_param('perpage', 30, PARAM_INT);
@@ -154,7 +154,15 @@ foreach ($columns as $column) {
    $headings[$column] = "<a href=\"?sort=$column&amp;dir=$columndir&amp;\">".$string[$column]."</a>$columnicon";
 }
 $headings['delete'] = '';
-$acl = $DB->get_records('mnet_sso_access_control', null, "$sort $dir", '*'); //, $page * $perpage, $perpage);
+
+$sortorder = get_safe_orderby([
+    'username' => 'username',
+    'mnet_host_id' => 'mnet_host_id',
+    'access' => 'accessctrl',
+    'default' => 'username',
+], $sort, $dir, false);
+
+$acl = $DB->get_records('mnet_sso_access_control', null, $sortorder);
 $aclcount = $DB->count_records('mnet_sso_access_control');

 if (!$acl) {
@@ -30,25 +30,36 @@

 require_once(__DIR__ . '/../config.php');

+// The state parameter we've given (used in moodle as a redirect url).
+// Per https://www.rfc-editor.org/rfc/rfc6749#section-4.1.2.1, state is required, even during error responses.
+$state = required_param('state', PARAM_LOCALURL);
+$redirecturl = new moodle_url($state);
+$params = $redirecturl->params();
+
 $error = optional_param('error', '', PARAM_RAW);
+
 if ($error) {
-    $message = optional_param('error_description', '', PARAM_RAW);
-    if ($message) {
-        $SESSION->loginerrormsg = $message;
-        redirect(new moodle_url(get_login_url()));
-    } else {
-        $SESSION->loginerrormsg = $error;
-        redirect(new moodle_url(get_login_url()));
+    $message = optional_param('error_description', null, PARAM_RAW);
+
+    // Errors can occur for authenticated users, such as when a user denies authorization for some internal service call.
+    // In such cases, propagate the error to the component redirect URI.
+    if (isloggedin()) {
+        if (isset($params['sesskey']) && confirm_sesskey($params['sesskey'])) {
+            $redirecturl->param('error', $error);
+            if ($message) {
+                $redirecturl->param('error_description', $message);
+            }
+            redirect($redirecturl);
+        }
    }
+
+    // Not logged in or the sesskey verification failed, redirect to login + show errors.
+    $SESSION->loginerrormsg = $message ?? $error;
+    redirect(new moodle_url(get_login_url()));
 }

 // The authorization code generated by the authorization server.
 $code = required_param('code', PARAM_RAW);
-// The state parameter we've given (used in moodle as a redirect url).
-$state = required_param('state', PARAM_LOCALURL);
-
-$redirecturl = new moodle_url($state);
-$params = $redirecturl->params();

 if (isset($params['sesskey']) and confirm_sesskey($params['sesskey'])) {
    $redirecturl->param('oauth2code', $code);
@@ -90,6 +90,7 @@ $title = get_string('overridepermissionsforrole', 'core_role', $a);
 $currenttab = 'permissions';

 $PAGE->set_title($title);
+$PAGE->activityheader->disable();
 $PAGE->navbar->add($straction);
 switch ($context->contextlevel) {
    case CONTEXT_SYSTEM:
@@ -52,6 +52,7 @@
    <span data-passwordunmask="wrapper" data-passwordunmaskid="{{ id }}">
        <span data-passwordunmask="editor">
            <input  type="password"
+                    autocomplete="new-password"
                    name="{{ name }}"
                    id="{{ id }}"
                    value="{{ value }}"
@@ -0,0 +1,113 @@
+@core @core_admin @core_course @javascript
+Feature: Reset course indentation
+  In order to reset indentation in course modules
+  As a admin
+  I want change indent value for all the modules of a course format courses in one go
+
+  Background:
+    Given the following "courses" exist:
+      | fullname        | shortname | format |
+      | Topics Course 1 | T1        | topics |
+      | Topics Course 2 | T2        | topics |
+      | Weekly Course 1 | W1        | weeks  |
+      | Weekly Course 2 | W2        | weeks  |
+    And the following "activities" exist:
+      | activity | name                 | intro                       | course | idnumber |
+      | forum    | Topics forum name    | Topics forum description    | T1     | forum1   |
+      | data     | Topics database name | Topics database description | T1     | data1    |
+      | wiki     | Topics wiki name     | Topics wiki description     | T2     | wiki1    |
+      | forum    | Weekly forum name    | Weekly forum description    | W1     | forum2   |
+      | data     | Weekly database name | Weekly database description | W1     | data2    |
+      | wiki     | Weekly wiki name     | Weekly wiki description     | W2     | wiki2    |
+    And I log in as "admin"
+    And I am on "Topics Course 1" course homepage with editing mode on
+    And I open "Topics forum name" actions menu
+    And I click on "Move right" "link" in the "Topics forum name" activity
+    And I open "Topics forum name" actions menu
+    And "Move right" "link" in the "Topics forum name" "activity" should not be visible
+    And "Move left" "link" in the "Topics forum name" "activity" should be visible
+    And I press the escape key
+    And I open "Topics database name" actions menu
+    And "Move right" "link" in the "Topics database name" "activity" should be visible
+    And "Move left" "link" in the "Topics database name" "activity" should not be visible
+    And I am on "Topics Course 2" course homepage with editing mode on
+    And I open "Topics wiki name" actions menu
+    And I click on "Move right" "link" in the "Topics wiki name" activity
+    And I open "Topics wiki name" actions menu
+    And "Move right" "link" in the "Topics wiki name" "activity" should not be visible
+    And "Move left" "link" in the "Topics wiki name" "activity" should be visible
+    And I am on "Weekly Course 1" course homepage with editing mode on
+    And I open "Weekly forum name" actions menu
+    And I click on "Move right" "link" in the "Weekly forum name" activity
+    And I open "Weekly forum name" actions menu
+    And "Move right" "link" in the "Weekly forum name" "activity" should not be visible
+    And "Move left" "link" in the "Weekly forum name" "activity" should be visible
+    And I press the escape key
+    And I open "Weekly database name" actions menu
+    And "Move right" "link" in the "Weekly database name" "activity" should be visible
+    And "Move left" "link" in the "Weekly database name" "activity" should not be visible
+    And I am on "Weekly Course 2" course homepage with editing mode on
+    And I open "Weekly wiki name" actions menu
+    And I click on "Move right" "link" in the "Weekly wiki name" activity
+    And I open "Weekly wiki name" actions menu
+    And "Move right" "link" in the "Weekly wiki name" "activity" should not be visible
+    And "Move left" "link" in the "Weekly wiki name" "activity" should be visible
+
+  Scenario Outline: Apply course indentation reset
+    Given I navigate to "Plugins > Course formats > <format> format" in site administration
+    And I wait "5" seconds
+    And "Reset indentation" "link" should exist
+    When I click on "Reset indentation" "link"
+    And I should see "Reset indentation on course page"
+    And "Reset indentation" "button" should exist
+    And I click on "Reset indentation" "button"
+    Then I should see "Indentation reset"
+    And I am on "<format> Course 1" course homepage with editing mode on
+    And I open "<format> forum name" actions menu
+    And "Move right" "link" in the "<format> forum name" "activity" should be visible
+    And "Move left" "link" in the "<format> forum name" "activity" should not be visible
+    And I press the escape key
+    And I open "<format> database name" actions menu
+    And "Move right" "link" in the "<format> database name" "activity" should be visible
+    And "Move left" "link" in the "<format> database name" "activity" should not be visible
+    And I am on "<format> Course 2" course homepage with editing mode on
+    And I open "<format> wiki name" actions menu
+    And "Move right" "link" in the "<format> wiki name" "activity" should be visible
+    And "Move left" "link" in the "<format> wiki name" "activity" should not be visible
+#   Check other course formats had not been reset
+    And I am on "<other> Course 1" course homepage with editing mode on
+    And I open "<other> forum name" actions menu
+    And "Move right" "link" in the "<other> forum name" "activity" should not be visible
+    And "Move left" "link" in the "<other> forum name" "activity" should be visible
+
+    Examples:
+      | format | other  |
+      | Topics | Weekly |
+      | Weekly | Topics |
+
+  Scenario Outline: Cancel course indentation reset
+    Given I navigate to "Plugins > Course formats > <format> format" in site administration
+    And "Reset indentation" "link" should exist
+    When I click on "Reset indentation" "link"
+    And I should see "Reset indentation on course page"
+    And "Reset indentation" "button" should exist
+    And "Cancel" "button" should exist
+    And I click on "Cancel" "button"
+    Then I should not see "Indentation reset"
+    And I am on "<format> Course 1" course homepage with editing mode on
+    And I open "<format> forum name" actions menu
+    And "Move right" "link" in the "<format> forum name" "activity" should not be visible
+    And "Move left" "link" in the "<format> forum name" "activity" should be visible
+    And I press the escape key
+    And I open "<format> database name" actions menu
+    And "Move right" "link" in the "<format> database name" "activity" should be visible
+    And "Move left" "link" in the "<format> database name" "activity" should not be visible
+    And I am on "<format> Course 2" course homepage with editing mode on
+    And I open "<format> wiki name" actions menu
+    And "Move right" "link" in the "<format> wiki name" "activity" should not be visible
+    And "Move left" "link" in the "<format> wiki name" "activity" should be visible
+
+    Examples:
+      | format |
+      | Topics |
+      | Weekly |
@@ -34,8 +34,11 @@ Feature: Manage availability conditions
    Given the following "courses" exist:
      | fullname | shortname | format |
      | Course 1 | C1        | topics |
+    And the following "activity" exists:
+      | activity | page |
+      | course   | C1   |
+      | name     | P1   |
    And I log in as "admin"
-    And I am on site homepage
    When I navigate to "Plugins > Availability restrictions > Manage restrictions" in site administration

    # Check the icon is there (it should be a Hide icon, meaning is currently visible).
@@ -51,8 +54,7 @@ Feature: Manage availability conditions

    # OK, toggling works. Set the grade one to Hide and we'll go see if it actually worked.
    And I click on "Hide" "icon" in the "Restriction by grade" "table_row"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add a "Page" to section "1"
+    And I am on the "P1" "page activity editing" page
    And I expand all fieldsets
    And I click on "Add restriction..." "button"
    And "Add restriction..." "dialogue" should be visible
@@ -49,7 +49,7 @@ list($options, $unrecognized) = cli_get_params(
        'torun'    => 0,
        'optimize-runs' => '',
        'add-core-features-to-theme' => false,
-        'axe'      => false,
+        'axe'      => null,
        'disable-composer' => false,
        'composer-upgrade' => true,
        'composer-self-update' => true,
@@ -69,7 +69,7 @@ Behat utilities to initialise behat tests

 Usage:
  php init.php      [--parallel=value [--maxruns=value] [--fromrun=value --torun=value]]
-                    [--axe] [-o | --optimize-runs] [-a | --add-core-features-to-theme]
+                    [--no-axe] [-o | --optimize-runs] [-a | --add-core-features-to-theme]
                    [--no-composer-self-update] [--no-composer-upgrade]
                    [--disable-composer]
                    [--help]
@@ -79,7 +79,7 @@ Options:
 -m, --maxruns       Max parallel processes to be executed at one time
 --fromrun           Execute run starting from (Used for parallel runs on different vms)
 --torun             Execute run till (Used for parallel runs on different vms)
--axe               Include axe accessibility tests
+--no-axe            Disable axe accessibility tests.

 -o, --optimize-runs
                    Split features with specified tags in all parallel runs.
@@ -110,6 +110,12 @@ if (!empty($options['help'])) {
    exit(0);
 }

+if ($options['axe']) {
+    echo "Axe accessibility tests are enabled by default, to disable them, use the --no-axe option.\n";
+} else if ($options['axe'] === false) {
+    echo "Axe accessibility tests have been disabled.\n";
+}
+
 // Check which util file to call.
 $utilfile = 'util_single_run.php';
 $commandoptions = "";
@@ -118,9 +124,7 @@ if ($options['parallel'] && $options['parallel'] > 1) {
    $utilfile = 'util.php';
    // Sanitize all input options, so they can be passed to util.
    foreach ($options as $option => $value) {
-        if ($value) {
-            $commandoptions .= " --$option=\"$value\"";
-        }
+        $commandoptions .= behat_get_command_flags($option, $value);
    }
 } else {
    // Only sanitize options for single run.
@@ -130,9 +134,7 @@ if ($options['parallel'] && $options['parallel'] > 1) {
    ];

    foreach ($cmdoptionsforsinglerun as $option) {
-        if (!empty($options[$option])) {
-            $commandoptions .= " --$option='$options[$option]'";
-        }
+        $commandoptions .= behat_get_command_flags($option, $options[$option]);
    }
 }

@@ -57,7 +57,7 @@ list($options, $unrecognized) = cli_get_params(
        'torun'       => 0,
        'optimize-runs' => '',
        'add-core-features-to-theme' => false,
-        'axe'         => false,
+        'axe'         => true,
    ),
    array(
        'h' => 'help',
@@ -73,7 +73,7 @@ $help = "
 Behat utilities to manage the test environment

 Usage:
-  php util.php [--install|--drop|--enable|--disable|--diag|--updatesteps|--axe|--help] [--parallel=value [--maxruns=value]]
+  php util.php [--install|--drop|--enable|--disable|--diag|--updatesteps|--no-axe|--help] [--parallel=value [--maxruns=value]]

 Options:
 --install      Installs the test environment for acceptance tests
@@ -82,7 +82,7 @@ Options:
 --disable      Disables test environment
 --diag         Get behat test environment status code
 --updatesteps  Update feature step file.
--axe          Include axe accessibility tests
+--no-axe       Disable axe accessibility tests.

 -j, --parallel Number of parallel behat run operation
 -m, --maxruns Max parallel processes to be executed at one time.
@@ -320,12 +320,7 @@ function commands_to_execute($options) {
    }

    foreach ($extraoptions as $option => $value) {
-        if ($options[$option]) {
-            $extra .= " --$option";
-            if ($value) {
-                $extra .= "=\"$value\"";
-            }
-        }
+        $extra .= behat_get_command_flags($option, $value);
    }

    if (empty($options['parallel'])) {
@@ -52,7 +52,7 @@ list($options, $unrecognized) = cli_get_params(
        'updatesteps' => false,
        'optimize-runs' => '',
        'add-core-features-to-theme' => false,
-        'axe'         => false,
+        'axe'         => true,
    ),
    array(
        'h' => 'help',
@@ -79,7 +79,7 @@ Options:
 --disable        Disables test environment
 --diag           Get behat test environment status code
 --updatesteps    Update feature step file.
--axe            Include axe accessibility tests
+--no-axe         Disable axe accessibility tests.

 -o, --optimize-runs Split features with specified tags in all parallel runs.
 -a, --add-core-features-to-theme Add all core features to specified theme's
@@ -186,7 +186,7 @@ if ($options['install']) {
        behat_config_manager::set_behat_run_config_value('behatsiteenabled', 1);
    }

-    // Define whether to run Behat with axe tests.
+    // Configure axe according to option.
    behat_config_manager::set_behat_run_config_value('axe', $options['axe']);

    // Enable test mode.
@@ -103,8 +103,7 @@ Feature: Set up contextual data for tests
    And the following "course enrolments" exist:
      | user | course | role |
      | student1 | C1 | student |
-    When I log in as "student1"
-    And I am on "Course 1" course homepage
+    When I am on the "Course 1" course page logged in as student1
    Then I should see "Topic 1"

  Scenario: Add role assigns
@@ -138,17 +137,11 @@ Feature: Set up contextual data for tests
    When I log in as "user1"
    And I am on site homepage
    Then edit mode should be available on the current page
-    And I log out
-    And I log in as "user2"
-    And I am on "Course 1" course homepage
+    And I am on the "Course 1" course page logged in as user2
    Then edit mode should be available on the current page
-    And I log out
-    And I log in as "user3"
-    And I am on "Course 1" course homepage
+    And I am on the "Course 1" course page logged in as user3
    Then edit mode should be available on the current page
-    And I log out
-    And I log in as "user4"
-    And I am on "Course 1" course homepage
+    And I am on the "Course 1" course page logged in as user4
    Then edit mode should be available on the current page
    And I log out
    And I log in as "user5"
@@ -190,8 +183,7 @@ Feature: Set up contextual data for tests
    And the following "activities" exist:
      | activity   | name                            | intro                         | course | idnumber    | grade |
      | assign     | Test assignment name with scale | Test assignment description   | C1     | assign1     | Test Scale 1 |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
+    When I am on the "Course 1" course page logged in as admin
    Then I should see "Test assignment name"
    # Assignment 2.2 module type is disabled by default
    # And I should see "Test assignment22 name"
@@ -308,9 +300,7 @@ Feature: Set up contextual data for tests
    And the following "grade categories" exist:
      | fullname | course | gradecategory |
      | Grade sub category 2 | C1 | Grade category 1 |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
-    And I navigate to "View > Grader report" in the course gradebook
+    When I am on the "Course 1" "grades > Grader report > View" page logged in as "admin"
    Then I should see "Grade category 1"
    And I should see "Grade sub category 2"

@@ -331,9 +321,7 @@ Feature: Set up contextual data for tests
      | itemname    | course | gradecategory |
      | Test Grade Item 2 | C1 | Grade category 1 |
      | Test Grade Item 3 | C1 | Grade sub category 2 |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
-    And I navigate to "Setup > Gradebook setup" in the course gradebook
+    When I am on the "Course 1" "grades > gradebook setup" page logged in as "admin"
    Then I should see "Test Grade Item 1"
    And I follow "Edit   Test Grade Item 1"
    And I expand all fieldsets
@@ -359,9 +347,7 @@ Feature: Set up contextual data for tests
    And the following "scales" exist:
      | name | scale |
      | Test Scale 1 | Disappointing, Good, Very good, Excellent |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
-    And I navigate to "Scales" in the course gradebook
+    When I am on the "Course 1" "grades > scales" page logged in as admin
    Then I should see "Test Scale 1"
    And I should see "Disappointing,  Good,  Very good,  Excellent"

@@ -380,9 +366,7 @@ Feature: Set up contextual data for tests
      | Grade outcome 2 | OT2       | C1     | Test Scale 1 |
    And the following config values are set as admin:
      | enableoutcomes | 1 |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
-    And I navigate to "More > Outcomes" in the course gradebook
+    When I am on the "Course 1" "grades > outcomes" page logged in as admin
    Then I should see "Grade outcome 1" in the "#addoutcomes" "css_element"
    And I should see "Grade outcome 2" in the "#removeoutcomes" "css_element"
    And I press "Manage outcomes"
@@ -408,9 +392,7 @@ Feature: Set up contextual data for tests
      | Test Outcome Grade Item 1 | C1     | OT1     | Grade category 1 |
    And the following config values are set as admin:
      | enableoutcomes | 1 |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
-    And I navigate to "Setup > Gradebook setup" in the course gradebook
+    When I am on the "Course 1" "grades > gradebook setup" page logged in as "admin"
    Then I should see "Test Outcome Grade Item 1"
    And I follow "Edit   Test Outcome Grade Item 1"
    And the field "Outcome" matches value "Grade outcome 1"
@@ -425,6 +407,5 @@ Feature: Set up contextual data for tests
    And the following "blocks" exist:
      | blockname    | contextlevel | reference | pagetypepattern | defaultregion |
      | online_users | Course       | C1        | course-view-*   | site-pre      |
-    When I log in as "admin"
-    And I am on "Course 1" course homepage
+    When I am on the "Course 1" course page logged in as admin
    Then I should see "Online users"
@@ -21,12 +21,15 @@ Feature: Edit capabilities

  Scenario: Default system capabilities modification
    Given I log in as "admin"
-    And I set the following system permissions of "Teacher" role:
+    And I navigate to "Users > Permissions > Define roles" in site administration
+    And I click on "Edit Teacher role" "link"
+    And I fill the capabilities form with the following permissions:
      | capability | permission |
      | block/mnet_hosts:myaddinstance | Allow |
      | moodle/site:messageanyuser | Inherit |
      | moodle/grade:managesharedforms | Prevent |
      | moodle/course:request | Prohibit |
+    And I press "Save changes"
    When I follow "Edit Teacher role"
    Then "block/mnet_hosts:myaddinstance" capability has "Allow" permission
    And "moodle/site:messageanyuser" capability has "Not set" permission
@@ -48,16 +51,12 @@ Feature: Edit capabilities
    And "mod/forum:addquestion" capability has "Allow" permission

  Scenario: Module capabilities overrides
-    Given I log in as "teacher1"
-    And the following "activity" exists:
+    Given the following "activity" exists:
      | activity | forum                |
      | course   | C1                   |
      | idnumber | 00001                |
      | name     | I'm the name         |
-      | intro    | I'm the introduction |
-      | section  | 1                    |
-    And I am on "Course 1" course homepage with editing mode on
-    And I follow "I'm the name"
+    And I am on the "I'm the name" "forum activity" page logged in as teacher1
    And I navigate to "Permissions" in current page administration
    And I override the system permissions of "Student" role with:
      | mod/forum:deleteanypost | Prohibit |
@@ -1,5 +1,7 @@
 This files describes API changes in the tool_behat code.

+=== 4.0.9 ===
+* Behat is initialised with Axe accessibility tests enabled by default, if you want to disable them please use the --no-axe option.
 === 3.7 ===
 * Behat will now look for behat step definitions in the current
  theme and any parents the theme may have.
@@ -16,6 +16,8 @@

 namespace tool_brickfield\local\tool;

+use tool_brickfield\manager;
+
 /**
 * Class advanced.
 *
@@ -51,12 +53,36 @@ class advanced extends tool {
        return 'advanced';
    }

+    /**
+     * Builds context data used to render a single grid item on the advanced page.
+     * @param string $icon
+     * @param string $heading
+     * @param string $content
+     * @return array
+     */
+    protected function get_grid_item_context(string $icon, string $heading, string $content): array {
+        return [
+            "icon" => "pix/i/$icon.png",
+            "iconalt" => get_string("icon:$icon", manager::PLUGINNAME),
+            "heading" => get_string($heading, manager::PLUGINNAME),
+            "content" => get_string($content, manager::PLUGINNAME)
+        ];
+    }
+
    /**
     * Return the data for renderer / template display.
     * @return \stdClass
     */
    protected function fetch_data(): \stdClass {
        $data = (object)[
+            'griditems' => [
+                $this->get_grid_item_context("analytics-custom", "headingone", "contentone"),
+                $this->get_grid_item_context("tools-custom", "headingtwo", "contenttwo"),
+                $this->get_grid_item_context("file-edit-custom", "headingthree", "contentthree"),
+                $this->get_grid_item_context("search-plus-custom", "headingfour", "contentfour"),
+                $this->get_grid_item_context("wand-magic-custom", "headingfive", "contentfive"),
+                $this->get_grid_item_context("hands-helping-custom", "headingsix", "contentsix"),
+            ],
            'valid' => true,
            'error' => '',
        ];
@@ -254,19 +254,16 @@ class renderer extends \tool_brickfield\output\renderer {
                <tr>
                    <td>
                        <img src="' . $this->image_path() . 'tachometer-alt-solid.svg" width="15" height="15">' .
-                        ' <td style="line-height: 10px;"> ' .
                        get_string('totalactivitiescount', manager::PLUGINNAME, $data->combodata['total']) .
-                        '</td></td>
+                    '</td>
                    <td>
                        <img src="' . $this->image_path() . 'check-square-regular.svg" width="15" height="15">' .
-                        ' <td style="line-height: 10px;"> ' .
                        get_string('passedcount', manager::PLUGINNAME, $data->combodata['passed']) .
-                        '</td></td>
+                    '</td>
                    <td>
                        <img src="' . $this->image_path() . 'times-circle-regular.svg" width="15" height="15">' .
-                        ' <td style="line-height: 10px;"> ' .
                        get_string('failedcount', manager::PLUGINNAME, $data->combodata['failed']) .
-                        '</td></td>
+                    '</td>
                </tr>
            </table>';

@@ -396,8 +393,8 @@ class renderer extends \tool_brickfield\output\renderer {
        foreach ($data->groupdata as $key => $group) {
            $checkgroup = area_base::checkgroup_name($key);
            $icon = $icons[$key];
-            $tabledata[] = ['<img src="'.$icon.'" width="15" height="15">' . ' ' .' <td style="line-height: 10px;">  '.
-                get_string('checktype:' . $checkgroup, manager::PLUGINNAME).'</td>', $group->errorinstances];
+            $tabledata[] = ['<img src="'.$icon.'" width="15" height="15">' . ' ' .
+                get_string('checktype:' . $checkgroup, manager::PLUGINNAME), $group->errorinstances];
        }

        return $this->render_table(
@@ -270,3 +270,9 @@ $string['headingthree'] = 'Accessible file formats';
 $string['headingfour'] = 'Focus effort';
 $string['headingfive'] = 'HTML fixes';
 $string['headingsix'] = 'Performance support';
+$string['icon:analytics-custom'] = 'Analytics icon';
+$string['icon:tools-custom'] = 'Tools icon';
+$string['icon:file-edit-custom'] = 'Edit file icon';
+$string['icon:search-plus-custom'] = 'Search icon';
+$string['icon:wand-magic-custom'] = 'Magic wand icon';
+$string['icon:hands-helping-custom'] = 'Helping hands icon';
@@ -10,49 +10,22 @@

 /* Advanced Page CSS */

-@media only screen and (min-width: 768px) {
-    .tool_brickfield_grid_item {
-        width: 33.333333333333336%;
-    }
+#tool_brickifeld_advanced_page {
+    margin: 20px 20px 20px 10px;
 }

-@media only screen and (max-width: 767px) {
-    .tool_brickfield_grid_item {
-        width: 100%;
-    }
-}
-
-.tool_brickfield_grid {
-    max-width: 1140px;
-    margin-right: auto;
-    margin-left: auto;
-}
-
-.tool_brickfield_grid_inner {
-    width: 100%;
+.tool_brickfield_banner_heading {
    display: flex;
-    flex-wrap: wrap;
-}
-
-.tool_brickfield_grid_item_shape {
-    height: 96%;
-    background-color: #fff;
-    padding: 10% 10% 10% 10%;
-    box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.05);
-    margin: 1% 1% 1% 1%;
-    border-radius: 15px 15px 15px 70px;
-}
-
-.tool_brickfield_grid_display {
-    display: grid;
-    grid-template-columns: 0.6fr 1.4fr 1fr;
-    grid-template-rows: 1fr 1fr;
-}
-
-.tool_brickfield_grid_spacing {
+    justify-content: space-between;
    margin-bottom: 20px;
-    margin-left: auto;
-    margin-right: 1em;
+}
+
+.tool_brickfield_banner_heading > img {
+    height: 50px;
+}
+
+.tool_brickfield_banner > p {
+    text-align: center;
 }

 .tool_brickfield_grid_heading {
@@ -60,59 +33,63 @@
    font-size: 20px;
    font-weight: 400;
    color: #040d29;
+    padding-bottom: 4px;
 }

 .tool_brickfield_grid_content {
    color: #040d29;
    font-size: 16px;
    line-height: 1.4em;
-    margin: 0;
-    padding: 0;
 }

-.tool_brickfield_logo_height {
-    height: 3em;
-}
-
-.tool_brickfield_logo_position {
-    padding-bottom: 2em;
-}
-
-.tool_brickfield_icon_position {
-    line-height: 1;
-    font-size: 50px;
-}
-
-.tool_brickfield_icon_height {
+.tool_brickfield_grid_heading > img {
    height: 30px;
+    padding-right: 16px;
 }

-.tool_brickfield_center_button {
-    text-align: center;
+.tool_brickfield_grid {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    margin: 20px 20px 30px;
 }

-.tool_brickfield_advanced_button {
+.tool_brickfield_grid > div {
+    margin: 10px;
+    padding: 20px;
+    flex-basis: 30%;
+    border: 1px solid grey;
+    max-width: 500px;
+    min-width: 250px;
+    flex-grow: 4;
+    border-radius: 15px 15px 15px 50px;
+}
+
+.tool_brickfield_grid_heading {
+    display: flex;
+}
+
+.tool_brickfield_footer > a {
    font-size: 18px;
    letter-spacing: 1px;
    color: #fff;
    background-color: #4054b2;
-    border-style: solid;
-    border-color: #fff;
-    border-radius: 5px 5px 5px 5px;
-    padding: 15px 50px 15px 50px;
+    border-radius: 5px;
+    padding: 15px 50px;
    transition: 0.3s;
+    margin-bottom: 20px;
 }

-.tool_brickfield_advanced_button:hover {
+.tool_brickfield_footer {
+    text-align: center;
+}
+
+.tool_brickfield_footer > a:hover {
+    color: #fff;
    background-color: #253687;
+    text-decoration: none;
 }

-.tool_brickfield_banner_heading {
-    margin-bottom: 1.5em;
-}
-
-.tool_brickfield_banner {
-    height: 10em;
-    padding: 2.5em;
-    margin-bottom: 2em;
+.tool_brickfield_footer > p {
+    margin-bottom: 25px;
 }
@@ -21,184 +21,42 @@

    Example context (json):
    {
-        "pagetitle": "Advanced"
+        "griditems": [
+            {
+                "icon": "some-icon-name",
+                "iconalt": "some-icon-alt",
+                "heading": "some-heading",
+                "content": "some-content"
+            }
+        ]
    }
 }}
-
-<link rel="stylesheet" href="styles.css">
-
-<h3>{{{pagetitle}}}</h3>
-
-<section class="tool_brickfield_banner">
-    <div class="tool_brickfield_banner_heading">
-        <img src="pix/i/Brickfield-logo-black.png" alt="Brickfield Logo" class="pull-right tool_brickfield_logo_height">
-        <h2>{{# str }}bannerheadingone, tool_brickfield{{/ str }}</h2>
+<div id="tool_brickifeld_advanced_page">
+    <div class="tool_brickfield_banner">
+        <div class="tool_brickfield_banner_heading">
+            <h2>{{#str}} bannerheadingone, tool_brickfield{{/str}}</h2>
+            <img src="pix/i/Brickfield-logo-black.png" alt="Brickfield Logo">
+        </div>
+        <p>{{#str}} bannercontentone, tool_brickfield, https://www.brickfield.ie/moodle_talk_to_sales/{{/str}}</p>
    </div>
-    <p>
-        {{# str }}bannercontentone, tool_brickfield, https://www.brickfield.ie/moodle_talk_to_sales/{{/ str }}
-    </p>
-</section>
-
-<div class="tool_brickfield_grid">
-    <div class="tool_brickfield_grid_inner">
-
+    <div class="tool_brickfield_grid">
+        {{#griditems}}
        <div class="tool_brickfield_grid_item">
-            <div class="tool_brickfield_grid_item_shape">
-                <div class="tool_brickfield_grid_display" style="grid-template-areas: 'al ar ar' 'al ar ar'; grid-area: a;">
-                    <div style="grid-area: al;">
-                        <div class="tool_brickfield_grid_spacing">
-                            <span class="tool_brickfield_icon_position">
-                                <img src="pix/i/analytics-custom.png" alt="Analytics icon" class="tool_brickfield_icon_height">
-                            </span>
-                        </div>
-                    </div>
-                    <div style="grid-area: ar;">
-                        <h3>
-                            <span class="tool_brickfield_grid_heading">
-                                {{# str }}headingone, tool_brickfield{{/ str }}
-                            </span>
-                        </h3>
-                        <p class="tool_brickfield_grid_content">
-                            {{# str }}contentone, tool_brickfield{{/ str }}
-                        </p>
-                    </div>
-                </div>
+            <div class="tool_brickfield_grid_heading">
+                <img src={{icon}} alt={{iconalt}}>
+                <h3>{{heading}}</h3>
+            </div>
+            <div class="tool_brickfield_grid_content">
+                <p>{{content}}</p>
            </div>
        </div>
-
-        <div class="tool_brickfield_grid_item">
-            <div class="tool_brickfield_grid_item_shape">
-                <div class="tool_brickfield_grid_display" style="grid-template-areas: 'bl br br' 'bl br br'; grid-area: b;">
-                    <div style="grid-area: bl;">
-                        <div class="tool_brickfield_grid_spacing">
-                            <span class="tool_brickfield_icon_position">
-                                <img src="pix/i/tools-custom.png" alt="Tools icon" class="tool_brickfield_icon_height">
-                            </span>
-                        </div>
-                    </div>
-                    <div style="grid-area: br;">
-                        <h3>
-                            <span class="tool_brickfield_grid_heading">
-                                {{# str }}headingtwo, tool_brickfield{{/ str }}
-                            </span>
-                        </h3>
-                        <p class="tool_brickfield_grid_content">
-                            {{# str }}contenttwo, tool_brickfield{{/ str }}
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="tool_brickfield_grid_item">
-            <div class="tool_brickfield_grid_item_shape">
-                <div class="tool_brickfield_grid_display" style="grid-template-areas: 'cl cr cr' 'cl cr cr'; grid-area: c;">
-                    <div style="grid-area: cl;">
-                        <div class="tool_brickfield_grid_spacing">
-                            <span class="tool_brickfield_icon_position">
-                                <img src="pix/i/file-edit-custom.png" alt="Edit file icon" class="tool_brickfield_icon_height">
-                            </span>
-                        </div>
-                    </div>
-                    <div style="grid-area: cr;">
-                        <h3>
-                            <span class="tool_brickfield_grid_heading">
-                                {{# str }}headingthree, tool_brickfield{{/ str }}
-                            </span>
-                        </h3>
-                        <p class="tool_brickfield_grid_content">
-                            {{# str }}contentthree, tool_brickfield{{/ str }}
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="tool_brickfield_grid_item">
-            <div class="tool_brickfield_grid_item_shape">
-                <div class="tool_brickfield_grid_display" style="grid-template-areas: 'dl dr dr' 'dl dr dr'; grid-area: d;">
-                    <div style="grid-area: dl;">
-                        <div class="tool_brickfield_grid_spacing">
-                            <span class="tool_brickfield_icon_position">
-                                <img src="pix/i/search-plus-custom.png" alt="Search icon" class="tool_brickfield_icon_height">
-                            </span>
-                        </div>
-                    </div>
-                    <div style="grid-area: dr;">
-                        <h3>
-                            <span class="tool_brickfield_grid_heading">
-                                {{# str }}headingfour, tool_brickfield{{/ str }}
-                            </span>
-                        </h3>
-                        <p class="tool_brickfield_grid_content">
-                            {{# str }}contentfour, tool_brickfield{{/ str }}
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="tool_brickfield_grid_item">
-            <div class="tool_brickfield_grid_item_shape">
-                <div class="tool_brickfield_grid_display" style="grid-template-areas: 'el er er' 'el er er'; grid-area: e;">
-                    <div style="grid-area: el;">
-                        <div class="tool_brickfield_grid_spacing">
-                            <span class="tool_brickfield_icon_position">
-                                <img src="pix/i/wand-magic-custom.png" alt="Magic wand icon" class="tool_brickfield_icon_height">
-                            </span>
-                        </div>
-                    </div>
-                    <div style="grid-area: er;">
-                        <h3>
-                            <span class="tool_brickfield_grid_heading">
-                                {{# str }}headingfive, tool_brickfield{{/ str }}
-                            </span>
-                        </h3>
-                        <p class="tool_brickfield_grid_content">
-                            {{# str }}contentfive, tool_brickfield{{/ str }}
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="tool_brickfield_grid_item">
-            <div class="tool_brickfield_grid_item_shape">
-                <div class="tool_brickfield_grid_display" style="grid-template-areas: 'fl fr fr' 'fl fr fr'; grid-area: f;">
-                    <div style="grid-area: fl;">
-                        <div class="tool_brickfield_grid_spacing">
-                            <span class="tool_brickfield_icon_position">
-                                <img src="pix/i/hands-helping-custom.png" alt="Helping hands icon" class="tool_brickfield_icon_height">
-                            </span>
-                        </div>
-                    </div>
-                    <div style="grid-area: fr;">
-                        <h3>
-                            <span class="tool_brickfield_grid_heading">
-                                {{# str }}headingsix, tool_brickfield{{/ str }}
-                            </span>
-                        </h3>
-                        <p class="tool_brickfield_grid_content">
-                            {{# str }}contentsix, tool_brickfield{{/ str }}
-                        </p>
-                    </div>
-                </div>
-            </div>
-        </div>
-
+        {{/griditems}}
+    </div>
+    <div class="tool_brickfield_footer">
+        <h2 class="accesshide">{{#str}} footerheading, tool_brickfield {{/str}}</h2>
+        <p>{{#str}}bannercontenttwo, tool_brickfield{{/str}}</p>
+        <a href="https://www.brickfield.ie/moodle_free_demo/">
+            {{#str}}buttonone, tool_brickfield{{/str}}
+        </a>
    </div>
 </div>
-
-<section class="tool_brickfield_banner">
-    <h2 class="accesshide">{{# str }}footerheading, tool_brickfield{{/ str }}</h2>
-    <p>
-        {{# str }}bannercontenttwo, tool_brickfield{{/ str }}
-    </p>
-    <div class="tool_brickfield_center_button">
-        <form action="https://www.brickfield.ie/moodle_free_demo/">
-            <button class="tool_brickfield_advanced_button">
-                {{# str }}buttonone, tool_brickfield{{/ str }}
-            </button>
-        </form>
-    </div>
-</section>
@@ -179,6 +179,7 @@ class api {
                           AND ra.roleid = :roleid
                           AND ra.userid = :userid
                         WHERE cm.cohortid ' . $cohortsql . '
+                           AND u.deleted = 0
                           AND ra.id IS NULL';

                $toadd = $DB->get_records_sql($sql, $params);
@@ -0,0 +1,43 @@
+<?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_cohortroles;
+
+use core\event\user_deleted;
+
+/**
+ * Plugin event observer callbacks
+ *
+ * @package    tool_cohortroles
+ * @copyright  2023 Paul Holden <paulh@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class observers {
+
+    /**
+     * User deleted event, remove cohort role assignments specific to them
+     *
+     * @param user_deleted $event
+     */
+    public static function user_deleted(user_deleted $event): void {
+        $cohortroleassignments = cohort_role_assignment::get_records(['userid' => $event->objectid]);
+        foreach ($cohortroleassignments as $cohortroleassignment) {
+            $cohortroleassignment->delete();
+        }
+    }
+}
@@ -0,0 +1,32 @@
+<?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/>.
+
+/**
+ * Plugin event observers
+ *
+ * @package    tool_cohortroles
+ * @copyright  2023 Paul Holden <paulh@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+$observers = [
+    [
+        'eventname' => '\core\event\user_deleted',
+        'callback' => '\tool_cohortroles\observers::user_deleted',
+    ],
+];
@@ -47,5 +47,13 @@ function xmldb_tool_cohortroles_upgrade($oldversion) {
    // Automatically generated Moodle v4.0.0 release upgrade line.
    // Put any upgrade step following this.

+    if ($oldversion < 2022041901) {
+        // Delete any tool_cohortroles mappings for users who no longer exist.
+        $DB->delete_records_select('tool_cohortroles', 'userid NOT IN (SELECT id FROM {user} WHERE deleted = 0)');
+
+        // Cohortroles savepoint reached.
+        upgrade_plugin_savepoint(true, 2022041901, 'tool', 'cohortroles');
+    }
+
    return true;
 }
@@ -24,8 +24,7 @@

 defined('MOODLE_INTERNAL') || die();

-
-$plugin->version   = 2022041900; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version   = 2022041901; // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires  = 2022041200; // Requires this Moodle version.
 $plugin->component = 'tool_cohortroles'; // Full name of the plugin (used for diagnostics).

@@ -30,6 +30,12 @@ Feature: Protected data should not be deleted
      | Site purpose | PT1H            | 0          |
      | prot         | P1D             | 1          |
      | unprot       | P1D             | 0          |
+    And the following "mod_forum > discussions" exist:
+      | user     | forum   | name                | message              |
+      | u1       | forump1 | Discussion subject  | Test post in forump1 |
+      | u1       | forumu1 | Discussion subject  | Test post in forumu1 |
+      | u1       | forump2 | Discussion subject  | Test post in forump2 |
+      | u1       | forumu2 | Discussion subject  | Test post in forumu2 |
    And I set the category and purpose for the "forump1" "forum" in course "C1" to "CAT" and "prot"
    And I set the category and purpose for the "forump2" "forum" in course "C2" to "CAT" and "prot"
    And I set the category and purpose for the "forumu1" "forum" in course "C1" to "CAT" and "unprot"
@@ -38,47 +44,25 @@ Feature: Protected data should not be deleted

  @javascripta
  Scenario: Unexpired and protected data is not removed
-    Given I log in as "u1"
-    And I am on "C1" course homepage
-    And I add a new discussion to "forump1" forum with:
-      | Subject | Discussion subject |
-      | Message | Test post in forump1 |
-    And I am on "C1" course homepage
-    And I add a new discussion to "forumu1" forum with:
-      | Subject | Discussion subject |
-      | Message | Test post in forumu1 |
-    And I am on "C2" course homepage
-    And I add a new discussion to "forump2" forum with:
-      | Subject | Discussion subject |
-      | Message | Test post in forump2 |
-    And I am on "C2" course homepage
-    And I add a new discussion to "forumu2" forum with:
-      | Subject | Discussion subject |
-      | Message | Test post in forumu2 |
-    And I log out
-    And I log in as "admin"
+    Given  I log in as "admin"
    And I create a dataprivacy "delete" request for "u1"
    And I approve a dataprivacy "delete" request for "u1"
    And I run all adhoc tasks
    And I navigate to "Users > Privacy and policies > Data requests" in site administration
    And I should see "Deleted" in the "u1" "table_row"

-    And I am on "C1" course homepage
-    And I follow "forump1"
+    And I am on the "forump1" "forum activity" page
    And I follow "Discussion subject"
    Then I should not see "Test post in forump1"

-    When I am on "C1" course homepage
-    And I follow "forumu1"
+    When I am on the "forumu1" "forum activity" page
    And I follow "Discussion subject"
    Then I should not see "Test post in forumu1"

-    And I am on "C2" course homepage
-    And I follow "forump2"
+    And I am on the "forump2" "forum activity" page
    And I follow "Discussion subject"
    Then I should see "Test post in forump2"

-    When I am on "C2" course homepage
-    And I follow "forumu2"
+    When I am on the "forumu2" "forum activity" page
    And I follow "Discussion subject"
    Then I should not see "Test post in forumu2"
@@ -24,6 +24,8 @@

 namespace tool_langimport;

+use moodle_url;
+
 defined('MOODLE_INTERNAL') || die();
 require_once($CFG->libdir.'/filelib.php');
 require_once($CFG->libdir.'/componentlib.class.php');
@@ -59,6 +61,25 @@ class controller {
        $this->availablelangs = $this->installer->get_remote_list_of_languages();
    }

+    /**
+     * Redirect to the specified url, outputting any required messages.
+     *
+     * @param moodle_url $url
+     */
+    public function redirect(moodle_url $url): void {
+        if ($this->info) {
+            $info = implode('<br />', $this->info);
+            \core\notification::success($info);
+        }
+
+        if ($this->errors) {
+            $info = implode('<br />', $this->errors);
+            \core\notification::error($info);
+        }
+
+        redirect($url);
+    }
+
    /**
     * Install language packs provided
     *
@@ -112,6 +133,18 @@ class controller {
    public function uninstall_language($lang) {
        global $CFG;

+        $lang = clean_param($lang, PARAM_LANG);
+        if ($lang === '') {
+            // Do not allow uninstallation of invalid languages.
+            // Note: PARAM_LANG returns an empty string for invalid validation.
+            return false;
+        }
+
+        if ($lang === 'en') {
+            // Never allow removal of the default langauge.
+            return false;
+        }
+
        $dest1 = $CFG->dataroot.'/lang/'.$lang;
        $dest2 = $CFG->dirroot.'/lang/'.$lang;
        $rm1 = false;
@@ -43,6 +43,13 @@ $uninstalllang      = optional_param_array('uninstalllang', array(), PARAM_LANG)
 $confirmtounistall  = optional_param('confirmtouninstall', '', PARAM_SAFEPATH);  // uninstallation confirmation
 $purgecaches        = optional_param('purgecaches', false, PARAM_BOOL);  // explicit caches reset

+// Filter the uninstall language list.
+// If the list contains a language which is not installed, it is replaced with an empty string.
+// When we try to uninstall an empty string, we uninstall every language.
+$uninstalllang = array_filter($uninstalllang, function($lang) {
+    return !empty($lang);
+});
+
 if ($purgecaches) {
    require_sesskey();
    get_string_manager()->reset_caches();
@@ -69,11 +76,12 @@ if (($mode == INSTALLATION_OF_SELECTED_LANG) and confirm_sesskey() and !empty($p
    if (is_array($pack) && count($pack) > 1) {
        // Installing multiple languages can take a while - perform it asynchronously in the background.
        $controller->schedule_languagepacks_installation($pack);
-
+        $controller->redirect($PAGE->url);
    } else {
        // Single language pack to be installed synchronously. It should be reasonably quick and can be used for debugging, too.
        core_php_time_limit::raise();
        $controller->install_languagepacks($pack);
+        $controller->redirect($PAGE->url);
    }
 }

@@ -102,7 +110,7 @@ if ($mode == DELETION_OF_SELECTED_LANG and (!empty($uninstalllang) or !empty($co
        foreach ($uninstalllang as $ulang) {
            $controller->uninstall_language($ulang);
        }
-
+        $controller->redirect($PAGE->url);
    }
 }

@@ -0,0 +1,59 @@
+<?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_langimport;
+
+/**
+ * Tests for \tool_langimport\locale class.
+ *
+ * @package    tool_langimport
+ * @category   test
+ * @coversDefaultClass \tool_langimport\controller
+ * @copyright  2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class controller_test extends \advanced_testcase {
+
+    /**
+     * Test uninstall of language with invalid values.
+     *
+     * @covers ::uninstall_lang
+     * @dataProvider uninstall_lang_invalid_provider
+     * @params string $lang
+     */
+    public function test_uninstall_lang_invalid(string $lang): void {
+        global $CFG;
+
+        $controller = new controller();
+        $this->assertFalse($controller->uninstall_language($lang));
+        $this->assertFileExists("{$CFG->dataroot}/lang");
+        $this->assertFileExists("{$CFG->dirroot}/lang/en");
+    }
+
+    /**
+     * Data provider for uninstall_lang tests with invalid values.
+     *
+     * @return array
+     */
+    public function uninstall_lang_invalid_provider(): array {
+        return [
+            'Empty string' => [''],
+            'Meaningless empty string' => [' '],
+            'Default language' => ['en'],
+            'Invalid language string' => ['swedish'],
+        ];
+    }
+}
@@ -14,19 +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/>.

-/**
- * License manager helper class.
- *
- * @package    tool_licensemanager
- * @copyright  2019 Tom Dickman <tomdickman@catalyst-au.net>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */

 namespace tool_licensemanager;

 use moodle_url;

-defined('MOODLE_INTERNAL') || die();

 /**
 * License manager helper class.
@@ -48,12 +40,7 @@ class helper {
     * @return \moodle_url
     */
    public static function get_licensemanager_url() : moodle_url {
-        global $CFG;
-
-        $url = new moodle_url($CFG->wwwroot . self::MANAGER_PATH,
-            ['sesskey' => sesskey()]);
-
-        return $url;
+        return new moodle_url(self::MANAGER_PATH);
    }

    /**
@@ -90,9 +77,8 @@ class helper {
     * @return \moodle_url
     */
    public static function get_create_license_url() : moodle_url {
-        $url = new moodle_url(self::MANAGER_PATH,
-            ['action' => manager::ACTION_CREATE, 'sesskey' => sesskey()]);
-
+        $url = self::get_licensemanager_url();
+        $url->params(['action' => manager::ACTION_CREATE]);
        return $url;
    }

@@ -104,9 +90,8 @@ class helper {
     * @return \moodle_url
     */
    public static function get_update_license_url(string $licenseshortname) : moodle_url {
-        $url = new moodle_url(self::MANAGER_PATH,
-            ['action' => manager::ACTION_UPDATE, 'license' => $licenseshortname, 'sesskey' => sesskey()]);
-
+        $url = self::get_licensemanager_url();
+        $url->params(['action' => manager::ACTION_UPDATE, 'license' => $licenseshortname]);
        return $url;
    }

@@ -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/>.

-/**
- * License manager.
- *
- * @package    tool_licensemanager
- * @copyright  2019 Tom Dickman <tomdickman@catalyst-au.net>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace tool_licensemanager;

 use tool_licensemanager\form\edit_license;
 use license_manager;
 use stdClass;

-defined('MOODLE_INTERNAL') || die();
-
 /**
 * License manager, main controller for tool_licensemanager.
 *
@@ -95,18 +85,25 @@ class manager {
        }

        $viewmanager = true;
+        $redirect = helper::get_licensemanager_url();

        switch ($action) {
            case self::ACTION_DISABLE:
+                require_sesskey();
                license_manager::disable($license);
+                redirect($redirect);
                break;

            case self::ACTION_ENABLE:
+                require_sesskey();
                license_manager::enable($license);
+                redirect($redirect);
                break;

            case self::ACTION_DELETE:
+                require_sesskey();
                license_manager::delete($license);
+                redirect($redirect);
                break;

            case self::ACTION_CREATE:
@@ -116,7 +113,9 @@ class manager {

            case self::ACTION_MOVE_UP:
            case self::ACTION_MOVE_DOWN:
+                require_sesskey();
                $this->change_license_order($action, $license);
+                redirect($redirect);
                break;

            case self::ACTION_VIEW_LICENSE_MANAGER:
@@ -28,15 +28,9 @@ require_once($CFG->libdir . '/licenselib.php');

 require_admin();

-$returnurl = \tool_licensemanager\helper::get_licensemanager_url();
-
 $action = optional_param('action', '', PARAM_ALPHANUMEXT);
 $license = optional_param('license', '', PARAM_SAFEDIR);

-if (!confirm_sesskey()) {
-    redirect($returnurl);
-}
-
 // Route via the manager.
 $licensemanager = new \tool_licensemanager\manager();
 $PAGE->set_context(context_system::instance());
@@ -128,3 +128,18 @@ Feature: Manage competency frameworks
    Then I should see "Competency framework updated"
    And I should see "Science Year-6 Edited"
    And I should see "sc-y-6"
+
+  Scenario: Duplicate a competency framework
+    Given the following lp "frameworks" exist:
+      | shortname | idnumber |
+      | CF1       | CF1      |
+    And the following lp "competencies" exist:
+      | shortname | framework |
+      | C1        | CF1       |
+    And I navigate to "Competencies > Competency frameworks" in site administration
+    # Duplicate the selected competency framework
+    When I click on "Duplicate" of edit menu in the "CF1" row
+    # Confirm that the selected framework was duplicated by clicking on the link
+    And I click on "CF1 (copy) (CF1_1)" "link"
+    # Confirm that the corresponding competency also exists in the duplicated framework
+    Then I should see "C1"
@@ -15,6 +15,17 @@ Feature: Manage plan workflow
      | usermanageowndraftplan | User manage own draft plan role | user |
      | usermanageownplan | User manage own plan role | user |
      | manageplan | Manager all plans role | manager |
+    And the following "role capabilities" exist:
+      | role                   | moodle/competency:planmanageowndraft | moodle/competency:planmanageown |
+      | usermanageowndraftplan | allow                                |                                 |
+      | usermanageownplan      | allow                                | allow                           |
+      | manageplan             | allow                                | allow                           |
+    And the following "role capability" exists:
+      | role                                | manageplan |
+      | moodle/competency:planmanage        | allow      |
+      | moodle/competency:planview          | allow      |
+      | moodle/competency:planreview        | allow      |
+      | moodle/competency:planrequestreview | allow      |
    And the following "role assigns" exist:
      | user  | role | contextlevel | reference |
      | user1 | usermanageowndraftplan | System |  |
@@ -40,23 +51,6 @@ Feature: Manage plan workflow
    And the following "blocks" exist:
      | blockname               | contextlevel | reference | pagetypepattern | defaultregion |
      | lp                      | System       | 1         | my-index        | content       |
-    And I log in as "admin"
-    And I set the following system permissions of "User manage own draft plan role" role:
-      | capability | permission |
-      | moodle/competency:planmanageowndraft | Allow |
-    And I set the following system permissions of "User manage own plan role" role:
-      | capability | permission |
-      | moodle/competency:planmanageowndraft | Allow |
-      | moodle/competency:planmanageown | Allow |
-    And I set the following system permissions of "Manager all plans role" role:
-      | capability | permission |
-      | moodle/competency:planmanage | Allow |
-      | moodle/competency:planmanagedraft | Allow |
-      | moodle/competency:planmanageowndraft | Allow |
-      | moodle/competency:planview | Allow |
-      | moodle/competency:planreview | Allow |
-      | moodle/competency:planrequestreview | Allow |
-    And I log out

  Scenario: User can manages his own plan draft
    Given I log in as "user1"
@@ -147,9 +141,7 @@ Feature: Manage plan workflow
      | name | user | description | status | reviewer |
      | Test-Plan3 | user1 | Description of plan 3 for user 1 | active | manager1 |
      | Test-Plan4 | user1 | Description of plan 4 for user 1 | active | manager1 |
-    And I log in as "manager1"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I follow "User 1"
+    And I am on the "user1" "user > profile" page logged in as "manager1"
    And I follow "Learning plans"
    And I should see "List of learning plans"
    When I click on "Send back to draft" of edit menu in the "Test-Plan3" row
@@ -165,9 +157,7 @@ Feature: Manage plan workflow
      | name | user | description | status | reviewer |
      | Test-Plan3 | user1 | Description of plan 3 for user 1 | active | manager1 |
      | Test-Plan4 | user1 | Description of plan 4 for user 1 | active | manager1 |
-    And I log in as "manager1"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I follow "User 1"
+    And I am on the "user1" "user > profile" page logged in as "manager1"
    And I follow "Learning plans"
    And I should see "List of learning plans"
    When I click on "Complete this learning plan" of edit menu in the "Test-Plan3" row
@@ -186,9 +176,7 @@ Feature: Manage plan workflow
      | name | user | description | status | reviewer |
      | Test-Plan3 | user1 | Description of plan 3 for user 1 | complete | manager1 |
      | Test-Plan4 | user1 | Description of plan 4 for user 1 | complete | manager1 |
-    And I log in as "manager1"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I follow "User 1"
+    And I am on the "user1" "user > profile" page logged in as "manager1"
    And I follow "Learning plans"
    And I should see "List of learning plans"
    When I click on "Reopen this learning plan" of edit menu in the "Test-Plan3" row
@@ -25,6 +25,8 @@
 require_once(__DIR__ . '/../../../config.php');
 require_once($CFG->libdir.'/adminlib.php');

+admin_externalpage_setup('toollpexportcsv');
+
 $pagetitle = get_string('exportnavlink', 'tool_lpimportcsv');

 $context = context_system::instance();
@@ -25,6 +25,8 @@ define('NO_OUTPUT_BUFFERING', true);
 require_once(__DIR__ . '/../../../config.php');
 require_once($CFG->libdir.'/adminlib.php');

+admin_externalpage_setup('toollpimportcsv');
+
 $pagetitle = get_string('pluginname', 'tool_lpimportcsv');

 $context = context_system::instance();
@@ -14,17 +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/>.

-/**
- * Event documentation
- *
- * @package    tool_monitor
- * @copyright  2014 onwards Ankit Agarwal <ankit.agrr@gmail.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */

 namespace tool_monitor;

-defined('MOODLE_INTERNAL') || die();
+use core_component;
+use ReflectionClass;

 /**
 * Class for returning event information.
@@ -35,126 +29,6 @@ defined('MOODLE_INTERNAL') || die();
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
 class eventlist {
-    /**
-     * Return all of the core event files.
-     *
-     * @return array Core events.
-     */
-    protected static function get_core_eventlist() {
-        global $CFG;
-
-        // Disable developer debugging as deprecated events will fire warnings.
-        // Setup backup variables to restore the following settings back to what they were when we are finished.
-        $debuglevel          = $CFG->debug;
-        $debugdisplay        = $CFG->debugdisplay;
-        $debugdeveloper      = $CFG->debugdeveloper;
-        $CFG->debug          = 0;
-        $CFG->debugdisplay   = false;
-        $CFG->debugdeveloper = false;
-
-        $eventinformation = array();
-        $directory = $CFG->libdir . '/classes/event';
-        $files = self::get_file_list($directory);
-
-        // Remove exceptional events that will cause problems being displayed.
-        if (isset($files['unknown_logged'])) {
-            unset($files['unknown_logged']);
-        }
-        foreach ($files as $file => $location) {
-            $classname = '\\core\\event\\' . $file;
-            // Check to see if this is actually a valid event.
-            if (method_exists($classname, 'get_static_info')) {
-                $ref = new \ReflectionClass($classname);
-                // Ignore abstracts.
-                if (!$ref->isAbstract() && $file != 'manager') {
-                    $eventinformation[$classname] = $classname::get_name_with_info();
-                }
-            }
-        }
-        // Now enable developer debugging as event information has been retrieved.
-        $CFG->debug          = $debuglevel;
-        $CFG->debugdisplay   = $debugdisplay;
-        $CFG->debugdeveloper = $debugdeveloper;
-        return $eventinformation;
-    }
-
-    /**
-     * This function returns an array of all events for the plugins of the system.
-     *
-     * @param bool $withoutcomponent Return an eventlist without associated components.
-     *
-     * @return array A list of events from all plug-ins.
-     */
-    protected static function get_non_core_eventlist($withoutcomponent = false) {
-        global $CFG;
-        // Disable developer debugging as deprecated events will fire warnings.
-        // Setup backup variables to restore the following settings back to what they were when we are finished.
-        $debuglevel          = $CFG->debug;
-        $debugdisplay        = $CFG->debugdisplay;
-        $debugdeveloper      = $CFG->debugdeveloper;
-        $CFG->debug          = 0;
-        $CFG->debugdisplay   = false;
-        $CFG->debugdeveloper = false;
-
-        $noncorepluginlist = array();
-        $plugintypes = \core_component::get_plugin_types();
-        foreach ($plugintypes as $plugintype => $notused) {
-            $pluginlist = \core_component::get_plugin_list($plugintype);
-            foreach ($pluginlist as $plugin => $directory) {
-                $plugindirectory = $directory . '/classes/event';
-                foreach (self::get_file_list($plugindirectory) as $eventname => $notused) {
-                    $fullpluginname = $plugintype . '_' . $plugin;
-                    $plugineventname = '\\' . $fullpluginname . '\\event\\' . $eventname;
-                    // Check that this is actually an event.
-                    if (method_exists($plugineventname, 'get_static_info')  && $fullpluginname !== 'tool_monitor') { // No selfie here.
-                        $ref = new \ReflectionClass($plugineventname);
-                        if (!$ref->isAbstract() && $fullpluginname !== 'logstore_legacy') {
-                            if ($withoutcomponent) {
-                                $noncorepluginlist[$plugineventname] = $plugineventname::get_name_with_info();
-                            } else {
-                                $noncorepluginlist[$fullpluginname][$plugineventname] = $plugineventname::get_name_with_info();
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        // Now enable developer debugging as event information has been retrieved.
-        $CFG->debug          = $debuglevel;
-        $CFG->debugdisplay   = $debugdisplay;
-        $CFG->debugdeveloper = $debugdeveloper;
-
-        return $noncorepluginlist;
-    }
-
-    /**
-     * Returns a list of files with a full directory path in a specified directory.
-     *
-     * @param string $directory location of files.
-     * @return array full location of files from the specified directory.
-     */
-    protected static function get_file_list($directory) {
-        global $CFG;
-        $directoryroot = $CFG->dirroot;
-        $finalfiles = array();
-        if (is_dir($directory)) {
-            if ($handle = opendir($directory)) {
-                $files = scandir($directory);
-                foreach ($files as $file) {
-                    if ($file != '.' && $file != '..') {
-                        // Ignore the file if it is external to the system.
-                        if (strrpos($directory, $directoryroot) !== false) {
-                            $location = substr($directory, strlen($directoryroot));
-                            $name = substr($file, 0, -4);
-                            $finalfiles[$name] = $location  . '/' . $file;
-                        }
-                    }
-                }
-            }
-        }
-        return $finalfiles;
-    }

    /**
     * Get a list of events present in the system.
@@ -164,13 +38,58 @@ class eventlist {
     * @return array list of events present in the system.
     */
    public static function get_all_eventlist($withoutcomponent = false) {
-        if ($withoutcomponent) {
-            $return = array_merge(self::get_core_eventlist(), self::get_non_core_eventlist($withoutcomponent));
-            array_multisort($return, SORT_NATURAL);
-        } else {
-            $return = array_merge(array('core' => self::get_core_eventlist()),
-                    self::get_non_core_eventlist($withoutcomponent = false));
+        global $CFG;
+
+        // Disable developer debugging as deprecated events will fire warnings.
+        // Setup backup variables to restore the following settings back to what they were when we are finished.
+        $debuglevel          = $CFG->debug;
+        $debugdisplay        = $CFG->debugdisplay;
+        $debugdeveloper      = $CFG->debugdeveloper;
+        $CFG->debug          = 0;
+        $CFG->debugdisplay   = false;
+        $CFG->debugdeveloper = false;
+
+        // List of exceptional events that will cause problems if displayed.
+        $eventsignore = [
+            \core\event\unknown_logged::class,
+            \logstore_legacy\event\legacy_logged::class,
+        ];
+
+        $return = [];
+
+        $events = core_component::get_component_classes_in_namespace(null, 'event');
+        foreach (array_keys($events) as $event) {
+            // We need to filter all classes that extend event base, or the base class itself.
+            if (is_a($event, \core\event\base::class, true) && !in_array($event, $eventsignore)) {
+
+                $reflectionclass = new ReflectionClass($event);
+                if ($reflectionclass->isAbstract()) {
+                    continue;
+                }
+
+                // We can't choose this component's own events.
+                [$component] = explode('\\', $event);
+                if ($component === 'tool_monitor') {
+                    continue;
+                }
+
+                if ($withoutcomponent) {
+                    $return["\\{$event}"] = $event::get_name_with_info();
+                } else {
+                    $return[$component]["\\{$event}"] = $event::get_name_with_info();
+                }
+            }
        }
+
+        // Now enable developer debugging as event information has been retrieved.
+        $CFG->debug          = $debuglevel;
+        $CFG->debugdisplay   = $debugdisplay;
+        $CFG->debugdeveloper = $debugdeveloper;
+
+        if ($withoutcomponent) {
+            array_multisort($return, SORT_NATURAL);
+        }
+
        return $return;
    }

@@ -169,10 +169,9 @@ Feature: tool_monitor_subscriptions
    And I should not see "You can manage rules the from the Event monitoring rules page."

  Scenario: No manage rules link when user does not have permission
-    Given I log in as "admin"
-    And I set the following system permissions of "Non-editing teacher" role:
-      | tool/monitor:managerules | Prohibit |
-    And I log out
+    Given the following "role capability" exists:
+      | role                     | teacher  |
+      | tool/monitor:managerules | prohibit |
    And I log in as "teacher1"
    And I follow "Preferences" in the user menu
    And I follow "Event monitoring"
@@ -71,8 +71,8 @@
            </div>
            <div class="box py-3 modal-footer">
                <div class="buttons">
-                    <input class="btn btn-secondary" type="submit" name="cancel" value="Cancel">
-                    <input class="btn btn-primary" type="submit" name="import" value="Continue">
+                    <input class="btn btn-secondary" type="submit" name="cancel" value="{{#str}}cancel, core{{/str}}">
+                    <input class="btn btn-primary" type="submit" name="import" value="{{#str}}continue, core{{/str}}">
                </div>
            </div>
        </form>
@@ -151,25 +151,25 @@ Feature: Basic OAuth2 functionality
      | Service base URL           | https://dc.imsglobal.org/                 |
    When I press "Save changes"
    Then I should see "Changes saved"
-    And I should see "Open Badges"
-    And "Allow services" "icon" should exist in the "Open Badges" "table_row"
-    And "Do not allow login" "icon" should exist in the "Open Badges" "table_row"
-    And "Service discovery successful" "icon" should exist in the "Open Badges" "table_row"
-    And the "src" attribute of "table.admintable th img" "css_element" should contain "IMS-Global-Logo.png"
-    And I click on "Configure endpoints" "link" in the "Open Badges" "table_row"
-    And I should see "https://dc.imsglobal.org/.well-known/badgeconnect.json" in the "discovery_endpoint" "table_row"
-    And I should see "authorization_endpoint"
-    And I navigate to "Server > OAuth 2 services" in site administration
-    And I click on "Configure user field mappings" "link" in the "Open Badges" "table_row"
-    And I should not see "given_name"
-    And I should not see "middle_name"
-    And I navigate to "Server > OAuth 2 services" in site administration
-    And I click on "Edit" "link" in the "Open Badges" "table_row"
+    And I should see "IMS Global Reference Implementation"
+    And I click on "Edit" "link" in the "IMS Global Reference Implementation" "table_row"
    And I set the following fields to these values:
      | Name                       | IMS Global                                |
    And I press "Save changes"
    And I should see "Changes saved"
    And I should see "IMS Global"
+    And "Allow services" "icon" should exist in the "IMS Global" "table_row"
+    And "Do not allow login" "icon" should exist in the "IMS Global" "table_row"
+    And "Service discovery successful" "icon" should exist in the "IMS Global" "table_row"
+    And the "src" attribute of "table.admintable th img" "css_element" should contain "IMS-Global-Logo.png"
+    And I click on "Configure endpoints" "link" in the "IMS Global" "table_row"
+    And I should see "https://dc.imsglobal.org/.well-known/badgeconnect.json" in the "discovery_endpoint" "table_row"
+    And I should see "authorization_endpoint"
+    And I navigate to "Server > OAuth 2 services" in site administration
+    And I click on "Configure user field mappings" "link" in the "IMS Global" "table_row"
+    And I should not see "given_name"
+    And I should not see "middle_name"
+    And I navigate to "Server > OAuth 2 services" in site administration
    And I click on "Delete" "link" in the "IMS Global" "table_row"
    And I should see "Are you sure you want to delete the identity issuer \"IMS Global\"?"
    And I press "Continue"
@@ -573,7 +573,7 @@ class acceptances_table extends \table_sql {
        if ($row->timemodified) {
            if ($this->is_downloading()) {
                // Use timestamp format readable for both machines and humans.
-                return date_format_string($row->timemodified, '%Y-%m-%d %H:%M:%S %Z');
+                return date_format_string((int) $row->timemodified, '%Y-%m-%d %H:%M:%S %Z');
            } else {
                // Use localised calendar format.
                return userdate($row->timemodified, get_string('strftimedatetime'));
@@ -48,15 +48,18 @@ use tool_policy\policy_version;
 */
 class page_viewalldoc implements renderable, templatable {

-    /** @var string Return url */
-    private $returnurl;
+    /** @var ?moodle_url Return url */
+    private $returnurl = null;

    /**
     * Prepare the page for rendering.
     *
     */
    public function __construct($returnurl) {
-        $this->returnurl = $returnurl;
+        if (!empty($returnurl)) {
+            $this->returnurl = new moodle_url($returnurl);
+        }
+
        $this->prepare_global_page_access();
        $this->prepare_policies();
    }
@@ -48,11 +48,9 @@ Feature: Viewing acceptances reports and accepting on behalf of other users
    And "Pending" "text" should exist in the "User Two" "table_row"

  Scenario: Agree on behalf of another user as a manager, single policy, javascript off
-    Given I log in as "admin"
-    And I set the following system permissions of "Manager" role:
-      | capability | permission |
-      | tool/policy:acceptbehalf | Allow |
-    And I log out
+    Given the following "role capability" exists:
+      | role                     | manager |
+      | tool/policy:acceptbehalf | allow   |
    When I log in as "manager"
    And I press "Next"
    And I set the field "I agree to the This site policy" to "1"
@@ -73,11 +71,9 @@ Feature: Viewing acceptances reports and accepting on behalf of other users

  @javascript
  Scenario: Agree on behalf of another user as a manager, single policy, javascript on
-    Given I log in as "admin"
-    And I set the following system permissions of "Manager" role:
-      | capability | permission |
-      | tool/policy:acceptbehalf | Allow |
-    And I log out
+    Given the following "role capability" exists:
+      | role                     | manager |
+      | tool/policy:acceptbehalf | allow   |
    When I log in as "manager"
    And I press "Next"
    And I set the field "I agree to the This site policy" to "1"
@@ -135,13 +131,13 @@ Feature: Viewing acceptances reports and accepting on behalf of other users
    And "Pending" "text" should exist in the "This privacy policy" "table_row"

  Scenario: Agree on behalf of another user as a manager, multiple policies, javascript off
-    Given I log in as "admin"
+    Given the following "role capability" exists:
+      | role                     | manager |
+      | tool/policy:acceptbehalf | allow   |
+    And I log in as "admin"
    And I navigate to "Users > Privacy and policies > Manage policies" in site administration
    And I click on "Set status to \"Active\"" "link" in the "This privacy policy" "table_row"
    And I press "Continue"
-    And I set the following system permissions of "Manager" role:
-      | capability | permission |
-      | tool/policy:acceptbehalf | Allow |
    And I log out
    When I log in as "manager"
    And I press "Next"
@@ -167,14 +163,14 @@ Feature: Viewing acceptances reports and accepting on behalf of other users

  @javascript
  Scenario: Agree on behalf of another user as a manager, multiple policies, javascript on
-    Given I log in as "admin"
+    Given the following "role capability" exists:
+      | role                     | manager |
+      | tool/policy:acceptbehalf | allow   |
+    And I log in as "admin"
    And I navigate to "Users > Privacy and policies > Manage policies" in site administration
    And I click on "Actions" "link_or_button" in the "This privacy policy" "table_row"
    And I click on "Set status to \"Active\"" "link" in the "This privacy policy" "table_row"
    And I press "Activate"
-    And I set the following system permissions of "Manager" role:
-      | capability | permission |
-      | tool/policy:acceptbehalf | Allow |
    And I log out
    When I log in as "manager"
    And I press "Next"
@@ -215,11 +211,9 @@ Feature: Viewing acceptances reports and accepting on behalf of other users
    And I should not see "Policies and agreements"

  Scenario: Policies and agreements profile link visible also for users who can access on behalf of others
-    Given I log in as "admin"
-    And I set the following system permissions of "Manager" role:
-      | capability | permission |
-      | tool/policy:acceptbehalf | Allow |
-    And I log out
+    Given the following "role capability" exists:
+      | role                     | manager |
+      | tool/policy:acceptbehalf | allow   |
    And I log in as "manager"
    And I press "Next"
    And I set the field "I agree to the This site policy" to "1"
@@ -231,19 +225,15 @@ Feature: Viewing acceptances reports and accepting on behalf of other users
    Then I should see "Policies and agreements"

  Scenario: Agree on behalf of another user as an admin who is logged in as a manager
-    Given I log in as "admin"
-    And I set the following system permissions of "Manager" role:
-      | capability | permission |
-      | tool/policy:acceptbehalf | Allow |
-    And I log out
+    Given the following "role capability" exists:
+      | role                     | manager |
+      | tool/policy:acceptbehalf | allow   |
    When I log in as "manager"
    And I press "Next"
    And I set the field "I agree to the This site policy" to "1"
    And I press "Next"
    And I log out
-    And I log in as "admin"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I follow "Manager"
+    And I am on the "manager" "user > profile" page logged in as "admin"
    And I follow "Log in as"
    And I press "Continue"
    And I navigate to "Users > Privacy and policies > Manage policies" in site administration
@@ -263,14 +253,14 @@ Feature: Viewing acceptances reports and accepting on behalf of other users

  @javascript
  Scenario: Bulk agree on behalf of another users as a manager, multiple policies, javascript on
-    Given I log in as "admin"
+    Given the following "role capability" exists:
+      | role                     | manager |
+      | tool/policy:acceptbehalf | allow   |
+    And I log in as "admin"
    And I navigate to "Users > Privacy and policies > Manage policies" in site administration
    And I click on "Actions" "link_or_button" in the "This privacy policy" "table_row"
    And I click on "Set status to \"Active\"" "link" in the "This privacy policy" "table_row"
    And I press "Activate"
-    And I set the following system permissions of "Manager" role:
-      | capability | permission |
-      | tool/policy:acceptbehalf | Allow |
    And I log out
    When I log in as "manager"
    And I press "Next"
@@ -563,9 +563,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
    And the following "users" exist:
      | username | firstname | lastname | email            |
      | user1    | User      | 1        | user1@example.com    |
-    When I log in as "admin"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I follow "User 1"
+    When I am on the "user1" "user > profile" page logged in as "admin"
    And I follow "Log in as"
    Then I should see "You are logged in as User 1"
    And I press "Continue"
@@ -604,8 +602,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
    And I set the field "I agree to the This site policy" to "1"
    And I set the field "I agree to the This privacy policy" to "1"
    And I press "Next"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I follow "User 1"
+    And I am on the "user1" "user > profile" page
    And I follow "Log in as"
    Then I should see "You are logged in as User 1"
    And I press "Continue"
@@ -54,10 +54,7 @@ Feature: Backup user data
    And I navigate to "Recycle bin" in current page administration
    And I should see "Quiz 1"
    And I click on "Restore" "link" in the "region-main" "region"
-    And I log out
-    And I log in as "student1"
-    And I am on "Course 1" course homepage
-    When I navigate to "User report" in the course gradebook
+    When I am on the "Course 1" "grades > User report > View" page logged in as "student1"
    Then "Quiz 1" row "Grade" column of "user-grade" table should contain "50"
    And "Quiz 1" row "Percentage" column of "user-grade" table should contain "50"

@@ -173,13 +173,16 @@ class tool_uploadcourse_tracker {
            } else {
                $outcome = $OUTPUT->pix_icon('i/invalid', '');
            }
+
            echo html_writer::start_tag('tr', array('class' => 'r' . $this->rownb % 2));
            echo html_writer::tag('td', $line, array('class' => 'c' . $ci++));
            echo html_writer::tag('td', $outcome, array('class' => 'c' . $ci++));
            echo html_writer::tag('td', isset($data['id']) ? $data['id'] : '', array('class' => 'c' . $ci++));
-            echo html_writer::tag('td', isset($data['shortname']) ? $data['shortname'] : '', array('class' => 'c' . $ci++));
-            echo html_writer::tag('td', isset($data['fullname']) ? $data['fullname'] : '', array('class' => 'c' . $ci++));
-            echo html_writer::tag('td', isset($data['idnumber']) ? $data['idnumber'] : '', array('class' => 'c' . $ci++));
+
+            // Ensure our data is suitable for HTML output.
+            echo html_writer::tag('td', isset($data['shortname']) ? s($data['shortname']) : '', array('class' => 'c' . $ci++));
+            echo html_writer::tag('td', isset($data['fullname']) ? s($data['fullname']) : '', array('class' => 'c' . $ci++));
+            echo html_writer::tag('td', isset($data['idnumber']) ? s($data['idnumber']) : '', array('class' => 'c' . $ci++));
            echo html_writer::tag('td', $status, array('class' => 'c' . $ci++));
            echo html_writer::end_tag('tr');
        }
@@ -111,7 +111,10 @@ class cli_helper {
        $form = new \admin_uploaduser_form1();
        [$elements, $defaults] = $form->get_form_for_cli();
        $options += $this->prepare_form_elements_for_cli($elements, $defaults);
-        $form = new \admin_uploaduser_form2(null, ['columns' => ['type1'], 'data' => []]);
+        // Specify pseudo-column 'type1' to force the form to populate the legacy role mapping selector
+        // but only if user is allowed to assign roles in courses (otherwise form validation will fail).
+        $columns = uu_allowed_roles() ? ['type1'] : [];
+        $form = new \admin_uploaduser_form2(null, ['columns' => $columns, 'data' => []]);
        [$elements, $defaults] = $form->get_form_for_cli();
        $options += $this->prepare_form_elements_for_cli($elements, $defaults);
        return $options;
@@ -123,7 +123,6 @@ class process {
        $today = make_timestamp(date('Y', $today), date('m', $today), date('d', $today), 0, 0, 0);
        $this->today = $today;

-        $this->rolecache      = uu_allowed_roles_cache(); // Course roles lookup cache.
        $this->sysrolecache   = uu_allowed_sysroles_cache(); // System roles lookup cache.
        $this->supportedauths = uu_supported_auths(); // Officially supported plugins that are enabled.

@@ -1140,14 +1139,18 @@ class process {
                }
            }

+            if (!array_key_exists($courseid, $this->rolecache)) {
+                $this->rolecache[$courseid] = uu_allowed_roles_cache(null, (int)$courseid);
+            }
+
            if ($courseid == SITEID) {
                // Technically frontpage does not have enrolments, but only role assignments,
                // let's not invent new lang strings here for this rarely used feature.

                if (!empty($user->{'role'.$i})) {
                    $rolename = $user->{'role'.$i};
-                    if (array_key_exists($rolename, $this->rolecache)) {
-                        $roleid = $this->rolecache[$rolename]->id;
+                    if (array_key_exists($rolename, $this->rolecache[$courseid]) ) {
+                        $roleid = $this->rolecache[$courseid][$rolename]->id;
                    } else {
                        $this->upt->track('enrolments', get_string('unknownrole', 'error', s($rolename)), 'error');
                        continue;
@@ -1157,7 +1160,7 @@ class process {

                    $a = new \stdClass();
                    $a->course = $shortname;
-                    $a->role   = $this->rolecache[$roleid]->name;
+                    $a->role = $this->rolecache[$courseid][$roleid]->name;
                    $this->upt->track('enrolments', get_string('enrolledincourserole', 'enrol_manual', $a), 'info');
                }

@@ -1167,8 +1170,8 @@ class process {
                $roleid = false;
                if (!empty($user->{'role'.$i})) {
                    $rolename = $user->{'role'.$i};
-                    if (array_key_exists($rolename, $this->rolecache)) {
-                        $roleid = $this->rolecache[$rolename]->id;
+                    if (array_key_exists($rolename, $this->rolecache[$courseid])) {
+                        $roleid = $this->rolecache[$courseid][$rolename]->id;
                    } else {
                        $this->upt->track('enrolments', get_string('unknownrole', 'error', s($rolename)), 'error');
                        continue;
@@ -1187,7 +1190,15 @@ class process {
                    }
                } else {
                    // No role specified, use the default from manual enrol plugin.
-                    $roleid = $this->manualcache[$courseid]->roleid;
+                    $defaultenrolroleid = (int)$this->manualcache[$courseid]->roleid;
+                    // Validate the current user can assign this role.
+                    if (array_key_exists($defaultenrolroleid, $this->rolecache[$courseid]) ) {
+                        $roleid = $defaultenrolroleid;
+                    } else {
+                        $role = $DB->get_record('role', ['id' => $defaultenrolroleid]);
+                        $this->upt->track('enrolments', get_string('unknownrole', 'error', s($role->shortname)), 'error');
+                        continue;
+                    }
                }

                if ($roleid) {
@@ -1230,7 +1241,7 @@ class process {

                    $a = new \stdClass();
                    $a->course = $shortname;
-                    $a->role   = $this->rolecache[$roleid]->name;
+                    $a->role = $this->rolecache[$courseid][$roleid]->name;
                    $this->upt->track('enrolments', get_string('enrolledincourserole', 'enrol_manual', $a), 'info');
                }
            }
@@ -369,17 +369,32 @@ function uu_allowed_roles() {
 }

 /**
- * Returns mapping of all roles using short role name as index.
+ * Returns assignable roles for current user using short role name and role ID as index.
+ * This function is no longer called without parameters.
+ *
+ * @param int|null $categoryid Id of the category to get roles for.
+ * @param int|null $courseid Id of the course to get roles for.
 * @return array
 */
-function uu_allowed_roles_cache() {
-    $allowedroles = get_assignable_roles(context_course::instance(SITEID), ROLENAME_SHORT);
+function uu_allowed_roles_cache(?int $categoryid = null, ?int $courseid = null): array {
+    if (!is_null($categoryid) && !is_null($courseid)) {
+        return [];
+    } else if (is_null($categoryid) && !is_null($courseid)) {
+        $allowedroles = get_assignable_roles(context_course::instance($courseid), ROLENAME_SHORT);
+    } else if (is_null($courseid) && !is_null($categoryid)) {
+        $allowedroles = get_assignable_roles(context_coursecat::instance($categoryid), ROLENAME_SHORT);
+    } else {
+        $allowedroles = get_assignable_roles(context_course::instance(SITEID), ROLENAME_SHORT);
+    }
+
    $rolecache = [];
+    // A role can be searched for by its ID or by its shortname.
    foreach ($allowedroles as $rid=>$rname) {
        $rolecache[$rid] = new stdClass();
        $rolecache[$rid]->id   = $rid;
        $rolecache[$rid]->name = $rname;
-        if (!is_numeric($rname)) { // only non-numeric shortnames are supported!!!
+        // Since numeric short names are allowed, to avoid replacement of another role, we only accept non-numeric values.
+        if (!is_numeric($rname)) {
            $rolecache[$rname] = new stdClass();
            $rolecache[$rname]->id   = $rid;
            $rolecache[$rname]->name = $rname;
@@ -143,7 +143,8 @@ class cli_test extends \advanced_testcase {
        // Created users have data in the profile fields.
        $user1 = \core_user::get_user_by_username('reznort');
        $profilefields1 = profile_user_record($user1->id);
-        $this->assertEquals((object)['superfield' => 'Loves cats'], $profilefields1);
+        $this->assertObjectHasAttribute('superfield', $profilefields1);
+        $this->assertEquals('Loves cats', $profilefields1->superfield);
    }

    /**
@@ -0,0 +1,221 @@
+<?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_uploaduser;
+
+use advanced_testcase;
+use context_system;
+use context_course;
+use context_coursecat;
+use stdClass;
+use tool_uploaduser\cli_helper;
+use tool_uploaduser\local\text_progress_tracker;
+
+/**
+ * Class upload_users_test
+ *
+ * @package    tool_uploaduser
+ * @copyright  2020 Marina Glancy
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class upload_users_test extends advanced_testcase {
+
+    /**
+     * Load required test libraries
+     */
+    public static function setUpBeforeClass(): void {
+        global $CFG;
+
+        require_once("{$CFG->dirroot}/{$CFG->admin}/tool/uploaduser/locallib.php");
+    }
+
+    /**
+     * Test upload users, enrol and role assignation
+     * @covers \tool_uploadusers::process
+     */
+    public function test_user_can_upload_with_course_enrolment(): void {
+
+        $this->resetAfterTest();
+        set_config('passwordpolicy', 0);
+        $this->setAdminUser();
+
+        // Create category and course.
+        $coursecat = $this->getDataGenerator()->create_category();
+        $coursecatcontext = context_coursecat::instance($coursecat->id);
+        $course = $this->getDataGenerator()->create_course(['shortname' => 'course01', 'category' => $coursecat->id]);
+        $coursecontext = context_course::instance($course->id);
+
+        // Create user.
+        $user = $this->getDataGenerator()->create_user();
+
+        // Create role with capability to upload CSV files, and assign this role to user.
+        $uploadroleid = create_role('upload role', 'uploadrole', '');
+        set_role_contextlevels($uploadroleid, [CONTEXT_SYSTEM]);
+        $systemcontext = context_system::instance();
+        assign_capability('moodle/site:uploadusers', CAP_ALLOW, $uploadroleid, $systemcontext->id);
+        $this->getDataGenerator()->role_assign($uploadroleid, $user->id, $systemcontext->id);
+
+        // Create role with some of allowed capabilities to enrol users, and assign this role to user.
+        $enrolroleid = create_role('enrol role', 'enrolrole', '');
+        set_role_contextlevels($enrolroleid, [CONTEXT_COURSECAT]);
+        assign_capability('enrol/manual:enrol', CAP_ALLOW, $enrolroleid, $coursecatcontext->id);
+        assign_capability('moodle/course:enrolreview', CAP_ALLOW, $enrolroleid, $coursecatcontext->id);
+        assign_capability('moodle/role:assign', CAP_ALLOW, $enrolroleid, $coursecatcontext->id);
+        $this->getDataGenerator()->role_assign($enrolroleid, $user->id, $coursecatcontext->id);
+
+        // User makes assignments.
+        $studentarch = get_archetype_roles('student');
+        $studentrole = array_shift($studentarch);
+        core_role_set_assign_allowed($enrolroleid, $studentrole->id);
+
+        // Flush accesslib.
+        accesslib_clear_all_caches_for_unit_testing();
+
+        // Process CSV file as user.
+        $csv = <<<EOF
+username,firstname,lastname,email,course1,role1
+student1,Student,One,s1@example.com,{$course->shortname},{$studentrole->shortname}
+student2,Student,Two,s2@example.com,{$course->shortname},teacher
+EOF;
+        $this->setUser($user);
+        $output = $this->process_csv_upload($csv, ['--uutype=' . UU_USER_ADDNEW]);
+
+        $this->assertStringContainsString('Enrolled in "course01" as "student"', $output);
+        $this->assertStringContainsString('Unknown role "teacher"', $output);
+
+        // Check user creation, enrolment and role assignation.
+        $this->assertEquals(1, count_enrolled_users($coursecontext));
+
+        $usersasstudent = get_role_users($studentrole->id, $coursecontext);
+        $this->assertCount(1, $usersasstudent);
+        $this->assertEquals('student1', reset($usersasstudent)->username);
+    }
+
+    /**
+     * Test upload users, enrol and assign default role from manual enrol plugin.
+     * @covers \tool_uploadusers::process
+     */
+    public function test_user_can_upload_with_course_enrolment_default_role(): void {
+
+        $this->resetAfterTest();
+        set_config('passwordpolicy', 0);
+        $this->setAdminUser();
+
+        // Create category and courses.
+        $coursecat = $this->getDataGenerator()->create_category();
+        $coursecatcontext = context_coursecat::instance($coursecat->id);
+        $course1 = $this->getDataGenerator()->create_course(['shortname' => 'course01', 'category' => $coursecat->id]);
+        $course1context = context_course::instance($course1->id);
+        // Change the default role to 'teacher'.
+        set_config('roleid', 4, 'enrol_manual');
+        $course2 = $this->getDataGenerator()->create_course(['shortname' => 'course02', 'category' => $coursecat->id]);
+        $course2context = context_course::instance($course2->id);
+
+        // Create user.
+        $user = $this->getDataGenerator()->create_user();
+
+        // Create role with capability to upload CSV files, and assign this role to user.
+        $uploadroleid = create_role('upload role', 'uploadrole', '');
+        set_role_contextlevels($uploadroleid, [CONTEXT_SYSTEM]);
+        $systemcontext = context_system::instance();
+        assign_capability('moodle/site:uploadusers', CAP_ALLOW, $uploadroleid, $systemcontext->id);
+        $this->getDataGenerator()->role_assign($uploadroleid, $user->id, $systemcontext->id);
+
+        // Create role with some of allowed capabilities to enrol users, and assign this role to user.
+        $enrolroleid = create_role('enrol role', 'enrolrole', '');
+        set_role_contextlevels($enrolroleid, [CONTEXT_COURSECAT]);
+        assign_capability('enrol/manual:enrol', CAP_ALLOW, $enrolroleid, $coursecatcontext->id);
+        assign_capability('moodle/course:enrolreview', CAP_ALLOW, $enrolroleid, $coursecatcontext->id);
+        assign_capability('moodle/role:assign', CAP_ALLOW, $enrolroleid, $coursecatcontext->id);
+        $this->getDataGenerator()->role_assign($enrolroleid, $user->id, $coursecatcontext->id);
+
+        // User makes assignments.
+        $studentarch = get_archetype_roles('student');
+        $studentrole = array_shift($studentarch);
+        core_role_set_assign_allowed($enrolroleid, $studentrole->id);
+
+        // Flush accesslib.
+        accesslib_clear_all_caches_for_unit_testing();
+
+        // Process CSV file (no roles specified) as user.
+        $csv = <<<EOF
+username,firstname,lastname,email,course1,role1
+student1,Student,One,s1@example.com,{$course1->shortname},
+student2,Student,Two,s2@example.com,{$course2->shortname},
+EOF;
+        $this->setUser($user);
+        $output = $this->process_csv_upload($csv, ['--uutype=' . UU_USER_ADDNEW]);
+
+        $this->assertStringContainsString('Enrolled in "course01" as "student"', $output);
+        // This $user cannot assign teacher role.
+        $this->assertStringContainsString('Unknown role "teacher"', $output);
+
+        // Check user creation, enrolment and role assignation.
+        $this->assertEquals(1, count_enrolled_users($course1context));
+        // This $user cannot enrol anyone as teacher.
+        $this->assertEquals(0, count_enrolled_users($course2context));
+
+        // Test user is enrolled as default-manual-enrol-plugin role.
+        $manualenrolinstance = new stdClass;
+        $enrolinstances = enrol_get_instances($course1->id, true);
+        foreach ($enrolinstances as $courseenrolinstance) {
+            if ($courseenrolinstance->enrol === 'manual') {
+                $manualenrolinstance = $courseenrolinstance;
+                break;
+            }
+        }
+        $defaulroleidexpected = $manualenrolinstance->roleid ?? 0;
+        // The default role of course01 is student, id 5.
+        $this->assertEquals(5, $defaulroleidexpected);
+
+        $usersasdefaultrole = get_role_users($defaulroleidexpected, $course1context);
+        $this->assertCount(1, $usersasdefaultrole);
+        $this->assertEquals('student1', reset($usersasdefaultrole)->username);
+    }
+
+    /**
+     * Generate cli_helper and mock $_SERVER['argv']
+     *
+     * @param string $filecontent
+     * @param array $mockargv
+     * @return string
+     */
+    protected function process_csv_upload(string $filecontent, array $mockargv = []): string {
+        $filepath = make_request_directory() . '/upload.csv';
+        file_put_contents($filepath, $filecontent);
+        $mockargv[] = "--file={$filepath}";
+
+        if (array_key_exists('argv', $_SERVER)) {
+            $oldservervars = $_SERVER['argv'];
+        }
+
+        $_SERVER['argv'] = array_merge([''], $mockargv);
+        $clihelper = new cli_helper(text_progress_tracker::class);
+
+        if (isset($oldservervars)) {
+            $_SERVER['argv'] = $oldservervars;
+        } else {
+            unset($_SERVER['argv']);
+        }
+
+        ob_start();
+        $clihelper->process();
+        $output = ob_get_contents();
+        ob_end_clean();
+
+        return $output;
+    }
+}
@@ -14,6 +14,8 @@ import {eventTypes} from './events';

 let currentTour = null;
 let tourId = null;
+let restartTourAndKeepProgress = false;
+let currentStepNo = null;

 /**
 * Find the first matching tour.
@@ -75,6 +77,20 @@ export const init = async(tourDetails, filters) => {
            resetTourState(tourId);
        }
    });
+
+    // Watch for the resize event.
+    window.addEventListener("resize", () => {
+        // Only listen for the running tour.
+        if (currentTour && currentTour.tourRunning) {
+            clearTimeout(window.resizedFinished);
+            window.resizedFinished = setTimeout(() => {
+                // Wait until the resize event has finished.
+                currentStepNo = currentTour.getCurrentStepNumber();
+                restartTourAndKeepProgress = true;
+                resetTourState(tourId);
+            }, 250);
+        }
+    });
 };

 /**
@@ -187,7 +203,13 @@ const startBootstrapTour = (tourId, template, tourConfig) => {
    });

    currentTour = new BootstrapTour(tourConfig);
-    return currentTour.startTour();
+    let startAt = 0;
+    if (restartTourAndKeepProgress && currentStepNo) {
+        startAt = currentStepNo;
+        restartTourAndKeepProgress = false;
+        currentStepNo = null;
+    }
+    return currentTour.startTour(startAt);
 };

 /**
@@ -153,14 +153,10 @@ Feature: Apply tour filters to a tour
      | Course 1 | C1        | topics | 1                |
      | Course 2 | C2        | topics | 1                |
    And the following "activities" exist:
-      | activity | course | name           | firstpagetitle | wikimode      |
-      | wiki     | C1     | Test wiki name | First page     | collaborative |
+      | activity | course | name            | firstpagetitle | wikimode      | idnumber | intro                  | type    |
+      | wiki     | C1     | Test wiki name  | First page     | collaborative |          |                        |         |
+      | forum    | C2     | Test forum name |                |               | 001      | Test forum description | general |
    And I log in as "admin"
-    And I am on "Course 2" course homepage with editing mode on
-    And I add a "Forum" to section "1" and I fill the form with:
-      | Forum name  | Test forum name                |
-      | Forum type  | Standard forum for general use |
-      | Description | Test forum description         |
    And I add a new user tour with:
      | Name               | Wiki tour                |
      | Description        | A tour with both matches |
@@ -29,6 +29,7 @@ require_once(__DIR__ . '/fixtures/test_target_course_level_shortname.php');
 * @package   core_analytics
 * @copyright 2017 David Monllaó {@link http://www.davidmonllao.com}
 * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers    \core_analytics\manager
 */
 class manager_test extends \advanced_testcase {

@@ -491,25 +492,63 @@ class manager_test extends \advanced_testcase {
        // No potential context restrictions.
        $this->assertFalse(\core_analytics\manager::get_potential_context_restrictions([]));

+        $defaultcategory = \core_course_category::get_default();
+        $defaultcategorycontext = $defaultcategory->get_context();
+
        // Include the all context levels so the misc. category get included.
-        $this->assertCount(1, \core_analytics\manager::get_potential_context_restrictions());
+        $this->assertEquals([
+            $defaultcategorycontext->id => "Category: {$defaultcategory->name}",
+        ], manager::get_potential_context_restrictions());

-        $this->getDataGenerator()->create_course();
-        $this->getDataGenerator()->create_category();
-        $this->assertCount(3, \core_analytics\manager::get_potential_context_restrictions());
-        $this->assertCount(3, \core_analytics\manager::get_potential_context_restrictions([CONTEXT_COURSE, CONTEXT_COURSECAT]));
+        $category = $this->getDataGenerator()->create_category(['name' => 'My category']);
+        $categorycontext = $category->get_context();

-        $this->assertCount(1, \core_analytics\manager::get_potential_context_restrictions([CONTEXT_COURSE]));
-        $this->assertCount(2, \core_analytics\manager::get_potential_context_restrictions([CONTEXT_COURSECAT]));
+        $courseone = $this->getDataGenerator()->create_course(['fullname' => 'Course one', 'shortname' => 'CS1']);
+        $courseonecontext = \context_course::instance($courseone->id);

-        $this->assertCount(1, \core_analytics\manager::get_potential_context_restrictions([CONTEXT_COURSECAT], 'Course category'));
-        $this->assertCount(1, \core_analytics\manager::get_potential_context_restrictions([CONTEXT_COURSECAT], 'Course category 1'));
-        $this->assertCount(
-            2,
-            \core_analytics\manager::get_potential_context_restrictions([CONTEXT_COURSECAT],
-            get_string('defaultcategoryname')
-        ));
-        $this->assertCount(1, \core_analytics\manager::get_potential_context_restrictions([CONTEXT_COURSE], 'Test course 1'));
-        $this->assertCount(1, \core_analytics\manager::get_potential_context_restrictions([CONTEXT_COURSE], 'Test course'));
+        $coursetwo = $this->getDataGenerator()->create_course(['fullname' => 'Course two', 'shortname' => 'CS2']);
+        $coursetwocontext = \context_course::instance($coursetwo->id);
+
+        // All context levels.
+        $this->assertEqualsCanonicalizing([
+            $defaultcategorycontext->id => "Category: {$defaultcategory->name}",
+            $categorycontext->id => "Category: {$category->name}",
+            $courseonecontext->id => "Course: {$courseone->shortname}",
+            $coursetwocontext->id => "Course: {$coursetwo->shortname}",
+        ], manager::get_potential_context_restrictions());
+
+        // All category/course context levels.
+        $this->assertEqualsCanonicalizing([
+            $defaultcategorycontext->id => "Category: {$defaultcategory->name}",
+            $categorycontext->id => "Category: {$category->name}",
+            $courseonecontext->id => "Course: {$courseone->shortname}",
+            $coursetwocontext->id => "Course: {$coursetwo->shortname}",
+        ], manager::get_potential_context_restrictions([CONTEXT_COURSECAT, CONTEXT_COURSE]));
+
+        // All category context levels.
+        $this->assertEqualsCanonicalizing([
+            $defaultcategorycontext->id => "Category: {$defaultcategory->name}",
+            $categorycontext->id => "Category: {$category->name}",
+        ], manager::get_potential_context_restrictions([CONTEXT_COURSECAT]));
+
+        // Filtered category context levels.
+        $this->assertEquals([
+            $categorycontext->id => "Category: {$category->name}",
+        ], manager::get_potential_context_restrictions([CONTEXT_COURSECAT], 'My cat'));
+
+        $this->assertEmpty(manager::get_potential_context_restrictions([CONTEXT_COURSECAT], 'nothing'));
+
+        // All course context levels.
+        $this->assertEqualsCanonicalizing([
+            $courseonecontext->id => "Course: {$courseone->shortname}",
+            $coursetwocontext->id => "Course: {$coursetwo->shortname}",
+        ], manager::get_potential_context_restrictions([CONTEXT_COURSE]));
+
+        // Filtered course context levels.
+        $this->assertEquals([
+            $courseonecontext->id => "Course: {$courseone->shortname}",
+        ], manager::get_potential_context_restrictions([CONTEXT_COURSE], 'one'));
+
+        $this->assertEmpty(manager::get_potential_context_restrictions([CONTEXT_COURSE], 'nothing'));
    }
 }
@@ -1,18 +1,20 @@
-Description of phpCAS 1.4.0 import into Moodle
+Description of phpCAS import into Moodle

-Last release package can be found in hhttps://github.com/apereo/phpCAS/releases
+Last release can be found at https://github.com/apereo/phpCAS/releases

 NOTICE:
 * Before running composer command, make sure you have the composer version updated.
 * Composer version 2.2.4 2022-01-08 12:30:42

 STEPS:
- * Create a temporary folder outside your moodle installation
- * Execute `composer require apereo/phpcas:VERSION`
+ * Make sure you're using the lowest supported PHP version for the given release (e.g. PHP 7.4 for Moodle 4.1)
+ * Create a temporary folder outside your Moodle installation
+ * Execute 'composer require apereo/phpcas:VERSION'
 * Check any new libraries that have been added and make sure they do not exist in Moodle already.
 * Remove the old 'vendor' directory in auth/cas/CAS/
 * Copy contents of 'vendor' directory
- * Create a commit with only the library changes
+ * Create a commit with only the library changes.
+   - Note: Make sure to check the list of unversioned files and add any new files to the staging area.
 * Update auth/cas/thirdpartylibs.xml
 * Apply the modifications described in the CHANGES section
 * Create another commit with the previous two steps of changes
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- *  PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS.php
 * @category Authentication
@@ -13,7 +13,7 @@ Api documentation can be found here:
 https://apereo.github.io/phpCAS/api/


-[![Build Status](https://travis-ci.org/apereo/phpCAS.png)](https://travis-ci.org/apereo/phpCAS)
+[![Test](https://github.com/apereo/phpCAS/actions/workflows/test.yml/badge.svg)](https://github.com/apereo/phpCAS/actions/workflows/test.yml)

 LICENSE
 -------
@@ -22,13 +22,15 @@
 		}
 	],
 	"require" : {
-		"php" : ">=7.0.0",
+		"php" : ">=7.1.0",
 		"ext-curl" : "*",
-		"psr/log" : "^1.0.0"
-	},
+		"ext-dom"  : "*",
+		"psr/log" : "^1.0 || ^2.0 || ^3.0"
+    },
 	"require-dev" : {
-		"monolog/monolog" : "^1.0.0",
-		"phpunit/phpunit" : ">=4.8.35 <8"
+		"monolog/monolog" : "^1.0.0 || ^2.0.0",
+		"phpunit/phpunit" : ">=7.5", 
+		"phpstan/phpstan" : "^1.5"
 	},
 	"autoload" : {
 		"classmap" : [
@@ -36,16 +38,18 @@
 		]
 	},
 	"autoload-dev" : {
+		"files": ["source/CAS.php"],
 		"psr-4" : {
 			"PhpCas\\" : "test/CAS/"
 		}
 	},
 	"scripts" : {
-		"test" : "phpunit"
+		"test" : "phpunit", 
+		"phpstan" : "phpstan"
 	},
 	"extra" : {
 		"branch-alias" : {
 			"dev-master" : "1.3.x-dev"
 		}
 	}
-}
+}
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-    bootstrap="source/CAS.php"
-    convertNoticesToExceptions="false"
-    colors="true"
-    stderr="true"
-    backupGlobals="true"
-    >
-
-    <testsuites>
-        <testsuite name="phpCAS Tests">
-            <directory>test/CAS/Tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="false">
-            <directory>source/</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="source/CAS.php" convertNoticesToExceptions="false" colors="true" stderr="true" backupGlobals="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage includeUncoveredFiles="false">
+    <include>
+      <directory>source/</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="phpCAS Tests">
+      <directory>test/CAS/Tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
@@ -20,7 +20,7 @@
 *
 *
 * Interface class of the phpCAS library
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/CAS.php
 * @category Authentication
@@ -57,7 +57,7 @@ if (!isset($_SERVER['REQUEST_URI']) && isset($_SERVER['SCRIPT_NAME']) && isset($
 /**
 * phpCAS version. accessible for the user by phpCAS::getVersion().
 */
-define('PHPCAS_VERSION', '1.4.0');
+define('PHPCAS_VERSION', '1.6.0');

 /**
 * @addtogroup public
@@ -136,11 +136,6 @@ define("SAML_SOAP_ENV_CLOSE", '</SOAP-ENV:Envelope>');
 */
 define("SAML_ATTRIBUTES", 'SAMLATTRIBS');

-/**
- * SAML Attributes
- */
-define("DEFAULT_ERROR", 'Internal script failure');
-
 /** @} */
 /**
 * @addtogroup publicPGTStorage
@@ -332,6 +327,14 @@ class phpCAS
     * @param string                   $server_hostname the hostname of the CAS server
     * @param int                      $server_port     the port the CAS server is running on
     * @param string                   $server_uri      the URI the CAS server is responding on
+     * @param string|string[]|CAS_ServiceBaseUrl_Interface
+     *                                 $service_base_url the base URL (protocol, host and the
+     *                                                  optional port) of the CAS client; pass
+     *                                                  in an array to use auto discovery with
+     *                                                  an allowlist; pass in
+     *                                                  CAS_ServiceBaseUrl_Interface for custom
+     *                                                  behavior. Added in 1.6.0. Similar to
+     *                                                  serverName config in other CAS clients.
     * @param bool                     $changeSessionID Allow phpCAS to change the session_id
     *                                                  (Single Sign Out/handleLogoutRequests
     *                                                  is based on that change)
@@ -343,7 +346,8 @@ class phpCAS
     * and phpCAS::setDebug()).
     */
    public static function client($server_version, $server_hostname,
-        $server_port, $server_uri, $changeSessionID = true, \SessionHandlerInterface $sessionHandler = null
+        $server_port, $server_uri, $service_base_url,
+        $changeSessionID = true, \SessionHandlerInterface $sessionHandler = null
    ) {
        phpCAS :: traceBegin();
        if (is_object(self::$_PHPCAS_CLIENT)) {
@@ -362,7 +366,7 @@ class phpCAS
        // initialize the object $_PHPCAS_CLIENT
        try {
            self::$_PHPCAS_CLIENT = new CAS_Client(
-                $server_version, false, $server_hostname, $server_port, $server_uri,
+                $server_version, false, $server_hostname, $server_port, $server_uri, $service_base_url,
                $changeSessionID, $sessionHandler
            );
        } catch (Exception $e) {
@@ -378,6 +382,14 @@ class phpCAS
     * @param string                   $server_hostname the hostname of the CAS server
     * @param string                   $server_port     the port the CAS server is running on
     * @param string                   $server_uri      the URI the CAS server is responding on
+     * @param string|string[]|CAS_ServiceBaseUrl_Interface
+     *                                 $service_base_url the base URL (protocol, host and the
+     *                                                  optional port) of the CAS client; pass
+     *                                                  in an array to use auto discovery with
+     *                                                  an allowlist; pass in
+     *                                                  CAS_ServiceBaseUrl_Interface for custom
+     *                                                  behavior. Added in 1.6.0. Similar to
+     *                                                  serverName config in other CAS clients.
     * @param bool                     $changeSessionID Allow phpCAS to change the session_id
     *                                                  (Single Sign Out/handleLogoutRequests
     *                                                  is based on that change)
@@ -389,7 +401,8 @@ class phpCAS
     * and phpCAS::setDebug()).
     */
    public static function proxy($server_version, $server_hostname,
-        $server_port, $server_uri, $changeSessionID = true, \SessionHandlerInterface $sessionHandler = null
+        $server_port, $server_uri, $service_base_url,
+        $changeSessionID = true, \SessionHandlerInterface $sessionHandler = null
    ) {
        phpCAS :: traceBegin();
        if (is_object(self::$_PHPCAS_CLIENT)) {
@@ -408,7 +421,7 @@ class phpCAS
        // initialize the object $_PHPCAS_CLIENT
        try {
            self::$_PHPCAS_CLIENT = new CAS_Client(
-                $server_version, true, $server_hostname, $server_port, $server_uri,
+                $server_version, true, $server_hostname, $server_port, $server_uri, $service_base_url,
                $changeSessionID, $sessionHandler
            );
        } catch (Exception $e) {
@@ -597,8 +610,6 @@ class phpCAS
        }
        if (self::$_PHPCAS_VERBOSE) {
            echo "<br />\n<b>phpCAS error</b>: <font color=\"FF0000\"><b>" . __CLASS__ . "::" . $function . '(): ' . htmlentities($msg) . "</b></font> in <b>" . $file . "</b> on line <b>" . $line . "</b><br />\n";
-        } else {
-            echo "<br />\n<b>Error</b>: <font color=\"FF0000\"><b>". DEFAULT_ERROR ."</b><br />\n";
        }
        phpCAS :: trace($msg . ' in ' . $file . 'on line ' . $line );
        phpCAS :: traceEnd();
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/AuthenticationException.php
 * @category Authentication
@@ -72,11 +72,15 @@ implements CAS_Exception
        phpCAS::traceBegin();
        $lang = $client->getLangObj();
        $client->printHTMLHeader($lang->getAuthenticationFailed());
-        printf(
-            $lang->getYouWereNotAuthenticated(),
-            htmlentities($client->getURL()),
-            isset($_SERVER['SERVER_ADMIN']) ? $_SERVER['SERVER_ADMIN']:''
-        );
+
+        if (phpCAS::getVerbose()) {
+            printf(
+                $lang->getYouWereNotAuthenticated(),
+                htmlentities($client->getURL()),
+                $_SERVER['SERVER_ADMIN'] ?? ''
+            );
+        }
+
        phpCAS::trace($messages[] = 'CAS URL: '.$cas_url);
        phpCAS::trace($messages[] = 'Authentication failure: '.$failure);
        if ( $no_response ) {
@@ -3,7 +3,7 @@
 /**
 * Autoloader Class
 *
- *  PHP Version 5
+ *  PHP Version 7
 *
 * @file      CAS/Autoload.php
 * @category  Authentication
@@ -68,12 +68,12 @@ function CAS_autoload($class)
    );
    $trace = $e->getTrace();
    if (isset($trace[2]) && isset($trace[2]['function'])
-        && in_array($trace[2]['function'], array('class_exists', 'interface_exists'))
+        && in_array($trace[2]['function'], array('class_exists', 'interface_exists', 'trait_exists'))
    ) {
        return false;
    }
    if (isset($trace[1]) && isset($trace[1]['function'])
-        && in_array($trace[1]['function'], array('class_exists', 'interface_exists'))
+        && in_array($trace[1]['function'], array('class_exists', 'interface_exists', 'trait_exists'))
    ) {
        return false;
    }
@@ -92,4 +92,4 @@ if (!class_exists('CAS_Client'))
        // it to the autoload stack
        spl_autoload_register('__autoload');
    }
-}
+}
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/Client.php
 * @category Authentication
@@ -102,6 +102,10 @@ class CAS_Client
     */
    public function printHTMLHeader($title)
    {
+        if (!phpCAS::getVerbose()) {
+            return;
+        }
+
        $this->_htmlFilterOutput(
            str_replace(
                '__TITLE__', $title,
@@ -130,16 +134,17 @@ class CAS_Client
     */
    public function printHTMLFooter()
    {
+        if (!phpCAS::getVerbose()) {
+            return;
+        }
+
        $lang = $this->getLangObj();
-        $this->_htmlFilterOutput(
-            empty($this->_output_footer)?
-            (phpCAS::getVerbose())?
-                '<hr><address>phpCAS __PHPCAS_VERSION__ '
-                .$lang->getUsingServer()
-                .' <a href="__SERVER_BASE_URL__">__SERVER_BASE_URL__</a> (CAS __CAS_VERSION__)</a></address></body></html>'
-                :'</body></html>'
-            :$this->_output_footer
-        );
+        $message = empty($this->_output_footer)
+            ? '<hr><address>phpCAS __PHPCAS_VERSION__ ' . $lang->getUsingServer() .
+              ' <a href="__SERVER_BASE_URL__">__SERVER_BASE_URL__</a> (CAS __CAS_VERSION__)</a></address></body></html>'
+            : $this->_output_footer;
+
+        $this->_htmlFilterOutput($message);
    }

    /**
@@ -174,6 +179,21 @@ class CAS_Client
        $this->_output_footer = $footer;
    }

+    /**
+     * Simple wrapper for printf function, that respects
+     * phpCAS verbosity setting.
+     *
+     * @param string $format
+     * @param string|int|float ...$values
+     *
+     * @see printf()
+     */
+    private function printf(string $format, ...$values): void
+    {
+        if (phpCAS::getVerbose()) {
+            printf($format, ...$values);
+        }
+    }

    /** @} */

@@ -898,6 +918,14 @@ class CAS_Client
     * @param bool                     $changeSessionID Allow phpCAS to change the session_id
     *                                                  (Single Sign Out/handleLogoutRequests
     *                                                  is based on that change)
+     * @param string|string[]|CAS_ServiceBaseUrl_Interface
+     *                                 $service_base_url the base URL (protocol, host and the
+     *                                                  optional port) of the CAS client; pass
+     *                                                  in an array to use auto discovery with
+     *                                                  an allowlist; pass in
+     *                                                  CAS_ServiceBaseUrl_Interface for custom
+     *                                                  behavior. Added in 1.6.0. Similar to
+     *                                                  serverName config in other CAS clients.
     * @param \SessionHandlerInterface $sessionHandler  the session handler
     *
     * @return self a newly created CAS_Client object
@@ -908,6 +936,7 @@ class CAS_Client
        $server_hostname,
        $server_port,
        $server_uri,
+        $service_base_url,
        $changeSessionID = true,
        \SessionHandlerInterface $sessionHandler = null
    ) {
@@ -925,6 +954,8 @@ class CAS_Client
        if (gettype($changeSessionID) != 'boolean')
            throw new CAS_TypeMismatchException($changeSessionID, '$changeSessionID', 'boolean');

+        $this->_setServiceBaseUrl($service_base_url);
+
        if (empty($sessionHandler)) {
            $sessionHandler = new CAS_Session_PhpSession;
        }
@@ -1029,7 +1060,7 @@ class CAS_Client

        if ( $this->_isCallbackMode() ) {
            //callback mode: check that phpCAS is secured
-            if ( !$this->_isHttps() ) {
+            if ( !$this->getServiceBaseUrl()->isHttps() ) {
                phpCAS::error(
                    'CAS proxies must be secured to use phpCAS; PGT\'s will not be received from the CAS server'
                );
@@ -1037,7 +1068,7 @@ class CAS_Client
        } else {
            //normal mode: get ticket and remove it from CGI parameters for
            // developers
-            $ticket = (isset($_GET['ticket']) ? $_GET['ticket'] : null);
+            $ticket = (isset($_GET['ticket']) ? $_GET['ticket'] : '');
            if (preg_match('/^[SP]T-/', $ticket) ) {
                phpCAS::trace('Ticket \''.$ticket.'\' found');
                $this->setTicket($ticket);
@@ -1553,7 +1584,7 @@ class CAS_Client
    {
        phpCAS::traceBegin();
        $res = false;
-        $validate_url = '';
+
        if ( $this->_wasPreviouslyAuthenticated() ) {
            if ($this->hasTicket()) {
                // User has a additional ticket but was already authenticated
@@ -1587,6 +1618,10 @@ class CAS_Client
            $this->markAuthenticationCall($res);
        } else {
            if ($this->hasTicket()) {
+                $validate_url = '';
+                $text_response = '';
+                $tree_response = '';
+
                switch ($this->getServerVersion()) {
                case CAS_VERSION_1_0:
                    // if a Service Ticket was given, validate it
@@ -1650,7 +1685,7 @@ class CAS_Client
                    $logoutTicket = $this->getTicket();
                    break;
                default:
-                    phpCAS::trace('Protocoll error');
+                    phpCAS::trace('Protocol error');
                    break;
                }
            } else {
@@ -1827,7 +1862,7 @@ class CAS_Client
        phpCAS::trace("Redirect to : ".$cas_url);
        $lang = $this->getLangObj();
        $this->printHTMLHeader($lang->getAuthenticationWanted());
-        printf('<p>'. $lang->getShouldHaveBeenRedirected(). '</p>', $cas_url);
+        $this->printf('<p>'. $lang->getShouldHaveBeenRedirected(). '</p>', $cas_url);
        $this->printHTMLFooter();
        phpCAS::traceExit();
        throw new CAS_GracefullTerminationException();
@@ -1870,7 +1905,7 @@ class CAS_Client
        }
        $lang = $this->getLangObj();
        $this->printHTMLHeader($lang->getLogout());
-        printf('<p>'.$lang->getShouldHaveBeenRedirected(). '</p>', $cas_url);
+        $this->printf('<p>'.$lang->getShouldHaveBeenRedirected(). '</p>', $cas_url);
        $this->printHTMLFooter();
        phpCAS::traceExit();
        throw new CAS_GracefullTerminationException();
@@ -2159,6 +2194,8 @@ class CAS_Client
            $validate_url .= '&renew=true';
        }

+        $headers = '';
+        $err_msg = '';
        // open and read the URL
        if ( !$this->_readURL($validate_url, $headers, $text_response, $err_msg) ) {
            phpCAS::trace(
@@ -2235,6 +2272,8 @@ class CAS_Client
            $validate_url .= '&renew=true';
        }

+        $headers = '';
+        $err_msg = '';
        // open and read the URL
        if ( !$this->_readURL($validate_url, $headers, $text_response, $err_msg) ) {
            phpCAS::trace(
@@ -2550,8 +2589,7 @@ class CAS_Client
        // the URL is built when needed only
        if ( empty($this->_callback_url) ) {
            // remove the ticket if present in the URL
-            $final_uri = 'https://';
-            $final_uri .= $this->_getClientUrl();
+            $final_uri = $this->getServiceBaseUrl()->get();
            $request_uri = $_SERVER['REQUEST_URI'];
            $request_uri = preg_replace('/\?.*$/', '', $request_uri);
            $final_uri .= $request_uri;
@@ -2892,6 +2930,8 @@ class CAS_Client
        $cas_url = $this->getServerProxyURL().'?targetService='
            .urlencode($target_service).'&pgt='.$this->_getPGT();

+        $headers = '';
+        $cas_response = '';
        // open and read the URL
        if ( !$this->_readURL($cas_url, $headers, $cas_response, $err_msg) ) {
            phpCAS::trace(
@@ -3917,10 +3957,7 @@ class CAS_Client
        // the URL is built when needed only
        if ( empty($this->_url) ) {
            // remove the ticket if present in the URL
-            $final_uri = ($this->_isHttps()) ? 'https' : 'http';
-            $final_uri .= '://';
-
-            $final_uri .= $this->_getClientUrl();
+            $final_uri = $this->getServiceBaseUrl()->get();
            $request_uri = explode('?', $_SERVER['REQUEST_URI'], 2);
            $final_uri .= $request_uri[0];

@@ -3957,65 +3994,61 @@ class CAS_Client
        return $this->_server['base_url'] = $url;
    }

+    /**
+     * The ServiceBaseUrl object that provides base URL during service URL
+     * discovery process.
+     *
+     * @var CAS_ServiceBaseUrl_Interface
+     *
+     * @hideinitializer
+     */
+    private $_serviceBaseUrl = null;

    /**
-     * Try to figure out the phpCAS client URL with possible Proxys / Ports etc.
+     * Answer the CAS_ServiceBaseUrl_Interface object for this client.
     *
-     * @return string Server URL with domain:port
+     * @return CAS_ServiceBaseUrl_Interface
     */
-    private function _getClientUrl()
+    public function getServiceBaseUrl()
    {
-        if (!empty($_SERVER['HTTP_X_FORWARDED_HOST'])) {
-            // explode the host list separated by comma and use the first host
-            $hosts = explode(',', $_SERVER['HTTP_X_FORWARDED_HOST']);
-            // see rfc7239#5.3 and rfc7230#2.7.1: port is in HTTP_X_FORWARDED_HOST if non default
-            return $hosts[0];
-        } else if (!empty($_SERVER['HTTP_X_FORWARDED_SERVER'])) {
-            $server_url = $_SERVER['HTTP_X_FORWARDED_SERVER'];
-        } else {
-            if (empty($_SERVER['SERVER_NAME'])) {
-                $server_url = $_SERVER['HTTP_HOST'];
-            } else {
-                $server_url = $_SERVER['SERVER_NAME'];
-            }
+        if (empty($this->_serviceBaseUrl)) {
+            phpCAS::error("ServiceBaseUrl object is not initialized");
        }
-        if (!strpos($server_url, ':')) {
-            if (empty($_SERVER['HTTP_X_FORWARDED_PORT'])) {
-                $server_port = $_SERVER['SERVER_PORT'];
-            } else {
-                $ports = explode(',', $_SERVER['HTTP_X_FORWARDED_PORT']);
-                $server_port = $ports[0];
-            }
-
-            if ( ($this->_isHttps() && $server_port!=443)
-                || (!$this->_isHttps() && $server_port!=80)
-            ) {
-                $server_url .= ':';
-                $server_url .= $server_port;
-            }
-        }
-        return $server_url;
+        return $this->_serviceBaseUrl;
    }

    /**
-     * This method checks to see if the request is secured via HTTPS
+     * This method sets the service base URL used during service URL discovery process.
     *
-     * @return bool true if https, false otherwise
+     * This is required since phpCAS 1.6.0 to protect the integrity of the authentication.
+     *
+     * @since phpCAS 1.6.0
+     *
+     * @param $name can be any of the following:
+     *   - A base URL string. The service URL discovery will always use this (protocol,
+     *     hostname and optional port number) without using any external host names.
+     *   - An array of base URL strings. The service URL discovery will check against
+     *     this list before using the auto discovered base URL. If there is no match,
+     *     the first base URL in the array will be used as the default. This option is
+     *     helpful if your PHP website is accessible through multiple domains without a
+     *     canonical name, or through both HTTP and HTTPS.
+     *   - A class that implements CAS_ServiceBaseUrl_Interface. If you need to customize
+     *     the base URL discovery behavior, you can pass in a class that implements the
+     *     interface.
+     *
+     * @return void
     */
-    private function _isHttps()
+    private function _setServiceBaseUrl($name)
    {
-        if (!empty($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
-            return ($_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https');
-        } elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTOCOL'])) {
-            return ($_SERVER['HTTP_X_FORWARDED_PROTOCOL'] === 'https');
-        } elseif ( isset($_SERVER['HTTPS'])
-            && !empty($_SERVER['HTTPS'])
-            && strcasecmp($_SERVER['HTTPS'], 'off') !== 0
-        ) {
-            return true;
+        if (is_array($name)) {
+            $this->_serviceBaseUrl = new CAS_ServiceBaseUrl_AllowedListDiscovery($name);
+        } else if (is_string($name)) {
+            $this->_serviceBaseUrl = new CAS_ServiceBaseUrl_Static($name);
+        } else if ($name instanceof CAS_ServiceBaseUrl_Interface) {
+            $this->_serviceBaseUrl = $name;
+        } else {
+            throw new CAS_TypeMismatchException($name, '$name', 'array, string, or CAS_ServiceBaseUrl_Interface object');
        }
-        return false;
-
    }

    /**
@@ -4147,7 +4180,7 @@ class CAS_Client
        phpCAS::traceBegin();
        $lang = $this->getLangObj();
        $this->printHTMLHeader($lang->getAuthenticationFailed());
-        printf(
+        $this->printf(
            $lang->getYouWereNotAuthenticated(), htmlentities($this->getURL()),
            isset($_SERVER['SERVER_ADMIN']) ? $_SERVER['SERVER_ADMIN']:''
        );
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/CookieJar.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/Exception.php
 * @category Authentication
@@ -56,4 +56,4 @@ interface CAS_Exception
 {

 }
-?>
+?>
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/GracefullTerminationException.php
 * @category Authentication
@@ -83,4 +83,4 @@ implements CAS_Exception
    }

 }
-?>
+?>
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/InvalidArgumentException.php
 * @category Authentication
@@ -43,4 +43,4 @@ implements CAS_Exception
 {

 }
-?>
+?>
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/Language/Catalan.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/Language/ChineseSimplified.php
 * @category Authentication
@@ -111,4 +111,4 @@ class CAS_Languages_ChineseSimplified implements CAS_Languages_LanguageInterface
    {
        return '服务器 <b>%s</b> 不可用（<b>%s</b>）。';
    }
-}
+}
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/Language/English.php
 * @category Authentication
@@ -111,4 +111,4 @@ class CAS_Languages_English implements CAS_Languages_LanguageInterface
    {
        return 'The service `<b>%s</b>\' is not available (<b>%s</b>).';
    }
-}
+}
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/Language/French.php
 * @category Authentication
@@ -113,4 +113,4 @@ class CAS_Languages_French implements CAS_Languages_LanguageInterface
    }
 }

-?>
+?>
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/Language/Galego.php
 * @category Authentication
@@ -101,7 +101,7 @@ class CAS_Languages_Galego implements CAS_Languages_LanguageInterface
    public function getYouWereNotAuthenticated()
    {
        return '
-        <p>Non estás autenticado</p><p>Podes volver tentalo facendo click <a href="%s">aquí</a>.</p><p>Se o problema persiste debería contactar con el <a href="mailto:%s">administrador deste sitio</a>.</p>';   
+        <p>Non estás autenticado</p><p>Podes volver tentalo facendo click <a href="%s">aquí</a>.</p><p>Se o problema persiste debería contactar con el <a href="mailto:%s">administrador deste sitio</a>.</p>';
    }

    /**
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/Language/German.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/Language/Greek.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/Language/Japanese.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/Language/LanguageInterface.php
 * @category Authentication
@@ -93,4 +93,4 @@ interface CAS_Languages_LanguageInterface
    public function getServiceUnavailable();

 }
-?>
+?>
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/Language/Portuguese.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/Language/Spanish.php
 * @category Authentication
@@ -18,7 +18,7 @@
 * limitations under the License.
 *
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/OutOfSequenceBeforeAuthenticationCallException.php
 * @category Authentication
@@ -18,7 +18,7 @@
 * limitations under the License.
 *
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/OutOfSequenceBeforeClientException.php
 * @category Authentication
@@ -18,7 +18,7 @@
 * limitations under the License.
 *
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/OutOfSequenceBeforeProxyException.php
 * @category Authentication
@@ -18,7 +18,7 @@
 * limitations under the License.
 *
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/OutOfSequenceException.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/PGTStorage/AbstractStorage.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/PGTStorage/Db.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/PGTStorage/AbstractStorage.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/ProxiedService.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/ProxiedService/Abstract.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/ProxiedService/Exception.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/ProxiedService/Http.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/ProxiedService/Http/Abstract.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/ProxiedService/Http/Get.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/ProxiedService/Http/Post.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/ProxiedService/Imap.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/ProxiedService/Testabel.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/ProxyChain.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/ProxyChain/AllowedList.php
 * @category Authentication
@@ -17,7 +17,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
- * PHP Version 5
+ * PHP Version 7
 *
 * @file     CAS/ProxyChain/Any.php
 * @category Authentication
--- a/Show More
+++ b/Show More