Moodle release 3.2.3

Automatically generated installer lang files
2017-05-07 21:32:59 +02:00 · 2017-05-08 00:06:07 +08:00 · 2017-05-07 00:05:59 +08:00 · 2017-05-05 17:26:59 +02:00 · 2017-05-05 15:08:55 +08:00 · 2017-05-05 14:51:15 +08:00
9139 changed files with 240259 additions and 835443 deletions
@@ -3,20 +3,17 @@
 */**/build/
 node_modules/
 vendor/
-admin/tool/policy/amd/src/jquery-eu-cookie-law-popup.js
 admin/tool/usertours/amd/src/tour.js
+admin/tool/usertours/amd/src/popper.js
 auth/cas/CAS/
-cache/stores/mongodb/MongoDB/
+auth/fc/fcFPP.php
 enrol/lti/ims-blti/
 filter/algebra/AlgParser.pm
 filter/tex/mimetex.*
-lib/editor/atto/plugins/html/yui/src/codemirror/
-lib/editor/atto/plugins/html/yui/src/beautify/
 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/mlbackend/php/phpml/
 lib/adodb/
 lib/bennu/
 lib/evalmath/
@@ -44,6 +41,7 @@ lib/html2text/
 lib/markdown/
 lib/recaptchalib.php
 lib/xhprof/
+lib/xmlize.php
 lib/horde/
 lib/requirejs/
 lib/amd/src/loglevel.js
@@ -58,18 +56,9 @@ lib/amd/src/chartjs-lazy.js
 lib/maxmind/GeoIp2/
 lib/maxmind/MaxMind/
 lib/ltiprovider/
-lib/amd/src/truncate.js
-lib/fonts/
-lib/amd/src/adapter.js
-lib/validateurlsyntax.php
-lib/amd/src/popper.js
-lib/geopattern-php/
-lib/php-jwt/
 media/player/videojs/amd/src/video-lazy.js
 media/player/videojs/amd/src/Youtube-lazy.js
 media/player/videojs/videojs/
-media/player/videojs/amd/src/videojs-flash-lazy.js
-media/player/videojs/videojs/video-js.swf
 mod/assign/feedback/editpdf/fpdi/
 repository/s3/S3.php
 theme/boost/scss/bootstrap/
@@ -85,4 +74,6 @@ 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
@@ -1,7 +1,4 @@
 {
-  'plugins': [
-    'promise',
-  ],
  'env': {
    'browser': true,
    'amd': true
@@ -16,7 +13,6 @@

    // === Possible Errors ===
    'comma-dangle': 'off',
-    'no-compare-neg-zero': 'error',
    'no-cond-assign': 'error',
    'no-console': 'error',
    'no-constant-condition': 'error',
@@ -68,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',
@@ -106,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',
@@ -174,41 +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'
-      }
-    },
-    {
-      files: ["**/amd/src/*.js"],
-      // Check AMD with some slightly stricter rules.
-      rules: {
-        'no-unused-vars': 'error',
-        'no-implicit-globals': 'error'
-      }
-    }
-  ]
+  }
 }
@@ -1,20 +0,0 @@
-{
-  "indentation": ["on",{
-    "Feature": 0,
-    "Background": 2,
-    "Scenario": 2,
-    "Step": 4,
-    "given": 4,
-    "and": 4
-  }],
-  "no-dupe-feature-names": "on",
-  "no-dupe-scenario-names": "off",
-  "no-empty-file": "on",
-  "no-files-without-scenarios": "on",
-  "no-multiple-empty-lines": "on",
-  "no-partially-commented-tag-lines": "on",
-  "no-trailing-spaces": "on",
-  "no-unamed-features": "on",
-  "no-unamed-scenarios": "on",
-  "no-scenario-outlines-without-examples": "on"
-}
@@ -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
@@ -9,18 +9,10 @@
 #
 # 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.*
@@ -1,23 +1,20 @@
 # Generated by "grunt ignorefiles"
-**/yui/build/*
-theme/boost/style/moodle.css
-theme/classic/style/moodle.css
+theme/bootstrapbase/style/
+theme/clean/style/custom.css
+theme/more/style/custom.css
 node_modules/
 vendor/
-admin/tool/policy/amd/src/jquery-eu-cookie-law-popup.js
 admin/tool/usertours/amd/src/tour.js
+admin/tool/usertours/amd/src/popper.js
 auth/cas/CAS/
-cache/stores/mongodb/MongoDB/
+auth/fc/fcFPP.php
 enrol/lti/ims-blti/
 filter/algebra/AlgParser.pm
 filter/tex/mimetex.*
-lib/editor/atto/plugins/html/yui/src/codemirror/
-lib/editor/atto/plugins/html/yui/src/beautify/
 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/mlbackend/php/phpml/
 lib/adodb/
 lib/bennu/
 lib/evalmath/
@@ -45,6 +42,7 @@ lib/html2text/
 lib/markdown/
 lib/recaptchalib.php
 lib/xhprof/
+lib/xmlize.php
 lib/horde/
 lib/requirejs/
 lib/amd/src/loglevel.js
@@ -59,18 +57,9 @@ lib/amd/src/chartjs-lazy.js
 lib/maxmind/GeoIp2/
 lib/maxmind/MaxMind/
 lib/ltiprovider/
-lib/amd/src/truncate.js
-lib/fonts/
-lib/amd/src/adapter.js
-lib/validateurlsyntax.php
-lib/amd/src/popper.js
-lib/geopattern-php/
-lib/php-jwt/
 media/player/videojs/amd/src/video-lazy.js
 media/player/videojs/amd/src/Youtube-lazy.js
 media/player/videojs/videojs/
-media/player/videojs/amd/src/videojs-flash-lazy.js
-media/player/videojs/videojs/video-js.swf
 mod/assign/feedback/editpdf/fpdi/
 repository/s3/S3.php
 theme/boost/scss/bootstrap/
@@ -86,4 +75,6 @@ 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
@@ -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,
@@ -2,7 +2,7 @@
 # process (which uses our internal CI system) this file is here for the benefit
 # of community developers git clones - see MDL-51458.

-sudo: required
+sudo: false

 # We currently disable Travis notifications entirely until https://github.com/travis-ci/travis-ci/issues/4976
 # is fixed.
@@ -13,25 +13,17 @@ language: php

 php:
    # We only run the highest and lowest supported versions to reduce the load on travis-ci.org.
-    - 7.2
    - 7.1
+    - 5.6

-addons:
-  postgresql: "9.6"
-  packages:
-    - mysql-server-5.6
-    - mysql-client-core-5.6
-    - mysql-client-5.6
-
-# Redis tests are currently failing on php 7.2 due to https://bugs.php.net/bug.php?id=75628
-# services:
-#     - redis-server
+services:
+    - redis-server

 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.2, so run that first.
+    # 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.

@@ -54,15 +46,22 @@ matrix:
    fast_finish: true

    include:
+          # 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.2
-          env: DB=none     TASK=GRUNT   NVM_VERSION='lts/carbon'
+        - php: 7.1
+          env: DB=none     TASK=GRUNT   NVM_VERSION='node'

    exclude:
        # MySQL - it's just too slow.
-        # Exclude it on all versions except for 7.2
+        # Exclude it on all versions except for 7.1

        - env: DB=mysqli   TASK=PHPUNIT
+          php: 5.6
+
+        # Moodle 2.7 is not compatible with PHP 7 for the upgrade test.
+        - env: DB=pgsql    TASK=UPGRADE
          php: 7.1

 cache:
@@ -71,26 +70,6 @@ cache:
      - $HOME/.npm

 install:
-    - >
-        if [ "$DB" = 'mysqli' ];
-        then
-            sudo mkdir /mnt/ramdisk
-            sudo mount -t tmpfs -o size=1024m tmpfs /mnt/ramdisk
-            sudo stop mysql
-            sudo mv /var/lib/mysql /mnt/ramdisk
-            sudo ln -s /mnt/ramdisk/mysql /var/lib/mysql
-            sudo start mysql
-        fi
-    - >
-        if [ "$DB" = 'pgsql' ];
-        then
-            sudo mkdir /mnt/ramdisk
-            sudo mount -t tmpfs -o size=1024m tmpfs /mnt/ramdisk
-            sudo service postgresql stop
-            sudo mv /var/lib/postgresql /mnt/ramdisk
-            sudo ln -s /mnt/ramdisk/postgresql /var/lib/postgresql
-            sudo service postgresql start 9.6
-        fi
    - >
        if [ "$TASK" = 'PHPUNIT' ];
        then
@@ -100,9 +79,8 @@ install:
            fi

            # Enable Redis.
-            # Redis tests are currently failing on php 7.2 due to https://bugs.php.net/bug.php?id=75628
-            # echo 'extension="redis.so"' > /tmp/redis.ini
-            # phpenv config-add /tmp/redis.ini
+            echo 'extension="redis.so"' > /tmp/redis.ini
+            phpenv config-add /tmp/redis.ini

            # Install composer dependencies.
            # We need --no-interaction in case we hit API limits for composer. This causes it to fall back to a standard clone.
@@ -136,7 +114,7 @@ before_script:

        # The wwwroot and dataroot.
        sed -i \
-          -e "s%http://example.com/moodle%https://localhost%" \
+          -e "s%http://example.com/moodle%http://localhost%" \
          -e "s%/home/example/moodledata%/home/travis/roots/base%" \
          config.php ;

@@ -173,11 +151,10 @@ before_script:
        mkdir -p "$HOME"/roots/phpunit

        # The phpunit dataroot and prefix..
-        # Redis tests are currently failing on php 7.2 due to https://bugs.php.net/bug.php?id=75628
-        # -e "/require_once/i \\define('TEST_SESSION_REDIS_HOST', '127.0.0.1');" \
        sed -i \
          -e "/require_once/i \\\$CFG->phpunit_dataroot = '\/home\/travis\/roots\/phpunit';" \
          -e "/require_once/i \\\$CFG->phpunit_prefix = 'p_';" \
+          -e "/require_once/i \\define('TEST_SESSION_REDIS_HOST', '127.0.0.1');" \
          config.php ;

        # Initialise PHPUnit for Moodle.
@@ -207,7 +184,7 @@ before_script:
        # We need the official upstream for comparison
        git remote add upstream https://github.com/moodle/moodle.git;

-        git fetch upstream MOODLE_37_STABLE;
+        git fetch upstream MOODLE_32_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`
@@ -227,9 +204,9 @@ before_script:
        # We need the official upstream.
        git remote add upstream https://github.com/moodle/moodle.git;

-        # Checkout 30 STABLE branch (the first version compatible with PHP 7.x)
-        git fetch upstream MOODLE_30_STABLE;
-        git checkout MOODLE_30_STABLE;
+        # 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;
@@ -248,7 +225,7 @@ script:
    - >
      if [ "$TASK" = 'PHPUNIT' ];
      then
-        vendor/bin/phpunit --fail-on-risky --disallow-test-output --verbose;
+        vendor/bin/phpunit;
      fi

    - >
@@ -263,9 +240,7 @@ 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

@@ -37,7 +37,7 @@ module.exports = function(grunt) {
    var expected = semver.validRange(grunt.file.readJSON('package.json').engines.node);
    var actual = semver.valid(process.version);
    if (!semver.satisfies(actual, expected)) {
-        grunt.fail.fatal('Node version not satisfied. Require ' + expected + ', version installed: ' + actual);
+        grunt.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
@@ -106,15 +106,33 @@ module.exports = function(grunt) {
        return libs;
    };

+
    // 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.
            options: {quiet: !grunt.option('show-lint-warnings')},
-            amd: {src: amdSrc},
+            amd: {
+              src: amdSrc,
+              // Check AMD with some slightly stricter rules.
+              rules: {
+                'no-unused-vars': 'error',
+                'no-implicit-globals': 'error'
+              }
+            },
            // Check YUI module source files.
-            yui: {src: ['**/yui/src/**/*.js', '!*/**/yui/src/*/meta/*.js']}
+            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'
+                   }
+               }
+            }
        },
        uglify: {
            amd: {
@@ -126,16 +144,16 @@ module.exports = function(grunt) {
                options: {report: 'none'}
            }
        },
-        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: {
-                includePaths: ["theme/boost/scss/", "theme/classic/scss/"]
-            }
+           }
        },
        watch: {
            options: {
@@ -145,14 +163,14 @@ module.exports = function(grunt) {
                files: ['**/amd/src/**/*.js'],
                tasks: ['amd']
            },
+            bootstrapbase: {
+                files: ["theme/bootstrapbase/less/**/*.less"],
+                tasks: ["css"]
+            },
            yui: {
                files: ['**/yui/src/**/*.js'],
                tasks: ['yui']
            },
-            gherkinlint: {
-                files: ['**/tests/behat/*.feature'],
-                tasks: ['gherkinlint']
-            }
        },
        shifter: {
            options: {
@@ -160,12 +178,20 @@ module.exports = function(grunt) {
                paths: [cwd]
            }
        },
-        gherkinlint: {
-            options: {
-                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']
@@ -177,6 +203,7 @@ module.exports = function(grunt) {
                        rules: {
                            // These rules have to be disabled in .stylelintrc for scss compat.
                            "at-rule-no-unknown": true,
+                            "no-browser-hacks": [true, {"severity": "warning"}]
                        }
                    }
                }
@@ -196,9 +223,9 @@ module.exports = function(grunt) {
      // Generate .stylelintignore.
      var stylelintIgnores = [
          '# Generated by "grunt ignorefiles"',
-          '**/yui/build/*',
-          'theme/boost/style/moodle.css',
-          'theme/classic/style/moodle.css',
+          'theme/bootstrapbase/style/',
+          'theme/clean/style/custom.css',
+          'theme/more/style/custom.css'
      ].concat(thirdPartyPaths);
      grunt.file.write('.stylelintignore', stylelintIgnores.join('\n'));
    };
@@ -291,22 +318,6 @@ module.exports = function(grunt) {
        }, done);
    };

-    tasks.gherkinlint = function() {
-        var done = this.async(),
-            options = grunt.config('gherkinlint.options');
-
-        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() {
        // Are we in a YUI directory?
        if (path.basename(path.resolve(cwd, '../../')) == 'yui') {
@@ -318,7 +329,6 @@ module.exports = function(grunt) {
            // Run them all!.
            grunt.task.run('css');
            grunt.task.run('js');
-            grunt.task.run('gherkinlint');
        }
    };

@@ -332,7 +342,7 @@ module.exports = function(grunt) {
          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('gherkinlint.options.files', files);
+          grunt.config('stylelint.less.src', files);
          changedFiles = Object.create(null);
    }, 200);

@@ -343,21 +353,20 @@ module.exports = function(grunt) {

    // 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');

    // 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('yui', ['eslint:yui', 'shifter']);
    grunt.registerTask('amd', ['eslint:amd', 'uglify']);
    grunt.registerTask('js', ['amd', 'yui']);

    // Register CSS taks.
-    grunt.registerTask('css', ['stylelint:scss', 'sass', 'stylelint:css']);
+    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);
@@ -16,9 +16,6 @@ $err = array();

 $returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageauths";

-debugging("Use of config.html files in authentication plugins have been deprecated. " .
-          " Please migrate your plugin to use the admin settings API", DEBUG_DEVELOPER);
-
 // save configuration changes
 if ($frm = data_submitted() and confirm_sesskey()) {

@@ -89,28 +86,12 @@ exit;

 /// Functions /////////////////////////////////////////////////////////////////

-
-/**
- * auth field locking
- * Good enough for most auth plugins
- * but some may want a custom one if they are offering
- * other options
- * Note: lockconfig_ fields have special handling.
- *
- * @param string $auth authentication plugin shortname
- * @param array $user_fields user profile fields
- * @param string $helptext help text to be displayed at top of form
- * @param boolean $retrieveopts Map fields or lock only.
- * @param boolean $updateopts Allow remote updates
- * @param array $customfields list of custom profile fields
- * @deprecated since Moodle 3.3
- */
+// Good enough for most auth plugins
+// but some may want a custom one if they are offering
+// other options
+// Note: lockconfig_ fields have special handling.
 function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts, $updateopts, $customfields = array()) {
    global $DB, $OUTPUT;
-    debugging("The function 'print_auth_lock_options' has been deprecated, " .
-              "Please migrate your code to use the admin settings API and use the function 'display_auth_lock_options' instead. ",
-              DEBUG_DEVELOPER);
-
    echo '<tr><td colspan="3">';
    if ($retrieveopts) {
        echo $OUTPUT->heading(get_string('auth_data_mapping', 'auth'));
@@ -165,12 +146,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 {
@@ -168,10 +168,10 @@
            $visible = '';
        } else if ($blocks[$blockid]->visible) {
            $visible = '<a href="blocks.php?hide='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strhide.'">'.
-                       $OUTPUT->pix_icon('t/hide', $strhide) . '</a>';
+                       '<img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.$strhide.'" /></a>';
        } else {
            $visible = '<a href="blocks.php?show='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strshow.'">'.
-                       $OUTPUT->pix_icon('t/show', $strshow) . '</a>';
+                       '<img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.$strshow.'" /></a>';
            $class = 'dimmed_text';
        }

@@ -186,10 +186,10 @@
            $undeletable = '';
        } else if (in_array($blockname, $undeletableblocktypes)) {
            $undeletable = '<a href="blocks.php?unprotect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strunprotect.'">'.
-                       $OUTPUT->pix_icon('t/unlock', $strunprotect) . '</a>';
+                       '<img src="'.$OUTPUT->pix_url('t/unlock') . '" class="iconsmall" alt="'.$strunprotect.'" /></a>';
        } else {
            $undeletable = '<a href="blocks.php?protect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strprotect.'">'.
-                       $OUTPUT->pix_icon('t/lock', $strprotect) . '</a>';
+                       '<img src="'.$OUTPUT->pix_url('t/lock') . '" class="iconsmall" alt="'.$strprotect.'" /></a>';
        }

        $row = array(
@@ -54,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');
@@ -75,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()) {
@@ -91,7 +89,7 @@ if ($PAGE->user_allowed_editing()) {
 $savebutton = false;
 $outputhtml = '';
 foreach ($settingspage->children as $childpage) {
-    if ($childpage->is_hidden() || !$childpage->check_access()) {
+    if ($childpage->is_hidden()) {
        continue;
    }
    if ($childpage instanceof admin_externalpage) {
@@ -129,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();

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

@@ -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;
@@ -219,6 +224,7 @@ $databases = array('mysqli' => moodle_database::get_driver_instance('mysqli', 'n
                   '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) {
@@ -442,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';

@@ -710,7 +715,7 @@ if ($interactive) {
    cli_separator();
    cli_heading(get_string('cliadminemail', 'install'));
    $prompt = get_string('clitypevaluedefault', 'admin', $options['adminemail']);
-    $options['adminemail'] = cli_input($prompt, $options['adminemail']);
+    $options['adminemail'] = cli_input($prompt);
 }

 // Validate that the address provided was an e-mail address.
@@ -803,12 +808,6 @@ if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {

 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";
 }
@@ -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
@@ -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);
@@ -53,7 +53,7 @@ Options:
 -h, --help            Print out this help

 Example:
-\$ sudo -u www-data /usr/bin/php admin/cli/mysql_collation.php --collation=utf8mb4_unicode_ci
+\$ sudo -u www-data /usr/bin/php admin/cli/mysql_collation.php --collation=utf8_general_ci
 ";

 if (!empty($options['collation'])) {
@@ -145,22 +145,9 @@ if (!empty($options['collation'])) {
            $skipped++;

        } else {
-            try {
-                $DB->change_database_structure("ALTER TABLE $table->name CONVERT TO CHARACTER SET $charset COLLATE $collation");
-                echo "CONVERTED\n";
-                $converted++;
-            } catch (ddl_exception $e) {
-                $result = mysql_set_row_format($table->name, $charset, $collation, $engine);
-                if ($result) {
-                    echo "CONVERTED\n";
-                    $converted++;
-                } else {
-                    // We don't know what the problem is. Stop the conversion.
-                    cli_error("Error: Tried to convert $table->name, but there was a problem. Please check the details of this
-                            table and try again.");
-                    die();
-                }
-            }
+            $DB->change_database_structure("ALTER TABLE $table->name DEFAULT CHARACTER SET $charset DEFAULT COLLATE = $collation");
+            echo "CONVERTED\n";
+            $converted++;
        }

        $sql = "SHOW FULL COLUMNS FROM $table->name WHERE collation IS NOT NULL";
@@ -203,7 +190,7 @@ if (!empty($options['collation'])) {
                $DB->change_database_structure($sql);
            } else {
                echo "ERROR (unknown column type: $column->type)\n";
-                $errors++;
+                $error++;
                continue;
            }
            echo "CONVERTED\n";
@@ -303,26 +290,3 @@ function mysql_get_column_collations($tablename) {
    $rs->close();
    return $collations;
 }
-
-function mysql_set_row_format($tablename, $charset, $collation, $engine) {
-    global $DB;
-
-    $sql = "SELECT row_format
-              FROM INFORMATION_SCHEMA.TABLES
-             WHERE table_schema = DATABASE() AND table_name = ?";
-    $rs = $DB->get_record_sql($sql, array($tablename));
-    if ($rs) {
-        if ($rs->row_format == 'Compact' || $rs->row_format == 'Redundant') {
-            $rowformat = $DB->get_row_format_sql($engine, $collation);
-            // Try to convert to compressed format and then try updating the collation again.
-            $DB->change_database_structure("ALTER TABLE $tablename $rowformat");
-            $DB->change_database_structure("ALTER TABLE $tablename CONVERT TO CHARACTER SET $charset COLLATE $collation");
-        } else {
-            // Row format may not be the problem. Can not diagnose problem. Send fail reply.
-            return false;
-        }
-    } else {
-        return false;
-    }
-    return true;
-}
@@ -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);
@@ -1,163 +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-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-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-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']) {
-    foreach ($plugininfo as $type => $plugins) {
-        foreach ($plugins as $name => $plugin) {
-            $pluginstring = $plugin->component . "\t" . $plugin->displayname;
-
-            if ($options['show-all']) {
-                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);
@@ -51,8 +51,7 @@ list($options, $unrecognized) = cli_get_params(
        'non-interactive'   => false,
        'allow-unstable'    => false,
        'help'              => false,
-        'lang'              => $lang,
-        'verbose-settings'  => false
+        'lang'              => $lang
    ),
    array(
        'h' => 'help'
@@ -85,9 +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.
 -h, --help            Print out this help

 Example:
@@ -135,11 +131,10 @@ if (!core_plugin_manager::instance()->all_plugins_ok($version, $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;
 }

@@ -188,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
@@ -1,62 +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_login();
-require_capability('moodle/site:config', $syscontext);
-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);
@@ -1754,7 +1754,6 @@
      <VENDOR name="oracle" version="10.2" />
    </DATABASE>
    <PHP version="5.6.5" level="required">
-      <RESTRICT function="restrict_php_version_72" message="unsupportedphpversion72" />
    </PHP>
    <PCREUNICODE level="optional">
      <FEEDBACK>
@@ -1920,7 +1919,6 @@
      <VENDOR name="oracle" version="10.2" />
    </DATABASE>
    <PHP version="5.6.5" level="required">
-      <RESTRICT function="restrict_php_version_72" message="unsupportedphpversion72" />
    </PHP>
    <PCREUNICODE level="optional">
      <FEEDBACK>
@@ -2083,720 +2081,4 @@
      </CUSTOM_CHECK>
    </CUSTOM_CHECKS>
  </MOODLE>
-  <MOODLE version="3.4" requires="3.0">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mariadb" version="5.5.31" />
-      <VENDOR name="mysql" version="5.5.31" />
-      <VENDOR name="postgres" version="9.3" />
-      <VENDOR name="mssql" version="10.0" />
-      <VENDOR name="oracle" version="10.2" />
-    </DATABASE>
-    <PHP version="7.0.0" level="required">
-      <RESTRICT function="restrict_php_version_73" message="unsupportedphpversion73" />
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="opensslrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zlib" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="gdrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlreader" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="intlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-      <PHP_EXTENSION name="fileinfo" level="required"/>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="96M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="opcache.enable" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opcacherecommended" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbstorageengine" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="quizattemptsupgradedmessage" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="slashargumentswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unsupporteddbtablerowformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unoconvwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="libcurlwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfileformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfilepertable" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddblargeprefix" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="ishttpswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="incompleteunicodesupport" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="3.5" requires="3.1">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mariadb" version="5.5.31" />
-      <VENDOR name="mysql" version="5.5.31" />
-      <VENDOR name="postgres" version="9.3" />
-      <VENDOR name="mssql" version="10.0" />
-      <VENDOR name="oracle" version="10.2" />
-    </DATABASE>
-    <PHP version="7.0.0" level="required">
-      <RESTRICT function="restrict_php_version_73" message="unsupportedphpversion73" />
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="opensslrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zlib" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="gdrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlreader" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="intlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-      <PHP_EXTENSION name="fileinfo" level="required"/>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="96M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="opcache.enable" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opcacherecommended" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbstorageengine" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="quizattemptsupgradedmessage" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="slashargumentswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unsupporteddbtablerowformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unoconvwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="libcurlwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfileformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfilepertable" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddblargeprefix" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="ishttpswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="incompleteunicodesupport" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="3.6" requires="3.1">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mariadb" version="5.5.31" />
-      <VENDOR name="mysql" version="5.6" />
-      <VENDOR name="postgres" version="9.4" />
-      <VENDOR name="mssql" version="10.0" />
-      <VENDOR name="oracle" version="11.2" />
-    </DATABASE>
-    <PHP version="7.0.0" level="required">
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="opensslrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zlib" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="gdrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlreader" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="intlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-      <PHP_EXTENSION name="fileinfo" level="required"/>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="96M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="opcache.enable" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opcacherecommended" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbstorageengine" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="quizattemptsupgradedmessage" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="slashargumentswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unsupporteddbtablerowformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unoconvwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="libcurlwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfileformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfilepertable" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddblargeprefix" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="ishttpswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="incompleteunicodesupport" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="sixtyfourbitswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
-  <MOODLE version="3.7" requires="3.2">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mariadb" version="5.5.31" />
-      <VENDOR name="mysql" version="5.6" />
-      <VENDOR name="postgres" version="9.4" />
-      <VENDOR name="mssql" version="10.0" />
-      <VENDOR name="oracle" version="11.2" />
-    </DATABASE>
-    <PHP version="7.1.0" level="required">
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="opensslrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zlib" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="gdrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlreader" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="intlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-      <PHP_EXTENSION name="fileinfo" level="required"/>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="96M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="opcache.enable" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opcacherecommended" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbstorageengine" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="quizattemptsupgradedmessage" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="slashargumentswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unsupporteddbtablerowformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unoconvwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="libcurlwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfileformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfilepertable" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddblargeprefix" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="ishttpswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="incompleteunicodesupport" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="sixtyfourbitswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -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.
@@ -214,7 +218,7 @@ function get_table_row(\core\plugininfo\filter $plugininfo, $state, $isfirstrow,

    // Re-order.
    $updown = '';
-    $spacer = $OUTPUT->spacer();
+    $spacer = '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" />';
    if ($state->active != TEXTFILTER_DISABLED) {
        if (!$isfirstrow) {
            $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'up'), new pix_icon('t/up', get_string('up'), '', array('class' => 'iconsmall')));
@@ -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')) {
@@ -96,12 +101,6 @@ if (function_exists('opcache_invalidate')) {
 // indirectly calls the protected init() method is good here.
 core_component::get_core_subsystems();

-if (is_major_upgrade_required() && isloggedin()) {
-    // A major upgrade is required.
-    // Terminate the session and redirect back here before anything DB-related happens.
-    redirect_if_major_upgrade_required();
-}
-
 require_once($CFG->libdir.'/adminlib.php');    // various admin-only functions
 require_once($CFG->libdir.'/upgradelib.php');  // general upgrade/install related functions

@@ -699,7 +698,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");
 }
@@ -815,19 +813,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 ?? 200;
-$croninfrequent = !$cronoverdue && ($lastcroninterval > $expectedfrequency || $lastcron < time() - $expectedfrequency);
 $dbproblems = $DB->diagnose();
 $maintenancemode = !empty($CFG->maintenance_enabled);

@@ -863,23 +856,12 @@ 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'))) {
-    $devlibdir = true;
-} else {
-    $devlibdir = false;
-}
-// Check if the site is being foced onto ssl.
-$overridetossl = !empty($CFG->overridetossl);

 admin_externalpage_setup('adminnotifications');

@@ -887,5 +869,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);
+                                       $registered, $cachewarnings, $eventshandlers, $themedesignermode);
@@ -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();
@@ -25,101 +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;
-});
-// Fetch message providers.
-$providers = get_message_providers();
-// Fetch the manage message outputs interface.
-$preferences = get_message_output_default_preferences();
+// Require site configuration capability
+require_capability('moodle/site:config', context_system::instance());

-if (($form = data_submitted()) && confirm_sesskey()) {
-    $preferences = 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;
-            $preferences[$disableprovidersetting] = 1;
-        } else {
-            $preferences[$disableprovidersetting] = 0;
-        }
+// Get the submitted params
+$disable    = optional_param('disable', 0, PARAM_INT);
+$enable     = optional_param('enable', 0, PARAM_INT);

-        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.
-                    $preferences[$processor->name.'_provider_'.$componentprovidersetting] = $value;
-                }
-            } else if (array_key_exists($componentprovidersetting, $form)) {
-                // 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.
-                $value = join(',', array_keys(array_filter($form->{$componentprovidersetting})));
-                if (empty($value)) {
-                    $value = null;
-                }
-            }
-            if ($setting != 'permitted') {
-                // We have already recoded site preferences for 'permitted' type.
-                $preferences['message_provider_'.$componentprovidersetting] = $value;
-            }
-        }
+$headingtitle = get_string('managemessageoutputs', 'message');
+
+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 ($preferences 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();
@@ -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')) {
@@ -148,7 +150,7 @@ foreach ($columns as $column) {
    } else {
        $columndir = $dir == "ASC" ? "DESC" : "ASC";
        $columnicon = $dir == "ASC" ? "down" : "up";
-        $columnicon = " " . $OUTPUT->pix_icon('t/' . $columnicon, get_string('sort'));
+        $columnicon = " <img src=\"" . $OUTPUT->pix_url('t/' . $columnicon) . "\" alt=\"\" />";
    }
    $headings[$column] = "<a href=\"?sort=$column&amp;dir=$columndir&amp;\">".$string[$column]."</a>$columnicon";
 }
@@ -34,8 +34,10 @@ $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();

@@ -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();
@@ -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);
@@ -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));

@@ -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);

@@ -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();
@@ -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();
@@ -87,18 +87,14 @@
    $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 {
            // took out hspace="\10\", because it does not validate. don't know what to replace with.
-            $icon = "<img src=\"" . $OUTPUT->image_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />";
+            $icon = "<img src=\"" . $OUTPUT->pix_url('icon', $module->name) . "\" class=\"icon\" alt=\"\" />";
            $strmodulename = $icon.' '.get_string('modulename', $module->name);
            $missing = false;
        }
@@ -134,11 +130,11 @@
            $class   = '';
        } else if ($module->visible) {
            $visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=".sesskey()."\" title=\"$strhide\">".
-                       $OUTPUT->pix_icon('t/hide', $strhide) . '</a>';
+                       "<img src=\"" . $OUTPUT->pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"$strhide\" /></a>";
            $class   = '';
        } else {
            $visible = "<a href=\"modules.php?show=$module->name&amp;sesskey=".sesskey()."\" title=\"$strshow\">".
-                       $OUTPUT->pix_icon('t/show', $strshow) . '</a>';
+                       "<img src=\"" . $OUTPUT->pix_url('t/show') . "\" class=\"iconsmall\" alt=\"$strshow\" /></a>";
            $class =   'dimmed_text';
        }
        if ($module->name == "forum") {
@@ -30,17 +30,6 @@

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

-$error = optional_param('error', '', PARAM_RAW);
-if ($error) {
-    $message = optional_param('error_description', '', PARAM_RAW);
-    if ($message) {
-        print_error($message);
-    } else {
-        print_error($error);
-    }
-    die();
-}
-
 // The authorization code generated by the authorization server.
 $code = required_param('code', PARAM_RAW);
 // The state parameter we've given (used in moodle as a redirect url).
@@ -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');
@@ -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();
@@ -31,6 +31,7 @@ require_once($CFG->libdir . '/adminlib.php');
 require_once($CFG->libdir . '/tablelib.php');

 // Check permissions.
+require_login();
 $systemcontext = context_system::instance();
 require_capability('moodle/question:config', $systemcontext);
 $canviewreports = has_capability('report/questioninstances:view', $systemcontext);
@@ -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 ($url !== HUB_MOODLEORGHUBURL) {
-    // Allow other plugins to confirm registration on hubs other than moodle.net . 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');
+}


@@ -20,7 +20,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////

-/**
+/*
 * @package    moodle
 * @subpackage registration
 * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
@@ -30,7 +30,482 @@
 * The forms needed by registration pages.
 */

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

-debugging('Support for alternative hubs has been removed from Moodle in 3.4. For communication with moodle.net ' .
-    'see lib/classes/hub/ .', 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) {
+                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);
+        $region = get_config('hub', 'site_region_' . $cleanhuburl);
+        $country = get_config('hub', 'site_country_' . $cleanhuburl);
+        if ($country === false) {
+            $country = $admin->country;
+        }
+        $language = get_config('hub', 'site_language_' . $cleanhuburl);
+        if ($language === false) {
+            $language = current_language();
+        }
+        $geolocation = get_config('hub', 'site_geolocation_' . $cleanhuburl);
+        $contactable = get_config('hub', 'site_contactable_' . $cleanhuburl);
+        $emailalert = get_config('hub', 'site_emailalert_' . $cleanhuburl);
+        $emailalert = ($emailalert === 0) ? 0 : 1;
+        $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->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->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);
+    }
+
+}
+
@@ -15,112 +15,199 @@
 // 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 for Moodle.net.
