Moodle release 2.1.2

weekly release 2.1.1+
fix permissions
2011-10-09 00:49:42 +02:00 · 2011-10-07 00:11:22 +02:00 · 2011-10-07 00:06:23 +02:00 · 2011-10-07 00:05:07 +02:00 · 2011-10-06 00:55:37 +00:00 · 2011-10-05 14:52:45 +08:00
19589 changed files with 1295845 additions and 2756624 deletions
@@ -1,79 +0,0 @@
-# Generated by "grunt ignorefiles"
-*/**/yui/src/*/meta/
-*/**/build/
-node_modules/
-vendor/
-admin/tool/usertours/amd/src/tour.js
-admin/tool/usertours/amd/src/popper.js
-auth/cas/CAS/
-auth/fc/fcFPP.php
-enrol/lti/ims-blti/
-filter/algebra/AlgParser.pm
-filter/tex/mimetex.*
-lib/editor/atto/yui/src/rangy/js/*.*
-lib/editor/tinymce/plugins/pdw/tinymce/
-lib/editor/tinymce/plugins/spellchecker/rpc.php
-lib/editor/tinymce/tiny_mce/
-lib/adodb/
-lib/bennu/
-lib/evalmath/
-lib/lessphp/
-lib/phpexcel/
-lib/google/
-lib/htmlpurifier/
-lib/jabber/
-lib/minify/matthiasmullie-minify/
-lib/minify/matthiasmullie-pathconverter/
-lib/pear/Auth/RADIUS.php
-lib/pear/Crypt/CHAP.php
-lib/pear/HTML/Common.php
-lib/pear/HTML/QuickForm.php
-lib/pear/HTML/QuickForm/
-lib/pear/PEAR.php
-lib/phpmailer/
-lib/simplepie/
-lib/tcpdf/
-lib/typo3/
-lib/yuilib/
-lib/yuilib/gallery/
-lib/jquery/
-lib/html2text/
-lib/markdown/
-lib/recaptchalib.php
-lib/xhprof/
-lib/xmlize.php
-lib/horde/
-lib/requirejs/
-lib/amd/src/loglevel.js
-lib/mustache/
-lib/amd/src/mustache.js
-lib/graphlib.php
-lib/php-css-parser/
-lib/rtlcss/
-lib/scssphp/
-lib/spout/
-lib/amd/src/chartjs-lazy.js
-lib/maxmind/GeoIp2/
-lib/maxmind/MaxMind/
-lib/ltiprovider/
-media/player/videojs/amd/src/video-lazy.js
-media/player/videojs/amd/src/Youtube-lazy.js
-media/player/videojs/videojs/
-mod/assign/feedback/editpdf/fpdi/
-repository/s3/S3.php
-theme/boost/scss/bootstrap/
-theme/boost/amd/src/alert.js
-theme/boost/amd/src/button.js
-theme/boost/amd/src/carousel.js
-theme/boost/amd/src/collapse.js
-theme/boost/amd/src/dropdown.js
-theme/boost/amd/src/modal.js
-theme/boost/amd/src/popover.js
-theme/boost/amd/src/scrollspy.js
-theme/boost/amd/src/tab.js
-theme/boost/amd/src/tooltip.js
-theme/boost/amd/src/util.js
-theme/boost/amd/src/tether.js
-theme/bootstrapbase/less/bootstrap/
-theme/bootstrapbase/javascript/html5shiv.js
-theme/bootstrapbase/amd/src/bootstrap.js
@@ -1,180 +0,0 @@
-{
-  'env': {
-    'browser': true,
-    'amd': true
-  },
-  'globals': {
-    'M': true,
-    'Y': true
-  },
-  'rules': {
-    // See http://eslint.org/docs/rules/ for all rules and explanations of all
-    // rules.
-
-    // === Possible Errors ===
-    'comma-dangle': 'off',
-    'no-cond-assign': 'error',
-    'no-console': 'error',
-    'no-constant-condition': 'error',
-    'no-control-regex': 'error',
-    'no-debugger': 'error',
-    'no-dupe-args': 'error',
-    'no-dupe-keys': 'error',
-    'no-duplicate-case': 'error',
-    'no-empty': 'warn',
-    'no-empty-character-class': 'error',
-    'no-ex-assign': 'error',
-    'no-extra-boolean-cast': 'error',
-    'no-extra-parens': 'off',
-    'no-extra-semi': 'error',
-    'no-func-assign': 'error',
-    'no-inner-declarations': 'error',
-    'no-invalid-regexp': 'error',
-    'no-irregular-whitespace': 'error',
-    'no-obj-calls': 'error',
-    'no-prototype-builtins': 'off',
-    'no-regex-spaces': 'error',
-    'no-sparse-arrays': 'error',
-    'no-unexpected-multiline': 'error',
-    'no-unreachable': 'warn',
-    'no-unsafe-finally': 'error',
-    'no-unsafe-negation': 'error',
-    'use-isnan': 'error',
-    'valid-jsdoc': ['warn', { 'requireReturn': false, 'requireParamDescription': false, 'requireReturnDescription': false }],
-    'valid-typeof': 'error',
-
-    // === Best Practices ===
-    // (these mostly match our jshint config)
-    'array-callback-return': 'warn',
-    'block-scoped-var': 'warn',
-    'complexity': 'warn',
-    'consistent-return': 'warn',
-    'curly': 'error',
-    'dot-notation': 'warn',
-    'no-alert': 'warn',
-    'no-caller': 'error',
-    'no-case-declarations': 'error',
-    'no-div-regex': 'error',
-    'no-empty-pattern': 'error',
-    'no-empty-function': 'warn',
-    'no-eq-null': 'error',
-    'no-eval': 'error',
-    'no-extend-native': 'error',
-    'no-extra-bind': 'warn',
-    'no-fallthrough': 'error',
-    'no-floating-decimal': 'warn',
-    'no-global-assign': 'warn',
-    // Enabled by grunt for AMD modules: 'no-implicit-globals': 'error',
-    'no-implied-eval': 'error',
-    'no-invalid-this': 'error',
-    'no-iterator': 'error',
-    'no-labels': 'error',
-    'no-loop-func': 'error',
-    'no-multi-spaces': 'warn',
-    'no-multi-str': 'error',
-    'no-new-func': 'error',
-    'no-new-wrappers': 'error',
-    'no-octal': 'error',
-    'no-octal-escape': 'error',
-    'no-proto': 'error',
-    'no-redeclare': 'warn',
-    'no-return-assign': 'error',
-    'no-script-url': 'error',
-    'no-self-assign': 'error',
-    'no-self-compare': 'error',
-    'no-sequences': 'warn',
-    'no-throw-literal': 'warn',
-    'no-unmodified-loop-condition': 'error',
-    'no-unused-expressions': 'error',
-    'no-unused-labels': 'error',
-    'no-useless-call': 'warn',
-    'no-useless-escape': 'warn',
-    'no-with': 'error',
-    'wrap-iife': ['error', 'any'],
-
-    // === Variables ===
-    'no-delete-var': 'error',
-    'no-undef': 'error',
-    'no-undef-init': 'error',
-    'no-unused-vars': ['error', { 'caughtErrors': 'none' }],
-
-    // === Stylistic Issues ===
-    'array-bracket-spacing': 'warn',
-    'block-spacing': 'warn',
-    'brace-style': ['warn', '1tbs'],
-    'camelcase': 'warn',
-    'comma-spacing': ['warn', { 'before': false, 'after': true }],
-    'comma-style': ['warn', 'last'],
-    'computed-property-spacing': 'error',
-    'consistent-this': 'off',
-    'eol-last': 'off',
-    'func-call-spacing': ['warn', 'never'],
-    'func-names': 'off',
-    'func-style': 'off',
-    // indent currently not doing well with our wrapping style, so disabled.
-    'indent': ['off', 4, { 'SwitchCase': 1 }],
-    'key-spacing': ['warn', { 'beforeColon': false, 'afterColon': true, 'mode': minimum }],
-    'keyword-spacing': 'warn',
-    'linebreak-style': ['error', 'unix'],
-    'lines-around-comment': 'off',
-    'max-len': ['error', 132],
-    'max-lines': 'off',
-    'max-depth': 'warn',
-    'max-nested-callbacks': ['warn', 5],
-    'max-params': 'off',
-    'max-statements': 'off',
-    'max-statements-per-line': ['warn', { max: 2 }],
-    'new-cap': ['warn', { 'properties': false }],
-    'new-parens': 'warn',
-    'newline-after-var': 'off',
-    'newline-before-return': 'off',
-    'newline-per-chained-call': 'off',
-    'no-array-constructor': 'off',
-    'no-bitwise': 'error',
-    'no-continue': 'off',
-    'no-inline-comments': 'off',
-    'no-lonely-if': 'off',
-    'no-mixed-operators': 'off',
-    'no-mixed-spaces-and-tabs': 'error',
-    'no-multiple-empty-lines': 'warn',
-    'no-negated-condition': 'off',
-    'no-nested-ternary': 'warn',
-    'no-new-object': 'off',
-    'no-plusplus': 'off',
-    'no-tabs': 'error',
-    'no-ternary': 'off',
-    'no-trailing-spaces': 'error',
-    'no-underscore-dangle': 'off',
-    'no-unneeded-ternary': 'off',
-    'no-whitespace-before-property': 'warn',
-    'object-curly-newline': 'off',
-    'object-curly-spacing': 'warn',
-    'object-property-newline': 'off',
-    'one-var': 'off',
-    'one-var-declaration-per-line': ['warn', 'initializations'],
-    'operator-assignment': 'off',
-    'operator-linebreak': 'off',
-    'padded-blocks': 'off',
-    'quote-props': ['warn', 'as-needed', {'unnecessary': false, 'keywords': true, 'numbers': true}],
-    'quotes': 'off',
-    'require-jsdoc': 'warn',
-    'semi': 'error',
-    'semi-spacing': ['warn', {'before': false, 'after': true}],
-    'sort-vars': 'off',
-    'space-before-blocks': 'warn',
-    'space-before-function-paren': ['warn', 'never'],
-    'space-in-parens': 'warn',
-    'space-infix-ops': 'warn',
-    'space-unary-ops': 'warn',
-    'spaced-comment': 'warn',
-    'unicode-bom': 'error',
-    'wrap-regex': 'off',
-
-    // === Deprecations ===
-    "no-restricted-properties": ['warn', {
-        'object': 'M',
-        'property': 'str',
-        'message': 'Use AMD module "core/str" or M.util.get_string()'
-    }],
-  }
-}
@@ -1,4 +0,0 @@
-**/yui/build/** -diff
-**/amd/build/** -diff
-theme/bootstrapbase/style/editor.css -diff
-theme/bootstrapbase/style/moodle.css -diff
@@ -25,14 +25,3 @@ CVS
 /.project
 /.buildpath
 /.cache
-phpunit.xml
-# Composer support. Do not ignore composer.json, or composer.lock. These should be shipped by us.
-composer.phar
-/vendor/
-/behat.yml
-*/yui/build/*/*-coverage.js
-/lib/yuilib/*/build/*/*-coverage.js
-# lib/yuilib/version/module/module-coverage.js
-/lib/yuilib/*/*/*-coverage.js
-atlassian-ide-plugin.xml
-/node_modules/
@@ -1,58 +0,0 @@
-// NOTE: We use eslint now. This file is used only by shifter. We keep the configuration
-// here because shifter uses jshint after modules have been concating. Eslint can't
-// currently do this.
-{
-    "asi":          false,
-    "bitwise":      true,
-    "boss":         false,
-    "browser":      true,
-    "curly":        true,
-    "debug":        false,
-    "eqeqeq":       false,
-    "eqnull":       false,
-    "es5":          false,
-    "esnext":       false,
-    "evil":         false,
-    "expr":         false,
-    "forin":        false,
-    "funcscope":    false,
-    "globalstrict": false,
-    "immed":        true,
-    "indent":       4,
-    "iterator":     false,
-    "lastsemic":    false,
-    "latedef":      true,
-    "laxbreak":     true,
-    "laxcomma":     false,
-    "loopfunc":     false,
-    "maxerr":       500,
-    "maxlen":       132,
-    "multistr":     false,
-    "newcap":       true,
-    "noarg":        true,
-    "noempty":      true,
-    "nomen":        false,
-    "onecase":      false,
-    "onevar":       false,
-    "passfail":     false,
-    "plusplus":     false,
-    "predef": [
-        "M",
-        "define",
-        "require"
-    ],
-    "proto":        false,
-    "regexdash":    false,
-    "regexp":       false,
-    "scripturl":    false,
-    "shadow":       false,
-    "smarttabs":    false,
-    "strict":       false,
-    "sub":          false,
-    "supernew":     false,
-    "trailing":     true,
-    "undef":        true,
-    "unused":       true,
-    "white":        false,
-    "yui":          true
-}
@@ -1,5 +0,0 @@
-{
-    "coverage": false,
-    "lint": "config",
-    "clean": true
-}
@@ -1,80 +0,0 @@
-# Generated by "grunt ignorefiles"
-theme/bootstrapbase/style/
-theme/clean/style/custom.css
-theme/more/style/custom.css
-node_modules/
-vendor/
-admin/tool/usertours/amd/src/tour.js
-admin/tool/usertours/amd/src/popper.js
-auth/cas/CAS/
-auth/fc/fcFPP.php
-enrol/lti/ims-blti/
-filter/algebra/AlgParser.pm
-filter/tex/mimetex.*
-lib/editor/atto/yui/src/rangy/js/*.*
-lib/editor/tinymce/plugins/pdw/tinymce/
-lib/editor/tinymce/plugins/spellchecker/rpc.php
-lib/editor/tinymce/tiny_mce/
-lib/adodb/
-lib/bennu/
-lib/evalmath/
-lib/lessphp/
-lib/phpexcel/
-lib/google/
-lib/htmlpurifier/
-lib/jabber/
-lib/minify/matthiasmullie-minify/
-lib/minify/matthiasmullie-pathconverter/
-lib/pear/Auth/RADIUS.php
-lib/pear/Crypt/CHAP.php
-lib/pear/HTML/Common.php
-lib/pear/HTML/QuickForm.php
-lib/pear/HTML/QuickForm/
-lib/pear/PEAR.php
-lib/phpmailer/
-lib/simplepie/
-lib/tcpdf/
-lib/typo3/
-lib/yuilib/
-lib/yuilib/gallery/
-lib/jquery/
-lib/html2text/
-lib/markdown/
-lib/recaptchalib.php
-lib/xhprof/
-lib/xmlize.php
-lib/horde/
-lib/requirejs/
-lib/amd/src/loglevel.js
-lib/mustache/
-lib/amd/src/mustache.js
-lib/graphlib.php
-lib/php-css-parser/
-lib/rtlcss/
-lib/scssphp/
-lib/spout/
-lib/amd/src/chartjs-lazy.js
-lib/maxmind/GeoIp2/
-lib/maxmind/MaxMind/
-lib/ltiprovider/
-media/player/videojs/amd/src/video-lazy.js
-media/player/videojs/amd/src/Youtube-lazy.js
-media/player/videojs/videojs/
-mod/assign/feedback/editpdf/fpdi/
-repository/s3/S3.php
-theme/boost/scss/bootstrap/
-theme/boost/amd/src/alert.js
-theme/boost/amd/src/button.js
-theme/boost/amd/src/carousel.js
-theme/boost/amd/src/collapse.js
-theme/boost/amd/src/dropdown.js
-theme/boost/amd/src/modal.js
-theme/boost/amd/src/popover.js
-theme/boost/amd/src/scrollspy.js
-theme/boost/amd/src/tab.js
-theme/boost/amd/src/tooltip.js
-theme/boost/amd/src/util.js
-theme/boost/amd/src/tether.js
-theme/bootstrapbase/less/bootstrap/
-theme/bootstrapbase/javascript/html5shiv.js
-theme/bootstrapbase/amd/src/bootstrap.js
@@ -1,94 +0,0 @@
-{
-    "rules": {
-        "at-rule-empty-line-before": [ "always",
-          {"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",
-        "block-closing-brace-newline-after": "always",
-        "block-closing-brace-newline-before": "always-multi-line",
-        "block-closing-brace-space-before": "always-single-line",
-        "block-no-empty": true,
-        "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" }],
-        "color-hex-length": ["short", { "severity": "warning" }],
-        "color-no-invalid-hex": true,
-        "declaration-bang-space-after": "never",
-        "declaration-bang-space-before": "always",
-        "declaration-block-no-duplicate-properties": true,
-        "declaration-block-no-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",
-        "declaration-block-semicolon-space-before": "never",
-        "declaration-block-single-line-max-declarations": 1,
-        "declaration-block-trailing-semicolon": "always",
-        "declaration-colon-newline-after": "always-multi-line",
-        "declaration-colon-space-after": "always-single-line",
-        "declaration-colon-space-before": "never",
-        "declaration-no-important": true,
-        "function-calc-no-unspaced-operator": true,
-        "function-comma-newline-after": "always-multi-line",
-        "function-comma-space-after": "always-single-line",
-        "function-comma-space-before": "never",
-        "function-linear-gradient-no-nonstandard-direction": true,
-        "function-max-empty-lines": 0,
-        "function-name-case": "lower",
-        "function-parentheses-newline-inside": "always-multi-line",
-        "function-parentheses-space-inside": "never-single-line",
-        "function-url-data-uris": never,
-        "function-whitespace-after": "always",
-        "indentation": 4,
-        "keyframe-declaration-no-important": true,
-        "length-zero-no-unit": [true, { "severity": "warning" }],
-        "max-empty-lines": 2,
-        "max-line-length": [132, { "severity": "warning" }],
-        "media-feature-colon-space-after": "always",
-        "media-feature-colon-space-before": "never",
-        "media-feature-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" }],
-        "no-invalid-double-slash-comments": true,
-        "no-unknown-animations": true,
-        "property-case": "lower",
-        "property-no-unknown": true,
-        "selector-attribute-brackets-space-inside": "never",
-        "selector-attribute-operator-space-after": "never",
-        "selector-attribute-operator-space-before": "never",
-        "selector-combinator-space-after": "always",
-        "selector-combinator-space-before": "always",
-        "selector-list-comma-newline-after": "always",
-        "selector-list-comma-space-before": "never",
-        "selector-max-empty-lines": 0,
-        "selector-pseudo-class-case": "lower",
-        "selector-pseudo-class-no-unknown": true,
-        "selector-pseudo-class-parentheses-space-inside": "never",
-        "selector-pseudo-element-case": "lower",
-        "selector-pseudo-element-no-unknown": true,
-        "selector-root-no-composition": true,
-        "selector-type-case": "lower",
-        "selector-type-no-unknown": true,
-        "string-no-newline": true,
-        "time-no-imperceptible": true,
-        "unit-blacklist": ["pt"],
-        "unit-case": "lower",
-        "unit-no-unknown": true,
-        "value-keyword-case": ["lower", {"ignoreKeywords": ["/(@|$)/"]}],
-        "value-list-comma-newline-after": "always-multi-line",
-        "value-list-comma-space-after": "always-single-line",
-        "value-list-comma-space-before": "never",
-  }
-}
@@ -1,262 +0,0 @@
-# PLEASE NOTE: Travis is not currently utilised by the Moodle core integration
-# process (which uses our internal CI system) this file is here for the benefit
-# of community developers git clones - see MDL-51458.
-
-sudo: false
-
-# We currently disable Travis notifications entirely until https://github.com/travis-ci/travis-ci/issues/4976
-# is fixed.
-notifications:
-  email: false
-
-language: php
-
-php:
-    # We only run the highest and lowest supported versions to reduce the load on travis-ci.org.
-    - 7.1
-    - 5.6
-
-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.1, so run that first.
-    # CI Tests should be second-highest in priority as these only take <= 60 seconds to run under normal circumstances.
-    # Postgres is significantly is pretty reasonable in its run-time.
-
-    # Run unit tests on MySQL
-    - DB=mysqli   TASK=PHPUNIT
-
-    # Run CI Tests without running PHPUnit.
-    - DB=none     TASK=CITEST
-
-    # Run unit tests on Postgres
-    - DB=pgsql    TASK=PHPUNIT
-
-    # Perform an upgrade test too.
-    - DB=pgsql    TASK=UPGRADE
-
-matrix:
-    # Enable fast finish.
-    # This will fail the build if a single job fails (except those in allow_failures).
-    # It will not stop the jobs from running.
-    fast_finish: true
-
-    include:
-          # Run grunt/npm install on lowest supported npm version
-        - php: 7.1
-          env: DB=none     TASK=GRUNT   NVM_VERSION='4'
-          # Run grunt/npm install on highest version ('node' is an alias for the latest node.js version.)
-        - php: 7.1
-          env: DB=none     TASK=GRUNT   NVM_VERSION='node'
-
-    exclude:
-        # MySQL - it's just too slow.
-        # 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:
-    directories:
-      - $HOME/.composer/cache
-      - $HOME/.npm
-
-install:
-    - >
-        if [ "$TASK" = 'PHPUNIT' ];
-        then
-            if [ -n "$GITHUB_APITOKEN" ]; then
-                composer config github-oauth.github.com $GITHUB_APITOKEN;
-                echo 'auth.json' >> .git/info/exclude
-            fi
-
-            # Enable Redis.
-            echo 'extension="redis.so"' > /tmp/redis.ini
-            phpenv config-add /tmp/redis.ini
-
-            # Install composer dependencies.
-            # We need --no-interaction in case we hit API limits for composer. This causes it to fall back to a standard clone.
-            # Typically it should be able to use the Composer cache if any other job has already completed before we started here.
-            travis_retry composer install --prefer-dist --no-interaction;
-        fi
-
-    - >
-        if [ "$TASK" = 'GRUNT' ];
-        then
-            nvm install $NVM_VERSION ;
-            nvm use $NVM_VERSION ;
-        fi
-
-before_script:
-    - phpenv config-rm xdebug.ini
-    - >
-      if [ "$TASK" = 'PHPUNIT' -o "$TASK" = 'UPGRADE' ];
-      then
-        # Copy generic configuration in place.
-        cp config-dist.php config.php ;
-
-        # Create the moodledata directory.
-        mkdir -p "$HOME"/roots/base
-
-        # The database name and password.
-        sed -i \
-          -e "s%= 'moodle'%= 'travis_ci_test'%" \
-          -e "s%= 'password'%= ''%" \
-          config.php ;
-
-        # The wwwroot and dataroot.
-        sed -i \
-          -e "s%http://example.com/moodle%http://localhost%" \
-          -e "s%/home/example/moodledata%/home/travis/roots/base%" \
-          config.php ;
-
-        if [ "$DB" = 'pgsql' ];
-        then
-          # Postgres-specific setup.
-          sed -i \
-            -e "s%= 'username'%= 'postgres'%" \
-            config.php ;
-
-          psql -c 'CREATE DATABASE travis_ci_test;' -U postgres;
-        fi
-
-        if [ "$DB" = 'mysqli' ];
-        then
-          # MySQL-specific setup.
-          sed -i \
-            -e "s%= 'pgsql'%= 'mysqli'%" \
-            -e "s%= 'username'%= 'travis'%" \
-            -e "s%=> 'utf8mb4_unicode_ci'%=> 'utf8mb4_bin'%" \
-            config.php;
-
-          mysql -u root -e 'SET GLOBAL innodb_file_format=barracuda;' ;
-          mysql -u root -e 'SET GLOBAL innodb_file_per_table=ON;' ;
-          mysql -u root -e 'SET GLOBAL innodb_large_prefix=ON;' ;
-          mysql -e 'CREATE DATABASE travis_ci_test DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_bin;' ;
-        fi
-      fi
-
-    - >
-      if [ "$TASK" = 'PHPUNIT' ];
-      then
-        # Create a directory for the phpunit dataroot.
-        mkdir -p "$HOME"/roots/phpunit
-
-        # The phpunit dataroot and prefix..
-        sed -i \
-          -e "/require_once/i \\\$CFG->phpunit_dataroot = '\/home\/travis\/roots\/phpunit';" \
-          -e "/require_once/i \\\$CFG->phpunit_prefix = 'p_';" \
-          -e "/require_once/i \\define('TEST_SESSION_REDIS_HOST', '127.0.0.1');" \
-          config.php ;
-
-        # Initialise PHPUnit for Moodle.
-        php admin/tool/phpunit/cli/init.php
-      fi
-
-    - >
-      if [ "$TASK" = 'GRUNT' ];
-      then
-        npm install --no-spin;
-        npm install --no-spin -g grunt ;
-      fi
-
-    ########################################################################
-    # CI Tests
-    ########################################################################
-    - >
-      if [ "$TASK" = 'CITEST' ];
-      then
-        # Note - this is deliberately placed in the script section as we
-        # should not add any code until after phpunit has run.
-
-        # The following repositories are required.
-        # The local_ci repository does the actual checking.
-        git clone https://github.com/moodlehq/moodle-local_ci.git local/ci
-
-        # We need the official upstream for comparison
-        git remote add upstream https://github.com/moodle/moodle.git;
-
-        git fetch upstream MOODLE_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`
-
-        # Variables required by our linter.
-        export gitcmd=`which git`;
-        export gitdir="$TRAVIS_BUILD_DIR";
-        export phpcmd=`which php`;
-      fi
-
-    ########################################################################
-    # Upgrade test
-    ########################################################################
-    - >
-      if [ "$TASK" = 'UPGRADE' ];
-      then
-        # We need the official upstream.
-        git remote add upstream https://github.com/moodle/moodle.git;
-
-        # Checkout 27 STABLE branch.
-        git fetch upstream MOODLE_27_STABLE;
-        git checkout MOODLE_27_STABLE;
-
-        # Perform the upgrade
-        php admin/cli/install_database.php --agree-license --adminpass=Password --adminemail=admin@example.com --fullname="Upgrade test" --shortname=Upgrade;
-
-        # Return to the previous commit
-        git checkout -;
-
-        # Perform the upgrade
-        php admin/cli/upgrade.php --non-interactive --allow-unstable ;
-
-        # The local_ci repository can be used to check upgrade savepoints.
-        git clone https://github.com/moodlehq/moodle-local_ci.git local/ci ;
-      fi
-
-script:
-    - >
-      if [ "$TASK" = 'PHPUNIT' ];
-      then
-        vendor/bin/phpunit;
-      fi
-
-    - >
-      if [ "$TASK" = 'CITEST' ];
-      then
-        bash local/ci/php_lint/php_lint.sh;
-      fi
-
-    - >
-      if [ "$TASK" = 'GRUNT' ];
-      then
-        grunt ;
-        # Add all files to the git index and then run diff --cached to see all changes.
-        # This ensures that we get the status of all files, including new files.
-        git add . ;
-        git diff --cached --exit-code ;
-      fi
-
-    ########################################################################
-    # Upgrade test
-    ########################################################################
-    - >
-      if [ "$TASK" = 'UPGRADE' ];
-      then
-        cp local/ci/check_upgrade_savepoints/check_upgrade_savepoints.php ./check_upgrade_savepoints.php
-        result=`php check_upgrade_savepoints.php`;
-        # Check if there are problems
-        count=`echo "$result" | grep -P "ERROR|WARN" | wc -l` ;
-        if (($count > 0));
-        then
-          echo "$result"
-          exit 1 ;
-        fi
-      fi
@@ -1,56 +0,0 @@
-CONTRIBUTING TO MOODLE
-======================
-
-Moodle is made by people like you. We are members of a big worldwide community
-of developers, designers, teachers, testers, translators and other users. We
-work in universities, schools, companies and other places. You are very welcome
-to join us and contribute to the project.
-
-See <https://docs.moodle.org/dev/Contributing_to_Moodle> for the many ways you
-can help, not only with coding.
-
-Moodle is open to community contributions to core, though all code must go
-through peer-review, automated behaviour testing, continuous integration and
-human post-integration checks.
-
-Pull requests
-------------
-
-Please do not open pull requests via Github. The repository there is just a
-mirror of the official repository at <https://git.moodle.org>. Issues are
-reported and patches provided via <https://tracker.moodle.org>. See below for
-more information.
-
-Moodle core bug fixes and new features
--------------------------------------
-
-During the years of intensive development, a mature process of including
-submitted patches has evolved.
-
-* Every bug fix or new feature must have a tracker issue.
-* You publish the branch implementing the fix or new feature in your public
-  clone of the moodle.git repository (typically on Github).
-* Your patch is peer-reviewed, discussed, integrated, tested and then released
-  as a part of moodle.git.
-* New features are developed on the master branch. Bug fixes are also
-  backported to currently supported maintenance (stable) branches.
-
-For further details, see <https://docs.moodle.org/dev/Process>.
-
-Moodle plugins
--------------
-
-Moodle has a framework for additional plugins to extend its functionality. We
-have a Moodle plugins directory <https://moodle.org/plugins/> where you can
-register and maintain your plugin. Plugins hosted in the plugins directory can
-be easily installed and updated via the Moodle administration interface.
-
-* You are expected to have a public source code repository with your plugin
-  code.
-* After registering your plugin in the plugins directory it is reviewed before
-  being published.
-* You are expected to continuously release updated versions of the plugin via
-  the plugins directory. We do not pull from your code repository; you must do
-  it explicitly.
-
-For further details, see <https://docs.moodle.org/dev/Plugin_contribution>.
@@ -1,376 +0,0 @@
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-/* jshint node: true, browser: false */
-/* eslint-env node */
-
-/**
- * @copyright  2014 Andrew Nicols
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-/**
- * Grunt configuration
- */
-
-module.exports = function(grunt) {
-    var path = require('path'),
-        tasks = {},
-        cwd = process.env.PWD || process.cwd(),
-        async = require('async'),
-        DOMParser = require('xmldom').DOMParser,
-        xpath = require('xpath'),
-        semver = require('semver');
-
-    // Verify the node version is new enough.
-    var expected = semver.validRange(grunt.file.readJSON('package.json').engines.node);
-    var actual = semver.valid(process.version);
-    if (!semver.satisfies(actual, expected)) {
-        grunt.fail.fatal('Node version too old. Require ' + expected + ', version installed: ' + actual);
-    }
-
-    // Windows users can't run grunt in a subdirectory, so allow them to set
-    // the root by passing --root=path/to/dir.
-    if (grunt.option('root')) {
-        var root = grunt.option('root');
-        if (grunt.file.exists(__dirname, root)) {
-            cwd = path.join(__dirname, root);
-            grunt.log.ok('Setting root to ' + cwd);
-        } else {
-            grunt.fail.fatal('Setting root to ' + root + ' failed - path does not exist');
-        }
-    }
-
-    var inAMD = path.basename(cwd) == 'amd';
-
-    // Globbing pattern for matching all AMD JS source files.
-    var amdSrc = [inAMD ? cwd + '/src/*.js' : '**/amd/src/*.js'];
-
-    /**
-     * Function to generate the destination for the uglify task
-     * (e.g. build/file.min.js). This function will be passed to
-     * the rename property of files array when building dynamically:
-     * http://gruntjs.com/configuring-tasks#building-the-files-object-dynamically
-     *
-     * @param {String} destPath the current destination
-     * @param {String} srcPath the  matched src path
-     * @return {String} The rewritten destination path.
-     */
-    var uglifyRename = function(destPath, srcPath) {
-        destPath = srcPath.replace('src', 'build');
-        destPath = destPath.replace('.js', '.min.js');
-        destPath = path.resolve(cwd, destPath);
-        return destPath;
-    };
-
-    /**
-     * Find thirdpartylibs.xml and generate an array of paths contained within
-     * them (used to generate ignore files and so on).
-     *
-     * @return {array} The list of thirdparty paths.
-     */
-    var getThirdPartyPathsFromXML = function() {
-        var thirdpartyfiles = grunt.file.expand('*/**/thirdpartylibs.xml');
-        var libs = ['node_modules/', 'vendor/'];
-
-        thirdpartyfiles.forEach(function(file) {
-          var dirname = path.dirname(file);
-
-          var doc = new DOMParser().parseFromString(grunt.file.read(file));
-          var nodes = xpath.select("/libraries/library/location/text()", doc);
-
-          nodes.forEach(function(node) {
-            var lib = path.join(dirname, node.toString());
-            if (grunt.file.isDir(lib)) {
-                // Ensure trailing slash on dirs.
-                lib = lib.replace(/\/?$/, '/');
-            }
-
-            // Look for duplicate paths before adding to array.
-            if (libs.indexOf(lib) === -1) {
-                libs.push(lib);
-            }
-          });
-        });
-        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,
-              // 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'],
-               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: {
-                files: [{
-                    expand: true,
-                    src: amdSrc,
-                    rename: uglifyRename
-                }],
-                options: {report: 'none'}
-            }
-        },
-        less: {
-            bootstrapbase: {
-                files: {
-                    "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.
-                }
-           }
-        },
-        watch: {
-            options: {
-                nospawn: true // We need not to spawn so config can be changed dynamically.
-            },
-            amd: {
-                files: ['**/amd/src/**/*.js'],
-                tasks: ['amd']
-            },
-            bootstrapbase: {
-                files: ["theme/bootstrapbase/less/**/*.less"],
-                tasks: ["css"]
-            },
-            yui: {
-                files: ['**/yui/src/**/*.js'],
-                tasks: ['yui']
-            },
-        },
-        shifter: {
-            options: {
-                recursive: true,
-                paths: [cwd]
-            }
-        },
-        stylelint: {
-            less: {
-                options: {
-                    syntax: 'less',
-                    configOverrides: {
-                        rules: {
-                            // These rules have to be disabled in .stylelintrc for scss compat.
-                            "at-rule-no-unknown": true,
-                            "no-browser-hacks": [true, {"severity": "warning"}]
-                        }
-                    }
-                },
-                src: ['theme/**/*.less']
-            },
-            scss: {
-                options: {syntax: 'scss'},
-                src: ['*/**/*.scss']
-            },
-            css: {
-                src: ['*/**/*.css'],
-                options: {
-                    configOverrides: {
-                        rules: {
-                            // These rules have to be disabled in .stylelintrc for scss compat.
-                            "at-rule-no-unknown": true,
-                            "no-browser-hacks": [true, {"severity": "warning"}]
-                        }
-                    }
-                }
-            }
-        }
-    });
-
-    /**
-     * Generate ignore files (utilising thirdpartylibs.xml data)
-     */
-    tasks.ignorefiles = function() {
-      // An array of paths to third party directories.
-      var thirdPartyPaths = getThirdPartyPathsFromXML();
-      // Generate .eslintignore.
-      var eslintIgnores = ['# Generated by "grunt ignorefiles"', '*/**/yui/src/*/meta/', '*/**/build/'].concat(thirdPartyPaths);
-      grunt.file.write('.eslintignore', eslintIgnores.join('\n'));
-      // Generate .stylelintignore.
-      var stylelintIgnores = [
-          '# Generated by "grunt ignorefiles"',
-          'theme/bootstrapbase/style/',
-          'theme/clean/style/custom.css',
-          'theme/more/style/custom.css'
-      ].concat(thirdPartyPaths);
-      grunt.file.write('.stylelintignore', stylelintIgnores.join('\n'));
-    };
-
-    /**
-     * Shifter task. Is configured with a path to a specific file or a directory,
-     * in the case of a specific file it will work out the right module to be built.
-     *
-     * Note that this task runs the invidiaul shifter jobs async (becase it spawns
-     * so be careful to to call done().
-     */
-    tasks.shifter = function() {
-        var done = this.async(),
-            options = grunt.config('shifter.options');
-
-        // Run the shifter processes one at a time to avoid confusing output.
-        async.eachSeries(options.paths, function(src, filedone) {
-            var args = [];
-            args.push(path.normalize(__dirname + '/node_modules/shifter/bin/shifter'));
-
-            // Always ignore the node_modules directory.
-            args.push('--excludes', 'node_modules');
-
-            // Determine the most appropriate options to run with based upon the current location.
-            if (grunt.file.isMatch('**/yui/**/*.js', src)) {
-                // When passed a JS file, build our containing module (this happen with
-                // watch).
-                grunt.log.debug('Shifter passed a specific JS file');
-                src = path.dirname(path.dirname(src));
-                options.recursive = false;
-            } else if (grunt.file.isMatch('**/yui/src', src)) {
-                // When in a src directory --walk all modules.
-                grunt.log.debug('In a src directory');
-                args.push('--walk');
-                options.recursive = false;
-            } else if (grunt.file.isMatch('**/yui/src/*', src)) {
-                // When in module, only build our module.
-                grunt.log.debug('In a module directory');
-                options.recursive = false;
-            } else if (grunt.file.isMatch('**/yui/src/*/js', src)) {
-                // When in module src, only build our module.
-                grunt.log.debug('In a source directory');
-                src = path.dirname(src);
-                options.recursive = false;
-            }
-
-            if (grunt.option('watch')) {
-                grunt.fail.fatal('The --watch option has been removed, please use `grunt watch` instead');
-            }
-
-            // Add the stderr option if appropriate
-            if (grunt.option('verbose')) {
-                args.push('--lint-stderr');
-            }
-
-            if (grunt.option('no-color')) {
-                args.push('--color=false');
-            }
-
-            var execShifter = function() {
-
-                grunt.log.ok("Running shifter on " + src);
-                grunt.util.spawn({
-                    cmd: "node",
-                    args: args,
-                    opts: {cwd: src, stdio: 'inherit', env: process.env}
-                }, function(error, result, code) {
-                    if (code) {
-                        grunt.fail.fatal('Shifter failed with code: ' + code);
-                    } else {
-                        grunt.log.ok('Shifter build complete.');
-                        filedone();
-                    }
-                });
-            };
-
-            // Actually run shifter.
-            if (!options.recursive) {
-                execShifter();
-            } else {
-                // Check that there are yui modules otherwise shifter ends with exit code 1.
-                if (grunt.file.expand({cwd: src}, '**/yui/src/**/*.js').length > 0) {
-                    args.push('--recursive');
-                    execShifter();
-                } else {
-                    grunt.log.ok('No YUI modules to build.');
-                    filedone();
-                }
-            }
-        }, done);
-    };
-
-    tasks.startup = function() {
-        // Are we in a YUI directory?
-        if (path.basename(path.resolve(cwd, '../../')) == 'yui') {
-            grunt.task.run('yui');
-        // Are we in an AMD directory?
-        } else if (inAMD) {
-            grunt.task.run('amd');
-        } else {
-            // Run them all!.
-            grunt.task.run('css');
-            grunt.task.run('js');
-        }
-    };
-
-    // On watch, we dynamically modify config to build only affected files. This
-    // method is slightly complicated to deal with multiple changed files at once (copied
-    // from the grunt-contrib-watch readme).
-    var changedFiles = Object.create(null);
-    var onChange = grunt.util._.debounce(function() {
-          var files = Object.keys(changedFiles);
-          grunt.config('eslint.amd.src', files);
-          grunt.config('eslint.yui.src', files);
-          grunt.config('uglify.amd.files', [{expand: true, src: files, rename: uglifyRename}]);
-          grunt.config('shifter.options.paths', files);
-          grunt.config('stylelint.less.src', files);
-          changedFiles = Object.create(null);
-    }, 200);
-
-    grunt.event.on('watch', function(action, filepath) {
-          changedFiles[filepath] = action;
-          onChange();
-    });
-
-    // Register NPM tasks.
-    grunt.loadNpmTasks('grunt-contrib-uglify');
-    grunt.loadNpmTasks('grunt-contrib-less');
-    grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-eslint');
-    grunt.loadNpmTasks('grunt-stylelint');
-
-    // Register JS tasks.
-    grunt.registerTask('shifter', 'Run Shifter against the current directory', tasks.shifter);
-    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', 'stylelint:less', 'less:bootstrapbase', 'stylelint:css']);
-
-    // Register the startup task.
-    grunt.registerTask('startup', 'Run the correct tasks for the current directory', tasks.startup);
-
-    // Register the default task.
-    grunt.registerTask('default', ['startup']);
-};
@@ -1,20 +0,0 @@
-MOODLE INSTALLATION
-===================
-
-Here is a short summary of the installation process (which can take just a few
-minutes):
-
-1. Move the Moodle files into your web directory.
-
-2. Create a single database for Moodle to store all its tables in (or choose an
-   existing database).
-
-3. Visit your Moodle site with a browser. You should be taken to the
-   install.php script, which will lead you through creating a config.php file
-   and then setting up Moodle, creating an admin account etc.
-
-4. Set up a cron task to call the file admin/cron.php every minute.
-
-For more information, see <https://docs.moodle.org/en/Installing_Moodle>.
-
-Good luck and have fun!
@@ -1,7 +0,0 @@
-*** PLEASE DO NOT OPEN PULL REQUESTS VIA GITHUB ***
-
-The moodle.git repository at Github is just a mirror of the official repository. We do not accept pull requests at Github.
-
-See CONTRIBUTING.txt guidelines for how to contribute patches for Moodle. Thank you.
-
--
@@ -1,28 +1,29 @@
-                                 .-..-.
-   _____                         | || |
-  /____/-.---_  .---.  .---.  .-.| || | .---.
-  | |  _   _  |/  _  \/  _  \/  _  || |/  __ \
-  * | | | | | || |_| || |_| || |_| || || |___/
-    |_| |_| |_|\_____/\_____/\_____||_|\_____)
+QUICK INSTALL
+=============

-Moodle - the world's open source learning platform
+For the impatient, here is a basic outline of the
+installation process, which normally takes me only
+a few minutes:

-Moodle <https://moodle.org> is a learning platform designed to provide
-educators, administrators and learners with a single robust, secure and
-integrated system to create personalised learning environments.
+1) Move the Moodle files into your web directory.

-You can download Moodle <https://download.moodle.org> and run it on your own
-web server, ask one of our Moodle Partners <https://moodle.com/partners/> to
-assist you, or have a MoodleCloud site <https://moodle.com/cloud/> set up for
-you.
+2) Create a single database for Moodle to store all
+   it's tables in (or choose an existing database).

-Moodle is widely used around the world by universities, schools, companies and
-all manner of organisations and individuals.
+3) Visit your Moodle site with a browser, you should
+   be taken to the install.php script, which will lead
+   you through creating a config.php file and then
+   setting up Moodle, creating an admin account etc.

-Moodle is provided freely as open source software, under the GNU General Public
-License <https://docs.moodle.org/dev/License>.
+4) Set up a cron task to call the file admin/cron.php
+   every five minutes or so.

-Moodle is written in PHP and JavaScript and uses an SQL database for storing
-the data.

-See <https://docs.moodle.org> for details of Moodle's many features.
+For more information, see the INSTALL DOCUMENTATION:
+
+   http://docs.moodle.org/en/Installing_Moodle
+
+
+Good luck and have fun!
+Martin Dougiamas, Lead Developer
+
@@ -1,48 +1,34 @@
-MOODLE TRADEMARKS POLICY
-========================
+------------------------
+Moodle Trademark License
+------------------------

-The word "Moodle" is trademarked in many countries around the world. The word
-was originally an acronym: Modular Object-Oriented Dynamic Learning
-Environment. The trademark is owned by Martin Dougiamas, Founder and Director
-of Moodle.
+The name Moodle™ is a registered trademark of the Moodle Trust.

-The law obligates trademark owners to police their marks and prevent the use of
-confusingly similar names by third parties. Through this policy we’d like to
-make it clear how Moodle-related projects, organisations, and people can use
-the Moodle trademark. We’d also like to be clear about how use of the word is
-restricted when used to promote commercial Moodle services. We do this to
-protect the very business model that allows us to continue developing Moodle
-for you.
+A key part of the business model that allows us to produce and
+distribute Moodle as completely Free open source software is that
+we restrict the commercial use of the Moodle trademark to those
+who have contracted to support Moodle development (Moodle Partners).

-Allowed uses
------------
+If you are intending to use the name (and/or logo) to advertise
+generic Moodle™ services (eg Moodle Hosting, Moodle Support,
+Moodle Certification, Moodle Training, Moodle Consulting,
+Moodle Customisation, Moodle Courseware Development, Moodle
+Theme design, Moodle Integrations, Moodle Installations, etc)
+or as the name of a software package, then you must seek
+direct permission in writing from the Moodle Trust via the
+moodle.com helpdesk, in accordance with normal trademark
+restrictions.

-The following uses don’t require any permission at all:
+There are no restrictions on how you use the name in other
+contexts (for example, if you use Moodle just to provide
+courses then you can use the name freely to refer to it.)

-* Referring to the software or the Moodle project.
-* Describing your own Moodle implementation (including within corporate
-  settings).
-* Describing a Moodle-based community hub.
-* Describing some software you’ve made that integrates with Moodle
-  (eg a Moodle integration feature on another system).
+If you aren't sure of a particular case, please ask us via
+http://moodle.com/helpdesk: we'll be happy to either provide
+you with official permission in writing or help you fix
+your wording.

-Restricted uses
---------------
-
-The following uses are generally prohibited without explicit and direct
-permission being granted to you by Moodle Pty Ltd. We do this to protect the
-Moodle project from software and sites which could confuse people. Please
-contact us to ask for permission in writing.
-
-* You can’t use "Moodle" in the name of your software (including Mobile apps)
-* You can’t use "Moodle" in your company name
-* You can’t use "Moodle" in your domain name
-* You can’t use "Moodle" in advertising-related keywords (such as Adsense)
-* You can’t use "Moodle" to describe services around Moodle (such as hosting,
-  training, support, consulting, course creation services, theme development,
-  customisation, installation, integration and certification). This applies
-  even if you do not charge for the services. Note that usually only Moodle
-  Partners have this permission.
-
-For information about the Moodle Partner Certification Mark as well as for how
-to contact us, please see <https://moodle.com/trademarks/>.
+Martin Dougiamas
+Executive Director
+Moodle Trust
+http://moodle.com
@@ -1,48 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Admin settings search form
- *
- * @package    admin
- * @copyright  2016 Damyon Wiese
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once $CFG->libdir.'/formslib.php';
-
-/**
- * Admin settings search form
- *
- * @package    admin
- * @copyright  2016 Damyon Wiese
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class admin_settings_search_form extends moodleform {
-    function definition () {
-        $mform = $this->_form;
-
-        //$mform->addElement('header', 'settingsheader', get_string('search', 'admin'));
-        $elements = [];
-        $elements[] = $mform->createElement('text', 'query', get_string('query', 'admin'));
-        $elements[] = $mform->createElement('submit', 'search', get_string('search'));
-        $mform->addGroup($elements);
-        $mform->setType('query', PARAM_RAW);
-        $mform->setDefault('query', optional_param('query', '', PARAM_RAW));
-    }
-}
@@ -1,106 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Allows admin to configure antiviruses.
- *
- * @package    core_antivirus
- * @copyright  2015 Ruslan Kabalin, Lancaster University.
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/tablelib.php');
-
-$action  = required_param('action', PARAM_ALPHANUMEXT);
-$antivirus  = required_param('antivirus', PARAM_PLUGIN);
-$confirm = optional_param('confirm', 0, PARAM_BOOL);
-
-$PAGE->set_url('/admin/antiviruses.php', array('action' => $action, 'antivirus' => $antivirus));
-$PAGE->set_context(context_system::instance());
-
-require_login();
-require_capability('moodle/site:config', context_system::instance());
-
-$returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageantiviruses";
-
-// Get currently installed and enabled antivirus plugins.
-$availableantiviruses = \core\antivirus\manager::get_available();
-if (!empty($antivirus) and empty($availableantiviruses[$antivirus])) {
-    redirect ($returnurl);
-}
-
-$activeantiviruses = explode(',', $CFG->antiviruses);
-foreach ($activeantiviruses as $key => $active) {
-    if (empty($availableantiviruses[$active])) {
-        unset($activeantiviruses[$key]);
-    }
-}
-
-if (!confirm_sesskey()) {
-    redirect($returnurl);
-}
-
-switch ($action) {
-    case 'disable':
-        // Remove from enabled list.
-        $key = array_search($antivirus, $activeantiviruses);
-        unset($activeantiviruses[$key]);
-        break;
-
-    case 'enable':
-        // Add to enabled list.
-        if (!in_array($antivirus, $activeantiviruses)) {
-            $activeantiviruses[] = $antivirus;
-            $activeantiviruses = array_unique($activeantiviruses);
-        }
-        break;
-
-    case 'down':
-        $key = array_search($antivirus, $activeantiviruses);
-        // Check auth plugin is valid.
-        if ($key !== false) {
-            // Move down the list.
-            if ($key < (count($activeantiviruses) - 1)) {
-                $fsave = $activeantiviruses[$key];
-                $activeantiviruses[$key] = $activeantiviruses[$key + 1];
-                $activeantiviruses[$key + 1] = $fsave;
-            }
-        }
-        break;
-
-    case 'up':
-        $key = array_search($antivirus, $activeantiviruses);
-        // Check auth is valid.
-        if ($key !== false) {
-            // Move up the list.
-            if ($key >= 1) {
-                $fsave = $activeantiviruses[$key];
-                $activeantiviruses[$key] = $activeantiviruses[$key - 1];
-                $activeantiviruses[$key - 1] = $fsave;
-            }
-        }
-        break;
-
-    default:
-        break;
-}
-
-set_config('antiviruses', implode(',', $activeantiviruses));
-core_plugin_manager::reset_caches();
-
-redirect ($returnurl);
@@ -12,14 +12,14 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/tablelib.php');

 require_login();
-require_capability('moodle/site:config', context_system::instance());
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));

 $returnurl = new moodle_url('/admin/settings.php', array('section'=>'manageauths'));

 $PAGE->set_url($returnurl);

-$action = optional_param('action', '', PARAM_ALPHANUMEXT);
-$auth   = optional_param('auth', '', PARAM_PLUGIN);
+$action = optional_param('action', '', PARAM_ACTION);
+$auth   = optional_param('auth', '', PARAM_SAFEDIR);

 get_enabled_auth_plugins(true); // fix the list of enabled auths
 if (empty($CFG->auth)) {
@@ -51,8 +51,7 @@ switch ($action) {
        if ($auth == $CFG->registerauth) {
            set_config('registerauth', '');
        }
-        \core\session\manager::gc(); // Remove stale sessions.
-        core_plugin_manager::reset_caches();
+        session_gc(); // remove stale sessions
        break;

    case 'enable':
@@ -62,8 +61,7 @@ switch ($action) {
            $authsenabled = array_unique($authsenabled);
            set_config('auth', implode(',', $authsenabled));
        }
-        \core\session\manager::gc(); // Remove stale sessions.
-        core_plugin_manager::reset_caches();
+        session_gc(); // remove stale sessions
        break;

    case 'down':
@@ -6,7 +6,7 @@
 require_once '../config.php';
 require_once $CFG->libdir.'/adminlib.php';

-$auth = required_param('auth', PARAM_PLUGIN);
+$auth = required_param('auth', PARAM_SAFEDIR);
 $PAGE->set_pagetype('admin-auth-' . $auth);

 admin_externalpage_setup('authsetting'.$auth);
@@ -78,9 +78,6 @@ echo '<p style="text-align: center"><input type="submit" value="' . get_string("
 echo "</div>\n";
 echo "</form>\n";

-$PAGE->requires->string_for_js('unmaskpassword', 'core_form');
-$PAGE->requires->yui_module('moodle-auth-passwordunmask', 'M.auth.passwordunmask');
-
 echo $OUTPUT->footer();
 exit;

@@ -90,8 +87,8 @@ exit;
 // 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;
+function print_auth_lock_options ($auth, $user_fields, $helptext, $retrieveopts, $updateopts) {
+    global $OUTPUT;
    echo '<tr><td colspan="3">';
    if ($retrieveopts) {
        echo $OUTPUT->heading(get_string('auth_data_mapping', 'auth'));
@@ -110,21 +107,14 @@ function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts,

    $pluginconfig = get_config("auth/$auth");

-    // Helptext is on a field with rowspan.
+    // helptext is on a field with rowspan
    if (empty($helptext)) {
-        $helptext = '&nbsp;';
+                $helptext = '&nbsp;';
    }

-    // If we have custom fields then merge them with user fields.
-    if (!empty($customfields)) {
-        $user_fields = array_merge($user_fields, $customfields);
-    }
-
-    if (!empty($customfields)) {
-        $customfieldname = $DB->get_records('user_info_field', null, '', 'shortname, name');
-    }
    foreach ($user_fields as $field) {
-        // Define some vars we'll work with.
+
+        // Define some vars we'll work with
        if (!isset($pluginconfig->{"field_map_$field"})) {
            $pluginconfig->{"field_map_$field"} = '';
        }
@@ -138,14 +128,12 @@ function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts,
            $pluginconfig->{"field_lock_$field"} = '';
        }

-        // Define the fieldname we display to the  user.
+        // define the fieldname we display to the  user
        $fieldname = $field;
        if ($fieldname === 'lang') {
            $fieldname = get_string('language');
-        } elseif (!empty($customfields) && in_array($field, $customfields)) {
-            // If custom field then pick name from database.
-            $fieldshortname = str_replace('profile_field_', '', $fieldname);
-            $fieldname = $customfieldname[$fieldshortname]->name;
+        } elseif (preg_match('/^(.+?)(\d+)$/', $fieldname, $matches)) {
+            $fieldname =  get_string($matches[1]) . ' ' . $matches[2];
        } elseif ($fieldname == 'url') {
            $fieldname = get_string('webpage');
        } else {
@@ -167,6 +155,8 @@ function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts,
                echo '<label for="menulockconfig_field_updateremote_'.$field.'">'.get_string('auth_updateremote', 'auth') . '</label>&nbsp;';
                echo html_writer::select($updateextoptions, "lockconfig_field_updateremote_{$field}", $pluginconfig->{"field_updateremote_$field"}, false);
                echo '<br />';
+
+
            }
            echo '<label for="menulockconfig_field_lock_'.$field.'">'.get_string('auth_fieldlock', 'auth') . '</label>&nbsp;';
            echo html_writer::select($lockoptions, "lockconfig_field_lock_{$field}", $pluginconfig->{"field_lock_$field"}, false);
@@ -185,3 +175,5 @@ function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts,
        echo '</tr>';
    }
 }
+
+
@@ -0,0 +1,76 @@
+<?php
+
+// block.php - allows admin to edit all local configuration variables for a block
+
+    require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+
+    $blockid = required_param('block', PARAM_INT);
+
+    if(!$blockrecord = blocks_get_record($blockid)) {
+        print_error('blockdoesnotexist', 'error');
+    }
+
+    admin_externalpage_setup('blocksetting'.$blockrecord->name);
+
+    $block = block_instance($blockrecord->name);
+    if($block === false) {
+        print_error('blockcannotinistantiate', 'error');
+    }
+
+    // Define the data we're going to silently include in the instance config form here,
+    // so we can strip them from the submitted data BEFORE handling it.
+    $hiddendata = array(
+        'block' => $blockid,
+        'sesskey' => sesskey()
+    );
+
+    /// If data submitted, then process and store.
+
+    if ($config = data_submitted()) {
+
+        if (!confirm_sesskey()) {
+             print_error('confirmsesskeybad', 'error');
+        }
+        if(!$block->has_config()) {
+            print_error('blockcannotconfig', 'error');
+        }
+        $remove = array_keys($hiddendata);
+        foreach($remove as $item) {
+            unset($config->$item);
+        }
+        $block->config_save($config);
+        redirect("$CFG->wwwroot/$CFG->admin/blocks.php", get_string("changessaved"), 1);
+        exit;
+    }
+
+    /// Otherwise print the form.
+
+    $strmanageblocks = get_string('manageblocks');
+    $strblockname = $block->get_title();
+
+    echo $OUTPUT->header();
+
+    echo $OUTPUT->heading($strblockname);
+
+    echo $OUTPUT->notification('This block still uses an old-style config_global.html file. ' .
+            'It must be updated by a developer to use a settings.php file.');
+
+    echo $OUTPUT->box(get_string('configwarning', 'admin'), 'generalbox boxwidthnormal boxaligncenter');
+    echo '<br />';
+
+    echo '<form method="post" action="block.php">';
+    echo '<p>';
+    foreach($hiddendata as $name => $val) {
+        echo '<input type="hidden" name="'. $name .'" value="'. $val .'" />';
+    }
+    echo '</p>';
+
+    echo $OUTPUT->box_start();
+    include($CFG->dirroot.'/blocks/'. $block->name() .'/config_global.html');
+    echo $OUTPUT->box_end();
+
+    echo '</form>';
+    echo $OUTPUT->footer();
+
+
@@ -1,10 +1,9 @@
 <?php

-    // Allows the admin to configure blocks (hide/show, uninstall and configure)
+    // Allows the admin to configure blocks (hide/show, delete and configure)

    require_once('../config.php');
    require_once($CFG->libdir.'/adminlib.php');
-    require_once($CFG->libdir.'/blocklib.php');
    require_once($CFG->libdir.'/tablelib.php');

    admin_externalpage_setup('manageblocks');
@@ -12,13 +11,14 @@
    $confirm  = optional_param('confirm', 0, PARAM_BOOL);
    $hide     = optional_param('hide', 0, PARAM_INT);
    $show     = optional_param('show', 0, PARAM_INT);
+    $delete   = optional_param('delete', 0, PARAM_INT);
    $unprotect = optional_param('unprotect', 0, PARAM_INT);
    $protect = optional_param('protect', 0, PARAM_INT);

 /// Print headings

    $strmanageblocks = get_string('manageblocks');
-    $struninstall = get_string('uninstallplugin', 'core_admin');
+    $strdelete = get_string('delete');
    $strversion = get_string('version');
    $strhide = get_string('hide');
    $strshow = get_string('show');
@@ -37,8 +37,6 @@
            print_error('blockdoesnotexist', 'error');
        }
        $DB->set_field('block', 'visible', '0', array('id'=>$block->id));      // Hide block
-        add_to_config_log('block_visibility', $block->visible, '0', $block->name);
-        core_plugin_manager::reset_caches();
        admin_get_root(true, false);  // settings not required - only pages
    }

@@ -47,22 +45,92 @@
            print_error('blockdoesnotexist', 'error');
        }
        $DB->set_field('block', 'visible', '1', array('id'=>$block->id));      // Show block
-        add_to_config_log('block_visibility', $block->visible, '1', $block->name);
-        core_plugin_manager::reset_caches();
        admin_get_root(true, false);  // settings not required - only pages
    }

+    if (!isset($CFG->undeletableblocktypes) || (!is_array($CFG->undeletableblocktypes) && !is_string($CFG->undeletableblocktypes))) {
+        $undeletableblocktypes = array('navigation', 'settings');
+    } else if (is_string($CFG->undeletableblocktypes)) {
+        $undeletableblocktypes = explode(',', $CFG->undeletableblocktypes);
+    } else {
+        $undeletableblocktypes = $CFG->undeletableblocktypes;
+    }
+
    if (!empty($protect) && confirm_sesskey()) {
-        block_manager::protect_block((int)$protect);
+        if (!$block = $DB->get_record('block', array('id'=>$protect))) {
+            print_error('blockdoesnotexist', 'error');
+        }
+        if (!in_array($block->name, $undeletableblocktypes)) {
+            $undeletableblocktypes[] = $block->name;
+            set_config('undeletableblocktypes', implode(',', $undeletableblocktypes));
+        }
        admin_get_root(true, false);  // settings not required - only pages
    }

    if (!empty($unprotect) && confirm_sesskey()) {
-        block_manager::unprotect_block((int)$unprotect);
+        if (!$block = $DB->get_record('block', array('id'=>$unprotect))) {
+            print_error('blockdoesnotexist', 'error');
+        }
+        if (in_array($block->name, $undeletableblocktypes)) {
+            $undeletableblocktypes = array_diff($undeletableblocktypes, array($block->name));
+            set_config('undeletableblocktypes', implode(',', $undeletableblocktypes));
+        }
        admin_get_root(true, false);  // settings not required - only pages
    }

-    $undeletableblocktypes = block_manager::get_undeletable_block_types();
+    if (!empty($delete) && confirm_sesskey()) {
+        echo $OUTPUT->header();
+        echo $OUTPUT->heading($strmanageblocks);
+
+        if (!$block = blocks_get_record($delete)) {
+            print_error('blockdoesnotexist', 'error');
+        }
+
+        if (get_string_manager()->string_exists('pluginname', "block_$block->name")) {
+            $strblockname = get_string('pluginname', "block_$block->name");
+        } else {
+            $strblockname = $block->name;
+        }
+
+        if (!$confirm) {
+            echo $OUTPUT->confirm(get_string('blockdeleteconfirm', '', $strblockname), 'blocks.php?delete='.$block->id.'&confirm=1', 'blocks.php');
+            echo $OUTPUT->footer();
+            exit;
+
+        } else {
+            // Inform block it's about to be deleted
+            if (file_exists("$CFG->dirroot/blocks/$block->name/block_$block->name.php")) {
+                $blockobject = block_instance($block->name);
+                if ($blockobject) {
+                    $blockobject->before_delete();  //only if we can create instance, block might have been already removed
+                }
+            }
+
+            // First delete instances and then block
+            $instances = $DB->get_records('block_instances', array('blockname' => $block->name));
+            if(!empty($instances)) {
+                foreach($instances as $instance) {
+                    blocks_delete_instance($instance);
+                }
+            }
+
+            // Delete block
+            $DB->delete_records('block', array('id'=>$block->id));
+
+            drop_plugin_tables($block->name, "$CFG->dirroot/blocks/$block->name/db/install.xml", false); // old obsoleted table names
+            drop_plugin_tables('block_'.$block->name, "$CFG->dirroot/blocks/$block->name/db/install.xml", false);
+
+            // Delete the capabilities that were defined by this block
+            capabilities_cleanup('block/'.$block->name);
+
+            // Remove event handlers and dequeue pending events
+            events_uninstall('block/'.$block->name);
+
+            $a->block = $strblockname;
+            $a->directory = $CFG->dirroot.'/blocks/'.$block->name;
+            notice(get_string('blockdeletefiles', '', $a), 'blocks.php');
+        }
+    }

    echo $OUTPUT->header();
    echo $OUTPUT->heading($strmanageblocks);
@@ -81,36 +149,21 @@

    $table = new flexible_table('admin-blocks-compatible');

-    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'undeletable', 'settings', 'uninstall'));
-    $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strprotecthdr, $strsettings, $struninstall));
+    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'undeletable', 'delete', 'settings'));
+    $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strprotecthdr, $strdelete, $strsettings));
    $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
-    $table->set_attribute('class', 'admintable blockstable generaltable');
-    $table->set_attribute('id', 'compatibleblockstable');
+    $table->set_attribute('class', 'compatibleblockstable blockstable generaltable');
    $table->setup();
    $tablerows = array();

-    // Sort blocks using current locale.
-    $blocknames = array();
    foreach ($blocks as $blockid=>$block) {
        $blockname = $block->name;
-        if (file_exists("$CFG->dirroot/blocks/$blockname/block_$blockname.php")) {
-            $blocknames[$blockid] = get_string('pluginname', 'block_'.$blockname);
-        } else {
-            $blocknames[$blockid] = $blockname;
-        }
-    }
-    core_collator::asort($blocknames);
-
-    foreach ($blocknames as $blockid=>$strblockname) {
-        $block = $blocks[$blockid];
-        $blockname = $block->name;
-        $dbversion = get_config('block_'.$block->name, 'version');

        if (!file_exists("$CFG->dirroot/blocks/$blockname/block_$blockname.php")) {
            $blockobject  = false;
-            $strblockname = '<span class="notifyproblem">'.$strblockname.' ('.get_string('missingfromdisk').')</span>';
+            $strblockname = '<span class="notifyproblem">'.$blockname.' ('.get_string('missingfromdisk').')</span>';
            $plugin = new stdClass();
-            $plugin->version = $dbversion;
+            $plugin->version = $block->version;

        } else {
            $plugin = new stdClass();
@@ -123,13 +176,10 @@
                $incompatible[] = $block;
                continue;
            }
+            $strblockname = get_string('pluginname', 'block_'.$blockname);
        }

-        if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('block_'.$blockname, 'manage')) {
-            $uninstall = html_writer::link($uninstallurl, $struninstall);
-        } else {
-            $uninstall = '';
-        }
+        $delete = '<a href="blocks.php?delete='.$blockid.'&amp;sesskey='.sesskey().'">'.$strdelete.'</a>';

        $settings = ''; // By default, no configuration
        if ($blockobject and $blockobject->has_config()) {
@@ -139,12 +189,8 @@
                $settings = '<a href="' . $blocksettings->url .  '">' . get_string('settings') . '</a>';
            } else if ($blocksettings instanceof admin_settingpage) {
                $settings = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=blocksetting'.$block->name.'">'.$strsettings.'</a>';
-            } else if (!file_exists($CFG->dirroot.'/blocks/'.$block->name.'/settings.php')) {
-                // If the block's settings node was not found, we check that the block really provides the settings.php file.
-                // Note that blocks can inject their settings to other nodes in the admin tree without using the default locations.
-                // This can be done by assigning null to $setting in settings.php and it is a valid case.
-                debugging('Warning: block_'.$block->name.' returns true in has_config() but does not provide a settings.php file',
-                    DEBUG_DEVELOPER);
+            } else {
+                $settings = '<a href="block.php?block='.$blockid.'">'.$strsettings.'</a>';
            }
        }

@@ -168,17 +214,17 @@
            $visible = '';
        } else if ($blocks[$blockid]->visible) {
            $visible = '<a href="blocks.php?hide='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strhide.'">'.
-                       '<img src="'.$OUTPUT->pix_url('t/hide') . '" class="iconsmall" alt="'.$strhide.'" /></a>';
+                       '<img src="'.$OUTPUT->pix_url('i/hide') . '" class="icon" alt="'.$strhide.'" /></a>';
        } else {
            $visible = '<a href="blocks.php?show='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strshow.'">'.
-                       '<img src="'.$OUTPUT->pix_url('t/show') . '" class="iconsmall" alt="'.$strshow.'" /></a>';
-            $class = 'dimmed_text';
+                       '<img src="'.$OUTPUT->pix_url('i/show') . '" class="icon" alt="'.$strshow.'" /></a>';
+            $class = ' class="dimmed_text"'; // Leading space required!
        }

-        if ($dbversion == $plugin->version) {
-            $version = $dbversion;
+        if ($block->version == $plugin->version) {
+            $version = $block->version;
        } else {
-            $version = "$dbversion ($plugin->version)";
+            $version = "$block->version ($plugin->version)";
        }

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

        $row = array(
-            $strblockname,
+            '<span'.$class.'>'.$strblockname.'</span>',
            $blocklist,
-            $version,
+            '<span'.$class.'>'.$version.'</span>',
            $visible,
            $undeletable,
-            $settings,
-            $uninstall,
+            $delete,
+            $settings
        );
-        $table->add_data($row, $class);
+        $tablerows[] = array(strip_tags($strblockname), $row); // first element will be used for sorting
+    }
+
+    textlib_get_instance()->asort($tablerows);
+    foreach ($tablerows as $row) {
+        $table->add_data($row[1]);
    }

    $table->print_html();
@@ -211,8 +262,8 @@

        $table = new flexible_table('admin-blocks-incompatible');

-        $table->define_columns(array('block', 'uninstall'));
-        $table->define_headers(array($strname, $struninstall));
+        $table->define_columns(array('block', 'delete'));
+        $table->define_headers(array($strname, $strdelete));
        $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');

        $table->set_attribute('class', 'incompatibleblockstable generaltable');
@@ -220,14 +271,9 @@
        $table->setup();

        foreach ($incompatible as $block) {
-            if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('block_'.$block->name, 'manage')) {
-                $uninstall = html_writer::link($uninstallurl, $struninstall);
-            } else {
-                $uninstall = '';
-            }
            $table->add_data(array(
                $block->name,
-                $uninstall,
+                '<a href="blocks.php?delete='.$block->id.'&amp;sesskey='.sesskey().'">'.$strdelete.'</a>',
            ));
        }
        $table->print_html();
@@ -0,0 +1,152 @@
+<?php
+      /// Create "blog" forums in each course and copy blog entries from these courses' participants in these forums
+
+define('NO_OUTPUT_BUFFERING', true);
+
+require_once('../config.php');
+require_once($CFG->dirroot.'/course/lib.php');
+require_once($CFG->dirroot.'/blog/lib.php');
+require_once($CFG->dirroot.'/mod/forum/lib.php');
+require_once($CFG->libdir.'/adminlib.php');
+
+admin_externalpage_setup('bloglevelupgrade');
+$PAGE->set_pagelayout('maintenance');
+
+$go = optional_param('go', 0, PARAM_BOOL);
+
+echo $OUTPUT->header();
+echo $OUTPUT->heading(get_string('bloglevelupgrade', 'admin'));
+
+$strbloglevelupgrade = get_string('bloglevelupgradeinfo', 'admin');
+
+if (!$go or !data_submitted() or !confirm_sesskey()) {   /// Print a form
+    $optionsyes = array('go'=>1, 'sesskey'=>sesskey());
+    echo $OUTPUT->confirm($strbloglevelupgrade, new moodle_url('bloglevelupgrade.php', $optionsyes), 'index.php');
+    echo $OUTPUT->footer();
+    die;
+}
+
+echo $OUTPUT->box_start();
+
+/// Turn off time limits, sometimes upgrades can be slow.
+
+set_time_limit(0);
+
+$i = 0;
+
+// If $CFG->bloglevel is set to BLOG_GROUP_LEVEL or BLOG_COURSE_LEVEL, create a new "blog" forum in each course
+// whose enrolled students have written blog entries, copy these entries in that forum and switch off blogs at site level
+
+if ($CFG->bloglevel == BLOG_COURSE_LEVEL || $CFG->bloglevel == BLOG_GROUP_LEVEL) {
+    $pbar = new progress_bar('bloglevelupgrade', 500, true);
+
+    $bloggers = $DB->get_records_sql("SELECT userid FROM {post} WHERE module = 'blog' GROUP BY userid");
+    require_once($CFG->dirroot.'/mod/forum/lib.php');
+
+    $a = new stdClass();
+    $a->userscount = 0;
+    $a->blogcount = 0;
+
+    foreach ($bloggers as $blogger) {
+        $courses = enrol_get_users_courses($blogger->userid, true, 'groupmode,groupmodeforce');
+        $blogentries = $DB->get_records('post', array('module' => 'blog', 'userid' => $blogger->userid));
+
+        foreach ($courses as $course) {
+            $forum = forum_get_course_forum($course->id, 'blog');
+            $cm = get_coursemodule_from_instance('forum', $forum->id);
+
+            if ($CFG->bloglevel == BLOG_GROUP_LEVEL && $course->groupmode != NOGROUPS) {
+                // Unless the course is set to separate groups forced, force the forum to Separate groups
+                if (!($course->groupmode == SEPARATEGROUPS && $course->groupmodeforce)) {
+                    $cm->groupmode = SEPARATEGROUPS;
+                    $DB->update_record('course_modules', $cm);
+                }
+
+                $groups = groups_get_user_groups($course->id, $blogger->userid);
+                foreach ($groups[0] as $groupid) { // [0] is for all groupings combined
+                    $a->blogcount += bloglevelupgrade_entries($blogentries, $forum, $cm, $groupid);
+                }
+            } else {
+                $a->blogcount += bloglevelupgrade_entries($blogentries, $forum, $cm);
+            }
+        }
+
+        $a->userscount = $i . '/' .  count($bloggers);
+        $pbar->update($i, count($bloggers), get_string('bloglevelupgradeprogress', 'admin', $a));
+        $i++;
+    }
+}
+
+function bloglevelupgrade_entries($blogentries, $forum, $cm, $groupid=-1) {
+    $count = 0;
+
+    $forumcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
+    $sitecontext = get_context_instance(CONTEXT_SYSTEM);
+
+    foreach ($blogentries as $blogentry) {
+        $discussion = new stdClass();
+        $discussion->course = $forum->course;
+        $discussion->forum = $forum->id;
+        $discussion->name = $blogentry->subject;
+        $discussion->assessed = $forum->assessed;
+        $discussion->message = $blogentry->summary;
+        $discussion->messageformat = $blogentry->summaryformat;
+        $discussion->messagetrust = 0;
+        $discussion->attachments = 0;
+        $discussion->mailnow = false;
+        $discussion->timemodified = $blogentry->created;
+        $discussion->itemid = null;
+        $discussion->groupid = $groupid;
+        $message = '';
+
+        $discussionid = forum_add_discussion($discussion, null, $message);
+
+        // Copy file attachment records
+        $fs = get_file_storage();
+        $files = $fs->get_area_files($sitecontext->id, 'blog', 'attachment', $blogentry->id);
+
+        if (!empty($files)) {
+            foreach ($files as $storedfile) {
+                $newfile = new stdClass();
+                $newfile->component = 'mod_forum';
+                $newfile->filearea = 'attachment';
+                $newfile->itemid = $discussion->firstpost;
+                $newfile->contextid = $forumcontext->id;
+                $fs->create_file_from_storedfile($newfile, $storedfile->get_id());
+            }
+        }
+
+        $files = $fs->get_area_files($sitecontext->id, 'blog', 'post', $blogentry->id);
+
+        if (!empty($files)) {
+            foreach ($files as $storedfile) {
+                $newfile = new stdClass();
+                $newfile->component = 'mod_forum';
+                $newfile->filearea = 'post';
+                $newfile->itemid = $discussion->firstpost;
+                $newfile->contextid = $forumcontext->id;
+                $fs->create_file_from_storedfile($newfile, $storedfile->get_id());
+            }
+        }
+        $count++;
+    }
+    return $count;
+}
+// END OF LOOP
+
+// set conversion flag - switches to new plugin automatically
+set_config('bloglevel_upgrade_complete', 1);
+// Finally switch bloglevel to 0 (disabled)
+set_config('bloglevel', 0);
+
+echo $OUTPUT->box_end();
+
+/// Rebuild course cache which might be incorrect now
+echo $OUTPUT->notification('Rebuilding course cache...', 'notifysuccess');
+rebuild_course_cache();
+echo $OUTPUT->notification('...finished', 'notifysuccess');
+
+echo $OUTPUT->continue_button('index.php');
+
+echo $OUTPUT->footer();
+die;
@@ -1,158 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This file is used to display a categories sub categories, external pages, and settings.
- *
- * @since      Moodle 2.3
- * @package    admin
- * @copyright  2011 Sam Hemelryk
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-$category = required_param('category', PARAM_SAFEDIR);
-$return = optional_param('return','', PARAM_ALPHA);
-$adminediting = optional_param('adminedit', -1, PARAM_BOOL);
-
-/// no guest autologin
-require_login(0, false);
-$PAGE->set_context(context_system::instance());
-$PAGE->set_url('/admin/category.php', array('category' => $category));
-$PAGE->set_pagetype('admin-setting-' . $category);
-$PAGE->set_pagelayout('admin');
-$PAGE->navigation->clear_cache();
-
-$adminroot = admin_get_root(); // need all settings
-$settingspage = $adminroot->locate($category, true);
-
-if (empty($settingspage) or !($settingspage instanceof admin_category)) {
-    print_error('categoryerror', 'admin', "$CFG->wwwroot/$CFG->admin/");
-}
-
-if (!($settingspage->check_access())) {
-    print_error('accessdenied', 'admin');
-}
-
-
-$statusmsg = '';
-$errormsg  = '';
-
-if ($data = data_submitted() and confirm_sesskey()) {
-    if (admin_write_settings($data)) {
-        $statusmsg = get_string('changessaved');
-    }
-
-    if (empty($adminroot->errors)) {
-        switch ($return) {
-            case 'site': redirect("$CFG->wwwroot/");
-            case 'admin': redirect("$CFG->wwwroot/$CFG->admin/");
-        }
-    } else {
-        $errormsg = get_string('errorwithsettings', 'admin');
-        $firsterror = reset($adminroot->errors);
-    }
-    $settingspage = $adminroot->locate($category, true);
-}
-
-if ($PAGE->user_allowed_editing() && $adminediting != -1) {
-    $USER->editing = $adminediting;
-}
-
-if ($PAGE->user_allowed_editing()) {
-    $url = clone($PAGE->url);
-    if ($PAGE->user_is_editing()) {
-        $caption = get_string('blockseditoff');
-        $url->param('adminedit', 'off');
-    } else {
-        $caption = get_string('blocksediton');
-        $url->param('adminedit', 'on');
-    }
-    $buttons = $OUTPUT->single_button($url, $caption, 'get');
-}
-
-$savebutton = false;
-$outputhtml = '';
-foreach ($settingspage->children as $childpage) {
-    if ($childpage->is_hidden()) {
-        continue;
-    }
-    if ($childpage instanceof admin_externalpage) {
-        $outputhtml .= $OUTPUT->heading(html_writer::link($childpage->url, $childpage->visiblename), 3);
-    } else if ($childpage instanceof admin_settingpage) {
-        $outputhtml .= $OUTPUT->heading(html_writer::link(new moodle_url('/'.$CFG->admin.'/settings.php', array('section' => $childpage->name)), $childpage->visiblename), 3);
-        // If its a settings page and has settings lets display them.
-        if (!empty($childpage->settings)) {
-            $outputhtml .= html_writer::start_tag('fieldset', array('class' => 'adminsettings'));
-            foreach ($childpage->settings as $setting) {
-                if (empty($setting->nosave)) {
-                    $savebutton = true;
-                }
-                $fullname = $setting->get_full_name();
-                if (array_key_exists($fullname, $adminroot->errors)) {
-                    $data = $adminroot->errors[$fullname]->data;
-                } else {
-                    $data = $setting->get_setting();
-                }
-                $outputhtml .= html_writer::tag('div', '<!-- -->', array('class' => 'clearer'));
-                $outputhtml .= $setting->output_html($data);
-            }
-            $outputhtml .= html_writer::end_tag('fieldset');
-        }
-    } else if ($childpage instanceof admin_category) {
-        $outputhtml .= $OUTPUT->heading(html_writer::link(new moodle_url('/'.$CFG->admin.'/category.php', array('category' => $childpage->name)), get_string('admincategory', 'admin', $childpage->visiblename)), 3);
-    }
-}
-if ($savebutton) {
-    $outputhtml .= html_writer::start_tag('div', array('class' => 'form-buttons'));
-    $outputhtml .= html_writer::empty_tag('input', array('class' => 'btn btn-primary form-submit', 'type' => 'submit', 'value' => get_string('savechanges','admin')));
-    $outputhtml .= html_writer::end_tag('div');
-}
-
-$visiblepathtosection = array_reverse($settingspage->visiblepath);
-$PAGE->set_title("$SITE->shortname: " . implode(": ",$visiblepathtosection));
-$PAGE->set_heading($SITE->fullname);
-$PAGE->set_button($buttons);
-
-echo $OUTPUT->header();
-
-if ($errormsg !== '') {
-    echo $OUTPUT->notification($errormsg);
-} else if ($statusmsg !== '') {
-    echo $OUTPUT->notification($statusmsg, 'notifysuccess');
-}
-
-$path = array_reverse($settingspage->visiblepath);
-if (is_array($path)) {
-    $visiblename = join(' / ', $path);
-} else {
-    $visiblename = $path;
-}
-echo $OUTPUT->heading(get_string('admincategory', 'admin', $visiblename), 2);
-
-echo html_writer::start_tag('form', array('action' => '', 'method' => 'post', 'id' => 'adminsettings'));
-echo html_writer::start_tag('div');
-echo html_writer::input_hidden_params(new moodle_url($PAGE->url, array('sesskey' => sesskey(), 'return' => $return)));
-echo html_writer::end_tag('div');
-echo html_writer::start_tag('fieldset');
-echo html_writer::tag('div', '<!-- -->', array('class' => 'clearer'));
-echo $outputhtml;
-echo html_writer::end_tag('fieldset');
-echo html_writer::end_tag('form');
-
-echo $OUTPUT->footer();
@@ -1,111 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This hack is intended for clustered sites that do not want
- * to use shared cachedir for component cache.
- *
- * This file needs to be called after any change in PHP files in dataroot,
- * that is before upgrade and install.
- *
- * @package   core
- * @copyright 2013 Petr Skoda (skodak)  {@link http://skodak.org}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-
-define('CLI_SCRIPT', true);
-define('ABORT_AFTER_CONFIG', true); // We need just the values from config.php.
-define('CACHE_DISABLE_ALL', true); // This prevents reading of existing caches.
-define('IGNORE_COMPONENT_CACHE', true);
-
-require(__DIR__.'/../../config.php');
-require_once($CFG->libdir.'/clilib.php');
-
-// Now get cli options.
-list($options, $unrecognized) = cli_get_params(
-    array(
-        'file'    => false,
-        'rebuild' => false,
-        'print'   => false,
-        'help'    => false
-    ),
-    array(
-        'h' => 'help'
-    )
-);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized), 2);
-}
-
-if (!$options['rebuild'] and !$options['file'] and !$options['print']) {
-    $help =
-"Create alternative component cache file
-
-Options:
-h, --help            Print out this help
--rebuild             Rebuild \$CFG->alternative_component_cache file
--file=filepath       Save component cache to file
--print               Print component cache file content
-
-Example:
-\$ php admin/cli/rebuild_alternative_component_cache.php --rebuild
-";
-
-    echo $help;
-    exit(0);
-}
-
-error_reporting(E_ALL | E_STRICT);
-ini_set('display_errors', 1);
-
-$content = core_component::get_cache_content();
-
-if ($options['print']) {
-    echo $content;
-    exit(0);
-}
-
-if ($options['rebuild']) {
-    if (empty($CFG->alternative_component_cache)) {
-        fwrite(STDERR, 'config.php does not contain $CFG->alternative_component_cache setting');
-        fwrite(STDERR, "\n");
-        exit(2);
-    }
-    $target = $CFG->alternative_component_cache;
-} else {
-    $target = $options['file'];
-}
-
-if (!$target) {
-    fwrite(STDERR, "Invalid target file $target");
-    fwrite(STDERR, "\n");
-    exit(1);
-}
-
-$bytes = file_put_contents($target, $content);
-
-if (!$bytes) {
-    fwrite(STDERR, "Error writing to $target");
-    fwrite(STDERR, "\n");
-    exit(1);
-}
-
-// Success.
-echo "File $target was updated\n";
-exit(0);
@@ -28,7 +28,7 @@

 define('CLI_SCRIPT', true);

-require(__DIR__.'/../../config.php');
+require(dirname(dirname(dirname(__FILE__))).'/config.php');
 require_once($CFG->libdir.'/clilib.php');      // cli only functions
 require_once($CFG->libdir.'/cronlib.php');

@@ -75,7 +75,8 @@ if (!empty($CFG->showcronsql)) {
    $DB->set_debug(true);
 }
 if (!empty($CFG->showcrondebugging)) {
-    set_debugging(DEBUG_DEVELOPER, true);
+    $CFG->debug = DEBUG_DEVELOPER;
+    $CFG->debugdisplay = true;
 }

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

 define('CLI_SCRIPT', true);

-require(__DIR__.'/../../config.php');
+require(dirname(dirname(dirname(__FILE__))).'/config.php');
 require_once($CFG->libdir.'/clilib.php');      // cli only functions
 require_once($CFG->libdir.'/cronlib.php');

@@ -1,125 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This script fixed incorrectly deleted users.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2013 Marina Glancy
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__.'/../../config.php');
-require_once($CFG->libdir.'/clilib.php');
-
-// Get cli options.
-list($options, $unrecognized) = cli_get_params(
-    array(
-        'courses'           => false,
-        'fix'               => false,
-        'help'              => false
-    ),
-    array(
-        'h' => 'help',
-        'c' => 'courses',
-        'f' => 'fix'
-    )
-);
-
-if ($options['help'] || empty($options['courses'])) {
-    $help =
-"Checks and fixes that course modules and sections reference each other correctly.
-
-Compares DB fields course_sections.sequence and course_modules.section
-checking that:
- course_sections.sequence contains each module id not more than once in the course
- for each moduleid from course_sections.sequence the field course_modules.section
-  refers to the same section id (this means course_sections.sequence is more
-  important if they are different)
- each module in the course is present in one of course_sections.sequence
- section sequences do not contain non-existing course modules
-
-If there are any mismatches, the message is displayed. If --fix is specified,
-the records in DB are corrected.
-
-This script may run for a long time on big systems if called for all courses.
-
-Avoid executing the script when another user may simultaneously edit any of the
-courses being checked (recommended to run in mainenance mode).
-
-Options:
-c, --courses         List courses that need to be checked (comma-separated
-                      values or * for all). Required
-f, --fix             Fix the mismatches in DB. If not specified check only and
-                      report problems to STDERR
-h, --help            Print out this help
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/fix_course_sequence.php --courses=*
-\$sudo -u www-data /usr/bin/php admin/cli/fix_course_sequence.php --courses=2,3,4 --fix
-";
-
-    echo $help;
-    die;
-}
-
-$courseslist = preg_split('/\s*,\s*/', $options['courses'], -1, PREG_SPLIT_NO_EMPTY);
-if (in_array('*', $courseslist)) {
-    $where = '';
-    $params = array();
-} else {
-    list($sql, $params) = $DB->get_in_or_equal($courseslist, SQL_PARAMS_NAMED, 'id');
-    $where = 'WHERE id '. $sql;
-}
-$coursescount = $DB->get_field_sql('SELECT count(id) FROM {course} '. $where, $params);
-
-if (!$coursescount) {
-    cli_error('No courses found');
-}
-echo "Checking $coursescount courses...\n\n";
-
-require_once($CFG->dirroot. '/course/lib.php');
-
-$problems = array();
-$courses = $DB->get_fieldset_sql('SELECT id FROM {course} '. $where, $params);
-foreach ($courses as $courseid) {
-    $errors = course_integrity_check($courseid, null, null, true, empty($options['fix']));
-    if ($errors) {
-        if (!empty($options['fix'])) {
-            // Reset the course cache to make sure cache is recalculated next time the course is viewed.
-            rebuild_course_cache($courseid, true);
-        }
-        foreach ($errors as $error) {
-            cli_problem($error);
-        }
-        $problems[] = $courseid;
-    } else {
-        echo "Course [$courseid] is OK\n";
-    }
-}
-if (!count($problems)) {
-    echo "\n...All courses are OK\n";
-} else {
-    if (!empty($options['fix'])) {
-        echo "\n...Found and fixed ".count($problems)." courses with problems". "\n";
-    } else {
-        echo "\n...Found ".count($problems)." courses with problems. To fix run:\n";
-        echo "\$sudo -u www-data /usr/bin/php admin/cli/fix_course_sequence.php --courses=".join(',', $problems)." --fix". "\n";
-    }
-}
@@ -1,91 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This script fixed incorrectly deleted users.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2013 Petr Skoda (http://skodak.org)
- * @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');
-
-
-// Now get cli options.
-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));
-}
-
-if ($options['help']) {
-    $help =
-        "Fix incorrectly deleted users.
-
-        This scripts detects users that are marked as deleted instead
-        of calling delete_user().
-
-        Deleted users do not have original username, idnumber or email,
-        we must also delete all roles, enrolments, group memberships, etc.
-
-        Please note this script does not delete any public information
-        such as forum posts.
-
-        Options:
-        -h, --help            Print out this help
-
-        Example:
-        \$sudo -u www-data /usr/bin/php admin/cli/fix_deleted_users.php
-        ";
-
-    echo $help;
-    die;
-}
-
-cli_heading('Looking for sloppy user deletes');
-
-// Look for sloppy deleted users where somebody only flipped the deleted flag.
-$sql = "SELECT *
-          FROM {user}
-         WHERE deleted = 1 AND email LIKE '%@%' AND username NOT LIKE '%@%'";
-$rs = $DB->get_recordset_sql($sql);
-foreach ($rs as $user) {
-    echo "Redeleting user $user->id: $user->username ($user->email)\n";
-    delete_user($user);
-}
-
-cli_heading('Deleting all leftovers');
-
-$DB->set_field('user', 'idnumber', '', array('deleted'=>1));
-
-$DB->delete_records_select('role_assignments', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
-$DB->delete_records_select('cohort_members', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
-$DB->delete_records_select('groups_members', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
-$DB->delete_records_select('user_enrolments', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
-$DB->delete_records_select('user_preferences', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
-$DB->delete_records_select('user_info_data', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
-$DB->delete_records_select('user_lastaccess', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
-$DB->delete_records_select('external_tokens', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
-$DB->delete_records_select('external_services_users', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
-
-exit(0);
@@ -1,103 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This script fixes orphaned question categories.
- *
- * Orphaned question categories have had their associated context deleted
- * but the category itself remains in the database with an invalid context.
- *
- * @package    core
- * @subpackage cli
- * @copyright  2013 Tyler Bannister (tyler.bannister@remote-learner.net)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__.'/../../config.php');
-require_once($CFG->libdir.'/clilib.php');
-require_once($CFG->libdir.'/questionlib.php');
-
-$long = array('fix'  => false, 'help' => false);
-$short = array('f' => 'fix', 'h' => 'help');
-
-// Now get cli options.
-list($options, $unrecognized) = cli_get_params($long, $short);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-if ($options['help']) {
-    $help =
-        "Fix orphaned question categories.
-
-        This scripts detects question categories that have had their
-        context deleted, thus severing them from their original purpose.
-
-        This script will find the orphaned categories and delete the unused
-        questions in each category found.  Used questions will not be
-        deleted, instead they will be moved to a rescue question category.
-
-        Options:
-        -h, --help            Print out this help
-        -f, --fix             Fix the orphaned question categories in the DB.
-                              If not specified only check and report problems to STDERR.
-        Example:
-        \$sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_question_categories.php
-        \$sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_question_categories.php -f
-        ";
-
-    echo $help;
-    die;
-}
-
-cli_heading('Checking for orphaned categories');
-
-
-$sql = 'SELECT qc.id, qc.contextid, qc.name
-          FROM {question_categories} qc
-     LEFT JOIN {context} c ON qc.contextid = c.id
-         WHERE c.id IS NULL';
-$categories = $DB->get_recordset_sql($sql);
-
-$i = 0;
-foreach ($categories as $category) {
-    $i += 1;
-    echo "Found orphaned category: {$category->name}\n";
-    if (!empty($options['fix'])) {
-        echo "Cleaning...";
-        // One transaction per category.
-        $transaction = $DB->start_delegated_transaction();
-        question_category_delete_safe($category);
-        $transaction->allow_commit();
-        echo "  Done!\n";
-    }
-}
-
-if (($i > 0) && !empty($options['fix'])) {
-    echo "Found and removed {$i} orphaned question categories\n";
-} else if ($i > 0) {
-    echo "Found {$i} orphaned question categories. To fix, run:\n";
-    echo "\$sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_question_categories.php --fix\n";
-} else {
-    echo "No orphaned question categories found.\n";
-}
-
-
-$categories->close();
@@ -20,6 +20,7 @@
 *
 * This script is not intended for beginners!
 * Potential problems:
+ * - environment check is not present yet
 * - su to apache account or sudo before execution
 * - not compatible with Windows platform
 *
@@ -36,12 +37,6 @@ if (isset($_SERVER['REMOTE_ADDR'])) {
    exit(1);
 }

-// Force OPcache reset if used, we do not want any stale caches
-// when preparing test environment.
-if (function_exists('opcache_reset')) {
-    opcache_reset();
-}
-
 $help =
 "Command line Moodle installer, creates config.php and initializes database.
 Please note you must execute this script with the same uid as apache
@@ -64,24 +59,19 @@ Options:
 --dbname=NAME         Database name. Default is moodle
 --dbuser=USERNAME     Database user. Default is root
 --dbpass=PASSWORD     Database password. Default is blank
--dbport=NUMBER       Use database port.
--dbsocket=PATH       Use database socket, 1 means default. Available for some databases only.
+--dbsocket            Use database sockets. Available for some databases only.
 --prefix=STRING       Table prefix for above database tables. Default is mdl_
 --fullname=STRING     The fullname of the site
 --shortname=STRING    The shortname of the site
--summary=STRING      The summary to be displayed on the front page
 --adminuser=USERNAME  Username for the moodle admin account. Default is admin
 --adminpass=PASSWORD  Password for the moodle admin account,
                      required in non-interactive mode.
--adminemail=STRING   Email address for the moodle admin account.
--upgradekey=STRING   The upgrade key to be set in the config.php, leave empty to not set it.
 --non-interactive     No interactive questions, installation fails if any
                      problem encountered.
 --agree-license       Indicates agreement with software license,
                      required in non-interactive mode.
 --allow-unstable      Install even if the version is not marked as stable yet,
                      required in non-interactive mode.
--skip-database       Stop the installation before installing the database.
 -h, --help            Print out this help

 Example:
@@ -89,18 +79,8 @@ Example:
 "; //TODO: localize, mark as needed in install - to be translated later when everything is finished


-// distro specific customisation
-$distrolibfile = __DIR__.'/../../install/distrolib.php';
-$distro = null;
-if (file_exists($distrolibfile)) {
-    require_once($distrolibfile);
-    if (function_exists('distro_get_config')) {
-        $distro = distro_get_config();
-    }
-}
-
 // Nothing to do if config.php exists
-$configfile = __DIR__.'/../../config.php';
+$configfile = dirname(dirname(dirname(__FILE__))).'/config.php';
 if (file_exists($configfile)) {
    require($configfile);
    require_once($CFG->libdir.'/clilib.php');
@@ -111,24 +91,19 @@ if (file_exists($configfile)) {
        echo "\n\n";
    }

-    if ($DB->get_manager()->table_exists('config')) {
-        cli_error(get_string('clialreadyinstalled', 'install'));
-    } else {
-        cli_error(get_string('clialreadyconfigured', 'install'));
-    }
+    cli_error(get_string('clialreadyinstalled', 'install'));
 }

 $olddir = getcwd();

-// change directory so that includes below work properly
+// change directory so that includes bellow work properly
 chdir(dirname($_SERVER['argv'][0]));

 // Servers should define a default timezone in php.ini, but if they don't then make sure something is defined.
-if (!function_exists('date_default_timezone_set') or !function_exists('date_default_timezone_get')) {
-    fwrite(STDERR, "Timezone functions are not available.\n");
-    exit(1);
+// This is a quick hack.  Ideally we should ask the admin for a value.  See MDL-22625 for more on this.
+if (function_exists('date_default_timezone_set') and function_exists('date_default_timezone_get')) {
+    @date_default_timezone_set(@date_default_timezone_get());
 }
-date_default_timezone_set(@date_default_timezone_get());

 // make sure PHP errors are displayed - helps with diagnosing of problems
@error_reporting(E_ALL);
@@ -139,88 +114,50 @@ date_default_timezone_set(@date_default_timezone_get());
 /** Used by library scripts to check they are being called by Moodle */
 define('MOODLE_INTERNAL', true);

-// Disables all caching.
-define('CACHE_DISABLE_ALL', true);
-
-define('PHPUNIT_TEST', false);
-
-define('IGNORE_COMPONENT_CACHE', true);
-
 // Check that PHP is of a sufficient version
-if (version_compare(phpversion(), "5.6.5") < 0) {
+if (version_compare(phpversion(), "5.3.2") < 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, "Moodle 2.1 or later requires at least PHP 5.3.2 (currently using version $phpversion).\n");
    fwrite(STDERR, "Please upgrade your server software or install older Moodle version.\n");
    exit(1);
 }

 // set up configuration
-global $CFG;
 $CFG = new stdClass();
 $CFG->lang                 = 'en';
-$CFG->dirroot              = dirname(dirname(__DIR__));
+$CFG->dirroot              = dirname(dirname(dirname(__FILE__)));
 $CFG->libdir               = "$CFG->dirroot/lib";
 $CFG->wwwroot              = "http://localhost";
 $CFG->httpswwwroot         = $CFG->wwwroot;
+$CFG->dataroot             = str_replace('\\', '/', dirname(dirname(dirname(dirname(__FILE__)))).'/moodledata');
 $CFG->docroot              = 'http://docs.moodle.org';
 $CFG->running_installer    = true;
 $CFG->early_install_lang   = true;
-$CFG->ostype               = (stristr(PHP_OS, 'win') && !stristr(PHP_OS, 'darwin')) ? 'WINDOWS' : 'UNIX';
-$CFG->dboptions            = array();
-$CFG->debug                = (E_ALL | E_STRICT);
-$CFG->debugdisplay         = true;
-$CFG->debugdeveloper       = true;

-$parts = explode('/', str_replace('\\', '/', dirname(__DIR__)));
+$parts = explode('/', str_replace('\\', '/', dirname(dirname(__FILE__))));
 $CFG->admin                = array_pop($parts);

 //point pear include path to moodles lib/pear so that includes and requires will search there for files before anywhere else
 //the problem is that we need specific version of quickforms and hacked excel files :-(
 ini_set('include_path', $CFG->libdir.'/pear' . PATH_SEPARATOR . ini_get('include_path'));

-require_once($CFG->libdir.'/classes/component.php');
-require_once($CFG->libdir.'/classes/text.php');
-require_once($CFG->libdir.'/classes/string_manager.php');
-require_once($CFG->libdir.'/classes/string_manager_install.php');
-require_once($CFG->libdir.'/classes/string_manager_standard.php');
 require_once($CFG->libdir.'/installlib.php');
 require_once($CFG->libdir.'/clilib.php');
 require_once($CFG->libdir.'/setuplib.php');
+require_once($CFG->libdir.'/textlib.class.php');
 require_once($CFG->libdir.'/weblib.php');
 require_once($CFG->libdir.'/dmllib.php');
 require_once($CFG->libdir.'/moodlelib.php');
 require_once($CFG->libdir.'/deprecatedlib.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/componentlib.class.php');
-require_once($CFG->dirroot.'/cache/lib.php');
-
-// Register our classloader, in theory somebody might want to replace it to load other hacked core classes.
-// Required because the database checks below lead to session interaction which is going to lead us to requiring autoloaded classes.
-if (defined('COMPONENT_CLASSLOADER')) {
-    spl_autoload_register(COMPONENT_CLASSLOADER);
-} else {
-    spl_autoload_register('core_component::classloader');
-}

 require($CFG->dirroot.'/version.php');
 $CFG->target_release = $release;

-\core\session\manager::init_empty_session();
-global $SESSION;
-global $USER;
-
-global $COURSE;
-$COURSE = new stdClass();
-$COURSE->id = 1;
-
-global $SITE;
-$SITE = $COURSE;
-define('SITEID', 1);
-
 //Database types
 $databases = array('mysqli' => moodle_database::get_driver_instance('mysqli', 'native'),
-                   'mariadb'=> moodle_database::get_driver_instance('mariadb', 'native'),
                   'pgsql'  => moodle_database::get_driver_instance('pgsql',  'native'),
                   'oci'    => moodle_database::get_driver_instance('oci',    'native'),
                   'sqlsrv' => moodle_database::get_driver_instance('sqlsrv', 'native'), // MS SQL*Server PHP driver
@@ -241,29 +178,24 @@ if (empty($databases)) {
 // now get cli options
 list($options, $unrecognized) = cli_get_params(
    array(
-        'chmod'             => isset($distro->directorypermissions) ? sprintf('%04o',$distro->directorypermissions) : '2777', // let distros set dir permissions
+        'chmod'             => '2777',
        'lang'              => $CFG->lang,
        'wwwroot'           => '',
-        'dataroot'          => empty($distro->dataroot) ? str_replace('\\', '/', dirname(dirname(dirname(__DIR__))).'/moodledata'): $distro->dataroot, // initialised later after including libs or by distro
-        'dbtype'            => empty($distro->dbtype) ? $defaultdb : $distro->dbtype, // let distro skip dbtype selection
-        'dbhost'            => empty($distro->dbhost) ? 'localhost' : $distro->dbhost, // let distros set dbhost
+        'dataroot'          => $CFG->dataroot,
+        'dbtype'            => $defaultdb,
+        'dbhost'            => 'localhost',
        'dbname'            => 'moodle',
-        'dbuser'            => empty($distro->dbuser) ? 'root' : $distro->dbuser, // let distros set dbuser
+        'dbuser'            => 'root',
        'dbpass'            => '',
-        'dbport'            => '',
-        'dbsocket'          => '',
+        'dbsocket'          => false,
        'prefix'            => 'mdl_',
        'fullname'          => '',
        'shortname'         => '',
-        'summary'           => '',
        'adminuser'         => 'admin',
        'adminpass'         => '',
-        'adminemail'        => '',
-        'upgradekey'        => '',
        'non-interactive'   => false,
        'agree-license'     => false,
        'allow-unstable'    => false,
-        'skip-database'     => false,
        'help'              => false
    ),
    array(
@@ -275,8 +207,7 @@ $interactive = empty($options['non-interactive']);

 // set up language
 $lang = clean_param($options['lang'], PARAM_SAFEDIR);
-$languages = get_string_manager()->get_list_of_translations();
-if (array_key_exists($lang, $languages)) {
+if (file_exists($CFG->dirroot.'/install/lang/'.$lang)) {
    $CFG->lang = $lang;
 }

@@ -291,41 +222,38 @@ if ($options['help']) {
 }

 //Print header
-cli_logo();
-echo PHP_EOL;
 echo get_string('cliinstallheader', 'install', $CFG->target_release)."\n";

 //Fist select language
 if ($interactive) {
    cli_separator();
-    // Do not put the langs into columns because it is not compatible with RTL.
+    $languages = get_string_manager()->get_list_of_translations();
+    // format the langs nicely - 3 per line
+    $c = 0;
+    $langlist = '';
+    foreach ($languages as $key=>$lang) {
+        $c++;
+        $length = iconv_strlen($lang, 'UTF-8');
+        $padded = $lang.str_repeat(' ', 38-$length);
+        $langlist .= $padded;
+        if ($c % 3 == 0) {
+            $langlist .= "\n";
+        }
+    }
    $default = $CFG->lang;
-    cli_heading(get_string('chooselanguagehead', 'install'));
-    if (array_key_exists($default, $languages)) {
-        echo $default.' - '.$languages[$default]."\n";
-    }
-    if ($default !== 'en') {
-        echo 'en - English (en)'."\n";
-    }
-    echo '? - '.get_string('availablelangs', 'install')."\n";
+    cli_heading(get_string('availablelangs', 'install'));
+    echo $langlist."\n";
    $prompt = get_string('clitypevaluedefault', 'admin', $CFG->lang);
    $error = '';
    do {
        echo $error;
        $input = cli_input($prompt, $default);
+        $input = clean_param($input, PARAM_SAFEDIR);

-        if ($input === '?') {
-            echo implode("\n", $languages)."\n";
-            $error = "\n";
-
+        if (!file_exists($CFG->dirroot.'/install/lang/'.$input)) {
+            $error = get_string('cliincorrectvalueretry', 'admin')."\n";
        } else {
-            $input = clean_param($input, PARAM_SAFEDIR);
-
-            if (!array_key_exists($input, $languages)) {
-                $error = get_string('cliincorrectvalueretry', 'admin')."\n";
-            } else {
-                $error = '';
-            }
+            $error = '';
        }
    } while ($error !== '');
    $CFG->lang = $input;
@@ -337,7 +265,7 @@ if ($interactive) {
 $chmod = octdec(clean_param($options['chmod'], PARAM_INT));
 if ($interactive) {
    cli_separator();
-    cli_heading(get_string('datarootpermission', 'install'));
+    cli_heading('Data directories permission'); // todo localize
    $prompt = get_string('clitypevaluedefault', 'admin', decoct($chmod));
    $error = '';
    do {
@@ -359,8 +287,6 @@ if ($interactive) {
    }
 }
 $CFG->directorypermissions = $chmod;
-$CFG->filepermissions      = ($CFG->directorypermissions & 0666);
-$CFG->umaskpermissions     = (($CFG->directorypermissions & 0777) ^ 0777);

 //We need wwwroot before we test dataroot
 $wwwroot = clean_param($options['wwwroot'], PARAM_URL);
@@ -399,7 +325,9 @@ $CFG->httpswwwroot  = $CFG->wwwroot;


 //We need dataroot before lang download
-$CFG->dataroot = $options['dataroot'];
+if (!empty($options['dataroot'])) {
+    $CFG->dataroot = $options['dataroot'];
+}
 if ($interactive) {
    cli_separator();
    $i=0;
@@ -447,9 +375,6 @@ if ($interactive) {
        cli_error(get_string('pathserrcreatedataroot', 'install', $a));
    }
 }
-$CFG->tempdir       = $CFG->dataroot.'/temp';
-$CFG->cachedir      = $CFG->dataroot.'/cache';
-$CFG->localcachedir = $CFG->dataroot.'/localcache';

 // download required lang packs
 if ($CFG->lang !== 'en') {
@@ -488,8 +413,7 @@ if (isset($maturity)) {
                exit(1);
            }
        } else {
-            cli_problem(get_string('maturitycorewarning', 'admin', $maturitylevel));
-            cli_error(get_string('maturityallowunstable', 'admin'));
+            cli_error(get_string('maturitycorewarning', 'admin'));
        }
    }
 }
@@ -565,34 +489,6 @@ if ($interactive) {
    $CFG->prefix = $options['prefix'];
 }

-// ask for db port
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('databaseport', 'install'));
-    $prompt = get_string('clitypevaluedefault', 'admin', $options['dbport']);
-    $CFG->dboptions['dbport'] = (int)cli_input($prompt, $options['dbport']);
-
-} else {
-    $CFG->dboptions['dbport'] = (int)$options['dbport'];
-}
-if ($CFG->dboptions['dbport'] <= 0) {
-    $CFG->dboptions['dbport'] = '';
-}
-
-// ask for db socket
-if ($CFG->ostype === 'WINDOWS') {
-    $CFG->dboptions['dbsocket'] = '';
-
-} else if ($interactive and empty($CFG->dboptions['dbport'])) {
-    cli_separator();
-    cli_heading(get_string('databasesocket', 'install'));
-    $prompt = get_string('clitypevaluedefault', 'admin', $options['dbsocket']);
-    $CFG->dboptions['dbsocket'] = cli_input($prompt, $options['dbsocket']);
-
-} else {
-    $CFG->dboptions['dbsocket'] = $options['dbsocket'];
-}
-
 // ask for db user
 if ($interactive) {
    cli_separator();
@@ -620,15 +516,12 @@ if ($interactive) {
        }

        $CFG->dbpass = cli_input($prompt, $options['dbpass']);
-        if (function_exists('distro_pre_create_db')) { // Hook for distros needing to do something before DB creation
-            $distro = distro_pre_create_db($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbport'=>$CFG->dboptions['dbport'], 'dbsocket'=>$CFG->dboptions['dbsocket']), $distro);
-        }
-        $hint_database = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbport'=>$CFG->dboptions['dbport'], 'dbsocket'=>$CFG->dboptions['dbsocket']));
+        $hint_database = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbsocket'=>$options['dbsocket']));
    } while ($hint_database !== '');

 } else {
    $CFG->dbpass = $options['dbpass'];
-    $hint_database = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbport'=>$CFG->dboptions['dbport'], 'dbsocket'=>$CFG->dboptions['dbsocket']));
+    $hint_database = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbsocket'=>$options['dbsocket']));
    if ($hint_database !== '') {
        cli_error(get_string('dbconnectionerror', 'install'));
    }
@@ -710,38 +603,6 @@ if ($interactive) {
    }
 }

-// Ask for the admin email address.
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('cliadminemail', 'install'));
-    $prompt = get_string('clitypevaluedefault', 'admin', $options['adminemail']);
-    $options['adminemail'] = cli_input($prompt);
-}
-
-// Validate that the address provided was an e-mail address.
-if (!empty($options['adminemail']) && !validate_email($options['adminemail'])) {
-    $a = (object) array('option' => 'adminemail', 'value' => $options['adminemail']);
-    cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-}
-
-// Ask for the upgrade key.
-if ($interactive) {
-    cli_separator();
-    cli_heading(get_string('upgradekeyset', 'admin'));
-    if ($options['upgradekey'] !== '') {
-        $prompt = get_string('clitypevaluedefault', 'admin', $options['upgradekey']);
-        $options['upgradekey'] = cli_input($prompt, $options['upgradekey']);
-    } else {
-        $prompt = get_string('clitypevalue', 'admin');
-        $options['upgradekey'] = cli_input($prompt);
-    }
-}
-
-// Set the upgrade key if it was provided.
-if ($options['upgradekey'] !== '') {
-    $CFG->upgradekey = $options['upgradekey'];
-}
-
 if ($interactive) {
    if (!$options['agree-license']) {
        cli_separator();
@@ -784,33 +645,7 @@ require($configfile);
 $CFG->lang = $installlang;
 $SESSION->lang = $CFG->lang;

-require("$CFG->dirroot/version.php");
-
-// Test environment first.
-require_once($CFG->libdir . '/environmentlib.php');
-list($envstatus, $environment_results) = check_moodle_environment(normalize_version($release), ENV_SELECT_RELEASE);
-if (!$envstatus) {
-    $errors = environment_get_errors($environment_results);
-    cli_heading(get_string('environment', 'admin'));
-    foreach ($errors as $error) {
-        list($info, $report) = $error;
-        echo "!! $info !!\n$report\n\n";
-    }
-    exit(1);
-}
-
-// Test plugin dependencies.
-$failed = array();
-if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
-    cli_problem(get_string('pluginscheckfailed', 'admin', array('pluginslist' => implode(', ', array_unique($failed)))));
-    cli_error(get_string('pluginschecktodo', 'admin'));
-}
-
-if (!$options['skip-database']) {
-    install_cli_database($options, $interactive);
-} else {
-    echo get_string('cliskipdatabase', 'install')."\n";
-}
+install_cli_database($options, $interactive);

 echo get_string('cliinstallfinished', 'install')."\n";
 exit(0); // 0 means success
@@ -29,19 +29,12 @@
 */

 define('CLI_SCRIPT', true);
-define('CACHE_DISABLE_ALL', true);

 // extra execution prevention - we can not just require config.php here
 if (isset($_SERVER['REMOTE_ADDR'])) {
    exit(1);
 }

-// Force OPcache reset if used, we do not want any stale caches
-// when preparing test environment.
-if (function_exists('opcache_reset')) {
-    opcache_reset();
-}
-
 $help =
 "Advanced command line Moodle database installer.
 Please note you must execute this script with the same uid as apache.
@@ -52,10 +45,9 @@ Options:
 --lang=CODE           Installation and default site language. Default is en.
 --adminuser=USERNAME  Username for the moodle admin account. Default is admin.
 --adminpass=PASSWORD  Password for the moodle admin account.
--adminemail=STRING   Email address for the moodle admin account.
 --agree-license       Indicates agreement with software license.
--fullname=STRING     Name of the site
--shortname=STRING    Name of the site
+--fullname            Name of the site
+--shortname           Name of the site
 -h, --help            Print out this help

 Example:
@@ -63,16 +55,16 @@ Example:
 ";

 // Check that PHP is of a sufficient version
-if (version_compare(phpversion(), "5.6.5") < 0) {
+if (version_compare(phpversion(), "5.3.2") < 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, "Moodle 2.1 or later requires at least PHP 5.3.2 (currently using version $phpversion).\n");
    fwrite(STDERR, "Please upgrade your server software or install older Moodle version.\n");
    exit(1);
 }

 // Nothing to do if config.php does not exist
-$configfile = __DIR__.'/../../config.php';
+$configfile = dirname(dirname(dirname(__FILE__))).'/config.php';
 if (!file_exists($configfile)) {
    fwrite(STDERR, 'config.php does not exist, can not continue'); // do not localize
    fwrite(STDERR, "\n");
@@ -103,7 +95,6 @@ list($options, $unrecognized) = cli_get_params(
        'lang'              => 'en',
        'adminuser'         => 'admin',
        'adminpass'         => '',
-        'adminemail'        => '',
        'fullname'          => '',
        'shortname'         => '',
        'agree-license'     => false,
@@ -128,12 +119,6 @@ if ($options['adminpass'] === true or $options['adminpass'] === '') {
    cli_error('You have to specify admin password. --help prints out the help'); // TODO: localize
 }

-// Validate that the address provided was an e-mail address.
-if (!empty($options['adminemail']) && !validate_email($options['adminemail'])) {
-    $a = (object) array('option' => 'adminemail', 'value' => $options['adminemail']);
-    cli_error(get_string('cliincorrectvalueerror', 'admin', $a));
-}
-
 $options['lang'] = clean_param($options['lang'], PARAM_SAFEDIR);
 if (!file_exists($CFG->dirroot.'/install/lang/'.$options['lang'])) {
    $options['lang'] = 'en';
@@ -159,27 +144,6 @@ if ($CFG->lang !== 'en') {
 $CFG->early_install_lang = false;
 get_string_manager(true);

-require("$CFG->dirroot/version.php");
-
-// Test environment first.
-require_once($CFG->libdir . '/environmentlib.php');
-list($envstatus, $environment_results) = check_moodle_environment(normalize_version($release), ENV_SELECT_RELEASE);
-if (!$envstatus) {
-    $errors = environment_get_errors($environment_results);
-    cli_heading(get_string('environment', 'admin'));
-    foreach ($errors as $error) {
-        list($info, $report) = $error;
-        echo "!! $info !!\n$report\n\n";
-    }
-    exit(1);
-}
-
-// Test plugin dependencies.
-$failed = array();
-if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
-    cli_problem(get_string('pluginscheckfailed', 'admin', array('pluginslist' => implode(', ', array_unique($failed)))));
-    cli_error(get_string('pluginschecktodo', 'admin'));
-}

 install_cli_database($options, true);

@@ -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
@@ -15,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

 /**
- * Enable or disable maintenance mode.
+ * Enable or disable maintenance mode
 *
 * @package    core
 * @subpackage cli
@@ -25,13 +26,12 @@

 define('CLI_SCRIPT', true);

-require(__DIR__.'/../../config.php');
-require_once("$CFG->libdir/clilib.php");
-require_once("$CFG->libdir/adminlib.php");
+require(dirname(dirname(dirname(__FILE__))).'/config.php');
+require_once($CFG->libdir.'/clilib.php');      // cli only functions


-// Now get cli options.
-list($options, $unrecognized) = cli_get_params(array('enable'=>false, 'enablelater'=>0, 'enableold'=>false, 'disable'=>false, 'help'=>false),
+// now get cli options
+list($options, $unrecognized) = cli_get_params(array('enable'=>false, 'disable'=>false, 'help'=>false),
                                               array('h'=>'help'));

 if ($unrecognized) {
@@ -45,14 +45,12 @@ if ($options['help']) {
 Current status displayed if not option specified.

 Options:
--enable              Enable CLI maintenance mode
--enablelater=MINUTES Number of minutes before entering CLI maintenance mode
--enableold           Enable legacy half-maintenance mode
+--enable              Enable maintenance mode
 --disable             Disable maintenance mode
 -h, --help            Print out this help

 Example:
-\$ sudo -u www-data /usr/bin/php admin/cli/maintenance.php
+\$sudo -u www-data /usr/bin/php admin/cli/maintenance.php
 "; //TODO: localize - to be translated later when everything is finished

    echo $help;
@@ -61,52 +59,18 @@ Example:

 cli_heading(get_string('sitemaintenancemode', 'admin')." ($CFG->wwwroot)");

-if ($options['enablelater']) {
-    if (file_exists("$CFG->dataroot/climaintenance.html")) {
-        // Already enabled, sorry.
-        echo get_string('clistatusenabled', 'admin')."\n";
-        return 1;
-    }
-
-    $time = time() + ($options['enablelater']*60);
-    set_config('maintenance_later', $time);
-
-    echo get_string('clistatusenabledlater', 'admin', userdate($time))."\n";
-    return 0;
-
-} else if ($options['enable']) {
-    if (file_exists("$CFG->dataroot/climaintenance.html")) {
-        // The maintenance is already enabled, nothing to do.
-    } else {
-        enable_cli_maintenance_mode();
-    }
-    set_config('maintenance_enabled', 0);
-    unset_config('maintenance_later');
-    echo get_string('sitemaintenanceoncli', 'admin')."\n";
-    exit(0);
-
-} else if ($options['enableold']) {
+if ($options['enable']) {
    set_config('maintenance_enabled', 1);
-    unset_config('maintenance_later');
    echo get_string('sitemaintenanceon', 'admin')."\n";
    exit(0);
-
 } else if ($options['disable']) {
    set_config('maintenance_enabled', 0);
-    unset_config('maintenance_later');
-    if (file_exists("$CFG->dataroot/climaintenance.html")) {
-        unlink("$CFG->dataroot/climaintenance.html");
-    }
    echo get_string('sitemaintenanceoff', 'admin')."\n";
    exit(0);
 }

-if (!empty($CFG->maintenance_enabled) or file_exists("$CFG->dataroot/climaintenance.html")) {
+if (!empty($CFG->maintenance_enabled)) {
    echo get_string('clistatusenabled', 'admin')."\n";
-
-} else if (isset($CFG->maintenance_later)) {
-    echo get_string('clistatusenabledlater', 'admin', userdate($CFG->maintenance_later))."\n";
-
 } else {
    echo get_string('clistatusdisabled', 'admin')."\n";
 }
@@ -1,292 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * MySQL collation conversion tool.
- *
- * @package    core
- * @copyright  2012 Petr Skoda (http://skodak.org)
- * @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');      // cli only functions
-
-if ($DB->get_dbfamily() !== 'mysql') {
-    cli_error('This function is designed for MySQL databases only!');
-}
-
-// now get cli options
-list($options, $unrecognized) = cli_get_params(array('help'=>false, 'list'=>false, 'collation'=>false, 'available'=>false),
-    array('h'=>'help', 'l'=>'list', 'a'=>'available'));
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-$help =
-    "MySQL collation conversions script.
-
-It is strongly recommended to stop the web server before the conversion.
-This script may be executed before the main upgrade - 1.9.x data for example.
-
-Options:
--collation=COLLATION Convert MySQL tables to different collation
-l, --list            Show table and column information
-a, --available       Show list of available collations
-h, --help            Print out this help
-
-Example:
-\$ sudo -u www-data /usr/bin/php admin/cli/mysql_collation.php --collation=utf8_general_ci
-";
-
-if (!empty($options['collation'])) {
-    $collations = mysql_get_collations();
-    $collation = clean_param($options['collation'], PARAM_ALPHANUMEXT);
-    $collation = strtolower($collation);
-    if (!isset($collations[$collation])) {
-        cli_error("Error: collation '$collation' is not available on this server!");
-    }
-
-    $collationinfo = explode('_', $collation);
-    $charset = reset($collationinfo);
-
-    $engine = strtolower($DB->get_dbengine());
-
-    // Do checks for utf8mb4.
-    if (strpos($collation, 'utf8mb4') === 0) {
-        // Do we have the right engine?
-        if ($engine !== 'innodb' && $engine !== 'xtradb') {
-            cli_error("Error: '$collation' requires InnoDB or XtraDB set as the engine.");
-        }
-        // Are we using Barracuda?
-        if ($DB->get_row_format() != 'Barracuda') {
-            // Try setting it here.
-            try {
-                $DB->execute("SET GLOBAL innodb_file_format=Barracuda");
-            } catch (dml_exception $e) {
-                cli_error("Error: '$collation' requires the file format to be set to Barracuda.
-                        An attempt was made to change the format, but it failed. Please try doing this manually.");
-            }
-            echo "GLOBAL SETTING: innodb_file_format changed to Barracuda\n";
-        }
-        // Is one file per table being used?
-        if (!$DB->is_file_per_table_enabled()) {
-            try {
-                $DB->execute("SET GLOBAL innodb_file_per_table=1");
-            } catch (dml_exception $e) {
-                cli_error("Error: '$collation' requires the setting 'innodb_file_per_table' be set to 'ON'.
-                        An attempt was made to change the format, but it failed. Please try doing this manually.");
-            }
-            echo "GLOBAL SETTING: innodb_file_per_table changed to 1\n";
-        }
-        // Is large prefix set?
-        if (!$DB->is_large_prefix_enabled()) {
-            try {
-                $DB->execute("SET GLOBAL innodb_large_prefix=1");
-            } catch (dml_exception $e) {
-                cli_error("Error: '$collation' requires the setting 'innodb_large_prefix' be set to 'ON'.
-                        An attempt was made to change the format, but it failed. Please try doing this manually.");
-            }
-            echo "GLOBAL SETTING: innodb_large_prefix changed to 1\n";
-        }
-    }
-
-    $sql = "SHOW VARIABLES LIKE 'collation_database'";
-    if (!$dbcollation = $DB->get_record_sql($sql)) {
-        cli_error("Error: Could not access collation information on the database.");
-    }
-    $sql = "SHOW VARIABLES LIKE 'character_set_database'";
-    if (!$dbcharset = $DB->get_record_sql($sql)) {
-        cli_error("Error: Could not access character set information on the database.");
-    }
-    if ($dbcollation->value !== $collation || $dbcharset->value !== $charset) {
-        // Try to convert the DB.
-        echo "Converting database to '$collation' for $CFG->wwwroot:\n";
-        $sql = "ALTER DATABASE $CFG->dbname DEFAULT CHARACTER SET $charset DEFAULT COLLATE = $collation";
-        try {
-            $DB->change_database_structure($sql);
-        } catch (exception $e) {
-            cli_error("Error: Tried to alter the database with no success. Please try manually changing the database
-                    to the new collation and character set and then run this script again.");
-        }
-        echo "DATABASE CONVERTED\n";
-    }
-
-    echo "Converting tables and columns to '$collation' for $CFG->wwwroot:\n";
-    $prefix = $DB->get_prefix();
-    $prefix = str_replace('_', '\\_', $prefix);
-    $sql = "SHOW TABLE STATUS WHERE Name LIKE BINARY '$prefix%'";
-    $rs = $DB->get_recordset_sql($sql);
-    $converted = 0;
-    $skipped   = 0;
-    $errors    = 0;
-    foreach ($rs as $table) {
-        echo str_pad($table->name, 40). " - ";
-
-        if ($table->collation === $collation) {
-            echo "NO CHANGE\n";
-            $skipped++;
-
-        } else {
-            $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";
-        $rs2 = $DB->get_recordset_sql($sql);
-        foreach ($rs2 as $column) {
-            $column = (object)array_change_key_case((array)$column, CASE_LOWER);
-            echo '    '.str_pad($column->field, 36). " - ";
-            if ($column->collation === $collation) {
-                echo "NO CHANGE\n";
-                $skipped++;
-                continue;
-            }
-
-            // Check for utf8mb4 collation.
-            $rowformat = $DB->get_row_format_sql($engine, $collation);
-
-            if ($column->type === 'tinytext' or $column->type === 'mediumtext' or $column->type === 'text' or $column->type === 'longtext') {
-                $notnull = ($column->null === 'NO') ? 'NOT NULL' : 'NULL';
-                $default = (!is_null($column->default) and $column->default !== '') ? "DEFAULT '$column->default'" : '';
-                // primary, unique and inc are not supported for texts
-                $sql = "ALTER TABLE $table->name
-                        MODIFY COLUMN $column->field $column->type
-                        CHARACTER SET $charset
-                        COLLATE $collation $notnull $default";
-                $DB->change_database_structure($sql);
-
-            } else if (strpos($column->type, 'varchar') === 0) {
-                $notnull = ($column->null === 'NO') ? 'NOT NULL' : 'NULL';
-                $default = !is_null($column->default) ? "DEFAULT '$column->default'" : '';
-
-                if ($rowformat != '') {
-                    $sql = "ALTER TABLE $table->name $rowformat";
-                    $DB->change_database_structure($sql);
-                }
-
-                $sql = "ALTER TABLE $table->name
-                        MODIFY COLUMN $column->field $column->type
-                        CHARACTER SET $charset
-                        COLLATE $collation $notnull $default";
-                $DB->change_database_structure($sql);
-            } else {
-                echo "ERROR (unknown column type: $column->type)\n";
-                $error++;
-                continue;
-            }
-            echo "CONVERTED\n";
-            $converted++;
-        }
-        $rs2->close();
-    }
-    $rs->close();
-    echo "Converted: $converted, skipped: $skipped, errors: $errors\n";
-    exit(0); // success
-
-} else if (!empty($options['list'])) {
-    echo "List of tables for $CFG->wwwroot:\n";
-    $prefix = $DB->get_prefix();
-    $prefix = str_replace('_', '\\_', $prefix);
-    $sql = "SHOW TABLE STATUS WHERE Name LIKE BINARY '$prefix%'";
-    $rs = $DB->get_recordset_sql($sql);
-    $counts = array();
-    foreach ($rs as $table) {
-        if (isset($counts[$table->collation])) {
-            $counts[$table->collation]++;
-        } else {
-            $counts[$table->collation] = 1;
-        }
-        echo str_pad($table->name, 40);
-        echo $table->collation.  "\n";
-        $collations = mysql_get_column_collations($table->name);
-        foreach ($collations as $columname=>$collation) {
-            if (isset($counts[$collation])) {
-                $counts[$collation]++;
-            } else {
-                $counts[$collation] = 1;
-            }
-            echo '    ';
-            echo str_pad($columname, 36);
-            echo $collation.  "\n";
-        }
-    }
-    $rs->close();
-
-    echo "\n";
-    echo "Table collations summary for $CFG->wwwroot:\n";
-    foreach ($counts as $collation => $count) {
-        echo "$collation: $count\n";
-    }
-    exit(0); // success
-
-} else if (!empty($options['available'])) {
-    echo "List of available MySQL collations for $CFG->wwwroot:\n";
-    $collations = mysql_get_collations();
-    foreach ($collations as $collation) {
-        echo " $collation\n";
-    }
-    die;
-
-} else {
-    echo $help;
-    die;
-}
-
-
-
-// ========== Some functions ==============
-
-function mysql_get_collations() {
-    global $DB;
-
-    $collations = array();
-    $sql = "SHOW COLLATION
-            WHERE Collation LIKE 'utf8\_%' AND Charset = 'utf8'
-               OR Collation LIKE 'utf8mb4\_%' AND Charset = 'utf8mb4'";
-    $rs = $DB->get_recordset_sql($sql);
-    foreach ($rs as $collation) {
-        $collations[$collation->collation] = $collation->collation;
-    }
-    $rs->close();
-
-    $collation = $DB->get_dbcollation();
-    if (isset($collations[$collation])) {
-        $collations[$collation] .= ' (default)';
-    }
-
-    return $collations;
-}
-
-function mysql_get_column_collations($tablename) {
-    global $DB;
-
-    $collations = array();
-    $sql = "SELECT column_name, collation_name
-              FROM INFORMATION_SCHEMA.COLUMNS
-             WHERE table_schema = DATABASE() AND table_name = ? AND collation_name IS NOT NULL";
-    $rs = $DB->get_recordset_sql($sql, array($tablename));
-    foreach($rs as $record) {
-        $collations[$record->column_name] = $record->collation_name;
-    }
-    $rs->close();
-    return $collations;
-}
@@ -1,202 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * MySQL table row compression tool tool.
- *
- * @package   core
- * @copyright 2014 Totara Learning Solutions Ltd {@link http://www.totaralms.com/}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @author    Petr Skoda <petr.skoda@totaralms.com>
- */
-
-define('CLI_SCRIPT', true);
-
-require(__DIR__.'/../../config.php');
-require_once($CFG->libdir . '/clilib.php');
-
-if ($DB->get_dbfamily() !== 'mysql') {
-    cli_error('This script is used for MySQL databases only.');
-}
-
-$engine = strtolower($DB->get_dbengine());
-if ($engine !== 'innodb' and $engine !== 'xtradb') {
-    cli_error('This script is for MySQL servers using InnoDB or XtraDB engines only.');
-}
-
-list($options, $unrecognized) = cli_get_params(
-    array('help' => false, 'info' => false, 'list' => false, 'fix' => false, 'showsql' => false),
-    array('h' => 'help', 'i' => 'info', 'l' => 'list', 'f' => 'fix', 's' => 'showsql')
-);
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-$help =
-    "Script for detection of row size problems in MySQL InnoDB tables.
-
-By default InnoDB storage table is using legacy Antelope file format
-which has major restriction on database row size.
-Use this script to detect and fix database tables with potential data
-overflow problems.
-
-Options:
-i, --info            Show database information
-l, --list            List problematic tables
-f, --fix             Attempt to fix all tables (requires SUPER privilege)
-s, --showsql         Print SQL statements for fixing of tables
-h, --help            Print out this help
-
-Example:
-\$ sudo -u www-data /usr/bin/php admin/cli/mysql_compressed_rows.php -l
-";
-
-/** @var mysql_sql_generator $generator */
-$generator = $DB->get_manager()->generator;
-
-$info = $DB->get_server_info();
-$filepertable = $DB->get_record_sql("SHOW VARIABLES LIKE 'innodb_file_per_table'");
-$filepertable = $filepertable ? $filepertable->value : '';
-$fileformat = $DB->get_record_sql("SHOW VARIABLES LIKE 'innodb_file_format'");
-$fileformat = $fileformat ? $fileformat->value : '';
-$prefix = $DB->get_prefix();
-$database = $CFG->dbname;
-
-if (!empty($options['info'])) {
-    echo "Database version:      " . $info['description'] . "\n";
-    echo "Database name:         $database\n";
-    echo "Database engine:       " . $DB->get_dbengine() . "\n";
-    echo "innodb_file_per_table: $filepertable\n";
-    echo "innodb_file_format:    $fileformat\n";
-
-    exit(0);
-
-} else if (!empty($options['list'])) {
-    $problem = false;
-    foreach ($DB->get_tables(false) as $table) {
-        $columns = $DB->get_columns($table, false);
-        $size = $generator->guess_antelope_row_size($columns);
-        $format = $DB->get_row_format($table);
-        if ($size <= $generator::ANTELOPE_MAX_ROW_SIZE) {
-            continue;
-        }
-
-        echo str_pad($prefix . $table, 32, ' ', STR_PAD_RIGHT);
-        echo str_pad($format, 11, ' ', STR_PAD_RIGHT);
-
-        if ($format === 'Compact' or $format === 'Redundant') {
-            $problem = true;
-            echo " (needs fixing)\n";
-
-        } else if ($format !== 'Compressed' and $format !== 'Dynamic') {
-            echo " (unknown)\n";
-
-        } else {
-            echo "\n";
-        }
-    }
-
-    if ($problem) {
-        exit(1);
-    }
-    exit(0);
-
-} else if (!empty($options['fix'])) {
-    $fixtables = array();
-    foreach ($DB->get_tables(false) as $table) {
-        $columns = $DB->get_columns($table, false);
-        $size = $generator->guess_antelope_row_size($columns);
-        $format = $DB->get_row_format($table);
-        if ($size <= $generator::ANTELOPE_MAX_ROW_SIZE) {
-            continue;
-        }
-        if ($format === 'Compact' or $format === 'Redundant') {
-            $fixtables[$table] = $table;
-        }
-    }
-
-    if (!$fixtables) {
-        echo "No changes necessary\n";
-        exit(0);
-    }
-
-    if ($filepertable !== 'ON') {
-        try {
-            $DB->execute("SET GLOBAL innodb_file_per_table=1");
-        } catch (dml_exception $e) {
-            echo "Cannot enable GLOBAL innodb_file_per_table setting, use --showsql option and execute the statements manually.";
-            throw $e;
-        }
-    }
-    if ($fileformat !== 'Barracuda') {
-        try {
-            $DB->execute("SET GLOBAL innodb_file_format=Barracuda");
-        } catch (dml_exception $e) {
-            echo "Cannot change GLOBAL innodb_file_format setting, use --showsql option and execute the statements manually.";
-            throw $e;
-        }
-    }
-
-    if (!$DB->is_compressed_row_format_supported(false)) {
-        echo "MySQL server is not compatible with compressed row format.";
-        exit(1);
-    }
-
-    foreach ($fixtables as $table) {
-        $DB->change_database_structure("ALTER TABLE {$prefix}$table ROW_FORMAT=Compressed");
-        echo str_pad($prefix . $table, 32, ' ', STR_PAD_RIGHT) . " ... Compressed\n";
-    }
-
-    exit(0);
-
-} else if (!empty($options['showsql'])) {
-    $fixtables = array();
-
-    foreach ($DB->get_tables(false) as $table) {
-        $columns = $DB->get_columns($table, false);
-        $size = $generator->guess_antelope_row_size($columns);
-        $format = $DB->get_row_format($table);
-        if ($size <= $generator::ANTELOPE_MAX_ROW_SIZE) {
-            continue;
-        }
-        if ($format === 'Compact' or $format === 'Redundant') {
-            $fixtables[$table] = $table;
-        }
-    }
-    if (!$fixtables) {
-        echo "No changes necessary\n";
-        exit(0);
-    }
-
-    echo "Copy the following SQL statements and execute them using account with SUPER privilege:\n\n";
-    echo "USE $database;\n";
-    echo "SET SESSION sql_mode=STRICT_ALL_TABLES;\n";
-    echo "SET GLOBAL innodb_file_per_table=1;\n";
-    echo "SET GLOBAL innodb_file_format=Barracuda;\n";
-    foreach ($fixtables as $table) {
-        echo "ALTER TABLE {$prefix}$table ROW_FORMAT=Compressed;\n";
-    }
-    echo "\n";
-    exit(0);
-
-} else {
-    echo $help;
-    die;
-}
-
-
@@ -26,7 +26,7 @@

 define('CLI_SCRIPT', true);

-require(__DIR__.'/../../config.php');
+require(dirname(dirname(dirname(__FILE__))).'/config.php');
 require_once($CFG->libdir.'/clilib.php');      // cli only functions

 if ($DB->get_dbfamily() !== 'mysql') {
@@ -34,8 +34,8 @@ if ($DB->get_dbfamily() !== 'mysql') {
 }

 // now get cli options
-list($options, $unrecognized) = cli_get_params(array('help'=>false, 'list'=>false, 'engine'=>false, 'available'=>false),
-                                               array('h'=>'help', 'l'=>'list', 'a'=>'available'));
+list($options, $unrecognized) = cli_get_params(array('help'=>false, 'list'=>false, 'engine'=>false),
+                                               array('h'=>'help', 'l'=>'list'));

 if ($unrecognized) {
    $unrecognized = implode("\n  ", $unrecognized);
@@ -52,7 +52,6 @@ and does not support transactions.
 Options:
 --engine=ENGINE       Convert MySQL tables to different engine
 -l, --list            Show table information
-a, --available       Show list of available engines
 -h, --help            Print out this help

 Example:
@@ -60,11 +59,7 @@ Example:
 ";

 if (!empty($options['engine'])) {
-    $engines = mysql_get_engines();
    $engine = clean_param($options['engine'], PARAM_ALPHA);
-    if (!isset($engines[strtoupper($engine)])) {
-        cli_error("Error: engine '$engine' is not available on this server!");
-    }

    echo "Converting tables to '$engine' for $CFG->wwwroot:\n";
    $prefix = $DB->get_prefix();
@@ -73,34 +68,20 @@ if (!empty($options['engine'])) {
    $rs = $DB->get_recordset_sql($sql);
    $converted = 0;
    $skipped   = 0;
-    $errors    = 0;
    foreach ($rs as $table) {
-        if (strtoupper($table->engine) === strtoupper($engine)) {
-            $newengine = mysql_get_table_engine($table->name);
-            echo str_pad($table->name, 40). " - NO CONVERSION NEEDED ($newengine)\n";
+        if ($table->engine === $engine) {
+            echo str_pad($table->name, 40). " - NO CONVERSION NEEDED\n";
            $skipped++;
            continue;
        }
        echo str_pad($table->name, 40). " - ";

-        try {
-            $DB->change_database_structure("ALTER TABLE {$table->name} ENGINE = $engine");
-            $newengine = mysql_get_table_engine($table->name);
-            if (strtoupper($newengine) !== strtoupper($engine)) {
-                echo "ERROR ($newengine)\n";
-                $errors++;
-                continue;
-            }
-            echo "DONE ($newengine)\n";
-            $converted++;
-        } catch (moodle_exception $e) {
-            echo $e->getMessage()."\n";
-            $errors++;
-            continue;
-        }
+        $DB->change_database_structure("ALTER TABLE {$table->name} TYPE = $engine");
+        echo "DONE\n";
+        $converted++;
    }
    $rs->close();
-    echo "Converted: $converted, skipped: $skipped, errors: $errors\n";
+    echo "Converted: $converted, skipped: $skipped\n";
    exit(0); // success

 } else if (!empty($options['list'])) {
@@ -128,53 +109,7 @@ if (!empty($options['engine'])) {
    }
    exit(0); // success

-} else if (!empty($options['available'])) {
-    echo "List of available MySQL engines for $CFG->wwwroot:\n";
-    $engines = mysql_get_engines();
-    foreach ($engines as $engine) {
-        echo " $engine\n";
-    }
-    die;
-
 } else {
    echo $help;
    die;
 }
-
-
-
-// ========== Some functions ==============
-
-function mysql_get_engines() {
-    global $DB;
-
-    $sql = "SHOW Engines";
-    $rs = $DB->get_recordset_sql($sql);
-    $engines = array();
-    foreach ($rs as $engine) {
-        if (strtoupper($engine->support) !== 'YES' and strtoupper($engine->support) !== 'DEFAULT') {
-            continue;
-        }
-        $engines[strtoupper($engine->engine)] = $engine->engine;
-        if (strtoupper($engine->support) === 'DEFAULT') {
-            $engines[strtoupper($engine->engine)] .= ' (default)';
-        }
-    }
-    $rs->close();
-
-    return $engines;
-}
-
-function mysql_get_table_engine($tablename) {
-    global $DB;
-
-    $engine = null;
-    $sql = "SHOW TABLE STATUS WHERE Name = '$tablename'"; // no special chars expected here
-    $rs = $DB->get_recordset_sql($sql);
-    if ($rs->valid()) {
-        $record = $rs->current();
-        $engine = $record->engine;
-    }
-    $rs->close();
-    return $engine;
-}
@@ -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/>.
-
-/**
- * @package    core
- * @subpackage cli
- * @copyright  2011 David Mudrak <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');
-
-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 =
-"Invalidates all Moodle internal caches
-
-Options:
-h, --help            Print out this help
-
-Example:
-\$sudo -u www-data /usr/bin/php admin/cli/purge_caches.php
-";
-
-    echo $help;
-    exit(0);
-}
-
-purge_all_caches();
-
-exit(0);
@@ -26,26 +26,13 @@

 define('CLI_SCRIPT', true);

-require(__DIR__.'/../../config.php');
+require(dirname(dirname(dirname(__FILE__))).'/config.php');
 require_once($CFG->libdir.'/clilib.php');      // cli only functions

-// Define the input options.
-$longparams = array(
-        'help' => false,
-        'username' => '',
-        'password' => '',
-        'ignore-password-policy' => false
-);
-
-$shortparams = array(
-        'h' => 'help',
-        'u' => 'username',
-        'p' => 'password',
-        'i' => 'ignore-password-policy'
-);

 // now get cli options
-list($options, $unrecognized) = cli_get_params($longparams, $shortparams);
+list($options, $unrecognized) = cli_get_params(array('help'=>false),
+                                               array('h'=>'help'));

 if ($unrecognized) {
    $unrecognized = implode("\n  ", $unrecognized);
@@ -60,43 +47,29 @@ There are no security checks here because anybody who is able to
 execute this file may execute any PHP too.

 Options:
-h, --help                    Print out this help
-u, --username=username       Specify username to change
-p, --password=newpassword    Specify new password
--ignore-password-policy      Ignore password policy when setting password
+-h, --help            Print out this help

 Example:
 \$sudo -u www-data /usr/bin/php admin/cli/reset_password.php
-\$sudo -u www-data /usr/bin/php admin/cli/reset_password.php --username=rosaura --password=jiu3jiu --ignore-password-policy
-";
+"; //TODO: localize - to be translated later when everything is finished

    echo $help;
    die;
 }
-if ($options['username'] == '' ) {
-    cli_heading('Password reset');
-    $prompt = "Enter username (manual authentication only)";
-    $username = cli_input($prompt);
-} else {
-    $username = $options['username'];
-}
+cli_heading('Password reset'); // TODO: localize
+$prompt = "enter username (manual authentication only)"; // TODO: localize
+$username = cli_input($prompt);

 if (!$user = $DB->get_record('user', array('auth'=>'manual', 'username'=>$username, 'mnethostid'=>$CFG->mnet_localhost_id))) {
    cli_error("Can not find user '$username'");
 }

-if ($options['password'] == '' ) {
-    $prompt = "Enter new password";
-    $password = cli_input($prompt);
-} else {
-    $password = $options['password'];
-}
+$prompt = "Enter new password"; // TODO: localize
+$password = cli_input($prompt);

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

 $hashedpassword = hash_internal_user_password($password);
@@ -105,4 +78,4 @@ $DB->set_field('user', 'password', $hashedpassword, array('id'=>$user->id));

 echo "Password changed\n";

-exit(0); // 0 means success.
+exit(0); // 0 means success
@@ -1,182 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This script implements some useful svg manipulation tricks.
- *
- * @package    core_admin
- * @subpackage cli
- * @copyright  2012 Petr Skoda {@link http://skodak.org}
- * @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');
-
-// Now get cli options.
-list($options, $unrecognized) = cli_get_params(array('help'=>false, 'ie9fix'=>false, 'noaspectratio'=>false, 'path'=>$CFG->dirroot),
-    array('h'=>'help'));
-
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
-}
-
-// If necessary add files that should be ignored - such as in 3rd party plugins.
-$blacklist = array();
-$path = $options['path'];
-if (!file_exists($path)) {
-    cli_error("Invalid path $path");
-}
-
-if ($options['ie9fix']) {
-    core_admin_recurse_svgs($path, '', 'core_admin_svgtool_ie9fix', $blacklist);
-
-} else if ($options['noaspectratio']) {
-    core_admin_recurse_svgs($path, '', 'core_admin_svgtool_noaspectratio', $blacklist);
-
-} else {
-    $help =
-        "Some svg image tweaks for icon designers.
-
-Options:
-
-h, --help            Print out this help
--ie9fix              Adds preserveAspectRatio=\"xMinYMid meet\" to every svg image
--noaspectratio       Removes preserveAspectRatio from svg files
--path=PATH           Path to directory or file to be converted, by default \$CFG->dirroot
-
-Examples:
-\$ php svgtool.php --ie9fix
-\$ php svgtool.php --ie9fix --path=../../../pix
-\$ php svgtool.php --noaspectratio
-";
-
-    echo $help;
-    die;
-}
-
-exit(0);
-
-/**
- * Fixes SVG images for IE9.
- *
- * @param string $file
- */
-function core_admin_svgtool_ie9fix($file) {
-    global $CFG;
-
-    if (strpos($file, $CFG->dirroot.DIRECTORY_SEPARATOR) === 0) {
-        $relfile = substr($file, strlen($CFG->dirroot));
-    } else {
-        $relfile = $file;
-    }
-
-    $content = file_get_contents($file);
-
-    if (!preg_match('/<svg\s[^>]*>/', $content, $matches)) {
-        echo "  skipping $relfile (invalid format)\n";
-        return;
-    }
-    $svg = $matches[0];
-    if (strpos($svg, 'preserveAspectRatio') !== false) {
-        return;
-    }
-
-    if (!is_writable($file)) {
-        echo "  skipping $relfile (can not modify file)\n";
-        return;
-    }
-
-    $newsvg = rtrim($svg, '>').' preserveAspectRatio="xMinYMid meet">';
-
-    $content = str_replace($svg, $newsvg, $content);
-    echo "converting $relfile\n";
-    file_put_contents($file, $content);
-}
-
-/**
- * Removes preserveAspectRatio attributes from SVG images.
- *
- * @param string $file
- */
-function core_admin_svgtool_noaspectratio($file) {
-    global $CFG;
-
-    if (strpos($file, $CFG->dirroot.DIRECTORY_SEPARATOR) === 0) {
-        $relfile = substr($file, strlen($CFG->dirroot));
-    } else {
-        $relfile = $file;
-    }
-
-    $content = file_get_contents($file);
-
-    if (!preg_match('/<svg\s[^>]*>/', $content, $matches)) {
-        echo "  skipping $relfile (invalid format)\n";
-        return;
-    }
-    $svg = $matches[0];
-    if (strpos($svg, 'preserveAspectRatio="xMinYMid meet"') === false) {
-        return;
-    }
-
-    if (!is_writable($file)) {
-        echo "  skipping $relfile (can not modify file)\n";
-        return;
-    }
-
-    $newsvg = preg_replace('/ ?preserveAspectRatio="xMinYMid meet"/', '', $svg);
-
-    $content = str_replace($svg, $newsvg, $content);
-    echo "resetting $relfile\n";
-    file_put_contents($file, $content);
-}
-
-/**
- * Recursively works through directories of this theme, finding and fixing SVG images.
- *
- * @param string $base
- * @param string $sub
- * @param string $filecallback
- * @param array $blacklist
- */
-function core_admin_recurse_svgs($base, $sub, $filecallback, $blacklist) {
-    if (is_dir("$base/$sub")) {
-        $items = new DirectoryIterator("$base/$sub");
-        foreach ($items as $item) {
-            if ($item->isDot()) {
-                continue;
-            }
-            $file = $item->getFilename();
-            core_admin_recurse_svgs("$base/$sub", $file, $filecallback, $blacklist);
-        }
-        unset($item);
-        unset($items);
-        return;
-
-    } else if (is_file("$base/$sub")) {
-        if (substr($sub, -4) !== '.svg') {
-            return;
-        }
-        $file = realpath("$base/$sub");
-        if (in_array($file, $blacklist)) {
-            return;
-        }
-        $filecallback($file);
-    }
-}
@@ -20,6 +20,7 @@
 *
 * This script is not intended for beginners!
 * Potential problems:
+ * - environment check is not present yet
 * - su to apache account or sudo before execution
 * - not compatible with Windows platform
 *
@@ -29,39 +30,27 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

-// Force OPcache reset if used, we do not want any stale caches
-// when detecting if upgrade necessary or when running upgrade.
-if (function_exists('opcache_reset') and !isset($_SERVER['REMOTE_ADDR'])) {
-    opcache_reset();
-}
-
 define('CLI_SCRIPT', true);
-define('CACHE_DISABLE_ALL', true);

-require(__DIR__.'/../../config.php');
+require(dirname(dirname(dirname(__FILE__))).'/config.php');
 require_once($CFG->libdir.'/adminlib.php');       // various admin-only functions
 require_once($CFG->libdir.'/upgradelib.php');     // general upgrade/install related functions
 require_once($CFG->libdir.'/clilib.php');         // cli only functions
 require_once($CFG->libdir.'/environmentlib.php');

+
 // now get cli options
-$lang = isset($SESSION->lang) ? $SESSION->lang : $CFG->lang;
 list($options, $unrecognized) = cli_get_params(
    array(
        'non-interactive'   => false,
        'allow-unstable'    => false,
-        'help'              => false,
-        'lang'              => $lang
+        'help'              => false
    ),
    array(
        'h' => 'help'
    )
 );

-if ($options['lang']) {
-    $SESSION->lang = $options['lang'];
-}
-
 $interactive = empty($options['non-interactive']);

 if ($unrecognized) {
@@ -80,10 +69,6 @@ Options:
 --non-interactive     No interactive questions or confirmations
 --allow-unstable      Upgrade even if the version is not marked as stable yet,
                      required in non-interactive mode.
--lang=CODE           Set preferred language for CLI output. Defaults to the
-                      site language if not set. Defaults to 'en' if the lang
-                      parameter is invalid or if the language pack is not
-                      installed.
 -h, --help            Print out this help

 Example:
@@ -98,7 +83,7 @@ if (empty($CFG->version)) {
    cli_error(get_string('missingconfigversion', 'debug'));
 }

-require("$CFG->dirroot/version.php");       // defines $version, $release, $branch and $maturity
+require("$CFG->dirroot/version.php");       // defines $version, $release and $maturity
 $CFG->target_release = $release;            // used during installation and upgrades

 if ($version < $CFG->version) {
@@ -108,13 +93,8 @@ if ($version < $CFG->version) {
 $oldversion = "$CFG->release ($CFG->version)";
 $newversion = "$release ($version)";

-if (!moodle_needs_upgrading()) {
-    cli_error(get_string('cliupgradenoneed', 'core_admin', $newversion), 0);
-}
-
-// Test environment first.
-list($envstatus, $environment_results) = check_moodle_environment(normalize_version($release), ENV_SELECT_RELEASE);
-if (!$envstatus) {
+// test environment first
+if (!check_moodle_environment(normalize_version($release), $environment_results, false, ENV_SELECT_RELEASE)) {
    $errors = environment_get_errors($environment_results);
    cli_heading(get_string('environment', 'admin'));
    foreach ($errors as $error) {
@@ -124,13 +104,6 @@ if (!$envstatus) {
    exit(1);
 }

-// Test plugin dependencies.
-$failed = array();
-if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
-    cli_problem(get_string('pluginscheckfailed', 'admin', array('pluginslist' => implode(', ', array_unique($failed)))));
-    cli_error(get_string('pluginschecktodo', 'admin'));
-}
-
 if ($interactive) {
    $a = new stdClass();
    $a->oldversion = $oldversion;
@@ -150,8 +123,7 @@ if (isset($maturity)) {
            echo get_string('morehelp') . ': ' . get_docs_url('admin/versions') . PHP_EOL;
            cli_separator();
        } else {
-            cli_problem(get_string('maturitycorewarning', 'admin', $maturitylevel));
-            cli_error(get_string('maturityallowunstable', 'admin'));
+            cli_error(get_string('maturitycorewarning', 'admin', $maturitylevel));
        }
    }
 }
@@ -166,22 +138,17 @@ if ($interactive) {
 }

 if ($version > $CFG->version) {
-    // We purge all of MUC's caches here.
-    // Caches are disabled for upgrade by CACHE_DISABLE_ALL so we must set the first arg to true.
-    // This ensures a real config object is loaded and the stores will be purged.
-    // This is the only way we can purge custom caches such as memcache or APC.
-    // Note: all other calls to caches will still used the disabled API.
-    cache_helper::purge_all(true);
    upgrade_core($version, true);
 }
 set_config('release', $release);
-set_config('branch', $branch);

 // unconditionally upgrade
 upgrade_noncore(true);

 // log in as admin - we need doanything permission when applying defaults
-\core\session\manager::set_user(get_admin());
+$admins = get_admins();
+$admin = reset($admins);
+session_set_user($admin);

 // apply all default settings, just in case do it twice to fill all defaults
 admin_apply_default_settings(NULL, false);
@@ -1,83 +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 course formats
- *
- * @package    core_admin
- * @copyright  2012 Marina Glancy
- * @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);
-$formatname   = required_param('format', PARAM_PLUGIN);
-
-$syscontext = context_system::instance();
-$PAGE->set_url('/admin/courseformats.php');
-$PAGE->set_context($syscontext);
-
-require_login();
-require_capability('moodle/site:config', $syscontext);
-require_sesskey();
-
-$return = new moodle_url('/admin/settings.php', array('section' => 'manageformats'));
-
-$formatplugins = core_plugin_manager::instance()->get_plugins_of_type('format');
-$sortorder = array_flip(array_keys($formatplugins));
-
-if (!isset($formatplugins[$formatname])) {
-    print_error('courseformatnotfound', 'error', $return, $formatname);
-}
-
-switch ($action) {
-    case 'disable':
-        if ($formatplugins[$formatname]->is_enabled()) {
-            if (get_config('moodlecourse', 'format') === $formatname) {
-                print_error('cannotdisableformat', 'error', $return);
-            }
-            set_config('disabled', 1, 'format_'. $formatname);
-            core_plugin_manager::reset_caches();
-        }
-        break;
-    case 'enable':
-        if (!$formatplugins[$formatname]->is_enabled()) {
-            unset_config('disabled', 'format_'. $formatname);
-            core_plugin_manager::reset_caches();
-        }
-        break;
-    case 'up':
-        if ($sortorder[$formatname]) {
-            $currentindex = $sortorder[$formatname];
-            $seq = array_keys($formatplugins);
-            $seq[$currentindex] = $seq[$currentindex-1];
-            $seq[$currentindex-1] = $formatname;
-            set_config('format_plugins_sortorder', implode(',', $seq));
-        }
-        break;
-    case 'down':
-        if ($sortorder[$formatname] < count($sortorder)-1) {
-            $currentindex = $sortorder[$formatname];
-            $seq = array_keys($formatplugins);
-            $seq[$currentindex] = $seq[$currentindex+1];
-            $seq[$currentindex+1] = $formatname;
-            set_config('format_plugins_sortorder', implode(',', $seq));
-        }
-        break;
-}
-redirect($return);
@@ -53,7 +53,7 @@ require_once($CFG->libdir.'/clilib.php');
 require_once($CFG->libdir.'/cronlib.php');

 // extra safety
-\core\session\manager::write_close();
+session_get_instance()->write_close();

 // check if execution allowed
 if (!empty($CFG->cronclionly)) {
@@ -72,10 +72,21 @@ if (!empty($CFG->cronremotepassword)) {
 }

 // send mime type and encoding
-@header('Content-Type: text/plain; charset=utf-8');
-
-// we do not want html markup in emulated CLI
-@ini_set('html_errors', 'off');
+if (check_browser_version('MSIE')) {
+    //ugly IE hack to work around downloading instead of viewing
+    @header('Content-Type: text/html; charset=utf-8');
+    echo "<xmp>"; //<pre> is not good enough for us here
+} else {
+    //send proper plaintext header
+    @header('Content-Type: text/plain; charset=utf-8');
+}

 // execute the cron
 cron_run();
+
+// finish the IE hack
+if (check_browser_version('MSIE')) {
+    echo "</xmp>";
+}
+
+
@@ -1,82 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Lets users manage data formats
- *
- * @license    http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @copyright  2016 Brendan Heywood (brendan@catalyst-au.net)
- * @package    core
- * @subpackage dataformat
- */
-
-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-
-$action = required_param('action', PARAM_ALPHANUMEXT);
-$name   = required_param('name', PARAM_PLUGIN);
-
-$syscontext = context_system::instance();
-$PAGE->set_url('/admin/dataformats.php');
-$PAGE->set_context($syscontext);
-
-require_login();
-require_capability('moodle/site:config', $syscontext);
-require_sesskey();
-
-$return = new moodle_url('/admin/settings.php', array('section' => 'managedataformats'));
-
-$plugins = core_plugin_manager::instance()->get_plugins_of_type('dataformat');
-$sortorder = array_flip(array_keys($plugins));
-
-if (!isset($plugins[$name])) {
-    print_error('courseformatnotfound', 'error', $return, $name);
-}
-
-switch ($action) {
-    case 'disable':
-        if ($plugins[$name]->is_enabled()) {
-            set_config('disabled', 1, 'dataformat_'. $name);
-            core_plugin_manager::reset_caches();
-        }
-        break;
-    case 'enable':
-        if (!$plugins[$name]->is_enabled()) {
-            unset_config('disabled', 'dataformat_'. $name);
-            core_plugin_manager::reset_caches();
-        }
-        break;
-    case 'up':
-        if ($sortorder[$name]) {
-            $currentindex = $sortorder[$name];
-            $seq = array_keys($plugins);
-            $seq[$currentindex] = $seq[$currentindex - 1];
-            $seq[$currentindex - 1] = $name;
-            set_config('dataformat_plugins_sortorder', implode(',', $seq));
-        }
-        break;
-    case 'down':
-        if ($sortorder[$name] < count($sortorder) - 1) {
-            $currentindex = $sortorder[$name];
-            $seq = array_keys($plugins);
-            $seq[$currentindex] = $seq[$currentindex + 1];
-            $seq[$currentindex + 1] = $name;
-            set_config('dataformat_plugins_sortorder', implode(',', $seq));
-        }
-        break;
-}
-redirect($return);
-
@@ -0,0 +1,32 @@
+<?PHP
+// dbperformance.php - shows latest ADOdb stats for the current server
+
+// disable moodle specific debug messages and any errors in output
+define('NO_DEBUG_DISPLAY', true);
+
+require_once('../config.php');
+
+error('TODO: rewrite db perf code'); // TODO: rewrite
+
+
+    $topframe    = optional_param('topframe', 0, PARAM_BOOL);
+    $bottomframe = optional_param('bottomframe', 0, PARAM_BOOL);
+    $do          = optional_param('do', '', PARAM_ALPHA);
+
+    require_login();
+
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+
+    $strdatabaseperformance = get_string("databaseperformance");
+    $stradministration = get_string("administration");
+    $site = get_site();
+
+    if (!empty($topframe)) {
+        $PAGE->set_url('/admin/dbperformance.php');
+        $PAGE->navbar->add($stradministration, new moodle_url('/admin/index.php'));
+        $PAGE->navbar->add($strdatabaseperformance);
+        $PAGE->set_title("$site->shortname: $strdatabaseperformance");
+        $PAGE->set_heading($site->fullname);
+        echo $OUTPUT->header();
+        exit;
+    }
@@ -0,0 +1,19 @@
+<?php
+
+if (!defined('MOODLE_INTERNAL')) {
+    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+}
+
+require_once $CFG->libdir.'/formslib.php';
+
+class database_export_form extends moodleform {
+
+    function definition() {
+        $mform = $this->_form;
+
+        $mform->addElement('header', 'database', get_string('dbexport', 'dbtransfer'));
+        $mform->addElement('textarea', 'description', get_string('description'), array('rows'=>5, 'cols'=>60));
+
+        $this->add_action_buttons(false, get_string('exportdata', 'dbtransfer'));
+    }
+}
@@ -0,0 +1,48 @@
+<?php
+
+if (!defined('MOODLE_INTERNAL')) {
+    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
+}
+
+require_once $CFG->libdir.'/formslib.php';
+
+class database_transfer_form extends moodleform {
+
+    function definition() {
+        $mform = $this->_form;
+
+        $mform->addElement('header', 'database', get_string('dbtransfer', 'dbtransfer'));
+
+        $supported = array (
+            'mysqli/native',
+            'pgsql/native',
+            'mssql/native',
+            'oci/native',
+            'sqlite3/pdo',
+        );
+        $drivers = array();
+        foreach($supported as $driver) {
+            list($dbtype, $dblibrary) = explode('/', $driver);
+            $targetdb = moodle_database::get_driver_instance($dbtype, $dblibrary);
+            if ($targetdb->driver_installed() !== true) {
+                continue;
+            }
+            $drivers[$driver] = $driver;
+        }
+
+        $mform->addElement('select', 'driver', get_string('dbtype', 'install'), $drivers);
+        $mform->addElement('text', 'dbhost', get_string('dbhost', 'install'));
+        $mform->addElement('text', 'dbname', get_string('database', 'install'));
+        $mform->addElement('text', 'dbuser', get_string('user'));
+        $mform->addElement('text', 'dbpass', get_string('password'));
+        $mform->addElement('text', 'prefix', get_string('dbprefix', 'install'));
+
+        $mform->addRule('dbhost', get_string('required'), 'required', null);
+        $mform->addRule('dbname', get_string('required'), 'required', null);
+        $mform->addRule('dbuser', get_string('required'), 'required', null);
+        $mform->addRule('dbpass', get_string('required'), 'required', null);
+        $mform->addRule('prefix', get_string('required'), 'required', null);
+
+        $this->add_action_buttons(false, get_string('transferdata', 'dbtransfer'));
+    }
+}
@@ -0,0 +1,21 @@
+<?php
+
+require('../../config.php');
+require_once('lib.php');
+require_once('database_export_form.php');
+
+require_login();
+admin_externalpage_setup('dbexport');
+
+//create form
+$form = new database_export_form();
+
+if ($data = $form->get_data()) {
+    dbtransfer_export_xml_database($data->description, $DB);
+    die;
+}
+
+echo $OUTPUT->header();
+// TODO: add some more info here
+$form->display();
+echo $OUTPUT->footer();
@@ -0,0 +1,47 @@
+<?php
+
+require('../../config.php');
+require_once('lib.php');
+require_once('database_transfer_form.php');
+
+require_login();
+admin_externalpage_setup('dbtransfer');
+
+// Create the form
+$form = new database_transfer_form();
+
+// If we have valid input.
+if ($data = $form->get_data()) {
+    // Connect to the other database.
+    list($dbtype, $dblibrary) = explode('/', $data->driver);
+    $targetdb = moodle_database::get_driver_instance($dbtype, $dblibrary);
+    if (!$targetdb->connect($data->dbhost, $data->dbuser, $data->dbpass, $data->dbname, $data->prefix, null)) {
+        throw new dbtransfer_exception('notargetconectexception', null, "$CFG->wwwroot/$CFG->admin/dbtransfer/");
+    }
+    if ($targetdb->get_tables()) {
+        throw new dbtransfer_exception('targetdatabasenotempty', null, "$CFG->wwwroot/$CFG->admin/dbtransfer/");
+    }
+
+    // Start output.
+    echo $OUTPUT->header();
+    $data->dbtype = $dbtype;
+    echo $OUTPUT->heading(get_string('transferringdbto', 'dbtransfer', $data));
+
+    // Do the transfer.
+    $feedback = new html_list_progress_trace();
+    dbtransfer_transfer_database($DB, $targetdb, $feedback);
+    $feedback->finished();
+
+    // Finish up.
+    echo $OUTPUT->notification(get_string('success'), 'notifysuccess');
+    echo $OUTPUT->continue_button("$CFG->wwwroot/$CFG->admin/");
+    echo $OUTPUT->footer();
+    die;
+}
+
+// Otherwise display the settings form.
+echo $OUTPUT->header();
+echo $OUTPUT->heading(get_string('transferdbtoserver', 'dbtransfer'));
+echo '<p>', get_string('transferdbintro', 'dbtransfer'), "</p>\n\n";
+$form->display();
+echo $OUTPUT->footer();
@@ -0,0 +1,52 @@
+<?php
+
+/*
+
+TODO:
+  - exporting to server file >2GB fails in 32bit operating systems - needs warning
+  - we may run out of disk space exporting to srever file - we must verify the file is not truncated; read from the end of file?
+  - when sending file >4GB - FAT32 limit, Apache limit, browser limit - needs warning
+  - there must be some form of progress bar during export, transfer - new tracking class could be passed around
+  - command line operation - could work around some 2G/4G limits in PHP; useful for cron full backups
+  - by default allow exporting into empty database only (no tables with the same prefix yet)
+  - all dangerous operation (like deleting of all data) should be confirmed by key found in special file in dataroot
+    (user would need file access to dataroot which might prevent various "accidents")
+  - implement "Export/import running" notification in lib/setup.php (similar to new upgrade flag in config table)
+  - gzip compression when storing xml file - the xml is very verbose and full of repeated tags (zip is not suitable here at all)
+    this could help us keep the files bellow 2G (expected ratio is > 10:1)
+
+*/
+
+require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir.'/dtllib.php');
+
+
+function dbtransfer_export_xml_database($description, $mdb) {
+    @set_time_limit(0);
+
+    session_get_instance()->write_close(); // release session
+
+    header('Content-Type: application/xhtml+xml; charset=utf-8');
+    header('Content-Disposition: attachment; filename=database.xml');
+    header('Expires: 0');
+    header('Cache-Control: must-revalidate,post-check=0,pre-check=0');
+    header('Pragma: public');
+
+    while(@ob_flush());
+
+    $var = new file_xml_database_exporter('php://output', $mdb);
+    $var->export_database($description);
+
+    // no more output
+    die;
+}
+
+
+function dbtransfer_transfer_database($sourcedb, $targetdb, $feedback = null) {
+    @set_time_limit(0);
+
+    session_get_instance()->write_close(); // release session
+
+    $var = new database_mover($sourcedb, $targetdb, true, $feedback);
+    $var->export_database(null);
+}
@@ -0,0 +1,86 @@
+<?php
+
+// Deletes the moodledata directory, COMPLETELY!!
+// BE VERY CAREFUL USING THIS!
+
+    require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+
+    admin_externalpage_setup('purgemoodledata');
+
+    require_login();
+
+    $sure       = optional_param('sure', 0, PARAM_BOOL);
+    $reallysure = optional_param('reallysure', 0, PARAM_BOOL);
+
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+
+    $deletedir = $CFG->dataroot;   // The directory to delete!
+
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading('Purge moodledata');
+
+    if (empty($sure)) {
+        $optionsyes = array('sure'=>'yes', 'sesskey'=>sesskey());
+
+        $formcontinue = new single_button(new moodle_url('delete.php', $optionsyes), get_string('yes'));
+        $formcancel = new single_button('index.php', get_string('no'), 'get');
+        echo $OUTPUT->confirm('Are you completely sure you want to delete everything inside the directory '. $deletedir .' ?', $formcontinue, $formcancel);
+        echo $OUTPUT->footer();
+        exit;
+    }
+
+    if (!data_submitted() or empty($reallysure)) {
+        $optionsyes = array('sure'=>'yes', 'sesskey'=>sesskey(), 'reallysure'=>'yes');
+        $formcontinue = new single_button(new moodle_url('delete.php', $optionsyes), get_string('yes'));
+        $formcancel = new single_button('index.php', get_string('no'), 'get');
+        echo $OUTPUT->confirm('Are you REALLY REALLY completely sure you want to delete everything inside the directory '.
+                $deletedir .' (this includes all user images, and any other course files that have been created) ?',
+                $formcontinue, $formcancel);
+        echo $OUTPUT->footer();
+        exit;
+    }
+
+    if (!confirm_sesskey()) {
+        print_error('wrongcall', 'error');
+    }
+
+    /// OK, here goes ...
+
+    delete_subdirectories($deletedir);
+
+    echo '<h1 align="center">Done!</h1>';
+    echo $OUTPUT->continue_button($CFG->wwwroot);
+    echo $OUTPUT->footer();
+    exit;
+
+
+function delete_subdirectories($rootdir) {
+
+    $dir = opendir($rootdir);
+
+    while (false !== ($file = readdir($dir))) {
+        if ($file != '.' and $file != '..') {
+            $fullfile = $rootdir .'/'. $file;
+            if (filetype($fullfile) == 'dir') {
+                delete_subdirectories($fullfile);
+                echo 'Deleting '. $fullfile .' ... ';
+                if (rmdir($fullfile)) {
+                    echo 'Done.<br />';
+                } else {
+                    echo 'FAILED.<br />';
+                }
+            } else {
+                echo 'Deleting '. $fullfile .' ... ';
+                if (unlink($fullfile)) {
+                    echo 'Done.<br />';
+                } else {
+                    echo 'FAILED.<br />';
+                }
+            }
+        }
+    }
+    closedir($dir);
+}
+
+
@@ -8,18 +8,14 @@ require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/tablelib.php');

-$action  = required_param('action', PARAM_ALPHANUMEXT);
-$editor  = required_param('editor', PARAM_PLUGIN);
-$confirm = optional_param('confirm', 0, PARAM_BOOL);
-
-$PAGE->set_url('/admin/editors.php', array('action'=>$action, 'editor'=>$editor));
-$PAGE->set_context(context_system::instance());
-
 require_login();
-require_capability('moodle/site:config', context_system::instance());
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));

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

+$action = optional_param('action', '', PARAM_ACTION);
+$editor = optional_param('editor', '', PARAM_SAFEDIR);
+
 // get currently installed and enabled auth plugins
 $available_editors = editors_get_available();
 if (!empty($editor) and empty($available_editors[$editor])) {
@@ -82,7 +78,6 @@ switch ($action) {
            }
        }
        break;
-
    default:
        break;
 }
@@ -93,7 +88,6 @@ if (empty($active_editors)) {
 }

 set_config('texteditors', implode(',', $active_editors));
-core_plugin_manager::reset_caches();

 if ($return) {
    redirect ($returnurl);
@@ -23,20 +23,17 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

-define('NO_OUTPUT_BUFFERING', true);
-
 require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');

-$action  = required_param('action', PARAM_ALPHANUMEXT);
-$enrol   = required_param('enrol', PARAM_PLUGIN);
+$action  = required_param('action', PARAM_ACTION);
+$enrol   = required_param('enrol', PARAM_SAFEDIR);
 $confirm = optional_param('confirm', 0, PARAM_BOOL);

 $PAGE->set_url('/admin/enrol.php');
-$PAGE->set_context(context_system::instance());

 require_login();
-require_capability('moodle/site:config', context_system::instance());
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 require_sesskey();

 $enabled = enrol_get_plugins(true);
@@ -44,14 +41,10 @@ $all     = enrol_get_plugins(false);

 $return = new moodle_url('/admin/settings.php', array('section'=>'manageenrols'));

-$syscontext = context_system::instance();
-
 switch ($action) {
    case 'disable':
        unset($enabled[$enrol]);
        set_config('enrol_plugins_enabled', implode(',', array_keys($enabled)));
-        core_plugin_manager::reset_caches();
-        $syscontext->mark_dirty(); // resets all enrol caches
        break;

    case 'enable':
@@ -61,8 +54,6 @@ switch ($action) {
        $enabled = array_keys($enabled);
        $enabled[] = $enrol;
        set_config('enrol_plugins_enabled', implode(',', $enabled));
-        core_plugin_manager::reset_caches();
-        $syscontext->mark_dirty(); // resets all enrol caches
        break;

    case 'up':
@@ -97,36 +88,32 @@ switch ($action) {
        set_config('enrol_plugins_enabled', implode(',', $enabled));
        break;

-    case 'migrate':
+    case 'uninstall':
+        echo $OUTPUT->header();
+        echo $OUTPUT->heading(get_string('enrolments', 'enrol'));
+
        if (get_string_manager()->string_exists('pluginname', 'enrol_'.$enrol)) {
            $strplugin = get_string('pluginname', 'enrol_'.$enrol);
        } else {
            $strplugin = $enrol;
        }

-        $PAGE->set_title($strplugin);
-        echo $OUTPUT->header();
+        if (!$confirm) {
+            $uurl = new moodle_url('/admin/enrol.php', array('action'=>'uninstall', 'enrol'=>$enrol, 'sesskey'=>sesskey(), 'confirm'=>1));
+            echo $OUTPUT->confirm(get_string('uninstallconfirm', 'enrol', $strplugin), $uurl, $return);
+            echo $OUTPUT->footer();
+            exit;

-        // This may take a long time.
-        core_php_time_limit::raise();
+        } else {  // Delete everything!!
+            uninstall_plugin('enrol', $enrol);

-        // Disable plugin to prevent concurrent cron execution.
-        unset($enabled[$enrol]);
-        set_config('enrol_plugins_enabled', implode(',', array_keys($enabled)));
-
-        echo $OUTPUT->heading(get_string('uninstallmigrating', 'enrol', 'enrol_'.$enrol));
-
-        require_once("$CFG->dirroot/enrol/manual/locallib.php");
-        enrol_manual_migrate_plugin_enrolments($enrol);
-
-        echo $OUTPUT->notification(get_string('success'), 'notifysuccess');
-
-        if (!$return = core_plugin_manager::instance()->get_uninstall_url('enrol_'.$enrol, 'manage')) {
-            $return = new moodle_url('/admin/plugins.php');
+            $a->plugin = $strplugin;
+            $a->directory = "$CFG->dirroot/enrol/$enrol";
+            echo $OUTPUT->notification(get_string('uninstalldeletefiles', 'enrol', $a), 'notifysuccess');
+            echo $OUTPUT->continue_button($return);
+            echo $OUTPUT->footer();
+            exit;
        }
-        echo $OUTPUT->continue_button($return);
-        echo $OUTPUT->footer();
-        exit;
 }


@@ -1,109 +1,137 @@
 <?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 the admin frontend to execute all the checks available
- * in the environment.xml file. It includes database, php and
- * php_extensions. Also, it's possible to update the xml file
- * from moodle.org be able to check more and more versions.
- *
- * @package    core
- * @subpackage admin
- * @copyright  2006 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.com                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards Martin Dougiamas     http://dougiamas.com  //
+//           (C) 2001-3001 Eloy Lafuente (stronk7) http://contiento.com  //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////
+
+// This file is the admin frontend to execute all the checks available
+// in the environment.xml file. It includes database, php and
+// php_extensions. Also, it's possible to update the xml file
+// from moodle.org be able to check more and more versions.
+
+    require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+    require_once($CFG->libdir.'/environmentlib.php');
+    require_once($CFG->libdir.'/componentlib.class.php');
+
+    admin_externalpage_setup('environment');
+
+/// Parameters
+    $action  = optional_param('action', '', PARAM_ACTION);
+    $version = optional_param('version', '', PARAM_FILE); //


-require_once('../config.php');
-require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->libdir.'/environmentlib.php');
-require_once($CFG->libdir.'/componentlib.class.php');
+/// Get some strings
+    $stradmin = get_string('administration');
+    $stradminhelpenvironment = get_string("adminhelpenvironment");
+    $strenvironment = get_string('environment', 'admin');
+    $strerror = get_string('error');
+    $strmoodleversion = get_string('moodleversion');
+    $strupdate = get_string('updatecomponent', 'admin');
+    $strupwards = get_string('upwards', 'admin');
+    $strmisc = get_string('miscellaneous');

-// Parameters
-$action  = optional_param('action', '', PARAM_ALPHANUMEXT);
-$version = optional_param('version', '', PARAM_FILE); //
+/// Print the header stuff
+    echo $OUTPUT->header();

-$extraurlparams = array();
-if ($version) {
-    $extraurlparams['version'] = $version;
-}
-admin_externalpage_setup('environment', '', $extraurlparams);
+/// Print the component download link
+    echo '<div class="reportlink"><a href="environment.php?action=updatecomponent&amp;sesskey='.sesskey().'">'.$strupdate.'</a></div>';

-// Handle the 'updatecomponent' action
-if ($action == 'updatecomponent' && confirm_sesskey()) {
-    // Create component installer and execute it
-    if ($cd = new component_installer('https://download.moodle.org',
-                                      'environment',
-                                      'environment.zip')) {
-        $status = $cd->install(); //returns COMPONENT_(ERROR | UPTODATE | INSTALLED)
-        switch ($status) {
-            case COMPONENT_ERROR:
-                if ($cd->get_error() == 'remotedownloaderror') {
-                    $a = new stdClass();
-                    $a->url  = 'https://download.moodle.org/environment/environment.zip';
-                    $a->dest = $CFG->dataroot . '/';
-                    print_error($cd->get_error(), 'error', $PAGE->url, $a);
-                    die();
+    echo $OUTPUT->heading($strenvironment);

-                } else {
-                    print_error($cd->get_error(), 'error', $PAGE->url);
-                    die();
-                }
-
-            case COMPONENT_UPTODATE:
-                redirect($PAGE->url, get_string($cd->get_error(), 'error'));
-                die;
-
-            case COMPONENT_INSTALLED:
-                redirect($PAGE->url, get_string('componentinstalled', 'admin'));
-                die;
-        }
-    }
-}
-
-// Get current Moodle version
-$current_version = $CFG->release;
-
-// Calculate list of versions
-$versions = array();
-if ($contents = load_environment_xml()) {
-    if ($env_versions = get_list_of_environment_versions($contents)) {
-        // Set the current version at the beginning
-        $env_version = normalize_version($current_version); //We need this later (for the upwards)
-        $versions[$env_version] = $current_version;
-        // If no version has been previously selected, default to $current_version
-        if (empty($version)) {
-            $version =  $env_version;
-        }
-        //Iterate over each version, adding bigger than current
-        foreach ($env_versions as $env_version) {
-            if (version_compare(normalize_version($current_version), $env_version, '<')) {
-                $versions[$env_version] = $env_version;
+/// Handle the 'updatecomponent' action
+    if ($action == 'updatecomponent' && confirm_sesskey()) {
+    /// Create component installer and execute it
+        if ($cd = new component_installer('http://download.moodle.org',
+                                          'environment',
+                                          'environment.zip')) {
+            $status = $cd->install(); //returns COMPONENT_(ERROR | UPTODATE | INSTALLED)
+            switch ($status) {
+                case COMPONENT_ERROR:
+                    if ($cd->get_error() == 'remotedownloaderror') {
+                        $a = new stdClass();
+                        $a->url = 'http://download.moodle.org/environment/environment.zip';
+                        $a->dest= $CFG->dataroot.'/';
+                        echo $OUTPUT->box(get_string($cd->get_error(), 'error', $a), 'errorbox');
+                    } else {
+                        echo $OUTPUT->box(get_string($cd->get_error(), 'error'), 'errorbox');
+                    }
+                    break;
+                case COMPONENT_UPTODATE:
+                    echo $OUTPUT->box(get_string($cd->get_error(), 'error'));
+                    break;
+                case COMPONENT_INSTALLED:
+                    echo $OUTPUT->box(get_string('componentinstalled', 'admin'));
+                    break;
            }
        }
-        // Add 'upwards' to the last element
-        $versions[$env_version] = $env_version.' '.get_string('upwards', 'admin');
-    } else {
-        $versions = array('error' => get_string('error'));
    }
-}

-// Get the results of the environment check.
-list($envstatus, $environment_results) = check_moodle_environment($version, ENV_SELECT_NEWER);
+/// Start of main box
+    echo $OUTPUT->box_start();
+
+    echo "<div style=\"text-align:center\">".$stradminhelpenvironment."</div><br />";
+
+/// Get current Moodle version
+    $current_version = $CFG->release;
+
+/// Calculate list of versions
+    $versions = array();
+    if ($contents = load_environment_xml()) {
+        if ($env_versions = get_list_of_environment_versions($contents)) {
+        /// Set the current version at the beginning
+            $env_version = normalize_version($current_version); //We need this later (for the upwards)
+            $versions[$env_version] = $current_version;
+        /// If no version has been previously selected, default to $current_version
+            if (empty($version)) {
+                $version =  $env_version;
+            }
+        ///Iterate over each version, adding bigger than current
+            foreach ($env_versions as $env_version) {
+                if (version_compare(normalize_version($current_version), $env_version, '<')) {
+                    $versions[$env_version] = $env_version;
+                }
+            }
+        /// Add 'upwards' to the last element
+            $versions[$env_version] = $env_version.' '.$strupwards;
+        } else {
+            $versions = array('error' => $strerror);
+        }
+    }
+
+/// Print form and popup menu
+    echo '<div style="text-align:center"> ';
+    $select = new single_select(new moodle_url('/admin/environment.php'), 'version', $versions, $version, null);
+    $select->label = $strmoodleversion;
+    echo $OUTPUT->render($select);
+    echo '</div>';
+
+/// End of main box
+    echo $OUTPUT->box_end();
+
+/// Gather and show results
+    $status = check_moodle_environment($version, $environment_results);
+
+/// Print footer
+    echo $OUTPUT->footer();

-// Display the page.
-$output = $PAGE->get_renderer('core', 'admin');
-echo $output->environment_check_page($versions, $version, $envstatus, $environment_results);
@@ -1,232 +1,260 @@
 <?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// NOTICE OF COPYRIGHT                                                   //
+//                                                                       //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//          http://moodle.org                                            //
+//                                                                       //
+// Copyright (C) 1999 onwards Martin Dougiamas  http://dougiamas.com     //
+//                                                                       //
+// This program is free software; you can redistribute it and/or modify  //
+// it under the terms of the GNU General Public License as published by  //
+// the Free Software Foundation; either version 2 of the License, or     //
+// (at your option) any later version.                                   //
+//                                                                       //
+// This program is distributed in the hope that it will be useful,       //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
+// GNU General Public License for more details:                          //
+//                                                                       //
+//          http://www.gnu.org/copyleft/gpl.html                         //
+//                                                                       //
+///////////////////////////////////////////////////////////////////////////

 /**
- * Filter management page.
+ * Processes actions from the admin_setting_managefilters object (defined in
+ * adminlib.php).
 *
- * @package    core
- * @copyright  1999 onwards Martin Dougiamas  http://dougiamas.com
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @package administration
+ *//** */

-require_once(__DIR__ . '/../config.php');
-require_once($CFG->libdir . '/adminlib.php');
+    require_once(dirname(__FILE__) . '/../config.php');
+    require_once($CFG->libdir . '/adminlib.php');

-$action = optional_param('action', '', PARAM_ALPHA);
-$filterpath = optional_param('filterpath', '', PARAM_PLUGIN);
+    $action = optional_param('action', '', PARAM_ACTION);
+    $filterpath = optional_param('filterpath', '', PARAM_PATH);

-require_login();
-$systemcontext = context_system::instance();
-require_capability('moodle/site:config', $systemcontext);
+    require_login();
+    $systemcontext = get_context_instance(CONTEXT_SYSTEM);
+    require_capability('moodle/site:config', $systemcontext);

-admin_externalpage_setup('managefilters');
+    $returnurl = "$CFG->wwwroot/$CFG->admin/filters.php";
+    admin_externalpage_setup('managefilters');

-// Clean up bogus filter states first.
-$plugininfos = core_plugin_manager::instance()->get_plugins_of_type('filter');
-$filters = array();
-$states = filter_get_global_states();
-foreach ($states as $state) {
-    if (!isset($plugininfos[$state->filter]) and !get_config('filter_'.$state->filter, 'version')) {
-        // Purge messy leftovers after incorrectly uninstalled plugins and unfinished installs.
-        $DB->delete_records('filter_active', array('filter' => $state->filter));
-        $DB->delete_records('filter_config', array('filter' => $state->filter));
-        error_log('Deleted bogus "filter_'.$state->filter.'" states and config data.');
-    } else {
-        $filters[$state->filter] = $state;
+    $filters = filter_get_global_states();
+
+    // In case any new filters have been installed, but not put in the table yet.
+    $fitlernames = filter_get_all_installed();
+    $newfilters = $fitlernames;
+    foreach ($filters as $filter => $notused) {
+        unset($newfilters[$filter]);
    }
-}

-// Add properly installed and upgraded filters to the global states table.
-foreach ($plugininfos as $filter => $info) {
-    if (isset($filters[$filter])) {
-        continue;
-    }
-    /** @var \core\plugininfo\base $info */
-    if ($info->is_installed_and_upgraded()) {
-        filter_set_global_state($filter, TEXTFILTER_DISABLED);
-        $states = filter_get_global_states();
-        foreach ($states as $state) {
-            if ($state->filter === $filter) {
-                $filters[$filter] = $state;
-                break;
-            }
+/// Process actions ============================================================
+
+    if ($action) {
+        if (!isset($filters[$filterpath]) && !isset($newfilters[$filterpath])) {
+            throw new moodle_exception('filternotinstalled', 'error', $returnurl, $filterpath);
+        }
+
+        if (!confirm_sesskey()) {
+            redirect($returnurl);
        }
    }
-}

-if ($action) {
-    require_sesskey();
-}
-
-// Process actions.
-switch ($action) {
+    switch ($action) {

    case 'setstate':
-        if (isset($filters[$filterpath]) and $newstate = optional_param('newstate', '', PARAM_INT)) {
+        if ($newstate = optional_param('newstate', '', PARAM_INTEGER)) {
            filter_set_global_state($filterpath, $newstate);
            if ($newstate == TEXTFILTER_DISABLED) {
                filter_set_applies_to_strings($filterpath, false);
            }
+            unset($newfilters[$filterpath]);
        }
        break;

    case 'setapplyto':
-        if (isset($filters[$filterpath])) {
-            $applytostrings = optional_param('stringstoo', false, PARAM_BOOL);
-            filter_set_applies_to_strings($filterpath, $applytostrings);
-        }
+        $applytostrings = optional_param('stringstoo', false, PARAM_BOOL);
+        filter_set_applies_to_strings($filterpath, $applytostrings);
        break;

    case 'down':
        if (isset($filters[$filterpath])) {
-            filter_set_global_state($filterpath, $filters[$filterpath]->active, 1);
+            $oldpos = $filters[$filterpath]->sortorder;
+            if ($oldpos <= count($filters)) {
+                filter_set_global_state($filterpath, $filters[$filterpath]->active, $oldpos + 1);
+            }
        }
        break;

    case 'up':
        if (isset($filters[$filterpath])) {
            $oldpos = $filters[$filterpath]->sortorder;
-            filter_set_global_state($filterpath, $filters[$filterpath]->active, -1);
+            if ($oldpos >= 1) {
+                filter_set_global_state($filterpath, $filters[$filterpath]->active, $oldpos - 1);
+            }
        }
        break;
-}

-// Reset caches and return.
-if ($action) {
-    reset_text_filters_cache();
-    core_plugin_manager::reset_caches();
-    redirect(new moodle_url('/admin/filters.php'));
-}
+    case 'delete':
+        if (!empty($filternames[$filterpath])) {
+            $filtername = $filternames[$filterpath];
+        } else {
+            $filtername = $filterpath;
+        }

-// Print the page heading.
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('filtersettings', 'admin'));
+        if (substr($filterpath, 0, 4) == 'mod/') {
+            $mod = basename($filterpath);
+            $a = new stdClass;
+            $a->filter = $filtername;
+            $a->module = get_string('modulename', $mod);
+            print_error('cannotdeletemodfilter', 'admin', $returnurl, $a);
+        }

-$states = filter_get_global_states();
-$stringfilters = filter_get_string_filters();
+        // If not yet confirmed, display a confirmation message.
+        if (!optional_param('confirm', '', PARAM_BOOL)) {
+            $title = get_string('deletefilterareyousure', 'admin', $filtername);
+            echo $OUTPUT->header();
+            echo $OUTPUT->heading($title);

-$table = new html_table();
-$table->head  = array(get_string('filter'), get_string('isactive', 'filters'),
-        get_string('order'), get_string('applyto', 'filters'), get_string('settings'), get_string('uninstallplugin', 'core_admin'));
-$table->colclasses = array ('leftalign', 'leftalign', 'centeralign', 'leftalign', 'leftalign', 'leftalign');
-$table->attributes['class'] = 'admintable generaltable';
-$table->id = 'filterssetting';
-$table->data  = array();
+            $linkcontinue = new moodle_url($returnurl, array('action' => 'delete', 'filterpath' => $filterpath, 'confirm' => 1));
+            $formcancel = new single_button(new moodle_url($returnurl), get_string('no'), 'get');
+            echo $OUTPUT->confirm(get_string('deletefilterareyousuremessage', 'admin', $filtername), $linkcontinue, $formcancel);
+            echo $OUTPUT->footer();
+            exit;
+        }

-$lastactive = null;
-foreach ($states as $state) {
-    if ($state->active != TEXTFILTER_DISABLED) {
-        $lastactive = $state->filter;
+        // Do the deletion.
+        $title = get_string('deletingfilter', 'admin', $filtername);
+        echo $OUTPUT->header();
+        echo $OUTPUT->heading($title);
+
+        // Delete all data for this plugin.
+        filter_delete_all_for_filter($filterpath);
+
+        $a = new stdClass;
+        $a->filter = $filtername;
+        $a->directory = $filterpath;
+        echo $OUTPUT->box(get_string('deletefilterfiles', 'admin', $a), 'generalbox', 'notice');
+        echo $OUTPUT->continue_button($returnurl);
+        echo $OUTPUT->footer();
+        exit;
    }
-}

-// Iterate through filters adding to display table.
-$firstrow = true;
-foreach ($states as $state) {
-    $filter = $state->filter;
-    if (!isset($plugininfos[$filter])) {
-        continue;
+    // Add any missing filters to the DB table.
+    foreach ($newfilters as $filter => $notused) {
+        filter_set_global_state($filter, TEXTFILTER_DISABLED);
    }
-    $plugininfo = $plugininfos[$filter];
-    $applytostrings = isset($stringfilters[$filter]) && $state->active != TEXTFILTER_DISABLED;
-    $row = get_table_row($plugininfo, $state, $firstrow, $filter == $lastactive, $applytostrings);
-    $table->data[] = $row;
-    if ($state->active == TEXTFILTER_DISABLED) {
+
+    // Reset caches and return
+    if ($action) {
+        reset_text_filters_cache();
+        redirect($returnurl);
+    }
+
+/// End of process actions =====================================================
+
+/// Print the page heading.
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('filtersettings', 'admin'));
+
+    $activechoices = array(
+        TEXTFILTER_DISABLED => get_string('disabled', 'filters'),
+        TEXTFILTER_OFF => get_string('offbutavailable', 'filters'),
+        TEXTFILTER_ON => get_string('on', 'filters'),
+    );
+    $applytochoices = array(
+        0 => get_string('content', 'filters'),
+        1 => get_string('contentandheadings', 'filters'),
+    );
+
+    $filters = filter_get_global_states();
+
+    // In case any new filters have been installed, but not put in the table yet.
+    $filternames = filter_get_all_installed();
+    $newfilters = $filternames;
+    foreach ($filters as $filter => $notused) {
+        unset($newfilters[$filter]);
+    }
+    $stringfilters = filter_get_string_filters();
+
+    $table = new html_table();
+    $table->head  = array(get_string('filter'), get_string('isactive', 'filters'),
+            get_string('order'), get_string('applyto', 'filters'), get_string('settings'), get_string('delete'));
+    $table->align = array('left', 'left', 'center', 'left', 'left');
+    $table->width = '100%';
+    $table->data  = array();
+
+    $lastactive = null;
+    foreach ($filters as $filter => $filterinfo) {
+        if ($filterinfo->active != TEXTFILTER_DISABLED) {
+            $lastactive = $filter;
+        }
+    }
+
+    // iterate through filters adding to display table
+    $firstrow = true;
+    foreach ($filters as $filter => $filterinfo) {
+        $applytostrings = isset($stringfilters[$filter]) && $filterinfo->active != TEXTFILTER_DISABLED;
+        $row = get_table_row($filterinfo, $firstrow, $filter == $lastactive, $applytostrings);
+        $table->data[] = $row;
+        if ($filterinfo->active == TEXTFILTER_DISABLED) {
+            $table->rowclasses[] = 'dimmed_text';
+        } else {
+            $table->rowclasses[] = '';
+        }
+        $firstrow = false;
+    }
+    foreach ($newfilters as $filter => $filtername) {
+        $filterinfo = new stdClass;
+        $filterinfo->filter = $filter;
+        $filterinfo->active = TEXTFILTER_DISABLED;
+        $row = get_table_row($filterinfo, false, false, false);
+        $table->data[] = $row;
        $table->rowclasses[] = 'dimmed_text';
-    } else {
-        $table->rowclasses[] = '';
    }
-    $firstrow = false;
-}

-echo html_writer::table($table);
-echo '<p class="filtersettingnote">' . get_string('filterallwarning', 'filters') . '</p>';
-echo $OUTPUT->footer();
-die;
+    echo html_writer::table($table);
+    echo '<p class="filtersettingnote">' . get_string('filterallwarning', 'filters') . '</p>';
+    echo $OUTPUT->footer();

+/// Display helper functions ===================================================

-/**
- * Return action URL.
- *
- * @param string $filterpath
- * @param string $action
- * @return moodle_url
- */
 function filters_action_url($filterpath, $action) {
-    if ($action === 'delete') {
-        return core_plugin_manager::instance()->get_uninstall_url('filter_'.$filterpath, 'manage');
-    }
    return new moodle_url('/admin/filters.php', array('sesskey'=>sesskey(), 'filterpath'=>$filterpath, 'action'=>$action));
 }

-/**
- * Construct table record.
- *
- * @param \core\plugininfo\filter $plugininfo
- * @param stdClass $state
- * @param bool $isfirstrow
- * @param bool $islastactive
- * @param bool $applytostrings
- * @return array data
- */
-function get_table_row(\core\plugininfo\filter $plugininfo, $state, $isfirstrow, $islastactive, $applytostrings) {
-    global $OUTPUT;
+function get_table_row($filterinfo, $isfirstrow, $islastactive, $applytostrings) {
+    global $CFG, $OUTPUT, $activechoices, $applytochoices, $filternames; //TODO: this is sloppy coding style!!
    $row = array();
-    $filter = $state->filter;
-    $active = $plugininfo->is_installed_and_upgraded();
+    $filter = $filterinfo->filter;

-    static $activechoices;
-    static $applytochoices;
-    if (!isset($activechoices)) {
-        $activechoices = array(
-            TEXTFILTER_DISABLED => get_string('disabled', 'core_filters'),
-            TEXTFILTER_OFF => get_string('offbutavailable', 'core_filters'),
-            TEXTFILTER_ON => get_string('on', 'core_filters'),
-        );
-        $applytochoices = array(
-            0 => get_string('content', 'core_filters'),
-            1 => get_string('contentandheadings', 'core_filters'),
-        );
+    // Filter name
+    if (!empty($filternames[$filter])) {
+        $row[] = $filternames[$filter];
+    } else {
+        $row[] = '<span class="error">' . get_string('filemissing', '', $filter) . '</span>';
    }

-    // Filter name.
-    $displayname = $plugininfo->displayname;
-    if (!$plugininfo->rootdir) {
-        $displayname = '<span class="error">' . $displayname . ' - ' . get_string('status_missing', 'core_plugin') . '</span>';
-    } else if (!$active) {
-        $displayname = '<span class="error">' . $displayname . ' - ' . get_string('error') . '</span>';
-    }
-    $row[] = $displayname;
-
-    // Disable/off/on.
-    $select = new single_select(filters_action_url($filter, 'setstate'), 'newstate', $activechoices, $state->active, null, 'active' . $filter);
-    $select->set_label(get_string('isactive', 'filters'), array('class' => 'accesshide'));
+    // Disable/off/on
+    $select = new single_select(filters_action_url($filter, 'setstate'), 'newstate', $activechoices, $filterinfo->active, null, 'active' . basename($filter));
    $row[] = $OUTPUT->render($select);

-    // Re-order.
+    // Re-order
    $updown = '';
-    $spacer = '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" />';
-    if ($state->active != TEXTFILTER_DISABLED) {
+    $spacer = '<img src="' . $OUTPUT->pix_url('spacer') . '" class="iconsmall" alt="" /> ';
+    if ($filterinfo->active != TEXTFILTER_DISABLED) {
        if (!$isfirstrow) {
-            $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'up'), new pix_icon('t/up', get_string('up'), '', array('class' => 'iconsmall')));
+            $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'up'), new pix_icon('t/up', get_string('up')));
        } else {
            $updown .= $spacer;
        }
        if (!$islastactive) {
-            $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'down'), new pix_icon('t/down', get_string('down'), '', array('class' => 'iconsmall')));
+            $updown .= $OUTPUT->action_icon(filters_action_url($filter, 'down'), new pix_icon('t/down', get_string('down')));
        } else {
            $updown .= $spacer;
        }
@@ -234,20 +262,24 @@ function get_table_row(\core\plugininfo\filter $plugininfo, $state, $isfirstrow,
    $row[] = $updown;

    // Apply to strings.
-    $select = new single_select(filters_action_url($filter, 'setapplyto'), 'stringstoo', $applytochoices, $applytostrings, null, 'applyto' . $filter);
-    $select->set_label(get_string('applyto', 'filters'), array('class' => 'accesshide'));
-    $select->disabled = ($state->active == TEXTFILTER_DISABLED);
+    $select = new single_select(filters_action_url($filter, 'setapplyto'), 'stringstoo', $applytochoices, $applytostrings, null, 'applyto' . basename($filter));
+    $select->disabled = $filterinfo->active == TEXTFILTER_DISABLED;
    $row[] = $OUTPUT->render($select);

-    // Settings link, if required.
-    if ($active and filter_has_global_settings($filter)) {
-        $row[] = html_writer::link(new moodle_url('/admin/settings.php', array('section'=>'filtersetting'.$filter)), get_string('settings'));
+    // Settings link, if required
+    if (filter_has_global_settings($filter)) {
+        $row[] = '<a href="' . $CFG->wwwroot . '/' . $CFG->admin . '/settings.php?section=filtersetting' .
+                str_replace('/', '',$filter) . '">' . get_string('settings') . '</a>';
    } else {
        $row[] = '';
    }

-    // Uninstall.
-    $row[] = html_writer::link(filters_action_url($filter, 'delete'), get_string('uninstallplugin', 'core_admin'));
+    // Delete
+    if (substr($filter, 0, 4) != 'mod/') {
+        $row[] = '<a href="' . filters_action_url($filter, 'delete') . '">' . get_string('delete') . '</a>';
+    } else {
+        $row[] = '';
+    }

    return $row;
 }
@@ -0,0 +1,150 @@
+<?php
+/** This expects the output from a command like
+ * clamscan -r --infected --no-summary <files> 2>&1 | php -d error_log=/path/to/log thisfile.php
+ * also it's important that the output of clamscan prints the FULL PATH to each infected file, so use absolute paths for area to scan
+ * also it should be run as root, or whatever the webserver runs as so that it has the right permissions in the quarantine dir etc.
+ * php -d error_log=/path/to/log thisfile.php will override the default error log for php cli, which is stderr, so if you want this script to just print stuff out, use php thisfile.php instead.
+ */
+
+die('TODO: MDL-19380');
+
+$fd = fopen('php://stdin','r');
+if (!$fd) {
+    exit();
+}
+
+require_once(dirname(dirname(__FILE__)).'/config.php');
+require_once($CFG->libdir.'/eventslib.php');
+require_once($CFG->dirroot.'/lib/uploadlib.php'); // contains virus handling stuff.
+
+$site = get_site();
+
+while(!feof($fd)) {
+    $entry = fgets($fd);
+    if (strlen(trim($entry)) == 0) {
+        continue;
+    }
+    if (!$file = validate_line($entry)) {
+        continue;
+    }
+    $bits = explode('/',$file);
+    $a->filename = $bits[count($bits)-1];
+
+    if (!$log = $DB->get_record("log", array("module"=>"upload", "info"=>$file, "action"=>"upload"))) {
+        $a->action = clam_handle_infected_file($file,0,false);
+        clam_replace_infected_file($file);
+        notify_admins_unknown($file,$a);
+        continue;
+    }
+    $action = clam_handle_infected_file($file,$log->userid,true);
+    clam_replace_infected_file($file);
+
+    list($ctxselect, $ctxjoin) = context_instance_preload_sql('c.id', CONTEXT_COURSE, 'ctx');
+    $sql = "SELECT c.id, c.fullname $ctxselect FROM {course} c $ctxjoin WHERE c.id = :courseid";
+    $course = $DB->get_record_sql($sql, array('courseid' => $log->course));
+    context_instance_preload($course);
+
+    $user = $DB->get_record("user", array("id"=>$log->userid));
+    $subject = get_string('virusfoundsubject','moodle',format_string($site->fullname));
+    $a->date = userdate($log->time);
+
+    $a->action = $action;
+    $a->course = format_string($course->fullname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id)));
+    $a->user = fullname($user);
+
+    notify_user($user,$subject,$a);
+    notify_admins($user,$subject,$a);
+}
+fclose($fd);
+
+
+function notify_user($user,$subject,$a) {
+
+    if (!$user) {
+        return false;
+    }
+    $body = get_string('virusfoundlater','moodle',$a);
+
+    $eventdata = new stdClass();
+    $eventdata->modulename        = 'moodle';
+    $eventdata->userfrom          = get_admin();
+    $eventdata->userto            = $user;
+    $eventdata->subject           = $subject;
+    $eventdata->fullmessage       = $body;
+    $eventdata->fullmessageformat = FORMAT_PLAIN;
+    $eventdata->fullmessagehtml   = '';
+    $eventdata->smallmessage      = '';
+    message_send($eventdata);
+}
+
+
+function notify_admins($user,$subject,$a) {
+
+    $admins = get_admins();
+
+    $body = get_string('virusfoundlateradmin','moodle',$a);
+    foreach ($admins as $admin) {
+        $eventdata = new stdClass();
+        $eventdata->modulename        = 'moodle';
+        $eventdata->userfrom          = $admin;
+        $eventdata->userto            = $admin;
+        $eventdata->subject           = $subject;
+        $eventdata->fullmessage       = $body;
+        $eventdata->fullmessageformat = FORMAT_PLAIN;
+        $eventdata->fullmessagehtml   = '';
+        $eventdata->smallmessage      = '';
+        message_send($eventdata);
+    }
+}
+
+function notify_admins_unknown($file,$a) {
+
+    global $site;
+
+    $admins = get_admins();
+    $subject = get_string('virusfoundsubject','moodle',format_string($site->fullname));
+    $body = get_string('virusfoundlateradminnolog','moodle',$a);
+    foreach ($admins as $admin) {
+        $eventdata = new stdClass();
+        $eventdata->modulename        = 'moodle';
+        $eventdata->userfrom          = $admin;
+        $eventdata->userto            = $admin;
+        $eventdata->subject           = $subject;
+        $eventdata->fullmessage       = $body;
+        $eventdata->fullmessageformat = FORMAT_PLAIN;
+        $eventdata->fullmessagehtml   = '';
+        $eventdata->smallmessage      = '';
+        message_send($eventdata);
+    }
+}
+
+function validate_line($line) {
+    global $CFG;
+    if (strpos($line,"FOUND") === false) {
+        return false;
+    }
+    $index = strpos($line,":");
+    $file = substr($line,0,$index);
+    if (!(strpos($file,$CFG->dataroot) === false)) {
+        if (!file_exists($file)) {
+            return false;
+        }
+    }
+    else {
+        if ($file{0} == "/") {
+            $file = $CFG->dataroot.$file;
+        }
+        else {
+            $file = $CFG->dataroot."/".$file;
+        }
+        if (!file_exists($file)) {
+            return false;
+        }
+    }
+    // clean up
+    $file = preg_replace('/\.\//','/',$file);
+    $file = preg_replace('/\/\//','/',$file);
+    return $file;
+}
+
+
@@ -0,0 +1,790 @@
+<?php
+
+    ob_start(); //for whitespace test
+    require_once('../config.php');
+
+    // extra whitespace test - intentionally breaks cookieless mode
+    $extraws = '';
+    while (ob_get_level()) {
+        $extraws .= ob_get_contents();
+        ob_end_clean();
+    }
+
+    require_once($CFG->libdir.'/adminlib.php');
+
+    admin_externalpage_setup('healthcenter');
+
+    define('SEVERITY_NOTICE',      'notice');
+    define('SEVERITY_ANNOYANCE',   'annoyance');
+    define('SEVERITY_SIGNIFICANT', 'significant');
+    define('SEVERITY_CRITICAL',    'critical');
+
+    $solution = optional_param('solution', 0, PARAM_SAFEDIR); //in fact it is class name alhanumeric and _
+
+    require_login();
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+
+    $site = get_site();
+
+    echo $OUTPUT->header();
+
+echo <<<STYLES
+<style type="text/css">
+div#healthnoproblemsfound {
+    width: 60%;
+    margin: auto;
+    padding: 1em;
+    border: 1px black solid;
+    -moz-border-radius: 6px;
+}
+dl.healthissues {
+    width: 60%;
+    margin: auto;
+}
+dl.critical dt, dl.critical dd {
+    background-color: #a71501;
+}
+dl.significant dt, dl.significant dd {
+    background-color: #d36707;
+}
+dl.annoyance dt, dl.annoyance dd {
+    background-color: #dba707;
+}
+dl.notice dt, dl.notice dd {
+    background-color: #e5db36;
+}
+dt.solution, dd.solution, div#healthnoproblemsfound {
+    background-color: #5BB83E !important;
+}
+dl.healthissues dt, dl.healthissues dd {
+    margin: 0px;
+    padding: 1em;
+    border: 1px black solid;
+}
+dl.healthissues dt {
+    font-weight: bold;
+    border-bottom: none;
+    padding-bottom: 0.5em;
+}
+dl.healthissues dd {
+    border-top: none;
+    padding-top: 0.5em;
+    margin-bottom: 10px;
+}
+dl.healthissues dd form {
+    margin-top: 0.5em;
+    text-align: right;
+}
+form#healthformreturn {
+    text-align: center;
+    margin: 2em;
+}
+dd.solution p {
+    padding: 0px;
+    margin: 1em 0px;
+}
+dd.solution li {
+    margin-top: 1em;
+}
+
+</style>
+STYLES;
+
+    if(strpos($solution, 'problem_') === 0 && class_exists($solution)) {
+        health_print_solution($solution);
+    }
+    else {
+        health_find_problems();
+    }
+
+
+    echo $OUTPUT->footer();
+
+
+function health_find_problems() {
+    global $OUTPUT;
+
+    echo $OUTPUT->heading(get_string('healthcenter'));
+
+    $issues   = array(
+        SEVERITY_CRITICAL    => array(),
+        SEVERITY_SIGNIFICANT => array(),
+        SEVERITY_ANNOYANCE   => array(),
+        SEVERITY_NOTICE      => array(),
+    );
+    $problems = 0;
+
+    for($i = 1; $i < 1000000; ++$i) {
+        $classname = sprintf('problem_%06d', $i);
+        if(!class_exists($classname)) {
+            break;
+        }
+        $problem = new $classname;
+        if($problem->exists()) {
+            $severity = $problem->severity();
+            $issues[$severity][$classname] = array(
+                'severity'    => $severity,
+                'description' => $problem->description(),
+                'title'       => $problem->title()
+            );
+            ++$problems;
+        }
+        unset($problem);
+    }
+
+    if($problems == 0) {
+        echo '<div id="healthnoproblemsfound">';
+        echo get_string('healthnoproblemsfound');
+        echo '</div>';
+    }
+    else {
+        echo $OUTPUT->heading(get_string('healthproblemsdetected'));
+        $severities = array(SEVERITY_CRITICAL, SEVERITY_SIGNIFICANT, SEVERITY_ANNOYANCE, SEVERITY_NOTICE);
+        foreach($severities as $severity) {
+            if(!empty($issues[$severity])) {
+                echo '<dl class="healthissues '.$severity.'">';
+                foreach($issues[$severity] as $classname => $data) {
+                    echo '<dt id="'.$classname.'">'.$data['title'].'</dt>';
+                    echo '<dd>'.$data['description'];
+                    echo '<form action="health.php#solution" method="get">';
+                    echo '<input type="hidden" name="solution" value="'.$classname.'" /><input type="submit" value="'.get_string('viewsolution').'" />';
+                    echo '</form></dd>';
+                }
+                echo '</dl>';
+            }
+        }
+    }
+}
+
+function health_print_solution($classname) {
+    global $OUTPUT;
+    $problem = new $classname;
+    $data = array(
+        'title'       => $problem->title(),
+        'severity'    => $problem->severity(),
+        'description' => $problem->description(),
+        'solution'    => $problem->solution()
+    );
+
+    echo $OUTPUT->heading(get_string('healthcenter'));
+    echo $OUTPUT->heading(get_string('healthproblemsolution'));
+    echo '<dl class="healthissues '.$data['severity'].'">';
+    echo '<dt>'.$data['title'].'</dt>';
+    echo '<dd>'.$data['description'].'</dd>';
+    echo '<dt id="solution" class="solution">'.get_string('healthsolution').'</dt>';
+    echo '<dd class="solution">'.$data['solution'].'</dd></dl>';
+    echo '<form id="healthformreturn" action="health.php#'.$classname.'" method="get">';
+    echo '<input type="submit" value="'.get_string('healthreturntomain').'" />';
+    echo '</form>';
+}
+
+class problem_base {
+    function exists() {
+        return false;
+    }
+    function title() {
+        return '???';
+    }
+    function severity() {
+        return SEVERITY_NOTICE;
+    }
+    function description() {
+        return '';
+    }
+    function solution() {
+        return '';
+    }
+}
+
+class problem_000002 extends problem_base {
+    function title() {
+        return 'Extra characters at the end of config.php or other library function';
+    }
+    function exists() {
+        global $extraws;
+
+        if($extraws === '') {
+            return false;
+        }
+        return true;
+    }
+    function severity() {
+        return SEVERITY_SIGNIFICANT;
+    }
+    function description() {
+        return 'Your Moodle configuration file config.php or another library file, contains some characters after the closing PHP tag (?>). This causes Moodle to exhibit several kinds of problems (such as broken downloaded files) and must be fixed.';
+    }
+    function solution() {
+        global $CFG;
+        return 'You need to edit <strong>'.$CFG->dirroot.'/config.php</strong> and remove all characters (including spaces and returns) after the ending ?> tag. These two characters should be the very last in that file. The extra trailing whitespace may be also present in other PHP files that are included from lib/setup.php.';
+    }
+}
+
+class problem_000003 extends problem_base {
+    function title() {
+        return '$CFG->dataroot does not exist or does not have write permissions';
+    }
+    function exists() {
+        global $CFG;
+        if(!is_dir($CFG->dataroot) || !is_writable($CFG->dataroot)) {
+            return true;
+        }
+        return false;
+    }
+    function severity() {
+        return SEVERITY_SIGNIFICANT;
+    }
+    function description() {
+        global $CFG;
+        return 'Your <strong>config.php</strong> says that your "data root" directory is <strong>'.$CFG->dataroot.'</strong>. However, this directory either does not exist or cannot be written to by Moodle. This means that a variety of problems will be present, such as users not being able to log in and not being able to upload any files. It is imperative that you address this problem for Moodle to work correctly.';
+    }
+    function solution() {
+        global $CFG;
+        return 'First of all, make sure that the directory <strong>'.$CFG->dataroot.'</strong> exists. If the directory does exist, then you must make sure that Moodle is able to write to it. Contact your web server administrator and request that he gives write permissions for that directory to the user that the web server process is running as.';
+    }
+}
+
+class problem_000004 extends problem_base {
+    function title() {
+        return 'cron.php is not set up to run automatically';
+    }
+    function exists() {
+        global $DB;
+        $lastcron = $DB->get_field_sql('SELECT max(lastcron) FROM {modules}');
+        return (time() - $lastcron > 3600 * 24);
+    }
+    function severity() {
+        return SEVERITY_SIGNIFICANT;
+    }
+    function description() {
+        return 'The cron.php mainenance script has not been run in the past 24 hours. This probably means that your server is not configured to automatically run this script in regular time intervals. If this is the case, then Moodle will mostly work as it should but some operations (notably sending email to users) will not be carried out at all.';
+    }
+    function solution() {
+        global $CFG;
+        return 'For detailed instructions on how to enable cron, see <a href="'.$CFG->wwwroot.'/doc/?file=install.html#cron">this section</a> of the installation manual.';
+    }
+}
+
+class problem_000005 extends problem_base {
+    function title() {
+        return 'PHP: session.auto_start is enabled';
+    }
+    function exists() {
+        return ini_get_bool('session.auto_start');
+    }
+    function severity() {
+        return SEVERITY_CRITICAL;
+    }
+    function description() {
+        return 'Your PHP configuration includes an enabled setting, session.auto_start, that <strong>must be disabled</strong> in order for Moodle to work correctly. Notable symptoms arising from this misconfiguration include fatal errors and/or blank pages when trying to log in.';
+    }
+    function solution() {
+        global $CFG;
+        return '<p>There are two ways you can solve this problem:</p><ol><li>If you have access to your main <strong>php.ini</strong> file, then find the line that looks like this: <pre>session.auto_start = 1</pre> and change it to <pre>session.auto_start = 0</pre> and then restart your web server. Be warned that this, as any other PHP setting change, might affect other web applications running on the server.</li><li>Finally, you may be able to change this setting just for your site by creating or editing the file <strong>'.$CFG->dirroot.'/.htaccess</strong> to contain this line: <pre>php_value session.auto_start "0"</pre></li></ol>';
+    }
+}
+
+class problem_000006 extends problem_base {
+    function title() {
+        return 'PHP: magic_quotes_runtime is enabled';
+    }
+    function exists() {
+        return (ini_get_bool('magic_quotes_runtime'));
+    }
+    function severity() {
+        return SEVERITY_SIGNIFICANT;
+    }
+    function description() {
+        return 'Your PHP configuration includes an enabled setting, magic_quotes_runtime, that <strong>must be disabled</strong> in order for Moodle to work correctly. Notable symptoms arising from this misconfiguration include strange display errors whenever a text field that includes single or double quotes is processed.';
+    }
+    function solution() {
+        global $CFG;
+        return '<p>There are two ways you can solve this problem:</p><ol><li>If you have access to your main <strong>php.ini</strong> file, then find the line that looks like this: <pre>magic_quotes_runtime = On</pre> and change it to <pre>magic_quotes_runtime = Off</pre> and then restart your web server. Be warned that this, as any other PHP setting change, might affect other web applications running on the server.</li><li>Finally, you may be able to change this setting just for your site by creating or editing the file <strong>'.$CFG->dirroot.'/.htaccess</strong> to contain this line: <pre>php_value magic_quotes_runtime "Off"</pre></li></ol>';
+    }
+}
+
+class problem_000007 extends problem_base {
+    function title() {
+        return 'PHP: file_uploads is disabled';
+    }
+    function exists() {
+        return !ini_get_bool('file_uploads');
+    }
+    function severity() {
+        return SEVERITY_SIGNIFICANT;
+    }
+    function description() {
+        return 'Your PHP configuration includes a disabled setting, file_uploads, that <strong>must be enabled</strong> to let Moodle offer its full functionality. Until this setting is enabled, it will not be possible to upload any files into Moodle. This includes, for example, course content and user pictures.';
+    }
+    function solution() {
+        global $CFG;
+        return '<p>There are two ways you can solve this problem:</p><ol><li>If you have access to your main <strong>php.ini</strong> file, then find the line that looks like this: <pre>file_uploads = Off</pre> and change it to <pre>file_uploads = On</pre> and then restart your web server. Be warned that this, as any other PHP setting change, might affect other web applications running on the server.</li><li>Finally, you may be able to change this setting just for your site by creating or editing the file <strong>'.$CFG->dirroot.'/.htaccess</strong> to contain this line: <pre>php_value file_uploads "On"</pre></li></ol>';
+    }
+}
+
+class problem_000008 extends problem_base {
+    function title() {
+        return 'PHP: memory_limit cannot be controlled by Moodle';
+    }
+    function exists() {
+        global $CFG;
+
+        $oldmemlimit = @ini_get('memory_limit');
+        if (empty($oldmemlimit)) {
+            // PHP not compiled with memory limits, this means that it's
+            // probably limited to 8M or in case of Windows not at all.
+            // We can ignore it for now - there is not much to test anyway
+            // TODO: add manual test that fills memory??
+            return false;
+        }
+        $oldmemlimit = get_real_size($oldmemlimit);
+        //now lets change the memory limit to something higher
+        $newmemlimit = ($oldmemlimit + 1024*1024*5);
+        raise_memory_limit($newmemlimit);
+        $testmemlimit = get_real_size(@ini_get('memory_limit'));
+        //verify the change had any effect at all
+        if ($oldmemlimit == $testmemlimit) {
+            //memory limit can not be changed - is it big enough then?
+            if ($oldmemlimit < get_real_size('128M')) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        reduce_memory_limit($oldmemlimit);
+        return false;
+    }
+    function severity() {
+        return SEVERITY_NOTICE;
+    }
+    function description() {
+        return 'The settings for PHP on your server do not allow a script to request more memory during its execution. '.
+               'This means that there is a hard limit of '.@ini_get('memory_limit').' for each script. '.
+               'It is possible that certain operations within Moodle will require more than this amount in order '.
+               'to complete successfully, especially if there are lots of data to be processed.';
+    }
+    function solution() {
+        return 'It is recommended that you contact your web server administrator to address this issue.';
+    }
+}
+
+class problem_000009 extends problem_base {
+    function title() {
+        return 'SQL: using account without password';
+    }
+    function exists() {
+        global $CFG;
+        return empty($CFG->dbpass);
+    }
+    function severity() {
+        return SEVERITY_CRITICAL;
+    }
+    function description() {
+        global $CFG;
+        return 'The user account your are connecting to the database server with is set up without a password. This is a very big security risk and is only somewhat lessened if your database is configured to not accept connections from any hosts other than the server Moodle is running on. Unless you use a strong password to connect to the database, you risk unauthorized access to and manipulation of your data.'.($CFG->dbuser != 'root'?'':' <strong>This is especially alarming because such access to the database would be as the superuser (root)!</strong>');
+    }
+    function solution() {
+        global $CFG;
+        return 'You should change the password of the user <strong>'.$CFG->dbuser.'</strong> both in your database and in your Moodle <strong>config.php</strong> immediately!'.($CFG->dbuser != 'root'?'':' It would also be a good idea to change the user account from root to something else, because this would lessen the impact in the event that your database is compromised anyway.');
+    }
+}
+/* // not implemented in 2.0 yet
+class problem_000010 extends problem_base {
+    function title() {
+        return 'Uploaded files: slasharguments disabled or not working';
+    }
+    function exists() {
+        if (!$this->is_enabled()) {
+            return true;
+        }
+        if ($this->status() < 1) {
+            return true;
+        }
+        return false;
+    }
+    function severity() {
+        if ($this->is_enabled() and $this->status() == 0) {
+            return SEVERITY_SIGNIFICANT;
+        } else {
+            return SEVERITY_ANNOYANCE;
+        }
+    }
+    function description() {
+        global $CFG;
+        $desc = 'Slasharguments are needed for relative linking in uploaded resources:<ul>';
+        if (!$this->is_enabled()) {
+            $desc .= '<li>slasharguments are <strong>disabled</strong> in Moodle configuration</li>';
+        } else {
+            $desc .= '<li>slasharguments are enabled in Moodle configuration</li>';
+        }
+        if ($this->status() == -1) {
+            $desc .= '<li>can not run automatic test, you can verify it <a href="'.$CFG->wwwroot.'/file.php/testslasharguments" target="_blank">here</a> manually</li>';
+        } else if ($this->status() == 0) {
+            $desc .= '<li>slashargument test <strong>failed</strong>, please check server configuration</li>';
+        } else {
+            $desc .= '<li>slashargument test passed</li>';
+        }
+        $desc .= '</ul>';
+        return $desc;
+    }
+    function solution() {
+        global $CFG;
+        $enabled = $this->is_enabled();
+        $status = $this->status();
+        $solution = '';
+        if ($enabled and ($status == 0)) {
+            $solution .= 'Slasharguments are enabled, but the test failed. Please disable slasharguments in Moodle configuration or fix the server configuration.<hr />';
+        } else if ((!$enabled) and ($status == 0)) {
+            $solution .= 'Slasharguments are disabled and the test failed. You may try to fix the server configuration.<hr />';
+        } else if ($enabled and ($status == -1)) {
+            $solution .= 'Slasharguments are enabled, <a href="'.$CFG->wwwroot.'/file.php/testslasharguments">automatic testing</a> not possible.<hr />';
+        } else if ((!$enabled) and ($status == -1)) {
+            $solution .= 'Slasharguments are disabled, <a href="'.$CFG->wwwroot.'/file.php/testslasharguments">automatic testing</a> not possible.<hr />';
+        } else if ((!$enabled) and ($status > 0)) {
+            $solution .= 'Slasharguments are disabled though the iternal test is OK. You should enable slasharguments in Moodle configuration.';
+        } else if ($enabled and ($status > 0)) {
+            $solution .= 'Congratulations - everything seems OK now :-D';
+        }
+        if ($status < 1) {
+            $solution .= '<p>IIS:<ul><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li><li>do NOT enable AllowPathInfoForScriptMappings !!!</li><li>slasharguments may not work when using ISAPI and PHP 4.3.10 and older</li></ul></p>';
+            $solution .= '<p>Apache 1:<ul><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li></ul></p>';
+            $solution .= '<p>Apache 2:<ul><li>you must add <code>AcceptPathInfo on</code> to php.ini or .htaccess</li><li>try to add <code>cgi.fix_pathinfo=1</code> to php.ini</li></ul></p>';
+        }
+        return $solution;
+    }
+    function is_enabled() {
+        global $CFG;
+        return !empty($CFG->slasharguments);
+    }
+    function status() {
+        global $CFG;
+        $handle = @fopen($CFG->wwwroot.'/file.php?file=/testslasharguments', "r");
+        $contents = @trim(fread($handle, 10));
+        @fclose($handle);
+        if ($contents != 'test -1') {
+            return -1;
+        }
+        $handle = @fopen($CFG->wwwroot.'/file.php/testslasharguments', "r");
+        $contents = trim(@fread($handle, 10));
+        @fclose($handle);
+        switch ($contents) {
+            case 'test 1': return 1;
+            case 'test 2': return 2;
+            default:  return 0;
+        }
+    }
+}*/
+
+class problem_000012 extends problem_base {
+    function title() {
+        return 'Random questions data consistency';
+    }
+    function exists() {
+        global $DB;
+        return $DB->record_exists_select('question', "qtype = 'random' AND parent <> id", array());
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        return '<p>For random questions, question.parent should equal question.id. ' .
+        'There are some questions in your database for which this is not true. ' .
+        'One way that this could have happened is for random questions restored from backup before ' .
+        '<a href="http://tracker.moodle.org/browse/MDL-5482">MDL-5482</a> was fixed.</p>';
+    }
+    function solution() {
+        global $CFG;
+        return '<p>Upgrade to Moodle 1.9.1 or later, or manually execute the SQL</p>' .
+        '<pre>UPDATE ' . $CFG->prefix . 'question SET parent = id WHERE qtype = \'random\' and parent &lt;> id;</pre>';
+    }
+}
+
+class problem_000013 extends problem_base {
+    function title() {
+        return 'Multi-answer questions data consistency';
+    }
+    function exists() {
+        global $DB;
+        $positionexpr = $DB->sql_position($DB->sql_concat("','", "q.id", "','"),
+                $DB->sql_concat("','", "qma.sequence", "','"));
+        return $DB->record_exists_sql("
+                SELECT * FROM {question} q
+                    JOIN {question_multianswer} qma ON $positionexpr > 0
+                WHERE qma.question <> q.parent") ||
+            $DB->record_exists_sql("
+                SELECT * FROM {question} q
+                    JOIN {question} parent_q ON parent_q.id = q.parent
+                WHERE q.category <> parent_q.category");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        return '<p>For each sub-question whose id is listed in ' .
+        'question_multianswer.sequence, its question.parent field should equal ' .
+        'question_multianswer.question; and each sub-question should be in the same ' .
+        'category as its parent. There are questions in your database for ' .
+        'which this is not the case. One way that this could have happened is ' .
+        'for multi-answer questions restored from backup before ' .
+        '<a href="http://tracker.moodle.org/browse/MDL-14750">MDL-14750</a> was fixed.</p>';
+    }
+    function solution() {
+        return '<p>Upgrade to Moodle 1.9.1 or later, or manually execute the ' .
+        'code in question_multianswer_fix_subquestion_parents_and_categories in ' .
+        '<a href="http://cvs.moodle.org/moodle/question/type/multianswer/db/upgrade.php?revision=1.1.10.2&amp;view=markup">/question/type/multianswer/db/upgrade.php' .
+        'from the 1.9 stable branch</a>.</p>';
+    }
+}
+
+class problem_000014 extends problem_base {
+    function title() {
+        return 'Only multianswer and random questions should be the parent of another question';
+    }
+    function exists() {
+        global $DB;
+        return $DB->record_exists_sql("
+                SELECT * FROM {question} q
+                    JOIN {question} parent_q ON parent_q.id = q.parent
+                WHERE parent_q.qtype NOT IN ('random', 'multianswer')");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        return '<p>You have questions that violate this in your databse. ' .
+        'You will need to investigate to determine how this happened.</p>';
+    }
+    function solution() {
+        return '<p>It is impossible to give a solution without knowing more about ' .
+        ' how the problem was caused. You may be able to get help from the ' .
+        '<a href="http://moodle.org/mod/forum/view.php?f=121">Quiz forum</a>.</p>';
+    }
+}
+
+class problem_000015 extends problem_base {
+    function title() {
+        return 'Question categories should belong to a valid context';
+    }
+    function exists() {
+        global $DB;
+        return $DB->record_exists_sql("
+            SELECT qc.*, (SELECT COUNT(1) FROM {question} q WHERE q.category = qc.id) AS numquestions
+            FROM {question_categories} qc
+                LEFT JOIN {context} con ON qc.contextid = con.id
+            WHERE con.id IS NULL");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        global $DB;
+        $problemcategories = $DB->get_records_sql("
+            SELECT qc.id, qc.name, qc.contextid, (SELECT COUNT(1) FROM {question} q WHERE q.category = qc.id) AS numquestions
+            FROM {question_categories} qc
+                LEFT JOIN {context} con ON qc.contextid = con.id
+            WHERE con.id IS NULL
+            ORDER BY numquestions DESC, qc.name");
+        $table = '<table><thead><tr><th>Cat id</th><th>Category name</th>' .
+        "<th>Context id</th><th>Num Questions</th></tr></thead><tbody>\n";
+        foreach ($problemcategories as $cat) {
+            $table .= "<tr><td>$cat->id</td><td>" . s($cat->name) . "</td><td>" .
+            $cat->contextid ."</td><td>$cat->numquestions</td></tr>\n";
+        }
+        $table .= '</tbody></table>';
+        return '<p>All question categories are linked to a context id, and, ' .
+        'the context they are linked to must exist. The following categories ' .
+        'belong to a non-existant category:</p>' . $table . '<p>Any of these ' .
+        'categories that contain no questions can just be deleted form the database. ' .
+        'Other categories will require more thought.</p>';
+    }
+    function solution() {
+        global $CFG;
+        return '<p>You can delete the empty categories by executing the following SQL:</p><pre>
+DELETE FROM ' . $CFG->prefix . 'question_categories
+WHERE
+    NOT EXISTS (SELECT * FROM ' . $CFG->prefix . 'question q WHERE q.category = ' . $CFG->prefix . 'question_categories.id)
+AND NOT EXISTS (SELECT * FROM ' . $CFG->prefix . 'context con WHERE contextid = con.id)
+        </pre><p>Any remaining categories that contain questions will require more thought. ' .
+        'People in the <a href="http://moodle.org/mod/forum/view.php?f=121">Quiz forum</a> may be able to help.</p>';
+    }
+}
+
+class problem_000016 extends problem_base {
+    function title() {
+        return 'Question categories should belong to the same context as their parent';
+    }
+    function exists() {
+        global $DB;
+        return $DB->record_exists_sql("
+            SELECT parent_qc.id AS parent, child_qc.id AS child, child_qc.contextid
+            FROM {question_categories} child_qc
+                JOIN {question_categories} parent_qc ON child_qc.parent = parent_qc.id
+            WHERE child_qc.contextid <> parent_qc.contextid");
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        global $DB;
+        $problemcategories = $DB->get_records_sql("
+            SELECT
+                parent_qc.id AS parentid, parent_qc.name AS parentname, parent_qc.contextid AS parentcon,
+                child_qc.id AS childid, child_qc.name AS childname, child_qc.contextid AS childcon
+            FROM {question_categories} child_qc
+                JOIN {question_categories} parent_qc ON child_qc.parent = parent_qc.id
+            WHERE child_qc.contextid <> parent_qc.contextid");
+        $table = '<table><thead><tr><th colspan="3">Child category</th><th colspan="3">Parent category</th></tr><tr>' .
+        '<th>Id</th><th>Name</th><th>Context id</th>' .
+        '<th>Id</th><th>Name</th><th>Context id</th>' .
+        "</tr></thead><tbody>\n";
+        foreach ($problemcategories as $cat) {
+            $table .= "<tr><td>$cat->childid</td><td>" . s($cat->childname) .
+            "</td><td>$cat->childcon</td><td>$cat->parentid</td><td>" . s($cat->parentname) .
+            "</td><td>$cat->parentcon</td></tr>\n";
+        }
+        $table .= '</tbody></table>';
+        return '<p>When one question category is the parent of another, then they ' .
+        'should both belong to the same context. This is not true for the following categories:</p>' .
+        $table;
+    }
+    function solution() {
+        return '<p>An automated solution is difficult. It depends whether the ' .
+        'parent or child category is in the wrong pace.' .
+        'People in the <a href="http://moodle.org/mod/forum/view.php?f=121">Quiz forum</a> may be able to help.</p>';
+    }
+}
+
+class problem_000017 extends problem_base {
+    function title() {
+        return 'Question categories tree structure';
+    }
+    function find_problems() {
+        global $DB;
+        static $answer = null;
+
+        if (is_null($answer)) {
+            $categories = $DB->get_records('question_categories', array(), 'id');
+
+            // Look for missing parents.
+            $missingparent = array();
+            foreach ($categories as $category) {
+                if ($category->parent != 0 && !array_key_exists($category->parent, $categories)) {
+                    $missingparent[$category->id] = $category;
+                }
+            }
+
+            // Look for loops.
+            $loops = array();
+            while (!empty($categories)) {
+                $current = array_pop($categories);
+                $thisloop = array($current->id => $current);
+                while (true) {
+                    if (isset($thisloop[$current->parent])) {
+                        // Loop detected
+                        $loops[$current->id] = $thisloop;
+                        break;
+                    } else if (!isset($categories[$current->parent])) {
+                        // Got to the top level, or a category we already know is OK.
+                        break;
+                    } else {
+                        // Continue following the path.
+                        $current = $categories[$current->parent];
+                        $thisloop[$current->id] = $current;
+                        unset($categories[$current->id]);
+                    }
+                }
+            }
+
+            $answer = array($missingparent, $loops);
+        }
+
+        return $answer;
+    }
+    function exists() {
+        list($missingparent, $loops) = $this->find_problems();
+        return !empty($missingparent) || !empty($loops);
+    }
+    function severity() {
+        return SEVERITY_ANNOYANCE;
+    }
+    function description() {
+        list($missingparent, $loops) = $this->find_problems();
+
+        $description = '<p>The question categories should be arranged into tree ' .
+                ' structures by the question_categories.parent field. Sometimes ' .
+                ' this tree structure gets messed up.</p>';
+
+        if (!empty($missingparent)) {
+            $description .= '<p>The following categories are missing their parents:</p><ul>';
+            foreach ($missingparent as $cat) {
+                $description .= "<li>Category $cat->id: " . s($cat->name) . "</li>\n";
+            }
+            $description .= "</ul>\n";
+        }
+
+        if (!empty($loops)) {
+            $description .= '<p>The following categories form a loop of parents:</p><ul>';
+            foreach ($loops as $loop) {
+                $description .= "<li><ul>\n";
+                foreach ($loop as $cat) {
+                    $description .= "<li>Category $cat->id: " . s($cat->name) . " has parent $cat->parent</li>\n";
+                }
+                $description .= "</ul></li>\n";
+            }
+            $description .= "</ul>\n";
+        }
+
+        return $description;
+    }
+    function solution() {
+        global $CFG;
+        list($missingparent, $loops) = $this->find_problems();
+
+        $solution = '<p>Consider executing the following SQL queries. These fix ' .
+                'the problem by moving some categories to the top level.</p>';
+
+        if (!empty($missingparent)) {
+            $solution .= "<pre>UPDATE " . $CFG->prefix . "question_categories\n" .
+                    "        SET parent = 0\n" .
+                    "        WHERE id IN (" . implode(',', array_keys($missingparent)) . ");</pre>\n";
+        }
+
+        if (!empty($loops)) {
+            $solution .= "<pre>UPDATE " . $CFG->prefix . "question_categories\n" .
+                    "        SET parent = 0\n" .
+                    "        WHERE id IN (" . implode(',', array_keys($loops)) . ");</pre>\n";
+        }
+
+        return $solution;
+    }
+}
+
+class problem_00000x extends problem_base {
+    function title() {
+        return '';
+    }
+    function exists() {
+        return false;
+    }
+    function severity() {
+        return SEVERITY_SIGNIFICANT;
+    }
+    function description() {
+        return '';
+    }
+    function solution() {
+        global $CFG;
+        return '';
+    }
+}
+
+/*
+
+TODO:
+
+    session.save_path -- it doesn't really matter because we are already IN a session, right?
+    detect unsupported characters in $CFG->wwwroot - see bug Bug #6091 - relative vs absolute path during backup/restore process
+
+*/
+
+
@@ -26,150 +26,46 @@
 // Check that config.php exists, if not then call the install script
 if (!file_exists('../config.php')) {
    header('Location: ../install.php');
-    die();
+    die;
 }

 // Check that PHP is of a sufficient version as soon as possible
-if (version_compare(phpversion(), '5.6.5') < 0) {
+if (version_compare(phpversion(), '5.3.2') < 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 "Moodle 2.1 or later requires at least PHP 5.3.2 (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')) {
-    // this should not happen, this must be very borked install
-    echo 'Moodle requires the iconv PHP extension. Please install or enable the iconv extension.';
-    die();
-}
-
-// Make sure php5-json is available.
-if (!function_exists('json_encode') || !function_exists('json_decode')) {
-    // This also shouldn't happen.
-    echo 'Moodle requires the json PHP extension. Please install or enable the json extension.';
-    die();
-}
-
-// Make sure xml extension is available.
-if (!extension_loaded('xml')) {
-    echo 'Moodle requires the xml PHP extension. Please install or enable the xml extension.';
-    die();
+    die;
 }

 define('NO_OUTPUT_BUFFERING', true);

-if (isset($_POST['upgradekey'])) {
-    // Before you start reporting issues about the collision attacks against
-    // SHA-1, you should understand that we are not actually attempting to do
-    // any cryptography here. This is hashed purely so that the key is not
-    // that apparent in the address bar itself. Anyone who catches the HTTP
-    // traffic can immediately use it as a valid admin key.
-    header('Location: index.php?cache=0&upgradekeyhash='.sha1($_POST['upgradekey']));
-    die();
-}
-
-if ((isset($_GET['cache']) and $_GET['cache'] === '0')
-        or (isset($_POST['cache']) and $_POST['cache'] === '0')
-        or (!isset($_POST['cache']) and !isset($_GET['cache']) and empty($_GET['sesskey']) and empty($_POST['sesskey']))) {
-    // Prevent caching at all cost when visiting this page directly,
-    // we redirect to self once we known no upgrades are necessary.
-    // Note: $_GET and $_POST are used here intentionally because our param cleaning is not loaded yet.
-    // Note2: the sesskey is present in all block editing hacks, we can not redirect there, so enable caching.
-    define('CACHE_DISABLE_ALL', true);
-
-    // Force OPcache reset if used, we do not want any stale caches
-    // when detecting if upgrade necessary or when running upgrade.
-    if (function_exists('opcache_reset')) {
-        opcache_reset();
-    }
-    $cache = 0;
-
-} else {
-    $cache = 1;
-}
-
 require('../config.php');
-
-// Invalidate the cache of version.php in any circumstances to help core_component
-// detecting if the version has changed and component cache should be reset.
-if (function_exists('opcache_invalidate')) {
-    opcache_invalidate($CFG->dirroot . '/version.php', true);
-}
-// Make sure the component cache gets rebuilt if necessary, any method that
-// indirectly calls the protected init() method is good here.
-core_component::get_core_subsystems();
-
 require_once($CFG->libdir.'/adminlib.php');    // various admin-only functions
 require_once($CFG->libdir.'/upgradelib.php');  // general upgrade/install related functions

-$confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL); // Core upgrade confirmed?
-$confirmrelease = optional_param('confirmrelease', 0, PARAM_BOOL); // Core release info and server checks confirmed?
-$confirmplugins = optional_param('confirmplugincheck', 0, PARAM_BOOL); // Plugins check page confirmed?
-$showallplugins = optional_param('showallplugins', 0, PARAM_BOOL); // Show all plugins on the plugins check page?
-$agreelicense = optional_param('agreelicense', 0, PARAM_BOOL); // GPL license confirmed for installation?
-$fetchupdates = optional_param('fetchupdates', 0, PARAM_BOOL); // Should check for available updates?
-$newaddonreq = optional_param('installaddonrequest', null, PARAM_RAW); // Plugin installation requested at moodle.org/plugins.
-$upgradekeyhash = optional_param('upgradekeyhash', null, PARAM_ALPHANUM); // Hash of provided upgrade key.
-$installdep = optional_param('installdep', null, PARAM_COMPONENT); // Install given missing dependency (required plugin).
-$installdepx = optional_param('installdepx', false, PARAM_BOOL); // Install all missing dependencies.
-$confirminstalldep = optional_param('confirminstalldep', false, PARAM_BOOL); // Installing dependencies confirmed.
-$abortinstall = optional_param('abortinstall', null, PARAM_COMPONENT); // Cancel installation of the given new plugin.
-$abortinstallx = optional_param('abortinstallx', null, PARAM_BOOL); // Cancel installation of all new plugins.
-$confirmabortinstall = optional_param('confirmabortinstall', false, PARAM_BOOL); // Installation cancel confirmed.
-$abortupgrade = optional_param('abortupgrade', null, PARAM_COMPONENT); // Cancel upgrade of the given existing plugin.
-$abortupgradex = optional_param('abortupgradex', null, PARAM_BOOL); // Cancel upgrade of all upgradable plugins.
-$confirmabortupgrade = optional_param('confirmabortupgrade', false, PARAM_BOOL); // Upgrade cancel confirmed.
-$installupdate = optional_param('installupdate', null, PARAM_COMPONENT); // Install given available update.
-$installupdateversion = optional_param('installupdateversion', null, PARAM_INT); // Version of the available update to install.
-$installupdatex = optional_param('installupdatex', false, PARAM_BOOL); // Install all available plugin updates.
-$confirminstallupdate = optional_param('confirminstallupdate', false, PARAM_BOOL); // Available update(s) install confirmed?
+$id             = optional_param('id', '', PARAM_TEXT);
+$confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL);
+$confirmrelease = optional_param('confirmrelease', 0, PARAM_BOOL);
+$confirmplugins = optional_param('confirmplugincheck', 0, PARAM_BOOL);
+$showallplugins = optional_param('showallplugins', 0, PARAM_BOOL);
+$agreelicense   = optional_param('agreelicense', 0, PARAM_BOOL);

-if (!empty($CFG->disableupdateautodeploy)) {
-    // Invalidate all requests to install plugins via the admin UI.
-    $newaddonreq = null;
-    $installdep = null;
-    $installdepx = false;
-    $abortupgrade = null;
-    $abortupgradex = null;
-    $installupdate = null;
-    $installupdateversion = null;
-    $installupdatex = false;
-}
-
-// Set up PAGE.
-$url = new moodle_url('/admin/index.php');
-$url->param('cache', $cache);
-if (isset($upgradekeyhash)) {
-    $url->param('upgradekeyhash', $upgradekeyhash);
-}
-$PAGE->set_url($url);
-unset($url);
-
-// Are we returning from an add-on installation request at moodle.org/plugins?
-if ($newaddonreq and !$cache and empty($CFG->disableupdateautodeploy)) {
-    $target = new moodle_url('/admin/tool/installaddon/index.php', array(
-        'installaddonrequest' => $newaddonreq,
-        'confirm' => 0));
-    if (!isloggedin() or isguestuser()) {
-        // Login and go the the add-on tool page.
-        $SESSION->wantsurl = $target->out();
-        redirect(get_login_url());
-    }
-    redirect($target);
-}
+// Check some PHP server settings

+$PAGE->set_url('/admin/index.php');
 $PAGE->set_pagelayout('admin'); // Set a default pagelayout

 $documentationlink = '<a href="http://docs.moodle.org/en/Installation">Installation docs</a>';

-// Check some PHP server settings
-
 if (ini_get_bool('session.auto_start')) {
    print_error('phpvaroff', 'debug', '', (object)array('name'=>'session.auto_start', 'link'=>$documentationlink));
 }

+if (ini_get_bool('magic_quotes_runtime')) {
+    print_error('phpvaroff', 'debug', '', (object)array('name'=>'magic_quotes_runtime', 'link'=>$documentationlink));
+}
+
 if (!ini_get_bool('file_uploads')) {
    print_error('phpvaron', 'debug', '', (object)array('name'=>'file_uploads', 'link'=>$documentationlink));
 }
@@ -179,26 +75,29 @@ if (is_float_problem()) {
 }

 // Set some necessary variables during set-up to avoid PHP warnings later on this page
+if (!isset($CFG->framename)) {
+    $CFG->framename = '_top';
+}
 if (!isset($CFG->release)) {
    $CFG->release = '';
 }
 if (!isset($CFG->version)) {
    $CFG->version = '';
 }
-if (!isset($CFG->branch)) {
-    $CFG->branch = '';
-}

 $version = null;
 $release = null;
-$branch = null;
-require("$CFG->dirroot/version.php");       // defines $version, $release, $branch and $maturity
+require("$CFG->dirroot/version.php");       // defines $version, $release and $maturity
 $CFG->target_release = $release;            // used during installation and upgrades

 if (!$version or !$release) {
    print_error('withoutversion', 'debug'); // without version, stop
 }

+// Turn off xmlstrictheaders during upgrade.
+$origxmlstrictheaders = !empty($CFG->xmlstrictheaders);
+$CFG->xmlstrictheaders = false;
+
 if (!core_tables_exist()) {
    $PAGE->set_pagelayout('maintenance');
    $PAGE->set_popup_notification_allowed(false);
@@ -209,61 +108,69 @@ if (!core_tables_exist()) {
    $strinstallation = get_string('installation', 'install');

    // remove current session content completely
-    \core\session\manager::terminate_current();
+    session_get_instance()->terminate_current();

    if (empty($agreelicense)) {
        $strlicense = get_string('license');
-
        $PAGE->navbar->add($strlicense);
        $PAGE->set_title($strinstallation.' - Moodle '.$CFG->target_release);
        $PAGE->set_heading($strinstallation);
        $PAGE->set_cacheable(false);
-
-        $output = $PAGE->get_renderer('core', 'admin');
-        echo $output->install_licence_page();
-        die();
+        echo $OUTPUT->header();
+        echo $OUTPUT->heading('<a href="http://moodle.org">Moodle</a> - Modular Object-Oriented Dynamic Learning Environment');
+        echo $OUTPUT->heading(get_string('copyrightnotice'));
+        $copyrightnotice = text_to_html(get_string('gpl3'));
+        $copyrightnotice = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $copyrightnotice); // extremely ugly validation hack
+        echo $OUTPUT->box($copyrightnotice, 'copyrightnotice');
+        echo '<br />';
+        $continue = new single_button(new moodle_url('/admin/index.php', array('lang'=>$CFG->lang, 'agreelicense'=>1)), get_string('continue'), 'get');
+        echo $OUTPUT->confirm(get_string('doyouagree'), $continue, "http://docs.moodle.org/dev/License");
+        echo $OUTPUT->footer();
+        die;
    }
    if (empty($confirmrelease)) {
-        require_once($CFG->libdir.'/environmentlib.php');
-        list($envstatus, $environment_results) = check_moodle_environment(normalize_version($release), ENV_SELECT_RELEASE);
        $strcurrentrelease = get_string('currentrelease');
-
        $PAGE->navbar->add($strcurrentrelease);
        $PAGE->set_title($strinstallation);
        $PAGE->set_heading($strinstallation . ' - Moodle ' . $CFG->target_release);
        $PAGE->set_cacheable(false);
+        echo $OUTPUT->header();
+        echo $OUTPUT->heading("Moodle $release");

-        $output = $PAGE->get_renderer('core', 'admin');
-        echo $output->install_environment_page($maturity, $envstatus, $environment_results, $release);
-        die();
+        if (isset($maturity)) {
+            // main version.php declares moodle code maturity
+            if ($maturity < MATURITY_STABLE) {
+                $maturitylevel = get_string('maturity'.$maturity, 'admin');
+                echo $OUTPUT->box(
+                    $OUTPUT->container(get_string('maturitycorewarning', 'admin', $maturitylevel)) .
+                    $OUTPUT->container($OUTPUT->doc_link('admin/versions', get_string('morehelp'))),
+                    'generalbox maturitywarning');
+            }
+        }
+
+        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases');
+        $releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
+        echo $OUTPUT->box($releasenoteslink, 'generalbox releasenoteslink');
+
+        require_once($CFG->libdir.'/environmentlib.php');
+        if (!check_moodle_environment(normalize_version($release), $environment_results, true, ENV_SELECT_RELEASE)) {
+            print_upgrade_reload("index.php?agreelicense=1&amp;lang=$CFG->lang");
+        } else {
+            echo $OUTPUT->notification(get_string('environmentok', 'admin'), 'notifysuccess');
+            echo $OUTPUT->continue_button(new moodle_url('/admin/index.php', array('agreelicense'=>1, 'confirmrelease'=>1, 'lang'=>$CFG->lang)));
+        }
+
+        echo $OUTPUT->footer();
+        die;
    }

-    // check plugin dependencies
-    $failed = array();
-    if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
-        $PAGE->navbar->add(get_string('pluginscheck', 'admin'));
-        $PAGE->set_title($strinstallation);
-        $PAGE->set_heading($strinstallation . ' - Moodle ' . $CFG->target_release);
-
-        $output = $PAGE->get_renderer('core', 'admin');
-        $url = new moodle_url($PAGE->url, array('agreelicense' => 1, 'confirmrelease' => 1, 'lang' => $CFG->lang));
-        echo $output->unsatisfied_dependencies_page($version, $failed, $url);
-        die();
-    }
-    unset($failed);
-
-    //TODO: add a page with list of non-standard plugins here
-
    $strdatabasesetup = get_string('databasesetup');
    upgrade_init_javascript();
-
    $PAGE->navbar->add($strdatabasesetup);
    $PAGE->set_title($strinstallation.' - Moodle '.$CFG->target_release);
    $PAGE->set_heading($strinstallation);
    $PAGE->set_cacheable(false);
-
-    $output = $PAGE->get_renderer('core', 'admin');
-    echo $output->header();
+    echo $OUTPUT->header();

    if (!$DB->setup_is_unicodedb()) {
        if (!$DB->change_db_encoding()) {
@@ -279,241 +186,94 @@ if (!core_tables_exist()) {
 // Check version of Moodle code on disk compared with database
 // and upgrade if possible.

-if (!$cache) {
-    // Do not try to do anything fancy in non-cached mode,
-    // this prevents themes from fetching data from non-existent tables.
-    $PAGE->set_pagelayout('maintenance');
-    $PAGE->set_popup_notification_allowed(false);
-}
-
 $stradministration = get_string('administration');
-$PAGE->set_context(context_system::instance());
+$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));

 if (empty($CFG->version)) {
    print_error('missingconfigversion', 'debug');
 }

-// Detect config cache inconsistency, this happens when you switch branches on dev servers.
-if ($CFG->version != $DB->get_field('config', 'value', array('name'=>'version'))) {
+if ($version > $CFG->version) {  // upgrade
    purge_all_caches();
-    redirect(new moodle_url($PAGE->url), 'Config cache inconsistency detected, resetting caches...');
-}
+    $PAGE->set_pagelayout('maintenance');
+    $PAGE->set_popup_notification_allowed(false);

-if (!$cache and $version > $CFG->version) {  // upgrade
-
-    $PAGE->set_url(new moodle_url($PAGE->url, array(
-        'confirmupgrade' => $confirmupgrade,
-        'confirmrelease' => $confirmrelease,
-        'confirmplugincheck' => $confirmplugins,
-    )));
-
-    check_upgrade_key($upgradekeyhash);
-
-    // Warning about upgrading a test site.
-    $testsite = false;
-    if (defined('BEHAT_SITE_RUNNING')) {
-        $testsite = 'behat';
-    }
-
-    if (isset($CFG->themerev)) {
-        // Store the themerev to restore after purging caches.
-        $themerev = $CFG->themerev;
-    }
-
-    // We purge all of MUC's caches here.
-    // Caches are disabled for upgrade by CACHE_DISABLE_ALL so we must set the first arg to true.
-    // This ensures a real config object is loaded and the stores will be purged.
-    // This is the only way we can purge custom caches such as memcache or APC.
-    // Note: all other calls to caches will still used the disabled API.
-    cache_helper::purge_all(true);
-    // We then purge the regular caches.
-    purge_all_caches();
-
-    if (isset($themerev)) {
-        // Restore the themerev
-        set_config('themerev', $themerev);
-    }
-
-    $output = $PAGE->get_renderer('core', 'admin');
-
-    if (upgrade_stale_php_files_present()) {
-        $PAGE->set_title($stradministration);
-        $PAGE->set_cacheable(false);
-
-        echo $output->upgrade_stale_php_files_page();
-        die();
-    }
+    $a->oldversion = "$CFG->release ($CFG->version)";
+    $a->newversion = "$release ($version)";
+    $strdatabasechecking = get_string('databasechecking', '', $a);

    if (empty($confirmupgrade)) {
-        $a = new stdClass();
-        $a->oldversion = "$CFG->release (".sprintf('%.2f', $CFG->version).")";
-        $a->newversion = "$release (".sprintf('%.2f', $version).")";
-        $strdatabasechecking = get_string('databasechecking', '', $a);
-
        $PAGE->set_title($stradministration);
        $PAGE->set_heading($strdatabasechecking);
        $PAGE->set_cacheable(false);
-
-        echo $output->upgrade_confirm_page($a->newversion, $maturity, $testsite);
-        die();
+        echo $OUTPUT->header();
+        if (isset($maturity)) {
+            // main version.php declares moodle code maturity
+            if ($maturity < MATURITY_STABLE) {
+                $maturitylevel = get_string('maturity'.$maturity, 'admin');
+                echo $OUTPUT->box(
+                    $OUTPUT->container(get_string('maturitycorewarning', 'admin', $maturitylevel)) .
+                    $OUTPUT->container($OUTPUT->doc_link('admin/versions', get_string('morehelp'))),
+                    'generalbox maturitywarning');
+}
+        }
+        $continueurl = new moodle_url('index.php', array('confirmupgrade' => 1));
+        $cancelurl = new moodle_url('index.php');
+        echo $OUTPUT->confirm(get_string('upgradesure', 'admin', $a->newversion), $continueurl, $cancelurl);
+        echo $OUTPUT->footer();
+        exit;

    } else if (empty($confirmrelease)){
-        require_once($CFG->libdir.'/environmentlib.php');
-        list($envstatus, $environment_results) = check_moodle_environment($release, ENV_SELECT_RELEASE);
        $strcurrentrelease = get_string('currentrelease');
-
        $PAGE->navbar->add($strcurrentrelease);
        $PAGE->set_title($strcurrentrelease);
        $PAGE->set_heading($strcurrentrelease);
        $PAGE->set_cacheable(false);
+        echo $OUTPUT->header();
+        echo $OUTPUT->heading("Moodle $release");
+        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases');
+        $releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
+        echo $OUTPUT->box($releasenoteslink);

-        echo $output->upgrade_environment_page($release, $envstatus, $environment_results);
-        die();
+        require_once($CFG->libdir.'/environmentlib.php');
+        if (!check_moodle_environment($release, $environment_results, true, ENV_SELECT_RELEASE)) {
+            print_upgrade_reload('index.php?confirmupgrade=1');
+        } else {
+            echo $OUTPUT->notification(get_string('environmentok', 'admin'), 'notifysuccess');
+            if (empty($CFG->skiplangupgrade)) {
+                echo $OUTPUT->box_start('generalbox', 'notice');
+                print_string('langpackwillbeupdated', 'admin');
+                echo $OUTPUT->box_end();
+            }
+            echo $OUTPUT->continue_button('index.php?confirmupgrade=1&confirmrelease=1');
+        }

-    } else if (empty($confirmplugins)) {
+        echo $OUTPUT->footer();
+        die;
+
+    } elseif (empty($confirmplugins)) {
        $strplugincheck = get_string('plugincheck');
-
        $PAGE->navbar->add($strplugincheck);
        $PAGE->set_title($strplugincheck);
        $PAGE->set_heading($strplugincheck);
        $PAGE->set_cacheable(false);
+        $output = $PAGE->get_renderer('core', 'admin');
+        $pluginman = plugin_manager::instance();

-        $pluginman = core_plugin_manager::instance();
-
-        // Check for available updates.
-        if ($fetchupdates) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $updateschecker = \core\update\checker::instance();
-            if ($updateschecker->enabled()) {
-                $updateschecker->fetch();
-            }
-            redirect($PAGE->url);
-        }
-
-        // Cancel all plugin installations.
-        if ($abortinstallx) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $abortables = $pluginman->list_cancellable_installations();
-            if ($abortables) {
-                if ($confirmabortinstall) {
-                    foreach ($abortables as $plugin) {
-                        $pluginman->cancel_plugin_installation($plugin->component);
-                    }
-                    redirect($PAGE->url);
-                } else {
-                    $continue = new moodle_url($PAGE->url, array('abortinstallx' => $abortinstallx, 'confirmabortinstall' => 1));
-                    echo $output->upgrade_confirm_abort_install_page($abortables, $continue);
-                    die();
-                }
-            }
-            redirect($PAGE->url);
-        }
-
-        // Cancel single plugin installation.
-        if ($abortinstall) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            if ($confirmabortinstall) {
-                $pluginman->cancel_plugin_installation($abortinstall);
-                redirect($PAGE->url);
-            } else {
-                $continue = new moodle_url($PAGE->url, array('abortinstall' => $abortinstall, 'confirmabortinstall' => 1));
-                $abortable = $pluginman->get_plugin_info($abortinstall);
-                if ($pluginman->can_cancel_plugin_installation($abortable)) {
-                    echo $output->upgrade_confirm_abort_install_page(array($abortable), $continue);
-                    die();
-                }
-                redirect($PAGE->url);
-            }
-        }
-
-        // Cancel all plugins upgrades (that is, restore archived versions).
-        if ($abortupgradex) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $restorable = $pluginman->list_restorable_archives();
-            if ($restorable) {
-                upgrade_install_plugins($restorable, $confirmabortupgrade,
-                    get_string('cancelupgradehead', 'core_plugin'),
-                    new moodle_url($PAGE->url, array('abortupgradex' => 1, 'confirmabortupgrade' => 1))
-                );
-            }
-            redirect($PAGE->url);
-        }
-
-        // Cancel single plugin upgrade (that is, install the archived version).
-        if ($abortupgrade) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $restorable = $pluginman->list_restorable_archives();
-            if (isset($restorable[$abortupgrade])) {
-                $restorable = array($restorable[$abortupgrade]);
-                upgrade_install_plugins($restorable, $confirmabortupgrade,
-                    get_string('cancelupgradehead', 'core_plugin'),
-                    new moodle_url($PAGE->url, array('abortupgrade' => $abortupgrade, 'confirmabortupgrade' => 1))
-                );
-            }
-            redirect($PAGE->url);
-        }
-
-        // Install all available missing dependencies.
-        if ($installdepx) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
-            upgrade_install_plugins($installable, $confirminstalldep,
-                get_string('dependencyinstallhead', 'core_plugin'),
-                new moodle_url($PAGE->url, array('installdepx' => 1, 'confirminstalldep' => 1))
-            );
-        }
-
-        // Install single available missing dependency.
-        if ($installdep) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
-            if (!empty($installable[$installdep])) {
-                $installable = array($installable[$installdep]);
-                upgrade_install_plugins($installable, $confirminstalldep,
-                    get_string('dependencyinstallhead', 'core_plugin'),
-                    new moodle_url($PAGE->url, array('installdep' => $installdep, 'confirminstalldep' => 1))
-                );
-            }
-        }
-
-        // Install all available updates.
-        if ($installupdatex) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            $installable = $pluginman->filter_installable($pluginman->available_updates());
-            upgrade_install_plugins($installable, $confirminstallupdate,
-                get_string('updateavailableinstallallhead', 'core_admin'),
-                new moodle_url($PAGE->url, array('installupdatex' => 1, 'confirminstallupdate' => 1))
-            );
-        }
-
-        // Install single available update.
-        if ($installupdate and $installupdateversion) {
-            // No sesskey support guaranteed here, because sessions might not work yet.
-            if ($pluginman->is_remote_plugin_installable($installupdate, $installupdateversion)) {
-                $installable = array($pluginman->get_remote_plugin_info($installupdate, $installupdateversion, true));
-                upgrade_install_plugins($installable, $confirminstallupdate,
-                    get_string('updateavailableinstallallhead', 'core_admin'),
-                    new moodle_url($PAGE->url, array('installupdate' => $installupdate,
-                        'installupdateversion' => $installupdateversion, 'confirminstallupdate' => 1)
-                    )
-                );
-            }
-        }
-
-        echo $output->upgrade_plugin_check_page(core_plugin_manager::instance(), \core\update\checker::instance(),
-                $version, $showallplugins, $PAGE->url, new moodle_url($PAGE->url, array('confirmplugincheck' => 1)));
+        echo $output->header();
+        echo $output->box_start('generalbox');
+        echo $output->container(get_string('pluginchecknotice', 'core_plugin'), 'generalbox', 'notice');
+        echo $output->plugins_check($pluginman->get_plugins(), array('full' => $showallplugins));
+        echo $output->box_end();
+        print_upgrade_reload('index.php?confirmupgrade=1&amp;confirmrelease=1');
+        $button = new single_button(new moodle_url('index.php', array('confirmupgrade'=>1, 'confirmrelease'=>1, 'confirmplugincheck'=>1)), get_string('upgradestart', 'admin'), 'get');
+        $button->class = 'continuebutton';
+        echo $output->render($button);
+        echo $output->footer();
        die();

    } else {
-        // Always verify plugin dependencies!
-        $failed = array();
-        if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
-            echo $output->unsatisfied_dependencies_page($version, $failed, $PAGE->url);
-            die();
-        }
-        unset($failed);
-
-        // Launch main upgrade.
+        // Launch main upgrade
        upgrade_core($version, true);
    }
 } else if ($version < $CFG->version) {
@@ -522,173 +282,37 @@ if (!$cache and $version > $CFG->version) {  // upgrade
 }

 // Updated human-readable release version if necessary
-if (!$cache and $release <> $CFG->release) {  // Update the release version
+if ($release <> $CFG->release) {  // Update the release version
    set_config('release', $release);
 }

-if (!$cache and $branch <> $CFG->branch) {  // Update the branch
-    set_config('branch', $branch);
-}
-
-if (!$cache and moodle_needs_upgrading()) {
-
-    $PAGE->set_url(new moodle_url($PAGE->url, array('confirmplugincheck' => $confirmplugins)));
-
-    check_upgrade_key($upgradekeyhash);
-
+if (moodle_needs_upgrading()) {
    if (!$PAGE->headerprinted) {
        // means core upgrade or installation was not already done
-
-        $pluginman = core_plugin_manager::instance();
-        $output = $PAGE->get_renderer('core', 'admin');
-
        if (!$confirmplugins) {
+            $PAGE->set_pagelayout('maintenance');
+            $PAGE->set_popup_notification_allowed(false);
            $strplugincheck = get_string('plugincheck');
-
            $PAGE->navbar->add($strplugincheck);
            $PAGE->set_title($strplugincheck);
            $PAGE->set_heading($strplugincheck);
            $PAGE->set_cacheable(false);
-
-            // Check for available updates.
-            if ($fetchupdates) {
-                require_sesskey();
-                $updateschecker = \core\update\checker::instance();
-                if ($updateschecker->enabled()) {
-                    $updateschecker->fetch();
-                }
-                redirect($PAGE->url);
-            }
-
-            // Cancel all plugin installations.
-            if ($abortinstallx) {
-                require_sesskey();
-                $abortables = $pluginman->list_cancellable_installations();
-                if ($abortables) {
-                    if ($confirmabortinstall) {
-                        foreach ($abortables as $plugin) {
-                            $pluginman->cancel_plugin_installation($plugin->component);
-                        }
-                        redirect($PAGE->url);
-                    } else {
-                        $continue = new moodle_url($PAGE->url, array('abortinstallx' => $abortinstallx,
-                            'confirmabortinstall' => 1));
-                        echo $output->upgrade_confirm_abort_install_page($abortables, $continue);
-                        die();
-                    }
-                }
-                redirect($PAGE->url);
-            }
-
-            // Cancel single plugin installation.
-            if ($abortinstall) {
-                require_sesskey();
-                if ($confirmabortinstall) {
-                    $pluginman->cancel_plugin_installation($abortinstall);
-                    redirect($PAGE->url);
-                } else {
-                    $continue = new moodle_url($PAGE->url, array('abortinstall' => $abortinstall, 'confirmabortinstall' => 1));
-                    $abortable = $pluginman->get_plugin_info($abortinstall);
-                    if ($pluginman->can_cancel_plugin_installation($abortable)) {
-                        echo $output->upgrade_confirm_abort_install_page(array($abortable), $continue);
-                        die();
-                    }
-                    redirect($PAGE->url);
-                }
-            }
-
-            // Cancel all plugins upgrades (that is, restore archived versions).
-            if ($abortupgradex) {
-                require_sesskey();
-                $restorable = $pluginman->list_restorable_archives();
-                if ($restorable) {
-                    upgrade_install_plugins($restorable, $confirmabortupgrade,
-                        get_string('cancelupgradehead', 'core_plugin'),
-                        new moodle_url($PAGE->url, array('abortupgradex' => 1, 'confirmabortupgrade' => 1))
-                    );
-                }
-                redirect($PAGE->url);
-            }
-
-            // Cancel single plugin upgrade (that is, install the archived version).
-            if ($abortupgrade) {
-                require_sesskey();
-                $restorable = $pluginman->list_restorable_archives();
-                if (isset($restorable[$abortupgrade])) {
-                    $restorable = array($restorable[$abortupgrade]);
-                    upgrade_install_plugins($restorable, $confirmabortupgrade,
-                        get_string('cancelupgradehead', 'core_plugin'),
-                        new moodle_url($PAGE->url, array('abortupgrade' => $abortupgrade, 'confirmabortupgrade' => 1))
-                    );
-                }
-                redirect($PAGE->url);
-            }
-
-            // Install all available missing dependencies.
-            if ($installdepx) {
-                require_sesskey();
-                $installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
-                upgrade_install_plugins($installable, $confirminstalldep,
-                    get_string('dependencyinstallhead', 'core_plugin'),
-                    new moodle_url($PAGE->url, array('installdepx' => 1, 'confirminstalldep' => 1))
-                );
-            }
-
-            // Install single available missing dependency.
-            if ($installdep) {
-                require_sesskey();
-                $installable = $pluginman->filter_installable($pluginman->missing_dependencies(true));
-                if (!empty($installable[$installdep])) {
-                    $installable = array($installable[$installdep]);
-                    upgrade_install_plugins($installable, $confirminstalldep,
-                        get_string('dependencyinstallhead', 'core_plugin'),
-                        new moodle_url($PAGE->url, array('installdep' => $installdep, 'confirminstalldep' => 1))
-                    );
-                }
-            }
-
-            // Install all available updates.
-            if ($installupdatex) {
-                require_sesskey();
-                $installable = $pluginman->filter_installable($pluginman->available_updates());
-                upgrade_install_plugins($installable, $confirminstallupdate,
-                    get_string('updateavailableinstallallhead', 'core_admin'),
-                    new moodle_url($PAGE->url, array('installupdatex' => 1, 'confirminstallupdate' => 1))
-                );
-            }
-
-            // Install single available update.
-            if ($installupdate and $installupdateversion) {
-                require_sesskey();
-                if ($pluginman->is_remote_plugin_installable($installupdate, $installupdateversion)) {
-                    $installable = array($pluginman->get_remote_plugin_info($installupdate, $installupdateversion, true));
-                    upgrade_install_plugins($installable, $confirminstallupdate,
-                        get_string('updateavailableinstallallhead', 'core_admin'),
-                        new moodle_url($PAGE->url, array('installupdate' => $installupdate,
-                            'installupdateversion' => $installupdateversion, 'confirminstallupdate' => 1)
-                        )
-                    );
-                }
-            }
-
-            // Show plugins info.
-            echo $output->upgrade_plugin_check_page($pluginman, \core\update\checker::instance(),
-                    $version, $showallplugins,
-                    new moodle_url($PAGE->url),
-                    new moodle_url($PAGE->url, array('confirmplugincheck' => 1, 'cache' => 0)));
-            die();
-        }
-
-        // Make sure plugin dependencies are always checked.
-        $failed = array();
-        if (!$pluginman->all_plugins_ok($version, $failed)) {
            $output = $PAGE->get_renderer('core', 'admin');
-            echo $output->unsatisfied_dependencies_page($version, $failed, $PAGE->url);
+            $pluginman = plugin_manager::instance();
+
+            echo $output->header();
+            echo $output->box_start('generalbox');
+            echo $output->container(get_string('pluginchecknotice', 'core_plugin'), 'generalbox', 'notice');
+            echo $output->plugins_check($pluginman->get_plugins(), array('full' => $showallplugins));
+            echo $output->box_end();
+            print_upgrade_reload('index.php');
+            $button = new single_button(new moodle_url('index.php', array('confirmplugincheck'=>1)), get_string('upgradestart', 'admin'), 'get');
+            $button->class = 'continuebutton';
+            echo $output->render($button);
+            echo $output->footer();
            die();
        }
-        unset($failed);
    }
-
    // install/upgrade all plugins and other parts
    upgrade_noncore(true);
 }
@@ -721,13 +345,8 @@ if (during_initial_install()) {
        }
    }

-    // Cleanup SESSION to make sure other code does not complain in the future.
-    unset($SESSION->has_timed_out);
-    unset($SESSION->wantsurl);
-
-    // at this stage there can be only one admin unless more were added by install - users may change username, so do not rely on that
-    $adminids = explode(',', $CFG->siteadmins);
-    $adminuser = get_complete_user_data('id', reset($adminids));
+    // at this stage there can be only one admin - users may change username, so do not rely on that
+    $adminuser = get_complete_user_data('id', $CFG->siteadmins);

    if ($adminuser->password === 'adminsetuppending') {
        // prevent installation hijacking
@@ -736,7 +355,7 @@ if (during_initial_install()) {
        }
        // login user and let him set password and admin details
        $adminuser->newadminuser = 1;
-        complete_user_login($adminuser);
+        complete_user_login($adminuser, false);
        redirect("$CFG->wwwroot/user/editadvanced.php?id=$adminuser->id"); // Edit thyself

    } else {
@@ -748,40 +367,14 @@ if (during_initial_install()) {
    upgrade_finished('upgradesettings.php');
 }

-if (has_capability('moodle/site:config', context_system::instance())) {
-    if ($fetchupdates) {
-        require_sesskey();
-        $updateschecker = \core\update\checker::instance();
-        if ($updateschecker->enabled()) {
-            $updateschecker->fetch();
-        }
-        redirect(new moodle_url('/admin/index.php', array('cache' => 0)));
-    }
-}
-
-// Now we can be sure everything was upgraded and caches work fine,
-// redirect if necessary to make sure caching is enabled.
-if (!$cache) {
-    redirect(new moodle_url('/admin/index.php', array('cache' => 1)));
-}
+// Turn xmlstrictheaders back on now.
+$CFG->xmlstrictheaders = $origxmlstrictheaders;
+unset($origxmlstrictheaders);

 // Check for valid admin user - no guest autologin
 require_login(0, false);
-if (isguestuser()) {
-    // Login as real user!
-    $SESSION->wantsurl = (string)new moodle_url('/admin/index.php');
-    redirect(get_login_url());
-}
-$context = context_system::instance();
-
-if (!has_capability('moodle/site:config', $context)) {
-    // Do not throw exception display an empty page with administration menu if visible for current user.
-    $PAGE->set_title($SITE->fullname);
-    $PAGE->set_heading($SITE->fullname);
-    echo $OUTPUT->header();
-    echo $OUTPUT->footer();
-    exit;
-}
+$context = get_context_instance(CONTEXT_SYSTEM);
+require_capability('moodle/site:config', $context);

 // check that site is properly customized
 $site = get_site();
@@ -789,10 +382,14 @@ if (empty($site->shortname)) {
    // probably new installation - lets return to frontpage after this step
    // remove settings that we want uninitialised
    unset_config('registerauth');
-    unset_config('timezone'); // Force admin to select timezone!
    redirect('upgradesettings.php?return=site');
 }

+// Check if we are returning from moodle.org registration and if so, we mark that fact to remove reminders
+if (!empty($id) and $id == $CFG->siteidentifier) {
+    set_config('registered', time());
+}
+
 // setup critical warnings before printing admin tree block
 $insecuredataroot = is_dataroot_insecure(true);
 $SESSION->admin_critical_warning = ($insecuredataroot==INSECURE_DATAROOT_ERROR);
@@ -804,69 +401,67 @@ if (any_new_admin_settings($adminroot)){
    redirect('upgradesettings.php');
 }

-// Return to original page that started the plugin uninstallation if necessary.
-if (isset($SESSION->pluginuninstallreturn)) {
-    $return = $SESSION->pluginuninstallreturn;
-    unset($SESSION->pluginuninstallreturn);
-    if ($return) {
-        redirect($return);
-    }
-}
-
 // Everything should now be set up, and the user is an admin

 // Print default admin page with notifications.
-$errorsdisplayed = defined('WARN_DISPLAY_ERRORS_ENABLED');
+admin_externalpage_setup('adminnotifications');
+echo $OUTPUT->header();

-// 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);
-$dbproblems = $DB->diagnose();
-$maintenancemode = !empty($CFG->maintenance_enabled);
-
-// Available updates for Moodle core.
-$updateschecker = \core\update\checker::instance();
-$availableupdates = array();
-$availableupdatesfetch = null;
-
-if ($updateschecker->enabled()) {
-    // Only compute the update information when it is going to be displayed to the user.
-    $availableupdates['core'] = $updateschecker->get_update_info('core',
-        array('minmaturity' => $CFG->updateminmaturity, 'notifybuilds' => $CFG->updatenotifybuilds));
-
-    // Available updates for contributed plugins
-    $pluginman = core_plugin_manager::instance();
-    foreach ($pluginman->get_plugins() as $plugintype => $plugintypeinstances) {
-        foreach ($plugintypeinstances as $pluginname => $plugininfo) {
-            $pluginavailableupdates = $plugininfo->available_updates();
-            if (!empty($pluginavailableupdates)) {
-                foreach ($pluginavailableupdates as $pluginavailableupdate) {
-                    if (!isset($availableupdates[$plugintype.'_'.$pluginname])) {
-                        $availableupdates[$plugintype.'_'.$pluginname] = array();
-                    }
-                    $availableupdates[$plugintype.'_'.$pluginname][] = $pluginavailableupdate;
-                }
-            }
-        }
+// Unstable code warning
+if (isset($maturity)) {
+    if ($maturity < MATURITY_STABLE) {
+        $maturitylevel = get_string('maturity'.$maturity, 'admin');
+        echo $OUTPUT->box(
+            get_string('maturitycoreinfo', 'admin', $maturitylevel) . ' ' .
+            $OUTPUT->doc_link('admin/versions', get_string('morehelp')),
+            'generalbox adminwarning maturityinfo');
    }
-
-    // The timestamp of the most recent check for available updates
-    $availableupdatesfetch = $updateschecker->get_last_timefetched();
 }

-$buggyiconvnomb = (!function_exists('mb_convert_encoding') and @iconv('UTF-8', 'UTF-8//IGNORE', '100'.chr(130).'€') !== '100€');
-//check if the site is registered on Moodle.org
-$registered = $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);
+if ($insecuredataroot == INSECURE_DATAROOT_WARNING) {
+    echo $OUTPUT->box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'generalbox adminwarning');
+} else if ($insecuredataroot == INSECURE_DATAROOT_ERROR) {
+    echo $OUTPUT->box(get_string('datarootsecurityerror', 'admin', $CFG->dataroot), 'generalbox adminerror');

-admin_externalpage_setup('adminnotifications');
+}

-$output = $PAGE->get_renderer('core', 'admin');
+if (defined('WARN_DISPLAY_ERRORS_ENABLED')) {
+    echo $OUTPUT->box(get_string('displayerrorswarning', 'admin'), 'generalbox adminwarning');
+}
+
+// If no recently cron run
+$lastcron = $DB->get_field_sql('SELECT MAX(lastcron) FROM {modules}');
+if (time() - $lastcron > 3600 * 24) {
+    $helpbutton = $OUTPUT->help_icon('cron', 'admin');
+    echo $OUTPUT->box(get_string('cronwarning', 'admin').'&nbsp;'.$helpbutton, 'generalbox adminwarning');
+}
+
+// Hidden bloglevel upgrade
+$showbloglevelupgrade = ($CFG->bloglevel == BLOG_COURSE_LEVEL || $CFG->bloglevel == BLOG_GROUP_LEVEL) && empty($CFG->bloglevel_upgrade_complete);
+if ($showbloglevelupgrade) {
+    echo $OUTPUT->box(get_string('bloglevelupgradenotice', 'admin'), 'generalbox adminwarning');
+}
+
+// diagnose DB, especially the sloppy MyISAM tables
+$diagnose = $DB->diagnose();
+if ($diagnose !== NULL) {
+    echo $OUTPUT->box($diagnose, 'generalbox adminwarning');
+}
+
+// Alert if we are currently in maintenance mode
+if (!empty($CFG->maintenance_enabled)) {
+    echo $OUTPUT->box(get_string('sitemaintenancewarning2', 'admin', "$CFG->wwwroot/$CFG->admin/settings.php?section=maintenancemode"), 'generalbox adminwarning');
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
+$copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
+                 '<a href="http://docs.moodle.org/dev/Releases" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
+                 'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'.
+                 'and <a href="http://docs.moodle.org/dev/Credits">many other contributors</a>.<br />'.
+                 '<a href="http://docs.moodle.org/dev/License">GNU Public License</a>';
+echo $OUTPUT->box($copyrighttext, 'copyright');
+//////////////////////////////////////////////////////////////////////////////////////////////////
+
+echo $OUTPUT->footer();

-echo $output->admin_notifications_page($maturity, $insecuredataroot, $errorsdisplayed, $cronoverdue, $dbproblems,
-                                       $maintenancemode, $availableupdates, $availableupdatesfetch, $buggyiconvnomb,
-                                       $registered, $cachewarnings, $eventshandlers, $themedesignermode);
@@ -0,0 +1,45 @@
+<?php
+
+    require_once('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+
+    admin_externalpage_setup('toinodb');
+
+    $confirm = optional_param('confirm', 0, PARAM_BOOL);
+
+    require_login();
+
+    require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading('Convert all MySQL tables from MYISAM to InnoDB');
+
+    if ($DB->get_dbfamily() != 'mysql') {
+        notice('This function is for MySQL databases only!', 'index.php');
+    }
+
+    if (data_submitted() and $confirm and confirm_sesskey()) {
+
+        echo $OUTPUT->notification('Please be patient and wait for this to complete...', 'notifysuccess');
+
+        if ($tables = $DB->get_tables()) {
+            $DB->set_debug(true);
+            foreach ($tables as $table) {
+                $fulltable = $DB->get_prefix().$table;
+                $DB->change_database_structure("ALTER TABLE $fulltable TYPE=INNODB");
+            }
+            $DB->set_debug(false);
+        }
+        echo $OUTPUT->notification('... done.', 'notifysuccess');
+        echo $OUTPUT->continue_button('index.php');
+        echo $OUTPUT->footer();
+
+    } else {
+        $optionsyes = array('confirm'=>'1', 'sesskey'=>sesskey());
+        $formcontinue = new single_button(new moodle_url('/admin/innodb.php', $optionsyes), get_string('yes'));
+        $formcancel = new single_button(new moodle_url('/admin/index.php'), get_string('no'), 'get');
+        echo $OUTPUT->confirm('Are you sure you want convert all your tables to the InnoDB format?', $formcontinue, $formcancel);
+        echo $OUTPUT->footer();
+    }
+
+
@@ -0,0 +1,341 @@
+<?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/>.
+
+/**
+ * Fetches language packages from download.moodle.org server
+ *
+ * Language packages are available at http://download.moodle.org/langpack/
+ * in ZIP format together with a file languages.md5 containing their hashes
+ * and meta info.
+ * Locally, language packs are saved into $CFG->dataroot/lang/
+ *
+ * @package   core
+ * @copyright 2005 Yu Zhang
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once(dirname(dirname(__FILE__)).'/config.php');
+require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir.'/filelib.php');
+require_once($CFG->libdir.'/componentlib.class.php');
+
+admin_externalpage_setup('langimport');
+
+if (!empty($CFG->skiplangupgrade)) {
+    echo $OUTPUT->header();
+    echo $OUTPUT->box(get_string('langimportdisabled', 'admin'));
+    echo $OUTPUT->footer();
+    die;
+}
+
+$mode          = optional_param('mode', 0, PARAM_INT);              // action
+$pack          = optional_param('pack', array(), PARAM_SAFEDIR);    // pack to install
+$uninstalllang = optional_param('uninstalllang', '', PARAM_LANG);   // installed pack to uninstall
+$confirm       = optional_param('confirm', 0, PARAM_BOOL);          // uninstallation confirmation
+
+define('INSTALLATION_OF_SELECTED_LANG', 2);
+define('DELETION_OF_SELECTED_LANG', 4);
+define('UPDATE_ALL_LANG', 5);
+
+get_string_manager()->reset_caches();
+
+$notice_ok    = array();
+$notice_error = array();
+
+if (($mode == INSTALLATION_OF_SELECTED_LANG) and confirm_sesskey() and !empty($pack)) {
+    set_time_limit(0);
+    make_upload_directory('temp');
+    make_upload_directory('lang');
+
+    $installer = new lang_installer($pack);
+    $results = $installer->run();
+    foreach ($results as $langcode => $langstatus) {
+        switch ($langstatus) {
+        case lang_installer::RESULT_DOWNLOADERROR:
+            $a       = new stdClass();
+            $a->url  = $installer->lang_pack_url($langcode);
+            $a->dest = $CFG->dataroot.'/lang';
+            print_error('remotedownloaderror', 'error', 'langimport.php', $a);
+            break;
+        case lang_installer::RESULT_INSTALLED:
+            $notice_ok[] = get_string('langpackinstalled', 'admin', $langcode);
+            break;
+        case lang_installer::RESULT_UPTODATE:
+            $notice_ok[] = get_string('langpackuptodate', 'admin', $langcode);
+            break;
+        }
+    }
+}
+
+if ($mode == DELETION_OF_SELECTED_LANG and !empty($uninstalllang)) {
+    if ($uninstalllang == 'en') {
+        $notice_error[] = 'English language pack can not be uninstalled';
+
+    } else if (!$confirm and confirm_sesskey()) {
+        echo $OUTPUT->header();
+        echo $OUTPUT->confirm(get_string('uninstallconfirm', 'admin', $uninstalllang),
+                     'langimport.php?mode='.DELETION_OF_SELECTED_LANG.'&uninstalllang='.$uninstalllang.'&confirm=1',
+                     'langimport.php');
+        echo $OUTPUT->footer();
+        die;
+
+    } else if (confirm_sesskey()) {
+        $dest1 = $CFG->dataroot.'/lang/'.$uninstalllang;
+        $dest2 = $CFG->dirroot.'/lang/'.$uninstalllang;
+        $rm1 = false;
+        $rm2 = false;
+        if (file_exists($dest1)){
+            $rm1 = remove_dir($dest1);
+        }
+        if (file_exists($dest2)){
+            $rm2 = remove_dir($dest2);
+        }
+        if ($rm1 or $rm2) {
+            $notice_ok[] = get_string('langpackremoved','admin');
+        } else {    //nothing deleted, possibly due to permission error
+            $notice_error[] = 'An error has occurred, language pack is not completely uninstalled, please check file permissions';
+        }
+    }
+}
+
+if ($mode == UPDATE_ALL_LANG) {
+    set_time_limit(0);
+
+    $installer = new lang_installer();
+
+    if (!$availablelangs = $installer->get_remote_list_of_languages()) {
+        print_error('cannotdownloadlanguageupdatelist', 'error');
+    }
+    $md5array = array();    // (string)langcode => (string)md5
+    foreach ($availablelangs as $alang) {
+        $md5array[$alang[0]] = $alang[1];
+    }
+
+    // filter out unofficial packs
+    $currentlangs = array_keys(get_string_manager()->get_list_of_translations(true));
+    $updateablelangs = array();
+    foreach ($currentlangs as $clang) {
+        if (!array_key_exists($clang, $md5array)) {
+            $notice_ok[] = get_string('langpackupdateskipped', 'admin', $clang);
+            continue;
+        }
+        $dest1 = $CFG->dataroot.'/lang/'.$clang;
+        $dest2 = $CFG->dirroot.'/lang/'.$clang;
+
+        if (file_exists($dest1.'/langconfig.php') || file_exists($dest2.'/langconfig.php')){
+            $updateablelangs[] = $clang;
+        }
+    }
+
+    // then filter out packs that have the same md5 key
+    $neededlangs = array();   // all the packs that needs updating
+    foreach ($updateablelangs as $ulang) {
+        if (!is_installed_lang($ulang, $md5array[$ulang])) {
+            $neededlangs[] = $ulang;
+        }
+    }
+
+    make_upload_directory('temp');
+    make_upload_directory('lang');
+
+    // clean-up currently installed versions of the packs
+    foreach ($neededlangs as $packindex => $pack) {
+        if ($pack == 'en') {
+            continue;
+        }
+
+        // delete old directories
+        $dest1 = $CFG->dataroot.'/lang/'.$pack;
+        $dest2 = $CFG->dirroot.'/lang/'.$pack;
+        $rm1 = false;
+        $rm2 = false;
+        if (file_exists($dest1)) {
+            if (!remove_dir($dest1)) {
+                $notice_error[] = 'Could not delete old directory '.$dest1.', update of '.$pack.' failed, please check permissions.';
+                unset($neededlangs[$packindex]);
+                continue;
+            }
+        }
+        if (file_exists($dest2)) {
+            if (!remove_dir($dest2)) {
+                $notice_error[] = 'Could not delete old directory '.$dest2.', update of '.$pack.' failed, please check permissions.';
+                unset($neededlangs[$packindex]);
+                continue;
+            }
+        }
+    }
+
+    // install all needed language packs
+    $installer->set_queue($neededlangs);
+    $results = $installer->run();
+    $updated = false;    // any packs updated?
+    foreach ($results as $langcode => $langstatus) {
+        switch ($langstatus) {
+        case lang_installer::RESULT_DOWNLOADERROR:
+            $a       = new stdClass();
+            $a->url  = $installer->lang_pack_url($langcode);
+            $a->dest = $CFG->dataroot.'/lang';
+            print_error('remotedownloaderror', 'error', 'langimport.php', $a);
+            break;
+        case lang_installer::RESULT_INSTALLED:
+            $updated = true;
+            $notice_ok[] = get_string('langpackinstalled', 'admin', $langcode);
+            break;
+        case lang_installer::RESULT_UPTODATE:
+            $notice_ok[] = get_string('langpackuptodate', 'admin', $langcode);
+            break;
+        }
+    }
+
+    if ($updated) {
+        $notice_ok[] = get_string('langupdatecomplete','admin');
+    } else {
+        $notice_ok[] = get_string('nolangupdateneeded','admin');
+    }
+
+    unset($installer);
+}
+get_string_manager()->reset_caches();
+
+echo $OUTPUT->header();
+echo $OUTPUT->heading(get_string('langimport', 'admin'));
+
+$installedlangs = get_string_manager()->get_list_of_translations(true);
+
+$missingparents = array();
+foreach ($installedlangs as $installedlang => $unused) {
+    $parent = get_parent_language($installedlang);
+    if (empty($parent)) {
+        continue;
+    }
+    if (!isset($installedlangs[$parent])) {
+        $missingparents[$installedlang] = $parent;
+    }
+}
+
+$installer = new lang_installer();
+
+if ($availablelangs = $installer->get_remote_list_of_languages()) {
+    $remote = true;
+} else {
+    $remote = false;
+    $availablelangs = array();
+    echo $OUTPUT->box_start();
+    print_string('remotelangnotavailable', 'admin', $CFG->dataroot.'/lang/');
+    echo $OUTPUT->box_end();
+}
+
+if ($notice_ok) {
+    $info = implode('<br />', $notice_ok);
+    echo $OUTPUT->notification($info, 'notifysuccess');
+}
+
+if ($notice_error) {
+    $info = implode('<br />', $notice_error);
+    echo $OUTPUT->notification($info, 'notifyproblem');
+}
+
+if ($missingparents) {
+    foreach ($missingparents as $l=>$parent) {
+        $a = new stdClass();
+        $a->lang   = $installedlangs[$l];
+        $a->parent = $parent;
+        foreach ($availablelangs as $alang) {
+            if ($alang[0] == $parent) {
+                $shortlang = $alang[0];
+                $a->parent = $alang[2].' ('.$shortlang.')';
+            }
+        }
+        $info = get_string('missinglangparent', 'admin', $a);
+        echo $OUTPUT->notification($info, 'notifyproblem');
+    }
+}
+
+echo $OUTPUT->box_start();
+
+echo html_writer::start_tag('table');
+echo html_writer::start_tag('tr');
+
+// list of installed languages
+$url = new moodle_url('/admin/langimport.php', array('mode' => DELETION_OF_SELECTED_LANG));
+echo html_writer::start_tag('td', array('valign' => 'top'));
+echo html_writer::start_tag('form', array('id' => 'uninstallform', 'action' => $url->out(), 'method' => 'post'));
+echo html_writer::start_tag('fieldset');
+echo html_writer::label(get_string('installedlangs','admin'), 'uninstalllang');
+echo html_writer::empty_tag('br');
+echo html_writer::select($installedlangs, 'uninstalllang', '', false, array('size' => 15));
+echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'sesskey', 'value' => sesskey()));
+echo html_writer::empty_tag('br');
+echo html_writer::empty_tag('input', array('type' => 'submit', 'value' => get_string('uninstall','admin')));
+echo html_writer::end_tag('fieldset');
+echo html_writer::end_tag('form');
+if ($remote) {
+    $url = new moodle_url('/admin/langimport.php', array('mode' => UPDATE_ALL_LANG));
+    echo html_writer::start_tag('form', array('id' => 'updateform', 'action' => $url->out(), 'method' => 'post'));
+    echo html_writer::tag('fieldset', html_writer::empty_tag('input', array('type' => 'submit', 'value' => get_string('updatelangs','admin'))));
+    echo html_writer::end_tag('form');
+}
+echo html_writer::end_tag('td');
+
+// list of available languages
+$options = array();
+foreach ($availablelangs as $alang) {
+    if (!empty($alang[0]) and trim($alang[0]) !== 'en' and !is_installed_lang($alang[0], $alang[1])) {
+        $options[$alang[0]] = $alang[2].' ('.$alang[0].')';
+    }
+}
+if (!empty($options)) {
+    echo html_writer::start_tag('td', array('valign' => 'top'));
+    $url = new moodle_url('/admin/langimport.php', array('mode' => INSTALLATION_OF_SELECTED_LANG));
+    echo html_writer::start_tag('form', array('id' => 'installform', 'action' => $url->out(), 'method' => 'post'));
+    echo html_writer::start_tag('fieldset');
+    echo html_writer::label(get_string('availablelangs','install'), 'pack');
+    echo html_writer::empty_tag('br');
+    echo html_writer::select($options, 'pack[]', '', false, array('size' => 15, 'multiple' => 'multiple'));
+    echo html_writer::empty_tag('input', array('type' => 'hidden', 'name' => 'sesskey', 'value' => sesskey()));
+    echo html_writer::empty_tag('br');
+    echo html_writer::empty_tag('input', array('type' => 'submit', 'value' => get_string('install','admin')));
+    echo html_writer::end_tag('fieldset');
+    echo html_writer::end_tag('form');
+    echo html_writer::end_tag('td');
+}
+
+echo html_writer::end_tag('tr');
+echo html_writer::end_tag('table');
+echo $OUTPUT->box_end();
+echo $OUTPUT->footer();
+die();
+
+////////////////////////////////////////////////////////////////////////////////
+// Local functions /////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * checks the md5 of the zip file, grabbed from download.moodle.org,
+ * against the md5 of the local language file from last update
+ * @param string $lang
+ * @param string $md5check
+ * @return bool
+ */
+function is_installed_lang($lang, $md5check) {
+    global $CFG;
+    $md5file = $CFG->dataroot.'/lang/'.$lang.'/'.$lang.'.md5';
+    if (file_exists($md5file)){
+        return (file_get_contents($md5file) == $md5check);
+    }
+    return false;
+}
@@ -18,14 +18,12 @@
 /**
 * This file contains functions used by the admin pages
 *
- * @since Moodle 2.1
+ * @since 2.1
 * @package admin
 * @copyright 2011 Andrew Davis
 * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

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

 require_login();
-require_capability('moodle/site:config', context_system::instance());
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));

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

-$action = optional_param('action', '', PARAM_ALPHANUMEXT);
+$action = optional_param('action', '', PARAM_ACTION);
 $license = optional_param('license', '', PARAM_SAFEDIR);

 ////////////////////////////////////////////////////////////////////////////////
@@ -27,27 +27,61 @@
 * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

-require_once(__DIR__ . '/../config.php');
+require_once(dirname(dirname(__FILE__)) . '/config.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/tablelib.php');

 admin_externalpage_setup('managelocalplugins');

+$delete  = optional_param('delete', '', PARAM_SAFEDIR);
+$confirm = optional_param('confirm', '', PARAM_BOOL);
+
+/// If data submitted, then process and store.
+
+if (!empty($delete) and confirm_sesskey()) {
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('localplugins'));
+
+    if (!$confirm) {
+        if (get_string_manager()->string_exists('pluginname', 'local_' . $delete)) {
+            $strpluginname = get_string('pluginname', 'local_' . $delete);
+        } else {
+            $strpluginname = $delete;
+        }
+        echo $OUTPUT->confirm(get_string('localplugindeleteconfirm', '', $strpluginname),
+                                new moodle_url($PAGE->url, array('delete' => $delete, 'confirm' => 1)),
+                                $PAGE->url);
+        echo $OUTPUT->footer();
+        die();
+
+    } else {
+        uninstall_plugin('local', $delete);
+        $a = new stdclass();
+        $a->name = $delete;
+        $pluginlocation = get_plugin_types();
+        $a->directory = $pluginlocation['local'] . '/' . $delete;
+        echo $OUTPUT->notification(get_string('plugindeletefiles', '', $a), 'notifysuccess');
+        echo $OUTPUT->continue_button($PAGE->url);
+        echo $OUTPUT->footer();
+        die();
+    }
+}
+
 echo $OUTPUT->header();
 echo $OUTPUT->heading(get_string('localplugins'));

 /// Print the table of all installed local plugins

 $table = new flexible_table('localplugins_administration_table');
-$table->define_columns(array('name', 'version', 'uninstall'));
-$table->define_headers(array(get_string('plugin'), get_string('version'), get_string('uninstallplugin', 'core_admin')));
+$table->define_columns(array('name', 'version', 'delete'));
+$table->define_headers(array(get_string('plugin'), get_string('version'), get_string('delete')));
 $table->define_baseurl($PAGE->url);
 $table->set_attribute('id', 'localplugins');
-$table->set_attribute('class', 'admintable generaltable');
+$table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
 $table->setup();

 $plugins = array();
-foreach (core_component::get_plugin_list('local') as $plugin => $plugindir) {
+foreach (get_plugin_list('local') as $plugin => $plugindir) {
    if (get_string_manager()->string_exists('pluginname', 'local_' . $plugin)) {
        $strpluginname = get_string('pluginname', 'local_' . $plugin);
    } else {
@@ -55,13 +89,11 @@ foreach (core_component::get_plugin_list('local') as $plugin => $plugindir) {
    }
    $plugins[$plugin] = $strpluginname;
 }
-core_collator::asort($plugins);
+textlib_get_instance()->asort($plugins);

 foreach ($plugins as $plugin => $name) {
-    $uninstall = '';
-    if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('local_'.$plugin, 'manage')) {
-        $uninstall = html_writer::link($uninstallurl, get_string('uninstallplugin', 'core_admin'));
-    }
+    $delete = new moodle_url($PAGE->url, array('delete' => $plugin, 'sesskey' => sesskey()));
+    $delete = html_writer::link($delete, get_string('delete'));

    $version = get_config('local_' . $plugin);
    if (!empty($version->version)) {
@@ -70,7 +102,7 @@ foreach ($plugins as $plugin => $name) {
        $version = '?';
    }

-    $table->add_data(array($name, $version, $uninstall));
+    $table->add_data(array($name, $version, $delete));
 }

 $table->print_html();
@@ -29,7 +29,7 @@
   */

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

@@ -29,28 +29,24 @@ require_once($CFG->libdir.'/adminlib.php');
 admin_externalpage_setup('managemessageoutputs');

 // Require site configuration capability
-require_capability('moodle/site:config', context_system::instance());
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));

 // Get the submitted params
 $disable    = optional_param('disable', 0, PARAM_INT);
 $enable     = optional_param('enable', 0, PARAM_INT);

-$headingtitle = get_string('managemessageoutputs', 'message');
-
 if (!empty($disable) && confirm_sesskey()) {
    if (!$processor = $DB->get_record('message_processors', array('id'=>$disable))) {
        print_error('outputdoesnotexist', 'message');
    }
-    \core_message\api::update_processor_status($processor, 0);     // Disable output.
-    core_plugin_manager::reset_caches();
+    $DB->set_field('message_processors', 'enabled', '0', array('id'=>$processor->id));      // Disable output
 }

-if (!empty($enable) && confirm_sesskey()) {
+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();
+    $DB->set_field('message_processors', 'enabled', '1', array('id'=>$processor->id));      // Enable output
 }

 if ($disable || $enable) {
@@ -58,7 +54,7 @@ if ($disable || $enable) {
    redirect($url);
 }
 // Page settings
-$PAGE->set_context(context_system::instance());
+$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));

 // Grab the renderer
 $renderer = $PAGE->get_renderer('core', 'message');
@@ -69,6 +65,6 @@ $messageoutputs = $renderer->manage_messageoutputs($processors);

 // Display the page
 echo $OUTPUT->header();
-echo $OUTPUT->heading($headingtitle);
+echo $OUTPUT->heading(get_string('managemessageoutputs', 'message'));
 echo $messageoutputs;
-echo $OUTPUT->footer();
+echo $OUTPUT->footer();
@@ -2,7 +2,7 @@

 // Allows the admin to control user logins from remote moodles.

-require_once(__DIR__ . '/../../config.php');
+require_once dirname(dirname(dirname(__FILE__))) . '/config.php';
 require_once($CFG->libdir.'/adminlib.php');
 include_once($CFG->dirroot.'/mnet/lib.php');

@@ -16,11 +16,13 @@ require_login();

 admin_externalpage_setup('ssoaccesscontrol');

+echo $OUTPUT->header();
+
 if (!extension_loaded('openssl')) {
    print_error('requiresopenssl', 'mnet');
 }

-$sitecontext = context_system::instance();
+$sitecontext = get_context_instance(CONTEXT_SYSTEM);
 $sesskey = sesskey();
 $formerror = array();

@@ -63,11 +65,9 @@ if (!empty($action) and confirm_sesskey()) {

            if (mnet_update_sso_access_control($idrec->username, $idrec->mnet_host_id, $accessctrl)) {
                if ($accessctrl == 'allow') {
-                    redirect('access_control.php', get_string('ssl_acl_allow','mnet', array('user' => $idrec->username,
-                        'host' => $mnethosts[$idrec->mnet_host_id])));
-                } else if ($accessctrl == 'deny') {
-                    redirect('access_control.php', get_string('ssl_acl_deny','mnet', array('user' => $idrec->username,
-                        'host' => $mnethosts[$idrec->mnet_host_id])));
+                    redirect('access_control.php', get_string('ssl_acl_allow','mnet', array('uset'=>$idrec->username, 'host'=>$mnethosts[$idrec->mnet_host_id])));
+                } elseif ($accessctrl == 'deny') {
+                    redirect('access_control.php', get_string('ssl_acl_deny','mnet', array('user'=>$idrec->username, 'host'=>$mnethosts[$idrec->mnet_host_id])));
                }
            }
            break;
@@ -103,7 +103,7 @@ if ($form = data_submitted() and confirm_sesskey()) {
        $usernames = explode(',', $form->username);

        foreach ($usernames as $username) {
-            $username = trim(core_text::strtolower($username));
+            $username = trim(moodle_strtolower($username));
            if (!empty($username)) {
                if (mnet_update_sso_access_control($username, $form->mnet_host_id, $form->accessctrl)) {
                    if ($form->accessctrl == 'allow') {
@@ -118,8 +118,6 @@ if ($form = data_submitted() and confirm_sesskey()) {
    exit;
 }

-echo $OUTPUT->header();
-
 // Explain
 echo $OUTPUT->box(get_string('ssoacldescr','mnet'));
 // Are the needed bits enabled?
@@ -205,18 +203,17 @@ echo get_string('username') . ":\n";
 if (!empty($formerror['username'])) {
    echo '<span class="error"> * </span>';
 }
-echo html_writer::label(get_string('username'), 'menuusername', false, array('class' => 'accesshide'));
-echo '<input id="menuusername" type="text" name="username" size="20" maxlength="100" />';
+echo '<input type="text" name="username" size="20" maxlength="100" />';

 // choose a remote host
-echo " " . html_writer::label(get_string('remotehost', 'mnet'), 'menumnet_host_id') . ":\n";
+echo " " . get_string('remotehost', 'mnet') . ":\n";
 if (!empty($formerror['mnet_host_id'])) {
    echo '<span class="error"> * </span>';
 }
 echo html_writer::select($mnethosts, 'mnet_host_id');

 // choose an access level
-echo " " . html_writer::label(get_string('accesslevel', 'mnet'), 'menuaccessctrl') . ":\n";
+echo " " . get_string('accesslevel', 'mnet') . ":\n";
 if (!empty($formerror['accessctrl'])) {
    echo '<span class="error"> * </span>';
 }
@@ -27,7 +27,7 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

-require(__DIR__.'/../../config.php');
+require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
 require_once($CFG->libdir . '/adminlib.php');

 $step   = optional_param('step', 'verify', PARAM_ALPHA);
@@ -36,7 +36,7 @@ $hostid = required_param('hostid', PARAM_INT);

 require_login();

-$context = context_system::instance();
+$context = get_context_instance(CONTEXT_SYSTEM);
 require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");

 $mnet = get_mnet_environment();
@@ -1,15 +1,15 @@
-<?php
+<?PHP

    // Allows the admin to configure mnet stuff

-    require(__DIR__.'/../../config.php');
+    require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
    require_once($CFG->libdir.'/adminlib.php');
    include_once($CFG->dirroot.'/mnet/lib.php');

    require_login();
    admin_externalpage_setup('net');

-    $context = context_system::instance();
+    $context = get_context_instance(CONTEXT_SYSTEM);

    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");

@@ -85,7 +85,7 @@
    echo $OUTPUT->header();
 ?>
 <form method="post" action="index.php">
-    <table align="center" width="635" class="generaltable" border="0" cellpadding="5" cellspacing="0">
+    <table align="center" width="635" class="generalbox" border="0" cellpadding="5" cellspacing="0">
        <tr>
            <td  class="generalboxcontent">
            <table cellpadding="9" cellspacing="0" >
@@ -106,7 +106,7 @@
    </table>
 </form>
 <form method="post" action="index.php">
-    <table align="center" width="635" class="generaltable" border="0" cellpadding="5" cellspacing="0">
+    <table align="center" width="635" class="generalbox" border="0" cellpadding="5" cellspacing="0">
        <tr>
            <td  class="generalboxcontent">
            <table cellpadding="9" cellspacing="0" >
@@ -38,10 +38,9 @@ class mnet_simple_host_form extends moodleform {

        $mform = $this->_form;

-        $mform->addElement('text', 'wwwroot', get_string('hostname', 'mnet'), array('maxlength' => 255, 'size' => 50));
+        $mform->addElement('text', 'wwwroot', get_string('hostname', 'mnet'));
        $mform->setType('wwwroot', PARAM_URL);
        $mform->addRule('wwwroot', null, 'required', null, 'client');
-        $mform->addRule('wwwroot', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');

        $mform->addElement('select', 'applicationid', get_string('applicationtype', 'mnet'),
                           $DB->get_records_menu('mnet_application', array(), 'id,display_name'));
@@ -50,7 +49,7 @@ class mnet_simple_host_form extends moodleform {
        $this->add_action_buttons(false, get_string('addhost', 'mnet'));
    }

-    function validation($data, $files) {
+    function validation($data) {
        global $DB;

        $wwwroot = $data['wwwroot'];
@@ -60,8 +59,7 @@ class mnet_simple_host_form extends moodleform {
        }
        if ($host = $DB->get_record('mnet_host', array('wwwroot' => $wwwroot))) {
            global $CFG;
-            return array('wwwroot' => get_string('hostexists', 'mnet',
-                new moodle_url('/admin/mnet/peers.php', array('hostid' => $host->id))));
+            return array('wwwroot' => get_string('hostexists', 'mnet', $CFG->wwwroot . '/admin/mnet/peers.php?hostid=' . $host->id));
        }
        return array();
    }
@@ -79,40 +77,33 @@ class mnet_review_host_form extends moodleform {
        $mnet_peer = $this->_customdata['peer'];

        $mform->addElement('hidden', 'last_connect_time');
-        $mform->setType('last_connect_time', PARAM_INT);
        $mform->addElement('hidden', 'id');
-        $mform->setType('id', PARAM_INT);
        $mform->addElement('hidden', 'applicationid');
-        $mform->setType('applicationid', PARAM_INT);
        $mform->addElement('hidden', 'oldpublickey');
-        $mform->setType('oldpublickey', PARAM_PEM);

-        $mform->addElement('text', 'name', get_string('site'), array('maxlength' => 80, 'size' => 50));
+        $mform->addElement('text', 'name', get_string('site'));
        $mform->setType('name', PARAM_NOTAGS);
-        $mform->addRule('name', get_string('maximumchars', '', 80), 'maxlength', 80, 'client');

-        $mform->addElement('text', 'wwwroot', get_string('hostname', 'mnet'), array('maxlength' => 255, 'size' => 50));
+        $mform->addElement('text', 'wwwroot', get_string('hostname', 'mnet'));
        $mform->setType('wwwroot', PARAM_URL);
-        $mform->addRule('wwwroot', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
-
-        $options = array(
-            mnet_peer::SSL_NONE => get_string('none'),
-            mnet_peer::SSL_HOST => get_string('verifyhostonly', 'core_mnet'),
-            mnet_peer::SSL_HOST_AND_PEER => get_string('verifyhostandpeer', 'core_mnet')
-        );
-        $mform->addElement('select', 'sslverification', get_string('sslverification', 'core_mnet'), $options);
-        $mform->setDefault('sslverification', mnet_peer::SSL_HOST_AND_PEER);
-        $mform->addHelpButton('sslverification', 'sslverification', 'core_mnet');

        $themes = array('' => get_string('forceno'));
-        foreach (array_keys(core_component::get_plugin_list('theme')) as $themename) {
+        foreach (array_keys(get_plugin_list('theme')) as $themename) {
            $themes[$themename] = get_string('pluginname', 'theme_'.$themename);
        }
        $mform->addElement('select', 'theme', get_string('forcetheme'), $themes);

        $mform->addElement('textarea', 'public_key', get_string('publickey', 'mnet'), array('rows' => 17, 'cols' => 100, 'class' => 'smalltext'));
        $mform->setType('public_key', PARAM_PEM);
-        $mform->addRule('public_key', get_string('required'), 'required');
+
+        if ($mnet_peer && !empty($mnet_peer->deleted)) {
+            $radioarray = array();
+            $radioarray[] = MoodleQuickForm::createElement('radio', 'deleted', '', get_string('yes'), 1);
+            $radioarray[] = MoodleQuickForm::createElement('radio', 'deleted', '', get_string('no'), 0);
+            $mform->addGroup($radioarray, 'radioar', get_string('deleted'), array(' '), false);
+        } else {
+            $mform->addElement('hidden', 'deleted');
+        }

        // finished with form controls, now the static informational stuff
        if ($mnet_peer && !empty($mnet_peer->bootstrapped)) {
@@ -149,36 +140,21 @@ class mnet_review_host_form extends moodleform {
                }
            }

-            $mform->addElement('static', 'certdetails', get_string('certdetails', 'mnet'),
-                $OUTPUT->box('<pre>' . $credstr . '</pre>', 'generalbox certdetails'));
-        }
-
-        if ($mnet_peer && !empty($mnet_peer->deleted)) {
-            $radioarray = array();
-            $radioarray[] = $mform->createElement('static', 'deletedinfo', '',
-                $OUTPUT->container(get_string('deletedhostinfo', 'mnet'), 'deletedhostinfo'));
-            $radioarray[] = $mform->createElement('radio', 'deleted', '', get_string('yes'), 1);
-            $radioarray[] = $mform->createElement('radio', 'deleted', '', get_string('no'), 0);
-            $mform->addGroup($radioarray, 'radioar', get_string('deleted'), array(' ', ' '), false);
-        } else {
-            $mform->addElement('hidden', 'deleted');
-            $mform->setType('deleted', PARAM_BOOL);
+            $mform->addElement('static', 'certdetails', get_string('certdetails', 'mnet'), $OUTPUT->box('<pre>' . $credstr . '</pre>'));
        }

        // finished with static stuff, print save button
        $this->add_action_buttons(false);
    }

-    function validation($data, $files) {
+    function validation($data) {
        $errors = array();
        if ($data['oldpublickey'] == $data['public_key']) {
            return;
        }
        $mnet_peer = new mnet_peer(); // idiotic api
        $mnet_peer->wwwroot = $data['wwwroot']; // just hard-set this rather than bootstrap the object
-        if (empty($data['public_key'])) {
-            $errors['public_key'] = get_string('publickeyrequired', 'mnet');
-        } else if (!$credentials = $mnet_peer->check_credentials($data['public_key'])) {
+        if (!$credentials = $mnet_peer->check_credentials($data['public_key'])) {
            $errmsg = '';
            foreach ($mnet_peer->error as $err) {
                $errmsg .= $err['code'] . ': ' . $err['text'].'<br />';
@@ -27,14 +27,14 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

-require(__DIR__.'/../../config.php');
+require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->dirroot.'/mnet/lib.php');
-require_once($CFG->dirroot.'/'.$CFG->admin.'/mnet/peer_forms.php');
+require_once($CFG->dirroot.'/admin/mnet/peer_forms.php');

 require_login();

-$context = context_system::instance();
+$context = get_context_instance(CONTEXT_SYSTEM);
 require_capability('moodle/site:config', $context, $USER->id, true, 'nopermissions');

 /// Initialize variables.
@@ -109,7 +109,7 @@ if (!empty($hostid)) {
    $mnet_peer->set_id($hostid);
    echo $OUTPUT->header();
    $currenttab = 'mnetdetails';
-    require_once($CFG->dirroot . '/' . $CFG->admin . '/mnet/tabs.php');
+    require_once($CFG->dirroot . '/admin/mnet/tabs.php');

    if ($hostid != $CFG->mnet_all_hosts_id) {
        $mnet_peer->currentkey = mnet_get_public_key($mnet_peer->wwwroot, $mnet_peer->application);
@@ -144,7 +144,7 @@ if (empty($noreviewform) && $id = optional_param('id', 0, PARAM_INT)) {
    // we're editing an existing one, so set up the tabs
    $currenttab = 'mnetdetails';
    $mnet_peer->set_id($id);
-    require_once($CFG->dirroot . '/' . $CFG->admin . '/mnet/tabs.php');
+    require_once($CFG->dirroot . '/admin/mnet/tabs.php');
 } else if (empty($noreviewform) && ($wwwroot = optional_param('wwwroot', '', PARAM_URL)) && ($applicationid = optional_param('applicationid', 0, PARAM_INT))) {
    $application = $DB->get_field('mnet_application', 'name', array('id'=>$applicationid));
    $mnet_peer->bootstrap($wwwroot, null, $application);
@@ -172,7 +172,6 @@ if ($formdata = $reviewform->get_data()) {
    $mnet_peer->public_key          = $formdata->public_key;
    $credentials                    = $mnet_peer->check_credentials($mnet_peer->public_key);
    $mnet_peer->public_key_expires  = $credentials['validTo_time_t'];
-    $mnet_peer->sslverification     = $formdata->sslverification;

    if ($mnet_peer->commit()) {
        redirect(new moodle_url('/admin/mnet/peers.php', array('hostid' => $mnet_peer->id)), get_string('changessaved'));
@@ -191,7 +190,7 @@ if ($formdata = $reviewform->get_data()) {

 // normal flow - just display all hosts with links
 echo $OUTPUT->header();
-$hosts = mnet_get_hosts(true);
+$hosts = mnet_get_hosts();

 // print the table to display the register all hosts setting
 $table = new html_table();
@@ -232,43 +231,28 @@ $table->head = array(
 );
 $table->wrap = array('nowrap', 'nowrap', 'nowrap', 'nowrap');
 $baseurl = new moodle_url('/admin/mnet/peers.php');
-$deleted = array();
 foreach($hosts as $host) {
    $hosturl = new moodle_url($baseurl, array('hostid' => $host->id));
-    if (trim($host->name) === '') {
-        // should not happen but...
-        $host->name = '???';
-    }
    // process all hosts first since it's the easiest
    if ($host->id == $CFG->mnet_all_hosts_id) {
-        $table->data[] = array(html_writer::link($hosturl, get_string('allhosts', 'core_mnet')), '*', '', '');
-        continue;
-    }
-
-    // populate the list of deleted hosts
-    if ($host->deleted) {
-        $deleted[] = html_writer::link($hosturl, $host->name);
+        $table->data[] = array(html_writer::tag('a', $host->name, array('href'=>$hosturl)), '', '', '');
        continue;
    }

    if ($host->last_connect_time == 0) {
        $last_connect = get_string('never');
    } else {
-        $last_connect = userdate($host->last_connect_time, get_string('strftimedatetime', 'core_langconfig'));
+        $last_connect = date('H:i:s d/m/Y', $host->last_connect_time);
    }
    $table->data[] = array(
        html_writer::link($hosturl, $host->name),
-        html_writer::link($host->wwwroot, $host->wwwroot),
+        html_writer::link($hosturl, $host->wwwroot),
        $last_connect,
        $OUTPUT->single_button(new moodle_url('/admin/mnet/delete.php', array('hostid' => $host->id)), get_string('delete'))
    );
 }
 echo html_writer::table($table);

-if ($deleted) {
-    echo $OUTPUT->box(get_string('deletedhosts', 'core_mnet', join(', ', $deleted)), 'deletedhosts');
-}
-
 // finally, print the initial form to add a new host
 echo $OUTPUT->box_start();
 echo $OUTPUT->heading(get_string('addnewhost', 'mnet'), 3);
@@ -24,9 +24,9 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

-require(__DIR__.'/../../config.php');
+require(dirname(dirname(dirname(__FILE__))).'/config.php');
 require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->dirroot . '/' . $CFG->admin .'/mnet/profilefields_form.php');
+require_once($CFG->dirroot . '/admin/mnet/profilefields_form.php');
 $mnet = get_mnet_environment();

 require_login();
@@ -34,7 +34,7 @@ $hostid = required_param('hostid', PARAM_INT);
 $mnet_peer = new mnet_peer();
 $mnet_peer->set_id($hostid);

-$context = context_system::instance();
+$context = get_context_instance(CONTEXT_SYSTEM);

 require_capability('moodle/site:config', $context, $USER->id, true, 'nopermissions');
 admin_externalpage_setup('mnetpeers');
@@ -39,19 +39,8 @@ class mnet_profile_form extends moodleform {
        global $CFG;
        $mform =& $this->_form;

-        $mnetprofileimportfields = '';
-        if (isset($CFG->mnetprofileimportfields)) {
-            $mnetprofileimportfields = str_replace(',', ', ', $CFG->mnetprofileimportfields);
-        }
-
-        $mnetprofileexportfields = '';
-        if (isset($CFG->mnetprofileexportfields)) {
-            $mnetprofileexportfields = str_replace(',', ', ', $CFG->mnetprofileexportfields);
-        }

        $mform->addElement('hidden', 'hostid', $this->_customdata['hostid']);
-        $mform->setType('hostid', PARAM_INT);
-
        $fields = mnet_profile_field_options();

        // Fields to import ----------------------------------------------------
@@ -60,7 +49,7 @@ class mnet_profile_form extends moodleform {
        $select = $mform->addElement('select', 'importfields', get_string('importfields', 'mnet'), $fields['optional']);
        $select->setMultiple(true);

-        $mform->addElement('checkbox', 'importdefault', get_string('leavedefault', 'mnet'), $mnetprofileimportfields);
+        $mform->addElement('checkbox', 'importdefault', get_string('leavedefault', 'mnet'), str_replace(',', ', ', $CFG->mnetprofileimportfields));

        // Fields to export ----------------------------------------------------
        $mform->addElement('header', 'export', get_string('exportfields', 'mnet'));
@@ -68,7 +57,7 @@ class mnet_profile_form extends moodleform {
        $select = $mform->addElement('select', 'exportfields', get_string('exportfields', 'mnet'), $fields['optional']);
        $select->setMultiple(true);

-        $mform->addElement('checkbox', 'exportdefault', get_string('leavedefault', 'mnet'), $mnetprofileexportfields);
+        $mform->addElement('checkbox', 'exportdefault', get_string('leavedefault', 'mnet'), str_replace(',', ', ', $CFG->mnetprofileexportfields));

        $this->add_action_buttons();
    }
@@ -25,15 +25,15 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

-require(__DIR__.'/../../config.php');
+require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
 require_once($CFG->libdir.'/adminlib.php');
-require_once($CFG->dirroot . '/' . $CFG->admin . '/mnet/services_form.php');
+require_once($CFG->dirroot . '/admin/mnet/services_form.php');
 $mnet = get_mnet_environment();

 require_login();
 admin_externalpage_setup('mnetpeers');

-$context = context_system::instance();
+$context = get_context_instance(CONTEXT_SYSTEM);
 require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");

 $hostid = required_param('hostid', PARAM_INT);
@@ -82,7 +82,7 @@ if ($formdata = $mform->get_data()) {

 echo $OUTPUT->header();
 $currenttab = 'mnetservices';
-require_once($CFG->dirroot . '/' . $CFG->admin . '/mnet/tabs.php');
+require_once($CFG->dirroot . '/admin/mnet/tabs.php');
 echo $OUTPUT->box_start();
 $s = mnet_get_service_info($mnet_peer, false); // basic data only
 $mform->set_data($s);
@@ -36,10 +36,9 @@ class mnet_services_form extends moodleform {
    function definition() {
        $mform =& $this->_form;
        $mnet_peer =& $this->_customdata['peer'];
-        $myservices = mnet_get_service_info($mnet_peer);
+        $myservices =& mnet_get_service_info($mnet_peer);

        $mform->addElement('hidden', 'hostid', $mnet_peer->id);
-        $mform->setType('hostid', PARAM_INT);

        $count = 0;
        foreach ($myservices as $name => $versions) {
@@ -56,8 +55,6 @@ class mnet_services_form extends moodleform {
            $mform->addElement('html', '<h3>' .  get_string($name.'_name', $langmodule , $mnet_peer->name) . '</h3>' . get_string($name.'_description', $langmodule, $mnet_peer->name));

            $mform->addElement('hidden', 'exists[' . $version['serviceid'] . ']', 1);
-            // Temporary fix until MDL-38885 gets integrated.
-            $mform->setType('exists', PARAM_BOOL);

            $pubstr = get_string('publish','mnet');
            if (!empty($version['hostsubscribes'])) {
@@ -34,12 +34,21 @@ if (!defined('MOODLE_INTERNAL')) {
 }

 $strmnetservices   = get_string('mnetservices', 'mnet');
+$strmnetlog        = get_string('mnetlog', 'mnet');
 $strmnetedithost   = get_string('reviewhostdetails', 'mnet');

+$logurl = $CFG->wwwroot.
+          '/course/report/log/index.php?chooselog=1&amp;showusers=1&amp;showcourses=1&amp;host_course='.$mnet_peer->id.
+          '%2F1&amp;user='.'0'.
+          '&amp;date=0'.
+          '&amp;modid=&amp;modaction=0&amp;logformat=showashtml';
 $tabs = array();
 if (isset($mnet_peer->id) && $mnet_peer->id > 0) {
    $tabs[] = new tabobject('mnetdetails', 'peers.php?step=update&amp;hostid='.$mnet_peer->id, $strmnetedithost, $strmnetedithost, false);
    $tabs[] = new tabobject('mnetservices', 'services.php?hostid='.$mnet_peer->id, $strmnetservices, $strmnetservices, false);
+    if ($mnet_peer->application->name == 'moodle' && $mnet_peer->id != $CFG->mnet_all_hosts_id) {
+        $tabs[] = new tabobject('mnetlog', $logurl, $strmnetlog, $strmnetlog, false);
+    }
    $tabs[] = new tabobject('mnetprofilefields', 'profilefields.php?hostid=' . $mnet_peer->id, get_string('profilefields', 'mnet'), get_string('profilefields', 'mnet'), false);
 } else {
    $tabs[] = new tabobject('mnetdetails', '#', $strmnetedithost, $strmnetedithost, false);
@@ -12,7 +12,7 @@
 * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
 * @package mnet
 */
-require(__DIR__.'/../../config.php');
+require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
 require_once $CFG->dirroot.'/mnet/xmlrpc/client.php';
 require_once($CFG->libdir.'/adminlib.php');
 include_once($CFG->dirroot.'/mnet/lib.php');
@@ -24,7 +24,7 @@ if ($CFG->mnet_dispatcher_mode === 'off') {
 require_login();
 admin_externalpage_setup('mnettestclient');

-$context = context_system::instance();
+$context = get_context_instance(CONTEXT_SYSTEM);
 require_capability('moodle/site:config', $context);

 error_reporting(DEBUG_ALL);
@@ -66,19 +66,12 @@ if (!empty($hostid) && array_key_exists($hostid, $hosts)) {

    $mnet_request->set_method('system/listServices');
    $mnet_request->send($mnet_peer);
-
    $services = $mnet_request->response;
    $yesno = array('No', 'Yes');
    $servicenames = array();

    echo $OUTPUT->heading(get_string('servicesavailableonhost', 'mnet', $host->wwwroot));

-    if (!empty($mnet_request->error)) {
-        echo $OUTPUT->heading(get_string('error'), 3);
-        echo html_writer::alist($mnet_request->error);
-        $services = array();
-    }
-
    $table = new html_table();
    $table->head = array(
        get_string('serviceid', 'mnet'),
@@ -134,7 +127,6 @@ if (!empty($hostid) && array_key_exists($hostid, $hosts)) {
    echo html_writer::table($table);


-    $mnet_request = new mnet_xmlrpc_client();
    $mnet_request->set_method('system/listMethods');
    if (isset($servicename) && array_key_exists($servicename, $serviceinfo)) {
        echo $OUTPUT->heading(get_string('methodsavailableonhostinservice', 'mnet', (object)array('host' => $host->wwwroot, 'service' => $servicename)));
@@ -147,11 +139,6 @@ if (!empty($hostid) && array_key_exists($hostid, $hosts)) {
    $mnet_request->send($mnet_peer);
    $methods = $mnet_request->response;

-    if (!empty($mnet_request->error)) {
-        echo $OUTPUT->heading(get_string('error'), 3);
-        echo html_writer::alist($mnet_request->error);
-        $methods = array();
-    }

    $table = new html_table();
    $table->head = array(
@@ -184,12 +171,6 @@ if (!empty($hostid) && array_key_exists($hostid, $hosts)) {

        echo $OUTPUT->heading(get_string('methodsignature', 'mnet', $method));

-        if (!empty($mnet_request->error)) {
-            echo $OUTPUT->heading(get_string('error'), 3);
-            echo html_writer::alist($mnet_request->error);
-            $signature = array();
-        }
-
        $table = new html_table();
        $table->head = array(
            get_string('position', 'mnet'),
@@ -1,14 +1,14 @@
 <?php
    // Allows the admin to configure services for remote hosts

-    require(__DIR__.'/../../config.php');
+    require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
    require_once($CFG->libdir.'/adminlib.php');
    include_once($CFG->dirroot.'/mnet/lib.php');

    require_login();
    admin_externalpage_setup('trustedhosts');

-    $context = context_system::instance();
+    $context = get_context_instance(CONTEXT_SYSTEM);

    require_capability('moodle/site:config', $context, $USER->id, true, "nopermissions");

@@ -11,14 +11,16 @@

    admin_externalpage_setup('managemodules');

-    $show    = optional_param('show', '', PARAM_PLUGIN);
-    $hide    = optional_param('hide', '', PARAM_PLUGIN);
+    $show    = optional_param('show', '', PARAM_SAFEDIR);
+    $hide    = optional_param('hide', '', PARAM_SAFEDIR);
+    $delete  = optional_param('delete', '', PARAM_SAFEDIR);
+    $confirm = optional_param('confirm', '', PARAM_BOOL);


 /// Print headings

    $stractivities = get_string("activities");
-    $struninstall = get_string('uninstallplugin', 'core_admin');
+    $strdelete = get_string("delete");
    $strversion = get_string("version");
    $strhide = get_string("hide");
    $strshow = get_string("show");
@@ -40,14 +42,14 @@
                   SET visibleold=visible, visible=0
                 WHERE module=?";
        $DB->execute($sql, array($module->id));
-        // Increment course.cacherev for courses where we just made something invisible.
-        // This will force cache rebuilding on the next request.
-        increment_revision_number('course', 'cacherev',
-                "id IN (SELECT DISTINCT course
+        // clear the course modinfo cache for courses
+        // where we just deleted something
+        $sql = "UPDATE {course}
+                   SET modinfo=''
+                 WHERE id IN (SELECT DISTINCT course
                                FROM {course_modules}
-                               WHERE visibleold=1 AND module=?)",
-                array($module->id));
-        core_plugin_manager::reset_caches();
+                               WHERE visibleold=1 AND module=?)";
+        $DB->execute($sql, array($module->id));
        admin_get_root(true, false);  // settings not required - only pages
    }

@@ -57,17 +59,48 @@
        }
        $DB->set_field("modules", "visible", "1", array("id"=>$module->id)); // Show main module
        $DB->set_field('course_modules', 'visible', '1', array('visibleold'=>1, 'module'=>$module->id)); // Get the previous saved visible state for the course module.
-        // Increment course.cacherev for courses where we just made something visible.
-        // This will force cache rebuilding on the next request.
-        increment_revision_number('course', 'cacherev',
-                "id IN (SELECT DISTINCT course
+        // clear the course modinfo cache for courses
+        // where we just made something visible
+        $sql = "UPDATE {course}
+                   SET modinfo = ''
+                 WHERE id IN (SELECT DISTINCT course
                                FROM {course_modules}
-                               WHERE visible=1 AND module=?)",
-                array($module->id));
-        core_plugin_manager::reset_caches();
+                               WHERE visible=1 AND module=?)";
+        $DB->execute($sql, array($module->id));
        admin_get_root(true, false);  // settings not required - only pages
    }

+    if (!empty($delete) and confirm_sesskey()) {
+        echo $OUTPUT->header();
+        echo $OUTPUT->heading($stractivities);
+
+        if (get_string_manager()->string_exists('modulename', $delete)) {
+            $strmodulename = get_string('modulename', $delete);
+        } else {
+            $strmodulename = $delete;
+        }
+
+        if (!$confirm) {
+            echo $OUTPUT->confirm(get_string("moduledeleteconfirm", "", $strmodulename), "modules.php?delete=$delete&confirm=1", "modules.php");
+            echo $OUTPUT->footer();
+            exit;
+
+        } else {  // Delete everything!!
+
+            if ($delete == "forum") {
+                print_error("cannotdeleteforummodule", 'forum');
+            }
+
+            uninstall_plugin('mod', $delete);
+            $a->module = $strmodulename;
+            $a->directory = "$CFG->dirroot/mod/$delete";
+            echo $OUTPUT->notification(get_string("moduledeletefiles", "", $a), 'notifysuccess');
+            echo $OUTPUT->continue_button("modules.php");
+            echo $OUTPUT->footer();
+            exit;
+        }
+    }
+
    echo $OUTPUT->header();
    echo $OUTPUT->heading($stractivities);

@@ -80,11 +113,11 @@
 /// Print the table of all modules
    // construct the flexible table ready to display
    $table = new flexible_table(MODULE_TABLE);
-    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'uninstall', 'settings'));
-    $table->define_headers(array($stractivitymodule, $stractivities, $strversion, "$strhide/$strshow", $strsettings, $struninstall));
+    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'delete', 'settings'));
+    $table->define_headers(array($stractivitymodule, $stractivities, $strversion, "$strhide/$strshow", $strdelete, $strsettings));
    $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/modules.php');
    $table->set_attribute('id', 'modules');
-    $table->set_attribute('class', 'admintable generaltable');
+    $table->set_attribute('class', 'generaltable');
    $table->setup();

    foreach ($modules as $module) {
@@ -99,10 +132,7 @@
            $missing = false;
        }

-        $uninstall = '';
-        if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('mod_'.$module->name, 'manage')) {
-            $uninstall = html_writer::link($uninstallurl, $struninstall);
-        }
+        $delete = "<a href=\"modules.php?delete=$module->name&amp;sesskey=".sesskey()."\">$strdelete</a>";

        if (file_exists("$CFG->dirroot/mod/$module->name/settings.php") ||
                file_exists("$CFG->dirroot/mod/$module->name/settingstree.php")) {
@@ -130,28 +160,28 @@
            $class   = '';
        } else if ($module->visible) {
            $visible = "<a href=\"modules.php?hide=$module->name&amp;sesskey=".sesskey()."\" title=\"$strhide\">".
-                       "<img src=\"" . $OUTPUT->pix_url('t/hide') . "\" class=\"iconsmall\" alt=\"$strhide\" /></a>";
+                       "<img src=\"" . $OUTPUT->pix_url('i/hide') . "\" class=\"icon\" alt=\"$strhide\" /></a>";
            $class   = '';
        } else {
            $visible = "<a href=\"modules.php?show=$module->name&amp;sesskey=".sesskey()."\" title=\"$strshow\">".
-                       "<img src=\"" . $OUTPUT->pix_url('t/show') . "\" class=\"iconsmall\" alt=\"$strshow\" /></a>";
-            $class =   'dimmed_text';
+                       "<img src=\"" . $OUTPUT->pix_url('i/show') . "\" class=\"icon\" alt=\"$strshow\" /></a>";
+            $class =   ' class="dimmed_text"';
        }
        if ($module->name == "forum") {
-            $uninstall = "";
+            $delete = "";
            $visible = "";
            $class = "";
        }
-        $version = get_config('mod_'.$module->name, 'version');
+

        $table->add_data(array(
-            $strmodulename,
+            '<span'.$class.'>'.$strmodulename.'</span>',
            $countlink,
-            $version,
+            '<span'.$class.'>'.$module->version.'</span>',
            $visible,
-            $settings,
-            $uninstall,
-        ), $class);
+            $delete,
+            $settings
+        ));
    }

    $table->print_html();
@@ -0,0 +1,117 @@
+<?php
+      /// Search and replace strings throughout all texts in the whole database
+
+define('NO_OUTPUT_BUFFERING', true);
+
+require_once('../config.php');
+require_once($CFG->dirroot.'/course/lib.php');
+require_once($CFG->libdir.'/adminlib.php');
+
+admin_externalpage_setup('multilangupgrade');
+
+$go = optional_param('go', 0, PARAM_BOOL);
+
+###################################################################
+echo $OUTPUT->header();
+
+echo $OUTPUT->heading(get_string('multilangupgrade', 'admin'));
+
+$strmultilangupgrade = get_String('multilangupgradeinfo', 'admin');
+
+if (!$go or !data_submitted() or !confirm_sesskey()) {   /// Print a form
+    $optionsyes = array('go'=>1, 'sesskey'=>sesskey());
+    echo $OUTPUT->confirm($strmultilangupgrade, new moodle_url('multilangupgrade.php', $optionsyes), 'index.php');
+    echo $OUTPUT->footer();
+    die;
+}
+
+
+if (!$tables = $DB->get_tables() ) {    // No tables yet at all.
+    print_error('notables', 'debug');
+}
+
+echo $OUTPUT->box_start();
+
+/// Turn off time limits, sometimes upgrades can be slow.
+
+@set_time_limit(0);
+
+echo '<strong>Progress:</strong>';
+$i = 0;
+$skiptables = array('config', 'user_students', 'user_teachers');
+
+foreach ($tables as $table) {
+    if (strpos($table,'pma') === 0) { // Not our tables
+        continue;
+    }
+    if (in_array($table, $skiptables)) { // Don't process these
+        continue;
+    }
+    $fulltable = $DB->get_prefix().$table;
+    if ($columns = $DB->get_columns($table)) {
+        if (!array_key_exists('id', $columns)) {
+            continue; // moodle tables have id
+        }
+        foreach ($columns as $column => $data) {
+            if (in_array($data->type, array('text','mediumtext','longtext','varchar'))) {  // Text stuff only
+                // first find candidate records
+                $sql = "SELECT id, $column FROM $fulltable WHERE $column LIKE '%</lang>%' OR $column LIKE '%<span lang=%'";
+                $rs = $DB->get_recordset_sql($sql);
+                foreach ($rs as $data) {
+                    $text = $data->$column;
+                    $id   = $data->id;
+                    if ($i % 600 == 0) {
+                        echo '<br />';
+                    }
+                    if ($i % 10 == 0) {
+                        echo '.';
+                    }
+                    $i++;
+
+                    if (empty($text) or is_numeric($text)) {
+                        continue; // nothing to do
+                    }
+
+                    $search = '/(<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)(\s*<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)+/is';
+                    $newtext = preg_replace_callback($search, 'multilangupgrade_impl', $text);
+
+                    if (is_null($newtext)) {
+                        continue; // regex error
+                    }
+
+                    if ($newtext != $text) {
+                        $DB->execute("UPDATE $fulltable SET $column=? WHERE id=?", array($newtext, $id));
+                    }
+                }
+                $rs->close();
+            }
+        }
+    }
+}
+
+// set conversion flag - switches to new plugin automatically
+set_config('filter_multilang_converted', 1);
+
+echo $OUTPUT->box_end();
+
+/// Rebuild course cache which might be incorrect now
+echo $OUTPUT->notification('Rebuilding course cache...', 'notifysuccess');
+rebuild_course_cache();
+echo $OUTPUT->notification('...finished', 'notifysuccess');
+
+echo $OUTPUT->continue_button('index.php');
+
+echo $OUTPUT->footer();
+die;
+
+
+function multilangupgrade_impl($langblock) {
+    $searchtosplit = '/<(?:lang|span) lang="([a-zA-Z0-9_-]*)".*?>(.+?)<\/(?:lang|span)>/is';
+    preg_match_all($searchtosplit, $langblock[0], $rawlanglist);
+    $return = '';
+    foreach ($rawlanglist[1] as $index=>$lang) {
+        $return .= '<span lang="'.$lang.'" class="multilang">'.$rawlanglist[2][$index].'</span>';
+    }
+    return $return;
+}
+
@@ -0,0 +1,166 @@
+<?php
+
+if (!isset($CFG)) {
+
+    require('../config.php');
+    require_once($CFG->libdir.'/adminlib.php');
+
+    admin_externalpage_setup('oacleanup');
+
+    echo $OUTPUT->header();
+    online_assignment_cleanup(true);
+    echo $OUTPUT->footer();
+
+}
+
+
+
+function online_assignment_cleanup($output=false) {
+    global $CFG, $DB, $OUTPUT;
+
+    if ($output) {
+        echo $OUTPUT->heading('Online Assignment Cleanup');
+        echo '<center>';
+    }
+
+
+    /// We don't want to run this code if we are doing an upgrade from an assignment
+    /// version earlier than 2005041400
+    /// because the assignment type field will not exist
+    $amv = $DB->get_field('modules', 'version', array('name'=>'assignment'));
+    if ((int)$amv < 2005041400) {
+        if ($output) {
+            echo '</center>';
+        }
+        return;
+    }
+
+
+    /// get the module id for assignments from db
+    $arecord = $DB->get_record('modules', array('name', 'assignment'));
+    $aid = $arecord->id;
+
+
+    /// get a list of all courses on this site
+    list($ctxselect, $ctxjoin) = context_instance_preload_sql('c.id', CONTEXT_COURSE, 'ctx');
+    $sql = "SELECT c.* $ctxselect FROM {course} c $ctxjoin";
+    $courses = $DB->get_records_sql($sql);
+
+    /// cycle through each course
+    foreach ($courses as $course) {
+        context_instance_preload($course);
+        $context = get_context_instance(CONTEXT_COURSE, $course->id);
+
+        if (empty($course->fullname)) {
+            $fullname = get_string('course').': '.$course->id;
+        } else {
+            $fullname = format_string($course->fullname, true, array('context' => $context));
+        }
+        if ($output) echo $OUTPUT->heading($fullname);
+
+        /// retrieve a list of sections beyond what is currently being shown
+        $sql = "SELECT *
+                  FROM {course_sections}
+                 WHERE course=? AND section>?
+              ORDER BY section ASC";
+        $params = array($course->id, $course->numsections);
+        if (!($xsections = $DB->get_records_sql($sql, $params))) {
+            if ($output) echo 'No extra sections<br />';
+            continue;
+        }
+
+        /// cycle through each of the xtra sections
+        foreach ($xsections as $xsection) {
+
+            if ($output) echo 'Checking Section: '.$xsection->section.'<br />';
+
+            /// grab any module instances from the sequence field
+            if (!empty($xsection->sequence)) {
+                $instances = explode(',', $xsection->sequence);
+
+                /// cycle through the instances
+                foreach ($instances as $instance) {
+                    /// is this an instance of an online assignment
+                    $sql = "SELECT a.id
+                              FROM  {course_modules} cm, {assignment} a
+                             WHERE cm.id = ? AND cm.module = ? AND
+                                   cm.instance = a.id AND a.assignmenttype = 'online'";
+                    $params = array($instance, $aid);
+
+                    /// if record exists then we need to move instance to it's correct section
+                    if ($DB->record_exists_sql($sql, $params)) {
+
+                        /// check the new section id
+                        /// the journal update erroneously stored it in course_sections->section
+                        $newsection = $xsection->section;
+                        /// double check the new section
+                        if ($newsection > $course->numsections) {
+                            /// get the record for section 0 for this course
+                            if (!($zerosection = $DB->get_record('course_sections', array('course'=>$course->id, 'section'=>'0')))) {
+                                continue;
+                            }
+                            $newsection = $zerosection->id;
+                        }
+
+                        /// grab the section record
+                        if (!($section = $DB->get_record('course_sections', array('id'=>$newsection)))) {
+                            if ($output) {
+                                echo 'Serious error: Cannot retrieve section: '.$newsection.' for course: '. $fullname .'<br />';
+                            }
+                            continue;
+                        }
+
+                        /// explode the sequence
+                        if  (($sequence = explode(',', $section->sequence)) === false) {
+                            $sequence = array();
+                        }
+
+                        /// add instance to correct section
+                        array_push($sequence, $instance);
+
+                        /// implode the sequence
+                        $section->sequence = implode(',', $sequence);
+
+                        $DB->set_field('course_sections', 'sequence', $section->sequence, array('id'=>$section->id));
+
+                        /// now we need to remove the instance from the old sequence
+
+                        /// grab the old section record
+                        if (!($section = $DB->get_record('course_sections', array('id'=>$xsection->id)))) {
+                            if ($output) echo 'Serious error: Cannot retrieve old section: '.$xsection->id.' for course: '.$fullname.'<br />';
+                            continue;
+                        }
+
+                        /// explode the sequence
+                        if  (($sequence = explode(',', $section->sequence)) === false) {
+                            $sequence = array();
+                        }
+
+                        /// remove the old value from the array
+                        $key = array_search($instance, $sequence);
+                        unset($sequence[$key]);
+
+                        /// implode the sequence
+                        $section->sequence = implode(',', $sequence);
+
+                        $DB->set_field('course_sections', 'sequence', $section->sequence, array('id'=>$section->id));
+
+
+                        if ($output) echo 'Online Assignment (instance '.$instance.') moved from section '.$section->id.': to section '.$newsection.'<br />';
+
+                    }
+                }
+            }
+
+            /// if the summary and sequence are empty then remove this section
+            if (empty($xsection->summary) and empty($xsection->sequence)) {
+                $DB->delete_records('course_sections', array('id'=>$xsection->id));
+                if ($output) echo 'Deleting empty section '.$xsection->section.'<br />';
+            }
+        }
+    }
+
+    echo '</center>';
+}
+
+
@@ -1,46 +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/>.
-
-/**
- * An oauth2 redirection endpoint which can be used for an application:
- * http://tools.ietf.org/html/draft-ietf-oauth-v2-26#section-3.1.2
- *
- * This is used because some oauth servers will not allow a redirect urls
- * with get params (like repository callback) and that needs to be called
- * using the state param.
- *
- * @package    core
- * @copyright  2012 Dan Poltawski
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once(__DIR__ . '/../config.php');
-
-// The authorization code generated by the authorization server.
-$code = required_param('code', PARAM_RAW);
-// The state parameter we've given (used in moodle as a redirect url).
-$state = required_param('state', PARAM_LOCALURL);
-
-$redirecturl = new moodle_url($state);
-$params = $redirecturl->params();
-
-if (isset($params['sesskey']) and confirm_sesskey($params['sesskey'])) {
-    $redirecturl->param('oauth2code', $code);
-    redirect($redirecturl);
-} else {
-    print_error('invalidsesskey');
-}
@@ -8,10 +8,10 @@

    echo $OUTPUT->header();

-    echo '<div class="phpinfo text-ltr">';
+    echo '<div class="phpinfo">';

    ob_start();
-    phpinfo(INFO_GENERAL + INFO_CONFIGURATION + INFO_MODULES + INFO_VARIABLES);
+    phpinfo(INFO_GENERAL + INFO_CONFIGURATION + INFO_MODULES);
    $html = ob_get_contents();
    ob_end_clean();

@@ -1,86 +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/>.
-
-/**
- * Provides an overview of installed plagiarism plugins
- *
- * Displays the list of found plagiarism plugins, their version (if found) and
- * a link to uninstall the plagiarism plugin.
- *
- * @see       http://docs.moodle.org/dev/Plagiarism_API
- * @package   admin
- * @copyright 2012 Dan Marsden <dan@danmarsden.com>
- * @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');
-
-
-admin_externalpage_setup('manageplagiarismplugins');
-
-echo $OUTPUT->header();
-
-// Print the table of all installed plagiarism plugins.
-
-$txt = get_strings(array('settings', 'name', 'version'));
-$txt->uninstall = get_string('uninstallplugin', 'core_admin');
-
-$plagiarismplugins = core_component::get_plugin_list('plagiarism');
-if (empty($plagiarismplugins)) {
-    echo $OUTPUT->notification(get_string('nopluginsinstalled', 'plagiarism'));
-    echo $OUTPUT->footer();
-    exit;
-}
-
-echo $OUTPUT->heading(get_string('availableplugins', 'plagiarism'), 3, 'main');
-echo $OUTPUT->box_start('generalbox authsui');
-
-$table = new html_table();
-$table->head  = array($txt->name, $txt->version, $txt->uninstall, $txt->settings);
-$table->colclasses = array('mdl-left', 'mdl-align', 'mdl-align', 'mdl-align');
-$table->data  = array();
-$table->attributes['class'] = 'manageplagiarismtable generaltable';
-
-// Iterate through auth plugins and add to the display table.
-$authcount = count($plagiarismplugins);
-foreach ($plagiarismplugins as $plugin => $dir) {
-    if (file_exists($dir.'/settings.php')) {
-        $displayname = "<span>".get_string($plugin, 'plagiarism_'.$plugin)."</span>";
-        // Settings link.
-        $url = new moodle_url("/plagiarism/$plugin/settings.php");
-        $settings = html_writer::link($url, $txt->settings);
-        // Get version.
-        $version = get_config('plagiarism_' . $plugin);
-        if (!empty($version->version)) {
-            $version = $version->version;
-        } else {
-            $version = '?';
-        }
-        // uninstall link.
-        $uninstall = '';
-        if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('plagiarism_'.$plugin, 'manage')) {
-            $uninstall = html_writer::link($uninstallurl, $txt->uninstall);
-        }
-        $table->data[] = array($displayname, $version, $uninstall, $settings);
-    }
-}
-echo html_writer::table($table);
-echo get_string('configplagiarismplugins', 'plagiarism');
-echo $OUTPUT->box_end();
-
-echo $OUTPUT->footer();
@@ -24,193 +24,18 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

-require_once(__DIR__ . '/../config.php');
+require_once(dirname(dirname(__FILE__)) . '/config.php');
 require_once($CFG->libdir . '/adminlib.php');
-require_once($CFG->libdir . '/filelib.php');
+require_once($CFG->libdir . '/pluginlib.php');

-$fetchupdates = optional_param('fetchupdates', false, PARAM_BOOL); // Check for available plugins updates.
-$updatesonly = optional_param('updatesonly', false, PARAM_BOOL); // Show updateable plugins only.
-$contribonly = optional_param('contribonly', false, PARAM_BOOL); // Show additional plugins only.
-$uninstall = optional_param('uninstall', '', PARAM_COMPONENT); // Uninstall the plugin.
-$delete = optional_param('delete', '', PARAM_COMPONENT); // Delete the plugin folder after it is uninstalled.
-$confirmed = optional_param('confirm', false, PARAM_BOOL); // Confirm the uninstall/delete action.
-$return = optional_param('return', 'overview', PARAM_ALPHA); // Where to return after uninstall.
-$installupdate = optional_param('installupdate', null, PARAM_COMPONENT); // Install given available update.
-$installupdateversion = optional_param('installupdateversion', null, PARAM_INT); // Version of the available update to install.
-$installupdatex = optional_param('installupdatex', false, PARAM_BOOL); // Install all available plugin updates.
-$confirminstallupdate = optional_param('confirminstallupdate', false, PARAM_BOOL); // Available update(s) install confirmed?
-
-// NOTE: do not use admin_externalpage_setup() here because it loads
-//       full admin tree which is not possible during uninstallation.
-
-require_login();
-$syscontext = context_system::instance();
-require_capability('moodle/site:config', $syscontext);
-
-// URL params we want to maintain on redirects.
-$pageparams = array('updatesonly' => $updatesonly, 'contribonly' => $contribonly);
-$pageurl = new moodle_url('/admin/plugins.php', $pageparams);
-
-$pluginman = core_plugin_manager::instance();
-
-if ($uninstall) {
-    require_sesskey();
-
-    if (!$confirmed) {
-        admin_externalpage_setup('pluginsoverview', '', $pageparams);
-    } else {
-        $PAGE->set_url($pageurl);
-        $PAGE->set_context($syscontext);
-        $PAGE->set_pagelayout('maintenance');
-        $PAGE->set_popup_notification_allowed(false);
-    }
-
-    /** @var core_admin_renderer $output */
-    $output = $PAGE->get_renderer('core', 'admin');
-
-    $pluginfo = $pluginman->get_plugin_info($uninstall);
-
-    // Make sure we know the plugin.
-    if (is_null($pluginfo)) {
-        throw new moodle_exception('err_uninstalling_unknown_plugin', 'core_plugin', '', array('plugin' => $uninstall),
-            'core_plugin_manager::get_plugin_info() returned null for the plugin to be uninstalled');
-    }
-
-    $pluginname = $pluginman->plugin_name($pluginfo->component);
-    $PAGE->set_title($pluginname);
-    $PAGE->navbar->add(get_string('uninstalling', 'core_plugin', array('name' => $pluginname)));
-
-    if (!$pluginman->can_uninstall_plugin($pluginfo->component)) {
-        throw new moodle_exception('err_cannot_uninstall_plugin', 'core_plugin', '',
-            array('plugin' => $pluginfo->component),
-            'core_plugin_manager::can_uninstall_plugin() returned false');
-    }
-
-    if (!$confirmed) {
-        $continueurl = new moodle_url($PAGE->url, array('uninstall' => $pluginfo->component, 'sesskey' => sesskey(), 'confirm' => 1, 'return'=>$return));
-        $cancelurl = $pluginfo->get_return_url_after_uninstall($return);
-        echo $output->plugin_uninstall_confirm_page($pluginman, $pluginfo, $continueurl, $cancelurl);
-        exit();
-
-    } else {
-        $SESSION->pluginuninstallreturn = $pluginfo->get_return_url_after_uninstall($return);
-        $progress = new progress_trace_buffer(new text_progress_trace(), false);
-        $pluginman->uninstall_plugin($pluginfo->component, $progress);
-        $progress->finished();
-
-        if ($pluginman->is_plugin_folder_removable($pluginfo->component)) {
-            $continueurl = new moodle_url($PAGE->url, array('delete' => $pluginfo->component, 'sesskey' => sesskey(), 'confirm' => 1));
-            echo $output->plugin_uninstall_results_removable_page($pluginman, $pluginfo, $progress, $continueurl);
-            // Reset op code caches.
-            if (function_exists('opcache_reset')) {
-                opcache_reset();
-            }
-            exit();
-
-        } else {
-            echo $output->plugin_uninstall_results_page($pluginman, $pluginfo, $progress);
-            // Reset op code caches.
-            if (function_exists('opcache_reset')) {
-                opcache_reset();
-            }
-            exit();
-        }
-    }
-}
-
-if ($delete and $confirmed) {
-    require_sesskey();
-
-    $PAGE->set_url($pageurl);
-    $PAGE->set_context($syscontext);
-    $PAGE->set_pagelayout('maintenance');
-    $PAGE->set_popup_notification_allowed(false);
-
-    /** @var core_admin_renderer $output */
-    $output = $PAGE->get_renderer('core', 'admin');
-
-    $pluginfo = $pluginman->get_plugin_info($delete);
-
-    // Make sure we know the plugin.
-    if (is_null($pluginfo)) {
-        throw new moodle_exception('err_removing_unknown_plugin', 'core_plugin', '', array('plugin' => $delete),
-            'core_plugin_manager::get_plugin_info() returned null for the plugin to be deleted');
-    }
-
-    $pluginname = $pluginman->plugin_name($pluginfo->component);
-    $PAGE->set_title($pluginname);
-    $PAGE->navbar->add(get_string('uninstalling', 'core_plugin', array('name' => $pluginname)));
-
-    // Make sure it is not installed.
-    if (!is_null($pluginfo->versiondb)) {
-        throw new moodle_exception('err_removing_installed_plugin', 'core_plugin', '',
-            array('plugin' => $pluginfo->component, 'versiondb' => $pluginfo->versiondb),
-            'core_plugin_manager::get_plugin_info() returned not-null versiondb for the plugin to be deleted');
-    }
-
-    // Make sure the folder is within Moodle installation tree.
-    if (strpos($pluginfo->rootdir, $CFG->dirroot) !== 0) {
-        throw new moodle_exception('err_unexpected_plugin_rootdir', 'core_plugin', '',
-            array('plugin' => $pluginfo->component, 'rootdir' => $pluginfo->rootdir, 'dirroot' => $CFG->dirroot),
-            'plugin root folder not in the moodle dirroot');
-    }
-
-    // So long, and thanks for all the bugs.
-    $pluginman->remove_plugin_folder($pluginfo);
-
-    // We need to execute upgrade to make sure everything including caches is up to date.
-    redirect(new moodle_url('/admin/index.php'));
-}
-
-// Install all avilable updates.
-if ($installupdatex) {
-    require_once($CFG->libdir.'/upgradelib.php');
-    require_sesskey();
-
-    $PAGE->set_url($pageurl);
-    $PAGE->set_context($syscontext);
-    $PAGE->set_pagelayout('maintenance');
-    $PAGE->set_popup_notification_allowed(false);
-
-    $installable = $pluginman->filter_installable($pluginman->available_updates());
-    upgrade_install_plugins($installable, $confirminstallupdate,
-        get_string('updateavailableinstallallhead', 'core_admin'),
-        new moodle_url($PAGE->url, array('installupdatex' => 1, 'confirminstallupdate' => 1))
-    );
-}
-
-// Install single available update.
-if ($installupdate and $installupdateversion) {
-    require_once($CFG->libdir.'/upgradelib.php');
-    require_sesskey();
-
-    $PAGE->set_url($pageurl);
-    $PAGE->set_context($syscontext);
-    $PAGE->set_pagelayout('maintenance');
-    $PAGE->set_popup_notification_allowed(false);
-
-    if ($pluginman->is_remote_plugin_installable($installupdate, $installupdateversion)) {
-        $installable = array($pluginman->get_remote_plugin_info($installupdate, $installupdateversion, true));
-        upgrade_install_plugins($installable, $confirminstallupdate,
-            get_string('updateavailableinstallallhead', 'core_admin'),
-            new moodle_url($PAGE->url, array('installupdate' => $installupdate,
-                'installupdateversion' => $installupdateversion, 'confirminstallupdate' => 1)
-            )
-        );
-    }
-}
-
-admin_externalpage_setup('pluginsoverview', '', $pageparams);
-
-/** @var core_admin_renderer $output */
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+admin_externalpage_setup('pluginsoverview');
 $output = $PAGE->get_renderer('core', 'admin');
+$pluginman = plugin_manager::instance();

-$checker = \core\update\checker::instance();
-
-if ($fetchupdates) {
-    require_sesskey();
-    $checker->fetch();
-    redirect($PAGE->url);
-}
-
-echo $output->plugin_management_page($pluginman, $checker, $pageparams);
+echo $output->header();
+echo $output->heading(get_string('pluginsoverview', 'core_admin'));
+echo $output->box_start('generalbox');
+echo $output->plugins_control_panel($pluginman->get_plugins());
+echo $output->box_end();
+echo $output->footer();
@@ -1,11 +1,11 @@
 <?php

-require_once(__DIR__ . '/../config.php');
+require_once(dirname(dirname(__FILE__)) . '/config.php');
 require_once($CFG->libdir . '/portfoliolib.php');
 require_once($CFG->libdir . '/portfolio/forms.php');
 require_once($CFG->libdir . '/adminlib.php');

-$portfolio     = optional_param('pf', '', PARAM_ALPHANUMEXT);
+$portfolio     = optional_param('pf', '', PARAM_FORMAT);
 $action        = optional_param('action', '', PARAM_ALPHA);
 $sure          = optional_param('sure', '', PARAM_ALPHA);

@@ -35,7 +35,7 @@ if ($action == 'newon') {

 admin_externalpage_setup($pagename);

-require_capability('moodle/site:config', context_system::instance());
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));

 $baseurl    = "$CFG->wwwroot/$CFG->admin/portfolio.php";
 $sesskeyurl = "$CFG->wwwroot/$CFG->admin/portfolio.php?sesskey=" . sesskey();
@@ -88,7 +88,6 @@ if (($action == 'edit') || ($action == 'new')) {
        } else {
            portfolio_static_function($plugin, 'create_instance', $plugin, $fromform->name, $fromform);
        }
-        core_plugin_manager::reset_caches();
        $savedstr = get_string('instancesaved', 'portfolio');
        redirect($baseurl, $savedstr, 1);
        exit;
@@ -117,7 +116,6 @@ if (($action == 'edit') || ($action == 'new')) {

    $instance->set('visible', $visible);
    $instance->save();
-    core_plugin_manager::reset_caches();
    $return = true;
 } else if ($action == 'delete') {
    $instance = portfolio_instance($portfolio);
@@ -162,7 +160,7 @@ if (($action == 'edit') || ($action == 'new')) {

    $output = $OUTPUT->box_start('generalbox');

-    $plugins = core_component::get_plugin_list('portfolio');
+    $plugins = get_plugin_list('portfolio');
    $plugins = array_keys($plugins);
    $instances = portfolio_instances(false, false);
    $usedplugins = array();
@@ -199,7 +197,6 @@ if (($action == 'edit') || ($action == 'new')) {
                $currentaction = 'hide';
            }
            $select = new single_select(portfolio_action_url($pluginid, 'pf'), 'action', $actionchoicesforexisting, $currentaction, null, 'applyto' . $pluginid);
-            $select->set_label(get_string('action'), array('class' => 'accesshide'));
            $table->data[] = array($pluginname, $OUTPUT->render($select), $settings);
        }
        if (!in_array($plugin, $usedplugins)) {
@@ -221,7 +218,6 @@ if (($action == 'edit') || ($action == 'new')) {
                $insaneplugins[] = $p;
            } else {
                $select = new single_select(portfolio_action_url($p, 'pf'), 'action', $actionchoicesfornew, 'delete', null, 'applyto' . $p);
-                $select->set_label(get_string('action'), array('class' => 'accesshide'));
                $table->data[] = array(portfolio_static_function($p, 'get_name'), $OUTPUT->render($select), '');
            }
        }
@@ -3,7 +3,7 @@

 //error_reporting(0);
 //ini_set('display_errors',0);
-require_once(__DIR__ . '/../config.php');
+require_once(dirname(dirname(__FILE__)).'/config.php');
 $tmp = explode('@',$_ENV['RECIPIENT']);
 $address = $tmp[0];

@@ -27,37 +27,37 @@ require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');

 $confirm = optional_param('confirm', 0, PARAM_BOOL);
-$returnurl = optional_param('returnurl', null, PARAM_LOCALURL);

-// If we have got here as a confirmed aciton, do it.
-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.
-    purge_all_caches();
-
-    if ($returnurl) {
-        $returnurl = $CFG->wwwroot . $returnurl;
-    } else {
-        $returnurl = new moodle_url('/admin/purgecaches.php');
-    }
-    redirect($returnurl, get_string('purgecachesfinished', 'admin'));
-}
-
-// Otherwise, show a button to actually purge the caches.
 admin_externalpage_setup('purgecaches');

-$actionurl = new moodle_url('/admin/purgecaches.php', array('sesskey'=>sesskey(), 'confirm'=>1));
-if ($returnurl) {
-    $actionurl->param('returnurl', $returnurl);
+require_login();
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+
+if ($confirm) {
+    require_sesskey();
+
+    // Valid request. Purge, and redisplay the form so it is easy to purge again
+    // in the near future.
+    purge_all_caches();
+    redirect(new moodle_url('/admin/purgecaches.php'), get_string('purgecachesfinished', 'admin'));
+
+} else {
+    // Show a confirm form.
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('purgecaches', 'admin'));
+
+    $url = new moodle_url('/admin/purgecaches.php', array('sesskey'=>sesskey(), 'confirm'=>1));
+    $button = new single_button($url, get_string('purgecaches','admin'), 'post');
+
+    // Cancel button takes them back to the page the were on, if possible,
+    // otherwise to the site home page.
+    $return = new moodle_url('/');
+    if (isset($_SERVER['HTTP_REFERER']) and !empty($_SERVER['HTTP_REFERER'])) {
+        if ($_SERVER['HTTP_REFERER'] !== "$CFG->wwwroot/$CFG->admin/purgecaches.php") {
+            $return = $_SERVER['HTTP_REFERER'];
+        }
+    }
+
+    echo $OUTPUT->confirm(get_string('purgecachesconfirm', 'admin'), $button, $return);
+    echo $OUTPUT->footer();
 }
-
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('purgecaches', 'admin'));
-
-echo $OUTPUT->box_start('generalbox', 'notice');
-echo html_writer::tag('p', get_string('purgecachesconfirm', 'admin'));
-echo $OUTPUT->single_button($actionurl, get_string('purgecaches', 'admin'), 'post');
-echo $OUTPUT->box_end();
-
-echo $OUTPUT->footer();
@@ -25,21 +25,20 @@
 */


-require_once(__DIR__ . '/../config.php');
+require_once(dirname(__FILE__) . '/../config.php');
 require_once($CFG->libdir . '/questionlib.php');
 require_once($CFG->libdir . '/adminlib.php');
 require_once($CFG->libdir . '/tablelib.php');

 // Check permissions.
 require_login();
-$systemcontext = context_system::instance();
+$systemcontext = get_context_instance(CONTEXT_SYSTEM);
 require_capability('moodle/question:config', $systemcontext);

 admin_externalpage_setup('manageqbehaviours');
 $thispageurl = new moodle_url('/admin/qbehaviours.php');

-$behaviours = core_component::get_plugin_list('qbehaviour');
-$pluginmanager = core_plugin_manager::instance();
+$behaviours = get_plugin_list('qbehaviour');

 // Get some data we will need - question counts and which types are needed.
 $counts = $DB->get_records_sql_menu("
@@ -51,16 +50,20 @@ foreach ($behaviours as $behaviour => $notused) {
    if (!array_key_exists($behaviour, $counts)) {
        $counts[$behaviour] = 0;
    }
-    $needed[$behaviour] = ($counts[$behaviour] > 0) ||
-            $pluginmanager->other_plugins_that_require('qbehaviour_' . $behaviour);
+    $needed[$behaviour] = $counts[$behaviour] > 0;
    $archetypal[$behaviour] = question_engine::is_behaviour_archetypal($behaviour);
 }
+
+foreach ($behaviours as $behaviour => $notused) {
+    foreach (question_engine::get_behaviour_required_behaviours($behaviour) as $reqbehaviour) {
+        $needed[$reqbehaviour] = true;
+    }
+}
 foreach ($counts as $behaviour => $count) {
    if (!array_key_exists($behaviour, $behaviours)) {
-        $counts['missing'] += $count;
+        $counts['missingtype'] += $count;
    }
 }
-$needed['missing'] = true;

 // Work of the correct sort order.
 $config = get_config('question');
@@ -82,7 +85,7 @@ if (!empty($config->disabledbehaviours)) {
 // Process actions ============================================================

 // Disable.
-if (($disable = optional_param('disable', '', PARAM_PLUGIN)) && confirm_sesskey()) {
+if (($disable = optional_param('disable', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
    if (!isset($behaviours[$disable])) {
        print_error('unknownbehaviour', 'question', $thispageurl, $disable);
    }
@@ -91,12 +94,11 @@ if (($disable = optional_param('disable', '', PARAM_PLUGIN)) && confirm_sesskey(
        $disabledbehaviours[] = $disable;
        set_config('disabledbehaviours', implode(',', $disabledbehaviours), 'question');
    }
-    core_plugin_manager::reset_caches();
    redirect($thispageurl);
 }

 // Enable.
-if (($enable = optional_param('enable', '', PARAM_PLUGIN)) && confirm_sesskey()) {
+if (($enable = optional_param('enable', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
    if (!isset($behaviours[$enable])) {
        print_error('unknownbehaviour', 'question', $thispageurl, $enable);
    }
@@ -109,12 +111,11 @@ if (($enable = optional_param('enable', '', PARAM_PLUGIN)) && confirm_sesskey())
        unset($disabledbehaviours[$key]);
        set_config('disabledbehaviours', implode(',', $disabledbehaviours), 'question');
    }
-    core_plugin_manager::reset_caches();
    redirect($thispageurl);
 }

 // Move up in order.
-if (($up = optional_param('up', '', PARAM_PLUGIN)) && confirm_sesskey()) {
+if (($up = optional_param('up', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
    if (!isset($behaviours[$up])) {
        print_error('unknownbehaviour', 'question', $thispageurl, $up);
    }
@@ -126,7 +127,7 @@ if (($up = optional_param('up', '', PARAM_PLUGIN)) && confirm_sesskey()) {
 }

 // Move down in order.
-if (($down = optional_param('down', '', PARAM_PLUGIN)) && confirm_sesskey()) {
+if (($down = optional_param('down', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
    if (!isset($behaviours[$down])) {
        print_error('unknownbehaviour', 'question', $thispageurl, $down);
    }
@@ -137,6 +138,69 @@ if (($down = optional_param('down', '', PARAM_PLUGIN)) && confirm_sesskey()) {
    redirect($thispageurl);
 }

+// Delete.
+if (($delete = optional_param('delete', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
+    // Check it is OK to delete this question type.
+    if ($delete == 'missing') {
+        print_error('cannotdeletemissingbehaviour', 'question', $thispageurl);
+    }
+
+    if (!isset($behaviours[$delete])) {
+        print_error('unknownbehaviour', 'question', $thispageurl, $delete);
+    }
+
+    $behaviourname = $sortedbehaviours[$delete];
+    if ($counts[$delete] > 0) {
+        print_error('cannotdeletebehaviourinuse', 'question', $thispageurl, $behaviourname);
+    }
+    if ($needed[$delete] > 0) {
+        print_error('cannotdeleteneededbehaviour', 'question', $thispageurl, $behaviourname);
+    }
+
+    // If not yet confirmed, display a confirmation message.
+    if (!optional_param('confirm', '', PARAM_BOOL)) {
+        echo $OUTPUT->header();
+        echo $OUTPUT->heading(get_string('deletebehaviourareyousure', 'question', $behaviourname));
+        echo $OUTPUT->confirm(
+                get_string('deletebehaviourareyousuremessage', 'question', $behaviourname),
+                new moodle_url($thispageurl, array('delete' => $delete, 'confirm' => 1)),
+                $thispageurl);
+        echo $OUTPUT->footer();
+        exit;
+    }
+
+    // Do the deletion.
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('deletingbehaviour', 'question', $behaviourname));
+
+    // Delete any configuration records.
+    if (!unset_all_config_for_plugin('qbehaviour_' . $delete)) {
+        echo $OUTPUT->notification(get_string('errordeletingconfig', 'admin', 'qbehaviour_' . $delete));
+    }
+    if (($key = array_search($delete, $disabledbehaviours)) !== false) {
+        unset($disabledbehaviours[$key]);
+        set_config('disabledbehaviours', implode(',', $disabledbehaviours), 'question');
+    }
+    $behaviourorder = explode(',', $config->behavioursortorder);
+    if (($key = array_search($delete, $behaviourorder)) !== false) {
+        unset($behaviourorder[$key]);
+        set_config('behavioursortorder', implode(',', $behaviourorder), 'question');
+    }
+
+    // Then the tables themselves
+    drop_plugin_tables($delete, get_plugin_directory('qbehaviour', $delete) . '/db/install.xml', false);
+
+    // Remove event handlers and dequeue pending events
+    events_uninstall('qbehaviour_' . $delete);
+
+    $a->behaviour = $behaviourname;
+    $a->directory = get_plugin_directory('qbehaviour', $delete);
+    echo $OUTPUT->box(get_string('qbehaviourdeletefiles', 'question', $a), 'generalbox', 'notice');
+    echo $OUTPUT->continue_button($thispageurl);
+    echo $OUTPUT->footer();
+    exit;
+}
+
 // End of process actions ==================================================

 // Print the page heading.
@@ -147,12 +211,12 @@ echo $OUTPUT->heading(get_string('manageqbehaviours', 'admin'));
 $table = new flexible_table('qbehaviouradmintable');
 $table->define_baseurl($thispageurl);
 $table->define_columns(array('behaviour', 'numqas', 'version', 'requires',
-        'available', 'uninstall'));
+        'available', 'delete'));
 $table->define_headers(array(get_string('behaviour', 'question'), get_string('numqas', 'question'),
        get_string('version'), get_string('requires', 'admin'),
-        get_string('availableq', 'question'), get_string('uninstallplugin', 'core_admin')));
+        get_string('availableq', 'question'), get_string('delete')));
 $table->set_attribute('id', 'qbehaviours');
-$table->set_attribute('class', 'generaltable admintable');
+$table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
 $table->setup();

 // Add a row for each question type.
@@ -174,19 +238,18 @@ foreach ($sortedbehaviours as $behaviour => $behaviourname) {
    }

    // Other question types required by this one.
-    $plugin = $pluginmanager->get_plugin_info('qbehaviour_' . $behaviour);
-    $required = $plugin->get_other_required_plugins();
-    if (!empty($required)) {
-        $strrequired = array();
-        foreach ($required as $component => $notused) {
-            $strrequired[] = $pluginmanager->plugin_name($component);
+    $requiredbehaviours = question_engine::get_behaviour_required_behaviours($behaviour);
+    if (!empty($requiredbehaviours)) {
+        $strrequiredbehaviours = array();
+        foreach ($requiredbehaviours as $required) {
+            $strrequiredbehaviours[] = $sortedbehaviours[$required];
        }
-        $row[] = implode(', ', $strrequired);
+        $row[] = implode(', ', $strrequiredbehaviours);
    } else {
        $row[] = '';
    }

-    // Are people allowed to select this behaviour?
+    // Are people allowed to create new questions of this type?
    $rowclass = '';
    if ($archetypal[$behaviour]) {
        $enabled = array_search($behaviour, $disabledbehaviours) === false;
@@ -195,7 +258,7 @@ foreach ($sortedbehaviours as $behaviour => $behaviourname) {
            $rowclass = 'dimmed_text';
        }
    } else {
-        $icons = $OUTPUT->spacer(array('class' => 'iconsmall'));
+        $icons = $OUTPUT->spacer() . ' ';
    }

    // Move icons.
@@ -207,11 +270,9 @@ foreach ($sortedbehaviours as $behaviour => $behaviourname) {
    if ($needed[$behaviour]) {
        $row[] = '';
    } else {
-        $uninstallurl = core_plugin_manager::instance()->get_uninstall_url('qbehaviour_'.$behaviour, 'manage');
-        if ($uninstallurl) {
-            $row[] = html_writer::link($uninstallurl, get_string('uninstallplugin', 'core_admin'),
+        $row[] = html_writer::link(new moodle_url($thispageurl,
+                array('delete' => $behaviour, 'sesskey' => sesskey())), get_string('delete'),
                array('title' => get_string('uninstallbehaviour', 'question')));
-        }
    }

    $table->add_data($row, $rowclass);
@@ -223,10 +284,10 @@ echo $OUTPUT->footer();

 function question_behaviour_enable_disable_icons($behaviour, $enabled) {
    if ($enabled) {
-        return question_behaviour_icon_html('disable', $behaviour, 't/hide',
+        return question_behaviour_icon_html('disable', $behaviour, 'i/hide',
                get_string('enabled', 'question'), get_string('disable'));
    } else {
-        return question_behaviour_icon_html('enable', $behaviour, 't/show',
+        return question_behaviour_icon_html('enable', $behaviour, 'i/show',
                get_string('disabled', 'question'), get_string('enable'));
    }
 }
@@ -235,7 +296,7 @@ function question_behaviour_icon_html($action, $behaviour, $icon, $alt, $tip) {
    global $OUTPUT;
    return $OUTPUT->action_icon(new moodle_url('/admin/qbehaviours.php',
            array($action => $behaviour, 'sesskey' => sesskey())),
-            new pix_icon($icon, $alt, 'moodle', array('title' => '', 'class' => 'iconsmall')),
-            null, array('title' => $tip));
+            new pix_icon($icon, $alt, 'moodle', array('title' => '')),
+            null, array('title' => $tip)) . ' ';
 }

@@ -25,14 +25,14 @@
 */


-require_once(__DIR__ . '/../config.php');
+require_once(dirname(__FILE__) . '/../config.php');
 require_once($CFG->libdir . '/questionlib.php');
 require_once($CFG->libdir . '/adminlib.php');
 require_once($CFG->libdir . '/tablelib.php');

 // Check permissions.
 require_login();
-$systemcontext = context_system::instance();
+$systemcontext = get_context_instance(CONTEXT_SYSTEM);
 require_capability('moodle/question:config', $systemcontext);
 $canviewreports = has_capability('report/questioninstances:view', $systemcontext);

@@ -40,7 +40,6 @@ admin_externalpage_setup('manageqtypes');
 $thispageurl = new moodle_url('/admin/qtypes.php');

 $qtypes = question_bank::get_all_qtypes();
-$pluginmanager = core_plugin_manager::instance();

 // Get some data we will need - question counts and which types are needed.
 $counts = $DB->get_records_sql("
@@ -53,11 +52,15 @@ foreach ($qtypes as $qtypename => $qtype) {
        $counts[$qtypename]->numquestions = 0;
        $counts[$qtypename]->numhidden = 0;
    }
-    $needed[$qtypename] = $counts[$qtypename]->numquestions > 0 ||
-            $pluginmanager->other_plugins_that_require($qtype->plugin_name());
+    $needed[$qtypename] = $counts[$qtypename]->numquestions > 0;
    $counts[$qtypename]->numquestions -= $counts[$qtypename]->numhidden;
 }
 $needed['missingtype'] = true; // The system needs the missing question type.
+foreach ($qtypes as $qtypename => $qtype) {
+    foreach ($qtype->requires_qtypes() as $reqtype) {
+        $needed[$reqtype] = true;
+    }
+}
 foreach ($counts as $qtypename => $count) {
    if (!isset($qtypes[$qtypename])) {
        $counts['missingtype']->numquestions += $count->numquestions - $count->numhidden;
@@ -76,7 +79,7 @@ $sortedqtypes = question_bank::sort_qtype_array($sortedqtypes, $config);
 // Process actions ============================================================

 // Disable.
-if (($disable = optional_param('disable', '', PARAM_PLUGIN)) && confirm_sesskey()) {
+if (($disable = optional_param('disable', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
    if (!isset($qtypes[$disable])) {
        print_error('unknownquestiontype', 'question', $thispageurl, $disable);
    }
@@ -86,7 +89,7 @@ if (($disable = optional_param('disable', '', PARAM_PLUGIN)) && confirm_sesskey(
 }

 // Enable.
-if (($enable = optional_param('enable', '', PARAM_PLUGIN)) && confirm_sesskey()) {
+if (($enable = optional_param('enable', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
    if (!isset($qtypes[$enable])) {
        print_error('unknownquestiontype', 'question', $thispageurl, $enable);
    }
@@ -100,7 +103,7 @@ if (($enable = optional_param('enable', '', PARAM_PLUGIN)) && confirm_sesskey())
 }

 // Move up in order.
-if (($up = optional_param('up', '', PARAM_PLUGIN)) && confirm_sesskey()) {
+if (($up = optional_param('up', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
    if (!isset($qtypes[$up])) {
        print_error('unknownquestiontype', 'question', $thispageurl, $up);
    }
@@ -111,7 +114,7 @@ if (($up = optional_param('up', '', PARAM_PLUGIN)) && confirm_sesskey()) {
 }

 // Move down in order.
-if (($down = optional_param('down', '', PARAM_PLUGIN)) && confirm_sesskey()) {
+if (($down = optional_param('down', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
    if (!isset($qtypes[$down])) {
        print_error('unknownquestiontype', 'question', $thispageurl, $down);
    }
@@ -121,6 +124,63 @@ if (($down = optional_param('down', '', PARAM_PLUGIN)) && confirm_sesskey()) {
    redirect($thispageurl);
 }

+// Delete.
+if (($delete = optional_param('delete', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
+    // Check it is OK to delete this question type.
+    if ($delete == 'missingtype') {
+        print_error('cannotdeletemissingqtype', 'question', $thispageurl);
+    }
+
+    if (!isset($qtypes[$delete])) {
+        print_error('unknownquestiontype', 'question', $thispageurl, $delete);
+    }
+
+    $qtypename = $qtypes[$delete]->local_name();
+    if ($counts[$delete]->numquestions + $counts[$delete]->numhidden > 0) {
+        print_error('cannotdeleteqtypeinuse', 'question', $thispageurl, $qtypename);
+    }
+
+    if ($needed[$delete] > 0) {
+        print_error('cannotdeleteqtypeneeded', 'question', $thispageurl, $qtypename);
+    }
+
+    // If not yet confirmed, display a confirmation message.
+    if (!optional_param('confirm', '', PARAM_BOOL)) {
+        $qtypename = $qtypes[$delete]->local_name();
+        echo $OUTPUT->header();
+        echo $OUTPUT->heading(get_string('deleteqtypeareyousure', 'question', $qtypename));
+        echo $OUTPUT->confirm(get_string('deleteqtypeareyousuremessage', 'question', $qtypename),
+                new moodle_url($thispageurl, array('delete' => $delete, 'confirm' => 1)),
+                $thispageurl);
+        echo $OUTPUT->footer();
+        exit;
+    }
+
+    // Do the deletion.
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('deletingqtype', 'question', $qtypename));
+
+    // Delete any configuration records.
+    if (!unset_all_config_for_plugin('qtype_' . $delete)) {
+        echo $OUTPUT->notification(get_string('errordeletingconfig', 'admin', 'qtype_' . $delete));
+    }
+    unset_config($delete . '_disabled', 'question');
+    unset_config($delete . '_sortorder', 'question');
+
+    // Then the tables themselves
+    drop_plugin_tables($delete, $qtypes[$delete]->plugin_dir() . '/db/install.xml', false);
+
+    // Remove event handlers and dequeue pending events
+    events_uninstall('qtype_' . $delete);
+
+    $a->qtype = $qtypename;
+    $a->directory = $qtypes[$delete]->plugin_dir();
+    echo $OUTPUT->box(get_string('qtypedeletefiles', 'question', $a), 'generalbox', 'notice');
+    echo $OUTPUT->continue_button($thispageurl);
+    echo $OUTPUT->footer();
+    exit;
+}
+
 // End of process actions ==================================================

 // Print the page heading.
@@ -131,12 +191,12 @@ echo $OUTPUT->heading(get_string('manageqtypes', 'admin'));
 $table = new flexible_table('qtypeadmintable');
 $table->define_baseurl($thispageurl);
 $table->define_columns(array('questiontype', 'numquestions', 'version', 'requires',
-        'availableto', 'uninstall', 'settings'));
+        'availableto', 'delete', 'settings'));
 $table->define_headers(array(get_string('questiontype', 'question'), get_string('numquestions', 'question'),
        get_string('version'), get_string('requires', 'admin'), get_string('availableq', 'question'),
-        get_string('settings'), get_string('uninstallplugin', 'core_admin')));
+        get_string('delete'), get_string('settings')));
 $table->set_attribute('id', 'qtypes');
-$table->set_attribute('class', 'admintable generaltable');
+$table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
 $table->setup();

 // Add a row for each question type.
@@ -159,7 +219,7 @@ foreach ($sortedqtypes as $qtypename => $localname) {
            $strcount = $counts[$qtypename]->numquestions;
        }
        if ($canviewreports) {
-            $row[] = html_writer::link(new moodle_url('/report/questioninstances/index.php',
+            $row[] = html_writer::link(new moodle_url('/admin/report/questioninstances/index.php',
                    array('qtype' => $qtypename)), $strcount, array('title' => get_string('showdetails', 'admin')));
        } else {
            $strcount;
@@ -177,12 +237,11 @@ foreach ($sortedqtypes as $qtypename => $localname) {
    }

    // Other question types required by this one.
-    $plugin = $pluginmanager->get_plugin_info($qtype->plugin_name());
-    $requiredtypes = $plugin->get_other_required_plugins();
+    $requiredtypes = $qtype->requires_qtypes();
    $strtypes = array();
    if (!empty($requiredtypes)) {
-        foreach ($requiredtypes as $required => $notused) {
-            $strtypes[] = $pluginmanager->plugin_name($required);
+        foreach ($requiredtypes as $required) {
+            $strtypes[] = $qtypes[$required]->local_name();
        }
        $row[] = implode(', ', $strtypes);
    } else {
@@ -198,7 +257,7 @@ foreach ($sortedqtypes as $qtypename => $localname) {
            $rowclass = 'dimmed_text';
        }
    } else {
-        $icons = $OUTPUT->spacer();
+        $icons = $OUTPUT->spacer() . ' ';
    }

    // Move icons.
@@ -206,6 +265,15 @@ foreach ($sortedqtypes as $qtypename => $localname) {
    $icons .= question_type_icon_html('down', $qtypename, 't/down', get_string('down'), '');
    $row[] = $icons;

+    // Delete link, if available.
+    if ($needed[$qtypename]) {
+        $row[] = '';
+    } else {
+        $row[] = html_writer::link(new moodle_url($thispageurl,
+                array('delete' => $qtypename, 'sesskey' => sesskey())), get_string('delete'),
+                array('title' => get_string('uninstallqtype', 'question')));
+    }
+
    // Settings link, if available.
    $settings = admin_get_root()->locate('qtypesetting' . $qtypename);
    if ($settings instanceof admin_externalpage) {
@@ -217,17 +285,6 @@ foreach ($sortedqtypes as $qtypename => $localname) {
        $row[] = '';
    }

-    // Uninstall link, if available.
-    if ($needed[$qtypename]) {
-        $row[] = '';
-    } else {
-        $uninstallurl = core_plugin_manager::instance()->get_uninstall_url('qtype_'.$qtypename, 'manage');
-        if ($uninstallurl) {
-            $row[] = html_writer::link($uninstallurl, get_string('uninstallplugin', 'core_admin'),
-                array('title' => get_string('uninstallqtype', 'question')));
-        }
-    }
-
    $table->add_data($row, $rowclass);
 }

@@ -237,10 +294,10 @@ echo $OUTPUT->footer();

 function question_types_enable_disable_icons($qtypename, $createable) {
    if ($createable) {
-        return question_type_icon_html('disable', $qtypename, 't/hide',
+        return question_type_icon_html('disable', $qtypename, 'i/hide',
                get_string('enabled', 'question'), get_string('disable'));
    } else {
-        return question_type_icon_html('enable', $qtypename, 't/show',
+        return question_type_icon_html('enable', $qtypename, 'i/show',
                get_string('disabled', 'question'), get_string('enable'));
    }
 }
@@ -249,7 +306,7 @@ function question_type_icon_html($action, $qtypename, $icon, $alt, $tip) {
    global $OUTPUT;
    return $OUTPUT->action_icon(new moodle_url('/admin/qtypes.php',
            array($action => $qtypename, 'sesskey' => sesskey())),
-            new pix_icon($icon, $alt, 'moodle', array('title' => '', 'class' => 'iconsmall')),
-            null, array('title' => $tip));
+            new pix_icon($icon, $alt, 'moodle', array('title' => '')),
+            null, array('title' => $tip)) . ' ';
 }

@@ -44,7 +44,7 @@ $hubname = optional_param('hubname', '', PARAM_TEXT);
 $token = optional_param('token', '', PARAM_TEXT);
 $error = optional_param('error', '', PARAM_ALPHANUM);

-admin_externalpage_setup('registrationhubs');
+admin_externalpage_setup('registrationindex');

 if (!empty($error) and $error == 'urlalreadyexist') {
    throw new moodle_exception('urlalreadyregistered', 'hub',
@@ -58,14 +58,17 @@ if (!empty($registeredhub) and $registeredhub->token == $token) {

    echo $OUTPUT->header();
    echo $OUTPUT->heading(get_string('registrationconfirmed', 'hub'), 3, 'main');
+    $hublink = html_writer::tag('a', $hubname, array('href' => $url));

    $registeredhub->token = $newtoken;
    $registeredhub->confirmed = 1;
    $registeredhub->hubname = $hubname;
    $registrationmanager->update_registeredhub($registeredhub);

-    // Display notification message.
-    echo $OUTPUT->notification(get_string('registrationconfirmedon', 'hub'), 'notifysuccess');
+    //display notficiation message
+    $notificationmessage = $OUTPUT->notification(
+            get_string('registrationconfirmedon', 'hub', $hublink), 'notifysuccess');
+    echo $notificationmessage;

    //display continue button
    $registrationpage = new moodle_url('/admin/registration/index.php');
@@ -49,10 +49,8 @@ class site_unregistration_form extends moodleform {
        $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);
@@ -84,6 +82,7 @@ class site_clean_registration_data_form extends moodleform {
        $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);
@@ -137,8 +136,8 @@ class hub_selector_form extends moodleform {
        $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);
+            if (strlen($hub['name']) > 100) {
+                $hubname = substr($hub['name'], 0, 100);
                $hubname = $hubname . "...";
            } else {
                $hubname = $hub['name'];
@@ -150,7 +149,6 @@ class hub_selector_form extends moodleform {
        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'));
@@ -158,10 +156,8 @@ class hub_selector_form extends moodleform {
        //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'));
    }
@@ -175,8 +171,11 @@ class hub_selector_form extends moodleform {

        $unlistedurl = $this->_form->_submitValues['unlistedurl'];

-        if (empty($unlistedurl)) {
-            $errors['unlistedurl'] = get_string('badurlformat', 'hub');
+        if (!empty($unlistedurl)) {
+            $unlistedurltotest = clean_param($unlistedurl, PARAM_URL);
+            if (empty($unlistedurltotest)) {
+                $errors['unlistedurl'] = get_string('badurlformat', 'hub');
+            }
        }

        return $errors;
@@ -204,7 +203,7 @@ class site_registration_form extends moodleform {
        $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)));
+            $sitename = format_string($site->fullname, true, array('context' => get_context_instance(CONTEXT_COURSE, SITEID)));
        }
        $sitedescription = get_config('hub', 'site_description_' . $cleanhuburl);
        if ($sitedescription === false) {
@@ -237,18 +236,13 @@ class site_registration_form extends moodleform {
        $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);
@@ -275,7 +269,6 @@ class site_registration_form extends moodleform {
        $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);

@@ -286,14 +279,27 @@ class site_registration_form extends moodleform {
        $mform->setType('description', PARAM_TEXT);
        $mform->addHelpButton('description', 'sitedesc', 'hub');

+        $mform->addElement('static', 'urlstring', get_string('siteurl', 'hub'), $CFG->wwwroot);
+        $mform->addHelpButton('urlstring', 'siteurl', 'hub');
+
        $languages = get_string_manager()->get_list_of_languages();
-        core_collator::asort($languages);
+        textlib_get_instance()->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('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');
+
        $mform->addElement('textarea', 'address', get_string('postaladdress', 'hub'),
                array('rows' => 4, 'cols' => 41));
        $mform->setType('address', PARAM_TEXT);
@@ -309,13 +315,11 @@ class site_registration_form extends moodleform {
        $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'),
@@ -329,12 +333,11 @@ class site_registration_form extends moodleform {
                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->setType('contactemail', PARAM_TEXT);
        $mform->setDefault('contactemail', $contactemail);
        $mform->addHelpButton('contactemail', 'siteemail', 'hub');

@@ -343,7 +346,6 @@ class site_registration_form extends moodleform {
        $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);

@@ -352,27 +354,12 @@ class site_registration_form extends moodleform {
        $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));
@@ -383,111 +370,80 @@ class site_registration_form extends moodleform {
        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->setDefault('courses', true);
            $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->setDefault('users', true);

            $mform->addElement('checkbox', 'roleassignments', '',
                    " " . get_string('roleassignmentsnumber', 'hub', $roleassigncount));
-            $mform->setDefault('roleassignments', $roleassignmentsnumber != -1);
-            $mform->setType('roleassignments', PARAM_INT);
+            $mform->setDefault('roleassignments', true);

            $mform->addElement('checkbox', 'posts', '',
                    " " . get_string('postsnumber', 'hub', $postcount));
-            $mform->setDefault('posts', $postsnumber != -1);
-            $mform->setType('posts', PARAM_INT);
+            $mform->setDefault('posts', true);

            $mform->addElement('checkbox', 'questions', '',
                    " " . get_string('questionsnumber', 'hub', $questioncount));
-            $mform->setDefault('questions', $questionsnumber != -1);
-            $mform->setType('questions', PARAM_INT);
+            $mform->setDefault('questions', true);

            $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('resources', PARAM_INT);
-
-            $mform->addElement('checkbox', 'issuedbadges', '',
-                    " " . get_string('issuedbadgesnumber', 'hub', $issuedbadges));
-            $mform->setDefault('issuedbadges', $issuedbadgesnumber != -1);
-            $mform->setType('resources', PARAM_INT);
+            $mform->setDefault('resources', true);

            $mform->addElement('checkbox', 'participantnumberaverage', '',
                    " " . get_string('participantnumberaverage', 'hub', $participantnumberaverage));
-            $mform->setDefault('participantnumberaverage', $participantnumberaveragecfg != -1);
-            $mform->setType('participantnumberaverage', PARAM_FLOAT);
+            $mform->setDefault('participantnumberaverage', true);

            $mform->addElement('checkbox', 'modulenumberaverage', '',
                    " " . get_string('modulenumberaverage', 'hub', $modulenumberaverage));
-            $mform->setDefault('modulenumberaverage', $modulenumberaveragecfg != -1);
-            $mform->setType('modulenumberaverage', PARAM_FLOAT);
+            $mform->setDefault('modulenumberaverage', true);
        } 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->addElement('hidden', 'courses', true);
+            $mform->setType('courses', PARAM_FLOAT);
            $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('hidden', 'users', true);
+            $mform->setType('users', PARAM_FLOAT);

            $mform->addElement('static', 'roleassignmentslabel', '',
                    " " . get_string('roleassignmentsnumber', 'hub', $roleassigncount));
-            $mform->addElement('hidden', 'roleassignments', 1);
-            $mform->setType('roleassignments', PARAM_INT);
+            $mform->addElement('hidden', 'roleassignments', true);
+            $mform->setType('roleassignments', PARAM_FLOAT);

            $mform->addElement('static', 'postslabel', '',
                    " " . get_string('postsnumber', 'hub', $postcount));
-            $mform->addElement('hidden', 'posts', 1);
-            $mform->setType('posts', PARAM_INT);
+            $mform->addElement('hidden', 'posts', true);
+            $mform->setType('posts', PARAM_FLOAT);

            $mform->addElement('static', 'questionslabel', '',
                    " " . get_string('questionsnumber', 'hub', $questioncount));
-            $mform->addElement('hidden', 'questions', 1);
-            $mform->setType('questions', PARAM_INT);
+            $mform->addElement('hidden', 'questions', true);
+            $mform->setType('questions', PARAM_FLOAT);

            $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('hidden', 'resources', true);
+            $mform->setType('resources', PARAM_FLOAT);

            $mform->addElement('static', 'participantnumberaveragelabel', '',
                    " " . get_string('participantnumberaverage', 'hub', $participantnumberaverage));
-            $mform->addElement('hidden', 'participantnumberaverage', 1);
+            $mform->addElement('hidden', 'participantnumberaverage', true);
            $mform->setType('participantnumberaverage', PARAM_FLOAT);

            $mform->addElement('static', 'modulenumberaveragelabel', '',
                    " " . get_string('modulenumberaverage', 'hub', $modulenumberaverage));
-            $mform->addElement('hidden', 'modulenumberaverage', 1);
+            $mform->addElement('hidden', 'modulenumberaverage', true);
            $mform->setType('modulenumberaverage', PARAM_FLOAT);
        }

@@ -0,0 +1,68 @@
+<?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/>.
+
+/*
+ * @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
+ *
+ * Thsi page displays a hub selector or a hub URL + password. Then it will redirect to
+ * the site registration form (with the selected hub as parameter)
+*/
+
+require('../../config.php');
+
+require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->dirroot.'/' . $CFG->admin . '/registration/forms.php');
+
+admin_externalpage_setup('registrationselector');
+
+$hubselectorform = new hub_selector_form();
+$fromform = $hubselectorform->get_data();
+
+//// Redirect to the registration form if an URL has been choosen ////
+
+$selectedhuburl = optional_param('publichub', false, PARAM_URL);
+$unlistedhuburl = optional_param('unlistedurl', false, PARAM_TEXT);
+$password = optional_param('password', '', PARAM_RAW);
+
+if (!empty($unlistedhuburl)) {
+    if (clean_param($unlistedhuburl, PARAM_URL) !== '') {
+        $huburl = $unlistedhuburl;
+    }
+} else if (!empty($selectedhuburl)) {
+    $huburl = $selectedhuburl;
+}
+
+
+//redirect
+if (!empty($huburl) and confirm_sesskey()) {
+    $hubname = optional_param(clean_param($huburl, PARAM_ALPHANUMEXT), '', PARAM_TEXT);
+    $params = array('sesskey' => sesskey(), 'huburl' => $huburl,
+            'password' => $password, 'hubname' => $hubname);
+    redirect(new moodle_url($CFG->wwwroot."/" . $CFG->admin . "/registration/register.php",
+            $params));
+}
+
+
+//// OUTPUT ////
+
+echo $OUTPUT->header();
+echo $OUTPUT->heading(get_string('registeron', 'hub'), 3, 'main');
+$hubselectorform->display();
+echo $OUTPUT->footer();
@@ -22,9 +22,8 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
 * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
 *
- * 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.
+ * On this page the administrator select if he wants to register on Moodle.org or
+ * a specific hub
 */

 require('../../config.php');
@@ -35,7 +34,7 @@ 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');
+admin_externalpage_setup('registrationindex');

 $renderer = $PAGE->get_renderer('core', 'register');

@@ -127,15 +126,13 @@ if (empty($cancel) and $unregistration and $confirm and confirm_sesskey()) {
    }
 }

+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));
+}
 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) {
@@ -145,7 +142,6 @@ if (empty($cancel) and $unregistration and !$confirm) {
        $siteunregistrationform = new site_unregistration_form('',
                        array('huburl' => $huburl, 'hubname' => $hub->hubname));
    }
-
    $siteunregistrationform->display();
 } else {
    $registeredonmoodleorg = false;
@@ -154,49 +150,8 @@ if (empty($cancel) and $unregistration and !$confirm) {
        $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();
-
-    //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');
-    }
-
-    //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));
-    }
-
-    echo $OUTPUT->heading(get_string('registerwith', 'hub'));
-
-    $hubselectorform->display();
+    echo $OUTPUT->heading(get_string('registeron', 'hub'), 3, 'main');
+    echo $renderer->registrationselector($registeredonmoodleorg);

    if (extension_loaded('xmlrpc')) {
        $hubs = $registrationmanager->get_registered_on_hubs();
@@ -53,30 +53,31 @@ class registration_manager {
    public function cron() {
        global $CFG;
        if (extension_loaded('xmlrpc')) {
-            $function = 'hub_update_site_info';
-            require_once($CFG->dirroot . "/webservice/xmlrpc/lib.php");
+            //check if the last registration cron update was less than a week ago
+            $lastcron = get_config('registration', 'crontime');
+            if ($lastcron === false or $lastcron < strtotime("-7 day")) { //set to a week, see MDL-23704
+                $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));
+                //update all hub where the site is registered on
+                $hubs = $this->get_registered_on_hubs();
+                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);
+                        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));
+                    }
                }
+                set_config('crontime', time(), 'registration');
            }
        } else {
            mtrace(get_string('errorcronnoxmlrpc', 'hub'));
@@ -117,7 +118,6 @@ class registration_manager {
     */
    public function add_registeredhub($hub) {
        global $DB;
-        $hub->timemodified = time();
        $id = $DB->insert_record('registration_hubs', $hub);
        return $id;
    }
@@ -171,16 +171,15 @@ class registration_manager {

    /**
     * Update a registered hub (mostly use to update the confirmation status)
-     * @param object $hub the hub
+     * @param object $communication the hub
     */
-    public function update_registeredhub($hub) {
+    public function update_registeredhub($communication) {
        global $DB;
-        $hub->timemodified = time();
-        $DB->update_record('registration_hubs', $hub);
+        $DB->update_record('registration_hubs', $communication);
    }

    /**
-     * Return all hubs where the site is registered
+     * Return all hubs where the site is registered on
     */
    public function get_registered_on_hubs() {
        global $DB;
@@ -248,20 +247,6 @@ class registration_manager {
            $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) {
@@ -27,7 +27,7 @@
 * @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.org/MOOCH or for a different hub.
+ * This page displays the site registration form.
 * It handles redirection to the hub to continue the registration workflow process.
 * It also handles update operation by web service.
 */
@@ -39,19 +39,15 @@ 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');

-require_sesskey();
+admin_externalpage_setup('registrationindex');

 $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);
+if (!confirm_sesskey()) {
+    throw new moodle_exception('missingparameter');
+}

 $registrationmanager = new registration_manager();

@@ -64,18 +60,7 @@ $siteregistrationform = new site_registration_form('',
 $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.
+    //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');
@@ -97,8 +82,6 @@ if (!empty($fromform) and confirm_sesskey()) {
    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');
 }
@@ -118,7 +101,6 @@ if ($update and confirm_sesskey()) {
    $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()));
    }
@@ -129,21 +111,6 @@ if ($update and confirm_sesskey()) {
 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);
@@ -178,24 +145,5 @@ 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();
@@ -30,23 +30,6 @@
 */
 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
@@ -59,6 +42,57 @@ class core_register_renderer extends plugin_renderer_base {
        return $this->output->box($message);
    }

+    /**
+     * Display the page to register on Moodle.org or on a specific hub
+     */
+    public function registrationselector($updatemoodleorg = false) {
+        global $CFG;
+        $table = new html_table();
+        $table->head = array(get_string('moodleorg', 'hub'), get_string('specifichub', 'hub'));
+        $table->size = array('50%', '50%');
+        //$table->attributes['class'] = 'registerindextable';
+        //Moodle.org information cell
+        $moodleorgcell = get_string('moodleorgregistrationdetail', 'hub');
+        $moodleorgcell .= html_writer::empty_tag('br') . html_writer::empty_tag('br');
+        $moodleorgcell = html_writer::tag('div', $moodleorgcell, array('class' => 'justifytext'));
+
+        //Specific hub information cell
+        $specifichubcell = get_string('specifichubregistrationdetail', 'hub');
+        $specifichubcell .= html_writer::empty_tag('br') . html_writer::empty_tag('br');
+        $specifichubcell = html_writer::tag('div', $specifichubcell, array('class' => 'justifytext'));
+
+        //add information cells
+        $cells = array($moodleorgcell, $specifichubcell);
+        $row = new html_table_row($cells);
+        $table->data[] = $row;
+
+        //Moodle.org button cell
+        $registeronmoodleorgurl = new moodle_url("/" . $CFG->admin . "/registration/register.php",
+                        array('sesskey' => sesskey(), 'huburl' => HUB_MOODLEORGHUBURL
+                            , 'hubname' => 'Moodle.org'));
+        $registeronmoodleorgbutton = new single_button($registeronmoodleorgurl,
+                        $updatemoodleorg ? get_string('updatesite', 'hub', 'Moodle.org') : get_string('registeronmoodleorg', 'hub'));
+        $registeronmoodleorgbutton->class = 'centeredbutton';
+        $registeronmoodleorgbuttonhtml = $this->output->render($registeronmoodleorgbutton);
+        $moodleorgcell = $registeronmoodleorgbuttonhtml;
+
+        //Specific hub button cell
+        $registeronspecifichuburl = new moodle_url("/" . $CFG->admin . "/registration/hubselector.php",
+                        array('sesskey' => sesskey()));
+        $registeronspecifichubbutton = new single_button($registeronspecifichuburl,
+                        get_string('registeronspecifichub', 'hub'));
+        $registeronspecifichubbutton->class = 'centeredbutton';
+        $registeronspecifichubbuttonhtml = $this->output->render($registeronspecifichubbutton);
+        $specifichubcell = $registeronspecifichubbuttonhtml;
+
+        //add button cells
+        $cells = array($moodleorgcell, $specifichubcell);
+        $row = new html_table_row($cells);
+        $table->data[] = $row;
+
+        return html_writer::table($table);
+    }
+
    /**
     * Display the listing of registered on hub
     */
@@ -92,4 +126,4 @@ class core_register_renderer extends plugin_renderer_base {
        return html_writer::table($table);
    }

-}
+}
@@ -39,7 +39,7 @@ $url = optional_param('url', '', PARAM_URL);
 $hubname = optional_param('hubname', '', PARAM_TEXT);
 $token = optional_param('token', '', PARAM_TEXT);

-admin_externalpage_setup('registrationhubs');
+admin_externalpage_setup('registrationindex');

 //check that we are waiting a confirmation from this hub, and check that the token is correct
 $registrationmanager = new registration_manager();
--- a/Show More
+++ b/Show More