Moodle release 3.3.4

Previously we appended a dot at the end of IP addresses and domain names in the
cURL security helper, but it causes issues with Google OAuth so this patch removes it.

.eslintignore

@@ -6,6 +6,7 @@ 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.*
@@ -13,7 +14,6 @@ lib/editor/atto/yui/src/rangy/js/*.*
 lib/editor/tinymce/plugins/pdw/tinymce/
 lib/editor/tinymce/plugins/spellchecker/rpc.php
 lib/editor/tinymce/tiny_mce/
-lib/mlbackend/php/phpml/
 lib/adodb/
 lib/bennu/
 lib/evalmath/
@@ -58,12 +58,9 @@ lib/maxmind/MaxMind/
 lib/ltiprovider/
 lib/amd/src/truncate.js
 lib/fonts/
-lib/validateurlsyntax.php
 media/player/videojs/amd/src/video-lazy.js
 media/player/videojs/amd/src/Youtube-lazy.js
 media/player/videojs/videojs/
-media/player/videojs/amd/src/videojs-flash-lazy.js
-media/player/videojs/videojs/video-js.swf
 mod/assign/feedback/editpdf/fpdi/
 repository/s3/S3.php
 theme/boost/scss/bootstrap/

.eslintrc

@@ -1,7 +1,4 @@
 {
-  'plugins': [
-    'promise',
-  ],
   'env': {
     'browser': true,
     'amd': true
@@ -16,7 +13,6 @@
 
     // === Possible Errors ===
     'comma-dangle': 'off',
-    'no-compare-neg-zero': 'error',
     'no-cond-assign': 'error',
     'no-console': 'error',
     'no-constant-condition': 'error',
@@ -68,6 +64,7 @@
     'no-fallthrough': 'error',
     'no-floating-decimal': 'warn',
     'no-global-assign': 'warn',
+    // Enabled by grunt for AMD modules: 'no-implicit-globals': 'error',
     'no-implied-eval': 'error',
     'no-invalid-this': 'error',
     'no-iterator': 'error',
@@ -106,7 +103,6 @@
     'block-spacing': 'warn',
     'brace-style': ['warn', '1tbs'],
     'camelcase': 'warn',
-    'capitalized-comments': ['warn', 'always', { 'ignoreConsecutiveComments': true }],
     'comma-spacing': ['warn', { 'before': false, 'after': true }],
     'comma-style': ['warn', 'last'],
     'computed-property-spacing': 'error',
@@ -174,41 +170,11 @@
     'unicode-bom': 'error',
     'wrap-regex': 'off',
 
-    // === Promises ===
-    'promise/always-return': 'warn',
-    'promise/no-return-wrap': 'warn',
-    'promise/param-names': 'warn',
-    'promise/catch-or-return': ['warn', {terminationMethod: ['catch', 'fail']}],
-    'promise/no-native': 'warn',
-    'promise/no-promise-in-callback': 'warn',
-    'promise/no-callback-in-promise': 'warn',
-    'promise/avoid-new': 'warn',
-
     // === Deprecations ===
     "no-restricted-properties": ['warn', {
         'object': 'M',
         'property': 'str',
         'message': 'Use AMD module "core/str" or M.util.get_string()'
     }],
-
-  },
-  overrides: [
-    {
-      files: ["**/yui/src/**/*.js"],
-      // Disable some rules which we can't safely define for YUI rollups.
-      rules: {
-        'no-undef': 'off',
-        'no-unused-vars': 'off',
-        'no-unused-expressions': 'off'
-      }
-    },
-    {
-      files: ["**/amd/src/*.js"],
-      // Check AMD with some slightly stricter rules.
-      rules: {
-        'no-unused-vars': 'error',
-        'no-implicit-globals': 'error'
-      }
-    }
-  ]
+  }
 }

.gitattributes

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

.stylelintignore

@@ -7,6 +7,7 @@ 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.*
@@ -14,7 +15,6 @@ lib/editor/atto/yui/src/rangy/js/*.*
 lib/editor/tinymce/plugins/pdw/tinymce/
 lib/editor/tinymce/plugins/spellchecker/rpc.php
 lib/editor/tinymce/tiny_mce/
-lib/mlbackend/php/phpml/
 lib/adodb/
 lib/bennu/
 lib/evalmath/
@@ -59,12 +59,9 @@ lib/maxmind/MaxMind/
 lib/ltiprovider/
 lib/amd/src/truncate.js
 lib/fonts/
-lib/validateurlsyntax.php
 media/player/videojs/amd/src/video-lazy.js
 media/player/videojs/amd/src/Youtube-lazy.js
 media/player/videojs/videojs/
-media/player/videojs/amd/src/videojs-flash-lazy.js
-media/player/videojs/videojs/video-js.swf
 mod/assign/feedback/editpdf/fpdi/
 repository/s3/S3.php
 theme/boost/scss/bootstrap/

.stylelintrc

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

.travis.yml

@@ -13,8 +13,8 @@ language: php
 
 php:
     # We only run the highest and lowest supported versions to reduce the load on travis-ci.org.
-    - 7.2
-    - 7.0
+    - 7.1
+    - 5.6
 
 addons:
   postgresql: "9.6"
@@ -30,7 +30,7 @@ env:
     # Although we want to run these jobs and see failures as quickly as possible, we also want to get the slowest job to
     # start first so that the total run time is not too high.
     #
-    # We only run MySQL on PHP 7.2, so run that first.
+    # We only run MySQL on PHP 7.1, so run that first.
     # CI Tests should be second-highest in priority as these only take <= 60 seconds to run under normal circumstances.
     # Postgres is significantly is pretty reasonable in its run-time.
 
@@ -54,15 +54,19 @@ matrix:
 
     include:
           # Run grunt/npm install on highest version ('node' is an alias for the latest node.js version.)
-        - php: 7.2
+        - php: 7.1
           env: DB=none     TASK=GRUNT   NVM_VERSION='8.9'
 
     exclude:
         # MySQL - it's just too slow.
-        # Exclude it on all versions except for 7.2
+        # Exclude it on all versions except for 7.1
 
         - env: DB=mysqli   TASK=PHPUNIT
-          php: 7.0
+          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:
@@ -204,7 +208,7 @@ before_script:
         # We need the official upstream for comparison
         git remote add upstream https://github.com/moodle/moodle.git;
 
-        git fetch upstream master;
+        git fetch upstream MOODLE_33_STABLE;
         export GIT_PREVIOUS_COMMIT="`git merge-base FETCH_HEAD $TRAVIS_COMMIT`";
         export GIT_COMMIT="$TRAVIS_COMMIT";
         export UPSTREAM_FETCH_HEAD=`git rev-parse FETCH_HEAD`
@@ -224,9 +228,9 @@ before_script:
         # We need the official upstream.
         git remote add upstream https://github.com/moodle/moodle.git;
 
-        # Checkout 30 STABLE branch (the first version compatible with PHP 7.x)
-        git fetch upstream MOODLE_30_STABLE;
-        git checkout MOODLE_30_STABLE;
+        # Checkout 27 STABLE branch.
+        git fetch upstream MOODLE_27_STABLE;
+        git checkout MOODLE_27_STABLE;
 
         # Perform the upgrade
         php admin/cli/install_database.php --agree-license --adminpass=Password --adminemail=admin@example.com --fullname="Upgrade test" --shortname=Upgrade;

Gruntfile.js

@@ -112,9 +112,26 @@ module.exports = function(grunt) {
             // Even though warnings dont stop the build we don't display warnings by default because
             // at this moment we've got too many core warnings.
             options: {quiet: !grunt.option('show-lint-warnings')},
-            amd: {src: amdSrc},
+            amd: {
+              src: amdSrc,
+              // Check AMD with some slightly stricter rules.
+              rules: {
+                'no-unused-vars': 'error',
+                'no-implicit-globals': 'error'
+              }
+            },
             // Check YUI module source files.
-            yui: {src: ['**/yui/src/**/*.js', '!*/**/yui/src/*/meta/*.js']}
+            yui: {
+               src: ['**/yui/src/**/*.js', '!*/**/yui/src/*/meta/*.js'],
+               options: {
+                   // Disable some rules which we can't safely define for YUI rollups.
+                   rules: {
+                     'no-undef': 'off',
+                     'no-unused-vars': 'off',
+                     'no-unused-expressions': 'off'
+                   }
+               }
+            }
         },
         uglify: {
             amd: {
@@ -177,6 +194,7 @@ module.exports = function(grunt) {
                         rules: {
                             // These rules have to be disabled in .stylelintrc for scss compat.
                             "at-rule-no-unknown": true,
+                            "no-browser-hacks": [true, {"severity": "warning"}]
                         }
                     }
                 },
@@ -193,6 +211,7 @@ module.exports = function(grunt) {
                         rules: {
                             // These rules have to be disabled in .stylelintrc for scss compat.
                             "at-rule-no-unknown": true,
+                            "no-browser-hacks": [true, {"severity": "warning"}]
                         }
                     }
                 }

admin/auth_config.php

@@ -165,6 +165,12 @@ function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts,
             // If custom field then pick name from database.
             $fieldshortname = str_replace('profile_field_', '', $fieldname);
             $fieldname = $customfieldname[$fieldshortname]->name;
+            if (core_text::strlen($fieldshortname) > 67) {
+                // If custom profile field name is longer than 67 characters we will not be able to store the setting
+                // such as 'field_updateremote_profile_field_NOTSOSHORTSHORTNAME' in the database because the character
+                // limit for the setting name is 100.
+                continue;
+            }
         } elseif ($fieldname == 'url') {
             $fieldname = get_string('webpage');
         } else {

admin/category.php

@@ -54,14 +54,16 @@ $statusmsg = '';
 $errormsg  = '';
 
 if ($data = data_submitted() and confirm_sesskey()) {
-    if (admin_write_settings($data)) {
-        $statusmsg = get_string('changessaved');
-    }
-
+    $count = admin_write_settings($data);
     if (empty($adminroot->errors)) {
-        switch ($return) {
-            case 'site': redirect("$CFG->wwwroot/");
-            case 'admin': redirect("$CFG->wwwroot/$CFG->admin/");
+        // No errors. Did we change any setting?  If so, then indicate success.
+        if ($count) {
+            $statusmsg = get_string('changessaved');
+        } else {
+            switch ($return) {
+                case 'site': redirect("$CFG->wwwroot/");
+                case 'admin': redirect("$CFG->wwwroot/$CFG->admin/");
+            }
         }
     } else {
         $errormsg = get_string('errorwithsettings', 'admin');

admin/cli/build_theme_css.php

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

admin/cli/install.php

@@ -146,9 +146,14 @@ define('PHPUNIT_TEST', false);
 
 define('IGNORE_COMPONENT_CACHE', true);
 
-// Check that PHP is of a sufficient version as soon as possible.
-require_once(__DIR__.'/../../lib/phpminimumversionlib.php');
-moodle_require_minimum_php_version();
+// Check that PHP is of a sufficient version
+if (version_compare(phpversion(), "5.6.5") < 0) {
+    $phpversion = phpversion();
+    // do NOT localise - lang strings would not work here and we CAN NOT move it after installib
+    fwrite(STDERR, "Moodle 3.2 or later requires at least PHP 5.6.5 (currently using version $phpversion).\n");
+    fwrite(STDERR, "Please upgrade your server software or install older Moodle version.\n");
+    exit(1);
+}
 
 // set up configuration
 global $CFG;
@@ -803,12 +808,6 @@ if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
 
 if (!$options['skip-database']) {
     install_cli_database($options, $interactive);
-    // This needs to happen at the end to ensure it occurs after all caches
-    // have been purged for the last time.
-    // This will build a cached version of the current theme for the user
-    // to immediately start browsing the site.
-    require_once($CFG->libdir.'/upgradelib.php');
-    upgrade_themes();
 } else {
     echo get_string('cliskipdatabase', 'install')."\n";
 }

admin/cli/install_database.php

@@ -62,9 +62,14 @@ Example:
 \$sudo -u www-data /usr/bin/php admin/cli/install_database.php --lang=cs --adminpass=soMePass123 --agree-license
 ";
 
-// Check that PHP is of a sufficient version as soon as possible.
-require_once(__DIR__.'/../../lib/phpminimumversionlib.php');
-moodle_require_minimum_php_version();
+// Check that PHP is of a sufficient version
+if (version_compare(phpversion(), "5.6.5") < 0) {
+    $phpversion = phpversion();
+    // do NOT localise - lang strings would not work here and we CAN NOT move it after installib
+    fwrite(STDERR, "Moodle 3.2 or later requires at least PHP 5.6.5 (currently using version $phpversion).\n");
+    fwrite(STDERR, "Please upgrade your server software or install older Moodle version.\n");
+    exit(1);
+}
 
 // Nothing to do if config.php does not exist
 $configfile = __DIR__.'/../../config.php';
@@ -178,12 +183,5 @@ if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
 
 install_cli_database($options, true);
 
-// This needs to happen at the end to ensure it occurs after all caches
-// have been purged for the last time.
-// This will build a cached version of the current theme for the user
-// to immediately start browsing the site.
-require_once($CFG->libdir.'/upgradelib.php');
-upgrade_themes();
-
 echo get_string('cliinstallfinished', 'install')."\n";
 exit(0); // 0 means success

admin/cli/kill_all_sessions.php

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

admin/cli/purge_caches.php

@@ -15,8 +15,6 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * CLI script to purge caches without asking for confirmation.
- *
  * @package    core
  * @subpackage cli
  * @copyright  2011 David Mudrak <david@moodle.com>
@@ -52,4 +50,4 @@ Example:
 
 purge_all_caches();
 
-exit(0);
+exit(0);

admin/cli/upgrade.php

@@ -187,11 +187,5 @@ upgrade_noncore(true);
 admin_apply_default_settings(NULL, false);
 admin_apply_default_settings(NULL, false);
 
-// This needs to happen at the end to ensure it occurs after all caches
-// have been purged for the last time.
-// This will build a cached version of the current theme for the user
-// to immediately start browsing the site.
-upgrade_themes();
-
 echo get_string('cliupgradefinished', 'admin')."\n";
 exit(0); // 0 means success

admin/environment.xml

@@ -2259,4 +2259,180 @@
       </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
+  <MOODLE version="3.5" requires="3.1">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="5.5.31" />
+      <VENDOR name="mysql" version="5.5.31" />
+      <VENDOR name="postgres" version="9.3" />
+      <VENDOR name="mssql" version="10.0" />
+      <VENDOR name="oracle" version="10.2" />
+    </DATABASE>
+    <PHP version="7.0.0" level="required">
+    </PHP>
+    <PCREUNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="pcreunicodewarning" />
+      </FEEDBACK>
+    </PCREUNICODE>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="mbstringrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="opensslrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zlib" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="gdrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlreader" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="intlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" level="required"/>
+      <PHP_EXTENSION name="fileinfo" level="required"/>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="96M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="opcache.enable" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opcacherecommended" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbstorageengine" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="quizattemptsupgradedmessage" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unsupporteddbtablerowformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unoconvwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="libcurlwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfileformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfilepertable" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddblargeprefix" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ishttpswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="incompleteunicodesupport" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/index.php

@@ -29,9 +29,14 @@ if (!file_exists('../config.php')) {
     die();
 }
 
-// Check that PHP is of a sufficient version as soon as possible.
-require_once(__DIR__.'/../lib/phpminimumversionlib.php');
-moodle_require_minimum_php_version();
+// Check that PHP is of a sufficient version as soon as possible
+if (version_compare(phpversion(), '5.6.5') < 0) {
+    $phpversion = phpversion();
+    // do NOT localise - lang strings would not work here and we CAN NOT move it to later place
+    echo "Moodle 3.2 or later requires at least PHP 5.6.5 (currently using version $phpversion).<br />";
+    echo "Please upgrade your server software or install older Moodle version.";
+    die();
+}
 
 // make sure iconv is available and actually works
 if (!function_exists('iconv')) {
@@ -699,7 +704,6 @@ if (!$cache and moodle_needs_upgrading()) {
 if (during_initial_install()) {
     set_config('rolesactive', 1); // after this, during_initial_install will return false.
     set_config('adminsetuppending', 1);
-    set_config('registrationpending', 1); // Remind to register site after all other setup is finished.
     // we need this redirect to setup proper session
     upgrade_finished("index.php?sessionstarted=1&amp;lang=$CFG->lang");
 }
@@ -815,9 +819,6 @@ if (isset($SESSION->pluginuninstallreturn)) {
     }
 }
 
-// If site registration needs updating, redirect.
-\core\hub\registration::registration_reminder('/admin/index.php');
-
 // Everything should now be set up, and the user is an admin
 
 // Print default admin page with notifications.
@@ -861,23 +862,19 @@ if ($updateschecker->enabled()) {
 
 $buggyiconvnomb = (!function_exists('mb_convert_encoding') and @iconv('UTF-8', 'UTF-8//IGNORE', '100'.chr(130).'€') !== '100€');
 //check if the site is registered on Moodle.org
-$registered = \core\hub\registration::is_registered();
+$registered = $DB->count_records('registration_hubs', array('huburl' => HUB_MOODLEORGHUBURL, 'confirmed' => 1));
 // Check if there are any cache warnings.
 $cachewarnings = cache_helper::warnings();
 // Check if there are events 1 API handlers.
 $eventshandlers = $DB->get_records_sql('SELECT DISTINCT component FROM {events_handlers}');
 $themedesignermode = !empty($CFG->themedesignermode);
-$mobileconfigured = !empty($CFG->enablemobilewebservice);
-$invalidforgottenpasswordurl = !empty($CFG->forgottenpasswordurl) && empty(clean_param($CFG->forgottenpasswordurl, PARAM_URL));
 
 // Check if a directory with development libraries exists.
-if (empty($CFG->disabledevlibdirscheck) && (is_dir($CFG->dirroot.'/vendor') || is_dir($CFG->dirroot.'/node_modules'))) {
+if (is_dir($CFG->dirroot.'/vendor') || is_dir($CFG->dirroot.'/node_modules')) {
     $devlibdir = true;
 } else {
     $devlibdir = false;
 }
-// Check if the site is being foced onto ssl.
-$overridetossl = !empty($CFG->overridetossl);
 
 admin_externalpage_setup('adminnotifications');
 
@@ -885,5 +882,4 @@ $output = $PAGE->get_renderer('core', 'admin');
 
 echo $output->admin_notifications_page($maturity, $insecuredataroot, $errorsdisplayed, $cronoverdue, $dbproblems,
                                        $maintenancemode, $availableupdates, $availableupdatesfetch, $buggyiconvnomb,
-                                       $registered, $cachewarnings, $eventshandlers, $themedesignermode, $devlibdir,
-                                       $mobileconfigured, $overridetossl, $invalidforgottenpasswordurl);
+                                       $registered, $cachewarnings, $eventshandlers, $themedesignermode, $devlibdir);

admin/purgecaches.php

@@ -29,9 +29,10 @@ require_once($CFG->libdir.'/adminlib.php');
 $confirm = optional_param('confirm', 0, PARAM_BOOL);
 $returnurl = optional_param('returnurl', null, PARAM_LOCALURL);
 
+admin_externalpage_setup('purgecaches');
+
 // If we have got here as a confirmed aciton, do it.
-if ($confirm && isloggedin() && confirm_sesskey()) {
-    require_capability('moodle/site:config', context_system::instance());
+if ($confirm && confirm_sesskey()) {
 
     // Valid request. Purge, and redirect the user back to where they came from.
     purge_all_caches();
@@ -45,8 +46,6 @@ if ($confirm && isloggedin() && confirm_sesskey()) {
 }
 
 // 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);

admin/registration/confirmregistration.php

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

admin/registration/forms.php

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

admin/registration/index.php

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

admin/registration/lib.php

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

admin/registration/register.php

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

admin/registration/renderer.php

@@ -36,6 +36,60 @@ class core_register_renderer extends plugin_renderer_base {
      * @return string
      */
     public function moodleorg_registration_message() {
-        return format_text(get_string('registermoodlenet', 'admin'), FORMAT_HTML, ['noclean' => true]);
+        $moodleorgstatslink = html_writer::link('http://moodle.net/stats',
+                                               get_string('statsmoodleorg', 'admin'),
+                                               array('target' => '_blank'));
+
+        $moodleorgregmsg = get_string('registermoodleorg', 'admin');
+        $items = array(get_string('registermoodleorgli1', 'admin'),
+                       get_string('registermoodleorgli2', 'admin', $moodleorgstatslink));
+        $moodleorgregmsg .= html_writer::alist($items);
+        return $moodleorgregmsg;
     }
+
+    /**
+     * Display a box message confirming a site registration (add or update)
+     * @param string $confirmationmessage
+     * @return string
+     */
+    public function registration_confirmation($confirmationmessage) {
+        $linktositelist = html_writer::tag('a', get_string('sitelist', 'hub'),
+                        array('href' => new moodle_url('/local/hub/index.php')));
+        $message = $confirmationmessage . html_writer::empty_tag('br') . $linktositelist;
+        return $this->output->box($message);
+    }
+
+    /**
+     * Display the listing of registered on hub
+     */
+    public function registeredonhublisting($hubs) {
+        global $CFG;
+        $table = new html_table();
+        $table->head = array(get_string('hub', 'hub'), get_string('operation', 'hub'));
+        $table->size = array('80%', '20%');
+
+        foreach ($hubs as $hub) {
+            if ($hub->huburl == HUB_MOODLEORGHUBURL) {
+                $hub->hubname = get_string('registeredmoodleorg', 'hub', $hub->hubname);
+            }
+            $hublink = html_writer::tag('a', $hub->hubname, array('href' => $hub->huburl));
+            $hublinkcell = html_writer::tag('div', $hublink, array('class' => 'registeredhubrow'));
+
+            $unregisterhuburl = new moodle_url("/" . $CFG->admin . "/registration/index.php",
+                            array('sesskey' => sesskey(), 'huburl' => $hub->huburl,
+                                'unregistration' => 1));
+            $unregisterbutton = new single_button($unregisterhuburl,
+                            get_string('unregister', 'hub'));
+            $unregisterbutton->class = 'centeredbutton';
+            $unregisterbuttonhtml = $this->output->render($unregisterbutton);
+
+            //add button cells
+            $cells = array($hublinkcell, $unregisterbuttonhtml);
+            $row = new html_table_row($cells);
+            $table->data[] = $row;
+        }
+
+        return html_writer::table($table);
+    }
+
 }

admin/registration/renewregistration.php

