Moodle release 3.7.3

This reverts commit ed080a580f.
This issue reverts the behaviour modified in MDL-66181, as that change
negatively impacted course-creation workflows. As this appears to be
the intended functionality, the Security team has agreed to revert
this change.

.eslintignore

@@ -4,6 +4,7 @@
 node_modules/
 vendor/
 admin/tool/policy/amd/src/jquery-eu-cookie-law-popup.js
+admin/tool/usertours/amd/src/tour.js
 auth/cas/CAS/
 cache/stores/mongodb/MongoDB/
 enrol/lti/ims-blti/
@@ -19,12 +20,15 @@ lib/mlbackend/php/phpml/
 lib/adodb/
 lib/bennu/
 lib/evalmath/
-lib/phpspreadsheet/
+lib/lessphp/
+lib/phpexcel/
 lib/google/
 lib/htmlpurifier/
 lib/jabber/
 lib/minify/matthiasmullie-minify/
 lib/minify/matthiasmullie-pathconverter/
+lib/pear/Auth/RADIUS.php
+lib/pear/Crypt/CHAP.php
 lib/pear/HTML/Common.php
 lib/pear/HTML/QuickForm.php
 lib/pear/HTML/QuickForm/
@@ -38,6 +42,7 @@ lib/yuilib/gallery/
 lib/jquery/
 lib/html2text/
 lib/markdown/
+lib/recaptchalib.php
 lib/xhprof/
 lib/horde/
 lib/requirejs/
@@ -60,10 +65,6 @@ lib/validateurlsyntax.php
 lib/amd/src/popper.js
 lib/geopattern-php/
 lib/php-jwt/
-lib/babel-polyfill/
-lib/mdn-polyfills/
-lib/emoji-data/
-lib/h5p/
 media/player/videojs/amd/src/video-lazy.js
 media/player/videojs/amd/src/Youtube-lazy.js
 media/player/videojs/videojs/
@@ -77,13 +78,10 @@ theme/boost/amd/src/button.js
 theme/boost/amd/src/carousel.js
 theme/boost/amd/src/collapse.js
 theme/boost/amd/src/dropdown.js
-theme/boost/amd/src/index.js
 theme/boost/amd/src/modal.js
 theme/boost/amd/src/popover.js
-theme/boost/amd/src/sanitizer.js
 theme/boost/amd/src/scrollspy.js
 theme/boost/amd/src/tab.js
-theme/boost/amd/src/toast.js
 theme/boost/amd/src/tooltip.js
 theme/boost/amd/src/util.js
 theme/boost/amd/src/tether.js

.eslintrc

@@ -1,6 +1,5 @@
 {
   'plugins': [
-    'babel',
     'promise',
   ],
   'env': {
@@ -204,45 +203,11 @@
       }
     },
     {
-      files: ["**/amd/src/*.js", "**/amd/src/**/*.js", "Gruntfile*.js", "babel-plugin-add-module-to-define.js"],
-      // We support es6 now. Woot!
-      env: {
-        es6: true
-      },
-      // We're using babel transpiling so use their parser
-      // for linting.
-      parser: 'babel-eslint',
+      files: ["**/amd/src/*.js", "Gruntfile.js"],
       // Check AMD with some slightly stricter rules.
       rules: {
         'no-unused-vars': 'error',
-        'no-implicit-globals': 'error',
-        // Disable all of the rules that have babel versions.
-        'new-cap': 'off',
-        // Not using this rule for the time being because it isn't
-        // compatible with jQuery and ES6.
-        'no-invalid-this': 'off',
-        'object-curly-spacing': 'off',
-        'quotes': 'off',
-        'semi': 'off',
-        'no-unused-expressions': 'off',
-        // Enable all of the babel version of these rules.
-        'babel/new-cap': ['warn', { 'properties': false }],
-        // Not using this rule for the time being because it isn't
-        // compatible with jQuery and ES6.
-        'babel/no-invalid-this': 'off',
-        'babel/object-curly-spacing': 'warn',
-        // This is off in the original style int.
-        'babel/quotes': 'off',
-        'babel/semi': 'error',
-        'babel/no-unused-expressions': 'error',
-        // === Promises ===
-        // We have Promise now that we're using ES6.
-        'promise/no-native': 'off',
-        'promise/avoid-new': 'off'
-      },
-      parserOptions: {
-        'ecmaVersion': 9,
-        'sourceType': 'module'
+        'no-implicit-globals': 'error'
       }
     }
   ]

.stylelintignore

@@ -5,6 +5,7 @@ theme/classic/style/moodle.css
 node_modules/
 vendor/
 admin/tool/policy/amd/src/jquery-eu-cookie-law-popup.js
+admin/tool/usertours/amd/src/tour.js
 auth/cas/CAS/
 cache/stores/mongodb/MongoDB/
 enrol/lti/ims-blti/
@@ -20,12 +21,15 @@ lib/mlbackend/php/phpml/
 lib/adodb/
 lib/bennu/
 lib/evalmath/
-lib/phpspreadsheet/
+lib/lessphp/
+lib/phpexcel/
 lib/google/
 lib/htmlpurifier/
 lib/jabber/
 lib/minify/matthiasmullie-minify/
 lib/minify/matthiasmullie-pathconverter/
+lib/pear/Auth/RADIUS.php
+lib/pear/Crypt/CHAP.php
 lib/pear/HTML/Common.php
 lib/pear/HTML/QuickForm.php
 lib/pear/HTML/QuickForm/
@@ -39,6 +43,7 @@ lib/yuilib/gallery/
 lib/jquery/
 lib/html2text/
 lib/markdown/
+lib/recaptchalib.php
 lib/xhprof/
 lib/horde/
 lib/requirejs/
@@ -61,10 +66,6 @@ lib/validateurlsyntax.php
 lib/amd/src/popper.js
 lib/geopattern-php/
 lib/php-jwt/
-lib/babel-polyfill/
-lib/mdn-polyfills/
-lib/emoji-data/
-lib/h5p/
 media/player/videojs/amd/src/video-lazy.js
 media/player/videojs/amd/src/Youtube-lazy.js
 media/player/videojs/videojs/
@@ -78,13 +79,10 @@ theme/boost/amd/src/button.js
 theme/boost/amd/src/carousel.js
 theme/boost/amd/src/collapse.js
 theme/boost/amd/src/dropdown.js
-theme/boost/amd/src/index.js
 theme/boost/amd/src/modal.js
 theme/boost/amd/src/popover.js
-theme/boost/amd/src/sanitizer.js
 theme/boost/amd/src/scrollspy.js
 theme/boost/amd/src/tab.js
-theme/boost/amd/src/toast.js
 theme/boost/amd/src/tooltip.js
 theme/boost/amd/src/util.js
 theme/boost/amd/src/tether.js

.travis.yml

