Moodle release 3.5.3

weekly release 3.5.2+
Merge branch 'MDL-63960-35' of git://github.com/andrewnicols/moodle into MOODLE_35_STABLE
2018-11-10 20:36:27 +01:00 · 2018-11-10 12:53:24 +01:00 · 2018-11-10 10:28:16 +01:00 · 2018-11-10 15:34:11 +08:00 · 2018-11-10 11:00:46 +08:00 · 2018-11-10 03:51:34 +01:00
1868 changed files with 70157 additions and 23002 deletions
@@ -5,7 +5,6 @@ node_modules/
 vendor/
 admin/tool/policy/amd/src/jquery-eu-cookie-law-popup.js
 admin/tool/usertours/amd/src/tour.js
-admin/tool/usertours/amd/src/popper.js
 auth/cas/CAS/
 enrol/lti/ims-blti/
 filter/algebra/AlgParser.pm
@@ -42,7 +41,6 @@ lib/html2text/
 lib/markdown/
 lib/recaptchalib.php
 lib/xhprof/
-lib/xmlize.php
 lib/horde/
 lib/requirejs/
 lib/amd/src/loglevel.js
@@ -59,7 +57,10 @@ lib/maxmind/MaxMind/
 lib/ltiprovider/
 lib/amd/src/truncate.js
 lib/fonts/
+lib/amd/src/adapter.js
 lib/validateurlsyntax.php
+lib/amd/src/popper.js
+lib/geopattern-php/
 media/player/videojs/amd/src/video-lazy.js
 media/player/videojs/amd/src/Youtube-lazy.js
 media/player/videojs/videojs/
@@ -7,7 +7,6 @@ node_modules/
 vendor/
 admin/tool/policy/amd/src/jquery-eu-cookie-law-popup.js
 admin/tool/usertours/amd/src/tour.js
-admin/tool/usertours/amd/src/popper.js
 auth/cas/CAS/
 enrol/lti/ims-blti/
 filter/algebra/AlgParser.pm
@@ -44,7 +43,6 @@ lib/html2text/
 lib/markdown/
 lib/recaptchalib.php
 lib/xhprof/
-lib/xmlize.php
 lib/horde/
 lib/requirejs/
 lib/amd/src/loglevel.js
@@ -61,7 +59,10 @@ lib/maxmind/MaxMind/
 lib/ltiprovider/
 lib/amd/src/truncate.js
 lib/fonts/
+lib/amd/src/adapter.js
 lib/validateurlsyntax.php
+lib/amd/src/popper.js
+lib/geopattern-php/
 media/player/videojs/amd/src/video-lazy.js
 media/player/videojs/amd/src/Youtube-lazy.js
 media/player/videojs/videojs/
@@ -207,7 +207,7 @@ before_script:
        # We need the official upstream for comparison
        git remote add upstream https://github.com/moodle/moodle.git;