@@ -20,7 +20,7 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-/**
+/*
  * @package    moodle
  * @subpackage registration
  * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
@@ -33,32 +33,44 @@
 
 require('../../config.php');
 require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
 
 $url = optional_param('url', '', PARAM_URL);
+$hubname = optional_param('hubname', '', PARAM_TEXT);
 $token = optional_param('token', '', PARAM_TEXT);
 
-admin_externalpage_setup('registrationmoodleorg');
+admin_externalpage_setup('registrationhubs');
 
-if ($url !== HUB_MOODLEORGHUBURL) {
-    throw new moodle_exception('errorotherhubsnotsupported', 'hub');
+//check that we are waiting a confirmation from this hub, and check that the token is correct
+$registrationmanager = new registration_manager();
+$registeredhub = $registrationmanager->get_unconfirmedhub($url);
+if (!empty($registeredhub) and $registeredhub->token == $token) {
+
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('renewregistration', 'hub'), 3, 'main');
+    $hublink = html_writer::tag('a', $hubname, array('href' => $url));
+
+    $registrationmanager->delete_registeredhub($url);
+
+    //Mooch case, need to recreate the siteidentifier
+    if ($url == HUB_MOODLEORGHUBURL) {
+        $CFG->siteidentifier = null;
+        get_site_identifier();
+    }
+
+    $deletedregmsg = get_string('previousregistrationdeleted', 'hub', $hublink);
+
+    $button = new single_button(new moodle_url('/admin/registration/index.php'),
+                    get_string('restartregistration', 'hub'));
+    $button->class = 'restartregbutton';
+
+    echo html_writer::tag('div', $deletedregmsg . $OUTPUT->render($button),
+            array('class' => 'mdl-align'));
+
+    echo $OUTPUT->footer();
+} else {
+    throw new moodle_exception('wrongtoken', 'hub',
+            $CFG->wwwroot . '/' . $CFG->admin . '/registration/index.php');
 }
 
-// Check that we are waiting a confirmation from this hub, and check that the token is correct.
-\core\hub\registration::reset_site_identifier($token);
-
-echo $OUTPUT->header();
-echo $OUTPUT->heading(get_string('renewregistration', 'hub'), 3, 'main');
-$hublink = html_writer::tag('a', 'Moodle.net', array('href' => HUB_MOODLEORGHUBURL));
-
-$deletedregmsg = get_string('previousregistrationdeleted', 'hub', $hublink);
-
-$button = new single_button(new moodle_url('/admin/registration/index.php'),
-                get_string('restartregistration', 'hub'));
-$button->class = 'restartregbutton';
-
-echo html_writer::tag('div', $deletedregmsg . $OUTPUT->render($button),
-        array('class' => 'mdl-align'));
-
-echo $OUTPUT->footer();
-
 

admin/renderer.php

@@ -278,17 +278,13 @@ class core_admin_renderer extends plugin_renderer_base {
      * @param array $eventshandlers Events 1 API handlers.
      * @param bool $themedesignermode Warn about the theme designer mode.
      * @param bool $devlibdir Warn about development libs directory presence.
-     * @param bool $mobileconfigured Whether the mobile web services have been enabled
-     * @param bool $overridetossl Whether or not ssl is being forced.
-     * @param bool $invalidforgottenpasswordurl Whether the forgotten password URL does not link to a valid URL.
      *
      * @return string HTML to output.
      */
     public function admin_notifications_page($maturity, $insecuredataroot, $errorsdisplayed,
             $cronoverdue, $dbproblems, $maintenancemode, $availableupdates, $availableupdatesfetch,
             $buggyiconvnomb, $registered, array $cachewarnings = array(), $eventshandlers = 0,
-            $themedesignermode = false, $devlibdir = false, $mobileconfigured = false,
-            $overridetossl = false, $invalidforgottenpasswordurl = false) {
+            $themedesignermode = false, $devlibdir = false) {
         global $CFG;
         $output = '';
 
@@ -304,12 +300,9 @@ class core_admin_renderer extends plugin_renderer_base {
         $output .= $this->cron_overdue_warning($cronoverdue);
         $output .= $this->db_problems($dbproblems);
         $output .= $this->maintenance_mode_warning($maintenancemode);
-        $output .= $this->overridetossl_warning($overridetossl);
         $output .= $this->cache_warnings($cachewarnings);
         $output .= $this->events_handlers($eventshandlers);
         $output .= $this->registration_warning($registered);
-        $output .= $this->mobile_configuration_warning($mobileconfigured);
-        $output .= $this->forgotten_password_url_warning($invalidforgottenpasswordurl);
 
         //////////////////////////////////////////////////////////////////////////////////////////////////
         ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
@@ -673,20 +666,6 @@ class core_admin_renderer extends plugin_renderer_base {
         return $this->warning(get_string('sitemaintenancewarning2', 'admin', $url));
     }
 
-    /**
-     * Render a warning that ssl is forced because the site was on loginhttps.
-     *
-     * @param bool $overridetossl Whether or not ssl is being forced.
-     * @return string
-     */
-    protected function overridetossl_warning($overridetossl) {
-        if (!$overridetossl) {
-            return '';
-        }
-        $warning = get_string('overridetossl', 'core_admin');
-        return $this->warning($warning, 'warning');
-    }
-
     /**
      * Display a warning about installing development code if necesary.
      * @param int $maturity
@@ -826,7 +805,8 @@ class core_admin_renderer extends plugin_renderer_base {
         if (!$registered) {
 
             if (has_capability('moodle/site:config', context_system::instance())) {
-                $registerbutton = $this->single_button(new moodle_url('/admin/registration/index.php'),
+                $registerbutton = $this->single_button(new moodle_url('/admin/registration/register.php',
+                    array('huburl' =>  HUB_MOODLEORGHUBURL, 'hubname' => 'Moodle.net')),
                     get_string('register', 'admin'));
                 $str = 'registrationwarning';
             } else {
@@ -845,45 +825,14 @@ class core_admin_renderer extends plugin_renderer_base {
     /**
      * Return an admin page warning if site is not registered with moodle.org
      *
+     * @since Moodle 3.3.2
      * @return string
      */
     public function warn_if_not_registered() {
-        return $this->registration_warning(\core\hub\registration::is_registered());
-    }
-
-    /**
-     * Display a warning about the Mobile Web Services being disabled.
-     *
-     * @param boolean $mobileconfigured true if mobile web services are enabled
-     * @return string HTML to output.
-     */
-    protected function mobile_configuration_warning($mobileconfigured) {
-        $output = '';
-        if (!$mobileconfigured) {
-            $settingslink = new moodle_url('/admin/settings.php', ['section' => 'mobilesettings']);
-            $configurebutton = $this->single_button($settingslink, get_string('enablemobilewebservice', 'admin'));
-            $output .= $this->warning(get_string('mobilenotconfiguredwarning', 'admin') . ' ' . $configurebutton);
-        }
-
-        return $output;
-    }
-
-    /**
-     * Display a warning about the forgotten password URL not linking to a valid URL.
-     *
-     * @param boolean $invalidforgottenpasswordurl true if the forgotten password URL is not valid
-     * @return string HTML to output.
-     */
-    protected function forgotten_password_url_warning($invalidforgottenpasswordurl) {
-        $output = '';
-        if ($invalidforgottenpasswordurl) {
-            $settingslink = new moodle_url('/admin/settings.php', ['section' => 'manageauths']);
-            $configurebutton = $this->single_button($settingslink, get_string('check', 'moodle'));
-            $output .= $this->warning(get_string('invalidforgottenpasswordurl', 'admin') . ' ' . $configurebutton,
-                'error alert alert-danger');
-        }
-
-        return $output;
+        global $CFG;
+        require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
+        $registrationmanager = new registration_manager();
+        return $this->registration_warning($registrationmanager->get_registeredhub(HUB_MOODLEORGHUBURL) ? true : false);
     }
 
     /**

admin/search.php

@@ -18,9 +18,6 @@ if ($hassiteconfig && moodle_needs_upgrading()) {
     redirect(new moodle_url('/admin/index.php'));
 }
 
-// If site registration needs updating, redirect.
-\core\hub\registration::registration_reminder('/admin/search.php');
-
 admin_externalpage_setup('search', '', array('query' => $query)); // now hidden page
 
 $adminroot = admin_get_root(); // need all settings here
@@ -32,15 +29,16 @@ $focus = '';
 // now we'll deal with the case that the admin has submitted the form with changed settings
 if ($data = data_submitted() and confirm_sesskey() and isset($data->action) and $data->action == 'save-settings') {
     require_capability('moodle/site:config', $context);
-    if (admin_write_settings($data)) {
-        redirect($PAGE->url, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
-    }
-
+    $count = admin_write_settings($data);
     if (!empty($adminroot->errors)) {
         $errormsg = get_string('errorwithsettings', 'admin');
         $firsterror = reset($adminroot->errors);
         $focus = $firsterror->id;
     } else {
+        // No errors. Did we change any setting? If so, then redirect with success.
+        if ($count) {
+            redirect($PAGE->url, get_string('changessaved'), null, \core\output\notification::NOTIFY_SUCCESS);
+        }
         redirect($PAGE->url);
     }
 }

admin/searchareas.php

@@ -125,9 +125,6 @@ foreach ($searchareas as $area) {
                     $areasconfig[$areaid]->docsprocessed . ' , ' .
                     $areasconfig[$areaid]->recordsprocessed . ' , ' .
                     $areasconfig[$areaid]->docsignored;
-                if ($areasconfig[$areaid]->partial) {
-                    $laststatus .= ' ' . get_string('searchpartial', 'admin');
-                }
             } else {
                 $laststatus = '';
             }

admin/settings.php

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

admin/settings/analytics.php

@@ -1,110 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Adds settings links to admin tree.
- *
- * @package   core_analytics
- * @copyright 2016 David Monllao {@link http://www.davidmonllao.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-if ($hassiteconfig) {
-    $settings = new admin_settingpage('analyticssettings', new lang_string('analyticssettings', 'analytics'));
-    $ADMIN->add('analytics', $settings);
-
-    if ($ADMIN->fulltree) {
-        // Select the site prediction's processor.
-        $predictionprocessors = \core_analytics\manager::get_all_prediction_processors();
-        $predictors = array();
-        foreach ($predictionprocessors as $fullclassname => $predictor) {
-            $pluginname = substr($fullclassname, 1, strpos($fullclassname, '\\', 1) - 1);
-            $predictors[$fullclassname] = new lang_string('pluginname', $pluginname);
-        }
-        $settings->add(new \core_analytics\admin_setting_predictor('analytics/predictionsprocessor',
-            new lang_string('predictionsprocessor', 'analytics'), new lang_string('predictionsprocessor_help', 'analytics'),
-            '\mlbackend_php\processor', $predictors)
-        );
-
-        // Log store.
-        $logmanager = get_log_manager();
-        $readers = $logmanager->get_readers('core\log\sql_reader');
-        $options = array();
-        $defaultreader = null;
-        foreach ($readers as $plugin => $reader) {
-            if (!$reader->is_logging()) {
-                continue;
-            }
-            if (!isset($defaultreader)) {
-                // The top one as default reader.
-                $defaultreader = $plugin;
-            }
-            $options[$plugin] = $reader->get_name();
-        }
-
-        if (empty($defaultreader)) {
-            // We fall here during initial site installation because log stores are not
-            // enabled until admin/tool/log/db/install.php is executed and get_readers
-            // return nothing.
-
-            if ($enabledlogstores = get_config('tool_log', 'enabled_stores')) {
-                $enabledlogstores = explode(',', $enabledlogstores);
-                $defaultreader = reset($enabledlogstores);
-
-                // No need to set the correct name, just the value, this will not be displayed.
-                $options[$defaultreader] = $defaultreader;
-            }
-        }
-        $settings->add(new admin_setting_configselect('analytics/logstore',
-            new lang_string('analyticslogstore', 'analytics'), new lang_string('analyticslogstore_help', 'analytics'),
-            $defaultreader, $options));
-
-        // Enable/disable time splitting methods.
-        $alltimesplittings = \core_analytics\manager::get_all_time_splittings();
-
-        $timesplittingoptions = array();
-        $timesplittingdefaults = array('\core\analytics\time_splitting\quarters_accum',
-            '\core\analytics\time_splitting\quarters', '\core\analytics\time_splitting\single_range');
-        foreach ($alltimesplittings as $key => $timesplitting) {
-            $timesplittingoptions[$key] = $timesplitting->get_name();
-        }
-        $settings->add(new admin_setting_configmultiselect('analytics/timesplittings',
-            new lang_string('enabledtimesplittings', 'analytics'), new lang_string('timesplittingmethod_help', 'analytics'),
-            $timesplittingdefaults, $timesplittingoptions)
-        );
-
-        // Predictions processor output dir.
-        $defaultmodeloutputdir = rtrim($CFG->dataroot, '/') . DIRECTORY_SEPARATOR . 'models';
-        if (empty(get_config('analytics', 'modeloutputdir')) && !file_exists($defaultmodeloutputdir) &&
-                is_writable($defaultmodeloutputdir)) {
-            // Automatically create the dir for them so users don't see the invalid value red cross.
-            mkdir($defaultmodeloutputdir, $CFG->directorypermissions, true);
-        }
-        $settings->add(new admin_setting_configdirectory('analytics/modeloutputdir', new lang_string('modeloutputdir', 'analytics'),
-            new lang_string('modeloutputdirinfo', 'analytics'), $defaultmodeloutputdir));
-
-        // Disable web interface evaluation and get predictions.
-        $settings->add(new admin_setting_configcheckbox('analytics/onlycli', new lang_string('onlycli', 'analytics'),
-            new lang_string('onlycliinfo', 'analytics'), 1));
-
-        // Training and prediction time limit per model.
-        $settings->add(new admin_setting_configduration('analytics/modeltimelimit', new lang_string('modeltimelimit', 'analytics'),
-            new lang_string('modeltimelimitinfo', 'analytics'), 20 * MINSECS));
-
-    }
-}

admin/settings/courses.php

@@ -92,9 +92,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $temp->add(new admin_setting_configselect('moodlecourse/coursedisplay', new lang_string('coursedisplay'),
         new lang_string('coursedisplay_help'), COURSE_DISPLAY_SINGLEPAGE, $choices));
 
-    $temp->add(new admin_setting_configcheckbox('moodlecourse/courseenddateenabled', get_string('courseenddateenabled'),
-        get_string('courseenddateenabled_desc'), 1));
-
     $temp->add(new admin_setting_configduration('moodlecourse/courseduration', get_string('courseduration'),
         get_string('courseduration_desc'), YEARSECS));
 

admin/settings/plugins.php

@@ -102,7 +102,7 @@ if ($hassiteconfig) {
     $temp->add(new admin_setting_configtext('alternateloginurl', new lang_string('alternateloginurl', 'auth'),
                                             new lang_string('alternatelogin', 'auth', htmlspecialchars(get_login_url())), ''));
     $temp->add(new admin_setting_configtext('forgottenpasswordurl', new lang_string('forgottenpasswordurl', 'auth'),
-                                            new lang_string('forgottenpassword', 'auth'), '', PARAM_URL));
+                                            new lang_string('forgottenpassword', 'auth'), ''));
     $temp->add(new admin_setting_confightmleditor('auth_instructions', new lang_string('instructions', 'auth'),
                                                 new lang_string('authinstructions', 'auth'), ''));
     $setting = new admin_setting_configtext('allowemailaddresses', new lang_string('allowemailaddresses', 'admin'),
@@ -557,21 +557,6 @@ if ($hassiteconfig) {
     $temp->add(new admin_setting_heading('searchengineheading', new lang_string('searchengine', 'admin'), ''));
     $temp->add(new admin_setting_configselect('searchengine',
                                 new lang_string('selectsearchengine', 'admin'), '', 'solr', $engines));
-    $temp->add(new admin_setting_heading('searchoptionsheading', new lang_string('searchoptions', 'admin'), ''));
-    $temp->add(new admin_setting_configcheckbox('searchindexwhendisabled',
-            new lang_string('searchindexwhendisabled', 'admin'), new lang_string('searchindexwhendisabled_desc', 'admin'),
-            0));
-    $temp->add(new admin_setting_configduration('searchindextime',
-            new lang_string('searchindextime', 'admin'), new lang_string('searchindextime_desc', 'admin'),
-            600));
-    $options = [
-        0 => new lang_string('searchallavailablecourses_off', 'admin'),
-        1 => new lang_string('searchallavailablecourses_on', 'admin')
-    ];
-    $temp->add(new admin_setting_configselect('searchallavailablecourses',
-            new lang_string('searchallavailablecourses', 'admin'),
-            new lang_string('searchallavailablecourses_desc', 'admin'),
-            0, $options));
 
     $ADMIN->add('searchplugins', $temp);
     $ADMIN->add('searchplugins', new admin_externalpage('searchareas', new lang_string('searchareas', 'admin'),

admin/settings/security.php

@@ -18,11 +18,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add(new admin_setting_configcheckbox('forceloginforprofiles', new lang_string('forceloginforprofiles', 'admin'), new lang_string('configforceloginforprofiles', 'admin'), 1));
     $temp->add(new admin_setting_configcheckbox('forceloginforprofileimage', new lang_string('forceloginforprofileimage', 'admin'), new lang_string('forceloginforprofileimage_help', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('opentogoogle', new lang_string('opentogoogle', 'admin'), new lang_string('configopentogoogle', 'admin'), 0));
-    $temp->add(new admin_setting_configselect('allowindexing', new lang_string('allowindexing', 'admin'), new lang_string('allowindexing_desc', 'admin'),
-        0,
-        array(0 => new lang_string('allowindexingexceptlogin', 'admin'),
-              1 => new lang_string('allowindexingeverywhere', 'admin'),
-              2 => new lang_string('allowindexingnowhere', 'admin'))));
     $temp->add(new admin_setting_pickroles('profileroles',
         new lang_string('profileroles','admin'),
         new lang_string('configprofileroles', 'admin'),
@@ -108,10 +103,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
         new lang_string('passwordchangetokendeletion', 'admin'),
         new lang_string('passwordchangetokendeletion_desc', 'admin'), 0));
 
-    $temp->add(new admin_setting_configduration('tokenduration',
-        new lang_string('tokenduration', 'admin'),
-        new lang_string('tokenduration_desc', 'admin'), 12 * WEEKSECS, WEEKSECS));
-
     $temp->add(new admin_setting_configcheckbox('groupenrolmentkeypolicy', new lang_string('groupenrolmentkeypolicy', 'admin'), new lang_string('groupenrolmentkeypolicy_desc', 'admin'), 1));
     $temp->add(new admin_setting_configcheckbox('disableuserimages', new lang_string('disableuserimages', 'admin'), new lang_string('configdisableuserimages', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('emailchangeconfirmation', new lang_string('emailchangeconfirmation', 'admin'), new lang_string('configemailchangeconfirmation', 'admin'), 1));
@@ -124,7 +115,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
 
     // "httpsecurity" settingpage
     $temp = new admin_settingpage('httpsecurity', new lang_string('httpsecurity', 'admin'));
-
+    $temp->add(new admin_setting_configcheckbox('loginhttps', new lang_string('loginhttps', 'admin'), new lang_string('configloginhttps', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('cookiesecure', new lang_string('cookiesecure', 'admin'), new lang_string('configcookiesecure', 'admin'), 1));
     $temp->add(new admin_setting_configcheckbox('cookiehttponly', new lang_string('cookiehttponly', 'admin'), new lang_string('configcookiehttponly', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('allowframembedding', new lang_string('allowframembedding', 'admin'), new lang_string('allowframembedding_help', 'admin'), 0));

admin/settings/server.php

@@ -12,8 +12,6 @@ $temp->add(new admin_setting_configexecutable('pathtodu', new lang_string('patht
 $temp->add(new admin_setting_configexecutable('aspellpath', new lang_string('aspellpath', 'admin'), new lang_string('edhelpaspellpath'), ''));
 $temp->add(new admin_setting_configexecutable('pathtodot', new lang_string('pathtodot', 'admin'), new lang_string('pathtodot_help', 'admin'), ''));
 $temp->add(new admin_setting_configexecutable('pathtogs', new lang_string('pathtogs', 'admin'), new lang_string('pathtogs_help', 'admin'), '/usr/bin/gs'));
-$temp->add(new admin_setting_configexecutable('pathtopython', new lang_string('pathtopython', 'admin'),
-    new lang_string('pathtopythondesc', 'admin'), ''));
 $ADMIN->add('server', $temp);
 
 
@@ -211,6 +209,9 @@ $temp->add(new admin_setting_configtext('curltimeoutkbitrate', new lang_string('
 $ADMIN->add('server', $temp);
 
 
+$ADMIN->add('server', new admin_externalpage('adminregistration', new lang_string('hubs', 'admin'),
+    "$CFG->wwwroot/$CFG->admin/registration/index.php"));
+
 // E-mail settings.
 $ADMIN->add('server', new admin_category('email', new lang_string('categoryemail', 'admin')));
 

admin/settings/top.php

@@ -11,7 +11,14 @@ $hassiteconfig = has_capability('moodle/site:config', $systemcontext);
 $ADMIN->add('root', new admin_externalpage('adminnotifications', new lang_string('notifications'), "$CFG->wwwroot/$CFG->admin/index.php"));
 
 $ADMIN->add('root', new admin_externalpage('registrationmoodleorg', new lang_string('registration', 'admin'),
-        new moodle_url("/admin/registration/index.php")));
+        "$CFG->wwwroot/$CFG->admin/registration/register.php?huburl=" . HUB_MOODLEORGHUBURL . "&hubname=Moodle.net&sesskey=" . sesskey()));
+$ADMIN->add('root', new admin_externalpage('registrationhub', new lang_string('registerwith', 'hub'),
+        "$CFG->wwwroot/$CFG->admin/registration/register.php", 'moodle/site:config', true));
+$ADMIN->add('root', new admin_externalpage('registrationhubs', new lang_string('hubs', 'admin'),
+        "$CFG->wwwroot/$CFG->admin/registration/index.php", 'moodle/site:config', true));
+$ADMIN->add('root', new admin_externalpage('siteregistrationconfirmed',
+        new lang_string('registrationconfirmed', 'hub'),
+        $CFG->wwwroot."/".$CFG->admin."/registration/confirmregistration.php", 'moodle/site:config', true));
  // hidden upgrade script
 $ADMIN->add('root', new admin_externalpage('upgradesettings', new lang_string('upgradesettings', 'admin'), "$CFG->wwwroot/$CFG->admin/upgradesettings.php", 'moodle/site:config', true));
 
@@ -23,7 +30,6 @@ if ($hassiteconfig) {
 $ADMIN->add('root', new admin_category('users', new lang_string('users','admin')));
 $ADMIN->add('root', new admin_category('courses', new lang_string('courses','admin')));
 $ADMIN->add('root', new admin_category('grades', new lang_string('grades')));
-$ADMIN->add('root', new admin_category('analytics', new lang_string('analytics', 'analytics')));
 $ADMIN->add('root', new admin_category('competencies', new lang_string('competencies', 'core_competency')));
 $ADMIN->add('root', new admin_category('badges', new lang_string('badges'), empty($CFG->enablebadges)));
 $ADMIN->add('root', new admin_category('location', new lang_string('location','admin')));

admin/settings/users.php

@@ -15,10 +15,15 @@ if ($hassiteconfig
  or has_capability('moodle/cohort:view', $systemcontext)) { // speedup for non-admins, add all caps used on this page
 
 
+    if (empty($CFG->loginhttps)) {
+        $securewwwroot = $CFG->wwwroot;
+    } else {
+        $securewwwroot = str_replace('http:','https:',$CFG->wwwroot);
+    }
     // stuff under the "accounts" subcategory
     $ADMIN->add('accounts', new admin_externalpage('editusers', new lang_string('userlist','admin'), "$CFG->wwwroot/$CFG->admin/user.php", array('moodle/user:update', 'moodle/user:delete')));
     $ADMIN->add('accounts', new admin_externalpage('userbulk', new lang_string('userbulk','admin'), "$CFG->wwwroot/$CFG->admin/user/user_bulk.php", array('moodle/user:update', 'moodle/user:delete')));
-    $ADMIN->add('accounts', new admin_externalpage('addnewuser', new lang_string('addnewuser'), "$CFG->wwwroot/user/editadvanced.php?id=-1", 'moodle/user:create'));
+    $ADMIN->add('accounts', new admin_externalpage('addnewuser', new lang_string('addnewuser'), "$securewwwroot/user/editadvanced.php?id=-1", 'moodle/user:create'));
 
     // "User default preferences" settingpage.
     $temp = new admin_settingpage('userdefaultpreferences', new lang_string('userdefaultpreferences', 'admin'));
@@ -184,8 +189,6 @@ if ($hassiteconfig
                     'phone2'      => new lang_string('phone2'),
                     'department'  => new lang_string('department'),
                     'institution' => new lang_string('institution'),
-                    'city'        => new lang_string('city'),
-                    'country'     => new lang_string('country'),
                 )));
         $setting = new admin_setting_configtext('fullnamedisplay', new lang_string('fullnamedisplay', 'admin'),
             new lang_string('configfullnamedisplay', 'admin'), 'language', PARAM_TEXT, 50);

admin/templates/setting_filetypes.mustache

@@ -1,52 +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/>.
-}}
-{{!
-    @template core_admin/setting_filetypes
-
-    Renders the admin_setting_filetypes setting element.
-
-    Context variables required for this template:
-    * id - element id
-    * name - form element name
-    * value - element value
-    * descriptions - data for the core_form/filetypes-descriptions template
-
-    Example context (json):
-    {
-        "id": "test0",
-        "name": "test",
-        "value": ".jpg,.gif",
-        "descriptions": {
-            "hasdescriptions": true,
-            "descriptions": [
-                {
-                    "description": "Image (JPEG)",
-                    "extensions": ".jpeg .jpe .jpg"
-                },
-                {
-                    "description": "Image (GIF)",
-                    "extensions": ".gif"
-                }
-            ]
-        }
-    }
-}}
-<div class="form-text defaultsnext">
-    <input type="text" name="{{name}}" value="{{value}}" size="30" id="{{id}}" class="text-ltr">
-    <span data-filetypesbrowser="{{id}}"></span>
-    <div data-filetypesdescriptions="{{id}}">{{#descriptions}}{{>core_form/filetypes-descriptions}}{{/descriptions}}</div>
-</div>

admin/tests/behat/manage_tokens.feature

@@ -1,26 +0,0 @@
-@core @core_admin
-Feature: Manage tokens
-  In order to manage webservice usage
-  As an admin
-  I need to be able to create and delete tokens
-
-  Background:
-    Given the following "users" exist:
-    | username  | password  | firstname | lastname |
-    | testuser  | testuser  | Joe | Bloggs |
-    | testuser2 | testuser2 | TestFirstname | TestLastname |
-    And I log in as "admin"
-    And I am on site homepage
-
-  @javascript
-  Scenario: Add & delete a token
-    Given I navigate to "Plugins > Web services > Manage tokens" in site administration
-    And I follow "Add"
-    And I set the field "User" to "Joe Bloggs"
-    And I set the field "IP restriction" to "127.0.0.1"
-    When I press "Save changes"
-    Then I should see "Joe Bloggs"
-    And I should see "127.0.0.1"
-    And I follow "Delete"
-    And I press "Delete"
-    And I should not see "Joe Bloggs"

admin/tool/analytics/amd/build/log_info.min.js

@@ -1 +0,0 @@
-define(["jquery","core/str","core/modal_factory","core/notification"],function(a,b,c,d){return{loadInfo:function(e,f){var g=a('[data-model-log-id="'+e+'"]');b.get_string("loginfo","tool_analytics").then(function(b){var d=a("<ul>");return f.forEach(function(a){d.append("<li>"+a+"</li>")}),d.append("</ul>"),c.create({title:b,body:d.html(),large:!0},g)})["catch"](d.exception)}}});

admin/tool/analytics/amd/build/model.min.js

@@ -1 +0,0 @@
-define(["jquery","core/str","core/log","core/notification","core/modal_factory","core/modal_events"],function(a,b,c,d,e,f){var g={clear:{title:{key:"clearpredictions",component:"tool_analytics"},body:{key:"clearmodelpredictions",component:"tool_analytics"}}},h=function(b){return a(b.closest("tr")[0]).find("span.target-name").text()};return{confirmAction:function(i,j){a('[data-action-id="'+i+'"]').on("click",function(i){i.preventDefault();var k=a(i.currentTarget);if("undefined"==typeof g[j])return void c.error('Action "'+j+'" is not allowed.');var l=[g[j].title,g[j].body];l[1].param=h(k);var m=b.get_strings(l),n=e.create({type:e.types.SAVE_CANCEL});a.when(m,n).then(function(a,b){return b.setTitle(a[0]),b.setBody(a[1]),b.setSaveButtonText(a[0]),b.getRoot().on(f.save,function(){window.location.href=k.attr("href")}),b.show(),b}).fail(d.exception)})}}});

admin/tool/analytics/amd/src/log_info.js

@@ -1,56 +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/>.
-
-/**
- * Shows a dialogue with info about this logs.
- *
- * @module     tool_analytics/log_info
- * @class      log_info
- * @package    tool_analytics
- * @copyright  2017 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-define(['jquery', 'core/str', 'core/modal_factory', 'core/notification'], function($, str, ModalFactory, Notification) {
-
-    return /** @alias module:tool_analytics/log_info */ {
-
-        /**
-         * Prepares a modal info for a log's results.
-         *
-         * @method loadInfo
-         * @param {int} id
-         * @param {string[]} info
-         */
-        loadInfo: function(id, info) {
-
-            var link = $('[data-model-log-id="' + id + '"]');
-            str.get_string('loginfo', 'tool_analytics').then(function(langString) {
-
-                var bodyInfo = $("<ul>");
-                info.forEach(function(item) {
-                    bodyInfo.append('<li>' + item + '</li>');
-                });
-                bodyInfo.append("</ul>");
-
-                return ModalFactory.create({
-                    title: langString,
-                    body: bodyInfo.html(),
-                    large: true,
-                }, link);
-
-            }).catch(Notification.exception);
-        }
-    };
-});