- * 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_once($CFG->libdir . '/adminlib.php');
+require('../../config.php');

-admin_externalpage_setup('registrationmoodleorg');
+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('registrationhubs');
+
+$renderer = $PAGE->get_renderer('core', 'register');

 $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 ($unregistration && \core\hub\registration::is_registered()) {
-    $siteunregistrationform = new \core\hub\site_unregistration_form();
+$registrationmanager = new registration_manager();
+$publicationmanager = new course_publish_manager();
+$errormessage = '';
+if (empty($cancel) and $unregistration and $confirm and confirm_sesskey()) {

-    if ($siteunregistrationform->is_cancelled()) {
-        redirect(new moodle_url('/admin/registration/index.php'));
-    } else if ($data = $siteunregistrationform->get_data()) {
-        \core\hub\registration::unregister($data->unpublishalladvertisedcourses,
-            $data->unpublishalluploadedcourses);
-        if (!\core\hub\registration::is_registered()) {
-            redirect(new moodle_url('/admin/registration/index.php'));
+    $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->heading(get_string('unregisterfrom', 'hub', 'Moodle.net'), 3, 'main');
-    $siteunregistrationform->display();
-    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
+    $registered = $DB->count_records('registration_hubs', array('huburl' => HUB_MOODLEORGHUBURL, 'confirmed' => 1));
+    if (empty($registered)) {
+        $warningmsg = get_string('registermoochtips', 'hub');
+        $warningmsg .= $renderer->single_button(new moodle_url('register.php', array('huburl' => HUB_MOODLEORGHUBURL
+                    , 'hubname' => 'Moodle.org')), get_string('register', 'admin'));
+        echo $renderer->box($warningmsg, 'buttons mdl-align generalbox adminwarning');
+    }

-$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 on Moodle.net.
-
-$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('updatesite', 'hub', 'Moodle.net'));
-} else if ($isinitialregistration) {
-    echo $OUTPUT->heading(get_string('completeregistration', 'hub'));
-} else {
-    echo $OUTPUT->heading(get_string('registerwithmoodleorg', 'admin'));
-}
-
-$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');
-} else if ($isinitialregistration) {
-    echo html_writer::div(html_writer::link(new moodle_url($returnurl), get_string('skipregistration', 'hub')), 'skipregistration');
 }
 echo $OUTPUT->footer();
@@ -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;
+    }
+
+}
+?>
@@ -20,7 +20,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////