@@ -206,7 +206,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_37_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`

Gruntfile.js

@@ -32,10 +32,7 @@ module.exports = function(grunt) {
         async = require('async'),
         DOMParser = require('xmldom').DOMParser,
         xpath = require('xpath'),
-        semver = require('semver'),
-        watchman = require('fb-watchman'),
-        watchmanClient = new watchman.Client(),
-        gruntFilePath = process.cwd();
+        semver = require('semver');
 
     // Verify the node version is new enough.
     var expected = semver.validRange(grunt.file.readJSON('package.json').engines.node);
@@ -56,23 +53,10 @@ module.exports = function(grunt) {
         }
     }
 
-    var files = null;
-    if (grunt.option('files')) {
-        // Accept a comma separated list of files to process.
-        files = grunt.option('files').split(',');
-    }
-
     var inAMD = path.basename(cwd) == 'amd';
 
     // Globbing pattern for matching all AMD JS source files.
-    var amdSrc = [];
-    if (inAMD) {
-        amdSrc.push(cwd + "/src/*.js");
-        amdSrc.push(cwd + "/src/**/*.js");
-    } else {
-        amdSrc.push("**/amd/src/*.js");
-        amdSrc.push("**/amd/src/**/*.js");
-    }
+    var amdSrc = [inAMD ? cwd + '/src/*.js' : '**/amd/src/*.js'];
 
     /**
      * Function to generate the destination for the uglify task
@@ -84,9 +68,10 @@ module.exports = function(grunt) {
      * @param {String} srcPath the  matched src path
      * @return {String} The rewritten destination path.
      */
-    var babelRename = function(destPath, srcPath) {
+    var uglifyRename = function(destPath, srcPath) {
         destPath = srcPath.replace('src', 'build');
         destPath = destPath.replace('.js', '.min.js');
+        destPath = path.resolve(cwd, destPath);
         return destPath;
     };
 
@@ -128,58 +113,18 @@ 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: files ? files : amdSrc},
+            amd: {src: amdSrc},
             // Check YUI module source files.
-            yui: {src: files ? files : ['**/yui/src/**/*.js', '!*/**/yui/src/*/meta/*.js']}
+            yui: {src: ['**/yui/src/**/*.js', '!*/**/yui/src/*/meta/*.js']}
         },
-        babel: {
-            options: {
-                sourceMaps: true,
-                comments: false,
-                plugins: [
-                    'transform-es2015-modules-amd-lazy',
-                    'system-import-transformer',
-                    // This plugin modifies the Babel transpiling for "export default"
-                    // so that if it's used then only the exported value is returned
-                    // by the generated AMD module.
-                    //
-                    // It also adds the Moodle plugin name to the AMD module definition
-                    // so that it can be imported as expected in other modules.
-                    path.resolve('babel-plugin-add-module-to-define.js'),
-                    '@babel/plugin-syntax-dynamic-import',
-                    '@babel/plugin-syntax-import-meta',
-                    ['@babel/plugin-proposal-class-properties', {'loose': false}],
-                    '@babel/plugin-proposal-json-strings'
-                ],
-                presets: [
-                    ['minify', {
-                        // This minification plugin needs to be disabled because it breaks the
-                        // source map generation and causes invalid source maps to be output.
-                        simplify: false,
-                        builtIns: false
-                    }],
-                    ['@babel/preset-env', {
-                        targets: {
-                            browsers: [
-                                ">0.25%",
-                                "last 2 versions",
-                                "not ie <= 10",
-                                "not op_mini all",
-                                "not Opera > 0",
-                                "not dead"
-                            ]
-                        },
-                        modules: false,
-                        useBuiltIns: false
-                    }]
-                ]
-            },
-            dist: {
+        uglify: {
+            amd: {
                 files: [{
                     expand: true,
-                    src: files ? files : amdSrc,
-                    rename: babelRename
-                }]
+                    src: amdSrc,
+                    rename: uglifyRename
+                }],
+                options: {report: 'none'}
             }
         },
         sass: {
@@ -201,14 +146,6 @@ module.exports = function(grunt) {
                 files: ['**/amd/src/**/*.js'],
                 tasks: ['amd']
             },
-            boost: {
-                files: ['**/theme/boost/scss/**/*.scss'],
-                tasks: ['scss']
-            },
-            rawcss: {
-                files: ['**/*.css', '**/theme/**/!(moodle.css|editor.css)'],
-                tasks: ['rawcss']
-            },
             yui: {
                 files: ['**/yui/src/**/*.js'],
                 tasks: ['yui']
@@ -221,21 +158,21 @@ module.exports = function(grunt) {
         shifter: {
             options: {
                 recursive: true,
-                paths: files ? files : [cwd]
+                paths: [cwd]
             }
         },
         gherkinlint: {
             options: {
-                files: files ? files : ['**/tests/behat/*.feature'],
+                files: ['**/tests/behat/*.feature'],
             }
         },
         stylelint: {
             scss: {
                 options: {syntax: 'scss'},
-                src: files ? files : ['*/**/*.scss']
+                src: ['*/**/*.scss']
             },
             css: {
-                src: files ? files : ['*/**/*.css'],
+                src: ['*/**/*.css'],
                 options: {
                     configOverrides: {
                         rules: {
@@ -386,232 +323,23 @@ module.exports = function(grunt) {
         }
     };
 
-    /**
-     * This is a wrapper task to handle the grunt watch command. It attempts to use
-     * Watchman to monitor for file changes, if it's installed, because it's much faster.
-     *
-     * If Watchman isn't installed then it falls back to the grunt-contrib-watch file
-     * watcher for backwards compatibility.
-     */
-    tasks.watch = function() {
-        var watchTaskDone = this.async();
-        var watchInitialised = false;
-        var watchTaskQueue = {};
-        var processingQueue = false;
-
-        // Grab the tasks and files that have been queued up and execute them.
-        var processWatchTaskQueue = function() {
-            if (!Object.keys(watchTaskQueue).length || processingQueue) {
-                // If there is nothing in the queue or we're already processing then wait.
-                return;
-            }
-
-            processingQueue = true;
-
-            // Grab all tasks currently in the queue.
-            var queueToProcess = watchTaskQueue;
-            // Reset the queue.
-            watchTaskQueue = {};
-
-            async.forEachSeries(
-                Object.keys(queueToProcess),
-                function(task, next) {
-                    var files = queueToProcess[task];
-                    var filesOption = '--files=' + files.join(',');
-                    grunt.log.ok('Running task ' + task + ' for files ' + filesOption);
-
-                    // Spawn the task in a child process so that it doesn't kill this one
-                    // if it failed.
-                    grunt.util.spawn(
-                        {
-                            // Spawn with the grunt bin.
-                            grunt: true,
-                            // Run from current working dir and inherit stdio from process.
-                            opts: {
-                                cwd: cwd,
-                                stdio: 'inherit'
-                            },
-                            args: [task, filesOption]
-                        },
-                        function(err, res, code) {
-                            if (code !== 0) {
-                                // The grunt task failed.
-                                grunt.log.error(err);
-                            }
-
-                            // Move on to the next task.
-                            next();
-                        }
-                    );
-                },
-                function() {
-                    // No longer processing.
-                    processingQueue = false;
-                    // Once all of the tasks are done then recurse just in case more tasks
-                    // were queued while we were processing.
-                    processWatchTaskQueue();
-                }
-            );
-        };
-
-        var watchConfig = grunt.config.get(['watch']);
-        watchConfig = Object.keys(watchConfig).reduce(function(carry, key) {
-            if (key == 'options') {
-                return carry;
-            }
-
-            var value = watchConfig[key];
-            var fileGlobs = value.files;
-            var taskNames = value.tasks;
-
-            taskNames.forEach(function(taskName) {
-                carry[taskName] = fileGlobs;
-            });
-
-            return carry;
-        }, {});
-
-        watchmanClient.on('error', function(error) {
-            // We have to add an error handler here and parse the error string because the
-            // example way from the docs to check if Watchman is installed doesn't actually work!!
-            // See: https://github.com/facebook/watchman/issues/509
-            if (error.message.match('Watchman was not found')) {
-                // If watchman isn't installed then we should fallback to the other watch task.
-                grunt.log.ok('It is recommended that you install Watchman for better performance using the "watch" command.');
-
-                // Fallback to the old grunt-contrib-watch task.
-                grunt.renameTask('watch-grunt', 'watch');
-                grunt.task.run(['watch']);
-                // This task is finished.
-                watchTaskDone(0);
-            } else {
-                grunt.log.error(error);
-                // Fatal error.
-                watchTaskDone(1);
-            }
-        });
-
-        watchmanClient.on('subscription', function(resp) {
-            if (resp.subscription !== 'grunt-watch') {
-                return;
-            }
-
-            resp.files.forEach(function(file) {
-                grunt.log.ok('File changed: ' + file.name);
-
-                var fullPath = cwd + '/' + file.name;
-                Object.keys(watchConfig).forEach(function(task) {
-                    var fileGlobs = watchConfig[task];
-                    var match = fileGlobs.every(function(fileGlob) {
-                        return grunt.file.isMatch(fileGlob, fullPath);
-                    });
-                    if (match) {
-                        // If we are watching a subdirectory then the file.name will be relative
-                        // to that directory. However the grunt tasks  expect the file paths to be
-                        // relative to the Gruntfile.js location so let's normalise them before
-                        // adding them to the queue.
-                        var relativePath = fullPath.replace(gruntFilePath + '/', '');
-                        if (task in watchTaskQueue) {
-                            if (!watchTaskQueue[task].includes(relativePath)) {
-                                watchTaskQueue[task] = watchTaskQueue[task].concat(relativePath);
-                            }
-                        } else {
-                            watchTaskQueue[task] = [relativePath];
-                        }
-                    }
-                });
-            });
-
-            processWatchTaskQueue();
-        });
-
-        process.on('SIGINT', function() {
-            // Let the user know that they may need to manually stop the Watchman daemon if they
-            // no longer want it running.
-            if (watchInitialised) {
-                grunt.log.ok('The Watchman daemon may still be running and may need to be stopped manually.');
-            }
-
-            process.exit();
-        });
-
-        // Initiate the watch on the current directory.
-        watchmanClient.command(['watch-project', cwd], function(watchError, watchResponse) {
-            if (watchError) {
-                grunt.log.error('Error initiating watch:', watchError);
-                watchTaskDone(1);
-                return;
-            }
-
-            if ('warning' in watchResponse) {
-                grunt.log.error('warning: ', watchResponse.warning);
-            }
-
-            var watch = watchResponse.watch;
-            var relativePath = watchResponse.relative_path;
-            watchInitialised = true;
-
-            watchmanClient.command(['clock', watch], function(clockError, clockResponse) {
-                if (clockError) {
-                    grunt.log.error('Failed to query clock:', clockError);
-                    watchTaskDone(1);
-                    return;
-                }
-
-                // Use the matching patterns specified in the watch config.
-                var matches = Object.keys(watchConfig).map(function(task) {
-                    var fileGlobs = watchConfig[task];
-                    var fileGlobMatches = fileGlobs.map(function(fileGlob) {
-                        return ['match', fileGlob, 'wholename'];
-                    });
-
-                    return ['allof'].concat(fileGlobMatches);
-                });
-
-                var sub = {
-                    expression: ["anyof"].concat(matches),
-                    // Which fields we're interested in.
-                    fields: ["name", "size", "type"],
-                    // Add our time constraint.
-                    since: clockResponse.clock
-                };
-
-                if (relativePath) {
-                    /* eslint-disable camelcase */
-                    sub.relative_root = relativePath;
-                }
-
-                watchmanClient.command(['subscribe', watch, 'grunt-watch', sub], function(subscribeError) {
-                    if (subscribeError) {
-                        // Probably an error in the subscription criteria.
-                        grunt.log.error('failed to subscribe: ', subscribeError);
-                        watchTaskDone(1);
-                        return;
-                    }
-
-                    grunt.log.ok('Listening for changes to files in ' + cwd);
-                });
-            });
-        });
-    };
-
     // On watch, we dynamically modify config to build only affected files. This
     // method is slightly complicated to deal with multiple changed files at once (copied
     // from the grunt-contrib-watch readme).
     var changedFiles = Object.create(null);
     var onChange = grunt.util._.debounce(function() {
-        var files = Object.keys(changedFiles);
-        grunt.config('eslint.amd.src', files);
-        grunt.config('eslint.yui.src', files);
-        grunt.config('shifter.options.paths', files);
-        grunt.config('gherkinlint.options.files', files);
-        grunt.config('babel.dist.files', [{expand: true, src: files, rename: babelRename}]);
-        changedFiles = Object.create(null);
+          var files = Object.keys(changedFiles);
+          grunt.config('eslint.amd.src', files);
+          grunt.config('eslint.yui.src', files);
+          grunt.config('uglify.amd.files', [{expand: true, src: files, rename: uglifyRename}]);
+          grunt.config('shifter.options.paths', files);
+          grunt.config('gherkinlint.options.files', files);
+          changedFiles = Object.create(null);
     }, 200);
 
     grunt.event.on('watch', function(action, filepath) {
-        changedFiles[filepath] = action;
-        onChange();
+          changedFiles[filepath] = action;
+          onChange();
     });
 
     // Register NPM tasks.
@@ -620,24 +348,17 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-sass');
     grunt.loadNpmTasks('grunt-eslint');
     grunt.loadNpmTasks('grunt-stylelint');
-    grunt.loadNpmTasks('grunt-babel');
-
-    // Rename the grunt-contrib-watch "watch" task because we're going to wrap it.
-    grunt.renameTask('watch', 'watch-grunt');
 
     // Register JS tasks.
     grunt.registerTask('shifter', 'Run Shifter against the current directory', tasks.shifter);
     grunt.registerTask('gherkinlint', 'Run gherkinlint against the current directory', tasks.gherkinlint);
     grunt.registerTask('ignorefiles', 'Generate ignore files for linters', tasks.ignorefiles);
-    grunt.registerTask('watch', 'Run tasks on file changes', tasks.watch);
     grunt.registerTask('yui', ['eslint:yui', 'shifter']);
-    grunt.registerTask('amd', ['eslint:amd', 'babel']);
+    grunt.registerTask('amd', ['eslint:amd', 'uglify']);
     grunt.registerTask('js', ['amd', 'yui']);
 
     // Register CSS taks.
     grunt.registerTask('css', ['stylelint:scss', 'sass', 'stylelint:css']);
-    grunt.registerTask('scss', ['stylelint:scss', 'sass']);
-    grunt.registerTask('rawcss', ['stylelint:css']);
 
     // Register the startup task.
     grunt.registerTask('startup', 'Run the correct tasks for the current directory', tasks.startup);

admin/antiviruses.php

@@ -33,7 +33,8 @@ $confirm = optional_param('confirm', 0, PARAM_BOOL);
 $PAGE->set_url('/admin/antiviruses.php', array('action' => $action, 'antivirus' => $antivirus));
 $PAGE->set_context(context_system::instance());
 
-require_admin();
+require_login();
+require_capability('moodle/site:config', context_system::instance());
 
 $returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageantiviruses";
 

admin/auth.php

@@ -11,7 +11,8 @@ require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/tablelib.php');
 
-require_admin();
+require_login();
+require_capability('moodle/site:config', context_system::instance());
 
 $returnurl = new moodle_url('/admin/settings.php', array('section'=>'manageauths'));
 

admin/category.php

@@ -30,7 +30,8 @@ $category = required_param('category', PARAM_SAFEDIR);
 $return = optional_param('return','', PARAM_ALPHA);
 $adminediting = optional_param('adminedit', -1, PARAM_BOOL);
 
-require_admin();
+/// no guest autologin
+require_login(0, false);
 $PAGE->set_context(context_system::instance());
 $PAGE->set_url('/admin/category.php', array('category' => $category));
 $PAGE->set_pagetype('admin-setting-' . $category);

admin/classes/form/purge_caches.php

@@ -50,7 +50,6 @@ class purge_caches extends \moodleform {
             $mform->createElement('advcheckbox', 'theme', '', get_string('purgethemecache', 'admin')),
             $mform->createElement('advcheckbox', 'lang', '', get_string('purgelangcache', 'admin')),
             $mform->createElement('advcheckbox', 'js', '', get_string('purgejscache', 'admin')),
-            $mform->createElement('advcheckbox', 'template', '', get_string('purgetemplates', 'admin')),
             $mform->createElement('advcheckbox', 'filter', '', get_string('purgefiltercache', 'admin')),
             $mform->createElement('advcheckbox', 'muc', '', get_string('purgemuc', 'admin')),
             $mform->createElement('advcheckbox', 'other', '', get_string('purgeothercaches', 'admin'))

admin/classes/local/settings/filesize.php

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

admin/cli/install.php

@@ -391,6 +391,7 @@ if ($interactive) {
 $CFG->wwwroot       = $wwwroot;
 $CFG->httpswwwroot  = $CFG->wwwroot;
 
+
 //We need dataroot before lang download
 $CFG->dataroot = $options['dataroot'];
 if ($interactive) {

admin/cli/reset_password.php

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

admin/cli/upgrade.php

@@ -52,8 +52,7 @@ list($options, $unrecognized) = cli_get_params(
         'allow-unstable'    => false,
         'help'              => false,
         'lang'              => $lang,
-        'verbose-settings'  => false,
-        'is-pending'        => false,
+        'verbose-settings'  => false
     ),
     array(
         'h' => 'help'
@@ -89,8 +88,6 @@ Options:
 --verbose-settings    Show new settings values. By default only the name of
                       new core or plugin settings are displayed. This option
                       outputs the new values as well as the setting name.
---is-pending          If an upgrade is needed it exits with an error code of
-                      2 so it distinct from other types of errors.
 -h, --help            Print out this help
 
 Example:
@@ -119,10 +116,6 @@ if (!moodle_needs_upgrading()) {
     cli_error(get_string('cliupgradenoneed', 'core_admin', $newversion), 0);
 }
 
-if ($options['is-pending']) {
-    cli_error(get_string('cliupgradepending', 'core_admin'), 2);
-}
-
 // Test environment first.
 list($envstatus, $environment_results) = check_moodle_environment(normalize_version($release), ENV_SELECT_RELEASE);
 if (!$envstatus) {

admin/courseformats.php

@@ -32,7 +32,8 @@ $syscontext = context_system::instance();
 $PAGE->set_url('/admin/courseformats.php');
 $PAGE->set_context($syscontext);
 
-require_admin();
+require_login();
+require_capability('moodle/site:config', $syscontext);
 require_sesskey();
 
 $return = new moodle_url('/admin/settings.php', array('section' => 'manageformats'));

admin/customfields.php

@@ -32,7 +32,8 @@ $syscontext = context_system::instance();
 $PAGE->set_url('/admin/customfields.php');
 $PAGE->set_context($syscontext);
 
-require_admin();
+require_login();
+require_capability('moodle/site:config', $syscontext);
 require_sesskey();
 
 $return = new moodle_url('/admin/settings.php', array('section' => 'managecustomfields'));

admin/dataformats.php

@@ -33,7 +33,8 @@ $syscontext = context_system::instance();
 $PAGE->set_url('/admin/dataformats.php');
 $PAGE->set_context($syscontext);
 
-require_admin();
+require_login();
+require_capability('moodle/site:config', $syscontext);
 require_sesskey();
 
 $return = new moodle_url('/admin/settings.php', array('section' => 'managedataformats'));

admin/editors.php

@@ -15,7 +15,8 @@ $confirm = optional_param('confirm', 0, PARAM_BOOL);
 $PAGE->set_url('/admin/editors.php', array('action'=>$action, 'editor'=>$editor));
 $PAGE->set_context(context_system::instance());
 
-require_admin();
+require_login();
+require_capability('moodle/site:config', context_system::instance());
 
 $returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=manageeditors";
 

admin/enrol.php

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

admin/licenses.php

@@ -23,7 +23,8 @@ require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/licenselib.php');
 
-require_admin();
+require_login();
+require_capability('moodle/site:config', context_system::instance());
 
 $returnurl = "$CFG->wwwroot/$CFG->admin/settings.php?section=managelicenses";
 

admin/media.php

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

admin/message.php

@@ -77,7 +77,7 @@ if (($form = data_submitted()) && confirm_sesskey()) {
                     // Record the site preference.
                     $preferences[$processor->name.'_provider_'.$componentprovidersetting] = $value;
                 }
-            } else if (property_exists($form, $componentprovidersetting)) {
+            } else if (array_key_exists($componentprovidersetting, $form)) {
                 // We must be processing loggedin or loggedoff checkboxes. Store
                 // defained comma-separated processors as setting value.
                 // Using array_filter eliminates elements set to 0 above.

admin/mnet/delete.php

@@ -34,6 +34,9 @@ $step   = optional_param('step', 'verify', PARAM_ALPHA);
 $hostid = required_param('hostid', PARAM_INT);
 
 
+
+$context = context_system::instance();
+
 $mnet = get_mnet_environment();
 
 $PAGE->set_url('/admin/mnet/delete.php');

admin/plugins.php

@@ -43,8 +43,9 @@ $confirminstallupdate = optional_param('confirminstallupdate', false, PARAM_BOOL
 // NOTE: do not use admin_externalpage_setup() here because it loads
 //       full admin tree which is not possible during uninstallation.
 
-require_admin();
+require_login();
 $syscontext = context_system::instance();
+require_capability('moodle/site:config', $syscontext);
 
 // URL params we want to maintain on redirects.
 $pageparams = array('updatesonly' => $updatesonly, 'contribonly' => $contribonly);

admin/qbehaviours.php

@@ -31,7 +31,7 @@ require_once($CFG->libdir . '/adminlib.php');
 require_once($CFG->libdir . '/tablelib.php');
 
 // Check permissions.
-require_login(null, false);
+require_login();
 $systemcontext = context_system::instance();
 require_capability('moodle/question:config', $systemcontext);
 

admin/qtypes.php

@@ -30,12 +30,12 @@ require_once($CFG->libdir . '/questionlib.php');
 require_once($CFG->libdir . '/adminlib.php');
 require_once($CFG->libdir . '/tablelib.php');
 
-admin_externalpage_setup('manageqtypes');
-
+// Check permissions.
 $systemcontext = context_system::instance();
 require_capability('moodle/question:config', $systemcontext);
 $canviewreports = has_capability('report/questioninstances:view', $systemcontext);
 
+admin_externalpage_setup('manageqtypes');
 $thispageurl = new moodle_url('/admin/qtypes.php');
 
 $qtypes = question_bank::get_all_qtypes();

admin/registration/index.php

@@ -32,25 +32,24 @@ require_once($CFG->libdir . '/adminlib.php');
 
 admin_externalpage_setup('registrationmoodleorg');
 
-$unregistration = optional_param('unregistration', false, PARAM_BOOL);
-$confirm = optional_param('confirm', false, PARAM_BOOL);
+$unregistration = optional_param('unregistration', 0, PARAM_INT);
 
 if ($unregistration && \core\hub\registration::is_registered()) {
-    if ($confirm) {
-        require_sesskey();
-        \core\hub\registration::unregister(false, false);
+    $siteunregistrationform = new \core\hub\site_unregistration_form();
 
+    if ($siteunregistrationform->is_cancelled()) {
+        redirect(new moodle_url('/admin/registration/index.php'));
+    } else if ($data = $siteunregistrationform->get_data()) {
+        \core\hub\registration::unregister($data->unpublishalladvertisedcourses,
+            $data->unpublishalluploadedcourses);
         if (!\core\hub\registration::is_registered()) {
             redirect(new moodle_url('/admin/registration/index.php'));
         }
     }
 
     echo $OUTPUT->header();
-    echo $OUTPUT->confirm(
-        get_string('registerwithmoodleorgremove', 'core_hub'),
-        new moodle_url(new moodle_url('/admin/registration/index.php', ['unregistration' => 1, 'confirm' => 1])),
-        new moodle_url(new moodle_url('/admin/registration/index.php'))
-    );
+    echo $OUTPUT->heading(get_string('registerwithmoodleorgremove', 'core_hub'), 3, 'main');
+    $siteunregistrationform->display();
     echo $OUTPUT->footer();
     exit;
 }
@@ -120,9 +119,8 @@ $siteregistrationform->display();
 if (\core\hub\registration::is_registered()) {
     // Unregister link.
     $unregisterhuburl = new moodle_url("/admin/registration/index.php", ['unregistration' => 1]);
-    echo html_writer::div(html_writer::link($unregisterhuburl, get_string('unregister', 'hub')), 'unregister mt-2');
+    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 mt-2');
+    echo html_writer::div(html_writer::link(new moodle_url($returnurl), get_string('skipregistration', 'hub')), 'skipregistration');
 }
 echo $OUTPUT->footer();

admin/repository.php

@@ -123,13 +123,13 @@ if (($action == 'edit') || ($action == 'new')) {
             }
             $instanceoptionnames = repository::static_function($repository, 'get_instance_option_names');
             if (!empty($instanceoptionnames)) {
-                if (property_exists($fromform, 'enablecourseinstances')) {
+                if (array_key_exists('enablecourseinstances', $fromform)) {
                     $settings['enablecourseinstances'] = $fromform->enablecourseinstances;
                 }
                 else {
                     $settings['enablecourseinstances'] = 0;
                 }
-                if (property_exists($fromform, 'enableuserinstances')) {
+                if (array_key_exists('enableuserinstances', $fromform)) {
                     $settings['enableuserinstances'] = $fromform->enableuserinstances;
                 }
                 else {

admin/roles/allow.php

@@ -46,6 +46,25 @@ $controller = new $classformode[$mode]();
 
 if (optional_param('submit', false, PARAM_BOOL) && data_submitted() && confirm_sesskey()) {
     $controller->process_submission();
+    $event = null;
+    // Create event depending on mode.
+    switch ($mode) {
+        case 'assign':
+            $event = \core\event\role_allow_assign_updated::create(array('context' => $syscontext));
+            break;
+        case 'override':
+            $event = \core\event\role_allow_override_updated::create(array('context' => $syscontext));
+            break;
+        case 'switch':
+            $event = \core\event\role_allow_switch_updated::create(array('context' => $syscontext));
+            break;
+        case 'view':
+            $event = \core\event\role_allow_view_updated::create(array('context' => $syscontext));
+            break;
+    }
+    if ($event) {
+        $event->trigger();
+    }
     redirect($baseurl);
 }
 

admin/roles/classes/allow_assign_page.php

@@ -46,8 +46,4 @@ class core_role_allow_assign_page extends core_role_allow_role_page {
     public function get_intro_text() {
         return get_string('configallowassign', 'core_admin');
     }
-
-    protected function get_eventclass() {
-        return \core\event\role_allow_assign_updated::class;
-    }
 }

admin/roles/classes/allow_override_page.php

@@ -46,8 +46,4 @@ class core_role_allow_override_page extends core_role_allow_role_page {
     public function get_intro_text() {
         return get_string('configallowoverride2', 'core_admin');
     }
-
-    protected function get_eventclass() {
-        return \core\event\role_allow_override_updated::class;
-    }
 }

admin/roles/classes/allow_role_page.php

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

admin/roles/classes/allow_switch_page.php

@@ -58,8 +58,4 @@ class core_role_allow_switch_page extends core_role_allow_role_page {
     public function get_intro_text() {
         return get_string('configallowswitch', 'core_admin');
     }
-
-    protected function get_eventclass() {
-        return \core\event\role_allow_switch_updated::class;
-    }
 }

admin/roles/classes/allow_view_page.php

@@ -74,8 +74,4 @@ class core_role_allow_view_page extends core_role_allow_role_page {
     public function get_intro_text() {
         return get_string('configallowview', 'core_admin');
     }
-
-    protected function get_eventclass() {
-        return \core\event\role_allow_view_updated::class;
-    }
 }

admin/roles/classes/define_role_table_advanced.php

@@ -434,7 +434,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
     }
 
     public function save_changes() {
-        global $DB, $USER;
+        global $DB;
 
         if (!$this->roleid) {
             // Creating role.
@@ -444,20 +444,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
             // Updating role.
             $DB->update_record('role', $this->role);
 
-            // Trigger role updated event.
-            \core\event\role_updated::create([
-                'userid' => $USER->id,
-                'objectid' => $this->role->id,
-                'context' => $this->context,
-                'other' => [
-                    'name' => $this->role->name,
-                    'shortname' => $this->role->shortname,
-                    'description' => $this->role->description,
-                    'archetype' => $this->role->archetype,
-                    'contextlevels' => $this->contextlevels
-                ]
-            ])->trigger();
-
             // This will ensure the course contacts cache is purged so name changes get updated in
             // the UI. It would be better to do this only when we know that fields affected are
             // updated. But thats getting into the weeds of the coursecat cache and role edits
@@ -487,17 +473,10 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
         $addfunction = "core_role_set_{$type}_allowed";
         $deltable = 'role_allow_'.$type;
         $field = 'allow'.$type;
-        $eventclass = "\\core\\event\\role_allow_" . $type . "_updated";
-        $context = context_system::instance();
 
         foreach ($current as $roleid) {
             if (!in_array($roleid, $wanted)) {
                 $DB->delete_records($deltable, array('roleid'=>$this->roleid, $field=>$roleid));
-                $eventclass::create([
-                    'context' => $context,
-                    'objectid' => $this->roleid,
-                    'other' => ['targetroleid' => $roleid, 'allow' => false]
-                ])->trigger();
                 continue;
             }
             $key = array_search($roleid, $wanted);
@@ -509,14 +488,6 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
                 $roleid = $this->roleid;
             }
             $addfunction($this->roleid, $roleid);
-
-            if (in_array($roleid, $wanted)) {
-                $eventclass::create([
-                    'context' => $context,
-                    'objectid' => $this->roleid,
-                    'other' => ['targetroleid' => $roleid, 'allow' => true]
-                ])->trigger();
-            }
         }
     }
 

admin/roles/define.php

@@ -52,12 +52,10 @@ if ($return === 'manage') {
     $returnurl = new moodle_url('/admin/roles/define.php', array('action'=>'view', 'roleid'=>$roleid));;
 }
 
-admin_externalpage_setup('defineroles', '', array('action' => $action, 'roleid' => $roleid),
-    new moodle_url('/admin/roles/define.php'));
-
 // Check access permissions.
 $systemcontext = context_system::instance();
 require_capability('moodle/role:manage', $systemcontext);
+admin_externalpage_setup('defineroles', '', array('action' => $action, 'roleid' => $roleid), new moodle_url('/admin/roles/define.php'));
 
 // Export role.
 if ($action === 'export') {
@@ -200,6 +198,19 @@ if (optional_param('cancel', false, PARAM_BOOL)) {
 if (optional_param('savechanges', false, PARAM_BOOL) && confirm_sesskey() && $definitiontable->is_submission_valid()) {
     $definitiontable->save_changes();
     $tableroleid = $definitiontable->get_role_id();
+    // Trigger event.
+    $event = \core\event\role_capabilities_updated::create(
+        array(
+            'context' => $systemcontext,
+            'objectid' => $tableroleid
+        )
+    );
+    $event->set_legacy_logdata(array(SITEID, 'role', $action, 'admin/roles/define.php?action=view&roleid=' . $tableroleid,
+        $definitiontable->get_role_name(), '', $USER->id));
+    if (!empty($role)) {
+        $event->add_record_snapshot('role', $role);
+    }
+    $event->trigger();
 
     if ($action === 'add') {
         redirect(new moodle_url('/admin/roles/define.php', array('action'=>'view', 'roleid'=>$definitiontable->get_role_id())));

admin/roles/manage.php

@@ -46,11 +46,10 @@ if ($action) {
 $baseurl = $CFG->wwwroot . '/' . $CFG->admin . '/roles/manage.php';
 $defineurl = $CFG->wwwroot . '/' . $CFG->admin . '/roles/define.php';
 
-admin_externalpage_setup('defineroles');
-
 // Check access permissions.
 $systemcontext = context_system::instance();
 require_capability('moodle/role:manage', $systemcontext);
+admin_externalpage_setup('defineroles');
 
 // Get some basic data we are going to need.
 $roles = role_fix_names(get_all_roles(), $systemcontext, ROLENAME_ORIGINAL);

admin/roles/override.php

@@ -134,6 +134,22 @@ $overridestable->read_submitted_permissions();
 if (optional_param('savechanges', false, PARAM_BOOL) && confirm_sesskey()) {
     $overridestable->save_changes();
     $rolename = $overridableroles[$roleid];
+    // Trigger event.
+    $event = \core\event\role_capabilities_updated::create(
+        array(
+            'context' => $context,
+            'objectid' => $roleid,
+        )
+    );
+
+    $event->set_legacy_logdata(
+        array(
+            $course->id, 'role', 'override', 'admin/roles/override.php?contextid=' . $context->id . '&roleid=' . $roleid,
+            $rolename, '', $USER->id
+        )
+    );
+    $event->add_record_snapshot('role', $role);
+    $event->trigger();
 
     redirect($returnurl);
 }

admin/roles/usersroles.php

@@ -45,7 +45,7 @@ $PAGE->set_pagelayout('admin');
 
 // Check login and permissions.
 if ($course->id == SITEID) {
-    require_login(null, false);
+    require_login();
     $PAGE->set_context($usercontext);
 } else {
     require_login($course);

admin/settings/analytics.php

@@ -24,7 +24,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-if ($hassiteconfig && \core_analytics\manager::is_analytics_enabled()) {
+if ($hassiteconfig) {
 
     $settings = new admin_settingpage('analyticssite', new lang_string('analyticssiteinfo', 'analytics'));
     $ADMIN->add('analytics', $settings);

admin/settings/appearance.php

@@ -76,24 +76,6 @@ preferences,moodle|/user/preferences.php|t/preferences',
 
     $ADMIN->add('appearance', $temp);
 
-    // Course colours section.
-    $temp = new admin_settingpage('coursecolors', new lang_string('coursecolorsettings', 'admin'));
-    $temp->add(new admin_setting_heading('coursecolorheading', '',
-        new lang_string('coursecolorheading_desc', 'admin')));
-
-    $basecolors = ['#81ecec', '#74b9ff', '#a29bfe', '#dfe6e9', '#00b894',
-            '#0984e3', '#b2bec3', '#fdcb6e', '#fd79a8', '#6c5ce7'];
-
-    foreach ($basecolors as $key => $color) {
-        $number = $key + 1;
-        $name = 'core_admin/coursecolor' . $number;
-        $title = get_string('coursecolor', 'admin', $number);
-        $setting = new admin_setting_configcolourpicker($name, $title, '', $color);
-        $temp->add($setting);
-    }
-
-    $ADMIN->add('appearance', $temp);
-
     // Calendar settings.
     $temp = new admin_settingpage('calendar', new lang_string('calendarsettings','admin'));
 
@@ -197,10 +179,6 @@ preferences,moodle|/user/preferences.php|t/preferences',
         'idnumber' => new lang_string('sort_idnumber', 'admin'),
     );
     $temp->add(new admin_setting_configselect('navsortmycoursessort', new lang_string('navsortmycoursessort', 'admin'), new lang_string('navsortmycoursessort_help', 'admin'), 'sortorder', $sortoptions));
-    $temp->add(new admin_setting_configcheckbox('navsortmycourseshiddenlast',
-            new lang_string('navsortmycourseshiddenlast', 'admin'),
-            new lang_string('navsortmycourseshiddenlast_help', 'admin'),
-            1));
     $temp->add(new admin_setting_configtext('navcourselimit', new lang_string('navcourselimit', 'admin'),
         new lang_string('confignavcourselimit', 'admin'), 10, PARAM_INT));
     $temp->add(new admin_setting_configcheckbox('usesitenameforsitepages', new lang_string('usesitenameforsitepages', 'admin'), new lang_string('configusesitenameforsitepages', 'admin'), 0));
@@ -279,10 +257,4 @@ preferences,moodle|/user/preferences.php|t/preferences',
     $temp->add(new admin_setting_configtextarea('additionalhtmlfooter', new lang_string('additionalhtmlfooter', 'admin'), new lang_string('additionalhtmlfooter_desc', 'admin'), '', PARAM_RAW));
     $ADMIN->add('appearance', $temp);
 
-    $setting = new admin_setting_configcheckbox('cachetemplates', new lang_string('cachetemplates', 'admin'),
-        new lang_string('cachetemplates_help', 'admin'), 1);
-    $setting->set_updatedcallback('template_reset_all_caches');
-    $temp = new admin_settingpage('templates', new lang_string('templates', 'admin'));
-    $temp->add($setting);
-    $ADMIN->add('appearance', $temp);
 } // end of speedup

admin/settings/courses.php

@@ -163,15 +163,9 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
 
     // "courserequests" settingpage.
     $temp = new admin_settingpage('courserequest', new lang_string('courserequest'));
-    $temp->add(new admin_setting_configcheckbox('enablecourserequests',
-        new lang_string('enablecourserequests', 'admin'),
-        new lang_string('configenablecourserequests', 'admin'), 1));
-    $temp->add(new admin_settings_coursecat_select('defaultrequestcategory',
-        new lang_string('defaultrequestcategory', 'admin'),
-        new lang_string('configdefaultrequestcategory', 'admin'), 1));
-    $temp->add(new admin_setting_configcheckbox('lockrequestcategory',
-        new lang_string('lockrequestcategory', 'admin'),
-        new lang_string('configlockrequestcategory', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('enablecourserequests', new lang_string('enablecourserequests', 'admin'), new lang_string('configenablecourserequests', 'admin'), 0));
+    $temp->add(new admin_settings_coursecat_select('defaultrequestcategory', new lang_string('defaultrequestcategory', 'admin'), new lang_string('configdefaultrequestcategory', 'admin'), 1));
+    $temp->add(new admin_setting_configcheckbox('requestcategoryselection', new lang_string('requestcategoryselection', 'admin'), new lang_string('configrequestcategoryselection', 'admin'), 0));
     $temp->add(new admin_setting_users_with_capability('courserequestnotify', new lang_string('courserequestnotify', 'admin'), new lang_string('configcourserequestnotify2', 'admin'), array(), 'moodle/site:approvecourse'));
     $ADMIN->add('courses', $temp);
 
@@ -212,11 +206,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_role_assignments', new lang_string('generalroleassignments','backup'), new lang_string('configgeneralroleassignments','backup'), array('value'=>1, 'locked'=>0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_activities', new lang_string('generalactivities','backup'), new lang_string('configgeneralactivities','backup'), array('value'=>1, 'locked'=>0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_blocks', new lang_string('generalblocks','backup'), new lang_string('configgeneralblocks','backup'), array('value'=>1, 'locked'=>0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock(
-            'backup/backup_general_files',
-            new lang_string('generalfiles', 'backup'),
-            new lang_string('configgeneralfiles', 'backup'),
-            array('value' => '1', 'locked' => 0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_filters', new lang_string('generalfilters','backup'), new lang_string('configgeneralfilters','backup'), array('value'=>1, 'locked'=>0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_comments', new lang_string('generalcomments','backup'), new lang_string('configgeneralcomments','backup'), array('value'=>1, 'locked'=>0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_badges', new lang_string('generalbadges','backup'), new lang_string('configgeneralbadges','backup'), array('value'=>1,'locked'=>0)));
@@ -352,10 +341,6 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_role_assignments', new lang_string('generalroleassignments','backup'), new lang_string('configgeneralroleassignments','backup'), 1));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_activities', new lang_string('generalactivities','backup'), new lang_string('configgeneralactivities','backup'), 1));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_blocks', new lang_string('generalblocks','backup'), new lang_string('configgeneralblocks','backup'), 1));
-    $temp->add(new admin_setting_configcheckbox(
-            'backup/backup_auto_files',
-            new lang_string('generalfiles', 'backup'),
-            new lang_string('configgeneralfiles', 'backup'), '1'));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_filters', new lang_string('generalfilters','backup'), new lang_string('configgeneralfilters','backup'), 1));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_comments', new lang_string('generalcomments','backup'), new lang_string('configgeneralcomments','backup'), 1));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_badges', new lang_string('generalbadges','backup'), new lang_string('configgeneralbadges','backup'), 1));

admin/settings/development.php

@@ -29,17 +29,13 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add(new admin_setting_configcheckbox('forceclean', new lang_string('forceclean', 'core_admin'),
         new lang_string('forceclean_desc', 'core_admin'), 0));
 
-    // Relative course dates mode setting.
-    $temp->add(new admin_setting_configcheckbox('enablecourserelativedates',
-        new lang_string('enablecourserelativedates', 'core_admin'),
-        new lang_string('enablecourserelativedates_desc', 'core_admin'), 0));
-
     $ADMIN->add('experimental', $temp);
 
     // "debugging" settingpage
     $temp = new admin_settingpage('debugging', new lang_string('debugging', 'admin'));
     $temp->add(new admin_setting_special_debug());
     $temp->add(new admin_setting_configcheckbox('debugdisplay', new lang_string('debugdisplay', 'admin'), new lang_string('configdebugdisplay', 'admin'), ini_get_bool('display_errors')));
+    $temp->add(new admin_setting_configcheckbox('debugsmtp', new lang_string('debugsmtp', 'admin'), new lang_string('configdebugsmtp', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('perfdebug', new lang_string('perfdebug', 'admin'), new lang_string('configperfdebug', 'admin'), '7', '15', '7'));
     $temp->add(new admin_setting_configcheckbox('debugstringids', new lang_string('debugstringids', 'admin'), new lang_string('debugstringids_desc', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('debugvalidators', new lang_string('debugvalidators', 'admin'), new lang_string('configdebugvalidators', 'admin'), 0));

admin/settings/frontpage.php

@@ -58,7 +58,7 @@ if (!during_initial_install()) { //do not use during installation
         foreach ($roles as $role) {
             if (empty($role->archetype) or $role->archetype === 'guest' or $role->archetype === 'frontpage' or $role->archetype === 'student') {
                 $options[$role->id] = $role->localname;
-                if ($role->archetype === 'frontpage' && !$defaultfrontpageroleid) {
+                if ($role->archetype === 'frontpage') {
                     $defaultfrontpageroleid = $role->id;
                 }
             }

admin/settings/plugins.php

@@ -175,13 +175,6 @@ if ($hassiteconfig) {
         $plugin->load_settings($ADMIN, 'antivirussettings', $hassiteconfig);
     }
 
-    // Machine learning backend plugins.
-    $ADMIN->add('modules', new admin_category('mlbackendsettings', new lang_string('mlbackendsettings', 'admin')));
-    $plugins = core_plugin_manager::instance()->get_plugins_of_type('mlbackend');
-    foreach ($plugins as $plugin) {
-        $plugin->load_settings($ADMIN, 'mlbackendsettings', $hassiteconfig);
-    }
-
 /// License types
     $ADMIN->add('modules', new admin_category('licensesettings', new lang_string('licenses')));
     $temp = new admin_settingpage('managelicenses', new lang_string('managelicenses', 'admin'));

admin/settings/security.php

@@ -1,29 +1,4 @@
 <?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 security related settings links for security category to admin tree.
- *
- * @copyright  1999 Martin Dougiamas  http://dougiamas.com
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-use core_admin\local\settings\filesize;
 
 if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
 
@@ -42,7 +17,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add(new admin_setting_configcheckbox('forcelogin', new lang_string('forcelogin', 'admin'), new lang_string('configforcelogin', 'admin'), 0));
     $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('opentowebcrawlers', new lang_string('opentowebcrawlers', 'admin'), new lang_string('configopentowebcrawlers', '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'),
@@ -61,9 +36,12 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     // maxbytes set to 0 will allow the maximum server limit for uploads
     $temp->add(new admin_setting_configselect('maxbytes', new lang_string('maxbytes', 'admin'), new lang_string('configmaxbytes', 'admin'), 0, $max_upload_choices));
     // 100MB
-    $defaultuserquota = 100 * filesize::UNIT_MB;
-    $temp->add(new filesize('userquota', new lang_string('userquota', 'admin'),
-            new lang_string('userquota_desc', 'admin'), $defaultuserquota));
+    $defaultuserquota = 104857600;
+    $params = new stdClass();
+    $params->bytes = $defaultuserquota;
+    $params->displaysize = display_size($defaultuserquota);
+    $temp->add(new admin_setting_configtext('userquota', new lang_string('userquota', 'admin'),
+                new lang_string('configuserquota', 'admin', $params), $defaultuserquota, PARAM_INT, 30));
 
     $temp->add(new admin_setting_configcheckbox('allowobjectembed', new lang_string('allowobjectembed', 'admin'), new lang_string('configallowobjectembed', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('enabletrusttext', new lang_string('enabletrusttext', 'admin'), new lang_string('configenabletrusttext', 'admin'), 0));

admin/settings/server.php

@@ -172,10 +172,7 @@ $temp->add(new admin_setting_configselect('tempdatafoldercleanup', new lang_stri
 
 $ADMIN->add('server', $temp);
 
-    $temp->add(new admin_setting_configduration('filescleanupperiod',
-        new lang_string('filescleanupperiod', 'admin'),
-        new lang_string('filescleanupperiod_help', 'admin'),
-        86400));
+
 
 $ADMIN->add('server', new admin_externalpage('environment', new lang_string('environment','admin'), "$CFG->wwwroot/$CFG->admin/environment.php"));
 $ADMIN->add('server', new admin_externalpage('phpinfo', new lang_string('phpinfo'), "$CFG->wwwroot/$CFG->admin/phpinfo.php"));
@@ -271,14 +268,6 @@ $temp->add(
         ]
     )
 );
-$temp->add(
-    new admin_setting_configcheckbox(
-        'task_logtostdout',
-        new lang_string('task_logtostdout', 'admin'),
-        new lang_string('task_logtostdout_desc', 'admin'),
-        1
-    )
-);
 
 if (\core\task\logmanager::uses_standard_settings()) {
     $temp->add(

admin/settings/subsystems.php

@@ -48,30 +48,4 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
 
     $optionalsubsystems->add(new admin_setting_configcheckbox('allowstealth', new lang_string('allowstealthmodules'),
         new lang_string('allowstealthmodules_help'), 0, 1, 0));
-
-    $optionalsubsystems->add(new admin_setting_configcheckbox('enableanalytics', new lang_string('enableanalytics', 'admin'),
-        new lang_string('configenableanalytics', 'admin'), 1, 1, 0));
-
-    $fullunicodesupport = true;
-    if ($DB->get_dbfamily() == 'mysql') {
-        $collation = $DB->get_dbcollation();
-        $collationinfo = explode('_', $collation);
-        $charset = reset($collationinfo);
-        $fullunicodesupport = $charset === 'utf8mb4';
-    }
-
-    if ($fullunicodesupport) {
-        $optionalsubsystems->add(new admin_setting_configcheckbox(
-            'allowemojipicker',
-            new lang_string('allowemojipicker', 'admin'),
-            new lang_string('configallowemojipicker', 'admin'),
-            1
-        ));
-    } else {
-        $optionalsubsystems->add(new admin_setting_description(
-            'allowemojipicker',
-            new lang_string('allowemojipicker', 'admin'),
-            new lang_string('configallowemojipickerincompatible', 'admin')
-        ));
-    }
 }

admin/settings/top.php

@@ -31,7 +31,6 @@ $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('h5p', new lang_string('h5p', 'core_h5p')));
 $ADMIN->add('root', new admin_category('location', new lang_string('location','admin')));
 $ADMIN->add('root', new admin_category('language', new lang_string('language')));
 $ADMIN->add('root', new admin_category('messaging', new lang_string('messagingcategory', 'admin')));

admin/settings/users.php

@@ -1,6 +1,6 @@
 <?php
 
-// This file defines settingpages and externalpages under the "users" category.
+// This file defines settingpages and externalpages under the "users" category
 
 $ADMIN->add('users', new admin_category('accounts', new lang_string('accounts', 'admin')));
 $ADMIN->add('users', new admin_category('roles', new lang_string('permissions', 'role')));
@@ -13,47 +13,15 @@ if ($hassiteconfig
  or has_capability('moodle/role:manage', $systemcontext)
  or has_capability('moodle/role:assign', $systemcontext)
  or has_capability('moodle/cohort:manage', $systemcontext)
- or has_capability('moodle/cohort:view', $systemcontext)) { // Speedup for non-admins, add all caps used on this page.
+ or has_capability('moodle/cohort:view', $systemcontext)) { // speedup for non-admins, add all caps used on this page
 
 
-    // Stuff under the "accounts" subcategory.
+    // 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'));
 
-    // User management settingpage.
-    $temp = new admin_settingpage('usermanagement', new lang_string('usermanagement', 'admin'));
-    if ($ADMIN->fulltree) {
-        $choices = array();
-        $choices['realname'] = new lang_string('fullnameuser');
-        $choices['lastname'] = new lang_string('lastname');
-        $choices['firstname'] = new lang_string('firstname');
-        $choices['username'] = new lang_string('username');
-        $choices['email'] = new lang_string('email');
-        $choices['city'] = new lang_string('city');
-        $choices['country'] = new lang_string('country');
-        $choices['confirmed'] = new lang_string('confirmed', 'admin');
-        $choices['suspended'] = new lang_string('suspended', 'auth');
-        $choices['profile'] = new lang_string('profilefields', 'admin');
-        $choices['courserole'] = new lang_string('courserole', 'filters');
-        $choices['anycourses'] = new lang_string('anycourses', 'filters');
-        $choices['systemrole'] = new lang_string('globalrole', 'role');
-        $choices['cohort'] = new lang_string('idnumber', 'core_cohort');
-        $choices['firstaccess'] = new lang_string('firstaccess', 'filters');
-        $choices['lastaccess'] = new lang_string('lastaccess');
-        $choices['neveraccessed'] = new lang_string('neveraccessed', 'filters');
-        $choices['timemodified'] = new lang_string('lastmodified');
-        $choices['nevermodified'] = new lang_string('nevermodified', 'filters');
-        $choices['auth'] = new lang_string('authentication');
-        $choices['idnumber'] = new lang_string('idnumber');
-        $choices['lastip'] = new lang_string('lastip');
-        $choices['mnethostid'] = new lang_string('mnetidprovider', 'mnet');
-        $temp->add(new admin_setting_configmultiselect('userfiltersdefault', new lang_string('userfiltersdefault', 'admin'),
-            new lang_string('userfiltersdefault_desc', 'admin'), array('realname'), $choices));
-    }
-    $ADMIN->add('accounts', $temp);
-
-    // User default preferences settingpage.
+    // "User default preferences" settingpage.
     $temp = new admin_settingpage('userdefaultpreferences', new lang_string('userdefaultpreferences', 'admin'));
     if ($ADMIN->fulltree) {
         $choices = array();
@@ -94,9 +62,9 @@ if ($hassiteconfig
     $ADMIN->add('accounts', new admin_externalpage('cohorts', new lang_string('cohorts', 'cohort'), $CFG->wwwroot . '/cohort/index.php', array('moodle/cohort:manage', 'moodle/cohort:view')));
 
 
-    // Stuff under the "roles" subcategory.
+    // stuff under the "roles" subcategory
 
-    // User policies settingpage.
+    // "userpolicies" settingpage
     $temp = new admin_settingpage('userpolicies', new lang_string('userpolicies', 'admin'));
     if ($ADMIN->fulltree) {
         if (!during_initial_install()) {
@@ -170,7 +138,7 @@ if ($hassiteconfig
             $temp->add(new admin_setting_configselect('restorernewroleid', new lang_string('restorernewroleid', 'admin'),
                           new lang_string('restorernewroleid_help', 'admin'), $defaultteacherid, $restorersnewrole));
 
-            // Release memory.
+            // release memory
             unset($otherroles);
             unset($guestroles);
             unset($userroles);
@@ -241,7 +209,7 @@ if ($hassiteconfig
     $ADMIN->add('roles', new admin_externalpage('assignroles', new lang_string('assignglobalroles', 'role'), "$CFG->wwwroot/$CFG->admin/roles/assign.php?contextid=".$systemcontext->id, 'moodle/role:assign'));
     $ADMIN->add('roles', new admin_externalpage('checkpermissions', new lang_string('checkglobalpermissions', 'role'), "$CFG->wwwroot/$CFG->admin/roles/check.php?contextid=".$systemcontext->id, array('moodle/role:assign', 'moodle/role:safeoverride', 'moodle/role:override', 'moodle/role:manage')));
 
-} // End of speedup.
+} // end of speedup
 
 // Privacy settings.
 if ($hassiteconfig) {

admin/tasklogs.php

@@ -40,6 +40,9 @@ $strheading = get_string('tasklogs', 'tool_task');
 $PAGE->set_title($strheading);
 $PAGE->set_heading($strheading);
 
+require_login();
+
+require_capability('moodle/site:config', context_system::instance());
 admin_externalpage_setup('tasklogs');
 
 $logid = optional_param('logid', null, PARAM_INT);
@@ -53,7 +56,7 @@ if (null !== $logid) {
         header("Content-Disposition: attachment; filename=\"{$filename}\"");
     }
 
-    readstring_accel($log->output, 'text/plain');
+    readstring_accel($log->output, 'text/plain', false);
     exit;
 }
 

admin/templates/setting_configfilesize.mustache

@@ -1,50 +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_configfilesize
-
-    Admin file size setting template.
-
-    Context variables required for this template:
-    * name - form element name
-    * options - list of options for units containing name, value, selected
-    * value - yes
-    * id - element id
-
-    Example context (json):
-    {
-        "name": "test",
-        "value": "5",
-        "id": "test0",
-        "options": [ { "name": "KB", "value": "1024", "selected": true } ]
-    }
-}}
-{{!
-    Setting configfilesize.
-}}
-<div class="form-filesize defaultsnext">
-    <div class="form-inline">
-        <input type="text" size="5" id="{{id}}v" name="{{name}}[v]" value="{{value}}" class="form-control text-ltr">
-        <label class="sr-only" for="{{id}}u">{{#str}}filesizeunits, admin{{/str}}</label>
-        <select id="{{id}}u" name="{{name}}[u]" class="form-control custom-select">
-            {{#options}}
-                <option value="{{value}}" {{#selected}}selected{{/selected}}>{{name}}</option>
-            {{/options}}
-        </select>
-    </div>
-</div>
-

admin/tests/behat/filter_users.feature

@@ -6,11 +6,11 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
 
   Background:
     Given the following "users" exist:
-      | username | firstname | lastname | email | auth | confirmed | lastip |
-      | user1 | User | One | one@example.com | manual | 0 | 127.0.1.1 |
-      | user2 | User | Two | two@example.com | ldap | 1 | 0.0.0.0 |
-      | user3 | User | Three | three@example.com | manual | 1 | 0.0.0.0 |
-      | user4 | User | Four | four@example.com | ldap | 0 | 127.0.1.2 |
+      | username | firstname | lastname | email | auth | confirmed |
+      | user1 | User | One | one@example.com | manual | 0 |
+      | user2 | User | Two | two@example.com | ldap | 1 |
+      | user3 | User | Three | three@example.com | manual | 1 |
+      | user4 | User | Four | four@example.com | ldap | 0 |
     And the following "cohorts" exist:
       | name | idnumber |
       | Cohort 1 | CH1 |
@@ -82,25 +82,3 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
     And I should not see "User Two"
     And I should not see "User Three"
     And I should see "User Four"
-
-  Scenario: Filter user accounts by last IP address
-    When I set the following fields to these values:
-      | id_lastip | 127.0.1.1 |
-    And I press "Add filter"
-    Then I should see "User One"
-    And I should not see "User Two"
-    And I should not see "User Three"
-    And I should not see "User Four"
-    And I press "Remove all filters"
-    And I set the following fields to these values:
-      | id_lastip | 127.0.1.2 |
-    And I press "Add filter"
-    And I should not see "User One"
-    And I should not see "User Two"
-    And I should not see "User Three"
-    And I should see "User Four"
-    And I press "Remove all filters"
-    And I should see "User One"
-    And I should see "User Two"
-    And I should see "User Three"
-    And I should see "User Four"

admin/tests/behat/filter_users_settings.feature

@@ -1,150 +0,0 @@
-@core @core_admin @javascript
-Feature: An administrator can configure the available user list filters
-  In order to have all needed user filters instantly at hand
-  As an admin
-  I want to configure the filters which are shown as default
-
-  Scenario: Do not change the user filter default configuration
-    When I log in as "admin"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
-    And I should not see "Firstname" in the "New filter" "fieldset"
-    And I should not see "Username" in the "New filter" "fieldset"
-    And I should not see "Email address" in the "New filter" "fieldset"
-    And I should not see "City/town" in the "New filter" "fieldset"
-    And I should not see "Country" in the "New filter" "fieldset"
-    And I should not see "Confirmed" in the "New filter" "fieldset"
-    And I should not see "Suspended account" in the "New filter" "fieldset"
-    And I should not see "User profile fields" in the "New filter" "fieldset"
-    And I should not see "Course role" in the "New filter" "fieldset"
-    And I should not see "Enrolled in any course" in the "New filter" "fieldset"
-    And I should not see "System role" in the "New filter" "fieldset"
-    And I should not see "Cohort ID" in the "New filter" "fieldset"
-    And I should not see "First access" in the "New filter" "fieldset"
-    And I should not see "Last access" in the "New filter" "fieldset"
-    And I should not see "Last modified" in the "New filter" "fieldset"
-    And I should not see "Authentication" in the "New filter" "fieldset"
-    And I should not see "ID number" in the "New filter" "fieldset"
-    And I should not see "Last IP address" in the "New filter" "fieldset"
-    And I should not see "MNet ID provider" in the "New filter" "fieldset"
-    And I navigate to "Users > Accounts > Bulk user actions" in site administration
-    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
-    And I should not see "Firstname" in the "New filter" "fieldset"
-    And I should not see "Username" in the "New filter" "fieldset"
-    And I should not see "Email address" in the "New filter" "fieldset"
-    And I should not see "City/town" in the "New filter" "fieldset"
-    And I should not see "Country" in the "New filter" "fieldset"
-    And I should not see "Confirmed" in the "New filter" "fieldset"
-    And I should not see "Suspended account" in the "New filter" "fieldset"
-    And I should not see "User profile fields" in the "New filter" "fieldset"
-    And I should not see "Course role" in the "New filter" "fieldset"
-    And I should not see "Enrolled in any course" in the "New filter" "fieldset"
-    And I should not see "System role" in the "New filter" "fieldset"
-    And I should not see "Cohort ID" in the "New filter" "fieldset"
-    And I should not see "First access" in the "New filter" "fieldset"
-    And I should not see "Last access" in the "New filter" "fieldset"
-    And I should not see "Last modified" in the "New filter" "fieldset"
-    And I should not see "Authentication" in the "New filter" "fieldset"
-    And I should not see "ID number" in the "New filter" "fieldset"
-    And I should not see "Last IP address" in the "New filter" "fieldset"
-    And I should not see "MNet ID provider" in the "New filter" "fieldset"
-
-  Scenario: Change the user filter default configuration to something else
-    Given the following config values are set as admin:
-      | userfiltersdefault | realname,username,email |
-    And I log in as "admin"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
-    And I should not see "Firstname" in the "New filter" "fieldset"
-    And I should see "Username" in the "New filter" "fieldset"
-    And I should see "Email address" in the "New filter" "fieldset"
-    And I should not see "City/town" in the "New filter" "fieldset"
-    And I should not see "Country" in the "New filter" "fieldset"
-    And I should not see "Confirmed" in the "New filter" "fieldset"
-    And I should not see "Suspended account" in the "New filter" "fieldset"
-    And I should not see "User profile fields" in the "New filter" "fieldset"
-    And I should not see "Course role" in the "New filter" "fieldset"
-    And I should not see "Enrolled in any course" in the "New filter" "fieldset"
-    And I should not see "System role" in the "New filter" "fieldset"
-    And I should not see "Cohort ID" in the "New filter" "fieldset"
-    And I should not see "First access" in the "New filter" "fieldset"
-    And I should not see "Last access" in the "New filter" "fieldset"
-    And I should not see "Last modified" in the "New filter" "fieldset"
-    And I should not see "Authentication" in the "New filter" "fieldset"
-    And I should not see "ID number" in the "New filter" "fieldset"
-    And I should not see "Last IP address" in the "New filter" "fieldset"
-    And I should not see "MNet ID provider" in the "New filter" "fieldset"
-    And I navigate to "Users > Accounts > Bulk user actions" in site administration
-    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
-    And I should not see "Firstname" in the "New filter" "fieldset"
-    And I should see "Username" in the "New filter" "fieldset"
-    And I should see "Email address" in the "New filter" "fieldset"
-    And I should not see "City/town" in the "New filter" "fieldset"
-    And I should not see "Country" in the "New filter" "fieldset"
-    And I should not see "Confirmed" in the "New filter" "fieldset"
-    And I should not see "Suspended account" in the "New filter" "fieldset"
-    And I should not see "User profile fields" in the "New filter" "fieldset"
-    And I should not see "Course role" in the "New filter" "fieldset"
-    And I should not see "Enrolled in any course" in the "New filter" "fieldset"
-    And I should not see "System role" in the "New filter" "fieldset"
-    And I should not see "Cohort ID" in the "New filter" "fieldset"
-    And I should not see "First access" in the "New filter" "fieldset"
-    And I should not see "Last access" in the "New filter" "fieldset"
-    And I should not see "Last modified" in the "New filter" "fieldset"
-    And I should not see "Authentication" in the "New filter" "fieldset"
-    And I should not see "ID number" in the "New filter" "fieldset"
-    And I should not see "Last IP address" in the "New filter" "fieldset"
-    And I should not see "MNet ID provider" in the "New filter" "fieldset"
-
-  Scenario: Change the user filter default configuration to no filter at all
-    Given the following config values are set as admin:
-      | userfiltersdefault | |
-    And I log in as "admin"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
-    And I should not see "Firstname" in the "New filter" "fieldset"
-    And I should not see "Username" in the "New filter" "fieldset"
-    And I should not see "Email address" in the "New filter" "fieldset"
-    And I should not see "City/town" in the "New filter" "fieldset"
-    And I should not see "Country" in the "New filter" "fieldset"
-    And I should not see "Confirmed" in the "New filter" "fieldset"
-    And I should not see "Suspended account" in the "New filter" "fieldset"
-    And I should not see "User profile fields" in the "New filter" "fieldset"
-    And I should not see "Course role" in the "New filter" "fieldset"
-    And I should not see "Enrolled in any course" in the "New filter" "fieldset"
-    And I should not see "System role" in the "New filter" "fieldset"
-    And I should not see "Cohort ID" in the "New filter" "fieldset"
-    And I should not see "First access" in the "New filter" "fieldset"
-    And I should not see "Last access" in the "New filter" "fieldset"
-    And I should not see "Last modified" in the "New filter" "fieldset"
-    And I should not see "Authentication" in the "New filter" "fieldset"
-    And I should not see "ID number" in the "New filter" "fieldset"
-    And I should not see "Last IP address" in the "New filter" "fieldset"
-    And I should not see "MNet ID provider" in the "New filter" "fieldset"
-    And I navigate to "Users > Accounts > Bulk user actions" in site administration
-    Then I should see "User full name"
-    And I should not see "Surname" in the "New filter" "fieldset"
-    And I should not see "Firstname" in the "New filter" "fieldset"
-    And I should not see "Username" in the "New filter" "fieldset"
-    And I should not see "Email address" in the "New filter" "fieldset"
-    And I should not see "City/town" in the "New filter" "fieldset"
-    And I should not see "Country" in the "New filter" "fieldset"
-    And I should not see "Confirmed" in the "New filter" "fieldset"
-    And I should not see "Suspended account" in the "New filter" "fieldset"
-    And I should not see "User profile fields" in the "New filter" "fieldset"
-    And I should not see "Course role" in the "New filter" "fieldset"
-    And I should not see "Enrolled in any course" in the "New filter" "fieldset"
-    And I should not see "System role" in the "New filter" "fieldset"
-    And I should not see "Cohort ID" in the "New filter" "fieldset"
-    And I should not see "First access" in the "New filter" "fieldset"
-    And I should not see "Last access" in the "New filter" "fieldset"
-    And I should not see "Last modified" in the "New filter" "fieldset"
-    And I should not see "Authentication" in the "New filter" "fieldset"
-    And I should not see "ID number" in the "New filter" "fieldset"
-    And I should not see "Last IP address" in the "New filter" "fieldset"
-    And I should not see "MNet ID provider" in the "New filter" "fieldset"

admin/timezone.php

@@ -12,7 +12,9 @@
     $PAGE->set_url('/admin/timezone.php');
     $PAGE->set_context(context_system::instance());
 
-    require_admin();
+    require_login();
+
+    require_capability('moodle/site:config', context_system::instance());
 
     $strtimezone = get_string("timezone");
     $strsavechanges = get_string("savechanges");

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

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

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/log_info.js"],"names":["define","$","str","ModalFactory","Notification","loadInfo","id","info","link","get_string","then","langString","bodyInfo","forEach","item","append","create","title","body","html","large","catch","exception"],"mappings":"AAwBAA,OAAM,2BAAC,CAAC,QAAD,CAAW,UAAX,CAAuB,oBAAvB,CAA6C,mBAA7C,CAAD,CAAoE,SAASC,CAAT,CAAYC,CAAZ,CAAiBC,CAAjB,CAA+BC,CAA/B,CAA6C,CAEnH,MAAoD,CAShDC,QAAQ,CAAE,kBAASC,CAAT,CAAaC,CAAb,CAAmB,CAEzB,GAAIC,CAAAA,CAAI,CAAGP,CAAC,CAAC,wBAAyBK,CAAzB,CAA8B,KAA/B,CAAZ,CACAJ,CAAG,CAACO,UAAJ,CAAe,SAAf,CAA0B,gBAA1B,EAA4CC,IAA5C,CAAiD,SAASC,CAAT,CAAqB,CAElE,GAAIC,CAAAA,CAAQ,CAAGX,CAAC,CAAC,MAAD,CAAhB,CACAM,CAAI,CAACM,OAAL,CAAa,SAASC,CAAT,CAAe,CACxBF,CAAQ,CAACG,MAAT,CAAgB,OAASD,CAAT,CAAgB,OAAhC,CACH,CAFD,EAGAF,CAAQ,CAACG,MAAT,CAAgB,OAAhB,EAEA,MAAOZ,CAAAA,CAAY,CAACa,MAAb,CAAoB,CACvBC,KAAK,CAAEN,CADgB,CAEvBO,IAAI,CAAEN,CAAQ,CAACO,IAAT,EAFiB,CAGvBC,KAAK,GAHkB,CAApB,CAIJZ,CAJI,CAMV,CAdD,EAcGa,KAdH,CAcSjB,CAAY,CAACkB,SAdtB,CAeH,CA3B+C,CA6BvD,CA/BK,CAAN","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Shows a dialogue with info about this logs.\n *\n * @module     tool_analytics/log_info\n * @class      log_info\n * @package    tool_analytics\n * @copyright  2017 David Monllao {@link http://www.davidmonllao.com}\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\ndefine(['jquery', 'core/str', 'core/modal_factory', 'core/notification'], function($, str, ModalFactory, Notification) {\n\n    return /** @alias module:tool_analytics/log_info */ {\n\n        /**\n         * Prepares a modal info for a log's results.\n         *\n         * @method loadInfo\n         * @param {int} id\n         * @param {string[]} info\n         */\n        loadInfo: function(id, info) {\n\n            var link = $('[data-model-log-id=\"' + id + '\"]');\n            str.get_string('loginfo', 'tool_analytics').then(function(langString) {\n\n                var bodyInfo = $(\"<ul>\");\n                info.forEach(function(item) {\n                    bodyInfo.append('<li>' + item + '</li>');\n                });\n                bodyInfo.append(\"</ul>\");\n\n                return ModalFactory.create({\n                    title: langString,\n                    body: bodyInfo.html(),\n                    large: true,\n                }, link);\n\n            }).catch(Notification.exception);\n        }\n    };\n});\n"],"file":"log_info.min.js"}

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

@@ -1,2 +1 @@
-define ("tool_analytics/model",["jquery","core/str","core/log","core/notification","core/modal_factory","core/modal_events","core/templates"],function(b,c,d,e,f,g,h){var i={clear:{title:{key:"clearpredictions",component:"tool_analytics"},body:{key:"clearmodelpredictions",component:"tool_analytics"}},delete:{title:{key:"delete",component:"tool_analytics"},body:{key:"deletemodelconfirmation",component:"tool_analytics"}}},j=function(a){var c=b(a).closest("[data-model-name]");if(c.length){return c.attr("data-model-name")}else{d.error("Unexpected DOM error - unable to obtain the model name");return""}};return{confirmAction:function confirmAction(a,h){b("[data-action-id=\""+a+"\"]").on("click",function(k){k.preventDefault();var l=b(k.currentTarget);if("undefined"==typeof i[h]){d.error("Action \""+h+"\" is not allowed.");return}var a=[i[h].title,i[h].body];a[1].param=j(l);var m=c.get_strings(a),n=f.create({type:f.types.SAVE_CANCEL});b.when(m,n).then(function(a,b){b.setTitle(a[0]);b.setBody(a[1]);b.setSaveButtonText(a[0]);b.getRoot().on(g.save,function(){window.location.href=l.attr("href")});b.show();return b}).fail(e.exception)})},selectEvaluationOptions:function selectEvaluationOptions(a,d){b("[data-action-id=\""+a+"\"]").on("click",function(i){i.preventDefault();var j=b(i.currentTarget),a=b(this).attr("data-timesplitting-methods"),k=c.get_strings([{key:"evaluatemodel",component:"tool_analytics"},{key:"evaluate",component:"tool_analytics"}]),l=f.create({type:f.types.SAVE_CANCEL}),m=h.render("tool_analytics/evaluation_options",{trainedexternally:d,timesplittingmethods:JSON.parse(a)});b.when(k,l).then(function(a,c){c.getRoot().on(g.hidden,c.destroy.bind(c));c.setTitle(a[0]);c.setSaveButtonText(a[1]);c.setBody(m);c.getRoot().on(g.save,function(){var a=b("input[name='evaluationmode']:checked").val();if("trainedmodel"==a){j.attr("href",j.attr("href")+"&mode=trainedmodel")}var c=b("#id-evaluation-timesplitting").val();j.attr("href",j.attr("href")+"&timesplitting="+c);window.location.href=j.attr("href")});c.show();return c}).fail(e.exception)})},selectExportOptions:function selectExportOptions(a,d){b("[data-action-id=\""+a+"\"]").on("click",function(i){i.preventDefault();var j=b(i.currentTarget);if(!d){j.attr("href",j.attr("href")+"&action=exportmodel&includeweights=0");window.location.href=j.attr("href");return}var a=c.get_strings([{key:"export",component:"tool_analytics"}]),k=f.create({type:f.types.SAVE_CANCEL}),l=h.render("tool_analytics/export_options",{});b.when(a,k).then(function(a,c){c.getRoot().on(g.hidden,c.destroy.bind(c));c.setTitle(a[0]);c.setSaveButtonText(a[0]);c.setBody(l);c.getRoot().on(g.save,function(){var a=b("input[name='exportoption']:checked").val();if("exportdata"==a){j.attr("href",j.attr("href")+"&action=exportdata")}else{j.attr("href",j.attr("href")+"&action=exportmodel");if(b("#id-includeweights").is(":checked")){j.attr("href",j.attr("href")+"&includeweights=1")}else{j.attr("href",j.attr("href")+"&includeweights=0")}}window.location.href=j.attr("href")});c.show();return c}).fail(e.exception)})}}});
-//# sourceMappingURL=model.min.js.map
+define(["jquery","core/str","core/log","core/notification","core/modal_factory","core/modal_events","core/templates"],function(a,b,c,d,e,f,g){var h={clear:{title:{key:"clearpredictions",component:"tool_analytics"},body:{key:"clearmodelpredictions",component:"tool_analytics"}},"delete":{title:{key:"delete",component:"tool_analytics"},body:{key:"deletemodelconfirmation",component:"tool_analytics"}}},i=function(b){var d=a(b).closest("[data-model-name]");return d.length?d.attr("data-model-name"):(c.error("Unexpected DOM error - unable to obtain the model name"),"")};return{confirmAction:function(g,j){a('[data-action-id="'+g+'"]').on("click",function(g){g.preventDefault();var k=a(g.currentTarget);if("undefined"==typeof h[j])return void c.error('Action "'+j+'" is not allowed.');var l=[h[j].title,h[j].body];l[1].param=i(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)})},selectEvaluationOptions:function(c,h,i){a('[data-action-id="'+c+'"]').on("click",function(c){c.preventDefault();var j=a(c.currentTarget),k=b.get_strings([{key:"evaluatemodel",component:"tool_analytics"},{key:"evaluate",component:"tool_analytics"}]),l=e.create({type:e.types.SAVE_CANCEL}),m=g.render("tool_analytics/evaluation_options",{trainedexternally:h,timesplittingmethods:i});a.when(k,l).then(function(b,c){return c.getRoot().on(f.hidden,c.destroy.bind(c)),c.setTitle(b[0]),c.setSaveButtonText(b[1]),c.setBody(m),c.getRoot().on(f.save,function(){var b=a("input[name='evaluationmode']:checked").val();"trainedmodel"==b&&j.attr("href",j.attr("href")+"&mode=trainedmodel");var c=a("#id-evaluation-timesplitting").val();j.attr("href",j.attr("href")+"&timesplitting="+c),window.location.href=j.attr("href")}),c.show(),c}).fail(d.exception)})},selectExportOptions:function(c,h){a('[data-action-id="'+c+'"]').on("click",function(c){c.preventDefault();var i=a(c.currentTarget);if(!h)return i.attr("href",i.attr("href")+"&action=exportmodel&includeweights=0"),void(window.location.href=i.attr("href"));var j=b.get_strings([{key:"export",component:"tool_analytics"}]),k=e.create({type:e.types.SAVE_CANCEL}),l=g.render("tool_analytics/export_options",{});a.when(j,k).then(function(b,c){return c.getRoot().on(f.hidden,c.destroy.bind(c)),c.setTitle(b[0]),c.setSaveButtonText(b[0]),c.setBody(l),c.getRoot().on(f.save,function(){var b=a("input[name='exportoption']:checked").val();"exportdata"==b?i.attr("href",i.attr("href")+"&action=exportdata"):(i.attr("href",i.attr("href")+"&action=exportmodel"),a("#id-includeweights").is(":checked")?i.attr("href",i.attr("href")+"&includeweights=1"):i.attr("href",i.attr("href")+"&includeweights=0")),window.location.href=i.attr("href")}),c.show(),c}).fail(d.exception)})}}});

admin/tool/analytics/amd/build/potential-contexts.min.js

@@ -1,2 +0,0 @@
-define ("tool_analytics/potential-contexts",["jquery","core/ajax"],function(a,b){return{processResults:function processResults(b,c){var d=[];if(a.isArray(c)){a.each(c,function(a,b){d.push({value:b.id,label:b.name})});return d}else{return c}},transport:function transport(c,d,e,f){var g,h=a(c).attr("modelid")||null;g=b.call([{methodname:"tool_analytics_potential_contexts",args:{query:d,modelid:h}}]);g[0].then(e).fail(f)}}});
-//# sourceMappingURL=potential-contexts.min.js.map

admin/tool/analytics/amd/build/potential-contexts.min.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/potential-contexts.js"],"names":["define","$","Ajax","processResults","selector","results","contexts","isArray","each","index","context","push","value","id","label","name","transport","query","success","failure","promise","modelid","attr","call","methodname","args","then","fail"],"mappings":"AAyBAA,OAAM,qCAAC,CAAC,QAAD,CAAW,WAAX,CAAD,CAA0B,SAASC,CAAT,CAAYC,CAAZ,CAAkB,CAE9C,MAA8D,CAE1DC,cAAc,CAAE,wBAASC,CAAT,CAAmBC,CAAnB,CAA4B,CACxC,GAAIC,CAAAA,CAAQ,CAAG,EAAf,CACA,GAAIL,CAAC,CAACM,OAAF,CAAUF,CAAV,CAAJ,CAAwB,CACpBJ,CAAC,CAACO,IAAF,CAAOH,CAAP,CAAgB,SAASI,CAAT,CAAgBC,CAAhB,CAAyB,CACrCJ,CAAQ,CAACK,IAAT,CAAc,CACVC,KAAK,CAAEF,CAAO,CAACG,EADL,CAEVC,KAAK,CAAEJ,CAAO,CAACK,IAFL,CAAd,CAIH,CALD,EAMA,MAAOT,CAAAA,CAEV,CATD,IASO,CACH,MAAOD,CAAAA,CACV,CACJ,CAhByD,CAkB1DW,SAAS,CAAE,mBAASZ,CAAT,CAAmBa,CAAnB,CAA0BC,CAA1B,CAAmCC,CAAnC,CAA4C,IAC/CC,CAAAA,CAD+C,CAG/CC,CAAO,CAAGpB,CAAC,CAACG,CAAD,CAAD,CAAYkB,IAAZ,CAAiB,SAAjB,GAA+B,IAHM,CAInDF,CAAO,CAAGlB,CAAI,CAACqB,IAAL,CAAU,CAAC,CACjBC,UAAU,CAAE,mCADK,CAEjBC,IAAI,CAAE,CACFR,KAAK,CAAEA,CADL,CAEFI,OAAO,CAAEA,CAFP,CAFW,CAAD,CAAV,CAAV,CAQAD,CAAO,CAAC,CAAD,CAAP,CAAWM,IAAX,CAAgBR,CAAhB,EAAyBS,IAAzB,CAA8BR,CAA9B,CACH,CA/ByD,CAmCjE,CArCK,CAAN","sourcesContent":["// This file is part of Moodle - http://moodle.org/\n//\n// Moodle is free software: you can redistribute it and/or modify\n// it under the terms of the GNU General Public License as published by\n// the Free Software Foundation, either version 3 of the License, or\n// (at your option) any later version.\n//\n// Moodle is distributed in the hope that it will be useful,\n// but WITHOUT ANY WARRANTY; without even the implied warranty of\n// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n// GNU General Public License for more details.\n//\n// You should have received a copy of the GNU General Public License\n// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.\n\n/**\n * Potential contexts selector module.\n *\n * @module     tool_analytics/potential-contexts\n * @class      potential-contexts\n * @package    tool_analytics\n * @copyright  2019 David Monllao\n * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later\n */\n\ndefine(['jquery', 'core/ajax'], function($, Ajax) {\n\n    return /** @alias module:tool_analytics/potential-contexts */ {\n\n        processResults: function(selector, results) {\n            var contexts = [];\n            if ($.isArray(results)) {\n                $.each(results, function(index, context) {\n                    contexts.push({\n                        value: context.id,\n                        label: context.name\n                    });\n                });\n                return contexts;\n\n            } else {\n                return results;\n            }\n        },\n\n        transport: function(selector, query, success, failure) {\n            var promise;\n\n            let modelid = $(selector).attr('modelid') || null;\n            promise = Ajax.call([{\n                methodname: 'tool_analytics_potential_contexts',\n                args: {\n                    query: query,\n                    modelid: modelid\n                }\n            }]);\n\n            promise[0].then(success).fail(failure);\n        }\n\n    };\n\n});\n"],"file":"potential-contexts.min.js"}

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

@@ -114,14 +114,12 @@ define(['jquery', 'core/str', 'core/log', 'core/notification', 'core/modal_facto
          * @param  {String}  actionId
          * @param  {Boolean} trainedOnlyExternally
          */
-        selectEvaluationOptions: function(actionId, trainedOnlyExternally) {
+        selectEvaluationOptions: function(actionId, trainedOnlyExternally, timeSplittingMethods) {
             $('[data-action-id="' + actionId + '"]').on('click', function(ev) {
                 ev.preventDefault();
 
                 var a = $(ev.currentTarget);
 
-                var timeSplittingMethods = $(this).attr('data-timesplitting-methods');
-
                 var stringsPromise = Str.get_strings([
                     {
                         key: 'evaluatemodel',
@@ -134,7 +132,7 @@ define(['jquery', 'core/str', 'core/log', 'core/notification', 'core/modal_facto
                 var modalPromise = ModalFactory.create({type: ModalFactory.types.SAVE_CANCEL});
                 var bodyPromise = Templates.render('tool_analytics/evaluation_options', {
                     trainedexternally: trainedOnlyExternally,
-                    timesplittingmethods: JSON.parse(timeSplittingMethods)
+                    timesplittingmethods: timeSplittingMethods
                 });
 
                 $.when(stringsPromise, modalPromise).then(function(strings, modal) {

admin/tool/analytics/amd/src/potential-contexts.js

@@ -1,63 +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/>.
-
-/**
- * Potential contexts selector module.
- *
- * @module     tool_analytics/potential-contexts
- * @class      potential-contexts
- * @package    tool_analytics
- * @copyright  2019 David Monllao
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-define(['jquery', 'core/ajax'], function($, Ajax) {
-
-    return /** @alias module:tool_analytics/potential-contexts */ {
-
-        processResults: function(selector, results) {
-            var contexts = [];
-            if ($.isArray(results)) {
-                $.each(results, function(index, context) {
-                    contexts.push({
-                        value: context.id,
-                        label: context.name
-                    });
-                });
-                return contexts;
-
-            } else {
-                return results;
-            }
-        },
-
-        transport: function(selector, query, success, failure) {
-            var promise;
-
-            let modelid = $(selector).attr('modelid') || null;
-            promise = Ajax.call([{
-                methodname: 'tool_analytics_potential_contexts',
-                args: {
-                    query: query,
-                    modelid: modelid
-                }
-            }]);
-
-            promise[0].then(success).fail(failure);
-        }
-
-    };
-
-});

admin/tool/analytics/classes/external.php

@@ -1,113 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * This is the external API for this component.
- *
- * @package    tool_analytics
- * @copyright  2019 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_analytics;
-
-defined('MOODLE_INTERNAL') || die();
-
-require_once("$CFG->libdir/externallib.php");
-
-use external_api;
-use external_function_parameters;
-use external_value;
-use external_single_structure;
-use external_multiple_structure;
-
-/**
- * This is the external API for this component.
- *
- * @copyright  2019 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class external extends external_api {
-
-    const MAX_CONTEXTS_RETURNED = 100;
-
-    /**
-     * potential_contexts parameters.
-     *
-     * @since  Moodle 3.8
-     * @return external_function_parameters
-     */
-    public static function potential_contexts_parameters() {
-        return new external_function_parameters(
-            array(
-                'query' => new external_value(PARAM_NOTAGS, 'The model id', VALUE_DEFAULT),
-                'modelid' => new external_value(PARAM_INT, 'The model id', VALUE_DEFAULT)
-            )
-        );
-    }
-
-    /**
-     * Return the contexts that match the provided query.
-     *
-     * @since  Moodle 3.8
-     * @param  string|null $query
-     * @param  int|null $modelid
-     * @return array an array of contexts
-     */
-    public static function potential_contexts(?string $query = null, ?int $modelid = null) {
-
-        $params = self::validate_parameters(self::potential_contexts_parameters(), ['modelid' => $modelid, 'query' => $query]);
-
-        \core_analytics\manager::check_can_manage_models();
-
-        if ($params['modelid']) {
-            $model = new \core_analytics\model($params['modelid']);
-            $contexts = ($model->get_analyser(['notimesplitting' => true]))::potential_context_restrictions($params['query']);
-        } else {
-            $contexts = \core_analytics\manager::get_potential_context_restrictions(null, $params['query']);
-        }
-
-        $contextoptions = [];
-        $i = 0;
-        foreach ($contexts as $contextid => $contextname) {
-
-            if ($i === self::MAX_CONTEXTS_RETURNED) {
-                // Limited to MAX_CONTEXTS_RETURNED items.
-                break;
-            }
-
-            $contextoptions[] = ['id' => $contextid, 'name' => $contextname];
-            $i++;
-        }
-
-        return $contextoptions;
-    }
-
-    /**
-     * potential_contexts return
-     *
-     * @since  Moodle 3.8
-     * @return external_description
-     */
-    public static function potential_contexts_returns() {
-        return new external_multiple_structure(
-            new external_single_structure([
-                'id'    => new external_value(PARAM_INT, 'ID of the context'),
-                'name'  => new external_value(PARAM_NOTAGS, 'The context name')
-            ])
-        );
-    }
-}

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

@@ -65,15 +65,6 @@ class edit_model extends \moodleform {
             $mform->addRule('target', get_string('required'), 'required', null, 'client');
         }
 
-        if (!empty($this->_customdata['targetname']) && !empty($this->_customdata['targetclass'])) {
-            $mform->addElement('static', 'targetname', get_string('target', 'tool_analytics'), $this->_customdata['targetname']);
-            $mform->addElement('hidden', 'target',
-                \tool_analytics\output\helper::class_to_option($this->_customdata['targetclass']));
-            // We won't update the model's target so no worries about its format (we can't use PARAM_ALPHANUMEXT
-            // because of class_to_option).
-            $mform->setType('target', PARAM_TEXT);
-        }
-
         // Indicators.
         if (!$this->_customdata['staticmodel']) {
             $indicators = array();
@@ -90,13 +81,6 @@ class edit_model extends \moodleform {
         }
 
         // Time-splitting methods.
-        if (!empty($this->_customdata['invalidcurrenttimesplitting'])) {
-            $mform->addElement('html', $OUTPUT->notification(
-                get_string('invalidcurrenttimesplitting', 'tool_analytics'),
-                \core\output\notification::NOTIFY_WARNING)
-            );
-        }
-
         $timesplittings = array('' => '');
         foreach ($this->_customdata['timesplittings'] as $classname => $timesplitting) {
             $optionname = \tool_analytics\output\helper::class_to_option($classname);
@@ -105,28 +89,6 @@ class edit_model extends \moodleform {
         $mform->addElement('select', 'timesplitting', get_string('timesplittingmethod', 'analytics'), $timesplittings);
         $mform->addHelpButton('timesplitting', 'timesplittingmethod', 'analytics');
 
-        // Contexts restriction.
-        if (!empty($this->_customdata['supportscontexts'])) {
-
-            $options = [
-                'ajax' => 'tool_analytics/potential-contexts',
-                'multiple' => true,
-                'noselectionstring' => get_string('all')
-            ];
-
-            if (!empty($this->_customdata['id'])) {
-                $options['modelid'] = $this->_customdata['id'];
-                $contexts = $this->load_current_contexts();
-            } else {
-                // No need to preload any selected contexts.
-                $contexts = [];
-            }
-
-            $mform->addElement('autocomplete', 'contexts', get_string('contexts', 'tool_analytics'), $contexts, $options);
-            $mform->setType('contexts', PARAM_INT);
-            $mform->addHelpButton('contexts', 'contexts', 'tool_analytics');
-        }
-
         // Predictions processor.
         if (!$this->_customdata['staticmodel']) {
             $defaultprocessor = \core_analytics\manager::get_predictions_processor_name(
@@ -168,35 +130,11 @@ class edit_model extends \moodleform {
     public function validation($data, $files) {
         $errors = parent::validation($data, $files);
 
-        $targetclass = \tool_analytics\output\helper::option_to_class($data['target']);
-        $target = \core_analytics\manager::get_target($targetclass);
-
         if (!empty($data['timesplitting'])) {
-            $timesplittingclass = \tool_analytics\output\helper::option_to_class($data['timesplitting']);
-            if (\core_analytics\manager::is_valid($timesplittingclass, '\core_analytics\local\time_splitting\base') === false) {
+            $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');
             }
-
-            $timesplitting = \core_analytics\manager::get_time_splitting($timesplittingclass);
-            if (!$target->can_use_timesplitting($timesplitting)) {
-                $errors['timesplitting'] = get_string('invalidtimesplitting', 'tool_analytics');
-            }
-        }
-
-        if (!empty($data['contexts'])) {
-
-            $analyserclass = $target->get_analyser_class();
-            if (!$potentialcontexts = $analyserclass::potential_context_restrictions()) {
-                $errors['contexts'] = get_string('errornocontextrestrictions', 'analytics');
-            } else {
-
-                // Flip the contexts array so we can just diff by key.
-                $selectedcontexts = array_flip($data['contexts']);
-                $invalidcontexts = array_diff_key($selectedcontexts, $potentialcontexts);
-                if (!empty($invalidcontexts)) {
-                    $errors['contexts'] = get_string('errorinvalidcontexts', 'analytics');
-                }
-            }
         }
 
         if (!$this->_customdata['staticmodel']) {
@@ -218,18 +156,4 @@ class edit_model extends \moodleform {
 
         return $errors;
     }
-
-    /**
-     * Load the currently selected context options.
-     *
-     * @return array
-     */
-    protected function load_current_contexts() {
-        $contexts = [];
-        foreach ($this->_customdata['contexts'] as $context) {
-            $contexts[$context->id] = $context->get_context_name(true, true);
-        }
-
-        return $contexts;
-    }
 }

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

@@ -105,50 +105,4 @@ class helper {
         $PAGE->reset_theme_and_output();
         $PAGE->set_context(\context_system::instance());
     }
-    /**
-     * Convert a list of contexts to an associative array where the value is the context name.
-     *
-     * @param  array            $contexts
-     * @param  \moodle_url      $url
-     * @param  \renderer_base   $output
-     * @param  int|null         $selected
-     * @param  bool             $includeall
-     * @param  bool             $shortentext
-     * @return \stdClass
-     */
-    public static function prediction_context_selector(array $contexts, \moodle_url $url, \renderer_base $output,
-            ?int $selected = null, ?bool $includeall = false, ?bool $shortentext = true): \stdClass {
-
-        foreach ($contexts 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 {
-                if ($shortentext) {
-                    $contextname = shorten_text($context->get_context_name(false, true), 40);
-                } else {
-                    $contextname = $context->get_context_name(false, true);
-                }
-            }
-            $contexts[$contextid] = $contextname;
-        }
-
-        if ($includeall) {
-            $contexts[0] = get_string('all');
-            $nothing = '';
-        } else {
-            $nothing = array('' => 'choosedots');
-        }
-
-        \core_collator::asort($contexts);
-
-        if (!$selected) {
-            $selected = '';
-        }
-        $singleselect = new \single_select($url, 'contextid', $contexts, $selected, $nothing);
-        return $singleselect->export_for_template($output);
-    }
 }

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

@@ -1,184 +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/>.
-
-/**
- * Insights report renderable.
- *
- * @package    tool_analytics
- * @copyright  2019 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;
-
-/**
- * Insights report renderable.
- *
- * @package    tool_analytics
- * @copyright  2019 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class insights_report implements \renderable, \templatable {
-
-    /**
-     * @var \core_analytics\model
-     */
-    private $model = null;
-
-    /**
-     * @var \context
-     */
-    private $context = null;
-
-    /**
-     * Inits the insights report renderable.
-     *
-     * @param \core_analytics\model $model
-     * @param int|null $contextid
-     * @return null
-     */
-    public function __construct(\core_analytics\model $model, ?int $contextid = null) {
-        $this->model = $model;
-        if ($contextid) {
-            $this->context = \context::instance_by_id($contextid);
-        }
-    }
-
-    /**
-     * Export the data.
-     *
-     * @param \renderer_base $output
-     * @return \stdClass
-     */
-    public function export_for_template(\renderer_base $output): \stdClass {
-
-        // Prepare the context object.
-        $data = new \stdClass();
-        $data->modelname = $this->model->get_name();
-
-        $data->charts = [];
-
-        $predictionactionrecords = $this->model->get_prediction_actions($this->context);
-
-        // Context selector.
-        $predictioncontexts = $this->model->get_predictions_contexts(false);
-        if ($predictioncontexts && count($predictioncontexts) > 1) {
-            $url = new \moodle_url('/admin/tool/analytics/model.php', ['id' => $this->model->get_id(),
-                'action' => 'insightsreport']);
-
-            if ($this->context) {
-                $selected = $this->context->id;
-            } else {
-                // This is the 'all' option.
-                $selected = 0;
-            }
-            $data->contextselect = \tool_analytics\output\helper::prediction_context_selector($predictioncontexts,
-                $url, $output, $selected, true, false);
-        }
-
-        if ($predictionactionrecords->valid()) {
-
-            foreach ($predictionactionrecords as $record) {
-
-                // Using this unusual execution flow to init the chart data because $predictionactionrecords
-                // is a \moodle_recordset.
-                if (empty($actionlabels)) {
-                    list($actionlabels, $actionvalues, $actiontypes) = $this->init_action_labels($record);
-                }
-
-                // One value for each action.
-                $actionvalues['separated'][$record->actionname]++;
-
-                // Grouped value.
-                $actiontype = $actiontypes[$record->actionname];
-                $actionvalues['grouped'][$actiontype]++;
-            }
-            $predictionactionrecords->close();
-
-            // Actions doughtnut.
-            $chart = new \core\chart_pie();
-            $chart->set_doughnut(true);
-            $chart->set_title(get_string('actionsexecutedbyusers', 'tool_analytics'));
-            $series = new \core\chart_series(get_string('actions', 'tool_analytics'),
-                array_values($actionvalues['separated']));
-            $chart->add_series($series);
-            $chart->set_labels(array_values($actionlabels['separated']));
-            $data->separatedchart = $output->render($chart);
-
-            // Positive/negative/neutral bar chart.
-            $chart = new \core\chart_bar();
-            $chart->set_title(get_string('actionexecutedgroupedusefulness', 'tool_analytics'));
-            $series = new \core\chart_series(get_string('actions', 'tool_analytics'),
-                array_values($actionvalues['grouped']));
-            $chart->add_series($series);
-            $chart->set_labels(array_values($actionlabels['grouped']));
-            $data->groupedchart = $output->render($chart);
-
-        } else {
-            $predictionactionrecords->close();
-            $data->noactions = [
-                'message' => get_string('noactionsfound', 'tool_analytics'),
-                'announce' => true,
-            ];
-        }
-        return $data;
-    }
-
-    /**
-     * Initialises the action labels and values in this model.
-     *
-     * @param  \stdClass $predictionactionrecord
-     * @return array Two-dimensional array with the labels and values initialised to zero.
-     */
-    private function init_action_labels(\stdClass $predictionactionrecord): array {
-
-        $predictioncontext = \context::instance_by_id($predictionactionrecord->contextid);
-
-        // Just 1 result, we just want to retrieve the prediction action names.
-        list ($unused, $predictions) = $this->model->get_predictions($predictioncontext, false, 0, 1);
-
-        // We pass 'true' for $isinsightuser so all the prediction actions available for this target are returning.
-        $predictionactions = $this->model->get_target()->prediction_actions(reset($predictions), true, true);
-
-        $actionlabels = [];
-        $actionvalues = ['separated' => [], 'grouped' => []];
-        $actiontypes = [];
-        foreach ($predictionactions as $action) {
-            $actionlabels['separated'][$action->get_action_name()] = $action->get_text();
-            $actionvalues['separated'][$action->get_action_name()] = 0;
-            $actiontypes[$action->get_action_name()] = $action->get_type();
-        }
-
-        $bulkactions = $this->model->get_target()->bulk_actions($predictions);
-        foreach ($bulkactions as $action) {
-            $actionlabels['separated'][$action->get_action_name()] = $action->get_text();
-            $actionvalues['separated'][$action->get_action_name()] = 0;
-            $actiontypes[$action->get_action_name()] = $action->get_type();
-        }
-
-        $actionlabels['grouped'][\core_analytics\action::TYPE_POSITIVE] = get_string('useful', 'analytics');
-        $actionlabels['grouped'][\core_analytics\action::TYPE_NEUTRAL] = get_string('neutral', 'analytics');
-        $actionlabels['grouped'][\core_analytics\action::TYPE_NEGATIVE] = get_string('notuseful', 'analytics');
-
-        $actionvalues['grouped'][\core_analytics\action::TYPE_POSITIVE] = 0;
-        $actionvalues['grouped'][\core_analytics\action::TYPE_NEUTRAL] = 0;
-        $actionvalues['grouped'][\core_analytics\action::TYPE_NEGATIVE] = 0;
-
-        return [$actionlabels, $actionvalues, $actiontypes];
-    }
-}

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

@@ -76,8 +76,7 @@ class invalid_analysables implements \renderable, \templatable {
 
         $offset = $this->page * $this->perpage;
 
-        $contexts = $this->model->get_contexts();
-        $analysables = $this->model->get_analyser(['notimesplitting' => true])->get_analysables_iterator(null, $contexts);
+        $analysables = $this->model->get_analyser(['notimesplitting' => true])->get_analysables_iterator();
 
         $skipped = 0;
         $enoughresults = false;

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

@@ -97,9 +97,16 @@ class models_list implements \renderable, \templatable {
         }
 
         // Evaluation options.
-        $timesplittingsforevaluation = \core_analytics\manager::get_time_splitting_methods_for_evaluation(true);
+        $timesplittingmethods = [
+            ['id' => 'all', 'text' => get_string('alltimesplittingmethods', 'tool_analytics')],
+        ];
+        foreach (\core_analytics\manager::get_time_splitting_methods_for_evaluation(true) as $timesplitting) {
+            $timesplittingmethods[] = [
+                'id' => \tool_analytics\output\helper::class_to_option($timesplitting->get_id()),
+                'text' => $timesplitting->get_name()->out(),
+            ];
+        }
 
-        $misconfiguredmodels = [];
         $data->models = array();
         foreach ($this->models as $model) {
             $modeldata = $model->export($output);
@@ -116,10 +123,6 @@ class models_list implements \renderable, \templatable {
                     describe its purpose.", DEBUG_DEVELOPER);
             }
 
-            if ($model->invalid_timesplitting_selected()) {
-                $misconfiguredmodels[$model->get_id()] = $model->get_name();
-            }
-
             // Check if there is a help icon for the indicators to show.
             if (!empty($modeldata->indicators)) {
                 $indicators = array();
@@ -153,7 +156,7 @@ class models_list implements \renderable, \templatable {
                     $modeldata->timesplittinghelp = $helpicon->export_for_template($output);
                 } else {
                     // We really want to encourage developers to add help to their time splitting methods.
-                    debugging("The analysis interval '{$modeldata->timesplitting}' should include a '{$identifier}_help'
+                    debugging("The time splitting method '{$modeldata->timesplitting}' should include a '{$identifier}_help'
                         string to describe its purpose.", DEBUG_DEVELOPER);
                 }
             } else {
@@ -163,20 +166,36 @@ class models_list implements \renderable, \templatable {
 
             // Has this model generated predictions?.
             $predictioncontexts = $model->get_predictions_contexts();
-            $anypredictionobtained = $model->any_prediction_obtained();
 
             // Model predictions list.
             if (!$model->is_enabled()) {
                 $modeldata->noinsights = get_string('disabledmodel', 'analytics');
             } else if ($model->uses_insights()) {
                 if ($predictioncontexts) {
-                    $url = new \moodle_url('/report/insights/insights.php', array('modelid' => $model->get_id()));
-                    $modeldata->insights = \tool_analytics\output\helper::prediction_context_selector($predictioncontexts,
-                        $url, $output);
+
+                    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(false, true), 40);
+                        }
+                        $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 ($anypredictionobtained) {
+                    if ($model->any_prediction_obtained()) {
                         $modeldata->noinsights = get_string('noinsights', 'analytics');
                     } else {
                         $modeldata->noinsights = get_string('nopredictionsyet', 'analytics');
@@ -197,11 +216,10 @@ class models_list implements \renderable, \templatable {
 
             // Get predictions.
             if (!$onlycli && $modeldata->enabled && !empty($modeldata->timesplitting)) {
-                $urlparams['action'] = 'scheduledanalysis';
-                $url = new \moodle_url('/admin/tool/analytics/model.php', $urlparams);
-                $icon = new \action_menu_link_secondary($url,
-                    new \pix_icon('i/notifications', get_string('executescheduledanalysis', 'tool_analytics')),
-                    get_string('executescheduledanalysis', 'tool_analytics'));
+                $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);
             }
 
@@ -213,29 +231,26 @@ class models_list implements \renderable, \templatable {
 
                 $actionid = 'evaluate-' . $model->get_id();
 
-                // Evaluation options.
-                $modeltimesplittingmethods = $this->timesplittings_options_for_evaluation($model, $timesplittingsforevaluation);
-
+                $modeltimesplittingmethods = $timesplittingmethods;
                 // Include the current time-splitting method as the default selection method the model already have one.
                 if ($model->get_model_obj()->timesplitting) {
                     $currenttimesplitting = ['id' => 'current', 'text' => get_string('currenttimesplitting', 'tool_analytics')];
                     array_unshift($modeltimesplittingmethods, $currenttimesplitting);
                 }
 
-                $evaluateparams = [$actionid, $trainedonlyexternally];
+                $evaluateparams = [$actionid, $trainedonlyexternally, $modeltimesplittingmethods];
                 $PAGE->requires->js_call_amd('tool_analytics/model', 'selectEvaluationOptions', $evaluateparams);
                 $urlparams['action'] = 'evaluate';
-                $url = new \moodle_url('/admin/tool/analytics/model.php', $urlparams);
+                $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'), ['data-action-id' => $actionid,
-                    'data-timesplitting-methods' => json_encode($modeltimesplittingmethods)]);
+                    get_string('evaluate', 'tool_analytics'), ['data-action-id' => $actionid]);
                 $actionsmenu->add($icon);
             }
 
             // Machine-learning-based models evaluation log.
             if (!$model->is_static() && $model->get_logs()) {
                 $urlparams['action'] = 'log';
-                $url = new \moodle_url('/admin/tool/analytics/model.php', $urlparams);
+                $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);
@@ -243,7 +258,7 @@ class models_list implements \renderable, \templatable {
 
             // Edit model.
             $urlparams['action'] = 'edit';
-            $url = new \moodle_url('/admin/tool/analytics/model.php', $urlparams);
+            $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);
 
@@ -260,7 +275,7 @@ class models_list implements \renderable, \templatable {
                     $icontype = 'i/checked';
                 }
                 $urlparams['action'] = $action;
-                $url = new \moodle_url('/admin/tool/analytics/model.php', $urlparams);
+                $url = new \moodle_url('model.php', $urlparams);
                 $icon = new \action_menu_link_secondary($url, new \pix_icon($icontype, $text), $text);
                 $actionsmenu->add($icon);
             }
@@ -273,7 +288,7 @@ class models_list implements \renderable, \templatable {
 
                 if ($fullysetup || $istrained) {
 
-                    $url = new \moodle_url('/admin/tool/analytics/model.php', $urlparams);
+                    $url = new \moodle_url('model.php', $urlparams);
                     // Clear the previous action param from the URL, we will set it in JS.
                     $url->remove_params('action');
 
@@ -288,31 +303,22 @@ class models_list implements \renderable, \templatable {
                 }
             }
 
-            // Insights report.
-            if (!empty($anypredictionobtained) && $model->uses_insights()) {
-                $urlparams['action'] = 'insightsreport';
-                $url = new \moodle_url('/admin/tool/analytics/model.php', $urlparams);
-                $pix = new \pix_icon('i/report', get_string('insightsreport', 'tool_analytics'));
-                $icon = new \action_menu_link_secondary($url, $pix, get_string('insightsreport', '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('/admin/tool/analytics/model.php', $urlparams);
+                $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($anypredictionobtained) || $model->is_trained()) {
+            if (!empty($predictioncontexts) || $model->is_trained()) {
                 $actionid = 'clear-' . $model->get_id();
                 $PAGE->requires->js_call_amd('tool_analytics/model', 'confirmAction', [$actionid, 'clear']);
                 $urlparams['action'] = 'clear';
-                $url = new \moodle_url('/admin/tool/analytics/model.php', $urlparams);
+                $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]);
@@ -323,7 +329,7 @@ class models_list implements \renderable, \templatable {
             $actionid = 'delete-' . $model->get_id();
             $PAGE->requires->js_call_amd('tool_analytics/model', 'confirmAction', [$actionid, 'delete']);
             $urlparams['action'] = 'delete';
-            $url = new \moodle_url('/admin/tool/analytics/model.php', $urlparams);
+            $url = new \moodle_url('model.php', $urlparams);
             $icon = new \action_menu_link_secondary($url, new \pix_icon('t/delete',
                 get_string('delete', 'tool_analytics')), get_string('delete', 'tool_analytics'),
                 ['data-action-id' => $actionid]);
@@ -334,10 +340,10 @@ class models_list implements \renderable, \templatable {
             $data->models[] = $modeldata;
         }
 
-        $data->warnings = [];
-        $data->infos = [];
         if (!$onlycli) {
-            $data->warnings[] = (object)array('message' => get_string('bettercli', 'tool_analytics'), 'closebutton' => true);
+            $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');
@@ -346,43 +352,12 @@ class models_list implements \renderable, \templatable {
             if (is_siteadmin()) {
                 $langstrid = 'clievaluationandpredictions';
             }
-            $data->infos[] = (object)array('message' => get_string($langstrid, 'tool_analytics', $url->out()),
-                'closebutton' => true);
-        }
-
-        if ($misconfiguredmodels) {
-            $warningstr = get_string('invalidtimesplittinginmodels', 'tool_analytics', implode(', ', $misconfiguredmodels));
-            $data->warnings[] = (object)array('message' => $warningstr, 'closebutton' => true);
+            $data->infos = array(
+                (object)array('message' => get_string($langstrid, 'tool_analytics', $url->out()),
+                    'closebutton' => true)
+            );
         }
 
         return $data;
     }
-
-    /**
-     * Returns the list of time splitting methods that are available for evaluation.
-     *
-     * @param  \core_analytics\model $model
-     * @param  array                 $timesplittingsforevaluation
-     * @return array
-     */
-    private function timesplittings_options_for_evaluation(\core_analytics\model $model,
-            array $timesplittingsforevaluation): array {
-
-        $modeltimesplittingmethods = [
-            ['id' => 'all', 'text' => get_string('alltimesplittingmethods', 'tool_analytics')],
-        ];
-        $potentialtimesplittingmethods = $model->get_potential_timesplittings();
-        foreach ($timesplittingsforevaluation as $timesplitting) {
-            if (empty($potentialtimesplittingmethods[$timesplitting->get_id()])) {
-                // This time-splitting method can not be used for this model.
-                continue;
-            }
-            $modeltimesplittingmethods[] = [
-                'id' => \tool_analytics\output\helper::class_to_option($timesplitting->get_id()),
-                'text' => $timesplitting->get_name()->out(),
-            ];
-        }
-
-        return $modeltimesplittingmethods;
-    }
 }

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

@@ -90,9 +90,9 @@ class renderer extends plugin_renderer_base {
                 $langstrdata = (object)array('name' => $timesplitting->get_name(), 'id' => $timesplittingid);
 
                 if (CLI_SCRIPT) {
-                    $output .= $OUTPUT->heading(get_string('scheduledanalysisresultscli', 'tool_analytics', $langstrdata), 3);
+                    $output .= $OUTPUT->heading(get_string('getpredictionsresultscli', 'tool_analytics', $langstrdata), 3);
                 } else {
-                    $output .= $OUTPUT->heading(get_string('scheduledanalysisresults', 'tool_analytics', $langstrdata), 3);
+                    $output .= $OUTPUT->heading(get_string('getpredictionsresults', 'tool_analytics', $langstrdata), 3);
                 }
             }
 
@@ -208,17 +208,6 @@ class renderer extends plugin_renderer_base {
         return $output;
     }
 
-    /**
-     * Defer to template.
-     *
-     * @param \tool_analytics\output\insights_report $insightsreport
-     * @return string HTML
-     */
-    protected function render_insights_report(\tool_analytics\output\insights_report $insightsreport): string {
-        $data = $insightsreport->export_for_template($this);
-        return parent::render_from_template('tool_analytics/insights_report', $data);
-    }
-
     /**
      * Defer to template.
      *
@@ -229,26 +218,4 @@ class renderer extends plugin_renderer_base {
         $data = $invalidanalysables->export_for_template($this);
         return parent::render_from_template('tool_analytics/invalid_analysables', $data);
     }
-
-    /**
-     * Renders an analytics disabled notification.
-     *
-     * @return string HTML
-     */
-    public function render_analytics_disabled() {
-        global $OUTPUT, $PAGE, $FULLME;
-
-        $PAGE->set_url($FULLME);
-        $PAGE->set_title(get_string('pluginname', 'tool_analytics'));
-        $PAGE->set_heading(get_string('pluginname', 'tool_analytics'));
-
-        $output = $OUTPUT->header();
-        $output .= $OUTPUT->notification(get_string('analyticsdisabled', 'analytics'), \core\output\notification::NOTIFY_INFO);
-        $output .= \html_writer::tag('a', get_string('continue'), ['class' => 'btn btn-primary',
-            'href' => (new \moodle_url('/'))->out()]);
-        $output .= $OUTPUT->footer();
-
-        return $output;
-    }
-
 }

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

@@ -52,11 +52,6 @@ class predict_models extends \core\task\scheduled_task {
     public function execute() {
         global $OUTPUT, $PAGE;
 
-        if (!\core_analytics\manager::is_analytics_enabled()) {
-            mtrace(get_string('analyticsdisabled', 'analytics'));
-            return;
-        }
-
         $models = \core_analytics\manager::get_all_models(true, true);
         if (!$models) {
             mtrace(get_string('errornoenabledandtrainedmodels', 'tool_analytics'));

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

@@ -52,11 +52,6 @@ class train_models extends \core\task\scheduled_task {
     public function execute() {
         global $OUTPUT, $PAGE;
 
-        if (!\core_analytics\manager::is_analytics_enabled()) {
-            mtrace(get_string('analyticsdisabled', 'analytics'));
-            return;
-        }
-
         $models = \core_analytics\manager::get_all_models(true);
         if (!$models) {
             mtrace(get_string('errornoenabledmodels', 'tool_analytics'));

admin/tool/analytics/cli/enable_model.php

@@ -32,20 +32,20 @@ $help = "Enables the provided model.
 Options:
 --modelid           Model id
 --list              List models
---analysisinterval  Time splitting method full class name
+--timesplitting     Time splitting method full class name
 -h, --help          Print out this help
 
 Example:
-\$ php admin/tool/analytics/cli/enable_model.php --modelid=1 --analysisinterval=\"\\core\\analytics\\time_splitting\\quarters\"
+\$ 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,
-        'list'             => false,
-        'modelid'          => false,
-        'analysisinterval' => false
+        'help'            => false,
+        'list'            => false,
+        'modelid'         => false,
+        'timesplitting'   => false
     ),
     array(
         'h' => 'help',
@@ -57,17 +57,12 @@ if ($options['help']) {
     exit(0);
 }
 
-if (!\core_analytics\manager::is_analytics_enabled()) {
-    echo get_string('analyticsdisabled', 'analytics') . PHP_EOL;
-    exit(0);
-}
-
 if ($options['list'] || $options['modelid'] === false) {
     \tool_analytics\clihelper::list_models();
     exit(0);
 }
 
-if ($options['analysisinterval'] === false) {
+if ($options['timesplitting'] === false) {
     echo $help;
     exit(0);
 }
@@ -78,7 +73,7 @@ if ($options['analysisinterval'] === false) {
 $model = new \core_analytics\model($options['modelid']);
 
 // Evaluate its suitability to predict accurately.
-$model->enable($options['analysisinterval']);
+$model->enable($options['timesplitting']);
 
 cli_heading(get_string('success'));
 exit(0);

admin/tool/analytics/cli/evaluate_model.php

@@ -33,7 +33,8 @@ Options:
 --modelid              Model id
 --list                 List models
 --non-interactive      Not interactive questions
---analysisinterval     Restrict the evaluation to 1 single analysis interval (Optional)
+--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)
 --mode                 'configuration' or 'trainedmodel'. You can only use mode=trainedmodel when the trained" .
     " model was imported" . "
 --reuse-prev-analysed  Reuse recently analysed courses instead of analysing the whole site. Set it to false while" .
@@ -41,7 +42,7 @@ Options:
 -h, --help             Print out this help
 
 Example:
-\$ php admin/tool/analytics/cli/evaluate_model.php --modelid=1 --analysisinterval='\\core\\analytics\\time_splitting\\quarters'
+\$ php admin/tool/analytics/cli/evaluate_model.php --modelid=1 --timesplitting='\\core\\analytics\\time_splitting\\quarters' --filter=123,321
 ";
 
 // Now get cli options.
@@ -50,10 +51,11 @@ list($options, $unrecognized) = cli_get_params(
         'help'                  => false,
         'modelid'               => false,
         'list'                  => false,
-        'analysisinterval'      => false,
+        'timesplitting'         => false,
         'mode'                  => 'configuration',
         'reuse-prev-analysed'   => true,
         'non-interactive'       => false,
+        'filter'                => false
     ),
     array(
         'h' => 'help',
@@ -65,11 +67,6 @@ if ($options['help']) {
     exit(0);
 }
 
-if (!\core_analytics\manager::is_analytics_enabled()) {
-    echo get_string('analyticsdisabled', 'analytics') . PHP_EOL;
-    exit(0);
-}
-
 if ($options['list']) {
     \tool_analytics\clihelper::list_models();
     exit(0);
@@ -81,12 +78,17 @@ if ($options['modelid'] === false) {
     exit(0);
 }
 
+// Reformat them as an array.
+if ($options['filter'] !== false) {
+    $options['filter'] = explode(',', $options['filter']);
+}
+
 if ($options['mode'] !== 'configuration' && $options['mode'] !== 'trainedmodel') {
     cli_error('Error: The provided mode is not supported');
 }
 
-if ($options['mode'] == 'trainedmodel' && $options['analysisinterval']) {
-    cli_error('Sorry, no analysis interval can be specified when using \'trainedmodel\' mode.');
+if ($options['mode'] == 'trainedmodel' && $options['timesplitting']) {
+    cli_error('Sorry, no time splitting method can be specified when using \'trainedmodel\' mode.');
 }
 
 // We need admin permissions.
@@ -103,7 +105,8 @@ if ($options['reuse-prev-analysed']) {
 $renderer = $PAGE->get_renderer('tool_analytics');
 
 $analyseroptions = array(
-    'timesplitting' => $options['analysisinterval'],
+    'filter' => $options['filter'],
+    'timesplitting' => $options['timesplitting'],
     'reuseprevanalysed' => $options['reuse-prev-analysed'],
     'mode' => $options['mode'],
 );

admin/tool/analytics/createmodel.php

@@ -27,13 +27,6 @@ require_once(__DIR__ . '/../../../config.php');
 require_login();
 \core_analytics\manager::check_can_manage_models();
 
-if (!\core_analytics\manager::is_analytics_enabled()) {
-    $PAGE->set_context(\context_system::instance());
-    $renderer = $PAGE->get_renderer('tool_analytics');
-    echo $renderer->render_analytics_disabled();
-    exit(0);
-}
-
 $returnurl = new \moodle_url('/admin/tool/analytics/index.php');
 $url = new \moodle_url('/admin/tool/analytics/createmodel.php');
 $title = get_string('createmodel', 'tool_analytics');
@@ -45,8 +38,6 @@ $targets = array_filter(\core_analytics\manager::get_all_targets(), function($ta
     return (!$target->based_on_assumptions());
 });
 
-// Set 'supportscontexts' to true as at this stage we don't know if the contexts are supported by
-// the selected target.
 $customdata = array(
     'trainedmodel' => false,
     'staticmodel' => false,
@@ -54,7 +45,6 @@ $customdata = array(
     'indicators' => \core_analytics\manager::get_all_indicators(),
     'timesplittings' => \core_analytics\manager::get_all_time_splittings(),
     'predictionprocessors' => \core_analytics\manager::get_all_prediction_processors(),
-    'supportscontexts' => true,
 );
 $mform = new \tool_analytics\output\form\edit_model(null, $customdata);
 
@@ -89,8 +79,8 @@ if ($mform->is_cancelled()) {
         $indicators = array_diff_key($indicators, $invalidindicators);
     }
 
-    // Update the model with the rest of the data provided in the form.
-    $model->update($data->enabled, $indicators, $timesplitting, $predictionsprocessor, $data->contexts);
+    // Update the model with the valid list of indicators.
+    $model->update($data->enabled, $indicators, $timesplitting, $predictionsprocessor);
 
     $message = '';
     $messagetype = \core\output\notification::NOTIFY_SUCCESS;

admin/tool/analytics/db/services.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/>.
-
-/**
- * Tool analytics webservice definitions.
- *
- * @package    tool_analytics
- * @copyright  2019 David Monllao {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-$functions = array(
-
-    'tool_analytics_potential_contexts' => array(
-        'classname'   => 'tool_analytics\external',
-        'methodname'  => 'potential_contexts',
-        'description' => 'Retrieve the list of potential contexts for a model.',
-        'type'        => 'read',
-        'ajax'          => true,
-        'services'    => array(MOODLE_OFFICIAL_MOBILE_SERVICE)
-    ),
-);

admin/tool/analytics/importmodel.php

@@ -27,13 +27,6 @@ require_once(__DIR__ . '/../../../config.php');
 require_login();
 \core_analytics\manager::check_can_manage_models();
 
-if (!\core_analytics\manager::is_analytics_enabled()) {
-    $PAGE->set_context(\context_system::instance());
-    $renderer = $PAGE->get_renderer('tool_analytics');
-    echo $renderer->render_analytics_disabled();
-    exit(0);
-}
-
 $returnurl = new \moodle_url('/admin/tool/analytics/index.php');
 $url = new \moodle_url('/admin/tool/analytics/importmodel.php');
 $title = get_string('importmodel', 'tool_analytics');
@@ -63,4 +56,4 @@ if ($form->is_cancelled()) {
 
 echo $OUTPUT->header();
 $form->display();
-echo $OUTPUT->footer();
+echo $OUTPUT->footer();

admin/tool/analytics/lang/en/deprecated.txt

@@ -1 +0,0 @@
-getpredictions,tool_analytics

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

@@ -23,14 +23,9 @@
  */
 
 $string['accuracy'] = 'Accuracy';
-$string['actions'] = 'Actions';
-$string['actionsexecutedbyusers'] = 'Actions executed by users';
-$string['actionsexecutedbyusersfor'] = 'Actions executed by users for "{$a}" model';
-$string['actionexecutedgroupedusefulness'] = 'Grouped actions';
 $string['allpredictions'] = 'All predictions';
-$string['alltimesplittingmethods'] = 'All analysis intervals';
+$string['alltimesplittingmethods'] = 'All time-splitting methods';
 $string['analysingsitedata'] = 'Analysing the site';
-$string['analysis'] = 'Analysis';
 $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';
@@ -38,24 +33,22 @@ $string['cantguessenddate'] = 'Can\'t guess the end date';
 $string['classdoesnotexist'] = 'Class {$a} does not exist';
 $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 an analysis interval by its ID. Note that you can also enable it later using the web interface (\'none\' to exit).';
+$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['clievaluationandpredictionsnoadmin'] = 'A scheduled task iterates through enabled models and gets predictions. Models evaluation via the web interface is disabled. It may be enabled by a site administrator.';
 $string['component'] = 'Component';
 $string['componentcore'] = 'Core';
 $string['componentselect'] = 'Select all models provided by the component \'{$a}\'';
 $string['componentselectnone'] = 'Unselect all';
-$string['contexts'] = 'Contexts';
-$string['contexts_help'] = 'The model will be limited to this set of contexts. No context restrictions will be applied if no contexts are selected.';
 $string['createmodel'] = 'Create model';
-$string['currenttimesplitting'] = 'Current analysis interval';
+$string['currenttimesplitting'] = 'Current time-splitting method';
 $string['delete'] = 'Delete';
 $string['deletemodelconfirmation'] = 'Are you sure you want to delete "{$a}"? These changes cannot be reverted.';
 $string['disabled'] = 'Disabled';
 $string['editmodel'] = 'Edit "{$a}" model';
-$string['edittrainedwarning'] = 'This model has already been trained. Note that changing its indicators or its analysis interval will delete its previous predictions and start generating new predictions.';
+$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 an analysis interval before enabling the model';
+$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';
@@ -78,13 +71,15 @@ $string['evaluationmodecoltrainedmodel'] = 'Trained model';
 $string['evaluationmodecolconfiguration'] = 'Configuration';
 $string['evaluationmodeconfiguration'] = 'Evaluate the model configuration';
 $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['executescheduledanalysis'] = 'Execute scheduled analysis';
 $string['export'] = 'Export';
 $string['exportincludeweights'] = 'Include the weights of the trained model';
 $string['exportmodel'] = 'Export configuration';
 $string['exporttrainingdata'] = 'Export training data';
+$string['getpredictionsresultscli'] = 'Results using {$a->name} (id: {$a->id}) time-splitting method';
+$string['getpredictionsresults'] = 'Results using {$a->name} time-splitting method';
 $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['importmodel'] = 'Import model';
 $string['indicators'] = 'Indicators';
@@ -92,7 +87,6 @@ $string['indicators_help'] = 'The indicators are what you think will lead to an
 $string['indicators_link'] = 'Indicators';
 $string['indicatorsnum'] = 'Number of indicators: {$a}';
 $string['info'] = 'Info';
-$string['insightsreport'] = 'Insights report';
 $string['ignoreversionmismatches'] = 'Ignore version mismatches';
 $string['ignoreversionmismatchescheckbox'] = 'Ignore the differences between this site version and the original site version.';
 $string['importedsuccessfully'] = 'The model has been successfully imported.';
@@ -100,10 +94,7 @@ $string['insights'] = 'Insights';
 $string['invalidanalysables'] = 'Invalid site elements';
 $string['invalidanalysablesinfo'] = 'This page lists analysable elements that can\'t be used by this prediction model. The listed elements can\'t be used either to train the prediction model nor can the prediction model obtain predictions for them.';
 $string['invalidanalysablestable'] = 'Invalid site analysable elements table';
-$string['invalidcurrenttimesplitting'] = 'The current analysis interval is invalid for the target of this model. Please select a different interval.';
-$string['invalidindicatorsremoved'] = 'A new model has been added. Indicators that don\'t work with the selected target have been automatically removed.';
-$string['invalidtimesplitting'] = 'The selected analysis interval is invalid for the selected target.';
-$string['invalidtimesplittinginmodels'] = 'The analysis interval used by some of the models is invalid. Please select a different interval for the following models: {$a}';
+$string['invalidindicatorsremoved'] = 'A new model has been added. Indicators that do not work with the selected target have been automatically removed.';
 $string['invalidprediction'] = 'Invalid to get predictions';
 $string['invalidtraining'] = 'Invalid to train the model';
 $string['loginfo'] = 'Log extra info';
@@ -112,13 +103,12 @@ $string['modelid'] = 'Model ID';
 $string['modelinvalidanalysables'] = 'Invalid analysable elements for "{$a}" model';
 $string['modelname'] = 'Model name';
 $string['modelresults'] = '{$a} results';
-$string['modeltimesplitting'] = 'Analysis interval';
+$string['modeltimesplitting'] = 'Time splitting';
 $string['newmodel'] = 'New model';
 $string['nextpage'] = 'Next page';
-$string['noactionsfound'] = 'Users have not executed any actions on the generated insights.';
 $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['nodatatopredict'] = 'No new elements to get predictions for';
+$string['nodatatotrain'] = 'There is no new data that can be used for training';
 $string['noinvalidanalysables'] = 'This site does not contain any invalid analysable element.';
 $string['notdefined'] = 'Not yet defined';
 $string['pluginname'] = 'Analytic models';
@@ -135,14 +125,12 @@ $string['restoredefaultsome'] = 'Succesfully re-created {$a->count} new model(s)
 $string['restoredefaultsubmit'] = 'Restore selected';
 $string['samestartdate'] = 'Current start date is good';
 $string['sameenddate'] = 'Current end date is good';
-$string['scheduledanalysisresults'] = 'Results using {$a->name} analysis interval';
-$string['scheduledanalysisresultscli'] = 'Results using {$a->name} (id: {$a->id}) analysis interval';
-$string['selecttimesplittingforevaluation'] = 'Select the analysis interval you want to use to evaluate the model configuration.';
+$string['selecttimesplittingforevaluation'] = 'Select the time-splitting method you want to use to evaluate the model configuration.';
 $string['target'] = 'Target';
 $string['target_help'] = 'The target is what the model will predict.';
 $string['target_link'] = 'Targets';
-$string['timesplittingnotdefined'] = 'No analysis interval is defined.';
-$string['timesplittingnotdefined_help'] = 'You need to select an analysis interval before enabling the model.';
+$string['timesplittingnotdefined'] = 'Time splitting is not defined.';
+$string['timesplittingnotdefined_help'] = 'You need to select a time-splitting method before enabling the model.';
 $string['trainandpredictmodel'] = 'Training model and calculating predictions';
 $string['trainingprocessfinished'] = 'Training process finished';
 $string['trainingresults'] = 'Training results';
@@ -152,6 +140,3 @@ $string['viewlog'] = 'Evaluation 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.';
 $string['privacy:metadata'] = 'The Analytic models plugin does not store any personal data.';
-
-// Deprecated since Moodle 3.8.
-$string['getpredictions'] = 'Get predictions';

admin/tool/analytics/model.php

@@ -33,13 +33,6 @@ require_login();
 $model = new \core_analytics\model($id);
 \core_analytics\manager::check_can_manage_models();
 
-if (!\core_analytics\manager::is_analytics_enabled()) {
-    $PAGE->set_context(\context_system::instance());
-    $renderer = $PAGE->get_renderer('tool_analytics');
-    echo $renderer->render_analytics_disabled();
-    exit(0);
-}
-
 $returnurl = new \moodle_url('/admin/tool/analytics/index.php');
 $params = array('id' => $id, 'action' => $action);
 $url = new \moodle_url('/admin/tool/analytics/model.php', $params);
@@ -52,8 +45,8 @@ switch ($action) {
     case 'evaluate':
         $title = get_string('evaluatemodel', 'tool_analytics');
         break;
-    case 'scheduledanalysis':
-        $title = get_string('analysis', 'tool_analytics');
+    case 'getpredictions':
+        $title = get_string('getpredictions', 'tool_analytics');
         break;
     case 'log':
         $title = get_string('viewlog', 'tool_analytics');
@@ -76,9 +69,6 @@ switch ($action) {
     case 'clear':
         $title = get_string('clearpredictions', 'tool_analytics');
         break;
-    case 'insightsreport':
-        $title = get_string('insightsreport', 'tool_analytics');
-        break;
     case 'invalidanalysables':
         $title = get_string('invalidanalysables', 'tool_analytics');
         break;
@@ -120,21 +110,13 @@ switch ($action) {
     case 'edit':
         confirm_sesskey();
 
-        $invalidcurrenttimesplitting = $model->invalid_timesplitting_selected();
-        $potentialtimesplittings = $model->get_potential_timesplittings();
-
         $customdata = array(
             'id' => $model->get_id(),
             'trainedmodel' => $model->is_trained(),
             'staticmodel' => $model->is_static(),
-            'invalidcurrenttimesplitting' => (!empty($invalidcurrenttimesplitting)),
-            'targetclass' => $model->get_target()->get_id(),
-            'targetname' => $model->get_target()->get_name(),
             'indicators' => $model->get_potential_indicators(),
-            'timesplittings' => $potentialtimesplittings,
-            'predictionprocessors' => \core_analytics\manager::get_all_prediction_processors(),
-            'supportscontexts' => ($model->get_analyser(['notimesplitting' => true]))::context_restriction_support(),
-            'contexts' => $model->get_contexts(),
+            'timesplittings' => \core_analytics\manager::get_all_time_splittings(),
+            'predictionprocessors' => \core_analytics\manager::get_all_prediction_processors()
         );
         $mform = new \tool_analytics\output\form\edit_model(null, $customdata);
 
@@ -159,11 +141,7 @@ switch ($action) {
                 $predictionsprocessor = false;
             }
 
-            if (!isset($data->contexts)) {
-                $data->contexts = null;
-            }
-
-            $model->update($data->enabled, $indicators, $timesplitting, $predictionsprocessor, $data->contexts);
+            $model->update($data->enabled, $indicators, $timesplitting, $predictionsprocessor);
             redirect($returnurl);
         }
 
@@ -174,9 +152,6 @@ switch ($action) {
         $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);
-        if ($modelobj->contextids) {
-            $modelobj->contexts = array_map($callable, json_decode($modelobj->contextids));
-        }
         $modelobj->predictionsprocessor = \tool_analytics\output\helper::class_to_option($modelobj->predictionsprocessor);
         $mform->set_data($modelobj);
         $mform->display();
@@ -225,7 +200,7 @@ switch ($action) {
         echo $renderer->render_evaluate_results($results, $model->get_analyser()->get_logs());
         break;
 
-    case 'scheduledanalysis':
+    case 'getpredictions':
         confirm_sesskey();
 
         if ($onlycli) {
@@ -298,18 +273,6 @@ switch ($action) {
         redirect($returnurl);
         break;
 
-    case 'insightsreport':
-
-        $contextid = optional_param('contextid', null, PARAM_INT);
-
-        echo $OUTPUT->header();
-
-        $renderable = new \tool_analytics\output\insights_report($model, $contextid);
-        $renderer = $PAGE->get_renderer('tool_analytics');
-        echo $renderer->render($renderable);
-
-        break;
-
     case 'invalidanalysables':
 
         echo $OUTPUT->header();

admin/tool/analytics/restoredefault.php

@@ -27,13 +27,6 @@ require_once(__DIR__ . '/../../../config.php');
 require_login();
 \core_analytics\manager::check_can_manage_models();
 
-if (!\core_analytics\manager::is_analytics_enabled()) {
-    $PAGE->set_context(\context_system::instance());
-    $renderer = $PAGE->get_renderer('tool_analytics');
-    echo $renderer->render_analytics_disabled();
-    exit(0);
-}
-
 $confirmed = optional_param('confirmed', false, PARAM_BOOL);
 $restoreids = optional_param_array('restoreid', [], PARAM_ALPHANUM);
 

admin/tool/analytics/settings.php

@@ -24,7 +24,5 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-if (\core_analytics\manager::is_analytics_enabled()) {
-    $ADMIN->add('analytics', new admin_externalpage('analyticmodels', get_string('analyticmodels', 'tool_analytics'),
-        "$CFG->wwwroot/$CFG->admin/tool/analytics/index.php", 'moodle/analytics:managemodels'));
-}
+$ADMIN->add('analytics', new admin_externalpage('analyticmodels', get_string('analyticmodels', 'tool_analytics'),
+    "$CFG->wwwroot/$CFG->admin/tool/analytics/index.php", 'moodle/analytics:managemodels'));

admin/tool/analytics/templates/insights_report.mustache

@@ -1,65 +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/insights_report
-
-    Template for the insights report.
-
-    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",
-        "noactions": {
-            "message": "Users have not executed any actions on the generated insights.",
-            "announce": "true"
-        }
-    }
-}}
-
-<div class="box">
-    <h3>{{#str}}actionsexecutedbyusersfor, tool_analytics, {{modelname}}{{/str}}</h3>
-
-    {{#contextselect}}
-        <div class="mt-3">
-            {{> core/single_select }}
-        </div>
-    {{/contextselect}}
-
-    {{#noactions}}
-        <div class="mt-3 mb-1">
-            {{> core/notification_info}}
-        </div>
-    {{/noactions}}
-    {{^noanalysables}}
-        <div class="row">
-            <div class="col-xl-6">
-                {{{separatedchart}}}
-            </div>
-            <div class="col-xl-6">
-                {{{groupedchart}}}
-            </div>
-        </div>
-    {{/noanalysables}}
-</div>

admin/tool/analytics/templates/restorable_models.mustache

@@ -58,7 +58,7 @@
                 "models": [
                     {
                         "defid": "id24680aceg",
-                        "targetname": "Courses at risk of not starting",
+                        "targetname": "No teaching",
                         "targetclass": "\\core\\analytics\\target\\no_teaching",
                         "indicatorsnum": 2,
                         "indicators": [

admin/tool/analytics/tests/behat/restoredefault.feature

@@ -15,55 +15,55 @@ Feature: Restoring default models
   Scenario: Restore a single deleted default model
     Given I log in as "manager"
     And I navigate to "Analytics > Analytics models" in site administration
-    # Delete 'Courses at risk of not starting' model.
-    And I click on "Delete" "link" in the "Courses at risk of not starting" "table_row"
+    # Delete 'No teaching' model.
+    And I click on "Delete" "link" in the "No teaching" "table_row"
     And I should see "Analytics models"
-    And I should not see "Courses at risk of not starting"
+    And I should not see "No teaching"
     # Delete 'Students at risk of dropping out' model.
     And I click on "Delete" "link" in the "Students at risk of dropping out" "table_row"
     And I should see "Analytics models"
     And I should not see "Students at risk of dropping out"
     # Go to the page for restoring deleted models.
     When I click on "Restore default models" "link"
-    And I should see "Courses at risk of not starting"
+    And I should see "No teaching"
     And I should see "Students at risk of dropping out"
-    # Select and restore the 'Courses at risk of not starting' model.
-    And I set the field with xpath "//tr[contains(normalize-space(.), 'Courses at risk of not starting')]//input[@type='checkbox']" to "1"
+    # Select and restore the 'No teaching' model.
+    And I set the field with xpath "//tr[contains(normalize-space(.), 'No teaching')]//input[@type='checkbox']" to "1"
     And I click on "Restore selected" "button"
     Then I should see "Succesfully re-created 1 new model(s)."
     And I should see "Analytics models"
-    And I should see "Courses at risk of not starting"
+    And I should see "No teaching"
     And I should not see "Students at risk of dropping out"
 
   Scenario: Restore multiple deleted default models at once
     Given I log in as "manager"
     And I navigate to "Analytics > Analytics models" in site administration
-    # Delete 'Courses at risk of not starting' model.
-    And I click on "Delete" "link" in the "Courses at risk of not starting" "table_row"
+    # Delete 'No teaching' model.
+    And I click on "Delete" "link" in the "No teaching" "table_row"
     And I should see "Analytics models"
-    And I should not see "Courses at risk of not starting"
+    And I should not see "No teaching"
     # Delete 'Students at risk of dropping out' model.
     And I click on "Delete" "link" in the "Students at risk of dropping out" "table_row"
     And I should see "Analytics models"
     And I should not see "Students at risk of dropping out"
     # Go to the page for restoring deleted models.
     When I click on "Restore default models" "link"
-    And I should see "Courses at risk of not starting"
+    And I should see "No teaching"
     And I should see "Students at risk of dropping out"
     # Select and restore both models.
-    And I set the field with xpath "//tr[contains(normalize-space(.), 'Courses at risk of not starting')]//input[@type='checkbox']" to "1"
+    And I set the field with xpath "//tr[contains(normalize-space(.), 'No teaching')]//input[@type='checkbox']" to "1"
     And I set the field with xpath "//tr[contains(normalize-space(.), 'Students at risk of dropping out')]//input[@type='checkbox']" to "1"
     And I click on "Restore selected" "button"
     Then I should see "Succesfully re-created 2 new model(s)."
     And I should see "Analytics models"
-    And I should see "Courses at risk of not starting"
+    And I should see "No teaching"
     And I should see "Students at risk of dropping out"
 
   Scenario: Going to the restore page while no models can be restored
     Given I log in as "manager"
     And I navigate to "Analytics > Analytics models" in site administration
     And I should see "Analytics models"
-    And I should see "Courses at risk of not starting"
+    And I should see "No teaching"
     When I click on "Restore default models" "link"
     Then I should see "All default models provided by core and installed plugins have been created. No new models were found; there is nothing to restore."
     And I click on "Back" "link"
@@ -73,23 +73,23 @@ Feature: Restoring default models
   Scenario: User can select and restore all missing models
     Given I log in as "manager"
     And I navigate to "Analytics > Analytics models" in site administration
-    # Delete 'Courses at risk of not starting' model.
-    And I click on "Actions" "link" in the "Courses at risk of not starting" "table_row"
-    And I click on "Delete" "link" in the "Courses at risk of not starting" "table_row"
+    # Delete 'No teaching' model.
+    And I click on "Actions" "link" in the "No teaching" "table_row"
+    And I click on "Delete" "link" in the "No teaching" "table_row"
     And I click on "Delete" "button" in the "Delete" "dialogue"
     And I should see "Analytics models"
-    And I should not see "Courses at risk of not starting"
+    And I should not see "No teaching"
     # Delete 'Students at risk of dropping out' model.
     And I click on "Actions" "link" in the "Students at risk of dropping out" "table_row"
     And I click on "Delete" "link" in the "Students at risk of dropping out" "table_row"
     And I click on "Delete" "button" in the "Delete" "dialogue"
     And I should see "Analytics models"
-    And I should not see "Courses at risk of not starting"
+    And I should not see "No teaching"
     And I should not see "Students at risk of dropping out"
     # Go to the page for restoring deleted models.
     And I click on "New model" "link"
     And I click on "Restore default models" "link"
-    And I should see "Courses at risk of not starting"
+    And I should see "No teaching"
     And I should see "Students at risk of dropping out"
     # Attempt to submit the form without selecting any model.
     And I click on "Restore selected" "button"
@@ -99,5 +99,5 @@ Feature: Restoring default models
     And I click on "Restore selected" "button"
     Then I should see "Succesfully re-created 2 new model(s)."
     And I should see "Analytics models"
-    And I should see "Courses at risk of not starting"
+    And I should see "No teaching"
     And I should see "Students at risk of dropping out"

admin/tool/analytics/tests/external_test.php

@@ -1,80 +0,0 @@
-<?php
-// This file is part of Moodle - http://moodle.org/
-//
-// Moodle is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Moodle is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Tool analytics external functions tests.
- *
- * @package    tool_analytics
- * @category   external
- * @copyright  2019 David Monllaó {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since      Moodle 3.8
- */
-
-defined('MOODLE_INTERNAL') || die();
-
-global $CFG;
-
-require_once($CFG->dirroot . '/webservice/tests/helpers.php');
-require_once(__DIR__ . '/../../../../analytics/tests/fixtures/test_indicator_max.php');
-require_once(__DIR__ . '/../../../../analytics/tests/fixtures/test_target_course_level_shortname.php');
-
-/**
- * Tool analytics external functions tests
- *
- * @package    tool_analytics
- * @category   external
- * @copyright  2019 David Monllaó {@link http://www.davidmonllao.com}
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @since      Moodle 3.8
- */
-class tool_analytics_external_testcase extends externallib_advanced_testcase {
-
-    /**
-     * test_potential_contexts description
-     */
-    public function test_potential_contexts() {
-        $this->resetAfterTest();
-
-        $this->setAdminUser();
-
-        // Include the all context levels so the misc. category get included.
-        $this->assertCount(1, \tool_analytics\external::potential_contexts());
-
-        // The frontpage is not included.
-        $this->assertCount(0, \tool_analytics\external::potential_contexts('PHPUnit'));
-
-        $target = \core_analytics\manager::get_target('test_target_course_level_shortname');
-        $indicators = ['test_indicator_max' => \core_analytics\manager::get_indicator('test_indicator_max')];
-        $model = \core_analytics\model::create($target, $indicators);
-
-        $this->assertCount(1, \tool_analytics\external::potential_contexts(null, $model->get_id()));
-    }
-
-    /**
-     * test_potential_contexts description
-     *
-     * @expectedException required_capability_exception
-     */
-    public function test_potential_contexts_no_manager() {
-        $this->resetAfterTest();
-
-        $user = $this->getDataGenerator()->create_user();
-        $this->setUser($user);
-
-        $this->assertCount(2, \tool_analytics\external::potential_contexts());
-    }
-}

admin/tool/analytics/version.php

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

admin/tool/availabilityconditions/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2019111800;
-$plugin->requires = 2019111200;
+$plugin->version = 2019052000;
+$plugin->requires = 2019051100;
 $plugin->component = 'tool_availabilityconditions';

admin/tool/behat/version.php

@@ -24,6 +24,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2019111800;   // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2019111200;   // Requires this Moodle version
+$plugin->version   = 2019052000;   // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2019051100;   // Requires this Moodle version
 $plugin->component = 'tool_behat'; // Full name of the plugin (used for diagnostics)

admin/tool/capability/renderer.php

@@ -124,7 +124,7 @@ class tool_capability_renderer extends plugin_renderer_base {
 
         $title = get_string('permissionsincontext', 'core_role', $context->get_context_name());
 
-        $html = $this->output->heading(html_writer::link($url, $title), 3);
+        $html = $this->output->heading(html_writer::link($url, $context->get_context_name(), ['title' => $title]), 3);
         $html .= html_writer::table($table);
         // If there are any child contexts, print them recursively.
         if (!empty($contexts[$contextid]->children)) {

admin/tool/capability/version.php

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

admin/tool/cohortroles/version.php

@@ -25,8 +25,8 @@
 defined('MOODLE_INTERNAL') || die();
 
 
-$plugin->version   = 2019111800; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2019111200; // Requires this Moodle version.
+$plugin->version   = 2019052000; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2019051100; // Requires this Moodle version.
 $plugin->component = 'tool_cohortroles'; // Full name of the plugin (used for diagnostics).
 
 $plugin->dependencies = array(

admin/tool/customlang/version.php

@@ -25,6 +25,6 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2019111800;
-$plugin->requires  = 2019111200;
+$plugin->version   = 2019052000;
+$plugin->requires  = 2019051100;
 $plugin->component = 'tool_customlang'; // Full name of the plugin (used for diagnostics)

admin/tool/dataprivacy/amd/build/add_category.min.js

@@ -1,2 +1 @@
-define ("tool_dataprivacy/add_category",["jquery","core/str","core/ajax","core/notification","core/modal_factory","core/modal_events","core/fragment"],function(a,b,c,d,e,f,g){var h={CATEGORY_LINK:"[data-add-element=\"category\"]"},i=function(a){this.contextId=a;this.strings=b.get_strings([{key:"addcategory",component:"tool_dataprivacy"},{key:"save",component:"admin"}]);this.registerEventListeners()};i.prototype.contextId=0;i.prototype.strings=0;i.prototype.registerEventListeners=function(){var b=a(h.CATEGORY_LINK);b.on("click",function(){return this.strings.then(function(a){e.create({type:e.types.SAVE_CANCEL,title:a[0],body:""},b).done(function(b){this.setupFormModal(b,a[1])}.bind(this))}.bind(this)).fail(d.exception)}.bind(this))};i.prototype.getBody=function(a){var b=null;if("undefined"!=typeof a){b={jsonformdata:JSON.stringify(a)}}return g.loadFragment("tool_dataprivacy","addcategory_form",this.contextId,b)};i.prototype.setupFormModal=function(a,b){a.setLarge();a.setSaveButtonText(b);a.getRoot().on(f.hidden,this.destroy.bind(this));a.setBody(this.getBody());a.getRoot().on(f.save,this.submitForm.bind(this));a.getRoot().on("submit","form",this.submitFormAjax.bind(this));this.modal=a;a.show()};i.prototype.submitForm=function(a){a.preventDefault();this.modal.getRoot().find("form").submit()};i.prototype.submitFormAjax=function(a){a.preventDefault();var b=this.modal.getRoot().find("form").serialize();c.call([{methodname:"tool_dataprivacy_create_category_form",args:{jsonformdata:JSON.stringify(b)},done:function(a){if(a.validationerrors){this.modal.setBody(this.getBody(b))}else{this.close()}}.bind(this),fail:d.exception}])};i.prototype.close=function(){this.destroy();document.location.reload()};i.prototype.destroy=function(){Y.use("moodle-core-formchangechecker",function(){M.core_formchangechecker.reset_form_dirty_state()});this.modal.destroy()};i.prototype.removeListeners=function(){a(h.CATEGORY_LINK).off("click")};return{getInstance:function getInstance(a){return new i(a)}}});
-//# sourceMappingURL=add_category.min.js.map
+define(["jquery","core/str","core/ajax","core/notification","core/modal_factory","core/modal_events","core/fragment"],function(a,b,c,d,e,f,g){var h={CATEGORY_LINK:'[data-add-element="category"]'},i=function(a){this.contextId=a;var c=[{key:"addcategory",component:"tool_dataprivacy"},{key:"save",component:"admin"}];this.strings=b.get_strings(c),this.registerEventListeners()};return i.prototype.contextId=0,i.prototype.strings=0,i.prototype.registerEventListeners=function(){var b=a(h.CATEGORY_LINK);b.on("click",function(){return this.strings.then(function(a){e.create({type:e.types.SAVE_CANCEL,title:a[0],body:""},b).done(function(b){this.setupFormModal(b,a[1])}.bind(this))}.bind(this)).fail(d.exception)}.bind(this))},i.prototype.getBody=function(a){var b=null;return"undefined"!=typeof a&&(b={jsonformdata:JSON.stringify(a)}),g.loadFragment("tool_dataprivacy","addcategory_form",this.contextId,b)},i.prototype.setupFormModal=function(a,b){a.setLarge(),a.setSaveButtonText(b),a.getRoot().on(f.hidden,this.destroy.bind(this)),a.setBody(this.getBody()),a.getRoot().on(f.save,this.submitForm.bind(this)),a.getRoot().on("submit","form",this.submitFormAjax.bind(this)),this.modal=a,a.show()},i.prototype.submitForm=function(a){a.preventDefault(),this.modal.getRoot().find("form").submit()},i.prototype.submitFormAjax=function(a){a.preventDefault();var b=this.modal.getRoot().find("form").serialize();c.call([{methodname:"tool_dataprivacy_create_category_form",args:{jsonformdata:JSON.stringify(b)},done:function(a){a.validationerrors?this.modal.setBody(this.getBody(b)):this.close()}.bind(this),fail:d.exception}])},i.prototype.close=function(){this.destroy(),document.location.reload()},i.prototype.destroy=function(){Y.use("moodle-core-formchangechecker",function(){M.core_formchangechecker.reset_form_dirty_state()}),this.modal.destroy()},i.prototype.removeListeners=function(){a(h.CATEGORY_LINK).off("click")},{getInstance:function(a){return new i(a)}}});

admin/tool/dataprivacy/amd/build/add_purpose.min.js

@@ -1,2 +1 @@
-define ("tool_dataprivacy/add_purpose",["jquery","core/str","core/ajax","core/notification","core/modal_factory","core/modal_events","core/fragment"],function(a,b,c,d,e,f,g){var h={PURPOSE_LINK:"[data-add-element=\"purpose\"]"},i=function(a){this.contextId=a;this.strings=b.get_strings([{key:"addpurpose",component:"tool_dataprivacy"},{key:"save",component:"admin"}]);this.registerEventListeners()};i.prototype.contextId=0;i.prototype.strings=0;i.prototype.registerEventListeners=function(){var b=a(h.PURPOSE_LINK);b.on("click",function(){return this.strings.then(function(a){e.create({type:e.types.SAVE_CANCEL,title:a[0],body:""},b).done(function(b){this.setupFormModal(b,a[1])}.bind(this))}.bind(this)).fail(d.exception)}.bind(this))};i.prototype.getBody=function(a){var b=null;if("undefined"!=typeof a){b={jsonformdata:JSON.stringify(a)}}return g.loadFragment("tool_dataprivacy","addpurpose_form",this.contextId,b)};i.prototype.setupFormModal=function(a,b){a.setLarge();a.setSaveButtonText(b);a.getRoot().on(f.hidden,this.destroy.bind(this));a.setBody(this.getBody());a.getRoot().on(f.save,this.submitForm.bind(this));a.getRoot().on("submit","form",this.submitFormAjax.bind(this));this.modal=a;a.show()};i.prototype.submitForm=function(a){a.preventDefault();this.modal.getRoot().find("form").submit()};i.prototype.submitFormAjax=function(a){a.preventDefault();var b=this.modal.getRoot().find("form").serialize();c.call([{methodname:"tool_dataprivacy_create_purpose_form",args:{jsonformdata:JSON.stringify(b)},done:function(a){if(a.validationerrors){this.modal.setBody(this.getBody(b))}else{this.close()}}.bind(this),fail:d.exception}])};i.prototype.close=function(){this.destroy();document.location.reload()};i.prototype.destroy=function(){Y.use("moodle-core-formchangechecker",function(){M.core_formchangechecker.reset_form_dirty_state()});this.modal.destroy()};i.prototype.removeListeners=function(){a(h.PURPOSE_LINK).off("click")};return{getInstance:function getInstance(a){return new i(a)}}});
-//# sourceMappingURL=add_purpose.min.js.map
+define(["jquery","core/str","core/ajax","core/notification","core/modal_factory","core/modal_events","core/fragment"],function(a,b,c,d,e,f,g){var h={PURPOSE_LINK:'[data-add-element="purpose"]'},i=function(a){this.contextId=a;var c=[{key:"addpurpose",component:"tool_dataprivacy"},{key:"save",component:"admin"}];this.strings=b.get_strings(c),this.registerEventListeners()};return i.prototype.contextId=0,i.prototype.strings=0,i.prototype.registerEventListeners=function(){var b=a(h.PURPOSE_LINK);b.on("click",function(){return this.strings.then(function(a){e.create({type:e.types.SAVE_CANCEL,title:a[0],body:""},b).done(function(b){this.setupFormModal(b,a[1])}.bind(this))}.bind(this)).fail(d.exception)}.bind(this))},i.prototype.getBody=function(a){var b=null;return"undefined"!=typeof a&&(b={jsonformdata:JSON.stringify(a)}),g.loadFragment("tool_dataprivacy","addpurpose_form",this.contextId,b)},i.prototype.setupFormModal=function(a,b){a.setLarge(),a.setSaveButtonText(b),a.getRoot().on(f.hidden,this.destroy.bind(this)),a.setBody(this.getBody()),a.getRoot().on(f.save,this.submitForm.bind(this)),a.getRoot().on("submit","form",this.submitFormAjax.bind(this)),this.modal=a,a.show()},i.prototype.submitForm=function(a){a.preventDefault(),this.modal.getRoot().find("form").submit()},i.prototype.submitFormAjax=function(a){a.preventDefault();var b=this.modal.getRoot().find("form").serialize();c.call([{methodname:"tool_dataprivacy_create_purpose_form",args:{jsonformdata:JSON.stringify(b)},done:function(a){a.validationerrors?this.modal.setBody(this.getBody(b)):this.close()}.bind(this),fail:d.exception}])},i.prototype.close=function(){this.destroy(),document.location.reload()},i.prototype.destroy=function(){Y.use("moodle-core-formchangechecker",function(){M.core_formchangechecker.reset_form_dirty_state()}),this.modal.destroy()},i.prototype.removeListeners=function(){a(h.PURPOSE_LINK).off("click")},{getInstance:function(a){return new i(a)}}});

admin/tool/dataprivacy/amd/build/categoriesactions.min.js

@@ -1,2 +1 @@
-define ("tool_dataprivacy/categoriesactions",["jquery","core/ajax","core/notification","core/str","core/modal_factory","core/modal_events"],function(a,b,c,d,e,f){var g={DELETE:"[data-action=\"deletecategory\"]"},h=function(){this.registerEvents()};h.prototype.registerEvents=function(){a(g.DELETE).click(function(g){g.preventDefault();var h=a(this).data("id"),i=a(this).data("name");d.get_strings([{key:"deletecategory",component:"tool_dataprivacy"},{key:"deletecategorytext",component:"tool_dataprivacy",param:i},{key:"delete"}]).then(function(d){var g=d[0],i=d[1],j=d[2];return e.create({title:g,body:i,type:e.types.SAVE_CANCEL}).then(function(d){d.setSaveButtonText(j);d.getRoot().on(f.save,function(){b.call([{methodname:"tool_dataprivacy_delete_category",args:{id:h}}])[0].done(function(b){if(b.result){a("tr[data-categoryid=\""+h+"\"]").remove()}else{c.addNotification({message:b.warnings[0].message,type:"error"})}}).fail(c.exception)});d.getRoot().on(f.hidden,function(){d.destroy()});return d})}).done(function(a){a.show()}).fail(c.exception)})};return{init:function init(){return new h}}});
-//# sourceMappingURL=categoriesactions.min.js.map
+define(["jquery","core/ajax","core/notification","core/str","core/modal_factory","core/modal_events"],function(a,b,c,d,e,f){var g={DELETE:'[data-action="deletecategory"]'},h=function(){this.registerEvents()};return h.prototype.registerEvents=function(){a(g.DELETE).click(function(g){g.preventDefault();var h=a(this).data("id"),i=a(this).data("name"),j=[{key:"deletecategory",component:"tool_dataprivacy"},{key:"deletecategorytext",component:"tool_dataprivacy",param:i},{key:"delete"}];d.get_strings(j).then(function(d){var g=d[0],i=d[1],j=d[2];return e.create({title:g,body:i,type:e.types.SAVE_CANCEL}).then(function(d){return d.setSaveButtonText(j),d.getRoot().on(f.save,function(){var d={methodname:"tool_dataprivacy_delete_category",args:{id:h}};b.call([d])[0].done(function(b){b.result?a('tr[data-categoryid="'+h+'"]').remove():c.addNotification({message:b.warnings[0].message,type:"error"})}).fail(c.exception)}),d.getRoot().on(f.hidden,function(){d.destroy()}),d})}).done(function(a){a.show()}).fail(c.exception)})},{init:function(){return new h}}});

admin/tool/dataprivacy/amd/build/data_deletion.min.js

@@ -1,2 +1 @@
-define ("tool_dataprivacy/data_deletion",["jquery","core/ajax","core/notification","core/str","core/modal_factory","core/modal_events"],function(a,b,c,d,e,f){var h={MARK_FOR_DELETION:"[data-action=\"markfordeletion\"]",SELECT_ALL:"[data-action=\"selectall\"]"},i={SELECTCONTEXT:".selectcontext"},j=function(){this.registerEvents()};j.prototype.registerEvents=function(){a(h.MARK_FOR_DELETION).click(function(b){b.preventDefault();var c=[];a(i.SELECTCONTEXT).each(function(){var b=a(this);if(b.is(":checked")){c.push(b.val())}});g(c)});a(h.SELECT_ALL).change(function(b){b.preventDefault();var c=a(this);if(c.is(":checked")){a(i.SELECTCONTEXT).attr("checked","checked")}else{a(i.SELECTCONTEXT).removeAttr("checked")}})};function g(a){var g="";d.get_strings([{key:"confirm",component:"moodle"},{key:"confirmcontextdeletion",component:"tool_dataprivacy"}]).then(function(a){g=a[0];var b=a[1];return e.create({title:g,body:b,type:e.types.SAVE_CANCEL})}).then(function(d){d.setSaveButtonText(g);d.getRoot().on(f.save,function(){b.call([{methodname:"tool_dataprivacy_confirm_contexts_for_deletion",args:{ids:a}}])[0].done(function(a){if(a.result){window.location.reload()}else{c.addNotification({message:a.warnings[0].message,type:"error"})}}).fail(c.exception)});d.getRoot().on(f.hidden,function(){d.destroy()});return d}).done(function(a){a.show()}).fail(c.exception)}return j});
-//# sourceMappingURL=data_deletion.min.js.map
+define(["jquery","core/ajax","core/notification","core/str","core/modal_factory","core/modal_events"],function(a,b,c,d,e,f){function g(a){var g=[{key:"confirm",component:"moodle"},{key:"confirmcontextdeletion",component:"tool_dataprivacy"}],h="tool_dataprivacy_confirm_contexts_for_deletion",i="";d.get_strings(g).then(function(a){i=a[0];var b=a[1];return e.create({title:i,body:b,type:e.types.SAVE_CANCEL})}).then(function(d){return d.setSaveButtonText(i),d.getRoot().on(f.save,function(){var d={ids:a},e={methodname:h,args:d};b.call([e])[0].done(function(a){a.result?window.location.reload():c.addNotification({message:a.warnings[0].message,type:"error"})}).fail(c.exception)}),d.getRoot().on(f.hidden,function(){d.destroy()}),d}).done(function(a){a.show()}).fail(c.exception)}var h={MARK_FOR_DELETION:'[data-action="markfordeletion"]',SELECT_ALL:'[data-action="selectall"]'},i={SELECTCONTEXT:".selectcontext"},j=function(){this.registerEvents()};return j.prototype.registerEvents=function(){a(h.MARK_FOR_DELETION).click(function(b){b.preventDefault();var c=[];a(i.SELECTCONTEXT).each(function(){var b=a(this);b.is(":checked")&&c.push(b.val())}),g(c)}),a(h.SELECT_ALL).change(function(b){b.preventDefault();var c=a(this);c.is(":checked")?a(i.SELECTCONTEXT).attr("checked","checked"):a(i.SELECTCONTEXT).removeAttr("checked")})},j});