Moodle release 2.5.1

It was toggling the state of the hidden input - not the checkbox.

.eslintrc

@@ -1,308 +0,0 @@
-{
-  'plugins': [
-    'babel',
-    'promise',
-    'jsdoc',
-  ],
-  'env': {
-    'browser': true,
-    'amd': true
-  },
-  'globals': {
-    'M': true,
-    'Y': true
-  },
-  'rules': {
-    // See http://eslint.org/docs/rules/ for all rules and explanations of all
-    // rules.
-
-    // === Possible Errors ===
-    'comma-dangle': 'off',
-    'no-compare-neg-zero': 'error',
-    'no-cond-assign': 'error',
-    'no-console': 'error',
-    'no-constant-condition': 'error',
-    'no-control-regex': 'error',
-    'no-debugger': 'error',
-    'no-dupe-args': 'error',
-    'no-dupe-keys': 'error',
-    'no-duplicate-case': 'error',
-    'no-empty': 'warn',
-    'no-empty-character-class': 'error',
-    'no-ex-assign': 'error',
-    'no-extra-boolean-cast': 'error',
-    'no-extra-parens': 'off',
-    'no-extra-semi': 'error',
-    'no-func-assign': 'error',
-    'no-inner-declarations': 'error',
-    'no-invalid-regexp': 'error',
-    'no-irregular-whitespace': 'error',
-    'no-obj-calls': 'error',
-    'no-prototype-builtins': 'off',
-    'no-regex-spaces': 'error',
-    'no-sparse-arrays': 'error',
-    'no-unexpected-multiline': 'error',
-    'no-unreachable': 'warn',
-    'no-unsafe-finally': 'error',
-    'no-unsafe-negation': 'error',
-    'use-isnan': 'error',
-    'valid-jsdoc': ['warn', { 'requireReturn': false, 'requireParamDescription': false, 'requireReturnDescription': false }],
-    'valid-typeof': 'error',
-
-    // === Best Practices ===
-    // (these mostly match our jshint config)
-    'array-callback-return': 'warn',
-    'block-scoped-var': 'warn',
-    'complexity': 'warn',
-    'consistent-return': 'warn',
-    'curly': 'error',
-    'dot-notation': 'warn',
-    'no-alert': 'warn',
-    'no-caller': 'error',
-    'no-case-declarations': 'error',
-    'no-div-regex': 'error',
-    'no-empty-pattern': 'error',
-    'no-empty-function': 'warn',
-    'no-eq-null': 'error',
-    'no-eval': 'error',
-    'no-extend-native': 'error',
-    'no-extra-bind': 'warn',
-    'no-fallthrough': 'error',
-    'no-floating-decimal': 'warn',
-    'no-global-assign': 'warn',
-    'no-implied-eval': 'error',
-    'no-invalid-this': 'error',
-    'no-iterator': 'error',
-    'no-labels': 'error',
-    'no-loop-func': 'error',
-    'no-multi-spaces': 'warn',
-    'no-multi-str': 'error',
-    'no-new-func': 'error',
-    'no-new-wrappers': 'error',
-    'no-octal': 'error',
-    'no-octal-escape': 'error',
-    'no-proto': 'error',
-    'no-redeclare': 'warn',
-    'no-return-assign': 'error',
-    'no-script-url': 'error',
-    'no-self-assign': 'error',
-    'no-self-compare': 'error',
-    'no-sequences': 'warn',
-    'no-throw-literal': 'warn',
-    'no-unmodified-loop-condition': 'error',
-    'no-unused-expressions': 'error',
-    'no-unused-labels': 'error',
-    'no-useless-call': 'warn',
-    'no-useless-escape': 'warn',
-    'no-with': 'error',
-    'wrap-iife': ['error', 'any'],
-
-    // === Variables ===
-    'no-delete-var': 'error',
-    'no-undef': 'error',
-    'no-undef-init': 'error',
-    'no-unused-vars': ['error', { 'caughtErrors': 'none' }],
-
-    // === Stylistic Issues ===
-    'array-bracket-spacing': 'warn',
-    'block-spacing': 'warn',
-    'brace-style': ['warn', '1tbs'],
-    'camelcase': 'warn',
-    'capitalized-comments': ['warn', 'always', { 'ignoreConsecutiveComments': true }],
-    'comma-spacing': ['warn', { 'before': false, 'after': true }],
-    'comma-style': ['warn', 'last'],
-    'computed-property-spacing': 'error',
-    'consistent-this': 'off',
-    'eol-last': 'off',
-    'func-call-spacing': ['warn', 'never'],
-    'func-names': 'off',
-    'func-style': 'off',
-    // indent currently not doing well with our wrapping style, so disabled.
-    'indent': ['off', 4, { 'SwitchCase': 1 }],
-    'key-spacing': ['warn', { 'beforeColon': false, 'afterColon': true, 'mode': minimum }],
-    'keyword-spacing': 'warn',
-    'linebreak-style': ['error', 'unix'],
-    'lines-around-comment': 'off',
-    'max-len': ['error', 132],
-    'max-lines': 'off',
-    'max-depth': 'warn',
-    'max-nested-callbacks': ['warn', 5],
-    'max-params': 'off',
-    'max-statements': 'off',
-    'max-statements-per-line': ['warn', { max: 2 }],
-    'new-cap': ['warn', { 'properties': false }],
-    'new-parens': 'warn',
-    'newline-after-var': 'off',
-    'newline-before-return': 'off',
-    'newline-per-chained-call': 'off',
-    'no-array-constructor': 'off',
-    'no-bitwise': 'error',
-    'no-continue': 'off',
-    'no-inline-comments': 'off',
-    'no-lonely-if': 'off',
-    'no-mixed-operators': 'off',
-    'no-mixed-spaces-and-tabs': 'error',
-    'no-multiple-empty-lines': 'warn',
-    'no-negated-condition': 'off',
-    'no-nested-ternary': 'warn',
-    'no-new-object': 'off',
-    'no-plusplus': 'off',
-    'no-tabs': 'error',
-    'no-ternary': 'off',
-    'no-trailing-spaces': 'error',
-    'no-underscore-dangle': 'off',
-    'no-unneeded-ternary': 'off',
-    'no-whitespace-before-property': 'warn',
-    'object-curly-newline': 'off',
-    'object-curly-spacing': 'warn',
-    'object-property-newline': 'off',
-    'one-var': 'off',
-    'one-var-declaration-per-line': ['warn', 'initializations'],
-    'operator-assignment': 'off',
-    'operator-linebreak': 'off',
-    'padded-blocks': 'off',
-    'quote-props': ['warn', 'as-needed', {'unnecessary': false, 'keywords': true, 'numbers': true}],
-    'quotes': 'off',
-    'require-jsdoc': 'warn',
-    'semi': 'error',
-    'semi-spacing': ['warn', {'before': false, 'after': true}],
-    'sort-vars': 'off',
-    'space-before-blocks': 'warn',
-    'space-before-function-paren': ['warn', 'never'],
-    'space-in-parens': 'warn',
-    'space-infix-ops': 'warn',
-    'space-unary-ops': 'warn',
-    'spaced-comment': 'warn',
-    'unicode-bom': 'error',
-    'wrap-regex': 'off',
-
-    // === Promises ===
-    'promise/always-return': 'warn',
-    'promise/no-return-wrap': 'warn',
-    'promise/param-names': 'warn',
-    'promise/catch-or-return': ['warn', {terminationMethod: ['catch', 'fail']}],
-    'promise/no-native': 'warn',
-    'promise/no-promise-in-callback': 'warn',
-    'promise/no-callback-in-promise': 'warn',
-    'promise/avoid-new': 'warn',
-
-    // === Deprecations ===
-    "no-restricted-properties": ['warn', {
-        'object': 'M',
-        'property': 'str',
-        'message': 'Use AMD module "core/str" or M.util.get_string()'
-    }],
-  },
-  overrides: [
-    {
-      files: ["**/yui/src/**/*.js"],
-      // Disable some rules which we can't safely define for YUI rollups.
-      rules: {
-        'no-undef': 'off',
-        'no-unused-vars': 'off',
-        'no-unused-expressions': 'off',
-
-        // === JSDocs ===
-        "jsdoc/check-access": 'off',
-        "jsdoc/check-alignment": 'off',
-        "jsdoc/check-param-names": 'off',
-        "jsdoc/check-property-names": 'off',
-        "jsdoc/empty-tags": 'off',
-        "jsdoc/implements-on-classes": 'off',
-        "jsdoc/multiline-blocks": 'off',
-        "jsdoc/require-jsdoc": 'off',
-        "jsdoc/require-param": 'off',
-        "jsdoc/require-param-name": 'off',
-        "jsdoc/require-param-type": 'off',
-        "jsdoc/require-property": 'off',
-        "jsdoc/require-property-name": 'off',
-        "jsdoc/require-property-type": 'off',
-      }
-    },
-    {
-      files: ["**/amd/src/*.js", "**/amd/src/**/*.js", "Gruntfile.js", ".grunt/*.js", ".grunt/tasks/*.js", "jsdoc.conf.js"],
-      // We support es6 now. Woot!
-      env: {
-        es6: true
-      },
-      // We're using babel transpiling so use their parser
-      // for linting.
-      parser: '@babel/eslint-parser',
-      // Check AMD with some slightly stricter rules.
-      rules: {
-        'no-unused-vars': 'error',
-        'no-implicit-globals': 'error',
-        // Disable all of the rules that have babel versions.
-        'new-cap': 'off',
-        // Not using this rule for the time being because it isn't
-        // compatible with jQuery and ES6.
-        'no-invalid-this': 'off',
-        'object-curly-spacing': 'off',
-        'quotes': 'off',
-        'semi': 'off',
-        'no-unused-expressions': 'off',
-        // Enable all of the babel version of these rules.
-        'babel/new-cap': ['warn', { 'properties': false }],
-        // Not using this rule for the time being because it isn't
-        // compatible with jQuery and ES6.
-        'babel/no-invalid-this': 'off',
-        'babel/object-curly-spacing': 'warn',
-        // This is off in the original style int.
-        'babel/quotes': 'off',
-        'babel/semi': 'error',
-        'babel/no-unused-expressions': 'error',
-        // === Promises ===
-        // We have Promise now that we're using ES6.
-        'promise/no-native': 'off',
-        'promise/avoid-new': 'off',
-
-        // === JSDocs ===
-        "jsdoc/check-access": [
-          'error',
-        ],
-        "jsdoc/check-alignment": 1, // Recommended.
-        "jsdoc/check-param-names": [
-          'error',
-        ],
-        "jsdoc/check-property-names": [
-          'error',
-        ],
-        "jsdoc/empty-tags": [
-          'error',
-        ],
-        "jsdoc/implements-on-classes": [
-          'error',
-        ],
-        "jsdoc/multiline-blocks": [
-          'error',
-        ],
-        "jsdoc/require-jsdoc": [
-          'error',
-        ],
-        "jsdoc/require-param": [
-          'error',
-        ],
-        "jsdoc/require-param-name": [
-          'error',
-        ],
-        "jsdoc/require-param-type": [
-          'error',
-        ],
-        "jsdoc/require-property": [
-          'error',
-        ],
-        "jsdoc/require-property-name": [
-          'error',
-        ],
-        "jsdoc/require-property-type": [
-          'error',
-        ],
-      },
-      parserOptions: {
-        'ecmaVersion': 9,
-        'sourceType': 'module',
-        'requireConfigFile': false,
-      }
-    }
-  ]
-}

.gherkin-lintrc

@@ -1,24 +0,0 @@
-{
-  "indentation": ["on",{
-    "Feature": 0,
-    "Background": 2,
-    "Scenario": 2,
-    "Examples": 4,
-    "example": 6,
-    "Step": 4,
-    "given": 4,
-    "and": 4
-  }],
-  "no-dupe-feature-names": "on",
-  "no-dupe-scenario-names": "off",
-  "no-empty-file": "on",
-  "no-files-without-scenarios": "on",
-  "no-multiple-empty-lines": "on",
-  "no-partially-commented-tag-lines": "on",
-  "no-trailing-spaces": "on",
-  "no-unnamed-features": "on",
-  "no-unnamed-scenarios": "on",
-  "no-scenario-outlines-without-examples": "on",
-  "no-examples-in-scenarios": "on",
-  "new-line-at-eof": ["on", "yes"]
-}

.gitattributes

@@ -1,3 +0,0 @@
-**/yui/build/** -diff
-**/amd/build/** -diff
-lib/dml/oci_native_moodle_package.sql text eol=lf

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-# Primary donations pages.
-custom: ["https://moodle.com/donations/", moodle.org]

.github/workflows/config-template.php

@@ -1,71 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Template configuraton file for github actions CI/CD.
- *
- * @package    core
- * @copyright  2020 onwards Eloy Lafuente (stronk7) {@link https://stronk7.com}
- * @license    https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-// This cannot be used out from a github actions workflow, so just exit.
-getenv('GITHUB_WORKFLOW') || die; // phpcs:ignore moodle.Files.MoodleInternal.MoodleInternalGlobalState
-
-unset($CFG);
-global $CFG;
-$CFG = new stdClass();
-
-$CFG->dbtype    = getenv('dbtype');
-$CFG->dblibrary = 'native';
-$CFG->dbhost    = '127.0.0.1';
-$CFG->dbname    = 'test';
-$CFG->dbuser    = 'test';
-$CFG->dbpass    = 'test';
-$CFG->prefix    = 'm_';
-$CFG->dboptions = ['dbcollation' => 'utf8mb4_bin'];
-
-$host = 'localhost';
-$CFG->wwwroot   = "http://{$host}";
-$CFG->dataroot  = realpath(dirname(__DIR__)) . '/moodledata';
-$CFG->admin     = 'admin';
-$CFG->directorypermissions = 0777;
-
-// Debug options - possible to be controlled by flag in future.
-$CFG->debug = (E_ALL | E_STRICT); // DEBUG_DEVELOPER.
-$CFG->debugdisplay = 1;
-$CFG->debugstringids = 1; // Add strings=1 to url to get string ids.
-$CFG->perfdebug = 15;
-$CFG->debugpageinfo = 1;
-$CFG->allowthemechangeonurl = 1;
-$CFG->passwordpolicy = 0;
-$CFG->cronclionly = 0;
-$CFG->pathtophp = getenv('pathtophp');
-
-$CFG->phpunit_dataroot  = realpath(dirname(__DIR__)) . '/phpunitdata';
-$CFG->phpunit_prefix = 't_';
-
-define('TEST_EXTERNAL_FILES_HTTP_URL', 'http://localhost:8080');
-define('TEST_EXTERNAL_FILES_HTTPS_URL', 'http://localhost:8080');
-
-define('TEST_SESSION_REDIS_HOST', 'localhost');
-define('TEST_CACHESTORE_REDIS_TESTSERVERS', 'localhost');
-
-// TODO: add others (solr, mongodb, memcached, ldap...).
-
-// Too much for now: define('PHPUNIT_LONGTEST', true); // Only leaves a few tests out and they are run later by CI.
-
-require_once(__DIR__ . '/lib/setup.php');

.github/workflows/push.yml

@@ -1,114 +0,0 @@
-name: Core
-
-on:
-  push:
-    branches-ignore:
-      - master
-      - MOODLE_[0-9]+_STABLE
-    tags-ignore:
-      - v[0-9]+.[0-9]+.[0-9]+*
-
-env:
-  php: 8.0
-
-jobs:
-  Grunt:
-    runs-on: ubuntu-18.04
-
-    steps:
-      - name: Checking out code
-        uses: actions/checkout@v2
-
-      - name: Configuring node & npm
-        uses: actions/setup-node@v2
-        with:
-          node-version-file: '.nvmrc'
-
-      - name: Installing node stuff
-        run: npm install
-
-      - name: Running grunt
-        run: npx grunt
-
-      - name: Looking for uncommitted changes
-        # Add all files to the git index and then run diff --cached to see all changes.
-        # This ensures that we get the status of all files, including new files.
-        # We ignore npm-shrinkwrap.json to make the tasks immune to npm changes.
-        run: |
-          git add .
-          git reset -- npm-shrinkwrap.json
-          git diff --cached --exit-code
-
-  PHPUnit:
-    runs-on: ${{ matrix.os }}
-    services:
-      exttests:
-        image: moodlehq/moodle-exttests
-        ports:
-          - 8080:80
-      redis:
-        image: redis
-        ports:
-          - 6379:6379
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-18.04
-            php: 7.3
-            extensions:
-            db: mysqli
-          - os: ubuntu-18.04
-            php: 8.0
-            db: pgsql
-            extensions: xmlrpc-beta
-
-    steps:
-      - name: Setting up DB mysql
-        if: ${{ matrix.db == 'mysqli' }}
-        uses: johanmeiring/mysql-action@tmpfs-patch
-        with:
-          collation server: utf8mb4_bin
-          mysql version: 5.7
-          mysql database: test
-          mysql user: test
-          mysql password: test
-          use tmpfs: true
-
-      - name: Setting up DB pgsql
-        if: ${{ matrix.db == 'pgsql' }}
-        uses: m4nu56/postgresql-action@v1
-        with:
-          postgresql version: 10
-          postgresql db: test
-          postgresql user: test
-          postgresql password: test
-
-      - name: Configuring git vars
-        uses: rlespinasse/github-slug-action@v3.x
-
-      - name: Setting up PHP ${{ matrix.php }}
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: ${{ matrix.extensions }}
-          ini-values: max_input_vars=5000
-          coverage: none
-
-      - name: Checking out code from ${{ env.GITHUB_REF_SLUG }}
-        uses: actions/checkout@v2
-
-      - name: Setting up PHPUnit
-        env:
-          dbtype: ${{ matrix.db }}
-        run: |
-          echo "pathtophp=$(which php)" >> $GITHUB_ENV # Inject installed pathtophp to env. The template config needs it.
-          cp .github/workflows/config-template.php config.php
-          mkdir ../moodledata
-          sudo locale-gen en_AU.UTF-8
-          php admin/tool/phpunit/cli/init.php --no-composer-self-update
-
-      - name: Running PHPUnit tests
-        env:
-          dbtype: ${{ matrix.db }}
-        run: vendor/bin/phpunit -v

.gitignore

@@ -9,24 +9,15 @@
 #
 # See gitignore(5) man page for more details
 #
-
-# Swap files (vim)
-[._]*.s[a-v][a-z]
-[._]*.sw[a-p]
-[._]s[a-rt-v][a-z]
-[._]ss[a-gi-z]
-[._]sw[a-p]
-# Temporary files including undo
-*~
-#
 /config.php
 /lib/editor/tinymce/extra/tools/temp/
+*~
+*.swp
 /tags
 /TAGS
 /cscope.*
 /.patches/
 /.idea/
-.phpstorm.*
 /nbproject/
 CVS
 .DS_Store
@@ -34,23 +25,11 @@ CVS
 /.project
 /.buildpath
 /.cache
-.phpunit.result.cache
 phpunit.xml
-# Composer support. Do not ignore composer.json, or composer.lock. These should be shipped by us.
+# Composer support - only composer.json is to be in git, the rest is installed in each checkout.
 composer.phar
+composer.lock
 /vendor/
 /behat.yml
 */yui/build/*/*-coverage.js
 /lib/yuilib/*/build/*/*-coverage.js
-# lib/yuilib/version/module/module-coverage.js
-/lib/yuilib/*/*/*-coverage.js
-atlassian-ide-plugin.xml
-/node_modules/
-/.vscode/
-moodle-plugin-ci.phar
-.eslintignore
-.stylelintignore
-/jsdoc
-/admin/tool/componentlibrary/docs
-/admin/tool/componentlibrary/hugo/site/data/my-index.json
-.hugo_build.lock

.grunt/babel-plugin-add-module-to-define.js

@@ -1,169 +0,0 @@
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This is a babel plugin to add the Moodle module names to the AMD modules
- * as part of the transpiling process.
- *
- * In addition it will also add a return statement for the default export if the
- * module is using default exports. This is a highly specific Moodle thing because
- * we're transpiling to AMD and none of the existing Babel 7 plugins work correctly.
- *
- * This will fix the issue where an ES6 module using "export default Foo" will be
- * transpiled into an AMD module that returns {default: Foo}; Instead it will now
- * just simply return Foo.
- *
- * Note: This means all other named exports in that module are ignored and won't be
- * exported.
- *
- * @copyright  2018 Ryan Wyllie <ryan@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-"use strict";
-/* eslint-env node */
-
-module.exports = ({template, types}) => {
-    const fs = require('fs');
-    const path = require('path');
-    const cwd = process.cwd();
-    const ComponentList = require(path.join(process.cwd(), '.grunt', 'components.js'));
-
-    /**
-     * Search the list of components that match the given file name
-     * and return the Moodle component for that file, if found.
-     *
-     * Throw an exception if no matching component is found.
-     *
-     * @throws {Error}
-     * @param {string} searchFileName The file name to look for.
-     * @return {string} Moodle component
-     */
-    function getModuleNameFromFileName(searchFileName) {
-        searchFileName = fs.realpathSync(searchFileName);
-        const relativeFileName = searchFileName.replace(`${cwd}${path.sep}`, '').replace(/\\/g, '/');
-        const [componentPath, file] = relativeFileName.split('/amd/src/');
-        const fileName = file.replace('.js', '');
-
-        // Check subsystems first which require an exact match.
-        const componentName = ComponentList.getComponentFromPath(componentPath);
-        if (componentName) {
-            return `${componentName}/${fileName}`;
-        }
-
-        // This matches the previous PHP behaviour that would throw an exception
-        // if it couldn't parse an AMD file.
-        throw new Error(`Unable to find module name for ${searchFileName} (${componentPath}::${file}}`);
-    }
-
-    /**
-     * This is heavily inspired by the babel-plugin-add-module-exports plugin.
-     * See: https://github.com/59naga/babel-plugin-add-module-exports
-     *
-     * This is used when we detect a module using "export default Foo;" to make
-     * sure the transpiled code just returns Foo directly rather than an object
-     * with the default property (i.e. {default: Foo}).
-     *
-     * Note: This means that we can't support modules that combine named exports
-     * with a default export.
-     *
-     * @param {String} path
-     * @param {String} exportObjectName
-     */
-    function addModuleExportsDefaults(path, exportObjectName) {
-        const rootPath = path.findParent(path => {
-            return path.key === 'body' || !path.parentPath;
-        });
-
-        // HACK: `path.node.body.push` instead of path.pushContainer(due doesn't work in Plugin.post).
-        // This is hardcoded to work specifically with AMD.
-        rootPath.node.body.push(template(`return ${exportObjectName}.default`)());
-    }
-
-    return {
-        pre() {
-            this.seenDefine = false;
-            this.addedReturnForDefaultExport = false;
-        },
-        visitor: {
-            // Plugin ordering is only respected if we visit the "Program" node.
-            // See: https://babeljs.io/docs/en/plugins.html#plugin-preset-ordering
-            //
-            // We require this to run after the other AMD module transformation so
-            // let's visit the "Program" node.
-            Program: {
-                exit(path) {
-                    path.traverse({
-                        CallExpression(path) {
-                            // If we find a "define" function call.
-                            if (!this.seenDefine && path.get('callee').isIdentifier({name: 'define'})) {
-                                // We only want to modify the first instance of define that we find.
-                                this.seenDefine = true;
-
-                                // Get the Moodle component for the file being processed.
-                                var moduleName = getModuleNameFromFileName(this.file.opts.filename);
-
-                                // The function signature of `define()` is:
-                                // define = function (name, deps, callback) {...}
-                                // Ensure that if the moduel supplied its own name that it is replaced.
-                                if (path.node.arguments.length > 0) {
-                                    // Ensure that there is only one name.
-                                    if (path.node.arguments[0].type === 'StringLiteral') {
-                                        // eslint-disable-next-line
-                                        console.log(`Replacing module name '${path.node.arguments[0].extra.rawValue}' with ${moduleName}`);
-                                        path.node.arguments.shift();
-                                    }
-                                }
-
-                                // Add the module name as the first argument to the define function.
-                                path.node.arguments.unshift(types.stringLiteral(moduleName));
-                                // Add a space after the define function in the built file so that previous versions
-                                // of Moodle will not try to add the module name to the file when it's being served
-                                // by PHP. This forces the regex in PHP to not match for this file.
-                                path.node.callee.name = 'define ';
-                            }
-
-                            // Check for any Object.defineProperty('exports', 'default') calls.
-                            if (!this.addedReturnForDefaultExport && path.get('callee').matchesPattern('Object.defineProperty')) {
-                                const [identifier, prop] = path.get('arguments');
-                                const objectName = identifier.get('name').node;
-                                const propertyName = prop.get('value').node;
-
-                                if ((objectName === 'exports' || objectName === '_exports') && propertyName === 'default') {
-                                    addModuleExportsDefaults(path, objectName);
-                                    this.addedReturnForDefaultExport = true;
-                                }
-                            }
-                        },
-                        AssignmentExpression(path) {
-                            // Check for an exports.default assignments.
-                            if (
-                                !this.addedReturnForDefaultExport &&
-                                (
-                                    path.get('left').matchesPattern('exports.default') ||
-                                    path.get('left').matchesPattern('_exports.default')
-                                )
-                            ) {
-                                const objectName = path.get('left.object.name').node;
-                                addModuleExportsDefaults(path, objectName);
-                                this.addedReturnForDefaultExport = true;
-                            }
-                        }
-                    }, this);
-                }
-            }
-        }
-    };
-};

.grunt/components.js

@@ -1,243 +0,0 @@
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Helper functions for working with Moodle component names, directories, and sources.
- *
- * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-"use strict";
-/* eslint-env node */
-
-/** @var {Object} A list of subsystems in Moodle */
-const componentData = {};
-
-/**
- * Load details of all moodle modules.
- *
- * @returns {object}
- */
-const fetchComponentData = () => {
-    const fs = require('fs');
-    const path = require('path');
-    const glob = require('glob');
-    const gruntFilePath = process.cwd();
-
-    if (!Object.entries(componentData).length) {
-        componentData.subsystems = {};
-        componentData.pathList = [];
-
-        // Fetch the component definiitions from the distributed JSON file.
-        const components = JSON.parse(fs.readFileSync(`${gruntFilePath}/lib/components.json`));
-
-        // Build the list of moodle subsystems.
-        componentData.subsystems.lib = 'core';
-        componentData.pathList.push(process.cwd() + path.sep + 'lib');
-        for (const [component, thisPath] of Object.entries(components.subsystems)) {
-            if (thisPath) {
-                // Prefix "core_" to the front of the subsystems.
-                componentData.subsystems[thisPath] = `core_${component}`;
-                componentData.pathList.push(process.cwd() + path.sep + thisPath);
-            }
-        }
-
-        // The list of components incldues the list of subsystems.
-        componentData.components = componentData.subsystems;
-
-        // Go through each of the plugintypes.
-        Object.entries(components.plugintypes).forEach(([pluginType, pluginTypePath]) => {
-            // We don't allow any code in this place..?
-            glob.sync(`${pluginTypePath}/*/version.php`).forEach(versionPath => {
-                const componentPath = fs.realpathSync(path.dirname(versionPath));
-                const componentName = path.basename(componentPath);
-                const frankenstyleName = `${pluginType}_${componentName}`;
-                componentData.components[`${pluginTypePath}/${componentName}`] = frankenstyleName;
-                componentData.pathList.push(componentPath);
-
-                // Look for any subplugins.
-                const subPluginConfigurationFile = `${componentPath}/db/subplugins.json`;
-                if (fs.existsSync(subPluginConfigurationFile)) {
-                    const subpluginList = JSON.parse(fs.readFileSync(fs.realpathSync(subPluginConfigurationFile)));
-
-                    Object.entries(subpluginList.plugintypes).forEach(([subpluginType, subpluginTypePath]) => {
-                        glob.sync(`${subpluginTypePath}/*/version.php`).forEach(versionPath => {
-                            const componentPath = fs.realpathSync(path.dirname(versionPath));
-                            const componentName = path.basename(componentPath);
-                            const frankenstyleName = `${subpluginType}_${componentName}`;
-
-                            componentData.components[`${subpluginTypePath}/${componentName}`] = frankenstyleName;
-                            componentData.pathList.push(componentPath);
-                        });
-                    });
-                }
-            });
-        });
-
-    }
-
-    return componentData;
-};
-
-/**
- * Get the list of component paths.
- *
- * @param   {string} relativeTo
- * @returns {array}
- */
-const getComponentPaths = (relativeTo = '') => fetchComponentData().pathList.map(componentPath => {
-    return componentPath.replace(relativeTo, '');
-});
-
-/**
- * Get the list of paths to build AMD sources.
- *
- * @returns {Array}
- */
-const getAmdSrcGlobList = () => {
-    const globList = [];
-    fetchComponentData().pathList.forEach(componentPath => {
-        globList.push(`${componentPath}/amd/src/*.js`);
-        globList.push(`${componentPath}/amd/src/**/*.js`);
-    });
-
-    return globList;
-};
-
-/**
- * Get the list of paths to build YUI sources.
- *
- * @param {String} relativeTo
- * @returns {Array}
- */
-const getYuiSrcGlobList = relativeTo => {
-    const globList = [];
-    fetchComponentData().pathList.forEach(componentPath => {
-        const relativeComponentPath = componentPath.replace(relativeTo, '');
-        globList.push(`${relativeComponentPath}/yui/src/**/*.js`);
-    });
-
-    return globList;
-};
-
-/**
- * Get the list of paths to thirdpartylibs.xml.
- *
- * @param {String} relativeTo
- * @returns {Array}
- */
-const getThirdPartyLibsList = relativeTo => {
-    const fs = require('fs');
-    const path = require('path');
-
-    return fetchComponentData().pathList
-        .map(componentPath => path.relative(relativeTo, componentPath) + '/thirdpartylibs.xml')
-        .map(componentPath => componentPath.replace(/\\/g, '/'))
-        .filter(path => fs.existsSync(path))
-        .sort();
-};
-
-/**
- * Get the list of thirdparty library paths.
- *
- * @returns {array}
- */
-const getThirdPartyPaths = () => {
-    const DOMParser = require('xmldom').DOMParser;
-    const fs = require('fs');
-    const path = require('path');
-    const xpath = require('xpath');
-
-    const thirdpartyfiles = getThirdPartyLibsList(fs.realpathSync('./'));
-    const libs = ['node_modules/', 'vendor/'];
-
-    const addLibToList = lib => {
-        if (!lib.match('\\*') && fs.statSync(lib).isDirectory()) {
-            // Ensure trailing slash on dirs.
-            lib = lib.replace(/\/?$/, '/');
-        }
-
-        // Look for duplicate paths before adding to array.
-        if (libs.indexOf(lib) === -1) {
-            libs.push(lib);
-        }
-    };
-
-    thirdpartyfiles.forEach(function(file) {
-        const dirname = path.dirname(file);
-
-        const xmlContent = fs.readFileSync(file, 'utf8');
-        const doc = new DOMParser().parseFromString(xmlContent);
-        const nodes = xpath.select("/libraries/library/location/text()", doc);
-
-        nodes.forEach(function(node) {
-            let lib = path.posix.join(dirname, node.toString());
-            addLibToList(lib);
-        });
-    });
-
-    return libs;
-
-};
-
-/**
- * Find the name of the component matching the specified path.
- *
- * @param {String} path
- * @returns {String|null} Name of matching component.
- */
-const getComponentFromPath = path => {
-    const componentList = fetchComponentData().components;
-
-    if (componentList.hasOwnProperty(path)) {
-        return componentList[path];
-    }
-
-    return null;
-};
-
-/**
- * Check whether the supplied path, relative to the Gruntfile.js, is in a known component.
- *
- * @param {String} checkPath The path to check. This can be with either Windows, or Linux directory separators.
- * @returns {String|null}
- */
-const getOwningComponentDirectory = checkPath => {
-    const path = require('path');
-
-    // Fetch all components into a reverse sorted array.
-    // This ensures that components which are within the directory of another component match first.
-    const pathList = Object.keys(fetchComponentData().components).sort().reverse();
-    for (const componentPath of pathList) {
-        // If the componentPath is the directory being checked, it will be empty.
-        // If the componentPath is a parent of the directory being checked, the relative directory will not start with ..
-        if (!path.relative(componentPath, checkPath).startsWith('..')) {
-            return componentPath;
-        }
-    }
-
-    return null;
-};
-
-module.exports = {
-    getAmdSrcGlobList,
-    getComponentFromPath,
-    getComponentPaths,
-    getOwningComponentDirectory,
-    getYuiSrcGlobList,
-    getThirdPartyLibsList,
-    getThirdPartyPaths,
-};

.grunt/jsdoc/README.md

@@ -1,19 +0,0 @@
-# Moodle JavaScript Documentation
-
-```
-                                 .-..-.
-   _____                         | || |
-  /____/-.---_  .---.  .---.  .-.| || | .---.
-  | |  _   _  |/  _  \/  _  \/  _  || |/  __ \
-  * | | | | | || |_| || |_| || |_| || || |___/
-    |_| |_| |_|\_____/\_____/\_____||_|\_____)
-
-Moodle - the world's open source learning platform
-
-```
-
-## About
-This generated documentation includes API documentation for JavaScript written in the AMD and ES2015 module formats within Moodle.
-
-## Related information
-See [https://docs.moodle.org/dev](https://docs.moodle.org/dev) for other related Developer Documentation.

.grunt/jsdoc/jsdoc.conf.js

@@ -1,131 +0,0 @@
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Helper functions for working with Moodle component names, directories, and sources.
- *
- * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-"use strict";
-/* eslint-env node */
-
-// Do not include any plugins as stanard.
-const plugins = [];
-
-plugins.push('plugins/markdown');
-
-/**
- * Get the source configuration.
- *
- * @return {Object}
- */
-const getSource = () => {
-    const glob = require('glob');
-    const path = require('path');
-    const ComponentList = require(path.resolve('.grunt/components.js'));
-    const thirdPartyPaths = ComponentList.getThirdPartyPaths();
-
-    const source = {
-        include: [],
-        includePattern: ".+\\.js$",
-    };
-
-    let includeList = [];
-
-    ComponentList.getAmdSrcGlobList().forEach(async pattern => {
-        includeList.push(...glob.sync(pattern));
-    });
-
-    const cwdLength = process.cwd().length + 1;
-    includeList.forEach(path => {
-        if (source.include.indexOf(path) !== -1) {
-            // Ensure no duplicates.
-            return;
-        }
-
-        const relPath = path.substring(cwdLength);
-        if (thirdPartyPaths.indexOf(relPath) !== -1) {
-            return;
-        }
-
-        source.include.push(path);
-    });
-
-    source.include.push('.grunt/jsdoc/README.md');
-    return source;
-};
-
-const tags = {
-    // Allow the use of unknown tags.
-    // We have a lot of legacy uses of these.
-    allowUnknownTags: true,
-
-    // We make use of jsdoc and closure dictionaries as standard.
-    dictionaries: [
-        'jsdoc',
-        'closure',
-    ],
-};
-
-// Template configuraiton.
-const templates = {
-    cleverLinks: false,
-    monospaceLinks: false,
-};
-
-module.exports = {
-    opts: {
-        destination: "./jsdoc/",
-        template: "node_modules/docdash",
-    },
-    plugins,
-    recurseDepth: 10,
-    source: getSource(),
-    sourceType: 'module',
-    tags,
-    templates,
-    docdash: {
-        collapse: true,
-        search: true,
-        sort: true,
-        sectionOrder: [
-            "Namespaces",
-            "Modules",
-            "Events",
-            "Classes",
-            "Externals",
-            "Mixins",
-            "Tutorials",
-            "Interfaces"
-        ],
-        "menu": {
-            "Developer Docs": {
-                href: "https://docs.moodle.org/dev",
-                target: "_blank",
-                "class": "menu-item",
-                id: "devdocs"
-            },
-            "MDN Docs": {
-                href: "https://developer.mozilla.org/en-US/docs/Web/JavaScript",
-                target: "_blank",
-                "class": "menu-item",
-                id: "mdndocs",
-            },
-        },
-        typedefs: true,
-    },
-};

.grunt/tasks/componentlibrary.js

@@ -1,140 +0,0 @@
-// 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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * Component Library build tasks.
- *
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-module.exports = grunt => {
-
-    /**
-     * Get a child path of the component library.
-     *
-     * @param   {string} path
-     * @returns {string}
-     */
-    const getCLPath = path => `admin/tool/componentlibrary/${path}`;
-
-    /**
-     * Get a spawn handler.
-     *
-     * This is a generic function to write the spawn output, and then to exit if required and mark the async task as
-     * complete.
-     *
-     * @param   {Promise} done
-     * @returns {function}
-     */
-    const getSpawnHandler = done => (error, result, code) => {
-        grunt.log.write(result);
-
-        if (error) {
-            process.exit(code);
-        }
-        done();
-    };
-
-    /**
-     * Spawn a function against Node with the provided args.
-     *
-     * @param   {array} args
-     * @returns {object}
-     */
-    const spawnNodeCall = args => grunt.util.spawn({
-        cmd: 'node',
-        args,
-    }, getSpawnHandler(grunt.task.current.async()));
-
-    /**
-     * Build the docs using Hugo.
-     *
-     * @returns {Object} Reference to the spawned task
-     */
-    const docsBuild = () => spawnNodeCall([
-        'node_modules/hugo-bin/cli.js',
-        '--config', getCLPath('config.yml'),
-        '--cleanDestinationDir',
-    ]);
-
-    /**
-     * Build the docs index using the hugo-lunr-indexer.
-     *
-     * @returns {Object} Reference to the spawned task
-     */
-    const indexBuild = () => spawnNodeCall([
-        'node_modules/hugo-lunr-indexer/bin/hli.js',
-        '-i', getCLPath('content/**'),
-        '-o', getCLPath('hugo/site/data/my-index.json'),
-        '-l', 'yaml',
-        '-d', '---',
-    ]);
-
-    /**
-     * Build the hugo CSS.
-     *
-     * @returns {Object} Reference to the spawned task
-     */
-    const cssBuild = () => spawnNodeCall([
-        'node_modules/node-sass/bin/node-sass',
-        '--output-style', 'expanded',
-        '--source-map', true,
-        '--source-map-contents', true,
-        '--precision', 6,
-        getCLPath('hugo/scss/docs.scss'),
-        '-o', getCLPath('hugo/dist/css/'),
-    ]);
-
-    // Register the various component library tasks.
-    grunt.registerTask('componentlibrary:docsBuild', 'Build the component library', docsBuild);
-    grunt.registerTask('componentlibrary:cssBuild', 'Build the component library', cssBuild);
-    grunt.registerTask('componentlibrary:indexBuild', 'Build the component library', indexBuild);
-    grunt.registerTask('componentlibrary', 'Build the component library', [
-        'componentlibrary:docsBuild',
-        'componentlibrary:cssBuild',
-        'componentlibrary:indexBuild',
-    ]);
-
-    grunt.config.merge({
-        watch: {
-            componentLibraryDocs: {
-                files: [
-                    getCLPath('content/**/*.md'),
-                    getCLPath('hugo'),
-                ],
-                tasks: ['componentlibrary:docsBuild', 'componentlibrary:indexBuild'],
-            },
-            componentLibraryCSS: {
-                files: [
-                    getCLPath('hugo/scss/**/*.scss'),
-                    'hugo',
-                ],
-                tasks: ['componentlibrary:cssBuild'],
-            },
-        },
-    });
-
-    // Add the 'componentlibrary' task as a startup task.
-    grunt.moodleEnv.startupTasks.push('componentlibrary');
-
-    return {
-        docsBuild,
-        cssBuild,
-        indexBuild,
-    };
-};

.grunt/tasks/eslint.js

@@ -1,64 +0,0 @@
-// 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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-module.exports = grunt => {
-    const files = grunt.moodleEnv.files;
-
-    // Project configuration.
-    grunt.config.merge({
-        eslint: {
-            // Even though warnings dont stop the build we don't display warnings by default because
-            // at this moment we've got too many core warnings.
-            // To display warnings call: grunt eslint --show-lint-warnings
-            // To fail on warnings call: grunt eslint --max-lint-warnings=0
-            // Also --max-lint-warnings=-1 can be used to display warnings but not fail.
-            options: {
-                quiet: (!grunt.option('show-lint-warnings')) && (typeof grunt.option('max-lint-warnings') === 'undefined'),
-                maxWarnings: ((typeof grunt.option('max-lint-warnings') !== 'undefined') ? grunt.option('max-lint-warnings') : -1)
-            },
-
-            // Check AMD src files.
-            amd: {src: files ? files : grunt.moodleEnv.amdSrc},
-
-            // Check YUI module source files.
-            yui: {src: files ? files : grunt.moodleEnv.yuiSrc},
-        },
-    });
-
-    grunt.loadNpmTasks('grunt-eslint');
-
-    // On watch, we dynamically modify config to build only affected files. This
-    // method is slightly complicated to deal with multiple changed files at once (copied
-    // from the grunt-contrib-watch readme).
-    let changedFiles = Object.create(null);
-    const onChange = grunt.util._.debounce(function() {
-        const files = Object.keys(changedFiles);
-        grunt.config('eslint.amd.src', files);
-        grunt.config('eslint.yui.src', files);
-        changedFiles = Object.create(null);
-    }, 200);
-
-    grunt.event.on('watch', (action, filepath) => {
-        changedFiles[filepath] = action;
-        onChange();
-    });
-};

.grunt/tasks/gherkinlint.js

@@ -1,92 +0,0 @@
-// 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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-module.exports = grunt => {
-    /**
-     * Get the list of feature files to pass to the gherkin linter.
-     *
-     * @returns {Array}
-     */
-    const getGherkinLintTargets = () => {
-        if (grunt.moodleEnv.files) {
-            // Specific files were requested. Only check these.
-            return grunt.moodleEnv.files;
-        }
-
-        if (grunt.moodleEnv.inComponent) {
-            return [`${grunt.moodleEnv.runDir}/tests/behat/*.feature`];
-        }
-
-        return ['**/tests/behat/*.feature'];
-    };
-
-    const handler = function() {
-        const done = this.async();
-        const options = grunt.config('gherkinlint.options');
-
-        // Grab the gherkin-lint linter and required scaffolding.
-        const linter = require('gherkin-lint/dist/linter.js');
-        const featureFinder = require('gherkin-lint/dist/feature-finder.js');
-        const configParser = require('gherkin-lint/dist/config-parser.js');
-        const formatter = require('gherkin-lint/dist/formatters/stylish.js');
-
-        // Run the linter.
-        return linter.lint(
-            featureFinder.getFeatureFiles(grunt.file.expand(options.files)),
-            configParser.getConfiguration(configParser.defaultConfigFileName)
-        )
-        .then(results => {
-            // Print the results out uncondtionally.
-            formatter.printResults(results);
-
-            return results;
-        })
-        .then(results => {
-            // Report on the results.
-            // The done function takes a bool whereby a falsey statement causes the task to fail.
-            return results.every(result => result.errors.length === 0);
-        })
-        .then(done); // eslint-disable-line promise/no-callback-in-promise
-    };
-
-    grunt.registerTask('gherkinlint', 'Run gherkinlint against the current directory', handler);
-
-    grunt.config.set('gherkinlint', {
-        options: {
-            files: getGherkinLintTargets(),
-        }
-    });
-
-    grunt.config.merge({
-        watch: {
-            gherkinlint: {
-                files: [grunt.moodleEnv.inComponent ? 'tests/behat/*.feature' : '**/tests/behat/*.feature'],
-                tasks: ['gherkinlint'],
-            },
-        },
-    });
-
-    // Add the 'gherkinlint' task as a startup task.
-    grunt.moodleEnv.startupTasks.push('gherkinlint');
-
-    return handler;
-};

.grunt/tasks/ignorefiles.js

@@ -1,61 +0,0 @@
-// 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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-module.exports = grunt => {
-    /**
-     * Generate ignore files (utilising thirdpartylibs.xml data)
-     */
-    const handler = function() {
-        const path = require('path');
-        const ComponentList = require(path.join(process.cwd(), '.grunt', 'components.js'));
-
-        // An array of paths to third party directories.
-        const thirdPartyPaths = ComponentList.getThirdPartyPaths();
-
-        // Generate .eslintignore.
-        const eslintIgnores = [
-            '# Generated by "grunt ignorefiles"',
-            // Do not ignore the .grunt directory.
-            '!/.grunt',
-
-            // Ignore all yui/src meta directories and build directories.
-            '*/**/yui/src/*/meta/',
-            '*/**/build/',
-        ].concat(thirdPartyPaths);
-        grunt.file.write('.eslintignore', eslintIgnores.join('\n') + '\n');
-
-        // Generate .stylelintignore.
-        const stylelintIgnores = [
-            '# Generated by "grunt ignorefiles"',
-            '**/yui/build/*',
-            'theme/boost/style/moodle.css',
-            'theme/classic/style/moodle.css',
-            'jsdoc/styles/*.css',
-            'admin/tool/componentlibrary/hugo/dist/css/docs.css',
-        ].concat(thirdPartyPaths);
-        grunt.file.write('.stylelintignore', stylelintIgnores.join('\n') + '\n');
-    };
-
-    grunt.registerTask('ignorefiles', 'Generate ignore files for linters', handler);
-
-    return handler;
-};

.grunt/tasks/javascript.js

@@ -1,225 +0,0 @@
-// 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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-/**
- * Function to generate the destination for the uglify task
- * (e.g. build/file.min.js). This function will be passed to
- * the rename property of files array when building dynamically:
- * http://gruntjs.com/configuring-tasks#building-the-files-object-dynamically
- *
- * @param {String} destPath the current destination
- * @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');
-    return destPath;
-};
-
-module.exports = grunt => {
-    // Load the Ignorefiles tasks.
-    require('./ignorefiles')(grunt);
-
-    // Load the Shifter tasks.
-    require('./shifter')(grunt);
-
-    // Load ESLint.
-    require('./eslint')(grunt);
-
-    // Load JSDoc.
-    require('./jsdoc')(grunt);
-
-    const path = require('path');
-
-    // Register JS tasks.
-    grunt.registerTask('yui', ['eslint:yui', 'shifter']);
-    grunt.registerTask('amd', ['ignorefiles', 'eslint:amd', 'rollup']);
-    grunt.registerTask('js', ['amd', 'yui']);
-
-    // Register NPM tasks.
-    grunt.loadNpmTasks('grunt-contrib-uglify');
-    grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-rollup');
-
-    const babelTransform = require('@babel/core').transform;
-    const babel = (options = {}) => {
-        return {
-            name: 'babel',
-
-            transform: (code, id) => {
-                grunt.log.debug(`Transforming ${id}`);
-                options.filename = id;
-                const transformed = babelTransform(code, options);
-
-                return {
-                    code: transformed.code,
-                    map: transformed.map
-                };
-            }
-        };
-    };
-
-    // Note: We have to use a rate limit plugin here because rollup runs all tasks asynchronously and in parallel.
-    // When we kick off a full run, if we kick off a rollup of every file this will fork-bomb the machine.
-    // To work around this we use a concurrent Promise queue based on the number of available processors.
-    const rateLimit = () => {
-        const queue = [];
-        let queueRunner;
-
-        const startQueue = () => {
-            if (queueRunner) {
-                return;
-            }
-
-            queueRunner = setTimeout(() => {
-                const limit = Math.max(1, require('os').cpus().length / 2);
-                grunt.log.debug(`Starting rollup with queue size of ${limit}`);
-                runQueue(limit);
-            }, 100);
-        };
-
-        // The queue runner will run the next `size` items in the queue.
-        const runQueue = (size = 1) => {
-            queue.splice(0, size).forEach(resolve => {
-                resolve();
-            });
-        };
-
-        return {
-            name: 'ratelimit',
-
-            // The options hook is run in parallel.
-            // We can return an unresolved Promise which is queued for later resolution.
-            options: async() => {
-                return new Promise(resolve => {
-                    queue.push(resolve);
-                    startQueue();
-                });
-            },
-
-            // When an item in the queue completes, start the next item in the queue.
-            buildEnd: () => {
-                runQueue();
-            },
-        };
-    };
-
-    const terser = require('rollup-plugin-terser').terser;
-    grunt.config.merge({
-        rollup: {
-            options: {
-                format: 'esm',
-                dir: 'output',
-                sourcemap: true,
-                treeshake: false,
-                context: 'window',
-                plugins: [
-                    rateLimit(),
-                    babel({
-                        sourceMaps: true,
-                        comments: false,
-                        compact: false,
-                        plugins: [
-                            'transform-es2015-modules-amd-lazy',
-                            'system-import-transformer',
-                            // This plugin modifies the Babel transpiling for "export default"
-                            // so that if it's used then only the exported value is returned
-                            // by the generated AMD module.
-                            //
-                            // It also adds the Moodle plugin name to the AMD module definition
-                            // so that it can be imported as expected in other modules.
-                            path.resolve('.grunt/babel-plugin-add-module-to-define.js'),
-                            '@babel/plugin-syntax-dynamic-import',
-                            '@babel/plugin-syntax-import-meta',
-                            ['@babel/plugin-proposal-class-properties', {'loose': false}],
-                            '@babel/plugin-proposal-json-strings'
-                        ],
-                        presets: [
-                            ['@babel/preset-env', {
-                                targets: {
-                                    browsers: [
-                                        ">0.3%",
-                                        "last 2 versions",
-                                        "not ie >= 0",
-                                        "not op_mini all",
-                                        "not Opera > 0",
-                                        "not dead"
-                                    ]
-                                },
-                                modules: false,
-                                useBuiltIns: false
-                            }]
-                        ]
-                    }),
-
-                    terser({
-                        // Do not mangle variables.
-                        // Makes debugging easier.
-                        mangle: false,
-                    }),
-                ],
-            },
-            dist: {
-                files: [{
-                    expand: true,
-                    src: grunt.moodleEnv.files ? grunt.moodleEnv.files : grunt.moodleEnv.amdSrc,
-                    rename: babelRename
-                }],
-            },
-        },
-    });
-
-    grunt.config.merge({
-        watch: {
-            amd: {
-                files: grunt.moodleEnv.inComponent
-                    ? ['amd/src/*.js', 'amd/src/**/*.js']
-                    : ['**/amd/src/**/*.js'],
-                tasks: ['amd']
-            },
-        },
-    });
-
-    // Add the 'js' task as a startup task.
-    grunt.moodleEnv.startupTasks.push('js');
-
-    // On watch, we dynamically modify config to build only affected files. This
-    // method is slightly complicated to deal with multiple changed files at once (copied
-    // from the grunt-contrib-watch readme).
-    let changedFiles = Object.create(null);
-    const onChange = grunt.util._.debounce(function() {
-        const files = Object.keys(changedFiles);
-        grunt.config('rollup.dist.files', [{expand: true, src: files, rename: babelRename}]);
-        changedFiles = Object.create(null);
-    }, 200);
-
-    grunt.event.on('watch', function(action, filepath) {
-        changedFiles[filepath] = action;
-        onChange();
-    });
-
-    return {
-        babelRename,
-    };
-};

.grunt/tasks/jsdoc.js

@@ -1,36 +0,0 @@
-// 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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-module.exports = grunt => {
-    // Project configuration.
-    grunt.config.merge({
-        jsdoc: {
-            dist: {
-                options: {
-                    configure: ".grunt/jsdoc/jsdoc.conf.js",
-                },
-            },
-        },
-    });
-
-    grunt.loadNpmTasks('grunt-jsdoc');
-};

.grunt/tasks/sass.js

@@ -1,40 +0,0 @@
-// 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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-module.exports = grunt => {
-    grunt.loadNpmTasks('grunt-sass');
-
-    grunt.config.merge({
-        sass: {
-            dist: {
-                files: {
-                    "theme/boost/style/moodle.css": "theme/boost/scss/preset/default.scss",
-                    "theme/classic/style/moodle.css": "theme/classic/scss/classicgrunt.scss"
-                }
-            },
-            options: {
-                implementation: require('node-sass'),
-                includePaths: ["theme/boost/scss/", "theme/classic/scss/"]
-            }
-        },
-    });
-};

.grunt/tasks/shifter.js

@@ -1,155 +0,0 @@
-// 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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-/* eslint-env node */
-
-module.exports = grunt => {
-    /**
-     * Shifter task. Is configured with a path to a specific file or a directory,
-     * in the case of a specific file it will work out the right module to be built.
-     *
-     * Note that this task runs the invidiaul shifter jobs async (becase it spawns
-     * so be careful to to call done().
-     */
-    const handler = function() {
-        const done = this.async();
-        const options = grunt.config('shifter.options');
-        const async = require('async');
-        const path = require('path');
-
-        // Run the shifter processes one at a time to avoid confusing output.
-        async.eachSeries(options.paths, function(src, filedone) {
-            var args = [];
-            args.push(path.normalize(process.cwd() + '/node_modules/shifter/bin/shifter'));
-
-            // Always ignore the node_modules directory.
-            args.push('--excludes', 'node_modules');
-
-            // Determine the most appropriate options to run with based upon the current location.
-            if (grunt.file.isMatch('**/yui/**/*.js', src)) {
-                // When passed a JS file, build our containing module (this happen with
-                // watch).
-                grunt.log.debug('Shifter passed a specific JS file');
-                src = path.dirname(path.dirname(src));
-                options.recursive = false;
-            } else if (grunt.file.isMatch('**/yui/src', src)) {
-                // When in a src directory --walk all modules.
-                grunt.log.debug('In a src directory');
-                args.push('--walk');
-                options.recursive = false;
-            } else if (grunt.file.isMatch('**/yui/src/*', src)) {
-                // When in module, only build our module.
-                grunt.log.debug('In a module directory');
-                options.recursive = false;
-            } else if (grunt.file.isMatch('**/yui/src/*/js', src)) {
-                // When in module src, only build our module.
-                grunt.log.debug('In a source directory');
-                src = path.dirname(src);
-                options.recursive = false;
-            }
-
-            if (grunt.option('watch')) {
-                grunt.fail.fatal('The --watch option has been removed, please use `grunt watch` instead');
-            }
-
-            // Add the stderr option if appropriate
-            if (grunt.option('verbose')) {
-                args.push('--lint-stderr');
-            }
-
-            if (grunt.option('no-color')) {
-                args.push('--color=false');
-            }
-
-            var execShifter = function() {
-
-                grunt.log.ok("Running shifter on " + src);
-                grunt.util.spawn({
-                    cmd: "node",
-                    args: args,
-                    opts: {cwd: src, stdio: 'inherit', env: process.env}
-                }, function(error, result, code) {
-                    if (code) {
-                        grunt.fail.fatal('Shifter failed with code: ' + code);
-                    } else {
-                        grunt.log.ok('Shifter build complete.');
-                        filedone();
-                    }
-                });
-            };
-
-            // Actually run shifter.
-            if (!options.recursive) {
-                execShifter();
-            } else {
-                // Check that there are yui modules otherwise shifter ends with exit code 1.
-                if (grunt.file.expand({cwd: src}, '**/yui/src/**/*.js').length > 0) {
-                    args.push('--recursive');
-                    execShifter();
-                } else {
-                    grunt.log.ok('No YUI modules to build.');
-                    filedone();
-                }
-            }
-        }, done);
-    };
-
-    // Register the shifter task.
-    grunt.registerTask('shifter', 'Run Shifter against the current directory', handler);
-
-    // Configure it.
-    grunt.config.set('shifter', {
-        options: {
-            recursive: true,
-            // Shifter takes a relative path.
-            paths: grunt.moodleEnv.files ? grunt.moodleEnv.files : [grunt.moodleEnv.runDir]
-        }
-    });
-
-    grunt.config.merge({
-        watch: {
-            yui: {
-                files: grunt.moodleEnv.inComponent
-                    ? ['yui/src/*.json', 'yui/src/**/*.js']
-                    : ['**/yui/src/**/*.js'],
-                tasks: ['yui']
-            },
-        },
-    });
-
-    // On watch, we dynamically modify config to build only affected files. This
-    // method is slightly complicated to deal with multiple changed files at once (copied
-    // from the grunt-contrib-watch readme).
-    let changedFiles = Object.create(null);
-    const onChange = grunt.util._.debounce(function() {
-        const files = Object.keys(changedFiles);
-        grunt.config('shifter.options.paths', files);
-        changedFiles = Object.create(null);
-    }, 200);
-
-    grunt.event.on('watch', (action, filepath) => {
-        changedFiles[filepath] = action;
-        onChange();
-    });
-
-    return handler;
-};

.grunt/tasks/startup.js

@@ -1,46 +0,0 @@
-// 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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-module.exports = grunt => {
-    /**
-     * Generate ignore files (utilising thirdpartylibs.xml data)
-     */
-    const handler = function() {
-        const path = require('path');
-
-        // Are we in a YUI directory?
-        if (path.basename(path.resolve(grunt.moodleEnv.cwd, '../../')) == 'yui') {
-            grunt.task.run('yui');
-        // Are we in an AMD directory?
-        } else if (grunt.moodleEnv.inAMD) {
-            grunt.task.run('amd');
-        } else {
-            // Run all of the requested startup tasks.
-            grunt.moodleEnv.startupTasks.forEach(taskName => grunt.task.run(taskName));
-        }
-    };
-
-    // Register the startup task.
-    grunt.registerTask('startup', 'Run the correct tasks for the current directory', handler);
-
-    return handler;
-};

.grunt/tasks/style.js

@@ -1,35 +0,0 @@
-// 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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-module.exports = grunt => {
-    // Load the ignorefiles tasks.
-    require('./ignorefiles')(grunt);
-
-    // Load the Style Lint tasks.
-    require('./stylelint')(grunt);
-
-    // Load the SASS tasks.
-    require('./sass')(grunt);
-
-    // Add the 'css' task as a startup task.
-    grunt.moodleEnv.startupTasks.push('css');
-};

.grunt/tasks/stylelint.js

@@ -1,183 +0,0 @@
-// 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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2021 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-module.exports = grunt => {
-
-    const getCssConfigForFiles = files => {
-        return {
-            stylelint: {
-                css: {
-                    // Use a fully-qualified path.
-                    src: files,
-                    options: {
-                        configOverrides: {
-                            rules: {
-                                // These rules have to be disabled in .stylelintrc for scss compat.
-                                "at-rule-no-unknown": true,
-                            }
-                        }
-                    }
-                },
-            },
-        };
-    };
-
-    const getScssConfigForFiles = files => {
-        return {
-            stylelint: {
-                scss: {
-                    options: {syntax: 'scss'},
-                    src: files,
-                },
-            },
-        };
-    };
-
-    /**
-     * Register any stylelint tasks.
-     *
-     * @param {Object} grunt
-     * @param {Array} files
-     * @param {String} fullRunDir
-     */
-    const registerStyleLintTasks = () => {
-        const glob = require('glob');
-
-        // The stylelinters do not handle the case where a configuration was provided but no files were included.
-        // Keep track of whether any files were found.
-        let hasCss = false;
-        let hasScss = false;
-
-        // The stylelint processors do not take a path argument. They always check all provided values.
-        // As a result we must check through each glob and determine if any files match the current directory.
-        const scssFiles = [];
-        const cssFiles = [];
-
-        const requestedFiles = grunt.moodleEnv.files;
-        if (requestedFiles) {
-            // Grunt was called with a files argument.
-            // Check whether each of the requested files matches either the CSS or SCSS source file list.
-
-            requestedFiles.forEach(changedFilePath => {
-                let matchesGlob;
-
-                // Check whether this watched path matches any watched SCSS file.
-                matchesGlob = grunt.moodleEnv.scssSrc.some(watchedPathGlob => {
-                    return glob.sync(watchedPathGlob).indexOf(changedFilePath) !== -1;
-                });
-                if (matchesGlob) {
-                    scssFiles.push(changedFilePath);
-                    hasScss = true;
-                }
-
-                // Check whether this watched path matches any watched CSS file.
-                matchesGlob = grunt.moodleEnv.cssSrc.some(watchedPathGlob => {
-                    return glob.sync(watchedPathGlob).indexOf(changedFilePath) !== -1;
-                });
-                if (matchesGlob) {
-                    cssFiles.push(changedFilePath);
-                    hasCss = true;
-                }
-            });
-        } else {
-            // Grunt was called without a list of files.
-            // The start directory (runDir) may be a child dir of the project.
-            // Check each scssSrc file to see if it's in the start directory.
-            // This means that we can lint just mod/*/styles.css if started in the mod directory.
-
-            grunt.moodleEnv.scssSrc.forEach(path => {
-                if (path.startsWith(grunt.moodleEnv.runDir)) {
-                    scssFiles.push(path);
-                    hasScss = true;
-                }
-            });
-
-            grunt.moodleEnv.cssSrc.forEach(path => {
-                if (path.startsWith(grunt.moodleEnv.runDir)) {
-                    cssFiles.push(path);
-                    hasCss = true;
-                }
-            });
-        }
-
-        // Register the tasks.
-        const scssTasks = ['sass'];
-        if (hasScss) {
-            grunt.config.merge(getScssConfigForFiles(scssFiles));
-            scssTasks.unshift('stylelint:scss');
-        }
-        scssTasks.unshift('ignorefiles');
-
-        const cssTasks = ['ignorefiles'];
-        if (hasCss) {
-            grunt.config.merge(getCssConfigForFiles(cssFiles));
-            cssTasks.push('stylelint:css');
-        }
-
-        // The tasks must be registered, even if empty to ensure a consistent command list.
-        // They jsut won't run anything.
-        grunt.registerTask('scss', scssTasks);
-        grunt.registerTask('rawcss', cssTasks);
-    };
-
-    // Register CSS tasks.
-    grunt.loadNpmTasks('grunt-stylelint');
-
-    // Register the style lint tasks.
-    registerStyleLintTasks();
-    grunt.registerTask('css', ['scss', 'rawcss']);
-
-    const getCoreThemeMatches = () => {
-        const scssMatch = 'scss/**/*.scss';
-
-        if (grunt.moodleEnv.inTheme) {
-            return [scssMatch];
-        }
-
-        if (grunt.moodleEnv.runDir.startsWith('theme')) {
-            return [`*/${scssMatch}`];
-        }
-
-        return [`theme/*/${scssMatch}`];
-    };
-
-    // Add the watch configuration for rawcss, and scss.
-    grunt.config.merge({
-        watch: {
-            rawcss: {
-                files: [
-                    '**/*.css',
-                ],
-                excludes: [
-                    '**/moodle.css',
-                    '**/editor.css',
-                    'jsdoc/styles/*.css',
-                ],
-                tasks: ['rawcss']
-            },
-            scss: {
-                files: getCoreThemeMatches(),
-                tasks: ['scss']
-            },
-        },
-    });
-};

.grunt/tasks/watch.js

@@ -1,272 +0,0 @@
-/**
- * This is a wrapper task to handle the grunt watch command. It attempts to use
- * Watchman to monitor for file changes, if it's installed, because it's much faster.
- *
- * If Watchman isn't installed then it falls back to the grunt-contrib-watch file
- * watcher for backwards compatibility.
- */
-
-/* eslint-env node */
-
-module.exports = grunt => {
-    /**
-     * This is a wrapper task to handle the grunt watch command. It attempts to use
-     * Watchman to monitor for file changes, if it's installed, because it's much faster.
-     *
-     * If Watchman isn't installed then it falls back to the grunt-contrib-watch file
-     * watcher for backwards compatibility.
-     */
-    const watchHandler = function() {
-        const async = require('async');
-        const watchTaskDone = this.async();
-        let watchInitialised = false;
-        let watchTaskQueue = {};
-        let processingQueue = false;
-
-        const watchman = require('fb-watchman');
-        const watchmanClient = new watchman.Client();
-
-        // Grab the tasks and files that have been queued up and execute them.
-        var processWatchTaskQueue = function() {
-            if (!Object.keys(watchTaskQueue).length || processingQueue) {
-                // If there is nothing in the queue or we're already processing then wait.
-                return;
-            }
-
-            processingQueue = true;
-
-            // Grab all tasks currently in the queue.
-            var queueToProcess = watchTaskQueue;
-            // Reset the queue.
-            watchTaskQueue = {};
-
-            async.forEachSeries(
-                Object.keys(queueToProcess),
-                function(task, next) {
-                    var files = queueToProcess[task];
-                    var filesOption = '--files=' + files.join(',');
-                    grunt.log.ok('Running task ' + task + ' for files ' + filesOption);
-
-                    // Spawn the task in a child process so that it doesn't kill this one
-                    // if it failed.
-                    grunt.util.spawn(
-                        {
-                            // Spawn with the grunt bin.
-                            grunt: true,
-                            // Run from current working dir and inherit stdio from process.
-                            opts: {
-                                cwd: grunt.moodleEnv.fullRunDir,
-                                stdio: 'inherit'
-                            },
-                            args: [task, filesOption]
-                        },
-                        function(err, res, code) {
-                            if (code !== 0) {
-                                // The grunt task failed.
-                                grunt.log.error(err);
-                            }
-
-                            // Move on to the next task.
-                            next();
-                        }
-                    );
-                },
-                function() {
-                    // No longer processing.
-                    processingQueue = false;
-                    // Once all of the tasks are done then recurse just in case more tasks
-                    // were queued while we were processing.
-                    processWatchTaskQueue();
-                }
-            );
-        };
-
-        const originalWatchConfig = grunt.config.get(['watch']);
-        const watchConfig = Object.keys(originalWatchConfig).reduce(function(carry, key) {
-            if (key == 'options') {
-                return carry;
-            }
-
-            const value = originalWatchConfig[key];
-
-            const taskNames = value.tasks;
-            const files = value.files;
-            let excludes = [];
-            if (value.excludes) {
-                excludes = value.excludes;
-            }
-
-            taskNames.forEach(function(taskName) {
-                carry[taskName] = {
-                    files,
-                    excludes,
-                };
-            });
-
-            return carry;
-        }, {});
-
-        watchmanClient.on('error', function(error) {
-            // We have to add an error handler here and parse the error string because the
-            // example way from the docs to check if Watchman is installed doesn't actually work!!
-            // See: https://github.com/facebook/watchman/issues/509
-            if (error.message.match('Watchman was not found')) {
-                // If watchman isn't installed then we should fallback to the other watch task.
-                grunt.log.ok('It is recommended that you install Watchman for better performance using the "watch" command.');
-
-                // Fallback to the old grunt-contrib-watch task.
-                grunt.renameTask('watch-grunt', 'watch');
-                grunt.task.run(['watch']);
-                // This task is finished.
-                watchTaskDone(0);
-            } else {
-                grunt.log.error(error);
-                // Fatal error.
-                watchTaskDone(1);
-            }
-        });
-
-        watchmanClient.on('subscription', function(resp) {
-            if (resp.subscription !== 'grunt-watch') {
-                return;
-            }
-
-            resp.files.forEach(function(file) {
-                grunt.log.ok('File changed: ' + file.name);
-
-                var fullPath = grunt.moodleEnv.fullRunDir + '/' + file.name;
-                Object.keys(watchConfig).forEach(function(task) {
-
-                    const fileGlobs = watchConfig[task].files;
-                    var match = fileGlobs.some(function(fileGlob) {
-                        return grunt.file.isMatch(`**/${fileGlob}`, fullPath);
-                    });
-
-                    if (match) {
-                        // If we are watching a subdirectory then the file.name will be relative
-                        // to that directory. However the grunt tasks  expect the file paths to be
-                        // relative to the Gruntfile.js location so let's normalise them before
-                        // adding them to the queue.
-                        var relativePath = fullPath.replace(grunt.moodleEnv.gruntFilePath + '/', '');
-                        if (task in watchTaskQueue) {
-                            if (!watchTaskQueue[task].includes(relativePath)) {
-                                watchTaskQueue[task] = watchTaskQueue[task].concat(relativePath);
-                            }
-                        } else {
-                            watchTaskQueue[task] = [relativePath];
-                        }
-                    }
-                });
-            });
-
-            processWatchTaskQueue();
-        });
-
-        process.on('SIGINT', function() {
-            // Let the user know that they may need to manually stop the Watchman daemon if they
-            // no longer want it running.
-            if (watchInitialised) {
-                grunt.log.ok('The Watchman daemon may still be running and may need to be stopped manually.');
-            }
-
-            process.exit();
-        });
-
-        // Initiate the watch on the current directory.
-        watchmanClient.command(['watch-project', grunt.moodleEnv.fullRunDir], function(watchError, watchResponse) {
-            if (watchError) {
-                grunt.log.error('Error initiating watch:', watchError);
-                watchTaskDone(1);
-                return;
-            }
-
-            if ('warning' in watchResponse) {
-                grunt.log.error('warning: ', watchResponse.warning);
-            }
-
-            var watch = watchResponse.watch;
-            var relativePath = watchResponse.relative_path;
-            watchInitialised = true;
-
-            watchmanClient.command(['clock', watch], function(clockError, clockResponse) {
-                if (clockError) {
-                    grunt.log.error('Failed to query clock:', clockError);
-                    watchTaskDone(1);
-                    return;
-                }
-
-                // Generate the expression query used by watchman.
-                // Documentation is limited, but see https://facebook.github.io/watchman/docs/expr/allof.html for examples.
-                // We generate an expression to match any value in the files list of all of our tasks, but excluding
-                // all value in the  excludes list of that task.
-                //
-                // [anyof, [
-                //      [allof, [
-                //          [anyof, [
-                //              ['match', validPath, 'wholename'],
-                //              ['match', validPath, 'wholename'],
-                //          ],
-                //          [not,
-                //              [anyof, [
-                //                  ['match', invalidPath, 'wholename'],
-                //                  ['match', invalidPath, 'wholename'],
-                //              ],
-                //          ],
-                //      ],
-                var matchWholeName = fileGlob => ['match', fileGlob, 'wholename'];
-                var matches = Object.keys(watchConfig).map(function(task) {
-                    const matchAll = [];
-                    matchAll.push(['anyof'].concat(watchConfig[task].files.map(matchWholeName)));
-
-                    if (watchConfig[task].excludes.length) {
-                        matchAll.push(['not', ['anyof'].concat(watchConfig[task].excludes.map(matchWholeName))]);
-                    }
-
-                    return ['allof'].concat(matchAll);
-                });
-
-                matches = ['anyof'].concat(matches);
-
-                var sub = {
-                    expression: matches,
-                    // Which fields we're interested in.
-                    fields: ["name", "size", "type"],
-                    // Add our time constraint.
-                    since: clockResponse.clock
-                };
-
-                if (relativePath) {
-                    /* eslint-disable camelcase */
-                    sub.relative_root = relativePath;
-                }
-
-                watchmanClient.command(['subscribe', watch, 'grunt-watch', sub], function(subscribeError) {
-                    if (subscribeError) {
-                        // Probably an error in the subscription criteria.
-                        grunt.log.error('failed to subscribe: ', subscribeError);
-                        watchTaskDone(1);
-                        return;
-                    }
-
-                    grunt.log.ok('Listening for changes to files in ' + grunt.moodleEnv.fullRunDir);
-                });
-            });
-        });
-    };
-
-    // Rename the grunt-contrib-watch "watch" task because we're going to wrap it.
-    grunt.renameTask('watch', 'watch-grunt');
-
-    // Register the new watch handler.
-    grunt.registerTask('watch', 'Run tasks on file changes', watchHandler);
-
-    grunt.config.merge({
-        watch: {
-            options: {
-                nospawn: true // We need not to spawn so config can be changed dynamically.
-            },
-        },
-    });
-
-    return watchHandler;
-};

.jshintignore

@@ -1,2 +0,0 @@
-**/amd/**
-/*.js

.jshintrc

@@ -1,58 +1,48 @@
-// NOTE: We use eslint now. This file is used only by shifter. We keep the configuration
-// here because shifter uses jshint after modules have been concating. Eslint can't
-// currently do this.
 {
-    "asi":          false,
-    "bitwise":      true,
-    "boss":         false,
     "browser":      true,
+    "yui":          true,
+    "bitwise":      true,
     "curly":        true,
+    "eqeqeq":       true,
+    "forin":        false,
+    "immed":        true,
+    "newcap":       true,
+    "noarg":        true,
+    "noempty":      true,
+    "nomen":        false,
+    "onevar":       false,
+    "plusplus":     false,
+    "regexp":       false,
+    "strict":       false,
+    "trailing":     true,
+    "unused":       true,
+    "white":        false,
+    "asi":          false,
+    "boss":         false,
     "debug":        false,
-    "eqeqeq":       false,
     "eqnull":       false,
     "es5":          false,
     "esnext":       false,
     "evil":         false,
     "expr":         false,
-    "forin":        false,
     "funcscope":    false,
     "globalstrict": false,
-    "immed":        true,
-    "indent":       4,
     "iterator":     false,
     "lastsemic":    false,
-    "latedef":      true,
     "laxbreak":     true,
     "laxcomma":     false,
     "loopfunc":     false,
-    "maxerr":       500,
-    "maxlen":       132,
     "multistr":     false,
-    "newcap":       true,
-    "noarg":        true,
-    "noempty":      true,
-    "nomen":        false,
     "onecase":      false,
-    "onevar":       false,
-    "passfail":     false,
-    "plusplus":     false,
-    "predef": [
-        "M",
-        "define",
-        "require"
-    ],
     "proto":        false,
     "regexdash":    false,
-    "regexp":       false,
     "scripturl":    false,
     "shadow":       false,
     "smarttabs":    false,
-    "strict":       false,
     "sub":          false,
     "supernew":     false,
-    "trailing":     true,
-    "undef":        true,
-    "unused":       true,
-    "white":        false,
-    "yui":          true
+    "maxerr":       500,
+    "maxlen":       150,
+    "passfail":     false,
+    "latedef":      true
 }

.nvmrc

@@ -1 +0,0 @@
-lts/gallium

.shifter.json

@@ -1,5 +1,4 @@
 {
     "coverage": false,
-    "lint": "config",
-    "clean": true
+    "lint": "config"
 }

.stylelintrc

@@ -1,95 +0,0 @@
-{
-    "plugins": [
-        "stylelint-csstree-validator"
-    ],
-    "rules": {
-        "csstree/validator": true,
-        "at-rule-empty-line-before": [ "always",
-          {"except": [ "blockless-after-blockless"], ignore: ["after-comment", "inside-block"]}
-        ],
-        "at-rule-name-case": "lower",
-        "at-rule-name-space-after": "always-single-line",
-        "at-rule-no-unknown": null, # Enabled for non-scss in grunt.
-        "at-rule-semicolon-newline-after": "always",
-        "at-rule-semicolon-space-before": "never",
-        "block-closing-brace-newline-after": "always",
-        "block-closing-brace-newline-before": "always",
-        "block-closing-brace-space-before": "always-single-line",
-        "block-no-empty": true,
-        "block-opening-brace-newline-after": "always",
-        "block-opening-brace-space-after": "always-single-line",
-        "block-opening-brace-space-before": "always",
-        "color-hex-case": ["lower", { "severity": "warning" }],
-        "color-hex-length": ["short", { "severity": "warning" }],
-        "color-no-invalid-hex": true,
-        "declaration-bang-space-after": "never",
-        "declaration-bang-space-before": "always",
-        "declaration-block-no-duplicate-properties": true,
-        "declaration-block-no-shorthand-property-overrides": true,
-        "declaration-block-semicolon-newline-after": "always-multi-line",
-        "declaration-block-semicolon-space-after": "always-single-line",
-        "declaration-block-semicolon-space-before": "never",
-        "declaration-block-single-line-max-declarations": 1,
-        "declaration-block-trailing-semicolon": "always",
-        "declaration-colon-newline-after": "always-multi-line",
-        "declaration-colon-space-after": "always-single-line",
-        "declaration-colon-space-before": "never",
-        "declaration-no-important": true,
-        "font-family-no-duplicate-names": true,
-        "function-calc-no-unspaced-operator": true,
-        "function-comma-newline-after": "always-multi-line",
-        "function-comma-space-after": "always-single-line",
-        "function-comma-space-before": "never",
-        "function-linear-gradient-no-nonstandard-direction": true,
-        "function-max-empty-lines": 0,
-        "function-name-case": "lower",
-        "function-parentheses-newline-inside": "always-multi-line",
-        "function-parentheses-space-inside": "never-single-line",
-        "function-url-scheme-blacklist": ["data"],
-        "function-whitespace-after": "always",
-        "indentation": 4,
-        "keyframe-declaration-no-important": true,
-        "length-zero-no-unit": [true, { "severity": "warning" }],
-        "max-empty-lines": 2,
-        "max-line-length": [132, { "severity": "warning" }],
-        "media-feature-colon-space-after": "always",
-        "media-feature-colon-space-before": "never",
-        "media-feature-parentheses-space-inside": "never",
-        "media-feature-range-operator-space-after": "always",
-        "media-feature-range-operator-space-before": "always",
-        "media-query-list-comma-newline-after": "always-multi-line",
-        "media-query-list-comma-space-after": "always-single-line",
-        "media-query-list-comma-space-before": "never",
-        "no-empty-source": true,
-        "no-eol-whitespace": true,
-        "no-extra-semicolons": [true, { "severity": "warning" }],
-        "no-invalid-double-slash-comments": true,
-        "no-unknown-animations": true,
-        "property-case": "lower",
-        "property-no-unknown": true,
-        "selector-attribute-brackets-space-inside": "never",
-        "selector-attribute-operator-space-after": "never",
-        "selector-attribute-operator-space-before": "never",
-        "selector-combinator-space-after": "always",
-        "selector-combinator-space-before": "always",
-        "selector-list-comma-newline-after": "always",
-        "selector-list-comma-space-before": "never",
-        "selector-max-empty-lines": 0,
-        "selector-pseudo-class-case": "lower",
-        "selector-pseudo-class-no-unknown": true,
-        "selector-pseudo-class-parentheses-space-inside": "never",
-        "selector-pseudo-element-case": "lower",
-        "selector-pseudo-element-no-unknown": true,
-        "selector-type-case": "lower",
-        "selector-type-no-unknown": true,
-        "string-no-newline": true,
-        "time-min-milliseconds": 100,
-        "unit-blacklist": ["pt"],
-        "unit-case": "lower",
-        "unit-no-unknown": true,
-        "value-keyword-case": ["lower", {"ignoreKeywords": ["/(@|$)/"]}],
-        "value-list-comma-newline-after": "always-multi-line",
-        "value-list-comma-space-after": "always-single-line",
-        "value-list-comma-space-before": "never",
-  }
-}

.travis.yml

@@ -1,266 +0,0 @@
-# PLEASE NOTE: Travis is not currently utilised by the Moodle core integration
-# process (which uses our internal CI system) this file is here for the benefit
-# of community developers git clones - see MDL-51458.
-
-notifications:
-  email:
-    if: env(MOODLE_EMAIL) != no
-
-language: php
-
-os: linux
-
-dist: bionic
-
-services:
-    - mysql
-    - docker
-
-addons:
-  postgresql: "10"
-
-branches:
-  except:
-    - master
-    - /MOODLE_[0-9]+_STABLE/
-    - /^v[0-9]+\.[0-9]+\.[0-9]+.*/
-
-jobs:
-    # Enable fast finish.
-    # This will fail the build if a single job fails (except those in allow_failures).
-    # It will not stop the jobs from running.
-    fast_finish: true
-
-    include:
-        # First all the lowest php ones (7.3)
-        - php: 7.3
-          env: DB=none     TASK=CITEST
-        - php: 7.3
-          env: DB=none     TASK=GRUNT    NVM_VERSION='lts/carbon'
-
-        - if: env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present
-          php: 7.3
-          env: DB=pgsql    TASK=PHPUNIT
-
-        - if: env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all"
-          php: 7.3
-          env: DB=mysqli   TASK=PHPUNIT
-
-        # Then, conditionally, all the highest php ones (8.0)
-        - if: env(MOODLE_PHP) = "all"
-          php: 8.0
-          env: DB=none     TASK=CITEST
-        - if: env(MOODLE_PHP) = "all"
-          php: 8.0
-          env: DB=none     TASK=GRUNT    NVM_VERSION='lts/carbon'
-
-        - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present)
-          php: 8.0
-          env: DB=pgsql    TASK=PHPUNIT
-
-        - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all")
-          php: 8.0
-          env: DB=mysqli   TASK=PHPUNIT
-
-cache:
-    directories:
-      - $HOME/.composer/cache
-      - $HOME/.npm
-
-before_install:
-    - docker run -d -p 127.0.0.1:8080:80 --name exttests moodlehq/moodle-exttests
-    # Avoid IPv6 default binding as service (causes redis not to start).
-    - sudo service redis-server start --bind 127.0.0.1
-
-install:
-    - >
-        if [ "$DB" = 'mysqli' ];
-        then
-            sudo mkdir /mnt/ramdisk
-            sudo mount -t tmpfs -o size=1024m tmpfs /mnt/ramdisk
-            sudo service mysql stop
-            sudo mv /var/lib/mysql /mnt/ramdisk
-            sudo ln -s /mnt/ramdisk/mysql /var/lib/mysql
-            sudo service mysql restart
-        fi
-    - >
-        if [ "$DB" = 'pgsql' ];
-        then
-            sudo mkdir /mnt/ramdisk
-            sudo mount -t tmpfs -o size=1024m tmpfs /mnt/ramdisk
-            sudo service postgresql stop
-            sudo mv /var/lib/postgresql /mnt/ramdisk
-            sudo ln -s /mnt/ramdisk/postgresql /var/lib/postgresql
-            sudo service postgresql start 9.6
-        fi
-    - >
-        if [ "$TASK" = 'PHPUNIT' ];
-        then
-            if [ -n "$GITHUB_APITOKEN" ]; then
-                composer config github-oauth.github.com $GITHUB_APITOKEN;
-                echo 'auth.json' >> .git/info/exclude
-            fi
-
-            echo 'extension="redis.so"' > /tmp/redis.ini
-            phpenv config-add /tmp/redis.ini
-
-            # Install composer dependencies.
-            # We need --no-interaction in case we hit API limits for composer. This causes it to fall back to a standard clone.
-            # Typically it should be able to use the Composer cache if any other job has already completed before we started here.
-            travis_retry composer install --prefer-dist --no-interaction;
-        fi
-
-    - >
-        if [ "$TASK" = 'GRUNT' ];
-        then
-            nvm install $NVM_VERSION ;
-            nvm use $NVM_VERSION ;
-        fi
-
-before_script:
-    - if [[ ${TRAVIS_PHP_VERSION:0:1} -gt 7 ]]; then pecl install xmlrpc-beta; fi
-    - echo 'max_input_vars=5000' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-    - phpenv config-rm xdebug.ini
-    - >
-      if [ "$TASK" = 'PHPUNIT' ];
-      then
-        # Copy generic configuration in place.
-        cp config-dist.php config.php ;
-
-        # Create the moodledata directory.
-        mkdir -p "$HOME"/roots/base
-
-        # The database name and password.
-        sed -i \
-          -e "s%= 'moodle'%= 'travis_ci_test'%" \
-          -e "s%= 'password'%= ''%" \
-          config.php ;
-
-        # The wwwroot and dataroot.
-        sed -i \
-          -e "s%http://example.com/moodle%https://localhost%" \
-          -e "s%/home/example/moodledata%/home/travis/roots/base%" \
-          config.php ;
-
-        if [ "$DB" = 'pgsql' ];
-        then
-          # Postgres-specific setup.
-          sed -i \
-            -e "s%= 'username'%= 'postgres'%" \
-            config.php ;
-
-          psql -c 'CREATE DATABASE travis_ci_test;' -U postgres;
-        fi
-
-        if [ "$DB" = 'mysqli' ];
-        then
-          # MySQL-specific setup.
-          sed -i \
-            -e "s%= 'pgsql'%= 'mysqli'%" \
-            -e "s%= 'username'%= 'travis'%" \
-            -e "s%=> 'utf8mb4_unicode_ci'%=> 'utf8mb4_bin'%" \
-            config.php;
-
-          mysql -u root -e 'SET GLOBAL innodb_file_format=barracuda;' ;
-          mysql -u root -e 'SET GLOBAL innodb_file_per_table=ON;' ;
-          mysql -u root -e 'SET GLOBAL innodb_large_prefix=ON;' ;
-          mysql -e 'CREATE DATABASE travis_ci_test DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_bin;' ;
-        fi
-      fi
-
-    - >
-      if [ "$TASK" = 'PHPUNIT' ];
-      then
-        # Create a directory for the phpunit dataroot.
-        mkdir -p "$HOME"/roots/phpunit
-
-        # The phpunit dataroot and prefix..
-        sed -i \
-          -e "/require_once/i \\\$CFG->phpunit_dataroot = '\/home\/travis\/roots\/phpunit';" \
-          -e "/require_once/i \\\$CFG->phpunit_prefix = 'p_';" \
-          config.php ;
-        # Enable test external resources
-        sed -i \
-          -e "/require_once/i \\define('TEST_EXTERNAL_FILES_HTTP_URL', 'http://127.0.0.1:8080');" \
-          -e "/require_once/i \\define('TEST_EXTERNAL_FILES_HTTPS_URL', 'http://127.0.0.1:8080');" \
-          config.php ;
-
-        # Redis cache store tests
-        sed -i \
-          -e "/require_once/i \\define('TEST_CACHESTORE_REDIS_TESTSERVERS', '127.0.0.1');" \
-          config.php ;
-        # Redis session tests
-        sed -i \
-          -e "/require_once/i \\define('TEST_SESSION_REDIS_HOST', '127.0.0.1');" \
-          config.php ;
-
-        # Initialise PHPUnit for Moodle.
-        php admin/tool/phpunit/cli/init.php
-      fi
-
-    - >
-      if [ "$TASK" = 'GRUNT' ];
-      then
-        npm install --no-spin;
-        npm install --no-spin -g grunt ;
-      fi
-
-    ########################################################################
-    # CI Tests
-    ########################################################################
-    - >
-      if [ "$TASK" = 'CITEST' ];
-      then
-        # Note - this is deliberately placed in the script section as we
-        # should not add any code until after phpunit has run.
-
-        # The following repositories are required.
-        # The local_ci repository does the actual checking.
-        git clone https://github.com/moodlehq/moodle-local_ci.git local/ci
-
-        # We need the official upstream for comparison
-        git remote add upstream https://github.com/moodle/moodle.git;
-
-        git fetch upstream MOODLE_400_STABLE;
-        export GIT_PREVIOUS_COMMIT="`git merge-base FETCH_HEAD $TRAVIS_COMMIT`";
-        export GIT_COMMIT="$TRAVIS_COMMIT";
-        export UPSTREAM_FETCH_HEAD=`git rev-parse FETCH_HEAD`
-
-        # Variables required by our linter.
-        export gitcmd=`which git`;
-        export gitdir="$TRAVIS_BUILD_DIR";
-        export phpcmd=`which php`;
-      fi
-
-script:
-    - >
-      if [ "$TASK" = 'PHPUNIT' ];
-      then
-        vendor/bin/phpunit --fail-on-risky --disallow-test-output --verbose;
-      fi
-
-    - >
-      if [ "$TASK" = 'CITEST' ];
-      then
-        bash local/ci/php_lint/php_lint.sh;
-      fi
-
-    - >
-      if [ "$TASK" = 'GRUNT' ];
-      then
-        grunt ;
-        # Add all files to the git index and then run diff --cached to see all changes.
-        # This ensures that we get the status of all files, including new files.
-        # We ignore npm-shrinkwrap.json to make the tasks immune to npm changes.
-        git add . ;
-        git reset -- npm-shrinkwrap.json ;
-        git diff --cached --exit-code ;
-      fi
-
-after_script:
-    - >
-      if [ "$TASK" = 'PHPUNIT' ];
-      then
-        EXTTESTS_HITS=$(docker logs exttests 2>&1 | grep -Fv -e 'AH00558' -e '[pid 1]' | wc -l)
-        echo -e "\nTest local resources number of hits: ${EXTTESTS_HITS}.\n"
-      fi

CONTRIBUTING.txt

@@ -1,56 +0,0 @@
-CONTRIBUTING TO MOODLE
-======================
-
-Moodle is made by people like you. We are members of a big worldwide community
-of developers, designers, teachers, testers, translators and other users. We
-work in universities, schools, companies and other places. You are very welcome
-to join us and contribute to the project.
-
-See <https://docs.moodle.org/dev/Contributing_to_Moodle> for the many ways you
-can help, not only with coding.
-
-Moodle is open to community contributions to core, though all code must go
-through peer-review, automated behaviour testing, continuous integration and
-human post-integration checks.
-
-Pull requests
--------------
-
-Please do not open pull requests via Github. The repository there is just a
-mirror of the official repository at <https://git.moodle.org>. Issues are
-reported and patches provided via <https://tracker.moodle.org>. See below for
-more information.
-
-Moodle core bug fixes and new features
---------------------------------------
-
-During the years of intensive development, a mature process of including
-submitted patches has evolved.
-
-* Every bug fix or new feature must have a tracker issue.
-* You publish the branch implementing the fix or new feature in your public
-  clone of the moodle.git repository (typically on Github).
-* Your patch is peer-reviewed, discussed, integrated, tested and then released
-  as a part of moodle.git.
-* New features are developed on the master branch. Bug fixes are also
-  backported to currently supported maintenance (stable) branches.
-
-For further details, see <https://docs.moodle.org/dev/Process>.
-
-Moodle plugins
---------------
-
-Moodle has a framework for additional plugins to extend its functionality. We
-have a Moodle plugins directory <https://moodle.org/plugins/> where you can
-register and maintain your plugin. Plugins hosted in the plugins directory can
-be easily installed and updated via the Moodle administration interface.
-
-* You are expected to have a public source code repository with your plugin
-  code.
-* After registering your plugin in the plugins directory it is reviewed before
-  being published.
-* You are expected to continuously release updated versions of the plugin via
-  the plugins directory. We do not pull from your code repository; you must do
-  it explicitly.
-
-For further details, see <https://docs.moodle.org/dev/Plugin_contribution>.

Gruntfile.js

@@ -1,265 +0,0 @@
-// 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/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * Grunt configuration for Moodle.
- *
- * @copyright  2014 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-/**
- * Setup the Grunt Moodle environment.
- *
- * @param   {Grunt} grunt
- * @returns {Object}
- */
-const setupMoodleEnvironment = grunt => {
-    const fs = require('fs');
-    const path = require('path');
-    const ComponentList = require(path.join(process.cwd(), '.grunt', 'components.js'));
-
-    const getAmdConfiguration = () => {
-        // If the cwd is the amd directory in the current component then it will be empty.
-        // If the cwd is a child of the component's AMD directory, the relative directory will not start with ..
-        let inAMD = !path.relative(`${componentDirectory}/amd`, cwd).startsWith('..');
-
-        // Globbing pattern for matching all AMD JS source files.
-        let amdSrc = [];
-        if (inComponent) {
-            amdSrc.push(
-                componentDirectory + "/amd/src/*.js",
-                componentDirectory + "/amd/src/**/*.js"
-            );
-        } else {
-            amdSrc = ComponentList.getAmdSrcGlobList();
-        }
-
-        return {
-            inAMD,
-            amdSrc,
-        };
-    };
-
-    const getYuiConfiguration = () => {
-        let yuiSrc = [];
-        if (inComponent) {
-            yuiSrc.push(componentDirectory + "/yui/src/**/*.js");
-        } else {
-            yuiSrc = ComponentList.getYuiSrcGlobList(gruntFilePath + '/');
-        }
-
-        return {
-            yuiSrc,
-        };
-    };
-
-    const getStyleConfiguration = () => {
-        const ComponentList = require(path.join(process.cwd(), '.grunt', 'components.js'));
-        // Build the cssSrc and scssSrc.
-        // Valid paths are:
-        // [component]/styles.css; and either
-        // [theme/[themename]]/scss/**/*.scss; or
-        // [theme/[themename]]/style/*.css.
-        //
-        // If a theme has scss, then it is assumed that the style directory contains generated content.
-        let cssSrc = [];
-        let scssSrc = [];
-
-        const checkComponentDirectory = componentDirectory => {
-            const isTheme = componentDirectory.startsWith('theme/');
-            if (isTheme) {
-                const scssDirectory = `${componentDirectory}/scss`;
-
-                if (fs.existsSync(scssDirectory)) {
-                    // This theme has an SCSS directory.
-                    // Include all scss files within it recursively, but do not check for css files.
-                    scssSrc.push(`${scssDirectory}/*.scss`);
-                    scssSrc.push(`${scssDirectory}/**/*.scss`);
-                } else {
-                    // This theme has no SCSS directory.
-                    // Only hte CSS files in the top-level directory are checked.
-                    cssSrc.push(`${componentDirectory}/style/*.css`);
-                }
-            } else {
-                // This is not a theme.
-                // All other plugin types are restricted to a single styles.css in their top level.
-                cssSrc.push(`${componentDirectory}/styles.css`);
-            }
-        };
-
-        if (inComponent) {
-            checkComponentDirectory(componentDirectory);
-        } else {
-            ComponentList.getComponentPaths(`${gruntFilePath}/`).forEach(componentPath => {
-                checkComponentDirectory(componentPath);
-            });
-        }
-
-        return {
-            cssSrc,
-            scssSrc,
-        };
-    };
-
-    /**
-     * Calculate the cwd, taking into consideration the `root` option (for Windows).
-     *
-     * @param {Object} grunt
-     * @returns {String} The current directory as best we can determine
-     */
-    const getCwd = grunt => {
-        let cwd = fs.realpathSync(process.env.PWD || process.cwd());
-
-        // Windows users can't run grunt in a subdirectory, so allow them to set
-        // the root by passing --root=path/to/dir.
-        if (grunt.option('root')) {
-            const root = grunt.option('root');
-            if (grunt.file.exists(__dirname, root)) {
-                cwd = fs.realpathSync(path.join(__dirname, root));
-                grunt.log.ok('Setting root to ' + cwd);
-            } else {
-                grunt.fail.fatal('Setting root to ' + root + ' failed - path does not exist');
-            }
-        }
-
-        return cwd;
-    };
-
-    // Detect directories:
-    // * gruntFilePath          The real path on disk to this Gruntfile.js
-    // * cwd                    The current working directory, which can be overridden by the `root` option
-    // * relativeCwd            The cwd, relative to the Gruntfile.js
-    // * componentDirectory     The root directory of the component if the cwd is in a valid component
-    // * inComponent            Whether the cwd is in a valid component
-    // * runDir                 The componentDirectory or cwd if not in a component, relative to Gruntfile.js
-    // * fullRunDir             The full path to the runDir
-    const gruntFilePath = fs.realpathSync(process.cwd());
-    const cwd = getCwd(grunt);
-    const relativeCwd = path.relative(gruntFilePath, cwd);
-    const componentDirectory = ComponentList.getOwningComponentDirectory(relativeCwd);
-    const inComponent = !!componentDirectory;
-    const inTheme = !!componentDirectory && componentDirectory.startsWith('theme/');
-    const runDir = inComponent ? componentDirectory : relativeCwd;
-    const fullRunDir = fs.realpathSync(gruntFilePath + path.sep + runDir);
-    const {inAMD, amdSrc} = getAmdConfiguration();
-    const {yuiSrc} = getYuiConfiguration();
-    const {cssSrc, scssSrc} = getStyleConfiguration();
-
-    let files = null;
-    if (grunt.option('files')) {
-        // Accept a comma separated list of files to process.
-        files = grunt.option('files').split(',');
-    }
-
-    grunt.log.debug('============================================================================');
-    grunt.log.debug(`= Node version:        ${process.versions.node}`);
-    grunt.log.debug(`= grunt version:       ${grunt.package.version}`);
-    grunt.log.debug(`= process.cwd:         '` + process.cwd() + `'`);
-    grunt.log.debug(`= process.env.PWD:     '${process.env.PWD}'`);
-    grunt.log.debug(`= path.sep             '${path.sep}'`);
-    grunt.log.debug('============================================================================');
-    grunt.log.debug(`= gruntFilePath:       '${gruntFilePath}'`);
-    grunt.log.debug(`= relativeCwd:         '${relativeCwd}'`);
-    grunt.log.debug(`= componentDirectory:  '${componentDirectory}'`);
-    grunt.log.debug(`= inComponent:         '${inComponent}'`);
-    grunt.log.debug(`= runDir:              '${runDir}'`);
-    grunt.log.debug(`= fullRunDir:          '${fullRunDir}'`);
-    grunt.log.debug('============================================================================');
-
-    if (inComponent) {
-        grunt.log.ok(`Running tasks for component directory ${componentDirectory}`);
-    }
-
-    return {
-        amdSrc,
-        componentDirectory,
-        cwd,
-        cssSrc,
-        files,
-        fullRunDir,
-        gruntFilePath,
-        inAMD,
-        inComponent,
-        inTheme,
-        relativeCwd,
-        runDir,
-        scssSrc,
-        yuiSrc,
-    };
-};
-
-/**
- * Verify tha tthe current NodeJS version matches the required version in package.json.
- *
- * @param   {Grunt} grunt
- */
-const verifyNodeVersion = grunt => {
-    const semver = require('semver');
-
-    // Verify the node version is new enough.
-    var expected = semver.validRange(grunt.file.readJSON('package.json').engines.node);
-    var actual = semver.valid(process.version);
-    if (!semver.satisfies(actual, expected)) {
-        grunt.fail.fatal('Node version not satisfied. Require ' + expected + ', version installed: ' + actual);
-    }
-};
-
-/**
- * Grunt configuration.
- *
- * @param {Grunt} grunt
- */
-module.exports = function(grunt) {
-    // Verify that the Node version meets our requirements.
-    verifyNodeVersion(grunt);
-
-    // Setup the Moodle environemnt within the Grunt object.
-    grunt.moodleEnv = setupMoodleEnvironment(grunt);
-
-    /**
-     * Add the named task.
-     *
-     * @param   {string} name
-     * @param   {Grunt} grunt
-     */
-    const addTask = (name, grunt) => {
-        const path = require('path');
-        const taskPath = path.resolve(`./.grunt/tasks/${name}.js`);
-
-        grunt.log.debug(`Including tasks for ${name} from ${taskPath}`);
-
-        require(path.resolve(`./.grunt/tasks/${name}.js`))(grunt);
-    };
-
-    // Startup tasks.
-    grunt.moodleEnv.startupTasks = [];
-
-    // Add Moodle task configuration.
-    addTask('gherkinlint', grunt);
-    addTask('ignorefiles', grunt);
-
-    addTask('javascript', grunt);
-    addTask('style', grunt);
-    addTask('componentlibrary', grunt);
-
-    addTask('watch', grunt);
-    addTask('startup', grunt);
-
-    // Register the default task.
-    grunt.registerTask('default', ['startup']);
-};

INSTALL.txt

@@ -1,20 +0,0 @@
-MOODLE INSTALLATION
-===================
-
-Here is a short summary of the installation process (which can take just a few
-minutes):
-
-1. Move the Moodle files into your web directory.
-
-2. Create a single database for Moodle to store all its tables in (or choose an
-   existing database).
-
-3. Visit your Moodle site with a browser. You should be taken to the
-   install.php script, which will lead you through creating a config.php file
-   and then setting up Moodle, creating an admin account etc.
-
-4. Set up a cron task to call the file admin/cron.php every minute.
-
-For more information, see <https://docs.moodle.org/en/Installing_Moodle>.
-
-Good luck and have fun!

PULL_REQUEST_TEMPLATE.txt

@@ -1,7 +0,0 @@
-*** PLEASE DO NOT OPEN PULL REQUESTS VIA GITHUB ***
-
-The moodle.git repository at Github is just a mirror of the official repository. We do not accept pull requests at Github.
-
-See CONTRIBUTING.txt guidelines for how to contribute patches for Moodle. Thank you.
-
---

README.txt

@@ -1,28 +1,29 @@
-                                 .-..-.
-   _____                         | || |
-  /____/-.---_  .---.  .---.  .-.| || | .---.
-  | |  _   _  |/  _  \/  _  \/  _  || |/  __ \
-  * | | | | | || |_| || |_| || |_| || || |___/
-    |_| |_| |_|\_____/\_____/\_____||_|\_____)
+QUICK INSTALL
+=============
 
-Moodle - the world's open source learning platform
+For the impatient, here is a basic outline of the
+installation process, which normally takes me only
+a few minutes:
 
-Moodle <https://moodle.org> is a learning platform designed to provide
-educators, administrators and learners with a single robust, secure and
-integrated system to create personalised learning environments.
+1) Move the Moodle files into your web directory.
 
-You can download Moodle <https://download.moodle.org> and run it on your own
-web server, ask one of our Moodle Partners <https://moodle.com/partners/> to
-assist you, or have a MoodleCloud site <https://moodle.com/cloud/> set up for
-you.
+2) Create a single database for Moodle to store all
+   its tables in (or choose an existing database).
 
-Moodle is widely used around the world by universities, schools, companies and
-all manner of organisations and individuals.
+3) Visit your Moodle site with a browser, you should
+   be taken to the install.php script, which will lead
+   you through creating a config.php file and then
+   setting up Moodle, creating an admin account etc.
 
-Moodle is provided freely as open source software, under the GNU General Public
-License <https://docs.moodle.org/dev/License>.
+4) Set up a cron task to call the file admin/cron.php
+   every five minutes or so.
 
-Moodle is written in PHP and JavaScript and uses an SQL database for storing
-the data.
 
-See <https://docs.moodle.org> for details of Moodle's many features.
+For more information, see the INSTALL DOCUMENTATION:
+
+   http://docs.moodle.org/en/Installing_Moodle
+
+
+Good luck and have fun!
+Martin Dougiamas, Lead Developer
+

TRADEMARK.txt

@@ -1,48 +1,34 @@
-MOODLE TRADEMARKS POLICY
-========================
+------------------------
+Moodle Trademark License
+------------------------
 
-The word "Moodle" is trademarked in many countries around the world. The word
-was originally coined as an acronym: Modular Object-Oriented Dynamic Learning
-Environment. The trademark is owned by Martin Dougiamas, Founder and Director
-of Moodle.
+The name Moodle™ is a registered trademark of the Moodle Trust.
 
-The law obligates trademark owners to police their marks and prevent the use of
-confusingly similar names by third parties. Through this policy we’d like to
-make it clear how Moodle-related projects, organisations, and people can use
-the Moodle trademark. We’d also like to be clear about how use of the word is
-restricted when used to promote commercial Moodle services. We do this to
-protect the very business model that allows us to continue developing Moodle
-for you.
+A key part of the business model that allows us to produce and
+distribute Moodle as completely Free open source software is that
+we restrict the commercial use of the Moodle trademark to those
+who have contracted to support Moodle development (Moodle Partners).
 
-Allowed uses
-------------
+If you are intending to use the name (and/or logo) to advertise
+generic Moodle™ services (eg Moodle Hosting, Moodle Support,
+Moodle Certification, Moodle Training, Moodle Consulting,
+Moodle Customisation, Moodle Courseware Development, Moodle
+Theme design, Moodle Integrations, Moodle Installations, etc)
+or as the name of a software package, then you must seek
+direct permission in writing from the Moodle Trust via the
+moodle.com helpdesk, in accordance with normal trademark
+restrictions.
 
-The following uses don’t require any permission at all:
+There are no restrictions on how you use the name in other
+contexts (for example, if you use Moodle just to provide
+courses then you can use the name freely to refer to it.)
 
-* Referring to the software or the Moodle project.
-* Describing your own Moodle implementation (including within corporate
-  settings).
-* Describing a Moodle-based community hub.
-* Describing some software you’ve made that integrates with Moodle
-  (eg a Moodle integration feature on another system).
+If you aren't sure of a particular case, please ask us via
+http://moodle.com/helpdesk: we'll be happy to either provide
+you with official permission in writing or help you fix
+your wording.
 
-Restricted uses
----------------
-
-The following uses are generally prohibited without explicit and direct
-permission being granted to you by Moodle Pty Ltd. We do this to protect the
-Moodle project from software and sites which could confuse people. Please
-contact us to ask for permission in writing.
-
-* You can’t use "Moodle" in the name of your software (including Mobile apps)
-* You can’t use "Moodle" in your company name
-* You can’t use "Moodle" in your domain name
-* You can’t use "Moodle" in advertising-related keywords (such as Adsense)
-* You can’t use "Moodle" to describe services around Moodle (such as hosting,
-  training, support, consulting, course creation services, theme development,
-  customisation, installation, integration and certification). This applies
-  even if you do not charge for the services. Note that usually only Moodle
-  Partners have this permission.
-
-For information about the Moodle Partner Certification Mark as well as for how
-to contact us, please see <https://moodle.com/trademarks/>.
+Martin Dougiamas
+Executive Director
+Moodle Trust
+http://moodle.com

admin/antiviruses.php

@@ -1,113 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Allows admin to configure antiviruses.
- *
- * @package    core_antivirus
- * @copyright  2015 Ruslan Kabalin, Lancaster University.
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/tablelib.php');
-
-$action  = required_param('action', PARAM_ALPHANUMEXT);
-$antivirus  = required_param('antivirus', PARAM_PLUGIN);
-$confirm = optional_param('confirm', 0, PARAM_BOOL);
-
-$PAGE->set_url('/admin/antiviruses.php', array('action' => $action, 'antivirus' => $antivirus));
-$PAGE->set_context(context_system::instance());
-
-require_admin();
-
-$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageantiviruses";
-
-// Get currently installed and enabled antivirus plugins.
-$availableantiviruses = \core\antivirus\manager::get_available();
-if (!empty($antivirus) and empty($availableantiviruses[$antivirus])) {
-    redirect ($returnurl);
-}
-
-$activeantiviruses = explode(',', $CFG->antiviruses);
-foreach ($activeantiviruses as $key => $active) {
-    if (empty($availableantiviruses[$active])) {
-        unset($activeantiviruses[$key]);
-    }
-}
-
-if (!confirm_sesskey()) {
-    redirect($returnurl);
-}
-
-$needsupdate = false;
-switch ($action) {
-    case 'disable':
-        // Remove from enabled list.
-        $class = \core_plugin_manager::resolve_plugininfo_class('antivirus');
-        $class::enable_plugin($antivirus, false);
-        break;
-
-    case 'enable':
-        // Add to enabled list.
-        if (!in_array($antivirus, $activeantiviruses)) {
-            $class = \core_plugin_manager::resolve_plugininfo_class('antivirus');
-            $class::enable_plugin($antivirus, true);
-        }
-        break;
-
-    case 'down':
-        $key = array_search($antivirus, $activeantiviruses);
-        // Check auth plugin is valid.
-        if ($key !== false) {
-            // Move down the list.
-            if ($key < (count($activeantiviruses) - 1)) {
-                $fsave = $activeantiviruses[$key];
-                $activeantiviruses[$key] = $activeantiviruses[$key + 1];
-                $activeantiviruses[$key + 1] = $fsave;
-                $needsupdate = true;
-            }
-        }
-        break;
-
-    case 'up':
-        $key = array_search($antivirus, $activeantiviruses);
-        // Check auth is valid.
-        if ($key !== false) {
-            // Move up the list.
-            if ($key >= 1) {
-                $fsave = $activeantiviruses[$key];
-                $activeantiviruses[$key] = $activeantiviruses[$key - 1];
-                $activeantiviruses[$key - 1] = $fsave;
-                $needsupdate = true;
-            }
-        }
-        break;
-
-    default:
-        break;
-}
-
-if ($needsupdate) {
-    $new = implode(',', $activeantiviruses);
-    add_to_config_log('antiviruses', $CFG->antiviruses, $new, 'core');
-    set_config('antiviruses', $new);
-    core_plugin_manager::reset_caches();
-}
-
-
-redirect ($returnurl);

admin/auth.php

@@ -11,7 +11,8 @@ require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/tablelib.php');
 
-require_admin();
+require_login();
+require_capability('moodle/site:config', context_system::instance());
 
 $returnurl = new moodle_url('/admin/settings.php', array('section'=>'manageauths'));
 
@@ -40,15 +41,27 @@ if (!confirm_sesskey()) {
 
 switch ($action) {
     case 'disable':
-        // Remove from enabled list.
-        $class = \core_plugin_manager::resolve_plugininfo_class('auth');
-        $class::enable_plugin($auth, false);
+        // remove from enabled list
+        $key = array_search($auth, $authsenabled);
+        if ($key !== false) {
+            unset($authsenabled[$key]);
+            set_config('auth', implode(',', $authsenabled));
+        }
+
+        if ($auth == $CFG->registerauth) {
+            set_config('registerauth', '');
+        }
+        session_gc(); // remove stale sessions
         break;
 
     case 'enable':
-        // Add to enabled list.
-        $class = \core_plugin_manager::resolve_plugininfo_class('auth');
-        $class::enable_plugin($auth, true);
+        // add to enabled list
+        if (!in_array($auth, $authsenabled)) {
+            $authsenabled[] = $auth;
+            $authsenabled = array_unique($authsenabled);
+            set_config('auth', implode(',', $authsenabled));
+        }
+        session_gc(); // remove stale sessions
         break;
 
     case 'down':
@@ -62,9 +75,7 @@ switch ($action) {
             $fsave = $authsenabled[$key];
             $authsenabled[$key] = $authsenabled[$key + 1];
             $authsenabled[$key + 1] = $fsave;
-            $value = implode(',', $authsenabled);
-            add_to_config_log('auth', $CFG->auth, $value, 'core');
-            set_config('auth', $value);
+            set_config('auth', implode(',', $authsenabled));
         }
         break;
 
@@ -79,9 +90,7 @@ switch ($action) {
             $fsave = $authsenabled[$key];
             $authsenabled[$key] = $authsenabled[$key - 1];
             $authsenabled[$key - 1] = $fsave;
-            $value = implode(',', $authsenabled);
-            add_to_config_log('auth', $CFG->auth, $value, 'core');
-            set_config('auth', $value);
+            set_config('auth', implode(',', $authsenabled));
         }
         break;
 
@@ -90,3 +99,5 @@ switch ($action) {
 }
 
 redirect($returnurl);
+
+

admin/auth_config.php

@@ -16,9 +16,6 @@ $err = array();
 
 $returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageauths";
 
-debugging("Use of config.html files in authentication plugins have been deprecated. " .
-          " Please migrate your plugin to use the admin settings API", DEBUG_DEVELOPER);
-
 // save configuration changes
 if ($frm = data_submitted() and confirm_sesskey()) {
 
@@ -81,36 +78,17 @@ echo '<p style="text-align: center"><input type="submit" value="' . get_string("
 echo "</div>\n";
 echo "</form>\n";
 
-$PAGE->requires->string_for_js('unmaskpassword', 'core_form');
-$PAGE->requires->yui_module('moodle-auth-passwordunmask', 'M.auth.passwordunmask');
-
 echo $OUTPUT->footer();
 exit;
 
 /// Functions /////////////////////////////////////////////////////////////////
 
-
-/**
- * auth field locking
- * Good enough for most auth plugins
- * but some may want a custom one if they are offering
- * other options
- * Note: lockconfig_ fields have special handling.
- *
- * @param string $auth authentication plugin shortname
- * @param array $user_fields user profile fields
- * @param string $helptext help text to be displayed at top of form
- * @param boolean $retrieveopts Map fields or lock only.
- * @param boolean $updateopts Allow remote updates
- * @param array $customfields list of custom profile fields
- * @deprecated since Moodle 3.3
- */
-function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts, $updateopts, $customfields = array()) {
-    global $DB, $OUTPUT;
-    debugging("The function 'print_auth_lock_options' has been deprecated, " .
-              "Please migrate your code to use the admin settings API and use the function 'display_auth_lock_options' instead. ",
-              DEBUG_DEVELOPER);
-
+// Good enough for most auth plugins
+// but some may want a custom one if they are offering
+// other options
+// Note: lockconfig_ fields have special handling.
+function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts, $updateopts) {
+    global $OUTPUT;
     echo '<tr><td colspan="3">';
     if ($retrieveopts) {
         echo $OUTPUT->heading(get_string('auth_data_mapping', 'auth'));
@@ -129,21 +107,14 @@ function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts,
 
     $pluginconfig = get_config("auth/$auth");
 
-    // Helptext is on a field with rowspan.
+    // helptext is on a field with rowspan
     if (empty($helptext)) {
-        $helptext = '&nbsp;';
+                $helptext = '&nbsp;';
     }
 
-    // If we have custom fields then merge them with user fields.
-    if (!empty($customfields)) {
-        $user_fields = array_merge($user_fields, $customfields);
-    }
-
-    if (!empty($customfields)) {
-        $customfieldname = $DB->get_records('user_info_field', null, '', 'shortname, name');
-    }
     foreach ($user_fields as $field) {
-        // Define some vars we'll work with.
+
+        // Define some vars we'll work with
         if (!isset($pluginconfig->{"field_map_$field"})) {
             $pluginconfig->{"field_map_$field"} = '';
         }
@@ -157,20 +128,14 @@ function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts,
             $pluginconfig->{"field_lock_$field"} = '';
         }
 
-        // Define the fieldname we display to the  user.
+        // define the fieldname we display to the  user
         $fieldname = $field;
         if ($fieldname === 'lang') {
             $fieldname = get_string('language');
-        } elseif (!empty($customfields) && in_array($field, $customfields)) {
-            // If custom field then pick name from database.
-            $fieldshortname = str_replace('profile_field_', '', $fieldname);
-            $fieldname = $customfieldname[$fieldshortname]->name;
-            if (core_text::strlen($fieldshortname) > 67) {
-                // If custom profile field name is longer than 67 characters we will not be able to store the setting
-                // such as 'field_updateremote_profile_field_NOTSOSHORTSHORTNAME' in the database because the character
-                // limit for the setting name is 100.
-                continue;
-            }
+        } elseif (preg_match('/^(.+?)(\d+)$/', $fieldname, $matches)) {
+            $fieldname =  get_string($matches[1]) . ' ' . $matches[2];
+        } elseif ($fieldname == 'url') {
+            $fieldname = get_string('webpage');
         } else {
             $fieldname = get_string($fieldname);
         }
@@ -190,6 +155,8 @@ function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts,
                 echo '<label for="menulockconfig_field_updateremote_'.$field.'">'.get_string('auth_updateremote', 'auth') . '</label>&nbsp;';
                 echo html_writer::select($updateextoptions, "lockconfig_field_updateremote_{$field}", $pluginconfig->{"field_updateremote_$field"}, false);
                 echo '<br />';
+
+
             }
             echo '<label for="menulockconfig_field_lock_'.$field.'">'.get_string('auth_fieldlock', 'auth') . '</label>&nbsp;';
             echo html_writer::select($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, false);
@@ -208,3 +175,5 @@ function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts,
         echo '</tr>';
     }
 }
+
+

admin/block.php

@@ -0,0 +1,76 @@
+<?php
+
+// block.php - allows admin to edit all local configuration variables for a block
+
+    require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+
+    $blockid = required_param('block', PARAM_INT);
+
+    if(!$blockrecord = blocks_get_record($blockid)) {
+        print_error('blockdoesnotexist', 'error');
+    }
+
+    admin_externalpage_setup('blocksetting'.$blockrecord->name);
+
+    $block = block_instance($blockrecord->name);
+    if($block === false) {
+        print_error('blockcannotinistantiate', 'error');
+    }
+
+    // Define the data we're going to silently include in the instance config form here,
+    // so we can strip them from the submitted data BEFORE handling it.
+    $hiddendata = array(
+        'block' => $blockid,
+        'sesskey' => sesskey()
+    );
+
+    /// If data submitted, then process and store.
+
+    if ($config = data_submitted()) {
+
+        if (!confirm_sesskey()) {
+             print_error('confirmsesskeybad', 'error');
+        }
+        if(!$block->has_config()) {
+            print_error('blockcannotconfig', 'error');
+        }
+        $remove = array_keys($hiddendata);
+        foreach($remove as $item) {
+            unset($config->$item);
+        }
+        $block->config_save($config);
+        redirect("$CFG->wwwroot/$CFG->admin/blocks.php", get_string("changessaved"), 1);
+        exit;
+    }
+
+    /// Otherwise print the form.
+
+    $strmanageblocks = get_string('manageblocks');
+    $strblockname = $block->get_title();
+
+    echo $OUTPUT->header();
+
+    echo $OUTPUT->heading($strblockname);
+
+    echo $OUTPUT->notification('This block still uses an old-style config_global.html file. ' .
+            'It must be updated by a developer to use a settings.php file.');
+
+    echo $OUTPUT->box(get_string('configwarning', 'admin'), 'generalbox boxwidthnormal boxaligncenter');
+    echo '<br />';
+
+    echo '<form method="post" action="block.php">';
+    echo '<p>';
+    foreach($hiddendata as $name => $val) {
+        echo '<input type="hidden" name="'. $name .'" value="'. $val .'" />';
+    }
+    echo '</p>';
+
+    echo $OUTPUT->box_start();
+    include($CFG->dirroot.'/blocks/'. $block->name() .'/config_global.html');
+    echo $OUTPUT->box_end();
+
+    echo '</form>';
+    echo $OUTPUT->footer();
+
+

admin/blocks.php

@@ -1,10 +1,9 @@
 <?php
 
-    // Allows the admin to configure blocks (hide/show, uninstall and configure)
+    // Allows the admin to configure blocks (hide/show, delete and configure)
 
     require_once('../config.php');
     require_once($CFG->libdir.'/adminlib.php');
-    require_once($CFG->libdir.'/blocklib.php');
     require_once($CFG->libdir.'/tablelib.php');
 
     admin_externalpage_setup('manageblocks');
@@ -12,13 +11,14 @@
     $confirm  = optional_param('confirm', 0, PARAM_BOOL);
     $hide     = optional_param('hide', 0, PARAM_INT);
     $show     = optional_param('show', 0, PARAM_INT);
+    $delete   = optional_param('delete', 0, PARAM_INT);
     $unprotect = optional_param('unprotect', 0, PARAM_INT);
     $protect = optional_param('protect', 0, PARAM_INT);
 
 /// Print headings
 
     $strmanageblocks = get_string('manageblocks');
-    $struninstall = get_string('uninstallplugin', 'core_admin');
+    $strdelete = get_string('delete');
     $strversion = get_string('version');
     $strhide = get_string('hide');
     $strshow = get_string('show');
@@ -30,46 +30,89 @@
     $strprotect = get_string('blockprotect', 'admin');
     $strunprotect = get_string('blockunprotect', 'admin');
 
+    // Purge all caches related to blocks administration.
+    cache::make('core', 'plugininfo_block')->purge();
+
+/// If data submitted, then process and store.
 
-    // If data submitted, then process and store.
     if (!empty($hide) && confirm_sesskey()) {
-        if (!$block = $DB->get_record('block', ['id' => $hide])) {
-            throw new \moodle_exception('blockdoesnotexist', 'error');
+        if (!$block = $DB->get_record('block', array('id'=>$hide))) {
+            print_error('blockdoesnotexist', 'error');
         }
-
-        $class = \core_plugin_manager::resolve_plugininfo_class('block');
-        $class::enable_plugin($block->name, false);
-        // Settings not required - only pages.
-        admin_get_root(true, false);
+        $DB->set_field('block', 'visible', '0', array('id'=>$block->id));      // Hide block
+        admin_get_root(true, false);  // settings not required - only pages
     }
 
     if (!empty($show) && confirm_sesskey() ) {
-        if (!$block = $DB->get_record('block', ['id' => $show])) {
-            throw new \moodle_exception('blockdoesnotexist', 'error');
+        if (!$block = $DB->get_record('block', array('id'=>$show))) {
+            print_error('blockdoesnotexist', 'error');
         }
+        $DB->set_field('block', 'visible', '1', array('id'=>$block->id));      // Show block
+        admin_get_root(true, false);  // settings not required - only pages
+    }
 
-        $class = \core_plugin_manager::resolve_plugininfo_class('block');
-        $class::enable_plugin($block->name, true);
-        // Settings not required - only pages.
-        admin_get_root(true, false);
+    if (!isset($CFG->undeletableblocktypes) || (!is_array($CFG->undeletableblocktypes) && !is_string($CFG->undeletableblocktypes))) {
+        $undeletableblocktypes = array('navigation', 'settings');
+    } else if (is_string($CFG->undeletableblocktypes)) {
+        $undeletableblocktypes = explode(',', $CFG->undeletableblocktypes);
+    } else {
+        $undeletableblocktypes = $CFG->undeletableblocktypes;
     }
 
     if (!empty($protect) && confirm_sesskey()) {
-        block_manager::protect_block((int)$protect);
+        if (!$block = $DB->get_record('block', array('id'=>$protect))) {
+            print_error('blockdoesnotexist', 'error');
+        }
+        if (!in_array($block->name, $undeletableblocktypes)) {
+            $undeletableblocktypes[] = $block->name;
+            set_config('undeletableblocktypes', implode(',', $undeletableblocktypes));
+        }
         admin_get_root(true, false);  // settings not required - only pages
     }
 
     if (!empty($unprotect) && confirm_sesskey()) {
-        block_manager::unprotect_block((int)$unprotect);
+        if (!$block = $DB->get_record('block', array('id'=>$unprotect))) {
+            print_error('blockdoesnotexist', 'error');
+        }
+        if (in_array($block->name, $undeletableblocktypes)) {
+            $undeletableblocktypes = array_diff($undeletableblocktypes, array($block->name));
+            set_config('undeletableblocktypes', implode(',', $undeletableblocktypes));
+        }
         admin_get_root(true, false);  // settings not required - only pages
     }
 
-    $undeletableblocktypes = block_manager::get_undeletable_block_types();
+    if (!empty($delete) && confirm_sesskey()) {
+        echo $OUTPUT->header();
+        echo $OUTPUT->heading($strmanageblocks);
+
+        if (!$block = blocks_get_record($delete)) {
+            print_error('blockdoesnotexist', 'error');
+        }
+
+        if (get_string_manager()->string_exists('pluginname', "block_$block->name")) {
+            $strblockname = get_string('pluginname', "block_$block->name");
+        } else {
+            $strblockname = $block->name;
+        }
+
+        if (!$confirm) {
+            echo $OUTPUT->confirm(get_string('blockdeleteconfirm', '', $strblockname), 'blocks.php?delete='.$block->id.'&confirm=1', 'blocks.php');
+            echo $OUTPUT->footer();
+            exit;
+
+        } else {
+            uninstall_plugin('block', $block->name);
+
+            $a = new stdClass();
+            $a->block = $strblockname;
+            $a->directory = $CFG->dirroot.'/blocks/'.$block->name;
+            notice(get_string('blockdeletefiles', '', $a), 'blocks.php');
+        }
+    }
 
     echo $OUTPUT->header();
     echo $OUTPUT->heading($strmanageblocks);
 
-    echo $OUTPUT->notification(get_string('noteunneededblocks', 'admin'), 'info');
 /// Main display starts here
 
 /// Get and sort the existing blocks
@@ -84,8 +127,8 @@
 
     $table = new flexible_table('admin-blocks-compatible');
 
-    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'undeletable', 'settings', 'uninstall'));
-    $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strprotecthdr, $strsettings, $struninstall));
+    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'undeletable', 'delete', 'settings'));
+    $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strprotecthdr, $strdelete, $strsettings));
     $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
     $table->set_attribute('class', 'admintable blockstable generaltable');
     $table->set_attribute('id', 'compatibleblockstable');
@@ -102,18 +145,17 @@
             $blocknames[$blockid] = $blockname;
         }
     }
-    core_collator::asort($blocknames);
+    collatorlib::asort($blocknames);
 
     foreach ($blocknames as $blockid=>$strblockname) {
         $block = $blocks[$blockid];
         $blockname = $block->name;
-        $dbversion = get_config('block_'.$block->name, 'version');
 
         if (!file_exists("$CFG->dirroot/blocks/$blockname/block_$blockname.php")) {
             $blockobject  = false;
             $strblockname = '<span class="notifyproblem">'.$strblockname.' ('.get_string('missingfromdisk').')</span>';
             $plugin = new stdClass();
-            $plugin->version = $dbversion;
+            $plugin->version = $block->version;
 
         } else {
             $plugin = new stdClass();
@@ -128,11 +170,7 @@
             }
         }
 
-        if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('block_'.$blockname, 'manage')) {
-            $uninstall = html_writer::link($uninstallurl, $struninstall);
-        } else {
-            $uninstall = '';
-        }
+        $delete = '<a href="blocks.php?delete='.$blockid.'&amp;sesskey='.sesskey().'">'.$strdelete.'</a>';
 
         $settings = ''; // By default, no configuration
         if ($blockobject and $blockobject->has_config()) {
@@ -142,12 +180,8 @@
                 $settings = '<a href="' . $blocksettings->url .  '">' . get_string('settings') . '</a>';
             } else if ($blocksettings instanceof admin_settingpage) {
                 $settings = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=blocksetting'.$block->name.'">'.$strsettings.'</a>';
-            } else if (!file_exists($CFG->dirroot.'/blocks/'.$block->name.'/settings.php')) {
-                // If the block's settings node was not found, we check that the block really provides the settings.php file.
-                // Note that blocks can inject their settings to other nodes in the admin tree without using the default locations.
-                // This can be done by assigning null to $setting in settings.php and it is a valid case.
-                debugging('Warning: block_'.$block->name.' returns true in has_config() but does not provide a settings.php file',
-                    DEBUG_DEVELOPER);
+            } else {
+                $settings = '<a href="block.php?block='.$blockid.'">'.$strsettings.'</a>';
             }
         }
 
@@ -171,17 +205,17 @@
             $visible = '';
         } else if ($blocks[$blockid]->visible) {
             $visible = '<a href="blocks.php?hide='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strhide.'">'.
-                       $OUTPUT->pix_icon('t/hide', $strhide) . '</a>';
+                       '<img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.$strhide.'" /></a>';
         } else {
             $visible = '<a href="blocks.php?show='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strshow.'">'.
-                       $OUTPUT->pix_icon('t/show', $strshow) . '</a>';
-            $class = 'dimmed_text';
+                       '<img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.$strshow.'" /></a>';
+            $class = ' class="dimmed_text"'; // Leading space required!
         }
 
-        if ($dbversion == $plugin->version) {
-            $version = $dbversion;
+        if ($block->version == $plugin->version) {
+            $version = $block->version;
         } else {
-            $version = "$dbversion ($plugin->version)";
+            $version = "$block->version ($plugin->version)";
         }
 
         if (!$blockobject) {
@@ -189,22 +223,22 @@
             $undeletable = '';
         } else if (in_array($blockname, $undeletableblocktypes)) {
             $undeletable = '<a href="blocks.php?unprotect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strunprotect.'">'.
-                       $OUTPUT->pix_icon('t/unlock', $strunprotect) . '</a>';
+                       '<img src="'.$OUTPUT->pix_url('t/unlock') . '" class="iconsmall" alt="'.$strunprotect.'" /></a>';
         } else {
             $undeletable = '<a href="blocks.php?protect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strprotect.'">'.
-                       $OUTPUT->pix_icon('t/lock', $strprotect) . '</a>';
+                       '<img src="'.$OUTPUT->pix_url('t/lock') . '" class="iconsmall" alt="'.$strprotect.'" /></a>';
         }
 
         $row = array(
-            $strblockname,
+            '<span'.$class.'>'.$strblockname.'</span>',
             $blocklist,
-            $version,
+            '<span'.$class.'>'.$version.'</span>',
             $visible,
             $undeletable,
-            $settings,
-            $uninstall,
+            $delete,
+            $settings
         );
-        $table->add_data($row, $class);
+        $table->add_data($row);
     }
 
     $table->print_html();
@@ -214,8 +248,8 @@
 
         $table = new flexible_table('admin-blocks-incompatible');
 
-        $table->define_columns(array('block', 'uninstall'));
-        $table->define_headers(array($strname, $struninstall));
+        $table->define_columns(array('block', 'delete'));
+        $table->define_headers(array($strname, $strdelete));
         $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
 
         $table->set_attribute('class', 'incompatibleblockstable generaltable');
@@ -223,17 +257,14 @@
         $table->setup();
 
         foreach ($incompatible as $block) {
-            if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('block_'.$block->name, 'manage')) {
-                $uninstall = html_writer::link($uninstallurl, $struninstall);
-            } else {
-                $uninstall = '';
-            }
             $table->add_data(array(
                 $block->name,
-                $uninstall,
+                '<a href="blocks.php?delete='.$block->id.'&amp;sesskey='.sesskey().'">'.$strdelete.'</a>',
             ));
         }
         $table->print_html();
     }
 
     echo $OUTPUT->footer();
+
+

admin/category.php

@@ -17,7 +17,7 @@
 /**
  * This file is used to display a categories sub categories, external pages, and settings.
  *
- * @since      Moodle 2.3
+ * @since      2.3
  * @package    admin
  * @copyright  2011 Sam Hemelryk
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -30,6 +30,7 @@ $category = required_param('category', PARAM_SAFEDIR);
 $return = optional_param('return','', PARAM_ALPHA);
 $adminediting = optional_param('adminedit', -1, PARAM_BOOL);
 
+/// no guest autologin
 require_login(0, false);
 $PAGE->set_context(context_system::instance());
 $PAGE->set_url('/admin/category.php', array('category' => $category));
@@ -48,40 +49,33 @@ if (!($settingspage->check_access())) {
     print_error('accessdenied', 'admin');
 }
 
-$hassiteconfig = has_capability('moodle/site:config', $PAGE->context);
-if ($hassiteconfig) {
-    $PAGE->add_header_action($OUTPUT->render_from_template('core_admin/header_search_input', [
-        'action' => new moodle_url('/admin/search.php'),
-    ]));
-}
 
 $statusmsg = '';
 $errormsg  = '';
 
 if ($data = data_submitted() and confirm_sesskey()) {
-    $count = admin_write_settings($data);
+    if (admin_write_settings($data)) {
+        $statusmsg = get_string('changessaved');
+    }
+
     if (empty($adminroot->errors)) {
-        // No errors. Did we change any setting?  If so, then indicate success.
-        if ($count) {
-            $statusmsg = get_string('changessaved');
-        } else {
-            switch ($return) {
-                case 'site': redirect("$CFG->wwwroot/");
-                case 'admin': redirect("$CFG->wwwroot/$CFG->admin/");
-            }
+        switch ($return) {
+            case 'site': redirect("$CFG->wwwroot/");
+            case 'admin': redirect("$CFG->wwwroot/$CFG->admin/");
         }
     } else {
         $errormsg = get_string('errorwithsettings', 'admin');
         $firsterror = reset($adminroot->errors);
     }
+    $adminroot = admin_get_root(true); //reload tree
     $settingspage = $adminroot->locate($category, true);
 }
 
 if ($PAGE->user_allowed_editing() && $adminediting != -1) {
     $USER->editing = $adminediting;
 }
-$buttons = null;
-if ($PAGE->user_allowed_editing() && !$PAGE->theme->haseditswitch) {
+
+if ($PAGE->user_allowed_editing()) {
     $url = clone($PAGE->url);
     if ($PAGE->user_is_editing()) {
         $caption = get_string('blockseditoff');
@@ -96,47 +90,46 @@ if ($PAGE->user_allowed_editing() && !$PAGE->theme->haseditswitch) {
 $savebutton = false;
 $outputhtml = '';
 foreach ($settingspage->children as $childpage) {
-    if ($childpage->is_hidden() || !$childpage->check_access()) {
+    if ($childpage->is_hidden()) {
         continue;
     }
     if ($childpage instanceof admin_externalpage) {
         $outputhtml .= $OUTPUT->heading(html_writer::link($childpage->url, $childpage->visiblename), 3);
     } else if ($childpage instanceof admin_settingpage) {
         $outputhtml .= $OUTPUT->heading(html_writer::link(new moodle_url('/'.$CFG->admin.'/settings.php', array('section' => $childpage->name)), $childpage->visiblename), 3);
-        // If its a settings page and has settings lets display them.
-        if (!empty($childpage->settings)) {
-            $outputhtml .= html_writer::start_tag('fieldset', array('class' => 'adminsettings'));
-            foreach ($childpage->settings as $setting) {
-                if (empty($setting->nosave)) {
-                    $savebutton = true;
-                }
-                $fullname = $setting->get_full_name();
-                if (array_key_exists($fullname, $adminroot->errors)) {
-                    $data = $adminroot->errors[$fullname]->data;
-                } else {
-                    $data = $setting->get_setting();
-                }
-                $outputhtml .= html_writer::tag('div', '<!-- -->', array('class' => 'clearer'));
-                $outputhtml .= $setting->output_html($data);
-            }
-            $outputhtml .= html_writer::end_tag('fieldset');
-        }
     } else if ($childpage instanceof admin_category) {
         $outputhtml .= $OUTPUT->heading(html_writer::link(new moodle_url('/'.$CFG->admin.'/category.php', array('category' => $childpage->name)), get_string('admincategory', 'admin', $childpage->visiblename)), 3);
+    } else {
+        continue;
+    }
+    if (!empty($childpage->settings)) {
+        $outputhtml .= html_writer::start_tag('fieldset', array('class' => 'adminsettings'));
+        foreach ($childpage->settings as $setting) {
+            if (empty($setting->nosave)) {
+                $savebutton = true;
+            }
+            $fullname = $setting->get_full_name();
+            if (array_key_exists($fullname, $adminroot->errors)) {
+                $data = $adminroot->errors[$fullname]->data;
+            } else {
+                $data = $setting->get_setting();
+            }
+            $outputhtml .= html_writer::tag('div', '<!-- -->', array('class' => 'clearer'));
+            $outputhtml .= $setting->output_html($data);
+        }
+        $outputhtml .= html_writer::end_tag('fieldset');
     }
 }
 if ($savebutton) {
     $outputhtml .= html_writer::start_tag('div', array('class' => 'form-buttons'));
-    $outputhtml .= html_writer::empty_tag('input', array('class' => 'btn btn-primary form-submit', 'type' => 'submit', 'value' => get_string('savechanges','admin')));
+    $outputhtml .= html_writer::empty_tag('input', array('class' => 'form-submit', 'type' => 'submit', 'value' => get_string('savechanges','admin')));
     $outputhtml .= html_writer::end_tag('div');
 }
 
 $visiblepathtosection = array_reverse($settingspage->visiblepath);
 $PAGE->set_title("$SITE->shortname: " . implode(": ",$visiblepathtosection));
 $PAGE->set_heading($SITE->fullname);
-if ($buttons) {
-    $PAGE->set_button($buttons);
-}
+$PAGE->set_button($buttons);
 
 echo $OUTPUT->header();
 
@@ -146,7 +139,13 @@ if ($errormsg !== '') {
     echo $OUTPUT->notification($statusmsg, 'notifysuccess');
 }
 
-echo $OUTPUT->heading(get_string('admincategory', 'admin', $settingspage->visiblename), 2);
+$path = array_reverse($settingspage->visiblepath);
+if (is_array($path)) {
+    $visiblename = join(' / ', $path);
+} else {
+    $visiblename = $path;
+}
+echo $OUTPUT->heading(get_string('admincategory', 'admin', $visiblename), 2);
 
 echo html_writer::start_tag('form', array('action' => '', 'method' => 'post', 'id' => 'adminsettings'));
 echo html_writer::start_tag('div');
@@ -158,7 +157,4 @@ echo $outputhtml;
 echo html_writer::end_tag('fieldset');
 echo html_writer::end_tag('form');
 
-// Add the form change checker.
-$PAGE->requires->js_call_amd('core_form/changechecker', 'watchFormById', ['adminsettings']);
-
-echo $OUTPUT->footer();
+echo $OUTPUT->footer();

admin/classes/form/purge_caches.php

@@ -1,76 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Form for selective purging of caches.
- *
- * @package    core
- * @copyright  2018 The Open University
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core_admin\form;
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->libdir.'/formslib.php');
-
-/**
- * Form for selecting which caches to purge on admin/purgecaches.php
- *
- * @package   core
- * @copyright 2018 The Open University
- * @author    Mark Johnson <mark.johnson@open.ac.uk>
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class purge_caches extends \moodleform {
-    /**
-     * Define a "Purge all caches" button, and a fieldset with checkboxes for selectively purging separate caches.
-     */
-    public function definition() {
-        $mform = $this->_form;
-        $mform->addElement('hidden', 'returnurl', $this->_customdata['returnurl']);
-        $mform->setType('returnurl', PARAM_LOCALURL);
-        $mform->addElement('submit', 'all', get_string('purgecaches', 'admin'));
-        $mform->addElement('header', 'purgecacheheader', get_string('purgeselectedcaches', 'admin'));
-        $checkboxes = [
-            $mform->createElement('advcheckbox', 'theme', '', get_string('purgethemecache', 'admin')),
-            $mform->createElement('advcheckbox', 'lang', '', get_string('purgelangcache', 'admin')),
-            $mform->createElement('advcheckbox', 'js', '', get_string('purgejscache', 'admin')),
-            $mform->createElement('advcheckbox', 'template', '', get_string('purgetemplates', 'admin')),
-            $mform->createElement('advcheckbox', 'filter', '', get_string('purgefiltercache', 'admin')),
-            $mform->createElement('advcheckbox', 'muc', '', get_string('purgemuc', 'admin')),
-            $mform->createElement('advcheckbox', 'other', '', get_string('purgeothercaches', 'admin'))
-        ];
-        $mform->addGroup($checkboxes, 'purgeselectedoptions');
-        $mform->addElement('submit', 'purgeselectedcaches', get_string('purgeselectedcaches', 'admin'));
-    }
-
-    /**
-     * If the "Purge selected caches" button was pressed, ensure at least one cache was selected.
-     *
-     * @param array $data
-     * @param array $files
-     * @return array Error messages
-     */
-    public function validation($data, $files) {
-        $errors = [];
-        if (isset($data['purgeselectedcaches']) && empty(array_filter($data['purgeselectedoptions']))) {
-            $errors['purgeselectedoptions'] = get_string('purgecachesnoneselected', 'admin');
-        }
-        return $errors;
-    }
-}

admin/classes/form/testoutgoingmailconf_form.php

@@ -1,92 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Testing outgoing mail configuration form
- *
- * @package    core
- * @copyright  2019 Victor Deniz <victor@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core_admin\form;
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->libdir.'/formslib.php');
-
-/**
- * Test mail form
- *
- * @package    core
- * @copyright 2019 Victor Deniz <victor@moodle.com>
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class testoutgoingmailconf_form extends \moodleform {
-    /**
-     * Add elements to form
-     */
-    public function definition() {
-        $mform = $this->_form;
-
-        // Recipient.
-        $options = ['maxlength' => '100', 'size' => '25', 'autocomplete' => 'email'];
-        $mform->addElement('text', 'recipient', get_string('testoutgoingmailconf_toemail', 'admin'), $options);
-        $mform->setType('recipient', PARAM_EMAIL);
-        $mform->addRule('recipient', get_string('required'), 'required');
-
-        // From user.
-        $options = ['maxlength' => '100', 'size' => '25'];
-        $mform->addElement('text', 'from', get_string('testoutgoingmailconf_fromemail', 'admin'), $options);
-        $mform->setType('from', PARAM_TEXT);
-        $mform->addHelpButton('from', 'testoutgoingmailconf_fromemail', 'admin');
-
-        // Additional subject text.
-        $options = ['size' => '25'];
-        $mform->addElement('text', 'additionalsubject', get_string('testoutgoingmailconf_subjectadditional', 'admin'), $options);
-        $mform->setType('additionalsubject', PARAM_TEXT);
-
-        $buttonarray = array();
-        $buttonarray[] = $mform->createElement('submit', 'send', get_string('testoutgoingmailconf_sendtest', 'admin'));
-        $buttonarray[] = $mform->createElement('cancel');
-
-        $mform->addGroup($buttonarray, 'buttonar', '', array(' '), false);
-        $mform->closeHeaderBefore('buttonar');
-
-    }
-
-    /**
-     * Validate Form field, should be a valid email format or a username that matches with a Moodle user.
-     *
-     * @param array $data
-     * @param array $files
-     * @return array
-     * @throws \dml_exception|\coding_exception
-     */
-    public function validation($data, $files): array {
-        $errors = parent::validation($data, $files);
-
-        if (isset($data['from']) && $data['from']) {
-            $userfrom = \core_user::get_user_by_username($data['from']);
-
-            if (!$userfrom && !validate_email($data['from'])) {
-                $errors['from'] = get_string('testoutgoingmailconf_fromemail_invalid', 'admin');
-            }
-        }
-
-        return $errors;
-    }
-}

admin/classes/local/entities/task_log.php

@@ -1,304 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-namespace core_admin\local\entities;
-
-use core_reportbuilder\local\filters\date;
-use core_reportbuilder\local\filters\duration;
-use core_reportbuilder\local\filters\select;
-use core_reportbuilder\local\filters\text;
-use core_reportbuilder\local\helpers\format;
-use lang_string;
-use core_reportbuilder\local\entities\base;
-use core_reportbuilder\local\report\column;
-use core_reportbuilder\local\report\filter;
-use stdClass;
-
-/**
- * Task log entity class implementation
- *
- * @package    core_admin
- * @copyright  2021 David Matamoros <davidmc@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class task_log extends base {
-
-    /** @var int Result success */
-    protected const SUCCESS = 0;
-
-    /** @var int Result failed */
-    protected const FAILED = 1;
-
-    /**
-     * Database tables that this entity uses and their default aliases
-     *
-     * @return array
-     */
-    protected function get_default_table_aliases(): array {
-        return ['task_log' => 'tl'];
-    }
-
-    /**
-     * The default title for this entity in the list of columns/conditions/filters in the report builder
-     *
-     * @return lang_string
-     */
-    protected function get_default_entity_title(): lang_string {
-        return new lang_string('entitytasklog', 'admin');
-    }
-
-    /**
-     * The default machine-readable name for this entity that will be used in the internal names of the columns/filters
-     *
-     * @return string
-     */
-    protected function get_default_entity_name(): string {
-        return 'task_log';
-    }
-
-    /**
-     * Initialise the entity
-     *
-     * @return base
-     */
-    public function initialise(): base {
-        $columns = $this->get_all_columns();
-        foreach ($columns as $column) {
-            $this->add_column($column);
-        }
-
-        $filters = $this->get_all_filters();
-        foreach ($filters as $filter) {
-            $this->add_filter($filter);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns list of all available columns
-     *
-     * @return column[]
-     */
-    protected function get_all_columns(): array {
-
-        $tablealias = $this->get_table_alias('task_log');
-
-        // Name column.
-        $columns[] = (new column(
-            'name',
-            new lang_string('name'),
-            $this->get_entity_name()
-        ))
-            ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_TEXT)
-            ->add_field("$tablealias.classname")
-            ->set_is_sortable(true)
-            ->add_callback(static function(string $value): string {
-                $output = '';
-                if (class_exists($value)) {
-                    $task = new $value;
-                    if ($task instanceof \core\task\scheduled_task) {
-                        $output = $task->get_name();
-                    }
-                }
-                $output .= \html_writer::tag('div', "\\{$value}", [
-                    'class' => 'task-class',
-                ]);
-                return $output;
-            });
-
-        // Type column.
-        $columns[] = (new column(
-            'type',
-            new lang_string('tasktype', 'admin'),
-            $this->get_entity_name()
-        ))
-            ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_INTEGER)
-            ->add_field("{$tablealias}.type")
-            ->set_is_sortable(true)
-            ->add_callback(static function(int $value): string {
-                if (\core\task\database_logger::TYPE_SCHEDULED === $value) {
-                    return get_string('task_type:scheduled', 'admin');
-                }
-                return get_string('task_type:adhoc', 'admin');
-            });
-
-        // Start time column.
-        $columns[] = (new column(
-            'starttime',
-            new lang_string('task_starttime', 'admin'),
-            $this->get_entity_name()
-        ))
-            ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_TIMESTAMP)
-            ->add_field("{$tablealias}.timestart")
-            ->set_is_sortable(true)
-            ->add_callback([format::class, 'userdate'], get_string('strftimedatetimeshortaccurate', 'core_langconfig'));
-
-        // Duration column.
-        $columns[] = (new column(
-            'duration',
-            new lang_string('task_duration', 'admin'),
-            $this->get_entity_name()
-        ))
-            ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_FLOAT)
-            ->add_field("{$tablealias}.timeend - {$tablealias}.timestart", 'duration')
-            ->set_is_sortable(true)
-            ->add_callback(static function(float $value): string {
-                $duration = round($value, 2);
-                if (empty($duration)) {
-                    // The format_time function returns 'now' when the difference is exactly 0.
-                    // Note: format_time performs concatenation in exactly this fashion so we should do this for consistency.
-                    return '0 ' . get_string('secs', 'moodle');
-                }
-                return format_time($duration);
-            });
-
-        // Hostname column.
-        $columns[] = (new column(
-            'hostname',
-            new lang_string('hostname', 'admin'),
-            $this->get_entity_name()
-        ))
-            ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_TEXT)
-            ->add_field("$tablealias.hostname")
-            ->set_is_sortable(true);
-
-        // PID column.
-        $columns[] = (new column(
-            'pid',
-            new lang_string('pid', 'admin'),
-            $this->get_entity_name()
-        ))
-            ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_INTEGER)
-            ->add_field("{$tablealias}.pid")
-            ->set_is_sortable(true);
-
-        // Database column.
-        $columns[] = (new column(
-            'database',
-            new lang_string('task_dbstats', 'admin'),
-            $this->get_entity_name()
-        ))
-            ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_INTEGER)
-            ->add_fields("{$tablealias}.dbreads, {$tablealias}.dbwrites")
-            ->set_is_sortable(true)
-            ->add_callback(static function(int $value, stdClass $row): string {
-                $output = '';
-                $output .= \html_writer::div(get_string('task_stats:dbreads', 'admin', $row->dbreads));
-                $output .= \html_writer::div(get_string('task_stats:dbwrites', 'admin', $row->dbwrites));
-                return $output;
-            });
-
-        // Result column.
-        $columns[] = (new column(
-            'result',
-            new lang_string('task_result', 'admin'),
-            $this->get_entity_name()
-        ))
-            ->add_joins($this->get_joins())
-            ->set_type(column::TYPE_INTEGER)
-            ->add_field("$tablealias.result")
-            ->set_is_sortable(true)
-            ->add_callback(static function(int $value): string {
-                if ($value) {
-                    return get_string('task_result:failed', 'admin');
-                }
-                return get_string('success');
-            });
-
-        return $columns;
-    }
-
-    /**
-     * Return list of all available filters
-     *
-     * @return filter[]
-     */
-    protected function get_all_filters(): array {
-        $filters = [];
-
-        $tablealias = $this->get_table_alias('task_log');
-
-        // Name filter (Filter by classname).
-        $filters[] = (new filter(
-            text::class,
-            'name',
-            new lang_string('classname', 'tool_task'),
-            $this->get_entity_name(),
-            "{$tablealias}.classname"
-        ))
-            ->add_joins($this->get_joins());
-
-        // Output filter (Filter by task output).
-        $filters[] = (new filter(
-            text::class,
-            'output',
-            new lang_string('task_logoutput', 'admin'),
-            $this->get_entity_name(),
-            "{$tablealias}.output"
-        ))
-            ->add_joins($this->get_joins());
-
-        // Result filter.
-        $filters[] = (new filter(
-            select::class,
-            'result',
-            new lang_string('task_result', 'admin'),
-            $this->get_entity_name(),
-            "{$tablealias}.result"
-        ))
-            ->add_joins($this->get_joins())
-            ->set_options([
-                self::SUCCESS => get_string('success'),
-                self::FAILED => get_string('task_result:failed', 'admin'),
-            ]);
-
-        // Start time filter.
-        $filters[] = (new filter(
-            date::class,
-            'timestart',
-            new lang_string('task_starttime', 'admin'),
-            $this->get_entity_name(),
-            "{$tablealias}.timestart"
-        ))
-            ->add_joins($this->get_joins())
-            ->set_limited_operators([
-                date::DATE_ANY,
-                date::DATE_RANGE,
-                date::DATE_PREVIOUS,
-                date::DATE_CURRENT,
-            ]);
-
-        // Duration filter.
-        $filters[] = (new filter(
-            duration::class,
-            'duration',
-            new lang_string('task_duration', 'admin'),
-            $this->get_entity_name(),
-            "${tablealias}.timeend - {$tablealias}.timestart"
-        ))
-            ->add_joins($this->get_joins());
-
-        return $filters;
-    }
-}

admin/classes/local/externalpage/accesscallback.php

@@ -1,71 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * External admin page class that allows a callback to be provided to determine whether page can be accessed
- *
- * @package     core_admin
- * @copyright   2019 Marina Glancy
- * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core_admin\local\externalpage;
-
-use admin_externalpage;
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once("{$CFG->libdir}/adminlib.php");
-
-/**
- * Admin externalpage class
- *
- * @package     core_admin
- * @copyright   2019 Marina Glancy
- * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class accesscallback extends admin_externalpage {
-
-    /** @var callable $accesscheckcallback */
-    protected $accesscheckcallback;
-
-    /**
-     * Class constructor
-     *
-     * @param string $name
-     * @param string $visiblename
-     * @param string $url
-     * @param callable $accesscheckcallback The callback method that will be executed to check whether user has access to
-     *     this page. The setting instance ($this) is passed as an argument to the callback. Should return boolean value
-     * @param bool $hidden
-     */
-    public function __construct(string $name, string $visiblename, string $url, callable $accesscheckcallback,
-            bool $hidden = false) {
-
-        $this->accesscheckcallback = $accesscheckcallback;
-
-        parent::__construct($name, $visiblename, $url, [], $hidden);
-    }
-
-    /**
-     * Determines if the current user has access to this external page based on access callback
-     *
-     * @return bool
-     */
-    public function check_access() {
-        return ($this->accesscheckcallback)($this);
-    }
-}

admin/classes/local/settings/autocomplete.php

@@ -1,206 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Auto complete admin setting.
- *
- * @package    core_admin
- * @copyright  2020 The Open University
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core_admin\local\settings;
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->libdir . '/adminlib.php');
-/**
- * Auto complete setting class.
- *
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @copyright 2020 The Open University
- */
-class autocomplete extends \admin_setting_configmultiselect {
-    /** @var boolean Should we allow typing new entries to the field? */
-    protected $tags = false;
-    /** @var string Name of an AMD module to send/process ajax requests. */
-    protected $ajax = '';
-    /** @var string Placeholder text for an empty list. */
-    protected $placeholder = '';
-    /** @var bool Whether the search has to be case-sensitive. */
-    protected $casesensitive = false;
-    /** @var bool Show suggestions by default - but this can be turned off. */
-    protected $showsuggestions = true;
-    /** @var string String that is shown when there are no selections. */
-    protected $noselectionstring = '';
-    /** @var string Delimiter to store values in database. */
-    protected $delimiter = ',';
-    /** @var string Should be multiple choices? */
-    protected $multiple = true;
-    /** @var string The link to manage choices. */
-    protected $manageurl = true;
-    /** @var string The text to display in manage link. */
-    protected $managetext = true;
-
-    /**
-     * Constructor
-     *
-     * @param string $name unique ascii name, either 'mysetting' for settings that in config, or 'myplugin/mysetting'
-     * for ones in config_plugins.
-     * @param string $visiblename localised
-     * @param string $description long localised info
-     * @param array $defaultsetting array of selected items
-     * @param array $choices options for autocomplete field
-     * @param array $attributes settings for autocomplete field
-     */
-    public function __construct($name, $visiblename, $description, $defaultsetting, $choices, $attributes = null) {
-
-        if ($attributes === null) {
-            $attributes = [];
-        }
-
-        $this->placeholder = get_string('search');
-        $this->noselectionstring = get_string('noselection', 'form');
-        $defaultattributes = [
-                'tags',
-                'showsuggestions',
-                'placeholder',
-                'noselectionstring',
-                'ajax',
-                'casesensitive',
-                'delimiter',
-                'multiple',
-                'manageurl',
-                'managetext'
-        ];
-
-        foreach ($defaultattributes as $attributename) {
-            if (isset($attributes[$attributename])) {
-                $this->$attributename = $attributes[$attributename];
-            }
-        }
-
-        parent::__construct($name, $visiblename, $description, $defaultsetting, $choices);
-    }
-
-    /**
-     * Returns the select setting(s)
-     *
-     * @return mixed null or array. Null if no settings else array of setting(s)
-     */
-    public function get_setting() {
-        $result = $this->config_read($this->name);
-        if (is_null($result)) {
-            return null;
-        }
-        if ($result === '') {
-            return [];
-        }
-        return explode($this->delimiter, $result);
-    }
-
-    /**
-     * Saves setting(s) provided through $data
-     *
-     * @param array $data
-     */
-    public function write_setting($data) {
-        if (!is_array($data)) {
-            return ''; // Ignore it.
-        }
-        if (!$this->load_choices() || empty($this->choices)) {
-            return '';
-        }
-
-        unset($data['xxxxx']);
-
-        $save = [];
-        foreach ($data as $value) {
-            if (!array_key_exists($value, $this->choices)) {
-                continue; // Ignore it.
-            }
-            $save[] = $value;
-        }
-
-        return ($this->config_write($this->name, implode($this->delimiter, $save)) ? '' : get_string('errorsetting', 'admin'));
-    }
-
-    /**
-     * Returns XHTML autocomplete field
-     *
-     * @param array $data Array of values to select by default
-     * @param string $query
-     * @return string XHTML autocomplete field
-     */
-    public function output_html($data, $query = '') {
-        global $OUTPUT;
-
-        if (!$this->load_choices() or empty($this->choices)) {
-            return '';
-        }
-
-        $default = $this->get_defaultsetting();
-        if (empty($default)) {
-            $default = [];
-        }
-
-        if (is_null($data)) {
-            $data = [];
-        }
-
-        $context = [
-                'id' => $this->get_id(),
-                'name' => $this->get_full_name()
-        ];
-
-        $defaults = [];
-        $options = [];
-        $template = 'core_admin/local/settings/autocomplete';
-
-        foreach ($this->choices as $value => $name) {
-            if (in_array($value, $default)) {
-                $defaults[] = $name;
-            }
-            $options[] = [
-                    'value' => $value,
-                    'text' => $name,
-                    'selected' => in_array($value, $data),
-                    'disabled' => false
-            ];
-        }
-
-        $context['options'] = $options;
-        $context['tags'] = $this->tags;
-        $context['placeholder'] = $this->placeholder;
-        $context['casesensitive'] = $this->casesensitive;
-        $context['multiple'] = $this->multiple;
-        $context['showsuggestions'] = $this->showsuggestions;
-        $context['manageurl'] = $this->manageurl;
-        $context['managetext'] = $this->managetext;
-
-        if (is_null($default)) {
-            $defaultinfo = null;
-        } if (!empty($defaults)) {
-            $defaultinfo = implode(', ', $defaults);
-        } else {
-            $defaultinfo = get_string('none');
-        }
-
-        $element = $OUTPUT->render_from_template($template, $context);
-
-        return format_admin_setting($this, $this->visiblename, $element, $this->description, true, '', $defaultinfo, $query);
-    }
-}

admin/classes/local/settings/filesize.php

@@ -1,197 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * File size admin setting.
- *
- * @package    core_admin
- * @copyright  2019 Shamim Rezaie <shamim@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core_admin\local\settings;
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->libdir . '/adminlib.php');
-
-/**
- * An admin setting to support entering and displaying of file sizes in Bytes, KB, MB or GB.
- *
- * @copyright   2019 Shamim Rezaie <shamim@moodle.com>
- * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class filesize extends \admin_setting {
-
-    /** @var int The byte unit. Number of bytes in a byte */
-    const UNIT_B = 1;
-
-    /** @var int The kilobyte unit (number of bytes in a kilobyte) */
-    const UNIT_KB = 1024;
-
-    /** @var int The megabyte unit (number of bytes in a megabyte) */
-    const UNIT_MB = 1048576;
-
-    /** @var int The gigabyte unit (number of bytes in a gigabyte) */
-    const UNIT_GB = 1073741824;
-
-    /** @var int default size unit */
-    protected $defaultunit;
-
-    /**
-     * Constructor
-     *
-     * @param string    $name           unique ascii name, either 'mysetting' for settings that in config,
-     *                                  or 'myplugin/mysetting' for ones in config_plugins.
-     * @param string    $visiblename    localised name
-     * @param string    $description    localised long description
-     * @param int|null  $defaultvalue   Value of the settings in bytes
-     * @param int|null  $defaultunit    GB, MB, etc. (in bytes)
-     */
-    public function __construct(string $name, string $visiblename, string $description,
-            int $defaultvalue = null, int $defaultunit = null) {
-
-        $defaultsetting = self::parse_bytes($defaultvalue);
-
-        if ($defaultunit && array_key_exists($defaultunit, self::get_units())) {
-            $this->defaultunit = $defaultunit;
-        } else {
-            $this->defaultunit = self::UNIT_MB;
-        }
-        parent::__construct($name, $visiblename, $description, $defaultsetting);
-    }
-
-    /**
-     * Returns selectable units.
-     *
-     * @return  array
-     */
-    protected static function get_units(): array {
-        return [
-            self::UNIT_GB => get_string('sizegb'),
-            self::UNIT_MB => get_string('sizemb'),
-            self::UNIT_KB => get_string('sizekb'),
-            self::UNIT_B  => get_string('sizeb'),
-        ];
-    }
-
-    /**
-     * Converts bytes to some more user friendly string.
-     *
-     * @param   int     $bytes  The number of bytes we want to convert from
-     * @return  string
-     */
-    protected static function get_size_text(int $bytes): string {
-        if (empty($bytes)) {
-            return get_string('none');
-        }
-        return display_size($bytes, 0);
-    }
-
-    /**
-     * Finds suitable units for given file size.
-     *
-     * @param   int     $bytes  The number of bytes
-     * @return  array           Parsed file size in the format of ['v' => value, 'u' => unit]
-     */
-    protected static function parse_bytes(int $bytes): array {
-        foreach (self::get_units() as $unit => $unused) {
-            if ($bytes % $unit === 0) {
-                return ['v' => (int)($bytes / $unit), 'u' => $unit];
-            }
-        }
-        return ['v' => (int)$bytes, 'u' => self::UNIT_B];
-    }
-
-    /**
-     * Get the selected file size as array.
-     *
-     * @return  array|null  An array containing 'v' => xx, 'u' => xx, or null if not set
-     */
-    public function get_setting(): ?array {
-        $bytes = $this->config_read($this->name);
-        if (is_null($bytes)) {
-            return null;
-        }
-        $bytes = intval($bytes);
-
-        return self::parse_bytes($bytes);
-    }
-
-    /**
-     * Store the file size as bytes.
-     *
-     * @param   array   $data   Must be form 'h' => xx, 'm' => xx
-     * @return  string          The error string if any
-     */
-    public function write_setting($data): string {
-        if (!is_array($data)) {
-            return '';
-        }
-
-        if (!is_numeric($data['v']) || $data['v'] < 0) {
-            return get_string('errorsetting', 'admin');
-        }
-
-        // Calculate size in bytes, ensuring we don't overflow PHP_INT_MAX.
-        $bytes = $data['v'] * $data['u'];
-        $result = (is_int($bytes) && $this->config_write($this->name, $bytes));
-
-        return ($result ? '' : get_string('errorsetting', 'admin'));
-    }
-
-    /**
-     * Returns file size text+select fields.
-     *
-     * @param   array   $data   The current setting value. Must be form 'v' => xx, 'u' => xx.
-     * @param   string  $query  Admin search query to be highlighted.
-     * @return  string          File size text+select fields and wrapping div(s).
-     */
-    public function output_html($data, $query = ''): string {
-        global $OUTPUT;
-
-        $default = $this->get_defaultsetting();
-        if (is_number($default)) {
-            $defaultinfo = self::get_size_text($default);
-        } else if (is_array($default)) {
-            $defaultinfo = self::get_size_text($default['v'] * $default['u']);
-        } else {
-            $defaultinfo = null;
-        }
-
-        $inputid = $this->get_id() . 'v';
-        $units = self::get_units();
-        $defaultunit = $this->defaultunit;
-
-        $context = (object) [
-            'id' => $this->get_id(),
-            'name' => $this->get_full_name(),
-            'value' => $data['v'],
-            'readonly' => $this->is_readonly(),
-            'options' => array_map(function($unit, $title) use ($data, $defaultunit) {
-                return [
-                    'value' => $unit,
-                    'name' => $title,
-                    'selected' => ($data['v'] == 0 && $unit == $defaultunit) || $unit == $data['u']
-                ];
-            }, array_keys($units), $units)
-        ];
-
-        $element = $OUTPUT->render_from_template('core_admin/setting_configfilesize', $context);
-
-        return format_admin_setting($this, $this->visiblename, $element, $this->description, $inputid, '', $defaultinfo, $query);
-    }
-}

admin/classes/local/settings/linkable_settings_page.php

@@ -1,37 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * A settings page which can be viewed with a link directly.
- *
- * @package    core_admin
- * @copyright  2021 Andrew Lyons <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core_admin\local\settings;
-
-use moodle_url;
-
-interface linkable_settings_page {
-
-    /**
-     * Get the URL to view this settings page.
-     *
-     * @return moodle_url
-     */
-    public function get_settings_page_url(): moodle_url;
-}

admin/classes/local/settings/manage_payment_gateway_plugins.php

@@ -1,74 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Payment gateway admin setting.
- *
- * @package    core_admin
- * @copyright  2020 Shamim Rezaie <shamim@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core_admin\local\settings;
-
-/**
- * Generic class for managing plugins in a table that allows re-ordering and enable/disable of each plugin.
- */
-class manage_payment_gateway_plugins extends \admin_setting_manage_plugins {
-    /**
-     * Get the admin settings section title (use get_string).
-     *
-     * @return string
-     */
-    public function get_section_title() {
-        return get_string('type_paygw_plural', 'plugin');
-    }
-
-    /**
-     * Get the type of plugin to manage.
-     *
-     * @return string
-     */
-    public function get_plugin_type() {
-        return 'paygw';
-    }
-
-    /**
-     * Get the name of the second column.
-     *
-     * @return string
-     */
-    public function get_info_column_name() {
-        return get_string('supportedcurrencies', 'core_payment');
-    }
-
-    /**
-     * Get the type of plugin to manage.
-     *
-     * @param plugininfo The plugin info class.
-     * @return string
-     */
-    public function get_info_column($plugininfo) {
-        $codes = $plugininfo->get_supported_currencies();
-
-        $currencies = [];
-        foreach ($codes as $c) {
-            $currencies[$c] = new \lang_string($c, 'core_currencies');
-        }
-
-        return implode(get_string('listsep', 'langconfig') . ' ', $currencies);
-    }
-}

admin/classes/local/settings/setting_scheduled_task_status.php

@@ -1,121 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Admin setting to show current scheduled task's status.
- *
- * @package core
- * @copyright 2021 Universitat Rovira i Virgili
- * @author Jordi Pujol-Ahulló <jpahullo@gmail.com>
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-namespace core_admin\local\settings;
-
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-require_once($CFG->libdir . '/adminlib.php');
-require_once($CFG->libdir . '/moodlelib.php');
-
-use admin_setting_description;
-use core\task\manager;
-use core\task\scheduled_task;
-use html_writer;
-use lang_string;
-use moodle_url;
-use stdClass;
-
-/**
- * This admin setting tells whether a given scheduled task is enabled, providing a link to its configuration page.
- *
- * The goal of this setting is to help contextualizing the configuration settings with related scheduled task status,
- * providing the big picture of that part of the system.
- *
- * @package core
- * @copyright 2021 Universitat Rovira i Virgili
- * @author Jordi Pujol-Ahulló <jpahullo@gmail.com>
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class setting_scheduled_task_status extends admin_setting_description {
-    /**
-     * @var string fully qualified class name of a scheduled task.
-     */
-    private $classname;
-    /**
-     * @var string additional text to append to the description.
-     */
-    private $extradescription;
-
-    /**
-     * setting_scheduled_task_status constructor.
-     * @param string $name unique setting name.
-     * @param string $scheduledtaskclassname full classpath class name of the scheduled task.
-     * @param string $extradescription extra detail to append to the scheduled task status to add context in the setting
-     * page.
-     */
-    public function __construct(string $name, string $scheduledtaskclassname, string $extradescription = '') {
-        $visiblename = new lang_string('task_status', 'admin');
-        $this->classname = $scheduledtaskclassname;
-        $this->extradescription = $extradescription;
-
-        parent::__construct($name, $visiblename, '');
-    }
-
-    /**
-     * Calculates lazily the content of the description.
-     * @param mixed $data nothing expected in this case.
-     * @param string $query nothing expected in this case.
-     * @return string the HTML content to print for this setting.
-     */
-    public function output_html($data, $query = ''): string {
-        if (empty($this->description)) {
-            $this->description = $this->get_task_description();
-        }
-
-        return parent::output_html($data, $query);
-    }
-
-    /**
-     * Returns the HTML to print as the description.
-     * @return string description to be printed.
-     */
-    private function get_task_description(): string {
-        $task = manager::get_scheduled_task($this->classname);
-        if ($task->is_enabled()) {
-            $taskenabled = get_string('enabled', 'admin');
-        } else {
-            $taskenabled = get_string('disabled', 'admin');
-        }
-        $taskenabled = strtolower($taskenabled);
-        $gotourl = new moodle_url(
-            '/admin/tool/task/scheduledtasks.php',
-            [],
-            scheduled_task::get_html_id($this->classname)
-        );
-        if (!empty($this->extradescription)) {
-            $this->extradescription = '<br />' . $this->extradescription;
-        }
-
-        $taskdetail = new stdClass();
-        $taskdetail->class = $this->classname;
-        $taskdetail->name = $task->get_name();
-        $taskdetail->status = $taskenabled;
-        $taskdetail->gotourl = $gotourl->out(false);
-        $taskdetail->extradescription = $this->extradescription;
-
-        return html_writer::tag('p', get_string('task_status_desc', 'admin', $taskdetail));
-    }
-}

admin/classes/local/systemreports/task_logs.php

@@ -1,158 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-namespace core_admin\local\systemreports;
-
-use context_system;
-use core_admin\local\entities\task_log;
-use core_reportbuilder\local\entities\user;
-use core_reportbuilder\local\report\action;
-use lang_string;
-use moodle_url;
-use pix_icon;
-use core_reportbuilder\system_report;
-
-/**
- * Task logs system report class implementation
- *
- * @package    core_admin
- * @copyright  2021 David Matamoros <davidmc@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class task_logs extends system_report {
-
-    /**
-     * Initialise report, we need to set the main table, load our entities and set columns/filters
-     */
-    protected function initialise(): void {
-        // Our main entity, it contains all of the column definitions that we need.
-        $entitymain = new task_log();
-        $entitymainalias = $entitymain->get_table_alias('task_log');
-
-        $this->set_main_table('task_log', $entitymainalias);
-        $this->add_entity($entitymain);
-
-        // Any columns required by actions should be defined here to ensure they're always available.
-        $this->add_base_fields("{$entitymainalias}.id");
-
-        // We can join the "user" entity to our "main" entity and use the fullname column from the user entity.
-        $entityuser = new user();
-        $entituseralias = $entityuser->get_table_alias('user');
-        $this->add_entity($entityuser->add_join(
-            "LEFT JOIN {user} {$entituseralias} ON {$entituseralias}.id = {$entitymainalias}.userid"
-        ));
-
-        // Now we can call our helper methods to add the content we want to include in the report.
-        $this->add_columns();
-        $this->add_filters();
-        $this->add_actions();
-
-        // Set if report can be downloaded.
-        $this->set_downloadable(true, get_string('tasklogs', 'admin'));
-    }
-
-    /**
-     * Validates access to view this report
-     *
-     * @return bool
-     */
-    protected function can_view(): bool {
-        return has_capability('moodle/site:config', context_system::instance());
-    }
-
-    /**
-     * Get the visible name of the report
-     *
-     * @return string
-     */
-    public static function get_name(): string {
-        return get_string('entitytasklog', 'admin');
-    }
-
-    /**
-     * Adds the columns we want to display in the report
-     *
-     * They are all provided by the entities we previously added in the {@see initialise} method, referencing each by their
-     * unique identifier
-     */
-    public function add_columns(): void {
-        $columns = [
-            'task_log:name',
-            'task_log:type',
-            'user:fullname',
-            'task_log:starttime',
-            'task_log:duration',
-            'task_log:hostname',
-            'task_log:pid',
-            'task_log:database',
-            'task_log:result',
-        ];
-
-        $this->add_columns_from_entities($columns);
-
-        // It's possible to override the display name of a column, if you don't want to use the value provided by the entity.
-        if ($column = $this->get_column('user:fullname')) {
-            $column->set_title(new lang_string('user', 'admin'));
-        }
-
-        // It's possible to set a default initial sort direction for one column.
-        $this->set_initial_sort_column('task_log:starttime', SORT_DESC);
-    }
-
-    /**
-     * Adds the filters we want to display in the report
-     *
-     * They are all provided by the entities we previously added in the {@see initialise} method, referencing each by their
-     * unique identifier
-     */
-    protected function add_filters(): void {
-        $filters = [
-            'task_log:name',
-            'task_log:output',
-            'task_log:result',
-            'task_log:timestart',
-            'task_log:duration',
-        ];
-
-        $this->add_filters_from_entities($filters);
-    }
-
-    /**
-     * Add the system report actions. An extra column will be appended to each row, containing all actions added here
-     *
-     * Note the use of ":id" placeholder which will be substituted according to actual values in the row
-     */
-    protected function add_actions(): void {
-
-        // Action to view individual task log on a popup window.
-        $this->add_action((new action(
-            new moodle_url('/admin/tasklogs.php', ['logid' => ':id']),
-            new pix_icon('e/search', ''),
-            [],
-            true,
-            new lang_string('view'),
-        )));
-
-        // Action to download individual task log.
-        $this->add_action((new action(
-            new moodle_url('/admin/tasklogs.php', ['logid' => ':id', 'download' => true]),
-            new pix_icon('t/download', ''),
-            [],
-            false,
-            new lang_string('download'),
-        )));
-    }
-}

admin/classes/privacy/provider.php

@@ -1,41 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-/**
- * Privacy Subsystem implementation for core_admin.
- *
- * @package    core_admin
- * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-namespace core_admin\privacy;
-defined('MOODLE_INTERNAL') || die();
-/**
- * Privacy Subsystem for core_admin implementing null_provider.
- *
- * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class provider implements \core_privacy\local\metadata\null_provider {
-    /**
-     * Get the language string identifier with the component's language
-     * file to explain why this plugin stores no data.
-     *
-     * @return  string
-     */
-    public static function get_reason() : string {
-        return 'privacy:metadata';
-    }
-}

admin/cli/adhoc_task.php

@@ -1,131 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Task executor for adhoc tasks.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__ . '/../../config.php');
-require_once("{$CFG->libdir}/clilib.php");
-require_once("{$CFG->libdir}/cronlib.php");
-
-list($options, $unrecognized) = cli_get_params(
-    [
-        'execute' => false,
-        'help' => false,
-        'keep-alive' => 0,
-        'showsql' => false,
-        'showdebugging' => false,
-        'ignorelimits' => false,
-        'force' => false,
-    ], [
-        'h' => 'help',
-        'e' => 'execute',
-        'k' => 'keep-alive',
-        'i' => 'ignorelimits',
-        'f' => 'force',
-    ]
-);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help'] or empty($options['execute'])) {
-    $help = <<<EOT
-Ad hoc cron tasks.
-
-Options:
- -h, --help                Print out this help
-     --showsql             Show sql queries before they are executed
-     --showdebugging       Show developer level debugging information
- -e, --execute             Run all queued adhoc tasks
- -k, --keep-alive=N        Keep this script alive for N seconds and poll for new adhoc tasks
- -i  --ignorelimits        Ignore task_adhoc_concurrency_limit and task_adhoc_max_runtime limits
- -f, --force               Run even if cron is disabled
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/adhoc_task.php --execute
-
-EOT;
-
-    echo $help;
-    die;
-}
-
-if ($options['showdebugging']) {
-    set_debugging(DEBUG_DEVELOPER, true);
-}
-
-if ($options['showsql']) {
-    $DB->set_debug(true);
-}
-
-if (CLI_MAINTENANCE) {
-    echo "CLI maintenance mode active, cron execution suspended.\n";
-    exit(1);
-}
-
-if (moodle_needs_upgrading()) {
-    echo "Moodle upgrade pending, cron execution suspended.\n";
-    exit(1);
-}
-
-if (empty($options['execute'])) {
-    exit(0);
-}
-
-if (!get_config('core', 'cron_enabled') && !$options['force']) {
-    mtrace('Cron is disabled. Use --force to override.');
-    exit(1);
-}
-
-if (empty($options['keep-alive'])) {
-    $options['keep-alive'] = 0;
-}
-
-if (!empty($CFG->showcronsql)) {
-    $DB->set_debug(true);
-}
-if (!empty($CFG->showcrondebugging)) {
-    set_debugging(DEBUG_DEVELOPER, true);
-}
-
-$checklimits = empty($options['ignorelimits']);
-
-core_php_time_limit::raise();
-
-// Increase memory limit.
-raise_memory_limit(MEMORY_EXTRA);
-
-// Emulate normal session - we use admin account by default.
-cron_setup_user();
-
-$humantimenow = date('r', time());
-$keepalive = (int)$options['keep-alive'];
-
-\core\local\cli\shutdown::script_supports_graceful_exit();
-
-mtrace("Server Time: {$humantimenow}\n");
-cron_run_adhoc_tasks(time(), $keepalive, $checklimits);

admin/cli/alternative_component_cache.php

@@ -1,111 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This hack is intended for clustered sites that do not want
- * to use shared cachedir for component cache.
- *
- * This file needs to be called after any change in PHP files in dataroot,
- * that is before upgrade and install.
- *
- * @package   core
- * @copyright 2013 Petr Skoda (skodak)  {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-
-define('CLI_SCRIPT', true);
-define('ABORT_AFTER_CONFIG', true); // We need just the values from config.php.
-define('CACHE_DISABLE_ALL', true); // This prevents reading of existing caches.
-define('IGNORE_COMPONENT_CACHE', true);
-
-require(__DIR__.'/../../config.php');
-require_once($CFG->libdir.'/clilib.php');
-
-// Now get cli options.
-list($options, $unrecognized) = cli_get_params(
-    array(
-        'file'    => false,
-        'rebuild' => false,
-        'print'   => false,
-        'help'    => false
-    ),
-    array(
-        'h' => 'help'
-    )
-);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized), 2);
-}
-
-if (!$options['rebuild'] and !$options['file'] and !$options['print']) {
-    $help =
-"Create alternative component cache file
-
-Options:
--h, --help            Print out this help
---rebuild             Rebuild \$CFG->alternative_component_cache file
---file=filepath       Save component cache to file
---print               Print component cache file content
-
-Example:
-\$ php admin/cli/rebuild_alternative_component_cache.php --rebuild
-";
-
-    echo $help;
-    exit(0);
-}
-
-error_reporting(E_ALL | E_STRICT);
-ini_set('display_errors', 1);
-
-$content = core_component::get_cache_content();
-
-if ($options['print']) {
-    echo $content;
-    exit(0);
-}
-
-if ($options['rebuild']) {
-    if (empty($CFG->alternative_component_cache)) {
-        fwrite(STDERR, 'config.php does not contain $CFG->alternative_component_cache setting');
-        fwrite(STDERR, "\n");
-        exit(2);
-    }
-    $target = $CFG->alternative_component_cache;
-} else {
-    $target = $options['file'];
-}
-
-if (!$target) {
-    fwrite(STDERR, "Invalid target file $target");
-    fwrite(STDERR, "\n");
-    exit(1);
-}
-
-$bytes = file_put_contents($target, $content);
-
-if (!$bytes) {
-    fwrite(STDERR, "Error writing to $target");
-    fwrite(STDERR, "\n");
-    exit(1);
-}
-
-// Success.
-echo "File $target was updated\n";
-exit(0);

admin/cli/automated_backups.php

@@ -28,7 +28,7 @@
 
 define('CLI_SCRIPT', true);
 
-require(__DIR__.'/../../config.php');
+require(dirname(dirname(dirname(__FILE__))).'/config.php');
 require_once($CFG->libdir.'/clilib.php');      // cli only functions
 require_once($CFG->libdir.'/cronlib.php');
 
@@ -75,7 +75,8 @@ if (!empty($CFG->showcronsql)) {
     $DB->set_debug(true);
 }
 if (!empty($CFG->showcrondebugging)) {
-    set_debugging(DEBUG_DEVELOPER, true);
+    $CFG->debug = DEBUG_DEVELOPER;
+    $CFG->debugdisplay = true;
 }
 
 $starttime = microtime();

admin/cli/backup.php

@@ -1,119 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This script allows to do backup.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2013 Lancaster University
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', 1);
-
-require(__DIR__.'/../../config.php');
-require_once($CFG->libdir.'/clilib.php');
-require_once($CFG->dirroot . '/backup/util/includes/backup_includes.php');
-
-// Now get cli options.
-list($options, $unrecognized) = cli_get_params(array(
-    'courseid' => false,
-    'courseshortname' => '',
-    'destination' => '',
-    'help' => false,
-    ), array('h' => 'help'));
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help'] || !($options['courseid'] || $options['courseshortname'])) {
-    $help = <<<EOL
-Perform backup of the given course.
-
-Options:
---courseid=INTEGER          Course ID for backup.
---courseshortname=STRING    Course shortname for backup.
---destination=STRING        Path where to store backup file. If not set the backup
-                            will be stored within the course backup file area.
--h, --help                  Print out this help.
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/backup.php --courseid=2 --destination=/moodle/backup/\n
-EOL;
-
-    echo $help;
-    die;
-}
-
-$admin = get_admin();
-if (!$admin) {
-    mtrace("Error: No admin account was found");
-    die;
-}
-
-// Do we need to store backup somewhere else?
-$dir = rtrim($options['destination'], '/');
-if (!empty($dir)) {
-    if (!file_exists($dir) || !is_dir($dir) || !is_writable($dir)) {
-        mtrace("Destination directory does not exists or not writable.");
-        die;
-    }
-}
-
-// Check that the course exists.
-if ($options['courseid']) {
-    $course = $DB->get_record('course', array('id' => $options['courseid']), '*', MUST_EXIST);
-} else if ($options['courseshortname']) {
-    $course = $DB->get_record('course', array('shortname' => $options['courseshortname']), '*', MUST_EXIST);
-}
-
-cli_heading('Performing backup...');
-$bc = new backup_controller(backup::TYPE_1COURSE, $course->id, backup::FORMAT_MOODLE,
-                            backup::INTERACTIVE_YES, backup::MODE_GENERAL, $admin->id);
-// Set the default filename.
-$format = $bc->get_format();
-$type = $bc->get_type();
-$id = $bc->get_id();
-$users = $bc->get_plan()->get_setting('users')->get_value();
-$anonymised = $bc->get_plan()->get_setting('anonymize')->get_value();
-$filename = backup_plan_dbops::get_default_backup_filename($format, $type, $id, $users, $anonymised);
-$bc->get_plan()->get_setting('filename')->set_value($filename);
-
-// Execution.
-$bc->finish_ui();
-$bc->execute_plan();
-$results = $bc->get_results();
-$file = $results['backup_destination']; // May be empty if file already moved to target location.
-
-// Do we need to store backup somewhere else?
-if (!empty($dir)) {
-    if ($file) {
-        mtrace("Writing " . $dir.'/'.$filename);
-        if ($file->copy_content_to($dir.'/'.$filename)) {
-            $file->delete();
-            mtrace("Backup completed.");
-        } else {
-            mtrace("Destination directory does not exist or is not writable. Leaving the backup in the course backup file area.");
-        }
-    }
-} else {
-    mtrace("Backup completed, the new file is listed in the backup area of the given course");
-}
-$bc->destroy();
-exit(0);

admin/cli/build_theme_css.php

@@ -1,119 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Build and store theme CSS.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2017 Ryan Wyllie <ryan@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__.'/../../config.php');
-require_once("$CFG->libdir/clilib.php");
-require_once("$CFG->libdir/csslib.php");
-require_once("$CFG->libdir/outputlib.php");
-
-$longparams = [
-    'themes'    => null,
-    'direction' => null,
-    'help'      => false,
-    'verbose'   => false
-];
-
-$shortmappings = [
-    't' => 'themes',
-    'd' => 'direction',
-    'h' => 'help',
-    'v' => 'verbose'
-];
-
-// Get CLI params.
-list($options, $unrecognized) = cli_get_params($longparams, $shortmappings);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help']) {
-    echo
-"Compile the CSS for one or more installed themes.
-Existing CSS caches will replaced.
-By default all themes will be recompiled unless otherwise specified.
-
-Options:
--t, --themes    A comma separated list of themes to be compiled
--d, --direction Only compile a single direction (either ltr or rtl)
--v, --verbose   Print info comments to stdout
--h, --help      Print out this help
-
-Example:
-\$ sudo -u www-data /usr/bin/php admin/cli/build_theme_css.php --themes=boost --direction=ltr
-";
-
-    die;
-}
-
-if (empty($options['verbose'])) {
-    $trace = new null_progress_trace();
-} else {
-    $trace = new text_progress_trace();
-}
-
-cli_heading('Build theme css');
-
-// Determine which themes we need to build.
-$themenames = [];
-if (is_null($options['themes'])) {
-    $trace->output('No themes specified. Finding all installed themes.');
-    $themenames = array_keys(core_component::get_plugin_list('theme'));
-} else {
-    if (is_string($options['themes'])) {
-        $themenames = explode(',', $options['themes']);
-    } else {
-        cli_error('--themes must be a comma separated list of theme names');
-    }
-}
-
-$trace->output('Checking that each theme is correctly installed...');
-$themeconfigs = [];
-foreach ($themenames as $themename) {
-    if (is_null(theme_get_config_file_path($themename))) {
-        cli_error("Unable to find theme config for {$themename}");
-    }
-
-    // Load the config for the theme.
-    $themeconfigs[] = theme_config::load($themename);
-}
-
-$directions = ['ltr', 'rtl'];
-
-if (!is_null($options['direction'])) {
-    if (!in_array($options['direction'], $directions)) {
-         cli_error("--direction must be either ltr or rtl");
-    }
-
-    $directions = [$options['direction']];
-}
-
-$trace->output('Building CSS for themes: ' . implode(', ', $themenames));
-theme_build_css_for_themes($themeconfigs, $directions);
-
-exit(0);

admin/cli/cfg.php

@@ -1,185 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * CLI script allowing to get and set config values.
- *
- * This is technically just a thin wrapper for {@link get_config()} and
- * {@link set_config()} functions.
- *
- * @package     core
- * @subpackage  cli
- * @copyright   2017 David Mudrák <david@moodle.com>
- * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__.'/../../config.php');
-require_once($CFG->libdir.'/clilib.php');
-
-$usage = "Displays the current value of the given site setting. Allows to set it to the given value, too.
-
-Usage:
-    # php cfg.php [--component=<componentname>] [--json] [--shell-arg]
-    # php cfg.php --name=<configname> [--component=<componentname>] [--shell-arg] [--no-eol]
-    # php cfg.php --name=<configname> [--component=<componentname>] --set=<value>
-    # php cfg.php --name=<configname> [--component=<componentname>] --unset
-    # php cfg.php [--help|-h]
-
-Options:
-    -h --help                   Print this help.
-    --component=<frankenstyle>  Name of the component the variable is part of. Defaults to core.
-    --name=<configname>         Name of the configuration variable to get/set. If missing, print all
-                                configuration variables of the given component.
-    --set=<value>               Set the given variable to this value.
-    --unset                     Unset the given variable.
-    --shell-arg                 Escape output values so that they can be directly used as shell script arguments.
-    --json                      Encode output list of values using JSON notation.
-    --no-eol                    Do not include the trailing new line character when printing the value.
-
-The list of all variables of the given component can be printed as
-tab-separated list (default) or JSON object (--json). Particular values are
-printed as raw text values, optionally escaped so that they can be directly
-used as shell script arguments (--shell-arg). Single values are displayed with
-trailing new line by default, unless explicitly disabled (--no-eol).
-
-In the read mode, the script exits with success status 0 if the requested value
-is found. If the requested variable is not set, the script exits with status 3.
-When listing all variables of the component, the exit status is always 0 even
-if no variables for the given component are found. When setting/unsetting a
-value, the exit status is 0. When attempting to set/unset a value that has
-already been hard-set in config.php, the script exits with error status 4. In
-case of unexpected error, the script exits with error status 1.
-
-Examples:
-
-    # php cfg.php
-        Prints tab-separated list of all core configuration variables and their values.
-
-    # php cfg.php --json
-        Prints list of all core configuration variables and their values as a JSON object.
-
-    # php cfg.php --name=release
-        Prints the given configuration variable - e.g. \$CFG->release in this case.
-
-    # php cfg.php --component=tool_recyclebin
-    #   Prints tab-separated list of the plugin's configuration variables.
-
-    # export DATAROOT=\$(php cfg.php --name=dataroot --shell-arg --no-eol)
-        Stores the given configuration variable in the shell variable, escaped
-        so that it can be safely used as a shell argument.
-
-    # php cfg.php --name=theme --set=classic
-        Sets the given configuration variable to the given value.
-
-    # php cfg.php --name=noemailever --unset
-        Unsets the previously configured variable.
-";
-
-list($options, $unrecognised) = cli_get_params([
-    'help' => false,
-    'component' => null,
-    'name' => null,
-    'set' => null,
-    'unset' => false,
-    'shell-arg' => false,
-    'json' => false,
-    'no-eol' => false,
-], [
-    'h' => 'help'
-]);
-
-if ($unrecognised) {
-    $unrecognised = implode(PHP_EOL.'  ', $unrecognised);
-    cli_error(get_string('cliunknowoption', 'core_admin', $unrecognised));
-}
-
-if ($options['help']) {
-    cli_writeln($usage);
-    exit(2);
-}
-
-if ($options['unset'] || $options['set'] !== null) {
-    // Unset the variable or set it to the given value.
-    if (empty($options['name'])) {
-        cli_error('Missing configuration variable name', 2);
-    }
-
-    // Check that the variable is not hard-set in the main config.php already.
-    $component = $options['component'];
-    if (!empty($component)) {
-        $componentsettings = $CFG->forced_plugin_settings[$component] ?? [];
-        $settinginconfig = array_key_exists($options['name'], $componentsettings);
-    } else {
-        $settinginconfig = array_key_exists($options['name'], $CFG->config_php_settings);
-    }
-    if ($settinginconfig) {
-        cli_error('The configuration variable is hard-set in the config.php, unable to change.', 4);
-    }
-
-    $new = $options['set'];
-    $old = get_config($options['component'], $options['name']);
-    if ($new !== $old) {
-        set_config($options['name'], $options['set'], $options['component']);
-        add_to_config_log($options['name'], $old, $new, $options['component']);
-    }
-    exit(0);
-}
-
-if ($options['name'] === null) {
-    // List all variables provided by the component (defaults to core).
-    $got = get_config($options['component']);
-
-    if ($options['json']) {
-        cli_writeln(json_encode($got));
-
-    } else {
-        foreach ($got as $name => $value) {
-            if ($options['shell-arg']) {
-                $value = escapeshellarg($value);
-            }
-            cli_writeln($name."\t".$value);
-        }
-    }
-
-    exit(0);
-
-} else {
-    // Display the value of a single variable.
-
-    $got = get_config($options['component'], $options['name']);
-
-    if ($got === false) {
-        cli_error('No such configuration variable found.', 3);
-    }
-
-    if ($options['shell-arg']) {
-        $got = escapeshellarg($got);
-    }
-
-    if ($options['json']) {
-        $got = json_encode($got);
-    }
-
-    if ($options['no-eol']) {
-        cli_write($got);
-    } else {
-        cli_writeln($got);
-    }
-
-    exit(0);
-}

admin/cli/check_database_schema.php

@@ -1,76 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Validate that the current db structure matches the install.xml files.
- *
- * @package   core
- * @copyright 2014 Totara Learning Solutions Ltd {@link http://www.totaralms.com/}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @author    Petr Skoda <petr.skoda@totaralms.com>
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__ . '/../../config.php');
-require_once($CFG->libdir.'/clilib.php');
-
-$help = "Validate database structure
-
-Options:
--h, --help            Print out this help.
-
-Example:
-\$ sudo -u www-data /usr/bin/php admin/cli/check_database_schema.php
-";
-
-list($options, $unrecognized) = cli_get_params(
-    array(
-        'help' => false,
-    ),
-    array(
-        'h' => 'help',
-    )
-);
-
-if ($options['help']) {
-    echo $help;
-    exit(0);
-}
-
-if (empty($CFG->version)) {
-    echo "Database is not yet installed.\n";
-    exit(2);
-}
-
-$dbmanager = $DB->get_manager();
-$schema = $dbmanager->get_install_xml_schema();
-
-if (!$errors = $dbmanager->check_database_schema($schema)) {
-    echo "Database structure is ok.\n";
-    exit(0);
-}
-
-foreach ($errors as $table => $items) {
-    cli_separator();
-    echo "$table\n";
-    foreach ($items as $item) {
-        echo " * $item\n";
-    }
-}
-cli_separator();
-
-exit(1);

admin/cli/checks.php

@@ -1,171 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * CLI tool for system checks
- *
- * @package    core
- * @category   check
- * @copyright  2020 Brendan Heywood (brendan@catalyst-au.net)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__ . '/../../config.php');
-require_once($CFG->libdir.'/clilib.php');
-
-use core\check\result;
-
-list($options, $unrecognized) = cli_get_params([
-    'help'    => false,
-    'filter'  => '',
-    'type'    => 'status',
-    'verbose' => false,
-], [
-    'h' => 'help',
-    'f' => 'filter',
-    'v' => 'verbose',
-    't' => 'type',
-]);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-$checks = \core\check\manager::get_checks($options['type']);
-$types = join(', ', \core\check\manager::TYPES);
-
-$help = "Run Moodle system checks
-
-Options:
- -h, --help      Print out this help
- -f, --filter    Filter to a subset of checks
- -t, --type      Which set of checks? Defaults to 'status'
-                 One of $types
- -v, --verbose   Show details of all checks, not just failed checks
-
-Example:
-
-  sudo -u www-data php admin/cli/checks.php
-  sudo -u www-data php admin/cli/checks.php -v
-  sudo -u www-data php admin/cli/checks.php -v --filter=environment
-
-";
-
-if ($options['help']) {
-    echo $help;
-    die();
-}
-
-$filter = $options['filter'];
-if ($filter) {
-    $checks = array_filter($checks, function($check, $key) use ($filter) {
-        $ref = $check->get_ref();
-        return (strpos($ref, $filter) !== false);
-    }, 1);
-}
-
-// These shell exit codes and labels align with the NRPE standard.
-$exitcodes = [
-    result::NA        => 0,
-    result::OK        => 0,
-    result::INFO      => 0,
-    result::UNKNOWN   => 3,
-    result::WARNING   => 1,
-    result::ERROR     => 2,
-    result::CRITICAL  => 2,
-];
-$exitlabel = [
-    result::NA        => 'OK',
-    result::OK        => 'OK',
-    result::INFO      => 'OK',
-    result::UNKNOWN   => 'UNKNOWN',
-    result::WARNING   => 'WARNING',
-    result::ERROR     => 'CRITICAL',
-    result::CRITICAL  => 'CRITICAL',
-];
-
-$format = "%      10s| % -60s\n";
-$spacer = "----------+--------------------------------------------------------------------\n";
-$prefix = '          |';
-
-$output = '';
-$header = $exitlabel[result::OK] . ': ' . get_string('checksok', '', $options['type']) . "\n";
-$exitcode = $exitcodes[result::OK];
-
-foreach ($checks as $check) {
-    $ref = $check->get_ref();
-    $result = $check->get_result();
-
-    $status = $result->get_status();
-    $checkexitcode = $exitcodes[$status];
-
-    // Summary is treated as html.
-    $summary = $result->get_summary();
-    $summary = html_to_text($summary, 60, false);
-
-    if ($checkexitcode > $exitcode) {
-        $exitcode = $checkexitcode;
-        $header = $exitlabel[$status] . ': ' . $check->get_name() . " (" . $check->get_ref() . ")\n";
-    }
-
-    if (empty($messages[$status])) {
-        $messages[$status] = $result;
-    }
-
-    $len = strlen(get_string('status' . $status));
-
-    if ($options['verbose'] ||
-        $status == result::WARNING ||
-        $status == result::CRITICAL ||
-        $status == result::ERROR) {
-
-        $output .= sprintf(
-            $format,
-            $OUTPUT->check_result($result),
-            sprintf('%s (%s)', $check->get_name(), $ref)
-        );
-
-        $summary = str_replace("\n", "\n" . $prefix . '     ', $summary);
-        $output .= sprintf( $format, '', '    ' . $summary);
-
-        if ($options['verbose']) {
-            $actionlink = $check->get_action_link();
-            if ($actionlink) {
-                $output .= sprintf( $format, '', '    ' . $actionlink->url);
-            }
-            $output .= sprintf( $format, '', '');
-        }
-    }
-}
-
-// Print NRPE header.
-print $header;
-
-// Only show the table header if there is anything to show.
-if ($output) {
-    print sprintf($format,
-        get_string('status'). ' ',
-        get_string('check')
-    ) .  $spacer;
-    print $output;
-}
-
-// NRPE shell exit code.
-exit($exitcode);
-

admin/cli/cron.php

@@ -30,30 +30,13 @@
 
 define('CLI_SCRIPT', true);
 
-require(__DIR__.'/../../config.php');
+require(dirname(dirname(dirname(__FILE__))).'/config.php');
 require_once($CFG->libdir.'/clilib.php');      // cli only functions
 require_once($CFG->libdir.'/cronlib.php');
 
 // now get cli options
-list($options, $unrecognized) = cli_get_params(
-    [
-        'help' => false,
-        'stop' => false,
-        'list' => false,
-        'force' => false,
-        'enable' => false,
-        'disable' => false,
-        'disable-wait' => false,
-    ], [
-        'h' => 'help',
-        's' => 'stop',
-        'l' => 'list',
-        'f' => 'force',
-        'e' => 'enable',
-        'd' => 'disable',
-        'w' => 'disable-wait',
-    ]
-);
+list($options, $unrecognized) = cli_get_params(array('help'=>false),
+                                               array('h'=>'help'));
 
 if ($unrecognized) {
     $unrecognized = implode("\n  ", $unrecognized);
@@ -65,13 +48,7 @@ if ($options['help']) {
 "Execute periodic cron actions.
 
 Options:
--h, --help               Print out this help
--s, --stop               Notify all other running cron processes to stop after the current task
--l, --list               Show the list of currently running tasks and how long they have been running
--f, --force              Execute task even if cron is disabled
--e, --enable             Enable cron
--d, --disable            Disable cron
--w, --disable-wait=600   Disable cron and wait until all tasks finished or fail after N seconds (optional param)
+-h, --help            Print out this help
 
 Example:
 \$sudo -u www-data /usr/bin/php admin/cli/cron.php
@@ -81,98 +58,4 @@ Example:
     die;
 }
 
-if ($options['stop']) {
-    // By clearing the caches this signals to other running processes
-    // to exit after finishing the current task.
-    \core\task\manager::clear_static_caches();
-    die;
-}
-
-if ($options['enable']) {
-    set_config('cron_enabled', 1);
-    mtrace('Cron has been enabled for the site.');
-    exit(0);
-}
-
-if ($options['disable']) {
-    set_config('cron_enabled', 0);
-    \core\task\manager::clear_static_caches();
-    mtrace('Cron has been disabled for the site.');
-    exit(0);
-}
-
-if ($options['list']) {
-    $tasks = \core\task\manager::get_running_tasks();
-    mtrace('The list of currently running tasks:');
-    $format = "%7s %-12s %-9s %-20s %-52s\n";
-    printf ($format,
-        'PID',
-        'HOST',
-        'TYPE',
-        'TIME',
-        'CLASSNAME'
-    );
-    foreach ($tasks as $task) {
-        printf ($format,
-            $task->pid,
-            substr($task->hostname, 0, 12),
-            $task->type,
-            format_time(time() - $task->timestarted),
-            substr($task->classname, 0, 52)
-        );
-    }
-    exit(0);
-}
-
-if ($wait = $options['disable-wait']) {
-    $started = time();
-    if (true === $wait) {
-        // Default waiting time.
-        $waitsec = 600;
-    } else {
-        $waitsec = $wait;
-        $wait = true;
-    }
-
-    set_config('cron_enabled', 0);
-    \core\task\manager::clear_static_caches();
-    mtrace('Cron has been disabled for the site.');
-    mtrace('Allocating '. format_time($waitsec) . ' for the tasks to finish.');
-
-    $lastcount = 0;
-    while ($wait) {
-        $tasks = \core\task\manager::get_running_tasks();
-
-        if (count($tasks) == 0) {
-            mtrace('');
-            mtrace('All scheduled and adhoc tasks finished.');
-            exit(0);
-        }
-
-        if (time() - $started >= $waitsec) {
-            mtrace('');
-            mtrace('Wait time ('. format_time($waitsec) . ') elapsed, but ' . count($tasks) . ' task(s) still running.');
-            mtrace('Exiting with code 1.');
-            exit(1);
-        }
-
-        if (count($tasks) !== $lastcount) {
-            mtrace('');
-            mtrace(count($tasks) . " tasks currently running.", '');
-            $lastcount = count($tasks);
-        } else {
-            mtrace('.', '');
-        }
-
-        sleep(1);
-    }
-}
-
-if (!get_config('core', 'cron_enabled') && !$options['force']) {
-    mtrace('Cron is disabled. Use --force to override.');
-    exit(1);
-}
-
-\core\local\cli\shutdown::script_supports_graceful_exit();
-
 cron_run();

admin/cli/dashboard_reset.php

@@ -1,65 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * CLI script to reset dashboards.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2021 Brendan Heywood (brendan@catalyst-au.net)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__.'/../../config.php');
-require_once($CFG->libdir.'/clilib.php');
-require_once($CFG->dirroot.'/my/lib.php');
-
-list($options, $unrecognized) = cli_get_params([
-    'help'    => false,
-    'execute' => false,
-], [
-    'h' => 'help',
-    'e' => 'execute',
-]);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized), 2);
-}
-
-if (!$options['execute']) {
-    $help = <<<EOF
-Resets Moodle dashboards for all users
-
-Options:
--h, --help          Print out this help
--e, --execute       Actually run the reset
-
-Example:
-\$ sudo -u www-data /usr/bin/php admin/cli/dashboard_reset.php -e
-
-EOF;
-
-    echo $help;
-    exit(0);
-}
-
-$progressbar = new progress_bar();
-$progressbar->create();
-my_reset_page_for_all_users(MY_PAGE_PRIVATE, 'my-index', $progressbar);
-

admin/cli/fix_course_sequence.php

@@ -1,125 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This script fixed incorrectly deleted users.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2013 Marina Glancy
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__.'/../../config.php');
-require_once($CFG->libdir.'/clilib.php');
-
-// Get cli options.
-list($options, $unrecognized) = cli_get_params(
-    array(
-        'courses'           => false,
-        'fix'               => false,
-        'help'              => false
-    ),
-    array(
-        'h' => 'help',
-        'c' => 'courses',
-        'f' => 'fix'
-    )
-);
-
-if ($options['help'] || empty($options['courses'])) {
-    $help =
-"Checks and fixes that course modules and sections reference each other correctly.
-
-Compares DB fields course_sections.sequence and course_modules.section
-checking that:
-- course_sections.sequence contains each module id not more than once in the course
-- for each moduleid from course_sections.sequence the field course_modules.section
-  refers to the same section id (this means course_sections.sequence is more
-  important if they are different)
-- each module in the course is present in one of course_sections.sequence
-- section sequences do not contain non-existing course modules
-
-If there are any mismatches, the message is displayed. If --fix is specified,
-the records in DB are corrected.
-
-This script may run for a long time on big systems if called for all courses.
-
-Avoid executing the script when another user may simultaneously edit any of the
-courses being checked (recommended to run in mainenance mode).
-
-Options:
--c, --courses         List courses that need to be checked (comma-separated
-                      values or * for all). Required
--f, --fix             Fix the mismatches in DB. If not specified check only and
-                      report problems to STDERR
--h, --help            Print out this help
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/fix_course_sequence.php --courses=*
-\$sudo -u www-data /usr/bin/php admin/cli/fix_course_sequence.php --courses=2,3,4 --fix
-";
-
-    echo $help;
-    die;
-}
-
-$courseslist = preg_split('/\s*,\s*/', $options['courses'], -1, PREG_SPLIT_NO_EMPTY);
-if (in_array('*', $courseslist)) {
-    $where = '';
-    $params = array();
-} else {
-    list($sql, $params) = $DB->get_in_or_equal($courseslist, SQL_PARAMS_NAMED, 'id');
-    $where = 'WHERE id '. $sql;
-}
-$coursescount = $DB->get_field_sql('SELECT count(id) FROM {course} '. $where, $params);
-
-if (!$coursescount) {
-    cli_error('No courses found');
-}
-echo "Checking $coursescount courses...\n\n";
-
-require_once($CFG->dirroot. '/course/lib.php');
-
-$problems = array();
-$courses = $DB->get_fieldset_sql('SELECT id FROM {course} '. $where, $params);
-foreach ($courses as $courseid) {
-    $errors = course_integrity_check($courseid, null, null, true, empty($options['fix']));
-    if ($errors) {
-        if (!empty($options['fix'])) {
-            // Reset the course cache to make sure cache is recalculated next time the course is viewed.
-            rebuild_course_cache($courseid, true);
-        }
-        foreach ($errors as $error) {
-            cli_problem($error);
-        }
-        $problems[] = $courseid;
-    } else {
-        echo "Course [$courseid] is OK\n";
-    }
-}
-if (!count($problems)) {
-    echo "\n...All courses are OK\n";
-} else {
-    if (!empty($options['fix'])) {
-        echo "\n...Found and fixed ".count($problems)." courses with problems". "\n";
-    } else {
-        echo "\n...Found ".count($problems)." courses with problems. To fix run:\n";
-        echo "\$sudo -u www-data /usr/bin/php admin/cli/fix_course_sequence.php --courses=".join(',', $problems)." --fix". "\n";
-    }
-}

admin/cli/fix_deleted_users.php

@@ -73,7 +73,6 @@ foreach ($rs as $user) {
     echo "Redeleting user $user->id: $user->username ($user->email)\n";
     delete_user($user);
 }
-$rs->close();
 
 cli_heading('Deleting all leftovers');
 

admin/cli/fix_orphaned_calendar_events.php

@@ -1,138 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Fix orphaned calendar events that were broken by MDL-67494.
- *
- * This script will look for all the calendar events which userids
- * where broken by a wrong upgrade step, affecting to Moodle 3.9.5
- * and up.
- *
- * It performs checks to both:
- *    a) Detect if the site was affected (ran the wrong upgrade step).
- *    b) Look for orphaned calendar events, categorising them as:
- *       - standard: site / category / course / group / user events
- *       - subscription: events created via subscriptions.
- *       - action: normal action events, created to show common important dates.
- *       - override: user and group override events, particular, that some activities support.
- *       - custom: other events, not being any of the above, common or particular.
- * By specifying it (--fix) try to recover as many broken events (missing userid) as
- * possible. Standard, subscription, action, override events in core are fully supported but
- * override or custom events should be fixed by each plugin as far as there isn't any standard
- * API (plugin-wise) to launch a rebuild of the calendar events.
- *
- * @package core
- * @copyright 2021 onwards Simey Lameze <simey@moodle.com>
- * @license    https://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require_once(__DIR__ . '/../../config.php');
-require_once($CFG->libdir . "/clilib.php");
-require_once($CFG->libdir . '/db/upgradelib.php');
-
-// Supported options.
-$long = ['fix'  => false, 'help' => false];
-$short = ['f' => 'fix', 'h' => 'help'];
-
-// CLI options.
-[$options, $unrecognized] = cli_get_params($long, $short);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help']) {
-    $help = <<<EOT
-Fix orphaned calendar events.
-
-  This script detects calendar events that have had their
-  userid lost. By default it will perform various checks
-  and report them, showing the site status in an easy way.
-
-  Also, optionally (--fix), it wil try to recover as many
-  lost userids as possible from different sources. Note that
-  this script aims to process well-know events in core,
-  leaving custom events in 3rd part plugins mostly unmodified
-  because there isn't any consistent way to regenerate them.
-
-  For more details:  https://tracker.moodle.org/browse/MDL-71156
-
-Options:
-  -h, --help    Print out this help.
-  -f, --fix     Fix the orphaned calendar events in the DB.
-                If not specified only check and report problems to STDERR.
-
-Usage:
-  - Only report:    \$ sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_calendar_events.php
-  - Report and fix: \$ sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_calendar_events.php -f
-EOT;
-
-    cli_writeln($help);
-    die;
-}
-
-// Check various usual pre-requisites.
-if (empty($CFG->version)) {
-    cli_error('Database is not yet installed.');
-}
-
-$admin = get_admin();
-if (!$admin) {
-    cli_error('Error: No admin account was found.');
-}
-
-if (moodle_needs_upgrading()) {
-    cli_error('Moodle upgrade pending, script execution suspended.');
-}
-
-// Do everything as admin by default.
-\core\session\manager::set_user($admin);
-
-// Report current site status.
-cli_heading('Checking the site status');
-$needsfix = upgrade_calendar_site_status();
-
-// Report current calendar events status.
-cli_heading('Checking the calendar events status');
-$info = upgrade_calendar_events_status();
-$hasbadevents = $info['total']->bad > 0 || $info['total']->bad != $info['other']->bad;
-$needsfix = $needsfix || $hasbadevents;
-
-// If, selected, fix as many calendar events as possible.
-if ($options['fix']) {
-
-    // If the report has told us that the fix was not needed... ask for confirmation!
-    if (!$needsfix) {
-        cli_writeln("This site DOES NOT NEED to run the calendar events fix.");
-        $input = cli_input('Are you completely sure that you want to run the fix? (y/N)', 'N', ['y', 'Y', 'n', 'N']);
-        if (strtolower($input) != 'y') {
-            exit(0);
-        }
-        cli_writeln("");
-    }
-    cli_heading('Fixing as many as possible calendar events');
-    upgrade_calendar_events_fix_remaining($info);
-    // Report current (after fix) calendar events status.
-    cli_heading('Checking the calendar events status (after fix)');
-    upgrade_calendar_events_status();
-} else if ($needsfix) {
-    // Fix option was not provided but problem events have been found. Notify the user and provide info how to fix these events.
-    cli_writeln("This site NEEDS to run the calendar events fix!");
-    cli_writeln("To fix the calendar events, re-run this script with the --fix option.");
-}

admin/cli/fix_orphaned_question_categories.php

@@ -1,103 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This script fixes orphaned question categories.
- *
- * Orphaned question categories have had their associated context deleted
- * but the category itself remains in the database with an invalid context.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2013 Tyler Bannister (tyler.bannister@remote-learner.net)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__.'/../../config.php');
-require_once($CFG->libdir.'/clilib.php');
-require_once($CFG->libdir.'/questionlib.php');
-
-$long = array('fix'  => false, 'help' => false);
-$short = array('f' => 'fix', 'h' => 'help');
-
-// Now get cli options.
-list($options, $unrecognized) = cli_get_params($long, $short);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help']) {
-    $help =
-        "Fix orphaned question categories.
-
-        This scripts detects question categories that have had their
-        context deleted, thus severing them from their original purpose.
-
-        This script will find the orphaned categories and delete the unused
-        questions in each category found.  Used questions will not be
-        deleted, instead they will be moved to a rescue question category.
-
-        Options:
-        -h, --help            Print out this help
-        -f, --fix             Fix the orphaned question categories in the DB.
-                              If not specified only check and report problems to STDERR.
-        Example:
-        \$sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_question_categories.php
-        \$sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_question_categories.php -f
-        ";
-
-    echo $help;
-    die;
-}
-
-cli_heading('Checking for orphaned categories');
-
-
-$sql = 'SELECT qc.id, qc.contextid, qc.name
-          FROM {question_categories} qc
-     LEFT JOIN {context} c ON qc.contextid = c.id
-         WHERE c.id IS NULL';
-$categories = $DB->get_recordset_sql($sql);
-
-$i = 0;
-foreach ($categories as $category) {
-    $i += 1;
-    echo "Found orphaned category: {$category->name}\n";
-    if (!empty($options['fix'])) {
-        echo "Cleaning...";
-        // One transaction per category.
-        $transaction = $DB->start_delegated_transaction();
-        question_category_delete_safe($category);
-        $transaction->allow_commit();
-        echo "  Done!\n";
-    }
-}
-
-if (($i > 0) && !empty($options['fix'])) {
-    echo "Found and removed {$i} orphaned question categories\n";
-} else if ($i > 0) {
-    echo "Found {$i} orphaned question categories. To fix, run:\n";
-    echo "\$sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_question_categories.php --fix\n";
-} else {
-    echo "No orphaned question categories found.\n";
-}
-
-
-$categories->close();

admin/cli/generate_key.php

@@ -1,79 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Generates a secure key for the current server (presuming it does not already exist).
- *
- * @package core_admin
- * @copyright 2020 The Open University
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-use \core\encryption;
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__ . '/../../config.php');
-require_once($CFG->libdir . '/clilib.php');
-
-// Get cli options.
-[$options, $unrecognized] = cli_get_params(
-        ['help' => false, 'method' => null],
-        ['h' => 'help']);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-// TODO: MDL-71421 - Remove the openssl alternative once sodium becomes a requirement in Moodle 4.2.
-
-if ($options['help']) {
-    echo "Generate secure key
-
-This script manually creates a secure key within the secret data root folder (configured in
-config.php as \$CFG->secretdataroot). You must run it using an account with access to write
-to that folder.
-
-In normal use Moodle automatically creates the key; this script is intended when setting up
-a new Moodle system, for cases where the secure folder is not on shared storage and the key
-may be manually installed on multiple servers.
-
-Options:
--h, --help         Print out this help
---method <method>  Generate key for specified encryption method instead of default.
-                   * sodium
-                   * openssl-aes-256-ctr
-
-Example:
-php admin/cli/generate_key.php
-";
-    exit;
-}
-
-$method = $options['method'];
-
-if (encryption::key_exists($method)) {
-    echo 'Key already exists: ' . encryption::get_key_file($method) . "\n";
-    exit;
-}
-
-// Creates key with default permissions (no chmod).
-echo "Generating key...\n";
-encryption::create_key($method, false);
-
-echo "\nKey created: " . encryption::get_key_file($method) . "\n\n";
-echo "If the key folder is not shared storage, then key files should be copied to all servers.\n";

admin/cli/install.php

@@ -36,12 +36,6 @@ if (isset($_SERVER['REMOTE_ADDR'])) {
     exit(1);
 }
 
-// Force OPcache reset if used, we do not want any stale caches
-// when preparing test environment.
-if (function_exists('opcache_reset')) {
-    opcache_reset();
-}
-
 $help =
 "Command line Moodle installer, creates config.php and initializes database.
 Please note you must execute this script with the same uid as apache
@@ -64,26 +58,19 @@ Options:
 --dbname=NAME         Database name. Default is moodle
 --dbuser=USERNAME     Database user. Default is root
 --dbpass=PASSWORD     Database password. Default is blank
---dbport=NUMBER       Use database port.
---dbsocket=PATH       Use database socket, 1 means default. Available for some databases only.
+--dbsocket            Use database sockets. Available for some databases only.
 --prefix=STRING       Table prefix for above database tables. Default is mdl_
 --fullname=STRING     The fullname of the site
 --shortname=STRING    The shortname of the site
---summary=STRING      The summary to be displayed on the front page
 --adminuser=USERNAME  Username for the moodle admin account. Default is admin
 --adminpass=PASSWORD  Password for the moodle admin account,
                       required in non-interactive mode.
---adminemail=STRING   Email address for the moodle admin account.
---sitepreset=STRING   Admin site preset to be applied during the installation process.
---supportemail=STRING Email address for support and help.
---upgradekey=STRING   The upgrade key to be set in the config.php, leave empty to not set it.
 --non-interactive     No interactive questions, installation fails if any
                       problem encountered.
 --agree-license       Indicates agreement with software license,
                       required in non-interactive mode.
 --allow-unstable      Install even if the version is not marked as stable yet,
                       required in non-interactive mode.
---skip-database       Stop the installation before installing the database.
 -h, --help            Print out this help
 
 Example:
@@ -92,7 +79,7 @@ Example:
 
 
 // distro specific customisation
-$distrolibfile = __DIR__.'/../../install/distrolib.php';
+$distrolibfile = dirname(dirname(dirname(__FILE__))).'/install/distrolib.php';
 $distro = null;
 if (file_exists($distrolibfile)) {
     require_once($distrolibfile);
@@ -102,7 +89,7 @@ if (file_exists($distrolibfile)) {
 }
 
 // Nothing to do if config.php exists
-$configfile = __DIR__.'/../../config.php';
+$configfile = dirname(dirname(dirname(__FILE__))).'/config.php';
 if (file_exists($configfile)) {
     require($configfile);
     require_once($CFG->libdir.'/clilib.php');
@@ -126,11 +113,10 @@ $olddir = getcwd();
 chdir(dirname($_SERVER['argv'][0]));
 
 // Servers should define a default timezone in php.ini, but if they don't then make sure something is defined.
-if (!function_exists('date_default_timezone_set') or !function_exists('date_default_timezone_get')) {
-    fwrite(STDERR, "Timezone functions are not available.\n");
-    exit(1);
+// This is a quick hack.  Ideally we should ask the admin for a value.  See MDL-22625 for more on this.
+if (function_exists('date_default_timezone_set') and function_exists('date_default_timezone_get')) {
+    @date_default_timezone_set(@date_default_timezone_get());
 }
-date_default_timezone_set(@date_default_timezone_get());
 
 // make sure PHP errors are displayed - helps with diagnosing of problems
 @error_reporting(E_ALL);
@@ -144,19 +130,19 @@ define('MOODLE_INTERNAL', true);
 // Disables all caching.
 define('CACHE_DISABLE_ALL', true);
 
-define('PHPUNIT_TEST', false);
-
-define('IGNORE_COMPONENT_CACHE', true);
-
-// Check that PHP is of a sufficient version as soon as possible.
-require_once(__DIR__.'/../../lib/phpminimumversionlib.php');
-moodle_require_minimum_php_version();
+// Check that PHP is of a sufficient version
+if (version_compare(phpversion(), "5.3.3") < 0) {
+    $phpversion = phpversion();
+    // do NOT localise - lang strings would not work here and we CAN NOT move it after installib
+    fwrite(STDERR, "Moodle 2.5 or later requires at least PHP 5.3.3 (currently using version $phpversion).\n");
+    fwrite(STDERR, "Please upgrade your server software or install older Moodle version.\n");
+    exit(1);
+}
 
 // set up configuration
-global $CFG;
 $CFG = new stdClass();
 $CFG->lang                 = 'en';
-$CFG->dirroot              = dirname(dirname(__DIR__));
+$CFG->dirroot              = dirname(dirname(dirname(__FILE__)));
 $CFG->libdir               = "$CFG->dirroot/lib";
 $CFG->wwwroot              = "http://localhost";
 $CFG->httpswwwroot         = $CFG->wwwroot;
@@ -164,26 +150,18 @@ $CFG->docroot              = 'http://docs.moodle.org';
 $CFG->running_installer    = true;
 $CFG->early_install_lang   = true;
 $CFG->ostype               = (stristr(PHP_OS, 'win') && !stristr(PHP_OS, 'darwin')) ? 'WINDOWS' : 'UNIX';
-$CFG->dboptions            = array();
-$CFG->debug                = (E_ALL | E_STRICT);
-$CFG->debugdisplay         = true;
-$CFG->debugdeveloper       = true;
 
-$parts = explode('/', str_replace('\\', '/', dirname(__DIR__)));
+$parts = explode('/', str_replace('\\', '/', dirname(dirname(__FILE__))));
 $CFG->admin                = array_pop($parts);
 
 //point pear include path to moodles lib/pear so that includes and requires will search there for files before anywhere else
 //the problem is that we need specific version of quickforms and hacked excel files :-(
 ini_set('include_path', $CFG->libdir.'/pear' . PATH_SEPARATOR . ini_get('include_path'));
 
-require_once($CFG->libdir.'/classes/component.php');
-require_once($CFG->libdir.'/classes/text.php');
-require_once($CFG->libdir.'/classes/string_manager.php');
-require_once($CFG->libdir.'/classes/string_manager_install.php');
-require_once($CFG->libdir.'/classes/string_manager_standard.php');
 require_once($CFG->libdir.'/installlib.php');
 require_once($CFG->libdir.'/clilib.php');
 require_once($CFG->libdir.'/setuplib.php');
+require_once($CFG->libdir.'/textlib.class.php');
 require_once($CFG->libdir.'/weblib.php');
 require_once($CFG->libdir.'/dmllib.php');
 require_once($CFG->libdir.'/moodlelib.php');
@@ -192,36 +170,15 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/componentlib.class.php');
 require_once($CFG->dirroot.'/cache/lib.php');
 
-// Register our classloader, in theory somebody might want to replace it to load other hacked core classes.
-// Required because the database checks below lead to session interaction which is going to lead us to requiring autoloaded classes.
-if (defined('COMPONENT_CLASSLOADER')) {
-    spl_autoload_register(COMPONENT_CLASSLOADER);
-} else {
-    spl_autoload_register('core_component::classloader');
-}
-
 require($CFG->dirroot.'/version.php');
 $CFG->target_release = $release;
 
-\core\session\manager::init_empty_session();
-global $SESSION;
-global $USER;
-
-global $COURSE;
-$COURSE = new stdClass();
-$COURSE->id = 1;
-
-global $SITE;
-$SITE = $COURSE;
-define('SITEID', 1);
-
 //Database types
 $databases = array('mysqli' => moodle_database::get_driver_instance('mysqli', 'native'),
-                   'auroramysql' => moodle_database::get_driver_instance('auroramysql', 'native'),
-                   'mariadb'=> moodle_database::get_driver_instance('mariadb', 'native'),
                    'pgsql'  => moodle_database::get_driver_instance('pgsql',  'native'),
                    'oci'    => moodle_database::get_driver_instance('oci',    'native'),
                    'sqlsrv' => moodle_database::get_driver_instance('sqlsrv', 'native'), // MS SQL*Server PHP driver
+                   'mssql'  => moodle_database::get_driver_instance('mssql',  'native'), // FreeTDS driver
                   );
 foreach ($databases as $type=>$database) {
     if ($database->driver_installed() !== true) {
@@ -241,28 +198,21 @@ list($options, $unrecognized) = cli_get_params(
         'chmod'             => isset($distro->directorypermissions) ? sprintf('%04o',$distro->directorypermissions) : '2777', // let distros set dir permissions
         'lang'              => $CFG->lang,
         'wwwroot'           => '',
-        'dataroot'          => empty($distro->dataroot) ? str_replace('\\', '/', dirname(dirname(dirname(__DIR__))).'/moodledata'): $distro->dataroot, // initialised later after including libs or by distro
+        'dataroot'          => empty($distro->dataroot) ? str_replace('\\', '/', dirname(dirname(dirname(dirname(__FILE__)))).'/moodledata'): $distro->dataroot, // initialised later after including libs or by distro
         'dbtype'            => empty($distro->dbtype) ? $defaultdb : $distro->dbtype, // let distro skip dbtype selection
         'dbhost'            => empty($distro->dbhost) ? 'localhost' : $distro->dbhost, // let distros set dbhost
         'dbname'            => 'moodle',
         'dbuser'            => empty($distro->dbuser) ? 'root' : $distro->dbuser, // let distros set dbuser
         'dbpass'            => '',
-        'dbport'            => '',
-        'dbsocket'          => '',
+        'dbsocket'          => false,
         'prefix'            => 'mdl_',
         'fullname'          => '',
         'shortname'         => '',
-        'summary'           => '',
         'adminuser'         => 'admin',
         'adminpass'         => '',
-        'adminemail'        => '',
-        'sitepreset'        => '',
-        'supportemail'      => '',
-        'upgradekey'        => '',
         'non-interactive'   => false,
         'agree-license'     => false,
         'allow-unstable'    => false,
-        'skip-database'     => false,
         'help'              => false
     ),
     array(
@@ -271,21 +221,13 @@ list($options, $unrecognized) = cli_get_params(
 );
 
 $interactive = empty($options['non-interactive']);
-$skipdatabase = $options['skip-database'];
 
 // set up language
 $lang = clean_param($options['lang'], PARAM_SAFEDIR);
-$languages = get_string_manager()->get_list_of_translations();
-if (array_key_exists($lang, $languages)) {
+if (file_exists($CFG->dirroot.'/install/lang/'.$lang)) {
     $CFG->lang = $lang;
 }
 
-// Set up site admin preset.
-$sitepreset = clean_param($options['sitepreset'], PARAM_RAW);
-if (!empty($sitepreset)) {
-    $CFG->setsitepresetduringinstall = $sitepreset;
-}
-
 if ($unrecognized) {
     $unrecognized = implode("\n  ", $unrecognized);
     cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
@@ -297,41 +239,28 @@ if ($options['help']) {
 }
 
 //Print header
-cli_logo();
-echo PHP_EOL;
 echo get_string('cliinstallheader', 'install', $CFG->target_release)."\n";
 
 //Fist select language
 if ($interactive) {
     cli_separator();
+    $languages = get_string_manager()->get_list_of_translations();
     // Do not put the langs into columns because it is not compatible with RTL.
+    $langlist = implode("\n", $languages);
     $default = $CFG->lang;
-    cli_heading(get_string('chooselanguagehead', 'install'));
-    if (array_key_exists($default, $languages)) {
-        echo $default.' - '.$languages[$default]."\n";
-    }
-    if ($default !== 'en') {
-        echo 'en - English (en)'."\n";
-    }
-    echo '? - '.get_string('availablelangs', 'install')."\n";
+    cli_heading(get_string('availablelangs', 'install'));
+    echo $langlist."\n";
     $prompt = get_string('clitypevaluedefault', 'admin', $CFG->lang);
     $error = '';
     do {
         echo $error;
         $input = cli_input($prompt, $default);
+        $input = clean_param($input, PARAM_SAFEDIR);
 
-        if ($input === '?') {
-            echo implode("\n", $languages)."\n";
-            $error = "\n";
-
+        if (!file_exists($CFG->dirroot.'/install/lang/'.$input)) {
+            $error = get_string('cliincorrectvalueretry', 'admin')."\n";
         } else {
-            $input = clean_param($input, PARAM_SAFEDIR);
-
-            if (!array_key_exists($input, $languages)) {
-                $error = get_string('cliincorrectvalueretry', 'admin')."\n";
-            } else {
-                $error = '';
-            }
+            $error = '';
         }
     } while ($error !== '');
     $CFG->lang = $input;
@@ -365,8 +294,6 @@ if ($interactive) {
     }
 }
 $CFG->directorypermissions = $chmod;
-$CFG->filepermissions      = ($CFG->directorypermissions & 0666);
-$CFG->umaskpermissions     = (($CFG->directorypermissions & 0777) ^ 0777);
 
 //We need wwwroot before we test dataroot
 $wwwroot = clean_param($options['wwwroot'], PARAM_URL);
@@ -403,6 +330,7 @@ if ($interactive) {
 $CFG->wwwroot       = $wwwroot;
 $CFG->httpswwwroot  = $CFG->wwwroot;
 
+
 //We need dataroot before lang download
 $CFG->dataroot = $options['dataroot'];
 if ($interactive) {
@@ -452,10 +380,8 @@ if ($interactive) {
         cli_error(get_string('pathserrcreatedataroot', 'install', $a));
     }
 }
-$CFG->tempdir       = $CFG->dataroot.'/temp';
-$CFG->backuptempdir = $CFG->tempdir.'/backup';
-$CFG->cachedir      = $CFG->dataroot.'/cache';
-$CFG->localcachedir = $CFG->dataroot.'/localcache';
+$CFG->tempdir  = $CFG->dataroot.'/temp';
+$CFG->cachedir = $CFG->dataroot.'/cache';
 
 // download required lang packs
 if ($CFG->lang !== 'en') {
@@ -525,105 +451,72 @@ if ($interactive) {
 $database = $databases[$CFG->dbtype];
 
 
-// We cannot do any validation until all DB connection data is provided.
-$hintdatabase = '';
-do {
-    echo $hintdatabase;
-
-    // Ask for db host.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('databasehost', 'install'));
-        if ($options['dbhost'] !== '') {
-            $prompt = get_string('clitypevaluedefault', 'admin', $options['dbhost']);
-        } else {
-            $prompt = get_string('clitypevalue', 'admin');
-        }
-        $CFG->dbhost = cli_input($prompt, $options['dbhost']);
-
+// ask for db host
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('databasehost', 'install'));
+    if ($options['dbhost'] !== '') {
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbhost']);
     } else {
-        $CFG->dbhost = $options['dbhost'];
+        $prompt = get_string('clitypevalue', 'admin');
     }
+    $CFG->dbhost = cli_input($prompt, $options['dbhost']);
 
-    // Ask for db name.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('databasename', 'install'));
-        if ($options['dbname'] !== '') {
-            $prompt = get_string('clitypevaluedefault', 'admin', $options['dbname']);
-        } else {
-            $prompt = get_string('clitypevalue', 'admin');
-        }
-        $CFG->dbname = cli_input($prompt, $options['dbname']);
+} else {
+    $CFG->dbhost = $options['dbhost'];
+}
 
+// ask for db name
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('databasename', 'install'));
+    if ($options['dbname'] !== '') {
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbname']);
     } else {
-        $CFG->dbname = $options['dbname'];
+        $prompt = get_string('clitypevalue', 'admin');
     }
+    $CFG->dbname = cli_input($prompt, $options['dbname']);
 
-    // Ask for db prefix.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('dbprefix', 'install'));
-        //TODO: solve somehow the prefix trouble for oci.
-        if ($options['prefix'] !== '') {
-            $prompt = get_string('clitypevaluedefault', 'admin', $options['prefix']);
-        } else {
-            $prompt = get_string('clitypevalue', 'admin');
-        }
-        $CFG->prefix = cli_input($prompt, $options['prefix']);
+} else {
+    $CFG->dbname = $options['dbname'];
+}
 
+// ask for db prefix
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('dbprefix', 'install'));
+    //TODO: solve somehow the prefix trouble for oci
+    if ($options['prefix'] !== '') {
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['prefix']);
     } else {
-        $CFG->prefix = $options['prefix'];
+        $prompt = get_string('clitypevalue', 'admin');
     }
+    $CFG->prefix = cli_input($prompt, $options['prefix']);
 
-    // Ask for db port.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('databaseport', 'install'));
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbport']);
-        $CFG->dboptions['dbport'] = (int) cli_input($prompt, $options['dbport']);
+} else {
+    $CFG->prefix = $options['prefix'];
+}
 
+// ask for db user
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('databaseuser', 'install'));
+    if ($options['dbuser'] !== '') {
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbuser']);
     } else {
-        $CFG->dboptions['dbport'] = (int) $options['dbport'];
-    }
-    if ($CFG->dboptions['dbport'] <= 0) {
-        $CFG->dboptions['dbport'] = '';
+        $prompt = get_string('clitypevalue', 'admin');
     }
+    $CFG->dbuser = cli_input($prompt, $options['dbuser']);
 
-    // Ask for db socket.
-    if ($CFG->ostype === 'WINDOWS') {
-        $CFG->dboptions['dbsocket'] = '';
-
-    } else if ($interactive and empty($CFG->dboptions['dbport'])) {
-        cli_separator();
-        cli_heading(get_string('databasesocket', 'install'));
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['dbsocket']);
-        $CFG->dboptions['dbsocket'] = cli_input($prompt, $options['dbsocket']);
-
-    } else {
-        $CFG->dboptions['dbsocket'] = $options['dbsocket'];
-    }
-
-    // Ask for db user.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('databaseuser', 'install'));
-        if ($options['dbuser'] !== '') {
-            $prompt = get_string('clitypevaluedefault', 'admin', $options['dbuser']);
-        } else {
-            $prompt = get_string('clitypevalue', 'admin');
-        }
-        $CFG->dbuser = cli_input($prompt, $options['dbuser']);
-
-    } else {
-        $CFG->dbuser = $options['dbuser'];
-    }
-
-    // Ask for db password.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('databasepass', 'install'));
+} else {
+    $CFG->dbuser = $options['dbuser'];
+}
 
+// ask for db password
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('databasepass', 'install'));
+    do {
         if ($options['dbpass'] !== '') {
             $prompt = get_string('clitypevaluedefault', 'admin', $options['dbpass']);
         } else {
@@ -631,171 +524,113 @@ do {
         }
 
         $CFG->dbpass = cli_input($prompt, $options['dbpass']);
-        if (function_exists('distro_pre_create_db')) { // Hook for distros needing to do something before DB creation.
-            $distro = distro_pre_create_db($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix,
-                    array('dbpersist' => 0, 'dbport' => $CFG->dboptions['dbport'], 'dbsocket' => $CFG->dboptions['dbsocket']),
-                    $distro);
+        if (function_exists('distro_pre_create_db')) { // Hook for distros needing to do something before DB creation
+            $distro = distro_pre_create_db($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbsocket'=>$options['dbsocket']), $distro);
         }
-        $hintdatabase = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix,
-                array('dbpersist' => 0, 'dbport' => $CFG->dboptions['dbport'], 'dbsocket' => $CFG->dboptions['dbsocket']));
+        $hint_database = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbsocket'=>$options['dbsocket']));
+    } while ($hint_database !== '');
 
-    } else {
-        $CFG->dbpass = $options['dbpass'];
-        $hintdatabase = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix,
-                array('dbpersist' => 0, 'dbport' => $CFG->dboptions['dbport'], 'dbsocket' => $CFG->dboptions['dbsocket']));
-        if ($hintdatabase !== '') {
-            cli_error(get_string('dbconnectionerror', 'install'));
-        }
-    }
-} while ($hintdatabase !== '');
-
-// If --skip-database option is provided, we do not need to ask for site fullname, shortname, adminuser, adminpass, adminemail.
-// These fields will be requested during the database install part.
-if (!$skipdatabase) {
-    // Ask for fullname.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('fullsitename', 'moodle'));
-
-        if ($options['fullname'] !== '') {
-            $prompt = get_string('clitypevaluedefault', 'admin', $options['fullname']);
-        } else {
-            $prompt = get_string('clitypevalue', 'admin');
-        }
-
-        do {
-            $options['fullname'] = cli_input($prompt, $options['fullname']);
-        } while (empty($options['fullname']));
-    } else {
-        if (empty($options['fullname'])) {
-            $a = (object)['option' => 'fullname', 'value' => $options['fullname']];
-            cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-        }
-    }
-
-    // Ask for shortname.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('shortsitename', 'moodle'));
-
-        if ($options['shortname'] !== '') {
-            $prompt = get_string('clitypevaluedefault', 'admin', $options['shortname']);
-        } else {
-            $prompt = get_string('clitypevalue', 'admin');
-        }
-
-        do {
-            $options['shortname'] = cli_input($prompt, $options['shortname']);
-        } while (empty($options['shortname']));
-    } else {
-        if (empty($options['shortname'])) {
-            $a = (object)['option' => 'shortname', 'value' => $options['shortname']];
-            cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-        }
-    }
-
-    // Ask for admin user name.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('cliadminusername', 'install'));
-        if (!empty($options['adminuser'])) {
-            $prompt = get_string('clitypevaluedefault', 'admin', $options['adminuser']);
-        } else {
-            $prompt = get_string('clitypevalue', 'admin');
-        }
-        do {
-            $options['adminuser'] = cli_input($prompt, $options['adminuser']);
-        } while (empty($options['adminuser']) or $options['adminuser'] === 'guest');
-    } else {
-        if ((empty($options['adminuser']) || $options['adminuser'] === 'guest')) {
-            $a = (object)['option' => 'adminuser', 'value' => $options['adminuser']];
-            cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-        }
-    }
-
-    // Ask for admin user password.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('cliadminpassword', 'install'));
-        $prompt = get_string('clitypevalue', 'admin');
-        do {
-            $options['adminpass'] = cli_input($prompt);
-        } while (empty($options['adminpass']) or $options['adminpass'] === 'admin');
-    } else {
-        if ((empty($options['adminpass']) or $options['adminpass'] === 'admin')) {
-            $a = (object)['option' => 'adminpass', 'value' => $options['adminpass']];
-            cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-        }
-    }
-
-    // Ask for the admin email address.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('cliadminemail', 'install'));
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['adminemail']);
-        $options['adminemail'] = cli_input($prompt, $options['adminemail']);
-    }
-
-    // Validate that the address provided was an e-mail address.
-    if (!empty($options['adminemail']) && !validate_email($options['adminemail'])) {
-        $a = (object)['option' => 'adminemail', 'value' => $options['adminemail']];
-        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-    }
-
-    // Ask for the support email address.
-    if ($interactive) {
-        cli_separator();
-        cli_heading(get_string('clisupportemail', 'install'));
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['supportemail']);
-        $options['supportemail'] = cli_input($prompt, $options['supportemail']);
-    }
-
-    // Validate that the support email address provided is valid.
-    if (!empty($options['supportemail']) && !validate_email($options['supportemail'])) {
-        $a = (object)['option' => 'supportemail', 'value' => $options['supportemail']];
-        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
+} else {
+    $CFG->dbpass = $options['dbpass'];
+    $hint_database = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbsocket'=>$options['dbsocket']));
+    if ($hint_database !== '') {
+        cli_error(get_string('dbconnectionerror', 'install'));
     }
 }
 
-// Ask for the upgrade key.
+// ask for fullname
 if ($interactive) {
     cli_separator();
-    cli_heading(get_string('upgradekeyset', 'admin'));
-    if ($options['upgradekey'] !== '') {
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['upgradekey']);
-        $options['upgradekey'] = cli_input($prompt, $options['upgradekey']);
+    cli_heading(get_string('fullsitename', 'moodle'));
+
+    if ($options['fullname'] !== '') {
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['fullname']);
     } else {
         $prompt = get_string('clitypevalue', 'admin');
-        $options['upgradekey'] = cli_input($prompt);
+    }
+
+    do {
+        $options['fullname'] = cli_input($prompt, $options['fullname']);
+    } while (empty($options['fullname']));
+} else {
+    if (empty($options['fullname'])) {
+        $a = (object)array('option'=>'fullname', 'value'=>$options['fullname']);
+        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
     }
 }
 
-// Set the upgrade key if it was provided.
-if ($options['upgradekey'] !== '') {
-    $CFG->upgradekey = $options['upgradekey'];
+// ask for shortname
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('shortsitename', 'moodle'));
+
+    if ($options['shortname'] !== '') {
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['shortname']);
+    } else {
+        $prompt = get_string('clitypevalue', 'admin');
+    }
+
+    do {
+        $options['shortname'] = cli_input($prompt, $options['shortname']);
+    } while (empty($options['shortname']));
+} else {
+    if (empty($options['shortname'])) {
+        $a = (object)array('option'=>'shortname', 'value'=>$options['shortname']);
+        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
+    }
 }
 
-// The user does not also need to pass agree-license when --skip-database is provided as the user will need to accept
-// the license again in the database install part.
-if (!$skipdatabase) {
-    if ($interactive) {
-        if (!$options['agree-license']) {
-            cli_separator();
-            cli_heading(get_string('copyrightnotice'));
-            echo "Moodle  - Modular Object-Oriented Dynamic Learning Environment\n";
-            echo get_string('gpl3')."\n\n";
-            echo get_string('doyouagree')."\n";
-            $prompt = get_string('cliyesnoprompt', 'admin');
-            $input = cli_input($prompt, '', array(get_string('clianswerno', 'admin'), get_string('cliansweryes', 'admin')));
-            if ($input == get_string('clianswerno', 'admin')) {
-                exit(1);
-            }
-        }
+// ask for admin user name
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('cliadminusername', 'install'));
+    if (!empty($options['adminuser'])) {
+        $prompt = get_string('clitypevaluedefault', 'admin', $options['adminuser']);
     } else {
-        if (!$options['agree-license'] && !$skipdatabase) {
-            cli_error(get_string('climustagreelicense', 'install'));
+        $prompt = get_string('clitypevalue', 'admin');
+    }
+    do {
+        $options['adminuser'] = cli_input($prompt, $options['adminuser']);
+    } while (empty($options['adminuser']) or $options['adminuser'] === 'guest');
+} else {
+    if (empty($options['adminuser']) or $options['adminuser'] === 'guest') {
+        $a = (object)array('option'=>'adminuser', 'value'=>$options['adminuser']);
+        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
+    }
+}
+
+// ask for admin user password
+if ($interactive) {
+    cli_separator();
+    cli_heading(get_string('cliadminpassword', 'install'));
+    $prompt = get_string('clitypevalue', 'admin');
+    do {
+        $options['adminpass'] = cli_input($prompt);
+    } while (empty($options['adminpass']) or $options['adminpass'] === 'admin');
+} else {
+    if (empty($options['adminpass']) or $options['adminpass'] === 'admin') {
+        $a = (object)array('option'=>'adminpass', 'value'=>$options['adminpass']);
+        cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
+    }
+}
+
+if ($interactive) {
+    if (!$options['agree-license']) {
+        cli_separator();
+        cli_heading(get_string('copyrightnotice'));
+        echo "Moodle  - Modular Object-Oriented Dynamic Learning Environment\n";
+        echo get_string('gpl3')."\n\n";
+        echo get_string('doyouagree')."\n";
+        $prompt = get_string('cliyesnoprompt', 'admin');
+        $input = cli_input($prompt, '', array(get_string('clianswerno', 'admin'), get_string('cliansweryes', 'admin')));
+        if ($input == get_string('clianswerno', 'admin')) {
+            exit(1);
         }
     }
+} else {
+    if (!$options['agree-license']) {
+        cli_error(get_string('climustagreelicense', 'install'));
+    }
 }
 
 // Finally we have all info needed for config.php
@@ -837,23 +672,14 @@ if (!$envstatus) {
 }
 
 // Test plugin dependencies.
+require_once($CFG->libdir . '/pluginlib.php');
 $failed = array();
-if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
+if (!plugin_manager::instance()->all_plugins_ok($version, $failed)) {
     cli_problem(get_string('pluginscheckfailed', 'admin', array('pluginslist' => implode(', ', array_unique($failed)))));
     cli_error(get_string('pluginschecktodo', 'admin'));
 }
 
-if (!$skipdatabase) {
-    install_cli_database($options, $interactive);
-    // This needs to happen at the end to ensure it occurs after all caches
-    // have been purged for the last time.
-    // This will build a cached version of the current theme for the user
-    // to immediately start browsing the site.
-    require_once($CFG->libdir.'/upgradelib.php');
-    upgrade_themes();
-} else {
-    echo get_string('cliskipdatabase', 'install')."\n";
-}
+install_cli_database($options, $interactive);
 
 echo get_string('cliinstallfinished', 'install')."\n";
 exit(0); // 0 means success

admin/cli/install_database.php

@@ -36,12 +36,6 @@ if (isset($_SERVER['REMOTE_ADDR'])) {
     exit(1);
 }
 
-// Force OPcache reset if used, we do not want any stale caches
-// when preparing test environment.
-if (function_exists('opcache_reset')) {
-    opcache_reset();
-}
-
 $help =
 "Advanced command line Moodle database installer.
 Please note you must execute this script with the same uid as apache.
@@ -52,23 +46,26 @@ Options:
 --lang=CODE           Installation and default site language. Default is en.
 --adminuser=USERNAME  Username for the moodle admin account. Default is admin.
 --adminpass=PASSWORD  Password for the moodle admin account.
---adminemail=STRING   Email address for the moodle admin account.
 --agree-license       Indicates agreement with software license.
 --fullname=STRING     Name of the site
 --shortname=STRING    Name of the site
---summary=STRING      The summary to be displayed on the front page
 -h, --help            Print out this help
 
 Example:
 \$sudo -u www-data /usr/bin/php admin/cli/install_database.php --lang=cs --adminpass=soMePass123 --agree-license
 ";
 
-// Check that PHP is of a sufficient version as soon as possible.
-require_once(__DIR__.'/../../lib/phpminimumversionlib.php');
-moodle_require_minimum_php_version();
+// Check that PHP is of a sufficient version
+if (version_compare(phpversion(), "5.3.3") < 0) {
+    $phpversion = phpversion();
+    // do NOT localise - lang strings would not work here and we CAN NOT move it after installib
+    fwrite(STDERR, "Moodle 2.5 or later requires at least PHP 5.3.3 (currently using version $phpversion).\n");
+    fwrite(STDERR, "Please upgrade your server software or install older Moodle version.\n");
+    exit(1);
+}
 
 // Nothing to do if config.php does not exist
-$configfile = __DIR__.'/../../config.php';
+$configfile = dirname(dirname(dirname(__FILE__))).'/config.php';
 if (!file_exists($configfile)) {
     fwrite(STDERR, 'config.php does not exist, can not continue'); // do not localize
     fwrite(STDERR, "\n");
@@ -83,6 +80,11 @@ require_once($CFG->libdir.'/installlib.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/componentlib.class.php');
 
+// make sure no tables are installed yet
+if ($DB->get_tables() ) {
+    cli_error(get_string('clitablesexist', 'install'));
+}
+
 $CFG->early_install_lang = true;
 get_string_manager(true);
 
@@ -94,10 +96,8 @@ list($options, $unrecognized) = cli_get_params(
         'lang'              => 'en',
         'adminuser'         => 'admin',
         'adminpass'         => '',
-        'adminemail'        => '',
         'fullname'          => '',
         'shortname'         => '',
-        'summary'           => '',
         'agree-license'     => false,
         'help'              => false
     ),
@@ -106,22 +106,12 @@ list($options, $unrecognized) = cli_get_params(
     )
 );
 
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
 
-// We show help text even if tables are installed.
 if ($options['help']) {
     echo $help;
     die;
 }
 
-// Make sure no tables are installed yet.
-if ($DB->get_tables() ) {
-    cli_error(get_string('clitablesexist', 'install'));
-}
-
 if (!$options['agree-license']) {
     cli_error('You have to agree to the license. --help prints out the help'); // TODO: localize
 }
@@ -130,12 +120,6 @@ if ($options['adminpass'] === true or $options['adminpass'] === '') {
     cli_error('You have to specify admin password. --help prints out the help'); // TODO: localize
 }
 
-// Validate that the address provided was an e-mail address.
-if (!empty($options['adminemail']) && !validate_email($options['adminemail'])) {
-    $a = (object) array('option' => 'adminemail', 'value' => $options['adminemail']);
-    cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-}
-
 $options['lang'] = clean_param($options['lang'], PARAM_SAFEDIR);
 if (!file_exists($CFG->dirroot.'/install/lang/'.$options['lang'])) {
     $options['lang'] = 'en';
@@ -177,20 +161,14 @@ if (!$envstatus) {
 }
 
 // Test plugin dependencies.
+require_once($CFG->libdir . '/pluginlib.php');
 $failed = array();
-if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
+if (!plugin_manager::instance()->all_plugins_ok($version, $failed)) {
     cli_problem(get_string('pluginscheckfailed', 'admin', array('pluginslist' => implode(', ', array_unique($failed)))));
     cli_error(get_string('pluginschecktodo', 'admin'));
 }
 
 install_cli_database($options, true);
 
-// This needs to happen at the end to ensure it occurs after all caches
-// have been purged for the last time.
-// This will build a cached version of the current theme for the user
-// to immediately start browsing the site.
-require_once($CFG->libdir.'/upgradelib.php');
-upgrade_themes();
-
 echo get_string('cliinstallfinished', 'install')."\n";
 exit(0); // 0 means success

admin/cli/kill_all_sessions.php

@@ -1,55 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * CLI script to kill all user sessions without asking for confirmation.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2017 Alexander Bias <alexander.bias@uni-ulm.de>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__.'/../../config.php');
-require_once($CFG->libdir.'/clilib.php');
-
-list($options, $unrecognized) = cli_get_params(array('help' => false), array('h' => 'help'));
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized), 2);
-}
-
-if ($options['help']) {
-    $help =
-"Kill all Moodle sessions
-
-Options:
--h, --help            Print out this help
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/kill_all_sessions.php
-";
-
-    echo $help;
-    exit(0);
-}
-
-\core\session\manager::kill_all_sessions();
-
-exit(0);

admin/cli/mysql_collation.php

@@ -24,7 +24,7 @@
 
 define('CLI_SCRIPT', true);
 
-require(__DIR__.'/../../config.php');
+require(dirname(dirname(dirname(__FILE__))).'/config.php');
 require_once($CFG->libdir.'/clilib.php');      // cli only functions
 
 if ($DB->get_dbfamily() !== 'mysql') {
@@ -53,7 +53,7 @@ Options:
 -h, --help            Print out this help
 
 Example:
-\$ sudo -u www-data /usr/bin/php admin/cli/mysql_collation.php --collation=utf8mb4_unicode_ci
+\$ sudo -u www-data /usr/bin/php admin/cli/mysql_collation.php --collation=utf8_general_ci
 ";
 
 if (!empty($options['collation'])) {
@@ -64,71 +64,6 @@ if (!empty($options['collation'])) {
         cli_error("Error: collation '$collation' is not available on this server!");
     }
 
-    $collationinfo = explode('_', $collation);
-    $charset = reset($collationinfo);
-
-    $engine = strtolower($DB->get_dbengine());
-
-    // Do checks for utf8mb4.
-    if (strpos($collation, 'utf8mb4') === 0) {
-        // Do we have the right engine?
-        if ($engine !== 'innodb' && $engine !== 'xtradb') {
-            cli_error("Error: '$collation' requires InnoDB or XtraDB set as the engine.");
-        }
-        // Are we using Barracuda?
-        if ($DB->get_row_format() != 'Barracuda') {
-            // Try setting it here.
-            try {
-                $DB->execute("SET GLOBAL innodb_file_format=Barracuda");
-            } catch (dml_exception $e) {
-                cli_error("Error: '$collation' requires the file format to be set to Barracuda.
-                        An attempt was made to change the format, but it failed. Please try doing this manually.");
-            }
-            echo "GLOBAL SETTING: innodb_file_format changed to Barracuda\n";
-        }
-        // Is one file per table being used?
-        if (!$DB->is_file_per_table_enabled()) {
-            try {
-                $DB->execute("SET GLOBAL innodb_file_per_table=1");
-            } catch (dml_exception $e) {
-                cli_error("Error: '$collation' requires the setting 'innodb_file_per_table' be set to 'ON'.
-                        An attempt was made to change the format, but it failed. Please try doing this manually.");
-            }
-            echo "GLOBAL SETTING: innodb_file_per_table changed to 1\n";
-        }
-        // Is large prefix set?
-        if (!$DB->is_large_prefix_enabled()) {
-            try {
-                $DB->execute("SET GLOBAL innodb_large_prefix=1");
-            } catch (dml_exception $e) {
-                cli_error("Error: '$collation' requires the setting 'innodb_large_prefix' be set to 'ON'.
-                        An attempt was made to change the format, but it failed. Please try doing this manually.");
-            }
-            echo "GLOBAL SETTING: innodb_large_prefix changed to 1\n";
-        }
-    }
-
-    $sql = "SHOW VARIABLES LIKE 'collation_database'";
-    if (!$dbcollation = $DB->get_record_sql($sql)) {
-        cli_error("Error: Could not access collation information on the database.");
-    }
-    $sql = "SHOW VARIABLES LIKE 'character_set_database'";
-    if (!$dbcharset = $DB->get_record_sql($sql)) {
-        cli_error("Error: Could not access character set information on the database.");
-    }
-    if ($dbcollation->value !== $collation || $dbcharset->value !== $charset) {
-        // Try to convert the DB.
-        echo "Converting database to '$collation' for $CFG->wwwroot:\n";
-        $sql = "ALTER DATABASE `$CFG->dbname` DEFAULT CHARACTER SET $charset DEFAULT COLLATE = $collation";
-        try {
-            $DB->change_database_structure($sql);
-        } catch (exception $e) {
-            cli_error("Error: Tried to alter the database with no success. Please try manually changing the database
-                    to the new collation and character set and then run this script again.");
-        }
-        echo "DATABASE CONVERTED\n";
-    }
-
     echo "Converting tables and columns to '$collation' for $CFG->wwwroot:\n";
     $prefix = $DB->get_prefix();
     $prefix = str_replace('_', '\\_', $prefix);
@@ -145,25 +80,12 @@ if (!empty($options['collation'])) {
             $skipped++;
 
         } else {
-            try {
-                $DB->change_database_structure("ALTER TABLE `$table->name` CONVERT TO CHARACTER SET $charset COLLATE $collation");
-                echo "CONVERTED\n";
-                $converted++;
-            } catch (ddl_exception $e) {
-                $result = mysql_set_row_format($table->name, $charset, $collation, $engine);
-                if ($result) {
-                    echo "CONVERTED\n";
-                    $converted++;
-                } else {
-                    // We don't know what the problem is. Stop the conversion.
-                    cli_error("Error: Tried to convert $table->name, but there was a problem. Please check the details of this
-                            table and try again.");
-                    die();
-                }
-            }
+            $DB->change_database_structure("ALTER TABLE $table->name DEFAULT COLLATE = $collation");
+            echo "CONVERTED\n";
+            $converted++;
         }
 
-        $sql = "SHOW FULL COLUMNS FROM `$table->name` WHERE collation IS NOT NULL";
+        $sql = "SHOW FULL COLUMNS FROM $table->name WHERE collation IS NOT NULL";
         $rs2 = $DB->get_recordset_sql($sql);
         foreach ($rs2 as $column) {
             $column = (object)array_change_key_case((array)$column, CASE_LOWER);
@@ -174,36 +96,22 @@ if (!empty($options['collation'])) {
                 continue;
             }
 
-            // Check for utf8mb4 collation.
-            $rowformat = $DB->get_row_format_sql($engine, $collation);
-
             if ($column->type === 'tinytext' or $column->type === 'mediumtext' or $column->type === 'text' or $column->type === 'longtext') {
                 $notnull = ($column->null === 'NO') ? 'NOT NULL' : 'NULL';
                 $default = (!is_null($column->default) and $column->default !== '') ? "DEFAULT '$column->default'" : '';
                 // primary, unique and inc are not supported for texts
-                $sql = "ALTER TABLE `$table->name`
-                        MODIFY COLUMN $column->field $column->type
-                        CHARACTER SET $charset
-                        COLLATE $collation $notnull $default";
+                $sql = "ALTER TABLE $table->name MODIFY COLUMN $column->field $column->type COLLATE $collation $notnull $default";
                 $DB->change_database_structure($sql);
 
             } else if (strpos($column->type, 'varchar') === 0) {
                 $notnull = ($column->null === 'NO') ? 'NOT NULL' : 'NULL';
                 $default = !is_null($column->default) ? "DEFAULT '$column->default'" : '';
-
-                if ($rowformat != '') {
-                    $sql = "ALTER TABLE `$table->name` $rowformat";
-                    $DB->change_database_structure($sql);
-                }
-
-                $sql = "ALTER TABLE `$table->name`
-                        MODIFY COLUMN $column->field $column->type
-                        CHARACTER SET $charset
-                        COLLATE $collation $notnull $default";
+                // primary, unique and inc are not supported for texts
+                $sql = "ALTER TABLE $table->name MODIFY COLUMN $column->field $column->type COLLATE $collation $notnull $default";
                 $DB->change_database_structure($sql);
             } else {
                 echo "ERROR (unknown column type: $column->type)\n";
-                $errors++;
+                $error++;
                 continue;
             }
             echo "CONVERTED\n";
@@ -272,9 +180,7 @@ function mysql_get_collations() {
     global $DB;
 
     $collations = array();
-    $sql = "SHOW COLLATION
-            WHERE Collation LIKE 'utf8\_%' AND Charset = 'utf8'
-               OR Collation LIKE 'utf8mb4\_%' AND Charset = 'utf8mb4'";
+    $sql = "SHOW COLLATION WHERE Collation LIKE 'utf8\_%' AND Charset = 'utf8'";
     $rs = $DB->get_recordset_sql($sql);
     foreach ($rs as $collation) {
         $collations[$collation->collation] = $collation->collation;
@@ -303,26 +209,3 @@ function mysql_get_column_collations($tablename) {
     $rs->close();
     return $collations;
 }
-
-function mysql_set_row_format($tablename, $charset, $collation, $engine) {
-    global $DB;
-
-    $sql = "SELECT row_format
-              FROM INFORMATION_SCHEMA.TABLES
-             WHERE table_schema = DATABASE() AND table_name = ?";
-    $rs = $DB->get_record_sql($sql, array($tablename));
-    if ($rs) {
-        if ($rs->row_format == 'Compact' || $rs->row_format == 'Redundant') {
-            $rowformat = $DB->get_row_format_sql($engine, $collation);
-            // Try to convert to compressed format and then try updating the collation again.
-            $DB->change_database_structure("ALTER TABLE `$tablename` $rowformat");
-            $DB->change_database_structure("ALTER TABLE `$tablename` CONVERT TO CHARACTER SET $charset COLLATE $collation");
-        } else {
-            // Row format may not be the problem. Can not diagnose problem. Send fail reply.
-            return false;
-        }
-    } else {
-        return false;
-    }
-    return true;
-}

admin/cli/mysql_compressed_rows.php

@@ -1,202 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * MySQL table row compression tool tool.
- *
- * @package   core
- * @copyright 2014 Totara Learning Solutions Ltd {@link http://www.totaralms.com/}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @author    Petr Skoda <petr.skoda@totaralms.com>
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__.'/../../config.php');
-require_once($CFG->libdir . '/clilib.php');
-
-if ($DB->get_dbfamily() !== 'mysql') {
-    cli_error('This script is used for MySQL databases only.');
-}
-
-$engine = strtolower($DB->get_dbengine());
-if ($engine !== 'innodb' and $engine !== 'xtradb') {
-    cli_error('This script is for MySQL servers using InnoDB or XtraDB engines only.');
-}
-
-list($options, $unrecognized) = cli_get_params(
-    array('help' => false, 'info' => false, 'list' => false, 'fix' => false, 'showsql' => false),
-    array('h' => 'help', 'i' => 'info', 'l' => 'list', 'f' => 'fix', 's' => 'showsql')
-);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-$help =
-    "Script for detection of row size problems in MySQL InnoDB tables.
-
-By default InnoDB storage table is using legacy Antelope file format
-which has major restriction on database row size.
-Use this script to detect and fix database tables with potential data
-overflow problems.
-
-Options:
--i, --info            Show database information
--l, --list            List problematic tables
--f, --fix             Attempt to fix all tables (requires SUPER privilege)
--s, --showsql         Print SQL statements for fixing of tables
--h, --help            Print out this help
-
-Example:
-\$ sudo -u www-data /usr/bin/php admin/cli/mysql_compressed_rows.php -l
-";
-
-/** @var mysql_sql_generator $generator */
-$generator = $DB->get_manager()->generator;
-
-$info = $DB->get_server_info();
-$filepertable = $DB->get_record_sql("SHOW VARIABLES LIKE 'innodb_file_per_table'");
-$filepertable = $filepertable ? $filepertable->value : '';
-$fileformat = $DB->get_record_sql("SHOW VARIABLES LIKE 'innodb_file_format'");
-$fileformat = $fileformat ? $fileformat->value : '';
-$prefix = $DB->get_prefix();
-$database = $CFG->dbname;
-
-if (!empty($options['info'])) {
-    echo "Database version:      " . $info['description'] . "\n";
-    echo "Database name:         $database\n";
-    echo "Database engine:       " . $DB->get_dbengine() . "\n";
-    echo "innodb_file_per_table: $filepertable\n";
-    echo "innodb_file_format:    $fileformat\n";
-
-    exit(0);
-
-} else if (!empty($options['list'])) {
-    $problem = false;
-    foreach ($DB->get_tables(false) as $table) {
-        $columns = $DB->get_columns($table, false);
-        $size = $generator->guess_antelope_row_size($columns);
-        $format = $DB->get_row_format($table);
-        if ($size <= $generator::ANTELOPE_MAX_ROW_SIZE) {
-            continue;
-        }
-
-        echo str_pad($prefix . $table, 32, ' ', STR_PAD_RIGHT);
-        echo str_pad($format, 11, ' ', STR_PAD_RIGHT);
-
-        if ($format === 'Compact' or $format === 'Redundant') {
-            $problem = true;
-            echo " (needs fixing)\n";
-
-        } else if ($format !== 'Compressed' and $format !== 'Dynamic') {
-            echo " (unknown)\n";
-
-        } else {
-            echo "\n";
-        }
-    }
-
-    if ($problem) {
-        exit(1);
-    }
-    exit(0);
-
-} else if (!empty($options['fix'])) {
-    $fixtables = array();
-    foreach ($DB->get_tables(false) as $table) {
-        $columns = $DB->get_columns($table, false);
-        $size = $generator->guess_antelope_row_size($columns);
-        $format = $DB->get_row_format($table);
-        if ($size <= $generator::ANTELOPE_MAX_ROW_SIZE) {
-            continue;
-        }
-        if ($format === 'Compact' or $format === 'Redundant') {
-            $fixtables[$table] = $table;
-        }
-    }
-
-    if (!$fixtables) {
-        echo "No changes necessary\n";
-        exit(0);
-    }
-
-    if ($filepertable !== 'ON') {
-        try {
-            $DB->execute("SET GLOBAL innodb_file_per_table=1");
-        } catch (dml_exception $e) {
-            echo "Cannot enable GLOBAL innodb_file_per_table setting, use --showsql option and execute the statements manually.";
-            throw $e;
-        }
-    }
-    if ($fileformat !== 'Barracuda') {
-        try {
-            $DB->execute("SET GLOBAL innodb_file_format=Barracuda");
-        } catch (dml_exception $e) {
-            echo "Cannot change GLOBAL innodb_file_format setting, use --showsql option and execute the statements manually.";
-            throw $e;
-        }
-    }
-
-    if (!$DB->is_compressed_row_format_supported(false)) {
-        echo "MySQL server is not compatible with compressed row format.";
-        exit(1);
-    }
-
-    foreach ($fixtables as $table) {
-        $DB->change_database_structure("ALTER TABLE `{$prefix}$table` ROW_FORMAT=Compressed");
-        echo str_pad($prefix . $table, 32, ' ', STR_PAD_RIGHT) . " ... Compressed\n";
-    }
-
-    exit(0);
-
-} else if (!empty($options['showsql'])) {
-    $fixtables = array();
-
-    foreach ($DB->get_tables(false) as $table) {
-        $columns = $DB->get_columns($table, false);
-        $size = $generator->guess_antelope_row_size($columns);
-        $format = $DB->get_row_format($table);
-        if ($size <= $generator::ANTELOPE_MAX_ROW_SIZE) {
-            continue;
-        }
-        if ($format === 'Compact' or $format === 'Redundant') {
-            $fixtables[$table] = $table;
-        }
-    }
-    if (!$fixtables) {
-        echo "No changes necessary\n";
-        exit(0);
-    }
-
-    echo "Copy the following SQL statements and execute them using account with SUPER privilege:\n\n";
-    echo "USE $database;\n";
-    echo "SET SESSION sql_mode=STRICT_ALL_TABLES;\n";
-    echo "SET GLOBAL innodb_file_per_table=1;\n";
-    echo "SET GLOBAL innodb_file_format=Barracuda;\n";
-    foreach ($fixtables as $table) {
-        echo "ALTER TABLE `{$prefix}$table` ROW_FORMAT=Compressed;\n";
-    }
-    echo "\n";
-    exit(0);
-
-} else {
-    echo $help;
-    die;
-}
-
-

admin/cli/mysql_engine.php

@@ -0,0 +1,180 @@
+<?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/>.
+
+/**
+ * MySQL engine conversion tool.
+ *
+ * @package    core
+ * @subpackage cli
+ * @copyright  2009 Petr Skoda (http://skodak.org)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+define('CLI_SCRIPT', true);
+
+require(dirname(dirname(dirname(__FILE__))).'/config.php');
+require_once($CFG->libdir.'/clilib.php');      // cli only functions
+
+if ($DB->get_dbfamily() !== 'mysql') {
+    cli_error('This function is designed for MySQL databases only!');
+}
+
+// now get cli options
+list($options, $unrecognized) = cli_get_params(array('help'=>false, 'list'=>false, 'engine'=>false, 'available'=>false),
+                                               array('h'=>'help', 'l'=>'list', 'a'=>'available'));
+
+if ($unrecognized) {
+    $unrecognized = implode("\n  ", $unrecognized);
+    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
+}
+
+$help =
+"MySQL engine conversions script.
+
+It is recommended to stop the web server before the conversion.
+Do not use MyISAM if possible, because it is not ACID compliant
+and does not support transactions.
+
+Options:
+--engine=ENGINE       Convert MySQL tables to different engine
+-l, --list            Show table information
+-a, --available       Show list of available engines
+-h, --help            Print out this help
+
+Example:
+\$sudo -u www-data /usr/bin/php admin/cli/mysql_engine.php --engine=InnoDB
+";
+
+if (!empty($options['engine'])) {
+    $engines = mysql_get_engines();
+    $engine = clean_param($options['engine'], PARAM_ALPHA);
+    if (!isset($engines[strtoupper($engine)])) {
+        cli_error("Error: engine '$engine' is not available on this server!");
+    }
+
+    echo "Converting tables to '$engine' for $CFG->wwwroot:\n";
+    $prefix = $DB->get_prefix();
+    $prefix = str_replace('_', '\\_', $prefix);
+    $sql = "SHOW TABLE STATUS WHERE Name LIKE BINARY '$prefix%'";
+    $rs = $DB->get_recordset_sql($sql);
+    $converted = 0;
+    $skipped   = 0;
+    $errors    = 0;
+    foreach ($rs as $table) {
+        if (strtoupper($table->engine) === strtoupper($engine)) {
+            $newengine = mysql_get_table_engine($table->name);
+            echo str_pad($table->name, 40). " - NO CONVERSION NEEDED ($newengine)\n";
+            $skipped++;
+            continue;
+        }
+        echo str_pad($table->name, 40). " - ";
+
+        try {
+            $DB->change_database_structure("ALTER TABLE {$table->name} ENGINE = $engine");
+            $newengine = mysql_get_table_engine($table->name);
+            if (strtoupper($newengine) !== strtoupper($engine)) {
+                echo "ERROR ($newengine)\n";
+                $errors++;
+                continue;
+            }
+            echo "DONE ($newengine)\n";
+            $converted++;
+        } catch (moodle_exception $e) {
+            echo $e->getMessage()."\n";
+            $errors++;
+            continue;
+        }
+    }
+    $rs->close();
+    echo "Converted: $converted, skipped: $skipped, errors: $errors\n";
+    exit(0); // success
+
+} else if (!empty($options['list'])) {
+    echo "List of tables for $CFG->wwwroot:\n";
+    $prefix = $DB->get_prefix();
+    $prefix = str_replace('_', '\\_', $prefix);
+    $sql = "SHOW TABLE STATUS WHERE Name LIKE BINARY '$prefix%'";
+    $rs = $DB->get_recordset_sql($sql);
+    $counts = array();
+    foreach ($rs as $table) {
+        if (isset($counts[$table->engine])) {
+            $counts[$table->engine]++;
+        } else {
+            $counts[$table->engine] = 1;
+        }
+        echo str_pad($table->engine, 10);
+        echo $table->name .  "\n";
+    }
+    $rs->close();
+
+    echo "\n";
+    echo "Table engines summary for $CFG->wwwroot:\n";
+    foreach ($counts as $engine => $count) {
+        echo "$engine: $count\n";
+    }
+    exit(0); // success
+
+} else if (!empty($options['available'])) {
+    echo "List of available MySQL engines for $CFG->wwwroot:\n";
+    $engines = mysql_get_engines();
+    foreach ($engines as $engine) {
+        echo " $engine\n";
+    }
+    die;
+
+} else {
+    echo $help;
+    die;
+}
+
+
+
+// ========== Some functions ==============
+
+function mysql_get_engines() {
+    global $DB;
+
+    $sql = "SHOW Engines";
+    $rs = $DB->get_recordset_sql($sql);
+    $engines = array();
+    foreach ($rs as $engine) {
+        if (strtoupper($engine->support) !== 'YES' and strtoupper($engine->support) !== 'DEFAULT') {
+            continue;
+        }
+        $engines[strtoupper($engine->engine)] = $engine->engine;
+        if (strtoupper($engine->support) === 'DEFAULT') {
+            $engines[strtoupper($engine->engine)] .= ' (default)';
+        }
+    }
+    $rs->close();
+
+    return $engines;
+}
+
+function mysql_get_table_engine($tablename) {
+    global $DB;
+
+    $engine = null;
+    $sql = "SHOW TABLE STATUS WHERE Name = '$tablename'"; // no special chars expected here
+    $rs = $DB->get_recordset_sql($sql);
+    if ($rs->valid()) {
+        $record = $rs->current();
+        $engine = $record->engine;
+    }
+    $rs->close();
+    return $engine;
+}

admin/cli/purge_caches.php

@@ -15,8 +15,6 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * CLI script to purge caches without asking for confirmation.
- *
  * @package    core
  * @subpackage cli
  * @copyright  2011 David Mudrak <david@moodle.com>
@@ -25,19 +23,10 @@
 
 define('CLI_SCRIPT', true);
 
-require(__DIR__.'/../../config.php');
+require(dirname(dirname(dirname(__FILE__))).'/config.php');
 require_once($CFG->libdir.'/clilib.php');
 
-$longoptions = [
-    'help' => false,
-    'muc' => false,
-    'theme' => false,
-    'lang' => false,
-    'js' => false,
-    'filter' => false,
-    'other' => false
-];
-list($options, $unrecognized) = cli_get_params($longoptions, ['h' => 'help']);
+list($options, $unrecognized) = cli_get_params(array('help' => false), array('h' => 'help'));
 
 if ($unrecognized) {
     $unrecognized = implode("\n  ", $unrecognized);
@@ -45,32 +34,20 @@ if ($unrecognized) {
 }
 
 if ($options['help']) {
-    // The indentation of this string is "wrong" but this is to avoid a extra whitespace in console output.
-    $help = <<<EOF
-Invalidates Moodle internal caches
-
-Specific caches can be defined (alone or in combination) using arguments. If none are specified,
-all caches will be purged.
+    $help =
+"Invalidates all Moodle internal caches
 
 Options:
 -h, --help            Print out this help
-    --muc             Purge all MUC caches (includes lang cache)
-    --theme           Purge theme cache
-    --lang            Purge language string cache
-    --js              Purge JavaScript cache
-    --filter          Purge text filter cache
-    --other           Purge all file caches and other miscellaneous caches (may include MUC
-                      if using cachestore_file).
 
 Example:
-\$ sudo -u www-data /usr/bin/php admin/cli/purge_caches.php
-
-EOF;
+\$sudo -u www-data /usr/bin/php admin/cli/purge_caches.php
+";
 
     echo $help;
     exit(0);
 }
 
-purge_caches(array_filter($options));
+purge_all_caches();
 
-exit(0);
+exit(0);

admin/cli/reset_password.php

@@ -26,26 +26,13 @@
 
 define('CLI_SCRIPT', true);
 
-require(__DIR__.'/../../config.php');
+require(dirname(dirname(dirname(__FILE__))).'/config.php');
 require_once($CFG->libdir.'/clilib.php');      // cli only functions
 
-// Define the input options.
-$longparams = array(
-        'help' => false,
-        'username' => '',
-        'password' => '',
-        'ignore-password-policy' => false
-);
-
-$shortparams = array(
-        'h' => 'help',
-        'u' => 'username',
-        'p' => 'password',
-        'i' => 'ignore-password-policy'
-);
 
 // now get cli options
-list($options, $unrecognized) = cli_get_params($longparams, $shortparams);
+list($options, $unrecognized) = cli_get_params(array('help'=>false),
+                                               array('h'=>'help'));
 
 if ($unrecognized) {
     $unrecognized = implode("\n  ", $unrecognized);
@@ -60,43 +47,29 @@ There are no security checks here because anybody who is able to
 execute this file may execute any PHP too.
 
 Options:
--h, --help                    Print out this help
--u, --username=username       Specify username to change
--p, --password=newpassword    Specify new password
---ignore-password-policy      Ignore password policy when setting password
+-h, --help            Print out this help
 
 Example:
 \$sudo -u www-data /usr/bin/php admin/cli/reset_password.php
-\$sudo -u www-data /usr/bin/php admin/cli/reset_password.php --username=rosaura --password=jiu3jiu --ignore-password-policy
-";
+"; //TODO: localize - to be translated later when everything is finished
 
     echo $help;
     die;
 }
-if ($options['username'] == '' ) {
-    cli_heading('Password reset');
-    $prompt = "Enter username (manual authentication only)";
-    $username = cli_input($prompt);
-} else {
-    $username = $options['username'];
-}
+cli_heading('Password reset'); // TODO: localize
+$prompt = "enter username (manual authentication only)"; // TODO: localize
+$username = cli_input($prompt);
 
 if (!$user = $DB->get_record('user', array('auth'=>'manual', 'username'=>$username, 'mnethostid'=>$CFG->mnet_localhost_id))) {
     cli_error("Can not find user '$username'");
 }
 
-if ($options['password'] == '' ) {
-    $prompt = "Enter new password";
-    $password = cli_input($prompt);
-} else {
-    $password = $options['password'];
-}
+$prompt = "Enter new password"; // TODO: localize
+$password = cli_input($prompt);
 
 $errmsg = '';//prevent eclipse warning
-if (!$options['ignore-password-policy'] ) {
-    if (!check_password_policy($password, $errmsg, $user)) {
-        cli_error(html_to_text($errmsg, 0));
-    }
+if (!check_password_policy($password, $errmsg)) {
+    cli_error($errmsg);
 }
 
 $hashedpassword = hash_internal_user_password($password);
@@ -105,4 +78,4 @@ $DB->set_field('user', 'password', $hashedpassword, array('id'=>$user->id));
 
 echo "Password changed\n";
 
-exit(0); // 0 means success.
+exit(0); // 0 means success

admin/cli/restore_backup.php

@@ -1,109 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This script allows to restore a course from CLI.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2020 Catalyst IT
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', 1);
-
-require(__DIR__ . '/../../config.php');
-require_once($CFG->libdir . '/clilib.php');
-require_once($CFG->dirroot . "/backup/util/includes/restore_includes.php");
-
-list($options, $unrecognized) = cli_get_params([
-    'file' => '',
-    'categoryid' => '',
-    'showdebugging' => false,
-    'help' => false,
-], [
-    'f' => 'file',
-    'c' => 'categoryid',
-    's' => 'showdebugging',
-    'h' => 'help',
-]);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help'] || !($options['file']) || !($options['categoryid'])) {
-    $help = <<<EOL
-Restore backup into provided category.
-
-Options:
--f, --file=STRING           Path to the backup file.
--c, --categoryid=INT        ID of the category to restore too.
--s, --showdebugging         Show developer level debugging information
--h, --help                  Print out this help.
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/restore_backup.php --file=/path/to/backup/file.mbz --categoryid=1\n
-EOL;
-
-    echo $help;
-    exit(0);
-}
-
-if ($options['showdebugging']) {
-    set_debugging(DEBUG_DEVELOPER, true);
-}
-
-if (!$admin = get_admin()) {
-    print_error('noadmins');
-}
-
-if (!file_exists($options['file'])) {
-    print_error('filenotfound');
-}
-
-if (!$category = $DB->get_record('course_categories', ['id' => $options['categoryid']], 'id')) {
-    print_error('invalidcategoryid');
-}
-
-$backupdir = "restore_" . uniqid();
-$path = $CFG->tempdir . DIRECTORY_SEPARATOR . "backup" . DIRECTORY_SEPARATOR . $backupdir;
-
-cli_heading(get_string('extractingbackupfileto', 'backup', $path));
-$fp = get_file_packer('application/vnd.moodle.backup');
-$fp->extract_to_pathname($options['file'], $path);
-
-cli_heading(get_string('preprocessingbackupfile'));
-try {
-    list($fullname, $shortname) = restore_dbops::calculate_course_names(0, get_string('restoringcourse', 'backup'),
-        get_string('restoringcourseshortname', 'backup'));
-
-    $courseid = restore_dbops::create_new_course($fullname, $shortname, $category->id);
-
-    $rc = new restore_controller($backupdir, $courseid, backup::INTERACTIVE_NO,
-        backup::MODE_GENERAL, $admin->id, backup::TARGET_NEW_COURSE);
-    $rc->execute_precheck();
-    $rc->execute_plan();
-    $rc->destroy();
-} catch (Exception $e) {
-    cli_heading(get_string('cleaningtempdata'));
-    fulldelete($path);
-    print_error('generalexceptionmessage', 'error', '', $e->getMessage());
-}
-
-cli_heading(get_string('restoredcourseid', 'backup', $courseid));
-exit(0);

admin/cli/scheduled_task.php

@@ -1,168 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * CLI task execution.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2014 Petr Skoda
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__ . '/../../config.php');
-require_once("$CFG->libdir/clilib.php");
-require_once("$CFG->libdir/cronlib.php");
-
-list($options, $unrecognized) = cli_get_params(
-    [
-        'help' => false,
-        'list' => false,
-        'execute' => false,
-        'showsql' => false,
-        'showdebugging' => false,
-        'force' => false,
-    ], [
-        'h' => 'help',
-        'f' => 'force',
-    ]
-);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help'] or (!$options['list'] and !$options['execute'])) {
-    $help =
-    "Scheduled cron tasks.
-
-    Options:
-    --execute=\\some\\task  Execute scheduled task manually
-    --list                List all scheduled tasks
-    --showsql             Show sql queries before they are executed
-    --showdebugging       Show developer level debugging information
-    -h, --help            Print out this help
-    -f, --force           Execute task even if cron is disabled
-
-    Example:
-    \$sudo -u www-data /usr/bin/php admin/cli/scheduled_task.php --execute=\\core\\task\\session_cleanup_task
-
-    ";
-
-    echo $help;
-    die;
-}
-
-if ($options['showdebugging']) {
-    set_debugging(DEBUG_DEVELOPER, true);
-}
-
-if ($options['showsql']) {
-    $DB->set_debug(true);
-}
-if ($options['list']) {
-    cli_heading("List of scheduled tasks ($CFG->wwwroot)");
-
-    $shorttime = get_string('strftimedatetimeshort');
-
-    $tasks = \core\task\manager::get_all_scheduled_tasks();
-    echo str_pad(get_string('scheduledtasks', 'tool_task'), 50, ' ') . ' ' . str_pad(get_string('runpattern', 'tool_task'), 17, ' ')
-        . ' ' . str_pad(get_string('lastruntime', 'tool_task'), 40, ' ') . get_string('nextruntime', 'tool_task') . "\n";
-    foreach ($tasks as $task) {
-        $class = '\\' . get_class($task);
-        $schedule = $task->get_minute() . ' '
-            . $task->get_hour() . ' '
-            . $task->get_day() . ' '
-            . $task->get_day_of_week() . ' '
-            . $task->get_month() . ' '
-            . $task->get_day_of_week();
-        $nextrun = $task->get_next_run_time();
-        $lastrun = $task->get_last_run_time();
-
-        $plugininfo = core_plugin_manager::instance()->get_plugin_info($task->get_component());
-        $plugindisabled = $plugininfo && $plugininfo->is_enabled() === false && !$task->get_run_if_component_disabled();
-
-        if ($plugindisabled) {
-            $nextrun = get_string('plugindisabled', 'tool_task');
-        } else if ($task->get_disabled()) {
-            $nextrun = get_string('taskdisabled', 'tool_task');
-        } else if ($nextrun > time()) {
-            $nextrun = userdate($nextrun);
-        } else {
-            $nextrun = get_string('asap', 'tool_task');
-        }
-
-        if ($lastrun) {
-            $lastrun = userdate($lastrun);
-        } else {
-            $lastrun = get_string('never');
-        }
-
-        echo str_pad($class, 50, ' ') . ' ' . str_pad($schedule, 17, ' ') .
-            ' ' . str_pad($lastrun, 40, ' ') . ' ' . $nextrun . "\n";
-    }
-    exit(0);
-}
-
-if ($execute = $options['execute']) {
-    if (!$task = \core\task\manager::get_scheduled_task($execute)) {
-        mtrace("Task '$execute' not found");
-        exit(1);
-    }
-
-    if (moodle_needs_upgrading()) {
-        mtrace("Moodle upgrade pending, cannot execute tasks.");
-        exit(1);
-    }
-
-    if (!get_config('core', 'cron_enabled') && !$options['force']) {
-        mtrace('Cron is disabled. Use --force to override.');
-        exit(1);
-    }
-
-    \core\task\manager::scheduled_task_starting($task);
-
-    // Increase memory limit.
-    raise_memory_limit(MEMORY_EXTRA);
-
-    // Emulate normal session - we use admin account by default.
-    cron_setup_user();
-
-    // Execute the task.
-    \core\local\cli\shutdown::script_supports_graceful_exit();
-    $cronlockfactory = \core\lock\lock_config::get_lock_factory('cron');
-    if (!$cronlock = $cronlockfactory->get_lock('core_cron', 10)) {
-        mtrace('Cannot obtain cron lock');
-        exit(129);
-    }
-    if (!$lock = $cronlockfactory->get_lock('\\' . get_class($task), 10)) {
-        $cronlock->release();
-        mtrace('Cannot obtain task lock');
-        exit(130);
-    }
-
-    $task->set_lock($lock);
-    if (!$task->is_blocking()) {
-        $cronlock->release();
-    } else {
-        $task->set_cron_lock($cronlock);
-    }
-
-    cron_run_inner_scheduled_task($task);
-}

admin/cli/uninstall_plugins.php

@@ -1,183 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * CLI script to uninstall plugins.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2018 Dmitrii Metelkin <dmitriim@catalyst-au.net>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__ . '/../../config.php');
-require_once($CFG->libdir . '/clilib.php');
-require_once($CFG->libdir . '/adminlib.php');
-
-$help = "Command line tool to uninstall plugins.
-
-Options:
-    -h --help                   Print this help.
-    --show-all                  Displays a list of all installed plugins.
-    --show-contrib              Displays a list of all third-party installed plugins.
-    --show-missing              Displays a list of plugins missing from disk.
-    --purge-missing             Uninstall all missing from disk plugins.
-    --plugins=<plugin name>     A comma separated list of plugins to be uninstalled. E.g. mod_assign,mod_forum
-    --run                       Execute uninstall. If this option is not set, then the script will be run in a dry mode.
-    --showsql                   Show sql queries before they are executed.
-    --showdebugging             Show developer level debugging information.
-
-Examples:
-
-    # php uninstall_plugins.php  --show-all
-        Prints tab-separated list of all installed plugins.
-
-    # php uninstall_plugins.php  --show-contrib
-        Prints tab-separated list of all third-party installed plugins.
-
-    # php uninstall_plugins.php  --show-missing
-        Prints tab-separated list of all missing from disk plugins.
-
-    # php uninstall_plugins.php  --purge-missing
-        A dry run of uninstalling all missing plugins.
-
-    # php uninstall_plugins.php  --purge-missing --run
-        Run uninstall of all missing plugins.
-
-    # php uninstall_plugins.php  --plugins=mod_assign,mod_forum
-        A dry run of uninstalling mod_assign and mod_forum plugins.
-
-    # php uninstall_plugins.php  --plugins=mod_assign,mod_forum --run
-        Run uninstall for mod_assign and mod_forum plugins.
-";
-
-list($options, $unrecognised) = cli_get_params([
-    'help' => false,
-    'show-all' => false,
-    'show-contrib' => false,
-    'show-missing' => false,
-    'purge-missing' => false,
-    'plugins' => false,
-    'run' => false,
-    'showsql' => false,
-    'showdebugging' => false,
-], [
-    'h' => 'help'
-]);
-
-if ($unrecognised) {
-    $unrecognised = implode(PHP_EOL.'  ', $unrecognised);
-    cli_error(get_string('cliunknowoption', 'core_admin', $unrecognised));
-}
-
-if ($options['help']) {
-    cli_writeln($help);
-    exit(0);
-}
-
-if ($options['showdebugging']) {
-    set_debugging(DEBUG_DEVELOPER, true);
-}
-
-if ($options['showsql']) {
-    $DB->set_debug(true);
-}
-
-$pluginman = core_plugin_manager::instance();
-$plugininfo = $pluginman->get_plugins();
-
-if ($options['show-all'] || $options['show-missing'] || $options['show-contrib']) {
-    foreach ($plugininfo as $type => $plugins) {
-        foreach ($plugins as $name => $plugin) {
-            if ($options['show-contrib'] && $plugin->is_standard()) {
-                continue;
-            }
-            $pluginstring = $plugin->component . "\t" . $plugin->displayname;
-
-            if ($options['show-all'] || $options['show-contrib']) {
-                cli_writeln($pluginstring);
-            } else {
-                if ($plugin->get_status() === core_plugin_manager::PLUGIN_STATUS_MISSING) {
-                    cli_writeln($pluginstring);
-                }
-            }
-        }
-    }
-
-    exit(0);
-}
-
-if ($options['purge-missing']) {
-    foreach ($plugininfo as $type => $plugins) {
-        foreach ($plugins as $name => $plugin) {
-            if ($plugin->get_status() === core_plugin_manager::PLUGIN_STATUS_MISSING) {
-
-                $pluginstring = $plugin->component . "\t" . $plugin->displayname;
-
-                if ($pluginman->can_uninstall_plugin($plugin->component)) {
-                    if ($options['run']) {
-                        cli_writeln('Uninstalling: ' . $pluginstring);
-
-                        $progress = new progress_trace_buffer(new text_progress_trace(), true);
-                        $pluginman->uninstall_plugin($plugin->component, $progress);
-                        $progress->finished();
-                        cli_write($progress->get_buffer());
-                    } else {
-                        cli_writeln('Will be uninstalled: ' . $pluginstring);
-                    }
-                } else {
-                    cli_writeln('Can not be uninstalled: ' . $pluginstring);
-                }
-            }
-        }
-    }
-
-    exit(0);
-}
-
-if ($options['plugins']) {
-    $components = explode(',', $options['plugins']);
-    foreach ($components as $component) {
-        $plugin = $pluginman->get_plugin_info($component);
-
-        if (is_null($plugin)) {
-            cli_writeln('Unknown plugin: ' . $component);
-        } else {
-            $pluginstring = $plugin->component . "\t" . $plugin->displayname;
-
-            if ($pluginman->can_uninstall_plugin($plugin->component)) {
-                if ($options['run']) {
-                    cli_writeln('Uninstalling: ' . $pluginstring);
-                    $progress = new progress_trace_buffer(new text_progress_trace(), true);
-                    $pluginman->uninstall_plugin($plugin->component, $progress);
-                    $progress->finished();
-                    cli_write($progress->get_buffer());
-                } else {
-                    cli_writeln('Will be uninstalled: ' . $pluginstring);
-                }
-            } else {
-                cli_writeln('Can not be uninstalled: ' . $pluginstring);
-            }
-        }
-    }
-
-    exit(0);
-}
-
-cli_writeln($help);
-exit(0);

admin/cli/upgrade.php

@@ -29,41 +29,28 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-// Force OPcache reset if used, we do not want any stale caches
-// when detecting if upgrade necessary or when running upgrade.
-if (function_exists('opcache_reset') and !isset($_SERVER['REMOTE_ADDR'])) {
-    opcache_reset();
-}
-
 define('CLI_SCRIPT', true);
 define('CACHE_DISABLE_ALL', true);
 
-require(__DIR__.'/../../config.php');
+require(dirname(dirname(dirname(__FILE__))).'/config.php');
 require_once($CFG->libdir.'/adminlib.php');       // various admin-only functions
 require_once($CFG->libdir.'/upgradelib.php');     // general upgrade/install related functions
 require_once($CFG->libdir.'/clilib.php');         // cli only functions
 require_once($CFG->libdir.'/environmentlib.php');
+require_once($CFG->libdir.'/pluginlib.php');
 
 // now get cli options
-$lang = isset($SESSION->lang) ? $SESSION->lang : $CFG->lang;
 list($options, $unrecognized) = cli_get_params(
     array(
         'non-interactive'   => false,
         'allow-unstable'    => false,
-        'help'              => false,
-        'lang'              => $lang,
-        'verbose-settings'  => false,
-        'is-pending'        => false,
+        'help'              => false
     ),
     array(
         'h' => 'help'
     )
 );
 
-if ($options['lang']) {
-    $SESSION->lang = $options['lang'];
-}
-
 $interactive = empty($options['non-interactive']);
 
 if ($unrecognized) {
@@ -82,15 +69,6 @@ Options:
 --non-interactive     No interactive questions or confirmations
 --allow-unstable      Upgrade even if the version is not marked as stable yet,
                       required in non-interactive mode.
---lang=CODE           Set preferred language for CLI output. Defaults to the
-                      site language if not set. Defaults to 'en' if the lang
-                      parameter is invalid or if the language pack is not
-                      installed.
---verbose-settings    Show new settings values. By default only the name of
-                      new core or plugin settings are displayed. This option
-                      outputs the new values as well as the setting name.
---is-pending          If an upgrade is needed it exits with an error code of
-                      2 so it distinct from other types of errors.
 -h, --help            Print out this help
 
 Example:
@@ -119,10 +97,6 @@ if (!moodle_needs_upgrading()) {
     cli_error(get_string('cliupgradenoneed', 'core_admin', $newversion), 0);
 }
 
-if ($options['is-pending']) {
-    cli_error(get_string('cliupgradepending', 'core_admin'), 2);
-}
-
 // Test environment first.
 list($envstatus, $environment_results) = check_moodle_environment(normalize_version($release), ENV_SELECT_RELEASE);
 if (!$envstatus) {
@@ -135,27 +109,17 @@ if (!$envstatus) {
     exit(1);
 }
 
-// Make sure there are no files left over from previous versions.
-if (upgrade_stale_php_files_present()) {
-    cli_problem(get_string('upgradestalefiles', 'admin'));
-
-    // Stale file info contains HTML elements which aren't suitable for CLI.
-    $upgradestalefilesinfo = get_string('upgradestalefilesinfo', 'admin', get_docs_url('Upgrading'));
-    cli_error(strip_tags($upgradestalefilesinfo));
-}
-
 // Test plugin dependencies.
 $failed = array();
-if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed, $CFG->branch)) {
+if (!plugin_manager::instance()->all_plugins_ok($version, $failed)) {
     cli_problem(get_string('pluginscheckfailed', 'admin', array('pluginslist' => implode(', ', array_unique($failed)))));
     cli_error(get_string('pluginschecktodo', 'admin'));
 }
 
-$a = new stdClass();
-$a->oldversion = $oldversion;
-$a->newversion = $newversion;
-
 if ($interactive) {
+    $a = new stdClass();
+    $a->oldversion = $oldversion;
+    $a->newversion = $newversion;
     echo cli_heading(get_string('databasechecking', '', $a)) . PHP_EOL;
 }
 
@@ -202,32 +166,11 @@ set_config('branch', $branch);
 upgrade_noncore(true);
 
 // log in as admin - we need doanything permission when applying defaults
-\core\session\manager::set_user(get_admin());
+session_set_user(get_admin());
 
-// Apply default settings and output those that have changed.
-cli_heading(get_string('cliupgradedefaultheading', 'admin'));
-$settingsoutput = admin_apply_default_settings(null, false);
+// apply all default settings, just in case do it twice to fill all defaults
+admin_apply_default_settings(NULL, false);
+admin_apply_default_settings(NULL, false);
 
-foreach ($settingsoutput as $setting => $value) {
-
-    if ($options['verbose-settings']) {
-        $stringvlaues = array(
-                'name' => $setting,
-                'defaultsetting' => var_export($value, true) // Expand objects.
-        );
-        echo get_string('cliupgradedefaultverbose', 'admin', $stringvlaues) . PHP_EOL;
-
-    } else {
-        echo get_string('cliupgradedefault', 'admin', $setting) . PHP_EOL;
-
-    }
-}
-
-// This needs to happen at the end to ensure it occurs after all caches
-// have been purged for the last time.
-// This will build a cached version of the current theme for the user
-// to immediately start browsing the site.
-upgrade_themes();
-
-echo get_string('cliupgradefinished', 'admin', $a)."\n";
+echo get_string('cliupgradefinished', 'admin')."\n";
 exit(0); // 0 means success

admin/contentbank.php

@@ -1,87 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Content bank and its plugins settings.
- *
- * @package    core
- * @subpackage contentbank
- * @copyright  2020 Amaia Anabitarte <amaia@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-$action = required_param('action', PARAM_ALPHANUMEXT);
-$name   = required_param('name', PARAM_PLUGIN);
-
-$syscontext = context_system::instance();
-$PAGE->set_url('/admin/contentbank.php');
-$PAGE->set_context($syscontext);
-
-require_admin();
-require_sesskey();
-
-$return = new moodle_url('/admin/settings.php', array('section' => 'managecontentbanktypes'));
-
-$plugins = core_plugin_manager::instance()->get_plugins_of_type('contenttype');
-$sortorder = array_flip(array_keys($plugins));
-
-if (!isset($plugins[$name])) {
-    print_error('contenttypenotfound', 'error', $return, $name);
-}
-
-switch ($action) {
-    case 'disable':
-        if ($plugins[$name]->is_enabled()) {
-            $class = \core_plugin_manager::resolve_plugininfo_class('contenttype');
-            $class::enable_plugin($name, false);
-        }
-        break;
-    case 'enable':
-        if (!$plugins[$name]->is_enabled()) {
-            $class = \core_plugin_manager::resolve_plugininfo_class('contenttype');
-            $class::enable_plugin($name, true);
-        }
-        break;
-    case 'up':
-        if ($sortorder[$name]) {
-            $currentindex = $sortorder[$name];
-            $seq = array_keys($plugins);
-            $seq[$currentindex] = $seq[$currentindex - 1];
-            $seq[$currentindex - 1] = $name;
-            set_config('contentbank_plugins_sortorder', implode(',', $seq));
-            core_plugin_manager::reset_caches();
-        }
-        break;
-    case 'down':
-        if ($sortorder[$name] < count($sortorder) - 1) {
-            $currentindex = $sortorder[$name];
-            $seq = array_keys($plugins);
-            $seq[$currentindex] = $seq[$currentindex + 1];
-            $seq[$currentindex + 1] = $name;
-            set_config('contentbank_plugins_sortorder', implode(',', $seq));
-            core_plugin_manager::reset_caches();
-        }
-        break;
-}
-$cache = cache::make('core', 'contentbank_enabled_extensions');
-$cache->purge();
-$cache = cache::make('core', 'contentbank_context_extensions');
-$cache->purge();
-
-redirect($return);

admin/courseformats.php

@@ -24,20 +24,23 @@
 
 require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir.'/pluginlib.php');
 
 $action  = required_param('action', PARAM_ALPHANUMEXT);
 $formatname   = required_param('format', PARAM_PLUGIN);
+$confirm = optional_param('confirm', 0, PARAM_BOOL);
 
 $syscontext = context_system::instance();
 $PAGE->set_url('/admin/courseformats.php');
 $PAGE->set_context($syscontext);
 
-require_admin();
+require_login();
+require_capability('moodle/site:config', $syscontext);
 require_sesskey();
 
 $return = new moodle_url('/admin/settings.php', array('section' => 'manageformats'));
 
-$formatplugins = core_plugin_manager::instance()->get_plugins_of_type('format');
+$formatplugins = plugin_manager::instance()->get_plugins_of_type('format');
 $sortorder = array_flip(array_keys($formatplugins));
 
 if (!isset($formatplugins[$formatname])) {
@@ -47,14 +50,15 @@ if (!isset($formatplugins[$formatname])) {
 switch ($action) {
     case 'disable':
         if ($formatplugins[$formatname]->is_enabled()) {
-            $class = \core_plugin_manager::resolve_plugininfo_class('format');
-            $class::enable_plugin($formatname, false);
+            if (get_config('moodlecourse', 'format') === $formatname) {
+                print_error('cannotdisableformat', 'error', $return);
+            }
+            set_config('disabled', 1, 'format_'. $formatname);
         }
         break;
     case 'enable':
         if (!$formatplugins[$formatname]->is_enabled()) {
-            $class = \core_plugin_manager::resolve_plugininfo_class('format');
-            $class::enable_plugin($formatname, true);
+            unset_config('disabled', 'format_'. $formatname);
         }
         break;
     case 'up':
@@ -75,5 +79,52 @@ switch ($action) {
             set_config('format_plugins_sortorder', implode(',', $seq));
         }
         break;
+    case 'uninstall':
+        echo $OUTPUT->header();
+        echo $OUTPUT->heading(get_string('courseformats', 'moodle'));
+
+        $coursecount = $DB->count_records('course', array('format' => $formatname));
+        if ($coursecount) {
+            // Check that default format is set. It will be used to convert courses
+            // using this format
+            $defaultformat = get_config('moodlecourse', 'format');
+            $defaultformat = $formatplugins[get_config('moodlecourse', 'format')];
+            if (!$defaultformat) {
+                echo $OUTPUT->error_text(get_string('defaultformatnotset', 'admin'));
+                echo $OUTPUT->footer();
+                exit;
+            }
+        }
+
+        $format = $formatplugins[$formatname];
+        $deleteurl = $format->get_uninstall_url();
+        if (!$deleteurl) {
+            // somebody was trying to cheat and type non-existing link
+            echo $OUTPUT->error_text(get_string('cannotuninstall', 'admin', $format->displayname));
+            echo $OUTPUT->footer();
+            exit;
+        }
+
+        if (!$confirm) {
+            if ($coursecount) {
+                $message = get_string('formatuninstallwithcourses', 'admin',
+                        (object)array('count' => $coursecount, 'format' => $format->displayname,
+                            'defaultformat' => $defaultformat->displayname));
+            } else {
+                $message = get_string('formatuninstallconfirm', 'admin', $format->displayname);
+            }
+            $deleteurl->param('confirm', 1);
+            echo $OUTPUT->confirm($message, $deleteurl, $return);
+        } else {
+            $a = new stdClass();
+            $a->plugin = $format->displayname;
+            $a->directory = $format->rootdir;
+            uninstall_plugin('format', $formatname);
+            echo $OUTPUT->notification(get_string('formatuninstalled', 'admin', $a), 'notifysuccess');
+            echo $OUTPUT->continue_button($return);
+        }
+
+        echo $OUTPUT->footer();
+        exit;
 }
 redirect($return);

admin/cron.php

@@ -53,7 +53,7 @@ require_once($CFG->libdir.'/clilib.php');
 require_once($CFG->libdir.'/cronlib.php');
 
 // extra safety
-\core\session\manager::write_close();
+session_get_instance()->write_close();
 
 // check if execution allowed
 if (!empty($CFG->cronclionly)) {
@@ -72,10 +72,24 @@ if (!empty($CFG->cronremotepassword)) {
 }
 
 // send mime type and encoding
-@header('Content-Type: text/plain; charset=utf-8');
+if (check_browser_version('MSIE')) {
+    //ugly IE hack to work around downloading instead of viewing
+    @header('Content-Type: text/html; charset=utf-8');
+    echo "<xmp>"; //<pre> is not good enough for us here
+} else {
+    //send proper plaintext header
+    @header('Content-Type: text/plain; charset=utf-8');
+}
 
 // we do not want html markup in emulated CLI
 @ini_set('html_errors', 'off');
 
 // execute the cron
 cron_run();
+
+// finish the IE hack
+if (check_browser_version('MSIE')) {
+    echo "</xmp>";
+}
+
+

admin/customfields.php

@@ -1,61 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Allows the admin to enable, disable and uninstall custom fields
- *
- * @package    core_admin
- * @copyright  2018 Daniel Neis Araujo
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-$action  = required_param('action', PARAM_ALPHANUMEXT);
-$customfieldname = required_param('field', PARAM_PLUGIN);
-
-$syscontext = context_system::instance();
-$PAGE->set_url('/admin/customfields.php');
-$PAGE->set_context($syscontext);
-
-require_admin();
-require_sesskey();
-
-$return = new moodle_url('/admin/settings.php', array('section' => 'managecustomfields'));
-
-$customfieldplugins = core_plugin_manager::instance()->get_plugins_of_type('customfield');
-$sortorder = array_flip(array_keys($customfieldplugins));
-
-if (!isset($customfieldplugins[$customfieldname])) {
-    print_error('customfieldnotfound', 'error', $return, $customfieldname);
-}
-
-switch ($action) {
-    case 'disable':
-        if ($customfieldplugins[$customfieldname]->is_enabled()) {
-            $class = \core_plugin_manager::resolve_plugininfo_class('customfield');
-            $class::enable_plugin($customfieldname, false);
-        }
-        break;
-    case 'enable':
-        if (!$customfieldplugins[$customfieldname]->is_enabled()) {
-            $class = \core_plugin_manager::resolve_plugininfo_class('customfield');
-            $class::enable_plugin($customfieldname, true);
-        }
-        break;
-}
-redirect($return);

admin/dataformats.php

@@ -1,80 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Lets users manage data formats
- *
- * @license    http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @copyright  2016 Brendan Heywood (brendan@catalyst-au.net)
- * @package    core
- * @subpackage dataformat
- */
-
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-$action = required_param('action', PARAM_ALPHANUMEXT);
-$name   = required_param('name', PARAM_PLUGIN);
-
-$syscontext = context_system::instance();
-$PAGE->set_url('/admin/dataformats.php');
-$PAGE->set_context($syscontext);
-
-require_admin();
-require_sesskey();
-
-$return = new moodle_url('/admin/settings.php', array('section' => 'managedataformats'));
-
-$plugins = core_plugin_manager::instance()->get_plugins_of_type('dataformat');
-$sortorder = array_flip(array_keys($plugins));
-
-if (!isset($plugins[$name])) {
-    print_error('courseformatnotfound', 'error', $return, $name);
-}
-
-switch ($action) {
-    case 'disable':
-        if ($plugins[$name]->is_enabled()) {
-            $class = \core_plugin_manager::resolve_plugininfo_class('dataformat');
-            $class::enable_plugin($name, false);
-        }
-        break;
-    case 'enable':
-        if (!$plugins[$name]->is_enabled()) {
-            $class = \core_plugin_manager::resolve_plugininfo_class('dataformat');
-            $class::enable_plugin($name, true);
-        }
-        break;
-    case 'up':
-        if ($sortorder[$name]) {
-            $currentindex = $sortorder[$name];
-            $seq = array_keys($plugins);
-            $seq[$currentindex] = $seq[$currentindex - 1];
-            $seq[$currentindex - 1] = $name;
-            set_config('dataformat_plugins_sortorder', implode(',', $seq));
-        }
-        break;
-    case 'down':
-        if ($sortorder[$name] < count($sortorder) - 1) {
-            $currentindex = $sortorder[$name];
-            $seq = array_keys($plugins);
-            $seq[$currentindex] = $seq[$currentindex + 1];
-            $seq[$currentindex + 1] = $name;
-            set_config('dataformat_plugins_sortorder', implode(',', $seq));
-        }
-        break;
-}
-redirect($return);

admin/editors.php

@@ -15,7 +15,8 @@ $confirm = optional_param('confirm', 0, PARAM_BOOL);
 $PAGE->set_url('/admin/editors.php', array('action'=>$action, 'editor'=>$editor));
 $PAGE->set_context(context_system::instance());
 
-require_admin();
+require_login();
+require_capability('moodle/site:config', context_system::instance());
 
 $returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageeditors";
 
@@ -39,19 +40,20 @@ if (!confirm_sesskey()) {
     redirect($returnurl);
 }
 
+
 $return = true;
 switch ($action) {
     case 'disable':
-        // Remove from enabled list.
-        $class = \core_plugin_manager::resolve_plugininfo_class('editor');
-        $class::enable_plugin($editor, false);
+        // remove from enabled list
+        $key = array_search($editor, $active_editors);
+        unset($active_editors[$key]);
         break;
 
     case 'enable':
-        // Add to enabled list.
+        // add to enabled list
         if (!in_array($editor, $active_editors)) {
-            $class = \core_plugin_manager::resolve_plugininfo_class('editor');
-            $class::enable_plugin($editor, true);
+            $active_editors[] = $editor;
+            $active_editors = array_unique($active_editors);
         }
         break;
 
@@ -64,9 +66,6 @@ switch ($action) {
                 $fsave = $active_editors[$key];
                 $active_editors[$key] = $active_editors[$key + 1];
                 $active_editors[$key + 1] = $fsave;
-                add_to_config_log('editor_position', $key, $key + 1, $editor);
-                set_config('texteditors', implode(',', $active_editors));
-                core_plugin_manager::reset_caches();
             }
         }
         break;
@@ -80,17 +79,62 @@ switch ($action) {
                 $fsave = $active_editors[$key];
                 $active_editors[$key] = $active_editors[$key - 1];
                 $active_editors[$key - 1] = $fsave;
-                add_to_config_log('editor_position', $key, $key - 1, $editor);
-                set_config('texteditors', implode(',', $active_editors));
-                core_plugin_manager::reset_caches();
             }
         }
         break;
 
+    case 'uninstall':
+        if ($editor === 'textarea') {
+            redirect($returnurl);
+        }
+        if (get_string_manager()->string_exists('pluginname', 'editor_'.$editor)) {
+            $strplugin = get_string('pluginname', 'editor_'.$editor);
+        } else {
+            $strplugin = $editor;
+        }
+
+        $PAGE->set_title($strplugin);
+        echo $OUTPUT->header();
+
+        if (!$confirm) {
+            echo $OUTPUT->heading(get_string('editors', 'core_editor'));
+
+            $deleteurl = new moodle_url('/admin/editors.php', array('action'=>'uninstall', 'editor'=>$editor, 'sesskey'=>sesskey(), 'confirm'=>1));
+
+            echo $OUTPUT->confirm(get_string('editordeleteconfirm', 'core_editor', $strplugin),
+                $deleteurl, $returnurl);
+            echo $OUTPUT->footer();
+            die();
+
+        } else {
+            // Remove from enabled list.
+            $key = array_search($editor, $active_editors);
+            unset($active_editors[$key]);
+            set_config('texteditors', implode(',', $active_editors));
+
+            // Delete everything!!
+            uninstall_plugin('editor', $editor);
+
+            $a = new stdClass();
+            $a->name = $strplugin;
+            $a->directory = "$CFG->dirroot/lib/editor/$editor";
+            echo $OUTPUT->notification(get_string('plugindeletefiles', '', $a), 'notifysuccess');
+            echo $OUTPUT->continue_button($returnurl);
+            echo $OUTPUT->footer();
+            die();
+        }
+
     default:
         break;
 }
 
+// at least one editor must be active
+if (empty($active_editors)) {
+    $active_editors = array('textarea');
+}
+
+set_config('texteditors', implode(',', $active_editors));
+
 if ($return) {
     redirect ($returnurl);
 }

admin/enrol.php

@@ -31,11 +31,13 @@ require_once($CFG->libdir.'/adminlib.php');
 $action  = required_param('action', PARAM_ALPHANUMEXT);
 $enrol   = required_param('enrol', PARAM_PLUGIN);
 $confirm = optional_param('confirm', 0, PARAM_BOOL);
+$migrate = optional_param('migrate', 0, PARAM_BOOL);
 
 $PAGE->set_url('/admin/enrol.php');
 $PAGE->set_context(context_system::instance());
 
-require_admin();
+require_login();
+require_capability('moodle/site:config', context_system::instance());
 require_sesskey();
 
 $enabled = enrol_get_plugins(true);
@@ -43,18 +45,23 @@ $all     = enrol_get_plugins(false);
 
 $return = new moodle_url('/admin/settings.php', array('section'=>'manageenrols'));
 
+$syscontext = context_system::instance();
+
 switch ($action) {
     case 'disable':
-        $class = \core_plugin_manager::resolve_plugininfo_class('enrol');
-        $class::enable_plugin($enrol, false);
+        unset($enabled[$enrol]);
+        set_config('enrol_plugins_enabled', implode(',', array_keys($enabled)));
+        $syscontext->mark_dirty(); // resets all enrol caches
         break;
 
     case 'enable':
         if (!isset($all[$enrol])) {
             break;
         }
-        $class = \core_plugin_manager::resolve_plugininfo_class('enrol');
-        $class::enable_plugin($enrol, true);
+        $enabled = array_keys($enabled);
+        $enabled[] = $enrol;
+        set_config('enrol_plugins_enabled', implode(',', $enabled));
+        $syscontext->mark_dirty(); // resets all enrol caches
         break;
 
     case 'up':
@@ -89,7 +96,7 @@ switch ($action) {
         set_config('enrol_plugins_enabled', implode(',', $enabled));
         break;
 
-    case 'migrate':
+    case 'uninstall':
         if (get_string_manager()->string_exists('pluginname', 'enrol_'.$enrol)) {
             $strplugin = get_string('pluginname', 'enrol_'.$enrol);
         } else {
@@ -99,27 +106,59 @@ switch ($action) {
         $PAGE->set_title($strplugin);
         echo $OUTPUT->header();
 
-        // This may take a long time.
-        core_php_time_limit::raise();
+        if (!$confirm) {
+            echo $OUTPUT->heading(get_string('enrolments', 'enrol'));
 
-        // Disable plugin to prevent concurrent cron execution.
-        unset($enabled[$enrol]);
-        set_config('enrol_plugins_enabled', implode(',', array_keys($enabled)));
+            $deleteurl = new moodle_url('/admin/enrol.php', array('action'=>'uninstall', 'enrol'=>$enrol, 'sesskey'=>sesskey(), 'confirm'=>1, 'migrate'=>0));
+            $migrateurl = new moodle_url('/admin/enrol.php', array('action'=>'uninstall', 'enrol'=>$enrol, 'sesskey'=>sesskey(), 'confirm'=>1, 'migrate'=>1));
 
-        echo $OUTPUT->heading(get_string('uninstallmigrating', 'enrol', 'enrol_'.$enrol));
+            $migrate = new single_button($migrateurl, get_string('uninstallmigrate', 'enrol'));
+            $delete = new single_button($deleteurl, get_string('uninstalldelete', 'enrol'));
+            $cancel = new single_button($return, get_string('cancel'), 'get');
 
-        require_once("$CFG->dirroot/enrol/manual/locallib.php");
-        enrol_manual_migrate_plugin_enrolments($enrol);
+            $buttons = $OUTPUT->render($delete) . $OUTPUT->render($cancel);
+            if ($enrol !== 'manual') {
+                $buttons = $OUTPUT->render($migrate) . $buttons;
+            }
 
-        echo $OUTPUT->notification(get_string('success'), 'notifysuccess');
+            echo $OUTPUT->box_start('generalbox', 'notice');
+            echo html_writer::tag('p', markdown_to_html(get_string('uninstallconfirm', 'enrol', $strplugin)));
+            echo html_writer::tag('div', $buttons, array('class' => 'buttons'));
+            echo $OUTPUT->box_end();
 
-        if (!$return = core_plugin_manager::instance()->get_uninstall_url('enrol_'.$enrol, 'manage')) {
-            $return = new moodle_url('/admin/plugins.php');
+            echo $OUTPUT->footer();
+            exit;
+
+        } else {
+            // This may take a long time.
+            set_time_limit(0);
+
+            // Disable plugin to prevent concurrent cron execution.
+            unset($enabled[$enrol]);
+            set_config('enrol_plugins_enabled', implode(',', array_keys($enabled)));
+
+            if ($migrate) {
+                echo $OUTPUT->heading(get_string('uninstallmigrating', 'enrol', 'enrol_'.$enrol));
+
+                require_once("$CFG->dirroot/enrol/manual/locallib.php");
+                enrol_manual_migrate_plugin_enrolments($enrol);
+
+                echo $OUTPUT->notification(get_string('success'), 'notifysuccess');
+            }
+
+            // Delete everything!!
+            uninstall_plugin('enrol', $enrol);
+            $syscontext->mark_dirty(); // Resets all enrol caches.
+
+            $a = new stdClass();
+            $a->plugin = $strplugin;
+            $a->directory = "$CFG->dirroot/enrol/$enrol";
+            echo $OUTPUT->notification(get_string('uninstalldeletefiles', 'enrol', $a), 'notifysuccess');
+            echo $OUTPUT->continue_button($return);
+            echo $OUTPUT->footer();
+            exit;
         }
-        echo $OUTPUT->continue_button($return);
-        echo $OUTPUT->footer();
-        exit;
 }
 
 
-redirect($return);
+redirect($return);

admin/environment.php

@@ -45,7 +45,7 @@ admin_externalpage_setup('environment', '', $extraurlparams);
 // Handle the 'updatecomponent' action
 if ($action == 'updatecomponent' && confirm_sesskey()) {
     // Create component installer and execute it
-    if ($cd = new component_installer('https://download.moodle.org',
+    if ($cd = new component_installer('http://download.moodle.org',
                                       'environment',
                                       'environment.zip')) {
         $status = $cd->install(); //returns COMPONENT_(ERROR | UPTODATE | INSTALLED)
@@ -53,7 +53,7 @@ if ($action == 'updatecomponent' && confirm_sesskey()) {
             case COMPONENT_ERROR:
                 if ($cd->get_error() == 'remotedownloaderror') {
                     $a = new stdClass();
-                    $a->url  = 'https://download.moodle.org/environment/environment.zip';
+                    $a->url  = 'http://download.moodle.org/environment/environment.zip';
                     $a->dest = $CFG->dataroot . '/';
                     print_error($cd->get_error(), 'error', $PAGE->url, $a);
                     die();
@@ -102,7 +102,7 @@ if ($contents = load_environment_xml()) {
 }
 
 // Get the results of the environment check.
-list($envstatus, $environment_results) = check_moodle_environment($version, ENV_SELECT_NEWER);
+list($envstatus, $environment_results) = check_moodle_environment($version);
 
 // Display the page.
 $output = $PAGE->get_renderer('core', 'admin');

admin/filters.php

@@ -1,97 +1,93 @@
 <?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.org                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards Martin Dougiamas  http://dougiamas.com     //
+//                                                                       //
+// This program 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 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program 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:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
 
 /**
- * Filter management page.
+ * Processes actions from the admin_setting_managefilters object (defined in
+ * adminlib.php).
  *
- * @package    core
- * @copyright  1999 onwards Martin Dougiamas  http://dougiamas.com
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @package administration
+ *//** */
 
-require_once(__DIR__ . '/../config.php');
-require_once($CFG->libdir . '/adminlib.php');
+    require_once(dirname(__FILE__) . '/../config.php');
+    require_once($CFG->libdir . '/adminlib.php');
 
-$action = optional_param('action', '', PARAM_ALPHA);
-$filterpath = optional_param('filterpath', '', PARAM_PLUGIN);
+    $action = optional_param('action', '', PARAM_ALPHANUMEXT);
+    $filterpath = optional_param('filterpath', '', PARAM_SAFEDIR);
 
-admin_externalpage_setup('managefilters');
+    require_login();
+    $systemcontext = context_system::instance();
+    require_capability('moodle/site:config', $systemcontext);
 
-// Clean up bogus filter states first.
-/** @var core\plugininfo\filter[] $plugininfos */
-$plugininfos = core_plugin_manager::instance()->get_plugins_of_type('filter');
-$filters = [];
-$states = filter_get_global_states();
-foreach ($states as $state) {
-    if (!isset($plugininfos[$state->filter]) and !get_config('filter_'.$state->filter, 'version')) {
-        // Purge messy leftovers after incorrectly uninstalled plugins and unfinished installations.
-        $DB->delete_records('filter_active', ['filter' => $state->filter]);
-        $DB->delete_records('filter_config', ['filter' => $state->filter]);
-        error_log('Deleted bogus "filter_'.$state->filter.'" states and config data.');
-    } else {
-        $filters[$state->filter] = $state;
+    $returnurl = "$CFG->wwwroot/$CFG->admin/filters.php";
+    admin_externalpage_setup('managefilters');
+
+    // Purge all caches related to filter administration.
+    cache::make('core', 'plugininfo_filter')->purge();
+
+    $filters = filter_get_global_states();
+
+    // In case any new filters have been installed, but not put in the table yet.
+    $fitlernames = filter_get_all_installed();
+    $newfilters = $fitlernames;
+    foreach ($filters as $filter => $notused) {
+        unset($newfilters[$filter]);
     }
-}
 
-// Add properly installed and upgraded filters to the global states table.
-foreach ($plugininfos as $filter => $info) {
-    if (isset($filters[$filter])) {
-        continue;
-    }
-    if ($info->is_installed_and_upgraded()) {
-        filter_set_global_state($filter, TEXTFILTER_DISABLED);
-        $states = filter_get_global_states();
-        foreach ($states as $state) {
-            if ($state->filter === $filter) {
-                $filters[$filter] = $state;
-                break;
-            }
+/// Process actions ============================================================
+
+    if ($action) {
+        if (!isset($filters[$filterpath]) && !isset($newfilters[$filterpath])) {
+            throw new moodle_exception('filternotinstalled', 'error', $returnurl, $filterpath);
+        }
+
+        if (!confirm_sesskey()) {
+            redirect($returnurl);
         }
     }
-}
 
-if ($action) {
-    require_sesskey();
-}
-
-// Process actions.
-switch ($action) {
+    switch ($action) {
 
     case 'setstate':
-        if (isset($filters[$filterpath]) and $newstate = optional_param('newstate', '', PARAM_INT)) {
-            /** @var \core\plugininfo\filter $class */
-            $class = core_plugin_manager::resolve_plugininfo_class('filter');
-            $class::enable_plugin($filterpath, $newstate);
+        if ($newstate = optional_param('newstate', '', PARAM_INT)) {
+            filter_set_global_state($filterpath, $newstate);
+            if ($newstate == TEXTFILTER_DISABLED) {
+                filter_set_applies_to_strings($filterpath, false);
+            }
+            unset($newfilters[$filterpath]);
         }
         break;
 
     case 'setapplyto':
-        if (isset($filters[$filterpath])) {
-            $applytostrings = optional_param('stringstoo', false, PARAM_BOOL);
-            filter_set_applies_to_strings($filterpath, $applytostrings);
-            reset_text_filters_cache();
-            core_plugin_manager::reset_caches();
-        }
+        $applytostrings = optional_param('stringstoo', false, PARAM_BOOL);
+        filter_set_applies_to_strings($filterpath, $applytostrings);
         break;
 
     case 'down':
         if (isset($filters[$filterpath])) {
             filter_set_global_state($filterpath, $filters[$filterpath]->active, 1);
-            reset_text_filters_cache();
-            core_plugin_manager::reset_caches();
         }
         break;
 
@@ -99,137 +95,154 @@ switch ($action) {
         if (isset($filters[$filterpath])) {
             $oldpos = $filters[$filterpath]->sortorder;
             filter_set_global_state($filterpath, $filters[$filterpath]->active, -1);
-            reset_text_filters_cache();
-            core_plugin_manager::reset_caches();
         }
         break;
-}
 
-// Return.
-if ($action) {
-    redirect(new moodle_url('/admin/filters.php'));
-}
+    case 'delete':
+        // If not yet confirmed, display a confirmation message.
+        if (!optional_param('confirm', '', PARAM_BOOL)) {
+            $filtername = filter_get_name($filterpath);
 
-// Print the page heading.
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('filtersettings', 'admin'));
+            $title = get_string('deletefilterareyousure', 'admin', $filtername);
+            echo $OUTPUT->header();
+            echo $OUTPUT->heading($title);
 
-$states = filter_get_global_states();
-$stringfilters = filter_get_string_filters();
+            $linkcontinue = new moodle_url($returnurl, array('action' => 'delete', 'filterpath' => $filterpath, 'confirm' => 1));
+            $formcancel = new single_button(new moodle_url($returnurl), get_string('no'), 'get');
+            echo $OUTPUT->confirm(get_string('deletefilterareyousuremessage', 'admin', $filtername), $linkcontinue, $formcancel);
+            echo $OUTPUT->footer();
+            exit;
+        }
 
-$table = new html_table();
-$table->head  = [get_string('filter'), get_string('isactive', 'filters'),
-        get_string('order'), get_string('applyto', 'filters'), get_string('settings'), get_string('uninstallplugin', 'core_admin')];
-$table->colclasses = array ('leftalign', 'leftalign', 'centeralign', 'leftalign', 'leftalign', 'leftalign');
-$table->attributes['class'] = 'admintable generaltable';
-$table->id = 'filterssetting';
-$table->data  = [];
+        // Do the deletion.
+        $title = get_string('deletingfilter', 'admin', $filterpath);
+        echo $OUTPUT->header();
+        echo $OUTPUT->heading($title);
 
-$lastactive = null;
-foreach ($states as $state) {
-    if ($state->active != TEXTFILTER_DISABLED) {
-        $lastactive = $state->filter;
+        // Delete all data for this plugin.
+        filter_delete_all_for_filter($filterpath);
+
+        $a = new stdClass;
+        $a->filter = $filterpath;
+        $a->directory = "$CFG->dirroot/filter/$filterpath";
+        echo $OUTPUT->box(get_string('deletefilterfiles', 'admin', $a), 'generalbox', 'notice');
+        echo $OUTPUT->continue_button($returnurl);
+        echo $OUTPUT->footer();
+        exit;
     }
-}
 
-// Iterate through filters adding to display table.
-$firstrow = true;
-foreach ($states as $state) {
-    $filter = $state->filter;
-    if (!isset($plugininfos[$filter])) {
-        continue;
+    // Add any missing filters to the DB table.
+    foreach ($newfilters as $filter => $notused) {
+        filter_set_global_state($filter, TEXTFILTER_DISABLED);
     }
-    $plugininfo = $plugininfos[$filter];
-    $applytostrings = isset($stringfilters[$filter]) && $state->active != TEXTFILTER_DISABLED;
-    $row = get_table_row($plugininfo, $state, $firstrow, $filter == $lastactive, $applytostrings);
-    $table->data[] = $row;
-    if ($state->active == TEXTFILTER_DISABLED) {
+
+    // Reset caches and return
+    if ($action) {
+        reset_text_filters_cache();
+        redirect($returnurl);
+    }
+
+/// End of process actions =====================================================
+
+/// Print the page heading.
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('filtersettings', 'admin'));
+
+    $activechoices = array(
+        TEXTFILTER_DISABLED => get_string('disabled', 'filters'),
+        TEXTFILTER_OFF => get_string('offbutavailable', 'filters'),
+        TEXTFILTER_ON => get_string('on', 'filters'),
+    );
+    $applytochoices = array(
+        0 => get_string('content', 'filters'),
+        1 => get_string('contentandheadings', 'filters'),
+    );
+
+    $filters = filter_get_global_states();
+
+    // In case any new filters have been installed, but not put in the table yet.
+    $filternames = filter_get_all_installed();
+    $newfilters = $filternames;
+    foreach ($filters as $filter => $notused) {
+        unset($newfilters[$filter]);
+    }
+    $stringfilters = filter_get_string_filters();
+
+    $table = new html_table();
+    $table->head  = array(get_string('filter'), get_string('isactive', 'filters'),
+            get_string('order'), get_string('applyto', 'filters'), get_string('settings'), get_string('delete'));
+    $table->colclasses = array ('leftalign', 'leftalign', 'centeralign', 'leftalign', 'leftalign', 'leftalign');
+    $table->attributes['class'] = 'admintable generaltable';
+    $table->id = 'filterssetting';
+    $table->data  = array();
+
+    $lastactive = null;
+    foreach ($filters as $filter => $filterinfo) {
+        if ($filterinfo->active != TEXTFILTER_DISABLED) {
+            $lastactive = $filter;
+        }
+    }
+
+    // iterate through filters adding to display table
+    $firstrow = true;
+    foreach ($filters as $filter => $filterinfo) {
+        $applytostrings = isset($stringfilters[$filter]) && $filterinfo->active != TEXTFILTER_DISABLED;
+        $row = get_table_row($filterinfo, $firstrow, $filter == $lastactive, $applytostrings);
+        $table->data[] = $row;
+        if ($filterinfo->active == TEXTFILTER_DISABLED) {
+            $table->rowclasses[] = 'dimmed_text';
+        } else {
+            $table->rowclasses[] = '';
+        }
+        $firstrow = false;
+    }
+    foreach ($newfilters as $filter => $filtername) {
+        $filterinfo = new stdClass;
+        $filterinfo->filter = $filter;
+        $filterinfo->active = TEXTFILTER_DISABLED;
+        $row = get_table_row($filterinfo, false, false, false);
+        $table->data[] = $row;
         $table->rowclasses[] = 'dimmed_text';
+    }
+
+    echo html_writer::table($table);
+    echo '<p class="filtersettingnote">' . get_string('filterallwarning', 'filters') . '</p>';
+    echo $OUTPUT->footer();
+
+/// Display helper functions ===================================================
+
+function filters_action_url($filterpath, $action) {
+    return new moodle_url('/admin/filters.php', array('sesskey'=>sesskey(), 'filterpath'=>$filterpath, 'action'=>$action));
+}
+
+function get_table_row($filterinfo, $isfirstrow, $islastactive, $applytostrings) {
+    global $CFG, $OUTPUT, $activechoices, $applytochoices, $filternames; //TODO: this is sloppy coding style!!
+    $row = array();
+    $filter = $filterinfo->filter;
+
+    // Filter name
+    if (!empty($filternames[$filter])) {
+        $row[] = $filternames[$filter];
     } else {
-        $table->rowclasses[] = '';
-    }
-    $firstrow = false;
-}
-
-echo html_writer::table($table);
-echo '<p class="filtersettingnote">' . get_string('filterallwarning', 'filters') . '</p>';
-echo $OUTPUT->footer();
-die;
-
-
-/**
- * Return action URL.
- *
- * @param string $filterpath which filter to get the URL for.
- * @param string $action which action to get the URL for.
- * @return moodle_url|null the requested URL.
- */
-function filters_action_url(string $filterpath, string $action): ?moodle_url {
-    if ($action === 'delete') {
-        return core_plugin_manager::instance()->get_uninstall_url('filter_'.$filterpath, 'manage');
-    }
-    return new moodle_url('/admin/filters.php',
-            ['sesskey' => sesskey(), 'filterpath' => $filterpath, 'action' => $action]);
-}
-
-/**
- * Construct table record.
- *
- * @param \core\plugininfo\filter $plugininfo
- * @param stdClass $state
- * @param bool $isfirstrow
- * @param bool $islastactive
- * @param bool $applytostrings
- * @return array data
- */
-function get_table_row(\core\plugininfo\filter $plugininfo, stdClass $state,
-        bool $isfirstrow, bool $islastactive, bool $applytostrings): array {
-    global $OUTPUT;
-    $row = [];
-    $filter = $state->filter;
-    $active = $plugininfo->is_installed_and_upgraded();
-
-    static $activechoices;
-    static $applytochoices;
-    if (!isset($activechoices)) {
-        $activechoices = [
-            TEXTFILTER_DISABLED => get_string('disabled', 'core_filters'),
-            TEXTFILTER_OFF => get_string('offbutavailable', 'core_filters'),
-            TEXTFILTER_ON => get_string('on', 'core_filters'),
-        ];
-        $applytochoices = [
-            0 => get_string('content', 'core_filters'),
-            1 => get_string('contentandheadings', 'core_filters'),
-        ];
+        $row[] = '<span class="error">' . get_string('filemissing', '', $filter) . '</span>';
     }
 
-    // Filter name.
-    $displayname = $plugininfo->displayname;
-    if (!$plugininfo->rootdir) {
-        $displayname = '<span class="error">' . $displayname . ' - ' . get_string('status_missing', 'core_plugin') . '</span>';
-    } else if (!$active) {
-        $displayname = '<span class="error">' . $displayname . ' - ' . get_string('error') . '</span>';
-    }
-    $row[] = $displayname;
-
-    // Disable/off/on.
-    $select = new single_select(filters_action_url($filter, 'setstate'), 'newstate', $activechoices, $state->active, null, 'active' . $filter);
-    $select->set_label(get_string('isactive', 'filters'), ['class' => 'accesshide']);
+    // Disable/off/on
+    $select = new single_select(filters_action_url($filter, 'setstate'), 'newstate', $activechoices, $filterinfo->active, null, 'active' . $filter);
+    $select->set_label(get_string('isactive', 'filters'), array('class' => 'accesshide'));
     $row[] = $OUTPUT->render($select);
 
-    // Re-order.
+    // Re-order
     $updown = '';
-    $spacer = $OUTPUT->spacer();
-    if ($state->active != TEXTFILTER_DISABLED) {
+    $spacer = '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" />';
+    if ($filterinfo->active != TEXTFILTER_DISABLED) {
         if (!$isfirstrow) {
-            $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'up'),
-                    new pix_icon('t/up', get_string('up'), '', ['class' => 'iconsmall']));
+            $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'up'), new pix_icon('t/up', get_string('up'), '', array('class' => 'iconsmall')));
         } else {
             $updown .= $spacer;
         }
         if (!$islastactive) {
-            $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'down'),
-                    new pix_icon('t/down', get_string('down'), '', ['class' => 'iconsmall']));
+            $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'down'), new pix_icon('t/down', get_string('down'), '', array('class' => 'iconsmall')));
         } else {
             $updown .= $spacer;
         }
@@ -237,23 +250,20 @@ function get_table_row(\core\plugininfo\filter $plugininfo, stdClass $state,
     $row[] = $updown;
 
     // Apply to strings.
-    $select = new single_select(filters_action_url($filter, 'setapplyto'),
-            'stringstoo', $applytochoices, $applytostrings, null, 'applyto' . $filter);
-    $select->set_label(get_string('applyto', 'filters'), ['class' => 'accesshide']);
-    $select->disabled = ($state->active == TEXTFILTER_DISABLED);
+    $select = new single_select(filters_action_url($filter, 'setapplyto'), 'stringstoo', $applytochoices, $applytostrings, null, 'applyto' . $filter);
+    $select->set_label(get_string('applyto', 'filters'), array('class' => 'accesshide'));
+    $select->disabled = $filterinfo->active == TEXTFILTER_DISABLED;
     $row[] = $OUTPUT->render($select);
 
-    // Settings link, if required.
-    if ($active and filter_has_global_settings($filter)) {
-        $row[] = html_writer::link(new moodle_url('/admin/settings.php',
-                ['section' => 'filtersetting'.$filter]), get_string('settings'));
+    // Settings link, if required
+    if (filter_has_global_settings($filter)) {
+        $row[] = '<a href="' . $CFG->wwwroot . '/' . $CFG->admin . '/settings.php?section=filtersetting' . $filter . '">' . get_string('settings') . '</a>';
     } else {
         $row[] = '';
     }
 
-    // Uninstall.
-    $row[] = html_writer::link(filters_action_url($filter, 'delete'),
-            get_string('uninstallplugin', 'core_admin'));
+    // Delete
+    $row[] = '<a href="' . filters_action_url($filter, 'delete') . '">' . get_string('delete') . '</a>';
 
     return $row;
 }

admin/handlevirus.php

@@ -0,0 +1,150 @@
+<?php
+/** This expects the output from a command like
+ * clamscan -r --infected --no-summary <files> 2>&1 | php -d error_log=/path/to/log thisfile.php
+ * also it's important that the output of clamscan prints the FULL PATH to each infected file, so use absolute paths for area to scan
+ * also it should be run as root, or whatever the webserver runs as so that it has the right permissions in the quarantine dir etc.
+ * php -d error_log=/path/to/log thisfile.php will override the default error log for php cli, which is stderr, so if you want this script to just print stuff out, use php thisfile.php instead.
+ */
+
+die('TODO: MDL-19380');
+
+$fd = fopen('php://stdin','r');
+if (!$fd) {
+    exit();
+}
+
+require_once(dirname(dirname(__FILE__)).'/config.php');
+require_once($CFG->libdir.'/eventslib.php');
+require_once($CFG->dirroot.'/lib/uploadlib.php'); // contains virus handling stuff.
+
+$site = get_site();
+
+while(!feof($fd)) {
+    $entry = fgets($fd);
+    if (strlen(trim($entry)) == 0) {
+        continue;
+    }
+    if (!$file = validate_line($entry)) {
+        continue;
+    }
+    $bits = explode('/',$file);
+    $a->filename = $bits[count($bits)-1];
+
+    if (!$log = $DB->get_record("log", array("module"=>"upload", "info"=>$file, "action"=>"upload"))) {
+        $a->action = clam_handle_infected_file($file,0,false);
+        clam_replace_infected_file($file);
+        notify_admins_unknown($file,$a);
+        continue;
+    }
+    $action = clam_handle_infected_file($file,$log->userid,true);
+    clam_replace_infected_file($file);
+
+    list($ctxselect, $ctxjoin) = context_instance_preload_sql('c.id', CONTEXT_COURSE, 'ctx');
+    $sql = "SELECT c.id, c.fullname $ctxselect FROM {course} c $ctxjoin WHERE c.id = :courseid";
+    $course = $DB->get_record_sql($sql, array('courseid' => $log->course));
+    context_instance_preload($course);
+
+    $user = $DB->get_record("user", array("id"=>$log->userid));
+    $subject = get_string('virusfoundsubject','moodle',format_string($site->fullname));
+    $a->date = userdate($log->time);
+
+    $a->action = $action;
+    $a->course = format_string($course->fullname, true, array('context' => context_course::instance($course->id)));
+    $a->user = fullname($user);
+
+    notify_user($user,$subject,$a);
+    notify_admins($user,$subject,$a);
+}
+fclose($fd);
+
+
+function notify_user($user,$subject,$a) {
+
+    if (!$user) {
+        return false;
+    }
+    $body = get_string('virusfoundlater','moodle',$a);
+
+    $eventdata = new stdClass();
+    $eventdata->modulename        = 'moodle';
+    $eventdata->userfrom          = get_admin();
+    $eventdata->userto            = $user;
+    $eventdata->subject           = $subject;
+    $eventdata->fullmessage       = $body;
+    $eventdata->fullmessageformat = FORMAT_PLAIN;
+    $eventdata->fullmessagehtml   = '';
+    $eventdata->smallmessage      = '';
+    message_send($eventdata);
+}
+
+
+function notify_admins($user,$subject,$a) {
+
+    $admins = get_admins();
+
+    $body = get_string('virusfoundlateradmin','moodle',$a);
+    foreach ($admins as $admin) {
+        $eventdata = new stdClass();
+        $eventdata->modulename        = 'moodle';
+        $eventdata->userfrom          = get_admin();
+        $eventdata->userto            = $admin;
+        $eventdata->subject           = $subject;
+        $eventdata->fullmessage       = $body;
+        $eventdata->fullmessageformat = FORMAT_PLAIN;
+        $eventdata->fullmessagehtml   = '';
+        $eventdata->smallmessage      = '';
+        message_send($eventdata);
+    }
+}
+
+function notify_admins_unknown($file,$a) {
+
+    global $site;
+
+    $admins = get_admins();
+    $subject = get_string('virusfoundsubject','moodle',format_string($site->fullname));
+    $body = get_string('virusfoundlateradminnolog','moodle',$a);
+    foreach ($admins as $admin) {
+        $eventdata = new stdClass();
+        $eventdata->modulename        = 'moodle';
+        $eventdata->userfrom          = get_admin();
+        $eventdata->userto            = $admin;
+        $eventdata->subject           = $subject;
+        $eventdata->fullmessage       = $body;
+        $eventdata->fullmessageformat = FORMAT_PLAIN;
+        $eventdata->fullmessagehtml   = '';
+        $eventdata->smallmessage      = '';
+        message_send($eventdata);
+    }
+}
+
+function validate_line($line) {
+    global $CFG;
+    if (strpos($line,"FOUND") === false) {
+        return false;
+    }
+    $index = strpos($line,":");
+    $file = substr($line,0,$index);
+    if (!(strpos($file,$CFG->dataroot) === false)) {
+        if (!file_exists($file)) {
+            return false;
+        }
+    }
+    else {
+        if ($file{0} == "/") {
+            $file = $CFG->dataroot.$file;
+        }
+        else {
+            $file = $CFG->dataroot."/".$file;
+        }
+        if (!file_exists($file)) {
+            return false;
+        }
+    }
+    // clean up
+    $file = preg_replace('/\.\//','/',$file);
+    $file = preg_replace('/\/\//','/',$file);
+    return $file;
+}
+
+

admin/index.php

@@ -29,9 +29,14 @@ if (!file_exists('../config.php')) {
     die();
 }
 
-// Check that PHP is of a sufficient version as soon as possible.
-require_once(__DIR__.'/../lib/phpminimumversionlib.php');
-moodle_require_minimum_php_version();
+// Check that PHP is of a sufficient version as soon as possible
+if (version_compare(phpversion(), '5.3.3') < 0) {
+    $phpversion = phpversion();
+    // do NOT localise - lang strings would not work here and we CAN NOT move it to later place
+    echo "Moodle 2.5 or later requires at least PHP 5.3.3 (currently using version $phpversion).<br />";
+    echo "Please upgrade your server software or install older Moodle version.";
+    die();
+}
 
 // make sure iconv is available and actually works
 if (!function_exists('iconv')) {
@@ -40,133 +45,44 @@ if (!function_exists('iconv')) {
     die();
 }
 
-// Make sure php5-json is available.
-if (!function_exists('json_encode') || !function_exists('json_decode')) {
-    // This also shouldn't happen.
-    echo 'Moodle requires the json PHP extension. Please install or enable the json extension.';
-    die();
-}
-
-// Make sure xml extension is available.
-if (!extension_loaded('xml')) {
-    echo 'Moodle requires the xml PHP extension. Please install or enable the xml extension.';
-    die();
-}
-
-// Make sure mbstring extension is available.
-if (!extension_loaded('mbstring')) {
-    echo 'Moodle requires the mbstring PHP extension. Please install or enable the mbstring extension.';
-    die();
-}
-
 define('NO_OUTPUT_BUFFERING', true);
 
-if (isset($_POST['upgradekey'])) {
-    // Before you start reporting issues about the collision attacks against
-    // SHA-1, you should understand that we are not actually attempting to do
-    // any cryptography here. This is hashed purely so that the key is not
-    // that apparent in the address bar itself. Anyone who catches the HTTP
-    // traffic can immediately use it as a valid admin key.
-    header('Location: index.php?cache=0&upgradekeyhash='.sha1($_POST['upgradekey']));
-    die();
-}
-
-if ((isset($_GET['cache']) and $_GET['cache'] === '0')
-        or (isset($_POST['cache']) and $_POST['cache'] === '0')
-        or (!isset($_POST['cache']) and !isset($_GET['cache']) and empty($_GET['sesskey']) and empty($_POST['sesskey']))) {
+if (empty($_GET['cache']) and empty($_POST['cache'])) {
     // Prevent caching at all cost when visiting this page directly,
     // we redirect to self once we known no upgrades are necessary.
     // Note: $_GET and $_POST are used here intentionally because our param cleaning is not loaded yet.
-    // Note2: the sesskey is present in all block editing hacks, we can not redirect there, so enable caching.
     define('CACHE_DISABLE_ALL', true);
-
-    // Force OPcache reset if used, we do not want any stale caches
-    // when detecting if upgrade necessary or when running upgrade.
-    if (function_exists('opcache_reset')) {
-        opcache_reset();
-    }
-    $cache = 0;
-
-} else {
-    $cache = 1;
 }
 
 require('../config.php');
-
-// Invalidate the cache of version.php in any circumstances to help core_component
-// detecting if the version has changed and component cache should be reset.
-if (function_exists('opcache_invalidate')) {
-    opcache_invalidate($CFG->dirroot . '/version.php', true);
-}
-// Make sure the component cache gets rebuilt if necessary, any method that
-// indirectly calls the protected init() method is good here.
-core_component::get_core_subsystems();
-
-if (is_major_upgrade_required() && isloggedin()) {
-    // A major upgrade is required.
-    // Terminate the session and redirect back here before anything DB-related happens.
-    redirect_if_major_upgrade_required();
-}
-
 require_once($CFG->libdir.'/adminlib.php');    // various admin-only functions
 require_once($CFG->libdir.'/upgradelib.php');  // general upgrade/install related functions
+require_once($CFG->libdir.'/pluginlib.php');   // available updates notifications
 
-$confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL); // Core upgrade confirmed?
-$confirmrelease = optional_param('confirmrelease', 0, PARAM_BOOL); // Core release info and server checks confirmed?
-$confirmplugins = optional_param('confirmplugincheck', 0, PARAM_BOOL); // Plugins check page confirmed?
-$showallplugins = optional_param('showallplugins', 0, PARAM_BOOL); // Show all plugins on the plugins check page?
-$agreelicense = optional_param('agreelicense', 0, PARAM_BOOL); // GPL license confirmed for installation?
-$fetchupdates = optional_param('fetchupdates', 0, PARAM_BOOL); // Should check for available updates?
-$newaddonreq = optional_param('installaddonrequest', null, PARAM_RAW); // Plugin installation requested at moodle.org/plugins.
-$upgradekeyhash = optional_param('upgradekeyhash', null, PARAM_ALPHANUM); // Hash of provided upgrade key.
-$installdep = optional_param('installdep', null, PARAM_COMPONENT); // Install given missing dependency (required plugin).
-$installdepx = optional_param('installdepx', false, PARAM_BOOL); // Install all missing dependencies.
-$confirminstalldep = optional_param('confirminstalldep', false, PARAM_BOOL); // Installing dependencies confirmed.
-$abortinstall = optional_param('abortinstall', null, PARAM_COMPONENT); // Cancel installation of the given new plugin.
-$abortinstallx = optional_param('abortinstallx', null, PARAM_BOOL); // Cancel installation of all new plugins.
-$confirmabortinstall = optional_param('confirmabortinstall', false, PARAM_BOOL); // Installation cancel confirmed.
-$abortupgrade = optional_param('abortupgrade', null, PARAM_COMPONENT); // Cancel upgrade of the given existing plugin.
-$abortupgradex = optional_param('abortupgradex', null, PARAM_BOOL); // Cancel upgrade of all upgradable plugins.
-$confirmabortupgrade = optional_param('confirmabortupgrade', false, PARAM_BOOL); // Upgrade cancel confirmed.
-$installupdate = optional_param('installupdate', null, PARAM_COMPONENT); // Install given available update.
-$installupdateversion = optional_param('installupdateversion', null, PARAM_INT); // Version of the available update to install.
-$installupdatex = optional_param('installupdatex', false, PARAM_BOOL); // Install all available plugin updates.
-$confirminstallupdate = optional_param('confirminstallupdate', false, PARAM_BOOL); // Available update(s) install confirmed?
-
-if (!empty($CFG->disableupdateautodeploy)) {
-    // Invalidate all requests to install plugins via the admin UI.
-    $newaddonreq = null;
-    $installdep = null;
-    $installdepx = false;
-    $abortupgrade = null;
-    $abortupgradex = null;
-    $installupdate = null;
-    $installupdateversion = null;
-    $installupdatex = false;
-}
+$id             = optional_param('id', '', PARAM_TEXT);
+$confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL);
+$confirmrelease = optional_param('confirmrelease', 0, PARAM_BOOL);
+$confirmplugins = optional_param('confirmplugincheck', 0, PARAM_BOOL);
+$showallplugins = optional_param('showallplugins', 0, PARAM_BOOL);
+$agreelicense   = optional_param('agreelicense', 0, PARAM_BOOL);
+$fetchupdates   = optional_param('fetchupdates', 0, PARAM_BOOL);
+$newaddonreq    = optional_param('installaddonrequest', null, PARAM_RAW);
+$cache          = optional_param('cache', 0, PARAM_BOOL);
 
 // Set up PAGE.
 $url = new moodle_url('/admin/index.php');
-$url->param('cache', $cache);
-if (isset($upgradekeyhash)) {
-    $url->param('upgradekeyhash', $upgradekeyhash);
+if (!is_null($newaddonreq)) {
+    // We need to set the eventual add-on installation request in the $PAGE's URL
+    // so that it is stored in $SESSION->wantsurl and the admin is redirected
+    // correctly once they are logged-in.
+    $url->param('installaddonrequest', $newaddonreq);
+}
+if ($cache) {
+    $url->param('cache', $cache);
 }
 $PAGE->set_url($url);
 unset($url);
 
-// Are we returning from an add-on installation request at moodle.org/plugins?
-if ($newaddonreq and !$cache and empty($CFG->disableupdateautodeploy)) {
-    $target = new moodle_url('/admin/tool/installaddon/index.php', array(
-        'installaddonrequest' => $newaddonreq,
-        'confirm' => 0));
-    if (!isloggedin() or isguestuser()) {
-        // Login and go the the add-on tool page.
-        $SESSION->wantsurl = $target->out();
-        redirect(get_login_url());
-    }
-    redirect($target);
-}
-
 $PAGE->set_pagelayout('admin'); // Set a default pagelayout
 
 $documentationlink = '<a href="http://docs.moodle.org/en/Installation">Installation docs</a>';
@@ -177,6 +93,10 @@ if (ini_get_bool('session.auto_start')) {
     print_error('phpvaroff', 'debug', '', (object)array('name'=>'session.auto_start', 'link'=>$documentationlink));
 }
 
+if (ini_get_bool('magic_quotes_runtime')) {
+    print_error('phpvaroff', 'debug', '', (object)array('name'=>'magic_quotes_runtime', 'link'=>$documentationlink));
+}
+
 if (!ini_get_bool('file_uploads')) {
     print_error('phpvaron', 'debug', '', (object)array('name'=>'file_uploads', 'link'=>$documentationlink));
 }
@@ -216,7 +136,7 @@ if (!core_tables_exist()) {
     $strinstallation = get_string('installation', 'install');
 
     // remove current session content completely
-    \core\session\manager::terminate_current();
+    session_get_instance()->terminate_current();
 
     if (empty($agreelicense)) {
         $strlicense = get_string('license');
@@ -232,7 +152,7 @@ if (!core_tables_exist()) {
     }
     if (empty($confirmrelease)) {
         require_once($CFG->libdir.'/environmentlib.php');
-        list($envstatus, $environmentresults) = check_moodle_environment(normalize_version($release), ENV_SELECT_RELEASE);
+        list($envstatus, $environment_results) = check_moodle_environment(normalize_version($release), ENV_SELECT_RELEASE);
         $strcurrentrelease = get_string('currentrelease');
 
         $PAGE->navbar->add($strcurrentrelease);
@@ -241,19 +161,19 @@ if (!core_tables_exist()) {
         $PAGE->set_cacheable(false);
 
         $output = $PAGE->get_renderer('core', 'admin');
-        echo $output->install_environment_page($maturity, $envstatus, $environmentresults, $release);
+        echo $output->install_environment_page($maturity, $envstatus, $environment_results, $release);
         die();
     }
 
     // check plugin dependencies
     $failed = array();
-    if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed, $CFG->branch)) {
+    if (!plugin_manager::instance()->all_plugins_ok($version, $failed)) {
         $PAGE->navbar->add(get_string('pluginscheck', 'admin'));
         $PAGE->set_title($strinstallation);
         $PAGE->set_heading($strinstallation . ' - Moodle ' . $CFG->target_release);
 
         $output = $PAGE->get_renderer('core', 'admin');
-        $url = new moodle_url($PAGE->url, array('agreelicense' => 1, 'confirmrelease' => 1, 'lang' => $CFG->lang));
+        $url = new moodle_url('/admin/index.php', array('agreelicense' => 1, 'confirmrelease' => 1, 'lang' => $CFG->lang));
         echo $output->unsatisfied_dependencies_page($version, $failed, $url);
         die();
     }
@@ -286,13 +206,6 @@ if (!core_tables_exist()) {
 // Check version of Moodle code on disk compared with database
 // and upgrade if possible.
 
-if (!$cache) {
-    // Do not try to do anything fancy in non-cached mode,
-    // this prevents themes from fetching data from non-existent tables.
-    $PAGE->set_pagelayout('maintenance');
-    $PAGE->set_popup_notification_allowed(false);
-}
-
 $stradministration = get_string('administration');
 $PAGE->set_context(context_system::instance());
 
@@ -301,32 +214,14 @@ if (empty($CFG->version)) {
 }
 
 // Detect config cache inconsistency, this happens when you switch branches on dev servers.
-if ($CFG->version != $DB->get_field('config', 'value', array('name'=>'version'))) {
-    purge_all_caches();
-    redirect(new moodle_url($PAGE->url), 'Config cache inconsistency detected, resetting caches...');
+if ($cache) {
+    if ($CFG->version != $DB->get_field('config', 'value', array('name'=>'version'))) {
+        purge_all_caches();
+        redirect(new moodle_url('/admin/index.php'), 'Config cache inconsistency detected, resetting caches...');
+    }
 }
 
-if (!$cache and $version > $CFG->version) {  // upgrade
-
-    $PAGE->set_url(new moodle_url($PAGE->url, array(
-        'confirmupgrade' => $confirmupgrade,
-        'confirmrelease' => $confirmrelease,
-        'confirmplugincheck' => $confirmplugins,
-    )));
-
-    check_upgrade_key($upgradekeyhash);
-
-    // Warning about upgrading a test site.
-    $testsite = false;
-    if (defined('BEHAT_SITE_RUNNING')) {
-        $testsite = 'behat';
-    }
-
-    if (isset($CFG->themerev)) {
-        // Store the themerev to restore after purging caches.
-        $themerev = $CFG->themerev;
-    }
-
+if ($version > $CFG->version) {  // upgrade
     // We purge all of MUC's caches here.
     // Caches are disabled for upgrade by CACHE_DISABLE_ALL so we must set the first arg to true.
     // This ensures a real config object is loaded and the stores will be purged.
@@ -336,17 +231,14 @@ if (!$cache and $version > $CFG->version) {  // upgrade
     // We then purge the regular caches.
     purge_all_caches();
 
-    if (isset($themerev)) {
-        // Restore the themerev
-        set_config('themerev', $themerev);
-    }
-
-    $output = $PAGE->get_renderer('core', 'admin');
+    $PAGE->set_pagelayout('maintenance');
+    $PAGE->set_popup_notification_allowed(false);
 
     if (upgrade_stale_php_files_present()) {
         $PAGE->set_title($stradministration);
         $PAGE->set_cacheable(false);
 
+        $output = $PAGE->get_renderer('core', 'admin');
         echo $output->upgrade_stale_php_files_page();
         die();
     }
@@ -361,12 +253,13 @@ if (!$cache and $version > $CFG->version) {  // upgrade
         $PAGE->set_heading($strdatabasechecking);
         $PAGE->set_cacheable(false);
 
-        echo $output->upgrade_confirm_page($a->newversion, $maturity, $testsite);
+        $output = $PAGE->get_renderer('core', 'admin');
+        echo $output->upgrade_confirm_page($a->newversion, $maturity);
         die();
 
-    } else if (empty($confirmrelease)) {
+    } else if (empty($confirmrelease)){
         require_once($CFG->libdir.'/environmentlib.php');
-        list($envstatus, $environmentresults) = check_moodle_environment($release, ENV_SELECT_RELEASE);
+        list($envstatus, $environment_results) = check_moodle_environment($release, ENV_SELECT_RELEASE);
         $strcurrentrelease = get_string('currentrelease');
 
         $PAGE->navbar->add($strcurrentrelease);
@@ -374,7 +267,8 @@ if (!$cache and $version > $CFG->version) {  // upgrade
         $PAGE->set_heading($strcurrentrelease);
         $PAGE->set_cacheable(false);
 
-        echo $output->upgrade_environment_page($release, $envstatus, $environmentresults);
+        $output = $PAGE->get_renderer('core', 'admin');
+        echo $output->upgrade_environment_page($release, $envstatus, $environment_results);
         die();
 
     } else if (empty($confirmplugins)) {
@@ -385,143 +279,45 @@ if (!$cache and $version > $CFG->version) {  // upgrade
         $PAGE->set_heading($strplugincheck);
         $PAGE->set_cacheable(false);
 
-        $pluginman = core_plugin_manager::instance();
+        $reloadurl = new moodle_url('/admin/index.php', array('confirmupgrade' => 1, 'confirmrelease' => 1));
 
-        // Check for available updates.
-        if ($fetchupdates) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $updateschecker = \core\update\checker::instance();
-            if ($updateschecker->enabled()) {
-                $updateschecker->fetch();
-            }
-            redirect($PAGE->url);
-        }
-
-        // Cancel all plugin installations.
-        if ($abortinstallx) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $abortables = $pluginman->list_cancellable_installations();
-            if ($abortables) {
-                if ($confirmabortinstall) {
-                    foreach ($abortables as $plugin) {
-                        $pluginman->cancel_plugin_installation($plugin->component);
-                    }
-                    redirect($PAGE->url);
-                } else {
-                    $continue = new moodle_url($PAGE->url, array('abortinstallx' => $abortinstallx, 'confirmabortinstall' => 1));
-                    echo $output->upgrade_confirm_abort_install_page($abortables, $continue);
-                    die();
-                }
-            }
-            redirect($PAGE->url);
-        }
-
-        // Cancel single plugin installation.
-        if ($abortinstall) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            if ($confirmabortinstall) {
-                $pluginman->cancel_plugin_installation($abortinstall);
-                redirect($PAGE->url);
-            } else {
-                $continue = new moodle_url($PAGE->url, array('abortinstall' => $abortinstall, 'confirmabortinstall' => 1));
-                $abortable = $pluginman->get_plugin_info($abortinstall);
-                if ($pluginman->can_cancel_plugin_installation($abortable)) {
-                    echo $output->upgrade_confirm_abort_install_page(array($abortable), $continue);
-                    die();
-                }
-                redirect($PAGE->url);
-            }
-        }
-
-        // Cancel all plugins upgrades (that is, restore archived versions).
-        if ($abortupgradex) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $restorable = $pluginman->list_restorable_archives();
-            if ($restorable) {
-                upgrade_install_plugins($restorable, $confirmabortupgrade,
-                    get_string('cancelupgradehead', 'core_plugin'),
-                    new moodle_url($PAGE->url, array('abortupgradex' => 1, 'confirmabortupgrade' => 1))
-                );
-            }
-            redirect($PAGE->url);
-        }
-
-        // Cancel single plugin upgrade (that is, install the archived version).
-        if ($abortupgrade) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $restorable = $pluginman->list_restorable_archives();
-            if (isset($restorable[$abortupgrade])) {
-                $restorable = array($restorable[$abortupgrade]);
-                upgrade_install_plugins($restorable, $confirmabortupgrade,
-                    get_string('cancelupgradehead', 'core_plugin'),
-                    new moodle_url($PAGE->url, array('abortupgrade' => $abortupgrade, 'confirmabortupgrade' => 1))
-                );
-            }
-            redirect($PAGE->url);
-        }
-
-        // Install all available missing dependencies.
-        if ($installdepx) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
-            upgrade_install_plugins($installable, $confirminstalldep,
-                get_string('dependencyinstallhead', 'core_plugin'),
-                new moodle_url($PAGE->url, array('installdepx' => 1, 'confirminstalldep' => 1))
-            );
-        }
-
-        // Install single available missing dependency.
-        if ($installdep) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
-            if (!empty($installable[$installdep])) {
-                $installable = array($installable[$installdep]);
-                upgrade_install_plugins($installable, $confirminstalldep,
-                    get_string('dependencyinstallhead', 'core_plugin'),
-                    new moodle_url($PAGE->url, array('installdep' => $installdep, 'confirminstalldep' => 1))
-                );
-            }
-        }
-
-        // Install all available updates.
-        if ($installupdatex) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $installable = $pluginman->filter_installable($pluginman->available_updates());
-            upgrade_install_plugins($installable, $confirminstallupdate,
-                get_string('updateavailableinstallallhead', 'core_admin'),
-                new moodle_url($PAGE->url, array('installupdatex' => 1, 'confirminstallupdate' => 1))
-            );
-        }
-
-        // Install single available update.
-        if ($installupdate and $installupdateversion) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            if ($pluginman->is_remote_plugin_installable($installupdate, $installupdateversion)) {
-                $installable = array($pluginman->get_remote_plugin_info($installupdate, $installupdateversion, true));
-                upgrade_install_plugins($installable, $confirminstallupdate,
-                    get_string('updateavailableinstallallhead', 'core_admin'),
-                    new moodle_url($PAGE->url, array('installupdate' => $installupdate,
-                        'installupdateversion' => $installupdateversion, 'confirminstallupdate' => 1)
-                    )
-                );
-            }
-        }
-
-        echo $output->upgrade_plugin_check_page(core_plugin_manager::instance(), \core\update\checker::instance(),
-                $version, $showallplugins, $PAGE->url, new moodle_url($PAGE->url, array('confirmplugincheck' => 1)));
-        die();
-
-    } else {
-        // Always verify plugin dependencies!
+        // check plugin dependencies first
         $failed = array();
-        if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed, $CFG->branch)) {
-            echo $output->unsatisfied_dependencies_page($version, $failed, new moodle_url($PAGE->url,
-                array('confirmplugincheck' => 0)));
+        if (!plugin_manager::instance()->all_plugins_ok($version, $failed)) {
+            $output = $PAGE->get_renderer('core', 'admin');
+            echo $output->unsatisfied_dependencies_page($version, $failed, $reloadurl);
             die();
         }
         unset($failed);
 
-        // Launch main upgrade.
+        if ($fetchupdates) {
+            // no sesskey support guaranteed here
+            if (empty($CFG->disableupdatenotifications)) {
+                available_update_checker::instance()->fetch();
+            }
+            redirect($reloadurl);
+        }
+
+        $output = $PAGE->get_renderer('core', 'admin');
+
+        $deployer = available_update_deployer::instance();
+        if ($deployer->enabled()) {
+            $deployer->initialize($reloadurl, $reloadurl);
+
+            $deploydata = $deployer->submitted_data();
+            if (!empty($deploydata)) {
+                echo $output->upgrade_plugin_confirm_deploy_page($deployer, $deploydata);
+                die();
+            }
+        }
+
+        echo $output->upgrade_plugin_check_page(plugin_manager::instance(), available_update_checker::instance(),
+                $version, $showallplugins, $reloadurl,
+                new moodle_url('/admin/index.php', array('confirmupgrade'=>1, 'confirmrelease'=>1, 'confirmplugincheck'=>1)));
+        die();
+
+    } else {
+        // Launch main upgrade
         upgrade_core($version, true);
     }
 } else if ($version < $CFG->version) {
@@ -530,191 +326,62 @@ if (!$cache and $version > $CFG->version) {  // upgrade
 }
 
 // Updated human-readable release version if necessary
-if (!$cache and $release <> $CFG->release) {  // Update the release version
+if ($release <> $CFG->release) {  // Update the release version
     set_config('release', $release);
 }
 
-if (!$cache and $branch <> $CFG->branch) {  // Update the branch
+if ($branch <> $CFG->branch) {  // Update the branch
     set_config('branch', $branch);
 }
 
-if (!$cache and moodle_needs_upgrading()) {
-
-    $PAGE->set_url(new moodle_url($PAGE->url, array(
-        'confirmrelease' => $confirmrelease,
-        'confirmplugincheck' => $confirmplugins,
-    )));
-
-    check_upgrade_key($upgradekeyhash);
-
+if (moodle_needs_upgrading()) {
     if (!$PAGE->headerprinted) {
         // means core upgrade or installation was not already done
-
-        $pluginman = core_plugin_manager::instance();
-        $output = $PAGE->get_renderer('core', 'admin');
-
-        if (empty($confirmrelease)) {
-            require_once($CFG->libdir . '/environmentlib.php');
-
-            list($envstatus, $environmentresults) = check_moodle_environment($release, ENV_SELECT_RELEASE);
-            $strcurrentrelease = get_string('currentrelease');
-
-            $PAGE->navbar->add($strcurrentrelease);
-            $PAGE->set_title($strcurrentrelease);
-            $PAGE->set_heading($strcurrentrelease);
-            $PAGE->set_cacheable(false);
-
-            echo $output->upgrade_environment_page($release, $envstatus, $environmentresults);
-            die();
-
-        } else if (!$confirmplugins) {
+        if (!$confirmplugins) {
             $strplugincheck = get_string('plugincheck');
 
+            $PAGE->set_pagelayout('maintenance');
+            $PAGE->set_popup_notification_allowed(false);
             $PAGE->navbar->add($strplugincheck);
             $PAGE->set_title($strplugincheck);
             $PAGE->set_heading($strplugincheck);
             $PAGE->set_cacheable(false);
 
-            // Check for available updates.
             if ($fetchupdates) {
-                require_sesskey();
-                $updateschecker = \core\update\checker::instance();
-                if ($updateschecker->enabled()) {
-                    $updateschecker->fetch();
-                }
+                // no sesskey support guaranteed here
+                available_update_checker::instance()->fetch();
                 redirect($PAGE->url);
             }
 
-            // Cancel all plugin installations.
-            if ($abortinstallx) {
-                require_sesskey();
-                $abortables = $pluginman->list_cancellable_installations();
-                if ($abortables) {
-                    if ($confirmabortinstall) {
-                        foreach ($abortables as $plugin) {
-                            $pluginman->cancel_plugin_installation($plugin->component);
-                        }
-                        redirect($PAGE->url);
-                    } else {
-                        $continue = new moodle_url($PAGE->url, array('abortinstallx' => $abortinstallx,
-                            'confirmabortinstall' => 1));
-                        echo $output->upgrade_confirm_abort_install_page($abortables, $continue);
-                        die();
-                    }
-                }
-                redirect($PAGE->url);
-            }
+            $output = $PAGE->get_renderer('core', 'admin');
 
-            // Cancel single plugin installation.
-            if ($abortinstall) {
-                require_sesskey();
-                if ($confirmabortinstall) {
-                    $pluginman->cancel_plugin_installation($abortinstall);
-                    redirect($PAGE->url);
-                } else {
-                    $continue = new moodle_url($PAGE->url, array('abortinstall' => $abortinstall, 'confirmabortinstall' => 1));
-                    $abortable = $pluginman->get_plugin_info($abortinstall);
-                    if ($pluginman->can_cancel_plugin_installation($abortable)) {
-                        echo $output->upgrade_confirm_abort_install_page(array($abortable), $continue);
-                        die();
-                    }
-                    redirect($PAGE->url);
+            $deployer = available_update_deployer::instance();
+            if ($deployer->enabled()) {
+                $deployer->initialize($PAGE->url, $PAGE->url);
+
+                $deploydata = $deployer->submitted_data();
+                if (!empty($deploydata)) {
+                    echo $output->upgrade_plugin_confirm_deploy_page($deployer, $deploydata);
+                    die();
                 }
             }
 
-            // Cancel all plugins upgrades (that is, restore archived versions).
-            if ($abortupgradex) {
-                require_sesskey();
-                $restorable = $pluginman->list_restorable_archives();
-                if ($restorable) {
-                    upgrade_install_plugins($restorable, $confirmabortupgrade,
-                        get_string('cancelupgradehead', 'core_plugin'),
-                        new moodle_url($PAGE->url, array('abortupgradex' => 1, 'confirmabortupgrade' => 1))
-                    );
-                }
-                redirect($PAGE->url);
+            // check plugin dependencies first
+            $failed = array();
+            if (!plugin_manager::instance()->all_plugins_ok($version, $failed)) {
+                echo $output->unsatisfied_dependencies_page($version, $failed, $PAGE->url);
+                die();
             }
+            unset($failed);
 
-            // Cancel single plugin upgrade (that is, install the archived version).
-            if ($abortupgrade) {
-                require_sesskey();
-                $restorable = $pluginman->list_restorable_archives();
-                if (isset($restorable[$abortupgrade])) {
-                    $restorable = array($restorable[$abortupgrade]);
-                    upgrade_install_plugins($restorable, $confirmabortupgrade,
-                        get_string('cancelupgradehead', 'core_plugin'),
-                        new moodle_url($PAGE->url, array('abortupgrade' => $abortupgrade, 'confirmabortupgrade' => 1))
-                    );
-                }
-                redirect($PAGE->url);
-            }
-
-            // Install all available missing dependencies.
-            if ($installdepx) {
-                require_sesskey();
-                $installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
-                upgrade_install_plugins($installable, $confirminstalldep,
-                    get_string('dependencyinstallhead', 'core_plugin'),
-                    new moodle_url($PAGE->url, array('installdepx' => 1, 'confirminstalldep' => 1))
-                );
-            }
-
-            // Install single available missing dependency.
-            if ($installdep) {
-                require_sesskey();
-                $installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
-                if (!empty($installable[$installdep])) {
-                    $installable = array($installable[$installdep]);
-                    upgrade_install_plugins($installable, $confirminstalldep,
-                        get_string('dependencyinstallhead', 'core_plugin'),
-                        new moodle_url($PAGE->url, array('installdep' => $installdep, 'confirminstalldep' => 1))
-                    );
-                }
-            }
-
-            // Install all available updates.
-            if ($installupdatex) {
-                require_sesskey();
-                $installable = $pluginman->filter_installable($pluginman->available_updates());
-                upgrade_install_plugins($installable, $confirminstallupdate,
-                    get_string('updateavailableinstallallhead', 'core_admin'),
-                    new moodle_url($PAGE->url, array('installupdatex' => 1, 'confirminstallupdate' => 1))
-                );
-            }
-
-            // Install single available update.
-            if ($installupdate and $installupdateversion) {
-                require_sesskey();
-                if ($pluginman->is_remote_plugin_installable($installupdate, $installupdateversion)) {
-                    $installable = array($pluginman->get_remote_plugin_info($installupdate, $installupdateversion, true));
-                    upgrade_install_plugins($installable, $confirminstallupdate,
-                        get_string('updateavailableinstallallhead', 'core_admin'),
-                        new moodle_url($PAGE->url, array('installupdate' => $installupdate,
-                            'installupdateversion' => $installupdateversion, 'confirminstallupdate' => 1)
-                        )
-                    );
-                }
-            }
-
-            // Show plugins info.
-            echo $output->upgrade_plugin_check_page($pluginman, \core\update\checker::instance(),
+            // dependencies check passed, let's rock!
+            echo $output->upgrade_plugin_check_page(plugin_manager::instance(), available_update_checker::instance(),
                     $version, $showallplugins,
                     new moodle_url($PAGE->url),
-                    new moodle_url($PAGE->url, array('confirmplugincheck' => 1, 'cache' => 0)));
+                    new moodle_url('/admin/index.php', array('confirmplugincheck'=>1)));
             die();
         }
-
-        // Make sure plugin dependencies are always checked.
-        $failed = array();
-        if (!$pluginman->all_plugins_ok($version, $failed, $CFG->branch)) {
-            $output = $PAGE->get_renderer('core', 'admin');
-            echo $output->unsatisfied_dependencies_page($version, $failed, new moodle_url($PAGE->url,
-                array('confirmplugincheck' => 0)));
-            die();
-        }
-        unset($failed);
     }
-
     // install/upgrade all plugins and other parts
     upgrade_noncore(true);
 }
@@ -724,13 +391,6 @@ if (!$cache and moodle_needs_upgrading()) {
 if (during_initial_install()) {
     set_config('rolesactive', 1); // after this, during_initial_install will return false.
     set_config('adminsetuppending', 1);
-    set_config('registrationpending', 1); // Remind to register site after all other setup is finished.
-
-    // Apply default preset, if it is defined in $CFG and has a valid value.
-    if (!empty($CFG->setsitepresetduringinstall)) {
-        \core_adminpresets\helper::change_default_preset($CFG->setsitepresetduringinstall);
-    }
-
     // we need this redirect to setup proper session
     upgrade_finished("index.php?sessionstarted=1&amp;lang=$CFG->lang");
 }
@@ -781,40 +441,16 @@ if (during_initial_install()) {
     upgrade_finished('upgradesettings.php');
 }
 
-if (has_capability('moodle/site:config', context_system::instance())) {
-    if ($fetchupdates) {
-        require_sesskey();
-        $updateschecker = \core\update\checker::instance();
-        if ($updateschecker->enabled()) {
-            $updateschecker->fetch();
-        }
-        redirect(new moodle_url('/admin/index.php', array('cache' => 0)));
-    }
-}
-
 // Now we can be sure everything was upgraded and caches work fine,
 // redirect if necessary to make sure caching is enabled.
 if (!$cache) {
-    redirect(new moodle_url('/admin/index.php', array('cache' => 1)));
+    redirect(new moodle_url($PAGE->url, array('cache' => 1)));
 }
 
 // Check for valid admin user - no guest autologin
 require_login(0, false);
-if (isguestuser()) {
-    // Login as real user!
-    $SESSION->wantsurl = (string)new moodle_url('/admin/index.php');
-    redirect(get_login_url());
-}
 $context = context_system::instance();
-
-if (!has_capability('moodle/site:config', $context)) {
-    // Do not throw exception display an empty page with administration menu if visible for current user.
-    $PAGE->set_title($SITE->fullname);
-    $PAGE->set_heading($SITE->fullname);
-    echo $OUTPUT->header();
-    echo $OUTPUT->footer();
-    exit;
-}
+require_capability('moodle/site:config', $context);
 
 // check that site is properly customized
 $site = get_site();
@@ -822,65 +458,59 @@ if (empty($site->shortname)) {
     // probably new installation - lets return to frontpage after this step
     // remove settings that we want uninitialised
     unset_config('registerauth');
-    unset_config('timezone'); // Force admin to select timezone!
     redirect('upgradesettings.php?return=site');
 }
 
+// Check if we are returning from moodle.org registration and if so, we mark that fact to remove reminders
+if (!empty($id) and $id == $CFG->siteidentifier) {
+    set_config('registered', time());
+}
+
+// Check if we are returning from an add-on installation request at moodle.org/plugins
+if (!is_null($newaddonreq)) {
+    if (!empty($CFG->disableonclickaddoninstall)) {
+        // The feature is disabled in config.php, ignore the request.
+    } else {
+        redirect(new moodle_url('/admin/tool/installaddon/index.php', array(
+            'installaddonrequest' => $newaddonreq,
+            'confirm' => 0)));
+    }
+}
+
 // setup critical warnings before printing admin tree block
 $insecuredataroot = is_dataroot_insecure(true);
 $SESSION->admin_critical_warning = ($insecuredataroot==INSECURE_DATAROOT_ERROR);
 
 $adminroot = admin_get_root();
-$PAGE->set_primary_active_tab('siteadminnode');
 
 // Check if there are any new admin settings which have still yet to be set
-if (any_new_admin_settings($adminroot)) {
+if (any_new_admin_settings($adminroot)){
     redirect('upgradesettings.php');
 }
 
-// Return to original page that started the plugin uninstallation if necessary.
-if (isset($SESSION->pluginuninstallreturn)) {
-    $return = $SESSION->pluginuninstallreturn;
-    unset($SESSION->pluginuninstallreturn);
-    if ($return) {
-        redirect($return);
-    }
-}
-
-// If site registration needs updating, redirect.
-\core\hub\registration::registration_reminder('/admin/index.php');
-
 // Everything should now be set up, and the user is an admin
 
 // Print default admin page with notifications.
 $errorsdisplayed = defined('WARN_DISPLAY_ERRORS_ENABLED');
 
-$lastcron = get_config('tool_task', 'lastcronstart');
+$lastcron = $DB->get_field_sql('SELECT MAX(lastcron) FROM {modules}');
 $cronoverdue = ($lastcron < time() - 3600 * 24);
-$lastcroninterval = get_config('tool_task', 'lastcroninterval');
-
-$expectedfrequency = $CFG->expectedcronfrequency ?? MINSECS;
-$croninfrequent = !$cronoverdue && ($lastcroninterval > ($expectedfrequency + MINSECS) || $lastcron < time() - $expectedfrequency);
 $dbproblems = $DB->diagnose();
 $maintenancemode = !empty($CFG->maintenance_enabled);
 
-// Available updates for Moodle core.
-$updateschecker = \core\update\checker::instance();
+// Available updates for Moodle core
+$updateschecker = available_update_checker::instance();
 $availableupdates = array();
-$availableupdatesfetch = null;
+$availableupdates['core'] = $updateschecker->get_update_info('core',
+    array('minmaturity' => $CFG->updateminmaturity, 'notifybuilds' => $CFG->updatenotifybuilds));
 
-if ($updateschecker->enabled()) {
-    // Only compute the update information when it is going to be displayed to the user.
-    $availableupdates['core'] = $updateschecker->get_update_info('core',
-        array('minmaturity' => $CFG->updateminmaturity, 'notifybuilds' => $CFG->updatenotifybuilds));
-
-    // Available updates for contributed plugins
-    $pluginman = core_plugin_manager::instance();
-    foreach ($pluginman->get_plugins() as $plugintype => $plugintypeinstances) {
-        foreach ($plugintypeinstances as $pluginname => $plugininfo) {
-            $pluginavailableupdates = $plugininfo->available_updates();
-            if (!empty($pluginavailableupdates)) {
-                foreach ($pluginavailableupdates as $pluginavailableupdate) {
+// Available updates for contributed plugins
+$pluginman = plugin_manager::instance();
+foreach ($pluginman->get_plugins() as $plugintype => $plugintypeinstances) {
+    foreach ($plugintypeinstances as $pluginname => $plugininfo) {
+        if (!empty($plugininfo->availableupdates)) {
+            foreach ($plugininfo->availableupdates as $pluginavailableupdate) {
+                if ($pluginavailableupdate->version > $plugininfo->versiondisk) {
                     if (!isset($availableupdates[$plugintype.'_'.$pluginname])) {
                         $availableupdates[$plugintype.'_'.$pluginname] = array();
                     }
@@ -889,53 +519,24 @@ if ($updateschecker->enabled()) {
             }
         }
     }
-
-    // The timestamp of the most recent check for available updates
-    $availableupdatesfetch = $updateschecker->get_last_timefetched();
 }
 
+// The timestamp of the most recent check for available updates
+$availableupdatesfetch = $updateschecker->get_last_timefetched();
+
 $buggyiconvnomb = (!function_exists('mb_convert_encoding') and @iconv('UTF-8', 'UTF-8//IGNORE', '100'.chr(130).'€') !== '100€');
 //check if the site is registered on Moodle.org
-$registered = \core\hub\registration::is_registered();
-// Check if there are any cache warnings.
-$cachewarnings = cache_helper::warnings();
-// Check if there are events 1 API handlers.
-$eventshandlers = $DB->get_records_sql('SELECT DISTINCT component FROM {events_handlers}');
-$themedesignermode = !empty($CFG->themedesignermode);
-$mobileconfigured = !empty($CFG->enablemobilewebservice);
-$invalidforgottenpasswordurl = !empty($CFG->forgottenpasswordurl) && empty(clean_param($CFG->forgottenpasswordurl, PARAM_URL));
-
-// Check if a directory with development libraries exists.
-if (empty($CFG->disabledevlibdirscheck) && (is_dir($CFG->dirroot.'/vendor') || is_dir($CFG->dirroot.'/node_modules'))) {
-    $devlibdir = true;
-} else {
-    $devlibdir = false;
-}
-// Check if the site is being foced onto ssl.
-$overridetossl = !empty($CFG->overridetossl);
-
-// Check if moodle campaign content setting is enabled or not.
-$showcampaigncontent = !isset($CFG->showcampaigncontent) || $CFG->showcampaigncontent;
-
-// Encourage admins to enable the user feedback feature if it is not enabled already.
-$showfeedbackencouragement = empty($CFG->enableuserfeedback);
-
-// Check if the service and support content setting is enabled or not.
-$servicesandsupportcontent = !isset($CFG->showservicesandsupportcontent) || $CFG->showservicesandsupportcontent;
-
-// Check whether the XML-RPC protocol is enabled or not.
-require_once($CFG->libdir . '/environmentlib.php');
-$result = new environment_results('custom_checks');
-$result = check_xmlrpc_usage($result);
-$xmlrpcwarning = !is_null($result) ? get_string($result->getFeedbackStr(), 'admin') : '';
+$registered = $DB->count_records('registration_hubs', array('huburl' => HUB_MOODLEORGHUBURL, 'confirmed' => 1));
 
 admin_externalpage_setup('adminnotifications');
 
-$output = $PAGE->get_renderer('core', 'admin');
+if ($fetchupdates) {
+    require_sesskey();
+    $updateschecker->fetch();
+    redirect(new moodle_url('/admin/index.php'));
+}
 
-echo $output->admin_notifications_page($maturity, $insecuredataroot, $errorsdisplayed, $cronoverdue, $dbproblems,
-                                       $maintenancemode, $availableupdates, $availableupdatesfetch, $buggyiconvnomb,
-                                       $registered, $cachewarnings, $eventshandlers, $themedesignermode, $devlibdir,
-                                       $mobileconfigured, $overridetossl, $invalidforgottenpasswordurl, $croninfrequent,
-                                       $showcampaigncontent, $showfeedbackencouragement, $servicesandsupportcontent,
-                                       $xmlrpcwarning);
+$output = $PAGE->get_renderer('core', 'admin');
+echo $output->admin_notifications_page($maturity, $insecuredataroot, $errorsdisplayed,
+        $cronoverdue, $dbproblems, $maintenancemode, $availableupdates, $availableupdatesfetch, $buggyiconvnomb,
+        $registered);

admin/lib.php

@@ -18,14 +18,12 @@
 /**
  * This file contains functions used by the admin pages
  *
- * @since Moodle 2.1
+ * @since 2.1
  * @package admin
  * @copyright 2011 Andrew Davis
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
  * Return a list of page types
  * @param string $pagetype current page type
@@ -39,86 +37,3 @@ function admin_page_type_list($pagetype, $parentcontext, $currentcontext) {
     );
     return $array;
 }
-
-/**
- * File serving.
- *
- * @param stdClass $course The course object.
- * @param stdClass $cm The cm object.
- * @param context $context The context object.
- * @param string $filearea The file area.
- * @param array $args List of arguments.
- * @param bool $forcedownload Whether or not to force the download of the file.
- * @param array $options Array of options.
- * @return void|false
- */
-function core_admin_pluginfile($course, $cm, $context, $filearea, $args, $forcedownload, array $options = array()) {
-    global $CFG;
-
-    if (in_array($filearea, ['logo', 'logocompact'])) {
-        $size = array_shift($args); // The path hides the size.
-        $itemid = clean_param(array_shift($args), PARAM_INT);
-        $filename = clean_param(array_shift($args), PARAM_FILE);
-        $themerev = theme_get_revision();
-        if ($themerev <= 0) {
-            // Normalise to 0 as -1 doesn't place well with paths.
-             $themerev = 0;
-        }
-
-        // Extract the requested width and height.
-        $maxwidth = 0;
-        $maxheight = 0;
-        if (preg_match('/^\d+x\d+$/', $size)) {
-            list($maxwidth, $maxheight) = explode('x', $size);
-            $maxwidth = clean_param($maxwidth, PARAM_INT);
-            $maxheight = clean_param($maxheight, PARAM_INT);
-        }
-
-        $lifetime = 0;
-        if ($itemid > 0 && $themerev == $itemid) {
-            // The itemid is $CFG->themerev, when 0 or less no caching. Also no caching when they don't match.
-            $lifetime = DAYSECS * 60;
-        }
-
-        // Anyone, including guests and non-logged in users, can view the logos.
-        $options = ['cacheability' => 'public'];
-
-        // Check if we've got a cached file to return. When lifetime is 0 then we don't want to cached one.
-        $candidate = $CFG->localcachedir . "/core_admin/$themerev/$filearea/{$maxwidth}x{$maxheight}/$filename";
-        if (file_exists($candidate) && $lifetime > 0) {
-            send_file($candidate, $filename, $lifetime, 0, false, false, '', false, $options);
-        }
-
-        // Find the original file.
-        $fs = get_file_storage();
-        $filepath = "/{$context->id}/core_admin/{$filearea}/0/{$filename}";
-        if (!$file = $fs->get_file_by_hash(sha1($filepath))) {
-            send_file_not_found();
-        }
-
-        // No need for resizing, but if the file should be cached we save it so we can serve it fast next time.
-        if (empty($maxwidth) && empty($maxheight)) {
-            if ($lifetime) {
-                file_safe_save_content($file->get_content(), $candidate);
-            }
-            send_stored_file($file, $lifetime, 0, false, $options);
-        }
-
-        // Proceed with the resizing.
-        $filedata = $file->resize_image($maxwidth, $maxheight);
-        if (!$filedata) {
-            send_file_not_found();
-        }
-
-        // If we don't want to cached the file, serve now and quit.
-        if (!$lifetime) {
-            send_content_uncached($filedata, $filename);
-        }
-
-        // Save, serve and quit.
-        file_safe_save_content($filedata, $candidate);
-        send_file($candidate, $filename, $lifetime, 0, false, false, '', false, $options);
-    }
-
-    send_file_not_found();
-}

admin/licenses.php

@@ -0,0 +1,57 @@
+<?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/>.
+
+/**
+ * Allows admin to configure licenses.
+ */
+
+require_once('../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir.'/licenselib.php');
+
+require_login();
+require_capability('moodle/site:config', context_system::instance());
+
+$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=managelicenses";
+
+$action = optional_param('action', '', PARAM_ALPHANUMEXT);
+$license = optional_param('license', '', PARAM_SAFEDIR);
+
+////////////////////////////////////////////////////////////////////////////////
+// process actions
+
+if (!confirm_sesskey()) {
+    redirect($returnurl);
+}
+
+$return = true;
+switch ($action) {
+    case 'disable':
+        license_manager::disable($license);
+        break;
+
+    case 'enable':
+        license_manager::enable($license);
+        break;
+
+    default:
+        break;
+}
+
+if ($return) {
+    redirect ($returnurl);
+}

admin/localplugins.php

@@ -27,27 +27,61 @@
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-require_once(__DIR__ . '/../config.php');
+require_once(dirname(dirname(__FILE__)) . '/config.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/tablelib.php');
 
 admin_externalpage_setup('managelocalplugins');
 
+$delete  = optional_param('delete', '', PARAM_PLUGIN);
+$confirm = optional_param('confirm', '', PARAM_BOOL);
+
+/// If data submitted, then process and store.
+
+if (!empty($delete) and confirm_sesskey()) {
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('localplugins'));
+
+    if (!$confirm) {
+        if (get_string_manager()->string_exists('pluginname', 'local_' . $delete)) {
+            $strpluginname = get_string('pluginname', 'local_' . $delete);
+        } else {
+            $strpluginname = $delete;
+        }
+        echo $OUTPUT->confirm(get_string('localplugindeleteconfirm', '', $strpluginname),
+                                new moodle_url($PAGE->url, array('delete' => $delete, 'confirm' => 1)),
+                                $PAGE->url);
+        echo $OUTPUT->footer();
+        die();
+
+    } else {
+        uninstall_plugin('local', $delete);
+        $a = new stdclass();
+        $a->name = $delete;
+        $pluginlocation = get_plugin_types();
+        $a->directory = $pluginlocation['local'] . '/' . $delete;
+        echo $OUTPUT->notification(get_string('plugindeletefiles', '', $a), 'notifysuccess');
+        echo $OUTPUT->continue_button($PAGE->url);
+        echo $OUTPUT->footer();
+        die();
+    }
+}
+
 echo $OUTPUT->header();
 echo $OUTPUT->heading(get_string('localplugins'));
 
 /// Print the table of all installed local plugins
 
 $table = new flexible_table('localplugins_administration_table');
-$table->define_columns(array('name', 'version', 'uninstall'));
-$table->define_headers(array(get_string('plugin'), get_string('version'), get_string('uninstallplugin', 'core_admin')));
+$table->define_columns(array('name', 'version', 'delete'));
+$table->define_headers(array(get_string('plugin'), get_string('version'), get_string('delete')));
 $table->define_baseurl($PAGE->url);
 $table->set_attribute('id', 'localplugins');
 $table->set_attribute('class', 'admintable generaltable');
 $table->setup();
 
 $plugins = array();
-foreach (core_component::get_plugin_list('local') as $plugin => $plugindir) {
+foreach (get_plugin_list('local') as $plugin => $plugindir) {
     if (get_string_manager()->string_exists('pluginname', 'local_' . $plugin)) {
         $strpluginname = get_string('pluginname', 'local_' . $plugin);
     } else {
@@ -55,13 +89,11 @@ foreach (core_component::get_plugin_list('local') as $plugin => $plugindir) {
     }
     $plugins[$plugin] = $strpluginname;
 }
-core_collator::asort($plugins);
+collatorlib::asort($plugins);
 
 foreach ($plugins as $plugin => $name) {
-    $uninstall = '';
-    if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('local_'.$plugin, 'manage')) {
-        $uninstall = html_writer::link($uninstallurl, get_string('uninstallplugin', 'core_admin'));
-    }
+    $delete = new moodle_url($PAGE->url, array('delete' => $plugin, 'sesskey' => sesskey()));
+    $delete = html_writer::link($delete, get_string('delete'));
 
     $version = get_config('local_' . $plugin);
     if (!empty($version->version)) {
@@ -70,7 +102,7 @@ foreach ($plugins as $plugin => $name) {
         $version = '?';
     }
 
-    $table->add_data(array($name, $version, $uninstall));
+    $table->add_data(array($name, $version, $delete));
 }
 
 $table->print_html();

admin/lock.php

@@ -1,96 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This file is used to display a categories sub categories, external pages, and settings.
- *
- * @package    admin
- * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once('../config.php');
-require_once("{$CFG->libdir}/adminlib.php");
-
-$contextid = required_param('id', PARAM_INT);
-$confirm = optional_param('confirm', null, PARAM_INT);
-$returnurl = optional_param('returnurl', null, PARAM_LOCALURL);
-
-$PAGE->set_url('/admin/lock.php', ['id' => $contextid]);
-
-list($context, $course, $cm) = get_context_info_array($contextid);
-
-$parentcontext = $context->get_parent_context();
-if ($parentcontext && !empty($parentcontext->locked)) {
-    // Can't make changes to a context whose parent is locked.
-    throw new \coding_exception('Not sure how you got here');
-}
-
-if ($course) {
-    $isfrontpage = ($course->id == SITEID);
-} else {
-    $isfrontpage = false;
-    $course = $SITE;
-}
-
-require_login($course, false, $cm);
-require_capability('moodle/site:managecontextlocks', $context);
-
-$PAGE->set_pagelayout('admin');
-$PAGE->navigation->clear_cache();
-
-$a = (object) [
-    'contextname' => $context->get_context_name(),
-];
-
-if (null !== $confirm && confirm_sesskey()) {
-    $context->set_locked(!empty($confirm));
-
-    if ($context->locked) {
-        $lockmessage = get_string('managecontextlocklocked', 'admin', $a);
-    } else {
-        $lockmessage = get_string('managecontextlockunlocked', 'admin', $a);
-    }
-
-    if (empty($returnurl)) {
-        $returnurl = $context->get_url();
-    } else {
-        $returnurl = new moodle_url($returnurl);
-    }
-    redirect($returnurl, $lockmessage);
-}
-
-$heading = get_string('managecontextlock', 'admin');
-$PAGE->set_title($heading);
-$PAGE->set_heading($heading);
-
-echo $OUTPUT->header();
-
-if ($context->locked) {
-    $confirmstring = get_string('confirmcontextunlock', 'admin', $a);
-    $target = 0;
-} else {
-    $confirmstring = get_string('confirmcontextlock', 'admin', $a);
-    $target = 1;
-}
-
-$confirmurl = new \moodle_url($PAGE->url, ['confirm' => $target]);
-if (!empty($returnurl)) {
-    $confirmurl->param('returnurl', $returnurl);
-}
-
-echo $OUTPUT->confirm($confirmstring, $confirmurl, $context->get_url());
-echo $OUTPUT->footer();

admin/mailout-debugger.php

@@ -29,7 +29,7 @@
    */
 
 // Security check.
-if (!file_exists(__DIR__.'/mailout-debugger.enable')) {
+if (!file_exists(dirname(__FILE__).'/mailout-debugger.enable')) {
     mdie("Disabled.");
 }
 $tmpdir=sys_get_temp_dir(); // default

admin/media.php

@@ -1,80 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Enrol config manipulation script.
- *
- * @package    core
- * @subpackage media
- * @copyright  2016 Marina Glancy
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('NO_OUTPUT_BUFFERING', true);
-
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-$action  = required_param('action', PARAM_ALPHANUMEXT);
-$media   = required_param('media', PARAM_PLUGIN);
-$confirm = optional_param('confirm', 0, PARAM_BOOL);
-
-$PAGE->set_url('/admin/media.php');
-$PAGE->set_context(context_system::instance());
-
-require_admin();
-require_sesskey();
-
-$plugins = core_plugin_manager::instance()->get_plugins_of_type('media');
-$sortorder = array_values(\core\plugininfo\media::get_enabled_plugins());
-
-$return = new moodle_url('/admin/settings.php', array('section' => 'managemediaplayers'));
-
-if (!array_key_exists($media, $plugins)) {
-    redirect($return);
-}
-
-switch ($action) {
-    case 'disable':
-        $class = \core_plugin_manager::resolve_plugininfo_class('media');
-        $class::enable_plugin($media, false);
-        break;
-
-    case 'enable':
-        $class = \core_plugin_manager::resolve_plugininfo_class('media');
-        $class::enable_plugin($media, true);
-        break;
-
-    case 'up':
-        if (($pos = array_search($media, $sortorder)) > 0) {
-            $tmp = $sortorder[$pos - 1];
-            $sortorder[$pos - 1] = $sortorder[$pos];
-            $sortorder[$pos] = $tmp;
-            \core\plugininfo\media::set_enabled_plugins($sortorder);
-        }
-        break;
-
-    case 'down':
-        if ((($pos = array_search($media, $sortorder)) !== false) && ($pos < count($sortorder) - 1)) {
-            $tmp = $sortorder[$pos + 1];
-            $sortorder[$pos + 1] = $sortorder[$pos];
-            $sortorder[$pos] = $tmp;
-            \core\plugininfo\media::set_enabled_plugins($sortorder);
-        }
-        break;
-}
-
-redirect($return);

admin/message.php

@@ -21,113 +21,78 @@
  * @copyright  2011 Lancaster University Network Services Limited
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-require_once(__DIR__ . '/../config.php');
+require_once(dirname(__FILE__) . '/../config.php');
 require_once($CFG->dirroot . '/message/lib.php');
 require_once($CFG->libdir.'/adminlib.php');
 
-// This is an admin page.
+// This is an admin page
 admin_externalpage_setup('managemessageoutputs');
 
-// Fetch processors.
-$allprocessors = get_message_processors();
-$processors = array_filter($allprocessors, function($processor) {
-    return $processor->enabled;
-});
-$disabledprocessors = array_filter($allprocessors, function($processor) {
-    return !$processor->enabled;
-});
+// Require site configuration capability
+require_capability('moodle/site:config', context_system::instance());
 
-// Fetch message providers.
-$providers = get_message_providers();
-// Fetch the manage message outputs interface.
-$preferences = get_message_output_default_preferences();
+// Get the submitted params
+$disable    = optional_param('disable', 0, PARAM_INT);
+$enable     = optional_param('enable', 0, PARAM_INT);
+$uninstall  = optional_param('uninstall', 0, PARAM_INT);
+$confirm  = optional_param('confirm', false, PARAM_BOOL);
 
-if (($form = data_submitted()) && confirm_sesskey()) {
-    $newpreferences = array();
-    // Prepare default message outputs settings.
-    foreach ($providers as $provider) {
-        $componentproviderbase = $provider->component.'_'.$provider->name;
-        $disableprovidersetting = $componentproviderbase.'_disable';
-        if (!isset($form->$disableprovidersetting)) {
-            $newpreferences[$disableprovidersetting] = 1;
-        } else {
-            $newpreferences[$disableprovidersetting] = 0;
-        }
+$headingtitle = get_string('managemessageoutputs', 'message');
 
-        $componentprovidersetting = $componentproviderbase.'_locked';
-        foreach ($processors as $processor) {
-            $value = 0;
-            if (isset($form->{$componentprovidersetting}[$processor->name])) {
-                $value = $form->{$componentprovidersetting}[$processor->name];
-                if ($value == 'on') {
-                    $value = 1;
-                }
-            }
+if (!empty($disable) && confirm_sesskey()) {
+    if (!$processor = $DB->get_record('message_processors', array('id'=>$disable))) {
+        print_error('outputdoesnotexist', 'message');
+    }
+    $DB->set_field('message_processors', 'enabled', '0', array('id'=>$processor->id));      // Disable output
+}
 
-            // Record the site preference.
-            $newpreferences[$processor->name.'_provider_'.$componentprovidersetting] = $value;
-        }
+if (!empty($enable) && confirm_sesskey()) {
+    if (!$processor = $DB->get_record('message_processors', array('id'=>$enable))) {
+        print_error('outputdoesnotexist', 'message');
+    }
+    $DB->set_field('message_processors', 'enabled', '1', array('id'=>$processor->id));      // Enable output
+}
 
-        $componentprovidersetting = $componentproviderbase.'_enabled';
-        $newsettings = [];
-        if (isset($form->$componentprovidersetting)) {
-            // Store defined comma-separated processors as setting value.
-            // Using array_filter eliminates elements set to 0 above.
-            $newsettings = array_keys(array_filter($form->{$componentprovidersetting}));
-        }
+if (!empty($uninstall) && confirm_sesskey()) {
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading($headingtitle);
 
-        // Let's join existing setting values for disabled processors.
-        $property = 'message_provider_'.$componentprovidersetting;
-        if (property_exists($preferences, $property)) {
-            $existingsetting = $preferences->$property;
-            foreach ($disabledprocessors as $disable) {
-                if (strpos($existingsetting, $disable->name) > -1) {
-                    $newsettings[] = $disable->name;
-                }
-            }
-        }
-
-        $value = join(',', $newsettings);
-        if (empty($value)) {
-            $value = null;
-        }
-
-        // Record the site preference.
-        $newpreferences['message_provider_'.$componentprovidersetting] = $value;
+    if (!$processor = $DB->get_record('message_processors', array('id'=>$uninstall))) {
+        print_error('outputdoesnotexist', 'message');
     }
 
-    // Update database.
-    $transaction = $DB->start_delegated_transaction();
+    $processorname = get_string('pluginname', 'message_'.$processor->name);
 
-    // Save processors enabled/disabled status.
-    foreach ($allprocessors as $processor) {
-        $enabled = isset($form->{$processor->name});
-        $class = \core_plugin_manager::resolve_plugininfo_class('message');
-        $class::enable_plugin($processor->name, $enabled);
+    if (!$confirm) {
+        echo $OUTPUT->confirm(get_string('processordeleteconfirm', 'message', $processorname), 'message.php?uninstall='.$processor->id.'&confirm=1', 'message.php');
+        echo $OUTPUT->footer();
+        exit;
+
+    } else {
+        message_processor_uninstall($processor->name);
+        $a = new stdClass();
+        $a->processor = $processorname;
+        $a->directory = $CFG->dirroot.'/message/output/'.$processor->name;
+        notice(get_string('processordeletefiles', 'message', $a), 'message.php');
     }
+}
 
-    foreach ($newpreferences as $name => $value) {
-        $old = isset($preferences->$name) ? $preferences->$name : '';
-
-        if ($old != $value) {
-            add_to_config_log($name, $old, $value, 'core');
-        }
-
-        set_config($name, $value, 'message');
-    }
-    $transaction->allow_commit();
-
-    core_plugin_manager::reset_caches();
-
+if ($disable || $enable || $uninstall) {
     $url = new moodle_url('message.php');
     redirect($url);
 }
-
 // Page settings
 $PAGE->set_context(context_system::instance());
+
+// Grab the renderer
 $renderer = $PAGE->get_renderer('core', 'message');
 
-// Display the page.
+// Display the manage message outputs interface
+$processors = get_message_processors();
+$messageoutputs = $renderer->manage_messageoutputs($processors);
+
+// Display the page
 echo $OUTPUT->header();
-echo $renderer->manage_messageoutput_settings($allprocessors, $processors, $providers, $preferences);
-echo $OUTPUT->footer();
+echo $OUTPUT->heading($headingtitle);
+echo $messageoutputs;
+echo $OUTPUT->footer();

admin/mnet/access_control.php

@@ -2,7 +2,7 @@
 
 // Allows the admin to control user logins from remote moodles.
 
-require_once(__DIR__ . '/../../config.php');
+require_once dirname(dirname(dirname(__FILE__))) . '/config.php';
 require_once($CFG->libdir.'/adminlib.php');
 include_once($CFG->dirroot.'/mnet/lib.php');
 
@@ -12,8 +12,12 @@ $page         = optional_param('page', 0, PARAM_INT);
 $perpage      = optional_param('perpage', 30, PARAM_INT);
 $action       = trim(strtolower(optional_param('action', '', PARAM_ALPHA)));
 
+require_login();
+
 admin_externalpage_setup('ssoaccesscontrol');
 
+echo $OUTPUT->header();
+
 if (!extension_loaded('openssl')) {
     print_error('requiresopenssl', 'mnet');
 }
@@ -61,11 +65,9 @@ if (!empty($action) and confirm_sesskey()) {
 
             if (mnet_update_sso_access_control($idrec->username, $idrec->mnet_host_id, $accessctrl)) {
                 if ($accessctrl == 'allow') {
-                    redirect('access_control.php', get_string('ssl_acl_allow','mnet', array('user' => $idrec->username,
-                        'host' => $mnethosts[$idrec->mnet_host_id])));
-                } else if ($accessctrl == 'deny') {
-                    redirect('access_control.php', get_string('ssl_acl_deny','mnet', array('user' => $idrec->username,
-                        'host' => $mnethosts[$idrec->mnet_host_id])));
+                    redirect('access_control.php', get_string('ssl_acl_allow','mnet', array('uset'=>$idrec->username, 'host'=>$mnethosts[$idrec->mnet_host_id])));
+                } elseif ($accessctrl == 'deny') {
+                    redirect('access_control.php', get_string('ssl_acl_deny','mnet', array('user'=>$idrec->username, 'host'=>$mnethosts[$idrec->mnet_host_id])));
                 }
             }
             break;
@@ -101,7 +103,7 @@ if ($form = data_submitted() and confirm_sesskey()) {
         $usernames = explode(',', $form->username);
 
         foreach ($usernames as $username) {
-            $username = trim(core_text::strtolower($username));
+            $username = trim(textlib::strtolower($username));
             if (!empty($username)) {
                 if (mnet_update_sso_access_control($username, $form->mnet_host_id, $form->accessctrl)) {
                     if ($form->accessctrl == 'allow') {
@@ -116,9 +118,6 @@ if ($form = data_submitted() and confirm_sesskey()) {
     exit;
 }
 
-echo $OUTPUT->header();
-echo $OUTPUT->render(mnet_get_deprecation_notice());
-
 // Explain
 echo $OUTPUT->box(get_string('ssoacldescr','mnet'));
 // Are the needed bits enabled?
@@ -149,7 +148,7 @@ foreach ($columns as $column) {
     } else {
         $columndir = $dir == "ASC" ? "DESC" : "ASC";
         $columnicon = $dir == "ASC" ? "down" : "up";
-        $columnicon = " " . $OUTPUT->pix_icon('t/' . $columnicon, get_string('sort'));
+        $columnicon = " <img src=\"" . $OUTPUT->pix_url('t/' . $columnicon) . "\" alt=\"\" />";
     }
     $headings[$column] = "<a href=\"?sort=$column&amp;dir=$columndir&amp;\">".$string[$column]."</a>$columnicon";
 }

admin/mnet/delete.php

@@ -27,13 +27,18 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-require(__DIR__.'/../../config.php');
+require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
 require_once($CFG->libdir . '/adminlib.php');
 
 $step   = optional_param('step', 'verify', PARAM_ALPHA);
 $hostid = required_param('hostid', PARAM_INT);
 
 
+require_login();
+
+$context = context_system::instance();
+require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
+
 $mnet = get_mnet_environment();
 
 $PAGE->set_url('/admin/mnet/delete.php');