-/**
+/*
 * @package    moodle
 * @subpackage registration
 * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
@@ -34,5 +34,168 @@


 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) {
+    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);
+        }
+    } else {
+        $registrationmessage = get_string('registrationwarning', 'admin');
+    }
+    echo $OUTPUT->notification($registrationmessage);
+
+    echo $OUTPUT->heading(get_string('registerwithmoodleorg', 'admin'));
+    $renderer = $PAGE->get_renderer('core', 'register');
+    echo $renderer->moodleorg_registration_message();
+}
+
+$siteregistrationform->display();
+echo $OUTPUT->footer();
@@ -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);
+    }
+
+}
@@ -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 ($url !== HUB_MOODLEORGHUBURL) {
-    // Allow other plugins to renew registration on hubs other than moodle.net . 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', 'Moodle.net', 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();
-

@@ -276,20 +276,12 @@ class core_admin_renderer extends plugin_renderer_base {
     * @param int|null $availableupdatesfetch timestamp of the most recent updates fetch or null (unknown)
     * @param string[] $cachewarnings An array containing warnings from the Cache API.
     * @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
     *
     * @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) {
+            $buggyiconvnomb, $registered, array $cachewarnings = array(), $eventshandlers = 0, $themedesignermode = false) {
        global $CFG;
        $output = '';

@@ -298,20 +290,15 @@ class core_admin_renderer extends plugin_renderer_base {
        $output .= $this->legacy_log_store_writing_error();
        $output .= empty($CFG->disableupdatenotifications) ? $this->available_updates($availableupdates, $availableupdatesfetch) : '';
        $output .= $this->insecure_dataroot_warning($insecuredataroot);
-        $output .= $this->development_libs_directories_warning($devlibdir);
        $output .= $this->themedesignermode_warning($themedesignermode);
        $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);

        //////////////////////////////////////////////////////////////////////////////////////////////////
        ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
@@ -533,24 +520,6 @@ class core_admin_renderer extends plugin_renderer_base {
        }
    }

-    /**
-     * Render a warning that a directory with development libs is present.
-     *
-     * @param bool $devlibdir True if the warning should be displayed.
-     * @return string
-     */
-    protected function development_libs_directories_warning($devlibdir) {
-
-        if ($devlibdir) {
-            $moreinfo = new moodle_url('/report/security/index.php');
-            $warning = get_string('devlibdirpresent', 'core_admin', ['moreinfourl' => $moreinfo->out()]);
-            return $this->warning($warning, 'error');
-
-        } else {
-            return '';
-        }
-    }
-
    /**
     * Render an appropriate message if dataroot is insecure.
     * @param bool $errorsdisplayed
@@ -616,24 +585,6 @@ class core_admin_renderer extends plugin_renderer_base {
                $this->help_icon('cron', 'admin'));
    }

-    /**
-     * 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 '';
-        }
-
-        $expectedfrequency = $CFG->expectedcronfrequency ?? 200;
-        return $this->warning(get_string('croninfrequent', 'admin', $expectedfrequency) . '&nbsp;' .
-                $this->help_icon('cron', 'admin'));
-    }
-
    /**
     * Render an appropriate message if there are any problems with the DB set-up.
     * @param bool $dbproblems
@@ -693,20 +644,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
@@ -843,68 +780,19 @@ class core_admin_renderer extends plugin_renderer_base {
     */
    protected function registration_warning($registered) {

-        if (!$registered && site_is_public()) {
-            if (has_capability('moodle/site:config', context_system::instance())) {
-                $registerbutton = $this->single_button(new moodle_url('/admin/registration/index.php'),
-                    get_string('register', 'admin'));
-                $str = 'registrationwarning';
-            } else {
-                $registerbutton = '';
-                $str = 'registrationwarningcontactadmin';
-            }
+        if (!$registered) {

-            return $this->warning( get_string($str, 'admin')
-                    . '&nbsp;' . $this->help_icon('registration', 'admin') . $registerbutton ,
-                'error alert alert-danger');
+            $registerbutton = $this->single_button(new moodle_url('/admin/registration/register.php',
+                    array('huburl' =>  HUB_MOODLEORGHUBURL, 'hubname' => 'Moodle.org')),
+                    get_string('register', 'admin'));
+
+            return $this->warning( get_string('registrationwarning', 'admin')
+                    . '&nbsp;' . $this->help_icon('registration', 'admin') . $registerbutton );
        }

        return '';
    }

-    /**
-     * Return an admin page warning if site is not registered with moodle.org
-     *
-     * @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') . '&nbsp;' . $configurebutton);
-        }
-
-        return $output;
-    }
-
-    /**
-     * 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') . '&nbsp;' . $configurebutton,
-                'error alert alert-danger');
-        }
-
-        return $output;
-    }
-
    /**
     * Helper method to render the information about the available Moodle update
     *
@@ -1062,10 +950,10 @@ 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);
@@ -1074,22 +962,22 @@ class core_admin_renderer extends plugin_renderer_base {

                $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-warning';
+                        $statusclass .= $dependenciesok ? '' : 'label-warning';
                        break;
                }
                $status = html_writer::span(get_string('status_' . $statuscode, 'core_plugin'), $statusclass);
@@ -1362,7 +1250,7 @@ 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, 'label');
                }
@@ -1467,7 +1355,7 @@ class core_admin_renderer extends plugin_renderer_base {
                    $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');
                }
                $requires[] = html_writer::tag('li',
                    html_writer::span(get_string('moodleversion', 'core_plugin', $plugin->versionrequires), 'dep dep-core').
@@ -1482,8 +1370,8 @@ class core_admin_renderer extends plugin_renderer_base {

                } 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)),
@@ -1491,24 +1379,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;
@@ -1727,7 +1615,7 @@ class core_admin_renderer extends plugin_renderer_base {
                if ($this->page->theme->resolve_image_location('icon', $plugin->type . '_' . $plugin->name, null)) {
                    $icon = $this->output->pix_icon('icon', '', $plugin->type . '_' . $plugin->name, array('class' => 'icon pluginicon'));
                } else {
-                    $icon = $this->output->spacer();
+                    $icon = $this->output->pix_icon('spacer', '', 'moodle', array('class' => 'icon pluginicon noicon'));
                }
                $status = $plugin->get_status();
                $row->attributes['class'] .= ' status-'.$status;
@@ -1772,13 +1660,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 = '';
                }
@@ -2009,7 +1897,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);
@@ -2017,15 +1905,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
@@ -2103,13 +1991,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() {
-        return format_text(get_string('registermoodlenet', 'admin'), FORMAT_HTML, ['noclean' => true]);
-    }
 }
@@ -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();
@@ -369,14 +370,14 @@ if (($action == 'edit') || ($action == 'new')) {

            if ($updowncount > 1) {
                $updown .= "<a href=\"$sesskeyurl&amp;action=moveup&amp;repos=".$typename."\">";
-                $updown .= $OUTPUT->pix_icon('t/up', get_string('moveup')) . "</a>&nbsp;";
+                $updown .= "<img src=\"" . $OUTPUT->pix_url('t/up') . "\" alt=\"up\" /></a>&nbsp;";
            }
            else {
                $updown .= $spacer;
            }
            if ($updowncount < $totalrepositorytypes) {
                $updown .= "<a href=\"$sesskeyurl&amp;action=movedown&amp;repos=".$typename."\">";
-                $updown .= $OUTPUT->pix_icon('t/down', get_string('movedown')) . "</a>&nbsp;";
+                $updown .= "<img src=\"" . $OUTPUT->pix_url('t/down') . "\" alt=\"down\" /></a>";
            }
            else {
                $updown .= $spacer;
@@ -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()));

@@ -80,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);
        }
    }
@@ -102,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) {
@@ -122,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);
 }

@@ -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,7 @@ $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) {
@@ -58,9 +58,6 @@ if (optional_param('submit', false, PARAM_BOOL) && data_submitted() && confirm_s
        case 'switch':
            $event = \core\event\role_allow_switch_updated::create(array('context' => $syscontext));
            break;
-        case 'view':
-            $event = \core\event\role_allow_view_updated::create(array('context' => $syscontext));
-            break;
    }
    if ($event) {
        $event->trigger();
@@ -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)) {
@@ -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) {
@@ -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) {
@@ -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) {
@@ -1,77 +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');
-    }
-}
@@ -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,10 @@ 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,
-            ]);
+        $iconurl = $OUTPUT->pix_url('i/' . str_replace('risk', 'risk_', $type));
+        $text = '<img src="' . $iconurl . '" alt="' . 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;
    }
@@ -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;

@@ -42,7 +42,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
    protected $allowassign;
    protected $allowoverride;
    protected $allowswitch;
-    protected $allowview;

    public function __construct($context, $roleid) {
        $this->roleid = $roleid;
@@ -73,7 +72,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
            $this->allowassign = array_keys($this->get_allow_roles_list('assign'));
            $this->allowoverride = array_keys($this->get_allow_roles_list('override'));
            $this->allowswitch = array_keys($this->get_allow_roles_list('switch'));
-            $this->allowview = array_keys($this->get_allow_roles_list('view'));

        } else {
            $this->role = new stdClass;
@@ -85,7 +83,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
            $this->allowassign = array();
            $this->allowoverride = array();
            $this->allowswitch = array();
-            $this->allowview = array();
        }
        parent::load_current_permissions();
    }
@@ -103,8 +100,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
            $this->role->shortname = core_text::strtolower(clean_param($this->role->shortname, PARAM_ALPHANUMEXT));
            if (empty($this->role->shortname)) {
                $this->errors['shortname'] = get_string('errorbadroleshortname', 'core_role');
-            } else if (core_text::strlen($this->role->shortname) > 100) { // Check if it exceeds the max of 100 characters.
-                $this->errors['shortname'] = get_string('errorroleshortnametoolong', 'core_role');
            }
        }
        if ($DB->record_exists_select('role', 'shortname = ? and id <> ?', array($this->role->shortname, $this->roleid))) {
@@ -167,10 +162,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
        if (!is_null($allow)) {
            $this->allowswitch = $allow;
        }
-        $allow = optional_param_array('allowview', null, PARAM_INT);
-        if (!is_null($allow)) {
-            $this->allowview = $allow;
-        }

        // Now read the permissions for each capability.
        parent::read_submitted_permissions();
@@ -187,8 +178,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
     * @param int $roleid role id or 0 for no role
     * @param array $options array with following keys:
     *      'name', 'shortname', 'description', 'permissions', 'archetype',
-     *      'contextlevels', 'allowassign', 'allowoverride', 'allowswitch',
-     *      'allowview'
+     *      'contextlevels', 'allowassign', 'allowoverride', 'allowswitch'
     */
    public function force_duplicate($roleid, array $options) {
        global $DB;
@@ -225,9 +215,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
            if ($options['allowswitch']) {
                $this->allowswitch = array();
            }
-            if ($options['allowview']) {
-                $this->allowview = array();
-            }

            if ($options['permissions']) {
                foreach ($this->capabilities as $capid => $cap) {
@@ -273,9 +260,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
        if ($options['allowswitch']) {
            $this->allowswitch = array_keys($this->get_allow_roles_list('switch', $roleid));
        }
-        if ($options['allowview']) {
-            $this->allowview = array_keys($this->get_allow_roles_list('view', $roleid));
-        }

        if ($options['permissions']) {
            $this->permissions = $DB->get_records_menu('role_capabilities',
@@ -296,8 +280,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
     * @param string $archetype
     * @param array $options array with following keys:
     *      'name', 'shortname', 'description', 'permissions', 'archetype',
-     *      'contextlevels', 'allowassign', 'allowoverride', 'allowswitch',
-     *      'allowview'
+     *      'contextlevels', 'allowassign', 'allowoverride', 'allowswitch'
     */
    public function force_archetype($archetype, array $options) {
        $archetypes = get_role_archetypes();
@@ -338,9 +321,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
        if ($options['allowswitch']) {
            $this->allowswitch = get_default_role_archetype_allows('switch', $archetype);
        }
-        if ($options['allowview']) {
-            $this->allowview = get_default_role_archetype_allows('view', $archetype);
-        }

        if ($options['permissions']) {
            $defaultpermissions = get_default_capabilities($archetype);
@@ -360,8 +340,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
     * @param string $xml
     * @param array $options array with following keys:
     *      'name', 'shortname', 'description', 'permissions', 'archetype',
-     *      'contextlevels', 'allowassign', 'allowoverride', 'allowswitch',
-     *      'allowview'
+     *      'contextlevels', 'allowassign', 'allowoverride', 'allowswitch'
     */
    public function force_preset($xml, array $options) {
        if (!$info = core_role_preset::parse_preset($xml)) {
@@ -398,7 +377,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
            }
        }

-        foreach (array('assign', 'override', 'switch', 'view') as $type) {
+        foreach (array('assign', 'override', 'switch') as $type) {
            if ($options['allow'.$type]) {
                if (isset($info['allow'.$type])) {
                    $this->{'allow'.$type} = $info['allow'.$type];
@@ -434,7 +413,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
    }

    public function save_changes() {
-        global $DB;
+        global $DB, $CFG;

        if (!$this->roleid) {
            // Creating role.
@@ -448,7 +427,8 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
            // the UI. It would be better to do this only when we know that fields affected are
            // updated. But thats getting into the weeds of the coursecat cache and role edits
            // should not be that frequent, so here is the ugly brutal approach.
-            core_course_category::role_assignment_changed($this->role->id, context_system::instance());
+            require_once($CFG->libdir . '/coursecatlib.php');
+            coursecat::role_assignment_changed($this->role->id, context_system::instance());
        }

        // Assignable contexts.
@@ -458,7 +438,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
        $this->save_allow('assign');
        $this->save_allow('override');
        $this->save_allow('switch');
-        $this->save_allow('view');

        // Permissions.
        parent::save_changes();
@@ -470,7 +449,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
        $current = array_keys($this->get_allow_roles_list($type));
        $wanted = $this->{'allow'.$type};

-        $addfunction = "core_role_set_{$type}_allowed";
+        $addfunction = 'allow_'.$type;
        $deltable = 'role_allow_'.$type;
        $field = 'allow'.$type;

@@ -497,7 +476,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
    }

    protected function get_shortname_field($id) {
-        return '<input type="text" id="' . $id . '" name="' . $id . '" maxlength="100" value="' . s($this->role->shortname) . '"' .
+        return '<input type="text" id="' . $id . '" name="' . $id . '" maxlength="254" value="' . s($this->role->shortname) . '"' .
                ' class="form-control"/>';
    }

@@ -527,11 +506,9 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
            if (!$this->disabled) {
                $output .= '<input type="hidden" name="contextlevel' . $cl . '" value="0" />';
            }
-            $output .= '<div class="form-check justify-content-start w-100">';
-            $output .= '<input class="form-check-input" type="checkbox" id="cl' . $cl . '" name="contextlevel' . $cl .
+            $output .= '<input type="checkbox" id="cl' . $cl . '" name="contextlevel' . $cl .
                '" value="1" ' . $extraarguments . '/> ';
-            $output .= '<label class="form-check-label" for="cl' . $cl . '">' . $clname . "</label>\n";
-            $output .= '</div>';
+            $output .= '<label for="cl' . $cl . '">' . $clname . "</label><br />\n";
        }
        return $output;
    }
@@ -546,7 +523,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
    protected function get_allow_roles_list($type, $roleid = null) {
        global $DB;

-        if ($type !== 'assign' and $type !== 'switch' and $type !== 'override' and $type !== 'view') {
+        if ($type !== 'assign' and $type !== 'switch' and $type !== 'override') {
            debugging('Invalid role allowed type specified', DEBUG_DEVELOPER);
            return array();
        }
@@ -570,11 +547,11 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
    /**
     * Returns an array of roles with the allowed type.
     *
-     * @param string $type Must be one of: assign, switch, override or view.
+     * @param string $type Must be one of: assign, switch, or override.
     * @return array Am array of role names with the allowed type
     */
    protected function get_allow_role_control($type) {
-        if ($type !== 'assign' and $type !== 'switch' and $type !== 'override' and $type !== 'view') {
+        if ($type !== 'assign' and $type !== 'switch' and $type !== 'override') {
            debugging('Invalid role allowed type specified', DEBUG_DEVELOPER);
            return '';
        }
@@ -664,7 +641,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
        $this->print_field('menuallowassign', get_string('allowassign', 'core_role'), $this->get_allow_role_control('assign'));
        $this->print_field('menuallowoverride', get_string('allowoverride', 'core_role'), $this->get_allow_role_control('override'));
        $this->print_field('menuallowswitch', get_string('allowswitch', 'core_role'), $this->get_allow_role_control('switch'));
-        $this->print_field('menuallowview', get_string('allowview', 'core_role'), $this->get_allow_role_control('view'));
        if ($risks = $this->get_role_risks_info()) {
            $this->print_field('', get_string('rolerisks', 'core_role'), $risks);
        }
@@ -56,24 +56,6 @@ class core_role_override_permissions_table_advanced extends core_role_capability
        }
    }

-    /**
-     * This method adds an additional class to a row if capability is other than inherited.
-     *
-     * @param stdClass $capability
-     * @return array
-     */
-    protected function get_row_attributes($capability) {
-        $rowattributes = parent::get_row_attributes($capability);
-        if ($this->permissions[$capability->name] !== 0) {
-            if (empty($rowattributes['class'])) {
-                $rowattributes['class'] = "overriddenpermission";
-            } else {
-                $rowattributes['class'] .= " overriddenpermission";
-            }
-        }
-        return $rowattributes;
-    }
-
    protected function load_parent_permissions() {
        // Get the capabilities from the parent context, so that can be shown in the interface.
        $parentcontext = $this->context->get_parent_context();
@@ -93,10 +93,9 @@ class core_role_permissions_table extends core_role_capability_table_base {
        foreach ($roles as $id => $name) {
            if (isset($needed[$id])) {
                $templatecontext = array("rolename" => $name, "roleid" => $id, "action" => "prevent", "spanclass" => "allowed",
-                                  "linkclass" => "preventlink", "adminurl" => $adminurl->out(), "icon" => "", "iconalt" => "");
+                                  "linkclass" => "preventlink", "adminurl" => $adminurl->out(), "imageurl" => "");
                if (isset($overridableroles[$id]) and ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability)))) {
-                    $templatecontext['icon'] = 't/delete';
-                    $templatecontext['iconalt'] = get_string('delete');
+                    $templatecontext['imageurl'] = $renderer->pix_url('t/delete');
                }
                $neededroles[$id] = $renderer->render_from_template('core/permissionmanager_role', $templatecontext);
            }
@@ -106,10 +105,9 @@ class core_role_permissions_table extends core_role_capability_table_base {
            if (isset($forbidden[$id])  and ($allowoverrides or ($allowsafeoverrides and is_safe_capability($capability)))) {
                $templatecontext = array("rolename" => $name, "roleid" => $id, "action" => "unprohibit",
                                "spanclass" => "forbidden", "linkclass" => "unprohibitlink", "adminurl" => $adminurl->out(),
-                                "icon" => "", "iconalt" => "");
+                                "imageurl" => "");
                if (isset($overridableroles[$id]) and prohibit_is_removable($id, $context, $capability->name)) {
-                    $templatecontext['icon'] = 't/delete';
-                    $templatecontext['iconalt'] = get_string('delete');
+                    $templatecontext['imageurl'] = $renderer->pix_url('t/delete');
                }
                $forbiddenroles[$id] = $renderer->render_from_template('core/permissionmanager_role', $templatecontext);
            }
@@ -84,7 +84,7 @@ class core_role_preset {
            $contextlevels->appendChild($dom->createElement('level', $name));
        }

-        foreach (array('assign', 'override', 'switch', 'view') as $type) {
+        foreach (array('assign', 'override', 'switch') as $type) {
            $allows = $dom->createElement('allow'.$type);
            $top->appendChild($allows);
            $records = $DB->get_records('role_allow_'.$type, array('roleid'=>$roleid), "allow$type ASC");
@@ -205,7 +205,7 @@ class core_role_preset {
            }
        }

-        foreach (array('assign', 'override', 'switch', 'view') as $type) {
+        foreach (array('assign', 'override', 'switch') as $type) {
            $values = self::get_node_children_values($dom, '/role/allow'.$type, 'shortname');
            if (!isset($values)) {
                $info['allow'.$type] = null;
@@ -79,7 +79,6 @@ class core_role_preset_form extends moodleform {
            $mform->addElement('advcheckbox', 'allowassign', get_string('allowassign', 'core_role'));
            $mform->addElement('advcheckbox', 'allowoverride', get_string('allowoverride', 'core_role'));
            $mform->addElement('advcheckbox', 'allowswitch', get_string('allowswitch', 'core_role'));
-            $mform->addElement('advcheckbox', 'allowview', get_string('allowview', 'core_role'));
            $mform->addElement('advcheckbox', 'permissions', get_string('permissions', 'core_role'));
        }

@@ -1,459 +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_role.
- *
- * @package    core_role
- * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace core_role\privacy;
-
-defined('MOODLE_INTERNAL') || die();
-
-use \core_privacy\local\metadata\collection;
-use \core_privacy\local\request\contextlist;
-use \core_privacy\local\request\approved_contextlist;
-use \core_privacy\local\request\transform;
-use \core_privacy\local\request\writer;
-use \core_privacy\local\request\userlist;
-use \core_privacy\local\request\approved_userlist;
-
-/**
- * Privacy provider for core_role.
- *
- * @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\provider,
-    \core_privacy\local\request\subsystem\provider,
-    \core_privacy\local\request\subsystem\plugin_provider,
-    \core_privacy\local\request\user_preference_provider,
-    \core_privacy\local\request\core_userlist_provider {
-
-    /**
-     * Get information about the user data stored by this plugin.
-     *
-     * @param  collection $collection An object for storing metadata.
-     * @return collection The metadata.
-     */
-    public static function get_metadata(collection $collection) : collection {
-        $rolecapabilities = [
-            'roleid' => 'privacy:metadata:role_capabilities:roleid',
-            'capability' => 'privacy:metadata:role_capabilities:capability',
-            'permission' => 'privacy:metadata:role_capabilities:permission',
-            'timemodified' => 'privacy:metadata:role_capabilities:timemodified',
-            'modifierid' => 'privacy:metadata:role_capabilities:modifierid'
-        ];
-        $roleassignments = [
-            'roleid' => 'privacy:metadata:role_assignments:roleid',
-            'userid' => 'privacy:metadata:role_assignments:userid',
-            'timemodified' => 'privacy:metadata:role_assignments:timemodified',
-            'modifierid' => 'privacy:metadata:role_assignments:modifierid',
-            'component' => 'privacy:metadata:role_assignments:component',
-            'itemid' => 'privacy:metadata:role_assignments:itemid'
-        ];
-        $collection->add_database_table('role_capabilities', $rolecapabilities,
-            'privacy:metadata:role_capabilities:tableexplanation');
-        $collection->add_database_table('role_assignments', $roleassignments,
-            'privacy:metadata:role_assignments:tableexplanation');
-
-        $collection->add_user_preference('definerole_showadvanced',
-            'privacy:metadata:preference:showadvanced');
-
-        return $collection;
-    }
-    /**
-     * Export all user preferences for the plugin.
-     *
-     * @param   int         $userid The userid of the user whose data is to be exported.
-     */
-    public static function export_user_preferences(int $userid) {
-        $showadvanced = get_user_preferences('definerole_showadvanced', null, $userid);
-        if ($showadvanced !== null) {
-            writer::export_user_preference('core_role',
-                'definerole_showadvanced',
-                transform::yesno($showadvanced),
-                get_string('privacy:metadata:preference:showadvanced', 'core_role')
-            );
-        }
-    }
-    /**
-     * Return all contexts for this userid.
-     *
-     * @param  int $userid The user ID.
-     * @return contextlist The list of context IDs.
-     */
-    public static function get_contexts_for_userid(int $userid) : contextlist {
-        global $DB;
-
-        $contextlist = new contextlist();
-
-        // The role_capabilities table contains user data.
-        $contexts = [
-            CONTEXT_SYSTEM,
-            CONTEXT_USER,
-            CONTEXT_COURSECAT,
-            CONTEXT_COURSE,
-            CONTEXT_MODULE,
-            CONTEXT_BLOCK
-        ];
-        list($insql, $inparams) = $DB->get_in_or_equal($contexts, SQL_PARAMS_NAMED);
-        $sql = "SELECT ctx.id
-                  FROM {context} ctx
-                  JOIN {role_capabilities} rc
-                    ON rc.contextid = ctx.id
-                   AND ((ctx.contextlevel {$insql} AND rc.modifierid = :modifierid)
-                    OR (ctx.contextlevel = :contextlevel AND ctx.instanceid = :userid))";
-        $params = [
-            'modifierid' => $userid,
-            'contextlevel' => CONTEXT_USER,
-            'userid' => $userid
-         ];
-        $params += $inparams;
-
-        $contextlist->add_from_sql($sql, $params);
-
-        // The role_assignments table contains user data.
-        $contexts = [
-            CONTEXT_SYSTEM,
-            CONTEXT_USER,
-            CONTEXT_COURSECAT,
-            CONTEXT_COURSE,
-            CONTEXT_MODULE,
-            CONTEXT_BLOCK
-        ];
-        list($insql, $inparams) = $DB->get_in_or_equal($contexts, SQL_PARAMS_NAMED);
-        $params = [
-            'userid' => $userid,
-            'modifierid' => $userid
-         ];
-        $params += $inparams;
-        $sql = "SELECT ctx.id
-                  FROM {role_assignments} ra
-                  JOIN {context} ctx
-                    ON ctx.id = ra.contextid
-                   AND ctx.contextlevel {$insql}
-                 WHERE (ra.userid = :userid
-                    OR ra.modifierid = :modifierid)
-                   AND ra.component != 'tool_cohortroles'";
-        $contextlist->add_from_sql($sql, $params);
-
-        return $contextlist;
-    }
-
-    /**
-     * Get the list of users within a specific context.
-     *
-     * @param userlist $userlist The userlist containing the list of users who have data in this context/plugin combination.
-     */
-    public static function get_users_in_context(userlist $userlist) {
-
-        if (empty($userlist)) {
-            return;
-        }
-
-        $context = $userlist->get_context();
-
-        // Include users who created or modified role capabilities.
-        $sql = "SELECT modifierid as userid
-                  FROM {role_capabilities}
-                 WHERE contextid = :contextid";
-
-        $params = [
-            'contextid' => $context->id
-        ];
-
-        $userlist->add_from_sql('userid', $sql, $params);
-
-        // Include users that have a role assigned to them.
-        $sql = "SELECT userid
-                  FROM {role_assignments}
-                 WHERE contextid = :contextid";
-
-        $userlist->add_from_sql('userid', $sql, $params);
-
-        // Include users who created or modified the role assignment.
-        // Differentiate and exclude special cases where tool_cohortroles adds records through the
-        // "Assign user roles to cohort" feature into the role_assignments table.
-        // These records should be separately processed in tool_cohortroles.
-        $sql = "SELECT modifierid as userid
-                  FROM {role_assignments}
-                 WHERE contextid = :contextid
-                       AND component != 'tool_cohortroles'";
-
-        $userlist->add_from_sql('userid', $sql, $params);
-    }
-
-    /**
-     * Export all user data for the specified user, in the specified contexts.
-     *
-     * @param  approved_contextlist $contextlist The list of approved contexts for a user.
-     */
-    public static function export_user_data(approved_contextlist $contextlist) {
-        global $DB;
-
-        if (empty($contextlist)) {
-             return;
-        }
-
-        $rolesnames = self::get_roles_name();
-        $userid = $contextlist->get_user()->id;
-        $ctxfields = \context_helper::get_preload_record_columns_sql('ctx');
-        list($insql, $inparams) = $DB->get_in_or_equal($contextlist->get_contextids(), SQL_PARAMS_NAMED);
-
-        // Role Assignments export data.
-        $contexts = [
-            CONTEXT_SYSTEM,
-            CONTEXT_USER,
-            CONTEXT_COURSECAT,
-            CONTEXT_COURSE,
-            CONTEXT_MODULE,
-            CONTEXT_BLOCK
-        ];
-        list($inctxsql, $ctxparams) = $DB->get_in_or_equal($contexts, SQL_PARAMS_NAMED);
-        $sql = "SELECT ra.id, ra.contextid, ra.roleid, ra.userid, ra.timemodified, ra.modifierid, $ctxfields
-                  FROM {role_assignments} ra
-                  JOIN {context} ctx
-                    ON ctx.id = ra.contextid
-                   AND ctx.contextlevel {$inctxsql}
-                   AND (ra.userid = :userid OR ra.modifierid = :modifierid)
-                   AND ra.component != 'tool_cohortroles'
-                  JOIN {role} r
-                    ON r.id = ra.roleid
-                 WHERE ctx.id {$insql}";
-        $params = ['userid' => $userid, 'modifierid' => $userid];
-        $params += $inparams;
-        $params += $ctxparams;
-        $assignments = $DB->get_recordset_sql($sql, $params);
-        foreach ($assignments as $assignment) {
-            \context_helper::preload_from_record($assignment);
-            $alldata[$assignment->contextid][$rolesnames[$assignment->roleid]][] = (object)[
-                'timemodified' => transform::datetime($assignment->timemodified),
-                'userid' => transform::user($assignment->userid),
-                'modifierid' => transform::user($assignment->modifierid)
-            ];
-        }
-        $assignments->close();
-        if (!empty($alldata)) {
-            array_walk($alldata, function($roledata, $contextid) {
-                $context = \context::instance_by_id($contextid);
-                array_walk($roledata, function($data, $rolename) use ($context) {
-                    writer::with_context($context)->export_data(
-                            [get_string('privacy:metadata:role_assignments', 'core_role'), $rolename],
-                            (object)$data);
-                });
-            });
-            unset($alldata);
-        }
-
-        // Role Capabilities export data.
-        $strpermissions = self::get_permissions_name();
-        $contexts = [
-            CONTEXT_SYSTEM,
-            CONTEXT_USER,
-            CONTEXT_COURSECAT,
-            CONTEXT_COURSE,
-            CONTEXT_MODULE,
-            CONTEXT_BLOCK
-        ];
-        list($inctxsql, $ctxparams) = $DB->get_in_or_equal($contexts, SQL_PARAMS_NAMED);
-        $sql = "SELECT rc.id, rc.contextid, rc.capability, rc.permission, rc.timemodified, rc.roleid, $ctxfields
-                  FROM {context} ctx
-                  JOIN {role_capabilities} rc
-                    ON rc.contextid = ctx.id
-                   AND ((ctx.contextlevel {$inctxsql} AND rc.modifierid = :modifierid)
-                    OR (ctx.contextlevel = :contextlevel AND ctx.instanceid = :userid))
-                 WHERE ctx.id {$insql}";
-        $params = [
-            'modifierid' => $userid,
-            'contextlevel' => CONTEXT_USER,
-            'userid' => $userid
-         ];
-        $params += $inparams;
-        $params += $ctxparams;
-        $capabilities = $DB->get_recordset_sql($sql, $params);
-        foreach ($capabilities as $capability) {
-            \context_helper::preload_from_record($capability);
-            $alldata[$capability->contextid][$rolesnames[$capability->roleid]][] = (object)[
-                'timemodified' => transform::datetime($capability->timemodified),
-                'capability' => $capability->capability,
-                'permission' => $strpermissions[$capability->permission]
-            ];
-        }
-        $capabilities->close();
-        if (!empty($alldata)) {
-            array_walk($alldata, function($capdata, $contextid) {
-                $context = \context::instance_by_id($contextid);
-                array_walk($capdata, function($data, $rolename) use ($context) {
-                    writer::with_context($context)->export_data(
-                            [get_string('privacy:metadata:role_capabilities', 'core_role'), $rolename],
-                            (object)$data);
-                });
-            });
-        }
-    }
-    /**
-     * Exports the data relating to tool_cohortroles component on role assignments by
-     * Assign user roles to cohort feature.
-     *
-     * @param  int $userid The user ID.
-     */
-    public static function export_user_role_to_cohort(int $userid) {
-        global $DB;
-
-        $rolesnames = self::get_roles_name();
-        $sql = "SELECT ra.id, ra.contextid, ra.roleid, ra.userid, ra.timemodified, ra.modifierid, r.id as roleid
-                  FROM {role_assignments} ra
-                  JOIN {context} ctx
-                    ON ctx.id = ra.contextid
-                   AND ctx.contextlevel = :contextlevel
-                   AND ra.component = 'tool_cohortroles'
-                  JOIN {role} r
-                    ON r.id = ra.roleid
-                 WHERE ctx.instanceid = :instanceid
-                    OR ra.userid = :userid";
-        $params = ['userid' => $userid, 'instanceid' => $userid, 'contextlevel' => CONTEXT_USER];
-        $assignments = $DB->get_recordset_sql($sql, $params);
-        foreach ($assignments as $assignment) {
-            $alldata[$assignment->contextid][$rolesnames[$assignment->roleid]][] = (object)[
-                'timemodified' => transform::datetime($assignment->timemodified),
-                'userid' => transform::user($assignment->userid),
-                'modifierid' => transform::user($assignment->modifierid)
-            ];
-        }
-        $assignments->close();
-        if (!empty($alldata)) {
-            array_walk($alldata, function($roledata, $contextid) {
-                $context = \context::instance_by_id($contextid);
-                array_walk($roledata, function($data, $rolename) use ($context) {
-                    writer::with_context($context)->export_related_data(
-                            [get_string('privacy:metadata:role_cohortroles', 'core_role'), $rolename], 'cohortroles',
-                            (object)$data);
-                });
-            });
-        }
-    }
-    /**
-     * Delete all user data for this context.
-     *
-     * @param  \context $context The context to delete data for.
-     */
-    public static function delete_data_for_all_users_in_context(\context $context) {
-        global $DB;
-
-        // Don't remove data from role_capabilities.
-        // Because this data affects the whole Moodle, there are override capabilities.
-        // Don't belong to the modifier user.
-
-        // Remove data from role_assignments.
-        $DB->delete_records('role_assignments', ['contextid' => $context->id]);
-    }
-
-    /**
-     * Delete multiple users within a single context.
-     *
-     * @param approved_userlist $userlist The approved context and user information to delete information for.
-     */
-    public static function delete_data_for_users(approved_userlist $userlist) {
-        global $DB;
-
-        // Don't remove data from role_capabilities.
-        // Because this data affects the whole Moodle, there are override capabilities.
-        // Don't belong to the modifier user.
-        $context = $userlist->get_context();
-        $userids = $userlist->get_userids();
-
-        if (empty($userids)) {
-            return;
-        }
-        list($usersql, $userparams) = $DB->get_in_or_equal($userids, SQL_PARAMS_NAMED);
-        $params = ['contextid' => $context->id] + $userparams;
-
-        // Remove data from role_assignments.
-        $DB->delete_records_select('role_assignments',
-            "contextid = :contextid AND userid {$usersql}", $params);
-    }
-
-    /**
-     * Delete all user data for this user only.
-     *
-     * @param  approved_contextlist $contextlist The list of approved contexts for a user.
-     */
-    public static function delete_data_for_user(approved_contextlist $contextlist) {
-        global $DB;
-
-        // Don't remove data from role_capabilities.
-        // Because this data affects the whole Moodle, there are override capabilities.
-        // Don't belong to the modifier user.
-
-        // Remove data from role_assignments.
-        if (empty($contextlist->count())) {
-            return;
-        }
-        $userid = $contextlist->get_user()->id;
-        $contextids = $contextlist->get_contextids();
-
-        list($contextsql, $contextparams) = $DB->get_in_or_equal($contextids, SQL_PARAMS_NAMED);
-        $params = ['userid' => $userid] + $contextparams;
-
-        // Only delete the roles assignments where the user is assigned in all contexts.
-        $DB->delete_records_select('role_assignments',
-            "userid = :userid AND contextid {$contextsql}", $params);
-    }
-    /**
-     * Delete user entries in role_assignments related to the feature
-     * Assign user roles to cohort feature.
-     *
-     * @param  int $userid The user ID.
-     */
-    public static function delete_user_role_to_cohort(int $userid) {
-        global $DB;
-
-        // Delete entries where userid is a mentor by tool_cohortroles.
-        $DB->delete_records('role_assignments', ['userid' => $userid, 'component' => 'tool_cohortroles']);
-    }
-    /**
-     * Get all the localised roles name in a simple array.
-     *
-     * @return array Array of name of the roles by roleid.
-     */
-    protected static function get_roles_name() {
-        $roles = role_fix_names(get_all_roles(), \context_system::instance(), ROLENAME_ORIGINAL);
-        $rolesnames = array();
-        foreach ($roles as $role) {
-            $rolesnames[$role->id] = $role->localname;
-        }
-        return $rolesnames;
-    }
-    /**
-     * Get all the permissions name in a simple array.
-     *
-     * @return array Array of permissions name.
-     */
-    protected static function get_permissions_name() {
-        $strpermissions = array(
-            CAP_INHERIT => get_string('inherit', 'role'),
-            CAP_ALLOW => get_string('allow', 'role'),
-            CAP_PREVENT => get_string('prevent', 'role'),
-            CAP_PROHIBIT => get_string('prohibit', 'role')
-        );
-        return $strpermissions;
-    }
-}
@@ -54,6 +54,7 @@ if ($return === 'manage') {

 // Check access permissions.
 $systemcontext = context_system::instance();
+require_login();
 require_capability('moodle/role:manage', $systemcontext);
 admin_externalpage_setup('defineroles', '', array('action' => $action, 'roleid' => $roleid), new moodle_url('/admin/roles/define.php'));

@@ -102,8 +103,7 @@ if ($action === 'add' and $resettype !== 'none') {
            'contextlevels' => 1,
            'allowassign'   => 1,
            'allowoverride' => 1,
-            'allowswitch'   => 1,
-            'allowview'   => 1);
+            'allowswitch'   => 1);
        if ($showadvanced) {
            $definitiontable = new core_role_define_role_table_advanced($systemcontext, 0);
        } else {
@@ -150,8 +150,7 @@ if ($action === 'add' and $resettype !== 'none') {
            'contextlevels' => $data->contextlevels,
            'allowassign'   => $data->allowassign,
            'allowoverride' => $data->allowoverride,
-            'allowswitch'   => $data->allowswitch,
-            'allowview'     => $data->allowview);
+            'allowswitch'   => $data->allowswitch);
        if ($showadvanced) {
            $definitiontable = new core_role_define_role_table_advanced($systemcontext, $roleid);
        } else {
@@ -48,6 +48,7 @@ $defineurl = $CFG->wwwroot . '/' . $CFG->admin . '/roles/define.php';

 // Check access permissions.
 $systemcontext = context_system::instance();
+require_login();
 require_capability('moodle/role:manage', $systemcontext);
 admin_externalpage_setup('defineroles');

@@ -84,10 +85,12 @@ switch ($action) {
            die;
        }
        if (!delete_role($roleid)) {
-            // The delete failed.
+            // The delete failed, but mark the context dirty in case.
+            $systemcontext->mark_dirty();
            print_error('cannotdeleterolewithid', 'error', $baseurl, $roleid);
        }
        // Deleted a role sitewide...
+        $systemcontext->mark_dirty();
        redirect($baseurl);
        break;

@@ -213,9 +216,9 @@ die;
 function get_action_icon($url, $icon, $alt, $tooltip) {
    global $OUTPUT;
    return '<a title="' . $tooltip . '" href="'. $url . '">' .
-            $OUTPUT->pix_icon('t/' . $icon, $alt) . '</a> ';
+            '<img src="' . $OUTPUT->pix_url('t/' . $icon) . '" class="iconsmall" alt="' . $alt . '" /></a> ';
 }
 function get_spacer() {
    global $OUTPUT;
-    return $OUTPUT->spacer();
+    return '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" /> ';
 }
@@ -29,7 +29,6 @@ $toprow[] = new tabobject('manage', new moodle_url('/admin/roles/manage.php'), g
 $toprow[] = new tabobject('assign', new moodle_url('/admin/roles/allow.php', array('mode'=>'assign')), get_string('allowassign', 'core_role'));
 $toprow[] = new tabobject('override', new moodle_url('/admin/roles/allow.php', array('mode'=>'override')), get_string('allowoverride', 'core_role'));
 $toprow[] = new tabobject('switch', new moodle_url('/admin/roles/allow.php', array('mode'=>'switch')), get_string('allowswitch', 'core_role'));
-$toprow[] = new tabobject('view', new moodle_url('/admin/roles/allow.php', ['mode' => 'view']), get_string('allowview', 'core_role'));

 echo $OUTPUT->tabtree($toprow, $currenttab);

@@ -51,7 +51,7 @@ M.core_role.init_cap_table_filter = function(Y, tableid, contextid) {
                marginRight : 'auto'
            });
            // Create the capability search input.
-            this.input = Y.Node.create('<input class="form-control mx-1" type="text"' +
+            this.input = Y.Node.create('<input class="form-control m-x-1" type="text"' +
                ' id="'+this.table.get('id')+'capabilitysearch" value="'+Y.Escape.html(filtervalue)+'" />');
            // Create a label for the search input.
            this.label = Y.Node.create('<label for="' + this.input.get('id') + '">' +
@@ -11,7 +11,6 @@
                <xs:element ref="allowassign" minOccurs="0"/>
                <xs:element ref="allowoverride" minOccurs="0"/>
                <xs:element ref="allowswitch" minOccurs="0"/>
-                <xs:element ref="allowview" minOccurs="0"/>
                <xs:element ref="permissions" minOccurs="0"/>
            </xs:sequence>
        </xs:complexType>
@@ -46,13 +45,6 @@
            </xs:sequence>
        </xs:complexType>
    </xs:element>
-    <xs:element name="allowview">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element maxOccurs="unbounded" minOccurs="0" ref="shortname"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
    <xs:element name="permissions">
        <xs:complexType>
            <xs:sequence>
@@ -1,21 +0,0 @@
-@core @core_admin @core_admin_roles
-Feature: Highlight non-inherited permissions
-  In order that the status of capabilities can be more easily seen
-  As an admin
-  I need altered permissions to be highlighted
-
-  Background:
-    Given the following "courses" exist:
-      | fullname        | shortname   |
-      | Course fullname | C_shortname |
-    And I log in as "admin"
-
-  @javascript
-  Scenario: Override a permission
-    Given I am on "Course fullname" course homepage
-    And I navigate to "Users > Permissions" in current page administration
-    And I select "Manager (0)" from the "roleid" singleselect
-    And I click on "Prohibit" "radio" in the "View added and updated modules in recent activity block" "table_row"
-    And I press "Save changes"
-    And I select "Manager (1)" from the "roleid" singleselect
-    Then the "class" attribute of "View added and updated modules in recent activity block" "table_row" should contain "overriddenpermission"
@@ -44,7 +44,7 @@ class core_role_preset_testcase extends advanced_testcase {
            $contextlevels = get_role_contextlevels($role->id);
            $this->assertEquals(array_values($contextlevels), array_values($info['contextlevels']));

-            foreach (array('assign', 'override', 'switch', 'view') as $type) {
+            foreach (array('assign', 'override', 'switch') as $type) {
                $records = $DB->get_records('role_allow_'.$type, array('roleid'=>$role->id), "allow$type ASC");
                $allows = array();
                foreach ($records as $record) {
@@ -1,747 +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 test for core_role
- *
- * @package    core_role
- * @category   test
- * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-use \core_role\privacy\provider;
-use \core_privacy\local\request\approved_contextlist;
-use \core_privacy\local\request\writer;
-use \core_privacy\tests\provider_testcase;
-use \core_privacy\local\request\transform;
-use \tool_cohortroles\api;
-use \core_privacy\local\request\approved_userlist;
-
-/**
- * Privacy test for core_role
- *
- * @copyright  2018 Carlos Escobedo <carlos@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class core_role_privacy_testcase extends provider_testcase {
-    /**
-     * Test to check export_user_preferences.
-     * returns user preferences data.
-     */
-    public function test_export_user_preferences() {
-        $this->resetAfterTest();
-        $this->setAdminUser();
-        $user = $this->getDataGenerator()->create_user();
-        $this->setUser($user);
-        $showadvanced = 1;
-        set_user_preference('definerole_showadvanced', $showadvanced);
-        provider::export_user_preferences($user->id);
-        $writer = writer::with_context(\context_system::instance());
-        $prefs = $writer->get_user_preferences('core_role');
-        $this->assertEquals(transform::yesno($showadvanced), transform::yesno($prefs->definerole_showadvanced->value));
-        $this->assertEquals(get_string('privacy:metadata:preference:showadvanced', 'core_role'),
-            $prefs->definerole_showadvanced->description);
-    }
-
-    /**
-     * Check all contexts are returned if there is any user data for this user.
-     */
-    public function test_get_contexts_for_userid() {
-        global $DB;
-
-        $this->resetAfterTest();
-        $this->setAdminUser();
-        $user = $this->getDataGenerator()->create_user();
-        $this->assertEmpty(provider::get_contexts_for_userid($user->id));
-
-        $user2 = $this->getDataGenerator()->create_user();
-        $usercontext2 = \context_user::instance($user2->id);
-        $course = $this->getDataGenerator()->create_course();
-        $course2 = $this->getDataGenerator()->create_course();
-        $coursecat = $this->getDataGenerator()->create_category();
-        $cm = $this->getDataGenerator()->create_module('chat', ['course' => $course->id]);
-        $cmcontext = \context_module::instance($cm->cmid);
-        $page = $this->getDataGenerator()->create_module('page', array('course' => $course->id));
-        $cmcontext2 = \context_module::instance($page->cmid);
-        $coursecontext = \context_course::instance($course->id);
-        $coursecontext2 = \context_course::instance($course2->id);
-        $coursecatcontext = \context_coursecat::instance($coursecat->id);
-        $systemcontext = \context_system::instance();
-        $block = $this->getDataGenerator()->create_block('online_users');
-        $blockcontext = \context_block::instance($block->id);
-
-        $student = $DB->get_record('role', array('shortname' => 'student'), '*', MUST_EXIST);
-        $manager = $DB->get_record('role', array('shortname' => 'manager'), '*', MUST_EXIST);
-
-        // Role assignments, where the user is assigned.
-        role_assign($student->id, $user->id, $cmcontext2->id);
-        role_assign($student->id, $user->id, $coursecontext2->id);
-        role_assign($student->id, $user->id, $blockcontext->id);
-        role_assign($manager->id, $user->id, $usercontext2->id);
-        // Role assignments, where the user makes assignments.
-        $this->setUser($user);
-        role_assign($student->id, $user2->id, $coursecontext->id);
-        role_assign($manager->id, $user2->id, $coursecatcontext->id);
-        role_assign($manager->id, $user2->id, $systemcontext->id);
-
-        // Role capabilities.
-        $this->setUser($user);
-        $result = assign_capability('moodle/backup:backupcourse', CAP_ALLOW, $student->id, $cmcontext->id);
-
-        $contextlist = provider::get_contexts_for_userid($user->id)->get_contextids();
-        $this->assertCount(8, $contextlist);
-        $this->assertTrue(in_array($cmcontext->id, $contextlist));
-    }
-
-    /**
-     * Test that user data is exported correctly.
-     */
-    public function test_export_user_data() {
-        global $DB;
-
-        $this->resetAfterTest();
-        $this->setAdminUser();
-        $user = $this->getDataGenerator()->create_user();
-        $user2 = $this->getDataGenerator()->create_user();
-        $usercontext2 = \context_user::instance($user2->id);
-        $course = $this->getDataGenerator()->create_course();
-        $course2 = $this->getDataGenerator()->create_course();
-        $coursecat = $this->getDataGenerator()->create_category();
-        $cm = $this->getDataGenerator()->create_module('chat', ['course' => $course->id]);
-        $cmcontext = \context_module::instance($cm->cmid);
-        $page = $this->getDataGenerator()->create_module('page', array('course' => $course->id));
-        $cmcontext2 = \context_module::instance($page->cmid);
-        $coursecontext = \context_course::instance($course->id);
-        $coursecontext2 = \context_course::instance($course2->id);
-        $coursecatcontext = \context_coursecat::instance($coursecat->id);
-        $systemcontext = \context_system::instance();
-        $block = $this->getDataGenerator()->create_block('online_users');
-        $blockcontext = \context_block::instance($block->id);
-
-        $student = $DB->get_record('role', array('shortname' => 'student'), '*', MUST_EXIST);
-        $manager = $DB->get_record('role', array('shortname' => 'manager'), '*', MUST_EXIST);
-        $rolesnames = self::get_roles_name();
-
-        $subcontextstudent = [
-            get_string('privacy:metadata:role_assignments', 'core_role'),
-            $rolesnames[$student->id]
-        ];
-        $subcontextmanager = [
-            get_string('privacy:metadata:role_assignments', 'core_role'),
-            $rolesnames[$manager->id]
-        ];
-        $subcontextrc = [
-            get_string('privacy:metadata:role_capabilities', 'core_role'),
-            $rolesnames[$student->id]
-        ];
-
-        // Test over role assignments.
-        // Where the user is assigned.
-        role_assign($student->id, $user->id, $cmcontext2->id);
-        role_assign($student->id, $user->id, $coursecontext2->id);
-        role_assign($student->id, $user->id, $blockcontext->id);
-        role_assign($manager->id, $user->id, $usercontext2->id);
-        // Where the user makes assignments.
-        $this->setUser($user);
-        role_assign($manager->id, $user2->id, $coursecatcontext->id);
-        role_assign($manager->id, $user2->id, $systemcontext->id);
-
-        // Test overridable roles in module, course, category, user, system and block.
-        assign_capability('moodle/backup:backupactivity', CAP_ALLOW, $student->id, $cmcontext->id, true);
-        assign_capability('moodle/backup:backupcourse', CAP_ALLOW, $student->id, $coursecontext->id, true);
-        assign_capability('moodle/category:manage', CAP_ALLOW, $student->id, $coursecatcontext->id, true);
-        assign_capability('moodle/backup:backupcourse', CAP_ALLOW, $student->id, $systemcontext->id, true);
-        assign_capability('moodle/block:edit', CAP_ALLOW, $student->id, $blockcontext->id, true);
-        assign_capability('moodle/competency:evidencedelete', CAP_ALLOW, $student->id, $usercontext2->id, true);
-
-        // Retrieve the user's context ids.
-        $contextlist = provider::get_contexts_for_userid($user->id);
-        $approvedcontextlist = new approved_contextlist($user, 'core_role', $contextlist->get_contextids());
-
-        $strpermissions = array(
-            CAP_INHERIT => get_string('inherit', 'role'),
-            CAP_ALLOW => get_string('allow', 'role'),
-            CAP_PREVENT => get_string('prevent', 'role'),
-            CAP_PROHIBIT => get_string('prohibit', 'role')
-        );
-        // Retrieve role capabilities and role assignments.
-        provider::export_user_data($approvedcontextlist);
-        foreach ($contextlist as $context) {
-            $writer = writer::with_context($context);
-            $this->assertTrue($writer->has_any_data());
-            if ($context->contextlevel == CONTEXT_MODULE) {
-                if ($data = $writer->get_data($subcontextstudent)) {
-                    $this->assertEquals($user->id, reset($data)->userid);
-                }
-                if ($data = $writer->get_data($subcontextrc)) {
-                    $this->assertEquals('moodle/backup:backupactivity', reset($data)->capability);
-                    $this->assertEquals($strpermissions[CAP_ALLOW], reset($data)->permission);
-                }
-            }
-            if ($context->contextlevel == CONTEXT_COURSE) {
-                if ($data = $writer->get_data($subcontextstudent)) {
-                    $this->assertEquals($user->id, reset($data)->userid);
-                }
-                if ($data = $writer->get_data($subcontextrc)) {
-                    $this->assertEquals('moodle/backup:backupcourse', reset($data)->capability);
-                }
-            }
-            if ($context->contextlevel == CONTEXT_COURSECAT) {
-                if ($data = $writer->get_data($subcontextmanager)) {
-                    $this->assertEquals($user->id, reset($data)->modifierid);
-                }
-                if ($data = $writer->get_data($subcontextrc)) {
-                    $this->assertEquals('moodle/category:manage', reset($data)->capability);
-                }
-            }
-            if ($context->contextlevel == CONTEXT_SYSTEM) {
-                if ($data = $writer->get_data($subcontextmanager)) {
-                    $this->assertEquals($user->id, reset($data)->modifierid);
-                }
-                if ($data = $writer->get_data($subcontextrc)) {
-                    $this->assertEquals('moodle/backup:backupcourse', reset($data)->capability);
-                }
-            }
-            if ($context->contextlevel == CONTEXT_BLOCK) {
-                if ($data = $writer->get_data($subcontextstudent)) {
-                    $this->assertEquals($user->id, reset($data)->userid);
-                }
-                if ($data = $writer->get_data($subcontextrc)) {
-                    $this->assertEquals('moodle/block:edit', reset($data)->capability);
-                }
-            }
-            if ($context->contextlevel == CONTEXT_USER) {
-                if ($data = $writer->get_data($subcontextmanager)) {
-                    $this->assertEquals($user->id, reset($data)->userid);
-                }
-                if ($data = $writer->get_data($subcontextrc)) {
-                    $this->assertEquals('moodle/competency:evidencedelete', reset($data)->capability);
-                }
-            }
-        }
-    }
-
-    /**
-     * Test for provider::delete_data_for_all_users_in_context().
-     */
-    public function test_delete_data_for_all_users_in_context() {
-        global $DB;
-
-        $this->resetAfterTest();
-        $this->setAdminUser();
-        $user = $this->getDataGenerator()->create_user();
-        $user2 = $this->getDataGenerator()->create_user();
-        $usercontext2 = \context_user::instance($user2->id);
-        $user3 = $this->getDataGenerator()->create_user();
-        $course = $this->getDataGenerator()->create_course();
-        $coursecontext = \context_course::instance($course->id);
-        $coursecat = $this->getDataGenerator()->create_category();
-        $coursecatcontext = \context_coursecat::instance($coursecat->id);
-        $systemcontext = \context_system::instance();
-        $cm = $this->getDataGenerator()->create_module('chat', ['course' => $course->id]);
-        $cmcontext = \context_module::instance($cm->cmid);
-        $student = $DB->get_record('role', array('shortname' => 'student'), '*', MUST_EXIST);
-        $manager = $DB->get_record('role', array('shortname' => 'manager'), '*', MUST_EXIST);
-        $block = $this->getDataGenerator()->create_block('online_users');
-        $blockcontext = \context_block::instance($block->id);
-
-        // Role assignments CONTEXT_COURSE.
-        role_assign($student->id, $user->id, $coursecontext->id);
-        role_assign($student->id, $user2->id, $coursecontext->id);
-        role_assign($student->id, $user3->id, $coursecontext->id);
-        $count = $DB->count_records('role_assignments', ['contextid' => $coursecontext->id]);
-        $this->assertEquals(3, $count);
-        // Role assignments CONTEXT_COURSECAT.
-        role_assign($student->id, $user2->id, $coursecatcontext->id);
-        role_assign($student->id, $user3->id, $coursecatcontext->id);
-        $count = $DB->count_records('role_assignments', ['contextid' => $coursecatcontext->id]);
-        $this->assertEquals(2, $count);
-        // Role assignments CONTEXT_SYSTEM.
-        role_assign($student->id, $user->id, $systemcontext->id);
-        $count = $DB->count_records('role_assignments', ['contextid' => $systemcontext->id]);
-        $this->assertEquals(1, $count);
-        // Role assignments CONTEXT_MODULE.
-        role_assign($student->id, $user->id, $cmcontext->id);
-        $count = $DB->count_records('role_assignments', ['contextid' => $cmcontext->id]);
-        $this->assertEquals(1, $count);
-        // Role assigments CONTEXT_BLOCK.
-        role_assign($student->id, $user->id, $blockcontext->id);
-        $count = $DB->count_records('role_assignments', ['contextid' => $blockcontext->id]);
-        $this->assertEquals(1, $count);
-        // Role assigments CONTEXT_USER.
-        role_assign($manager->id, $user->id, $usercontext2->id);
-        $count = $DB->count_records('role_assignments', ['contextid' => $usercontext2->id]);
-        $this->assertEquals(1, $count);
-
-        // Delete data based on CONTEXT_COURSE context.
-        provider::delete_data_for_all_users_in_context($coursecontext);
-        // After deletion, the role_assignments entries for this context should have been deleted.
-        $count = $DB->count_records('role_assignments', ['contextid' => $coursecontext->id]);
-        $this->assertEquals(0, $count);
-        // Check it is not removing data on other contexts.
-        $count = $DB->count_records('role_assignments', ['contextid' => $coursecatcontext->id]);
-        $this->assertEquals(2, $count);
-        $count = $DB->count_records('role_assignments', ['contextid' => $systemcontext->id]);
-        $this->assertEquals(1, $count);
-        $count = $DB->count_records('role_assignments', ['contextid' => $cmcontext->id]);
-        $this->assertEquals(1, $count);
-        // Delete data based on CONTEXT_COURSECAT context.
-        provider::delete_data_for_all_users_in_context($coursecatcontext);
-        // After deletion, the role_assignments entries for this context should have been deleted.
-        $count = $DB->count_records('role_assignments', ['contextid' => $coursecatcontext->id]);
-        $this->assertEquals(0, $count);
-        // Delete data based on CONTEXT_SYSTEM context.
-        provider::delete_data_for_all_users_in_context($systemcontext);
-        // After deletion, the role_assignments entries for this context should have been deleted.
-        $count = $DB->count_records('role_assignments', ['contextid' => $systemcontext->id]);
-        $this->assertEquals(0, $count);
-        // Delete data based on CONTEXT_MODULE context.
-        provider::delete_data_for_all_users_in_context($cmcontext);
-        // After deletion, the role_assignments entries for this context should have been deleted.
-        $count = $DB->count_records('role_assignments', ['contextid' => $cmcontext->id]);
-        $this->assertEquals(0, $count);
-        // Delete data based on CONTEXT_BLOCK context.
-        provider::delete_data_for_all_users_in_context($usercontext2);
-        // After deletion, the role_assignments entries for this context should have been deleted.
-        $count = $DB->count_records('role_assignments', ['contextid' => $usercontext2->id]);
-        $this->assertEquals(0, $count);
-    }
-
-    /**
-     * Test for provider::delete_data_for_user().
-     */
-    public function test_delete_data_for_user() {
-        global $DB;
-
-        $this->resetAfterTest();
-        $this->setAdminUser();
-        $user = $this->getDataGenerator()->create_user();
-        $user2 = $this->getDataGenerator()->create_user();
-        $usercontext2 = \context_user::instance($user2->id);
-        $user3 = $this->getDataGenerator()->create_user();
-        $usercontext3 = \context_user::instance($user3->id);
-        $course = $this->getDataGenerator()->create_course();
-        $course2 = $this->getDataGenerator()->create_course();
-        $course3 = $this->getDataGenerator()->create_course();
-        $coursecontext = \context_course::instance($course->id);
-        $coursecontext2 = \context_course::instance($course2->id);
-        $coursecontext3 = \context_course::instance($course3->id);
-        $coursecat = $this->getDataGenerator()->create_category();
-        $coursecatcontext = \context_coursecat::instance($coursecat->id);
-        $systemcontext = \context_system::instance();
-        $cm = $this->getDataGenerator()->create_module('chat', ['course' => $course->id]);
-        $cmcontext = \context_module::instance($cm->cmid);
-        $student = $DB->get_record('role', array('shortname' => 'student'), '*', MUST_EXIST);
-        $manager = $DB->get_record('role', array('shortname' => 'manager'), '*', MUST_EXIST);
-        $block = $this->getDataGenerator()->create_block('online_users');
-        $blockcontext = \context_block::instance($block->id);
-
-        // Role assignments, Where the user is assigned.
-        role_assign($student->id, $user->id, $coursecontext->id);
-        role_assign($student->id, $user->id, $coursecontext2->id);
-        role_assign($student->id, $user->id, $coursecatcontext->id);
-        role_assign($student->id, $user->id, $cmcontext->id);
-        role_assign($student->id, $user->id, $systemcontext->id);
-        role_assign($student->id, $user->id, $blockcontext->id);
-        role_assign($manager->id, $user->id, $usercontext2->id);
-        role_assign($manager->id, $user->id, $usercontext3->id);
-        $count = $DB->count_records('role_assignments', ['userid' => $user->id]);
-        $this->assertEquals(8, $count);
-        // Role assignments, where the user makes assignments.
-        $this->setUser($user);
-        role_assign($student->id, $user2->id, $coursecontext3->id);
-        role_assign($student->id, $user3->id, $coursecontext3->id);
-        $count = $DB->count_records('role_assignments', ['modifierid' => $user->id]);
-        $this->assertEquals(2, $count);
-
-        $contextlist = provider::get_contexts_for_userid($user->id);
-        $approvedcontextlist = new approved_contextlist($user, 'core_role', $contextlist->get_contextids());
-        provider::delete_data_for_user($approvedcontextlist);
-        // After deletion, the role_assignments assigned to the user should have been deleted.
-        $count = $DB->count_records('role_assignments', ['userid' => $user->id]);
-        $this->assertEquals(0, $count);
-        // After deletion, the role_assignments assigned by the user should not have been deleted.
-        $count = $DB->count_records('role_assignments', ['modifierid' => $user->id]);
-        $this->assertEquals(2, $count);
-    }
-
-    /**
-     * Export for a user with a key against a script where no instance is specified.
-     */
-    public function test_export_user_role_to_cohort() {
-        global $DB;
-
-        $this->resetAfterTest();
-        $this->setAdminUser();
-        // Assign user roles to cohort.
-        $user = $this->getDataGenerator()->create_user();
-        $contextuser = \context_user::instance($user->id);
-        $teacher = $DB->get_record('role', array('shortname' => 'teacher'), '*', MUST_EXIST);
-        $cohort = $this->getDataGenerator()->create_cohort();
-        $userassignover = $this->getDataGenerator()->create_user();
-        $contextuserassignover = \context_user::instance($userassignover->id);
-        cohort_add_member($cohort->id, $userassignover->id);
-        $this->setAdminUser();
-        $params = (object) array(
-            'userid' => $user->id,
-            'roleid' => $teacher->id,
-            'cohortid' => $cohort->id
-        );
-        api::create_cohort_role_assignment($params);
-        api::sync_all_cohort_roles();
-        $rolesnames = self::get_roles_name();
-        $subcontextteacher = [
-            get_string('privacy:metadata:role_cohortroles', 'core_role'),
-            $rolesnames[$teacher->id]
-        ];
-        // Test User is assigned role teacher to cohort.
-        provider::export_user_role_to_cohort($user->id);
-        $writer = writer::with_context($contextuserassignover);
-        $this->assertTrue($writer->has_any_data());
-        $exported = $writer->get_related_data($subcontextteacher, 'cohortroles');
-        $this->assertEquals($user->id, reset($exported)->userid);
-
-        // Test User is member of a cohort which User2 is assigned to role to this cohort.
-        $user2 = $this->getDataGenerator()->create_user();
-        $cohort2 = $this->getDataGenerator()->create_cohort();
-        cohort_add_member($cohort2->id, $user->id);
-        $params = (object) array(
-            'userid' => $user2->id,
-            'roleid' => $teacher->id,
-            'cohortid' => $cohort2->id
-        );
-        api::create_cohort_role_assignment($params);
-        api::sync_all_cohort_roles();
-        provider::export_user_role_to_cohort($user->id);
-        $writer = writer::with_context($contextuser);
-        $this->assertTrue($writer->has_any_data());
-        $exported = $writer->get_related_data($subcontextteacher, 'cohortroles');
-        $this->assertEquals($user2->id, reset($exported)->userid);
-    }
-
-    /**
-     * Test for provider::delete_user_role_to_cohort().
-     */
-    public function test_delete_user_role_to_cohort() {
-        global $DB;
-
-        $this->resetAfterTest();
-        $this->setAdminUser();
-        // Assign user roles to cohort.
-        $user = $this->getDataGenerator()->create_user();
-        $user2 = $this->getDataGenerator()->create_user();
-        $user3 = $this->getDataGenerator()->create_user();
-        $user4 = $this->getDataGenerator()->create_user();
-        $teacher = $DB->get_record('role', array('shortname' => 'teacher'), '*', MUST_EXIST);
-        $cohort = $this->getDataGenerator()->create_cohort();
-        cohort_add_member($cohort->id, $user2->id);
-        cohort_add_member($cohort->id, $user3->id);
-        cohort_add_member($cohort->id, $user4->id);
-        $this->setAdminUser();
-        $params = (object) array(
-            'userid' => $user->id,
-            'roleid' => $teacher->id,
-            'cohortid' => $cohort->id
-        );
-        api::create_cohort_role_assignment($params);
-        api::sync_all_cohort_roles();
-
-        $count = $DB->count_records('role_assignments', ['userid' => $user->id, 'component' => 'tool_cohortroles']);
-        $this->assertEquals(3, $count);
-
-        provider::delete_user_role_to_cohort($user->id);
-        $count = $DB->count_records('role_assignments', ['userid' => $user->id, 'component' => 'tool_cohortroles']);
-        $this->assertEquals(0, $count);
-    }
-
-    /**
-     * Test that only users within a course context are fetched.
-     */
-    public function test_get_users_in_context() {
-        global $DB;
-
-        $this->resetAfterTest();
-
-        $component = 'core_role';
-
-        $this->setAdminUser();
-        $admin = \core_user::get_user_by_username('admin');
-        // Create user1.
-        $user1 = $this->getDataGenerator()->create_user();
-        $usercontext1 = \context_user::instance($user1->id);
-        // Create user2.
-        $user2 = $this->getDataGenerator()->create_user();
-        $usercontext2 = \context_user::instance($user2->id);
-        // Create course1.
-        $course1 = $this->getDataGenerator()->create_course();
-        $coursecontext1 = \context_course::instance($course1->id);
-        // Create course category.
-        $coursecat = $this->getDataGenerator()->create_category();
-        $coursecatcontext = \context_coursecat::instance($coursecat->id);
-        // Create chat module.
-        $cm = $this->getDataGenerator()->create_module('chat', ['course' => $course1->id]);
-        $cmcontext = \context_module::instance($cm->cmid);
-
-        $systemcontext = \context_system::instance();
-        // Create a block.
-        $block = $this->getDataGenerator()->create_block('online_users');
-        $blockcontext = \context_block::instance($block->id);
-
-        $studentrole = $DB->get_record('role', array('shortname' => 'student'), '*', MUST_EXIST);
-        $managerrole = $DB->get_record('role', array('shortname' => 'manager'), '*', MUST_EXIST);
-
-        // Role assignments CONTEXT_COURSE.
-        role_assign($studentrole->id, $user1->id, $coursecontext1->id);
-        role_assign($studentrole->id, $user2->id, $coursecontext1->id);
-        // Role assignments CONTEXT_COURSECAT.
-        role_assign($studentrole->id, $user2->id, $coursecatcontext->id);
-        // Role assignments CONTEXT_SYSTEM.
-        role_assign($studentrole->id, $user1->id, $systemcontext->id);
-        // Role assignments CONTEXT_MODULE.
-        role_assign($studentrole->id, $user2->id, $cmcontext->id);
-        // Role assigments CONTEXT_BLOCK.
-        role_assign($studentrole->id, $user1->id, $blockcontext->id);
-        // Role assigments CONTEXT_USER.
-        role_assign($managerrole->id, $user1->id, $usercontext2->id);
-
-        // Role capabilities.
-        $this->setUser($user1);
-        assign_capability('moodle/backup:backupcourse', CAP_ALLOW, $studentrole->id, $cmcontext->id);
-
-        // The user list for usercontext1 should not return any users.
-        $userlist1 = new \core_privacy\local\request\userlist($usercontext1, $component);
-        provider::get_users_in_context($userlist1);
-        $this->assertCount(0, $userlist1);
-        // The user list for usercontext2 should user1 and admin (role creator).
-        $userlist2 = new \core_privacy\local\request\userlist($usercontext2, $component);
-        provider::get_users_in_context($userlist2);
-        $this->assertCount(2, $userlist2);
-        $expected = [
-            $user1->id,
-            $admin->id
-        ];
-        $this->assertEquals($expected, $userlist2->get_userids(), '', 0.0, 10, true);
-
-        // The user list for coursecontext1 should user1, user2 and admin (role creator).
-        $userlist3 = new \core_privacy\local\request\userlist($coursecontext1, $component);
-        provider::get_users_in_context($userlist3);
-        $this->assertCount(3, $userlist3);
-        $expected = [
-            $user1->id,
-            $user2->id,
-            $admin->id
-        ];
-        $this->assertEquals($expected, $userlist3->get_userids(), '', 0.0, 10, true);
-
-        // The user list for coursecatcontext should user2 and admin (role creator).
-        $userlist4 = new \core_privacy\local\request\userlist($coursecatcontext, $component);
-        provider::get_users_in_context($userlist4);
-        $this->assertCount(2, $userlist4);
-        $expected = [
-            $user2->id,
-            $admin->id
-        ];
-        $this->assertEquals($expected, $userlist4->get_userids(), '', 0.0, 10, true);
-
-        // The user list for systemcontext should user1 and admin (role creator).
-        $userlist6 = new \core_privacy\local\request\userlist($systemcontext, $component);
-        provider::get_users_in_context($userlist6);
-        $this->assertCount(2, $userlist6);
-        $expected = [
-            $user1->id,
-            $admin->id
-        ];
-        $this->assertEquals($expected, $userlist6->get_userids(), '', 0.0, 10, true);
-
-        // The user list for cmcontext should user1, user2 and admin (role creator).
-        $userlist7 = new \core_privacy\local\request\userlist($cmcontext, $component);
-        provider::get_users_in_context($userlist7);
-        $this->assertCount(3, $userlist7);
-        $expected = [
-            $user1->id,
-            $user2->id,
-            $admin->id
-        ];
-        $this->assertEquals($expected, $userlist7->get_userids(), '', 0.0, 10, true);
-
-        // The user list for blockcontext should user1 and admin (role creator).
-        $userlist8 = new \core_privacy\local\request\userlist($blockcontext, $component);
-        provider::get_users_in_context($userlist8);
-        $this->assertCount(2, $userlist8);
-        $expected = [
-            $user1->id,
-            $admin->id
-        ];
-        $this->assertEquals($expected, $userlist8->get_userids(), '', 0.0, 10, true);
-    }
-
-    /**
-     * Test that data for users in approved userlist is deleted.
-     */
-    public function test_delete_data_for_users() {
-        global $DB;
-
-        $this->resetAfterTest();
-
-        $component = 'core_role';
-
-        $this->setAdminUser();
-        $admin = \core_user::get_user_by_username('admin');
-        // Create user1.
-        $user1 = $this->getDataGenerator()->create_user();
-        // Create user2.
-        $user2 = $this->getDataGenerator()->create_user();
-        $usercontext2 = \context_user::instance($user2->id);
-        // Create course1.
-        $course1 = $this->getDataGenerator()->create_course();
-        $coursecontext1 = \context_course::instance($course1->id);
-        // Create course category.
-        $coursecat = $this->getDataGenerator()->create_category();
-        $coursecatcontext = \context_coursecat::instance($coursecat->id);
-        // Create chat module.
-        $cm = $this->getDataGenerator()->create_module('chat', ['course' => $course1->id]);
-        $cmcontext = \context_module::instance($cm->cmid);
-
-        $systemcontext = \context_system::instance();
-        // Create a block.
-        $block = $this->getDataGenerator()->create_block('online_users');
-        $blockcontext = \context_block::instance($block->id);
-
-        $studentrole = $DB->get_record('role', array('shortname' => 'student'), '*', MUST_EXIST);
-        $managerrole = $DB->get_record('role', array('shortname' => 'manager'), '*', MUST_EXIST);
-
-        // Role assignments CONTEXT_COURSE.
-        role_assign($studentrole->id, $user1->id, $coursecontext1->id);
-        role_assign($studentrole->id, $user2->id, $coursecontext1->id);
-        // Role assignments CONTEXT_COURSECAT.
-        role_assign($studentrole->id, $user2->id, $coursecatcontext->id);
-        // Role assignments CONTEXT_SYSTEM.
-        role_assign($studentrole->id, $user1->id, $systemcontext->id);
-        // Role assignments CONTEXT_MODULE.
-        role_assign($studentrole->id, $user2->id, $cmcontext->id);
-        // Role assigments CONTEXT_BLOCK.
-        role_assign($studentrole->id, $user1->id, $blockcontext->id);
-        // Role assigments CONTEXT_USER.
-        role_assign($managerrole->id, $user1->id, $usercontext2->id);
-
-        // Role capabilities.
-        $this->setUser($user1);
-        assign_capability('moodle/backup:backupcourse', CAP_ALLOW, $studentrole->id, $cmcontext->id);
-
-        // The user list for usercontext2 should user1 and admin (role creator).
-        $userlist1 = new \core_privacy\local\request\userlist($usercontext2, $component);
-        provider::get_users_in_context($userlist1);
-        $this->assertCount(2, $userlist1);
-        // The user list for coursecontext1 should user1, user2 and admin (role creator).
-        $userlist2 = new \core_privacy\local\request\userlist($coursecontext1, $component);
-        provider::get_users_in_context($userlist2);
-        $this->assertCount(3, $userlist2);
-        // The user list for coursecatcontext should user2 and admin (role creator).
-        $userlist3 = new \core_privacy\local\request\userlist($coursecatcontext, $component);
-        provider::get_users_in_context($userlist3);
-        $this->assertCount(2, $userlist3);
-        // The user list for systemcontext should user1 and admin (role creator).
-        $userlist4 = new \core_privacy\local\request\userlist($systemcontext, $component);
-        provider::get_users_in_context($userlist4);
-        $this->assertCount(2, $userlist4);
-        // The user list for cmcontext should user1, user2 and admin (role creator).
-        $userlist5 = new \core_privacy\local\request\userlist($cmcontext, $component);
-        provider::get_users_in_context($userlist5);
-        $this->assertCount(3, $userlist5);
-        // The user list for blockcontext should user1 and admin (role creator).
-        $userlist6 = new \core_privacy\local\request\userlist($blockcontext, $component);
-        provider::get_users_in_context($userlist6);
-        $this->assertCount(2, $userlist6);
-
-        // Convert $userlist1 into an approved_contextlist.
-        $approvedlist1 = new approved_userlist($usercontext2, $component, $userlist1->get_userids());
-        // Delete using delete_data_for_user.
-        provider::delete_data_for_users($approvedlist1);
-        // Re-fetch users in usercontext2.
-        $userlist1 = new \core_privacy\local\request\userlist($usercontext2, $component);
-        provider::get_users_in_context($userlist1);
-        $this->assertCount(0, $userlist1);
-
-        // Convert $userlist2 into an approved_contextlist.
-        $approvedlist2 = new approved_userlist($coursecontext1, $component, $userlist2->get_userids());
-        // Delete using delete_data_for_user.
-        provider::delete_data_for_users($approvedlist2);
-        // Re-fetch users in coursecontext1.
-        $userlist2 = new \core_privacy\local\request\userlist($coursecontext1, $component);
-        provider::get_users_in_context($userlist2);
-        $this->assertCount(0, $userlist2);
-
-        // Convert $userlist3 into an approved_contextlist.
-        $approvedlist3 = new approved_userlist($coursecatcontext, $component, $userlist3->get_userids());
-        // Delete using delete_data_for_user.
-        provider::delete_data_for_users($approvedlist3);
-        // Re-fetch users in coursecatcontext.
-        $userlist3 = new \core_privacy\local\request\userlist($coursecatcontext, $component);
-        provider::get_users_in_context($userlist3);
-        $this->assertCount(0, $userlist3);
-
-        // Convert $userlist4 into an approved_contextlist.
-        $approvedlist4 = new approved_userlist($systemcontext, $component, $userlist4->get_userids());
-        // Delete using delete_data_for_user.
-        provider::delete_data_for_users($approvedlist4);
-        // Re-fetch users in systemcontext.
-        $userlist4 = new \core_privacy\local\request\userlist($systemcontext, $component);
-        provider::get_users_in_context($userlist4);
-        // The data from role_capabilities should still be present. The user list should return the admin user.
-        $this->assertCount(1, $userlist4);
-        $expected = [$admin->id];
-        $this->assertEquals($expected, $userlist4->get_userids());
-
-        // Convert $userlist5 into an approved_contextlist.
-        $approvedlist5 = new approved_userlist($cmcontext, $component, $userlist5->get_userids());
-        // Delete using delete_data_for_user.
-        provider::delete_data_for_users($approvedlist5);
-        // Re-fetch users in cmcontext.
-        $userlist5 = new \core_privacy\local\request\userlist($cmcontext, $component);
-        provider::get_users_in_context($userlist5);
-        // The data from role_capabilities should still be present. The user list should return user1.
-        $this->assertCount(1, $userlist5);
-        $expected = [$user1->id];
-        $this->assertEquals($expected, $userlist5->get_userids());
-
-        // Convert $userlist6 into an approved_contextlist.
-        $approvedlist6 = new approved_userlist($blockcontext, $component, $userlist6->get_userids());
-        // Delete using delete_data_for_user.
-        provider::delete_data_for_users($approvedlist6);
-        // Re-fetch users in blockcontext.
-        $userlist6 = new \core_privacy\local\request\userlist($blockcontext, $component);
-        provider::get_users_in_context($userlist6);
-        $this->assertCount(0, $userlist6);
-    }
-
-    /**
-     * Supoort function to get all the localised roles name
-     * in a simple array for testing.
-     *
-     * @return array Array of name of the roles by roleid.
-     */
-    protected static function get_roles_name() {
-        $roles = role_fix_names(get_all_roles(), \context_system::instance(), ROLENAME_ORIGINAL);
-        $rolesnames = array();
-        foreach ($roles as $role) {
-            $rolesnames[$role->id] = $role->localname;
-        }
-        return $rolesnames;
-    }
-}
@@ -193,8 +193,10 @@ function print_report_tree($contextid, $contexts, $systemcontext, $fullname, $al
                $strgoto = get_string('gotoassignroles', 'core_role', $a);
                $strcheck = get_string('checkuserspermissionshere', 'core_role', $a);
            }
-            echo ' <a title="' . $strgoto . '" href="' . $raurl . '">' . $OUTPUT->pix_icon('t/edit', $stredit) . '</a> ';
-            echo ' <a title="' . $strcheck . '" href="' . $churl . '">' . $OUTPUT->pix_icon('t/preview', $strcheckpermissions) . '</a> ';
+            echo ' <a title="' . $strgoto . '" href="' . $raurl . '"><img class="iconsmall" src="' .
+                    $OUTPUT->pix_url('t/edit') . '" alt="' . $stredit . '" /></a> ';
+            echo ' <a title="' . $strcheck . '" href="' . $churl . '"><img class="iconsmall" src="' .
+                    $OUTPUT->pix_url('t/preview') . '" alt="' . $strcheckpermissions . '" /></a> ';
            echo "</p>\n";
        }
    }
@@ -5,22 +5,11 @@
 require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');

-redirect_if_major_upgrade_required();
-
 $query = trim(optional_param('query', '', PARAM_NOTAGS));  // Search string

 $context = context_system::instance();
 $PAGE->set_context($context);

-$hassiteconfig = has_capability('moodle/site:config', $context);
-
-if ($hassiteconfig && moodle_needs_upgrading()) {
-    redirect(new moodle_url('/admin/index.php'));
-}
-
-// If site registration needs updating, redirect.
-\core\hub\registration::registration_reminder('/admin/search.php');
-
 admin_externalpage_setup('search', '', array('query' => $query)); // now hidden page

 $adminroot = admin_get_root(); // need all settings here
@@ -32,16 +21,15 @@ $focus = '';
 // now we'll deal with the case that the admin has submitted the form with changed settings
 if ($data = data_submitted() and confirm_sesskey() and isset($data->action) and $data->action == 'save-settings') {
    require_capability('moodle/site:config', $context);
-    $count = admin_write_settings($data);
+    if (admin_write_settings($data)) {
+        redirect($PAGE->url, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
+    }
+
    if (!empty($adminroot->errors)) {
        $errormsg = get_string('errorwithsettings', 'admin');
        $firsterror = reset($adminroot->errors);
        $focus = $firsterror->id;
    } else {
-        // No errors. Did we change any setting? If so, then redirect with success.
-        if ($count) {
-            redirect($PAGE->url, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
-        }
        redirect($PAGE->url);
    }
 }
@@ -50,12 +38,6 @@ if ($data = data_submitted() and confirm_sesskey() and isset($data->action) and
 // to modify them
 echo $OUTPUT->header($focus);

-// Display a warning if site is not registered.
-if (empty($query)) {
-    $adminrenderer = $PAGE->get_renderer('core', 'admin');
-    echo $adminrenderer->warn_if_not_registered();
-}
-
 echo $OUTPUT->heading(get_string('administrationsite'));

 if ($errormsg !== '') {
@@ -67,7 +49,7 @@ if ($errormsg !== '') {

 $showsettingslinks = true;

-if ($hassiteconfig) {
+if (has_capability('moodle/site:config', $context)) {
    require_once("admin_settings_search_form.php");
    $form = new admin_settings_search_form();
    $form->display();
@@ -28,158 +28,95 @@ admin_externalpage_setup('searchareas');

 $areaid = optional_param('areaid', null, PARAM_ALPHAEXT);
 $action = optional_param('action', null, PARAM_ALPHA);
-$indexingenabled = \core_search\manager::is_indexing_enabled(); // This restricts many of the actions on this page.

-// Get a search manager instance, which we'll need for display and to handle some actions.
 try {
    $searchmanager = \core_search\manager::instance();
 } catch (core_search\engine_exception $searchmanagererror) {
-    // In action cases, we'll throw this exception below. In non-action cases, we produce a lang string error.
+    // Continue, we return an error later depending on the requested action.
 }

-// Handle all the actions.
+echo $OUTPUT->header();
+
 if ($action) {
-    // If dealing with an areaid, we need to check that the area exists.
+    require_sesskey();
+
    if ($areaid) {
+        // We need to check that the area exists.
        $area = \core_search\manager::get_search_area($areaid);
        if ($area === false) {
            throw new moodle_exception('invalidrequest');
        }
    }

-    // All the indexing actions.
-    if (in_array($action, ['delete', 'indexall', 'reindexall', 'deleteall'])) {
-
-        // All of these actions require that indexing is enabled.
-        if ($indexingenabled) {
-
-            // For all of these actions, we strictly need a manager instance.
-            if (isset($searchmanagererror)) {
-                throw $searchmanagererror;
-            }
-
-            // Show confirm prompt for all these actions as they may be inadvisable, or may cause
-            // an interruption in search functionality, on production systems.
-            if (!optional_param('confirm', 0, PARAM_INT)) {
-                // Display confirmation prompt.
-                $a = null;
-                if ($areaid) {
-                    $a = html_writer::tag('strong', $area->get_visible_name());
-                }
-
-                $actionparams = ['sesskey' => sesskey(), 'action' => $action, 'confirm' => 1];
-                if ($areaid) {
-                    $actionparams['areaid'] = $areaid;
-                }
-                $actionurl = new moodle_url('/admin/searchareas.php', $actionparams);
-                $cancelurl = new moodle_url('/admin/searchareas.php');
-                echo $OUTPUT->header();
-                echo $OUTPUT->confirm(get_string('confirm_' . $action, 'search', $a),
-                    new single_button($actionurl, get_string('continue'), 'post', true),
-                    new single_button($cancelurl, get_string('cancel'), 'get'));
-                echo $OUTPUT->footer();
-                exit;
-            } else {
-                // Confirmed, so run the required action.
-                require_sesskey();
-
-                switch ($action) {
-                    case 'delete':
-                        $searchmanager->delete_index($areaid);
-                        \core\notification::success(get_string('searchindexdeleted', 'admin'));
-                        break;
-                    case 'indexall':
-                        $searchmanager->index();
-                        \core\notification::success(get_string('searchindexupdated', 'admin'));
-                        break;
-                    case 'reindexall':
-                        $searchmanager->index(true);
-                        \core\notification::success(get_string('searchreindexed', 'admin'));
-                        break;
-                    case 'deleteall':
-                        $searchmanager->delete_index();
-                        \core\notification::success(get_string('searchalldeleted', 'admin'));
-                        break;
-                    default:
-                        break;
-                }
-
-                // Redirect back to the main page after taking action.
-                redirect(new moodle_url('/admin/searchareas.php'));
-            }
+    // All actions but enable/disable need the search engine to be ready.
+    if ($action !== 'enable' && $action !== 'disable') {
+        if (!empty($searchmanagererror)) {
+            throw $searchmanagererror;
        }
-    } else if (in_array($action, ['enable', 'disable'])) {
-        // Toggling search areas requires no confirmation.
-        require_sesskey();
+    }

-        switch ($action) {
-            case 'enable':
-                $area->set_enabled(true);
-                \core\notification::success(get_string('searchareaenabled', 'admin'));
-                break;
-            case 'disable':
-                $area->set_enabled(false);
-                core\notification::success(get_string('searchareadisabled', 'admin'));
-                break;
-            default:
-                break;
-        }
-
-        redirect(new moodle_url('/admin/searchareas.php'));
-    } else {
-        // Invalid action.
-        throw new moodle_exception('invalidaction');
+    switch ($action) {
+        case 'enable':
+            $area->set_enabled(true);
+            echo $OUTPUT->notification(get_string('searchareaenabled', 'admin'), \core\output\notification::NOTIFY_SUCCESS);
+            break;
+        case 'disable':
+            $area->set_enabled(false);
+            echo $OUTPUT->notification(get_string('searchareadisabled', 'admin'), \core\output\notification::NOTIFY_SUCCESS);
+            break;
+        case 'delete':
+            $search = \core_search\manager::instance();
+            $search->delete_index($areaid);
+            echo $OUTPUT->notification(get_string('searchindexdeleted', 'admin'), \core\output\notification::NOTIFY_SUCCESS);
+            break;
+        case 'indexall':
+            $searchmanager->index();
+            echo $OUTPUT->notification(get_string('searchindexupdated', 'admin'), \core\output\notification::NOTIFY_SUCCESS);
+            break;
+        case 'reindexall':
+            $searchmanager->index(true);
+            echo $OUTPUT->notification(get_string('searchreindexed', 'admin'), \core\output\notification::NOTIFY_SUCCESS);
+            break;
+        case 'deleteall':
+            $searchmanager->delete_index();
+            echo $OUTPUT->notification(get_string('searchalldeleted', 'admin'), \core\output\notification::NOTIFY_SUCCESS);
+            break;
+        default:
+            throw new moodle_exception('invalidaction');
+            break;
    }
 }

-
-// Display.
-if (isset($searchmanager) && $indexingenabled) {
-    \core\notification::info(get_string('indexinginfo', 'admin'));
-} else if (isset($searchmanager)) {
-    $params = (object) [
-        'url' => (new moodle_url("/admin/settings.php?section=manageglobalsearch#admin-searchindexwhendisabled"))->out(false)
-    ];
-    \core\notification::error(get_string('indexwhendisabledfullnotice', 'search', $params));
+$searchareas = \core_search\manager::get_search_areas_list();
+if (empty($searchmanagererror)) {
+    $areasconfig = $searchmanager->get_areas_config($searchareas);
 } else {
-    // In non-action cases, init errors are translated and displayed to the user as error notifications.
-    $errorstr = get_string($searchmanagererror->errorcode, $searchmanagererror->module, $searchmanagererror->a);
-    \core\notification::error($errorstr);
+    $areasconfig = false;
 }

-echo $OUTPUT->header();
+if (!empty($searchmanagererror)) {
+    $errorstr = get_string($searchmanagererror->errorcode, $searchmanagererror->module, $searchmanagererror->a);
+    echo $OUTPUT->notification($errorstr, \core\output\notification::NOTIFY_ERROR);
+} else {
+    echo $OUTPUT->notification(get_string('indexinginfo', 'admin'), \core\output\notification::NOTIFY_INFO);
+}

 $table = new html_table();
 $table->id = 'core-search-areas';
-$table->head = [
-    get_string('searcharea', 'search'),
-    get_string('searchareacategories', 'search'),
-    get_string('enable'),
-    get_string('newestdocindexed', 'admin'),
-    get_string('searchlastrun', 'admin'),
-    get_string('searchindexactions', 'admin')
-];

-$searchareas = \core_search\manager::get_search_areas_list();
-$areasconfig = isset($searchmanager) ? $searchmanager->get_areas_config($searchareas) : false;
+$table->head = array(get_string('searcharea', 'search'), get_string('enable'), get_string('newestdocindexed', 'admin'),
+    get_string('searchlastrun', 'admin'), get_string('searchindexactions', 'admin'));
+
 foreach ($searchareas as $area) {
    $areaid = $area->get_area_id();
    $columns = array(new html_table_cell($area->get_visible_name()));

-    $areacategories = [];
-    foreach (\core_search\manager::get_search_area_categories() as $category) {
-        if (key_exists($areaid, $category->get_areas())) {
-            $areacategories[] = $category->get_visiblename();
-        }
-    }
-    $columns[] = new html_table_cell(implode(', ', $areacategories));
-
    if ($area->is_enabled()) {
        $columns[] = $OUTPUT->action_icon(admin_searcharea_action_url('disable', $areaid),
            new pix_icon('t/hide', get_string('disable'), 'moodle', array('title' => '', 'class' => 'iconsmall')),
            null, array('title' => get_string('disable')));

-        if ($areasconfig && $indexingenabled) {
+        if ($areasconfig) {
            $columns[] = $areasconfig[$areaid]->lastindexrun;

            if ($areasconfig[$areaid]->indexingstart) {
@@ -188,31 +125,14 @@ foreach ($searchareas as $area) {
                    $areasconfig[$areaid]->docsprocessed . ' , ' .
                    $areasconfig[$areaid]->recordsprocessed . ' , ' .
                    $areasconfig[$areaid]->docsignored;
-                if ($areasconfig[$areaid]->partial) {
-                    $laststatus .= ' ' . get_string('searchpartial', 'admin');
-                }
            } else {
                $laststatus = '';
            }
            $columns[] = $laststatus;
-            $accesshide = html_writer::span($area->get_visible_name(), 'accesshide');
-            $actions = [];
-            $actions[] = $OUTPUT->pix_icon('t/delete', '') .
-                    html_writer::link(admin_searcharea_action_url('delete', $areaid),
-                    get_string('deleteindex', 'search', $accesshide));
-            if ($area->supports_get_document_recordset()) {
-                $actions[] = $OUTPUT->pix_icon('i/reload', '') . html_writer::link(
-                        new moodle_url('searchreindex.php', ['areaid' => $areaid]),
-                        get_string('gradualreindex', 'search', $accesshide));
-            }
-            $columns[] = html_writer::alist($actions, ['class' => 'unstyled list-unstyled']);
+            $columns[] = html_writer::link(admin_searcharea_action_url('delete', $areaid), 'Delete index');

        } else {
-            if (!$areasconfig) {
-                $blankrow = new html_table_cell(get_string('searchnotavailable', 'admin'));
-            } else {
-                $blankrow = new html_table_cell(get_string('indexwhendisabledshortnotice', 'search'));
-            }
+            $blankrow = new html_table_cell(get_string('searchnotavailable', 'admin'));
            $blankrow->colspan = 3;
            $columns[] = $blankrow;
        }
@@ -231,7 +151,10 @@ foreach ($searchareas as $area) {
 }

 // Cross-search area tasks.
-$options = (isset($searchmanager) && $indexingenabled) ? [] : ['disabled' => true];
+$options = array();
+if (!empty($searchmanagererror)) {
+    $options['disabled'] = true;
+}
 echo $OUTPUT->box_start('search-areas-actions');
 echo $OUTPUT->single_button(admin_searcharea_action_url('indexall'), get_string('searchupdateindex', 'admin'), 'get', $options);
 echo $OUTPUT->single_button(admin_searcharea_action_url('reindexall'), get_string('searchreindexindex', 'admin'), 'get', $options);
@@ -239,13 +162,6 @@ echo $OUTPUT->single_button(admin_searcharea_action_url('deleteall'), get_string
 echo $OUTPUT->box_end();

 echo html_writer::table($table);
-
-if (isset($searchmanager)) {
-    // Show information about queued index requests for specific contexts.
-    $searchrenderer = $PAGE->get_renderer('core_search');
-    echo $searchrenderer->render_index_requests_info($searchmanager->get_index_requests_info());
-}
-
 echo $OUTPUT->footer();

 /**
@@ -256,12 +172,9 @@ echo $OUTPUT->footer();
 * @return moodle_url
 */
 function admin_searcharea_action_url($action, $areaid = false) {
-    $params = array('action' => $action);
+    $params = array('action' => $action, 'sesskey' => sesskey());
    if ($areaid) {
        $params['areaid'] = $areaid;
    }
-    if ($action === 'disable' || $action === 'enable') {
-        $params['sesskey'] = sesskey();
-    }
    return new moodle_url('/admin/searchareas.php', $params);
 }
@@ -1,87 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Adds a search area to the queue for indexing.
- *
- * @package core_search
- * @copyright 2017 The Open University
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('NO_OUTPUT_BUFFERING', true);
-
-require(__DIR__ . '/../config.php');
-
-// Check access.
-require_once($CFG->libdir . '/adminlib.php');
-
-admin_externalpage_setup('searchareas', '', null, (new moodle_url('/admin/searchreindex.php'))->out(false));
-
-// Get area parameter and check it exists.
-$areaid = required_param('areaid', PARAM_ALPHAEXT);
-$area = \core_search\manager::get_search_area($areaid);
-if ($area === false) {
-    throw new moodle_exception('invalidrequest');
-}
-$areaname = $area->get_visible_name();
-
-// Start page output.
-$heading = get_string('gradualreindex', 'search', '');
-$PAGE->set_title($PAGE->title . ': ' . $heading);
-$PAGE->navbar->add($heading);
-echo $OUTPUT->header();
-echo $OUTPUT->heading($heading);
-
-// If sesskey is supplied, actually carry out the action.
-if (optional_param('sesskey', '', PARAM_ALPHANUM)) {
-    require_sesskey();
-
-    // Get all contexts for search area. This query can take time in large cases.
-    \core_php_time_limit::raise(0);
-    $contextiterator = $area->get_contexts_to_reindex();
-
-    $progress = new \core\progress\display_if_slow('');
-    $progress->start_progress($areaname);
-
-    // Request reindexing for each context (with low priority).
-    $count = 0;
-    foreach ($contextiterator as $context) {
-        \core_php_time_limit::raise(30);
-        \core_search\manager::request_index($context, $area->get_area_id(),
-                \core_search\manager::INDEX_PRIORITY_REINDEXING);
-        $progress->progress();
-        $count++;
-    }
-
-    // Unset the iterator which should close the recordset (if there is one).
-    unset($contextiterator);
-
-    $progress->end_progress();
-
-    $a = (object)['name' => html_writer::tag('strong', $areaname), 'count' => $count];
-    echo $OUTPUT->box(get_string('gradualreindex_queued', 'search', $a));
-
-    echo $OUTPUT->continue_button(new moodle_url('/admin/searchareas.php'));
-} else {
-    // Display confirmation prompt.
-    echo $OUTPUT->confirm(get_string('gradualreindex_confirm', 'search', html_writer::tag('strong', $areaname)),
-            new single_button(new moodle_url('/admin/searchreindex.php', ['areaid' => $areaid,
-                'sesskey' => sesskey()]), get_string('continue'), 'post', true),
-            new single_button(new moodle_url('/admin/searchareas.php'), get_string('cancel'), 'get'));
-}
-
-echo $OUTPUT->footer();
@@ -38,17 +38,12 @@ if (!($settingspage->check_access())) {
 $statusmsg = '';
 $errormsg  = '';

-// Form is submitted with changed settings. Do not want to execute when modifying a block.
-if ($data = data_submitted() and confirm_sesskey() and isset($data->action) and $data->action == 'save-settings') {
+if ($data = data_submitted() and confirm_sesskey()) {
+    if (admin_write_settings($data)) {
+        redirect($PAGE->url, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
+    }

-    $count = admin_write_settings($data);
-    // Regardless of whether any setting change was written (a positive count), check validation errors for those that didn't.
    if (empty($adminroot->errors)) {
-        // No errors. Did we change any setting? If so, then redirect with success.
-        if ($count) {
-            redirect($PAGE->url, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
-        }
-        // We didn't change a setting.
        switch ($return) {
            case 'site': redirect("$CFG->wwwroot/");
            case 'admin': redirect("$CFG->wwwroot/$CFG->admin/");
@@ -156,11 +151,4 @@ $PAGE->requires->yui_module('moodle-core-formchangechecker',
 );
 $PAGE->requires->string_for_js('changesmadereallygoaway', 'moodle');

-if ($settingspage->has_dependencies()) {
-    $opts = [
-        'dependencies' => $settingspage->get_dependencies_for_javascript()
-    ];
-    $PAGE->requires->js_call_amd('core/showhidesettings', 'init', [$opts]);
-}
-
 echo $OUTPUT->footer();
@@ -1,153 +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/>.
-
-/**
- * Adds settings links to admin tree.
- *
- * @package   core_analytics
- * @copyright 2016 David Monllao {@link http://www.davidmonllao.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-if ($hassiteconfig) {
-
-    $settings = new admin_settingpage('analyticssite', new lang_string('analyticssiteinfo', 'analytics'));
-    $ADMIN->add('analytics', $settings);
-
-    if ($ADMIN->fulltree) {
-        $modeinstructions = [
-            'facetoface' => get_string('modeinstructionfacetoface', 'analytics'),
-            'blendedhybrid' => get_string('modeinstructionblendedhybrid', 'analytics'),
-            'fullyonline' => get_string('modeinstructionfullyonline', 'analytics'),
-        ];
-        $settings->add(new admin_setting_configmultiselect('analytics/modeinstruction', get_string('modeinstruction', 'analytics'),
-            '', [], $modeinstructions));
-
-        $settings->add(new admin_setting_configtext_with_maxlength('analytics/percentonline',
-            get_string('percentonline', 'analytics'),
-            get_string('percentonline_help', 'analytics'), '', PARAM_INT, 3, 3));
-
-        $typeinstitutions = [
-            'typeinstitutionacademic' => get_string('typeinstitutionacademic', 'analytics'),
-            'typeinstitutiontraining' => get_string('typeinstitutiontraining', 'analytics'),
-            'typeinstitutionngo' => get_string('typeinstitutionngo', 'analytics'),
-        ];
-        $settings->add(new admin_setting_configmultiselect('analytics/typeinstitution', get_string('typeinstitution', 'analytics'),
-            '', [], $typeinstitutions));
-
-        $levelinstitutions = [
-            'levelinstitutionisced0' => get_string('levelinstitutionisced0', 'analytics'),
-            'levelinstitutionisced1' => get_string('levelinstitutionisced1', 'analytics'),
-            'levelinstitutionisced2' => get_string('levelinstitutionisced2', 'analytics'),
-            'levelinstitutionisced3' => get_string('levelinstitutionisced3', 'analytics'),
-            'levelinstitutionisced4' => get_string('levelinstitutionisced4', 'analytics'),
-            'levelinstitutionisced5' => get_string('levelinstitutionisced5', 'analytics'),
-            'levelinstitutionisced6' => get_string('levelinstitutionisced6', 'analytics'),
-            'levelinstitutionisced7' => get_string('levelinstitutionisced7', 'analytics'),
-            'levelinstitutionisced8' => get_string('levelinstitutionisced8', 'analytics'),
-        ];
-        $settings->add(new admin_setting_configmultiselect('analytics/levelinstitution',
-            get_string('levelinstitution', 'analytics'), '', [], $levelinstitutions));
-    }
-
-    $settings = new admin_settingpage('analyticssettings', new lang_string('analyticssettings', 'analytics'));
-    $ADMIN->add('analytics', $settings);
-
-    if ($ADMIN->fulltree) {
-
-
-        // Select the site prediction's processor.
-        $predictionprocessors = \core_analytics\manager::get_all_prediction_processors();
-        $predictors = array();
-        foreach ($predictionprocessors as $fullclassname => $predictor) {
-            $pluginname = substr($fullclassname, 1, strpos($fullclassname, '\\', 1) - 1);
-            $predictors[$fullclassname] = new lang_string('pluginname', $pluginname);
-        }
-        $settings->add(new \core_analytics\admin_setting_predictor('analytics/predictionsprocessor',
-            new lang_string('defaultpredictionsprocessor', 'analytics'), new lang_string('predictionsprocessor_help', 'analytics'),
-            \core_analytics\manager::default_mlbackend(), $predictors)
-        );
-
-        // Log store.
-        $logmanager = get_log_manager();
-        $readers = $logmanager->get_readers('core\log\sql_reader');
-        $options = array();
-        $defaultreader = null;
-        foreach ($readers as $plugin => $reader) {
-            if (!$reader->is_logging()) {
-                continue;
-            }
-            if (!isset($defaultreader)) {
-                // The top one as default reader.
-                $defaultreader = $plugin;
-            }
-            $options[$plugin] = $reader->get_name();
-        }
-
-        if (empty($defaultreader)) {
-            // We fall here during initial site installation because log stores are not
-            // enabled until admin/tool/log/db/install.php is executed and get_readers
-            // return nothing.
-
-            if ($enabledlogstores = get_config('tool_log', 'enabled_stores')) {
-                $enabledlogstores = explode(',', $enabledlogstores);
-                $defaultreader = reset($enabledlogstores);
-
-                // No need to set the correct name, just the value, this will not be displayed.
-                $options[$defaultreader] = $defaultreader;
-            }
-        }
-        $settings->add(new admin_setting_configselect('analytics/logstore',
-            new lang_string('analyticslogstore', 'analytics'), new lang_string('analyticslogstore_help', 'analytics'),
-            $defaultreader, $options));
-
-        // Enable/disable time splitting methods.
-        $alltimesplittings = \core_analytics\manager::get_time_splitting_methods_for_evaluation(true);
-
-        $timesplittingoptions = array();
-        $timesplittingdefaults = array('\core\analytics\time_splitting\quarters_accum',
-            '\core\analytics\time_splitting\quarters', '\core\analytics\time_splitting\single_range');
-        foreach ($alltimesplittings as $key => $timesplitting) {
-            $timesplittingoptions[$key] = $timesplitting->get_name();
-        }
-        $settings->add(new admin_setting_configmultiselect('analytics/defaulttimesplittingsevaluation',
-            new lang_string('defaulttimesplittingmethods', 'analytics'),
-            new lang_string('defaulttimesplittingmethods_help', 'analytics'),
-            $timesplittingdefaults, $timesplittingoptions)
-        );
-
-        // Predictions processor output dir.
-        $defaultmodeloutputdir = rtrim($CFG->dataroot, '/') . DIRECTORY_SEPARATOR . 'models';
-        if (empty(get_config('analytics', 'modeloutputdir')) && !file_exists($defaultmodeloutputdir) &&
-                is_writable($defaultmodeloutputdir)) {
-            // Automatically create the dir for them so users don't see the invalid value red cross.
-            mkdir($defaultmodeloutputdir, $CFG->directorypermissions, true);
-        }
-        $settings->add(new admin_setting_configdirectory('analytics/modeloutputdir', new lang_string('modeloutputdir', 'analytics'),
-            new lang_string('modeloutputdirinfo', 'analytics'), $defaultmodeloutputdir));
-
-        // Disable web interface evaluation and get predictions.
-        $settings->add(new admin_setting_configcheckbox('analytics/onlycli', new lang_string('onlycli', 'analytics'),
-            new lang_string('onlycliinfo', 'analytics'), 1));
-
-        // Training and prediction time limit per model.
-        $settings->add(new admin_setting_configduration('analytics/modeltimelimit', new lang_string('modeltimelimit', 'analytics'),
-            new lang_string('modeltimelimitinfo', 'analytics'), 20 * MINSECS));
-
-    }
-}
@@ -22,18 +22,18 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) { // sp
    $temp->add(new admin_setting_configcheckbox('allowuserthemes', new lang_string('allowuserthemes', 'admin'), new lang_string('configallowuserthemes', 'admin'), 0));
    $temp->add(new admin_setting_configcheckbox('allowcoursethemes', new lang_string('allowcoursethemes', 'admin'), new lang_string('configallowcoursethemes', 'admin'), 0));
    $temp->add(new admin_setting_configcheckbox('allowcategorythemes',  new lang_string('allowcategorythemes', 'admin'), new lang_string('configallowcategorythemes', 'admin'), 0));
-    $temp->add(new admin_setting_configcheckbox('allowcohortthemes',  new lang_string('allowcohortthemes', 'admin'), new lang_string('configallowcohortthemes', 'admin'), 0));
    $temp->add(new admin_setting_configcheckbox('allowthemechangeonurl',  new lang_string('allowthemechangeonurl', 'admin'), new lang_string('configallowthemechangeonurl', 'admin'), 0));
    $temp->add(new admin_setting_configcheckbox('allowuserblockhiding', new lang_string('allowuserblockhiding', 'admin'), new lang_string('configallowuserblockhiding', 'admin'), 1));
+    $temp->add(new admin_setting_configcheckbox('allowblockstodock', new lang_string('allowblockstodock', 'admin'), new lang_string('configallowblockstodock', 'admin'), 1));
    $temp->add(new admin_setting_configtextarea('custommenuitems', new lang_string('custommenuitems', 'admin'),
        new lang_string('configcustommenuitems', 'admin'), '', PARAM_RAW, '50', '10'));
    $temp->add(new admin_setting_configtextarea(
        'customusermenuitems',
        new lang_string('customusermenuitems', 'admin'),
        new lang_string('configcustomusermenuitems', 'admin'),
-        'grades,grades|/grade/report/mygrades.php|t/grades
-messages,message|/message/index.php|t/message
-preferences,moodle|/user/preferences.php|t/preferences',
+        'grades,grades|/grade/report/mygrades.php|grades
+messages,message|/message/index.php|message
+preferences,moodle|/user/preferences.php|preferences',
        PARAM_RAW,
        '50',
        '10'
@@ -179,11 +179,10 @@ preferences,moodle|/user/preferences.php|t/preferences',
        'idnumber' => new lang_string('sort_idnumber', 'admin'),
    );
    $temp->add(new admin_setting_configselect('navsortmycoursessort', new lang_string('navsortmycoursessort', 'admin'), new lang_string('navsortmycoursessort_help', 'admin'), 'sortorder', $sortoptions));
-    $temp->add(new admin_setting_configtext('navcourselimit', new lang_string('navcourselimit', 'admin'),
-        new lang_string('confignavcourselimit', 'admin'), 10, PARAM_INT));
+    $temp->add(new admin_setting_configtext('navcourselimit',new lang_string('navcourselimit','admin'),new lang_string('confignavcourselimit', 'admin'),20,PARAM_INT));
    $temp->add(new admin_setting_configcheckbox('usesitenameforsitepages', new lang_string('usesitenameforsitepages', 'admin'), new lang_string('configusesitenameforsitepages', 'admin'), 0));
    $temp->add(new admin_setting_configcheckbox('linkadmincategories', new lang_string('linkadmincategories', 'admin'), new lang_string('linkadmincategories_help', 'admin'), 1));
-    $temp->add(new admin_setting_configcheckbox('linkcoursesections', new lang_string('linkcoursesections', 'admin'), new lang_string('linkcoursesections_help', 'admin'), 1));
+    $temp->add(new admin_setting_configcheckbox('linkcoursesections', new lang_string('linkcoursesections', 'admin'), new lang_string('linkcoursesections_help', 'admin'), 0));
    $temp->add(new admin_setting_configcheckbox('navshowfrontpagemods', new lang_string('navshowfrontpagemods', 'admin'), new lang_string('navshowfrontpagemods_help', 'admin'), 1));
    $temp->add(new admin_setting_configcheckbox('navadduserpostslinks', new lang_string('navadduserpostslinks', 'admin'), new lang_string('navadduserpostslinks_help', 'admin'), 1));

@@ -199,7 +198,7 @@ preferences,moodle|/user/preferences.php|t/preferences',

    // "documentation" settingpage
    $temp = new admin_settingpage('documentation', new lang_string('moodledocs'));
-    $temp->add(new admin_setting_configtext('docroot', new lang_string('docroot', 'admin'), new lang_string('configdocroot', 'admin'), 'https://docs.moodle.org', PARAM_URL));
+    $temp->add(new admin_setting_configtext('docroot', new lang_string('docroot', 'admin'), new lang_string('configdocroot', 'admin'), 'http://docs.moodle.org', PARAM_URL));
    $ltemp = array('' => get_string('forceno'));
    $ltemp += get_string_manager()->get_list_of_translations(true);
    $temp->add(new admin_setting_configselect('doclang', get_string('doclang', 'admin'), get_string('configdoclang', 'admin'), '', $ltemp));
@@ -217,9 +216,6 @@ preferences,moodle|/user/preferences.php|t/preferences',
    // coursecontact is the person responsible for course - usually manages enrolments, receives notification, etc.
    $temp = new admin_settingpage('coursecontact', new lang_string('courses'));
    $temp->add(new admin_setting_special_coursecontact());
-    $temp->add(new admin_setting_configcheckbox('coursecontactduplicates',
-            new lang_string('coursecontactduplicates', 'admin'),
-            new lang_string('coursecontactduplicates_desc', 'admin'), 0));
    $temp->add(new admin_setting_configcheckbox('courselistshortnames',
            new lang_string('courselistshortnames', 'admin'),
            new lang_string('courselistshortnames_desc', 'admin'), 0));
@@ -229,10 +225,6 @@ preferences,moodle|/user/preferences.php|t/preferences',
            new lang_string('configcourseoverviewfileslimit', 'admin'), 1, PARAM_INT));
    $temp->add(new admin_setting_configtext('courseoverviewfilesext', new lang_string('courseoverviewfilesext'),
            new lang_string('configcourseoverviewfilesext', 'admin'), '.jpg,.gif,.png'));
-    $temp->add(new admin_setting_configtext('coursegraceperiodbefore', new lang_string('coursegraceperiodbefore', 'admin'),
-        new lang_string('configcoursegraceperiodbefore', 'admin'), 0, PARAM_INT));
-    $temp->add(new admin_setting_configtext('coursegraceperiodafter', new lang_string('coursegraceperiodafter', 'admin'),
-        new lang_string('configcoursegraceperiodafter', 'admin'), 0, PARAM_INT));
    $ADMIN->add('appearance', $temp);

    $temp = new admin_settingpage('ajax', new lang_string('ajaxuse'));
@@ -258,3 +250,4 @@ preferences,moodle|/user/preferences.php|t/preferences',
    $ADMIN->add('appearance', $temp);

 } // end of speedup
+
@@ -57,11 +57,9 @@ if (($hassiteconfig || has_any_capability(array(
            new lang_string('badgesalt_desc', 'badges'),
            'badges' . $SITE->timecreated, PARAM_ALPHANUM));

-    $backpacks = badges_get_site_backpacks();
-    $choices = array();
-    foreach ($backpacks as $backpack) {
-        $choices[$backpack->id] = $backpack->backpackweburl;
-    }
+    $globalsettings->add(new admin_setting_configcheckbox('badges_allowexternalbackpack',
+            new lang_string('allowexternalbackpack', 'badges'),
+            new lang_string('allowexternalbackpack_desc', 'badges'), 1));

    $globalsettings->add(new admin_setting_configcheckbox('badges_allowcoursebadges',
            new lang_string('allowcoursebadges', 'badges'),
@@ -93,32 +91,4 @@ if (($hassiteconfig || has_any_capability(array(
            array('moodle/badges:createbadge'), empty($CFG->enablebadges)
        )
    );
-    $backpacksettings = new admin_settingpage('backpacksettings', new lang_string('backpacksettings', 'badges'),
-            array('moodle/badges:manageglobalsettings'), empty($CFG->enablebadges));
-
-    $backpacksettings->add(new admin_setting_configcheckbox('badges_allowexternalbackpack',
-            new lang_string('allowexternalbackpack', 'badges'),
-            new lang_string('allowexternalbackpack_desc', 'badges'), 1));
-
-    $backpacksettings->add(new admin_setting_configselect('badges_site_backpack',
-            new lang_string('sitebackpack', 'badges'),
-            new lang_string('sitebackpack_help', 'badges'),
-            1, $choices));
-
-    $warning = badges_verify_site_backpack();
-    if (!empty($warning)) {
-        $backpacksettings->add(new admin_setting_description('badges_site_backpack_verify',
-            new lang_string('sitebackpackverify', 'badges'),
-            $warning));
-    }
-
-    $ADMIN->add('badges', $backpacksettings);
-
-    $ADMIN->add('badges',
-        new admin_externalpage('managebackpacks',
-            new lang_string('managebackpacks', 'badges'),
-            new moodle_url('/badges/backpacks.php'),
-            array('moodle/badges:manageglobalsettings'), empty($CFG->enablebadges) || empty($CFG->badges_allowexternalbackpack)
-        )
-    );
 }
@@ -37,24 +37,12 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
            array('moodle/category:manage', 'moodle/course:create')
        )
    );
-    $ADMIN->add('courses',
-        new admin_externalpage('course_customfield', new lang_string('course_customfield', 'admin'),
-            $CFG->wwwroot . '/course/customfield.php',
-            array('moodle/course:configurecustomfields')
-        )
-    );
    $ADMIN->add('courses',
        new admin_externalpage('addcategory', new lang_string('addcategory', 'admin'),
            new moodle_url('/course/editcategory.php', array('parent' => 0)),
            array('moodle/category:manage')
        )
    );
-    $ADMIN->add('courses',
-        new admin_externalpage('addnewcourse', new lang_string('addnewcourse'),
-            new moodle_url('/course/edit.php', array('category' => 0)),
-            array('moodle/category:manage')
-        )
-    );
    $ADMIN->add('courses',
        new admin_externalpage('restorecourse', new lang_string('restorecourse', 'admin'),
            new moodle_url('/backup/restorefile.php', array('contextid' => context_system::instance()->id)),
@@ -104,9 +92,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
    $temp->add(new admin_setting_configselect('moodlecourse/coursedisplay', new lang_string('coursedisplay'),
        new lang_string('coursedisplay_help'), COURSE_DISPLAY_SINGLEPAGE, $choices));

-    $temp->add(new admin_setting_configcheckbox('moodlecourse/courseenddateenabled', get_string('courseenddateenabled'),
-        get_string('courseenddateenabled_desc'), 1));
-
    $temp->add(new admin_setting_configduration('moodlecourse/courseduration', get_string('courseduration'),
        get_string('courseduration_desc'), YEARSECS));

@@ -148,7 +133,7 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
    // Completion tracking.
    $temp->add(new admin_setting_heading('progress', new lang_string('completion','completion'), ''));
    $temp->add(new admin_setting_configselect('moodlecourse/enablecompletion', new lang_string('completion', 'completion'),
-        new lang_string('enablecompletion_help', 'completion'), 1, array(0 => new lang_string('no'), 1 => new lang_string('yes'))));
+        new lang_string('enablecompletion_help', 'completion'), 0, array(0 => new lang_string('no'), 1 => new lang_string('yes'))));

    // Groups.
    $temp->add(new admin_setting_heading('groups', new lang_string('groups', 'group'), ''));
@@ -161,6 +146,7 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {

    $ADMIN->add('courses', $temp);

+
    // "courserequests" settingpage.
    $temp = new admin_settingpage('courserequest', new lang_string('courserequest'));
    $temp->add(new admin_setting_configcheckbox('enablecourserequests', new lang_string('enablecourserequests', 'admin'), new lang_string('configenablecourserequests', 'admin'), 0));
@@ -336,7 +322,7 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_skip_modif_prev', new lang_string('skipmodifprev', 'backup'), new lang_string('skipmodifprevhelp', 'backup'), 0));

    // Automated defaults section.
-    $temp->add(new admin_setting_heading('automatedsettings', new lang_string('automatedsettings','backup'), new lang_string('recyclebin_desc', 'backup')));
+    $temp->add(new admin_setting_heading('automatedsettings', new lang_string('automatedsettings','backup'), ''));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_users', new lang_string('generalusers', 'backup'), new lang_string('configgeneralusers', 'backup'), 1));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_role_assignments', new lang_string('generalroleassignments','backup'), new lang_string('configgeneralroleassignments','backup'), 1));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_activities', new lang_string('generalactivities','backup'), new lang_string('configgeneralactivities','backup'), 1));
@@ -357,129 +343,4 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
    //$temp->add(new admin_setting_configcheckbox('backup/backup_auto_blogs', new lang_string('blogs', 'blog'), new lang_string('backupblogshelp','blog'), 0));

    $ADMIN->add('backups', $temp);
-
-    // Create a page for general restore configuration and defaults.
-    $temp = new admin_settingpage('restoregeneralsettings', new lang_string('generalrestoredefaults', 'backup'));
-
-    // General restore defaults.
-    $temp->add(new admin_setting_heading('generalsettings', new lang_string('generalrestoresettings', 'backup'), ''));
-
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_users',
-        new lang_string('generalusers', 'backup'), new lang_string('configrestoreusers', 'backup'),
-        array('value' => 1, 'locked' => 0)));
-    // Can not use actual constants here because we'd need to include 100 of backup/restore files.
-    $options = [
-        0/*backup::ENROL_NEVER*/     => get_string('rootsettingenrolments_never', 'backup'),
-        1/*backup::ENROL_WITHUSERS*/ => get_string('rootsettingenrolments_withusers', 'backup'),
-        2/*backup::ENROL_ALWAYS*/    => get_string('rootsettingenrolments_always', 'backup'),
-    ];
-    $temp->add(new admin_setting_configselect_with_lock('restore/restore_general_enrolments',
-        new lang_string('generalenrolments', 'backup'), new lang_string('configrestoreenrolments', 'backup'),
-        array('value' => 1/*backup::ENROL_WITHUSERS*/, 'locked' => 0), $options));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_role_assignments',
-        new lang_string('generalroleassignments', 'backup'),
-        new lang_string('configrestoreroleassignments', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_activities',
-        new lang_string('generalactivities', 'backup'),
-        new lang_string('configrestoreactivities', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_blocks',
-        new lang_string('generalblocks', 'backup'),
-        new lang_string('configrestoreblocks', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_filters',
-        new lang_string('generalfilters', 'backup'),
-        new lang_string('configrestorefilters', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_comments',
-        new lang_string('generalcomments', 'backup'),
-        new lang_string('configrestorecomments', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_badges',
-        new lang_string('generalbadges', 'backup'),
-        new lang_string('configrestorebadges', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_calendarevents',
-        new lang_string('generalcalendarevents', 'backup'),
-        new lang_string('configrestorecalendarevents', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_userscompletion',
-        new lang_string('generaluserscompletion', 'backup'),
-        new lang_string('configrestoreuserscompletion', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_logs',
-        new lang_string('generallogs', 'backup'),
-        new lang_string('configrestorelogs', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_histories',
-        new lang_string('generalhistories', 'backup'),
-        new lang_string('configrestorehistories', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_groups',
-        new lang_string('generalgroups', 'backup'), new lang_string('configrestoregroups', 'backup'),
-        array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_general_competencies',
-        new lang_string('generalcompetencies', 'backup'),
-        new lang_string('configrestorecompetencies', 'backup'), array('value' => 1, 'locked' => 0)));
-
-    // Restore defaults when merging into another course.
-    $temp->add(new admin_setting_heading('mergerestoredefaults', new lang_string('mergerestoredefaults', 'backup'), ''));
-
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_merge_overwrite_conf',
-        new lang_string('setting_overwrite_conf', 'backup'),
-    new lang_string('config_overwrite_conf', 'backup'), array('value' => 0, 'locked' => 0)));
-
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_merge_course_fullname',
-        new lang_string('setting_overwrite_course_fullname', 'backup'),
-        new lang_string('config_overwrite_course_fullname', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_merge_course_shortname',
-        new lang_string('setting_overwrite_course_shortname', 'backup'),
-        new lang_string('config_overwrite_course_shortname', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_merge_course_startdate',
-        new lang_string('setting_overwrite_course_startdate', 'backup'),
-        new lang_string('config_overwrite_course_startdate', 'backup'), array('value' => 1, 'locked' => 0)));
-
-    // Restore defaults when replacing course contents.
-    $temp->add(new admin_setting_heading('replacerestoredefaults', new lang_string('replacerestoredefaults', 'backup'), ''));
-
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_replace_overwrite_conf',
-        new lang_string('setting_overwrite_conf', 'backup'),
-        new lang_string('config_overwrite_conf', 'backup'), array('value' => 0, 'locked' => 0)));
-
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_replace_course_fullname',
-        new lang_string('setting_overwrite_course_fullname', 'backup'),
-        new lang_string('config_overwrite_course_fullname', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_replace_course_shortname',
-        new lang_string('setting_overwrite_course_shortname', 'backup'),
-        new lang_string('config_overwrite_course_shortname', 'backup'), array('value' => 1, 'locked' => 0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('restore/restore_replace_course_startdate',
-        new lang_string('setting_overwrite_course_startdate', 'backup'),
-        new lang_string('config_overwrite_course_startdate', 'backup'), array('value' => 1, 'locked' => 0)));
-
-    $temp->add(new admin_setting_configselect_with_lock('restore/restore_replace_keep_roles_and_enrolments',
-        new lang_string('setting_keep_roles_and_enrolments', 'backup'),
-        new lang_string('config_keep_roles_and_enrolments', 'backup'), array('value' => 0, 'locked' => 0),
-        array(1 => get_string('yes'), 0 => get_string('no'))));
-    $temp->add(new admin_setting_configselect_with_lock('restore/restore_replace_keep_groups_and_groupings',
-        new lang_string('setting_keep_groups_and_groupings', 'backup'),
-        new lang_string('config_keep_groups_and_groupings', 'backup'), array('value' => 0, 'locked' => 0),
-        array(1 => get_string('yes'), 0 => get_string('no'))));
-
-    $ADMIN->add('backups', $temp);
-
-    // Create a page for asynchronous backup and restore configuration and defaults.
-    if (!empty($CFG->enableasyncbackup)) {  // Only add settings if async mode is enable at site level.
-        $temp = new admin_settingpage('asyncgeneralsettings', new lang_string('asyncgeneralsettings', 'backup'));
-
-        $temp->add(new admin_setting_configcheckbox(
-                'backup/backup_async_message_users',
-                new lang_string('asyncemailenable', 'backup'),
-                new lang_string('asyncemailenabledetail', 'backup'), 0));
-
-        $temp->add(new admin_setting_configtext(
-                'backup/backup_async_message_subject',
-                new lang_string('asyncmessagesubject', 'backup'),
-                new lang_string('asyncmessagesubjectdetail', 'backup'),
-                new lang_string('asyncmessagesubjectdefault', 'backup')));
-
-        $temp->add(new admin_setting_confightmleditor(
-                'backup/backup_async_message',
-                new lang_string('asyncmessagebody', 'backup'),
-                new lang_string('asyncmessagebodydetail', 'backup'),
-                new lang_string('asyncmessagebodydefault', 'backup')));
-
-        $ADMIN->add('backups', $temp);
-    }
-
 }
@@ -14,21 +14,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page

    $temp->add(new admin_setting_configcheckbox('dndallowtextandlinks', new lang_string('dndallowtextandlinks', 'admin'), new lang_string('configdndallowtextandlinks', 'admin'), 0));

-    $temp->add(new admin_setting_configexecutable('pathtosassc', new lang_string('pathtosassc', 'admin'), new lang_string('pathtosassc_help', 'admin'), ''));
-
-    $temp->add(new admin_setting_configcheckbox('contextlocking', new lang_string('contextlocking', 'core_admin'),
-        new lang_string('contextlocking_desc', 'core_admin'), 0));
-
-    $temp->add(new admin_setting_configcheckbox(
-            'contextlockappliestoadmin',
-            new lang_string('contextlockappliestoadmin', 'core_admin'),
-            new lang_string('contextlockappliestoadmin_desc', 'core_admin'),
-            1
-        ));
-
-    $temp->add(new admin_setting_configcheckbox('forceclean', new lang_string('forceclean', 'core_admin'),
-        new lang_string('forceclean_desc', 'core_admin'), 0));
-
    $ADMIN->add('experimental', $temp);

    // "debugging" settingpage
@@ -43,9 +28,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
    $ADMIN->add('development', $temp);

    // "Profiling" settingpage (conditionally if the 'xhprof' extension is available only).
-    $xhprofenabled = extension_loaded('tideways_xhprof');
-    $xhprofenabled = $xhprofenabled || extension_loaded('tideways');
-    $xhprofenabled = $xhprofenabled || extension_loaded('xhprof');
+    $xhprofenabled = extension_loaded('xhprof') || extension_loaded('tideways');
    $temp = new admin_settingpage('profiling', new lang_string('profiling', 'admin'), 'moodle/site:config', !$xhprofenabled);
    // Main profiling switch.
    $temp->add(new admin_setting_configcheckbox('profilingenabled', new lang_string('profilingenabled', 'admin'), new lang_string('profilingenabled_help', 'admin'), false));
@@ -59,8 +42,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
    $temp->add(new admin_setting_configcheckbox('profilingallowme', new lang_string('profilingallowme', 'admin'), new lang_string('profilingallowme_help', 'admin'), false));
    // Allow PROFILEALL/PROFILEALLSTOP GPC.
    $temp->add(new admin_setting_configcheckbox('profilingallowall', new lang_string('profilingallowall', 'admin'), new lang_string('profilingallowall_help', 'admin'), false));
-    $temp->add(new admin_setting_configtext('profilingslow', new lang_string('profilingslow', 'admin'),
-        new lang_string('profilingslow_help', 'admin'), 0, PARAM_FLOAT));
    // TODO: Allow to skip PHP functions (XHPROF_FLAGS_NO_BUILTINS)
    // TODO: Allow to skip call_user functions (ignored_functions array)
    // Specify the life time (in minutes) of profiling runs.
@@ -95,8 +76,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
        $ADMIN->add('development', new admin_externalpage('mnettestclient', new lang_string('testclient', 'mnet'), "$CFG->wwwroot/$CFG->admin/mnet/testclient.php"));
    }

-    $ADMIN->add('development', new admin_externalpage('purgecaches', new lang_string('purgecachespage', 'admin'),
-            "$CFG->wwwroot/$CFG->admin/purgecaches.php"));
+    $ADMIN->add('development', new admin_externalpage('purgecaches', new lang_string('purgecaches','admin'), "$CFG->wwwroot/$CFG->admin/purgecaches.php"));

    $ADMIN->add('development', new admin_externalpage('thirdpartylibs', new lang_string('thirdpartylibs','admin'), "$CFG->wwwroot/$CFG->admin/thirdpartylibs.php"));
 } // end of speedup
@@ -42,9 +42,6 @@ if (has_capability('moodle/grade:manage', $systemcontext)
        // enable publishing in exports/imports
        $temp->add(new admin_setting_configcheckbox('gradepublishing', new lang_string('gradepublishing', 'grades'), new lang_string('gradepublishing_help', 'grades'), 0));

-        $temp->add(new admin_setting_configcheckbox('grade_export_exportfeedback', new lang_string('exportfeedback', 'grades'),
-                                                  new lang_string('exportfeedback_desc', 'grades'), 0));
-
        $temp->add(new admin_setting_configselect('grade_export_displaytype', new lang_string('gradeexportdisplaytype', 'grades'),
                                                  new lang_string('gradeexportdisplaytype_desc', 'grades'), GRADE_DISPLAY_TYPE_REAL, $display_types));

@@ -1,78 +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/>.
-
-/**
- * Adds messaging related settings links for Messaging category to admin tree.
- *
- * @copyright 2019 Amaia Anabitarte <amaia@moodle.com>
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-if ($hassiteconfig) {
-    $temp = new admin_settingpage('messages', new lang_string('messagingssettings', 'admin'));
-    $temp->add(new admin_setting_configcheckbox('messaging',
-        new lang_string('messaging', 'admin'),
-        new lang_string('configmessaging', 'admin'),
-        1));
-    $temp->add(new admin_setting_configcheckbox('messagingallusers',
-            new lang_string('messagingallusers', 'admin'),
-            new lang_string('configmessagingallusers', 'admin'),
-             0)
-    );
-    $temp->add(new admin_setting_configcheckbox('messagingdefaultpressenter',
-            new lang_string('messagingdefaultpressenter', 'admin'),
-            new lang_string('configmessagingdefaultpressenter', 'admin'),
-            1)
-    );
-    $options = array(
-        DAYSECS => new lang_string('secondstotime86400'),
-        WEEKSECS => new lang_string('secondstotime604800'),
-        2620800 => new lang_string('nummonths', 'moodle', 1),
-        7862400 => new lang_string('nummonths', 'moodle', 3),
-        15724800 => new lang_string('nummonths', 'moodle', 6),
-        0 => new lang_string('never')
-    );
-    $temp->add(new admin_setting_configselect(
-            'messagingdeletereadnotificationsdelay',
-            new lang_string('messagingdeletereadnotificationsdelay', 'admin'),
-            new lang_string('configmessagingdeletereadnotificationsdelay', 'admin'),
-            604800,
-            $options)
-    );
-    $temp->add(new admin_setting_configselect(
-            'messagingdeleteallnotificationsdelay',
-            new lang_string('messagingdeleteallnotificationsdelay', 'admin'),
-            new lang_string('configmessagingdeleteallnotificationsdelay', 'admin'),
-            2620800,
-            $options)
-    );
-    $temp->add(new admin_setting_configcheckbox('messagingallowemailoverride',
-        new lang_string('messagingallowemailoverride', 'admin'),
-        new lang_string('configmessagingallowemailoverride', 'admin'),
-        0));
-    $ADMIN->add('messaging', $temp);
-    $ADMIN->add('messaging', new admin_page_managemessageoutputs());
-
-    // Notification outputs plugins.
-    $plugins = core_plugin_manager::instance()->get_plugins_of_type('message');
-    core_collator::asort_objects_by_property($plugins, 'displayname');
-    foreach ($plugins as $plugin) {
-        /** @var \core\plugininfo\message $plugin */
-        $plugin->load_settings($ADMIN, 'messaging', $hassiteconfig);
-    }
-}
@@ -1,53 +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 gives information about Moodle Services
- *
- * @package    core
- * @copyright  2018 Amaia Anabitarte <amaia@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-if ($hassiteconfig) {
-
-    // Create Moodle Services information.
-    $moodleservices->add(new admin_setting_heading('moodleservicesintro', '',
-        new lang_string('moodleservices_help', 'admin')));
-
-    // Moodle Partners information.
-    if (empty($CFG->disableserviceads_partner)) {
-        $moodleservices->add(new admin_setting_heading('moodlepartners',
-            new lang_string('moodlepartners', 'admin'),
-            new lang_string('moodlepartners_help', 'admin')));
-    }
-
-    // Moodle app information.
-    $moodleservices->add(new admin_setting_heading('moodleapp',
-        new lang_string('moodleapp', 'admin'),
-        new lang_string('moodleapp_help', 'admin')));
-
-    // Branded Moodle app information.
-    if (empty($CFG->disableserviceads_branded)) {
-        $moodleservices->add(new admin_setting_heading('moodlebrandedapp',
-            new lang_string('moodlebrandedapp', 'admin'),
-            new lang_string('moodlebrandedapp_help', 'admin')));
-    }
-}
-
-
@@ -59,18 +59,6 @@ if ($hassiteconfig) {
        $plugin->load_settings($ADMIN, 'formatsettings', $hassiteconfig);
    }

-    // Custom fields.
-    $ADMIN->add('modules', new admin_category('customfieldsettings', new lang_string('customfields', 'core_customfield')));
-    $temp = new admin_settingpage('managecustomfields', new lang_string('managecustomfields', 'core_admin'));
-    $temp->add(new admin_setting_managecustomfields());
-    $ADMIN->add('customfieldsettings', $temp);
-    $plugins = core_plugin_manager::instance()->get_plugins_of_type('customfield');
-    core_collator::asort_objects_by_property($plugins, 'displayname');
-    foreach ($plugins as $plugin) {
-        /** @var \core\plugininfo\customfield $plugin */
-        $plugin->load_settings($ADMIN, 'customfieldsettings', $hassiteconfig);
-    }
-
    // blocks
    $ADMIN->add('modules', new admin_category('blocksettings', new lang_string('blocks')));
    $ADMIN->add('blocksettings', new admin_page_manageblocks());
@@ -81,6 +69,17 @@ if ($hassiteconfig) {
        $plugin->load_settings($ADMIN, 'blocksettings', $hassiteconfig);
    }

+    // message outputs
+    $ADMIN->add('modules', new admin_category('messageoutputs', new lang_string('messageoutputs', 'message')));
+    $ADMIN->add('messageoutputs', new admin_page_managemessageoutputs());
+    $ADMIN->add('messageoutputs', new admin_page_defaultmessageoutputs());
+    $plugins = core_plugin_manager::instance()->get_plugins_of_type('message');
+    core_collator::asort_objects_by_property($plugins, 'displayname');
+    foreach ($plugins as $plugin) {
+        /** @var \core\plugininfo\message $plugin */
+        $plugin->load_settings($ADMIN, 'messageoutputs', $hassiteconfig);
+    }
+
    // authentication plugins
    $ADMIN->add('modules', new admin_category('authsettings', new lang_string('authentication', 'admin')));

@@ -103,7 +102,7 @@ if ($hassiteconfig) {
    $temp->add(new admin_setting_configtext('alternateloginurl', new lang_string('alternateloginurl', 'auth'),
                                            new lang_string('alternatelogin', 'auth', htmlspecialchars(get_login_url())), ''));
    $temp->add(new admin_setting_configtext('forgottenpasswordurl', new lang_string('forgottenpasswordurl', 'auth'),
-                                            new lang_string('forgottenpassword', 'auth'), '', PARAM_URL));
+                                            new lang_string('forgottenpassword', 'auth'), ''));
    $temp->add(new admin_setting_confightmleditor('auth_instructions', new lang_string('instructions', 'auth'),
                                                new lang_string('authinstructions', 'auth'), ''));
    $setting = new admin_setting_configtext('allowemailaddresses', new lang_string('allowemailaddresses', 'admin'),
@@ -231,19 +230,6 @@ if ($hassiteconfig) {
        300, PARAM_INT, 10));
    $ADMIN->add('mediaplayers', $temp);

-    // Convert plugins.
-    $ADMIN->add('modules', new admin_category('fileconverterplugins', new lang_string('type_fileconverter_plural', 'plugin')));
-    $temp = new admin_settingpage('managefileconverterplugins', new lang_string('type_fileconvertermanage', 'plugin'));
-    $temp->add(new admin_setting_manage_fileconverter_plugins());
-    $ADMIN->add('fileconverterplugins', $temp);
-
-    $plugins = core_plugin_manager::instance()->get_plugins_of_type('fileconverter');
-    core_collator::asort_objects_by_property($plugins, 'displayname');
-    foreach ($plugins as $plugin) {
-        /** @var \core\plugininfo\media $plugin */
-        $plugin->load_settings($ADMIN, 'fileconverterplugins', $hassiteconfig);
-    }
-
    $plugins = core_plugin_manager::instance()->get_plugins_of_type('media');
    core_collator::asort_objects_by_property($plugins, 'displayname');
    foreach ($plugins as $plugin) {
@@ -557,45 +543,7 @@ if ($hassiteconfig) {
    // Search engine selection.
    $temp->add(new admin_setting_heading('searchengineheading', new lang_string('searchengine', 'admin'), ''));
    $temp->add(new admin_setting_configselect('searchengine',
-                                new lang_string('selectsearchengine', 'admin'), '', 'simpledb', $engines));
-    $temp->add(new admin_setting_heading('searchoptionsheading', new lang_string('searchoptions', 'admin'), ''));
-    $temp->add(new admin_setting_configcheckbox('searchindexwhendisabled',
-            new lang_string('searchindexwhendisabled', 'admin'), new lang_string('searchindexwhendisabled_desc', 'admin'),
-            0));
-    $temp->add(new admin_setting_configduration('searchindextime',
-            new lang_string('searchindextime', 'admin'), new lang_string('searchindextime_desc', 'admin'),
-            600));
-    $temp->add(new admin_setting_heading('searchcoursesheading', new lang_string('searchablecourses', 'admin'), ''));
-    $options = [
-        0 => new lang_string('searchallavailablecourses_off', 'admin'),
-        1 => new lang_string('searchallavailablecourses_on', 'admin')
-    ];
-    $temp->add(new admin_setting_configselect('searchallavailablecourses',
-            new lang_string('searchallavailablecourses', 'admin'),
-            new lang_string('searchallavailablecoursesdesc', 'admin'),
-            0, $options));
-    $temp->add(new admin_setting_configcheckbox('searchincludeallcourses',
-        new lang_string('searchincludeallcourses', 'admin'), new lang_string('searchincludeallcourses_desc', 'admin'),
-        0));
-
-    // Search display options.
-    $temp->add(new admin_setting_heading('searchdisplay', new lang_string('searchdisplay', 'admin'), ''));
-    $temp->add(new admin_setting_configcheckbox('searchenablecategories',
-        new lang_string('searchenablecategories', 'admin'),
-        new lang_string('searchenablecategories_desc', 'admin'),
-        0));
-    $options = [];
-    foreach (\core_search\manager::get_search_area_categories() as $category) {
-        $options[$category->get_name()] = $category->get_visiblename();
-    }
-    $temp->add(new admin_setting_configselect('searchdefaultcategory',
-        new lang_string('searchdefaultcategory', 'admin'),
-        new lang_string('searchdefaultcategory_desc', 'admin'),
-        \core_search\manager::SEARCH_AREA_CATEGORY_ALL, $options));
-    $temp->add(new admin_setting_configcheckbox('searchhideallcategory',
-        new lang_string('searchhideallcategory', 'admin'),
-        new lang_string('searchhideallcategory_desc', 'admin'),
-        0));
+                                new lang_string('selectsearchengine', 'admin'), '', 'solr', $engines));

    $ADMIN->add('searchplugins', $temp);
    $ADMIN->add('searchplugins', new admin_externalpage('searchareas', new lang_string('searchareas', 'admin'),
@@ -18,11 +18,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
    $temp->add(new admin_setting_configcheckbox('forceloginforprofiles', new lang_string('forceloginforprofiles', 'admin'), new lang_string('configforceloginforprofiles', 'admin'), 1));
    $temp->add(new admin_setting_configcheckbox('forceloginforprofileimage', new lang_string('forceloginforprofileimage', 'admin'), new lang_string('forceloginforprofileimage_help', 'admin'), 0));
    $temp->add(new admin_setting_configcheckbox('opentogoogle', new lang_string('opentogoogle', 'admin'), new lang_string('configopentogoogle', 'admin'), 0));
-    $temp->add(new admin_setting_configselect('allowindexing', new lang_string('allowindexing', 'admin'), new lang_string('allowindexing_desc', 'admin'),
-        0,
-        array(0 => new lang_string('allowindexingexceptlogin', 'admin'),
-              1 => new lang_string('allowindexingeverywhere', 'admin'),
-              2 => new lang_string('allowindexingnowhere', 'admin'))));
    $temp->add(new admin_setting_pickroles('profileroles',
        new lang_string('profileroles','admin'),
        new lang_string('configprofileroles', 'admin'),
@@ -54,7 +49,8 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
                       3600 => new lang_string('numminutes', '', 60))));

    $temp->add(new admin_setting_configcheckbox('extendedusernamechars', new lang_string('extendedusernamechars', 'admin'), new lang_string('configextendedusernamechars', 'admin'), 0));
-
+    $temp->add(new admin_setting_configtext('sitepolicy', new lang_string('sitepolicy', 'admin'), new lang_string('sitepolicy_help', 'admin'), '', PARAM_RAW));
+    $temp->add(new admin_setting_configtext('sitepolicyguest', new lang_string('sitepolicyguest', 'admin'), new lang_string('sitepolicyguest_help', 'admin'), (isset($CFG->sitepolicy) ? $CFG->sitepolicy : ''), PARAM_RAW));
    $temp->add(new admin_setting_configcheckbox('extendedusernamechars', new lang_string('extendedusernamechars', 'admin'), new lang_string('configextendedusernamechars', 'admin'), 0));
    $temp->add(new admin_setting_configcheckbox('keeptagnamecase', new lang_string('keeptagnamecase','admin'),new lang_string('configkeeptagnamecase', 'admin'),'1'));

@@ -63,8 +59,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
    $temp->add(new admin_setting_configcheckbox('cronclionly', new lang_string('cronclionly', 'admin'), new lang_string
            ('configcronclionly', 'admin'), 1));
    $temp->add(new admin_setting_configpasswordunmask('cronremotepassword', new lang_string('cronremotepassword', 'admin'), new lang_string('configcronremotepassword', 'admin'), ''));
-    $temp->add(new admin_setting_configcheckbox('tool_task/enablerunnow', new lang_string('enablerunnow', 'tool_task'),
-            new lang_string('enablerunnow_desc', 'tool_task'), 1));

    $options = array(0=>get_string('no'), 3=>3, 5=>5, 7=>7, 10=>10, 20=>20, 30=>30, 50=>50, 100=>100);
    $temp->add(new admin_setting_configselect('lockoutthreshold', new lang_string('lockoutthreshold', 'admin'), new lang_string('lockoutthreshold_desc', 'admin'), 0, $options));
@@ -107,10 +101,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
        new lang_string('passwordchangetokendeletion', 'admin'),
        new lang_string('passwordchangetokendeletion_desc', 'admin'), 0));

-    $temp->add(new admin_setting_configduration('tokenduration',
-        new lang_string('tokenduration', 'admin'),
-        new lang_string('tokenduration_desc', 'admin'), 12 * WEEKSECS, WEEKSECS));
-
    $temp->add(new admin_setting_configcheckbox('groupenrolmentkeypolicy', new lang_string('groupenrolmentkeypolicy', 'admin'), new lang_string('groupenrolmentkeypolicy_desc', 'admin'), 1));
    $temp->add(new admin_setting_configcheckbox('disableuserimages', new lang_string('disableuserimages', 'admin'), new lang_string('configdisableuserimages', 'admin'), 0));
    $temp->add(new admin_setting_configcheckbox('emailchangeconfirmation', new lang_string('emailchangeconfirmation', 'admin'), new lang_string('configemailchangeconfirmation', 'admin'), 1));
@@ -123,10 +113,11 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page

    // "httpsecurity" settingpage
    $temp = new admin_settingpage('httpsecurity', new lang_string('httpsecurity', 'admin'));
-
+    $temp->add(new admin_setting_configcheckbox('loginhttps', new lang_string('loginhttps', 'admin'), new lang_string('configloginhttps', 'admin'), 0));
    $temp->add(new admin_setting_configcheckbox('cookiesecure', new lang_string('cookiesecure', 'admin'), new lang_string('configcookiesecure', 'admin'), 1));
    $temp->add(new admin_setting_configcheckbox('cookiehttponly', new lang_string('cookiehttponly', 'admin'), new lang_string('configcookiehttponly', 'admin'), 0));
    $temp->add(new admin_setting_configcheckbox('allowframembedding', new lang_string('allowframembedding', 'admin'), new lang_string('allowframembedding_help', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('loginpasswordautocomplete', new lang_string('loginpasswordautocomplete', 'admin'), new lang_string('loginpasswordautocomplete_help', 'admin'), 0));

    // Settings elements used by the \core\files\curl_security_helper class.
    $temp->add(new admin_setting_configmixedhostiplist('curlsecurityblockedhosts',
@@ -4,16 +4,15 @@

 if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page

+
 // "systempaths" settingpage
 $temp = new admin_settingpage('systempaths', new lang_string('systempaths','admin'));
-$temp->add(new admin_setting_configexecutable('pathtophp', new lang_string('pathtophp', 'admin'),
-    new lang_string('configpathtophp', 'admin'), ''));
+
 $temp->add(new admin_setting_configexecutable('pathtodu', new lang_string('pathtodu', 'admin'), new lang_string('configpathtodu', 'admin'), ''));
 $temp->add(new admin_setting_configexecutable('aspellpath', new lang_string('aspellpath', 'admin'), new lang_string('edhelpaspellpath'), ''));
 $temp->add(new admin_setting_configexecutable('pathtodot', new lang_string('pathtodot', 'admin'), new lang_string('pathtodot_help', 'admin'), ''));
 $temp->add(new admin_setting_configexecutable('pathtogs', new lang_string('pathtogs', 'admin'), new lang_string('pathtogs_help', 'admin'), '/usr/bin/gs'));
-$temp->add(new admin_setting_configexecutable('pathtopython', new lang_string('pathtopython', 'admin'),
-    new lang_string('pathtopythondesc', 'admin'), ''));
+$temp->add(new admin_setting_configexecutable('pathtounoconv', new lang_string('pathtounoconv', 'admin'), new lang_string('pathtounoconv_help', 'admin'), '/usr/bin/unoconv'));
 $ADMIN->add('server', $temp);


@@ -176,8 +175,6 @@ $ADMIN->add('server', $temp);

 $ADMIN->add('server', new admin_externalpage('environment', new lang_string('environment','admin'), "$CFG->wwwroot/$CFG->admin/environment.php"));
 $ADMIN->add('server', new admin_externalpage('phpinfo', new lang_string('phpinfo'), "$CFG->wwwroot/$CFG->admin/phpinfo.php"));
-$ADMIN->add('server', new admin_externalpage('testoutgoingmailconf', new lang_string('testoutgoingmailconf', 'admin'),
-            new moodle_url("$CFG->wwwroot/$CFG->admin/testoutgoingmailconf.php"), 'moodle/site:config', true));


 // "performance" settingpage
@@ -213,91 +210,8 @@ $temp->add(new admin_setting_configtext('curltimeoutkbitrate', new lang_string('
 $ADMIN->add('server', $temp);


-$ADMIN->add('server', new admin_category('taskconfig', new lang_string('taskadmintitle', 'admin')));
-$temp = new admin_settingpage('taskprocessing', new lang_string('taskprocessing','admin'));
-$temp->add(
-    new admin_setting_configtext(
-        'task_scheduled_concurrency_limit',
-        new lang_string('task_scheduled_concurrency_limit', 'admin'),
-        new lang_string('task_scheduled_concurrency_limit_desc', 'admin'),
-        3,
-        PARAM_INT
-    )
-);
-
-$temp->add(
-    new admin_setting_configduration(
-        'task_scheduled_max_runtime',
-        new lang_string('task_scheduled_max_runtime', 'admin'),
-        new lang_string('task_scheduled_max_runtime_desc', 'admin'),
-        30 * MINSECS
-    )
-);
-
-$temp->add(
-    new admin_setting_configtext(
-        'task_adhoc_concurrency_limit',
-        new lang_string('task_adhoc_concurrency_limit', 'admin'),
-        new lang_string('task_adhoc_concurrency_limit_desc', 'admin'),
-        3,
-        PARAM_INT
-    )
-);
-
-$temp->add(
-    new admin_setting_configduration(
-        'task_adhoc_max_runtime',
-        new lang_string('task_adhoc_max_runtime', 'admin'),
-        new lang_string('task_adhoc_max_runtime_desc', 'admin'),
-        30 * MINSECS
-    )
-);
-$ADMIN->add('taskconfig', $temp);
-
-$temp = new admin_settingpage('tasklogging', new lang_string('tasklogging','admin'));
-$temp->add(
-    new admin_setting_configselect(
-        'task_logmode',
-        new lang_string('task_logmode', 'admin'),
-        new lang_string('task_logmode_desc', 'admin'),
-        \core\task\logmanager::MODE_ALL,
-        [
-            \core\task\logmanager::MODE_ALL => new lang_string('task_logmode_all', 'admin'),
-            \core\task\logmanager::MODE_FAILONLY => new lang_string('task_logmode_failonly', 'admin'),
-            \core\task\logmanager::MODE_NONE => new lang_string('task_logmode_none', 'admin'),
-        ]
-    )
-);
-
-if (\core\task\logmanager::uses_standard_settings()) {
-    $temp->add(
-        new admin_setting_configduration(
-            'task_logretention',
-            new \lang_string('task_logretention', 'admin'),
-            new \lang_string('task_logretention_desc', 'admin'),
-            28 * DAYSECS
-        )
-    );
-
-    $temp->add(
-        new admin_setting_configtext(
-            'task_logretainruns',
-            new \lang_string('task_logretainruns', 'admin'),
-            new \lang_string('task_logretainruns_desc', 'admin'),
-            20,
-            PARAM_INT
-        )
-    );
-}
-$ADMIN->add('taskconfig', $temp);
-
-if (\core\task\logmanager::uses_standard_settings()) {
-    $ADMIN->add('taskconfig', new admin_externalpage(
-        'tasklogs',
-        new lang_string('tasklogs','admin'),
-        "{$CFG->wwwroot}/{$CFG->admin}/tasklogs.php"
-    ));
-}
+$ADMIN->add('server', new admin_externalpage('adminregistration', new lang_string('hubs', 'admin'),
+    "$CFG->wwwroot/$CFG->admin/registration/index.php"));

 // E-mail settings.
 $ADMIN->add('server', new admin_category('email', new lang_string('categoryemail', 'admin')));
@@ -328,10 +242,6 @@ $temp->add(new admin_setting_configtextarea('allowedemaildomains',
        new lang_string('allowedemaildomains', 'admin'),
        new lang_string('configallowedemaildomains', 'admin'),
        ''));
-$url = new moodle_url('/admin/testoutgoingmailconf.php');
-$link = html_writer::link($url, get_string('testoutgoingmailconf', 'admin'));
-$temp->add(new admin_setting_heading('testoutgoinmailc', new lang_string('testoutgoingmailconf', 'admin'),
-        new lang_string('testoutgoingmaildetail', 'admin', $link)));
 $temp->add(new admin_setting_heading('emaildoesnotfit', new lang_string('doesnotfit', 'admin'),
        new lang_string('doesnotfitdetail', 'admin')));
 $charsets = get_list_of_charsets();
@@ -354,8 +264,6 @@ $choices = array(new lang_string('never', 'admin'),
                 new lang_string('onlynoreply', 'admin'));
 $temp->add(new admin_setting_configselect('emailfromvia', new lang_string('emailfromvia', 'admin'),
          new lang_string('configemailfromvia', 'admin'), 1, $choices));
-    $temp->add(new admin_setting_configtext('emailsubjectprefix', new lang_string('emailsubjectprefix', 'admin'),
-        new lang_string('configemailsubjectprefix', 'admin'), '', PARAM_RAW));

 $ADMIN->add('email', $temp);

@@ -13,6 +13,15 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page

    $optionalsubsystems->add(new admin_setting_configcheckbox('enablewebservices', new lang_string('enablewebservices', 'admin'), new lang_string('configenablewebservices', 'admin'), 0));

+    $optionalsubsystems->add(new admin_setting_configcheckbox('messaging', new lang_string('messaging', 'admin'), new lang_string('configmessaging','admin'), 1));
+
+    $optionalsubsystems->add(new admin_setting_configcheckbox('messaginghidereadnotifications', new lang_string('messaginghidereadnotifications', 'admin'), new lang_string('configmessaginghidereadnotifications','admin'), 0));
+
+    $options = array(DAYSECS=>new lang_string('secondstotime86400'), WEEKSECS=>new lang_string('secondstotime604800'), 2620800=>new lang_string('nummonths', 'moodle', 1), 15724800=>new lang_string('nummonths', 'moodle', 6),0=>new lang_string('never'));
+    $optionalsubsystems->add(new admin_setting_configselect('messagingdeletereadnotificationsdelay', new lang_string('messagingdeletereadnotificationsdelay', 'admin'), new lang_string('configmessagingdeletereadnotificationsdelay', 'admin'), 604800, $options));
+
+    $optionalsubsystems->add(new admin_setting_configcheckbox('messagingallowemailoverride', new lang_string('messagingallowemailoverride', 'admin'), new lang_string('configmessagingallowemailoverride','admin'), 0));
+
    $optionalsubsystems->add(new admin_setting_configcheckbox('enablestats', new lang_string('enablestats', 'admin'), new lang_string('configenablestats', 'admin'), 0));

    $optionalsubsystems->add(new admin_setting_configcheckbox('enablerssfeeds', new lang_string('enablerssfeeds', 'admin'), new lang_string('configenablerssfeeds', 'admin'), 0));
@@ -45,13 +54,4 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page

    $optionalsubsystems->add(new admin_setting_configcheckbox('enableglobalsearch', new lang_string('enableglobalsearch', 'admin'),
        new lang_string('enableglobalsearch_desc', 'admin'), 0, 1, 0));
-
-    $optionalsubsystems->add(new admin_setting_configcheckbox('allowstealth', new lang_string('allowstealthmodules'),
-        new lang_string('allowstealthmodules_help'), 0, 1, 0));
-
-    $optionalsubsystems->add(new admin_setting_configcheckbox('enablecoursepublishing',
-        new lang_string('enablecoursepublishing', 'hub'), new lang_string('enablecoursepublishing_help', 'hub'), 0));
-
-    $optionalsubsystems->add(new admin_setting_configcheckbox('enableasyncbackup', new lang_string('enableasyncbackup', 'backup'),
-        new lang_string('enableasyncbackup_help', 'backup'), 0, 1, 0));
 }
@@ -11,15 +11,17 @@ $hassiteconfig = has_capability('moodle/site:config', $systemcontext);
 $ADMIN->add('root', new admin_externalpage('adminnotifications', new lang_string('notifications'), "$CFG->wwwroot/$CFG->admin/index.php"));

 $ADMIN->add('root', new admin_externalpage('registrationmoodleorg', new lang_string('registration', 'admin'),
-        new moodle_url("/admin/registration/index.php")));
+        "$CFG->wwwroot/$CFG->admin/registration/register.php?huburl=" . HUB_MOODLEORGHUBURL . "&hubname=Moodle.org&sesskey=" . sesskey()));
+$ADMIN->add('root', new admin_externalpage('registrationhub', new lang_string('registerwith', 'hub'),
+        "$CFG->wwwroot/$CFG->admin/registration/register.php", 'moodle/site:config', true));
+$ADMIN->add('root', new admin_externalpage('registrationhubs', new lang_string('hubs', 'admin'),
+        "$CFG->wwwroot/$CFG->admin/registration/index.php", 'moodle/site:config', true));
+$ADMIN->add('root', new admin_externalpage('siteregistrationconfirmed',
+        new lang_string('registrationconfirmed', 'hub'),
+        $CFG->wwwroot."/".$CFG->admin."/registration/confirmregistration.php", 'moodle/site:config', true));
 // hidden upgrade script
 $ADMIN->add('root', new admin_externalpage('upgradesettings', new lang_string('upgradesettings', 'admin'), "$CFG->wwwroot/$CFG->admin/upgradesettings.php", 'moodle/site:config', true));

-// Adding Moodle Services information page.
-$moodleservices = new admin_settingpage('moodleservices', new lang_string('moodleservices',
-    'admin'));
-$ADMIN->add('root', $moodleservices);
-
 if ($hassiteconfig) {
    $optionalsubsystems = new admin_settingpage('optionalsubsystems', new lang_string('advancedfeatures', 'admin'));
    $ADMIN->add('root', $optionalsubsystems);
@@ -28,12 +30,10 @@ if ($hassiteconfig) {
 $ADMIN->add('root', new admin_category('users', new lang_string('users','admin')));
 $ADMIN->add('root', new admin_category('courses', new lang_string('courses','admin')));
 $ADMIN->add('root', new admin_category('grades', new lang_string('grades')));
-$ADMIN->add('root', new admin_category('analytics', new lang_string('analytics', 'analytics')));
 $ADMIN->add('root', new admin_category('competencies', new lang_string('competencies', 'core_competency')));
 $ADMIN->add('root', new admin_category('badges', new lang_string('badges'), empty($CFG->enablebadges)));
 $ADMIN->add('root', new admin_category('location', new lang_string('location','admin')));
 $ADMIN->add('root', new admin_category('language', new lang_string('language')));
-$ADMIN->add('root', new admin_category('messaging', new lang_string('messagingcategory', 'admin')));
 $ADMIN->add('root', new admin_category('modules', new lang_string('plugins', 'admin')));
 $ADMIN->add('root', new admin_category('security', new lang_string('security','admin')));
 $ADMIN->add('root', new admin_category('appearance', new lang_string('appearance','admin')));
@@ -4,7 +4,6 @@

 $ADMIN->add('users', new admin_category('accounts', new lang_string('accounts', 'admin')));
 $ADMIN->add('users', new admin_category('roles', new lang_string('permissions', 'role')));
-$ADMIN->add('users', new admin_category('privacy', new lang_string('privacyandpolicies', 'admin')));

 if ($hassiteconfig
 or has_capability('moodle/user:create', $systemcontext)
@@ -16,10 +15,15 @@ if ($hassiteconfig
 or has_capability('moodle/cohort:view', $systemcontext)) { // speedup for non-admins, add all caps used on this page


+    if (empty($CFG->loginhttps)) {
+        $securewwwroot = $CFG->wwwroot;
+    } else {
+        $securewwwroot = str_replace('http:','https:',$CFG->wwwroot);
+    }
    // stuff under the "accounts" subcategory
    $ADMIN->add('accounts', new admin_externalpage('editusers', new lang_string('userlist','admin'), "$CFG->wwwroot/$CFG->admin/user.php", array('moodle/user:update', 'moodle/user:delete')));
    $ADMIN->add('accounts', new admin_externalpage('userbulk', new lang_string('userbulk','admin'), "$CFG->wwwroot/$CFG->admin/user/user_bulk.php", array('moodle/user:update', 'moodle/user:delete')));
-    $ADMIN->add('accounts', new admin_externalpage('addnewuser', new lang_string('addnewuser'), "$CFG->wwwroot/user/editadvanced.php?id=-1", 'moodle/user:create'));
+    $ADMIN->add('accounts', new admin_externalpage('addnewuser', new lang_string('addnewuser'), "$securewwwroot/user/editadvanced.php?id=-1", 'moodle/user:create'));

    // "User default preferences" settingpage.
    $temp = new admin_settingpage('userdefaultpreferences', new lang_string('userdefaultpreferences', 'admin'));
@@ -29,7 +33,7 @@ if ($hassiteconfig
        $choices['1'] = new lang_string('emaildisplayyes');
        $choices['2'] = new lang_string('emaildisplaycourse');
        $temp->add(new admin_setting_configselect('defaultpreference_maildisplay', new lang_string('emaildisplay'),
-            new lang_string('emaildisplay_help'), 2, $choices));
+            '', 2, $choices));

        $choices = array();
        $choices['0'] = new lang_string('textformat');
@@ -151,7 +155,6 @@ if ($hassiteconfig
        $temp->add(new admin_setting_configmultiselect('hiddenuserfields', new lang_string('hiddenuserfields', 'admin'),
                   new lang_string('confighiddenuserfields', 'admin'), array(),
                       array('description' => new lang_string('description'),
-                             'email' => new lang_string('email'),
                             'city' => new lang_string('city'),
                             'country' => new lang_string('country'),
                             'timezone' => new lang_string('timezone'),
@@ -174,19 +177,18 @@ if ($hassiteconfig
        // Options include fields from the user table that might be helpful to
        // distinguish when adding or listing users ('I want to add the John
        // Smith from Science faculty').
+        // Username is not included as an option because in some sites, it might
+        // be a security problem to reveal usernames even to trusted staff.
        // Custom user profile fields are not currently supported.
        $temp->add(new admin_setting_configmulticheckbox('showuseridentity',
                new lang_string('showuseridentity', 'admin'),
                new lang_string('showuseridentity_desc', 'admin'), array('email' => 1), array(
-                    'username'    => new lang_string('username'),
                    'idnumber'    => new lang_string('idnumber'),
                    'email'       => new lang_string('email'),
                    'phone1'      => new lang_string('phone1'),
                    'phone2'      => new lang_string('phone2'),
                    'department'  => new lang_string('department'),
                    'institution' => new lang_string('institution'),
-                    'city'        => new lang_string('city'),
-                    'country'     => new lang_string('country'),
                )));
        $setting = new admin_setting_configtext('fullnamedisplay', new lang_string('fullnamedisplay', 'admin'),
            new lang_string('configfullnamedisplay', 'admin'), 'language', PARAM_TEXT, 50);
@@ -210,48 +212,3 @@ if ($hassiteconfig
    $ADMIN->add('roles', new admin_externalpage('checkpermissions', new lang_string('checkglobalpermissions', 'role'), "$CFG->wwwroot/$CFG->admin/roles/check.php?contextid=".$systemcontext->id, array('moodle/role:assign', 'moodle/role:safeoverride', 'moodle/role:override', 'moodle/role:manage')));

 } // end of speedup
-
-// Privacy settings.
-if ($hassiteconfig) {
-    $temp = new admin_settingpage('privacysettings', new lang_string('privacysettings', 'admin'));
-
-    $options = array(
-        0 => get_string('no'),
-        1 => get_string('yes')
-    );
-    $url = new moodle_url('/admin/settings.php?section=supportcontact');
-    $url = $url->out();
-    $setting = new admin_setting_configselect('agedigitalconsentverification',
-        new lang_string('agedigitalconsentverification', 'admin'),
-        new lang_string('agedigitalconsentverification_desc', 'admin', $url), 0, $options);
-    $setting->set_force_ltr(true);
-    $temp->add($setting);
-
-    // See {@link https://gdpr-info.eu/art-8-gdpr/}.
-    $ageofdigitalconsentmap = implode(PHP_EOL, [
-        '*, 16',
-        'AT, 14',
-        'ES, 14',
-        'US, 13'
-    ]);
-    $setting = new admin_setting_agedigitalconsentmap('agedigitalconsentmap',
-        new lang_string('ageofdigitalconsentmap', 'admin'),
-        new lang_string('ageofdigitalconsentmap_desc', 'admin'),
-        $ageofdigitalconsentmap,
-        PARAM_RAW
-    );
-    $temp->add($setting);
-
-    $ADMIN->add('privacy', $temp);
-
-    // Policy settings.
-    $temp = new admin_settingpage('policysettings', new lang_string('policysettings', 'admin'));
-    $temp->add(new admin_settings_sitepolicy_handler_select('sitepolicyhandler', new lang_string('sitepolicyhandler', 'core_admin'),
-        new lang_string('sitepolicyhandler_desc', 'core_admin')));
-    $temp->add(new admin_setting_configtext('sitepolicy', new lang_string('sitepolicy', 'core_admin'),
-        new lang_string('sitepolicy_help', 'core_admin'), '', PARAM_RAW));
-    $temp->add(new admin_setting_configtext('sitepolicyguest', new lang_string('sitepolicyguest', 'core_admin'),
-        new lang_string('sitepolicyguest_help', 'core_admin'), (isset($CFG->sitepolicy) ? $CFG->sitepolicy : ''), PARAM_RAW));
-
-    $ADMIN->add('privacy', $temp);
-}
@@ -1,92 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Task log.
- *
- * @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(__DIR__ . '/../config.php');
-require_once("{$CFG->libdir}/adminlib.php");
-require_once("{$CFG->libdir}/tablelib.php");
-require_once("{$CFG->libdir}/filelib.php");
-
-$filter = optional_param('filter', '', PARAM_RAW);
-$result = optional_param('result', null, PARAM_INT);
-
-$pageurl = new \moodle_url('/admin/tasklogs.php');
-$pageurl->param('filter', $filter);
-
-$PAGE->set_url($pageurl);
-$PAGE->set_context(context_system::instance());
-$PAGE->set_pagelayout('admin');
-$strheading = get_string('tasklogs', 'tool_task');
-$PAGE->set_title($strheading);
-$PAGE->set_heading($strheading);
-
-require_login();
-
-require_capability('moodle/site:config', context_system::instance());
-admin_externalpage_setup('tasklogs');
-
-$logid = optional_param('logid', null, PARAM_INT);
-$download = optional_param('download', false, PARAM_BOOL);
-
-if (null !== $logid) {
-    $log = $DB->get_record('task_log', ['id' => $logid], '*', MUST_EXIST);
-
-    if ($download) {
-        $filename = str_replace('\\', '_', $log->classname) . "-{$log->id}.log";
-        header("Content-Disposition: attachment; filename=\"{$filename}\"");
-    }
-
-    readstring_accel($log->output, 'text/plain', false);
-    exit;
-}
-
-$renderer = $PAGE->get_renderer('tool_task');
-
-echo $OUTPUT->header();
-echo $OUTPUT->render_from_template('core_admin/tasklogs', (object) [
-    'action' => $pageurl->out(),
-    'filter' => $filter,
-    'resultfilteroptions' => [
-        (object) [
-            'value' => -1,
-            'title' => get_string('all'),
-            'selected' => (-1 === $result),
-        ],
-        (object) [
-            'value' => 0,
-            'title' => get_string('success'),
-            'selected' => (0 === $result),
-        ],
-        (object) [
-            'value' => 1,
-            'title' => get_string('task_result:failed', 'admin'),
-            'selected' => (1 === $result),
-        ],
-    ],
-]);
-
-$table = new \core_admin\task_log_table($filter, $result);
-$table->baseurl = $pageurl;
-$table->out(100, false);
-
-echo $OUTPUT->footer();
@@ -29,7 +29,6 @@
    * element - The Element HTML
    * forceltr - Force this element to be displayed LTR
    * default - Default value
-    * dependenton - optional message listing the settings this one is dependent on

    Example context (json):
    {
@@ -44,11 +43,8 @@
        "default": "Default value"
    }
 }}
-{{!
-    Setting.
-}}
-<div class="form-item row" id="{{id}}">
-    <div class="form-label col-sm-3 text-sm-right">
+<div class="form-item clearfix" id="{{id}}">
+    <div class="form-label">
        <label {{#labelfor}}for="{{labelfor}}"{{/labelfor}}>
            {{{title}}}
            {{#override}}
@@ -58,17 +54,16 @@
                <div class="form-warning">{{warning}}</div>
            {{/warning}}
        </label>
-        <span class="form-shortname d-block small text-muted">{{{name}}}</span>
+        <span class="form-shortname">{{{name}}}</span>
    </div>
-    <div class="form-setting col-sm-9">
+    <div class="form-setting">
        {{#error}}
            <div><span class="error">{{error}}</span></div>
        {{/error}}
        {{{element}}}
        {{#default}}
-            <div class="form-defaultinfo text-muted {{#forceltr}}text-ltr{{/forceltr}}">{{{default}}}</div>
+            <div class="form-defaultinfo {{#forceltr}}text-ltr{{/forceltr}}">{{{default}}}</div>
        {{/default}}
-        <div class="form-description mt-3">{{{description}}}</div>
-        {{#dependenton}}<div class="form-dependenton mb-4 text-muted">{{{.}}}</div>{{/dependenton}}
    </div>
+    <div class="form-description">{{{description}}}</div>
 </div>
@@ -35,16 +35,13 @@
        "haspreviewconfig": false
    }
 }}
-{{!
-    Setting configcolourpicker.
-}}
 <div class="form-colourpicker defaultsnext">
    <div class="admin_colourpicker clearfix">
        {{#icon}}
            {{>core/pix_icon}}
        {{/icon}}
    </div>
-    <input type="text" name="{{name}}" id="{{id}}" value="{{value}}" size="12" class="form-control text-ltr">
+    <input type="text" name="{{name}}" id="{{id}}" value="{{value}}" size="12" class="text-ltr">
    {{#haspreviewconfig}}
        <input type="button" id="{{id}}_preview" value={{#quote}}{{#str}}preview{{/str}}{{/quote}} class="admin_colourpicker_preview">
    {{/haspreviewconfig}}
--- a/Show More
+++ b/Show More