admin/tool/analytics/amd/src/model.js

@@ -1,94 +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/>.
-
-/**
- * AMD module for model actions confirmation.
- *
- * @module     tool_analytics/model
- * @copyright  2017 David Monllao
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-define(['jquery', 'core/str', 'core/log', 'core/notification', 'core/modal_factory', 'core/modal_events'],
-    function($, Str, log, Notification, ModalFactory, ModalEvents) {
-
-    /**
-     * List of actions that require confirmation and confirmation message.
-     */
-    var actionsList = {
-        clear: {
-            title: {
-                key: 'clearpredictions',
-                component: 'tool_analytics'
-            }, body: {
-                key: 'clearmodelpredictions',
-                component: 'tool_analytics'
-            }
-
-        }
-    };
-
-    /**
-     * Returns the model name.
-     *
-     * @param {Object} actionItem The action item DOM node.
-     * @return {String}
-     */
-    var getModelName = function(actionItem) {
-        return $(actionItem.closest('tr')[0]).find('span.target-name').text();
-    };
-
-    /** @alias module:tool_analytics/model */
-    return {
-
-        /**
-         * Displays a confirm modal window before executing the action.
-         *
-         * @param {String} actionId
-         * @param {String} actionType
-         */
-        confirmAction: function(actionId, actionType) {
-            $('[data-action-id="' + actionId + '"]').on('click', function(ev) {
-                ev.preventDefault();
-
-                var a = $(ev.currentTarget);
-
-                if (typeof actionsList[actionType] === "undefined") {
-                    log.error('Action "' + actionType + '" is not allowed.');
-                    return;
-                }
-
-                var reqStrings = [
-                    actionsList[actionType].title,
-                    actionsList[actionType].body
-                ];
-                reqStrings[1].param = getModelName(a);
-
-                var stringsPromise = Str.get_strings(reqStrings);
-                var modalPromise = ModalFactory.create({type: ModalFactory.types.SAVE_CANCEL});
-
-                $.when(stringsPromise, modalPromise).then(function(strings, modal) {
-                    modal.setTitle(strings[0]);
-                    modal.setBody(strings[1]);
-                    modal.setSaveButtonText(strings[0]);
-                    modal.getRoot().on(ModalEvents.save, function() {
-                        window.location.href = a.attr('href');
-                    });
-                    modal.show();
-                    return modal;
-                }).fail(Notification.exception);
-            });
-        }
-    };
-});

admin/tool/analytics/classes/output/form/edit_model.php

@@ -1,119 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Model edit form.
- *
- * @package   tool_analytics
- * @copyright 2017 David Monllao {@link http://www.davidmonllao.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_analytics\output\form;
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once($CFG->dirroot.'/lib/formslib.php');
-
-/**
- * Model edit form.
- *
- * @package   tool_analytics
- * @copyright 2017 David Monllao {@link http://www.davidmonllao.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class edit_model extends \moodleform {
-
-    /**
-     * Form definition
-     */
-    public function definition() {
-        global $OUTPUT;
-
-        $mform = $this->_form;
-
-        if ($this->_customdata['model']->is_trained()) {
-            $message = get_string('edittrainedwarning', 'tool_analytics');
-            $mform->addElement('html', $OUTPUT->notification($message, \core\output\notification::NOTIFY_WARNING));
-        }
-
-        $mform->addElement('advcheckbox', 'enabled', get_string('enabled', 'tool_analytics'));
-
-        $indicators = array();
-        foreach ($this->_customdata['indicators'] as $classname => $indicator) {
-            $optionname = \tool_analytics\output\helper::class_to_option($classname);
-            $indicators[$optionname] = $indicator->get_name();
-        }
-        $options = array(
-            'multiple' => true
-        );
-        $mform->addElement('autocomplete', 'indicators', get_string('indicators', 'tool_analytics'), $indicators, $options);
-        $mform->setType('indicators', PARAM_ALPHANUMEXT);
-
-        $timesplittings = array('' => '');
-        foreach ($this->_customdata['timesplittings'] as $classname => $timesplitting) {
-            $optionname = \tool_analytics\output\helper::class_to_option($classname);
-            $timesplittings[$optionname] = $timesplitting->get_name();
-        }
-
-        $mform->addElement('select', 'timesplitting', get_string('timesplittingmethod', 'analytics'), $timesplittings);
-        $mform->addHelpButton('timesplitting', 'timesplittingmethod', 'analytics');
-
-        $mform->addElement('hidden', 'id', $this->_customdata['id']);
-        $mform->setType('id', PARAM_INT);
-
-        $mform->addElement('hidden', 'action', 'edit');
-        $mform->setType('action', PARAM_ALPHANUMEXT);
-
-        $this->add_action_buttons();
-    }
-
-    /**
-     * Form validation
-     *
-     * @param array $data data from the form.
-     * @param array $files files uploaded.
-     *
-     * @return array of errors.
-     */
-    public function validation($data, $files) {
-        $errors = parent::validation($data, $files);
-
-        if (!empty($data['timesplitting'])) {
-            $realtimesplitting = \tool_analytics\output\helper::option_to_class($data['timesplitting']);
-            if (\core_analytics\manager::is_valid($realtimesplitting, '\core_analytics\local\time_splitting\base') === false) {
-                $errors['timesplitting'] = get_string('errorinvalidtimesplitting', 'analytics');
-            }
-        }
-
-        if (empty($data['indicators'])) {
-            $errors['indicators'] = get_string('errornoindicators', 'analytics');
-        } else {
-            foreach ($data['indicators'] as $indicator) {
-                $realindicatorname = \tool_analytics\output\helper::option_to_class($indicator);
-                if (\core_analytics\manager::is_valid($realindicatorname, '\core_analytics\local\indicator\base') === false) {
-                    $errors['indicators'] = get_string('errorinvalidindicator', 'analytics', $realindicatorname);
-                }
-            }
-        }
-
-        if (!empty($data['enabled']) && empty($data['timesplitting'])) {
-            $errors['enabled'] = get_string('errorcantenablenotimesplitting', 'tool_analytics');
-        }
-
-        return $errors;
-    }
-}

admin/tool/analytics/classes/output/helper.php

@@ -1,61 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Typical crappy helper class with tiny functions.
- *
- * @package   tool_analytics
- * @copyright 2017 David Monllao {@link http://www.davidmonllao.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_analytics\output;
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Helper class with general purpose tiny functions.
- *
- * @package   tool_analytics
- * @copyright 2017 David Monllao {@link http://www.davidmonllao.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class helper {
-
-    /**
-     * Converts a class full name to a select option key
-     *
-     * @param string $class
-     * @return string
-     */
-    public static function class_to_option($class) {
-        // Form field is PARAM_ALPHANUMEXT and we are sending fully qualified class names
-        // as option names, but replacing the backslash for a string that is really unlikely
-        // to ever be part of a class name.
-        return str_replace('\\', '2015102400ouuu', $class);
-    }
-
-    /**
-     * option_to_class
-     *
-     * @param string $option
-     * @return string
-     */
-    public static function option_to_class($option) {
-        // Really unlikely but yeah, I'm a bad booyyy.
-        return str_replace('2015102400ouuu', '\\', $option);
-    }
-}

admin/tool/analytics/classes/output/invalid_analysables.php

@@ -1,158 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Invalid analysables renderable.
- *
- * @package    tool_analytics
- * @copyright  2017 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_analytics\output;
-
-defined('MOODLE_INTERNAL') || die;
-
-/**
- * Invalid analysables renderable.
- *
- * @package    tool_analytics
- * @copyright  2017 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class invalid_analysables implements \renderable, \templatable {
-
-    /**
-     * @var \core_analytics\model
-     */
-    protected $model = null;
-
-    /**
-     * @var int
-     */
-    protected $page = 0;
-
-    /**
-     * @var int
-     */
-    protected $perpage = 0;
-
-    /**
-     * Inits the invalid analysables renderable.
-     *
-     * @param \core_analytics\model $model
-     * @param int $page
-     * @param int $perpage
-     * @return \stdClass
-     */
-    public function __construct(\core_analytics\model $model, $page, $perpage) {
-
-        $this->model = $model;
-        $this->page = $page;
-        $this->perpage = $perpage;
-    }
-
-    /**
-     * Export the data.
-     *
-     * @param \renderer_base $output
-     * @return \stdClass
-     */
-    public function export_for_template(\renderer_base $output) {
-        global $PAGE;
-
-        $offset = $this->page * $this->perpage;
-
-        $analysables = $this->model->get_analyser(['notimesplitting' => true])->get_analysables();
-
-        $skipped = 0;
-        $enoughresults = false;
-        $morepages = false;
-        $results = array();
-        foreach ($analysables as $key => $analysable) {
-
-            $validtraining = $this->model->get_target()->is_valid_analysable($analysable, true);
-            if ($validtraining === true) {
-                if ($this->model->is_static()) {
-                    // We still want to show this analysable if it is not valid to get predictions.
-                    $validtraining = get_string('notrainingbasedassumptions', 'analytics');
-                } else {
-                    // We skip analysables that are valid for training or valid for prediction.
-                    continue;
-                }
-            }
-
-            $validprediction = $this->model->get_target()->is_valid_analysable($analysable, false);
-            if ($validprediction === true) {
-                // We skip analysables that are valid for training or valid for prediction.
-                continue;
-            }
-
-            if ($offset && $skipped < $offset) {
-                $skipped++;
-                continue;
-            }
-
-            // Add a new results if we don't have enough yet.
-            if (!$enoughresults) {
-                $results[$analysable->get_id()] = array($analysable, $validtraining, $validprediction);
-                if ($this->perpage && count($results) === $this->perpage) {
-                    $enoughresults = true;
-                }
-            } else {
-                // Confirmed that we have results we can not fit into this page.
-                $morepages = true;
-                break;
-            }
-
-            unset($analysables[$key]);
-        }
-
-        // Prepare the context object.
-        $data = new \stdClass();
-        $data->modelname = $this->model->get_target()->get_name();
-
-        if ($this->page > 0) {
-            $prev = clone $PAGE->url;
-            $prev->param('page', $this->page - 1);
-            $button = new \single_button($prev, get_string('previouspage', 'tool_analytics'), 'get');
-            $data->prev = $button->export_for_template($output);
-        }
-        if ($morepages) {
-            $next = clone $PAGE->url;
-            $next->param('page', $this->page + 1);
-            $button = new \single_button($next, get_string('nextpage', 'tool_analytics'), 'get');
-            $data->next = $button->export_for_template($output);
-        }
-
-        $data->analysables = [];
-        foreach ($results as list($analysable, $validtraining, $validprediction)) {
-            $obj = new \stdClass();
-            $obj->url = \html_writer::link($analysable->get_context()->get_url(), $analysable->get_name(),
-                array('target' => '_blank'));
-
-            if ($validtraining !== true) {
-                $obj->validtraining = $validtraining;
-            }
-            if ($validprediction !== true) {
-                $obj->validprediction = $validprediction;
-            }
-            $data->analysables[] = $obj;
-        }
-
-        return $data;
-    }
-}

admin/tool/analytics/classes/output/model_logs.php

@@ -1,192 +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/>.
-
-/**
- * Model logs table class.
- *
- * @package    tool_analytics
- * @copyright  2017 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_analytics\output;
-
-defined('MOODLE_INTERNAL') || die;
-require_once($CFG->libdir . '/tablelib.php');
-
-/**
- * Model logs table class.
- *
- * @package    tool_analytics
- * @copyright  2017 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class model_logs extends \table_sql {
-
-    /**
-     * @var \core_analytics\model
-     */
-    protected $model = null;
-
-    /**
-     * Sets up the table_log parameters.
-     *
-     * @param string $uniqueid unique id of form.
-     * @param \core_analytics\model $model
-     */
-    public function __construct($uniqueid, $model) {
-        global $PAGE;
-
-        parent::__construct($uniqueid);
-
-        $this->model = $model;
-
-        $this->set_attribute('class', 'modellog generaltable generalbox');
-        $this->set_attribute('aria-live', 'polite');
-
-        $this->define_columns(array('time', 'version', 'indicators', 'timesplitting', 'accuracy', 'info', 'usermodified'));
-        $this->define_headers(array(
-            get_string('time'),
-            get_string('version'),
-            get_string('indicators', 'tool_analytics'),
-            get_string('timesplittingmethod', 'analytics'),
-            get_string('accuracy', 'tool_analytics'),
-            get_string('info', 'tool_analytics'),
-            get_string('fullnameuser'),
-        ));
-        $this->pageable(true);
-        $this->collapsible(false);
-        $this->sortable(false);
-        $this->is_downloadable(false);
-
-        $this->define_baseurl($PAGE->url);
-    }
-
-    /**
-     * Generate the version column.
-     *
-     * @param \stdClass $log log data.
-     * @return string HTML for the version column
-     */
-    public function col_version($log) {
-        $recenttimestr = get_string('strftimerecent', 'core_langconfig');
-        return userdate($log->version, $recenttimestr);
-    }
-
-    /**
-     * Generate the time column.
-     *
-     * @param \stdClass $log log data.
-     * @return string HTML for the time column
-     */
-    public function col_time($log) {
-        $recenttimestr = get_string('strftimerecent', 'core_langconfig');
-        return userdate($log->timecreated, $recenttimestr);
-    }
-
-    /**
-     * Generate the indicators column.
-     *
-     * @param \stdClass $log log data.
-     * @return string HTML for the indicators column
-     */
-    public function col_indicators($log) {
-        $indicatorclasses = json_decode($log->indicators);
-        $indicators = array();
-        foreach ($indicatorclasses as $indicatorclass) {
-            $indicator = \core_analytics\manager::get_indicator($indicatorclass);
-            if ($indicator) {
-                $indicators[] = $indicator->get_name();
-            } else {
-                debugging('Can\'t load ' . $indicatorclass . ' indicator', DEBUG_DEVELOPER);
-            }
-        }
-        return '<ul><li>' . implode('</li><li>', $indicators) . '</li></ul>';
-    }
-
-    /**
-     * Generate the context column.
-     *
-     * @param \stdClass $log log data.
-     * @return string HTML for the context column
-     */
-    public function col_timesplitting($log) {
-        $timesplitting = \core_analytics\manager::get_time_splitting($log->timesplitting);
-        return $timesplitting->get_name();
-    }
-
-    /**
-     * Generate the accuracy column.
-     *
-     * @param \stdClass $log log data.
-     * @return string HTML for the accuracy column
-     */
-    public function col_accuracy($log) {
-        return strval(round($log->score * 100, 2)) . '%';
-    }
-
-    /**
-     * Generate the info column.
-     *
-     * @param \stdClass $log log data.
-     * @return string HTML for the score column
-     */
-    public function col_info($log) {
-        global $PAGE;
-
-        if (empty($log->info) && empty($log->dir)) {
-            return '';
-        }
-
-        $info = array();
-        if (!empty($log->info)) {
-            $info = json_decode($log->info);
-        }
-        if (!empty($log->dir)) {
-            $info[] = get_string('predictorresultsin', 'tool_analytics', $log->dir);
-        }
-        $PAGE->requires->js_call_amd('tool_analytics/log_info', 'loadInfo', array($log->id, $info));
-        return \html_writer::link('#', get_string('view'), array('data-model-log-id' => $log->id));
-    }
-
-    /**
-     * Generate the usermodified column.
-     *
-     * @param \stdClass $log log data.
-     * @return string HTML for the usermodified column
-     */
-    public function col_usermodified($log) {
-        $user = \core_user::get_user($log->usermodified);
-        return fullname($user);
-    }
-
-    /**
-     * Query the logs table. Store results in the object for use by build_table.
-     *
-     * @param int $pagesize size of page for paginated displayed table.
-     * @param bool $useinitialsbar do you want to use the initials bar.
-     */
-    public function query_db($pagesize, $useinitialsbar = true) {
-        $total = count($this->model->get_logs());
-        $this->pagesize($pagesize, $total);
-        $this->rawdata = $this->model->get_logs($this->get_page_start(), $this->get_page_size());
-
-        // Set initial bars.
-        if ($useinitialsbar) {
-            $this->initialbars($total > $pagesize);
-        }
-    }
-}

admin/tool/analytics/classes/output/models_list.php

