Moodle release 3.3.2

We can't really control the direct web access to directories in dirroot,
that is part of the server setup. So we at least warn admins as they may
not realize the risks of having directories like vendor or node_modules
exposed.

Credit goes to Petr Škoda for mentioning the PHPUnit issue CVE-2017-9841
to me.

.eslintignore

@@ -0,0 +1,83 @@
+# Generated by "grunt ignorefiles"
+*/**/yui/src/*/meta/
+*/**/build/
+node_modules/
+vendor/
+admin/tool/usertours/amd/src/tour.js
+admin/tool/usertours/amd/src/popper.js
+auth/cas/CAS/
+auth/fc/fcFPP.php
+enrol/lti/ims-blti/
+filter/algebra/AlgParser.pm
+filter/tex/mimetex.*
+lib/editor/atto/yui/src/rangy/js/*.*
+lib/editor/tinymce/plugins/pdw/tinymce/
+lib/editor/tinymce/plugins/spellchecker/rpc.php
+lib/editor/tinymce/tiny_mce/
+lib/adodb/
+lib/bennu/
+lib/evalmath/
+lib/lessphp/
+lib/phpexcel/
+lib/google/
+lib/htmlpurifier/
+lib/jabber/
+lib/minify/matthiasmullie-minify/
+lib/minify/matthiasmullie-pathconverter/
+lib/pear/Auth/RADIUS.php
+lib/pear/Crypt/CHAP.php
+lib/pear/HTML/Common.php
+lib/pear/HTML/QuickForm.php
+lib/pear/HTML/QuickForm/
+lib/pear/PEAR.php
+lib/phpmailer/
+lib/simplepie/
+lib/tcpdf/
+lib/typo3/
+lib/yuilib/
+lib/yuilib/gallery/
+lib/jquery/
+lib/html2text/
+lib/markdown/
+lib/recaptchalib.php
+lib/xhprof/
+lib/xmlize.php
+lib/horde/
+lib/requirejs/
+lib/amd/src/loglevel.js
+lib/mustache/
+lib/amd/src/mustache.js
+lib/graphlib.php
+lib/php-css-parser/
+lib/rtlcss/
+lib/scssphp/
+lib/spout/
+lib/amd/src/chartjs-lazy.js
+lib/maxmind/GeoIp2/
+lib/maxmind/MaxMind/
+lib/ltiprovider/
+lib/amd/src/truncate.js
+lib/fonts/
+media/player/videojs/amd/src/video-lazy.js
+media/player/videojs/amd/src/Youtube-lazy.js
+media/player/videojs/videojs/
+mod/assign/feedback/editpdf/fpdi/
+repository/s3/S3.php
+theme/boost/scss/bootstrap/
+theme/boost/amd/src/alert.js
+theme/boost/amd/src/button.js
+theme/boost/amd/src/carousel.js
+theme/boost/amd/src/collapse.js
+theme/boost/amd/src/dropdown.js
+theme/boost/amd/src/modal.js
+theme/boost/amd/src/popover.js
+theme/boost/amd/src/scrollspy.js
+theme/boost/amd/src/tab.js
+theme/boost/amd/src/tooltip.js
+theme/boost/amd/src/util.js
+theme/boost/amd/src/tether.js
+theme/boost/scss/fontawesome/
+theme/bootstrapbase/less/bootstrap/
+theme/bootstrapbase/javascript/html5shiv.js
+theme/bootstrapbase/amd/src/bootstrap.js
+theme/bootstrapbase/less/fontawesome/

.eslintrc

@@ -1,9 +1,4 @@
 {
-  'plugins': [
-    'babel',
-    'promise',
-    'jsdoc',
-  ],
   'env': {
     'browser': true,
     'amd': true
@@ -18,7 +13,6 @@
 
     // === Possible Errors ===
     'comma-dangle': 'off',
-    'no-compare-neg-zero': 'error',
     'no-cond-assign': 'error',
     'no-console': 'error',
     'no-constant-condition': 'error',
@@ -70,6 +64,7 @@
     'no-fallthrough': 'error',
     'no-floating-decimal': 'warn',
     'no-global-assign': 'warn',
+    // Enabled by grunt for AMD modules: 'no-implicit-globals': 'error',
     'no-implied-eval': 'error',
     'no-invalid-this': 'error',
     'no-iterator': 'error',
@@ -108,7 +103,6 @@
     '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',
@@ -176,132 +170,11 @@
     '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", "babel-plugin-add-module-to-define.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',
-      // 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'
-      }
-    }
-  ]
+  }
 }

.gherkin-lintrc

@@ -3,8 +3,6 @@
     "Feature": 0,
     "Background": 2,
     "Scenario": 2,
-    "Examples": 4,
-    "example": 6,
     "Step": 4,
     "given": 4,
     "and": 4
@@ -16,9 +14,7 @@
   "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"]
+  "no-unamed-features": "on",
+  "no-unamed-scenarios": "on",
+  "no-scenario-outlines-without-examples": "on"
 }

.gitattributes

@@ -1,3 +1,4 @@
 **/yui/build/** -diff
 **/amd/build/** -diff
-lib/dml/oci_native_moodle_package.sql text eol=lf
+theme/bootstrapbase/style/editor.css -diff
+theme/bootstrapbase/style/moodle.css -diff

.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,110 +0,0 @@
-name: Core
-
-on:
-  push:
-    branches-ignore:
-      - master
-      - MOODLE_[0-9]+_STABLE
-    tags-ignore:
-      - v[0-9]+.[0-9]+.[0-9]+*
-
-env:
-  php: 7.4
-
-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.2
-            db: mysqli
-          - os: ubuntu-18.04
-            php: 7.4
-            db: pgsql
-
-    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: 9.6
-          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 }}
-          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,7 +25,6 @@ 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.phar
@@ -46,8 +36,3 @@ composer.phar
 /lib/yuilib/*/*/*-coverage.js
 atlassian-ide-plugin.xml
 /node_modules/
-/.vscode/
-moodle-plugin-ci.phar
-.eslintignore
-.stylelintignore
-/jsdoc

.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('GruntfileComponents.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,
-    },
-};

.jshintignore

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

.nvmrc

@@ -1 +0,0 @@
-v14.18.0

.stylelintignore

@@ -0,0 +1,84 @@
+# Generated by "grunt ignorefiles"
+theme/bootstrapbase/style/
+theme/clean/style/custom.css
+theme/more/style/custom.css
+node_modules/
+vendor/
+admin/tool/usertours/amd/src/tour.js
+admin/tool/usertours/amd/src/popper.js
+auth/cas/CAS/
+auth/fc/fcFPP.php
+enrol/lti/ims-blti/
+filter/algebra/AlgParser.pm
+filter/tex/mimetex.*
+lib/editor/atto/yui/src/rangy/js/*.*
+lib/editor/tinymce/plugins/pdw/tinymce/
+lib/editor/tinymce/plugins/spellchecker/rpc.php
+lib/editor/tinymce/tiny_mce/
+lib/adodb/
+lib/bennu/
+lib/evalmath/
+lib/lessphp/
+lib/phpexcel/
+lib/google/
+lib/htmlpurifier/
+lib/jabber/
+lib/minify/matthiasmullie-minify/
+lib/minify/matthiasmullie-pathconverter/
+lib/pear/Auth/RADIUS.php
+lib/pear/Crypt/CHAP.php
+lib/pear/HTML/Common.php
+lib/pear/HTML/QuickForm.php
+lib/pear/HTML/QuickForm/
+lib/pear/PEAR.php
+lib/phpmailer/
+lib/simplepie/
+lib/tcpdf/
+lib/typo3/
+lib/yuilib/
+lib/yuilib/gallery/
+lib/jquery/
+lib/html2text/
+lib/markdown/
+lib/recaptchalib.php
+lib/xhprof/
+lib/xmlize.php
+lib/horde/
+lib/requirejs/
+lib/amd/src/loglevel.js
+lib/mustache/
+lib/amd/src/mustache.js
+lib/graphlib.php
+lib/php-css-parser/
+lib/rtlcss/
+lib/scssphp/
+lib/spout/
+lib/amd/src/chartjs-lazy.js
+lib/maxmind/GeoIp2/
+lib/maxmind/MaxMind/
+lib/ltiprovider/
+lib/amd/src/truncate.js
+lib/fonts/
+media/player/videojs/amd/src/video-lazy.js
+media/player/videojs/amd/src/Youtube-lazy.js
+media/player/videojs/videojs/
+mod/assign/feedback/editpdf/fpdi/
+repository/s3/S3.php
+theme/boost/scss/bootstrap/
+theme/boost/amd/src/alert.js
+theme/boost/amd/src/button.js
+theme/boost/amd/src/carousel.js
+theme/boost/amd/src/collapse.js
+theme/boost/amd/src/dropdown.js
+theme/boost/amd/src/modal.js
+theme/boost/amd/src/popover.js
+theme/boost/amd/src/scrollspy.js
+theme/boost/amd/src/tab.js
+theme/boost/amd/src/tooltip.js
+theme/boost/amd/src/util.js
+theme/boost/amd/src/tether.js
+theme/boost/scss/fontawesome/
+theme/bootstrapbase/less/bootstrap/
+theme/bootstrapbase/javascript/html5shiv.js
+theme/bootstrapbase/amd/src/bootstrap.js
+theme/bootstrapbase/less/fontawesome/

.stylelintrc

@@ -1,22 +1,18 @@
 {
-    "plugins": [
-        "stylelint-csstree-validator"
-    ],
     "rules": {
-        "csstree/validator": true,
         "at-rule-empty-line-before": [ "always",
-          {"except": [ "blockless-after-blockless"], ignore: ["after-comment", "inside-block"]}
+          {"except": [ "blockless-group"], ignore: ["after-comment", "all-nested"]}
         ],
         "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-newline-before": "always-multi-line",
         "block-closing-brace-space-before": "always-single-line",
         "block-no-empty": true,
-        "block-opening-brace-newline-after": "always",
+        "block-no-single-line": true,
+        "block-opening-brace-newline-after": "always-multi-line",
         "block-opening-brace-space-after": "always-single-line",
         "block-opening-brace-space-before": "always",
         "color-hex-case": ["lower", { "severity": "warning" }],
@@ -25,6 +21,7 @@
         "declaration-bang-space-after": "never",
         "declaration-bang-space-before": "always",
         "declaration-block-no-duplicate-properties": true,
+        "declaration-block-no-ignored-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",
@@ -35,7 +32,6 @@
         "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",
@@ -45,7 +41,7 @@
         "function-name-case": "lower",
         "function-parentheses-newline-inside": "always-multi-line",
         "function-parentheses-space-inside": "never-single-line",
-        "function-url-scheme-blacklist": ["data"],
+        "function-url-data-uris": never,
         "function-whitespace-after": "always",
         "indentation": 4,
         "keyframe-declaration-no-important": true,
@@ -54,12 +50,14 @@
         "max-line-length": [132, { "severity": "warning" }],
         "media-feature-colon-space-after": "always",
         "media-feature-colon-space-before": "never",
+        "media-feature-no-missing-punctuation": true,
         "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-browser-hacks": null, # Enabled for non-scss in grunt.
         "no-empty-source": true,
         "no-eol-whitespace": true,
         "no-extra-semicolons": [true, { "severity": "warning" }],
@@ -80,10 +78,11 @@
         "selector-pseudo-class-parentheses-space-inside": "never",
         "selector-pseudo-element-case": "lower",
         "selector-pseudo-element-no-unknown": true,
+        "selector-root-no-composition": true,
         "selector-type-case": "lower",
         "selector-type-no-unknown": true,
         "string-no-newline": true,
-        "time-min-milliseconds": 100,
+        "time-no-imperceptible": true,
         "unit-blacklist": ["pt"],
         "unit-case": "lower",
         "unit-no-unknown": true,

.travis.yml

@@ -2,86 +2,90 @@
 # process (which uses our internal CI system) this file is here for the benefit
 # of community developers git clones - see MDL-51458.
 
+sudo: required
+
+# We currently disable Travis notifications entirely until https://github.com/travis-ci/travis-ci/issues/4976
+# is fixed.
 notifications:
-  email:
-    if: env(MOODLE_EMAIL) != no
+  email: false
 
 language: php
 
-os: linux
-
-dist: bionic
-
-services:
-    - mysql
-    - docker
+php:
+    # We only run the highest and lowest supported versions to reduce the load on travis-ci.org.
+    - 7.1
+    - 5.6
 
 addons:
-  postgresql: "9.6"
+  postgresql: "9.3"
+  packages:
+    - mysql-server-5.6
+    - mysql-client-core-5.6
+    - mysql-client-5.6
 
-branches:
-  except:
-    - master
-    - /MOODLE_[0-9]+_STABLE/
-    - /^v[0-9]+\.[0-9]+\.[0-9]+.*/
+services:
+    - redis-server
 
-jobs:
+env:
+    # Although we want to run these jobs and see failures as quickly as possible, we also want to get the slowest job to
+    # start first so that the total run time is not too high.
+    #
+    # We only run MySQL on PHP 7.1, so run that first.
+    # CI Tests should be second-highest in priority as these only take <= 60 seconds to run under normal circumstances.
+    # Postgres is significantly is pretty reasonable in its run-time.
+
+    # Run unit tests on MySQL
+    - DB=mysqli   TASK=PHPUNIT
+
+    # Run CI Tests without running PHPUnit.
+    - DB=none     TASK=CITEST
+
+    # Run unit tests on Postgres
+    - DB=pgsql    TASK=PHPUNIT
+
+    # Perform an upgrade test too.
+    - DB=pgsql    TASK=UPGRADE
+
+matrix:
     # 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.2)
-        - php: 7.2
-          env: DB=none     TASK=CITEST
-        - php: 7.2
-          env: DB=none     TASK=GRUNT    NVM_VERSION='lts/carbon'
+          # Run grunt/npm install on lowest supported npm version
+        - php: 7.1
+          env: DB=none     TASK=GRUNT   NVM_VERSION='4'
+          # Run grunt/npm install on highest version ('node' is an alias for the latest node.js version.)
+        - php: 7.1
+          env: DB=none     TASK=GRUNT   NVM_VERSION='node'
 
-        - if: env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present
-          php: 7.2
-          env: DB=pgsql    TASK=PHPUNIT
+    exclude:
+        # MySQL - it's just too slow.
+        # Exclude it on all versions except for 7.1
 
-        - if: env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all"
-          php: 7.2
-          env: DB=mysqli   TASK=PHPUNIT
+        - env: DB=mysqli   TASK=PHPUNIT
+          php: 5.6
 
-        # Then, conditionally, all the highest php ones (7.4)
-        - if: env(MOODLE_PHP) = "all"
-          php: 7.4
-          env: DB=none     TASK=CITEST
-        - if: env(MOODLE_PHP) = "all"
-          php: 7.4
-          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: 7.4
-          env: DB=pgsql    TASK=PHPUNIT
-
-        - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all")
-          php: 7.4
-          env: DB=mysqli   TASK=PHPUNIT
+        # Moodle 2.7 is not compatible with PHP 7 for the upgrade test.
+        - env: DB=pgsql    TASK=UPGRADE
+          php: 7.1
 
 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 stop mysql
             sudo mv /var/lib/mysql /mnt/ramdisk
             sudo ln -s /mnt/ramdisk/mysql /var/lib/mysql
-            sudo service mysql restart
+            sudo start mysql
         fi
     - >
         if [ "$DB" = 'pgsql' ];
@@ -91,7 +95,7 @@ install:
             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
+            sudo service postgresql start 9.3
         fi
     - >
         if [ "$TASK" = 'PHPUNIT' ];
@@ -101,6 +105,7 @@ install:
                 echo 'auth.json' >> .git/info/exclude
             fi
 
+            # Enable Redis.
             echo 'extension="redis.so"' > /tmp/redis.ini
             phpenv config-add /tmp/redis.ini
 
@@ -120,7 +125,7 @@ install:
 before_script:
     - phpenv config-rm xdebug.ini
     - >
-      if [ "$TASK" = 'PHPUNIT' ];
+      if [ "$TASK" = 'PHPUNIT' -o "$TASK" = 'UPGRADE' ];
       then
         # Copy generic configuration in place.
         cp config-dist.php config.php ;
@@ -176,21 +181,7 @@ before_script:
         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, but not for PHP 7.2 and up. See MDL-60978 for more info.
-        redissession="define('TEST_SESSION_REDIS_HOST', '127.0.0.1');"
-        sed -i \
-          -e "/require_once/i \\${redissession}" \
+          -e "/require_once/i \\define('TEST_SESSION_REDIS_HOST', '127.0.0.1');" \
           config.php ;
 
         # Initialise PHPUnit for Moodle.
@@ -220,7 +211,7 @@ before_script:
         # We need the official upstream for comparison
         git remote add upstream https://github.com/moodle/moodle.git;
 
-        git fetch upstream MOODLE_310_STABLE;
+        git fetch upstream MOODLE_33_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`
@@ -231,11 +222,37 @@ before_script:
         export phpcmd=`which php`;
       fi
 
+    ########################################################################
+    # Upgrade test
+    ########################################################################
+    - >
+      if [ "$TASK" = 'UPGRADE' ];
+      then
+        # We need the official upstream.
+        git remote add upstream https://github.com/moodle/moodle.git;
+
+        # Checkout 27 STABLE branch.
+        git fetch upstream MOODLE_27_STABLE;
+        git checkout MOODLE_27_STABLE;
+
+        # Perform the upgrade
+        php admin/cli/install_database.php --agree-license --adminpass=Password --adminemail=admin@example.com --fullname="Upgrade test" --shortname=Upgrade;
+
+        # Return to the previous commit
+        git checkout -;
+
+        # Perform the upgrade
+        php admin/cli/upgrade.php --non-interactive --allow-unstable ;
+
+        # The local_ci repository can be used to check upgrade savepoints.
+        git clone https://github.com/moodlehq/moodle-local_ci.git local/ci ;
+      fi
+
 script:
     - >
       if [ "$TASK" = 'PHPUNIT' ];
       then
-        vendor/bin/phpunit --fail-on-risky --disallow-test-output --verbose;
+        vendor/bin/phpunit;
       fi
 
     - >
@@ -250,16 +267,23 @@ script:
         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:
+    ########################################################################
+    # Upgrade test
+    ########################################################################
     - >
-      if [ "$TASK" = 'PHPUNIT' ];
+      if [ "$TASK" = 'UPGRADE' ];
       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"
+        cp local/ci/check_upgrade_savepoints/check_upgrade_savepoints.php ./check_upgrade_savepoints.php
+        result=`php check_upgrade_savepoints.php`;
+        # Check if there are problems
+        count=`echo "$result" | grep -P "ERROR|WARN" | wc -l` ;
+        if (($count > 0));
+        then
+          echo "$result"
+          exit 1 ;
+        fi
       fi

Gruntfile.js

@@ -20,204 +20,42 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-/* eslint-env node */
-
 /**
- * Calculate the cwd, taking into consideration the `root` option (for Windows).
- *
- * @param {Object} grunt
- * @returns {String} The current directory as best we can determine
+ * Grunt configuration
  */
-const getCwd = grunt => {
-    const fs = require('fs');
-    const path = require('path');
 
-    let cwd = fs.realpathSync(process.env.PWD || process.cwd());
+module.exports = function(grunt) {
+    var path = require('path'),
+        tasks = {},
+        cwd = process.env.PWD || process.cwd(),
+        async = require('async'),
+        DOMParser = require('xmldom').DOMParser,
+        xpath = require('xpath'),
+        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 too old. Require ' + expected + ', version installed: ' + actual);
+    }
 
     // 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');
+        var root = grunt.option('root');
         if (grunt.file.exists(__dirname, root)) {
-            cwd = fs.realpathSync(path.join(__dirname, root));
+            cwd = 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;
-};
-
-/**
- * Register any stylelint tasks.
- *
- * @param {Object} grunt
- * @param {Array} files
- * @param {String} fullRunDir
- */
-const registerStyleLintTasks = (grunt, files, fullRunDir) => {
-    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,
-                },
-            },
-        };
-    };
-
-    let hasCss = true;
-    let hasScss = true;
-
-    if (files) {
-        // Specific files were passed. Just set them up.
-        grunt.config.merge(getCssConfigForFiles(files));
-        grunt.config.merge(getScssConfigForFiles(files));
-    } else {
-        // The stylelint system does not handle the case where there was no file to lint.
-        // Check whether there are any files to lint in the current directory.
-        const glob = require('glob');
-
-        const scssSrc = [];
-        glob.sync(`${fullRunDir}/**/*.scss`).forEach(path => scssSrc.push(path));
-
-        if (scssSrc.length) {
-            grunt.config.merge(getScssConfigForFiles(scssSrc));
-        } else {
-            hasScss = false;
-        }
-
-        const cssSrc = [];
-        glob.sync(`${fullRunDir}/**/*.css`).forEach(path => cssSrc.push(path));
-
-        if (cssSrc.length) {
-            grunt.config.merge(getCssConfigForFiles(cssSrc));
-        } else {
-            hasCss = false;
-        }
-    }
-
-    const scssTasks = ['sass'];
-    if (hasScss) {
-        scssTasks.unshift('stylelint:scss');
-    }
-    scssTasks.unshift('ignorefiles');
-    grunt.registerTask('scss', scssTasks);
-
-    const cssTasks = ['ignorefiles'];
-    if (hasCss) {
-        cssTasks.push('stylelint:css');
-    }
-    grunt.registerTask('rawcss', cssTasks);
-
-    grunt.registerTask('css', ['scss', 'rawcss']);
-};
-
-/**
- * Grunt configuration.
- *
- * @param {Object} grunt
- */
-module.exports = function(grunt) {
-    const path = require('path');
-    const tasks = {};
-    const async = require('async');
-    const DOMParser = require('xmldom').DOMParser;
-    const xpath = require('xpath');
-    const semver = require('semver');
-    const watchman = require('fb-watchman');
-    const watchmanClient = new watchman.Client();
-    const fs = require('fs');
-    const ComponentList = require(path.resolve('GruntfileComponents.js'));
-    const sass = require('node-sass');
-
-    // 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);
-    }
-
-    // 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 runDir = inComponent ? componentDirectory : relativeCwd;
-    const fullRunDir = fs.realpathSync(gruntFilePath + path.sep + runDir);
-    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}`);
-    }
-
-    let files = null;
-    if (grunt.option('files')) {
-        // Accept a comma separated list of files to process.
-        files = grunt.option('files').split(',');
-    }
-
-    // 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 ..
-    const inAMD = !path.relative(`${componentDirectory}/amd`, cwd).startsWith('..');
+    var inAMD = path.basename(cwd) == 'amd';
 
     // Globbing pattern for matching all AMD JS source files.
-    let amdSrc = [];
-    if (inComponent) {
-        amdSrc.push(componentDirectory + "/amd/src/*.js");
-        amdSrc.push(componentDirectory + "/amd/src/**/*.js");
-    } else {
-        amdSrc = ComponentList.getAmdSrcGlobList();
-    }
-
-    let yuiSrc = [];
-    if (inComponent) {
-        yuiSrc.push(componentDirectory + "/yui/src/**/*.js");
-    } else {
-        yuiSrc = ComponentList.getYuiSrcGlobList(gruntFilePath + '/');
-    }
+    var amdSrc = [inAMD ? cwd + '/src/*.js' : '**/amd/src/*.js'];
 
     /**
      * Function to generate the destination for the uglify task
@@ -229,9 +67,10 @@ module.exports = function(grunt) {
      * @param {String} srcPath the  matched src path
      * @return {String} The rewritten destination path.
      */