-        git fetch upstream MOODLE_34_STABLE;
+        git fetch upstream MOODLE_35_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`
@@ -137,6 +137,16 @@ module.exports = function(grunt) {
                }
           }
        },
+        sass: {
+            dist: {
+                files: {
+                    "theme/boost/style/moodle.css": "theme/boost/scss/preset/default.scss"
+                }
+            },
+            options: {
+                includePaths: ["theme/boost/scss/"]
+            }
+        },
        watch: {
            options: {
                nospawn: true // We need not to spawn so config can be changed dynamically.
@@ -363,6 +373,7 @@ module.exports = function(grunt) {
    grunt.loadNpmTasks('grunt-contrib-uglify');
    grunt.loadNpmTasks('grunt-contrib-less');
    grunt.loadNpmTasks('grunt-contrib-watch');
+    grunt.loadNpmTasks('grunt-sass');
    grunt.loadNpmTasks('grunt-eslint');
    grunt.loadNpmTasks('grunt-stylelint');

@@ -375,7 +386,7 @@ module.exports = function(grunt) {
    grunt.registerTask('js', ['amd', 'yui']);

    // Register CSS taks.
-    grunt.registerTask('css', ['stylelint:scss', 'stylelint:less', 'less:bootstrapbase', 'stylelint:css']);
+    grunt.registerTask('css', ['stylelint:scss', 'sass', 'stylelint:less', 'less:bootstrapbase', 'stylelint:css']);

    // Register the startup task.
    grunt.registerTask('startup', 'Run the correct tasks for the current directory', tasks.startup);
@@ -219,7 +219,6 @@ $databases = array('mysqli' => moodle_database::get_driver_instance('mysqli', 'n
                   'pgsql'  => moodle_database::get_driver_instance('pgsql',  'native'),
                   'oci'    => moodle_database::get_driver_instance('oci',    'native'),
                   'sqlsrv' => moodle_database::get_driver_instance('sqlsrv', 'native'), // MS SQL*Server PHP driver
-                   'mssql'  => moodle_database::get_driver_instance('mssql',  'native'), // FreeTDS driver
                  );
 foreach ($databases as $type=>$database) {
    if ($database->driver_installed() !== true) {
@@ -443,6 +442,7 @@ if ($interactive) {
    }
 }
 $CFG->tempdir       = $CFG->dataroot.'/temp';
+$CFG->backuptempdir = $CFG->tempdir.'/backup';
 $CFG->cachedir      = $CFG->dataroot.'/cache';
 $CFG->localcachedir = $CFG->dataroot.'/localcache';

@@ -131,10 +131,11 @@ if (!core_plugin_manager::instance()->all_plugins_ok($version, $failed)) {
    cli_error(get_string('pluginschecktodo', 'admin'));
 }

+$a = new stdClass();
+$a->oldversion = $oldversion;
+$a->newversion = $newversion;
+
 if ($interactive) {
-    $a = new stdClass();
-    $a->oldversion = $oldversion;
-    $a->newversion = $newversion;
    echo cli_heading(get_string('databasechecking', '', $a)) . PHP_EOL;
 }

@@ -193,5 +194,5 @@ admin_apply_default_settings(NULL, false);
 // to immediately start browsing the site.
 upgrade_themes();

-echo get_string('cliupgradefinished', 'admin')."\n";
+echo get_string('cliupgradefinished', 'admin', $a)."\n";
 exit(0); // 0 means success
@@ -2618,185 +2618,4 @@
      </CUSTOM_CHECK>
    </CUSTOM_CHECKS>
  </MOODLE>
-  <MOODLE version="3.7" requires="3.2">
-    <UNICODE level="required">
-      <FEEDBACK>
-        <ON_ERROR message="unicoderequired" />
-      </FEEDBACK>
-    </UNICODE>
-    <DATABASE level="required">
-      <VENDOR name="mariadb" version="5.5.31" />
-      <VENDOR name="mysql" version="5.6" />
-      <VENDOR name="postgres" version="9.4" />
-      <VENDOR name="mssql" version="10.0" />
-      <VENDOR name="oracle" version="11.2" />
-    </DATABASE>
-    <PHP version="7.1.0" level="required">
-    </PHP>
-    <PCREUNICODE level="optional">
-      <FEEDBACK>
-        <ON_CHECK message="pcreunicodewarning" />
-      </FEEDBACK>
-    </PCREUNICODE>
-    <PHP_EXTENSIONS>
-      <PHP_EXTENSION name="iconv" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="iconvrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="mbstring" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="mbstringrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="curl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="curlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="openssl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="opensslrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="tokenizer" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="tokenizerrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlrpc" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="xmlrpcrecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="soap" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="soaprecommended" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="ctype" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ctyperequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zip" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="ziprequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="zlib" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="gd" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="gdrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="simplexml" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="simplexmlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="spl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="splrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="pcre" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="dom" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xml" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="xmlreader" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="intl" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="intlrequired" />
-        </FEEDBACK>
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="json" level="required">
-      </PHP_EXTENSION>
-      <PHP_EXTENSION name="hash" level="required"/>
-      <PHP_EXTENSION name="fileinfo" level="required"/>
-    </PHP_EXTENSIONS>
-    <PHP_SETTINGS>
-      <PHP_SETTING name="memory_limit" value="96M" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="settingmemorylimit" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="file_uploads" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="settingfileuploads" />
-        </FEEDBACK>
-      </PHP_SETTING>
-      <PHP_SETTING name="opcache.enable" value="1" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="opcacherecommended" />
-        </FEEDBACK>
-      </PHP_SETTING>
-    </PHP_SETTINGS>
-    <CUSTOM_CHECKS>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbstorageengine" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="quizattemptsupgradedmessage" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="slashargumentswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unsupporteddbtablerowformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="unoconvwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="libcurlwarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfileformat" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddbfilepertable" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
-        <FEEDBACK>
-          <ON_ERROR message="unsupporteddblargeprefix" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="ishttpswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="incompleteunicodesupport" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="optional">
-        <FEEDBACK>
-          <ON_CHECK message="sixtyfourbitswarning" />
-        </FEEDBACK>
-      </CUSTOM_CHECK>
-    </CUSTOM_CHECKS>
-  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -29,7 +29,8 @@ $mode = required_param('mode', PARAM_ALPHANUMEXT);
 $classformode = array(
    'assign' => 'core_role_allow_assign_page',
    'override' => 'core_role_allow_override_page',
-    'switch' => 'core_role_allow_switch_page'
+    'switch' => 'core_role_allow_switch_page',
+    'view' => 'core_role_allow_view_page'
 );
 if (!isset($classformode[$mode])) {
    print_error('invalidmode', '', '', $mode);
@@ -58,6 +59,9 @@ if (optional_param('submit', false, PARAM_BOOL) && data_submitted() && confirm_s
        case 'switch':
            $event = \core\event\role_allow_switch_updated::create(array('context' => $syscontext));
            break;
+        case 'view':
+            $event = \core\event\role_allow_view_updated::create(array('context' => $syscontext));
+            break;
    }
    if ($event) {
        $event->trigger();
@@ -33,7 +33,7 @@ class core_role_allow_assign_page extends core_role_allow_role_page {
    }

    protected function set_allow($fromroleid, $targetroleid) {
-        allow_assign($fromroleid, $targetroleid);
+        core_role_set_assign_allowed($fromroleid, $targetroleid);
    }

    protected function get_cell_tooltip($fromrole, $targetrole) {
@@ -33,7 +33,7 @@ class core_role_allow_override_page extends core_role_allow_role_page {
    }

    protected function set_allow($fromroleid, $targetroleid) {
-        allow_override($fromroleid, $targetroleid);
+        core_role_set_override_allowed($fromroleid, $targetroleid);
    }

    protected function get_cell_tooltip($fromrole, $targetrole) {
@@ -41,7 +41,7 @@ class core_role_allow_switch_page extends core_role_allow_role_page {
    }

    protected function set_allow($fromroleid, $targetroleid) {
-        allow_switch($fromroleid, $targetroleid);
+        core_role_set_switch_allowed($fromroleid, $targetroleid);
    }

    protected function is_allowed_target($targetroleid) {
@@ -0,0 +1,77 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Role view matrix.
+ *
+ * @package    core_role
+ * @copyright  2016 onwards Andrew Hancox <andrewdchancox@googlemail.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Subclass of role_allow_role_page for the Allow views tab.
+ *
+ * @package    core_role
+ * @copyright  2016 onwards Andrew Hancox <andrewdchancox@googlemail.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class core_role_allow_view_page extends core_role_allow_role_page {
+    /** @var array */
+    protected $allowedtargetroles;
+
+    /**
+     * core_role_allow_view_page constructor.
+     */
+    public function __construct() {
+        parent::__construct('role_allow_view', 'allowview');
+    }
+
+
+    /**
+     * Allow from role to view target role.
+     * @param int $fromroleid
+     * @param int $targetroleid
+     */
+    protected function set_allow($fromroleid, $targetroleid) {
+        core_role_set_view_allowed($fromroleid, $targetroleid);
+    }
+
+    /**
+     * Get tool tip for cell.
+     * @param string $fromrole
+     * @param string $targetrole
+     * @return string
+     * @throws \coding_exception
+     */
+    protected function get_cell_tooltip($fromrole, $targetrole) {
+        $a = new stdClass;
+        $a->fromrole = $fromrole->localname;
+        $a->targetrole = $targetrole->localname;
+        return get_string('allowroletoview', 'core_role', $a);
+    }
+
+    /**
+     * Get intro text for role allow view page.
+     * @return string
+     * @throws \coding_exception
+     */
+    public function get_intro_text() {
+        return get_string('configallowview', 'core_admin');
+    }
+}
@@ -42,6 +42,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
    protected $allowassign;
    protected $allowoverride;
    protected $allowswitch;
+    protected $allowview;

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

        } else {
            $this->role = new stdClass;
@@ -83,6 +85,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
            $this->allowassign = array();
            $this->allowoverride = array();
            $this->allowswitch = array();
+            $this->allowview = array();
        }
        parent::load_current_permissions();
    }
@@ -164,6 +167,10 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
        if (!is_null($allow)) {
            $this->allowswitch = $allow;
        }
+        $allow = optional_param_array('allowview', null, PARAM_INT);
+        if (!is_null($allow)) {
+            $this->allowview = $allow;
+        }

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

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

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

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

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

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

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

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

-        if ($type !== 'assign' and $type !== 'switch' and $type !== 'override') {
+        if ($type !== 'assign' and $type !== 'switch' and $type !== 'override' and $type !== 'view') {
            debugging('Invalid role allowed type specified', DEBUG_DEVELOPER);
            return array();
        }
@@ -549,11 +571,11 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
    /**
     * Returns an array of roles with the allowed type.
     *
-     * @param string $type Must be one of: assign, switch, or override.
+     * @param string $type Must be one of: assign, switch, override or view.
     * @return array Am array of role names with the allowed type
     */
    protected function get_allow_role_control($type) {
-        if ($type !== 'assign' and $type !== 'switch' and $type !== 'override') {
+        if ($type !== 'assign' and $type !== 'switch' and $type !== 'override' and $type !== 'view') {
            debugging('Invalid role allowed type specified', DEBUG_DEVELOPER);
            return '';
        }
@@ -643,6 +665,7 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
        $this->print_field('menuallowassign', get_string('allowassign', 'core_role'), $this->get_allow_role_control('assign'));
        $this->print_field('menuallowoverride', get_string('allowoverride', 'core_role'), $this->get_allow_role_control('override'));
        $this->print_field('menuallowswitch', get_string('allowswitch', 'core_role'), $this->get_allow_role_control('switch'));
+        $this->print_field('menuallowview', get_string('allowview', 'core_role'), $this->get_allow_role_control('view'));
        if ($risks = $this->get_role_risks_info()) {
            $this->print_field('', get_string('rolerisks', 'core_role'), $risks);
        }
@@ -84,7 +84,7 @@ class core_role_preset {
            $contextlevels->appendChild($dom->createElement('level', $name));
        }

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

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

@@ -103,7 +103,8 @@ if ($action === 'add' and $resettype !== 'none') {
            'contextlevels' => 1,
            'allowassign'   => 1,
            'allowoverride' => 1,
-            'allowswitch'   => 1);
+            'allowswitch'   => 1,
+            'allowview'   => 1);
        if ($showadvanced) {
            $definitiontable = new core_role_define_role_table_advanced($systemcontext, 0);
        } else {
@@ -150,7 +151,8 @@ if ($action === 'add' and $resettype !== 'none') {
            'contextlevels' => $data->contextlevels,
            'allowassign'   => $data->allowassign,
            'allowoverride' => $data->allowoverride,
-            'allowswitch'   => $data->allowswitch);
+            'allowswitch'   => $data->allowswitch,
+            'allowview'     => $data->allowview);
        if ($showadvanced) {
            $definitiontable = new core_role_define_role_table_advanced($systemcontext, $roleid);
        } else {
@@ -29,6 +29,7 @@ $toprow[] = new tabobject('manage', new moodle_url('/admin/roles/manage.php'), g
 $toprow[] = new tabobject('assign', new moodle_url('/admin/roles/allow.php', array('mode'=>'assign')), get_string('allowassign', 'core_role'));
 $toprow[] = new tabobject('override', new moodle_url('/admin/roles/allow.php', array('mode'=>'override')), get_string('allowoverride', 'core_role'));
 $toprow[] = new tabobject('switch', new moodle_url('/admin/roles/allow.php', array('mode'=>'switch')), get_string('allowswitch', 'core_role'));
+$toprow[] = new tabobject('view', new moodle_url('/admin/roles/allow.php', ['mode' => 'view']), get_string('allowview', 'core_role'));

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

@@ -11,6 +11,7 @@
                <xs:element ref="allowassign" minOccurs="0"/>
                <xs:element ref="allowoverride" minOccurs="0"/>
                <xs:element ref="allowswitch" minOccurs="0"/>
+                <xs:element ref="allowview" minOccurs="0"/>
                <xs:element ref="permissions" minOccurs="0"/>
            </xs:sequence>
        </xs:complexType>
@@ -45,6 +46,13 @@
            </xs:sequence>
        </xs:complexType>
    </xs:element>
+    <xs:element name="allowview">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element maxOccurs="unbounded" minOccurs="0" ref="shortname"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
    <xs:element name="permissions">
        <xs:complexType>
            <xs:sequence>
@@ -44,7 +44,7 @@ class core_role_preset_testcase extends advanced_testcase {
            $contextlevels = get_role_contextlevels($role->id);
            $this->assertEquals(array_values($contextlevels), array_values($info['contextlevels']));

-            foreach (array('assign', 'override', 'switch') as $type) {
+            foreach (array('assign', 'override', 'switch', 'view') as $type) {
                $records = $DB->get_records('role_allow_'.$type, array('roleid'=>$role->id), "allow$type ASC");
                $allows = array();
                foreach ($records as $record) {
@@ -34,13 +34,11 @@ $indexingenabled = \core_search\manager::is_indexing_enabled(); // This restrict
 try {
    $searchmanager = \core_search\manager::instance();
 } catch (core_search\engine_exception $searchmanagererror) {
-    // In action cases, well throw this exception below. In non-action cases, we produce a lang string error.
+    // In action cases, we'll throw this exception below. In non-action cases, we produce a lang string error.
 }

 // Handle all the actions.
 if ($action) {
-    require_sesskey();
-
    // If dealing with an areaid, we need to check that the area exists.
    if ($areaid) {
        $area = \core_search\manager::get_search_area($areaid);
@@ -60,31 +58,60 @@ if ($action) {
                throw $searchmanagererror;
            }

-            switch ($action) {
-                case 'delete':
-                    $searchmanager->delete_index($areaid);
-                    \core\notification::success(get_string('searchindexdeleted', 'admin'));
-                    break;
-                case 'indexall':
-                    $searchmanager->index();
-                    \core\notification::success(get_string('searchindexupdated', 'admin'));
-                    break;
-                case 'reindexall':
-                    $searchmanager->index(true);
-                    \core\notification::success(get_string('searchreindexed', 'admin'));
-                    break;
-                case 'deleteall':
-                    $searchmanager->delete_index();
-                    \core\notification::success(get_string('searchalldeleted', 'admin'));
-                    break;
-                default:
-                    break;
-            }
+            // Show confirm prompt for all these actions as they may be inadvisable, or may cause
+            // an interruption in search functionality, on production systems.
+            if (!optional_param('confirm', 0, PARAM_INT)) {
+                // Display confirmation prompt.
+                $a = null;
+                if ($areaid) {
+                    $a = html_writer::tag('strong', $area->get_visible_name());
+                }

-            // Redirect back to the main page after taking action.
-            redirect(new moodle_url('/admin/searchareas.php'));
+                $actionparams = ['sesskey' => sesskey(), 'action' => $action, 'confirm' => 1];
+                if ($areaid) {
+                    $actionparams['areaid'] = $areaid;
+                }
+                $actionurl = new moodle_url('/admin/searchareas.php', $actionparams);
+                $cancelurl = new moodle_url('/admin/searchareas.php');
+                echo $OUTPUT->header();
+                echo $OUTPUT->confirm(get_string('confirm_' . $action, 'search', $a),
+                    new single_button($actionurl, get_string('continue'), 'post', true),
+                    new single_button($cancelurl, get_string('cancel'), 'get'));
+                echo $OUTPUT->footer();
+                exit;
+            } else {
+                // Confirmed, so run the required action.
+                require_sesskey();
+
+                switch ($action) {
+                    case 'delete':
+                        $searchmanager->delete_index($areaid);
+                        \core\notification::success(get_string('searchindexdeleted', 'admin'));
+                        break;
+                    case 'indexall':
+                        $searchmanager->index();
+                        \core\notification::success(get_string('searchindexupdated', 'admin'));
+                        break;
+                    case 'reindexall':
+                        $searchmanager->index(true);
+                        \core\notification::success(get_string('searchreindexed', 'admin'));
+                        break;
+                    case 'deleteall':
+                        $searchmanager->delete_index();
+                        \core\notification::success(get_string('searchalldeleted', 'admin'));
+                        break;
+                    default:
+                        break;
+                }
+
+                // Redirect back to the main page after taking action.
+                redirect(new moodle_url('/admin/searchareas.php'));
+            }
        }
    } else if (in_array($action, ['enable', 'disable'])) {
+        // Toggling search areas requires no confirmation.
+        require_sesskey();
+
        switch ($action) {
            case 'enable':
                $area->set_enabled(true);
@@ -159,7 +186,17 @@ foreach ($searchareas as $area) {
                $laststatus = '';
            }
            $columns[] = $laststatus;
-            $columns[] = html_writer::link(admin_searcharea_action_url('delete', $areaid), 'Delete index');
+            $accesshide = html_writer::span($area->get_visible_name(), 'accesshide');
+            $actions = [];
+            $actions[] = $OUTPUT->pix_icon('t/delete', '') .
+                    html_writer::link(admin_searcharea_action_url('delete', $areaid),
+                    get_string('deleteindex', 'search', $accesshide));
+            if ($area->supports_get_document_recordset()) {
+                $actions[] = $OUTPUT->pix_icon('i/reload', '') . html_writer::link(
+                        new moodle_url('searchreindex.php', ['areaid' => $areaid]),
+                        get_string('gradualreindex', 'search', $accesshide));
+            }
+            $columns[] = html_writer::alist($actions, ['class' => 'unstyled list-unstyled']);

        } else {
            if (!$areasconfig) {
@@ -194,6 +231,12 @@ echo $OUTPUT->box_end();

 echo html_writer::table($table);

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

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

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

+    $temp->add(new admin_setting_configexecutable('pathtosassc', new lang_string('pathtosassc', 'admin'), new lang_string('pathtosassc_help', 'admin'), ''));
+
+    $temp->add(new admin_setting_configcheckbox('forceclean', new lang_string('forceclean', 'core_admin'),
+        new lang_string('forceclean_desc', 'core_admin'), 0));
+
    $ADMIN->add('experimental', $temp);

    // "debugging" settingpage
@@ -42,6 +42,9 @@ if (has_capability('moodle/grade:manage', $systemcontext)
        // enable publishing in exports/imports
        $temp->add(new admin_setting_configcheckbox('gradepublishing', new lang_string('gradepublishing', 'grades'), new lang_string('gradepublishing_help', 'grades'), 0));

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

@@ -556,7 +556,7 @@ if ($hassiteconfig) {
    // Search engine selection.
    $temp->add(new admin_setting_heading('searchengineheading', new lang_string('searchengine', 'admin'), ''));
    $temp->add(new admin_setting_configselect('searchengine',
-                                new lang_string('selectsearchengine', 'admin'), '', 'solr', $engines));
+                                new lang_string('selectsearchengine', 'admin'), '', 'simpledb', $engines));
    $temp->add(new admin_setting_heading('searchoptionsheading', new lang_string('searchoptions', 'admin'), ''));
    $temp->add(new admin_setting_configcheckbox('searchindexwhendisabled',
            new lang_string('searchindexwhendisabled', 'admin'), new lang_string('searchindexwhendisabled_desc', 'admin'),
@@ -15,8 +15,6 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page

    $optionalsubsystems->add(new admin_setting_configcheckbox('messaging', new lang_string('messaging', 'admin'), new lang_string('configmessaging','admin'), 1));

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

@@ -29,7 +29,7 @@ if ($hassiteconfig
        $choices['1'] = new lang_string('emaildisplayyes');
        $choices['2'] = new lang_string('emaildisplaycourse');
        $temp->add(new admin_setting_configselect('defaultpreference_maildisplay', new lang_string('emaildisplay'),
-            '', 2, $choices));
+            new lang_string('emaildisplay_help'), 2, $choices));

        $choices = array();
        $choices['0'] = new lang_string('textformat');
@@ -151,6 +151,7 @@ if ($hassiteconfig
        $temp->add(new admin_setting_configmultiselect('hiddenuserfields', new lang_string('hiddenuserfields', 'admin'),
                   new lang_string('confighiddenuserfields', 'admin'), array(),
                       array('description' => new lang_string('description'),
+                             'email' => new lang_string('email'),
                             'city' => new lang_string('city'),
                             'country' => new lang_string('country'),
                             'timezone' => new lang_string('timezone'),
@@ -0,0 +1,21 @@
+@core @core_admin
+Feature: Use the search areas admin screen
+  In order to control search indexing
+  As an admin
+  I need to use the search areas admin screen
+
+  Background:
+    Given I log in as "admin"
+    And I navigate to "Plugins > Search > Search areas" in site administration
+
+  Scenario: Disable and enable a search area
+    When I click on "Disable" "link" in the "Book - resource information" "table_row"
+    Then I should see "Search area disabled" in the ".alert-success" "css_element"
+    And I should see "Search area disabled" in the "Book - resource information" "table_row"
+
+    When I click on "Enable" "link" in the "Book - resource information" "table_row"
+    Then I should see "Search area enabled" in the ".alert-success" "css_element"
+    And I should not see "Search area disabled" in the "Book - resource information" "table_row"
+
+  # Note: Other scenarios are not currently easy to implement in Behat because there is no mock
+  # search engine - we could add testing once Moodle has an internal database search engine.
@@ -0,0 +1,55 @@
+<?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/>.
+
+/**
+ * Helper class that contains helper functions for cli scripts.
+ *
+ * @package   tool_analytics
+ * @copyright 2017 onwards Ankit Agarwal
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace tool_analytics;
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Helper class that contains helper functions for cli scripts.
+ *
+ * @package   tool_analytics
+ * @copyright 2017 onwards Ankit Agarwal
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class clihelper {
+
+    /**
+     * List all models in the system. To be used from cli scripts.
+     *
+     * @return void
+     */
+    public static function list_models() {
+        cli_heading("List of models");
+        echo str_pad(get_string('modelid', 'tool_analytics'), 15, ' ') . ' ' . str_pad(get_string('name'), 50, ' ') .
+            ' ' . str_pad(get_string('status'), 15, ' ') . "\n";
+        $models = \core_analytics\manager::get_all_models();
+        foreach ($models as $model) {
+            $modelid = $model->get_id();
+            $isenabled = $model->is_enabled() ? get_string('enabled', 'tool_analytics') : get_string('disabled', 'tool_analytics');
+            $name = $model->get_target()->get_name();
+            echo str_pad($modelid, 15, ' ') . ' ' . str_pad($name, 50, ' ') . ' ' . str_pad($isenabled, 15, ' ') . "\n";
+        }
+    }
+}
@@ -31,6 +31,7 @@ $help = "Enables the provided model.

 Options:
 --modelid           Model id
+--list              List models
 --timesplitting     Time splitting method full class name
 -h, --help          Print out this help

@@ -42,6 +43,7 @@ Example:
 list($options, $unrecognized) = cli_get_params(
    array(
        'help'            => false,
+        'list'            => false,
        'modelid'         => false,
        'timesplitting'   => false
    ),
@@ -55,7 +57,12 @@ if ($options['help']) {
    exit(0);
 }

-if ($options['modelid'] === false || $options['timesplitting'] === false) {
+if ($options['list'] || $options['modelid'] === false) {
+    \tool_analytics\clihelper::list_models();
+    exit(0);
+}
+
+if ($options['timesplitting'] === false) {
    echo $help;
    exit(0);
 }
@@ -31,6 +31,7 @@ $help = "Evaluates the provided model.

 Options:
 --modelid              Model id
+--list                 List models
 --non-interactive      Not interactive questions
 --timesplitting        Restrict the evaluation to 1 single time splitting method (Optional)
 --filter               Analyser dependant. e.g. A courseid would evaluate the model using a single course (Optional)
@@ -47,6 +48,7 @@ list($options, $unrecognized) = cli_get_params(
    array(
        'help'                  => false,
        'modelid'               => false,
+        'list'                  => false,
        'timesplitting'         => false,
        'reuse-prev-analysed'   => true,
        'non-interactive'       => false,
@@ -62,8 +64,8 @@ if ($options['help']) {
    exit(0);
 }

-if ($options['modelid'] === false) {
-    echo $help;
+if ($options['list'] || $options['modelid'] === false) {
+    \tool_analytics\clihelper::list_models();
    exit(0);
 }

@@ -34,6 +34,7 @@ $string['clearmodelpredictions'] = 'Are you sure you want to clear all "{$a}" pr
 $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['disabled'] = 'Disabled';
 $string['editmodel'] = 'Edit "{$a}" model';
 $string['edittrainedwarning'] = 'This model has already been trained. Note that changing its indicators or its time-splitting method will delete its previous predictions and start generating new predictions.';
 $string['enabled'] = 'Enabled';
@@ -66,6 +67,7 @@ $string['invalidanalysablestable'] = 'Invalid site analysable elements table';
 $string['invalidprediction'] = 'Invalid to get predictions';
 $string['invalidtraining'] = 'Invalid to train the model';
 $string['loginfo'] = 'Log extra info';
+$string['modelid'] = 'Model ID';
 $string['modelinvalidanalysables'] = 'Invalid analysable elements for "{$a}" model';
 $string['modelresults'] = '{$a} results';
 $string['modeltimesplitting'] = 'Time splitting';
@@ -24,6 +24,6 @@

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

-$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017110800; // Requires this Moodle version.
+$plugin->version   = 2018051400; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2018050800; // Requires this Moodle version.
 $plugin->component = 'tool_analytics'; // Full name of the plugin (used for diagnostics).
@@ -24,7 +24,7 @@

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

-$plugin->version   = 2017111300;
-$plugin->requires  = 2017110800;
+$plugin->version   = 2018051400;
+$plugin->requires  = 2018050800;
 $plugin->component = 'tool_assignmentupgrade';
-$plugin->dependencies = array('mod_assign' => 2017110800);
+$plugin->dependencies = array('mod_assign' => 2018050800);
@@ -24,6 +24,6 @@

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

-$plugin->version = 2017111300;
-$plugin->requires = 2017110800;
+$plugin->version = 2018051400;
+$plugin->requires = 2018050800;
 $plugin->component = 'tool_availabilityconditions';
@@ -109,17 +109,6 @@ require_once(__DIR__ . '/../../../../lib/behat/lib.php');
 require_once(__DIR__ . '/../../../../lib/behat/classes/behat_command.php');
 require_once(__DIR__ . '/../../../../lib/behat/classes/behat_config_manager.php');

-// Remove error handling overrides done in config.php. This is consistent with admin/tool/behat/cli/util_single_run.php.
-$CFG->debug = (E_ALL | E_STRICT);
-$CFG->debugdisplay = 1;
-error_reporting($CFG->debug);
-ini_set('display_errors', '1');
-ini_set('log_errors', '1');
-
-// Import the necessary libraries.
-require_once($CFG->libdir . '/setuplib.php');
-require_once($CFG->libdir . '/behat/classes/util.php');
-
 // For drop option check if parallel site.
 if ((empty($options['parallel'])) && ($options['drop']) || $options['updatesteps']) {
    $options['parallel'] = behat_config_manager::get_behat_run_config_value('parallel');
@@ -139,7 +139,7 @@ class tool_behat_renderer extends plugin_renderer_base {
        $msg = get_string('wrongbehatsetup', 'tool_behat', $a);

        // Error box including generic error string + specific error msg.
-        $html .= $this->output->box_start('box errorbox');
+        $html .= $this->output->box_start('box errorbox alert alert-danger');
        $html .= html_writer::tag('div', $msg);
        $html .= $this->output->box_end();

@@ -24,6 +24,6 @@

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

-$plugin->version   = 2017111300;   // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017110800;   // Requires this Moodle version
+$plugin->version   = 2018051400;   // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2018050800;   // Requires this Moodle version
 $plugin->component = 'tool_behat'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@

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

-$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017110800; // Requires this Moodle version.
+$plugin->version   = 2018051400; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2018050800; // Requires this Moodle version.
 $plugin->component = 'tool_capability'; // Full name of the plugin (used for diagnostics).
@@ -94,7 +94,8 @@ class cohort_role_assignments_table extends table_sql {
            'idnumber' => $data->cohortidnumber,
            'description' => $data->cohortdescription,
            'visible' => $data->cohortvisible,
-            'name' => $data->cohortname
+            'name' => $data->cohortname,
+            'theme' => $data->cohorttheme
        );
        $context = context_helper::instance_by_id($data->cohortcontextid);

@@ -169,7 +170,7 @@ class cohort_role_assignments_table extends table_sql {
    protected function get_sql_and_params($count = false) {
        $fields = 'uca.id, uca.cohortid, uca.userid, uca.roleid, ';
        $fields .= 'c.name as cohortname, c.idnumber as cohortidnumber, c.contextid as cohortcontextid, ';
-        $fields .= 'c.visible as cohortvisible, c.description as cohortdescription, ';
+        $fields .= 'c.visible as cohortvisible, c.description as cohortdescription, c.theme as cohorttheme, ';

        // Add extra user fields that we need for the graded user.
        $extrafields = get_extra_user_fields($this->context);
@@ -31,13 +31,15 @@
    * idnumber cohort idnumber field
    * description cohort description field
    * visible cohort visible field
+    * theme cohort theme field

    Example context (json):
    { "id": "1",
      "name": "Cohort 1",
      "visible": true,
      "idnumber": "014",
-      "description": "Some users"
+      "description": "Some users",
+      "theme": "clean"
    }
 }}
 {{> tool_lp/form-cohort-selector-suggestion }}
@@ -25,8 +25,8 @@
 defined('MOODLE_INTERNAL') || die();


-$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017110800; // Requires this Moodle version.
+$plugin->version   = 2018051400; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2018050800; // Requires this Moodle version.
 $plugin->component = 'tool_cohortroles'; // Full name of the plugin (used for diagnostics).

 $plugin->dependencies = array(
@@ -29,9 +29,6 @@ defined('MOODLE_INTERNAL') || die();
 function xmldb_tool_customlang_upgrade($oldversion) {
    global $CFG;

-    // Moodle v3.1.0 release upgrade line.
-    // Put any upgrade step following this.
-
    // Automatically generated Moodle v3.2.0 release upgrade line.
    // Put any upgrade step following this.

@@ -41,5 +38,8 @@ function xmldb_tool_customlang_upgrade($oldversion) {
    // Automatically generated Moodle v3.4.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -25,6 +25,6 @@

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

-$plugin->version   = 2017111300;
-$plugin->requires  = 2017110800;
+$plugin->version   = 2018051400;
+$plugin->requires  = 2018050800;
 $plugin->component = 'tool_customlang'; // Full name of the plugin (used for diagnostics)
@@ -1075,7 +1075,6 @@ class api {
    public static function add_request_contexts_with_status(contextlist_collection $clcollection, int $requestid, int $status) {
        $request = new data_request($requestid);
        $user = \core_user::get_user($request->get('userid'));
-        $isconfigured = data_registry::defaults_set();
        foreach ($clcollection as $contextlist) {
            // Convert the \core_privacy\local\request\contextlist into a contextlist persistent and store it.
            $clp = \tool_dataprivacy\contextlist::from_contextlist($contextlist);
@@ -1084,11 +1083,7 @@ class api {

            // Store the associated contexts in the contextlist.
            foreach ($contextlist->get_contextids() as $contextid) {
-                if ($isconfigured && self::DATAREQUEST_TYPE_DELETE == $request->get('type')) {
-                    // Data can only be deleted from it if the context is either expired, or unprotected.
-                    // Note: We can only check whether a context is expired or unprotected if the site is configured and
-                    // defaults are set appropriately. If they are not, we treat all contexts as though they are
-                    // unprotected.
+                if ($request->get('type') == static::DATAREQUEST_TYPE_DELETE) {
                    $context = \context::instance_by_id($contextid);
                    $purpose = static::get_effective_context_purpose($context);

@@ -1168,11 +1163,10 @@ class api {
     * @return contextlist_collection the collection of approved_contextlist objects.
     */
    public static function get_approved_contextlist_collection_for_request(data_request $request) : contextlist_collection {
-        global $DB;
        $foruser = core_user::get_user($request->get('userid'));
-        $isconfigured = data_registry::defaults_set();

        // Fetch all approved contextlists and create the core_privacy\local\request\contextlist objects here.
+        global $DB;
        $sql = "SELECT cl.component, ctx.contextid
                  FROM {" . request_contextlist::TABLE . "} rcl
                  JOIN {" . contextlist::TABLE . "} cl ON rcl.contextlistid = cl.id
@@ -1196,13 +1190,10 @@ class api {
                $contexts = [];
            }

-            if ($isconfigured && $request->get('type') == static::DATAREQUEST_TYPE_DELETE) {
+            if ($request->get('type') == static::DATAREQUEST_TYPE_DELETE) {
                $context = \context::instance_by_id($record->contextid);
                $purpose = static::get_effective_context_purpose($context);
                // Data can only be deleted from it if the context is either expired, or unprotected.
-                // Note: We can only check whether a context is expired or unprotected if the site is configured and
-                // defaults are set appropriately. If they are not, we treat all contexts as though they are
-                // unprotected.
                if (!expired_contexts_manager::is_context_expired_or_unprotected_for_user($context, $foruser)) {
                    continue;
                }
@@ -920,17 +920,9 @@ class expired_contexts_manager {
     * @return  bool
     */
    protected static function is_course_context_expired_or_unprotected_for_user(\context $context, \stdClass $user) {
+        $expiryrecords = self::get_nested_expiry_info_for_courses($context->path);

-        if ($context->get_course_context()->instanceid == SITEID) {
-            // The is an activity in the site course (front page).
-            $purpose = data_registry::get_effective_contextlevel_value(CONTEXT_SYSTEM, 'purpose');
-            $info = static::get_expiry_info($purpose);
-
-        } else {
-            $expiryrecords = self::get_nested_expiry_info_for_courses($context->path);
-            $info = $expiryrecords[$context->path]->info;
-        }
-
+        $info = $expiryrecords[$context->path]->info;
        if ($info->is_fully_expired()) {
            // This context is fully expired.
            return true;
@@ -63,6 +63,7 @@ class external extends external_api {
    /**
     * Parameter description for cancel_data_request().
     *
+     * @since Moodle 3.5
     * @return external_function_parameters
     */
    public static function cancel_data_request_parameters() {
@@ -74,6 +75,7 @@ class external extends external_api {
    /**
     * Cancel a data request.
     *
+     * @since Moodle 3.5
     * @param int $requestid The request ID.
     * @return array
     * @throws invalid_persistent_exception
@@ -133,6 +135,7 @@ class external extends external_api {
    /**
     * Parameter description for cancel_data_request().
     *
+     * @since Moodle 3.5
     * @return external_description
     */
    public static function cancel_data_request_returns() {
@@ -145,6 +148,7 @@ class external extends external_api {
    /**
     * Parameter description for contact_dpo().
     *
+     * @since Moodle 3.5
     * @return external_function_parameters
     */
    public static function contact_dpo_parameters() {
@@ -156,6 +160,7 @@ class external extends external_api {
    /**
     * Make a general enquiry to a DPO.
     *
+     * @since Moodle 3.5
     * @param string $message The message to be sent to the DPO.
     * @return array
     * @throws coding_exception
@@ -221,6 +226,7 @@ class external extends external_api {
    /**
     * Parameter description for contact_dpo().
     *
+     * @since Moodle 3.5
     * @return external_description
     */
    public static function contact_dpo_returns() {
@@ -233,6 +239,7 @@ class external extends external_api {
    /**
     * Parameter description for mark_complete().
     *
+     * @since Moodle 3.5.2
     * @return external_function_parameters
     */
    public static function mark_complete_parameters() {
@@ -244,6 +251,7 @@ class external extends external_api {
    /**
     * Mark a user's general enquiry's status as complete.
     *
+     * @since Moodle 3.5.2
     * @param int $requestid The request ID of the general enquiry.
     * @return array
     * @throws coding_exception
@@ -283,6 +291,7 @@ class external extends external_api {
    /**
     * Parameter description for mark_complete().
     *
+     * @since Moodle 3.5.2
     * @return external_description
     */
    public static function mark_complete_returns() {
@@ -295,6 +304,7 @@ class external extends external_api {
    /**
     * Parameter description for get_data_request().
     *
+     * @since Moodle 3.5
     * @return external_function_parameters
     */
    public static function get_data_request_parameters() {
@@ -306,6 +316,7 @@ class external extends external_api {
    /**
     * Fetch the details of a user's data request.
     *
+     * @since Moodle 3.5
     * @param int $requestid The request ID.
     * @return array
     * @throws coding_exception
@@ -342,6 +353,7 @@ class external extends external_api {
    /**
     * Parameter description for get_data_request().
     *
+     * @since Moodle 3.5
     * @return external_description
     */
    public static function get_data_request_returns() {
@@ -354,6 +366,7 @@ class external extends external_api {
    /**
     * Parameter description for approve_data_request().
     *
+     * @since Moodle 3.5
     * @return external_function_parameters
     */
    public static function approve_data_request_parameters() {
@@ -365,6 +378,7 @@ class external extends external_api {
    /**
     * Approve a data request.
     *
+     * @since Moodle 3.5
     * @param int $requestid The request ID.
     * @return array
     * @throws coding_exception
@@ -411,6 +425,7 @@ class external extends external_api {
    /**
     * Parameter description for approve_data_request().
     *
+     * @since Moodle 3.5
     * @return external_description
     */
    public static function approve_data_request_returns() {
@@ -502,6 +517,7 @@ class external extends external_api {
    /**
     * Parameter description for deny_data_request().
     *
+     * @since Moodle 3.5
     * @return external_function_parameters
     */
    public static function deny_data_request_parameters() {
@@ -513,6 +529,7 @@ class external extends external_api {
    /**
     * Deny a data request.
     *
+     * @since Moodle 3.5
     * @param int $requestid The request ID.
     * @return array
     * @throws coding_exception
@@ -559,6 +576,7 @@ class external extends external_api {
    /**
     * Parameter description for deny_data_request().
     *
+     * @since Moodle 3.5
     * @return external_description
     */
    public static function deny_data_request_returns() {
@@ -650,6 +668,7 @@ class external extends external_api {
    /**
     * Parameter description for get_data_request().
     *
+     * @since Moodle 3.5
     * @return external_function_parameters
     */
    public static function get_users_parameters() {
@@ -661,6 +680,7 @@ class external extends external_api {
    /**
     * Fetch the details of a user's data request.
     *
+     * @since Moodle 3.5
     * @param string $query The search request.
     * @return array
     * @throws required_capability_exception
@@ -700,6 +720,7 @@ class external extends external_api {
    /**
     * Parameter description for get_users().
     *
+     * @since Moodle 3.5
     * @return external_description
     * @throws coding_exception
     */
@@ -716,6 +737,7 @@ class external extends external_api {
    /**
     * Parameter description for create_purpose_form().
     *
+     * @since Moodle 3.5
     * @return external_function_parameters
     */
    public static function create_purpose_form_parameters() {
@@ -727,6 +749,7 @@ class external extends external_api {
    /**
     * Creates a data purpose from form data.
     *
+     * @since Moodle 3.5
     * @param string $jsonformdata
     * @return array
     */
@@ -769,6 +792,7 @@ class external extends external_api {
    /**
     * Returns for create_purpose_form().
     *
+     * @since Moodle 3.5
     * @return external_single_structure
     */
    public static function create_purpose_form_returns() {
@@ -782,6 +806,7 @@ class external extends external_api {
    /**
     * Parameter description for delete_purpose().
     *
+     * @since Moodle 3.5
     * @return external_function_parameters
     */
    public static function delete_purpose_parameters() {
@@ -793,6 +818,7 @@ class external extends external_api {
    /**
     * Deletes a data purpose.
     *
+     * @since Moodle 3.5
     * @param int $id The ID.
     * @return array
     * @throws invalid_persistent_exception
@@ -821,6 +847,7 @@ class external extends external_api {
    /**
     * Parameter description for delete_purpose().
     *
+     * @since Moodle 3.5
     * @return external_single_structure
     */
    public static function delete_purpose_returns() {
@@ -833,6 +860,7 @@ class external extends external_api {
    /**
     * Parameter description for create_category_form().
     *
+     * @since Moodle 3.5
     * @return external_function_parameters
     */
    public static function create_category_form_parameters() {
@@ -844,6 +872,7 @@ class external extends external_api {
    /**
     * Creates a data category from form data.
     *
+     * @since Moodle 3.5
     * @param string $jsonformdata
     * @return array
     */
@@ -886,6 +915,7 @@ class external extends external_api {
    /**
     * Returns for create_category_form().
     *
+     * @since Moodle 3.5
     * @return external_single_structure
     */
    public static function create_category_form_returns() {
@@ -899,6 +929,7 @@ class external extends external_api {
    /**
     * Parameter description for delete_category().
     *
+     * @since Moodle 3.5
     * @return external_function_parameters
     */
    public static function delete_category_parameters() {
@@ -910,6 +941,7 @@ class external extends external_api {
    /**
     * Deletes a data category.
     *
+     * @since Moodle 3.5
     * @param int $id The ID.
     * @return array
     * @throws invalid_persistent_exception
@@ -938,6 +970,7 @@ class external extends external_api {
    /**
     * Parameter description for delete_category().
     *
+     * @since Moodle 3.5
     * @return external_single_structure
     */
    public static function delete_category_returns() {
@@ -950,6 +983,7 @@ class external extends external_api {
    /**
     * Parameter description for set_contextlevel_form().
     *
+     * @since Moodle 3.5
     * @return external_function_parameters
     */
    public static function set_contextlevel_form_parameters() {
@@ -961,6 +995,7 @@ class external extends external_api {
    /**
     * Creates a data category from form data.
     *
+     * @since Moodle 3.5
     * @param string $jsonformdata
     * @return array
     */
@@ -1005,6 +1040,7 @@ class external extends external_api {
    /**
     * Returns for set_contextlevel_form().
     *
+     * @since Moodle 3.5
     * @return external_single_structure
     */
    public static function set_contextlevel_form_returns() {
@@ -1017,6 +1053,7 @@ class external extends external_api {
    /**
     * Parameter description for set_context_form().
     *
+     * @since Moodle 3.5
     * @return external_function_parameters
     */
    public static function set_context_form_parameters() {
@@ -1028,6 +1065,7 @@ class external extends external_api {
    /**
     * Creates a data category from form data.
     *
+     * @since Moodle 3.5
     * @param string $jsonformdata
     * @return array
     */
@@ -1073,6 +1111,7 @@ class external extends external_api {
    /**
     * Returns for set_context_form().
     *
+     * @since Moodle 3.5
     * @return external_single_structure
     */
    public static function set_context_form_returns() {
@@ -1085,6 +1124,7 @@ class external extends external_api {
    /**
     * Parameter description for tree_extra_branches().
     *
+     * @since Moodle 3.5
     * @return external_function_parameters
     */
    public static function tree_extra_branches_parameters() {
@@ -1097,6 +1137,7 @@ class external extends external_api {
    /**
     * Returns tree extra branches.
     *
+     * @since Moodle 3.5
     * @param int $contextid
     * @param string $element
     * @return array
@@ -1136,6 +1177,7 @@ class external extends external_api {
    /**
     * Returns for tree_extra_branches().
     *
+     * @since Moodle 3.5
     * @return external_single_structure
     */
    public static function tree_extra_branches_returns() {
@@ -1148,6 +1190,7 @@ class external extends external_api {
    /**
     * Parameters for confirm_contexts_for_deletion().
     *
+     * @since Moodle 3.5
     * @return external_function_parameters
     */
    public static function confirm_contexts_for_deletion_parameters() {
@@ -1162,6 +1205,7 @@ class external extends external_api {
    /**
     * Confirm a given array of expired context record IDs
     *
+     * @since Moodle 3.5
     * @param int[] $ids Array of record IDs from the expired contexts table.
     * @return array
     * @throws coding_exception
@@ -1245,6 +1289,7 @@ class external extends external_api {
    /**
     * Returns for confirm_contexts_for_deletion().
     *
+     * @since Moodle 3.5
     * @return external_single_structure
     */
    public static function confirm_contexts_for_deletion_returns() {
@@ -1540,6 +1585,7 @@ class external extends external_api {
    /**
     * Gets the structure of a tree node (link + child branches).
     *
+     * @since Moodle 3.5
     * @param bool $allowchildbranches
     * @return array
     */
@@ -1,105 +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/>.
-
-
-/**
- * Filter selector field.
- *
- * @package    tool_dataprivacy
- * @copyright  2018 Jun Pataleta
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-namespace tool_dataprivacy\form;
-
-defined('MOODLE_INTERNAL') || die();
-
-use MoodleQuickForm_autocomplete;
-
-global $CFG;
-require_once($CFG->libdir . '/form/autocomplete.php');
-
-/**
- * Form field type for choosing a user on the data request creation form.
- *
- * @package    tool_dataprivacy
- * @copyright  2018 Jun Pataleta
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-class request_user_autocomplete extends MoodleQuickForm_autocomplete {
-
-    /**
-     * Constructor.
-     *
-     * @param string $elementname Element name
-     * @param mixed $elementlabel Label(s) for an element
-     * @param array $options Options to control the element's display
-     *                       Valid options are:
-     *                       - multiple bool Whether or not the field accepts more than one values.
-     */
-    public function __construct($elementname = null, $elementlabel = null, $options = array()) {
-        $validattributes = array(
-            'ajax' => 'tool_dataprivacy/form-user-selector',
-        );
-        if (!empty($options['multiple'])) {
-            $validattributes['multiple'] = 'multiple';
-        }
-
-        parent::__construct($elementname, $elementlabel, array(), $validattributes);
-    }
-
-    /**
-     * Set the value of this element.
-     *
-     * @param  string|array $value The value to set.
-     * @return boolean
-     */
-    public function setValue($value) {
-        global $DB;
-        $values = (array) $value;
-        $ids = [];
-        foreach ($values as $onevalue) {
-            if (!empty($onevalue) && (!$this->optionExists($onevalue)) &&
-                    ($onevalue !== '_qf__force_multiselect_submission')) {
-                array_push($ids, $onevalue);
-            }
-        }
-
-        if (empty($ids)) {
-            return $this->setSelected([]);
-        }
-
-        $toselect = [];
-        list($insql, $inparams) = $DB->get_in_or_equal($ids, SQL_PARAMS_NAMED);
-        $allusernames = get_all_user_name_fields(true);
-        // Exclude admins and guest user.
-        $excludedusers = array_keys(get_admins()) + [guest_user()->id];
-        $sort = 'firstname ASC';
-        $fields = 'id, email, ' . $allusernames;
-        // Fetch the selected users, exclude the admins and guest users.
-        $users = get_users(true, '', true, $excludedusers, $sort, '', '', 0, 30, $fields, "id $insql", $inparams);
-        foreach ($users as $user) {
-            $userdata = (object)[
-                'name' => fullname($user),
-                'email' => $user->email
-            ];
-            $this->addOption(get_string('nameemail', 'tool_dataprivacy', $userdata), $user->id);
-            array_push($toselect, $user->id);
-        }
-
-        return $this->setSelected($toselect);
-    }
-}
@@ -178,7 +178,7 @@ class provider implements
            $contextdatatowrite[] = $data;
        }

-        // ...{User context} / Privacy and policies / Data requests.
+        // User context / Privacy and policies / Data requests.
        $subcontext = [
            get_string('privacyandpolicies', 'admin'),
            get_string('datarequests', 'tool_dataprivacy'),
@@ -74,9 +74,11 @@ class process_data_request_task extends adhoc_task {
            return;
        }

+        // If no site purpose is defined, reject requests since they cannot be processed.
        if (!\tool_dataprivacy\data_registry::defaults_set()) {
-            // Warn if no site purpose is defined.
-            mtrace('Warning: No purpose is defined at the system level. Deletion will delete all.');
+            api::update_request_status($requestid, api::DATAREQUEST_STATUS_REJECTED);
+            mtrace('No site purpose defined. Request ' . $requestid . ' rejected.');
+            return;
        }

        // Get the user details now. We might not be able to retrieve it later if it's a deletion processing.
@@ -28,9 +28,7 @@ use tool_dataprivacy\local\helper;
 defined('MOODLE_INTERNAL') || die();

 require_once($CFG->libdir.'/formslib.php');
-\MoodleQuickForm::registerElementType('request_user_autocomplete',
-    $CFG->dirroot . '/admin/tool/dataprivacy/classes/form/request_user_autocomplete.php',
-    '\\tool_dataprivacy\\form\\request_user_autocomplete');
+
 /**
 * The contact form to the site's Data Protection Officer
 *
@@ -56,8 +54,20 @@ class tool_dataprivacy_data_request_form extends moodleform {
        if ($this->manage) {
            $options = [
                'ajax' => 'tool_dataprivacy/form-user-selector',
+                'valuehtmlcallback' => function($value) {
+                    global $OUTPUT;
+
+                    $allusernames = get_all_user_name_fields(true);
+                    $fields = 'id, email, ' . $allusernames;
+                    $user = \core_user::get_user($value, $fields);
+                    $useroptiondata = [
+                        'fullname' => fullname($user),
+                        'email' => $user->email
+                    ];
+                    return $OUTPUT->render_from_template('tool_dataprivacy/form-user-selector-suggestion', $useroptiondata);
+                }
            ];
-            $mform->addElement('request_user_autocomplete', 'userid', get_string('requestfor', 'tool_dataprivacy'), [], $options);
+            $mform->addElement('autocomplete', 'userid', get_string('requestfor', 'tool_dataprivacy'), [], $options);
            $mform->addRule('userid', null, 'required', null, 'client');

        } else {
@@ -38,10 +38,6 @@ $title = get_string('datarequests', 'tool_dataprivacy');
 echo $OUTPUT->header();
 echo $OUTPUT->heading($title);

-if (!\tool_dataprivacy\data_registry::defaults_set()) {
-    \core\notification::error(get_string('systemconfignotsetwarning', 'tool_dataprivacy'));
-}
-
 if (\tool_dataprivacy\api::is_site_dpo($USER->id)) {
    $filtersapplied = optional_param_array('request-filters', [-1], PARAM_NOTAGS);
    $filterscleared = optional_param('filters-cleared', 0, PARAM_INT);
@@ -18,14 +18,15 @@
 * tool_dataprivacy plugin upgrade code
 *
 * @package    tool_dataprivacy
- * @copyright  2018 David Monllao
+ * @copyright  2018 Jun Pataleta
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

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

 /**
- * Function to upgrade auth_cas.
+ * Function to upgrade tool_dataprivacy.
+ *
 * @param int $oldversion the version we are upgrading from
 * @return bool result
 */
@@ -34,14 +35,7 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {

    $dbman = $DB->get_manager();

-    if ($oldversion < 2017111300) {
-        // Nothing to do here. Moodle Plugins site's just complaining about missing upgrade.php.
-        // Savepoint reached.
-        upgrade_plugin_savepoint(true, 2017111300, 'error', 'dataprivacy');
-    }
-
-    if ($oldversion < 2017111303) {
-
+    if ($oldversion < 2018051405) {
        // Define table tool_dataprivacy_ctxexpired to be created.
        $table = new xmldb_table('tool_dataprivacy_ctxexpired');

@@ -62,12 +56,6 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {
            $dbman->create_table($table);
        }

-        // Dataprivacy savepoint reached.
-        upgrade_plugin_savepoint(true, 2017111303, 'tool', 'dataprivacy');
-    }
-
-    if ($oldversion < 2017111304) {
-
        // Define table tool_dataprivacy_contextlist to be created.
        $table = new xmldb_table('tool_dataprivacy_contextlist');

@@ -124,11 +112,6 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {
            $dbman->create_table($table);
        }

-        // Dataprivacy savepoint reached.
-        upgrade_plugin_savepoint(true, 2017111304, 'tool', 'dataprivacy');
-    }
-
-    if ($oldversion < 2017111305) {
        // Define field lawfulbases to be added to tool_dataprivacy_purpose.
        $table = new xmldb_table('tool_dataprivacy_purpose');

@@ -159,10 +142,10 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {
        }

        // Dataprivacy savepoint reached.
-        upgrade_plugin_savepoint(true, 2017111305, 'tool', 'dataprivacy');
+        upgrade_plugin_savepoint(true, 2018051405, 'tool', 'dataprivacy');
    }

-    if ($oldversion < 2017111315) {
+    if ($oldversion < 2018051406) {
        // Update completed delete requests to new delete status.
        $query = "UPDATE {tool_dataprivacy_request}
                     SET status = :setstatus
@@ -185,10 +168,10 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {

        $DB->execute($query, $params);

-        upgrade_plugin_savepoint(true, 2017111315, 'tool', 'dataprivacy');
+        upgrade_plugin_savepoint(true, 2018051406, 'tool', 'dataprivacy');
    }

-    if ($oldversion < 2017111316) {
+    if ($oldversion < 2018051407) {

        // Changing precision of field status on table tool_dataprivacy_request to (2).
        $table = new xmldb_table('tool_dataprivacy_request');
@@ -198,10 +181,10 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {
        $dbman->change_field_precision($table, $field);

        // Dataprivacy savepoint reached.
-        upgrade_plugin_savepoint(true, 2017111316, 'tool', 'dataprivacy');
+        upgrade_plugin_savepoint(true, 2018051407, 'tool', 'dataprivacy');
    }

-    if ($oldversion < 2017111354) {
+    if ($oldversion < 2018051411) {
        // Define table tool_dataprivacy_purposerole to be created.
        $table = new xmldb_table('tool_dataprivacy_purposerole');

@@ -262,10 +245,10 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {
        $dbman->change_field_notnull($table, $field);

        // Dataprivacy savepoint reached.
-        upgrade_plugin_savepoint(true, 2017111354, 'tool', 'dataprivacy');
+        upgrade_plugin_savepoint(true, 2018051411, 'tool', 'dataprivacy');
    }

-    if ($oldversion < 2017111356) {
+    if ($oldversion < 2018051413) {
        // Define field sensitivedatareasons to be added to tool_dataprivacy_purpose.
        $table = new xmldb_table('tool_dataprivacy_request');
        $field = new xmldb_field('creationmethod', XMLDB_TYPE_INTEGER, 10, null, XMLDB_NOTNULL, null, 0, 'timemodified');
@@ -276,21 +259,7 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {
        }

        // Dataprivacy savepoint reached.
-        upgrade_plugin_savepoint(true, 2017111356, 'tool', 'dataprivacy');
-    }
-
-    if ($oldversion < 2017111358) {
-        // Delete orphaned data privacy requests.
-        $sql = "SELECT r.id
-                  FROM {tool_dataprivacy_request} r LEFT JOIN {user} u ON r.userid = u.id
-                 WHERE u.id IS NULL";
-        $orphaned = $DB->get_fieldset_sql($sql);
-
-        if ($orphaned) {
-            $DB->delete_records_list('tool_dataprivacy_request', 'id', $orphaned);
-        }
-
-        upgrade_plugin_savepoint(true, 2017111358, 'tool', 'dataprivacy');
+        upgrade_plugin_savepoint(true, 2018051413, 'tool', 'dataprivacy');
    }

    return true;
@@ -225,7 +225,7 @@ $string['privacy:metadata:request:requestedby'] = 'The ID of the user making the
 $string['privacy:metadata:request:dpocomment'] = 'Any comments made by the site\'s privacy officer regarding the request.';
 $string['privacy:metadata:request:timecreated'] = 'The timestamp indicating when the request was made by the user.';
 $string['privacyrequestexpiry'] = 'Data request expiry';
-$string['privacyrequestexpiry_desc'] = 'The amount of time that approved data requests will be available for download before expiring. 0 means no time limit.';
+$string['privacyrequestexpiry_desc'] = 'The time that approved data requests will be available for download before expiring. If set to zero, then there is no time limit.';
 $string['protected'] = 'Protected';
 $string['protectedlabel'] = 'The retention of this data has a higher legal precedent over a user\'s request to be forgotten. This data will only be deleted after the retention period has expired.';
 $string['purpose'] = 'Purpose';
@@ -255,7 +255,7 @@ $string['requeststatus'] = 'Status';
 $string['requestsubmitted'] = 'Your request has been submitted to the privacy officer';
 $string['requesttype'] = 'Type';
 $string['requesttypeuser'] = '{$a->typename} ({$a->user})';
-$string['requesttype_help'] = 'Select the reason why you would like to contact the privacy officer';
+$string['requesttype_help'] = 'Select the reason for contacting the privacy officer. Be aware that deletion of all personal  data will result in you no longer being able to log in to the site.';
 $string['requesttypedelete'] = 'Delete all of my personal data';
 $string['requesttypedeleteshort'] = 'Delete';
 $string['requesttypeexport'] = 'Export all of my personal data';
@@ -308,7 +308,6 @@ $string['statusrejected'] = 'Rejected';
 $string['subjectscope'] = 'Subject scope';
 $string['subjectscope_help'] = 'The subject scope lists the roles which may be assigned in this context.';
 $string['summary'] = 'Registry configuration summary';
-$string['systemconfignotsetwarning'] = 'A site purpose and category have not been defined. When these are not defined, all data will be removed when processing deletion requests.';
 $string['user'] = 'User';
 $string['userlistnoncompliant'] = 'Userlist provider missing';
 $string['userlistexplanation'] = 'This plugin has the base provider but should also implement the userlist provider for full support of privacy functionality.';
@@ -25,22 +25,10 @@ dd a.contactdpo {
    margin-left: inherit;
 }

-#page-admin-tool-dataprivacy-datarequests [data-region="data-requests-table"] .no-overflow {
-    overflow: inherit;
-}
-
-#page-admin-tool-dataprivacy-datarequests [data-region="data-requests-table"] .moodle-actionmenu {
+[data-region="data-requests-table"] .moodle-actionmenu {
    min-width: 150px;
 }

 .context-level-view {
    margin: 1em;
-}
-
-[data-region="purposes"] .col-name-description {
-    width: 25%;
-}
-
-[data-region="categories"] .col-description {
-    width: 50%;
-}
+}
@@ -61,7 +61,7 @@
        <thead>
            <tr>
                <th scope="col">{{#str}}name{{/str}}</th>
-                <th scope="col" class="col-description">{{#str}}description{{/str}}</th>
+                <th scope="col" class="w-50">{{#str}}description{{/str}}</th>
                <th scope="col">{{#str}}actions{{/str}}</th>
            </tr>
        </thead>
@@ -73,7 +73,7 @@
        <caption class="accesshide">{{#str}}purposeslist, tool_dataprivacy{{/str}}</caption>
        <thead>
            <tr>
-                <th scope="col" class="col-name-description">{{#str}}name{{/str}}</th>
+                <th scope="col" class="w-25">{{#str}}name{{/str}}</th>
                <th scope="col">{{#str}}lawfulbases, tool_dataprivacy{{/str}}</th>
                <th scope="col">{{#str}}sensitivedatareasons, tool_dataprivacy{{/str}}</th>
                <th scope="col">{{#str}}retentionperiod, tool_dataprivacy{{/str}}</th>
@@ -1711,48 +1711,6 @@ class tool_dataprivacy_api_testcase extends advanced_testcase {
        $this->assertEquals($data->contexts->used, $contextids, '', 0.0, 10, true);
    }

-    /**
-     * Test that delete requests do not filter out protected purpose contexts if the the site is properly configured.
-     */
-    public function test_add_request_contexts_with_status_delete_course_no_site_config() {
-        $this->resetAfterTest();
-
-        $user = $this->getDataGenerator()->create_user();
-
-        $course = $this->getDataGenerator()->create_course(['startdate' => time() - YEARSECS, 'enddate' => time() - YEARSECS]);
-        $coursecontext = \context_course::instance($course->id);
-
-        $forum = $this->getDataGenerator()->create_module('forum', ['course' => $course->id]);
-        list(, $forumcm) = get_course_and_cm_from_instance($forum->id, 'forum');
-        $contextforum = \context_module::instance($forumcm->id);
-
-        $this->getDataGenerator()->enrol_user($user->id, $course->id, 'student');
-
-        // Create the initial contextlist.
-        $initialcollection = new \core_privacy\local\request\contextlist_collection($user->id);
-
-        $contextlist = new \core_privacy\local\request\contextlist();
-        $contextlist->add_from_sql('SELECT id FROM {context} WHERE id = :contextid', ['contextid' => $coursecontext->id]);
-        $contextlist->set_component('tool_dataprivacy');
-        $initialcollection->add_contextlist($contextlist);
-
-        $contextlist = new \core_privacy\local\request\contextlist();
-        $contextlist->add_from_sql('SELECT id FROM {context} WHERE id = :contextid', ['contextid' => $contextforum->id]);
-        $contextlist->set_component('mod_forum');
-        $initialcollection->add_contextlist($contextlist);
-
-        $request = api::create_data_request($user->id, api::DATAREQUEST_TYPE_DELETE);
-        api::add_request_contexts_with_status(
-            $initialcollection, $request->get('id'), contextlist_context::STATUS_APPROVED);
-
-        $newcollection = \tool_dataprivacy\request_contextlist::get_records();
-        $this->assertCount(2, $newcollection);
-        foreach ($newcollection as $contextlist) {
-            $requests = contextlist_context::get_records(['contextlistid' => $contextlist->get('contextlistid')]);
-            $this->assertCount(1, $requests);
-        }
-    }
-
    /**
     * Test that delete requests do not filter out protected purpose contexts if they are already expired.
     */
@@ -1849,64 +1807,6 @@ class tool_dataprivacy_api_testcase extends advanced_testcase {
        $this->assertCount(1, $requests);
    }

-    /**
-     * Test that delete requests do not filter out protected purpose contexts if the the site is properly configured.
-     */
-    public function test_get_approved_contextlist_collection_for_request_delete_course_no_config() {
-        $this->resetAfterTest();
-
-        $user = $this->getDataGenerator()->create_user();
-        $course = $this->getDataGenerator()->create_course(['startdate' => time() - YEARSECS, 'enddate' => time() - YEARSECS]);
-        $coursecontext = \context_course::instance($course->id);
-
-        $forum = $this->getDataGenerator()->create_module('forum', ['course' => $course->id]);
-        list(, $forumcm) = get_course_and_cm_from_instance($forum->id, 'forum');
-        $contextforum = \context_module::instance($forumcm->id);
-
-        $this->getDataGenerator()->enrol_user($user->id, $course->id, 'student');
-
-        // Create the initial contextlist.
-        $request = api::create_data_request($user->id, api::DATAREQUEST_TYPE_DELETE);
-        $initialcollection = new \core_privacy\local\request\contextlist_collection($user->id);
-
-        $contextlist = new \tool_dataprivacy\contextlist(0, (object) ['component' => 'tool_dataprivacy']);
-        $contextlist->save();
-        $clcontext = new \tool_dataprivacy\contextlist_context(0, (object) [
-                'contextid' => $coursecontext->id,
-                'status' => contextlist_context::STATUS_APPROVED,
-                'contextlistid' => $contextlist->get('id'),
-            ]);
-        $clcontext->save();
-        $rcl = new \tool_dataprivacy\request_contextlist(0, (object) [
-                'requestid' => $request->get('id'),
-                'contextlistid' => $contextlist->get('id'),
-            ]);
-        $rcl->save();
-
-        $contextlist = new \tool_dataprivacy\contextlist(0, (object) ['component' => 'mod_forum']);
-        $contextlist->save();
-        $clcontext = new \tool_dataprivacy\contextlist_context(0, (object) [
-                'contextid' => $contextforum->id,
-                'status' => contextlist_context::STATUS_APPROVED,
-                'contextlistid' => $contextlist->get('id'),
-            ]);
-        $clcontext->save();
-        $rcl = new \tool_dataprivacy\request_contextlist(0, (object) [
-                'requestid' => $request->get('id'),
-                'contextlistid' => $contextlist->get('id'),
-            ]);
-        $rcl->save();
-
-        $collection = api::get_approved_contextlist_collection_for_request($request);
-        $this->assertCount(2, $collection);
-
-        $list = $collection->get_contextlist_for_component('tool_dataprivacy');
-        $this->assertCount(1, $list);
-
-        $list = $collection->get_contextlist_for_component('mod_forum');
-        $this->assertCount(1, $list);
-    }
-
    /**
     * Test that delete requests do not filter out protected purpose contexts if they are already expired.
     */
@@ -49,7 +49,7 @@ Feature: Data export from the privacy API
    And I reload the page
    And I should see "Download ready" in the "Victim User 1" "table_row"
    And I open the action menu in "Victim User 1" "table_row"
-    And following "Download" should download between "1" and "130000" bytes
+    And following "Download" should download between "1" and "100000" bytes
    And the following config values are set as admin:
      | privacyrequestexpiry | 1 | tool_dataprivacy |
    And I wait "1" seconds
@@ -87,7 +87,7 @@ Feature: Data export from the privacy API
    And I reload the page
    And I should see "Download ready" in the "Export all of my personal data" "table_row"
    And I open the action menu in "Victim User 1" "table_row"
-    And following "Download" should download between "1" and "130000" bytes
+    And following "Download" should download between "1" and "100000" bytes

    And the following config values are set as admin:
      | privacyrequestexpiry | 1 | tool_dataprivacy |
@@ -127,7 +127,7 @@ Feature: Data export from the privacy API
    And I reload the page
    And I should see "Download ready" in the "Victim User 1" "table_row"
    And I open the action menu in "Victim User 1" "table_row"
-    And following "Download" should download between "1" and "130000" bytes
+    And following "Download" should download between "1" and "100000" bytes

    And the following config values are set as admin:
      | privacyrequestexpiry | 1 | tool_dataprivacy |
@@ -2222,40 +2222,6 @@ class tool_dataprivacy_expired_contexts_testcase extends advanced_testcase {
        $this->assertTrue(expired_contexts_manager::is_context_expired_or_unprotected_for_user($blockcontext, $user));
    }

-    /**
-     * Test the is_context_expired functions when supplied with the front page course.
-     */
-    public function test_is_context_expired_frontpage() {
-        $this->resetAfterTest();
-
-        $purposes = $this->setup_basics('PT1H', 'PT1H', 'P1D');
-
-        $frontcourse = get_site();
-        $frontcoursecontext = \context_course::instance($frontcourse->id);
-
-        $sitenews = $this->getDataGenerator()->create_module('forum', ['course' => $frontcourse->id]);
-        $cm = get_coursemodule_from_instance('forum', $sitenews->id);
-        $sitenewscontext = \context_module::instance($cm->id);
-
-        $user = $this->getDataGenerator()->create_user(['lastaccess' => time() - YEARSECS]);
-
-        $this->assertFalse(expired_contexts_manager::is_context_expired($frontcoursecontext));
-        $this->assertFalse(expired_contexts_manager::is_context_expired($sitenewscontext));
-
-        $this->assertTrue(expired_contexts_manager::is_context_expired_or_unprotected_for_user($frontcoursecontext, $user));
-        $this->assertTrue(expired_contexts_manager::is_context_expired_or_unprotected_for_user($sitenewscontext, $user));
-
-        // Protecting the course contextlevel does not impact the front page.
-        $purposes->course->set('protected', 1)->save();
-        $this->assertTrue(expired_contexts_manager::is_context_expired_or_unprotected_for_user($frontcoursecontext, $user));
-        $this->assertTrue(expired_contexts_manager::is_context_expired_or_unprotected_for_user($sitenewscontext, $user));
-
-        // Protecting the system contextlevel affects the front page, too.
-        $purposes->system->set('protected', 1)->save();
-        $this->assertFalse(expired_contexts_manager::is_context_expired_or_unprotected_for_user($frontcoursecontext, $user));
-        $this->assertFalse(expired_contexts_manager::is_context_expired_or_unprotected_for_user($sitenewscontext, $user));
-    }
-
    /**
     * Test the is_context_expired functions when supplied with an expired course.
     */
@@ -24,6 +24,6 @@

 defined('MOODLE_INTERNAL') || die;

-$plugin->version   = 2017111358;
-$plugin->requires  = 2017111304.00;        // Moodle 3.4.4 (Build: 20180517) and upwards.
+$plugin->version   = 2018051414;
+$plugin->requires  = 2018050800;        // Moodle 3.5dev (Build 2018031600) and upwards.
 $plugin->component = 'tool_dataprivacy';
@@ -24,6 +24,6 @@

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

-$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017110800; // Requires this Moodle version.
+$plugin->version   = 2018051400; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2018050800; // Requires this Moodle version.
 $plugin->component = 'tool_dbtransfer'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

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

-$plugin->version = 2017111300;
-$plugin->requires = 2017110800;
+$plugin->version = 2018051400;
+$plugin->requires = 2018050800;
 $plugin->component = 'tool_filetypes';
@@ -139,36 +139,6 @@
            <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
          </HTTPSamplerProxy>
          <hashTree/>
-          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="View login page" enabled="true">
-            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-              <collectionProp name="Arguments.arguments"/>
-            </elementProp>
-            <stringProp name="HTTPSampler.domain"></stringProp>
-            <stringProp name="HTTPSampler.port"></stringProp>
-            <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-            <stringProp name="HTTPSampler.response_timeout"></stringProp>
-            <stringProp name="HTTPSampler.protocol"></stringProp>
-            <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-            <stringProp name="HTTPSampler.path">${sitepath}/login/index.php</stringProp>
-            <stringProp name="HTTPSampler.method">GET</stringProp>
-            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-            <boolProp name="HTTPSampler.monitor">false</boolProp>
-            <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-          </HTTPSamplerProxy>
-          <hashTree>
-            <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Get logintoken" enabled="true">
-              <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-              <stringProp name="RegexExtractor.refname">LOGIN_TOKEN</stringProp>
-              <stringProp name="RegexExtractor.regex">type=&quot;hidden&quot;\sname=&quot;logintoken&quot;\svalue=&quot;(\w+)&quot;</stringProp>
-              <stringProp name="RegexExtractor.template">$1$</stringProp>
-              <stringProp name="RegexExtractor.default">0</stringProp>
-              <stringProp name="RegexExtractor.match_number">1</stringProp>
-            </RegexExtractor>
-            <hashTree/>
-          </hashTree>
          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Login" enabled="true">
            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
              <collectionProp name="Arguments.arguments">
@@ -186,13 +156,6 @@
                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
                  <stringProp name="Argument.name">password</stringProp>
                </elementProp>
-                <elementProp name="logintoken" elementType="HTTPArgument">
-                  <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                  <stringProp name="Argument.value">${LOGIN_TOKEN}</stringProp>
-                  <stringProp name="Argument.metadata">=</stringProp>
-                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                  <stringProp name="Argument.name">logintoken</stringProp>
-                </elementProp>
              </collectionProp>
            </elementProp>
            <stringProp name="HTTPSampler.domain"></stringProp>
@@ -210,17 +173,7 @@
            <boolProp name="HTTPSampler.monitor">false</boolProp>
            <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
          </HTTPSamplerProxy>
-          <hashTree>
-            <ResponseAssertion guiclass="AssertionGui" testclass="ResponseAssertion" testname="Logged in" enabled="true">
-              <collectionProp name="Asserion.test_strings">
-                <stringProp name="615717117">&lt;div class=&quot;logininfo&quot;&gt;You are logged in as</stringProp>
-              </collectionProp>
-              <stringProp name="Assertion.test_field">Assertion.response_data</stringProp>
-              <boolProp name="Assertion.assume_success">false</boolProp>
-              <intProp name="Assertion.test_type">2</intProp>
-            </ResponseAssertion>
-            <hashTree/>
-          </hashTree>
+          <hashTree/>
          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Frontpage logged" enabled="true">
            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
              <collectionProp name="Arguments.arguments"/>
@@ -382,36 +335,6 @@
            <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
          </HTTPSamplerProxy>
          <hashTree/>
-          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="View login page" enabled="true">
-            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
-              <collectionProp name="Arguments.arguments"/>
-            </elementProp>
-            <stringProp name="HTTPSampler.domain"></stringProp>
-            <stringProp name="HTTPSampler.port"></stringProp>
-            <stringProp name="HTTPSampler.connect_timeout"></stringProp>
-            <stringProp name="HTTPSampler.response_timeout"></stringProp>
-            <stringProp name="HTTPSampler.protocol"></stringProp>
-            <stringProp name="HTTPSampler.contentEncoding"></stringProp>
-            <stringProp name="HTTPSampler.path">${sitepath}/login/index.php</stringProp>
-            <stringProp name="HTTPSampler.method">GET</stringProp>
-            <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
-            <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
-            <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
-            <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
-            <boolProp name="HTTPSampler.monitor">false</boolProp>
-            <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
-          </HTTPSamplerProxy>
-          <hashTree>
-            <RegexExtractor guiclass="RegexExtractorGui" testclass="RegexExtractor" testname="Get logintoken" enabled="true">
-              <stringProp name="RegexExtractor.useHeaders">false</stringProp>
-              <stringProp name="RegexExtractor.refname">LOGIN_TOKEN</stringProp>
-              <stringProp name="RegexExtractor.regex">type=&quot;hidden&quot;\sname=&quot;logintoken&quot;\svalue=&quot;(\w+)&quot;</stringProp>
-              <stringProp name="RegexExtractor.template">$1$</stringProp>
-              <stringProp name="RegexExtractor.default">0</stringProp>
-              <stringProp name="RegexExtractor.match_number">1</stringProp>
-            </RegexExtractor>
-            <hashTree/>
-          </hashTree>
          <HTTPSamplerProxy guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="Login" enabled="true">
            <elementProp name="HTTPsampler.Arguments" elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
              <collectionProp name="Arguments.arguments">
@@ -429,13 +352,6 @@
                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
                  <stringProp name="Argument.name">password</stringProp>
                </elementProp>
-                <elementProp name="logintoken" elementType="HTTPArgument">
-                  <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                  <stringProp name="Argument.value">${LOGIN_TOKEN}</stringProp>
-                  <stringProp name="Argument.metadata">=</stringProp>
-                  <boolProp name="HTTPArgument.use_equals">true</boolProp>
-                  <stringProp name="Argument.name">logintoken</stringProp>
-                </elementProp>
              </collectionProp>
            </elementProp>
            <stringProp name="HTTPSampler.domain"></stringProp>
@@ -24,6 +24,6 @@

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

-$plugin->version = 2017111300;
-$plugin->requires = 2017110800;
+$plugin->version = 2018051400;
+$plugin->requires = 2018050800;
 $plugin->component = 'tool_generator';
@@ -25,8 +25,8 @@

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

-$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017110800; // Requires this Moodle version
+$plugin->version   = 2018051400; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2018050800; // Requires this Moodle version
 $plugin->component = 'tool_health'; // Full name of the plugin (used for diagnostics)

 $plugin->maturity  = MATURITY_ALPHA; // this version's maturity level
@@ -24,6 +24,6 @@

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

-$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017110800; // Requires this Moodle version.
+$plugin->version   = 2018051400; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2018050800; // Requires this Moodle version.
 $plugin->component = 'tool_httpsreplace'; // Full name of the plugin (used for diagnostics).
@@ -25,6 +25,6 @@

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

-$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017110800; // Requires this Moodle version
+$plugin->version   = 2018051400; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2018050800; // Requires this Moodle version
 $plugin->component = 'tool_innodb'; // Full name of the plugin (used for diagnostics)
@@ -24,6 +24,6 @@
 defined('MOODLE_INTERNAL') || die();

 $plugin->component  = 'tool_installaddon';
-$plugin->version    = 2017111300;
-$plugin->requires   = 2017110800;
+$plugin->version    = 2018051400;
+$plugin->requires   = 2018050800;
 $plugin->maturity   = MATURITY_STABLE;
@@ -25,6 +25,6 @@

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

-$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017110800; // Requires this Moodle version
+$plugin->version   = 2018051400; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2018050800; // Requires this Moodle version
 $plugin->component = 'tool_langimport'; // Full name of the plugin (used for diagnostics)
@@ -33,9 +33,6 @@ defined('MOODLE_INTERNAL') || die();
 function xmldb_tool_log_upgrade($oldversion) {
    global $CFG;

-    // Moodle v3.1.0 release upgrade line.
-    // Put any upgrade step following this.
-
    // Automatically generated Moodle v3.2.0 release upgrade line.
    // Put any upgrade step following this.

@@ -45,5 +42,8 @@ function xmldb_tool_log_upgrade($oldversion) {
    // Automatically generated Moodle v3.4.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -44,8 +44,7 @@ class helper {
            'native/mariadb' => \moodle_database::get_driver_instance('mariadb', 'native')->get_name(),
            'native/pgsql'   => \moodle_database::get_driver_instance('pgsql', 'native')->get_name(),
            'native/oci'     => \moodle_database::get_driver_instance('oci', 'native')->get_name(),
-            'native/sqlsrv'  => \moodle_database::get_driver_instance('sqlsrv', 'native')->get_name(),
-            'native/mssql'   => \moodle_database::get_driver_instance('mssql', 'native')->get_name()
+            'native/sqlsrv'  => \moodle_database::get_driver_instance('sqlsrv', 'native')->get_name()
        );
    }

@@ -27,9 +27,6 @@ defined('MOODLE_INTERNAL') || die();
 function xmldb_logstore_database_upgrade($oldversion) {
    global $CFG;

-    // Moodle v3.1.0 release upgrade line.
-    // Put any upgrade step following this.
-
    // Automatically generated Moodle v3.2.0 release upgrade line.
    // Put any upgrade step following this.

@@ -39,5 +36,8 @@ function xmldb_logstore_database_upgrade($oldversion) {
    // Automatically generated Moodle v3.4.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -24,6 +24,6 @@

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

-$plugin->version = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2017110800; // Requires this Moodle version.
+$plugin->version = 2018051400; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2018050800; // Requires this Moodle version.
 $plugin->component = 'logstore_database'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

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

-$plugin->version = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2017110800; // Requires this Moodle version.
+$plugin->version = 2018051400; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2018050800; // Requires this Moodle version.
 $plugin->component = 'logstore_legacy'; // Full name of the plugin (used for diagnostics).
@@ -27,9 +27,6 @@ defined('MOODLE_INTERNAL') || die();
 function xmldb_logstore_standard_upgrade($oldversion) {
    global $CFG;

-    // Moodle v3.1.0 release upgrade line.
-    // Put any upgrade step following this.
-
    // Automatically generated Moodle v3.2.0 release upgrade line.
    // Put any upgrade step following this.

@@ -39,5 +36,8 @@ function xmldb_logstore_standard_upgrade($oldversion) {
    // Automatically generated Moodle v3.4.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -24,6 +24,6 @@

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

-$plugin->version = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2017110800; // Requires this Moodle version.
+$plugin->version = 2018051400; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2018050800; // Requires this Moodle version.
 $plugin->component = 'logstore_standard'; // Full name of the plugin (used for diagnostics).
@@ -24,6 +24,6 @@

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

-$plugin->version = 2017111301; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires = 2017110800; // Requires this Moodle version.
+$plugin->version = 2018051401; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires = 2018050800; // Requires this Moodle version.
 $plugin->component = 'tool_log'; // Full name of the plugin (used for diagnostics).
@@ -39,7 +39,7 @@
 </h2>
 <div>{{{framework.description}}}</div>
    <h3>{{#str}}competencies, core_competency{{/str}}</h3>
-    <div class="row-fluid">
+    <div class="row-fluid row">
        <div class="span6 col-lg-6">
            <p>
                <form data-region="filtercompetencies" data-frameworkid="{{framework.id}}" class="form-inline">
@@ -56,7 +56,7 @@
        </div>

        <div class="span6 card col-lg-6">
-            <div class="card-block">
+            <div class="card-block card-body">
                <div class="card-title">
                    <h4 data-region="selected-competency">{{#str}}selectedcompetency, tool_lp{{/str}}</h4>
                        <span data-region="competencyactionsmenu" class="pull-xs-right">
@@ -116,7 +116,7 @@ class tool_lp_external_testcase extends externallib_advanced_testcase {
        $this->userrole = create_role('User role', 'lpuserrole', 'learning plan user role description');

        assign_capability('moodle/competency:competencymanage', CAP_ALLOW, $this->creatorrole, $syscontext->id);
-        assign_capability('moodle/competency:coursecompetencyconfigure', CAP_ALLOW, $this->creatorrole, $syscontext->id);
+        assign_capability('moodle/competency:competencycompetencyconfigure', CAP_ALLOW, $this->creatorrole, $syscontext->id);
        assign_capability('moodle/competency:planmanage', CAP_ALLOW, $this->creatorrole, $syscontext->id);
        assign_capability('moodle/competency:planmanagedraft', CAP_ALLOW, $this->creatorrole, $syscontext->id);
        assign_capability('moodle/competency:planmanageown', CAP_ALLOW, $this->creatorrole, $syscontext->id);
@@ -25,6 +25,6 @@
 defined('MOODLE_INTERNAL') || die();


-$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017110800; // Requires this Moodle version.
+$plugin->version   = 2018051400; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2018050800; // Requires this Moodle version.
 $plugin->component = 'tool_lp'; // Full name of the plugin (used for diagnostics).
@@ -21,7 +21,7 @@
 * @copyright  2016 Damyon Wiese
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
-define('NO_OUTPUT_BUFFERING', true);
+
 require_once(__DIR__ . '/../../../config.php');
 require_once($CFG->libdir.'/adminlib.php');

@@ -25,8 +25,8 @@
 defined('MOODLE_INTERNAL') || die();


-$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017110800; // Requires this Moodle version.
+$plugin->version   = 2018051400; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2018050800; // Requires this Moodle version.
 $plugin->component = 'tool_lpimportcsv'; // Full name of the plugin (used for diagnostics).
-$plugin->dependencies = array('tool_lp' => 2017110800);
+$plugin->dependencies = array('tool_lp' => 2018050800);

@@ -24,8 +24,8 @@

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

-$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017110800; // Requires this Moodle version.
+$plugin->version   = 2018051400; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2018050800; // Requires this Moodle version.
 $plugin->component = 'tool_lpmigrate'; // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = array(
    'tool_lp' => ANY_VERSION
@@ -672,29 +672,13 @@ class manager {
        $attachment->charset        = $partdata->getCharset();
        $attachment->description    = $partdata->getDescription();
        $attachment->contentid      = $partdata->getContentId();
-        $attachment->filesize       = $partdata->getBytes();
+        $attachment->filesize       = $messagedata->getBodyPartSize($part);

        if (!empty($CFG->antiviruses)) {
            mtrace("--> Attempting virus scan of '{$attachment->filename}'");
-
-            // Store the file on disk - it will need to be virus scanned first.
-            $itemid = rand(1, 999999999);;
-            $directory = make_temp_directory("/messageinbound/{$itemid}", false);
-            $filepath = $directory . "/" . $attachment->filename;
-            if (!$fp = fopen($filepath, "w")) {
-                // Unable to open the temporary file to write this to disk.
-                mtrace("--> Unable to save the file to disk for virus scanning. Check file permissions.");
-
-                throw new \core\message\inbound\processing_failed_exception('attachmentfilepermissionsfailed',
-                        'tool_messageinbound');
-            }
-
-            fwrite($fp, $attachment->content);
-            fclose($fp);
-
            // Perform a virus scan now.
            try {
-                \core\antivirus\manager::scan_file($filepath, $attachment->filename, true);
+                \core\antivirus\manager::scan_data($attachment->content);
            } catch (\core\antivirus\scanner_exception $e) {
                mtrace("--> A virus was found in the attachment '{$attachment->filename}'.");
                $this->inform_attachment_virus();
@@ -45,7 +45,7 @@ $string['invalid_recipient_handler'] = 'If a valid message is received but the s
 This handler processes those replies.

 It is not possible to disable sender verification of this handler because the user may reply from an incorrect email address if their email client configuration is incorrect.';
-$string['invalid_recipient_handler_name'] = 'Invalid recipient handler';
+$string['invalid_recipient_handler_name'] = 'Invalid sender handler';
 $string['invalidrecipientdescription'] = 'The message "{$a->subject}" could not be authenticated, since it was sent from a different email address than in your user profile. For the message to be authenticated, you need to reply to this message.';
 $string['invalidrecipientdescriptionhtml'] = 'The message "{$a->subject}" could not be authenticated, since it was sent from a different email address than in your user profile. For the message to be authenticated, you need to reply to this message.';
 $string['invalidrecipientfinal'] = 'The message "{$a->subject}" could not be authenticated. Please check that you are sending your message from the same email address as in your profile.';
@@ -24,6 +24,6 @@

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

-$plugin->version   = 2017111300;
-$plugin->requires  = 2017110800;
+$plugin->version   = 2018051400;
+$plugin->requires  = 2018050800;
 $plugin->component = 'tool_messageinbound';
@@ -90,6 +90,25 @@ class api {

                require("$path/db/mobile.php");
                foreach ($addons as $addonname => $addoninfo) {
+
+                    // Add handlers (for site add-ons).
+                    $handlers = !empty($addoninfo['handlers']) ? $addoninfo['handlers'] : array();
+                    $handlers = json_encode($handlers); // JSON formatted, since it is a complex structure that may vary over time.
+
+                    // Now language strings used by the app.
+                    $lang = array();
+                    if (!empty($addoninfo['lang'])) {
+                        $stringmanager = get_string_manager();
+                        $langs = $stringmanager->get_list_of_translations();
+                        foreach ($langs as $langid => $langname) {
+                            foreach ($addoninfo['lang'] as $stringinfo) {
+                                $lang[$langid][$stringinfo[0]] =
+                                    $stringmanager->get_string($stringinfo[0], $stringinfo[1], null, $langid);
+                            }
+                        }
+                    }
+                    $lang = json_encode($lang);
+
                    $plugininfo = array(
                        'component' => $component,
                        'version' => $version,
@@ -97,7 +116,9 @@ class api {
                        'dependencies' => !empty($addoninfo['dependencies']) ? $addoninfo['dependencies'] : array(),
                        'fileurl' => '',
                        'filehash' => '',
-                        'filesize' => 0
+                        'filesize' => 0,
+                        'handlers' => $handlers,
+                        'lang' => $lang,
                    );

                    // All the mobile packages must be under the plugin mobile directory.
@@ -149,6 +170,13 @@ class api {
            'maintenancemessage' => $maintenancemessage,
            'mobilecssurl' => !empty($CFG->mobilecssurl) ? $CFG->mobilecssurl : '',
            'tool_mobile_disabledfeatures' => get_config('tool_mobile', 'disabledfeatures'),
+            'country' => clean_param($CFG->country, PARAM_NOTAGS),
+            'agedigitalconsentverification' => \core_auth\digital_consent::is_age_digital_consent_verification_enabled(),
+            'autolang' => $CFG->autolang,
+            'lang' => clean_param($CFG->lang, PARAM_LANG),  // Avoid breaking WS because of incorrect package langs.
+            'langmenu' => $CFG->langmenu,
+            'langlist' => $CFG->langlist,
+            'locale' => $CFG->locale,
        );

        $typeoflogin = get_config('tool_mobile', 'typeoflogin');
@@ -180,6 +208,12 @@ class api {
            $settings['identityproviders'] = $identityprovidersdata;
        }

+        // If age is verified, return also the admin contact details.
+        if ($settings['agedigitalconsentverification']) {
+            $settings['supportname'] = clean_param($CFG->supportname, PARAM_NOTAGS);
+            $settings['supportemail'] = clean_param($CFG->supportemail, PARAM_EMAIL);
+        }
+
        return $settings;
    }

@@ -243,6 +277,7 @@ class api {
            $settings->tool_mobile_customlangstrings = get_config('tool_mobile', 'customlangstrings');
            $settings->tool_mobile_disabledfeatures = get_config('tool_mobile', 'disabledfeatures');
            $settings->tool_mobile_custommenuitems = get_config('tool_mobile', 'custommenuitems');
+            $settings->tool_mobile_apppolicy = get_config('tool_mobile', 'apppolicy');
        }

        return $settings;
@@ -325,6 +360,7 @@ class api {
        }

        $features = array(
+            'NoDelegate_CoreOffline' => new lang_string('offlineuse', 'tool_mobile'),
            '$mmLoginEmailSignup' => new lang_string('startsignup'),
            "$mainmenu" => array(
                '$mmSideMenuDelegate_mmCourses' => new lang_string('mycourses'),
@@ -345,6 +381,8 @@ class api {
                '$mmCoursesDelegate_mmaGrades' => new lang_string('grades', 'grades'),
                '$mmCoursesDelegate_mmaCourseCompletion' => new lang_string('coursecompletion', 'completion'),
                '$mmCoursesDelegate_mmaNotes' => new lang_string('notes', 'notes'),
+                'NoDelegate_CoreCourseDownload' => new lang_string('downloadcourse', 'tool_mobile'),
+                'NoDelegate_CoreCoursesDownload' => new lang_string('downloadcourses', 'tool_mobile'),
            ),
            "$user" => array(
                '$mmUserDelegate_mmaBadges' => new lang_string('badges', 'badges'),
@@ -28,6 +28,7 @@ defined('MOODLE_INTERNAL') || die();
 require_once("$CFG->libdir/externallib.php");

 use external_api;
+use external_files;
 use external_function_parameters;
 use external_value;
 use external_single_structure;
@@ -37,6 +38,7 @@ use context_system;
 use moodle_exception;
 use moodle_url;
 use core_text;
+use coding_exception;

 /**
 * This is the external API for this tool.
@@ -91,7 +93,9 @@ class external extends external_api {
                            'fileurl' => new external_value(PARAM_URL, 'The addon package url for download
                                                            or empty if it doesn\'t exist.'),
                            'filehash' => new external_value(PARAM_RAW, 'The addon package hash or empty if it doesn\'t exist.'),
-                            'filesize' => new external_value(PARAM_INT, 'The addon package size or empty if it doesn\'t exist.')
+                            'filesize' => new external_value(PARAM_INT, 'The addon package size or empty if it doesn\'t exist.'),
+                            'handlers' => new external_value(PARAM_RAW, 'Handlers definition (JSON)', VALUE_OPTIONAL),
+                            'lang' => new external_value(PARAM_RAW, 'Language strings used by the handlers (JSON)', VALUE_OPTIONAL),
                        )
                    )
                ),
@@ -161,6 +165,19 @@ class external extends external_api {
                    ),
                    'Identity providers', VALUE_OPTIONAL
                ),
+                'country' => new external_value(PARAM_NOTAGS, 'Default site country', VALUE_OPTIONAL),
+                'agedigitalconsentverification' => new external_value(PARAM_BOOL, 'Whether age digital consent verification
+                    is enabled.', VALUE_OPTIONAL),
+                'supportname' => new external_value(PARAM_NOTAGS, 'Site support contact name
+                    (only if age verification is enabled).', VALUE_OPTIONAL),
+                'supportemail' => new external_value(PARAM_EMAIL, 'Site support contact email
+                    (only if age verification is enabled).', VALUE_OPTIONAL),
+                'autolang' => new external_value(PARAM_INT, 'Whether to detect default language
+                    from browser setting.', VALUE_OPTIONAL),
+                'lang' => new external_value(PARAM_LANG, 'Default language for the site.', VALUE_OPTIONAL),
+                'langmenu' => new external_value(PARAM_INT, 'Whether the language menu should be displayed.', VALUE_OPTIONAL),
+                'langlist' => new external_value(PARAM_RAW, 'Languages on language menu.', VALUE_OPTIONAL),
+                'locale' => new external_value(PARAM_RAW, 'Sitewide locale.', VALUE_OPTIONAL),
                'warnings' => new external_warnings(),
            )
        );
@@ -317,4 +334,130 @@ class external extends external_api {
            )
        );
    }
+
+    /**
+     * Returns description of get_content() parameters
+     *
+     * @return external_function_parameters
+     * @since Moodle 3.5
+     */
+    public static function get_content_parameters() {
+        return new external_function_parameters(
+            array(
+                'component' => new external_value(PARAM_COMPONENT, 'Component where the class is e.g. mod_assign.'),
+                'method' => new external_value(PARAM_ALPHANUMEXT, 'Method to execute in class \$component\output\mobile.'),
+                'args' => new external_multiple_structure(
+                    new external_single_structure(
+                        array(
+                            'name' => new external_value(PARAM_ALPHANUMEXT, 'Param name.'),
+                            'value' => new external_value(PARAM_RAW, 'Param value.')
+                        )
+                    ), 'Args for the method are optional.', VALUE_OPTIONAL
+                )
+            )
+        );
+    }
+
+    /**
+     * Returns a piece of content to be displayed in the Mobile app, it usually returns a template, javascript and
+     * other structured data that will be used to render a view in the Mobile app..
+     *
+     * Callbacks (placed in \$component\output\mobile) that are called by this web service are responsible for doing the
+     * appropriate security checks to access the information to be returned.
+     *
+     * @param string $component fame of the component.
+     * @param string $method function method name in class \$component\output\mobile.
+     * @param array $args optional arguments for the method.
+     * @return array HTML, JavaScript and other required data and information to create a view in the app.
+     * @since Moodle 3.5
+     * @throws coding_exception
+     */
+    public static function get_content($component, $method, $args = array()) {
+        global $OUTPUT, $PAGE, $USER;
+
+        $params = self::validate_parameters(self::get_content_parameters(),
+            array(
+                'component' => $component,
+                'method' => $method,
+                'args' => $args
+            )
+        );
+
+        // Reformat arguments into something less unwieldy.
+        $arguments = array();
+        foreach ($params['args'] as $paramargument) {
+            $arguments[$paramargument['name']] = $paramargument['value'];
+        }
+
+        // The component was validated via the PARAM_COMPONENT parameter type.
+        $classname = '\\' . $params['component'] .'\output\mobile';
+        if (!method_exists($classname, $params['method'])) {
+            throw new coding_exception("Missing method in $classname");
+        }
+        $result = call_user_func_array(array($classname, $params['method']), array($arguments));
+
+        // Populate otherdata.
+        $otherdata = array();
+        if (!empty($result['otherdata'])) {
+            $result['otherdata'] = (array) $result['otherdata'];
+            foreach ($result['otherdata'] as $name => $value) {
+                $otherdata[] = array(
+                    'name' => $name,
+                    'value' => $value
+                );
+            }
+        }
+
+        return array(
+            'templates'  => !empty($result['templates']) ? $result['templates'] : array(),
+            'javascript' => !empty($result['javascript']) ? $result['javascript'] : '',
+            'otherdata'  => $otherdata,
+            'files'      => !empty($result['files']) ? $result['files'] : array(),
+            'restrict'   => !empty($result['restrict']) ? $result['restrict'] : array(),
+        );
+    }
+
+    /**
+     * Returns description of get_content() result value
+     *
+     * @return array
+     * @since Moodle 3.5
+     */
+    public static function get_content_returns() {
+        return new external_single_structure(
+            array(
+                'templates' => new external_multiple_structure(
+                    new external_single_structure(
+                        array(
+                            'id' => new external_value(PARAM_TEXT, 'ID of the template.'),
+                            'html' => new external_value(PARAM_RAW, 'HTML code.'),
+                        )
+                    ),
+                    'Templates required by the generated content.'
+                ),
+                'javascript' => new external_value(PARAM_RAW, 'JavaScript code.'),
+                'otherdata' => new external_multiple_structure(
+                    new external_single_structure(
+                        array(
+                            'name' => new external_value(PARAM_RAW, 'Field name.'),
+                            'value' => new external_value(PARAM_RAW, 'Field value.')
+                        )
+                    ),
+                    'Other data that can be used or manipulated by the template via 2-way data-binding.'
+                ),
+                'files' => new external_files('Files in the content.'),
+                'restrict' => new external_single_structure(
+                    array(
+                        'users' => new external_multiple_structure(
+                            new external_value(PARAM_INT, 'user id'), 'List of allowed users.', VALUE_OPTIONAL
+                        ),
+                        'courses' => new external_multiple_structure(
+                            new external_value(PARAM_INT, 'course id'), 'List of allowed courses.', VALUE_OPTIONAL
+                        ),
+                    ),
+                    'Restrict this content to certain users or courses.'
+                )
+            )
+        );
+    }
 }
@@ -60,6 +60,13 @@ $functions = array(
                            Is created only in https sites and is restricted by time and ip address.',
        'type'        => 'write',
        'services'    => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
-    )
+    ),
+    'tool_mobile_get_content' => array(
+        'classname'   => 'tool_mobile\external',
+        'methodname'  => 'get_content',
+        'description' => 'Returns a piece of content to be displayed in the Mobile app.',
+        'type'        => 'read',
+        'services'    => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
+    ),
 );

@@ -25,6 +25,8 @@
 $string['adodbdebugwarning'] = 'ADOdb debugging is enabled. It should be disabled in the external database authentication or external database enrolment plugin settings.';
 $string['androidappid'] = 'Android app\'s unique identifier';
 $string['androidappid_desc'] = 'This setting may be left as default unless you have a custom Android app.';
+$string['apppolicy'] = 'App policy URL';
+$string['apppolicy_help'] = 'The URL of a policy for app users which is listed on the About page in the app. If the field is left empty, the site policy URL will be used instead.';
 $string['autologinkeygenerationlockout'] = 'Auto-login key generation is blocked. You need to wait 6 minutes between requests.';
 $string['autologinnotallowedtoadmins'] = 'Auto-login is not allowed for site admins.';
 $string['cachedef_plugininfo'] = 'This stores the list of plugins with mobile addons';
@@ -51,6 +53,8 @@ Mis calificaciones|https://someurl.xyz/local/mygrades/index.php|embedded|es
 $string['disabledfeatures'] = 'Disabled features';
 $string['disabledfeatures_desc'] = 'Select here the features you want to disable in the Mobile app for your site. Please note that some features listed here could be already disabled via other site settings. You will have to log out and log in again in the app to see the changes.';
 $string['displayerrorswarning'] = 'Display debug messages (debugdisplay) is enabled. It should be disabled.';
+$string['downloadcourse'] = 'Download course';
+$string['downloadcourses'] = 'Download courses';
 $string['enablesmartappbanners'] = 'Enable App Banners';
 $string['enablesmartappbanners_desc'] = 'If enabled, a banner promoting the mobile app will be displayed when accessing the site using a mobile browser.';
 $string['forcedurlscheme'] = 'If you want to allow only your custom branded app to be opened via a browser window, then specify its URL scheme here; otherwise leave the field empty.';
@@ -79,13 +83,14 @@ $string['mobilecssurl'] = 'CSS';
 $string['mobilefeatures'] = 'Mobile features';
 $string['mobilenotificationsdisabledwarning'] = 'Mobile notifications are not enabled. They should be enabled in Manage message outputs.';
 $string['mobilesettings'] = 'Mobile settings';
+$string['offlineuse'] = 'Offline use';
 $string['pluginname'] = 'Moodle Mobile tools';
+$string['pluginnotenabledorconfigured'] = 'Plugin not enabled or configured.';
+$string['remoteaddons'] = 'Remote add-ons';
 $string['selfsignedoruntrustedcertificatewarning'] = 'It seems that the HTTPS certificate is self-signed or not trusted. The mobile app will only work with trusted sites.';
 $string['setuplink'] = 'App download page';
 $string['setuplink_desc'] = 'URL of page with links to download the mobile app from the App Store and Google Play.';
 $string['smartappbanners'] = 'App Banners';
-$string['pluginnotenabledorconfigured'] = 'Plugin not enabled or configured.';
-$string['remoteaddons'] = 'Remote add-ons';
 $string['typeoflogin'] = 'Type of login';
 $string['typeoflogin_desc'] = 'If the site uses a SSO authentication method, then select via a browser window or via an embedded browser. An embedded browser provides a better user experience, though it doesn\'t work with all SSO plugins.';
 $string['getmoodleonyourmobile'] = 'Get the mobile app';
@@ -43,6 +43,9 @@ if ($hassiteconfig) {
                new lang_string('configenablemobilewebservice', 'admin', $enablemobiledoclink), $default));
    }

+    $temp->add(new admin_setting_configtext('tool_mobile/apppolicy', new lang_string('apppolicy', 'tool_mobile'),
+        new lang_string('apppolicy_help', 'tool_mobile'), '', PARAM_URL));
+
    $ADMIN->add('mobileapp', $temp);

    // Show only mobile settings if the mobile service is enabled.
@@ -29,6 +29,7 @@ defined('MOODLE_INTERNAL') || die();
 global $CFG;

 require_once($CFG->dirroot . '/webservice/tests/helpers.php');
+require_once($CFG->dirroot . '/admin/tool/mobile/tests/fixtures/output/mobile.php');

 use tool_mobile\external;
 use tool_mobile\api;
@@ -86,6 +87,13 @@ class tool_mobile_external_testcase extends externallib_advanced_testcase {
            'mobilecssurl' => '',
            'tool_mobile_disabledfeatures' => '',
            'launchurl' => "$CFG->wwwroot/$CFG->admin/tool/mobile/launch.php",
+            'country' => $CFG->country,
+            'agedigitalconsentverification' => \core_auth\digital_consent::is_age_digital_consent_verification_enabled(),
+            'autolang' => $CFG->autolang,
+            'lang' => $CFG->lang,
+            'langmenu' => $CFG->langmenu,
+            'langlist' => $CFG->langlist,
+            'locale' => $CFG->locale,
            'warnings' => array()
        );
        $this->assertEquals($expected, $result);
@@ -98,12 +106,20 @@ class tool_mobile_external_testcase extends externallib_advanced_testcase {
        set_config('logo', 'mock.png', 'core_admin');
        set_config('logocompact', 'mock.png', 'core_admin');
        set_config('forgottenpasswordurl', 'mailto:fake@email.zy'); // Test old hack.
+        set_config('agedigitalconsentverification', 1);
+        set_config('autolang', 1);
+        set_config('lang', 'a_b');  // Set invalid lang.

        list($authinstructions, $notusedformat) = external_format_text($authinstructions, FORMAT_MOODLE, $context->id);
        $expected['registerauth'] = 'email';
        $expected['authinstructions'] = $authinstructions;
        $expected['typeoflogin'] = api::LOGIN_VIA_BROWSER;
        $expected['forgottenpasswordurl'] = ''; // Expect empty when it's not an URL.
+        $expected['agedigitalconsentverification'] = true;
+        $expected['supportname'] = $CFG->supportname;
+        $expected['supportemail'] = $CFG->supportemail;
+        $expected['autolang'] = '1';
+        $expected['lang'] = ''; // Expect empty because it was set to an invalid lang.

        if ($logourl = $OUTPUT->get_logo_url()) {
            $expected['logourl'] = $logourl->out(false);
@@ -157,6 +173,7 @@ class tool_mobile_external_testcase extends externallib_advanced_testcase {
            array('name' => 'tool_mobile_customlangstrings', 'value' => ''),
            array('name' => 'tool_mobile_disabledfeatures', 'value' => ''),
            array('name' => 'tool_mobile_custommenuitems', 'value' => ''),
+            array('name' => 'tool_mobile_apppolicy', 'value' => ''),
        );
        $this->assertCount(0, $result['warnings']);
        $this->assertEquals($expected, $result['settings']);
@@ -290,4 +307,53 @@ class tool_mobile_external_testcase extends externallib_advanced_testcase {
        $this->expectExceptionMessage(get_string('autologinkeygenerationlockout', 'tool_mobile'));
        $result = external::get_autologin_key($token->privatetoken);
    }
+
+    /**
+     * Test get_content.
+     */
+    public function test_get_content() {
+
+        $paramval = 16;
+        $result = external::get_content('tool_mobile', 'test_view', array(array('name' => 'param1', 'value' => $paramval)));
+        $result = external_api::clean_returnvalue(external::get_content_returns(), $result);
+        $this->assertCount(1, $result['templates']);
+        $this->assertCount(1, $result['otherdata']);
+        $this->assertCount(2, $result['restrict']['users']);
+        $this->assertCount(2, $result['restrict']['courses']);
+        $this->assertEquals('alert();', $result['javascript']);
+        $this->assertEquals('main', $result['templates'][0]['id']);
+        $this->assertEquals('The HTML code', $result['templates'][0]['html']);
+        $this->assertEquals('otherdata1', $result['otherdata'][0]['name']);
+        $this->assertEquals($paramval, $result['otherdata'][0]['value']);
+        $this->assertEquals(array(1, 2), $result['restrict']['users']);
+        $this->assertEquals(array(3, 4), $result['restrict']['courses']);
+        $this->assertEmpty($result['files']);
+    }
+
+    /**
+     * Test get_content non existent function in valid component.
+     */
+    public function test_get_content_non_existent_function() {
+
+        $this->expectException('coding_exception');
+        $result = external::get_content('tool_mobile', 'test_blahblah');
+    }
+
+    /**
+     * Test get_content incorrect component.
+     */
+    public function test_get_content_invalid_component() {
+
+        $this->expectException('moodle_exception');
+        $result = external::get_content('tool_mobile\hack', 'test_view');
+    }
+
+    /**
+     * Test get_content non existent component.
+     */
+    public function test_get_content_non_existent_component() {
+
+        $this->expectException('moodle_exception');
+        $result = external::get_content('tool_blahblahblah', 'test_view');
+    }
 }
@@ -0,0 +1,60 @@
+<?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/>.
+
+/**
+ * Mock class for get_content.
+ *
+ * @package tool_mobile
+ * @copyright 2018 Juan Leyva
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+namespace tool_mobile\output;
+
+defined('MOODLE_INTERNAL') || die;
+
+/**
+ * Mock class for get_content.
+ *
+ * @package tool_mobile
+ * @copyright 2018 Juan Leyva
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class mobile {
+
+    /**
+     * Returns a test view.
+     * @param  array $args Arguments from tool_mobile_get_content WS
+     *
+     * @return array       HTML, javascript and otherdata
+     */
+    public static function test_view($args) {
+        $args = (object) $args;
+
+        return array(
+            'templates' => array(
+                array(
+                    'id' => 'main',
+                    'html' => 'The HTML code',
+                ),
+            ),
+            'javascript' => 'alert();',
+            'otherdata' => array('otherdata1' => $args->param1),
+            'restrict' => array('users' => array(1, 2), 'courses' => array(3, 4)),
+            'files' => array()
+        );
+    }
+}
@@ -1,6 +1,11 @@
 This files describes changes in tool_mobile code.
 Information provided here is intended especially for developers.

+=== 3.5 ===
+
+ * External function tool_mobile::tool_mobile_get_plugins_supporting_mobile now returns additional plugins information required by
+   Moodle Mobile 3.5.0.
+
 === 3.4 ===

 * External function tool_mobile::tool_mobile_get_plugins_supporting_mobile is now available via AJAX for not logged users.
@@ -23,9 +23,9 @@
 */

 defined('MOODLE_INTERNAL') || die();
-$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017110800; // Requires this Moodle version.
+$plugin->version   = 2018051400; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2018050800; // Requires this Moodle version.
 $plugin->component = 'tool_mobile'; // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = array(
-    'webservice_rest' => 2017110800
+    'webservice_rest' => 2018050800
 );
@@ -35,9 +35,6 @@ function xmldb_tool_monitor_upgrade($oldversion) {

    $dbman = $DB->get_manager();

-    // Moodle v3.1.0 release upgrade line.
-    // Put any upgrade step following this.
-
    if ($oldversion < 2016052305) {

        // Define field inactivedate to be added to tool_monitor_subscriptions.
@@ -79,5 +76,8 @@ function xmldb_tool_monitor_upgrade($oldversion) {
    // Automatically generated Moodle v3.4.0 release upgrade line.
    // Put any upgrade step following this.

+    // Automatically generated Moodle v3.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -26,6 +26,6 @@

 defined('MOODLE_INTERNAL') || die;

-$plugin->version   = 2017111300;     // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017110800;     // Requires this Moodle version.
+$plugin->version   = 2018051400;     // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2018050800;     // Requires this Moodle version.
 $plugin->component = 'tool_monitor'; // Full name of the plugin (used for diagnostics).
@@ -25,7 +25,7 @@

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

-$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2017110800; // Requires this Moodle version
+$plugin->version   = 2018051400; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2018050800; // Requires this Moodle version
 $plugin->component = 'tool_multilangupgrade'; // Full name of the plugin (used for diagnostics)

@@ -24,7 +24,7 @@

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

-$plugin->version   = 2017111300; // The current plugin version (Date: YYYYMMDDXX).
-$plugin->requires  = 2017110800; // Requires this Moodle version.
+$plugin->version   = 2018051400; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->requires  = 2018050800; // Requires this Moodle version.
 $plugin->component = 'tool_oauth2'; // Full name of the plugin (used for diagnostics).

--- a/Show More
+++ b/Show More