@@ -1,275 +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/>.
-
-/**
- * Prediction models list page.
- *
- * @package    tool_analytics
- * @copyright  2016 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_analytics\output;
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Shows tool_analytics models list.
- *
- * @package    tool_analytics
- * @copyright  2016 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class models_list implements \renderable, \templatable {
-
-    /**
-     * models
-     *
-     * @var \core_analytics\model[]
-     */
-    protected $models = array();
-
-    /**
-     * __construct
-     *
-     * @param \core_analytics\model[] $models
-     * @return void
-     */
-    public function __construct($models) {
-        $this->models = $models;
-    }
-
-    /**
-     * Exports the data.
-     *
-     * @param \renderer_base $output
-     * @return \stdClass
-     */
-    public function export_for_template(\renderer_base $output) {
-        global $PAGE;
-
-        $data = new \stdClass();
-
-        $onlycli = get_config('analytics', 'onlycli');
-        if ($onlycli === false) {
-            // Default applied if no config found.
-            $onlycli = 1;
-        }
-
-        $data->models = array();
-        foreach ($this->models as $model) {
-            $modeldata = $model->export();
-
-            // Check if there is a help icon for the target to show.
-            $identifier = $modeldata->target->get_identifier();
-            $component = $modeldata->target->get_component();
-            if (get_string_manager()->string_exists($identifier . '_help', $component)) {
-                $helpicon = new \help_icon($identifier, $component);
-                $modeldata->targethelp = $helpicon->export_for_template($output);
-            } else {
-                // We really want to encourage developers to add help to their targets.
-                debugging("The target '{$modeldata->target}' should include a '{$identifier}_help' string to
-                    describe its purpose.", DEBUG_DEVELOPER);
-            }
-
-            // Check if there is a help icon for the indicators to show.
-            if (!empty($modeldata->indicators)) {
-                $indicators = array();
-                foreach ($modeldata->indicators as $ind) {
-                    // Create the indicator with the details we want for the context.
-                    $indicator = new \stdClass();
-                    $indicator->name = $ind->out();
-                    $identifier = $ind->get_identifier();
-                    $component = $ind->get_component();
-                    if (get_string_manager()->string_exists($identifier . '_help', $component)) {
-                        $helpicon = new \help_icon($identifier, $component);
-                        $indicator->help = $helpicon->export_for_template($output);
-                    } else {
-                        // We really want to encourage developers to add help to their indicators.
-                        debugging("The indicator '{$ind}' should include a '{$identifier}_help' string to
-                            describe its purpose.", DEBUG_DEVELOPER);
-                    }
-                    $indicators[] = $indicator;
-                }
-                $modeldata->indicators = $indicators;
-            }
-
-            // Check if there is a help icon for the time splitting method.
-            if (!empty($modeldata->timesplitting)) {
-                $identifier = $modeldata->timesplitting->get_identifier();
-                $component = $modeldata->timesplitting->get_component();
-                if (get_string_manager()->string_exists($identifier . '_help', $component)) {
-                    $helpicon = new \help_icon($identifier, $component);
-                    $modeldata->timesplittinghelp = $helpicon->export_for_template($output);
-                } else {
-                    // We really want to encourage developers to add help to their time splitting methods.
-                    debugging("The time splitting method '{$modeldata->timesplitting}' should include a '{$identifier}_help'
-                        string to describe its purpose.", DEBUG_DEVELOPER);
-                }
-            }
-
-            // Has this model generated predictions?.
-            $predictioncontexts = $model->get_predictions_contexts();
-
-            // Model predictions list.
-            if (!$model->is_enabled()) {
-                $modeldata->noinsights = get_string('disabledmodel', 'analytics');
-            } else if ($model->uses_insights()) {
-                if ($predictioncontexts) {
-
-                    foreach ($predictioncontexts as $contextid => $unused) {
-                        // We prepare this to be used as single_select template options.
-                        $context = \context::instance_by_id($contextid);
-
-                        // Special name for system level predictions as showing "System is not visually nice".
-                        if ($contextid == SYSCONTEXTID) {
-                            $contextname = get_string('allpredictions', 'tool_analytics');
-                        } else {
-                            $contextname = shorten_text($context->get_context_name(true, true), 90);
-                        }
-                        $predictioncontexts[$contextid] = $contextname;
-                    }
-                    \core_collator::asort($predictioncontexts);
-
-                    if (!empty($predictioncontexts)) {
-                        $url = new \moodle_url('/report/insights/insights.php', array('modelid' => $model->get_id()));
-                        $singleselect = new \single_select($url, 'contextid', $predictioncontexts);
-                        $modeldata->insights = $singleselect->export_for_template($output);
-                    }
-                }
-
-                if (empty($modeldata->insights)) {
-                    if ($model->any_prediction_obtained()) {
-                        $modeldata->noinsights = get_string('noinsights', 'analytics');
-                    } else {
-                        $modeldata->noinsights = get_string('nopredictionsyet', 'analytics');
-                    }
-                }
-
-            } else {
-                $modeldata->noinsights = get_string('noinsightsmodel', 'analytics');
-            }
-
-            // Actions.
-            $actionsmenu = new \action_menu();
-            $actionsmenu->set_menu_trigger(get_string('actions'));
-            $actionsmenu->set_owner_selector('model-actions-' . $model->get_id());
-            $actionsmenu->set_alignment(\action_menu::TL, \action_menu::BL);
-
-            $urlparams = ['id' => $model->get_id(), 'sesskey' => sesskey()];
-
-            // Get predictions.
-            if (!$onlycli && $modeldata->enabled && !empty($modeldata->timesplitting)) {
-                $urlparams['action'] = 'getpredictions';
-                $url = new \moodle_url('model.php', $urlparams);
-                $icon = new \action_menu_link_secondary($url, new \pix_icon('i/notifications',
-                    get_string('getpredictions', 'tool_analytics')), get_string('getpredictions', 'tool_analytics'));
-                $actionsmenu->add($icon);
-            }
-
-            // Evaluate machine-learning-based models.
-            if (!$onlycli && $model->get_indicators() && !$model->is_static()) {
-                $urlparams['action'] = 'evaluate';
-                $url = new \moodle_url('model.php', $urlparams);
-                $icon = new \action_menu_link_secondary($url, new \pix_icon('i/calc', get_string('evaluate', 'tool_analytics')),
-                    get_string('evaluate', 'tool_analytics'));
-                $actionsmenu->add($icon);
-            }
-
-            // Machine-learning-based models evaluation log.
-            if (!$model->is_static()) {
-                $urlparams['action'] = 'log';
-                $url = new \moodle_url('model.php', $urlparams);
-                $icon = new \action_menu_link_secondary($url, new \pix_icon('i/report', get_string('viewlog', 'tool_analytics')),
-                    get_string('viewlog', 'tool_analytics'));
-                $actionsmenu->add($icon);
-            }
-
-            // Edit model.
-            if (!$model->is_static()) {
-                $urlparams['action'] = 'edit';
-                $url = new \moodle_url('model.php', $urlparams);
-                $icon = new \action_menu_link_secondary($url, new \pix_icon('t/edit', get_string('edit')), get_string('edit'));
-                $actionsmenu->add($icon);
-            }
-
-            // Enable / disable.
-            if ($model->is_enabled()) {
-                $action = 'disable';
-                $text = get_string('disable');
-                $icontype = 't/block';
-            } else {
-                $action = 'enable';
-                $text = get_string('enable');
-                $icontype = 'i/checked';
-            }
-            $urlparams['action'] = $action;
-            $url = new \moodle_url('model.php', $urlparams);
-            $icon = new \action_menu_link_secondary($url, new \pix_icon($icontype, $text), $text);
-            $actionsmenu->add($icon);
-
-            // Export training data.
-            if (!$model->is_static() && $model->is_trained()) {
-                $urlparams['action'] = 'export';
-                $url = new \moodle_url('model.php', $urlparams);
-                $icon = new \action_menu_link_secondary($url, new \pix_icon('i/export',
-                    get_string('exporttrainingdata', 'tool_analytics')), get_string('export', 'tool_analytics'));
-                $actionsmenu->add($icon);
-            }
-
-            // Invalid analysables.
-            $analyser = $model->get_analyser(['notimesplitting' => true]);
-            if (!$analyser instanceof \core_analytics\local\analyser\sitewide) {
-                $urlparams['action'] = 'invalidanalysables';
-                $url = new \moodle_url('model.php', $urlparams);
-                $pix = new \pix_icon('i/report', get_string('invalidanalysables', 'tool_analytics'));
-                $icon = new \action_menu_link_secondary($url, $pix, get_string('invalidanalysables', 'tool_analytics'));
-                $actionsmenu->add($icon);
-            }
-
-            // Clear model.
-            if (!empty($predictioncontexts)) {
-                $actionid = 'clear-' . $model->get_id();
-                $PAGE->requires->js_call_amd('tool_analytics/model', 'confirmAction', [$actionid, 'clear']);
-                $urlparams['action'] = 'clear';
-                $url = new \moodle_url('model.php', $urlparams);
-                $icon = new \action_menu_link_secondary($url, new \pix_icon('e/cleanup_messy_code',
-                    get_string('clearpredictions', 'tool_analytics')), get_string('clearpredictions', 'tool_analytics'),
-                    ['data-action-id' => $actionid]);
-                $actionsmenu->add($icon);
-            }
-
-            $modeldata->actions = $actionsmenu->export_for_template($output);
-
-            $data->models[] = $modeldata;
-        }
-
-        if (!$onlycli) {
-            $data->warnings = array(
-                (object)array('message' => get_string('bettercli', 'tool_analytics'), 'closebutton' => true)
-            );
-        } else {
-            $url = new \moodle_url('/admin/settings.php', array('section' => 'analyticssettings'),
-                'id_s_analytics_onlycli');
-            $data->infos = array(
-                (object)array('message' => get_string('clievaluationandpredictions', 'tool_analytics', $url->out()),
-                    'closebutton' => true)
-            );
-        }
-
-        return $data;
-    }
-}

admin/tool/analytics/classes/output/renderer.php

@@ -1,221 +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/>.
-
-/**
- * Renderer.
- *
- * @package    tool_analytics
- * @copyright  2016 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_analytics\output;
-
-defined('MOODLE_INTERNAL') || die();
-
-use plugin_renderer_base;
-use templatable;
-use renderable;
-
-/**
- * Renderer class.
- *
- * @package    tool_analytics
- * @copyright  2016 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class renderer extends plugin_renderer_base {
-
-    /**
-     * Defer to template.
-     *
-     * @param \tool_analytics\output\models_list $modelslist
-     * @return string HTML
-     */
-    protected function render_models_list(\tool_analytics\output\models_list $modelslist) {
-        $data = $modelslist->export_for_template($this);
-        return parent::render_from_template('tool_analytics/models_list', $data);
-    }
-
-    /**
-     * Renders a table.
-     *
-     * @param \table_sql $table
-     * @return string HTML
-     */
-    public function render_table(\table_sql $table) {
-
-        ob_start();
-        $table->out(10, true);
-        $output = ob_get_contents();
-        ob_end_clean();
-
-        return $output;
-    }
-
-    /**
-     * Web interface evaluate results.
-     *
-     * @param \stdClass[] $results
-     * @param string[] $logs
-     * @return string HTML
-     */
-    public function render_evaluate_results($results, $logs = array()) {
-        global $OUTPUT;
-
-        $output = '';
-
-        foreach ($results as $timesplittingid => $result) {
-
-            if (!CLI_SCRIPT) {
-                $output .= $OUTPUT->box_start('generalbox m-b-3');
-            }
-
-            // Check that the array key is a string, not all results depend on time splitting methods (e.g. general errors).
-            if (!is_numeric($timesplittingid)) {
-                $timesplitting = \core_analytics\manager::get_time_splitting($timesplittingid);
-                $langstrdata = (object)array('name' => $timesplitting->get_name(), 'id' => $timesplittingid);
-
-                if (CLI_SCRIPT) {
-                    $output .= $OUTPUT->heading(get_string('getpredictionsresultscli', 'tool_analytics', $langstrdata), 3);
-                } else {
-                    $output .= $OUTPUT->heading(get_string('getpredictionsresults', 'tool_analytics', $langstrdata), 3);
-                }
-            }
-
-            if ($result->status == 0) {
-                $output .= $OUTPUT->notification(get_string('goodmodel', 'tool_analytics'),
-                    \core\output\notification::NOTIFY_SUCCESS);
-            } else if ($result->status === \core_analytics\model::NO_DATASET) {
-                $output .= $OUTPUT->notification(get_string('nodatatoevaluate', 'tool_analytics'),
-                    \core\output\notification::NOTIFY_WARNING);
-            }
-
-            if (isset($result->score)) {
-                // Score.
-                $output .= $OUTPUT->heading(get_string('accuracy', 'tool_analytics') . ': ' .
-                    round(floatval($result->score), 4) * 100  . '%', 4);
-            }
-
-            if (!empty($result->info)) {
-                foreach ($result->info as $message) {
-                    $output .= $OUTPUT->notification($message, \core\output\notification::NOTIFY_WARNING);
-                }
-            }
-
-            if (!CLI_SCRIPT) {
-                $output .= $OUTPUT->box_end();
-            }
-        }
-
-        // Info logged during evaluation.
-        if (!empty($logs) && debugging()) {
-            $output .= $OUTPUT->heading(get_string('extrainfo', 'tool_analytics'), 3);
-            foreach ($logs as $log) {
-                $output .= $OUTPUT->notification($log, \core\output\notification::NOTIFY_WARNING);
-            }
-        }
-
-        if (!CLI_SCRIPT) {
-            $output .= $OUTPUT->single_button(new \moodle_url('/admin/tool/analytics/index.php'), get_string('continue'), 'get');
-        }
-
-        return $output;
-    }
-
-
-    /**
-     * Web interface training & prediction results.
-     *
-     * @param \stdClass|false $trainresults
-     * @param string[] $trainlogs
-     * @param \stdClass|false $predictresults
-     * @param string[] $predictlogs
-     * @return string HTML
-     */
-    public function render_get_predictions_results($trainresults = false, $trainlogs = array(), $predictresults = false, $predictlogs = array()) {
-        global $OUTPUT;
-
-        $output = '';
-
-        if ($trainresults || (!empty($trainlogs) && debugging())) {
-            $output .= $OUTPUT->heading(get_string('trainingresults', 'tool_analytics'), 3);
-        }
-
-        if ($trainresults) {
-            if ($trainresults->status == 0) {
-                $output .= $OUTPUT->notification(get_string('trainingprocessfinished', 'tool_analytics'),
-                    \core\output\notification::NOTIFY_SUCCESS);
-            } else if ($trainresults->status === \core_analytics\model::NO_DATASET ||
-                    $trainresults->status === \core_analytics\model::NOT_ENOUGH_DATA) {
-                $output .= $OUTPUT->notification(get_string('nodatatotrain', 'tool_analytics'),
-                    \core\output\notification::NOTIFY_WARNING);
-            } else {
-                $output .= $OUTPUT->notification(get_string('generalerror', 'tool_analytics', $trainresults->status),
-                    \core\output\notification::NOTIFY_ERROR);
-            }
-        }
-
-        if (!empty($trainlogs) && debugging()) {
-            $output .= $OUTPUT->heading(get_string('extrainfo', 'tool_analytics'), 4);
-            foreach ($trainlogs as $log) {
-                $output .= $OUTPUT->notification($log, \core\output\notification::NOTIFY_WARNING);
-            }
-        }
-
-        if ($predictresults || (!empty($predictlogs) && debugging())) {
-            $output .= $OUTPUT->heading(get_string('predictionresults', 'tool_analytics'), 3, 'main m-t-3');
-        }
-
-        if ($predictresults) {
-            if ($predictresults->status == 0) {
-                $output .= $OUTPUT->notification(get_string('predictionprocessfinished', 'tool_analytics'),
-                    \core\output\notification::NOTIFY_SUCCESS);
-            } else if ($predictresults->status === \core_analytics\model::NO_DATASET ||
-                    $predictresults->status === \core_analytics\model::NOT_ENOUGH_DATA) {
-                $output .= $OUTPUT->notification(get_string('nodatatopredict', 'tool_analytics'),
-                    \core\output\notification::NOTIFY_WARNING);
-            } else {
-                $output .= $OUTPUT->notification(get_string('generalerror', 'tool_analytics', $predictresults->status),
-                    \core\output\notification::NOTIFY_ERROR);
-            }
-        }
-
-        if (!empty($predictlogs) && debugging()) {
-            $output .= $OUTPUT->heading(get_string('extrainfo', 'tool_analytics'), 4);
-            foreach ($predictlogs as $log) {
-                $output .= $OUTPUT->notification($log, \core\output\notification::NOTIFY_WARNING);
-            }
-        }
-
-        if (!CLI_SCRIPT) {
-            $output .= $OUTPUT->single_button(new \moodle_url('/admin/tool/analytics/index.php'), get_string('continue'), 'get');
-        }
-
-        return $output;
-    }
-
-    /**
-     * Defer to template.
-     *
-     * @param \tool_analytics\output\invalid_analysables $invalidanalysables
-     * @return string HTML
-     */
-    protected function render_invalid_analysables(\tool_analytics\output\invalid_analysables $invalidanalysables) {
-        $data = $invalidanalysables->export_for_template($this);
-        return parent::render_from_template('tool_analytics/invalid_analysables', $data);
-    }
-}

admin/tool/analytics/classes/task/predict_models.php

@@ -1,71 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Predict system models with new data available.
- *
- * @package    tool_analytics
- * @copyright  2017 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_analytics\task;
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Predict system models with new data available.
- *
- * @package    tool_analytics
- * @copyright  2017 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class predict_models extends \core\task\scheduled_task {
-
-    /**
-     * get_name
-     *
-     * @return string
-     */
-    public function get_name() {
-        return get_string('predictmodels', 'tool_analytics');
-    }
-
-    /**
-     * Executes the prediction task.
-     *
-     * @return void
-     */
-    public function execute() {
-        global $OUTPUT, $PAGE;
-
-        $models = \core_analytics\manager::get_all_models(true, true);
-        if (!$models) {
-            mtrace(get_string('errornoenabledandtrainedmodels', 'tool_analytics'));
-            return;
-        }
-
-        foreach ($models as $model) {
-            $result = $model->predict();
-            if ($result) {
-                echo $OUTPUT->heading(get_string('modelresults', 'tool_analytics', $model->get_target()->get_name()));
-                $renderer = $PAGE->get_renderer('tool_analytics');
-                echo $renderer->render_get_predictions_results(false, array(), $result, $model->get_analyser()->get_logs());
-            }
-        }
-
-    }
-}

admin/tool/analytics/classes/task/train_models.php

@@ -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/>.
-
-/**
- * Train system models with new data available.
- *
- * @package    tool_analytics
- * @copyright  2017 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_analytics\task;
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Train system models with new data available.
- *
- * @package    tool_analytics
- * @copyright  2017 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class train_models extends \core\task\scheduled_task {
-
-    /**
-     * get_name
-     *
-     * @return string
-     */
-    public function get_name() {
-        return get_string('trainmodels', 'tool_analytics');
-    }
-
-    /**
-     * Executes the prediction task.
-     *
-     * @return void
-     */
-    public function execute() {
-        global $OUTPUT, $PAGE;
-
-        $models = \core_analytics\manager::get_all_models(true);
-        if (!$models) {
-            mtrace(get_string('errornoenabledmodels', 'tool_analytics'));
-            return;
-        }
-
-        foreach ($models as $model) {
-
-            if ($model->is_static()) {
-                // Skip models based on assumptions.
-                continue;
-            }
-
-            if (!$model->get_time_splitting()) {
-                // Can not train if there is no time splitting method selected.
-                continue;
-            }
-
-            $result = $model->train();
-            if ($result) {
-                echo $OUTPUT->heading(get_string('modelresults', 'tool_analytics', $model->get_target()->get_name()));
-
-                $renderer = $PAGE->get_renderer('tool_analytics');
-                echo $renderer->render_get_predictions_results($result, $model->get_analyser()->get_logs());
-            }
-        }
-    }
-}

admin/tool/analytics/cli/enable_model.php

@@ -1,72 +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/>.
-
-/**
- * Enables the provided model.
- *
- * @package    tool_analytics
- * @copyright  2017 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require_once(__DIR__ . '/../../../../config.php');
-require_once($CFG->libdir.'/clilib.php');
-
-$help = "Enables the provided model.
-
-Options:
---modelid           Model id
---timesplitting     Time splitting method full class name
--h, --help          Print out this help
-
-Example:
-\$ php admin/tool/analytics/cli/enable_model.php --modelid=1 --timesplitting=\"\\core\\analytics\\time_splitting\\quarters\"
-";
-
-// Now get cli options.
-list($options, $unrecognized) = cli_get_params(
-    array(
-        'help'            => false,
-        'modelid'         => false,
-        'timesplitting'   => false
-    ),
-    array(
-        'h' => 'help',
-    )
-);
-
-if ($options['help']) {
-    echo $help;
-    exit(0);
-}
-
-if ($options['modelid'] === false || $options['timesplitting'] === false) {
-    echo $help;
-    exit(0);
-}
-
-// We need admin permissions.
-\core\session\manager::set_user(get_admin());
-
-$model = new \core_analytics\model($options['modelid']);
-
-// Evaluate its suitability to predict accurately.
-$model->enable($options['timesplitting']);
-
-cli_heading(get_string('success'));
-exit(0);

admin/tool/analytics/cli/evaluate_model.php

@@ -1,131 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Evaluates the provided model.
- *
- * @package    tool_analytics
- * @copyright  2016 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require_once(__DIR__ . '/../../../../config.php');
-require_once($CFG->libdir.'/clilib.php');
-
-$help = "Evaluates the provided model.
-
-Options:
---modelid              Model id
---non-interactive      Not interactive questions
---timesplitting        Restrict the evaluation to 1 single time splitting method (Optional)
---filter               Analyser dependant. e.g. A courseid would evaluate the model using a single course (Optional)
---reuse-prev-analysed  Reuse recently analysed courses instead of analysing the whole site. Set it to false while" .
-    " coding indicators. Defaults to true (Optional)" . "
--h, --help             Print out this help
-
-Example:
-\$ php admin/tool/analytics/cli/evaluate_model.php --modelid=1 --timesplitting='\\core\\analytics\\time_splitting\\quarters' --filter=123,321
-";
-
-// Now get cli options.
-list($options, $unrecognized) = cli_get_params(
-    array(
-        'help'                  => false,
-        'modelid'               => false,
-        'timesplitting'         => false,
-        'reuse-prev-analysed'   => true,
-        'non-interactive'       => false,
-        'filter'                => false
-    ),
-    array(
-        'h' => 'help',
-    )
-);
-
-if ($options['help']) {
-    echo $help;
-    exit(0);
-}
-
-if ($options['modelid'] === false) {
-    echo $help;
-    exit(0);
-}
-
-// Reformat them as an array.
-if ($options['filter'] !== false) {
-    $options['filter'] = explode(',', $options['filter']);
-}
-
-// We need admin permissions.
-\core\session\manager::set_user(get_admin());
-
-$model = new \core_analytics\model($options['modelid']);
-
-mtrace(get_string('analysingsitedata', 'tool_analytics'));
-
-if ($options['reuse-prev-analysed']) {
-    mtrace(get_string('evaluationinbatches', 'tool_analytics'));
-}
-
-$analyseroptions = array(
-    'filter' => $options['filter'],
-    'timesplitting' => $options['timesplitting'],
-    'reuseprevanalysed' => $options['reuse-prev-analysed'],
-);
-// Evaluate its suitability to predict accurately.
-$results = $model->evaluate($analyseroptions);
-
-$renderer = $PAGE->get_renderer('tool_analytics');
-echo $renderer->render_evaluate_results($results, $model->get_analyser()->get_logs());
-
-// Check that we have, at leasa,t 1 valid dataset (not necessarily good) to use.
-foreach ($results as $result) {
-    if ($result->status !== \core_analytics\model::NO_DATASET &&
-            $result->status !== \core_analytics\model::GENERAL_ERROR) {
-        $validdatasets = true;
-    }
-}
-
-if (!empty($validdatasets) && !$model->is_enabled() && $options['non-interactive'] === false) {
-
-    // Select a dataset, train and enable the model.
-    $input = cli_input(get_string('clienablemodel', 'tool_analytics'));
-    while (!\core_analytics\manager::is_valid($input, '\core_analytics\local\time_splitting\base') && $input !== 'none') {
-        mtrace(get_string('errorunexistingtimesplitting', 'analytics'));
-        $input = cli_input(get_string('clienablemodel', 'tool_analytics'));
-    }
-
-    if ($input === 'none') {
-        exit(0);
-    }
-
-    // Refresh the instance to prevent unexpected issues.
-    $model = new \core_analytics\model($modelobj);
-
-    // Set the time splitting method file and enable it.
-    $model->enable($input);
-
-    mtrace(get_string('trainandpredictmodel', 'tool_analytics'));
-
-    // Train the model with the selected time splitting method and start predicting.
-    $model->train();
-    $model->predict();
-}
-
-exit(0);

admin/tool/analytics/cli/guess_course_start_and_end.php

@@ -1,214 +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/>.
-
-/**
- * Guesses course start and end dates based on activity logs.
- *
- * @package    tool_analytics
- * @copyright  2016 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('CLI_SCRIPT', true);
-
-require_once(__DIR__ . '/../../../../config.php');
-require_once($CFG->libdir.'/clilib.php');
-
-require_once($CFG->dirroot . '/course/lib.php');
-require_once($CFG->dirroot . '/course/format/weeks/lib.php');
-
-$help = "Guesses course start and end dates based on activity logs.
-
-IMPORTANT: Don't use this script if you keep previous academic years users enrolled in courses. Guesses would not be accurate.
-
-Options:
---guessstart           Guess the course start date (default to true)
---guessend             Guess the course end date (default to true)
---guessall             Guess all start and end dates, even if they are already set (default to false)
---update               Update the db or just notify the guess (default to false)
---filter               Analyser dependant. e.g. A courseid would evaluate the model using a single course (Optional)
--h, --help             Print out this help
-
-Example:
-\$ php admin/tool/analytics/cli/guess_course_start_and_end_dates.php --update=1 --filter=123,321
-";
-
-// Now get cli options.
-list($options, $unrecognized) = cli_get_params(
-    array(
-        'help'        => false,
-        'guessstart'  => true,
-        'guessend'    => true,
-        'guessall'    => false,
-        'update'      => false,
-        'filter'      => false
-    ),
-    array(
-        'h' => 'help',
-    )
-);
-
-if ($options['help']) {
-    echo $help;
-    exit(0);
-}
-
-if ($options['guessstart'] === false && $options['guessend'] === false && $options['guessall'] === false) {
-    echo $help;
-    exit(0);
-}
-
-// Reformat them as an array.
-if ($options['filter'] !== false) {
-    $options['filter'] = explode(',', clean_param($options['filter'], PARAM_SEQUENCE));
-}
-
-// We need admin permissions.
-\core\session\manager::set_user(get_admin());
-
-$conditions = array('id != 1');
-if (!$options['guessall']) {
-    if ($options['guessstart']) {
-        $conditions[] = '(startdate is null or startdate = 0)';
-    }
-    if ($options['guessend']) {
-        $conditions[] = '(enddate is null or enddate = 0)';
-    }
-}
-
-$coursessql = '';
-$params = null;
-if ($options['filter']) {
-    list($coursessql, $params) = $DB->get_in_or_equal($options['filter'], SQL_PARAMS_NAMED);
-    $conditions[] = 'id ' . $coursessql;
-}
-
-$courses = $DB->get_recordset_select('course', implode(' AND ', $conditions), $params, 'sortorder ASC');
-foreach ($courses as $course) {
-    tool_analytics_calculate_course_dates($course, $options);
-}
-$courses->close();
-
-
-/**
- * tool_analytics_calculate_course_dates
- *
- * @param stdClass $course
- * @param array $options CLI options
- * @return void
- */
-function tool_analytics_calculate_course_dates($course, $options) {
-    global $DB, $OUTPUT;
-
-    $courseman = new \core_analytics\course($course);
-
-    $notification = $course->shortname . ' (id = ' . $course->id . '): ';
-
-    if ($options['guessstart'] || $options['guessall']) {
-
-        $originalstartdate = $course->startdate;
-
-        $guessedstartdate = $courseman->guess_start();
-        if ($guessedstartdate == $originalstartdate) {
-            if (!$guessedstartdate) {
-                $notification .= PHP_EOL . '  ' . get_string('cantguessstartdate', 'tool_analytics');
-            } else {
-                // No need to update.
-                $notification .= PHP_EOL . '  ' . get_string('samestartdate', 'tool_analytics') . ': ' . userdate($guessedstartdate);
-            }
-        } else if (!$guessedstartdate) {
-            $notification .= PHP_EOL . '  ' . get_string('cantguessstartdate', 'tool_analytics');
-        } else {
-            // Update it to something we guess.
-
-            // We set it to $course even if we don't update because may be needed to guess the end one.
-            $course->startdate = $guessedstartdate;
-            $notification .= PHP_EOL . '  ' . get_string('startdate') . ': ' . userdate($guessedstartdate);
-
-            // Two different course updates because week's end date may be recalculated after setting the start date.
-            if ($options['update']) {
-                update_course($course);
-
-                // Refresh course data as end date may have been updated.
-                $course = $DB->get_record('course', array('id' => $course->id));
-                $courseman = new \core_analytics\course($course);
-            }
-        }
-    }
-
-    if ($options['guessend'] || $options['guessall']) {
-
-        $originalenddate = $course->enddate;
-
-        $format = course_get_format($course);
-        $formatoptions = $format->get_format_options();
-
-        // Change this for a course formats API level call in MDL-60702.
-        if (method_exists($format, 'update_end_date') && $formatoptions['automaticenddate']) {
-            // Special treatment for weeks-based formats with automatic end date.
-
-            if ($options['update']) {
-                $format::update_end_date($course->id);
-                $course->enddate = $DB->get_field('course', 'enddate', array('id' => $course->id));
-                $notification .= PHP_EOL . '  ' . get_string('weeksenddateautomaticallyset', 'tool_analytics') . ': ' .
-                    userdate($course->enddate);
-            } else {
-                // We can't provide more info without actually updating it in db.
-                $notification .= PHP_EOL . '  ' . get_string('weeksenddatedefault', 'tool_analytics');
-            }
-        } else {
-            $guessedenddate = $courseman->guess_end();
-
-            if ($guessedenddate == $originalenddate) {
-                if (!$guessedenddate) {
-                    $notification .= PHP_EOL . '  ' . get_string('cantguessenddate', 'tool_analytics');
-                } else {
-                    // No need to update.
-                    $notification .= PHP_EOL . '  ' . get_string('sameenddate', 'tool_analytics') . ': ' . userdate($guessedenddate);
-                }
-            } else if (!$guessedenddate) {
-                $notification .= PHP_EOL . '  ' . get_string('cantguessenddate', 'tool_analytics');
-            } else {
-                // Update it to something we guess.
-
-                $course->enddate = $guessedenddate;
-
-                $updateit = false;
-                if ($course->enddate < $course->startdate) {
-                    $notification .= PHP_EOL . '  ' . get_string('errorendbeforestart', 'analytics', userdate($course->enddate));
-                } else if ($course->startdate + (YEARSECS + (WEEKSECS * 4)) > $course->enddate) {
-                    $notification .= PHP_EOL . '  ' . get_string('coursetoolong', 'analytics');
-                } else {
-                    $notification .= PHP_EOL . '  ' . get_string('enddate') . ': ' . userdate($course->enddate);
-                    $updateit = true;
-                }
-
-                if ($options['update']) {
-                    if ($course->enddate > $course->startdate) {
-                        update_course($course);
-                    }
-                }
-            }
-        }
-
-    }
-
-    mtrace($notification);
-}
-
-mtrace(get_string('success'));
-
-exit(0);

admin/tool/analytics/index.php