-    var babelRename = function(destPath, srcPath) {
+    var uglifyRename = function(destPath, srcPath) {
         destPath = srcPath.replace('src', 'build');
         destPath = destPath.replace('.js', '.min.js');
+        destPath = path.resolve(cwd, destPath);
         return destPath;
     };
 
@@ -242,206 +81,161 @@ module.exports = function(grunt) {
      * @return {array} The list of thirdparty paths.
      */
     var getThirdPartyPathsFromXML = function() {
-        const thirdpartyfiles = ComponentList.getThirdPartyLibsList(gruntFilePath + '/');
-        const libs = ['node_modules/', 'vendor/'];
+        var thirdpartyfiles = grunt.file.expand('*/**/thirdpartylibs.xml');
+        var libs = ['node_modules/', 'vendor/'];
 
         thirdpartyfiles.forEach(function(file) {
-            const dirname = path.dirname(file);
+          var dirname = path.dirname(file);
 
-            const doc = new DOMParser().parseFromString(grunt.file.read(file));
-            const nodes = xpath.select("/libraries/library/location/text()", doc);
+          var doc = new DOMParser().parseFromString(grunt.file.read(file));
+          var nodes = xpath.select("/libraries/library/location/text()", doc);
 
-            nodes.forEach(function(node) {
-                let lib = path.posix.join(dirname, node.toString());
-                if (grunt.file.isDir(lib)) {
-                    // Ensure trailing slash on dirs.
-                    lib = lib.replace(/\/?$/, '/');
-                }
+          nodes.forEach(function(node) {
+            var lib = path.join(dirname, node.toString());
+            if (grunt.file.isDir(lib)) {
+                // Ensure trailing slash on dirs.
+                lib = lib.replace(/\/?$/, '/');
+            }
 
-                // Look for duplicate paths before adding to array.
-                if (libs.indexOf(lib) === -1) {
-                    libs.push(lib);
-                }
-            });
+            // Look for duplicate paths before adding to array.
+            if (libs.indexOf(lib) === -1) {
+                libs.push(lib);
+            }
+          });
         });
-
         return libs;
     };
 
-    /**
-     * Get the list of feature files to pass to the gherkin linter.
-     *
-     * @returns {Array}
-     */
-    const getGherkinLintTargets = () => {
-        if (files) {
-            // Specific files were requested. Only check these.
-            return files;
-        }
-
-        if (inComponent) {
-            return [`${runDir}/tests/behat/*.feature`];
-        }
-
-        return ['**/tests/behat/*.feature'];
-    };
-
     // Project configuration.
     grunt.initConfig({
         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)
+            options: {quiet: !grunt.option('show-lint-warnings')},
+            amd: {
+              src: amdSrc,
+              // Check AMD with some slightly stricter rules.
+              rules: {
+                'no-unused-vars': 'error',
+                'no-implicit-globals': 'error'
+              }
             },
-            amd: {src: files ? files : amdSrc},
             // Check YUI module source files.
-            yui: {src: files ? files : yuiSrc},
+            yui: {
+               src: ['**/yui/src/**/*.js', '!*/**/yui/src/*/meta/*.js'],
+               options: {
+                   // Disable some rules which we can't safely define for YUI rollups.
+                   rules: {
+                     'no-undef': 'off',
+                     'no-unused-vars': 'off',
+                     'no-unused-expressions': 'off'
+                   }
+               }
+            }
         },
-        babel: {
-            options: {
-                sourceMaps: true,
-                comments: 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('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: [
-                    ['minify', {
-                        // This minification plugin needs to be disabled because it breaks the
-                        // source map generation and causes invalid source maps to be output.
-                        simplify: false,
-                        builtIns: false
-                    }],
-                    ['@babel/preset-env', {
-                        targets: {
-                            browsers: [
-                                ">0.25%",
-                                "last 2 versions",
-                                "not ie <= 10",
-                                "not op_mini all",
-                                "not Opera > 0",
-                                "not dead"
-                            ]
-                        },
-                        modules: false,
-                        useBuiltIns: false
-                    }]
-                ]
-            },
-            dist: {
+        uglify: {
+            amd: {
                 files: [{
                     expand: true,
-                    src: files ? files : amdSrc,
-                    rename: babelRename
-                }]
+                    src: amdSrc,
+                    rename: uglifyRename
+                }],
+                options: {report: 'none'}
             }
         },
-        jsdoc: {
-            dist: {
-                options: {
-                    configure: ".grunt/jsdoc/jsdoc.conf.js",
-                },
-            },
-        },
-        sass: {
-            dist: {
+        less: {
+            bootstrapbase: {
                 files: {
-                    "theme/boost/style/moodle.css": "theme/boost/scss/preset/default.scss",
-                    "theme/classic/style/moodle.css": "theme/classic/scss/classicgrunt.scss"
+                    "theme/bootstrapbase/style/moodle.css": "theme/bootstrapbase/less/moodle.less",
+                    "theme/bootstrapbase/style/editor.css": "theme/bootstrapbase/less/editor.less",
+                },
+                options: {
+                    compress: false // We must not compress to keep the comments.
                 }
-            },
-            options: {
-                implementation: sass,
-                includePaths: ["theme/boost/scss/", "theme/classic/scss/"]
-            }
+           }
         },
         watch: {
             options: {
                 nospawn: true // We need not to spawn so config can be changed dynamically.
             },
             amd: {
-                files: inComponent
-                    ? ['amd/src/*.js', 'amd/src/**/*.js']
-                    : ['**/amd/src/**/*.js'],
+                files: ['**/amd/src/**/*.js'],
                 tasks: ['amd']
             },
-            boost: {
-                files: [inComponent ? 'scss/**/*.scss' : 'theme/boost/scss/**/*.scss'],
-                tasks: ['scss']
-            },
-            rawcss: {
-                files: [
-                    '**/*.css',
-                ],
-                excludes: [
-                    '**/moodle.css',
-                    '**/editor.css',
-                ],
-                tasks: ['rawcss']
+            bootstrapbase: {
+                files: ["theme/bootstrapbase/less/**/*.less"],
+                tasks: ["css"]
             },
             yui: {
-                files: inComponent
-                    ? ['yui/src/*.json', 'yui/src/**/*.js']
-                    : ['**/yui/src/**/*.js'],
+                files: ['**/yui/src/**/*.js'],
                 tasks: ['yui']
             },
             gherkinlint: {
-                files: [inComponent ? 'tests/behat/*.feature' : '**/tests/behat/*.feature'],
+                files: ['**/tests/behat/*.feature'],
                 tasks: ['gherkinlint']
             }
         },
         shifter: {
             options: {
                 recursive: true,
-                // Shifter takes a relative path.
-                paths: files ? files : [runDir]
+                paths: [cwd]
             }
         },
         gherkinlint: {
             options: {
-                files: getGherkinLintTargets(),
+                files: ['**/tests/behat/*.feature'],
             }
         },
+        stylelint: {
+            less: {
+                options: {
+                    syntax: 'less',
+                    configOverrides: {
+                        rules: {
+                            // These rules have to be disabled in .stylelintrc for scss compat.
+                            "at-rule-no-unknown": true,
+                            "no-browser-hacks": [true, {"severity": "warning"}]
+                        }
+                    }
+                },
+                src: ['theme/**/*.less']
+            },
+            scss: {
+                options: {syntax: 'scss'},
+                src: ['*/**/*.scss']
+            },
+            css: {
+                src: ['*/**/*.css'],
+                options: {
+                    configOverrides: {
+                        rules: {
+                            // These rules have to be disabled in .stylelintrc for scss compat.
+                            "at-rule-no-unknown": true,
+                            "no-browser-hacks": [true, {"severity": "warning"}]
+                        }
+                    }
+                }
+            }
+        }
     });
 
     /**
      * Generate ignore files (utilising thirdpartylibs.xml data)
      */
     tasks.ignorefiles = function() {
-        // An array of paths to third party directories.
-        const thirdPartyPaths = getThirdPartyPathsFromXML();
-        // Generate .eslintignore.
-        const eslintIgnores = [
-            '# Generated by "grunt ignorefiles"',
-            '*/**/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',
-        ].concat(thirdPartyPaths);
-        grunt.file.write('.stylelintignore', stylelintIgnores.join('\n') + '\n');
+      // An array of paths to third party directories.
+      var thirdPartyPaths = getThirdPartyPathsFromXML();
+      // Generate .eslintignore.
+      var eslintIgnores = ['# Generated by "grunt ignorefiles"', '*/**/yui/src/*/meta/', '*/**/build/'].concat(thirdPartyPaths);
+      grunt.file.write('.eslintignore', eslintIgnores.join('\n'));
+      // Generate .stylelintignore.
+      var stylelintIgnores = [
+          '# Generated by "grunt ignorefiles"',
+          'theme/bootstrapbase/style/',
+          'theme/clean/style/custom.css',
+          'theme/more/style/custom.css'
+      ].concat(thirdPartyPaths);
+      grunt.file.write('.stylelintignore', stylelintIgnores.join('\n'));
     };
 
     /**
@@ -533,32 +327,19 @@ module.exports = function(grunt) {
     };
 
     tasks.gherkinlint = function() {
-        const done = this.async();
-        const options = grunt.config('gherkinlint.options');
+        var done = this.async(),
+            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
+        var args = grunt.file.expand(options.files);
+        args.unshift(path.normalize(__dirname + '/node_modules/.bin/gherkin-lint'));
+        grunt.util.spawn({
+            cmd: 'node',
+            args: args,
+            opts: {stdio: 'inherit', env: process.env}
+        }, function(error, result, code) {
+            // Propagate the exit code.
+            done(code === 0);
+        });
     };
 
     tasks.startup = function() {
@@ -576,289 +357,43 @@ module.exports = function(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.
-     */
-    tasks.watch = function() {
-        var watchTaskDone = this.async();
-        var watchInitialised = false;
-        var watchTaskQueue = {};
-        var processingQueue = false;
-
-        // 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: 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 = 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(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', 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 ' + fullRunDir);
-                });
-            });
-        });
-    };
-
     // 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).
     var changedFiles = Object.create(null);
     var onChange = grunt.util._.debounce(function() {
-        var files = Object.keys(changedFiles);
-        grunt.config('eslint.amd.src', files);
-        grunt.config('eslint.yui.src', files);
-        grunt.config('shifter.options.paths', files);
-        grunt.config('gherkinlint.options.files', files);
-        grunt.config('babel.dist.files', [{expand: true, src: files, rename: babelRename}]);
-        changedFiles = Object.create(null);
+          var files = Object.keys(changedFiles);
+          grunt.config('eslint.amd.src', files);
+          grunt.config('eslint.yui.src', files);
+          grunt.config('uglify.amd.files', [{expand: true, src: files, rename: uglifyRename}]);
+          grunt.config('shifter.options.paths', files);
+          grunt.config('stylelint.less.src', files);
+          grunt.config('gherkinlint.options.files', files);
+          changedFiles = Object.create(null);
     }, 200);
 
     grunt.event.on('watch', function(action, filepath) {
-        changedFiles[filepath] = action;
-        onChange();
+          changedFiles[filepath] = action;
+          onChange();
     });
 
     // Register NPM tasks.
     grunt.loadNpmTasks('grunt-contrib-uglify');
+    grunt.loadNpmTasks('grunt-contrib-less');
     grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-sass');
     grunt.loadNpmTasks('grunt-eslint');
     grunt.loadNpmTasks('grunt-stylelint');
-    grunt.loadNpmTasks('grunt-babel');
-    grunt.loadNpmTasks('grunt-jsdoc');
-
-    // Rename the grunt-contrib-watch "watch" task because we're going to wrap it.
-    grunt.renameTask('watch', 'watch-grunt');
 
     // Register JS tasks.
     grunt.registerTask('shifter', 'Run Shifter against the current directory', tasks.shifter);
     grunt.registerTask('gherkinlint', 'Run gherkinlint against the current directory', tasks.gherkinlint);
     grunt.registerTask('ignorefiles', 'Generate ignore files for linters', tasks.ignorefiles);
-    grunt.registerTask('watch', 'Run tasks on file changes', tasks.watch);
     grunt.registerTask('yui', ['eslint:yui', 'shifter']);
-    grunt.registerTask('amd', ['ignorefiles', 'eslint:amd', 'babel']);
+    grunt.registerTask('amd', ['eslint:amd', 'uglify']);
     grunt.registerTask('js', ['amd', 'yui']);
 
-    // Register CSS tasks.
-    registerStyleLintTasks(grunt, files, fullRunDir);
+    // Register CSS taks.
+    grunt.registerTask('css', ['stylelint:scss', 'stylelint:less', 'less:bootstrapbase', 'stylelint:css']);
 
     // Register the startup task.
     grunt.registerTask('startup', 'Run the correct tasks for the current directory', tasks.startup);

GruntfileComponents.js

@@ -1,233 +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 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,
-    getOwningComponentDirectory,
-    getYuiSrcGlobList,
-    getThirdPartyLibsList,
-    getThirdPartyPaths,
-};

TRADEMARK.txt

@@ -2,7 +2,7 @@ MOODLE TRADEMARKS POLICY
 ========================
 
 The word "Moodle" is trademarked in many countries around the world. The word
-was originally coined as an acronym: Modular Object-Oriented Dynamic Learning
+was originally an acronym: Modular Object-Oriented Dynamic Learning
 Environment. The trademark is owned by Martin Dougiamas, Founder and Director
 of Moodle.
 

admin/admin_settings_search_form.php

@@ -0,0 +1,48 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Admin settings search form
+ *
+ * @package    admin
+ * @copyright  2016 Damyon Wiese
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once $CFG->libdir.'/formslib.php';
+
+/**
+ * Admin settings search form
+ *
+ * @package    admin
+ * @copyright  2016 Damyon Wiese
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class admin_settings_search_form extends moodleform {
+    function definition () {
+        $mform = $this->_form;
+
+        //$mform->addElement('header', 'settingsheader', get_string('search', 'admin'));
+        $elements = [];
+        $elements[] = $mform->createElement('text', 'query', get_string('query', 'admin'));
+        $elements[] = $mform->createElement('submit', 'search', get_string('search'));
+        $mform->addGroup($elements);
+        $mform->setType('query', PARAM_RAW);
+        $mform->setDefault('query', optional_param('query', '', PARAM_RAW));
+    }
+}

admin/antiviruses.php

@@ -33,7 +33,8 @@ $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();
+require_login();
+require_capability('moodle/site:config', context_system::instance());
 
 $returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageantiviruses";
 
@@ -98,10 +99,8 @@ switch ($action) {
     default:
         break;
 }
-$new = implode(',', $activeantiviruses);
-add_to_config_log('antiviruses', $CFG->antiviruses, $new, 'core');
-set_config('antiviruses', $new);
 
+set_config('antiviruses', implode(',', $activeantiviruses));
 core_plugin_manager::reset_caches();
 
-redirect ($returnurl);
+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'));
 

admin/auth_config.php

@@ -165,12 +165,6 @@ function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts,
             // 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 ($fieldname == 'url') {
             $fieldname = get_string('webpage');
         } else {

admin/category.php

@@ -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));
@@ -53,16 +54,14 @@ $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');
@@ -74,7 +73,7 @@ if ($data = data_submitted() and confirm_sesskey()) {
 if ($PAGE->user_allowed_editing() && $adminediting != -1) {
     $USER->editing = $adminediting;
 }
-$buttons = null;
+
 if ($PAGE->user_allowed_editing()) {
     $url = clone($PAGE->url);
     if ($PAGE->user_is_editing()) {
@@ -128,9 +127,7 @@ if ($savebutton) {
 $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();
 
@@ -158,9 +155,4 @@ echo $outputhtml;
 echo html_writer::end_tag('fieldset');
 echo html_writer::end_tag('form');
 
-$PAGE->requires->yui_module('moodle-core-formchangechecker', 'M.core_formchangechecker.init', [[
-    'formid' => 'adminsettings'
-]]);
-$PAGE->requires->string_for_js('changesmadereallygoaway', 'moodle');
-
 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,59 +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');
-
-        $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');
-
-    }
-}

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);
-    }
-
-    /**
-     * 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/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/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/classes/task_log_table.php

@@ -1,292 +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 log table.
- *
- * @package    core_admin
- * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core_admin;
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->libdir . '/tablelib.php');
-
-/**
- * Table to display list of task logs.
- *
- * @copyright  2018 Andrew Nicols <andrew@nicols.co.uk>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class task_log_table extends \table_sql {
-
-    /**
-     * Constructor for the task_log table.
-     *
-     * @param   string      $filter
-     * @param   int         $resultfilter
-     */
-    public function __construct(string $filter = '', int $resultfilter = null) {
-        global $DB;
-
-        if (-1 === $resultfilter) {
-            $resultfilter = null;
-        }
-
-        parent::__construct('tasklogs');
-
-        $columnheaders = [
-            'classname'  => get_string('name'),
-            'type'       => get_string('tasktype', 'admin'),
-            'userid'     => get_string('user', 'admin'),
-            'timestart'  => get_string('task_starttime', 'admin'),
-            'duration'   => get_string('task_duration', 'admin'),
-            'hostname'   => get_string('hostname', 'tool_task'),
-            'pid'        => get_string('pid', 'tool_task'),
-            'db'         => get_string('task_dbstats', 'admin'),
-            'result'     => get_string('task_result', 'admin'),
-            'actions'    => '',
-        ];
-        $this->define_columns(array_keys($columnheaders));
-        $this->define_headers(array_values($columnheaders));
-
-        // The name column is a header.
-        $this->define_header_column('classname');
-
-        // This table is not collapsible.
-        $this->collapsible(false);
-
-        // The actions class should not wrap. Use the BS text utility class.
-        $this->column_class('actions', 'text-nowrap');
-
-        // Allow pagination.
-        $this->pageable(true);
-
-        // Allow sorting. Default to sort by timestarted DESC.
-        $this->sortable(true, 'timestart', SORT_DESC);
-
-        // Add filtering.
-        $where = [];
-        $params = [];
-        if (!empty($filter)) {
-            $orwhere = [];
-            $filter = str_replace('\\', '\\\\', $filter);
-
-            // Check the class name.
-            $orwhere[] = $DB->sql_like('classname', ':classfilter', false, false);
-            $params['classfilter'] = '%' . $DB->sql_like_escape($filter) . '%';
-
-            $orwhere[] = $DB->sql_like('output', ':outputfilter', false, false);
-            $params['outputfilter'] = '%' . $DB->sql_like_escape($filter) . '%';
-
-            $where[] = "(" . implode(' OR ', $orwhere) . ")";
-        }
-
-        if (null !== $resultfilter) {
-            $where[] = 'tl.result = :result';
-            $params['result'] = $resultfilter;
-        }
-
-        $where = implode(' AND ', $where);
-
-        $this->set_sql('', '', $where, $params);
-    }
-
-    /**
-     * Query the db. Store results in the table object for use by build_table.
-     *
-     * @param int $pagesize size of page for paginated displayed table.
-     * @param bool $useinitialsbar do you want to use the initials bar. Bar
-     * will only be used if there is a fullname column defined for the table.
-     */
-    public function query_db($pagesize, $useinitialsbar = true) {
-        global $DB;
-
-        // Fetch the attempts.
-        $sort = $this->get_sql_sort();
-        if ($sort) {
-            $sort = "ORDER BY $sort";
-        }
-
-        $extrafields = get_extra_user_fields(\context_system::instance());
-        $userfields = \user_picture::fields('u', $extrafields, 'userid2', 'user');
-
-        $where = '';
-        if (!empty($this->sql->where)) {
-            $where = "WHERE {$this->sql->where}";
-        }
-
-        $sql = "SELECT
-                    tl.id, tl.type, tl.component, tl.classname, tl.userid, tl.timestart, tl.timeend,
-                    tl.hostname, tl.pid,
-                    tl.dbreads, tl.dbwrites, tl.result,
-                    tl.dbreads + tl.dbwrites AS db,
-                    tl.timeend - tl.timestart AS duration,
-                    {$userfields}
-                FROM {task_log} tl
-           LEFT JOIN {user} u ON u.id = tl.userid
-                {$where}
-                {$sort}";
-
-        $this->pagesize($pagesize, $DB->count_records_sql("SELECT COUNT('x') FROM {task_log} tl {$where}", $this->sql->params));
-        if (!$this->is_downloading()) {
-            $this->rawdata = $DB->get_records_sql($sql, $this->sql->params, $this->get_page_start(), $this->get_page_size());
-        } else {
-            $this->rawdata = $DB->get_records_sql($sql, $this->sql->params);
-        }
-    }
-
-    /**
-     * Format the name cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_classname($row) : string {
-        $output = '';
-        if (class_exists($row->classname)) {
-            $task = new $row->classname;
-            if ($task instanceof \core\task\scheduled_task) {
-                $output = $task->get_name();
-            }
-        }
-
-        $output .= \html_writer::tag('div', "\\{$row->classname}", [
-                'class' => 'task-class',
-            ]);
-        return $output;
-    }
-
-    /**
-     * Format the type cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_type($row) : string {
-        if (\core\task\database_logger::TYPE_SCHEDULED == $row->type) {
-            return get_string('task_type:scheduled', 'admin');
-        } else {
-            return get_string('task_type:adhoc', 'admin');
-        }
-    }
-
-    /**
-     * Format the timestart cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_result($row) : string {
-        if ($row->result) {
-            return get_string('task_result:failed', 'admin');
-        } else {
-            return get_string('success');
-        }
-    }
-
-    /**
-     * Format the timestart cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_timestart($row) : string {
-        return userdate($row->timestart, get_string('strftimedatetimeshort', 'langconfig'));
-    }
-
-    /**
-     * Format the duration cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_duration($row) : string {
-        $duration = round($row->timeend - $row->timestart, 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);
-    }
-
-    /**
-     * Format the DB details cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_db($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;
-    }
-
-    /**
-     * Format the actions cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_actions($row) : string {
-        global $OUTPUT;
-
-        $actions = [];
-
-        $url = new \moodle_url('/admin/tasklogs.php', ['logid' => $row->id]);
-
-        // Quick view.
-        $actions[] = $OUTPUT->action_icon(
-            $url,
-            new \pix_icon('e/search', get_string('view')),
-            new \popup_action('click', $url)
-        );
-
-        // Download.
-        $actions[] = $OUTPUT->action_icon(
-            new \moodle_url($url, ['download' => true]),
-            new \pix_icon('t/download', get_string('download'))
-        );
-
-        return implode('&nbsp;', $actions);
-    }
-
-    /**
-     * Format the user cell.
-     *
-     * @param   \stdClass $row
-     * @return  string
-     */
-    public function col_userid($row) : string {
-        if (empty($row->userid)) {
-            return '';
-        }
-
-        $user = (object) [];
-        username_load_fields_from_object($user, $row, 'user');
-
-        return fullname($user);
-    }
-}

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

@@ -83,7 +83,7 @@ Examples:
         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
+    # php cfg.php --name=theme --set=clean
         Sets the given configuration variable to the given value.
 
     # php cfg.php --name=noemailever --unset
@@ -120,23 +120,11 @@ if ($options['unset'] || $options['set'] !== null) {
     }
 
     // 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) {
+    if (array_key_exists($options['name'], $CFG->config_php_settings)) {
         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']);
-    }
+    set_config($options['name'], $options['set'], $options['component']);
     exit(0);
 }
 

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

@@ -35,25 +35,8 @@ 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/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/install.php

@@ -146,9 +146,14 @@ 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.6.5") < 0) {
+    $phpversion = phpversion();
+    // do NOT localise - lang strings would not work here and we CAN NOT move it after installib
+    fwrite(STDERR, "Moodle 3.2 or later requires at least PHP 5.6.5 (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;
@@ -215,11 +220,11 @@ 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) {
@@ -267,7 +272,6 @@ 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);
@@ -393,6 +397,7 @@ if ($interactive) {
 $CFG->wwwroot       = $wwwroot;
 $CFG->httpswwwroot  = $CFG->wwwroot;
 
+
 //We need dataroot before lang download
 $CFG->dataroot = $options['dataroot'];
 if ($interactive) {
@@ -443,7 +448,6 @@ if ($interactive) {
     }
 }
 $CFG->tempdir       = $CFG->dataroot.'/temp';
-$CFG->backuptempdir = $CFG->tempdir.'/backup';
 $CFG->cachedir      = $CFG->dataroot.'/cache';
 $CFG->localcachedir = $CFG->dataroot.'/localcache';
 
@@ -515,105 +519,100 @@ 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 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->dboptions['dbport'] = (int)$options['dbport'];
+}
+if ($CFG->dboptions['dbport'] <= 0) {
+    $CFG->dboptions['dbport'] = '';
+}
+
+// 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 {
-        $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 {
@@ -621,118 +620,110 @@ 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, 'dbport'=>$CFG->dboptions['dbport'], 'dbsocket'=>$CFG->dboptions['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, 'dbport'=>$CFG->dboptions['dbport'], 'dbsocket'=>$CFG->dboptions['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'));
-        }
+} else {
+    $CFG->dbpass = $options['dbpass'];
+    $hint_database = 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 ($hint_database !== '') {
+        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'));
+// 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']));
+    if ($options['fullname'] !== '') {
+        $prompt = get_string('clitypevaluedefault', 'admin', $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']];
+    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));
     }
 }
 
+// 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));
+    }
+}
+
+// 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']) 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));
+    }
+}
+
+// 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);
+}
+
+// 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));
+}
+
 // Ask for the upgrade key.
 if ($interactive) {
     cli_separator();
@@ -751,27 +742,23 @@ if ($options['upgradekey'] !== '') {
     $CFG->upgradekey = $options['upgradekey'];
 }
 
-// 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);
-            }
-        }
-    } else {
-        if (!$options['agree-license'] && !$skipdatabase) {
-            cli_error(get_string('climustagreelicense', 'install'));
+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
@@ -819,14 +806,8 @@ if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
     cli_error(get_string('pluginschecktodo', 'admin'));
 }
 
-if (!$skipdatabase) {
+if (!$options['skip-database']) {
     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";
 }

admin/cli/install_database.php

@@ -62,9 +62,14 @@ 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.6.5") < 0) {
+    $phpversion = phpversion();
+    // do NOT localise - lang strings would not work here and we CAN NOT move it after installib
+    fwrite(STDERR, "Moodle 3.2 or later requires at least PHP 5.6.5 (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';
@@ -82,6 +87,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);
 
@@ -104,17 +114,12 @@ list($options, $unrecognized) = cli_get_params(
     )
 );
 
-// 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
 }
@@ -178,12 +183,5 @@ if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
 
 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