@@ -1,37 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Prediction models tool frontend.
- *
- * @package tool_analytics
- * @copyright 2016 David Monllao {@link http://www.davidmonllao.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');
-
-admin_externalpage_setup('analyticmodels', '', null, '', array('pagelayout' => 'report'));
-
-$models = \core_analytics\manager::get_all_models();
-
-echo $OUTPUT->header();
-
-$templatable = new \tool_analytics\output\models_list($models);
-echo $PAGE->get_renderer('tool_analytics')->render($templatable);
-
-echo $OUTPUT->footer();

admin/tool/analytics/lang/en/tool_analytics.php

@@ -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/>.
-
-/**
- * Strings for tool_analytics.
- *
- * @package tool_analytics
- * @copyright 2016 David Monllao {@link http://www.davidmonllao.com}
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-$string['accuracy'] = 'Accuracy';
-$string['allpredictions'] = 'All predictions';
-$string['analysingsitedata'] = 'Analysing the site';
-$string['analyticmodels'] = 'Analytics models';
-$string['bettercli'] = 'Evaluating models and generating predictions may involve heavy processing. It is recommended to run these actions from the command line.';
-$string['cantguessstartdate'] = 'Can\'t guess the start date';
-$string['cantguessenddate'] = 'Can\'t guess the end date';
-$string['clearpredictions'] = 'Clear predictions';
-$string['clearmodelpredictions'] = 'Are you sure you want to clear all "{$a}" predictions?';
-$string['clienablemodel'] = 'You can enable the model by selecting a time-splitting method by its ID. Note that you can also enable it later using the web interface (\'none\' to exit).';
-$string['clievaluationandpredictions'] = 'A scheduled task iterates through enabled models and gets predictions. Models evaluation via the web interface is disabled. You can allow these processes to be executed manually via the web interface by disabling the <a href="{$a}">\'onlycli\'</a> analytics setting.';
-$string['editmodel'] = 'Edit "{$a}" model';
-$string['edittrainedwarning'] = 'This model has already been trained. Note that changing its indicators or its time-splitting method will delete its previous predictions and start generating new predictions.';
-$string['enabled'] = 'Enabled';
-$string['errorcantenablenotimesplitting'] = 'You need to select a time-splitting method before enabling the model';
-$string['errornoenabledandtrainedmodels'] = 'There are no enabled and trained models to predict.';
-$string['errornoenabledmodels'] = 'There are no enabled models to train.';
-$string['errornoexport'] = 'Only trained models can be exported';
-$string['errornostaticedit'] = 'Models based on assumptions cannot be edited.';
-$string['errornostaticevaluated'] = 'Models based on assumptions cannot be evaluated. They are always 100% correct according to how they were defined.';
-$string['errornostaticlog'] = 'Models based on assumptions cannot be evaluated because there is no performance log.';
-$string['erroronlycli'] = 'Execution only allowed via command line';
-$string['errortrainingdataexport'] = 'The model training data could not be exported';
-$string['evaluate'] = 'Evaluate';
-$string['evaluatemodel'] = 'Evaluate model';
-$string['evaluationinbatches'] = 'The site contents are calculated and stored in batches. The evaluation process may be stopped at any time. The next time it is run, it will continue from the point when it was stopped.';
-$string['export'] = 'Export';
-$string['exporttrainingdata'] = 'Export training data';
-$string['getpredictionsresultscli'] = 'Results using {$a->name} (id: {$a->id}) course duration splitting';
-$string['getpredictionsresults'] = 'Results using {$a->name} course duration splitting';
-$string['extrainfo'] = 'Info';
-$string['generalerror'] = 'Evaluation error. Status code {$a}';
-$string['getpredictions'] = 'Get predictions';
-$string['goodmodel'] = 'This is a good model for using to obtain predictions. Enable it to start obtaining predictions.';
-$string['indicators'] = 'Indicators';
-$string['info'] = 'Info';
-$string['insights'] = 'Insights';
-$string['invalidanalysables'] = 'Invalid site elements';
-$string['invalidanalysablesinfo'] = 'This pages lists this site analysable elements that can not be used by this prediction model. The listed elements can not be used neither to train the prediction model nor the prediction model can get predictions for them.';
-$string['invalidanalysablestable'] = 'Invalid site analysable elements table';
-$string['invalidprediction'] = 'Invalid to get predictions';
-$string['invalidtraining'] = 'Invalid to train the model';
-$string['loginfo'] = 'Log extra info';
-$string['modelinvalidanalysables'] = 'Invalid analysable elements for "{$a}" model';
-$string['modelresults'] = '{$a} results';
-$string['modeltimesplitting'] = 'Time splitting';
-$string['nextpage'] = 'Next page';
-$string['nodatatoevaluate'] = 'There is no data to evaluate the model';
-$string['nodatatopredict'] = 'No new elements to get predictions for';
-$string['nodatatotrain'] = 'There is no new data that can be used for training';
-$string['notdefined'] = 'Not yet defined';
-$string['pluginname'] = 'Analytic models';
-$string['predictionresults'] = 'Prediction results';
-$string['predictmodels'] = 'Predict models';
-$string['predictorresultsin'] = 'Predictor logged information in {$a} directory';
-$string['predictionprocessfinished'] = 'Prediction process finished';
-$string['previouspage'] = 'Previous page';
-$string['samestartdate'] = 'Current start date is good';
-$string['sameenddate'] = 'Current end date is good';
-$string['target'] = 'Target';
-$string['trainandpredictmodel'] = 'Training model and calculating predictions';
-$string['trainingprocessfinished'] = 'Training process finished';
-$string['trainingresults'] = 'Training results';
-$string['trainmodels'] = 'Train models';
-$string['viewlog'] = 'Log';
-$string['weeksenddateautomaticallyset'] = 'End date automatically set based on start date and the number of sections';
-$string['weeksenddatedefault'] = 'End date automatically calculated from the course start date.';

admin/tool/analytics/model.php

@@ -1,241 +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/>.
-
-/**
- * Model-related actions.
- *
- * @package    tool_analytics
- * @copyright  2017 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-require_once(__DIR__ . '/../../../config.php');
-
-$id = required_param('id', PARAM_INT);
-$action = required_param('action', PARAM_ALPHANUMEXT);
-
-$context = context_system::instance();
-
-require_login();
-
-$model = new \core_analytics\model($id);
-\core_analytics\manager::check_can_manage_models();
-
-$params = array('id' => $id, 'action' => $action);
-$url = new \moodle_url('/admin/tool/analytics/model.php', $params);
-
-switch ($action) {
-
-    case 'edit':
-        $title = get_string('editmodel', 'tool_analytics', $model->get_target()->get_name());
-        break;
-    case 'evaluate':
-        $title = get_string('evaluatemodel', 'tool_analytics');
-        break;
-    case 'getpredictions':
-        $title = get_string('getpredictions', 'tool_analytics');
-        break;
-    case 'log':
-        $title = get_string('viewlog', 'tool_analytics');
-        break;
-    case 'enable':
-        $title = get_string('enable');
-        break;
-    case 'disable':
-        $title = get_string('disable');
-        break;
-    case 'export':
-        $title = get_string('export', 'tool_analytics');
-        break;
-    case 'clear':
-        $title = get_string('clearpredictions', 'tool_analytics');
-        break;
-    case 'invalidanalysables':
-        $title = get_string('invalidanalysables', 'tool_analytics');
-        break;
-    default:
-        throw new moodle_exception('errorunknownaction', 'analytics');
-}
-
-$PAGE->set_context($context);
-$PAGE->set_url($url);
-$PAGE->set_pagelayout('report');
-$PAGE->set_title($title);
-$PAGE->set_heading($title);
-
-$onlycli = get_config('analytics', 'onlycli');
-if ($onlycli === false) {
-    // Default applied if no config found.
-    $onlycli = 1;
-}
-
-switch ($action) {
-
-    case 'enable':
-        confirm_sesskey();
-
-        $model->enable();
-        redirect(new \moodle_url('/admin/tool/analytics/index.php'));
-        break;
-
-    case 'disable':
-        confirm_sesskey();
-
-        $model->update(0, false, false);
-        redirect(new \moodle_url('/admin/tool/analytics/index.php'));
-        break;
-
-    case 'edit':
-        confirm_sesskey();
-
-        if ($model->is_static()) {
-            echo $OUTPUT->header();
-            throw new moodle_exception('errornostaticedit', 'tool_analytics');
-        }
-
-        $customdata = array(
-            'id' => $model->get_id(),
-            'model' => $model,
-            'indicators' => $model->get_potential_indicators(),
-            'timesplittings' => \core_analytics\manager::get_enabled_time_splitting_methods()
-        );
-        $mform = new \tool_analytics\output\form\edit_model(null, $customdata);
-
-        if ($mform->is_cancelled()) {
-            redirect(new \moodle_url('/admin/tool/analytics/index.php'));
-
-        } else if ($data = $mform->get_data()) {
-
-            // Converting option names to class names.
-            $indicators = array();
-            foreach ($data->indicators as $indicator) {
-                $indicatorclass = \tool_analytics\output\helper::option_to_class($indicator);
-                $indicators[] = \core_analytics\manager::get_indicator($indicatorclass);
-            }
-            $timesplitting = \tool_analytics\output\helper::option_to_class($data->timesplitting);
-            $model->update($data->enabled, $indicators, $timesplitting);
-            redirect(new \moodle_url('/admin/tool/analytics/index.php'));
-        }
-
-        echo $OUTPUT->header();
-
-        $modelobj = $model->get_model_obj();
-
-        $callable = array('\tool_analytics\output\helper', 'class_to_option');
-        $modelobj->indicators = array_map($callable, json_decode($modelobj->indicators));
-        $modelobj->timesplitting = \tool_analytics\output\helper::class_to_option($modelobj->timesplitting);
-        $mform->set_data($modelobj);
-        $mform->display();
-        break;
-
-    case 'evaluate':
-        confirm_sesskey();
-
-        echo $OUTPUT->header();
-
-        if ($model->is_static()) {
-            throw new moodle_exception('errornostaticevaluate', 'tool_analytics');
-        }
-
-        if ($onlycli) {
-            throw new moodle_exception('erroronlycli', 'tool_analytics');
-        }
-
-        // Web interface is used by people who can not use CLI nor code stuff, always use
-        // cached stuff as they will change the model through the web interface as well
-        // which invalidates the previously analysed stuff.
-        $results = $model->evaluate(array('reuseprevanalysed' => true));
-        $renderer = $PAGE->get_renderer('tool_analytics');
-        echo $renderer->render_evaluate_results($results, $model->get_analyser()->get_logs());
-        break;
-
-    case 'getpredictions':
-        confirm_sesskey();
-
-        echo $OUTPUT->header();
-
-        if ($onlycli) {
-            throw new moodle_exception('erroronlycli', 'tool_analytics');
-        }
-
-        $trainresults = $model->train();
-        $trainlogs = $model->get_analyser()->get_logs();
-
-        // Looks dumb to get a new instance but better be conservative.
-        $model = new \core_analytics\model($model->get_model_obj());
-        if ($model->is_trained()) {
-            $predictresults = $model->predict();
-            $predictlogs = $model->get_analyser()->get_logs();
-        } else {
-            $predictresults = false;
-            $predictlogs = array();
-        }
-
-        $renderer = $PAGE->get_renderer('tool_analytics');
-        echo $renderer->render_get_predictions_results($trainresults, $trainlogs, $predictresults, $predictlogs);
-        break;
-
-    case 'log':
-        echo $OUTPUT->header();
-
-        if ($model->is_static()) {
-            throw new moodle_exception('errornostaticlog', 'tool_analytics');
-        }
-
-        $renderer = $PAGE->get_renderer('tool_analytics');
-        $modellogstable = new \tool_analytics\output\model_logs('model-' . $model->get_id(), $model);
-        echo $renderer->render_table($modellogstable);
-        break;
-
-    case 'export':
-
-        if ($model->is_static() || !$model->is_trained()) {
-            throw new moodle_exception('errornoexport', 'tool_analytics');
-        }
-
-        $file = $model->get_training_data();
-        if (!$file) {
-            redirect(new \moodle_url('/admin/tool/analytics/index.php'), get_string('errortrainingdataexport', 'tool_analytics'),
-                null, \core\output\notification::NOTIFY_ERROR);
-        }
-
-        $filename = 'training-data.' . $model->get_id() . '.' . time() . '.csv';
-        send_file($file, $filename, null, 0, false, true);
-        break;
-
-    case 'clear':
-        confirm_sesskey();
-
-        $model->clear();
-        redirect(new \moodle_url('/admin/tool/analytics/index.php'));
-        break;
-
-    case 'invalidanalysables':
-
-        echo $OUTPUT->header();
-
-        $page = optional_param('page', 0, PARAM_INT);
-        // No option in the UI to change this, only for url hackers ;).
-        $perpage = optional_param('perpage', 10, PARAM_INT);
-
-        $renderable = new \tool_analytics\output\invalid_analysables($model, $page, $perpage);
-        $renderer = $PAGE->get_renderer('tool_analytics');
-        echo $renderer->render($renderable);
-
-        break;
-}
-
-echo $OUTPUT->footer();

admin/tool/analytics/templates/invalid_analysables.mustache

@@ -1,78 +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/>.
-}}
-{{!
-    @template tool_analytics/invalid_analysables
-
-    Template for invalid analysables.
-
-    Classes required for JS:
-    * none
-
-    Data attributes required for JS:
-    * none
-
-    Context variables required for this template:
-    * none
-
-    Example context (json):
-    {
-        "modelname": "Not engaging courses",
-        "analysables": [
-            {
-                "url": "<a href=\"#\">Maths</a>",
-                "validtraining": "Ongoing course",
-                "validprediction": "Not enough students activity"
-            }, {
-                "url": "<a href=\"#\">Psichology</a>",
-                "validtraining": "No students",
-                "validprediction": "No students"
-            }
-        ]
-    }
-}}
-
-<div class="box">
-    <h3>{{#str}}modelinvalidanalysables, tool_analytics, {{modelname}}{{/str}}</h3>
-    <div>{{#str}}invalidanalysablesinfo, tool_analytics{{/str}}</div>
-    <div class="m-t-2 m-b-1">
-        <span>{{#prev}}{{> core/single_button}}{{/prev}}</span>
-        <span>{{#next}}{{> core/single_button}}{{/next}}</span>
-    </div>
-    <table class="generaltable fullwidth">
-        <caption class="accesshide">{{#str}}invalidanalysablestable, tool_analytics{{/str}}</caption>
-        <thead>
-            <tr>
-                <th scope="col">{{#str}}name{{/str}}</th>
-                <th scope="col">{{#str}}invalidtraining, tool_analytics{{/str}}</th>
-                <th scope="col">{{#str}}invalidprediction, tool_analytics{{/str}}</th>
-            </tr>
-        </thead>
-        <tbody>
-        {{#analysables}}
-            <tr>
-                <td>{{{url}}}</td>
-                <td>{{validtraining}}</td>
-                <td>{{validprediction}}</td>
-            </tr>
-        {{/analysables}}
-        </tbody>
-    </table>
-    <div class="m-t-1 m-b-2">
-        <span>{{#prev}}{{> core/single_button}}{{/prev}}</span>
-        <span>{{#next}}{{> core/single_button}}{{/next}}</span>
-    </div>
-</div>

admin/tool/analytics/templates/models_list.mustache

@@ -1,183 +0,0 @@
-{{!
-    This file is part of Moodle - http://moodle.org/
-
-    Moodle is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Moodle is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-}}
-{{!
-    @template tool_analytics/models_list
-
-    Template for models list.
-
-    Classes required for JS:
-    * none
-
-    Data attributes required for JS:
-    * none
-
-    Context variables required for this template:
-    * none
-
-    Example context (json):
-    {
-        "models": [
-            {
-                "target": "Prevent devs at risk",
-                "targethelp": [
-                    {
-                        "title": "Help with something",
-                        "url": "http://example.org/help",
-                        "linktext": "",
-                        "icon":{
-                            "extraclasses": "iconhelp",
-                            "attributes": [
-                                {"name": "src", "value": "../../../pix/help.svg"},
-                                {"name": "alt", "value": "Help icon"}
-                            ]
-                        }
-                    }
-                ],
-                "enabled": 1,
-                "indicators": [{
-                    "name": "Indicator 1",
-                    "help": [{
-                            "title": "Help with something",
-                            "url": "http://example.org/help",
-                            "linktext": "",
-                            "icon":{
-                                "extraclasses": "iconhelp",
-                                "attributes": [
-                                    {"name": "src", "value": "../../../pix/help.svg"},
-                                    {"name": "alt", "value": "Help icon"}
-                                ]
-                            }
-                        }]
-                    },
-                    {
-                    "name": "Indicator 2",
-                    "help": [{
-                            "title": "Help with something",
-                            "url": "http://example.org/help",
-                            "linktext": "",
-                            "icon":{
-                                "extraclasses": "iconhelp",
-                                "attributes": [
-                                    {"name": "src", "value": "../../../pix/help.svg"},
-                                    {"name": "alt", "value": "Help icon"}
-                                ]
-                            }
-                        }]
-                    }],
-                "timesplitting": "Quarters",
-                "timesplittinghelp": [
-                    {
-                        "title": "Help with something",
-                        "url": "http://example.org/help",
-                        "linktext": "",
-                        "icon":{
-                            "extraclasses": "iconhelp",
-                            "attributes": [
-                                {"name": "src", "value": "../../../pix/help.svg"},
-                                {"name": "alt", "value": "Help icon"}
-                            ]
-                        }
-                    }
-                ],
-                "noinsights": "No insights available yet"
-            }
-        ],
-        "warnings": {
-            "message": "Hey, this is a warning"
-        }
-    }
-}}
-
-{{#warnings}}
-    {{> core/notification_warning}}
-{{/warnings}}
-{{#infos}}
-    {{> core/notification_info}}
-{{/infos}}
-
-<div class="box">
-    <table class="generaltable fullwidth">
-        <caption>{{#str}}analyticmodels, tool_analytics{{/str}}</caption>
-        <thead>
-            <tr>
-                <th scope="col">{{#str}}target, tool_analytics{{/str}}</th>
-                <th scope="col">{{#str}}enabled, tool_analytics{{/str}}</th>
-                <th scope="col">{{#str}}indicators, tool_analytics{{/str}}</th>
-                <th scope="col">{{#str}}modeltimesplitting, tool_analytics{{/str}}</th>
-                <th scope="col">{{#str}}insights, tool_analytics{{/str}}</th>
-                <th scope="col">{{#str}}actions{{/str}}</th>
-            </tr>
-        </thead>
-        <tbody>
-        {{#models}}
-            <tr>
-                <td>
-                    <span class="target-name">{{target}}</span>
-                    {{#targethelp}}
-                        {{>core/help_icon}}
-                    {{/targethelp}}
-                </td>
-                <td>
-                    {{#enabled}}
-                        {{#pix}}i/checked, core, {{#str}}yes{{/str}}{{/pix}}
-                    {{/enabled}}
-                    {{^enabled}}
-                        {{#str}}no{{/str}}
-                    {{/enabled}}
-                </td>
-                <td>
-                    <ul>
-                    {{#indicators}}
-                        <li>
-                            {{name}}
-                            {{#help}}
-                                {{>core/help_icon}}
-                            {{/help}}
-                        </li>
-                    {{/indicators}}
-                    </ul>
-                </td>
-                <td>
-                    {{#timesplitting}}
-                        {{timesplitting}}
-                        {{#timesplittinghelp}}
-                            {{>core/help_icon}}
-                        {{/timesplittinghelp}}
-                    {{/timesplitting}}
-                    {{^timesplitting}}
-                        {{#str}}notdefined, tool_analytics{{/str}}
-                    {{/timesplitting}}
-                </td>
-                <td>
-                    {{! models_list renderer is responsible of sending one or the other}}
-                    {{#insights}}
-                        {{> core/single_select }}
-                    {{/insights}}
-                    {{#noinsights}}
-                        {{.}}
-                    {{/noinsights}}
-                </td>
-                <td>
-                    {{#actions}}
-                        {{> core/action_menu}}
-                    {{/actions}}
-                </td>
-            </tr>
-        {{/models}}
-        </tbody>
-    </table>
-</div>

admin/tool/behat/cli/util.php

@@ -398,7 +398,7 @@ function print_combined_install_output($processes) {
     // Show process name in first row.
     foreach ($processes as $name => $process) {
         // If we don't have enough space to show full run name then show runX.
-        if ($lengthofprocessline < strlen($name + 2)) {
+        if ($lengthofprocessline < strlen($name) + 2) {
             $name = substr($name, -5);
         }
         // One extra padding as we are adding | separator for rest of the data.

admin/tool/behat/tests/behat/data_generators.feature

@@ -221,7 +221,7 @@ Feature: Set up contextual data for tests
     And I should see "Test workshop name"
     And I follow "Test assignment name"
     And I should see "Test assignment description"
-    And I am on "Course 1" course homepage
+    And I follow "C1"
     And I follow "Test assignment name with scale"
     And I follow "Edit settings"
     And the field "Type" matches value "Scale"
@@ -312,6 +312,7 @@ Feature: Set up contextual data for tests
       | fullname | course | gradecategory |
       | Grade sub category 2 | C1 | Grade category 1 |
     When I log in as "admin"
+    And I am on course index
     And I am on "Course 1" course homepage
     And I navigate to "View > Grader report" in the course gradebook
     Then I should see "Grade category 1"

admin/tool/customlang/db/upgrade.php

@@ -29,6 +29,15 @@ defined('MOODLE_INTERNAL') || die();
 function xmldb_tool_customlang_upgrade($oldversion) {
     global $CFG;
 
+    // Moodle v2.8.0 release upgrade line.
+    // Put any upgrade step following this.
+
+    // Moodle v2.9.0 release upgrade line.
+    // Put any upgrade step following this.
+
+    // Moodle v3.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     // Moodle v3.1.0 release upgrade line.
     // Put any upgrade step following this.
 

admin/tool/httpsreplace/classes/form.php

@@ -1,52 +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/>.
-
-/**
- * Site wide http -> https search-replace form.
- *
- * @package    tool_httpsreplace
- * @copyright Copyright (c) 2016 Blackboard Inc. (http://www.blackboard.com)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_httpsreplace;
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once("$CFG->libdir/formslib.php");
-
-/**
- * Site wide http -> https search-replace form.
- * @copyright Copyright (c) 2016 Blackboard Inc. (http://www.blackboard.com)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class form extends \moodleform {
-
-    /**
-     * Define the form.
-     */
-    public function definition() {
-        $mform = $this->_form;
-
-        $mform->addElement('header', 'confirmhdr', get_string('confirm'));
-        $mform->setExpanded('confirmhdr', true);
-        $mform->addElement('checkbox', 'sure', get_string('disclaimer', 'tool_httpsreplace'));
-        $mform->addRule('sure', get_string('required'), 'required', null, 'client');
-        $mform->disable_form_change_checker();
-
-        $this->add_action_buttons(false, get_string('doit', 'tool_httpsreplace'));
-    }
-}

admin/tool/httpsreplace/classes/url_finder.php

@@ -1,264 +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/>.
-
-/**
- * url_finder class definition.
- *
- * @package    tool_httpsreplace
- * @copyright Copyright (c) 2016 Blackboard Inc. (http://www.blackboard.com)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_httpsreplace;
-
-use database_column_info;
-use progress_bar;
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Examines DB for non-https src or data links
- *
- * @package tool_httpsreplace
- * @copyright Copyright (c) 2016 Blackboard Inc. (http://www.blackboard.com)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class url_finder {
-
-    /**
-     * Returns a hash of what hosts are referred to over http and would need to be changed.
-     *
-     * @param progress_bar $progress Progress bar keeping track of this process.
-     * @return array Hash of domains with number of references as the value.
-     */
-    public function http_link_stats($progress = null) {
-        return $this->process(false, $progress);
-    }
-
-    /**
-     * Changes all resources referred to over http to https.
-     *
-     * @param progress_bar $progress Progress bar keeping track of this process.
-     * @return bool True upon success
-     */
-    public function upgrade_http_links($progress = null) {
-        return $this->process(true, $progress);
-    }
-
-    /**
-     * Replace http domains with https equivalent, with two types of exceptions
-     * for less straightforward swaps.
-     *
-     * @param string $table
-     * @param database_column_info $column
-     * @param string $domain
-     * @param string $search search string that has prefix, protocol, domain name and one extra character,
-     *      example1: src="http://host.com/
-     *      example2: DATA="HTTP://MYDOMAIN.EDU"
-     *      example3: src="HTTP://hello.world?
-     * @return void
-     */
-    protected function domain_swap($table, $column, $domain, $search) {
-        global $DB;
-
-        $renames = json_decode(get_config('tool_httpsreplace', 'renames'), true);
-
-        if (isset($renames[$domain])) {
-            $replace = preg_replace('|http://'.preg_quote($domain).'|i', 'https://' . $renames[$domain], $search);
-        } else {
-            $replace = preg_replace('|http://|i', 'https://', $search);
-        }
-        $DB->set_debug(true);
-        $DB->replace_all_text($table, $column, $search, $replace);
-        $DB->set_debug(false);
-    }
-
-    /**
-     * Returns SQL to be used to match embedded http links in the given column
-     *
-     * @param string $columnname name of the column (ready to be used in the SQL query)
-     * @return array
-     */
-    protected function get_select_search_in_column($columnname) {
-        global $DB;
-
-        if ($DB->sql_regex_supported()) {
-            // Database supports regex, use it for better match.
-            $select = $columnname . ' ' . $DB->sql_regex() . ' ?';
-            $params = ["(src|data)\ *=\ *[\\\"\']http://"];
-        } else {
-            // Databases without regex support should use case-insensitive LIKE.
-            // This will have false positive matches and more results than we need, we'll have to filter them in php.
-            $select = $DB->sql_like($columnname, '?', false);
-            $params = ['%=%http://%'];
-        }
-
-        return [$select, $params];
-    }
-
-    /**
-     * Originally forked from core function db_search().
-     * @param bool $replacing Whether or not to replace the found urls.
-     * @param progress_bar $progress Progress bar keeping track of this process.
-     * @return bool|array If $replacing, return true on success. If not, return hash of http urls to number of times used.
-     */
-    protected function process($replacing = false, $progress = null) {
-        global $DB, $CFG;
-
-        require_once($CFG->libdir.'/filelib.php');
-
-        // TODO: block_instances have HTML content as base64, need to decode then
-        // search, currently just skipped. See MDL-60024.
-        $skiptables = array(
-            'block_instances',
-            'config',
-            'config_log',
-            'config_plugins',
-            'events_queue',
-            'files',
-            'filter_config',
-            'grade_grades_history',
-            'grade_items_history',
-            'log',
-            'logstore_standard_log',
-            'repository_instance_config',
-            'sessions',
-            'upgrade_log',
-            'grade_categories_history',
-            '',
-        );
-
-        // Turn off time limits.
-        \core_php_time_limit::raise();
-        if (!$tables = $DB->get_tables() ) {    // No tables yet at all.
-            return false;
-        }
-
-        $urls = array();
-
-        $numberoftables = count($tables);
-        $tablenumber = 0;
-        foreach ($tables as $table) {
-            if ($progress) {
-                $progress->update($tablenumber, $numberoftables, get_string('searching', 'tool_httpsreplace', $table));
-                $tablenumber++;
-            }
-            if (in_array($table, $skiptables)) {
-                continue;
-            }
-            if ($columns = $DB->get_columns($table)) {
-                foreach ($columns as $column) {
-
-                    // Only convert columns that are either text or long varchar.
-                    if ($column->meta_type == 'X' || ($column->meta_type == 'C' && $column->max_length > 255)) {
-                        $columnname = $column->name;
-                        $columnnamequoted = $DB->get_manager()->generator->getEncQuoted($columnname);
-                        list($select, $params) = $this->get_select_search_in_column($columnnamequoted);
-                        $rs = $DB->get_recordset_select($table, $select, $params, '', $columnnamequoted);
-
-                        $found = array();
-                        foreach ($rs as $record) {
-                            // Regex to match src=http://etc. and data=http://etc.urls.
-                            // Standard warning on expecting regex to perfectly parse HTML
-                            // read http://stackoverflow.com/a/1732454 for more info.
-                            $regex = '#((src|data)\ *=\ *[\'\"])(http://)([^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|/)))[\'\"]#i';
-                            preg_match_all($regex, $record->$columnname, $match);
-                            foreach ($match[0] as $i => $fullmatch) {
-                                if (\core_text::strpos($fullmatch, $CFG->wwwroot) !== false) {
-                                    continue;
-                                }
-                                $prefix = $match[1][$i];
-                                $protocol = $match[3][$i];
-                                $url = $protocol . $match[4][$i];
-                                $host = \core_text::strtolower(parse_url($url, PHP_URL_HOST));
-                                if (empty($host)) {
-                                    continue;
-                                }
-                                if ($replacing) {
-                                    // For replace string use: prefix, protocol, host and one extra character.
-                                    $found[$prefix . \core_text::substr($url, 0, \core_text::strlen($host) + 8)] = $host;
-                                } else {
-                                    $entry["table"] = $table;
-                                    $entry["columnname"] = $columnname;
-                                    $entry["url"] = $url;
-                                    $entry["host"] = $host;
-                                    $entry["raw"] = $record->$columnname;
-                                    $entry["ssl"] = '';
-                                    $urls[] = $entry;
-                                }
-                            }
-                        }
-                        $rs->close();
-
-                        if ($replacing) {
-                            foreach ($found as $search => $domain) {
-                                $this->domain_swap($table, $column, $domain, $search);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if ($replacing) {
-            rebuild_course_cache(0, true);
-            purge_all_caches();
-            return true;
-        }
-
-        $domains = array_map(function ($i) {
-            return $i['host'];
-        }, $urls);
-
-        $uniquedomains = array_unique($domains);
-
-        $sslfailures = array();
-
-        foreach ($uniquedomains as $domain) {
-            if (!$this->check_domain_availability("https://$domain/")) {
-                $sslfailures[] = $domain;
-            }
-        }
-
-        $results = array();
-        foreach ($urls as $url) {
-            $host = $url['host'];
-            foreach ($sslfailures as $badhost) {
-                if ($host == $badhost) {
-                    if (!isset($results[$host])) {
-                        $results[$host] = 1;
-                    } else {
-                        $results[$host]++;
-                    }
-                }
-            }
-        }
-        return $results;
-    }
-
-    /**
-     * Check if url is available (GET request returns 200)
-     *
-     * @param string $url
-     * @return bool
-     */
-    protected function check_domain_availability($url) {
-        $curl = new \curl();
-        $curl->head($url);
-        $info = $curl->get_info();
-        return !empty($info['http_code']) && $info['http_code'] == 200;
-    }
-}

admin/tool/httpsreplace/cli/url_replace.php

@@ -1,93 +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/>.
-
-/**
- * url_replace cli script. Examines DB for non-https src or data links, and lists broken ones or replaces all links.
- *
- * @package    tool_httpsreplace
- * @copyright Copyright (c) 2016 Blackboard Inc. (http://www.blackboard.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,
-        'list' => false,
-        'replace' => false,
-        'confirm' => false,
-    ),
-    array(
-        'h' => 'help',
-        'l' => 'list',
-        'r' => 'replace',
-    )
-);
-if ($unrecognized) {
-    $unrecognized = implode("\n  ", $unrecognized);
-    cli_error(get_string('cliunknowoption', 'admin', $unrecognized), 2);
-}
-if ($options['help'] || (!$options['list'] && !$options['replace'])) {
-    $help = "Examines DB for non-https src or data links, and lists broken links or replaces all links.
-Options:
--h, --help            Print out this help
--l, --list            List of http (not https) urls on a site in the DB that would become broken.
--r, --replace         List of http (not https) urls on a site in the DB that would become broken.
---confirm             Replaces http urls with https across a site's content.
-Example:
-\$ sudo -u www-data /usr/bin/php admin/tool/httpsreplace/cli/url_replace.php --list \n";
-    echo $help;
-    exit(0);
-}
-
-if (!$DB->replace_all_text_supported()) {
-    echo $OUTPUT->notification(get_string('notimplemented', 'tool_httpsreplace'));
-    exit(1);
-}
-
-if (!is_https()) {
-    echo $OUTPUT->notification(get_string('httpwarning', 'tool_httpsreplace'), 'warning');
-    echo "\n";
-}
-
-if ($options['replace']) {
-
-    if ($options['confirm']) {
-
-        $urlfinder = new \tool_httpsreplace\url_finder();
-        $urlfinder->upgrade_http_links();
-    } else {
-        echo "Once this is tool run, changes made can't be reverted. \n" .
-             "A complete backup should be made before running this script. \n\n" .
-             "There is a low risk that the wrong content will be replaced, introducing problems. \n" .
-             "If you are sure you want to continue, add --confirm\n\n";
-    }
-
-} else {
-
-    $urlfinder = new \tool_httpsreplace\url_finder();
-    $results = $urlfinder->http_link_stats();
-    asort($results);
-    $fp = fopen('php://stdout', 'w');
-    fputcsv($fp, ['clientsite', 'httpdomain', 'urlcount']);
-    foreach ($results as $domain => $count) {
-        fputcsv($fp, [$SITE->shortname, $domain, $count]);
-    }
-    fclose($fp);
-}

admin/tool/httpsreplace/index.php

@@ -1,59 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Search and replace http -> https throughout all texts in the whole database
- *
- * @package    tool_httpsreplace
- * @copyright Copyright (c) 2016 Blackboard Inc. (http://www.blackboard.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');
-
-admin_externalpage_setup('toolhttpsreplace');
-
-$context = context_system::instance();
-
-require_login();
-require_capability('moodle/site:config', $context);
-
-$PAGE->set_context($context);
-$PAGE->set_url(new moodle_url('/admin/tool/httpsreplace/index.php'));
-$PAGE->set_title(get_string('pageheader', 'tool_httpsreplace'));
-$PAGE->set_pagelayout('admin');
-
-echo $OUTPUT->header();
-
-echo $OUTPUT->heading(get_string('pageheader', 'tool_httpsreplace'));
-
-if (!$DB->replace_all_text_supported()) {
-    echo $OUTPUT->notification(get_string('notimplemented', 'tool_httpsreplace'));
-    echo $OUTPUT->footer();
-    die;
-}
-
-if (!is_https()) {
-    echo $OUTPUT->notification(get_string('httpwarning', 'tool_httpsreplace'), 'warning');
-}
-
-echo '<p>'.get_string('domainexplain', 'tool_httpsreplace').'</p>';
-echo '<p>'.page_doc_link(get_string('doclink', 'tool_httpsreplace')).'</p>';
-
-echo $OUTPUT->continue_button(new moodle_url('/admin/tool/httpsreplace/tool.php'));
-
-echo $OUTPUT->footer();

admin/tool/httpsreplace/lang/en/tool_httpsreplace.php

@@ -1,43 +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/>.
-
-/**
- * Strings for component 'tool_httpsreplace'
- *
- * @package    tool_httpsreplace
- * @copyright Copyright (c) 2016 Blackboard Inc. (http://www.blackboard.com)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-$string['complete'] = 'Completed';
-$string['count'] = 'Number of embedded content items';
-$string['disclaimer'] = 'I understand the risks of this operation';
-$string['doclink'] = 'HTTPS conversion tool';
-$string['doit'] = 'Perform conversion';
-$string['domain'] = 'Problematic domain';
-$string['domainexplain'] = 'When a site is moved from HTTP to HTTPS, all embeded HTTP content will stop working. This tool allows you to automatically convert HTTP content to HTTPS.
-
-Before performing the conversion, content will be scanned to find any URLs which may not work after conversion. You may want to check each one has HTTPS available, or find alternative resources.';
-$string['domainexplainhelp'] = 'These domains are found in your content, but do not appear to support HTTPS content. After switching to HTTPS, the content included from these sites will no longer display within Moodle for users with secure modern browsers. It is possible that these sites are temporarily or permanently unavailable and will not work with either security setting. Proceed only after reviewing these results and determining if this externally-hosted content is non-essential. Note: This content would no longer work upon switching to HTTPS anyway.';
-$string['httpwarning'] = 'This instance is still running on HTTP. You can still run this tool and external content will be changed to HTTPS, but internal content will remain on HTTP. You will need to run this script again after switching to HTTPS to convert internal content.';
-$string['notimplemented'] = 'Sorry, this feature is not implemented in your database driver.';
-$string['oktoprocede'] = 'The scan finds no issues with your content. You can proceed to upgrade any HTTP content to use HTTPS.';
-$string['pageheader'] = 'Upgrade externally-hosted content URLs to HTTPS';
-$string['pluginname'] = 'HTTPS conversion tool';
-$string['replacing'] = 'Replacing HTTP content with HTTPS...';
-$string['searching'] = 'Searching {$a}';
-$string['takeabackupwarning'] = 'Warning: After running this tool, changes cannot be reverted. It is recommended that a site backup is made before proceeding, as there is a small risk of wrong content being replaced.';
-$string['toolintro'] = 'If you are planning on converting your site to HTTPS, you can use the <a href="{$a}">HTTPS conversion tool</a> to convert your embedded content to HTTPS.';

admin/tool/httpsreplace/settings.php

@@ -1,41 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Link to http -> https replace script.
- *
- * @package tool_httpsreplace
- * @copyright Copyright (c) 2016 Blackboard Inc. (http://www.blackboard.com)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die;
-
-if ($hassiteconfig) {
-
-    $pluginname = get_string('pluginname', 'tool_httpsreplace');
-    $url = $CFG->wwwroot.'/'.$CFG->admin.'/tool/httpsreplace/index.php';
-    $ADMIN->add('security', new admin_externalpage('toolhttpsreplace', $pluginname, $url, 'moodle/site:config', true));
-
-    $httpsreplaceurl = $CFG->wwwroot.'/'.$CFG->admin.'/tool/httpsreplace/index.php';
-    $ADMIN->locate('httpsecurity')->add(
-        new admin_setting_heading(
-            'tool_httpsreplaceheader',
-            new lang_string('pluginname', 'tool_httpsreplace'),
-            new lang_string('toolintro', 'tool_httpsreplace', $httpsreplaceurl)
-        )
-    );
-}

admin/tool/httpsreplace/tests/behat/httpsreplace.feature

@@ -1,29 +0,0 @@
-@tool @tool_httpsreplace
-Feature: View the httpsreplace report
-  In order to switch to https
-  As an admin
-  I need to be able to automatically replace http links
-
-  Background: Create some http links
-    Given I am on site homepage
-    And the following "courses" exist:
-      | fullname | shortname | category | summary                                                                                                     |
-      | Course 1 | C1        | 0        | <img src="http://intentionally.unavailable/test.png"> <img src="http://download.moodle.org/unittest/test.jpg"> |
-    And I log in as "admin"
-
-  @javascript
-  Scenario: Go to the HTTPS replace report screen. Make sure broken domains are reported.
-    When I navigate to "HTTP security" node in "Site administration > Security"
-    And I follow "HTTPS conversion tool"
-    And I press "Continue"
-    Then I should see "intentionally.unavailable"
-
-  @javascript
-  Scenario: Use the find and replace tool.
-    When I navigate to "HTTP security" node in "Site administration > Security"
-    And I follow "HTTPS conversion tool"
-    And I press "Continue"
-    And I set the field "I understand the risks of this operation" to "1"
-    And I press "Perform conversion"
-    Then I should see "intentionally.unavailable"
-    And I should see "download.moodle.org"

admin/tool/httpsreplace/tests/httpsreplace_test.php

@@ -1,413 +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/>.
-
-/**
- * HTTPS find and replace Tests
- *
- * @package   tool_httpsreplace
- * @copyright Copyright (c) 2016 Blackboard Inc. (http://www.blackboard.com)
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_httpsreplace\tests;
-
-
-defined('MOODLE_INTERNAL') || die();
-
-/**
- * Tests the httpsreplace tool.
- *
- * @package   tool_httpsreplace
- * @copyright Copyright (c) 2016 Blackboard Inc. (http://www.blackboard.com)
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class httpsreplace_test extends \advanced_testcase {
-
-    /**
-     * Data provider for test_upgrade_http_links
-     */
-    public function upgrade_http_links_provider() {
-        global $CFG;
-        // Get the http url, since the default test wwwroot is https.
-        $wwwroothttp = preg_replace('/^https:/', 'http:', $CFG->wwwroot);
-        return [
-            "Test image from another site should be replaced" => [
-                "content" => '<img src="' . $this->getExternalTestFileUrl('/test.jpg', false) . '">',
-                "outputregex" => '/UPDATE/',
-                "expectedcontent" => '<img src="' . $this->getExternalTestFileUrl('/test.jpg', true) . '">',
-            ],
-            "Test object from another site should be replaced" => [
-                "content" => '<object data="' . $this->getExternalTestFileUrl('/test.swf', false) . '">',
-                "outputregex" => '/UPDATE/',
-                "expectedcontent" => '<object data="' . $this->getExternalTestFileUrl('/test.swf', true) . '">',
-            ],
-            "Test image from a site with international name should be replaced" => [
-                "content" => '<img src="http://中国互联网络信息中心.中国/logosy/201706/W01.png">',
-                "outputregex" => '/UPDATE/',
-                "expectedcontent" => '<img src="https://中国互联网络信息中心.中国/logosy/201706/W01.png">',
-            ],
-            "Link that is from this site should be replaced" => [
-                "content" => '<img src="' . $wwwroothttp . '/logo.png">',
-                "outputregex" => '/UPDATE/',
-                "expectedcontent" => '<img src="' . $CFG->wwwroot . '/logo.png">',
-            ],
-            "Link that is from this site, https new so doesn't need replacing" => [
-                "content" => '<img src="' . $CFG->wwwroot . '/logo.png">',
-                "outputregex" => '/^$/',
-                "expectedcontent" => '<img src="' . $CFG->wwwroot . '/logo.png">',
-            ],
-            "Unavailable image should be replaced" => [
-                "content" => '<img src="http://intentionally.unavailable/link1.jpg">',
-                "outputregex" => '/UPDATE/',
-                "expectedcontent" => '<img src="https://intentionally.unavailable/link1.jpg">',
-            ],
-            "Https content that has an http url as a param should not be replaced" => [
-                "content" => '<img src="https://anothersite.com?param=http://asdf.com">',
-                "outputregex" => '/^$/',
-                "expectedcontent" => '<img src="https://anothersite.com?param=http://asdf.com">',
-            ],
-            "Search for params should be case insensitive" => [
-                "content" => '<object DATA="' . $this->getExternalTestFileUrl('/test.swf', false) . '">',
-                "outputregex" => '/UPDATE/',
-                "expectedcontent" => '<object DATA="' . $this->getExternalTestFileUrl('/test.swf', true) . '">',
-            ],
-            "URL should be case insensitive" => [
-                "content" => '<object data="HTTP://some.site/path?query">',
-                "outputregex" => '/UPDATE/',
-                "expectedcontent" => '<object data="https://some.site/path?query">',
-            ],
-            "More params should not interfere" => [
-                "content" => '<img alt="A picture" src="' . $this->getExternalTestFileUrl('/test.png', false) .
-                    '" width="1”><p style="font-size: \'20px\'"></p>',
-                "outputregex" => '/UPDATE/',
-                "expectedcontent" => '<img alt="A picture" src="' . $this->getExternalTestFileUrl('/test.png', true) .
-                    '" width="1”><p style="font-size: \'20px\'"></p>',
-            ],
-            "Broken URL should not be changed" => [
-                "content" => '<img src="broken.' . $this->getExternalTestFileUrl('/test.png', false) . '">',
-                "outputregex" => '/^$/',
-                "expectedcontent" => '<img src="broken.' . $this->getExternalTestFileUrl('/test.png', false) . '">',
-            ],
-            "Link URL should not be changed" => [
-                "content" => '<a href="' . $this->getExternalTestFileUrl('/test.png', false) . '">' .
-                    $this->getExternalTestFileUrl('/test.png', false) . '</a>',
-                "outputregex" => '/^$/',
-                "expectedcontent" => '<a href="' . $this->getExternalTestFileUrl('/test.png', false) . '">' .
-                    $this->getExternalTestFileUrl('/test.png', false) . '</a>',
-            ],
-            "Test image from another site should be replaced but link should not" => [
-                "content" => '<a href="' . $this->getExternalTestFileUrl('/test.png', false) . '"><img src="' .
-                    $this->getExternalTestFileUrl('/test.jpg', false) . '"></a>',
-                "outputregex" => '/UPDATE/',
-                "expectedcontent" => '<a href="' . $this->getExternalTestFileUrl('/test.png', false) . '"><img src="' .
-                    $this->getExternalTestFileUrl('/test.jpg', true) . '"></a>',
-            ],
-        ];
-    }
-
-    /**
-     * Test upgrade_http_links
-     * @param string $content Example content that we'll attempt to replace.
-     * @param string $ouputregex Regex for what output we expect.
-     * @param string $expectedcontent What content we are expecting afterwards.
-     * @dataProvider upgrade_http_links_provider
-     */
-    public function test_upgrade_http_links($content, $ouputregex, $expectedcontent) {
-        global $DB;
-
-        $this->resetAfterTest();
-        $this->expectOutputRegex($ouputregex);
-
-        $finder = new tool_httpreplace_url_finder_test();
-
-        $generator = $this->getDataGenerator();
-        $course = $generator->create_course((object) [
-            'summary' => $content,
-        ]);
-
-        $finder->upgrade_http_links();
-
-        $summary = $DB->get_field('course', 'summary', ['id' => $course->id]);
-        $this->assertContains($expectedcontent, $summary);
-    }
-
-    /**
-     * Data provider for test_http_link_stats
-     */
-    public function http_link_stats_provider() {
-        global $CFG;
-        // Get the http url, since the default test wwwroot is https.
-        $wwwrootdomain = 'www.example.com';
-        $wwwroothttp = preg_replace('/^https:/', 'http:', $CFG->wwwroot);
-        $testdomain = 'download.moodle.org';
-        return [
-            "Test image from an available site so shouldn't be reported" => [
-                "content" => '<img src="' . $this->getExternalTestFileUrl('/test.jpg', false) . '">',
-                "domain" => $testdomain,
-                "expectedcount" => 0,
-            ],
-            "Link that is from this site shouldn't be reported" => [
-                "content" => '<img src="' . $wwwroothttp . '/logo.png">',
-                "domain" => $wwwrootdomain,
-                "expectedcount" => 0,
-            ],
-            "Unavailable, but https shouldn't be reported" => [
-                "content" => '<img src="https://intentionally.unavailable/logo.png">',
-                "domain" => 'intentionally.unavailable',
-                "expectedcount" => 0,
-            ],
-            "Unavailable image should be reported" => [
-                "content" => '<img src="http://intentionally.unavailable/link1.jpg">',
-                "domain" => 'intentionally.unavailable',
-                "expectedcount" => 1,
-            ],
-            "Unavailable object should be reported" => [
-                "content" => '<object data="http://intentionally.unavailable/file.swf">',
-                "domain" => 'intentionally.unavailable',
-                "expectedcount" => 1,
-            ],
-            "Link should not be reported" => [
-                "content" => '<a href="http://intentionally.unavailable/page.php">Link</a>',
-                "domain" => 'intentionally.unavailable',
-                "expectedcount" => 0,
-            ],
-            "Text should not be reported" => [
-                "content" => 'http://intentionally.unavailable/page.php',
-                "domain" => 'intentionally.unavailable',
-                "expectedcount" => 0,
-            ],
-        ];
-    }
-
-    /**
-     * Test http_link_stats
-     * @param string $content Example content that we'll attempt to replace.
-     * @param string $domain The domain we will check was replaced.
-     * @param string $expectedcount Number of urls from that domain that we expect to be replaced.
-     * @dataProvider http_link_stats_provider
-     */
-    public function test_http_link_stats($content, $domain, $expectedcount) {
-        $this->resetAfterTest();
-
-        $finder = new tool_httpreplace_url_finder_test();
-
-        $generator = $this->getDataGenerator();
-        $course = $generator->create_course((object) [
-            'summary' => $content,
-        ]);
-
-        $results = $finder->http_link_stats();
-
-        $this->assertEquals($expectedcount, $results[$domain] ?? 0);
-    }
-
-    /**
-     * Test links and text are not changed
-     */
-    public function test_links_and_text() {
-        global $DB;
-
-        $this->resetAfterTest();
-        $this->expectOutputRegex('/^$/');
-
-        $finder = new tool_httpreplace_url_finder_test();
-
-        $generator = $this->getDataGenerator();
-        $course = $generator->create_course((object) [
-            'summary' => '<a href="http://intentionally.unavailable/page.php">Link</a> http://other.unavailable/page.php',
-        ]);
-
-        $results = $finder->http_link_stats();
-        $this->assertCount(0, $results);
-
-        $finder->upgrade_http_links();
-
-        $results = $finder->http_link_stats();
-        $this->assertCount(0, $results);
-
-        $summary = $DB->get_field('course', 'summary', ['id' => $course->id]);
-        $this->assertContains('http://intentionally.unavailable/page.php', $summary);
-        $this->assertContains('http://other.unavailable/page.php', $summary);
-        $this->assertNotContains('https://intentionally.unavailable', $summary);
-        $this->assertNotContains('https://other.unavailable', $summary);
-    }
-
-    /**
-     * If we have an http wwwroot then we shouldn't report it.
-     */
-    public function test_httpwwwroot() {
-        global $DB, $CFG;
-
-        $this->resetAfterTest();
-        $CFG->wwwroot = preg_replace('/^https:/', 'http:', $CFG->wwwroot);
-        $this->expectOutputRegex('/^$/');
-
-        $finder = new tool_httpreplace_url_finder_test();
-
-        $generator = $this->getDataGenerator();
-        $course = $generator->create_course((object) [
-            'summary' => '<img src="' . $CFG->wwwroot . '/image.png">',
-        ]);
-
-        $results = $finder->http_link_stats();
-        $this->assertCount(0, $results);
-
-        $finder->upgrade_http_links();
-        $summary = $DB->get_field('course', 'summary', ['id' => $course->id]);
-        $this->assertContains($CFG->wwwroot, $summary);
-    }
-
-    /**
-     * Test that links in excluded tables are not replaced
-     */
-    public function test_upgrade_http_links_excluded_tables() {
-        $this->resetAfterTest();
-
-        set_config('test_upgrade_http_links', '<img src="http://somesite/someimage.png" />');
-
-        $finder = new tool_httpreplace_url_finder_test();
-        ob_start();
-        $results = $finder->upgrade_http_links();
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertTrue($results);
-        $this->assertNotContains('https://somesite', $output);
-        $testconf = get_config('core', 'test_upgrade_http_links');
-        $this->assertContains('http://somesite', $testconf);
-        $this->assertNotContains('https://somesite', $testconf);
-    }
-
-    /**
-     * Test renamed domains
-     */
-    public function test_renames() {
-        global $DB, $CFG;
-        $this->resetAfterTest();
-        $this->expectOutputRegex('/UPDATE/');
-
-        $renames = [
-            'example.com' => 'secure.example.com',
-        ];
-
-        set_config('renames', json_encode($renames), 'tool_httpsreplace');
-
-        $finder = new tool_httpreplace_url_finder_test();
-
-        $generator = $this->getDataGenerator();
-        $course = $generator->create_course((object) [
-            'summary' => '<script src="http://example.com/test.js"><img src="http://EXAMPLE.COM/someimage.png">',
-        ]);
-
-        $results = $finder->http_link_stats();
-        $this->assertCount(0, $results);
-
-        $finder->upgrade_http_links();
-
-        $summary = $DB->get_field('course', 'summary', ['id' => $course->id]);
-        $this->assertContains('https://secure.example.com', $summary);
-        $this->assertNotContains('http://example.com', $summary);
-        $this->assertEquals('<script src="https://secure.example.com/test.js">' .
-            '<img src="https://secure.example.com/someimage.png">', $summary);
-    }
-
-    /**
-     * When there are many different pieces of contents from the same site, we should only run replace once
-     */
-    public function test_multiple() {
-        global $DB;
-        $this->resetAfterTest();
-        $original1 = '';
-        $expected1 = '';
-        $original2 = '';
-        $expected2 = '';
-        for ($i = 0; $i < 15; $i++) {
-            $original1 .= '<img src="http://example.com/image' . $i . '.png">';
-            $expected1 .= '<img src="https://example.com/image' . $i . '.png">';
-            $original2 .= '<img src="http://example.com/image' . ($i + 15 ) . '.png">';
-            $expected2 .= '<img src="https://example.com/image' . ($i + 15) . '.png">';
-        }
-        $finder = new tool_httpreplace_url_finder_test();
-
-        $generator = $this->getDataGenerator();
-        $course1 = $generator->create_course((object) ['summary' => $original1]);
-        $course2 = $generator->create_course((object) ['summary' => $original2]);
-
-        ob_start();
-        $finder->upgrade_http_links();
-        $output = ob_get_contents();
-        ob_end_clean();
-
-        // Make sure everything is replaced.
-        $summary1 = $DB->get_field('course', 'summary', ['id' => $course1->id]);
-        $this->assertEquals($expected1, $summary1);
-        $summary2 = $DB->get_field('course', 'summary', ['id' => $course2->id]);
-        $this->assertEquals($expected2, $summary2);
-
-        // Make sure only one UPDATE statment was called.
-        $this->assertEquals(1, preg_match_all('/UPDATE/', $output));
-    }
-
-    /**
-     * Test the tool when the column name is a reserved word in SQL (in this case 'where')
-     */
-    public function test_reserved_words() {
-        global $DB;
-
-        $this->resetAfterTest();
-        $this->expectOutputRegex('/UPDATE/');
-
-        // Create a table with a field that is a reserved SQL word.
-        $dbman = $DB->get_manager();
-        $table = new \xmldb_table('reserved_words_temp');
-        $table->add_field('id', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, XMLDB_SEQUENCE, null);
-        $table->add_field('where', XMLDB_TYPE_TEXT, null, null, null, null, null);
-        $table->add_key('primary', XMLDB_KEY_PRIMARY, array('id'));
-        $dbman->create_table($table);
-
-        // Insert a record with an <img> in this table and run tool.
-        $content = '<img src="http://example.com/image.png">';
-        $expectedcontent = '<img src="https://example.com/image.png">';
-        $columnamequoted = $dbman->generator->getEncQuoted('where');
-        $DB->execute("INSERT INTO {reserved_words_temp} ($columnamequoted) VALUES (?)", [$content]);
-
-        $finder = new tool_httpreplace_url_finder_test();
-        $finder->upgrade_http_links();
-
-        $record = $DB->get_record('reserved_words_temp', []);
-        $this->assertContains($expectedcontent, $record->where);
-
-        $dbman->drop_table($table);
-    }
-}
-
-/**
- * Class tool_httpreplace_url_finder_test for testing replace tool without calling curl
- *
- * @package   tool_httpsreplace
- * @copyright 2017 Marina Glancy
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class tool_httpreplace_url_finder_test extends \tool_httpsreplace\url_finder {
-    /**
-     * Check if url is available (check hardcoded for unittests)
-     *
-     * @param string $url
-     * @return bool
-     */
-    protected function check_domain_availability($url) {
-        return !preg_match('|\.unavailable/$|', $url);
-    }
-}

admin/tool/httpsreplace/tool.php

@@ -1,109 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Search and replace http -> https throughout all texts in the whole database
- *
- * @package    tool_httpsreplace
- * @copyright Copyright (c) 2016 Blackboard Inc. (http://www.blackboard.com)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define('NO_OUTPUT_BUFFERING', true);
-
-require_once(__DIR__ . '/../../../config.php');
-require_once($CFG->dirroot . '/course/lib.php');
-require_once($CFG->libdir . '/adminlib.php');
-
-admin_externalpage_setup('toolhttpsreplace');
-
-$context = context_system::instance();
-
-require_login();
-require_capability('moodle/site:config', $context);
-
-$PAGE->set_context($context);
-$PAGE->set_url(new moodle_url('/admin/tool/httpsreplace/index.php'));
-$PAGE->set_title(get_string('pageheader', 'tool_httpsreplace'));
-$PAGE->set_pagelayout('admin');
-
-echo $OUTPUT->header();
-
-echo $OUTPUT->heading(get_string('pageheader', 'tool_httpsreplace'));
-
-if (!$DB->replace_all_text_supported()) {
-    echo $OUTPUT->notification(get_string('notimplemented', 'tool_httpsreplace'));
-    echo $OUTPUT->footer();
-    die;
-}
-
-if (!is_https()) {
-    echo $OUTPUT->notification(get_string('httpwarning', 'tool_httpsreplace'), 'warning');
-}
-
-$form = new \tool_httpsreplace\form();
-
-$finder = new \tool_httpsreplace\url_finder();
-
-$PAGE->set_cacheable(false);
-$progressbar = new progress_bar();
-
-if (!$data = $form->get_data()) {
-
-    echo $progressbar->create();
-
-    $results = $finder->http_link_stats($progressbar);
-
-    $progressbar->update_full(100, get_string('complete', 'tool_httpsreplace'));
-
-    if (empty($results)) {
-        echo '<p>'.get_string('oktoprocede', 'tool_httpsreplace').'</p>';
-    } else {
-        arsort($results);
-        $table = new html_table();
-        $table->id = 'plugins-check';
-        $table->head = array(
-            get_string('domain', 'tool_httpsreplace'),
-            get_string('count', 'tool_httpsreplace'),
-        );
-        $data = array();
-        foreach ($results as $domain => $count) {
-            $cleandomain = format_text($domain, FORMAT_PLAIN);
-            $data[] = [$cleandomain, $count];
-        }
-        $table->data = $data;
-        echo html_writer::table($table);
-        echo get_string('domainexplainhelp', 'tool_httpsreplace');
-    }
-    echo $OUTPUT->notification(get_string('takeabackupwarning', 'tool_httpsreplace'), 'warning');
-    $form->display();
-} else {
-    // Scroll to the end when finished.
-    $PAGE->requires->js_init_code("window.scrollTo(0, document.body.scrollHeight);");
-
-    echo html_writer::tag('p', get_string('replacing', 'tool_httpsreplace'));
-
-    echo $progressbar->create();
-
-    echo $OUTPUT->box_start();
-    $finder->upgrade_http_links($progressbar);
-    echo $OUTPUT->box_end();
-
-    $progressbar->update_full(100, get_string('complete', 'tool_httpsreplace'));
-
-    echo $OUTPUT->continue_button(new moodle_url('/admin/settings.php', ['section' => 'httpsecurity']));
-}
-echo $OUTPUT->footer();

admin/tool/httpsreplace/version.php

@@ -1,29 +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/>.
-
-/**
- * Version details.
- *
- * @package    tool_httpsreplace
- * @copyright Copyright (c) 2016 Blackboard Inc. (http://www.blackboard.com)
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-$plugin->version   = 2017082500; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017082400; // Requires this Moodle version.
-$plugin->component = 'tool_httpsreplace'; // Full name of the plugin (used for diagnostics).

admin/tool/log/db/upgrade.php

@@ -33,6 +33,15 @@ defined('MOODLE_INTERNAL') || die();
 function xmldb_tool_log_upgrade($oldversion) {
     global $CFG;
 
+    // Moodle v2.8.0 release upgrade line.
+    // Put any upgrade step following this.
+
+    // Moodle v2.9.0 release upgrade line.
+    // Put any upgrade step following this.
+
+    // Moodle v3.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     // Moodle v3.1.0 release upgrade line.
     // Put any upgrade step following this.
 

admin/tool/log/store/database/db/upgrade.php

@@ -27,6 +27,15 @@ defined('MOODLE_INTERNAL') || die();
 function xmldb_logstore_database_upgrade($oldversion) {
     global $CFG;
 
+    // Moodle v2.8.0 release upgrade line.
+    // Put any upgrade step following this.
+
+    // Moodle v2.9.0 release upgrade line.
+    // Put any upgrade step following this.
+
+    // Moodle v3.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     // Moodle v3.1.0 release upgrade line.
     // Put any upgrade step following this.
 

admin/tool/log/store/database/upgrade.txt

@@ -1,6 +1,6 @@
 This files describes API changes in the logstore_database code.
 
-=== 3.4 ===
+=== 3.3.1 ===
 * PostgreSQL connections now use advanced options to reduce connection overhead.  These options are not compatible
   with some connection poolers.  The dbhandlesoptions parameter has been added to allow the database to configure the
   required defaults. The parameters that are required in the database are;

admin/tool/log/store/database/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2017062600; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version = 2017051501; // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires = 2017050500; // Requires this Moodle version.
 $plugin->component = 'logstore_database'; // Full name of the plugin (used for diagnostics).

admin/tool/log/store/standard/db/upgrade.php

@@ -25,7 +25,33 @@
 defined('MOODLE_INTERNAL') || die();
 
 function xmldb_logstore_standard_upgrade($oldversion) {
-    global $CFG;
+    global $CFG, $DB;
+
+    $dbman = $DB->get_manager();
+
+    // Moodle v2.8.0 release upgrade line.
+    // Put any upgrade step following this.
+
+    // Moodle v2.9.0 release upgrade line.
+    // Put any upgrade step following this.
+
+    // Moodle v3.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
+    if ($oldversion < 2016041200) {
+        // This could take a long time. Unfortunately, no way to know how long, and no way to do progress, so setting for 1 hour.
+        upgrade_set_timeout(3600);
+
+        // Define key contextid (foreign) to be added to logstore_standard_log.
+        $table = new xmldb_table('logstore_standard_log');
+        $key = new xmldb_key('contextid', XMLDB_KEY_FOREIGN, array('contextid'), 'context', array('id'));
+
+        // Launch add key contextid.
+        $dbman->add_key($table, $key);
+
+        // Standard savepoint reached.
+        upgrade_plugin_savepoint(true, 2016041200, 'logstore', 'standard');
+    }
 
     // Moodle v3.1.0 release upgrade line.
     // Put any upgrade step following this.

admin/tool/lp/amd/build/competencypicker_user_plans.min.js

@@ -1 +1 @@
-define(["jquery","core/notification","core/ajax","core/templates","core/str","tool_lp/tree","tool_lp/competencypicker"],function(a,b,c,d,e,f,g){var h=function(a,b,c){g.prototype.constructor.apply(this,[1,!1,"self",c]),this._userId=a,this._plans=[],b&&(this._planId=b,this._singlePlan=!0)};return h.prototype=Object.create(g.prototype),h.prototype._plans=null,h.prototype._planId=null,h.prototype._singlePlan=!1,h.prototype._userId=null,h.prototype._afterRender=function(){var c=this;g.prototype._afterRender.apply(c,arguments),c._singlePlan||c._find('[data-action="chooseplan"]').change(function(d){c._planId=a(d.target).val(),c._loadCompetencies().then(c._refresh.bind(c))["catch"](b.exception)})},h.prototype._fetchCompetencies=function(a,d){var e=this;return c.call([{methodname:"core_competency_list_plan_competencies",args:{id:a}}])[0].done(function(a){var b,c,f=[];for(b=0;b<a.length;b++)c=a[b].competency,c.shortname.toLowerCase().indexOf(d.toLowerCase())<0||(c.children=[],c.haschildren=0,f.push(c));e._competencies=f}).fail(b.exception)},h.prototype._getPlan=function(b){var c;return a.each(this._plans,function(a,d){if(d.id==b)return void(c=d)}),c},h.prototype._loadCompetencies=function(){return this._fetchCompetencies(this._planId,this._searchText)},h.prototype._loadPlans=function(){var d,e=this;return e._plans.length>0?a.when():(d=e._singlePlan?c.call([{methodname:"core_competency_read_plan",args:{id:this._planId}}])[0].then(function(a){return[a]}):c.call([{methodname:"core_competency_list_user_plans",args:{userid:e._userId}}])[0],d.done(function(a){e._plans=a}).fail(b.exception))},h.prototype._preRender=function(){var b=this;return b._loadPlans().then(function(){return!b._planId&&b._plans.length>0&&(b._planId=b._plans[0].id),b._planId?b._loadCompetencies():(b._plans=[],a.when())})},h.prototype._render=function(){var b=this;return b._preRender().then(function(){b._singlePlan||a.each(b._plans,function(a,c){c.id==b._planId?c.selected=!0:c.selected=!1});var c={competencies:b._competencies,plan:b._getPlan(b._planId),plans:b._plans,search:b._searchText,singlePlan:b._singlePlan};return d.render("tool_lp/competency_picker_user_plans",c)})},h});
+define(["jquery","core/notification","core/ajax","core/templates","core/str","tool_lp/tree","tool_lp/competencypicker"],function(a,b,c,d,e,f,g){var h=function(a,b,c){g.prototype.constructor.apply(this,[1,!1,"self",c]),this._userId=a,this._plans=[],b&&(this._planId=b,this._singlePlan=!0)};return h.prototype=Object.create(g.prototype),h.prototype._plans=null,h.prototype._planId=null,h.prototype._singlePlan=!1,h.prototype._userId=null,h.prototype._afterRender=function(){var b=this;g.prototype._afterRender.apply(b,arguments),b._singlePlan||b._find('[data-action="chooseplan"]').change(function(c){b._planId=a(c.target).val(),b._loadCompetencies().then(b._refresh.bind(b))})},h.prototype._fetchCompetencies=function(a,d){var e=this;return c.call([{methodname:"core_competency_list_plan_competencies",args:{id:a}}])[0].done(function(a){var b,c,f=[];for(b=0;b<a.length;b++)c=a[b].competency,c.shortname.toLowerCase().indexOf(d.toLowerCase())<0||(c.children=[],c.haschildren=0,f.push(c));e._competencies=f}).fail(b.exception)},h.prototype._getPlan=function(b){var c;return a.each(this._plans,function(a,d){if(d.id==b)return void(c=d)}),c},h.prototype._loadCompetencies=function(){return this._fetchCompetencies(this._planId,this._searchText)},h.prototype._loadPlans=function(){var d,e=this;return e._plans.length>0?a.when():(d=e._singlePlan?c.call([{methodname:"core_competency_read_plan",args:{id:this._planId}}])[0].then(function(a){return[a]}):c.call([{methodname:"core_competency_list_user_plans",args:{userid:e._userId}}])[0],d.done(function(a){e._plans=a}).fail(b.exception))},h.prototype._preRender=function(){var b=this;return b._loadPlans().then(function(){return!b._planId&&b._plans.length>0&&(b._planId=b._plans[0].id),b._planId?b._loadCompetencies():(b._plans=[],a.when())})},h.prototype._render=function(){var b=this;return b._preRender().then(function(){b._singlePlan||a.each(b._plans,function(a,c){c.id==b._planId?c.selected=!0:c.selected=!1});var c={competencies:b._competencies,plan:b._getPlan(b._planId),plans:b._plans,search:b._searchText,singlePlan:b._singlePlan};return d.render("tool_lp/competency_picker_user_plans",c)})},h});

admin/tool/lp/amd/build/competencyruleconfig.min.js

@@ -1 +1 @@
-define(["jquery","core/notification","core/templates","tool_lp/dialogue","tool_lp/competency_outcomes","core/str"],function(a,b,c,d,e,f){var g=function(b,c){this._eventNode=a("<div></div>"),this._tree=b,this._rulesModules=c,this._setUp()};return g.prototype._competency=null,g.prototype._eventNode=null,g.prototype._outcomesOption=null,g.prototype._popup=null,g.prototype._ready=null,g.prototype._rules=null,g.prototype._rulesModules=null,g.prototype._tree=null,g.prototype._afterChange=function(){this._isValid()?this._find('[data-action="save"]').prop("disabled",!1):this._find('[data-action="save"]').prop("disabled",!0)},g.prototype._afterRuleConfigChange=function(a,b){b==this._getRule()&&this._afterChange()},g.prototype._afterRender=function(){var a=this;a._find('[name="outcome"]').on("change",function(){a._switchedOutcome()}).trigger("change"),a._find('[name="rule"]').on("change",function(){a._switchedRule()}).trigger("change"),a._find('[data-action="save"]').on("click",function(){a._trigger("save",a._getConfig()),a.close()}),a._find('[data-action="cancel"]').on("click",function(){a.close()})},g.prototype.canBeConfigured=function(){var b=!1;return a.each(this._rules,function(a,c){if(c.canConfig())return void(b=!0)}),b},g.prototype.close=function(){this._popup.close(),this._popup=null},g.prototype.display=function(){var c=this;return!!c._competency&&a.when(f.get_string("competencyrule","tool_lp"),c._render()).then(function(a,b){c._popup=new d(a,b[0],c._afterRender.bind(c))}).fail(b.exception)},g.prototype._find=function(b){return a(this._popup.getContent()).find(b)},g.prototype._getApplicableOutcomesOptions=function(){var b=this,c=[];return a.each(b._outcomesOption,function(a,d){c.push({code:d.code,name:d.name,selected:d.code==b._competency.ruleoutcome})}),c},g.prototype._getApplicableRulesOptions=function(){var b=this,c=[];return a.each(b._rules,function(a,d){d.canConfig()&&c.push({name:b._getRuleName(d.getType()),type:d.getType(),selected:d.getType()==b._competency.ruletype})}),c},g.prototype._getConfig=function(){var a=this._getRule();return{ruletype:a?a.getType():null,ruleconfig:a?a.getConfig():null,ruleoutcome:this._getOutcome()}},g.prototype._getOutcome=function(){return this._find('[name="outcome"]').val()},g.prototype._getRule=function(){var b,c=this._find('[name="rule"]').val();return a.each(this._rules,function(a,d){if(d.getType()==c)return void(b=d)}),b},g.prototype._getRuleName=function(b){var c,d=this;return a.each(d._rulesModules,function(a,d){if(d.type==b)return void(c=d.name)}),c},g.prototype._initOutcomes=function(){var a=this;return e.getAll().then(function(b){a._outcomesOption=b})},g.prototype._initRules=function(){var b=this,c=[];return a.each(b._rules,function(d,e){var f=e.init().then(function(){e.setTargetCompetency(b._competency),e.on("change",b._afterRuleConfigChange.bind(b))},function(){return b._rules.splice(d,1),a.when()});c.push(f)}),a.when.apply(a.when,c)},g.prototype._isValid=function(){var a=this._getOutcome(),b=this._getRule();return a==e.NONE||!!b&&b.isValid()},g.prototype.on=function(a,b){this._eventNode.on(a,b)},g.prototype._preRender=function(){return this.ready()},g.prototype.ready=function(){return this._ready.promise()},g.prototype._render=function(){var a=this;return this._preRender().then(function(){var b;a.canBeConfigured()?(b={},b.outcomes=a._getApplicableOutcomesOptions(),b.rules=a._getApplicableRulesOptions()):b=!1;var d={competencyshortname:a._competency.shortname,config:b};return c.render("tool_lp/competency_rule_config",d)})},g.prototype.setTargetCompetencyId=function(b){var c=this;c._competency=c._tree.getCompetency(b),a.each(c._rules,function(a,b){b.setTargetCompetency(c._competency)})},g.prototype._setUp=function(){var b=this,c=[],d=[];b._ready=a.Deferred(),b._rules=[],a.each(b._rulesModules,function(a,b){d.push(b.amd)}),require(d,function(){a.each(arguments,function(a,c){var d=new c(b._tree);b._rules.push(d)}),c.push(b._initRules()),c.push(b._initOutcomes()),a.when.apply(a.when,c).always(function(){b._ready.resolve()})})},g.prototype._switchedOutcome=function(){var a=this,b=a._getOutcome();return b==e.NONE?(a._find('[data-region="rule-type"]').hide().find('[name="rule"]').val(-1),a._find('[data-region="rule-config"]').empty().hide(),void a._afterChange()):(a._find('[data-region="rule-type"]').show(),a._find('[data-region="rule-config"]').show(),void a._afterChange())},g.prototype._switchedRule=function(){var a=this,b=a._find('[data-region="rule-config"]'),c=a._getRule();return c?void c.injectTemplate(b).then(function(){b.show()}).always(function(){a._afterChange()})["catch"](function(){b.empty().hide()}):(b.empty().hide(),void a._afterChange())},g.prototype._trigger=function(a,b){this._eventNode.trigger(a,[b])},g});
+define(["jquery","core/notification","core/templates","tool_lp/dialogue","tool_lp/competency_outcomes","core/str"],function(a,b,c,d,e,f){var g=function(b,c){this._eventNode=a("<div></div>"),this._tree=b,this._rulesModules=c,this._setUp()};return g.prototype._competency=null,g.prototype._eventNode=null,g.prototype._outcomesOption=null,g.prototype._popup=null,g.prototype._ready=null,g.prototype._rules=null,g.prototype._rulesModules=null,g.prototype._tree=null,g.prototype._afterChange=function(){this._isValid()?this._find('[data-action="save"]').prop("disabled",!1):this._find('[data-action="save"]').prop("disabled",!0)},g.prototype._afterRuleConfigChange=function(a,b){b==this._getRule()&&this._afterChange()},g.prototype._afterRender=function(){var a=this;a._find('[name="outcome"]').on("change",function(){a._switchedOutcome()}).trigger("change"),a._find('[name="rule"]').on("change",function(){a._switchedRule()}).trigger("change"),a._find('[data-action="save"]').on("click",function(){a._trigger("save",a._getConfig()),a.close()}),a._find('[data-action="cancel"]').on("click",function(){a.close()})},g.prototype.canBeConfigured=function(){var b=!1;return a.each(this._rules,function(a,c){if(c.canConfig())return void(b=!0)}),b},g.prototype.close=function(){this._popup.close(),this._popup=null},g.prototype.display=function(){var a=this;return!!a._competency&&a._render().then(function(b){return f.get_string("competencyrule","tool_lp").then(function(c){a._popup=new d(c,b,a._afterRender.bind(a))})}).fail(b.exception)},g.prototype._find=function(b){return a(this._popup.getContent()).find(b)},g.prototype._getApplicableOutcomesOptions=function(){var b=this,c=[];return a.each(b._outcomesOption,function(a,d){c.push({code:d.code,name:d.name,selected:d.code==b._competency.ruleoutcome})}),c},g.prototype._getApplicableRulesOptions=function(){var b=this,c=[];return a.each(b._rules,function(a,d){d.canConfig()&&c.push({name:b._getRuleName(d.getType()),type:d.getType(),selected:d.getType()==b._competency.ruletype})}),c},g.prototype._getConfig=function(){var a=this._getRule();return{ruletype:a?a.getType():null,ruleconfig:a?a.getConfig():null,ruleoutcome:this._getOutcome()}},g.prototype._getOutcome=function(){return this._find('[name="outcome"]').val()},g.prototype._getRule=function(){var b,c=this._find('[name="rule"]').val();return a.each(this._rules,function(a,d){if(d.getType()==c)return void(b=d)}),b},g.prototype._getRuleName=function(b){var c,d=this;return a.each(d._rulesModules,function(a,d){if(d.type==b)return void(c=d.name)}),c},g.prototype._initOutcomes=function(){var a=this;return e.getAll().then(function(b){a._outcomesOption=b})},g.prototype._initRules=function(){var b=this,c=[];return a.each(b._rules,function(d,e){var f=e.init().then(function(){e.setTargetCompetency(b._competency),e.on("change",b._afterRuleConfigChange.bind(b))},function(){return b._rules.splice(d,1),a.when()});c.push(f)}),a.when.apply(a.when,c)},g.prototype._isValid=function(){var a=this._getOutcome(),b=this._getRule();return a==e.NONE||!!b&&b.isValid()},g.prototype.on=function(a,b){this._eventNode.on(a,b)},g.prototype._preRender=function(){return this.ready()},g.prototype.ready=function(){return this._ready.promise()},g.prototype._render=function(){var a=this;return this._preRender().then(function(){var b;a.canBeConfigured()?(b={},b.outcomes=a._getApplicableOutcomesOptions(),b.rules=a._getApplicableRulesOptions()):b=!1;var d={competencyshortname:a._competency.shortname,config:b};return c.render("tool_lp/competency_rule_config",d)})},g.prototype.setTargetCompetencyId=function(b){var c=this;c._competency=c._tree.getCompetency(b),a.each(c._rules,function(a,b){b.setTargetCompetency(c._competency)})},g.prototype._setUp=function(){var b=this,c=[],d=[];b._ready=a.Deferred(),b._rules=[],a.each(b._rulesModules,function(a,b){d.push(b.amd)}),require(d,function(){a.each(arguments,function(a,c){var d=new c(b._tree);b._rules.push(d)}),c.push(b._initRules()),c.push(b._initOutcomes()),a.when.apply(a.when,c).always(function(){b._ready.resolve()})})},g.prototype._switchedOutcome=function(){var a=this,b=a._getOutcome();return b==e.NONE?(a._find('[data-region="rule-type"]').hide().find('[name="rule"]').val(-1),a._find('[data-region="rule-config"]').empty().hide(),void a._afterChange()):(a._find('[data-region="rule-type"]').show(),a._find('[data-region="rule-config"]').show(),void a._afterChange())},g.prototype._switchedRule=function(){var a=this,b=a._find('[data-region="rule-config"]'),c=a._getRule();return c?void c.injectTemplate(b).then(function(){b.show()},function(){b.empty().hide()}).always(function(){a._afterChange()}):(b.empty().hide(),void a._afterChange())},g.prototype._trigger=function(a,b){this._eventNode.trigger(a,[b])},g});

admin/tool/lp/amd/build/form-cohort-selector.min.js

@@ -1 +1 @@
-define(["jquery","core/ajax","core/templates"],function(a,b,c){return{processResults:function(b,c){var d=[];return a.each(c,function(a,b){d.push({value:b.id,label:b._label})}),d},transport:function(d,e,f,g){var h,i=parseInt(a(d).data("contextid"),10),j=a(d).data("includes");h=b.call([{methodname:"tool_lp_search_cohorts",args:{query:e,context:{contextid:i},includes:j}}]),h[0].then(function(b){var d=[],e=0;return a.each(b.cohorts,function(a,b){d.push(c.render("tool_lp/form-cohort-selector-suggestion",b))}),a.when.apply(a.when,d).then(function(){var c=arguments;a.each(b.cohorts,function(a,b){b._label=c[e],e++}),f(b.cohorts)})})["catch"](g)}}});
+define(["jquery","core/ajax","core/templates"],function(a,b,c){return{processResults:function(b,c){var d=[];return a.each(c,function(a,b){d.push({value:b.id,label:b._label})}),d},transport:function(d,e,f,g){var h,i=parseInt(a(d).data("contextid"),10),j=a(d).data("includes");h=b.call([{methodname:"tool_lp_search_cohorts",args:{query:e,context:{contextid:i},includes:j}}]),h[0].then(function(b){var d=[],e=0;return a.each(b.cohorts,function(a,b){d.push(c.render("tool_lp/form-cohort-selector-suggestion",b))}),a.when.apply(a.when,d).then(function(){var c=arguments;a.each(b.cohorts,function(a,b){b._label=c[e],e++}),f(b.cohorts)})},g)}}});

admin/tool/lp/amd/build/form-user-selector.min.js

@@ -1 +1 @@
-define(["jquery","core/ajax","core/templates"],function(a,b,c){return{processResults:function(b,c){var d=[];return a.each(c,function(a,b){d.push({value:b.id,label:b._label})}),d},transport:function(d,e,f,g){var h,i=a(d).data("capability");"undefined"==typeof i&&(i=""),h=b.call([{methodname:"tool_lp_search_users",args:{query:e,capability:i}}]),h[0].then(function(b){var d=[],e=0;return a.each(b.users,function(b,e){var f=e,g=[];a.each(["idnumber","email","phone1","phone2","department","institution"],function(a,b){"undefined"!=typeof e[b]&&""!==e[b]&&(f.hasidentity=!0,g.push(e[b]))}),f.identity=g.join(", "),d.push(c.render("tool_lp/form-user-selector-suggestion",f))}),a.when.apply(a.when,d).then(function(){var c=arguments;a.each(b.users,function(a,b){b._label=c[e],e++}),f(b.users)})})["catch"](g)}}});
+define(["jquery","core/ajax","core/templates"],function(a,b,c){return{processResults:function(b,c){var d=[];return a.each(c,function(a,b){d.push({value:b.id,label:b._label})}),d},transport:function(d,e,f,g){var h,i=a(d).data("capability");"undefined"==typeof i&&(i=""),h=b.call([{methodname:"tool_lp_search_users",args:{query:e,capability:i}}]),h[0].then(function(b){var d=[],e=0;return a.each(b.users,function(b,e){var f=e,g=[];a.each(["idnumber","email","phone1","phone2","department","institution"],function(a,b){"undefined"!=typeof e[b]&&""!==e[b]&&(f.hasidentity=!0,g.push(e[b]))}),f.identity=g.join(", "),d.push(c.render("tool_lp/form-user-selector-suggestion",f))}),a.when.apply(a.when,d).then(function(){var c=arguments;a.each(b.users,function(a,b){b._label=c[e],e++}),f(b.users)})},g)}}});

admin/tool/lp/amd/build/frameworks_datasource.min.js

@@ -1 +1 @@
-define(["jquery","core/ajax","core/notification"],function(a,b,c){return{list:function(c,d){var e={context:{contextid:c}};return a.extend(e,"undefined"==typeof d?{}:d),b.call([{methodname:"core_competency_list_competency_frameworks",args:e}])[0]},processResults:function(b,c){var d=[];return a.each(c,function(a,b){d.push({value:b.id,label:b.shortname+" "+b.idnumber})}),d},transport:function(b,d,e){var f=a(b),g=f.data("contextid"),h=f.data("onlyvisible");if(!g)throw new Error("The attribute data-contextid is required on "+b);this.list(g,{query:d,onlyvisible:h}).then(e)["catch"](c.exception)}}});
+define(["jquery","core/ajax","core/notification"],function(a,b,c){return{list:function(d,e){var f,g={context:{contextid:d}};return a.extend(g,"undefined"==typeof e?{}:e),f=b.call([{methodname:"core_competency_list_competency_frameworks",args:g}])[0],f.fail(c.exception)},processResults:function(b,c){var d=[];return a.each(c,function(a,b){d.push({value:b.id,label:b.shortname+" "+b.idnumber})}),d},transport:function(b,c,d){var e=a(b),f=e.data("contextid"),g=e.data("onlyvisible");if(!f)throw new Error("The attribute data-contextid is required on "+b);this.list(f,{query:c,onlyvisible:g}).then(d)}}});

admin/tool/lp/amd/build/user_competency_plan_popup.min.js

@@ -1 +1 @@
-define(["jquery","core/notification","core/str","core/ajax","core/templates","tool_lp/dialogue"],function(a,b,c,d,e,f){var g=function(b,c,d){this._regionSelector=b,this._userCompetencySelector=c,this._planId=d,a(this._regionSelector).on("click",this._userCompetencySelector,this._handleClick.bind(this))};return g.prototype._handleClick=function(c){c.preventDefault();var e=a(c.target).closest("tr"),f=a(e).data("competencyid"),g=a(e).data("userid"),h=this._planId,i=d.call([{methodname:"tool_lp_data_for_user_competency_summary_in_plan",args:{competencyid:f,planid:h},done:this._contextLoaded.bind(this),fail:b.exception}]);i[0].then(function(a){var b="core_competency_user_competency_viewed_in_plan";return a.plan.iscompleted&&(b="core_competency_user_competency_plan_viewed"),d.call([{methodname:b,args:{competencyid:f,userid:g,planid:h}}])[0]})["catch"](b.exception)},g.prototype._contextLoaded=function(a){var d=this;e.render("tool_lp/user_competency_summary_in_plan",a).done(function(a,g){c.get_string("usercompetencysummary","report_competency").done(function(b){new f(b,a,e.runTemplateJS.bind(e,g),d._refresh.bind(d),(!0))}).fail(b.exception)}).fail(b.exception)},g.prototype._refresh=function(){var a=this._planId;d.call([{methodname:"tool_lp_data_for_plan_page",args:{planid:a},done:this._pageContextLoaded.bind(this),fail:b.exception}])},g.prototype._pageContextLoaded=function(a){var c=this;e.render("tool_lp/plan_page",a).done(function(a,b){e.replaceNode(c._regionSelector,a,b)}).fail(b.exception)},g.prototype._regionSelector=null,g.prototype._userCompetencySelector=null,g.prototype._planId=null,g});
+define(["jquery","core/notification","core/str","core/ajax","core/templates","tool_lp/dialogue"],function(a,b,c,d,e,f){var g=function(b,c,d){this._regionSelector=b,this._userCompetencySelector=c,this._planId=d,a(this._regionSelector).on("click",this._userCompetencySelector,this._handleClick.bind(this))};return g.prototype._handleClick=function(c){c.preventDefault();var e=a(c.target).closest("tr"),f=a(e).data("competencyid"),g=a(e).data("userid"),h=this._planId,i=d.call([{methodname:"tool_lp_data_for_user_competency_summary_in_plan",args:{competencyid:f,planid:h},done:this._contextLoaded.bind(this),fail:b.exception}]);i[0].then(function(a){var c="core_competency_user_competency_viewed_in_plan";a.plan.iscompleted&&(c="core_competency_user_competency_plan_viewed"),d.call([{methodname:c,args:{competencyid:f,userid:g,planid:h},fail:b.exception}])})},g.prototype._contextLoaded=function(a){var d=this;e.render("tool_lp/user_competency_summary_in_plan",a).done(function(a,g){c.get_string("usercompetencysummary","report_competency").done(function(b){new f(b,a,e.runTemplateJS.bind(e,g),d._refresh.bind(d),(!0))}).fail(b.exception)}).fail(b.exception)},g.prototype._refresh=function(){var a=this._planId;d.call([{methodname:"tool_lp_data_for_plan_page",args:{planid:a},done:this._pageContextLoaded.bind(this),fail:b.exception}])},g.prototype._pageContextLoaded=function(a){var c=this;e.render("tool_lp/plan_page",a).done(function(a,b){e.replaceNode(c._regionSelector,a,b)}).fail(b.exception)},g.prototype._regionSelector=null,g.prototype._userCompetencySelector=null,g.prototype._planId=null,g});

admin/tool/lp/amd/build/user_competency_workflow.min.js

@@ -1 +1 @@
-define(["jquery","core/templates","core/ajax","core/notification","core/str","tool_lp/menubar","tool_lp/event_base"],function(a,b,c,d,e,f,g){var h=function(){g.prototype.constructor.apply(this,[])};return h.prototype=Object.create(g.prototype),h.prototype._nodeSelector='[data-node="user-competency"]',h.prototype._cancelReviewRequest=function(a){var b={methodname:"core_competency_user_competency_cancel_review_request",args:{userid:a.userid,competencyid:a.competencyid}};c.call([b])[0].then(function(){this._trigger("review-request-cancelled",a),this._trigger("status-changed",a)}.bind(this))["catch"](function(){this._trigger("error-occured",a)}.bind(this))},h.prototype.cancelReviewRequest=function(a){this._cancelReviewRequest(a)},h.prototype._cancelReviewRequestHandler=function(b){b.preventDefault();var c=this._findUserCompetencyData(a(b.target));this.cancelReviewRequest(c)},h.prototype._requestReview=function(a){var b={methodname:"core_competency_user_competency_request_review",args:{userid:a.userid,competencyid:a.competencyid}};c.call([b])[0].then(function(){this._trigger("review-requested",a),this._trigger("status-changed",a)}.bind(this))["catch"](function(){this._trigger("error-occured",a)}.bind(this))},h.prototype.requestReview=function(a){this._requestReview(a)},h.prototype._requestReviewHandler=function(b){b.preventDefault();var c=this._findUserCompetencyData(a(b.target));this.requestReview(c)},h.prototype._startReview=function(a){var b={methodname:"core_competency_user_competency_start_review",args:{userid:a.userid,competencyid:a.competencyid}};c.call([b])[0].then(function(){this._trigger("review-started",a),this._trigger("status-changed",a)}.bind(this))["catch"](function(){this._trigger("error-occured",a)}.bind(this))},h.prototype.startReview=function(a){this._startReview(a)},h.prototype._startReviewHandler=function(b){b.preventDefault();var c=this._findUserCompetencyData(a(b.target));this.startReview(c)},h.prototype._stopReview=function(a){var b={methodname:"core_competency_user_competency_stop_review",args:{userid:a.userid,competencyid:a.competencyid}};c.call([b])[0].then(function(){this._trigger("review-stopped",a),this._trigger("status-changed",a)}.bind(this))["catch"](function(){this._trigger("error-occured",a)}.bind(this))},h.prototype.stopReview=function(a){this._stopReview(a)},h.prototype._stopReviewHandler=function(b){b.preventDefault();var c=this._findUserCompetencyData(a(b.target));this.stopReview(c)},h.prototype.enhanceMenubar=function(a){f.enhance(a,{'[data-action="request-review"]':this._requestReviewHandler.bind(this),'[data-action="cancel-review-request"]':this._cancelReviewRequestHandler.bind(this)})},h.prototype._findUserCompetencyData=function(a){var b,c=a.parents(this._nodeSelector);if(1!=c.length)throw new Error("The evidence node was not located.");if(b=c.data(),"undefined"==typeof b||"undefined"==typeof b.userid||"undefined"==typeof b.competencyid)throw new Error("User competency data could not be found.");return b},h.prototype.enhanceMenubar=function(a){f.enhance(a,{'[data-action="request-review"]':this._requestReviewHandler.bind(this),'[data-action="cancel-review-request"]':this._cancelReviewRequestHandler.bind(this),'[data-action="start-review"]':this._startReviewHandler.bind(this),'[data-action="stop-review"]':this._stopReviewHandler.bind(this)})},h.prototype.registerEvents=function(b){var c=a(b);c.find('[data-action="request-review"]').click(this._requestReviewHandler.bind(this)),c.find('[data-action="cancel-review-request"]').click(this._cancelReviewRequestHandler.bind(this)),c.find('[data-action="start-review"]').click(this._startReviewHandler.bind(this)),c.find('[data-action="stop-review"]').click(this._stopReviewHandler.bind(this))},h});
+define(["jquery","core/templates","core/ajax","core/notification","core/str","tool_lp/menubar","tool_lp/event_base"],function(a,b,c,d,e,f,g){var h=function(){g.prototype.constructor.apply(this,[])};return h.prototype=Object.create(g.prototype),h.prototype._nodeSelector='[data-node="user-competency"]',h.prototype._cancelReviewRequest=function(a){var b={methodname:"core_competency_user_competency_cancel_review_request",args:{userid:a.userid,competencyid:a.competencyid}};c.call([b])[0].then(function(){this._trigger("review-request-cancelled",a),this._trigger("status-changed",a)}.bind(this),function(){this._trigger("error-occured",a)}.bind(this))},h.prototype.cancelReviewRequest=function(a){this._cancelReviewRequest(a)},h.prototype._cancelReviewRequestHandler=function(b){b.preventDefault();var c=this._findUserCompetencyData(a(b.target));this.cancelReviewRequest(c)},h.prototype._requestReview=function(a){var b={methodname:"core_competency_user_competency_request_review",args:{userid:a.userid,competencyid:a.competencyid}};c.call([b])[0].then(function(){this._trigger("review-requested",a),this._trigger("status-changed",a)}.bind(this),function(){this._trigger("error-occured",a)}.bind(this))},h.prototype.requestReview=function(a){this._requestReview(a)},h.prototype._requestReviewHandler=function(b){b.preventDefault();var c=this._findUserCompetencyData(a(b.target));this.requestReview(c)},h.prototype._startReview=function(a){var b={methodname:"core_competency_user_competency_start_review",args:{userid:a.userid,competencyid:a.competencyid}};c.call([b])[0].then(function(){this._trigger("review-started",a),this._trigger("status-changed",a)}.bind(this),function(){this._trigger("error-occured",a)}.bind(this))},h.prototype.startReview=function(a){this._startReview(a)},h.prototype._startReviewHandler=function(b){b.preventDefault();var c=this._findUserCompetencyData(a(b.target));this.startReview(c)},h.prototype._stopReview=function(a){var b={methodname:"core_competency_user_competency_stop_review",args:{userid:a.userid,competencyid:a.competencyid}};c.call([b])[0].then(function(){this._trigger("review-stopped",a),this._trigger("status-changed",a)}.bind(this),function(){this._trigger("error-occured",a)}.bind(this))},h.prototype.stopReview=function(a){this._stopReview(a)},h.prototype._stopReviewHandler=function(b){b.preventDefault();var c=this._findUserCompetencyData(a(b.target));this.stopReview(c)},h.prototype.enhanceMenubar=function(a){f.enhance(a,{'[data-action="request-review"]':this._requestReviewHandler.bind(this),'[data-action="cancel-review-request"]':this._cancelReviewRequestHandler.bind(this)})},h.prototype._findUserCompetencyData=function(a){var b,c=a.parents(this._nodeSelector);if(1!=c.length)throw new Error("The evidence node was not located.");if(b=c.data(),"undefined"==typeof b||"undefined"==typeof b.userid||"undefined"==typeof b.competencyid)throw new Error("User competency data could not be found.");return b},h.prototype.enhanceMenubar=function(a){f.enhance(a,{'[data-action="request-review"]':this._requestReviewHandler.bind(this),'[data-action="cancel-review-request"]':this._cancelReviewRequestHandler.bind(this),'[data-action="start-review"]':this._startReviewHandler.bind(this),'[data-action="stop-review"]':this._stopReviewHandler.bind(this)})},h.prototype.registerEvents=function(b){var c=a(b);c.find('[data-action="request-review"]').click(this._requestReviewHandler.bind(this)),c.find('[data-action="cancel-review-request"]').click(this._cancelReviewRequestHandler.bind(this)),c.find('[data-action="start-review"]').click(this._startReviewHandler.bind(this)),c.find('[data-action="stop-review"]').click(this._stopReviewHandler.bind(this))},h});

admin/tool/lp/amd/src/actionselector.js

@@ -131,7 +131,6 @@ define(['jquery',
                 html,
                 self._afterRender.bind(self)
             );
-            return;
         }).fail(Notification.exception);
     };
 
@@ -157,7 +156,6 @@ define(['jquery',
         return self._render().then(function(html) {
             self._find('[data-region="action-selector"]').replaceWith(html);
             self._afterRender();
-            return;
         });
     };
 

admin/tool/lp/amd/src/competencies.js

@@ -181,13 +181,13 @@ define(['jquery',
                     pagerender = 'tool_lp/plan_page';
                     pageregion = 'plan-page';
                 }
+
                 ajax.call(requests)[requests.length - 1].then(function(context) {
-                    return templates.render(pagerender, context);
-                }).then(function(html, js) {
-                    $('[data-region="' + pageregion + '"]').replaceWith(html);
-                    templates.runTemplateJS(js);
-                    return;
-                }).catch(notification.exception);
+                    return templates.render(pagerender, context).done(function(html, js) {
+                        $('[data-region="' + pageregion + '"]').replaceWith(html);
+                        templates.runTemplateJS(js);
+                    });
+                }, notification.exception);
             });
         }
 

admin/tool/lp/amd/src/competency_rule_points.js

@@ -166,7 +166,6 @@ define(['jquery',
             // We're done, let's trigger a change.
             self._templateLoaded = true;
             self._triggerChange();
-            return;
         });
     };
 

admin/tool/lp/amd/src/competencyactions.js

@@ -430,13 +430,12 @@ define(['jquery',
                 var promises = ajax.call(calls);
 
                 promises[calls.length - 1].then(function(context) {
-                    return templates.render('tool_lp/related_competencies', context);
-                }).then(function(html, js) {
-                    $('[data-region="relatedcompetencies"]').replaceWith(html);
-                    templates.runTemplateJS(js);
-                    updatedRelatedCompetencies();
-                    return;
-                }).catch(notification.exception);
+                    return templates.render('tool_lp/related_competencies', context).done(function(html, js) {
+                        $('[data-region="relatedcompetencies"]').replaceWith(html);
+                        templates.runTemplateJS(js);
+                        updatedRelatedCompetencies();
+                    });
+                }, notification.exception);
             });
         }
 
@@ -473,8 +472,7 @@ define(['jquery',
                 relatedTarget.ruleconfig = config.ruleconfig;
                 renderCompetencySummary(relatedTarget);
             }
-            return;
-        }).catch(notification.exception);
+        }, notification.exception);
     };
 
     /**
@@ -694,27 +692,28 @@ define(['jquery',
                     type: strs[1]
                 };
             }
-            return context;
-        }).then(function(context) {
-            return templates.render('tool_lp/competency_summary', context);
-        }).then(function(html) {
-            $('[data-region="competencyinfo"]').html(html);
-            $('[data-action="deleterelation"]').on('click', deleteRelatedHandler);
+        }).then(function() {
+            return templates.render('tool_lp/competency_summary', context).then(function(html) {
+                $('[data-region="competencyinfo"]').html(html);
+                $('[data-action="deleterelation"]').on('click', deleteRelatedHandler);
+            });
+        }).then(function() {
             return templates.render('tool_lp/loading', {});
         }).then(function(html, js) {
             templates.replaceNodeContents('[data-region="relatedcompetencies"]', html, js);
-            return ajax.call([{
+        }).done(function() {
+            ajax.call([{
                 methodname: 'tool_lp_data_for_related_competencies_section',
-                args: {competencyid: competency.id}
-            }])[0];
-        }).then(function(context) {
-            return templates.render('tool_lp/related_competencies', context);
-        }).then(function(html, js) {
-            $('[data-region="relatedcompetencies"]').replaceWith(html);
-            templates.runTemplateJS(js);
-            updatedRelatedCompetencies();
-            return;
-        }).catch(notification.exception);
+                args: {competencyid: competency.id},
+                done: function(context) {
+                    return templates.render('tool_lp/related_competencies', context).done(function(html, js) {
+                        $('[data-region="relatedcompetencies"]').replaceWith(html);
+                        templates.runTemplateJS(js);
+                        updatedRelatedCompetencies();
+                    });
+                }
+            }]);
+        }).fail(notification.exception);
     };
 
     /**
@@ -777,17 +776,16 @@ define(['jquery',
             // Log Competency viewed event.
             triggerCompetencyViewedEvent(competency);
         }
+
         strSelectedTaxonomy(level).then(function(str) {
             selectedTitle.text(str);
-            return;
-        }).catch(notification.exception);
+        });
 
         strAddTaxonomy(sublevel).then(function(str) {
             btn.show()
                 .find('[data-region="term"]')
                 .text(str);
-            return;
-        }).catch(notification.exception);
+        });
 
         // We handled this event so consume it.
         evt.preventDefault();

admin/tool/lp/amd/src/competencypicker.js

@@ -134,7 +134,7 @@ define(['jquery',
         if (!self._singleFramework) {
             self._find('[data-action="chooseframework"]').change(function(e) {
                 self._frameworkId = $(e.target).val();
-                self._loadCompetencies().then(self._refresh.bind(self)).catch(Notification.exception);
+                self._loadCompetencies().then(self._refresh.bind(self));
             });
         }
 
@@ -203,15 +203,15 @@ define(['jquery',
      */
     Picker.prototype.display = function() {
         var self = this;
-        return $.when(Str.get_string('competencypicker', 'tool_lp'), self._render())
-        .then(function(title, render) {
-            self._popup = new Dialogue(
-                title,
-                render[0],
-                self._afterRender.bind(self)
-            );
-            return;
-        }).catch(Notification.exception);
+        return self._render().then(function(html) {
+            return Str.get_string('competencypicker', 'tool_lp').then(function(title) {
+                self._popup = new Dialogue(
+                    title,
+                    html,
+                    self._afterRender.bind(self)
+                );
+            });
+        }).fail(Notification.exception);
     };
 
     /**
@@ -388,7 +388,6 @@ define(['jquery',
         return self._render().then(function(html) {
             self._find('[data-region="competencylinktree"]').replaceWith(html);
             self._afterRender();
-            return;
         });
     };
 

admin/tool/lp/amd/src/competencypicker_user_plans.js

@@ -77,8 +77,7 @@ define(['jquery',
         if (!self._singlePlan) {
             self._find('[data-action="chooseplan"]').change(function(e) {
                 self._planId = $(e.target).val();
-                self._loadCompetencies().then(self._refresh.bind(self))
-                .catch(Notification.exception);
+                self._loadCompetencies().then(self._refresh.bind(self));
             });
         }
     };

admin/tool/lp/amd/src/competencyruleconfig.js

@@ -165,14 +165,14 @@ define(['jquery',
         if (!self._competency) {
             return false;
         }
-        return $.when(Str.get_string('competencyrule', 'tool_lp'), self._render())
-        .then(function(title, render) {
-            self._popup = new Dialogue(
-                title,
-                render[0],
-                self._afterRender.bind(self)
-            );
-            return;
+        return self._render().then(function(html) {
+            return Str.get_string('competencyrule', 'tool_lp').then(function(title) {
+                self._popup = new Dialogue(
+                    title,
+                    html,
+                    self._afterRender.bind(self)
+                );
+            });
         }).fail(Notification.exception);
     };
 
@@ -312,9 +312,9 @@ define(['jquery',
      */
     RuleConfig.prototype._initOutcomes = function() {
         var self = this;
+
         return Outcomes.getAll().then(function(outcomes) {
             self._outcomesOption = outcomes;
-            return;
         });
     };
 
@@ -328,11 +328,11 @@ define(['jquery',
     RuleConfig.prototype._initRules = function() {
         var self = this,
             promises = [];
+
         $.each(self._rules, function(index, rule) {
             var promise = rule.init().then(function() {
                 rule.setTargetCompetency(self._competency);
                 rule.on('change', self._afterRuleConfigChange.bind(self));
-                return;
             }, function() {
                 // Upon failure remove the rule, and resolve the promise.
                 self._rules.splice(index, 1);
@@ -518,13 +518,13 @@ define(['jquery',
             self._afterChange();
             return;
         }
+
         rule.injectTemplate(container).then(function() {
             container.show();
-            return;
+        }, function() {
+            container.empty().hide();
         }).always(function() {
             self._afterChange();
-        }).catch(function() {
-            container.empty().hide();
         });
     };
 

admin/tool/lp/amd/src/evidence_delete.js

@@ -76,7 +76,6 @@ define(['jquery',
                         }]);
                         promise[0].then(function() {
                             parent.remove();
-                            return;
                         }).fail(Notification.exception);
                     }
                 );

admin/tool/lp/amd/src/form-cohort-selector.js

@@ -51,6 +51,7 @@ define(['jquery', 'core/ajax', 'core/templates'], function($, Ajax, Templates) {
                     includes: includes
                 }
             }]);
+
             promise[0].then(function(results) {
                 var promises = [],
                     i = 0;
@@ -68,10 +69,9 @@ define(['jquery', 'core/ajax', 'core/templates'], function($, Ajax, Templates) {
                         i++;
                     });
                     success(results.cohorts);
-                    return;
                 });
 
-            }).catch(failure);
+            }, failure);
         }
 
     };