@@ -119,7 +119,7 @@ if (!empty($options['collation'])) {
     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";
+        $sql = "ALTER DATABASE $CFG->dbname DEFAULT CHARACTER SET $charset DEFAULT COLLATE = $collation";
         try {
             $DB->change_database_structure($sql);
         } catch (exception $e) {
@@ -146,7 +146,7 @@ if (!empty($options['collation'])) {
 
         } else {
             try {
-                $DB->change_database_structure("ALTER TABLE `$table->name` CONVERT TO CHARACTER SET $charset COLLATE $collation");
+                $DB->change_database_structure("ALTER TABLE $table->name CONVERT TO CHARACTER SET $charset COLLATE $collation");
                 echo "CONVERTED\n";
                 $converted++;
             } catch (ddl_exception $e) {
@@ -163,7 +163,7 @@ if (!empty($options['collation'])) {
             }
         }
 
-        $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);
@@ -181,7 +181,7 @@ if (!empty($options['collation'])) {
                 $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`
+                $sql = "ALTER TABLE $table->name
                         MODIFY COLUMN $column->field $column->type
                         CHARACTER SET $charset
                         COLLATE $collation $notnull $default";
@@ -192,11 +192,11 @@ if (!empty($options['collation'])) {
                 $default = !is_null($column->default) ? "DEFAULT '$column->default'" : '';
 
                 if ($rowformat != '') {
-                    $sql = "ALTER TABLE `$table->name` $rowformat";
+                    $sql = "ALTER TABLE $table->name $rowformat";
                     $DB->change_database_structure($sql);
                 }
 
-                $sql = "ALTER TABLE `$table->name`
+                $sql = "ALTER TABLE $table->name
                         MODIFY COLUMN $column->field $column->type
                         CHARACTER SET $charset
                         COLLATE $collation $notnull $default";
@@ -315,8 +315,8 @@ function mysql_set_row_format($tablename, $charset, $collation, $engine) {
         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");
+            $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;

admin/cli/mysql_compressed_rows.php

@@ -158,7 +158,7 @@ if (!empty($options['info'])) {
     }
 
     foreach ($fixtables as $table) {
-        $DB->change_database_structure("ALTER TABLE `{$prefix}$table` ROW_FORMAT=Compressed");
+        $DB->change_database_structure("ALTER TABLE {$prefix}$table ROW_FORMAT=Compressed");
         echo str_pad($prefix . $table, 32, ' ', STR_PAD_RIGHT) . " ... Compressed\n";
     }
 
@@ -189,7 +189,7 @@ if (!empty($options['info'])) {
     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 "ALTER TABLE {$prefix}$table ROW_FORMAT=Compressed;\n";
     }
     echo "\n";
     exit(0);

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>
@@ -28,16 +26,7 @@ define('CLI_SCRIPT', true);
 require(__DIR__.'/../../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

@@ -94,7 +94,7 @@ if ($options['password'] == '' ) {
 
 $errmsg = '';//prevent eclipse warning
 if (!$options['ignore-password-policy'] ) {
-    if (!check_password_policy($password, $errmsg, $user)) {
+    if (!check_password_policy($password, $errmsg)) {
         cli_error(html_to_text($errmsg, 0));
     }
 }

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/svgtool.php

@@ -38,17 +38,17 @@ if ($unrecognized) {
 }
 
 // If necessary add files that should be ignored - such as in 3rd party plugins.
-$ignorelist = array();
+$blacklist = array();
 $path = $options['path'];
 if (!file_exists($path)) {
     cli_error("Invalid path $path");
 }
 
 if ($options['ie9fix']) {
-    core_admin_recurse_svgs($path, '', 'core_admin_svgtool_ie9fix', $ignorelist);
+    core_admin_recurse_svgs($path, '', 'core_admin_svgtool_ie9fix', $blacklist);
 
 } else if ($options['noaspectratio']) {
-    core_admin_recurse_svgs($path, '', 'core_admin_svgtool_noaspectratio', $ignorelist);
+    core_admin_recurse_svgs($path, '', 'core_admin_svgtool_noaspectratio', $blacklist);
 
 } else {
     $help =
@@ -153,9 +153,9 @@ function core_admin_svgtool_noaspectratio($file) {
  * @param string $base
  * @param string $sub
  * @param string $filecallback
- * @param array $ignorelist List of files to be ignored and skipped.
+ * @param array $blacklist
  */
-function core_admin_recurse_svgs($base, $sub, $filecallback, $ignorelist) {
+function core_admin_recurse_svgs($base, $sub, $filecallback, $blacklist) {
     if (is_dir("$base/$sub")) {
         $items = new DirectoryIterator("$base/$sub");
         foreach ($items as $item) {
@@ -163,7 +163,7 @@ function core_admin_recurse_svgs($base, $sub, $filecallback, $ignorelist) {
                 continue;
             }
             $file = $item->getFilename();
-            core_admin_recurse_svgs("$base/$sub", $file, $filecallback, $ignorelist);
+            core_admin_recurse_svgs("$base/$sub", $file, $filecallback, $blacklist);
         }
         unset($item);
         unset($items);
@@ -174,7 +174,7 @@ function core_admin_recurse_svgs($base, $sub, $filecallback, $ignorelist) {
             return;
         }
         $file = realpath("$base/$sub");
-        if (in_array($file, $ignorelist)) {
+        if (in_array($file, $blacklist)) {
             return;
         }
         $filecallback($file);

admin/cli/uninstall_plugins.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 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.
-
-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,
-], [
-    '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);
-}
-
-$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

@@ -51,9 +51,7 @@ list($options, $unrecognized) = cli_get_params(
         'non-interactive'   => false,
         'allow-unstable'    => false,
         'help'              => false,
-        'lang'              => $lang,
-        'verbose-settings'  => false,
-        'is-pending'        => false,
+        'lang'              => $lang
     ),
     array(
         'h' => 'help'
@@ -86,11 +84,6 @@ Options:
                       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 +112,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) {
@@ -137,16 +126,15 @@ if (!$envstatus) {
 
 // Test plugin dependencies.
 $failed = array();
-if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed, $CFG->branch)) {
+if (!core_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;
 }
 
@@ -195,30 +183,9 @@ upgrade_noncore(true);
 // log in as admin - we need doanything permission when applying defaults
 \core\session\manager::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,84 +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()) {
-            set_config('disabled', 1, 'contentbank_'. $name);
-        }
-        break;
-    case 'enable':
-        if (!$plugins[$name]->is_enabled()) {
-            unset_config('disabled', 'contentbank_'. $name);
-        }
-        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));
-        }
-        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));
-        }
-        break;
-}
-core_plugin_manager::reset_caches();
-$cache = cache::make('core', 'contentbank_enabled_extensions');
-$cache->purge();
-$cache = cache::make('core', 'contentbank_context_extensions');
-$cache->purge();
-
-redirect($return);

admin/courseformats.php

@@ -32,7 +32,8 @@ $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'));

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()) {
-            set_config('disabled', 1, 'customfield_'. $customfieldname);
-            core_plugin_manager::reset_caches();
-        }
-        break;
-    case 'enable':
-        if (!$customfieldplugins[$customfieldname]->is_enabled()) {
-            unset_config('disabled', 'customfield_'. $customfieldname);
-            core_plugin_manager::reset_caches();
-        }
-        break;
-}
-redirect($return);

admin/dataformats.php

@@ -33,7 +33,8 @@ $syscontext = context_system::instance();
 $PAGE->set_url('/admin/dataformats.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' => 'managedataformats'));

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";
 

admin/enrol.php

@@ -35,7 +35,8 @@ $confirm = optional_param('confirm', 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);

admin/filters.php

@@ -28,6 +28,10 @@ require_once($CFG->libdir . '/adminlib.php');
 $action = optional_param('action', '', PARAM_ALPHA);
 $filterpath = optional_param('filterpath', '', PARAM_PLUGIN);
 
+require_login();
+$systemcontext = context_system::instance();
+require_capability('moodle/site:config', $systemcontext);
+
 admin_externalpage_setup('managefilters');
 
 // Clean up bogus filter states first.

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.6.5') < 0) {
+    $phpversion = phpversion();
+    // do NOT localise - lang strings would not work here and we CAN NOT move it to later place
+    echo "Moodle 3.2 or later requires at least PHP 5.6.5 (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')) {
@@ -226,7 +231,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);
@@ -235,13 +240,13 @@ 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 (!core_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);
@@ -358,9 +363,9 @@ if (!$cache and $version > $CFG->version) {  // upgrade
         echo $output->upgrade_confirm_page($a->newversion, $maturity, $testsite);
         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);
@@ -368,7 +373,7 @@ if (!$cache and $version > $CFG->version) {  // upgrade
         $PAGE->set_heading($strcurrentrelease);
         $PAGE->set_cacheable(false);
 
-        echo $output->upgrade_environment_page($release, $envstatus, $environmentresults);
+        echo $output->upgrade_environment_page($release, $envstatus, $environment_results);
         die();
 
     } else if (empty($confirmplugins)) {
@@ -508,9 +513,8 @@ if (!$cache and $version > $CFG->version) {  // upgrade
     } else {
         // Always verify plugin dependencies!
         $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 (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
+            echo $output->unsatisfied_dependencies_page($version, $failed, $PAGE->url);
             die();
         }
         unset($failed);
@@ -534,10 +538,7 @@ if (!$cache and $branch <> $CFG->branch) {  // Update the branch
 
 if (!$cache and moodle_needs_upgrading()) {
 
-    $PAGE->set_url(new moodle_url($PAGE->url, array(
-        'confirmrelease' => $confirmrelease,
-        'confirmplugincheck' => $confirmplugins,
-    )));
+    $PAGE->set_url(new moodle_url($PAGE->url, array('confirmplugincheck' => $confirmplugins)));
 
     check_upgrade_key($upgradekeyhash);
 
@@ -547,21 +548,7 @@ if (!$cache and moodle_needs_upgrading()) {
         $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->navbar->add($strplugincheck);
@@ -700,10 +687,9 @@ if (!$cache and moodle_needs_upgrading()) {
 
         // Make sure plugin dependencies are always checked.
         $failed = array();
-        if (!$pluginman->all_plugins_ok($version, $failed, $CFG->branch)) {
+        if (!$pluginman->all_plugins_ok($version, $failed)) {
             $output = $PAGE->get_renderer('core', 'admin');
-            echo $output->unsatisfied_dependencies_page($version, $failed, new moodle_url($PAGE->url,
-                array('confirmplugincheck' => 0)));
+            echo $output->unsatisfied_dependencies_page($version, $failed, $PAGE->url);
             die();
         }
         unset($failed);
@@ -718,7 +704,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.
     // we need this redirect to setup proper session
     upgrade_finished("index.php?sessionstarted=1&amp;lang=$CFG->lang");
 }
@@ -821,7 +806,7 @@ $SESSION->admin_critical_warning = ($insecuredataroot==INSECURE_DATAROOT_ERROR);
 $adminroot = admin_get_root();
 
 // 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');
 }
 
@@ -834,20 +819,14 @@ if (isset($SESSION->pluginuninstallreturn)) {
     }
 }
 
-// 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');
+// We make the assumption that at least one schedule task should run once per day.
+$lastcron = $DB->get_field_sql('SELECT MAX(lastruntime) FROM {task_scheduled}');
 $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);
 
@@ -883,29 +862,19 @@ if ($updateschecker->enabled()) {
 
 $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();
+$registered = $DB->count_records('registration_hubs', array('huburl' => HUB_MOODLEORGHUBURL, 'confirmed' => 1));
 // 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'))) {
+if (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);
 
 admin_externalpage_setup('adminnotifications');
 
@@ -913,6 +882,4 @@ $output = $PAGE->get_renderer('core', 'admin');
 
 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);
+                                       $registered, $cachewarnings, $eventshandlers, $themedesignermode, $devlibdir);

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/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/media.php

@@ -35,7 +35,8 @@ $confirm = optional_param('confirm', 0, PARAM_BOOL);
 $PAGE->set_url('/admin/media.php');
 $PAGE->set_context(context_system::instance());
 
-require_admin();
+require_login();
+require_capability('moodle/site:config', context_system::instance());
 require_sesskey();
 
 $plugins = core_plugin_manager::instance()->get_plugins_of_type('media');

admin/message.php

@@ -25,121 +25,50 @@ require_once(__DIR__ . '/../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);
 
-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';
-        $providerdisabled = false;
-        if (!isset($form->$disableprovidersetting)) {
-            $providerdisabled = true;
-            $newpreferences[$disableprovidersetting] = 1;
-        } else {
-            $newpreferences[$disableprovidersetting] = 0;
-        }
+$headingtitle = get_string('managemessageoutputs', 'message');
 
-        foreach (array('permitted', 'loggedin', 'loggedoff') as $setting) {
-            $value = null;
-            $componentprovidersetting = $componentproviderbase.'_'.$setting;
-            if ($setting == 'permitted') {
-                // If we deal with permitted select element, we need to create individual
-                // setting for each possible processor. Note that this block will
-                // always be processed first after entring parental foreach iteration
-                // so we can change form values on this stage.
-                foreach ($processors as $processor) {
-                    $value = '';
-                    if (isset($form->{$componentprovidersetting}[$processor->name])) {
-                        $value = $form->{$componentprovidersetting}[$processor->name];
-                    }
-                    // Ensure that loggedin loggedoff options are set correctly for this permission.
-                    if (($value == 'disallowed') || $providerdisabled) {
-                        // It might be better to unset them, but I can't figure out why that cause error.
-                        $form->{$componentproviderbase.'_loggedin'}[$processor->name] = 0;
-                        $form->{$componentproviderbase.'_loggedoff'}[$processor->name] = 0;
-                    } else if ($value == 'forced') {
-                        $form->{$componentproviderbase.'_loggedin'}[$processor->name] = 1;
-                        $form->{$componentproviderbase.'_loggedoff'}[$processor->name] = 1;
-                    }
-                    // Record the site preference.
-                    $newpreferences[$processor->name.'_provider_'.$componentprovidersetting] = $value;
-                }
-            } else {
-                $newsettings = array();
-                if (property_exists($form, $componentprovidersetting)) {
-                    // We must be processing loggedin or loggedoff checkboxes.
-                    // Store defained comma-separated processors as setting value.
-                    // Using array_filter eliminates elements set to 0 above.
-                    $newsettings = array_keys(array_filter($form->{$componentprovidersetting}));
-                }
-
-                // 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;
-                }
-            }
-            if ($setting != 'permitted') {
-                // We have already recoded site preferences for 'permitted' type.
-                $newpreferences['message_provider_'.$componentprovidersetting] = $value;
-            }
-        }
+if (!empty($disable) && confirm_sesskey()) {
+    if (!$processor = $DB->get_record('message_processors', array('id'=>$disable))) {
+        print_error('outputdoesnotexist', 'message');
     }
-
-    // Update database.
-    $transaction = $DB->start_delegated_transaction();
-
-    // Save processors enabled/disabled status.
-    foreach ($allprocessors as $processor) {
-        $enabled = isset($form->{$processor->name});
-        \core_message\api::update_processor_status($processor, $enabled);
-    }
-
-    foreach ($newpreferences as $name => $value) {
-        set_config($name, $value, 'message');
-    }
-    $transaction->allow_commit();
-
+    \core_message\api::update_processor_status($processor, 0);     // Disable output.
     core_plugin_manager::reset_caches();
+}
 
+if (!empty($enable) && confirm_sesskey()) {
+    if (!$processor = $DB->get_record('message_processors', array('id'=>$enable))) {
+        print_error('outputdoesnotexist', 'message');
+    }
+    \core_message\api::update_processor_status($processor, 1);      // Enable output.
+    core_plugin_manager::reset_caches();
+}
+
+if ($disable || $enable) {
     $url = new moodle_url('message.php');
     redirect($url);
 }
-
 // Page settings
 $PAGE->set_context(context_system::instance());
-$PAGE->requires->js_init_call('M.core_message.init_defaultoutputs');
 
+// 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->heading($headingtitle);
+echo $messageoutputs;
 echo $OUTPUT->footer();

admin/mnet/access_control.php

@@ -12,6 +12,8 @@ $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');
 
 if (!extension_loaded('openssl')) {

admin/mnet/delete.php

@@ -34,6 +34,11 @@ $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');

admin/mnet/index.php

@@ -6,10 +6,12 @@
     require_once($CFG->libdir.'/adminlib.php');
     include_once($CFG->dirroot.'/mnet/lib.php');
 
+    require_login();
     admin_externalpage_setup('net');
 
     $context = context_system::instance();
 
+    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 
     $site = get_site();
     $mnet = get_mnet_environment();

admin/mnet/peer_forms.php

@@ -156,7 +156,7 @@ class mnet_review_host_form extends moodleform {
         if ($mnet_peer && !empty($mnet_peer->deleted)) {
             $radioarray = array();
             $radioarray[] = $mform->createElement('static', 'deletedinfo', '',
-                $OUTPUT->container(get_string('deletedhostinfo', 'mnet'), 'alert alert-warning'));
+                $OUTPUT->container(get_string('deletedhostinfo', 'mnet'), 'deletedhostinfo'));
             $radioarray[] = $mform->createElement('radio', 'deleted', '', get_string('yes'), 1);
             $radioarray[] = $mform->createElement('radio', 'deleted', '', get_string('no'), 0);
             $mform->addGroup($radioarray, 'radioar', get_string('deleted'), array(' ', ' '), false);

admin/mnet/peers.php

@@ -32,6 +32,10 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->dirroot.'/mnet/lib.php');
 require_once($CFG->dirroot.'/'.$CFG->admin.'/mnet/peer_forms.php');
 
+require_login();
+
+$context = context_system::instance();
+require_capability('moodle/site:config', $context, $USER->id, true, 'nopermissions');
 
 /// Initialize variables.
 $hostid = optional_param('hostid', 0, PARAM_INT);

admin/mnet/profilefields.php

@@ -29,10 +29,14 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->dirroot . '/' . $CFG->admin .'/mnet/profilefields_form.php');
 $mnet = get_mnet_environment();
 
+require_login();
 $hostid = required_param('hostid', PARAM_INT);
 $mnet_peer = new mnet_peer();
 $mnet_peer->set_id($hostid);
 
+$context = context_system::instance();
+
+require_capability('moodle/site:config', $context, $USER->id, true, 'nopermissions');
 admin_externalpage_setup('mnetpeers');
 $form = new mnet_profile_form(null, array('hostid' => $hostid));
 

admin/mnet/services.php

@@ -30,8 +30,11 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->dirroot . '/' . $CFG->admin . '/mnet/services_form.php');
 $mnet = get_mnet_environment();
 
+require_login();
 admin_externalpage_setup('mnetpeers');
 
+$context = context_system::instance();
+require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 
 $hostid = required_param('hostid', PARAM_INT);
 

admin/mnet/testclient.php

@@ -21,8 +21,12 @@ if ($CFG->mnet_dispatcher_mode === 'off') {
     print_error('mnetdisabled', 'mnet');
 }
 
+require_login();
 admin_externalpage_setup('mnettestclient');
 
+$context = context_system::instance();
+require_capability('moodle/site:config', $context);
+
 error_reporting(DEBUG_ALL);
 
 echo $OUTPUT->header();

admin/mnet/trustedhosts.php

@@ -5,8 +5,12 @@
     require_once($CFG->libdir.'/adminlib.php');
     include_once($CFG->dirroot.'/mnet/lib.php');
 
+    require_login();
     admin_externalpage_setup('trustedhosts');
 
+    $context = context_system::instance();
+
+    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");
 
     if (!extension_loaded('openssl')) {
         echo $OUTPUT->header();

admin/modules.php

@@ -49,7 +49,6 @@
                 array($module->id));
         core_plugin_manager::reset_caches();
         admin_get_root(true, false);  // settings not required - only pages
-        redirect(new moodle_url('/admin/modules.php'));
     }
 
     if (!empty($show) and confirm_sesskey()) {
@@ -67,7 +66,6 @@
                 array($module->id));
         core_plugin_manager::reset_caches();
         admin_get_root(true, false);  // settings not required - only pages
-        redirect(new moodle_url('/admin/modules.php'));
     }
 
     echo $OUTPUT->header();
@@ -89,13 +87,9 @@
     $table->set_attribute('class', 'admintable generaltable');
     $table->setup();
 
-    $pluginmanager = core_plugin_manager::instance();
-
     foreach ($modules as $module) {
-        $plugininfo = $pluginmanager->get_plugin_info('mod_'.$module->name);
-        $status = $plugininfo->get_status();
 
-        if ($status === core_plugin_manager::PLUGIN_STATUS_MISSING) {
+        if (!file_exists("$CFG->dirroot/mod/$module->name/lib.php")) {
             $strmodulename = '<span class="notifyproblem">'.$module->name.' ('.get_string('missingfromdisk').')</span>';
             $missing = true;
         } else {
@@ -123,8 +117,8 @@
             $count = -1;
         }
         if ($count>0) {
-            $countlink = $OUTPUT->action_link(new moodle_url('/course/search.php', ['modulelist' => $module->name]),
-                $count, null, ['title' => $strshowmodulecourse]);
+            $countlink = "<a href=\"{$CFG->wwwroot}/course/search.php?modulelist=$module->name" .
+                "&amp;sesskey=".sesskey()."\" title=\"$strshowmodulecourse\">$count</a>";
         } else if ($count < 0) {
             $countlink = get_string('error');
         } else {

admin/plugins.php

@@ -43,8 +43,9 @@ $confirminstallupdate = optional_param('confirminstallupdate', false, PARAM_BOOL
 // NOTE: do not use admin_externalpage_setup() here because it loads
 //       full admin tree which is not possible during uninstallation.
 
-require_admin();
+require_login();
 $syscontext = context_system::instance();
+require_capability('moodle/site:config', $syscontext);
 
 // URL params we want to maintain on redirects.
 $pageparams = array('updatesonly' => $updatesonly, 'contribonly' => $contribonly);
@@ -53,6 +54,7 @@ $pageurl = new moodle_url('/admin/plugins.php', $pageparams);
 $pluginman = core_plugin_manager::instance();
 
 if ($uninstall) {
+    require_sesskey();
 
     if (!$confirmed) {
         admin_externalpage_setup('pluginsoverview', '', $pageparams);
@@ -91,7 +93,6 @@ if ($uninstall) {
         exit();
 
     } else {
-        require_sesskey();
         $SESSION->pluginuninstallreturn = $pluginfo->get_return_url_after_uninstall($return);
         $progress = new progress_trace_buffer(new text_progress_trace(), false);
         $pluginman->uninstall_plugin($pluginfo->component, $progress);

admin/portfolio.php

@@ -35,6 +35,8 @@ if ($action == 'newon') {
 
 admin_externalpage_setup($pagename);
 
+require_capability('moodle/site:config', context_system::instance());
+
 $baseurl    = "$CFG->wwwroot/$CFG->admin/portfolio.php";
 $sesskeyurl = "$CFG->wwwroot/$CFG->admin/portfolio.php?sesskey=" . sesskey();
 $configstr  = get_string('manageportfolios', 'portfolio');

admin/purgecaches.php

@@ -27,43 +27,37 @@ require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 
 $confirm = optional_param('confirm', 0, PARAM_BOOL);
-$returnurl = optional_param('returnurl', '/admin/purgecaches.php', PARAM_LOCALURL);
-$returnurl = new moodle_url($returnurl);
-
-admin_externalpage_setup('purgecaches');
-
-$form = new core_admin\form\purge_caches(null, ['returnurl' => $returnurl]);
+$returnurl = optional_param('returnurl', null, PARAM_LOCALURL);
 
 // If we have got here as a confirmed aciton, do it.
-if ($data = $form->get_data()) {
+if ($confirm && isloggedin() && confirm_sesskey()) {
+    require_capability('moodle/site:config', context_system::instance());
 
     // Valid request. Purge, and redirect the user back to where they came from.
-    $selected = $data->purgeselectedoptions;
-    purge_caches($selected);
+    purge_all_caches();
 
-    if (isset($data->all)) {
-        $message = get_string('purgecachesfinished', 'admin');
+    if ($returnurl) {
+        $returnurl = $CFG->wwwroot . $returnurl;
     } else {
-        $message = get_string('purgeselectedcachesfinished', 'admin');
+        $returnurl = new moodle_url('/admin/purgecaches.php');
     }
-
-} else if ($confirm && confirm_sesskey()) {
-    purge_caches();
-    $message = get_string('purgecachesfinished', 'admin');
+    redirect($returnurl, get_string('purgecachesfinished', 'admin'));
 }
 
-if (isset($message)) {
-    redirect($returnurl, $message);
-}
+// Otherwise, show a button to actually purge the caches.
+admin_externalpage_setup('purgecaches');
 
-// Otherwise, show a form to actually purge the caches.
+$actionurl = new moodle_url('/admin/purgecaches.php', array('sesskey'=>sesskey(), 'confirm'=>1));
+if ($returnurl) {
+    $actionurl->param('returnurl', $returnurl);
+}
 
 echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('purgecachespage', 'admin'));
+echo $OUTPUT->heading(get_string('purgecaches', 'admin'));
 
 echo $OUTPUT->box_start('generalbox', 'notice');
 echo html_writer::tag('p', get_string('purgecachesconfirm', 'admin'));
-echo $form->render();
+echo $OUTPUT->single_button($actionurl, get_string('purgecaches', 'admin'), 'post');
 echo $OUTPUT->box_end();
 
 echo $OUTPUT->footer();

admin/qbehaviours.php

@@ -31,7 +31,7 @@ require_once($CFG->libdir . '/adminlib.php');
 require_once($CFG->libdir . '/tablelib.php');
 
 // Check permissions.
-require_login(null, false);
+require_login();
 $systemcontext = context_system::instance();
 require_capability('moodle/question:config', $systemcontext);
 
@@ -170,7 +170,7 @@ foreach ($sortedbehaviours as $behaviour => $behaviourname) {
     if ($version) {
         $row[] = $version;
     } else {
-        $row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'text-muted'));
+        $row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'disabled'));
     }
 
     // Other question types required by this one.

admin/qtypes.php

@@ -30,12 +30,13 @@ require_once($CFG->libdir . '/questionlib.php');
 require_once($CFG->libdir . '/adminlib.php');
 require_once($CFG->libdir . '/tablelib.php');
 
-admin_externalpage_setup('manageqtypes');
-
+// Check permissions.
+require_login();
 $systemcontext = context_system::instance();
 require_capability('moodle/question:config', $systemcontext);
 $canviewreports = has_capability('report/questioninstances:view', $systemcontext);
 
+admin_externalpage_setup('manageqtypes');
 $thispageurl = new moodle_url('/admin/qtypes.php');
 
 $qtypes = question_bank::get_all_qtypes();
@@ -172,7 +173,7 @@ foreach ($sortedqtypes as $qtypename => $localname) {
     if ($version) {
         $row[] = $version;
     } else {
-        $row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'text-muted'));
+        $row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'disabled'));
     }
 
     // Other question types required by this one.

admin/registration/confirmregistration.php

@@ -20,7 +20,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-/**
+/*
  * @package    moodle
  * @subpackage registration
  * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
@@ -36,6 +36,7 @@
 
 require('../../config.php');
 require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
 
 $newtoken = optional_param('newtoken', '', PARAM_ALPHANUM);
 $url = optional_param('url', '', PARAM_URL);
@@ -43,19 +44,7 @@ $hubname = optional_param('hubname', '', PARAM_TEXT);
 $token = optional_param('token', '', PARAM_TEXT);
 $error = optional_param('error', '', PARAM_ALPHANUM);
 
-admin_externalpage_setup('registrationmoodleorg');
-
-if (parse_url($url, PHP_URL_HOST) !== parse_url(HUB_MOODLEORGHUBURL, PHP_URL_HOST)) {
-    // Allow other plugins to confirm registration on custom hubs. Plugins implementing this
-    // callback need to redirect or exit. See https://docs.moodle.org/en/Hub_registration .
-    $callbacks = get_plugins_with_function('hub_registration');
-    foreach ($callbacks as $plugintype => $plugins) {
-        foreach ($plugins as $plugin => $callback) {
-            $callback('confirm');
-        }
-    }
-    throw new moodle_exception('errorotherhubsnotsupported', 'hub');
-}
+admin_externalpage_setup('registrationhubs');
 
 if (!empty($error) and $error == 'urlalreadyexist') {
     throw new moodle_exception('urlalreadyregistered', 'hub',
@@ -63,22 +52,38 @@ if (!empty($error) and $error == 'urlalreadyexist') {
 }
 
 //check that we are waiting a confirmation from this hub, and check that the token is correct
-core\hub\registration::confirm_registration($token, $newtoken, $hubname);
+$registrationmanager = new registration_manager();
+$registeredhub = $registrationmanager->get_unconfirmedhub($url);
+if (!empty($registeredhub) and $registeredhub->token == $token) {
 
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('registrationconfirmed', 'hub'), 3, 'main');
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('registrationconfirmed', 'hub'), 3, 'main');
 
-// Display notification message.
-echo $OUTPUT->notification(get_string('registrationconfirmedon', 'hub'), 'notifysuccess');
+    $registeredhub->token = $newtoken;
+    $registeredhub->confirmed = 1;
+    $registeredhub->hubname = $hubname;
+    $registrationmanager->update_registeredhub($registeredhub);
 
-// Display continue button.
-$returnurl = !empty($SESSION->registrationredirect) ? clean_param($SESSION->registrationredirect, PARAM_LOCALURL) : null;
-unset($SESSION->registrationredirect);
-$continueurl = new moodle_url($returnurl ?: '/admin/registration/index.php');
-$continuebutton = $OUTPUT->render(new single_button($continueurl, get_string('continue')));
-$continuebutton = html_writer::tag('div', $continuebutton, array('class' => 'mdl-align'));
-echo $continuebutton;
+    // Display notification message.
+    echo $OUTPUT->notification(get_string('registrationconfirmedon', 'hub'), 'notifysuccess');
 
-echo $OUTPUT->footer();
+    //display continue button
+    $registrationpage = new moodle_url('/admin/registration/index.php');
+    $continuebutton = $OUTPUT->render(new single_button($registrationpage, get_string('continue', 'hub')));
+    $continuebutton = html_writer::tag('div', $continuebutton, array('class' => 'mdl-align'));
+    echo $continuebutton;
+
+    if (!extension_loaded('xmlrpc')) {
+        //display notice about xmlrpc
+        $xmlrpcnotification = $OUTPUT->doc_link('admin/environment/php_extension/xmlrpc', '');
+        $xmlrpcnotification .= get_string('xmlrpcdisabledregistration', 'hub');
+        echo $OUTPUT->notification($xmlrpcnotification);
+    }
+
+    echo $OUTPUT->footer();
+} else {
+    throw new moodle_exception('wrongtoken', 'hub',
+            $CFG->wwwroot . '/' . $CFG->admin . '/registration/index.php');
+}
 
 

admin/registration/forms.php

@@ -20,7 +20,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-/**
+/*
  * @package    moodle
  * @subpackage registration
  * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
@@ -30,6 +30,490 @@
  * The forms needed by registration pages.
  */
 
-defined('MOODLE_INTERNAL') || die();
 
-debugging('Support for alternative hubs has been removed from Moodle in 3.4.', DEBUG_DEVELOPER);
+require_once($CFG->libdir . '/formslib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
+
+/**
+ * This form display a unregistration form.
+ */
+class site_unregistration_form extends moodleform {
+
+    public function definition() {
+        $mform = & $this->_form;
+        $mform->addElement('header', 'site', get_string('unregister', 'hub'));
+
+        $huburl = $this->_customdata['huburl'];
+        $hubname = $this->_customdata['hubname'];
+
+        $unregisterlabel = get_string('unregister', 'hub');
+        $mform->addElement('checkbox', 'unpublishalladvertisedcourses', '',
+                ' ' . get_string('unpublishalladvertisedcourses', 'hub'));
+        $mform->setType('unpublishalladvertisedcourses', PARAM_INT);
+        $mform->addElement('checkbox', 'unpublishalluploadedcourses', '',
+                ' ' . get_string('unpublishalluploadedcourses', 'hub'));
+        $mform->setType('unpublishalluploadedcourses', PARAM_INT);
+
+        $mform->addElement('hidden', 'confirm', 1);
+        $mform->setType('confirm', PARAM_INT);
+        $mform->addElement('hidden', 'unregistration', 1);
+        $mform->setType('unregistration', PARAM_INT);
+        $mform->addElement('hidden', 'huburl', $huburl);
+        $mform->setType('huburl', PARAM_URL);
+        $mform->addElement('hidden', 'hubname', $hubname);
+        $mform->setType('hubname', PARAM_TEXT);
+
+        $this->add_action_buttons(true, $unregisterlabel);
+    }
+
+}
+
+/**
+ * This form display a clean registration data form.
+ */
+class site_clean_registration_data_form extends moodleform {
+
+    public function definition() {
+        $mform = & $this->_form;
+        $mform->addElement('header', 'site', get_string('unregister', 'hub'));
+
+        $huburl = $this->_customdata['huburl'];
+        $hubname = $this->_customdata['hubname'];
+
+
+        $unregisterlabel = get_string('forceunregister', 'hub');
+        $mform->addElement('static', '', get_string('warning', 'hub'), get_string('forceunregisterconfirmation', 'hub', $hubname));
+
+        $mform->addElement('hidden', 'confirm', 1);
+        $mform->setType('confirm', PARAM_INT);
+        $mform->addElement('hidden', 'unregistration', 1);
+        $mform->setType('unregistration', PARAM_INT);
+        $mform->addElement('hidden', 'cleanregdata', 1);
+        $mform->setType('cleanregdata', PARAM_INT);
+        $mform->addElement('hidden', 'huburl', $huburl);
+        $mform->setType('huburl', PARAM_URL);
+        $mform->addElement('hidden', 'hubname', $hubname);
+        $mform->setType('hubname', PARAM_TEXT);
+
+        $this->add_action_buttons(true, $unregisterlabel);
+    }
+
+}
+
+/**
+ * This form display a hub selector.
+ * The hub list is retrieved from Moodle.org hub directory.
+ * Also displayed, a text field to enter private hub url + its password
+ */
+class hub_selector_form extends moodleform {
+
+    public function definition() {
+        global $CFG, $OUTPUT;
+        $mform = & $this->_form;
+        $mform->addElement('header', 'site', get_string('selecthub', 'hub'));
+
+        //retrieve the hub list on the hub directory by web service
+        $function = 'hubdirectory_get_hubs';
+        $params = array();
+        $serverurl = HUB_HUBDIRECTORYURL . "/local/hubdirectory/webservice/webservices.php";
+        require_once($CFG->dirroot . "/webservice/xmlrpc/lib.php");
+        $xmlrpcclient = new webservice_xmlrpc_client($serverurl, 'publichubdirectory');
+        try {
+            $hubs = $xmlrpcclient->call($function, $params);
+        } catch (Exception $e) {
+            $error = $OUTPUT->notification(get_string('errorhublisting', 'hub', $e->getMessage()));
+            $mform->addElement('static', 'errorhub', '', $error);
+            $hubs = array();
+        }
+
+        //remove moodle.org from the hub list
+        foreach ($hubs as $key => $hub) {
+            if ($hub['url'] == HUB_MOODLEORGHUBURL || $hub['url'] == HUB_OLDMOODLEORGHUBURL) {
+                unset($hubs[$key]);
+            }
+        }
+
+        //Public hub list
+        $options = array();
+        foreach ($hubs as $hub) {
+            //to not display a name longer than 100 character (too big)
+            if (core_text::strlen($hub['name']) > 100) {
+                $hubname = core_text::substr($hub['name'], 0, 100);
+                $hubname = $hubname . "...";
+            } else {
+                $hubname = $hub['name'];
+            }
+            $options[$hub['url']] = $hubname;
+            $mform->addElement('hidden', clean_param($hub['url'], PARAM_ALPHANUMEXT), $hubname);
+            $mform->setType(clean_param($hub['url'], PARAM_ALPHANUMEXT), PARAM_ALPHANUMEXT);
+        }
+        if (!empty($hubs)) {
+            $mform->addElement('select', 'publichub', get_string('publichub', 'hub'),
+                    $options, array("size" => 15));
+            $mform->setType('publichub', PARAM_URL);
+        }
+
+        $mform->addElement('static', 'or', '', get_string('orenterprivatehub', 'hub'));
+
+        //Private hub
+        $mform->addElement('text', 'unlistedurl', get_string('privatehuburl', 'hub'),
+                array('class' => 'registration_textfield'));
+        $mform->setType('unlistedurl', PARAM_URL);
+        $mform->addElement('text', 'password', get_string('password'),
+                array('class' => 'registration_textfield'));
+        $mform->setType('password', PARAM_RAW);
+
+        $this->add_action_buttons(false, get_string('selecthub', 'hub'));
+    }
+
+    /**
+     * Check the unlisted URL is a URL
+     */
+    function validation($data, $files) {
+        global $CFG;
+        $errors = parent::validation($data, $files);
+
+        $unlistedurl = $this->_form->_submitValues['unlistedurl'];
+
+        if (empty($unlistedurl)) {
+            $errors['unlistedurl'] = get_string('badurlformat', 'hub');
+        }
+
+        return $errors;
+    }
+
+}
+
+/**
+ * The site registration form. Information will be sent to a given hub.
+ */
+class site_registration_form extends moodleform {
+
+    public function definition() {
+        global $CFG, $DB;
+
+        $strrequired = get_string('required');
+        $mform = & $this->_form;
+        $huburl = $this->_customdata['huburl'];
+        $hubname = $this->_customdata['hubname'];
+        $password = $this->_customdata['password'];
+        $admin = get_admin();
+        $site = get_site();
+
+        //retrieve config for this hub and set default if they don't exist
+        $cleanhuburl = clean_param($huburl, PARAM_ALPHANUMEXT);
+        $sitename = get_config('hub', 'site_name_' . $cleanhuburl);
+        if ($sitename === false) {
+            $sitename = format_string($site->fullname, true, array('context' => context_course::instance(SITEID)));
+        }
+        $sitedescription = get_config('hub', 'site_description_' . $cleanhuburl);
+        if ($sitedescription === false) {
+            $sitedescription = $site->summary;
+        }
+        $contactname = get_config('hub', 'site_contactname_' . $cleanhuburl);
+        if ($contactname === false) {
+            $contactname = fullname($admin, true);
+        }
+        $contactemail = get_config('hub', 'site_contactemail_' . $cleanhuburl);
+        if ($contactemail === false) {
+            $contactemail = $admin->email;
+        }
+        $contactphone = get_config('hub', 'site_contactphone_' . $cleanhuburl);
+        if ($contactphone === false) {
+            $contactphone = $admin->phone1;
+        }
+        $imageurl = get_config('hub', 'site_imageurl_' . $cleanhuburl);
+        $privacy = get_config('hub', 'site_privacy_' . $cleanhuburl);
+        $address = get_config('hub', 'site_address_' . $cleanhuburl);
+        if ($address === false) {
+            $address = '';
+        }
+        $region = get_config('hub', 'site_region_' . $cleanhuburl);
+        $country = get_config('hub', 'site_country_' . $cleanhuburl);
+        if (empty($country)) {
+            $country = $admin->country ?: $CFG->country;
+        }
+        $language = get_config('hub', 'site_language_' . $cleanhuburl);
+        if ($language === false) {
+            $language = explode('_', current_language())[0];
+        }
+        $geolocation = get_config('hub', 'site_geolocation_' . $cleanhuburl);
+        if ($geolocation === false) {
+            $geolocation = '';
+        }
+        $contactable = get_config('hub', 'site_contactable_' . $cleanhuburl);
+        $emailalert = get_config('hub', 'site_emailalert_' . $cleanhuburl);
+        $emailalert = ($emailalert === false || $emailalert) ? 1 : 0;
+        $coursesnumber = get_config('hub', 'site_coursesnumber_' . $cleanhuburl);
+        $usersnumber = get_config('hub', 'site_usersnumber_' . $cleanhuburl);
+        $roleassignmentsnumber = get_config('hub', 'site_roleassignmentsnumber_' . $cleanhuburl);
+        $postsnumber = get_config('hub', 'site_postsnumber_' . $cleanhuburl);
+        $questionsnumber = get_config('hub', 'site_questionsnumber_' . $cleanhuburl);
+        $resourcesnumber = get_config('hub', 'site_resourcesnumber_' . $cleanhuburl);
+        $badgesnumber = get_config('hub', 'site_badges_' . $cleanhuburl);
+        $issuedbadgesnumber = get_config('hub', 'site_issuedbadges_' . $cleanhuburl);
+        $mediancoursesize = get_config('hub', 'site_mediancoursesize_' . $cleanhuburl);
+        $participantnumberaveragecfg = get_config('hub', 'site_participantnumberaverage_' . $cleanhuburl);
+        $modulenumberaveragecfg = get_config('hub', 'site_modulenumberaverage_' . $cleanhuburl);
+
+        //hidden parameters
+        $mform->addElement('hidden', 'huburl', $huburl);
+        $mform->setType('huburl', PARAM_URL);
+        $mform->addElement('hidden', 'hubname', $hubname);
+        $mform->setType('hubname', PARAM_TEXT);
+        $mform->addElement('hidden', 'password', $password);
+        $mform->setType('password', PARAM_RAW);
+
+        //the input parameters
+        $mform->addElement('header', 'moodle', get_string('registrationinfo', 'hub'));
+
+        $mform->addElement('text', 'name', get_string('sitename', 'hub'),
+                array('class' => 'registration_textfield'));
+        $mform->addRule('name', $strrequired, 'required', null, 'client');
+        $mform->setType('name', PARAM_TEXT);
+        $mform->setDefault('name', $sitename);
+        $mform->addHelpButton('name', 'sitename', 'hub');
+
+        $options = array();
+        $registrationmanager = new registration_manager();
+        $options[HUB_SITENOTPUBLISHED] = $registrationmanager->get_site_privacy_string(HUB_SITENOTPUBLISHED);
+        $options[HUB_SITENAMEPUBLISHED] = $registrationmanager->get_site_privacy_string(HUB_SITENAMEPUBLISHED);
+        $options[HUB_SITELINKPUBLISHED] = $registrationmanager->get_site_privacy_string(HUB_SITELINKPUBLISHED);
+        $mform->addElement('select', 'privacy', get_string('siteprivacy', 'hub'), $options);
+        $mform->setDefault('privacy', $privacy);
+        $mform->setType('privacy', PARAM_ALPHA);
+        $mform->addHelpButton('privacy', 'privacy', 'hub');
+        unset($options);
+
+        $mform->addElement('textarea', 'description', get_string('sitedesc', 'hub'),
+                array('rows' => 8, 'cols' => 41));
+        $mform->addRule('description', $strrequired, 'required', null, 'client');
+        $mform->setDefault('description', $sitedescription);
+        $mform->setType('description', PARAM_TEXT);
+        $mform->addHelpButton('description', 'sitedesc', 'hub');
+
+        $languages = get_string_manager()->get_list_of_languages();
+        core_collator::asort($languages);
+        $mform->addElement('select', 'language', get_string('sitelang', 'hub'),
+                $languages);
+        $mform->setType('language', PARAM_ALPHANUMEXT);
+        $mform->addHelpButton('language', 'sitelang', 'hub');
+        $mform->setDefault('language', $language);
+
+        $mform->addElement('textarea', 'address', get_string('postaladdress', 'hub'),
+                array('rows' => 4, 'cols' => 41));
+        $mform->setType('address', PARAM_TEXT);
+        $mform->setDefault('address', $address);
+        $mform->addHelpButton('address', 'postaladdress', 'hub');
+
+        //TODO: use the region array I generated
+//        $mform->addElement('select', 'region', get_string('selectaregion'), array('-' => '-'));
+//        $mform->setDefault('region', $region);
+        $mform->addElement('hidden', 'regioncode', '-');
+        $mform->setType('regioncode', PARAM_ALPHANUMEXT);
+
+        $countries = ['' => ''] + get_string_manager()->get_list_of_countries();
+        $mform->addElement('select', 'countrycode', get_string('sitecountry', 'hub'), $countries);
+        $mform->setDefault('countrycode', $country);
+        $mform->setType('countrycode', PARAM_ALPHANUMEXT);
+        $mform->addHelpButton('countrycode', 'sitecountry', 'hub');
+        $mform->addRule('countrycode', $strrequired, 'required', null, 'client');
+
+        $mform->addElement('text', 'geolocation', get_string('sitegeolocation', 'hub'),
+                array('class' => 'registration_textfield'));
+        $mform->setDefault('geolocation', $geolocation);
+        $mform->setType('geolocation', PARAM_RAW);
+        $mform->addHelpButton('geolocation', 'sitegeolocation', 'hub');
+
+        $mform->addElement('text', 'contactname', get_string('siteadmin', 'hub'),
+                array('class' => 'registration_textfield'));
+        $mform->addRule('contactname', $strrequired, 'required', null, 'client');
+        $mform->setType('contactname', PARAM_TEXT);
+        $mform->setDefault('contactname', $contactname);
+        $mform->addHelpButton('contactname', 'siteadmin', 'hub');
+
+        $mform->addElement('text', 'contactphone', get_string('sitephone', 'hub'),
+                array('class' => 'registration_textfield'));
+        $mform->setType('contactphone', PARAM_TEXT);
+        $mform->setDefault('contactphone', $contactphone);
+        $mform->addHelpButton('contactphone', 'sitephone', 'hub');
+        $mform->setForceLtr('contactphone');
+
+        $mform->addElement('text', 'contactemail', get_string('siteemail', 'hub'),
+                array('class' => 'registration_textfield'));
+        $mform->addRule('contactemail', $strrequired, 'required', null, 'client');
+        $mform->setType('contactemail', PARAM_EMAIL);
+        $mform->setDefault('contactemail', $contactemail);
+        $mform->addHelpButton('contactemail', 'siteemail', 'hub');
+
+        $options = array();
+        $options[0] = get_string("registrationcontactno");
+        $options[1] = get_string("registrationcontactyes");
+        $mform->addElement('select', 'contactable', get_string('siteregistrationcontact', 'hub'), $options);
+        $mform->setDefault('contactable', $contactable);
+        $mform->setType('contactable', PARAM_INT);
+        $mform->addHelpButton('contactable', 'siteregistrationcontact', 'hub');
+        unset($options);
+
+        $options = array();
+        $options[0] = get_string("registrationno");
+        $options[1] = get_string("registrationyes");
+        $mform->addElement('select', 'emailalert', get_string('siteregistrationemail', 'hub'), $options);
+        $mform->setDefault('emailalert', $emailalert);
+        $mform->setType('emailalert', PARAM_INT);
+        $mform->addHelpButton('emailalert', 'siteregistrationemail', 'hub');
+        unset($options);
+
+        //TODO site logo
+        $mform->addElement('hidden', 'imageurl', ''); //TODO: temporary
+        $mform->setType('imageurl', PARAM_URL);
+
+        $mform->addElement('static', 'urlstring', get_string('siteurl', 'hub'), $CFG->wwwroot);
+        $mform->addHelpButton('urlstring', 'siteurl', 'hub');
+
+        $mform->addElement('static', 'versionstring', get_string('siteversion', 'hub'), $CFG->version);
+        $mform->addElement('hidden', 'moodleversion', $CFG->version);
+        $mform->setType('moodleversion', PARAM_INT);
+        $mform->addHelpButton('versionstring', 'siteversion', 'hub');
+
+        $mform->addElement('static', 'releasestring', get_string('siterelease', 'hub'), $CFG->release);
+        $mform->addElement('hidden', 'moodlerelease', $CFG->release);
+        $mform->setType('moodlerelease', PARAM_TEXT);
+        $mform->addHelpButton('releasestring', 'siterelease', 'hub');
+
+        /// Display statistic that are going to be retrieve by the hub
+        $coursecount = $DB->count_records('course') - 1;
+        $usercount = $DB->count_records('user', array('deleted' => 0));
+        $roleassigncount = $DB->count_records('role_assignments');
+        $postcount = $DB->count_records('forum_posts');
+        $questioncount = $DB->count_records('question');
+        $resourcecount = $DB->count_records('resource');
+        require_once($CFG->dirroot . "/course/lib.php");
+        $participantnumberaverage = number_format(average_number_of_participants(), 2);
+        $modulenumberaverage = number_format(average_number_of_courses_modules(), 2);
+        require_once($CFG->libdir . '/badgeslib.php');
+        $badges = $DB->count_records_select('badge', 'status <> ' . BADGE_STATUS_ARCHIVED);
+        $issuedbadges = $DB->count_records('badge_issued');
+
+        if (HUB_MOODLEORGHUBURL != $huburl) {
+            $mform->addElement('checkbox', 'courses', get_string('sendfollowinginfo', 'hub'),
+                    " " . get_string('coursesnumber', 'hub', $coursecount));
+            $mform->setDefault('courses', $coursesnumber != -1);
+            $mform->setType('courses', PARAM_INT);
+            $mform->addHelpButton('courses', 'sendfollowinginfo', 'hub');
+
+            $mform->addElement('checkbox', 'users', '',
+                    " " . get_string('usersnumber', 'hub', $usercount));
+            $mform->setDefault('users', $usersnumber != -1);
+            $mform->setType('users', PARAM_INT);
+
+            $mform->addElement('checkbox', 'roleassignments', '',
+                    " " . get_string('roleassignmentsnumber', 'hub', $roleassigncount));
+            $mform->setDefault('roleassignments', $roleassignmentsnumber != -1);
+            $mform->setType('roleassignments', PARAM_INT);
+
+            $mform->addElement('checkbox', 'posts', '',
+                    " " . get_string('postsnumber', 'hub', $postcount));
+            $mform->setDefault('posts', $postsnumber != -1);
+            $mform->setType('posts', PARAM_INT);
+
+            $mform->addElement('checkbox', 'questions', '',
+                    " " . get_string('questionsnumber', 'hub', $questioncount));
+            $mform->setDefault('questions', $questionsnumber != -1);
+            $mform->setType('questions', PARAM_INT);
+
+            $mform->addElement('checkbox', 'resources', '',
+                    " " . get_string('resourcesnumber', 'hub', $resourcecount));
+            $mform->setDefault('resources', $resourcesnumber != -1);
+            $mform->setType('resources', PARAM_INT);
+
+            $mform->addElement('checkbox', 'badges', '',
+                    " " . get_string('badgesnumber', 'hub', $badges));
+            $mform->setDefault('badges', $badgesnumber != -1);
+            $mform->setType('badges', PARAM_INT);
+
+            $mform->addElement('checkbox', 'issuedbadges', '',
+                    " " . get_string('issuedbadgesnumber', 'hub', $issuedbadges));
+            $mform->setDefault('issuedbadges', $issuedbadgesnumber != -1);
+            $mform->setType('issuedbadges', PARAM_INT);
+
+            $mform->addElement('checkbox', 'participantnumberaverage', '',
+                    " " . get_string('participantnumberaverage', 'hub', $participantnumberaverage));
+            $mform->setDefault('participantnumberaverage', $participantnumberaveragecfg != -1);
+            $mform->setType('participantnumberaverage', PARAM_FLOAT);
+
+            $mform->addElement('checkbox', 'modulenumberaverage', '',
+                    " " . get_string('modulenumberaverage', 'hub', $modulenumberaverage));
+            $mform->setDefault('modulenumberaverage', $modulenumberaveragecfg != -1);
+            $mform->setType('modulenumberaverage', PARAM_FLOAT);
+        } else {
+            $mform->addElement('static', 'courseslabel', get_string('sendfollowinginfo', 'hub'),
+                    " " . get_string('coursesnumber', 'hub', $coursecount));
+            $mform->addElement('hidden', 'courses', 1);
+            $mform->setType('courses', PARAM_INT);
+            $mform->addHelpButton('courseslabel', 'sendfollowinginfo', 'hub');
+
+            $mform->addElement('static', 'userslabel', '',
+                    " " . get_string('usersnumber', 'hub', $usercount));
+            $mform->addElement('hidden', 'users', 1);
+            $mform->setType('users', PARAM_INT);
+
+            $mform->addElement('static', 'roleassignmentslabel', '',
+                    " " . get_string('roleassignmentsnumber', 'hub', $roleassigncount));
+            $mform->addElement('hidden', 'roleassignments', 1);
+            $mform->setType('roleassignments', PARAM_INT);
+
+            $mform->addElement('static', 'postslabel', '',
+                    " " . get_string('postsnumber', 'hub', $postcount));
+            $mform->addElement('hidden', 'posts', 1);
+            $mform->setType('posts', PARAM_INT);
+
+            $mform->addElement('static', 'questionslabel', '',
+                    " " . get_string('questionsnumber', 'hub', $questioncount));
+            $mform->addElement('hidden', 'questions', 1);
+            $mform->setType('questions', PARAM_INT);
+
+            $mform->addElement('static', 'resourceslabel', '',
+                    " " . get_string('resourcesnumber', 'hub', $resourcecount));
+            $mform->addElement('hidden', 'resources', 1);
+            $mform->setType('resources', PARAM_INT);
+
+            $mform->addElement('static', 'badgeslabel', '',
+                    " " . get_string('badgesnumber', 'hub', $badges));
+            $mform->addElement('hidden', 'badges', 1);
+            $mform->setType('badges', PARAM_INT);
+
+            $mform->addElement('static', 'issuedbadgeslabel', '',
+                    " " . get_string('issuedbadgesnumber', 'hub', $issuedbadges));
+            $mform->addElement('hidden', 'issuedbadges', true);
+            $mform->setType('issuedbadges', PARAM_INT);
+
+            $mform->addElement('static', 'participantnumberaveragelabel', '',
+                    " " . get_string('participantnumberaverage', 'hub', $participantnumberaverage));
+            $mform->addElement('hidden', 'participantnumberaverage', 1);
+            $mform->setType('participantnumberaverage', PARAM_FLOAT);
+
+            $mform->addElement('static', 'modulenumberaveragelabel', '',
+                    " " . get_string('modulenumberaverage', 'hub', $modulenumberaverage));
+            $mform->addElement('hidden', 'modulenumberaverage', 1);
+            $mform->setType('modulenumberaverage', PARAM_FLOAT);
+        }
+
+        //check if it's a first registration or update
+        $hubregistered = $registrationmanager->get_registeredhub($huburl);
+
+        if (!empty($hubregistered)) {
+            $buttonlabel = get_string('updatesite', 'hub',
+                            !empty($hubname) ? $hubname : $huburl);
+            $mform->addElement('hidden', 'update', true);
+            $mform->setType('update', PARAM_BOOL);
+        } else {
+            $buttonlabel = get_string('registersite', 'hub',
+                            !empty($hubname) ? $hubname : $huburl);
+        }
+
+        $this->add_action_buttons(false, $buttonlabel);
+    }
+
+}
+

admin/registration/index.php

@@ -15,114 +15,194 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
+/*
  * @package    moodle
  * @subpackage registration
  * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
  * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
  *
- * This page displays the site registration form.
- * It handles redirection to the hub to continue the registration workflow process.
- * It also handles update operation by web service.
+ * On this page the administrator selects which hub he wants to register (except for moodle.net)
+ * Admins can register with moodle.net via the site admin menu "Registration" link.
+ * On this page the administrator can also unregister from any hubs including moodle.net.
  */
 
-require_once('../../config.php');
+require('../../config.php');
+
 require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/forms.php');
+require_once($CFG->dirroot . '/course/publish/lib.php');
+require_once($CFG->dirroot . "/webservice/xmlrpc/lib.php");
 
-admin_externalpage_setup('registrationmoodleorg');
+admin_externalpage_setup('registrationhubs');
 
-$unregistration = optional_param('unregistration', false, PARAM_BOOL);
-$confirm = optional_param('confirm', false, PARAM_BOOL);
+$renderer = $PAGE->get_renderer('core', 'register');
 
-if ($unregistration && \core\hub\registration::is_registered()) {
-    if ($confirm) {
-        require_sesskey();
-        \core\hub\registration::unregister(false, false);
+$unregistration = optional_param('unregistration', 0, PARAM_INT);
+$cleanregdata = optional_param('cleanregdata', 0, PARAM_BOOL);
+$confirm = optional_param('confirm', 0, PARAM_INT);
+$huburl = optional_param('huburl', '', PARAM_URL);
+$cancel = optional_param('cancel', null, PARAM_ALPHA);
 
-        if (!\core\hub\registration::is_registered()) {
-            redirect(new moodle_url('/admin/registration/index.php'));
+$registrationmanager = new registration_manager();
+$publicationmanager = new course_publish_manager();
+$errormessage = '';
+if (empty($cancel) and $unregistration and $confirm and confirm_sesskey()) {
+
+    $hub = $registrationmanager->get_registeredhub($huburl);
+
+    //unpublish course and unregister the site by web service
+    if (!$cleanregdata) {
+
+        //check if we need to unpublish courses
+        //enrollable courses
+        $unpublishalladvertisedcourses = optional_param('unpublishalladvertisedcourses', 0, PARAM_INT);
+        $hubcourseids = array();
+        if ($unpublishalladvertisedcourses) {
+            $enrollablecourses = $publicationmanager->get_publications($huburl, null, 1);
+            if (!empty($enrollablecourses)) {
+                foreach ($enrollablecourses as $enrollablecourse) {
+                    $hubcourseids[] = $enrollablecourse->hubcourseid;
+                }
+            }
         }
+        //downloadable courses
+        $unpublishalluploadedcourses = optional_param('unpublishalluploadedcourses', 0, PARAM_INT);
+        if ($unpublishalluploadedcourses) {
+            $downloadablecourses = $publicationmanager->get_publications($huburl, null, 0);
+            if (!empty($downloadablecourses)) {
+                foreach ($downloadablecourses as $downloadablecourse) {
+                    $hubcourseids[] = $downloadablecourse->hubcourseid;
+                }
+            }
+        }
+
+        //unpublish the courses by web service
+        if (!empty($hubcourseids)) {
+            $function = 'hub_unregister_courses';
+            $params = array('courseids' => $hubcourseids);
+            $serverurl = $huburl . "/local/hub/webservice/webservices.php";
+            $xmlrpcclient = new webservice_xmlrpc_client($serverurl, $hub->token);
+            try {
+                $result = $xmlrpcclient->call($function, $params);
+                //delete the published courses
+                if (!empty($enrollablecourses)) {
+                    $publicationmanager->delete_hub_publications($huburl, 1);
+                }
+                if (!empty($downloadablecourses)) {
+                    $publicationmanager->delete_hub_publications($huburl, 0);
+                }
+            } catch (Exception $e) {
+                $errormessage = $e->getMessage();
+                $errormessage .= html_writer::empty_tag('br') .
+                        get_string('errorunpublishcourses', 'hub');
+                $confirm = false;
+                $cleanregdata = 1;
+            }
+        }
+    }
+
+    //course unpublish went ok, unregister the site now
+    if ($confirm) {
+        $function = 'hub_unregister_site';
+        $params = array();
+        $serverurl = $huburl . "/local/hub/webservice/webservices.php";
+        $xmlrpcclient = new webservice_xmlrpc_client($serverurl, $hub->token);
+        try {
+            $result = $xmlrpcclient->call($function, $params);
+        } catch (Exception $e) {
+            if (!$cleanregdata) {
+                $errormessage = $e->getMessage();
+                $confirm = false;
+                $cleanregdata = 1;
+            }
+        }
+    }
+
+    //check that we are still processing the unregistration,
+    //it could have been unset if an exception were previsouly catched
+    if ($confirm) {
+        $registrationmanager->delete_registeredhub($huburl);
+    }
+}
+
+if (empty($cancel) and $unregistration and !$confirm) {
+
+    echo $OUTPUT->header();
+
+    //do not check sesskey if confirm = false because this script is linked into email message
+    if (!empty($errormessage)) {
+        echo $OUTPUT->notification(get_string('unregistrationerror', 'hub', $errormessage));
+    }
+
+    $hub = $registrationmanager->get_registeredhub($huburl);
+    echo $OUTPUT->heading(get_string('unregisterfrom', 'hub', $hub->hubname), 3, 'main');
+    if ($cleanregdata) {
+        $siteunregistrationform = new site_clean_registration_data_form('',
+                        array('huburl' => $huburl, 'hubname' => $hub->hubname));
+    } else {
+        $siteunregistrationform = new site_unregistration_form('',
+                        array('huburl' => $huburl, 'hubname' => $hub->hubname));
+    }
+
+    $siteunregistrationform->display();
+} else {
+    $registeredonmoodleorg = false;
+    $moodleorghub = $registrationmanager->get_registeredhub(HUB_MOODLEORGHUBURL);
+    if (!empty($moodleorghub)) {
+        $registeredonmoodleorg = true;
+    }
+
+    // load the hub selector form
+    $hubselectorform = new hub_selector_form();
+    $fromform = $hubselectorform->get_data();
+    $selectedhuburl = optional_param('publichub', false, PARAM_URL);
+    $unlistedhuburl = optional_param('unlistedurl', false, PARAM_TEXT);
+    $password = optional_param('password', '', PARAM_RAW);
+    $registeringhuburl = null;
+    if (!empty($unlistedhuburl)) {
+        if (clean_param($unlistedhuburl, PARAM_URL) !== '') {
+            $registeringhuburl = $unlistedhuburl;
+        }
+    } else if (!empty($selectedhuburl)) {
+        $registeringhuburl = $selectedhuburl;
+    }
+
+    // a hub has been selected, redirect to the hub registration page
+    if (empty($cancel) and !empty($registeringhuburl) and confirm_sesskey()) {
+        $hubname = optional_param(clean_param($registeringhuburl, PARAM_ALPHANUMEXT), '', PARAM_TEXT);
+        $params = array('sesskey' => sesskey(), 'huburl' => $registeringhuburl,
+            'password' => $password, 'hubname' => $hubname);
+        redirect(new moodle_url($CFG->wwwroot . "/" . $CFG->admin . "/registration/register.php",
+                        $params));
     }
 
     echo $OUTPUT->header();
-    echo $OUTPUT->confirm(
-        get_string('registerwithmoodleorgremove', 'core_hub'),
-        new moodle_url(new moodle_url('/admin/registration/index.php', ['unregistration' => 1, 'confirm' => 1])),
-        new moodle_url(new moodle_url('/admin/registration/index.php'))
-    );
-    echo $OUTPUT->footer();
-    exit;
-}
 
-$isinitialregistration = \core\hub\registration::show_after_install(true);
-if (!$returnurl = optional_param('returnurl', null, PARAM_LOCALURL)) {
-    $returnurl = $isinitialregistration ? '/admin/index.php' : '/admin/registration/index.php';
-}
+    //check if the site is registered on Moodle.org and display a message about registering on MOOCH
+    $adminrenderer = $PAGE->get_renderer('core', 'admin');
+    echo $adminrenderer->warn_if_not_registered();
 
-$siteregistrationform = new \core\hub\site_registration_form();
-$siteregistrationform->set_data(['returnurl' => $returnurl]);
-if ($fromform = $siteregistrationform->get_data()) {
+    //do not check sesskey if confirm = false because this script is linked into email message
+    if (!empty($errormessage)) {
+        echo $OUTPUT->notification(get_string('unregistrationerror', 'hub', $errormessage));
+    }
 
-    // Save the settings.
-    \core\hub\registration::save_site_info($fromform);
+    echo $OUTPUT->heading(get_string('registerwith', 'hub'));
 
-    if (\core\hub\registration::is_registered()) {
-        if (\core\hub\registration::update_manual()) {
-            redirect(new moodle_url($returnurl));
+    $hubselectorform->display();
+
+    if (extension_loaded('xmlrpc')) {
+        $hubs = $registrationmanager->get_registered_on_hubs();
+        if (!empty($hubs)) {
+            echo $OUTPUT->heading(get_string('registeredon', 'hub'), 3, 'main');
+            echo $renderer->registeredonhublisting($hubs);
         }
-        redirect(new moodle_url('/admin/registration/index.php', ['returnurl' => $returnurl]));
-    } else {
-        \core\hub\registration::register($returnurl);
-        // This method will redirect away.
+    } else { //display notice about xmlrpc
+        $xmlrpcnotification = $OUTPUT->doc_link('admin/environment/php_extension/xmlrpc', '');
+        $xmlrpcnotification .= get_string('xmlrpcdisabledregistration', 'hub');
+        echo $OUTPUT->notification($xmlrpcnotification);
     }
-
-}
-
-// OUTPUT SECTION.
-
-echo $OUTPUT->header();
-
-// Current status of registration.
-
-$notificationtype = \core\output\notification::NOTIFY_ERROR;
-if (\core\hub\registration::is_registered()) {
-    $lastupdated = \core\hub\registration::get_last_updated();
-    if ($lastupdated == 0) {
-        $registrationmessage = get_string('pleaserefreshregistrationunknown', 'admin');
-    } else if (\core\hub\registration::get_new_registration_fields()) {
-        $registrationmessage = get_string('pleaserefreshregistrationnewdata', 'admin');
-    } else {
-        $lastupdated = userdate($lastupdated, get_string('strftimedate', 'langconfig'));
-        $registrationmessage = get_string('pleaserefreshregistration', 'admin', $lastupdated);
-        $notificationtype = \core\output\notification::NOTIFY_INFO;
-    }
-    echo $OUTPUT->notification($registrationmessage, $notificationtype);
-} else if (!$isinitialregistration) {
-    $registrationmessage = get_string('registrationwarning', 'admin');
-    echo $OUTPUT->notification($registrationmessage, $notificationtype);
-}
-
-// Heading.
-if (\core\hub\registration::is_registered()) {
-    echo $OUTPUT->heading(get_string('registerwithmoodleorgupdate', 'core_hub'));
-} else if ($isinitialregistration) {
-    echo $OUTPUT->heading(get_string('registerwithmoodleorgcomplete', 'core_hub'));
-} else {
-    echo $OUTPUT->heading(get_string('registerwithmoodleorg', 'core_hub'));
-}
-
-$renderer = $PAGE->get_renderer('core', 'admin');
-echo $renderer->moodleorg_registration_message();
-
-$siteregistrationform->display();
-
-if (\core\hub\registration::is_registered()) {
-    // Unregister link.
-    $unregisterhuburl = new moodle_url("/admin/registration/index.php", ['unregistration' => 1]);
-    echo html_writer::div(html_writer::link($unregisterhuburl, get_string('unregister', 'hub')), 'unregister mt-2');
-} else if ($isinitialregistration) {
-    echo html_writer::div(html_writer::link(new moodle_url($returnurl), get_string('skipregistration', 'hub')),
-        'skipregistration mt-2');
 }
 echo $OUTPUT->footer();

admin/registration/lib.php

@@ -1,4 +1,5 @@
 <?php
+
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -14,4 +15,297 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-defined('MOODLE_INTERNAL') || die();
+
+
+
+//// SITE PRIVACY /////
+
+/**
+ * Site privacy: private
+ */
+define('HUB_SITENOTPUBLISHED', 'notdisplayed');
+
+/**
+ * Site privacy: public
+ */
+define('HUB_SITENAMEPUBLISHED', 'named');
+
+/**
+ * Site privacy: public and global
+ */
+define('HUB_SITELINKPUBLISHED', 'linked');
+
+/**
+ *
+ * Site registration library
+ *
+ * @package   course
+ * @copyright 2010 Moodle Pty Ltd (http://moodle.com)
+ * @author    Jerome Mouneyrac
+ * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class registration_manager {
+
+    /**
+     * Automatically update the registration on all hubs
+     */
+    public function cron() {
+        global $CFG;
+        if (extension_loaded('xmlrpc')) {
+            $function = 'hub_update_site_info';
+            require_once($CFG->dirroot . "/webservice/xmlrpc/lib.php");
+
+            // Update all hubs where the site is registered.
+            $hubs = $this->get_registered_on_hubs();
+            if (empty($hubs)) {
+                mtrace(get_string('registrationwarning', 'admin'));
+            }
+            foreach ($hubs as $hub) {
+                // Update the registration.
+                $siteinfo = $this->get_site_info($hub->huburl);
+                $params = array('siteinfo' => $siteinfo);
+                $serverurl = $hub->huburl . "/local/hub/webservice/webservices.php";
+                $xmlrpcclient = new webservice_xmlrpc_client($serverurl, $hub->token);
+                try {
+                    $result = $xmlrpcclient->call($function, $params);
+                    $this->update_registeredhub($hub); // To update timemodified.
+                    mtrace(get_string('siteupdatedcron', 'hub', $hub->hubname));
+                } catch (Exception $e) {
+                    $errorparam = new stdClass();
+                    $errorparam->errormessage = $e->getMessage();
+                    $errorparam->hubname = $hub->hubname;
+                    mtrace(get_string('errorcron', 'hub', $errorparam));
+                }
+            }
+        } else {
+            mtrace(get_string('errorcronnoxmlrpc', 'hub'));
+        }
+    }
+
+    /**
+     * Return the site secret for a given hub
+     * site identifier is assigned to Mooch
+     * each hub has a unique and personal site secret.
+     * @param string $huburl
+     * @return string site secret
+     */
+    public function get_site_secret_for_hub($huburl) {
+        global $DB;
+
+        $existingregistration = $DB->get_record('registration_hubs',
+                    array('huburl' => $huburl));
+
+        if (!empty($existingregistration)) {
+            return $existingregistration->secret;
+        }
+
+        if ($huburl == HUB_MOODLEORGHUBURL) {
+            $siteidentifier =  get_site_identifier();
+        } else {
+            $siteidentifier = random_string(32) . $_SERVER['HTTP_HOST'];
+        }
+
+        return $siteidentifier;
+
+    }
+
+    /**
+     * When the site register on a hub, he must call this function
+     * @param object $hub where the site is registered on
+     * @return integer id of the record
+     */
+    public function add_registeredhub($hub) {
+        global $DB;
+        $hub->timemodified = time();
+        $id = $DB->insert_record('registration_hubs', $hub);
+        return $id;
+    }
+
+    /**
+     * When a site unregister from a hub, he must call this function
+     * @param string $huburl the huburl to delete
+     */
+    public function delete_registeredhub($huburl) {
+        global $DB;
+        $DB->delete_records('registration_hubs', array('huburl' => $huburl));
+    }
+
+    /**
+     * Get a hub on which the site is registered for a given url or token
+     * Mostly use to check if the site is registered on a specific hub
+     * @param string $huburl
+     * @param string $token
+     * @return object the  hub
+     */
+    public function get_registeredhub($huburl = null, $token = null) {
+        global $DB;
+
+        $params = array();
+        if (!empty($huburl)) {
+            $params['huburl'] = $huburl;
+        }
+        if (!empty($token)) {
+            $params['token'] = $token;
+        }
+        $params['confirmed'] = 1;
+        $token = $DB->get_record('registration_hubs', $params);
+        return $token;
+    }
+
+    /**
+     * Get the hub which has not confirmed that the site is registered on,
+     * but for which a request has been sent
+     * @param string $huburl
+     * @return object the  hub
+     */
+    public function get_unconfirmedhub($huburl) {
+        global $DB;
+
+        $params = array();
+        $params['huburl'] = $huburl;
+        $params['confirmed'] = 0;
+        $token = $DB->get_record('registration_hubs', $params);
+        return $token;
+    }
+
+    /**
+     * Update a registered hub (mostly use to update the confirmation status)
+     * @param object $hub the hub
+     */
+    public function update_registeredhub($hub) {
+        global $DB;
+        $hub->timemodified = time();
+        $DB->update_record('registration_hubs', $hub);
+    }
+
+    /**
+     * Return all hubs where the site is registered
+     */
+    public function get_registered_on_hubs() {
+        global $DB;
+        $hubs = $DB->get_records('registration_hubs', array('confirmed' => 1));
+        return $hubs;
+    }
+
+    /**
+     * Return site information for a specific hub
+     * @param string $huburl
+     * @return array site info
+     */
+    public function get_site_info($huburl) {
+        global $CFG, $DB;
+
+        $siteinfo = array();
+        $cleanhuburl = clean_param($huburl, PARAM_ALPHANUMEXT);
+        $siteinfo['name'] = get_config('hub', 'site_name_' . $cleanhuburl);
+        $siteinfo['description'] = get_config('hub', 'site_description_' . $cleanhuburl);
+        $siteinfo['contactname'] = get_config('hub', 'site_contactname_' . $cleanhuburl);
+        $siteinfo['contactemail'] = get_config('hub', 'site_contactemail_' . $cleanhuburl);
+        $siteinfo['contactphone'] = get_config('hub', 'site_contactphone_' . $cleanhuburl);
+        $siteinfo['imageurl'] = get_config('hub', 'site_imageurl_' . $cleanhuburl);
+        $siteinfo['privacy'] = get_config('hub', 'site_privacy_' . $cleanhuburl);
+        $siteinfo['street'] = get_config('hub', 'site_address_' . $cleanhuburl);
+        $siteinfo['regioncode'] = get_config('hub', 'site_region_' . $cleanhuburl);
+        $siteinfo['countrycode'] = get_config('hub', 'site_country_' . $cleanhuburl);
+        $siteinfo['geolocation'] = get_config('hub', 'site_geolocation_' . $cleanhuburl);
+        $siteinfo['contactable'] = get_config('hub', 'site_contactable_' . $cleanhuburl);
+        $siteinfo['emailalert'] = get_config('hub', 'site_emailalert_' . $cleanhuburl);
+        if (get_config('hub', 'site_coursesnumber_' . $cleanhuburl) == -1) {
+            $coursecount = -1;
+        } else {
+            $coursecount = $DB->count_records('course') - 1;
+        }
+        $siteinfo['courses'] = $coursecount;
+        if (get_config('hub', 'site_usersnumber_' . $cleanhuburl) == -1) {
+            $usercount = -1;
+        } else {
+            $usercount = $DB->count_records('user', array('deleted' => 0));
+        }
+        $siteinfo['users'] = $usercount;
+
+        if (get_config('hub', 'site_roleassignmentsnumber_' . $cleanhuburl) == -1) {
+            $roleassigncount = -1;
+        } else {
+            $roleassigncount = $DB->count_records('role_assignments');
+        }
+        $siteinfo['enrolments'] = $roleassigncount;
+        if (get_config('hub', 'site_postsnumber_' . $cleanhuburl) == -1) {
+            $postcount = -1;
+        } else {
+            $postcount = $DB->count_records('forum_posts');
+        }
+        $siteinfo['posts'] = $postcount;
+        if (get_config('hub', 'site_questionsnumber_' . $cleanhuburl) == -1) {
+            $questioncount = -1;
+        } else {
+            $questioncount = $DB->count_records('question');
+        }
+        $siteinfo['questions'] = $questioncount;
+        if (get_config('hub', 'site_resourcesnumber_' . $cleanhuburl) == -1) {
+            $resourcecount = -1;
+        } else {
+            $resourcecount = $DB->count_records('resource');
+        }
+        $siteinfo['resources'] = $resourcecount;
+        // Badge statistics.
+        require_once($CFG->libdir . '/badgeslib.php');
+        if (get_config('hub', 'site_badges_' . $cleanhuburl) == -1) {
+            $badges = -1;
+        } else {
+            $badges = $DB->count_records_select('badge', 'status <> ' . BADGE_STATUS_ARCHIVED);
+        }
+        $siteinfo['badges'] = $badges;
+        if (get_config('hub', 'site_issuedbadges_' . $cleanhuburl) == -1) {
+            $issuedbadges = -1;
+        } else {
+            $issuedbadges = $DB->count_records('badge_issued');
+        }
+        $siteinfo['issuedbadges'] = $issuedbadges;
+        //TODO
+        require_once($CFG->dirroot . "/course/lib.php");
+        if (get_config('hub', 'site_participantnumberaverage_' . $cleanhuburl) == -1) {
+            $participantnumberaverage = -1;
+        } else {
+            $participantnumberaverage = average_number_of_participants();
+        }
+        $siteinfo['participantnumberaverage'] = $participantnumberaverage;
+        if (get_config('hub', 'site_modulenumberaverage_' . $cleanhuburl) == -1) {
+            $modulenumberaverage = -1;
+        } else {
+            $modulenumberaverage = average_number_of_courses_modules();
+        }
+        $siteinfo['modulenumberaverage'] = $modulenumberaverage;
+        $siteinfo['language'] = get_config('hub', 'site_language_' . $cleanhuburl);
+        $siteinfo['moodleversion'] = $CFG->version;
+        $siteinfo['moodlerelease'] = $CFG->release;
+        $siteinfo['url'] = $CFG->wwwroot;
+
+        return $siteinfo;
+    }
+
+    /**
+     * Retrieve the site privacy string matching the define value
+     * @param string $privacy must match the define into moodlelib.php
+     * @return string
+     */
+    public function get_site_privacy_string($privacy) {
+        switch ($privacy) {
+            case HUB_SITENOTPUBLISHED:
+                $privacystring = get_string('siteprivacynotpublished', 'hub');
+                break;
+            case HUB_SITENAMEPUBLISHED:
+                $privacystring = get_string('siteprivacypublished', 'hub');
+                break;
+            case HUB_SITELINKPUBLISHED:
+                $privacystring = get_string('siteprivacylinked', 'hub');
+                break;
+        }
+        if (empty($privacystring)) {
+            throw new moodle_exception('unknownprivacy');
+        }
+        return $privacystring;
+    }
+
+}
+?>

admin/registration/register.php

@@ -20,7 +20,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-/**
+/*
  * @package    moodle
  * @subpackage registration
  * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
@@ -34,5 +34,170 @@
 
 
 require_once('../../config.php');
+require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/forms.php');
+require_once($CFG->dirroot . '/webservice/lib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
 
-redirect(new moodle_url('/admin/registration/index.php'));
+require_sesskey();
+
+$huburl = required_param('huburl', PARAM_URL);
+$huburl = rtrim($huburl, "/");
+
+if ($huburl == HUB_MOODLEORGHUBURL) { // register to Moodle.org
+    admin_externalpage_setup('registrationmoodleorg');
+} else { //register to a hub
+    admin_externalpage_setup('registrationhub');
+}
+
+$password = optional_param('password', '', PARAM_TEXT);
+$hubname = optional_param('hubname', '', PARAM_TEXT);
+
+$registrationmanager = new registration_manager();
+
+$registeredhub = $registrationmanager->get_registeredhub($huburl);
+
+$siteregistrationform = new site_registration_form('',
+                array('alreadyregistered' => !empty($registeredhub->token),
+                    'huburl' => $huburl, 'hubname' => $hubname,
+                    'password' => $password));
+$fromform = $siteregistrationform->get_data();
+
+if (!empty($fromform) and confirm_sesskey()) {
+
+    // Set to -1 all optional data marked as "don't send" by the admin.
+    // The function get_site_info() will not calculate the optional data if config is set to -1.
+    $inputnames = array('courses', 'users', 'roleassignments', 'posts', 'questions', 'resources',
+        'badges', 'issuedbadges', 'modulenumberaverage', 'participantnumberaverage');
+    foreach ($inputnames as $inputname) {
+        if (empty($fromform->{$inputname})) {
+            $fromform->{$inputname} = -1;
+        }
+    }
+
+    // Save the settings.
+    $cleanhuburl = clean_param($huburl, PARAM_ALPHANUMEXT);
+    set_config('site_name_' . $cleanhuburl, $fromform->name, 'hub');
+    set_config('site_description_' . $cleanhuburl, $fromform->description, 'hub');
+    set_config('site_contactname_' . $cleanhuburl, $fromform->contactname, 'hub');
+    set_config('site_contactemail_' . $cleanhuburl, $fromform->contactemail, 'hub');
+    set_config('site_contactphone_' . $cleanhuburl, $fromform->contactphone, 'hub');
+    set_config('site_imageurl_' . $cleanhuburl, $fromform->imageurl, 'hub');
+    set_config('site_privacy_' . $cleanhuburl, $fromform->privacy, 'hub');
+    set_config('site_address_' . $cleanhuburl, $fromform->address, 'hub');
+    set_config('site_region_' . $cleanhuburl, $fromform->regioncode, 'hub');
+    set_config('site_country_' . $cleanhuburl, $fromform->countrycode, 'hub');
+    set_config('site_language_' . $cleanhuburl, $fromform->language, 'hub');
+    set_config('site_geolocation_' . $cleanhuburl, $fromform->geolocation, 'hub');
+    set_config('site_contactable_' . $cleanhuburl, $fromform->contactable, 'hub');
+    set_config('site_emailalert_' . $cleanhuburl, $fromform->emailalert, 'hub');
+    set_config('site_coursesnumber_' . $cleanhuburl, $fromform->courses, 'hub');
+    set_config('site_usersnumber_' . $cleanhuburl, $fromform->users, 'hub');
+    set_config('site_roleassignmentsnumber_' . $cleanhuburl, $fromform->roleassignments, 'hub');
+    set_config('site_postsnumber_' . $cleanhuburl, $fromform->posts, 'hub');
+    set_config('site_questionsnumber_' . $cleanhuburl, $fromform->questions, 'hub');
+    set_config('site_resourcesnumber_' . $cleanhuburl, $fromform->resources, 'hub');
+    set_config('site_badges_' . $cleanhuburl, $fromform->badges, 'hub');
+    set_config('site_issuedbadges_' . $cleanhuburl, $fromform->issuedbadges, 'hub');
+    set_config('site_modulenumberaverage_' . $cleanhuburl, $fromform->modulenumberaverage, 'hub');
+    set_config('site_participantnumberaverage_' . $cleanhuburl, $fromform->participantnumberaverage, 'hub');
+}
+
+/////// UPDATE ACTION ////////
+
+// update the hub registration
+$update = optional_param('update', 0, PARAM_INT);
+if ($update and confirm_sesskey()) {
+
+    //update the registration
+    $function = 'hub_update_site_info';
+    $siteinfo = $registrationmanager->get_site_info($huburl);
+    $params = array('siteinfo' => $siteinfo);
+    $serverurl = $huburl . "/local/hub/webservice/webservices.php";
+    require_once($CFG->dirroot . "/webservice/xmlrpc/lib.php");
+    $xmlrpcclient = new webservice_xmlrpc_client($serverurl, $registeredhub->token);
+    try {
+        $result = $xmlrpcclient->call($function, $params);
+        $registrationmanager->update_registeredhub($registeredhub); // To update timemodified.
+    } catch (Exception $e) {
+        $error = $OUTPUT->notification(get_string('errorregistration', 'hub', $e->getMessage()));
+    }
+}
+
+/////// FORM REGISTRATION ACTION //////
+
+if (!empty($fromform) and empty($update) and confirm_sesskey()) {
+
+    if (!empty($fromform) and confirm_sesskey()) { // if the register button has been clicked
+
+        // Retrieve the optional info (specially course number, user number, module number average...).
+        $siteinfo = $registrationmanager->get_site_info($huburl);
+        $fromform->courses = $siteinfo['courses'];
+        $fromform->users = $siteinfo['users'];
+        $fromform->enrolments = $siteinfo['enrolments'];
+        $fromform->posts = $siteinfo['posts'];
+        $fromform->questions = $siteinfo['questions'];
+        $fromform->resources = $siteinfo['resources'];
+        $fromform->badges = $siteinfo['badges'];
+        $fromform->issuedbadges = $siteinfo['issuedbadges'];
+        $fromform->modulenumberaverage = $siteinfo['modulenumberaverage'];
+        $fromform->participantnumberaverage = $siteinfo['participantnumberaverage'];
+        $fromform->street = $siteinfo['street'];
+
+        $params = (array) $fromform; //we are using the form input as the redirection parameters (token, url and name)
+
+        $unconfirmedhub = $registrationmanager->get_unconfirmedhub($huburl);
+        if (empty($unconfirmedhub)) {
+            //we save the token into the communication table in order to have a reference
+            $unconfirmedhub = new stdClass();
+            $unconfirmedhub->token = $registrationmanager->get_site_secret_for_hub($huburl);
+            $unconfirmedhub->secret = $unconfirmedhub->token;
+            $unconfirmedhub->huburl = $huburl;
+            $unconfirmedhub->hubname = $hubname;
+            $unconfirmedhub->confirmed = 0;
+            $unconfirmedhub->id = $registrationmanager->add_registeredhub($unconfirmedhub);
+        }
+
+        $params['token'] = $unconfirmedhub->token;
+        $params['url'] = $CFG->wwwroot;
+        redirect(new moodle_url($huburl . '/local/hub/siteregistration.php', $params));
+    }
+}
+
+/////// OUTPUT SECTION /////////////
+
+echo $OUTPUT->header();
+//Display update notification result
+if (!empty($registeredhub->confirmed)) {
+    if (!empty($result)) {
+        echo $OUTPUT->notification(get_string('siteregistrationupdated', 'hub'), 'notifysuccess');
+    }
+}
+
+if (!empty($error)) {
+    echo $error;
+}
+
+// Some Moodle.org registration explanation.
+if ($huburl == HUB_MOODLEORGHUBURL) {
+    $notificationtype = \core\output\notification::NOTIFY_ERROR;
+    if (!empty($registeredhub->token)) {
+        if ($registeredhub->timemodified == 0) {
+            $registrationmessage = get_string('pleaserefreshregistrationunknown', 'admin');
+        } else {
+            $lastupdated = userdate($registeredhub->timemodified, get_string('strftimedate', 'langconfig'));
+            $registrationmessage = get_string('pleaserefreshregistration', 'admin', $lastupdated);
+            $notificationtype = \core\output\notification::NOTIFY_INFO;
+        }
+    } else {
+        $registrationmessage = get_string('registrationwarning', 'admin');
+    }
+    echo $OUTPUT->notification($registrationmessage, $notificationtype);
+
+    echo $OUTPUT->heading(get_string('registerwithmoodleorg', 'admin'));
+    $renderer = $PAGE->get_renderer('core', 'register');
+    echo $renderer->moodleorg_registration_message();
+}
+
+$siteregistrationform->display();
+echo $OUTPUT->footer();

admin/registration/renderer.php

@@ -0,0 +1,95 @@
+<?php
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// This file is part of Moodle - http://moodle.org/                      //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//                                                                       //
+// 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/>.       //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+/**
+ * Registration renderer.
+ * @package   moodle
+ * @subpackage registration
+ * @copyright 2010 Moodle Pty Ltd (http://moodle.com)
+ * @author    Jerome Mouneyrac
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class core_register_renderer extends plugin_renderer_base {
+
+    /**
+     * Display message about the benefits of registering on Moodle.org
+     *
+     * @return string
+     */
+    public function moodleorg_registration_message() {
+        $moodleorgstatslink = html_writer::link('http://moodle.net/stats',
+                                               get_string('statsmoodleorg', 'admin'),
+                                               array('target' => '_blank'));
+
+        $moodleorgregmsg = get_string('registermoodleorg', 'admin');
+        $items = array(get_string('registermoodleorgli1', 'admin'),
+                       get_string('registermoodleorgli2', 'admin', $moodleorgstatslink));
+        $moodleorgregmsg .= html_writer::alist($items);
+        return $moodleorgregmsg;
+    }
+
+    /**
+     * Display a box message confirming a site registration (add or update)
+     * @param string $confirmationmessage
+     * @return string
+     */
+    public function registration_confirmation($confirmationmessage) {
+        $linktositelist = html_writer::tag('a', get_string('sitelist', 'hub'),
+                        array('href' => new moodle_url('/local/hub/index.php')));
+        $message = $confirmationmessage . html_writer::empty_tag('br') . $linktositelist;
+        return $this->output->box($message);
+    }
+
+    /**
+     * Display the listing of registered on hub
+     */
+    public function registeredonhublisting($hubs) {
+        global $CFG;
+        $table = new html_table();
+        $table->head = array(get_string('hub', 'hub'), get_string('operation', 'hub'));
+        $table->size = array('80%', '20%');
+
+        foreach ($hubs as $hub) {
+            if ($hub->huburl == HUB_MOODLEORGHUBURL) {
+                $hub->hubname = get_string('registeredmoodleorg', 'hub', $hub->hubname);
+            }
+            $hublink = html_writer::tag('a', $hub->hubname, array('href' => $hub->huburl));
+            $hublinkcell = html_writer::tag('div', $hublink, array('class' => 'registeredhubrow'));
+
+            $unregisterhuburl = new moodle_url("/" . $CFG->admin . "/registration/index.php",
+                            array('sesskey' => sesskey(), 'huburl' => $hub->huburl,
+                                'unregistration' => 1));
+            $unregisterbutton = new single_button($unregisterhuburl,
+                            get_string('unregister', 'hub'));
+            $unregisterbutton->class = 'centeredbutton';
+            $unregisterbuttonhtml = $this->output->render($unregisterbutton);
+
+            //add button cells
+            $cells = array($hublinkcell, $unregisterbuttonhtml);
+            $row = new html_table_row($cells);
+            $table->data[] = $row;
+        }
+
+        return html_writer::table($table);
+    }
+
+}

admin/registration/renewregistration.php

@@ -20,7 +20,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-/**
+/*
  * @package    moodle
  * @subpackage registration
  * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
@@ -33,40 +33,44 @@
 
 require('../../config.php');
 require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
 
 $url = optional_param('url', '', PARAM_URL);
+$hubname = optional_param('hubname', '', PARAM_TEXT);
 $token = optional_param('token', '', PARAM_TEXT);
 
-admin_externalpage_setup('registrationmoodleorg');
+admin_externalpage_setup('registrationhubs');
 
-if (parse_url($url, PHP_URL_HOST) !== parse_url(HUB_MOODLEORGHUBURL, PHP_URL_HOST)) {
-    // Allow other plugins to renew registration on custom hubs. Plugins implementing this
-    // callback need to redirect or exit. See https://docs.moodle.org/en/Hub_registration .
-    $callbacks = get_plugins_with_function('hub_registration');
-    foreach ($callbacks as $plugintype => $plugins) {
-        foreach ($plugins as $plugin => $callback) {
-            $callback('renew');
-        }
+//check that we are waiting a confirmation from this hub, and check that the token is correct
+$registrationmanager = new registration_manager();
+$registeredhub = $registrationmanager->get_unconfirmedhub($url);
+if (!empty($registeredhub) and $registeredhub->token == $token) {
+
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('renewregistration', 'hub'), 3, 'main');
+    $hublink = html_writer::tag('a', $hubname, array('href' => $url));
+
+    $registrationmanager->delete_registeredhub($url);
+
+    //Mooch case, need to recreate the siteidentifier
+    if ($url == HUB_MOODLEORGHUBURL) {
+        $CFG->siteidentifier = null;
+        get_site_identifier();
     }
-    throw new moodle_exception('errorotherhubsnotsupported', 'hub');
+
+    $deletedregmsg = get_string('previousregistrationdeleted', 'hub', $hublink);
+
+    $button = new single_button(new moodle_url('/admin/registration/index.php'),
+                    get_string('restartregistration', 'hub'));
+    $button->class = 'restartregbutton';
+
+    echo html_writer::tag('div', $deletedregmsg . $OUTPUT->render($button),
+            array('class' => 'mdl-align'));
+
+    echo $OUTPUT->footer();
+} else {
+    throw new moodle_exception('wrongtoken', 'hub',
+            $CFG->wwwroot . '/' . $CFG->admin . '/registration/index.php');
 }
 
-// Check that we are waiting a confirmation from this hub, and check that the token is correct.
-\core\hub\registration::reset_site_identifier($token);
-
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('renewregistration', 'hub'), 3, 'main');
-$hublink = html_writer::tag('a', HUB_MOODLEORGHUBURL, array('href' => HUB_MOODLEORGHUBURL));
-
-$deletedregmsg = get_string('previousregistrationdeleted', 'hub', $hublink);
-
-$button = new single_button(new moodle_url('/admin/registration/index.php'),
-                get_string('restartregistration', 'hub'));
-$button->class = 'restartregbutton';
-
-echo html_writer::tag('div', $deletedregmsg . $OUTPUT->render($button),
-        array('class' => 'mdl-align'));
-
-echo $OUTPUT->footer();
-
 

admin/renderer.php

@@ -220,7 +220,7 @@ class core_admin_renderer extends plugin_renderer_base {
             $output .= $this->container_end();
         }
 
-        $button = new single_button($continueurl, get_string('upgradestart', 'admin'), 'get', true);
+        $button = new single_button($continueurl, get_string('upgradestart', 'admin'), 'get');
         $button->class = 'continuebutton';
         $output .= $this->render($button);
         $output .= $this->footer();
@@ -253,7 +253,7 @@ class core_admin_renderer extends plugin_renderer_base {
             $out .= $this->output->container(get_string('cancelinstallinfodir', 'core_plugin', $pluginfo->rootdir));
             if ($repotype = $pluginman->plugin_external_source($pluginfo->component)) {
                 $out .= $this->output->container(get_string('uninstalldeleteconfirmexternal', 'core_plugin', $repotype),
-                    'alert alert-warning mt-2');
+                    'uninstalldeleteconfirmexternal');
             }
         }
 
@@ -278,22 +278,13 @@ class core_admin_renderer extends plugin_renderer_base {
      * @param array $eventshandlers Events 1 API handlers.
      * @param bool $themedesignermode Warn about the theme designer mode.
      * @param bool $devlibdir Warn about development libs directory presence.
-     * @param bool $mobileconfigured Whether the mobile web services have been enabled
-     * @param bool $overridetossl Whether or not ssl is being forced.
-     * @param bool $invalidforgottenpasswordurl Whether the forgotten password URL does not link to a valid URL.
-     * @param bool $croninfrequent If true, warn that cron hasn't run in the past few minutes
-     * @param bool $showcampaigncontent Whether the campaign content should be visible or not.
-     * @param bool $showfeedbackencouragement Whether the feedback encouragement content should be displayed or not.
      *
      * @return string HTML to output.
      */
     public function admin_notifications_page($maturity, $insecuredataroot, $errorsdisplayed,
             $cronoverdue, $dbproblems, $maintenancemode, $availableupdates, $availableupdatesfetch,
             $buggyiconvnomb, $registered, array $cachewarnings = array(), $eventshandlers = 0,
-            $themedesignermode = false, $devlibdir = false, $mobileconfigured = false,
-            $overridetossl = false, $invalidforgottenpasswordurl = false, $croninfrequent = false,
-            $showcampaigncontent = false, bool $showfeedbackencouragement = false) {
-
+            $themedesignermode = false, $devlibdir = false) {
         global $CFG;
         $output = '';
 
@@ -307,17 +298,11 @@ class core_admin_renderer extends plugin_renderer_base {
         $output .= $this->display_errors_warning($errorsdisplayed);
         $output .= $this->buggy_iconv_warning($buggyiconvnomb);
         $output .= $this->cron_overdue_warning($cronoverdue);
-        $output .= $this->cron_infrequent_warning($croninfrequent);
         $output .= $this->db_problems($dbproblems);
         $output .= $this->maintenance_mode_warning($maintenancemode);
-        $output .= $this->overridetossl_warning($overridetossl);
         $output .= $this->cache_warnings($cachewarnings);
         $output .= $this->events_handlers($eventshandlers);
         $output .= $this->registration_warning($registered);
-        $output .= $this->mobile_configuration_warning($mobileconfigured);
-        $output .= $this->forgotten_password_url_warning($invalidforgottenpasswordurl);
-        $output .= $this->userfeedback_encouragement($showfeedbackencouragement);
-        $output .= $this->campaign_content($showcampaigncontent);
 
         //////////////////////////////////////////////////////////////////////////////////////////////////
         ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
@@ -367,15 +352,14 @@ class core_admin_renderer extends plugin_renderer_base {
         $output = '';
 
         if ($checker->enabled()) {
-            $output .= $this->container_start('checkforupdates mb-4');
+            $output .= $this->container_start('checkforupdates');
             $output .= $this->single_button(
                 new moodle_url($reloadurl, array('fetchupdates' => 1)),
                 get_string('checkforupdates', 'core_plugin')
             );
             if ($timefetched = $checker->get_last_timefetched()) {
                 $timefetched = userdate($timefetched, get_string('strftimedatetime', 'core_langconfig'));
-                $output .= $this->container(get_string('checkforupdateslast', 'core_plugin', $timefetched),
-                    'lasttimefetched small text-muted mt-1');
+                $output .= $this->container(get_string('checkforupdateslast', 'core_plugin', $timefetched), 'lasttimefetched');
             }
             $output .= $this->container_end();
         }
@@ -439,7 +423,7 @@ class core_admin_renderer extends plugin_renderer_base {
 
         if ($repotype = $pluginman->plugin_external_source($pluginfo->component)) {
             $confirm .= $this->output->container(get_string('uninstalldeleteconfirmexternal', 'core_plugin', $repotype),
-                'alert alert-warning mt-2');
+                'uninstalldeleteconfirmexternal');
         }
 
         // After any uninstall we must execute full upgrade to finish the cleanup!
@@ -518,7 +502,7 @@ class core_admin_renderer extends plugin_renderer_base {
      * @return string HTML to output.
      */
     protected function warning($message, $type = 'warning') {
-        return $this->box($message, 'generalbox alert alert-' . $type);
+        return $this->box($message, 'generalbox admin' . $type);
     }
 
     /**
@@ -533,7 +517,7 @@ class core_admin_renderer extends plugin_renderer_base {
             return $this->warning(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot));
 
         } else if ($insecuredataroot == INSECURE_DATAROOT_ERROR) {
-            return $this->warning(get_string('datarootsecurityerror', 'admin', $CFG->dataroot), 'danger');
+            return $this->warning(get_string('datarootsecurityerror', 'admin', $CFG->dataroot), 'error');
 
         } else {
             return '';
@@ -551,7 +535,7 @@ class core_admin_renderer extends plugin_renderer_base {
         if ($devlibdir) {
             $moreinfo = new moodle_url('/report/security/index.php');
             $warning = get_string('devlibdirpresent', 'core_admin', ['moreinfourl' => $moreinfo->out()]);
-            return $this->warning($warning, 'danger');
+            return $this->warning($warning, 'error');
 
         } else {
             return '';
@@ -608,27 +592,19 @@ class core_admin_renderer extends plugin_renderer_base {
             return '';
         }
 
-        $check = new \tool_task\check\cronrunning();
-        $result = $check->get_result();
-        return $this->warning($result->get_summary() . ' ' . $this->help_icon('cron', 'admin'));
-    }
+        if (empty($CFG->cronclionly)) {
+            $url = new moodle_url('/admin/cron.php');
+            if (!empty($CFG->cronremotepassword)) {
+                $url = new moodle_url('/admin/cron.php', array('password' => $CFG->cronremotepassword));
+            }
 
-    /**
-     * Render an appropriate message if cron is not being run frequently (recommended every minute).
-     *
-     * @param bool $croninfrequent
-     * @return string HTML to output.
-     */
-    public function cron_infrequent_warning(bool $croninfrequent) : string {
-        global $CFG;
-
-        if (!$croninfrequent) {
-            return '';
+            return $this->warning(get_string('cronwarning', 'admin', $url->out()) . ' ' .
+                    $this->help_icon('cron', 'admin'));
         }
 
-        $check = new \tool_task\check\cronrunning();
-        $result = $check->get_result();
-        return $this->warning($result->get_summary() . ' ' . $this->help_icon('cron', 'admin'));
+        // $CFG->cronclionly is not empty: cron can run only from CLI.
+        return $this->warning(get_string('cronwarningcli', 'admin') . ' ' .
+                $this->help_icon('cron', 'admin'));
     }
 
     /**
@@ -690,20 +666,6 @@ class core_admin_renderer extends plugin_renderer_base {
         return $this->warning(get_string('sitemaintenancewarning2', 'admin', $url));
     }
 
-    /**
-     * Render a warning that ssl is forced because the site was on loginhttps.
-     *
-     * @param bool $overridetossl Whether or not ssl is being forced.
-     * @return string
-     */
-    protected function overridetossl_warning($overridetossl) {
-        if (!$overridetossl) {
-            return '';
-        }
-        $warning = get_string('overridetossl', 'core_admin');
-        return $this->warning($warning, 'warning');
-    }
-
     /**
      * Display a warning about installing development code if necesary.
      * @param int $maturity
@@ -718,7 +680,7 @@ class core_admin_renderer extends plugin_renderer_base {
         return $this->warning(
                     $this->container(get_string('maturitycorewarning', 'admin', $maturitylevel)) .
                     $this->container($this->doc_link('admin/versions', get_string('morehelp'))),
-                'danger');
+                'error');
     }
 
     /*
@@ -734,7 +696,7 @@ class core_admin_renderer extends plugin_renderer_base {
         }
 
         $warning = (get_string('testsiteupgradewarning', 'admin', $testsite));
-        return $this->warning($warning, 'danger');
+        return $this->warning($warning, 'error');
     }
 
     /**
@@ -769,7 +731,7 @@ class core_admin_renderer extends plugin_renderer_base {
         $level = 'warning';
 
         if ($maturity == MATURITY_ALPHA) {
-            $level = 'danger';
+            $level = 'error';
         }
 
         $maturitylevel = get_string('maturity' . $maturity, 'admin');
@@ -820,7 +782,7 @@ class core_admin_renderer extends plugin_renderer_base {
             }
         }
 
-        $updateinfo .= $this->container_start('checkforupdates mt-1');
+        $updateinfo .= $this->container_start('checkforupdates');
         $fetchurl = new moodle_url('/admin/index.php', array('fetchupdates' => 1, 'sesskey' => sesskey(), 'cache' => 0));
         $updateinfo .= $this->single_button($fetchurl, get_string('checkforupdates', 'core_plugin'));
         if ($fetch) {
@@ -840,9 +802,11 @@ class core_admin_renderer extends plugin_renderer_base {
      */
     protected function registration_warning($registered) {
 
-        if (!$registered && site_is_public()) {
+        if (!$registered) {
+
             if (has_capability('moodle/site:config', context_system::instance())) {
-                $registerbutton = $this->single_button(new moodle_url('/admin/registration/index.php'),
+                $registerbutton = $this->single_button(new moodle_url('/admin/registration/register.php',
+                    array('huburl' =>  HUB_MOODLEORGHUBURL, 'hubname' => 'Moodle.net')),
                     get_string('register', 'admin'));
                 $str = 'registrationwarning';
             } else {
@@ -861,59 +825,14 @@ class core_admin_renderer extends plugin_renderer_base {
     /**
      * Return an admin page warning if site is not registered with moodle.org
      *
+     * @since Moodle 3.3.2
      * @return string
      */
     public function warn_if_not_registered() {
-        return $this->registration_warning(\core\hub\registration::is_registered());
-    }
-
-    /**
-     * Display a warning about the Mobile Web Services being disabled.
-     *
-     * @param boolean $mobileconfigured true if mobile web services are enabled
-     * @return string HTML to output.
-     */
-    protected function mobile_configuration_warning($mobileconfigured) {
-        $output = '';
-        if (!$mobileconfigured) {
-            $settingslink = new moodle_url('/admin/settings.php', ['section' => 'mobilesettings']);
-            $configurebutton = $this->single_button($settingslink, get_string('enablemobilewebservice', 'admin'));
-            $output .= $this->warning(get_string('mobilenotconfiguredwarning', 'admin') . ' ' . $configurebutton);
-        }
-
-        return $output;
-    }
-
-    /**
-     * Display campaign content.
-     *
-     * @param bool $showcampaigncontent Whether the campaign content should be visible or not.
-     * @return string the campaign content raw html.
-     */
-    protected function campaign_content(bool $showcampaigncontent): string {
-        if (!$showcampaigncontent) {
-            return '';
-        }
-
-        return $this->render_from_template('core/campaign_content', ['lang' => current_language()]);
-    }
-
-    /**
-     * Display a warning about the forgotten password URL not linking to a valid URL.
-     *
-     * @param boolean $invalidforgottenpasswordurl true if the forgotten password URL is not valid
-     * @return string HTML to output.
-     */
-    protected function forgotten_password_url_warning($invalidforgottenpasswordurl) {
-        $output = '';
-        if ($invalidforgottenpasswordurl) {
-            $settingslink = new moodle_url('/admin/settings.php', ['section' => 'manageauths']);
-            $configurebutton = $this->single_button($settingslink, get_string('check', 'moodle'));
-            $output .= $this->warning(get_string('invalidforgottenpasswordurl', 'admin') . ' ' . $configurebutton,
-                'error alert alert-danger');
-        }
-
-        return $output;
+        global $CFG;
+        require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
+        $registrationmanager = new registration_manager();
+        return $this->registration_warning($registrationmanager->get_registeredhub(HUB_MOODLEORGHUBURL) ? true : false);
     }
 
     /**
@@ -923,7 +842,7 @@ class core_admin_renderer extends plugin_renderer_base {
      */
     protected function moodle_available_update_info(\core\update\info $updateinfo) {
 
-        $boxclasses = 'moodleupdateinfo mb-2';
+        $boxclasses = 'moodleupdateinfo';
         $info = array();
 
         if (isset($updateinfo->release)) {
@@ -943,8 +862,7 @@ class core_admin_renderer extends plugin_renderer_base {
         }
 
         if (isset($updateinfo->download)) {
-            $info[] = html_writer::link($updateinfo->download, get_string('download'),
-                array('class' => 'info download btn btn-secondary'));
+            $info[] = html_writer::link($updateinfo->download, get_string('download'), array('class' => 'info download'));
         }
 
         if (isset($updateinfo->url)) {
@@ -952,9 +870,9 @@ class core_admin_renderer extends plugin_renderer_base {
                 array('class' => 'info more'));
         }
 
-        $box  = $this->output->container_start($boxclasses);
-        $box .= $this->output->container(implode(html_writer::tag('span', ' | ', array('class' => 'separator')), $info), '');
-        $box .= $this->output->container_end();
+        $box  = $this->output->box_start($boxclasses);
+        $box .= $this->output->box(implode(html_writer::tag('span', ' ', array('class' => 'separator')), $info), '');
+        $box .= $this->output->box_end();
 
         return $box;
     }
@@ -966,7 +884,7 @@ class core_admin_renderer extends plugin_renderer_base {
     protected function release_notes_link() {
         $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases');
         $releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
-        return $this->box($releasenoteslink, 'generalbox alert alert-info');
+        return $this->box($releasenoteslink, 'generalbox releasenoteslink');
     }
 
     /**
@@ -995,7 +913,7 @@ class core_admin_renderer extends plugin_renderer_base {
      * @return string HTML code
      */
     public function plugins_check_table(core_plugin_manager $pluginman, $version, array $options = array()) {
-        global $CFG;
+
         $plugininfo = $pluginman->get_plugins();
 
         if (empty($plugininfo)) {
@@ -1066,7 +984,7 @@ class core_admin_renderer extends plugin_renderer_base {
                 $displayname = new html_table_cell(
                     $icon.
                     html_writer::span($plugin->displayname, 'pluginname').
-                    html_writer::div($plugin->get_dir(), 'plugindir text-muted small')
+                    html_writer::div($plugin->get_dir(), 'plugindir')
                 );
 
                 $versiondb = new html_table_cell($plugin->versiondb);
@@ -1074,46 +992,44 @@ class core_admin_renderer extends plugin_renderer_base {
 
                 if ($isstandard = $plugin->is_standard()) {
                     $row->attributes['class'] .= ' standard';
-                    $sourcelabel = html_writer::span(get_string('sourcestd', 'core_plugin'), 'sourcetext badge badge-secondary');
+                    $sourcelabel = html_writer::span(get_string('sourcestd', 'core_plugin'), 'sourcetext label');
                 } else {
                     $row->attributes['class'] .= ' extension';
-                    $sourcelabel = html_writer::span(get_string('sourceext', 'core_plugin'), 'sourcetext badge badge-info');
+                    $sourcelabel = html_writer::span(get_string('sourceext', 'core_plugin'), 'sourcetext label label-info');
                 }
 
                 $coredependency = $plugin->is_core_dependency_satisfied($version);
-                $incompatibledependency = $plugin->is_core_compatible_satisfied($CFG->branch);
-
                 $otherpluginsdependencies = $pluginman->are_dependencies_satisfied($plugin->get_other_required_plugins());
-                $dependenciesok = $coredependency && $otherpluginsdependencies && $incompatibledependency;
+                $dependenciesok = $coredependency && $otherpluginsdependencies;
 
                 $statuscode = $plugin->get_status();
                 $row->attributes['class'] .= ' status-' . $statuscode;
-                $statusclass = 'statustext badge ';
+                $statusclass = 'statustext label ';
                 switch ($statuscode) {
                     case core_plugin_manager::PLUGIN_STATUS_NEW:
-                        $statusclass .= $dependenciesok ? 'badge-success' : 'badge-warning';
+                        $statusclass .= $dependenciesok ? 'label-success' : 'label-warning';
                         break;
                     case core_plugin_manager::PLUGIN_STATUS_UPGRADE:
-                        $statusclass .= $dependenciesok ? 'badge-info' : 'badge-warning';
+                        $statusclass .= $dependenciesok ? 'label-info' : 'label-warning';
                         break;
                     case core_plugin_manager::PLUGIN_STATUS_MISSING:
                     case core_plugin_manager::PLUGIN_STATUS_DOWNGRADE:
                     case core_plugin_manager::PLUGIN_STATUS_DELETE:
-                        $statusclass .= 'badge-danger';
+                        $statusclass .= 'label-important';
                         break;
                     case core_plugin_manager::PLUGIN_STATUS_NODB:
                     case core_plugin_manager::PLUGIN_STATUS_UPTODATE:
-                        $statusclass .= $dependenciesok ? 'badge-light' : 'badge-warning';
+                        $statusclass .= $dependenciesok ? '' : 'label-warning';
                         break;
                 }
                 $status = html_writer::span(get_string('status_' . $statuscode, 'core_plugin'), $statusclass);
 
                 if (!empty($installabortable[$plugin->component])) {
                     $status .= $this->output->single_button(
-                        new moodle_url($this->page->url, array('abortinstall' => $plugin->component, 'confirmplugincheck' => 0)),
+                        new moodle_url($this->page->url, array('abortinstall' => $plugin->component)),
                         get_string('cancelinstallone', 'core_plugin'),
                         'post',
-                        array('class' => 'actionbutton cancelinstallone d-block mt-1')
+                        array('class' => 'actionbutton cancelinstallone')
                     );
                 }
 
@@ -1122,7 +1038,7 @@ class core_admin_renderer extends plugin_renderer_base {
                         new moodle_url($this->page->url, array('abortupgrade' => $plugin->component)),
                         get_string('cancelupgradeone', 'core_plugin'),
                         'post',
-                        array('class' => 'actionbutton cancelupgradeone d-block mt-1')
+                        array('class' => 'actionbutton cancelupgradeone')
                     );
                 }
 
@@ -1134,11 +1050,8 @@ class core_admin_renderer extends plugin_renderer_base {
                 }
 
                 $status = new html_table_cell($sourcelabel.' '.$status);
-                if ($plugin->pluginsupported != null) {
-                    $requires = new html_table_cell($this->required_column($plugin, $pluginman, $version, $CFG->branch));
-                } else {
-                    $requires = new html_table_cell($this->required_column($plugin, $pluginman, $version));
-                }
+
+                $requires = new html_table_cell($this->required_column($plugin, $pluginman, $version));
 
                 $statusisboring = in_array($statuscode, array(
                         core_plugin_manager::PLUGIN_STATUS_NODB, core_plugin_manager::PLUGIN_STATUS_UPTODATE));
@@ -1195,7 +1108,7 @@ class core_admin_renderer extends plugin_renderer_base {
             }
         }
 
-        $out .= $this->output->container_start('actions mb-2');
+        $out .= $this->output->container_start('actions');
 
         $installableupdates = $pluginman->filter_installable($pluginman->available_updates());
         if ($installableupdates) {
@@ -1203,16 +1116,16 @@ class core_admin_renderer extends plugin_renderer_base {
                 new moodle_url($this->page->url, array('installupdatex' => 1)),
                 get_string('updateavailableinstallall', 'core_admin', count($installableupdates)),
                 'post',
-                array('class' => 'singlebutton updateavailableinstallall mr-1')
+                array('class' => 'singlebutton updateavailableinstallall')
             );
         }
 
         if ($installabortable) {
             $out .= $this->output->single_button(
-                new moodle_url($this->page->url, array('abortinstallx' => 1, 'confirmplugincheck' => 0)),
+                new moodle_url($this->page->url, array('abortinstallx' => 1)),
                 get_string('cancelinstallall', 'core_plugin', count($installabortable)),
                 'post',
-                array('class' => 'singlebutton cancelinstallall mr-1')
+                array('class' => 'singlebutton cancelinstallall')
             );
         }
 
@@ -1221,17 +1134,15 @@ class core_admin_renderer extends plugin_renderer_base {
                 new moodle_url($this->page->url, array('abortupgradex' => 1)),
                 get_string('cancelupgradeall', 'core_plugin', count($upgradeabortable)),
                 'post',
-                array('class' => 'singlebutton cancelupgradeall mr-1')
+                array('class' => 'singlebutton cancelupgradeall')
             );
         }
 
         $out .= html_writer::div(html_writer::link(new moodle_url($this->page->url, array('showallplugins' => 0)),
-            get_string('plugincheckattention', 'core_plugin')).' '.html_writer::span($sumattention, 'badge badge-light'),
-            'btn btn-link mr-1');
+            get_string('plugincheckattention', 'core_plugin')).' '.html_writer::span($sumattention, 'badge'));
 
         $out .= html_writer::div(html_writer::link(new moodle_url($this->page->url, array('showallplugins' => 1)),
-            get_string('plugincheckall', 'core_plugin')).' '.html_writer::span($sumtotal, 'badge badge-light'),
-            'btn btn-link mr-1');
+            get_string('plugincheckall', 'core_plugin')).' '.html_writer::span($sumtotal, 'badge'));
 
         $out .= $this->output->container_end(); // End of .actions container.
         $out .= $this->output->container_end(); // End of #plugins-check-info container.
@@ -1299,13 +1210,12 @@ class core_admin_renderer extends plugin_renderer_base {
             }
         }
 
-        $out  = $this->output->container_start('plugins-check-dependencies mb-4');
+        $out  = $this->output->container_start('plugins-check-dependencies');
 
         if ($unavailable or $unknown) {
             $out .= $this->output->heading(get_string('misdepsunavail', 'core_plugin'));
             if ($unknown) {
-                $out .= $this->output->render((new \core\output\notification(get_string('misdepsunknownlist', 'core_plugin',
-                    implode(', ', $unknown))))->set_show_closebutton(false));
+                $out .= $this->output->notification(get_string('misdepsunknownlist', 'core_plugin', implode($unknown, ', ')));
             }
             if ($unavailable) {
                 $unavailablelist = array();
@@ -1319,18 +1229,18 @@ class core_admin_renderer extends plugin_renderer_base {
                     }
                     $unavailablelist[] = $unavailablelistitem;
                 }
-                $out .= $this->output->render((new \core\output\notification(get_string('misdepsunavaillist', 'core_plugin',
-                    implode(', ', $unavailablelist))))->set_show_closebutton(false));
+                $out .= $this->output->notification(get_string('misdepsunavaillist', 'core_plugin',
+                    implode($unavailablelist, ', ')));
             }
-            $out .= $this->output->container_start('plugins-check-dependencies-actions mb-4');
+            $out .= $this->output->container_start('plugins-check-dependencies-actions');
             $out .= ' '.html_writer::link(new moodle_url('/admin/tool/installaddon/'),
-                get_string('dependencyuploadmissing', 'core_plugin'), array('class' => 'btn btn-secondary'));
+                get_string('dependencyuploadmissing', 'core_plugin'));
             $out .= $this->output->container_end(); // End of .plugins-check-dependencies-actions container.
         }
 
         if ($available) {
             $out .= $this->output->heading(get_string('misdepsavail', 'core_plugin'));
-            $out .= $this->output->container_start('plugins-check-dependencies-actions mb-2');
+            $out .= $this->output->container_start('plugins-check-dependencies-actions');
 
             $installable = $pluginman->filter_installable($available);
             if ($installable) {
@@ -1338,13 +1248,12 @@ class core_admin_renderer extends plugin_renderer_base {
                     new moodle_url($this->page->url, array('installdepx' => 1)),
                     get_string('dependencyinstallmissing', 'core_plugin', count($installable)),
                     'post',
-                    array('class' => 'singlebutton dependencyinstallmissing d-inline-block mr-1')
+                    array('class' => 'singlebutton dependencyinstallmissing')
                 );
             }
 
             $out .= html_writer::div(html_writer::link(new moodle_url('/admin/tool/installaddon/'),
-                get_string('dependencyuploadmissing', 'core_plugin'), array('class' => 'btn btn-link')),
-                'dependencyuploadmissing d-inline-block mr-1');
+                get_string('dependencyuploadmissing', 'core_plugin')), 'dependencyuploadmissing');
 
             $out .= $this->output->container_end(); // End of .plugins-check-dependencies-actions container.
 
@@ -1383,9 +1292,9 @@ class core_admin_renderer extends plugin_renderer_base {
             $supportedmoodles = array();
             foreach ($plugin->version->supportedmoodles as $moodle) {
                 if ($CFG->branch == str_replace('.', '', $moodle->release)) {
-                    $supportedmoodles[] = html_writer::span($moodle->release, 'badge badge-success');
+                    $supportedmoodles[] = html_writer::span($moodle->release, 'label label-success');
                 } else {
-                    $supportedmoodles[] = html_writer::span($moodle->release, 'badge badge-light');
+                    $supportedmoodles[] = html_writer::span($moodle->release, 'label');
                 }
             }
 
@@ -1399,7 +1308,7 @@ class core_admin_renderer extends plugin_renderer_base {
                 }
                 $info = html_writer::div(
                     get_string('requiredby', 'core_plugin', implode(', ', $requriedby)),
-                    'requiredby mb-1'
+                    'requiredby'
                 );
             } else {
                 $info = '';
@@ -1410,39 +1319,38 @@ class core_admin_renderer extends plugin_renderer_base {
             $info .= html_writer::div(
                 html_writer::link('https://moodle.org/plugins/view.php?plugin='.$plugin->component,
                     get_string('misdepinfoplugin', 'core_plugin')),
-                'misdepinfoplugin d-inline-block mr-3 mb-1'
+                'misdepinfoplugin'
             );
 
             $info .= html_writer::div(
                 html_writer::link('https://moodle.org/plugins/pluginversion.php?id='.$plugin->version->id,
                     get_string('misdepinfoversion', 'core_plugin')),
-                'misdepinfoversion d-inline-block mr-3 mb-1'
+                'misdepinfoversion'
             );
 
-            $info .= html_writer::div(html_writer::link($plugin->version->downloadurl, get_string('download')),
-                'misdepdownload d-inline-block mr-3 mb-1');
+            $info .= html_writer::div(html_writer::link($plugin->version->downloadurl, get_string('download')), 'misdepdownload');
 
             if ($pluginman->is_remote_plugin_installable($plugin->component, $plugin->version->version, $reason)) {
                 $info .= $this->output->single_button(
                     new moodle_url($this->page->url, array('installdep' => $plugin->component)),
                     get_string('dependencyinstall', 'core_plugin'),
                     'post',
-                    array('class' => 'singlebutton dependencyinstall mr-3 mb-1')
+                    array('class' => 'singlebutton dependencyinstall')
                 );
             } else {
                 $reasonhelp = $this->info_remote_plugin_not_installable($reason);
                 if ($reasonhelp) {
-                    $info .= html_writer::div($reasonhelp, 'reasonhelp dependencyinstall d-inline-block mr-3 mb-1');
+                    $info .= html_writer::div($reasonhelp, 'reasonhelp dependencyinstall');
                 }
             }
 
             $info .= $this->output->container_end(); // End of .actions container.
 
             $table->data[] = array(
-                html_writer::div($plugin->name, 'name').' '.html_writer::div($plugin->component, 'component text-muted small'),
+                html_writer::div($plugin->name, 'name').' '.html_writer::div($plugin->component, 'component'),
                 $plugin->version->release,
                 $plugin->version->version,
-                implode(' ', $supportedmoodles),
+                implode($supportedmoodles, ' '),
                 $info
             );
         }
@@ -1474,54 +1382,38 @@ class core_admin_renderer extends plugin_renderer_base {
      * @param \core\plugininfo\base $plugin the plugin we are rendering the row for.
      * @param core_plugin_manager $pluginman provides data on all the plugins.
      * @param string $version
-     * @param int $branch the current Moodle branch
      * @return string HTML code
      */
-    protected function required_column(\core\plugininfo\base $plugin, core_plugin_manager $pluginman, $version, $branch = null) {
+    protected function required_column(\core\plugininfo\base $plugin, core_plugin_manager $pluginman, $version) {
 
         $requires = array();
         $displayuploadlink = false;
         $displayupdateslink = false;
 
-        $requirements = $pluginman->resolve_requirements($plugin, $version, $branch);
-        foreach ($requirements as $reqname => $reqinfo) {
+        foreach ($pluginman->resolve_requirements($plugin, $version) as $reqname => $reqinfo) {
             if ($reqname === 'core') {
                 if ($reqinfo->status == $pluginman::REQUIREMENT_STATUS_OK) {
-                    $class = 'requires-ok text-muted';
+                    $class = 'requires-ok';
                     $label = '';
                 } else {
                     $class = 'requires-failed';
-                    $label = html_writer::span(get_string('dependencyfails', 'core_plugin'), 'badge badge-danger');
+                    $label = html_writer::span(get_string('dependencyfails', 'core_plugin'), 'label label-important');
                 }
-
-                if ($branch != null && !$plugin->is_core_compatible_satisfied($branch)) {
-                    $requires[] = html_writer::tag('li',
-                    html_writer::span(get_string('incompatibleversion', 'core_plugin', $branch), 'dep dep-core').
+                $requires[] = html_writer::tag('li',
+                    html_writer::span(get_string('moodleversion', 'core_plugin', $plugin->versionrequires), 'dep dep-core').
                     ' '.$label, array('class' => $class));
 
-                } else if ($branch != null && $plugin->pluginsupported != null) {
-                    $requires[] = html_writer::tag('li',
-                        html_writer::span(get_string('moodlebranch', 'core_plugin',
-                        array('min' => $plugin->pluginsupported[0], 'max' => $plugin->pluginsupported[1])), 'dep dep-core').
-                        ' '.$label, array('class' => $class));
-
-                } else if ($reqinfo->reqver != ANY_VERSION) {
-                    $requires[] = html_writer::tag('li',
-                        html_writer::span(get_string('moodleversion', 'core_plugin', $plugin->versionrequires), 'dep dep-core').
-                        ' '.$label, array('class' => $class));
-                }
-
             } else {
                 $actions = array();
 
                 if ($reqinfo->status == $pluginman::REQUIREMENT_STATUS_OK) {
                     $label = '';
-                    $class = 'requires-ok text-muted';
+                    $class = 'requires-ok';
 
                 } else if ($reqinfo->status == $pluginman::REQUIREMENT_STATUS_MISSING) {
                     if ($reqinfo->availability == $pluginman::REQUIREMENT_AVAILABLE) {
-                        $label = html_writer::span(get_string('dependencymissing', 'core_plugin'), 'badge badge-warning');
-                        $label .= ' '.html_writer::span(get_string('dependencyavailable', 'core_plugin'), 'badge badge-warning');
+                        $label = html_writer::span(get_string('dependencymissing', 'core_plugin'), 'label label-warning');
+                        $label .= ' '.html_writer::span(get_string('dependencyavailable', 'core_plugin'), 'label label-warning');
                         $class = 'requires-failed requires-missing requires-available';
                         $actions[] = html_writer::link(
                             new moodle_url('https://moodle.org/plugins/view.php', array('plugin' => $reqname)),
@@ -1529,24 +1421,24 @@ class core_admin_renderer extends plugin_renderer_base {
                         );
 
                     } else {
-                        $label = html_writer::span(get_string('dependencymissing', 'core_plugin'), 'badge badge-danger');
+                        $label = html_writer::span(get_string('dependencymissing', 'core_plugin'), 'label label-important');
                         $label .= ' '.html_writer::span(get_string('dependencyunavailable', 'core_plugin'),
-                            'badge badge-danger');
+                            'label label-important');
                         $class = 'requires-failed requires-missing requires-unavailable';
                     }
                     $displayuploadlink = true;
 
                 } else if ($reqinfo->status == $pluginman::REQUIREMENT_STATUS_OUTDATED) {
                     if ($reqinfo->availability == $pluginman::REQUIREMENT_AVAILABLE) {
-                        $label = html_writer::span(get_string('dependencyfails', 'core_plugin'), 'badge badge-warning');
-                        $label .= ' '.html_writer::span(get_string('dependencyavailable', 'core_plugin'), 'badge badge-warning');
+                        $label = html_writer::span(get_string('dependencyfails', 'core_plugin'), 'label label-warning');
+                        $label .= ' '.html_writer::span(get_string('dependencyavailable', 'core_plugin'), 'label label-warning');
                         $class = 'requires-failed requires-outdated requires-available';
                         $displayupdateslink = true;
 
                     } else {
-                        $label = html_writer::span(get_string('dependencyfails', 'core_plugin'), 'badge badge-danger');
+                        $label = html_writer::span(get_string('dependencyfails', 'core_plugin'), 'label label-important');
                         $label .= ' '.html_writer::span(get_string('dependencyunavailable', 'core_plugin'),
-                            'badge badge-danger');
+                            'label label-important');
                         $class = 'requires-failed requires-outdated requires-unavailable';
                     }
                     $displayuploadlink = true;
@@ -1570,14 +1462,13 @@ class core_admin_renderer extends plugin_renderer_base {
             return '';
         }
 
-        $out = html_writer::tag('ul', implode("\n", $requires), array('class' => 'm-0'));
+        $out = html_writer::tag('ul', implode("\n", $requires));
 
         if ($displayuploadlink) {
             $out .= html_writer::div(
                 html_writer::link(
                     new moodle_url('/admin/tool/installaddon/'),
-                    get_string('dependencyuploadmissing', 'core_plugin'),
-                    array('class' => 'btn btn-secondary btn-sm m-1')
+                    get_string('dependencyuploadmissing', 'core_plugin')
                 ),
                 'dependencyuploadmissing'
             );
@@ -1587,20 +1478,12 @@ class core_admin_renderer extends plugin_renderer_base {
             $out .= html_writer::div(
                 html_writer::link(
                     new moodle_url($this->page->url, array('sesskey' => sesskey(), 'fetchupdates' => 1)),
-                    get_string('checkforupdates', 'core_plugin'),
-                    array('class' => 'btn btn-secondary btn-sm m-1')
+                    get_string('checkforupdates', 'core_plugin')
                 ),
                 'checkforupdates'
             );
         }
 
-        // Check if supports is present, and $branch is not in, only if $incompatible check was ok.
-        if ($plugin->pluginsupported != null && $class == 'requires-ok' && $branch != null) {
-            if ($pluginman->check_explicitly_supported($plugin, $branch) == $pluginman::VERSION_NOT_SUPPORTED) {
-                $out .= html_writer::div(get_string('notsupported', 'core_plugin', $branch));
-            }
-        }
-
         return $out;
 
     }
@@ -1616,18 +1499,12 @@ class core_admin_renderer extends plugin_renderer_base {
 
         $plugininfo = $pluginman->get_plugins();
 
-        $numtotal = $numextension = $numupdatable = $numinstallable = 0;
+        $numtotal = $numextension = $numupdatable = 0;
 
         foreach ($plugininfo as $type => $plugins) {
             foreach ($plugins as $name => $plugin) {
-                if ($res = $plugin->available_updates()) {
+                if ($plugin->available_updates()) {
                     $numupdatable++;
-                    foreach ($res as $updateinfo) {
-                        if ($pluginman->is_remote_plugin_installable($updateinfo->component, $updateinfo->version, $reason, false)) {
-                            $numinstallable++;
-                            break;
-                        }
-                    }
                 }
                 if ($plugin->get_status() === core_plugin_manager::PLUGIN_STATUS_MISSING) {
                     continue;
@@ -1670,13 +1547,16 @@ class core_admin_renderer extends plugin_renderer_base {
             $out .= $this->output->heading(get_string('overviewext', 'core_plugin'), 3);
         }
 
-        if ($numinstallable) {
-            $out .= $this->output->single_button(
-                new moodle_url($this->page->url, array('installupdatex' => 1)),
-                get_string('updateavailableinstallall', 'core_admin', $numinstallable),
-                'post',
-                array('class' => 'singlebutton updateavailableinstallall')
-            );
+        if ($numupdatable) {
+            $installableupdates = $pluginman->filter_installable($pluginman->available_updates());
+            if ($installableupdates) {
+                $out .= $this->output->single_button(
+                    new moodle_url($this->page->url, array('installupdatex' => 1)),
+                    get_string('updateavailableinstallall', 'core_admin', count($installableupdates)),
+                    'post',
+                    array('class' => 'singlebutton updateavailableinstallall')
+                );
+            }
         }
 
         $out .= html_writer::div($infoall, 'info info-all').
@@ -1822,13 +1702,13 @@ class core_admin_renderer extends plugin_renderer_base {
                     $source = '';
                 } else {
                     $row->attributes['class'] .= ' extension';
-                    $source = html_writer::div(get_string('sourceext', 'core_plugin'), 'source badge badge-info');
+                    $source = html_writer::div(get_string('sourceext', 'core_plugin'), 'source label label-info');
                 }
 
                 if ($status === core_plugin_manager::PLUGIN_STATUS_MISSING) {
-                    $msg = html_writer::div(get_string('status_missing', 'core_plugin'), 'statusmsg badge badge-danger');
+                    $msg = html_writer::div(get_string('status_missing', 'core_plugin'), 'statusmsg label label-important');
                 } else if ($status === core_plugin_manager::PLUGIN_STATUS_NEW) {
-                    $msg = html_writer::div(get_string('status_new', 'core_plugin'), 'statusmsg badge badge-success');
+                    $msg = html_writer::div(get_string('status_new', 'core_plugin'), 'statusmsg label label-success');
                 } else {
                     $msg = '';
                 }
@@ -1910,7 +1790,7 @@ class core_admin_renderer extends plugin_renderer_base {
             'infos'
         );
 
-        if ($pluginman->is_remote_plugin_installable($updateinfo->component, $updateinfo->version, $reason, false)) {
+        if ($pluginman->is_remote_plugin_installable($updateinfo->component, $updateinfo->version, $reason)) {
             $box .= $this->output->single_button(
                 new moodle_url($this->page->url, array('installupdate' => $updateinfo->component,
                     'installupdateversion' => $updateinfo->version)),
@@ -1950,7 +1830,7 @@ class core_admin_renderer extends plugin_renderer_base {
             get_string('status'),
         );
         $servertable->colclasses = array('centeralign name', 'centeralign info', 'leftalign report', 'leftalign plugin', 'centeralign status');
-        $servertable->attributes['class'] = 'admintable environmenttable generaltable table-sm';
+        $servertable->attributes['class'] = 'admintable environmenttable generaltable';
         $servertable->id = 'serverstatus';
 
         $serverdata = array('ok'=>array(), 'warn'=>array(), 'error'=>array());
@@ -1963,7 +1843,7 @@ class core_admin_renderer extends plugin_renderer_base {
             get_string('status'),
         );
         $othertable->colclasses = array('aligncenter info', 'alignleft report', 'alignleft plugin', 'aligncenter status');
-        $othertable->attributes['class'] = 'admintable environmenttable generaltable table-sm';
+        $othertable->attributes['class'] = 'admintable environmenttable generaltable';
         $othertable->id = 'otherserverstatus';
 
         $otherdata = array('ok'=>array(), 'warn'=>array(), 'error'=>array());
@@ -2059,7 +1939,7 @@ class core_admin_renderer extends plugin_renderer_base {
                 if (empty($CFG->docroot) or $environment_result->plugin) {
                     $report = get_string($stringtouse, 'admin', $rec);
                 } else {
-                    $report = $this->doc_link(join('/', $linkparts), get_string($stringtouse, 'admin', $rec), true);
+                    $report = $this->doc_link(join($linkparts, '/'), get_string($stringtouse, 'admin', $rec));
                 }
                 // Enclose report text in div so feedback text will be displayed underneath it.
                 $report = html_writer::div($report);
@@ -2067,15 +1947,15 @@ class core_admin_renderer extends plugin_renderer_base {
                 // Format error or warning line
                 if ($errorline) {
                     $messagetype = 'error';
-                    $statusclass = 'badge-danger';
+                    $statusclass = 'label-important';
                 } else if ($warningline) {
                     $messagetype = 'warn';
-                    $statusclass = 'badge-warning';
+                    $statusclass = 'label-warning';
                 } else {
                     $messagetype = 'ok';
-                    $statusclass = 'badge-success';
+                    $statusclass = 'label-success';
                 }
-                $status = html_writer::span($status, 'badge ' . $statusclass);
+                $status = html_writer::span($status, 'label ' . $statusclass);
                 // Here we'll store all the feedback found
                 $feedbacktext = '';
                 // Append the feedback if there is some
@@ -2130,16 +2010,8 @@ class core_admin_renderer extends plugin_renderer_base {
         $output .= $this->container_start('upgradekeyreq');
         $output .= $this->heading(get_string('upgradekeyreq', 'core_admin'));
         $output .= html_writer::start_tag('form', array('method' => 'POST', 'action' => $url));
-        $output .= html_writer::empty_tag('input', [
-            'name' => 'upgradekey',
-            'type' => 'password',
-            'class' => 'form-control w-auto',
-        ]);
-        $output .= html_writer::empty_tag('input', [
-            'type' => 'submit',
-            'value' => get_string('submit'),
-            'class' => 'btn btn-primary mt-3',
-        ]);
+        $output .= html_writer::empty_tag('input', array('name' => 'upgradekey', 'type' => 'password'));
+        $output .= html_writer::empty_tag('input', array('value' => get_string('submit'), 'type' => 'submit'));
         $output .= html_writer::end_tag('form');
         $output .= $this->container_end();
         $output .= $this->footer();
@@ -2161,51 +2033,4 @@ class core_admin_renderer extends plugin_renderer_base {
             return $this->warning(get_string('legacylogginginuse'));
         }
     }
-
-    /**
-     * Display message about the benefits of registering on Moodle.org
-     *
-     * @return string
-     */
-    public function moodleorg_registration_message() {
-
-        $out = format_text(get_string('registerwithmoodleorginfo', 'core_hub'), FORMAT_MARKDOWN);
-
-        $out .= html_writer::link(
-            new moodle_url('/admin/settings.php', ['section' => 'moodleservices']),
-            $this->output->pix_icon('i/info', '').' '.get_string('registerwithmoodleorginfoapp', 'core_hub'),
-            ['class' => 'btn btn-link', 'role' => 'opener', 'target' => '_href']
-        );
-
-        $out .= html_writer::link(
-            HUB_MOODLEORGHUBURL,
-            $this->output->pix_icon('i/stats', '').' '.get_string('registerwithmoodleorginfostats', 'core_hub'),
-            ['class' => 'btn btn-link', 'role' => 'opener', 'target' => '_href']
-        );
-
-        $out .= html_writer::link(
-            HUB_MOODLEORGHUBURL.'/sites',
-            $this->output->pix_icon('i/location', '').' '.get_string('registerwithmoodleorginfosites', 'core_hub'),
-            ['class' => 'btn btn-link', 'role' => 'opener', 'target' => '_href']
-        );
-
-        return $this->output->box($out);
-    }
-
-    /**
-     * Display message about benefits of enabling the user feedback feature.
-     *
-     * @param bool $showfeedbackencouragement Whether the encouragement content should be displayed or not
-     * @return string
-     */
-    protected function userfeedback_encouragement(bool $showfeedbackencouragement): string {
-        $output = '';
-
-        if ($showfeedbackencouragement) {
-            $settingslink = new moodle_url('/admin/settings.php', ['section' => 'userfeedback']);
-            $output .= $this->warning(get_string('userfeedbackencouragement', 'admin', $settingslink->out()), 'info');
-        }
-
-        return $output;
-    }
 }

admin/repository.php

@@ -47,6 +47,7 @@ if ($action == 'newon') {
     $visible = false;
 }
 
+require_capability('moodle/site:config', context_system::instance());
 admin_externalpage_setup($pagename);
 
 $sesskeyurl = $CFG->wwwroot.'/'.$CFG->admin.'/repository.php?sesskey=' . sesskey();
@@ -123,13 +124,13 @@ if (($action == 'edit') || ($action == 'new')) {
             }
             $instanceoptionnames = repository::static_function($repository, 'get_instance_option_names');
             if (!empty($instanceoptionnames)) {
-                if (property_exists($fromform, 'enablecourseinstances')) {
+                if (array_key_exists('enablecourseinstances', $fromform)) {
                     $settings['enablecourseinstances'] = $fromform->enablecourseinstances;
                 }
                 else {
                     $settings['enablecourseinstances'] = 0;
                 }
-                if (property_exists($fromform, 'enableuserinstances')) {
+                if (array_key_exists('enableuserinstances', $fromform)) {
                     $settings['enableuserinstances'] = $fromform->enableuserinstances;
                 }
                 else {

admin/repositoryinstance.php

@@ -42,6 +42,7 @@ if ($edit){
 }
 
 admin_externalpage_setup($pagename, '', null, new moodle_url('/admin/repositoryinstance.php'));
+require_capability('moodle/site:config', $context);
 
 $baseurl = new moodle_url("/$CFG->admin/repositoryinstance.php", array('sesskey'=>sesskey()));
 

admin/roles/admins.php

@@ -36,12 +36,15 @@ if (!is_siteadmin()) {
 }
 
 $admisselector = new core_role_admins_existing_selector();
+$admisselector->set_extra_fields(array('username', 'email'));
+
 $potentialadmisselector = new core_role_admins_potential_selector();
+$potentialadmisselector->set_extra_fields(array('username', 'email'));
 
 if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
     if ($userstoadd = $potentialadmisselector->get_selected_users()) {
         $user = reset($userstoadd);
-        $username = $potentialadmisselector->output_user($user);
+        $username = fullname($user) . " ($user->username, $user->email)";
         echo $OUTPUT->header();
         $yesurl = new moodle_url('/admin/roles/admins.php', array('confirmadd'=>$user->id, 'sesskey'=>sesskey()));
         echo $OUTPUT->confirm(get_string('confirmaddadmin', 'core_role', $username), $yesurl, $PAGE->url);
@@ -55,7 +58,7 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
         if ($USER->id == $user->id) {
             // Can not remove self.
         } else {
-            $username = $admisselector->output_user($user);
+            $username = fullname($user) . " ($user->username, $user->email)";
             echo $OUTPUT->header();
             $yesurl = new moodle_url('/admin/roles/admins.php', array('confirmdel'=>$user->id, 'sesskey'=>sesskey()));
             echo $OUTPUT->confirm(get_string('confirmdeladmin', 'core_role', $username), $yesurl, $PAGE->url);
@@ -77,16 +80,9 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
         }
 
         if (isset($admins[$newmain])) {
-            $logstringold = implode(', ', $admins);
-
             unset($admins[$newmain]);
             array_unshift($admins, $newmain);
-
-            $logstringnew = implode(', ', $admins);
-
             set_config('siteadmins', implode(',', $admins));
-            add_to_config_log('siteadmins', $logstringold, $logstringnew, null);
-
             redirect($PAGE->url);
         }
     }
@@ -99,16 +95,8 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
             $admins[$admin] = $admin;
         }
     }
-
-    $logstringold = implode(', ', $admins);
-
     $admins[$confirmadd] = $confirmadd;
-
-    $logstringnew = implode(', ', $admins);
-
     set_config('siteadmins', implode(',', $admins));
-    add_to_config_log('siteadmins', $logstringold, $logstringnew, 'core');
-
     redirect($PAGE->url);
 
 } else if ($confirmdel and confirm_sesskey() and $confirmdel != $USER->id) {
@@ -119,16 +107,8 @@ if (optional_param('add', false, PARAM_BOOL) and confirm_sesskey()) {
             $admins[$admin] = $admin;
         }
     }
-
-    $logstringold = implode(', ', $admins);
-
     unset($admins[$confirmdel]);
-
-    $logstringnew = implode(', ', $admins);
-
     set_config('siteadmins', implode(',', $admins));
-    add_to_config_log('siteadmins', $logstringold, $logstringnew, 'core');
-
     redirect($PAGE->url);
 }
 

admin/roles/allow.php

@@ -29,8 +29,7 @@ $mode = required_param('mode', PARAM_ALPHANUMEXT);
 $classformode = array(
     'assign' => 'core_role_allow_assign_page',
     'override' => 'core_role_allow_override_page',
-    'switch' => 'core_role_allow_switch_page',
-    'view' => 'core_role_allow_view_page'
+    'switch' => 'core_role_allow_switch_page'
 );
 if (!isset($classformode[$mode])) {
     print_error('invalidmode', '', '', $mode);
@@ -46,6 +45,23 @@ $controller = new $classformode[$mode]();
 
 if (optional_param('submit', false, PARAM_BOOL) && data_submitted() && confirm_sesskey()) {
     $controller->process_submission();
+    $syscontext->mark_dirty();
+    $event = null;
+    // Create event depending on mode.
+    switch ($mode) {
+        case 'assign':
+            $event = \core\event\role_allow_assign_updated::create(array('context' => $syscontext));
+            break;
+        case 'override':
+            $event = \core\event\role_allow_override_updated::create(array('context' => $syscontext));
+            break;
+        case 'switch':
+            $event = \core\event\role_allow_switch_updated::create(array('context' => $syscontext));
+            break;
+    }
+    if ($event) {
+        $event->trigger();
+    }
     redirect($baseurl);
 }
 

admin/roles/assign.php

@@ -245,7 +245,7 @@ if ($roleid) {
     $select = new single_select($PAGE->url, 'roleid', $nameswithcounts, $roleid, null);
     $select->label = get_string('assignanotherrole', 'core_role');
     echo $OUTPUT->render($select);
-    echo '<p><a href="' . $url . '">' . get_string('backtoallroles', 'core_role') . '</a></p>';
+    echo '<p><a href="' . $PAGE->url . '">' . get_string('backtoallroles', 'core_role') . '</a></p>';
     echo '</div>';
 
 } else if (empty($assignableroles)) {

admin/roles/classes/allow_assign_page.php

@@ -33,7 +33,7 @@ class core_role_allow_assign_page extends core_role_allow_role_page {
     }
 
     protected function set_allow($fromroleid, $targetroleid) {
-        core_role_set_assign_allowed($fromroleid, $targetroleid);
+        allow_assign($fromroleid, $targetroleid);
     }
 
     protected function get_cell_tooltip($fromrole, $targetrole) {
@@ -46,8 +46,4 @@ class core_role_allow_assign_page extends core_role_allow_role_page {
     public function get_intro_text() {
         return get_string('configallowassign', 'core_admin');
     }
-
-    protected function get_eventclass() {
-        return \core\event\role_allow_assign_updated::class;
-    }
 }

admin/roles/classes/allow_override_page.php

@@ -33,7 +33,7 @@ class core_role_allow_override_page extends core_role_allow_role_page {
     }
 
     protected function set_allow($fromroleid, $targetroleid) {
-        core_role_set_override_allowed($fromroleid, $targetroleid);
+        allow_override($fromroleid, $targetroleid);
     }
 
     protected function get_cell_tooltip($fromrole, $targetrole) {
@@ -46,8 +46,4 @@ class core_role_allow_override_page extends core_role_allow_role_page {
     public function get_intro_text() {
         return get_string('configallowoverride2', 'core_admin');
     }
-
-    protected function get_eventclass() {
-        return \core\event\role_allow_override_updated::class;
-    }
 }

admin/roles/classes/allow_role_page.php

@@ -59,36 +59,12 @@ abstract class core_role_allow_role_page {
      */
     public function process_submission() {
         global $DB;
-
-        $context = context_system::instance();
-        $this->load_current_settings();
-
         // Delete all records, then add back the ones that should be allowed.
         $DB->delete_records($this->tablename);
         foreach ($this->roles as $fromroleid => $notused) {
             foreach ($this->roles as $targetroleid => $alsonotused) {
-                $isallowed = $this->allowed[$fromroleid][$targetroleid];
                 if (optional_param('s_' . $fromroleid . '_' . $targetroleid, false, PARAM_BOOL)) {
                     $this->set_allow($fromroleid, $targetroleid);
-                    // Only trigger events if this role allow relationship did not exist and the checkbox element
-                    // has been submitted.
-                    if (!$isallowed) {
-                        $eventclass = $this->get_eventclass();
-                        $eventclass::create([
-                            'context' => $context,
-                            'objectid' => $fromroleid,
-                            'other' => ['targetroleid' => $targetroleid, 'allow' => true]
-                        ])->trigger();
-                    }
-                } else if ($isallowed) {
-                    // When the user has deselect an existing role allow checkbox but it is in the list of roles
-                    // allowances.
-                    $eventclass = $this->get_eventclass();
-                    $eventclass::create([
-                        'context' => $context,
-                        'objectid' => $fromroleid,
-                        'other' => ['targetroleid' => $targetroleid, 'allow' => false]
-                    ])->trigger();
                 }
             }
         }
@@ -185,10 +161,4 @@ abstract class core_role_allow_role_page {
      * @return string
      */
     public abstract function get_intro_text();
-
-    /**
-     * Returns the allow class respective event class name.
-     * @return string
-     */
-    protected abstract function get_eventclass();
 }

admin/roles/classes/allow_switch_page.php

@@ -41,7 +41,7 @@ class core_role_allow_switch_page extends core_role_allow_role_page {
     }
 
     protected function set_allow($fromroleid, $targetroleid) {
-        core_role_set_switch_allowed($fromroleid, $targetroleid);
+        allow_switch($fromroleid, $targetroleid);
     }
 
     protected function is_allowed_target($targetroleid) {
@@ -58,8 +58,4 @@ class core_role_allow_switch_page extends core_role_allow_role_page {
     public function get_intro_text() {
         return get_string('configallowswitch', 'core_admin');
     }
-
-    protected function get_eventclass() {
-        return \core\event\role_allow_switch_updated::class;
-    }
 }

admin/roles/classes/allow_view_page.php

@@ -1,81 +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/>.
-
-/**
- * Role view matrix.
- *
- * @package    core_role
- * @copyright  2016 onwards Andrew Hancox <andrewdchancox@googlemail.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Subclass of role_allow_role_page for the Allow views tab.
- *
- * @package    core_role
- * @copyright  2016 onwards Andrew Hancox <andrewdchancox@googlemail.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class core_role_allow_view_page extends core_role_allow_role_page {
-    /** @var array */
-    protected $allowedtargetroles;
-
-    /**
-     * core_role_allow_view_page constructor.
-     */
-    public function __construct() {
-        parent::__construct('role_allow_view', 'allowview');
-    }
-
-
-    /**
-     * Allow from role to view target role.
-     * @param int $fromroleid
-     * @param int $targetroleid
-     */
-    protected function set_allow($fromroleid, $targetroleid) {
-        core_role_set_view_allowed($fromroleid, $targetroleid);
-    }
-
-    /**
-     * Get tool tip for cell.
-     * @param string $fromrole
-     * @param string $targetrole
-     * @return string
-     * @throws \coding_exception
-     */
-    protected function get_cell_tooltip($fromrole, $targetrole) {
-        $a = new stdClass;
-        $a->fromrole = $fromrole->localname;
-        $a->targetrole = $targetrole->localname;
-        return get_string('allowroletoview', 'core_role', $a);
-    }
-
-    /**
-     * Get intro text for role allow view page.
-     * @return string
-     * @throws \coding_exception
-     */
-    public function get_intro_text() {
-        return get_string('configallowview', 'core_admin');
-    }
-
-    protected function get_eventclass() {
-        return \core\event\role_allow_view_updated::class;
-    }
-}

admin/roles/classes/capability_table_base.php

@@ -43,7 +43,7 @@ abstract class core_role_capability_table_base {
     protected $id;
 
     /** Added to the class="" attribute on output. */
-    protected $classes = array('rolecap table-hover');
+    protected $classes = array('rolecap');
 
     /** Default number of capabilities in the table for the search UI to be shown. */
     const NUM_CAPS_FOR_SEARCH = 12;

admin/roles/classes/capability_table_with_risks.php

@@ -123,6 +123,9 @@ abstract class core_role_capability_table_with_risks extends core_role_capabilit
             assign_capability($changedcap, $this->permissions[$changedcap],
                 $this->roleid, $this->context->id, true);
         }
+
+        // Force accessinfo refresh for users visiting this context.
+        $this->context->mark_dirty();
     }
 
     public function display() {
@@ -180,14 +183,9 @@ abstract class core_role_capability_table_with_risks extends core_role_capabilit
     public function get_risk_icon($type) {
         global $OUTPUT;
 
-        $alt = get_string("{$type}short", "admin");
-        $title = get_string($type, "admin");
-
-        $text = $OUTPUT->pix_icon('i/' . str_replace('risk', 'risk_', $type), $alt, 'moodle', [
-                'title' => $title,
-            ]);
+        $text = $OUTPUT->pix_icon('i/' . str_replace('risk', 'risk_', $type), get_string($type . 'short', 'admin'));
         $action = new popup_action('click', $this->risksurl, 'docspopup');
-        $riskicon = $OUTPUT->action_link($this->risksurl, $text, $action);
+        $riskicon = $OUTPUT->action_link($this->risksurl, $text, $action, array('title'=>get_string($type, 'admin')));
 
         return $riskicon;
     }

admin/roles/classes/check_capability_table.php

@@ -50,7 +50,6 @@ class core_role_check_capability_table extends core_role_capability_table_base {
         $this->contextname = $contextname;
         $this->stryes = get_string('yes');
         $this->strno = get_string('no');
-        $this->add_classes(['table-striped']);
     }
 
     protected function add_header_cells() {

admin/roles/classes/check_users_selector.php

@@ -69,11 +69,8 @@ class core_role_check_users_selector extends user_selector_base {
 
         if ($coursecontext and $coursecontext != SITEID) {
             $sql1 = " FROM {user} u
-                      JOIN (SELECT DISTINCT subu.id
-                              FROM {user} subu
-                              JOIN {user_enrolments} ue ON (ue.userid = subu.id)
-                              JOIN {enrol} e ON (e.id = ue.enrolid AND e.courseid = :courseid1)
-                           ) subq ON subq.id = u.id
+                      JOIN {user_enrolments} ue ON (ue.userid = u.id)
+                      JOIN {enrol} e ON (e.id = ue.enrolid AND e.courseid = :courseid1)
                      WHERE $wherecondition";
             $params['courseid1'] = $coursecontext->instanceid;