admin/tool/lp/amd/src/form-user-selector.js

@@ -79,10 +79,9 @@ define(['jquery', 'core/ajax', 'core/templates'], function($, Ajax, Templates) {
                         i++;
                     });
                     success(results.users);
-                    return;
                 });
 
-            }).catch(failure);
+            }, failure);
         }
 
     };

admin/tool/lp/amd/src/frameworks_datasource.js

@@ -35,17 +35,20 @@ define(['jquery', 'core/ajax', 'core/notification'], function($, Ajax, Notificat
          * @return {Promise}
          */
         list: function(contextId, options) {
-            var args = {
+            var promise,
+                args = {
                     context: {
                         contextid: contextId
                     }
                 };
 
             $.extend(args, typeof options === 'undefined' ? {} : options);
-            return Ajax.call([{
+            promise = Ajax.call([{
                 methodname: 'core_competency_list_competency_frameworks',
                 args: args
             }])[0];
+
+            return promise.fail(Notification.exception);
         },
 
         /**
@@ -73,7 +76,6 @@ define(['jquery', 'core/ajax', 'core/notification'], function($, Ajax, Notificat
          * @param {String} query The query string.
          * @param {Function} callback A callback function receiving an array of results.
          */
-        /* eslint-disable promise/no-callback-in-promise */
         transport: function(selector, query, callback) {
             var el = $(selector),
                 contextId = el.data('contextid'),
@@ -82,10 +84,11 @@ define(['jquery', 'core/ajax', 'core/notification'], function($, Ajax, Notificat
             if (!contextId) {
                 throw new Error('The attribute data-contextid is required on ' + selector);
             }
+
             this.list(contextId, {
                 query: query,
                 onlyvisible: onlyVisible,
-            }).then(callback).catch(Notification.exception);
+            }).then(callback);
         }
     };
 

admin/tool/lp/amd/src/parentcompetency_form.js

@@ -81,7 +81,6 @@ define(['jquery', 'core/ajax', 'core/str', 'tool_lp/competencypicker', 'core/tem
             Str.get_string('competencyframeworkroot', 'tool_lp').then(function(rootframework) {
                 $(self.staticElementSelector).html(rootframework);
                 $(self.inputHiddenSelector).val(data.competencyId);
-                return;
             }).fail(Notification.exception);
         }
     };