Moodle release 2.8.9

weekly release 2.8.8+
MDL-51685 unittest: Test functionality individually
2015-11-06 20:51:38 +01:00 · 2015-11-06 11:56:38 +00:00 · 2015-11-06 11:24:41 +01:00 · 2015-11-06 10:05:56 +00:00 · 2015-11-06 08:12:57 +00:00 · 2015-11-06 15:12:11 +08:00
1511 changed files with 40058 additions and 10771 deletions
@@ -0,0 +1,3 @@
+--errors=errors,duplicate-properties
+--warnings=known-properties,display-property-grouping,empty-rules,important
+--exclude-list=vendor/,lib/editor/tinymce/,lib/yuilib/,theme/bootstrapbase/style/
@@ -64,6 +64,8 @@ echo "<form id=\"authmenu\" method=\"post\" action=\"auth_config.php\">\n";
 echo "<div>\n";
 echo "<input type=\"hidden\" name=\"sesskey\" value=\"".sesskey()."\" />\n";
 echo "<input type=\"hidden\" name=\"auth\" value=\"".$auth."\" />\n";
+// HACK to prevent browsers from automatically inserting the user's password into the wrong fields.
+echo prevent_form_autofill_password();

 // auth plugin description
 echo $OUTPUT->box_start();
@@ -146,8 +148,8 @@ function print_auth_lock_options($auth, $user_fields, $helptext, $retrieveopts,
            // If custom field then pick name from database.
            $fieldshortname = str_replace('profile_field_', '', $fieldname);
            $fieldname = $customfieldname[$fieldshortname]->name;
-        } elseif (preg_match('/^(.+?)(\d+)$/', $fieldname, $matches)) {
-            $fieldname =  get_string($matches[1]) . ' ' . $matches[2];
+        } elseif ($fieldname == 'phone1') {
+            $fieldname = get_string('phone');
        } elseif ($fieldname == 'url') {
            $fieldname = get_string('webpage');
        } else {
@@ -67,7 +67,6 @@ if ($data = data_submitted() and confirm_sesskey()) {
        $errormsg = get_string('errorwithsettings', 'admin');
        $firsterror = reset($adminroot->errors);
    }
-    $adminroot = admin_get_root(true); //reload tree
    $settingspage = $adminroot->locate($category, true);
 }

@@ -156,4 +155,4 @@ echo $outputhtml;
 echo html_writer::end_tag('fieldset');
 echo html_writer::end_tag('form');

-echo $OUTPUT->footer();
+echo $OUTPUT->footer();
@@ -0,0 +1,103 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This script fixes orphaned question categories.
+ *
+ * Orphaned question categories have had their associated context deleted
+ * but the category itself remains in the database with an invalid context.
+ *
+ * @package    core
+ * @subpackage cli
+ * @copyright  2013 Tyler Bannister (tyler.bannister@remote-learner.net)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+define('CLI_SCRIPT', true);
+
+require(__DIR__.'/../../config.php');
+require_once($CFG->libdir.'/clilib.php');
+require_once($CFG->libdir.'/questionlib.php');
+
+$long = array('fix'  => false, 'help' => false);
+$short = array('f' => 'fix', 'h' => 'help');
+
+// Now get cli options.
+list($options, $unrecognized) = cli_get_params($long, $short);
+
+if ($unrecognized) {
+    $unrecognized = implode("\n  ", $unrecognized);
+    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
+}
+
+if ($options['help']) {
+    $help =
+        "Fix orphaned question categories.
+
+        This scripts detects question categories that have had their
+        context deleted, thus severing them from their original purpose.
+
+        This script will find the orphaned categories and delete the unused
+        questions in each category found.  Used questions will not be
+        deleted, instead they will be moved to a rescue question category.
+
+        Options:
+        -h, --help            Print out this help
+        -f, --fix             Fix the orphaned question categories in the DB.
+                              If not specified only check and report problems to STDERR.
+        Example:
+        \$sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_question_categories.php
+        \$sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_question_categories.php -f
+        ";
+
+    echo $help;
+    die;
+}
+
+cli_heading('Checking for orphaned categories');
+
+
+$sql = 'SELECT qc.id, qc.contextid, qc.name
+          FROM {question_categories} qc
+     LEFT JOIN {context} c ON qc.contextid = c.id
+         WHERE c.id IS NULL';
+$categories = $DB->get_recordset_sql($sql);
+
+$i = 0;
+foreach ($categories as $category) {
+    $i += 1;
+    echo "Found orphaned category: {$category->name}\n";
+    if (!empty($options['fix'])) {
+        echo "Cleaning...";
+        // One transaction per category.
+        $transaction = $DB->start_delegated_transaction();
+        question_category_delete_safe($category);
+        $transaction->allow_commit();
+        echo "  Done!\n";
+    }
+}
+
+if (($i > 0) && !empty($options['fix'])) {
+    echo "Found and removed {$i} orphaned question categories\n";
+} else if ($i > 0) {
+    echo "Found {$i} orphaned question categories. To fix, run:\n";
+    echo "\$sudo -u www-data /usr/bin/php admin/cli/fix_orphaned_question_categories.php --fix\n";
+} else {
+    echo "No orphaned question categories found.\n";
+}
+
+
+$categories->close();
@@ -1027,6 +1027,7 @@
      <VENDOR name="oracle" version="10.2" />
    </DATABASE>
    <PHP version="5.4.4" level="required">
+      <RESTRICT function="restrict_php_version_7" message="unsupportedphpversion7" />
    </PHP>
    <PCREUNICODE level="optional">
      <FEEDBACK>
@@ -1134,6 +1135,16 @@
          <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_CHECKS>
  </MOODLE>
  <MOODLE version="2.8" requires="2.2">
@@ -1150,6 +1161,7 @@
      <VENDOR name="oracle" version="10.2" />
    </DATABASE>
    <PHP version="5.4.4" level="required">
+      <RESTRICT function="restrict_php_version_7" message="unsupportedphpversion7" />
    </PHP>
    <PCREUNICODE level="optional">
      <FEEDBACK>
@@ -1257,6 +1269,294 @@
          <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_CHECKS>
+  </MOODLE>
+  <MOODLE version="2.9" requires="2.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.5.31" />
+      <VENDOR name="postgres" version="9.1" />
+      <VENDOR name="mssql" version="10.0" />
+      <VENDOR name="oracle" version="10.2" />
+    </DATABASE>
+    <PHP version="5.4.4" level="required">
+      <RESTRICT function="restrict_php_version_7" message="unsupportedphpversion7" />
+    </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="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opensslrecommended" />
+        </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="intl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="intlrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" 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_CHECKS>
+  </MOODLE>
+  <MOODLE version="3.0" requires="2.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.5.31" />
+      <VENDOR name="postgres" version="9.1" />
+      <VENDOR name="mssql" version="10.0" />
+      <VENDOR name="oracle" version="10.2" />
+    </DATABASE>
+    <PHP version="5.4.4" level="required">
+      <RESTRICT function="restrict_php_version_7" message="unsupportedphpversion7" />
+    </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="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opensslrecommended" />
+        </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="intl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="intlrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" 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_CHECKS>
  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -514,7 +514,15 @@ if (isguestuser()) {
    redirect(get_login_url());
 }
 $context = context_system::instance();
-require_capability('moodle/site:config', $context);
+
+if (!has_capability('moodle/site:config', $context)) {
+    // Do not throw exception display an empty page with administration menu if visible for current user.
+    $PAGE->set_title($SITE->fullname);
+    $PAGE->set_heading($SITE->fullname);
+    echo $OUTPUT->header();
+    echo $OUTPUT->footer();
+    exit;
+}

 // check that site is properly customized
 $site = get_site();
@@ -561,31 +569,36 @@ $cronoverdue = ($lastcron < time() - 3600 * 24);
 $dbproblems = $DB->diagnose();
 $maintenancemode = !empty($CFG->maintenance_enabled);

-// Available updates for Moodle core
+// Available updates for Moodle core.
 $updateschecker = \core\update\checker::instance();
 $availableupdates = array();
-$availableupdates['core'] = $updateschecker->get_update_info('core',
-    array('minmaturity' => $CFG->updateminmaturity, 'notifybuilds' => $CFG->updatenotifybuilds));
+$availableupdatesfetch = null;

-// Available updates for contributed plugins
-$pluginman = core_plugin_manager::instance();
-foreach ($pluginman->get_plugins() as $plugintype => $plugintypeinstances) {
-    foreach ($plugintypeinstances as $pluginname => $plugininfo) {
-        if (!empty($plugininfo->availableupdates)) {
-            foreach ($plugininfo->availableupdates as $pluginavailableupdate) {
-                if ($pluginavailableupdate->version > $plugininfo->versiondisk) {
-                    if (!isset($availableupdates[$plugintype.'_'.$pluginname])) {
-                        $availableupdates[$plugintype.'_'.$pluginname] = array();
+if (empty($CFG->disableupdatenotifications)) {
+    // Only compute the update information when it is going to be displayed to the user.
+    $availableupdates['core'] = $updateschecker->get_update_info('core',
+        array('minmaturity' => $CFG->updateminmaturity, 'notifybuilds' => $CFG->updatenotifybuilds));
+
+    // Available updates for contributed plugins
+    $pluginman = core_plugin_manager::instance();
+    foreach ($pluginman->get_plugins() as $plugintype => $plugintypeinstances) {
+        foreach ($plugintypeinstances as $pluginname => $plugininfo) {
+            if (!empty($plugininfo->availableupdates)) {
+                foreach ($plugininfo->availableupdates as $pluginavailableupdate) {
+                    if ($pluginavailableupdate->version > $plugininfo->versiondisk) {
+                        if (!isset($availableupdates[$plugintype.'_'.$pluginname])) {
+                            $availableupdates[$plugintype.'_'.$pluginname] = array();
+                        }
+                        $availableupdates[$plugintype.'_'.$pluginname][] = $pluginavailableupdate;
                    }
-                    $availableupdates[$plugintype.'_'.$pluginname][] = $pluginavailableupdate;
                }
            }
        }
    }
-}

-// The timestamp of the most recent check for available updates
-$availableupdatesfetch = $updateschecker->get_last_timefetched();
+    // The timestamp of the most recent check for available updates
+    $availableupdatesfetch = $updateschecker->get_last_timefetched();
+}

 $buggyiconvnomb = (!function_exists('mb_convert_encoding') and @iconv('UTF-8', 'UTF-8//IGNORE', '100'.chr(130).'€') !== '100€');
 //check if the site is registered on Moodle.org
@@ -11,7 +11,7 @@
    echo '<div class="phpinfo">';

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

@@ -65,7 +65,7 @@ if (!empty($registeredhub) and $registeredhub->token == $token) {
    $registeredhub->hubname = $hubname;
    $registrationmanager->update_registeredhub($registeredhub);

-    //display notficiation message
+    // Display notification message.
    $notificationmessage = $OUTPUT->notification(
            get_string('registrationconfirmedon', 'hub', $hublink), 'notifysuccess');
    echo $notificationmessage;
@@ -22,9 +22,9 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
 * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
 *
- * On this page the administrator selects which hub he wants to register,
- * except for MOOCH. Admins can register with MOOCH with the top admin menu "Registration" link.
- * On this page the administrator can also unregister from any hubs, including MOOCH.
+ * On this page the administrator selects which hub he wants to register (except for moodle.net)
+ * Admins can register with moodle.net via the site admin menu "Registration" link.
+ * On this page the administrator can also unregister from any hubs including moodle.net.
 */

 require('../../config.php');
@@ -53,31 +53,30 @@ class registration_manager {
    public function cron() {
        global $CFG;
        if (extension_loaded('xmlrpc')) {
-            //check if the last registration cron update was less than a week ago
-            $lastcron = get_config('registration', 'crontime');
-            if ($lastcron === false or $lastcron < strtotime("-7 day")) { //set to a week, see MDL-23704
-                $function = 'hub_update_site_info';
-                require_once($CFG->dirroot . "/webservice/xmlrpc/lib.php");
+            $function = 'hub_update_site_info';
+            require_once($CFG->dirroot . "/webservice/xmlrpc/lib.php");

-                //update all hub where the site is registered on
-                $hubs = $this->get_registered_on_hubs();
-                foreach ($hubs as $hub) {
-                    //update the registration
-                    $siteinfo = $this->get_site_info($hub->huburl);
-                    $params = array('siteinfo' => $siteinfo);
-                    $serverurl = $hub->huburl . "/local/hub/webservice/webservices.php";
-                    $xmlrpcclient = new webservice_xmlrpc_client($serverurl, $hub->token);
-                    try {
-                        $result = $xmlrpcclient->call($function, $params);
-                        mtrace(get_string('siteupdatedcron', 'hub', $hub->hubname));
-                    } catch (Exception $e) {
-                        $errorparam = new stdClass();
-                        $errorparam->errormessage = $e->getMessage();
-                        $errorparam->hubname = $hub->hubname;
-                        mtrace(get_string('errorcron', 'hub', $errorparam));
-                    }
+            // Update all hubs where the site is registered.
+            $hubs = $this->get_registered_on_hubs();
+            if (empty($hubs)) {
+                mtrace(get_string('registrationwarning', 'admin'));
+            }
+            foreach ($hubs as $hub) {
+                // Update the registration.
+                $siteinfo = $this->get_site_info($hub->huburl);
+                $params = array('siteinfo' => $siteinfo);
+                $serverurl = $hub->huburl . "/local/hub/webservice/webservices.php";
+                $xmlrpcclient = new webservice_xmlrpc_client($serverurl, $hub->token);
+                try {
+                    $result = $xmlrpcclient->call($function, $params);
+                    $this->update_registeredhub($hub); // To update timemodified.
+                    mtrace(get_string('siteupdatedcron', 'hub', $hub->hubname));
+                } catch (Exception $e) {
+                    $errorparam = new stdClass();
+                    $errorparam->errormessage = $e->getMessage();
+                    $errorparam->hubname = $hub->hubname;
+                    mtrace(get_string('errorcron', 'hub', $errorparam));
                }
-                set_config('crontime', time(), 'registration');
            }
        } else {
            mtrace(get_string('errorcronnoxmlrpc', 'hub'));
@@ -39,6 +39,8 @@ require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/forms.php');
 require_once($CFG->dirroot . '/webservice/lib.php');
 require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');

+require_sesskey();
+
 $huburl = required_param('huburl', PARAM_URL);
 $huburl = rtrim($huburl, "/");

@@ -177,6 +179,13 @@ if (!empty($error)) {

 //some Moodle.org resitration explanation
 if ($huburl == HUB_MOODLEORGHUBURL) {
+    if (!empty($registeredhub->token)) {
+        $registrationmessage = get_string('pleaserefreshregistration', 'admin');
+    } else {
+        $registrationmessage = get_string('registrationwarning', 'admin');
+    }
+    echo $OUTPUT->notification($registrationmessage);
+
    echo $OUTPUT->heading(get_string('registerwithmoodleorg', 'admin'));
    $renderer = $PAGE->get_renderer('core', 'register');
    echo $renderer->moodleorg_registration_message();
@@ -36,13 +36,18 @@ class core_register_renderer extends plugin_renderer_base {
     * @return string
     */
    public function moodleorg_registration_message() {
-        $moodleorgurl = html_writer::link('http://moodle.org', 'Moodle.org');
-        $moodleorgstatsurl = html_writer::link('http://moodle.org/stats', get_string('statsmoodleorg', 'admin'));
-        $moochurl = html_writer::link(HUB_MOODLEORGHUBURL, get_string('moodleorghubname', 'admin'));
-        $moodleorgregmsg = get_string('registermoodleorg', 'admin', $moodleorgurl);
+
+        $moodleorgstatslink = html_writer::link('http://moodle.net/stats',
+                                               get_string('statsmoodleorg', 'admin'),
+                                               array('target' => '_blank'));
+
+        $hublink = html_writer::link('https://moodle.net/mod/page/view.php?id=1',
+                                      get_string('moodleorghubname', 'admin'),
+                                      array('target' => '_blank'));
+
+        $moodleorgregmsg = get_string('registermoodleorg', 'admin', $hublink);
        $items = array(get_string('registermoodleorgli1', 'admin'),
-            get_string('registermoodleorgli2', 'admin', $moodleorgstatsurl),
-            get_string('registermoodleorgli3', 'admin', $moochurl));
+                       get_string('registermoodleorgli2', 'admin', $moodleorgstatslink));
        $moodleorgregmsg .= html_writer::alist($items);
        return $moodleorgregmsg;
    }
@@ -50,7 +50,8 @@ $table->set_attribute('class', 'admintable generaltable');
 $table->setup();

 $plugins = array();
-foreach (core_component::get_plugin_list('report') as $plugin => $plugindir) {
+$availableplugins = core_component::get_plugin_list('report');
+foreach ($availableplugins as $plugin => $plugindir) {
    if (get_string_manager()->string_exists('pluginname', 'report_' . $plugin)) {
        $strpluginname = get_string('pluginname', 'report_' . $plugin);
    } else {
@@ -80,7 +81,10 @@ foreach ($plugins as $plugin => $name) {
        $uninstall = html_writer::link($uninstallurl, $struninstall);
    }

-    $stores = $logmanager->get_supported_logstores('report_' . $plugin);
+    $stores = array();
+    if (isset($availableplugins[$plugin])) {
+        $stores = $logmanager->get_supported_logstores('report_' . $plugin);
+    }
    if ($stores === false) {
        $supportedstores = get_string('logstorenotrequired', 'admin');
    } else if (!empty($stores)) {
@@ -264,6 +264,7 @@ if (($action == 'edit') || ($action == 'new')) {
    $strshow = get_string('on', 'repository');
    $strhide = get_string('off', 'repository');
    $strdelete = get_string('disabled', 'repository');
+    $struninstall = get_string('uninstallplugin', 'core_admin');

    $actionchoicesforexisting = array(
        'show' => $strshow,
@@ -286,9 +287,9 @@ if (($action == 'edit') || ($action == 'new')) {

    // Table to list plug-ins
    $table = new html_table();
-    $table->head = array(get_string('name'), get_string('isactive', 'repository'), get_string('order'), $settingsstr);
+    $table->head = array(get_string('name'), get_string('isactive', 'repository'), get_string('order'), $settingsstr, $struninstall);

-    $table->colclasses = array('leftalign', 'centeralign', 'centeralign', 'centeralign', 'centeralign');
+    $table->colclasses = array('leftalign', 'centeralign', 'centeralign', 'centeralign', 'centeralign', 'centeralign');
    $table->id = 'repositoriessetting';
    $table->data = array();
    $table->attributes['class'] = 'admintable generaltable';
@@ -384,7 +385,12 @@ if (($action == 'edit') || ($action == 'new')) {

            $updowncount++;

-            $table->data[] = array($i->get_readablename(), $OUTPUT->render($select), $updown, $settings);
+            $uninstall = '';
+            if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('repository_' . $typename, 'manage')) {
+                $uninstall = html_writer::link($uninstallurl, $struninstall);
+            }
+
+            $table->data[] = array($i->get_readablename(), $OUTPUT->render($select), $updown, $settings, $uninstall);

            if (!in_array($typename, $alreadyplugins)) {
                $alreadyplugins[] = $typename;
@@ -400,7 +406,11 @@ if (($action == 'edit') || ($action == 'new')) {
            if (!in_array($plugin, $alreadyplugins)) {
                $select = new single_select(repository_action_url($plugin, 'repos'), 'action', $actionchoicesfornew, 'delete', null, 'applyto' . basename($plugin));
                $select->set_label(get_string('action'), array('class' => 'accesshide'));
-                $table->data[] = array(get_string('pluginname', 'repository_'.$plugin), $OUTPUT->render($select), '', '');
+                $uninstall = '';
+                if ($uninstallurl = core_plugin_manager::instance()->get_uninstall_url('repository_' . $plugin, 'manage')) {
+                    $uninstall = html_writer::link($uninstallurl, $struninstall);
+                }
+                $table->data[] = array(get_string('pluginname', 'repository_'.$plugin), $OUTPUT->render($select), '', '', $uninstall);
            }
        }
    }
@@ -472,7 +472,9 @@ class core_role_define_role_table_advanced extends core_role_capability_table_wi
    }

    protected function get_description_field($id) {
-        return print_textarea(true, 10, 50, 50, 10, 'description', $this->role->description, 0, true);
+        return '<textarea class="form-textarea" id="'. s($id) .'" name="description" rows="10" cols="50">' .
+            htmlspecialchars($this->role->description) .
+            '</textarea>';
    }

    protected function get_archetype_field($id) {
@@ -41,15 +41,24 @@ class core_role_existing_role_holders extends core_role_assign_user_selector_bas
        list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext);
        $params = array_merge($params, $sortparams);

-        $sql = "SELECT ra.id AS raid," . $this->required_fields_sql('u') . ",ra.contextid,ra.component
-                  FROM {role_assignments} ra
+        $fields = "SELECT ra.id AS raid," . $this->required_fields_sql('u') . ",ra.contextid,ra.component ";
+        $countfields = "SELECT COUNT(1) ";
+        $sql = "FROM {role_assignments} ra
                  JOIN {user} u ON u.id = ra.userid
                  JOIN {context} ctx ON ra.contextid = ctx.id
                 WHERE $wherecondition
                       AND ctx.id $ctxcondition
-                       AND ra.roleid = :roleid
-              ORDER BY ctx.depth DESC, ra.component, $sort";
-        $contextusers = $DB->get_records_sql($sql, $params);
+                       AND ra.roleid = :roleid";
+         $order = " ORDER BY ctx.depth DESC, ra.component, $sort";
+
+        if (!$this->is_validating()) {
+            $existinguserscount = $DB->count_records_sql($countfields . $sql, $params);
+            if ($existinguserscount > $this->maxusersperpage) {
+                return $this->too_many_results($search, $existinguserscount);
+            }
+        }
+
+        $contextusers = $DB->get_records_sql($fields . $sql . $order, $params);

        // No users at all.
        if (empty($contextusers)) {
@@ -132,7 +132,7 @@ if ($courseid == SITEID) {
    $PAGE->set_heading($course->fullname.': '.$fullname);
 }
 echo $OUTPUT->header();
-echo $OUTPUT->heading($title, 3);
+echo $OUTPUT->heading($title);
 echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal');

 // Display them.
@@ -22,7 +22,6 @@ if ($data = data_submitted() and confirm_sesskey()) {
    if (admin_write_settings($data)) {
        $statusmsg = get_string('changessaved');
    }
-    $adminroot = admin_get_root(true); //reload tree

    if (!empty($adminroot->errors)) {
        $errormsg = get_string('errorwithsettings', 'admin');
@@ -44,10 +43,11 @@ if ($errormsg !== '') {

 $resultshtml = admin_search_settings_html($query); // case insensitive search only

-echo '<form action="search.php" method="post" id="adminsettings">';
+echo '<form action="' . $PAGE->url->out(true) . '" method="post" id="adminsettings">';
 echo '<div>';
 echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
-echo '<input type="hidden" name="query" value="'.s($query).'" />';
+// HACK to prevent browsers from automatically inserting the user's password into the wrong fields.
+echo prevent_form_autofill_password();
 echo '</div>';
 echo '<fieldset>';
 echo '<div class="clearer"><!-- --></div>';
@@ -48,7 +48,6 @@ if ($data = data_submitted() and confirm_sesskey()) {
        $errormsg = get_string('errorwithsettings', 'admin');
        $firsterror = reset($adminroot->errors);
    }
-    $adminroot = admin_get_root(true); //reload tree
    $settingspage = $adminroot->locate($section, true);
 }

@@ -78,6 +77,8 @@ if (empty($SITE->fullname)) {
    echo html_writer::input_hidden_params($PAGE->url);
    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
    echo '<input type="hidden" name="return" value="'.$return.'" />';
+    // HACK to prevent browsers from automatically inserting the user's password into the wrong fields.
+    echo prevent_form_autofill_password();

    echo $settingspage->output_html();

@@ -120,6 +121,8 @@ if (empty($SITE->fullname)) {
    echo html_writer::input_hidden_params($PAGE->url);
    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
    echo '<input type="hidden" name="return" value="'.$return.'" />';
+    // HACK to prevent browsers from automatically inserting the user's password into the wrong fields.
+    echo prevent_form_autofill_password();
    echo $OUTPUT->heading($settingspage->visiblename);

    echo $settingspage->output_html();
@@ -64,7 +64,8 @@ mybadges,badges|/badges/mybadges.php|award',
                                              array('0'        => new lang_string('default', 'calendar'),
                                                    '%I:%M %p' => new lang_string('timeformat_12', 'calendar'),
                                                    '%H:%M'    => new lang_string('timeformat_24', 'calendar'))));
-    $temp->add(new admin_setting_configselect('calendar_startwday', new lang_string('configstartwday', 'admin'), new lang_string('helpstartofweek', 'admin'), 0,
+    $temp->add(new admin_setting_configselect('calendar_startwday', new lang_string('configstartwday', 'admin'),
+        new lang_string('helpstartofweek', 'admin'), get_string('firstdayofweek', 'langconfig'),
    array(
            0 => new lang_string('sunday', 'calendar'),
            1 => new lang_string('monday', 'calendar'),
@@ -46,7 +46,7 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
    $ADMIN->add('courses',
        new admin_externalpage('restorecourse', new lang_string('restorecourse', 'admin'),
            new moodle_url('/backup/restorefile.php', array('contextid' => context_system::instance()->id)),
-            array('moodle/course:create')
+            array('moodle/restore:restorecourse')
        )
    );

@@ -75,6 +75,8 @@ if (has_capability('moodle/grade:manage', $systemcontext)
        $temp->add(new admin_setting_special_gradepointmax());

        $temp->add(new admin_setting_special_gradepointdefault());
+
+        $temp->add(new admin_setting_special_grademinmaxtouse());
    }
    $ADMIN->add('grades', $temp);

@@ -278,9 +278,6 @@ if ($hassiteconfig) {
    $ADMIN->add('webservicesettings', new admin_externalpage('webservicedocumentation', new lang_string('wsdocapi', 'webservice'), "$CFG->wwwroot/$CFG->admin/webservice/documentation.php", 'moodle/site:config', false));
    /// manage service
    $temp = new admin_settingpage('externalservices', new lang_string('externalservices', 'webservice'));
-    $temp->add(new admin_setting_enablemobileservice('enablemobilewebservice',
-            new lang_string('enablemobilewebservice', 'admin'),
-            new lang_string('configenablemobilewebservice', 'admin', $enablemobiledoclink), 0));
    $temp->add(new admin_setting_heading('manageserviceshelpexplaination', new lang_string('information', 'webservice'), new lang_string('servicehelpexplanation', 'webservice')));
    $temp->add(new admin_setting_manageexternalservices());
    $ADMIN->add('webservicesettings', $temp);
@@ -35,7 +35,8 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
    $params = new stdClass();
    $params->bytes = $defaultuserquota;
    $params->displaysize = display_size($defaultuserquota);
-    $temp->add(new admin_setting_configtext('userquota', new lang_string('userquota', 'admin'), new lang_string('configuserquota', 'admin', $params), $defaultuserquota));
+    $temp->add(new admin_setting_configtext('userquota', new lang_string('userquota', 'admin'),
+                new lang_string('configuserquota', 'admin', $params), $defaultuserquota, PARAM_INT, 30));

    $temp->add(new admin_setting_configcheckbox('allowobjectembed', new lang_string('allowobjectembed', 'admin'), new lang_string('configallowobjectembed', 'admin'), 0));
    $temp->add(new admin_setting_configcheckbox('enabletrusttext', new lang_string('enabletrusttext', 'admin'), new lang_string('configenabletrusttext', 'admin'), 0));
@@ -11,7 +11,7 @@ $hassiteconfig = has_capability('moodle/site:config', $systemcontext);
 $ADMIN->add('root', new admin_externalpage('adminnotifications', new lang_string('notifications'), "$CFG->wwwroot/$CFG->admin/index.php"));

 $ADMIN->add('root', new admin_externalpage('registrationmoodleorg', new lang_string('registration', 'admin'),
-        "$CFG->wwwroot/$CFG->admin/registration/register.php?huburl=" . HUB_MOODLEORGHUBURL . "&hubname=Moodle.org"));
+        "$CFG->wwwroot/$CFG->admin/registration/register.php?huburl=" . HUB_MOODLEORGHUBURL . "&hubname=Moodle.org&sesskey=" . sesskey()));
 $ADMIN->add('root', new admin_externalpage('registrationhub', new lang_string('registerwith', 'hub'),
        "$CFG->wwwroot/$CFG->admin/registration/register.php", 'moodle/site:config', true));
 $ADMIN->add('root', new admin_externalpage('registrationhubs', new lang_string('hubs', 'admin'),
@@ -114,6 +114,30 @@ class behat_admin extends behat_base {
        }
    }

+    /**
+     * Sets the specified site settings. A table with | config | value | (optional)plugin | is expected.
+     *
+     * @Given /^the following config values are set as admin:$/
+     * @param TableNode $table
+     */
+    public function the_following_config_values_are_set_as_admin(TableNode $table) {
+
+        if (!$data = $table->getRowsHash()) {
+            return;
+        }
+
+        foreach ($data as $config => $value) {
+            // Default plugin value is null.
+            $plugin = null;
+
+            if (is_array($value)) {
+                $plugin = $value[1];
+                $value = $value[0];
+            }
+            set_config($config, $value, $plugin);
+        }
+    }
+
    /**
     * Waits with the provided params if we are running a JS session.
     *
@@ -7,10 +7,10 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
  Background:
    Given the following "users" exist:
      | username | firstname | lastname | email | auth | confirmed |
-      | user1 | User | One | one@asd.com | manual | 0 |
-      | user2 | User | Two | two@asd.com | ldap | 1 |
-      | user3 | User | Three | three@asd.com | manual | 1 |
-      | user4 | User | Four | four@asd.com | ldap | 0 |
+      | user1 | User | One | one@example.com | manual | 0 |
+      | user2 | User | Two | two@example.com | ldap | 1 |
+      | user3 | User | Three | three@example.com | manual | 1 |
+      | user4 | User | Four | four@example.com | ldap | 0 |
    And the following "cohorts" exist:
      | name | idnumber |
      | Cohort 1 | CH1 |
@@ -23,8 +23,8 @@ Feature: An administrator can filter user accounts by role, cohort and other pro
      | user2 | C1 | student |
      | user3 | C1 | student |
    And I log in as "admin"
-    And I add "User Two (two@asd.com)" user to "CH1" cohort members
-    And I add "User Three (three@asd.com)" user to "CH1" cohort members
+    And I add "User Two (two@example.com)" user to "CH1" cohort members
+    And I add "User Three (three@example.com)" user to "CH1" cohort members
    And I follow "Browse list of users"

  @javascript
@@ -13,15 +13,13 @@ Feature: Set admin settings value
    And I should not see "C_shortname Course fullname"

  Scenario: set admin value with full name
-    Given I set the following administration settings values:
-      | Display extended course names | 1 |
-    When I press "Save changes"
+    Given the following config values are set as admin:
+      | courselistshortnames | 1 |
    And I am on homepage
    Then I should see "C_shortname Course fullname"

  Scenario: set admin value with short name
-    Given I set the following administration settings values:
+    Given the following config values are set as admin:
      | courselistshortnames | 1 |
-    When I press "Save changes"
    And I am on homepage
    Then I should see "C_shortname Course fullname"
@@ -21,7 +21,7 @@ Feature: Upload users
    And I should see "Tom"
    And I should see "Jones"
    And I should see "verysecret"
-    And I should see "jonest@someplace.edu"
+    And I should see "jonest@example.com"
    And I should see "Reznor"
    And I should see "course1"
    And I should see "math102"
@@ -32,7 +32,7 @@ Feature: Upload users
    And I follow "Browse list of users"
    And I should see "Tom Jones"
    And I should see "Trent Reznor"
-    And I should see "reznor@someplace.edu"
+    And I should see "reznor@example.com"
    And I am on homepage
    And I follow "Maths"
    And I expand "Users" node
@@ -13,8 +13,8 @@ Feature: Manage availability conditions
    Then I should not see "Availability restrictions"

    # Enable it and check I can now see and click on it.
-    And I set the following administration settings values:
-      | Enable conditional access | 1 |
+    And the following config values are set as admin:
+      | enableavailability | 1 |
    And I am on homepage
    And I navigate to "Manage restrictions" node in "Site administration > Plugins > Availability restrictions"

@@ -28,9 +28,9 @@ Feature: Manage availability conditions
    Given the following "courses" exist:
      | fullname | shortname | format |
      | Course 1 | C1        | topics |
+    And the following config values are set as admin:
+      | enableavailability | 1 |
    And I log in as "admin"
-    And I set the following administration settings values:
-      | Enable conditional access | 1 |
    And I am on homepage
    When I navigate to "Manage restrictions" node in "Site administration > Plugins > Availability restrictions"

@@ -44,13 +44,19 @@ require_once(__DIR__ . '/../../../../lib/behat/lib.php');
 chdir(__DIR__);
 $output = null;
 exec("php util.php --diag", $output, $code);
+
+// Ensure we have composer installed, before we install or re-install test site.
+if ($code == TESTING_EXITCODE_COMPOSER || $code == BEHAT_EXITCODE_INSTALL || $code == BEHAT_EXITCODE_REINSTALL) {
+    testing_update_composer_dependencies();
+    chdir(__DIR__);
+    exec("php util.php --diag", $output, $code);
+}
+
 if ($code == 0) {
    echo "Behat test environment already installed\n";

 } else if ($code == BEHAT_EXITCODE_INSTALL) {

-    testing_update_composer_dependencies();
-
    // Behat and dependencies are installed and we need to install the test site.
    chdir(__DIR__);
    passthru("php util.php --install", $code);
@@ -60,8 +66,6 @@ if ($code == 0) {

 } else if ($code == BEHAT_EXITCODE_REINSTALL) {

-    testing_update_composer_dependencies();
-
    // Test site data is outdated.
    chdir(__DIR__);
    passthru("php util.php --drop", $code);
@@ -74,18 +78,6 @@ if ($code == 0) {
        exit($code);
    }

-} else if ($code == BEHAT_EXITCODE_COMPOSER) {
-    // Missing Behat dependencies.
-
-    testing_update_composer_dependencies();
-
-    // Returning to admin/tool/behat/cli.
-    chdir(__DIR__);
-    passthru("php util.php --install", $code);
-    if ($code != 0) {
-        exit($code);
-    }
-
 } else {
    // Generic error, we just output it.
    echo implode("\n", $output)."\n";
@@ -165,7 +165,7 @@ class tool_behat_renderer extends plugin_renderer_base {
        // Info.
        $installurl = behat_command::DOCS_URL . '#Installation';
        $installlink = html_writer::tag('a', $installurl, array('href' => $installurl, 'target' => '_blank'));
-        $writetestsurl = behat_command::DOCS_URL . '#Writting_features';
+        $writetestsurl = behat_command::DOCS_URL . '#Writing_features';
        $writetestslink = html_writer::tag('a', $writetestsurl, array('href' => $writetestsurl, 'target' => '_blank'));
        $writestepsurl = behat_command::DOCS_URL . '#Adding_steps_definitions';
        $writestepslink = html_writer::tag('a', $writestepsurl, array('href' => $writestepsurl, 'target' => '_blank'));
@@ -69,8 +69,8 @@ Feature: Set up contextual data for tests
  Scenario: Role overrides
    Given the following "users" exist:
      | username | firstname | lastname | email |
-      | teacher1 | Teacher | 1 | teacher1@asd.com |
-      | student1 | Student | 1 | student1@asd.com |
+      | teacher1 | Teacher | 1 | teacher1@example.com |
+      | student1 | Student | 1 | student1@example.com |
    And the following "categories" exist:
      | name | category | idnumber |
      | Cat 1 | 0 | CAT1 |
@@ -99,7 +99,7 @@ Feature: Set up contextual data for tests
  Scenario: Add course enrolments
    Given the following "users" exist:
      | username | firstname | lastname | email |
-      | student1 | Student | 1 | student1@asd.com |
+      | student1 | Student | 1 | student1@example.com |
    And the following "courses" exist:
      | fullname | shortname | format |
      | Course 1 | C1 | topics |
@@ -117,11 +117,11 @@ Feature: Set up contextual data for tests
      | Custom student         | custom2   |                  |                |
    And the following "users" exist:
      | username | firstname | lastname | email |
-      | user1 | User | 1 | user1@moodlemoodle.com |
-      | user2 | User | 2 | user2@moodlemoodle.com |
-      | user3 | User | 3 | user3@moodlemoodle.com |
-      | user4 | User | 4 | user4@moodlemoodle.com |
-      | user5 | User | 5 | user5@moodlemoodle.com |
+      | user1 | User | 1 | user1@example.com |
+      | user2 | User | 2 | user2@example.com |
+      | user3 | User | 3 | user3@example.com |
+      | user4 | User | 4 | user4@example.com |
+      | user5 | User | 5 | user5@example.com |
    And the following "categories" exist:
      | name | category | idnumber |
      | Cat 1 | 0 | CAT1 |
@@ -229,8 +229,8 @@ Feature: Set up contextual data for tests
  Scenario: Add relations between users and groups
    Given the following "users" exist:
      | username | firstname | lastname | email |
-      | student1 | Student | 1 | student1@asd.com |
-      | student2 | Student | 2 | student2@asd.com |
+      | student1 | Student | 1 | student1@example.com |
+      | student2 | Student | 2 | student2@example.com |
    And the following "courses" exist:
      | fullname | shortname |
      | Course 1 | C1 |
@@ -269,8 +269,8 @@ Feature: Set up contextual data for tests
      | Cat 1 | 0        | CAT1     |
    And the following "users" exist:
      | username | firstname | lastname | email |
-      | student1 | Student | 1 | student1@asd.com |
-      | student2 | Student | 2 | student2@asd.com |
+      | student1 | Student | 1 | student1@example.com |
+      | student2 | Student | 2 | student2@example.com |
    And the following "cohorts" exist:
      | name            | idnumber |
      | System cohort A | CHSA     |
@@ -385,9 +385,9 @@ Feature: Set up contextual data for tests
    And the following "grade outcomes" exist:
      | fullname        | shortname | course | scale        |
      | Grade outcome 2 | OT2       | C1     | Test Scale 1 |
+    And the following config values are set as admin:
+      | enableoutcomes | 1 |
    When I log in as "admin"
-    And I set the following administration settings values:
-      | Enable outcomes | 1 |
    And I follow "Home"
    And I follow "Course 1"
    And I follow "Outcomes"
@@ -414,9 +414,9 @@ Feature: Set up contextual data for tests
     And the following "grade items" exist:
       | itemname                  | course | outcome | gradecategory    |
       | Test Outcome Grade Item 1 | C1     | OT1     | Grade category 1 |
+    And the following config values are set as admin:
+      | enableoutcomes | 1 |
    When I log in as "admin"
-    And I set the following administration settings values:
-      | Enable outcomes | 1 |
    And I follow "Home"
    And I follow "Course 1"
    And I follow "Grades"
@@ -7,7 +7,7 @@ Feature: Edit capabilities
  Background:
    Given the following "users" exist:
      | username | firstname | lastname | email |
-      | teacher1 | Teacher | 1 | teacher1@asd.com |
+      | teacher1 | Teacher | 1 | teacher1@example.com |
    And the following "courses" exist:
      | fullname | shortname | category |
      | Course 1 | C1 | 0 |
@@ -15,7 +15,6 @@ Feature: Edit capabilities
      | user | course | role |
      | teacher1 | C1 | editingteacher |

-  @javascript
  Scenario: Default system capabilities modification
    Given I log in as "admin"
    And I set the following system permissions of "Teacher" role:
@@ -30,7 +29,6 @@ Feature: Edit capabilities
    And "moodle/grade:managesharedforms" capability has "Prevent" permission
    And "moodle/course:request" capability has "Prohibit" permission

-  @javascript
  Scenario: Course capabilities overrides
    Given I log in as "teacher1"
    And I follow "Course 1"
@@ -41,11 +39,11 @@ Feature: Edit capabilities
      | mod/forum:editanypost | Prevent |
      | mod/forum:addquestion | Allow |
    When I set the field "Advanced role override" to "Student (3)"
+    And I press "Go"
    Then "mod/forum:deleteanypost" capability has "Prohibit" permission
    And "mod/forum:editanypost" capability has "Prevent" permission
    And "mod/forum:addquestion" capability has "Allow" permission

-  @javascript
  Scenario: Module capabilities overrides
    Given I log in as "teacher1"
    And I follow "Course 1"
@@ -60,6 +58,7 @@ Feature: Edit capabilities
      | mod/forum:editanypost | Prevent |
      | mod/forum:addquestion | Allow |
    When I set the field "Advanced role override" to "Student (3)"
+    And I press "Go"
    Then "mod/forum:deleteanypost" capability has "Prohibit" permission
    And "mod/forum:editanypost" capability has "Prevent" permission
    And "mod/forum:addquestion" capability has "Allow" permission
@@ -10,9 +10,9 @@ Feature: Verify that all form fields values can be get and set
      | Course 1 | C1 | 0 |
    And the following "users" exist:
      | username | email | firstname | lastname |
-      | student1 | s1@asd.com | Student | 1 |
-      | student2 | s2@asd.com | Student | 2 |
-      | student3 | s3@asd.com | Student | 3 |
+      | student1 | s1@example.com | Student | 1 |
+      | student2 | s2@example.com | Student | 2 |
+      | student3 | s3@example.com | Student | 3 |
    And the following "course enrolments" exist:
      | user | course | role |
      | student1 | C1 | student |
@@ -137,6 +137,17 @@ Feature: Verify that all form fields values can be get and set
    And I press "Save my choice"
    And the field "one" matches value "1"
    And the field "two" matches value ""
+    # Check if field xpath set/match works.
+    And I am on site homepage
+    And I follow "Course 1"
+    And I navigate to "Edit settings" node in "Course administration"
+    And I set the field with xpath "//input[@id='id_idnumber']" to "Course id number"
+    And the field with xpath "//input[@name='idnumber']" matches value "Course id number"
+    And the field with xpath "//input[@name='idnumber']" does not match value ""
+    And I press "Save changes"
+    And I navigate to "Edit settings" node in "Course administration"
+    And the field "Course ID number" matches value "Course id number"
+

  Scenario: with JS disabled all form fields getters and setters works as expected

@@ -83,7 +83,6 @@ SEARCH.prototype = {
        div.append(label).append(this.input);

        this.select.insert(div, 'before');
-        this.select.one('option').setStyle('display', 'none');

        this.input.on('keyup', this.typed, this);
        this.select.on('change', this.validate, this);
@@ -1 +1 @@
-YUI.add("moodle-tool_capability-search",function(e,t){var n=function(){n.superclass.constructor.apply(this,arguments)};n.prototype={form:null,select:null,selectoptions:{},input:null,button:null,lastsearch:null,initializer:function(){this.form=e.one("#capability-overview-form"),this.select=this.form.one("select[data-search=capability]"),this.select.setStyle("minWidth",this.select.get("offsetWidth")),this.select.get("options").each(function(e){var t=e.get("value");this.selectoptions[t]=e},this),this.button=this.form.all("input[type=submit]"),this.lastsearch=this.form.one("input[name=search]");var t=e.Node.create('<div id="capabilitysearchui"></div>'),n=e.Node.create('<label for="capabilitysearch">'+this.get("strsearch")+"</label>");this.input=e.Node.create('<input type="text" id="capabilitysearch" />'),t.append(n).append(this.input),this.select.insert(t,"before"),this.select.one("option").setStyle("display","none"),this.input.on("keyup",this.typed,this),this.select.on("change",this.validate,this),this.lastsearch&&(this.input.set("value",this.lastsearch.get("value")),this.typed(),this.select.one("option[selected]")&&this.select.set("scrollTop",this.select.one("option[selected]").get("getX"))),this.validate()},validate:function(){this.button.set("disabled",this.select.get("value")==="")},typed:function(){var e=this.input.get("value"),t=0,n=null,r;this.lastsearch&&this.lastsearch.set("value",e),this.select.all("option").remove();for(r in this.selectoptions)r.indexOf(e)>=0&&(t++,n=this.selectoptions[r],this.select.append(this.selectoptions[r]));t===0?this.input.addClass("error"):(this.input.removeClass("error"),t===1&&n.set("selected",!0)),this.validate()}},e.extend(n,e.Base,n.prototype,{NAME:"tool_capability-search",ATTRS:{strsearch:{}}}),M.tool_capability=M.tool_capability||{},M.tool_capability.init_capability_search=function(e){new n(e)}},"@VERSION@",{requires:["base","node"]});
+YUI.add("moodle-tool_capability-search",function(e,t){var n=function(){n.superclass.constructor.apply(this,arguments)};n.prototype={form:null,select:null,selectoptions:{},input:null,button:null,lastsearch:null,initializer:function(){this.form=e.one("#capability-overview-form"),this.select=this.form.one("select[data-search=capability]"),this.select.setStyle("minWidth",this.select.get("offsetWidth")),this.select.get("options").each(function(e){var t=e.get("value");this.selectoptions[t]=e},this),this.button=this.form.all("input[type=submit]"),this.lastsearch=this.form.one("input[name=search]");var t=e.Node.create('<div id="capabilitysearchui"></div>'),n=e.Node.create('<label for="capabilitysearch">'+this.get("strsearch")+"</label>");this.input=e.Node.create('<input type="text" id="capabilitysearch" />'),t.append(n).append(this.input),this.select.insert(t,"before"),this.input.on("keyup",this.typed,this),this.select.on("change",this.validate,this),this.lastsearch&&(this.input.set("value",this.lastsearch.get("value")),this.typed(),this.select.one("option[selected]")&&this.select.set("scrollTop",this.select.one("option[selected]").get("getX"))),this.validate()},validate:function(){this.button.set("disabled",this.select.get("value")==="")},typed:function(){var e=this.input.get("value"),t=0,n=null,r;this.lastsearch&&this.lastsearch.set("value",e),this.select.all("option").remove();for(r in this.selectoptions)r.indexOf(e)>=0&&(t++,n=this.selectoptions[r],this.select.append(this.selectoptions[r]));t===0?this.input.addClass("error"):(this.input.removeClass("error"),t===1&&n.set("selected",!0)),this.validate()}},e.extend(n,e.Base,n.prototype,{NAME:"tool_capability-search",ATTRS:{strsearch:{}}}),M.tool_capability=M.tool_capability||{},M.tool_capability.init_capability_search=function(e){new n(e)}},"@VERSION@",{requires:["base","node"]});
@@ -83,7 +83,6 @@ SEARCH.prototype = {
        div.append(label).append(this.input);

        this.select.insert(div, 'before');
-        this.select.one('option').setStyle('display', 'none');

        this.input.on('keyup', this.typed, this);
        this.select.on('change', this.validate, this);
@@ -81,7 +81,6 @@ SEARCH.prototype = {
        div.append(label).append(this.input);

        this.select.insert(div, 'before');
-        this.select.one('option').setStyle('display', 'none');

        this.input.on('keyup', this.typed, this);
        this.select.on('change', this.validate, this);
@@ -48,5 +48,8 @@ function xmldb_tool_customlang_upgrade($oldversion) {
    // Moodle v2.7.0 release upgrade line.
    // Put any upgrade step following this.

+    // Moodle v2.8.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -63,7 +63,7 @@ if ($translatorsubmitted) {
    $checkin = optional_param('savecheckin', false, PARAM_RAW);

    if ($checkin === false) {
-        $nexturl = $PAGE->url;
+        $nexturl = new moodle_url($PAGE->url, array('p' => $currentpage));
    } else {
        $nexturl = new moodle_url('/admin/tool/customlang/index.php', array('action'=>'checkin', 'lng' => $lng, 'sesskey'=>sesskey()));
    }
@@ -133,6 +133,7 @@ class tool_customlang_renderer extends plugin_renderer_base {
        $output .= html_writer::start_tag('div');
        $output .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'translatorsubmitted', 'value'=>1));
        $output .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'sesskey', 'value'=>sesskey()));
+        $output .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'p', 'value'=>$translator->currentpage));
        $save1   = html_writer::empty_tag('input', array('type'=>'submit', 'name'=>'savecontinue', 'value'=>get_string('savecontinue', 'tool_customlang')));
        $save2   = html_writer::empty_tag('input', array('type'=>'submit', 'name'=>'savecheckin', 'value'=>get_string('savecheckin', 'tool_customlang')));
        $output .= html_writer::tag('fieldset', $save1.$save2, array('class'=>'buttonsbar'));
@@ -208,10 +208,13 @@ class tool_generator_course_backend extends tool_generator_backend {
     */
    private function create_course() {
        $this->log('createcourse', $this->shortname);
-        $courserecord = array('shortname' => $this->shortname,
-                'fullname' => get_string('fullname', 'tool_generator',
-                    array('size' => get_string('shortsize_' . $this->size, 'tool_generator'))),
-                'numsections' => self::$paramsections[$this->size]);
+        $courserecord = array(
+            'shortname' => $this->shortname,
+            'fullname' => get_string('fullname', 'tool_generator',
+                array('size' => get_string('shortsize_' . $this->size, 'tool_generator'))),
+            'numsections' => self::$paramsections[$this->size],
+            'startdate' => usergetmidnight(time())
+        );
        return $this->generator->create_course($courserecord, array('createsections' => true));
    }

@@ -308,8 +311,7 @@ class tool_generator_course_backend extends tool_generator_backend {
            $username = 'tool_generator_' . $textnumber;

            // Create user account.
-            $record = array('firstname' => get_string('firstname', 'tool_generator'),
-                    'lastname' => $number, 'username' => $username);
+            $record = array('username' => $username, 'idnumber' => $number);

            // We add a user password if it has been specified.
            if (!empty($CFG->tool_generator_users_password)) {
@@ -62,7 +62,6 @@ $string['error_nonexistingcourse'] = 'The specified course does not exist';
 $string['error_nopageinstances'] = 'The selected course does not contain page module instances';
 $string['error_notdebugging'] = 'Not available on this server because debugging is not set to DEVELOPER';
 $string['error_nouserspassword'] = 'You need to set $CFG->tool_generator_users_password in config.php to generate the test plan';
-$string['firstname'] = 'Test course user';
 $string['fullname'] = 'Test course: {$a->size}';
 $string['maketestcourse'] = 'Make test course';
 $string['maketestplan'] = 'Make JMeter test plan';
@@ -136,7 +136,7 @@ class tool_generator_maketestcourse_testcase extends advanced_testcase {
        $lastusernumber = 0;
        $discussionstarters = array();
        foreach ($discussions as $discussion) {
-            $usernumber = intval($discussion->lastname);
+            $usernumber = core_user::get_user($discussion->userid, 'id, idnumber')->idnumber;

            // Checks that the users are odd numbers.
            $this->assertEquals(1, $usernumber % 2);
@@ -23,7 +23,7 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

-$string['healthnoproblemsfound'] = 'There is no health problem found!';
+$string['healthnoproblemsfound'] = 'No health problems were found!';
 $string['healthproblemsdetected'] = 'Health problems detected!';
 $string['healthproblemsolution'] = 'Health problem solution';
 $string['healthreturntomain'] = 'Continue';
@@ -156,7 +156,7 @@ class controller {
        $updateablelangs = array();
        foreach ($currentlangs as $clang) {
            if (!array_key_exists($clang, $md5array)) {
-                $noticeok[] = get_string('langpackupdateskipped', 'tool_langimport', $clang);
+                $this->info[] = get_string('langpackupdateskipped', 'tool_langimport', $clang);
                continue;
            }
            $dest1 = $CFG->dataroot.'/lang/'.$clang;
@@ -175,36 +175,10 @@ class controller {
            }
        }

-        // Clean-up currently installed versions of the packs.
-        foreach ($neededlangs as $packindex => $pack) {
-            if ($pack == 'en') {
-                continue;
-            }
-
-            // Delete old directories.
-            $dest1 = $CFG->dataroot.'/lang/'.$pack;
-            $dest2 = $CFG->dirroot.'/lang/'.$pack;
-            if (file_exists($dest1)) {
-                if (!remove_dir($dest1)) {
-                    $noticeerror[] = 'Could not delete old directory '.$dest1.', update of '.$pack
-                        .' failed, please check permissions.';
-                    unset($neededlangs[$packindex]);
-                    continue;
-                }
-            }
-            if (file_exists($dest2)) {
-                if (!remove_dir($dest2)) {
-                    $noticeerror[] = 'Could not delete old directory '.$dest2.', update of '.$pack
-                        .' failed, please check permissions.';
-                    unset($neededlangs[$packindex]);
-                    continue;
-                }
-            }
-        }
-
        try {
            $updated = $this->install_languagepacks($neededlangs, true);
        } catch (\moodle_exception $e) {
+            $this->errors[] = 'An exception occurred while installing language packs: ' . $e->getMessage();
            return false;
        }

@@ -45,6 +45,14 @@ class update_langpacks_task extends \core\task\scheduled_task {
     * Run langpack update
     */
    public function execute() {
+        global $CFG;
+
+        if (!empty($CFG->skiplangupgrade)) {
+            mtrace('Langpack update skipped. ($CFG->skiplangupgrade set)');
+
+            return;
+        }
+
        $controller = new \tool_langimport\controller();
        if ($controller->update_all_installed_languages()) {
            foreach ($controller->info as $message) {
@@ -213,11 +213,14 @@ class manager implements \core\log\manager {
     * @param string $info Additional description information
     * @param int $cm The course_module->id if there is one
     * @param int|\stdClass $user If log regards $user other than $USER
+     * @param string $ip Override the IP, should only be used for restore.
+     * @param int $time Override the log time, should only be used for restore.
     */
-    public function legacy_add_to_log($courseid, $module, $action, $url = '', $info = '', $cm = 0, $user = 0) {
+    public function legacy_add_to_log($courseid, $module, $action, $url = '', $info = '',
+                                      $cm = 0, $user = 0, $ip = null, $time = null) {
        $this->init();
        if (isset($this->stores['logstore_legacy'])) {
-            $this->stores['logstore_legacy']->legacy_add_to_log($courseid, $module, $action, $url, $info, $cm, $user);
+            $this->stores['logstore_legacy']->legacy_add_to_log($courseid, $module, $action, $url, $info, $cm, $user, $ip, $time);
        }
    }
 }
@@ -46,5 +46,8 @@ function xmldb_tool_log_upgrade($oldversion) {
    // Moodle v2.7.0 release upgrade line.
    // Put any upgrade step following this.

+    // Moodle v2.8.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -36,5 +36,8 @@ function xmldb_logstore_database_upgrade($oldversion) {
    // Moodle v2.7.0 release upgrade line.
    // Put any upgrade step following this.

+    // Moodle v2.8.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -91,19 +91,24 @@ class store implements \tool_log\log\store, \core\log\sql_select_reader {
        // Replace the query with hardcoded mappings required for core.
        list($selectwhere, $params, $sort) = self::replace_sql_legacy($selectwhere, $params, $sort);

-        $events = array();
        $records = array();

        try {
-            $records = $DB->get_records_select('log', $selectwhere, $params, $sort, '*', $limitfrom, $limitnum);
+            // A custom report + on the fly SQL rewriting = a possible exception.
+            $records = $DB->get_recordset_select('log', $selectwhere, $params, $sort, '*', $limitfrom, $limitnum);
        } catch (\moodle_exception $ex) {
            debugging("error converting legacy event data " . $ex->getMessage() . $ex->debuginfo, DEBUG_DEVELOPER);
+            return array();
        }

+        $events = array();
+
        foreach ($records as $data) {
            $events[$data->id] = \logstore_legacy\event\legacy_logged::restore_legacy($data);
        }

+        $records->close();
+
        return $events;
    }

@@ -143,8 +148,10 @@ class store implements \tool_log\log\store, \core\log\sql_select_reader {
     * @param    string $info Additional description information
     * @param    int $cm The course_module->id if there is one
     * @param    int|\stdClass $user If log regards $user other than $USER
+     * @param    string $ip Override the IP, should only be used for restore.
+     * @param    int $time Override the log time, should only be used for restore.
     */
-    public function legacy_add_to_log($courseid, $module, $action, $url, $info, $cm, $user) {
+    public function legacy_add_to_log($courseid, $module, $action, $url, $info, $cm, $user, $ip = null, $time = null) {
        // Note that this function intentionally does not follow the normal Moodle DB access idioms.
        // This is for a good reason: it is the most frequently used DB update function,
        // so it has been optimised for speed.
@@ -172,9 +179,9 @@ class store implements \tool_log\log\store, \core\log\sql_select_reader {
            }
        }

-        $remoteaddr = getremoteaddr();
+        $remoteaddr = (is_null($ip)) ? getremoteaddr() : $ip;

-        $timenow = time();
+        $timenow = (is_null($time)) ? time() : $time;
        if (!empty($url)) { // Could break doing html_entity_decode on an empty var.
            $url = html_entity_decode($url, ENT_QUOTES, 'UTF-8');
        } else {
@@ -44,11 +44,26 @@ class cleanup_task extends \core\task\scheduled_task {
    public function execute() {
        global $CFG, $DB;

-        // Delete old logs to save space (this might need a timer to slow it down...).
-        if (!empty($CFG->loglifetime)) { // Value in days.
-            $loglifetime = time(0) - ($CFG->loglifetime * 3600 * 24);
-            $DB->delete_records_select("log", "time < ?", array($loglifetime));
-            mtrace(" Deleted old legacy log records");
+        if (empty($CFG->loglifetime)) {
+            return;
        }
+
+        $loglifetime = time() - ($CFG->loglifetime * 3600 * 24); // Value in days.
+        $lifetimep = array($loglifetime);
+        $start = time();
+
+        while ($min = $DB->get_field_select("log", "MIN(time)", "time < ?", $lifetimep)) {
+            // Break this down into chunks to avoid transaction for too long and generally thrashing database.
+            // Experiments suggest deleting one day takes up to a few seconds; probably a reasonable chunk size usually.
+            // If the cleanup has just been enabled, it might take e.g a month to clean the years of logs.
+            $params = array(min($min + 3600 * 24, $loglifetime));
+            $DB->delete_records_select("log", "time < ?", $params);
+            if (time() > $start + 300) {
+                // Do not churn on log deletion for too long each run.
+                break;
+            }
+        }
+
+        mtrace(" Deleted old legacy log records");
    }
 }
@@ -28,7 +28,7 @@ $tasks = array(
    array(
        'classname' => '\logstore_legacy\task\cleanup_task',
        'blocking' => 0,
-        'minute' => '*',
+        'minute' => 'R',
        'hour' => '5',
        'day' => '*',
        'dayofweek' => '*',
@@ -273,4 +273,33 @@ class logstore_legacy_store_testcase extends advanced_testcase {
            $this->assertContains($expectedreport, $reports);
        }
    }
+
+    /**
+     * Test that the legacy log cleanup works correctly.
+     */
+    public function test_cleanup_task() {
+        global $DB;
+
+        $this->resetAfterTest();
+
+        // Create some records spread over various days; test multiple iterations in cleanup.
+        $record = (object) array('time' => time());
+        $DB->insert_record('log', $record);
+        $record->time -= 3600 * 24 * 30;
+        $DB->insert_record('log', $record);
+        $record->time -= 3600 * 24 * 30;
+        $DB->insert_record('log', $record);
+        $record->time -= 3600 * 24 * 30;
+        $DB->insert_record('log', $record);
+        $this->assertEquals(4, $DB->count_records('log'));
+
+        // Remove all logs before "today".
+        set_config('loglifetime', 1);
+
+        $this->expectOutputString(" Deleted old legacy log records\n");
+        $clean = new \logstore_legacy\task\cleanup_task();
+        $clean->execute();
+
+        $this->assertEquals(1, $DB->count_records('log'));
+    }
 }
@@ -24,6 +24,6 @@

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

-$plugin->version = 2014111000; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version = 2014111001; // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires = 2014110400; // Requires this Moodle version.
 $plugin->component = 'logstore_legacy'; // Full name of the plugin (used for diagnostics).
@@ -72,7 +72,7 @@ class store implements \tool_log\log\writer, \core\log\sql_internal_reader {
        $sort = self::tweak_sort_by_id($sort);

        $events = array();
-        $records = $DB->get_records_select('logstore_standard_log', $selectwhere, $params, $sort, '*', $limitfrom, $limitnum);
+        $records = $DB->get_recordset_select('logstore_standard_log', $selectwhere, $params, $sort, '*', $limitfrom, $limitnum);

        foreach ($records as $data) {
            $extra = array('origin' => $data->origin, 'ip' => $data->ip, 'realuserid' => $data->realuserid);
@@ -94,6 +94,8 @@ class store implements \tool_log\log\writer, \core\log\sql_internal_reader {
            }
        }

+        $records->close();
+
        return $events;
    }

@@ -43,12 +43,29 @@ class cleanup_task extends \core\task\scheduled_task {
     */
    public function execute() {
        global $DB;
+
        $loglifetime = (int)get_config('logstore_standard', 'loglifetime');

-        if ($loglifetime > 0) {
-            $loglifetime = time() - ($loglifetime * 3600 * 24); // Value in days.
-            $DB->delete_records_select("logstore_standard_log", "timecreated < ?", array($loglifetime));
-            mtrace(" Deleted old log records from standard store.");
+        if (empty($loglifetime) || $loglifetime < 0) {
+            return;
        }
+
+        $loglifetime = time() - ($loglifetime * 3600 * 24); // Value in days.
+        $lifetimep = array($loglifetime);
+        $start = time();
+
+        while ($min = $DB->get_field_select("logstore_standard_log", "MIN(timecreated)", "timecreated < ?", $lifetimep)) {
+            // Break this down into chunks to avoid transaction for too long and generally thrashing database.
+            // Experiments suggest deleting one day takes up to a few seconds; probably a reasonable chunk size usually.
+            // If the cleanup has just been enabled, it might take e.g a month to clean the years of logs.
+            $params = array(min($min + 3600 * 24, $loglifetime));
+            $DB->delete_records_select("logstore_standard_log", "timecreated < ?", $params);
+            if (time() > $start + 300) {
+                // Do not churn on log deletion for too long each run.
+                break;
+            }
+        }
+
+        mtrace(" Deleted old log records from standard store.");
    }
 }
@@ -28,7 +28,7 @@ $tasks = array(
    array(
        'classname' => '\logstore_standard\task\cleanup_task',
        'blocking' => 0,
-        'minute' => '*',
+        'minute' => 'R',
        'hour' => '4',
        'day' => '*',
        'dayofweek' => '*',
@@ -114,5 +114,8 @@ function xmldb_logstore_standard_upgrade($oldversion) {
    // Moodle v2.7.0 release upgrade line.
    // Put any upgrade step following this.

+    // Moodle v2.8.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -218,4 +218,41 @@ class logstore_standard_store_testcase extends advanced_testcase {
            $this->assertContains($expectedreport, $reports);
        }
    }
+
+    /**
+     * Test that the standard log cleanup works correctly.
+     */
+    public function test_cleanup_task() {
+        global $DB;
+
+        $this->resetAfterTest();
+
+        // Create some records spread over various days; test multiple iterations in cleanup.
+        $ctx = context_course::instance(1);
+        $record = (object) array(
+            'edulevel' => 0,
+            'contextid' => $ctx->id,
+            'contextlevel' => $ctx->contextlevel,
+            'contextinstanceid' => $ctx->instanceid,
+            'userid' => 1,
+            'timecreated' => time(),
+        );
+        $DB->insert_record('logstore_standard_log', $record);
+        $record->timecreated -= 3600 * 24 * 30;
+        $DB->insert_record('logstore_standard_log', $record);
+        $record->timecreated -= 3600 * 24 * 30;
+        $DB->insert_record('logstore_standard_log', $record);
+        $record->timecreated -= 3600 * 24 * 30;
+        $DB->insert_record('logstore_standard_log', $record);
+        $this->assertEquals(4, $DB->count_records('logstore_standard_log'));
+
+        // Remove all logs before "today".
+        set_config('loglifetime', 1, 'logstore_standard');
+
+        $this->expectOutputString(" Deleted old log records from standard store.\n");
+        $clean = new \logstore_standard\task\cleanup_task();
+        $clean->execute();
+
+        $this->assertEquals(1, $DB->count_records('logstore_standard_log'));
+    }
 }
@@ -24,6 +24,6 @@

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

-$plugin->version = 2014111000; // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version = 2014111001; // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires = 2014110400; // Requires this Moodle version.
 $plugin->component = 'logstore_standard'; // Full name of the plugin (used for diagnostics).
@@ -62,15 +62,24 @@ class tool_messageinbound_edit_handler_form extends moodleform {
        // Items which can be configured.
        $mform->addElement('header', 'configuration', get_string('configuration'));

-        $options = array(
-            HOURSECS => get_string('onehour', 'tool_messageinbound'),
-            DAYSECS => get_string('oneday', 'tool_messageinbound'),
-            WEEKSECS => get_string('oneweek', 'tool_messageinbound'),
-            YEARSECS => get_string('oneyear', 'tool_messageinbound'),
-            0 => get_string('noexpiry', 'tool_messageinbound'),
-        );
-        $mform->addElement('select', 'defaultexpiration', get_string('defaultexpiration', 'tool_messageinbound'), $options);
-        $mform->addHelpButton('defaultexpiration', 'defaultexpiration', 'tool_messageinbound');
+        if ($handler->can_change_defaultexpiration()) {
+            // Show option to change expiry only if the handler supports it.
+            $options = array(
+                HOURSECS => get_string('onehour', 'tool_messageinbound'),
+                DAYSECS => get_string('oneday', 'tool_messageinbound'),
+                WEEKSECS => get_string('oneweek', 'tool_messageinbound'),
+                YEARSECS => get_string('oneyear', 'tool_messageinbound'),
+                0 => get_string('noexpiry', 'tool_messageinbound'),
+            );
+            $mform->addElement('select', 'defaultexpiration', get_string('defaultexpiration', 'tool_messageinbound'), $options);
+            $mform->addHelpButton('defaultexpiration', 'defaultexpiration', 'tool_messageinbound');
+        } else {
+            $text = $this->get_defaultexpiration_text($handler);
+            $mform->addElement('static', 'defaultexpiration_fake', get_string('defaultexpiration', 'tool_messageinbound'), $text);
+            $mform->addElement('hidden', 'defaultexpiration');
+            $mform->addHelpButton('defaultexpiration_fake', 'defaultexpiration', 'tool_messageinbound');
+            $mform->setType('defaultexpiration', PARAM_INT);
+        }

        if ($handler->can_change_validateaddress()) {
            $mform->addElement('checkbox', 'validateaddress', get_string('requirevalidation', 'tool_messageinbound'));
@@ -103,4 +112,28 @@ class tool_messageinbound_edit_handler_form extends moodleform {

        $this->add_action_buttons(true, get_string('savechanges'));
    }
+
+    /**
+     * Return a text string representing the selected default expiration for the handler.
+     *
+     * @param \core\message\inbound\handler $handler handler instance.
+     *
+     * @return string localised text string.
+     */
+    protected function get_defaultexpiration_text(\core\message\inbound\handler $handler) {
+        switch($handler->defaultexpiration) {
+            case HOURSECS :
+                    return get_string('onehour', 'tool_messageinbound');
+            case DAYSECS :
+                    return get_string('oneday', 'tool_messageinbound');
+            case WEEKSECS :
+                    return get_string('oneweek', 'tool_messageinbound');
+            case YEARSECS :
+                    return get_string('oneyear', 'tool_messageinbound');
+            case 0:
+                    return get_string('noexpiry', 'tool_messageinbound');
+            default:
+                    return ''; // Should never happen.
+        }
+    }
 }
@@ -102,6 +102,10 @@ class manager {
        try {
            $this->client->login();
            mtrace("Connection established.");
+
+            // Ensure that mailboxes exist.
+            $this->ensure_mailboxes_exist();
+
            return true;

        } catch (\Horde_Imap_Client_Exception $e) {
@@ -291,6 +295,11 @@ class manager {
        // First flag this message to prevent another running hitting this message while we look at the headers.
        $this->add_flag_to_message($messageid, self::MESSAGE_FLAGGED);

+        if ($this->is_bulk_message($message, $messageid)) {
+            mtrace("- The message has a bulk header set. This is likely an auto-generated reply - discarding.");
+            return;
+        }
+
        // Record the user that this script is currently being run as.  This is important when re-processing existing
        // messages, as cron_setup_user is called multiple times.
        $originaluser = $USER;
@@ -363,7 +372,10 @@ class manager {

            // Process and retrieve the message data for this message.
            // This includes fetching the full content, as well as all headers, and attachments.
-            $this->process_message_data($envelope, $messagedata, $messageid);
+            if (!$this->process_message_data($envelope, $messagedata, $messageid)) {
+                mtrace("--- Message could not be found on the server. Is another process removing messages?");
+                return;
+            }

            // When processing validation replies, we need to skip the sender verification phase as this has been
            // manually completed.
@@ -403,7 +415,7 @@ class manager {
                mtrace("-- Returning to the original user.");
                cron_setup_user($originaluser);
                return;
-            } catch (Exception $e) {
+            } catch (\Exception $e) {
                // An unknown error occurred. The user is not informed, but the administrator is.
                mtrace("-- Message processing failed. An unexpected exception was thrown. Details follow.");
                mtrace($e->getMessage());
@@ -457,36 +469,25 @@ class manager {
        $query = new \Horde_Imap_Client_Fetch_Query();
        $query->imapDate();

-        // Fetch all of the message parts too.
-        $typemap = $structure->contentTypeMap();
-        foreach ($typemap as $part => $type) {
-            // The header.
-            $query->headerText(array(
-                'id' => $part,
-            ));
-        }
+        // Fetch the message header.
+        $query->headerText();

+        // Retrieve the message with the above components.
        $messagedata = $this->client->fetch($mailbox, $query, array('ids' => $messageid))->first();

-        // Store the data for this message.
-        $headers = '';
-
-        foreach ($typemap as $part => $type) {
-            // Grab all of the header data into a string.
-            $headers .= $messagedata->getHeaderText($part);
-
-            // We don't handle any of the other MIME content at this stage.
+        if (!$messagedata) {
+            // Message was not found! Somehow it has been removed or is no longer returned.
+            return null;
        }

-        $data = new \stdClass();
-
        // The message ID should always be in the first part.
+        $data = new \stdClass();
        $data->messageid = $messagedata->getHeaderText(0, \Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->getValue('Message-ID');
        $data->subject = $envelope->subject;
        $data->timestamp = $messagedata->getImapDate()->__toString();
        $data->envelope = $envelope;
        $data->data = $this->addressmanager->get_data();
-        $data->headers = $headers;
+        $data->headers = $messagedata->getHeaderText();

        $this->currentmessagedata = $data;

@@ -496,9 +497,8 @@ class manager {
    /**
     * Process a message again to add body and attachment data.
     *
-     * @param Horde_Imap_Client_Data_Envelope $envelope The Envelope of the message
-     * @param Horde_Imap_Client_Data_Fetch $basemessagedata The structure and part of the message body
-     * @param string|Horde_Imap_Client_Ids $messageid The Hore message Uid
+     * @param \Horde_Imap_Client_Data_Fetch $basemessagedata The structure and part of the message body
+     * @param string|\Horde_Imap_Client_Ids $messageid The Hore message Uid
     * @return \stdClass The current value of the messagedata
     */
    private function process_message_data_body(
@@ -616,6 +616,9 @@ class manager {
    private function process_message_part_attachment($messagedata, $partdata, $part, $filename) {
        global $CFG;

+        // For Antivirus, the repository/lib.php must be included as it is not autoloaded.
+        require_once($CFG->dirroot . '/repository/lib.php');
+
        // If a filename is present, assume that this part is an attachment.
        $attachment = new \stdClass();
        $attachment->filename       = $filename;
@@ -647,7 +650,7 @@ class manager {
            // Perform a virus scan now.
            try {
                \repository::antivir_scan_file($filepath, $attachment->filename, true);
-            } catch (moodle_exception $e) {
+            } catch (\moodle_exception $e) {
                mtrace("--> A virus was found in the attachment '{$attachment->filename}'.");
                $this->inform_attachment_virus();
                return;
@@ -736,6 +739,64 @@ class manager {
        return in_array($flag, $flags);
    }

+    /**
+     * Ensure that all mailboxes exist.
+     */
+    private function ensure_mailboxes_exist() {
+        $requiredmailboxes = array(
+            self::MAILBOX,
+            self::CONFIRMATIONFOLDER,
+        );
+
+        $existingmailboxes = $this->client->listMailboxes($requiredmailboxes);
+        foreach ($requiredmailboxes as $mailbox) {
+            if (isset($existingmailboxes[$mailbox])) {
+                // This mailbox was found.
+                continue;
+            }
+
+            mtrace("Unable to find the '{$mailbox}' mailbox - creating it.");
+            $this->client->createMailbox($mailbox);
+        }
+    }
+
+    /**
+     * Attempt to determine whether this message is a bulk message (e.g. automated reply).
+     *
+     * @param \Horde_Imap_Client_Data_Fetch $message The message to process
+     * @param string|\Horde_Imap_Client_Ids $messageid The Hore message Uid
+     * @return boolean
+     */
+    private function is_bulk_message(
+            \Horde_Imap_Client_Data_Fetch $message,
+            $messageid) {
+        $query = new \Horde_Imap_Client_Fetch_Query();
+        $query->headerText(array('peek' => true));
+
+        $messagedata = $this->client->fetch($this->get_mailbox(), $query, array('ids' => $messageid))->first();
+
+        // Assume that this message is not bulk to begin with.
+        $isbulk = false;
+
+        // An auto-reply may itself include the Bulk Precedence.
+        $precedence = $messagedata->getHeaderText(0, \Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->getValue('Precedence');
+        $isbulk = $isbulk || strtolower($precedence) == 'bulk';
+
+        // If the X-Autoreply header is set, and not 'no', then this is an automatic reply.
+        $autoreply = $messagedata->getHeaderText(0, \Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->getValue('X-Autoreply');
+        $isbulk = $isbulk || ($autoreply && $autoreply != 'no');
+
+        // If the X-Autorespond header is set, and not 'no', then this is an automatic response.
+        $autorespond = $messagedata->getHeaderText(0, \Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->getValue('X-Autorespond');
+        $isbulk = $isbulk || ($autorespond && $autorespond != 'no');
+
+        // If the Auto-Submitted header is set, and not 'no', then this is a non-human response.
+        $autosubmitted = $messagedata->getHeaderText(0, \Horde_Imap_Client_Data_Fetch::HEADER_PARSE)->getValue('Auto-Submitted');
+        $isbulk = $isbulk || ($autosubmitted && $autosubmitted != 'no');
+
+        return $isbulk;
+    }
+
    /**
     * Send the message to the appropriate handler.
     *
@@ -758,7 +819,7 @@ class manager {
            $error->message     = $e->getMessage();
            throw new \core\message\inbound\processing_failed_exception('messageprocessingfailed', 'tool_messageinbound', $error);

-        } catch (Exception $e) {
+        } catch (\Exception $e) {
            mtrace("-> The Inbound Message handler threw an exception. Unable to process this message. User informed.");
            mtrace("--> " . $e->getMessage());
            // An unknown error occurred. Still inform the user but, this time do not include the specific
@@ -46,7 +46,7 @@ class invalid_recipient_handler extends \core\message\inbound\handler {
    /**
     * Do not allow changes to the address validation setting.
     */
-    public function allow_validateaddress_change() {
+    public function can_change_validateaddress() {
        return false;
    }

@@ -58,8 +58,11 @@ if (empty($classname)) {
    if ($mform->is_cancelled()) {
        redirect($PAGE->url);
    } else if ($data = $mform->get_data()) {
+
        // Update the record from the form.
-        $record->defaultexpiration = (int) $data->defaultexpiration;
+        if ($handler->can_change_defaultexpiration()) {
+            $record->defaultexpiration = (int) $data->defaultexpiration;
+        }

        if ($handler->can_change_validateaddress()) {
            $record->validateaddress = !empty($data->validateaddress);
@@ -41,9 +41,9 @@ if ($hassiteconfig) {
    $settings->add(new admin_setting_heading('messageinbound_mailboxconfiguration',
            new lang_string('mailboxconfiguration', 'tool_messageinbound'),
            new lang_string('messageinboundmailboxconfiguration_desc', 'tool_messageinbound'), ''));
-    $settings->add(new admin_setting_configtext('messageinbound_mailbox',
+    $settings->add(new admin_setting_configtext_with_maxlength('messageinbound_mailbox',
            new lang_string('mailbox', 'tool_messageinbound'),
-            null, '', PARAM_RAW));
+            null, '', PARAM_RAW, null, 15));
    $settings->add(new admin_setting_configtext('messageinbound_domain',
            new lang_string('domain', 'tool_messageinbound'),
            null, '', PARAM_RAW));
@@ -164,29 +164,32 @@ class renderable extends \table_sql implements \renderable {
     */
    public function col_manage(\tool_monitor\rule $rule) {
        global $OUTPUT, $CFG;
+
        $manage = '';
-        // We don't need to check for capability at course level since, user is never shown this page,
-        // if he doesn't have the capability.
+
+        // Do not allow the user to edit the rule unless they have the system capability, or we are viewing the rules
+        // for a course, and not the site. Note - we don't need to check for the capability at a course level since
+        // the user is never shown this page otherwise.
        if ($this->hassystemcap || ($rule->courseid != 0)) {
-            // There might be site rules which the user can not manage.
            $editurl = new \moodle_url($CFG->wwwroot. '/admin/tool/monitor/edit.php', array('ruleid' => $rule->id,
                    'courseid' => $rule->courseid, 'sesskey' => sesskey()));
-            $copyurl = new \moodle_url($CFG->wwwroot. '/admin/tool/monitor/managerules.php',
-                    array('ruleid' => $rule->id, 'action' => 'copy', 'courseid' => $this->courseid, 'sesskey' => sesskey()));
-            $deleteurl = new \moodle_url($CFG->wwwroot. '/admin/tool/monitor/managerules.php', array('ruleid' => $rule->id,
-                    'action' => 'delete', 'courseid' => $rule->courseid, 'sesskey' => sesskey()));
-
            $icon = $OUTPUT->render(new \pix_icon('t/edit', get_string('editrule', 'tool_monitor')));
            $manage .= \html_writer::link($editurl, $icon, array('class' => 'action-icon'));
+        }

-            $icon = $OUTPUT->render(new \pix_icon('t/copy', get_string('duplicaterule', 'tool_monitor')));
-            $manage .= \html_writer::link($copyurl, $icon, array('class' => 'action-icon'));
+        // The user should always be able to copy the rule if they are able to view the page.
+        $copyurl = new \moodle_url($CFG->wwwroot. '/admin/tool/monitor/managerules.php',
+                array('ruleid' => $rule->id, 'action' => 'copy', 'courseid' => $this->courseid, 'sesskey' => sesskey()));
+        $icon = $OUTPUT->render(new \pix_icon('t/copy', get_string('duplicaterule', 'tool_monitor')));
+        $manage .= \html_writer::link($copyurl, $icon, array('class' => 'action-icon'));

+        if ($this->hassystemcap || ($rule->courseid != 0)) {
+            $deleteurl = new \moodle_url($CFG->wwwroot. '/admin/tool/monitor/managerules.php', array('ruleid' => $rule->id,
+                    'action' => 'delete', 'courseid' => $rule->courseid, 'sesskey' => sesskey()));
            $icon = $OUTPUT->render(new \pix_icon('t/delete', get_string('deleterule', 'tool_monitor')));
            $manage .= \html_writer::link($deleteurl, $icon, array('class' => 'action-icon'));
-        } else {
-            $manage = get_string('nopermission', 'tool_monitor');
        }
+
        return $manage;
    }

@@ -215,7 +215,10 @@ class rules extends \table_sql implements \renderable {
            return false;
        }
        $orderby = 'visible DESC, sortorder ASC';
-        $options = array(0 => get_string('site'));
+        $options = array();
+        if (has_capability('tool/monitor:subscribe', \context_system::instance())) {
+            $options[0] = get_string('site');
+        }
        if ($courses = get_user_capability_course('tool/monitor:subscribe', null, true, 'fullname', $orderby)) {
            foreach ($courses as $course) {
                $options[$course->id] = format_string($course->fullname, true,
@@ -223,7 +226,7 @@ class rules extends \table_sql implements \renderable {
            }
        }
        $url = new \moodle_url('/admin/tool/monitor/index.php');
-        $select = new \single_select($url, 'courseid', $options, $this->courseid);
+        $select = new \single_select($url, 'courseid', $options, $this->courseid, array());
        $select->set_label(get_string('selectacourse', 'tool_monitor'));
        return $select;
    }
@@ -50,5 +50,8 @@ function xmldb_tool_monitor_upgrade($oldversion) {
        upgrade_plugin_savepoint(true, 2014102000, 'tool', 'monitor');
    }

+    // Moodle v2.8.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -35,6 +35,7 @@ $confirm = optional_param('confirm', false, PARAM_BOOL);
 // Validate course id.
 if (empty($courseid)) {
    require_login();
+    require_capability('tool/monitor:subscribe', context_system::instance());
 } else {
    // They might want to see rules for this course.
    $course = get_course($courseid);
@@ -78,13 +78,14 @@ if (!empty($action) && $ruleid) {

    echo $OUTPUT->header();
    $rule = \tool_monitor\rule_manager::get_rule($rule);
-    if ($rule->can_manage_rule()) {
-        switch ($action) {
-            case 'copy' :
-                $rule->duplicate_rule($courseid);
-                echo $OUTPUT->notification(get_string('rulecopysuccess', 'tool_monitor'), 'notifysuccess');
-                break;
-            case 'delete' :
+    switch ($action) {
+        case 'copy':
+            // No need to check for capability here as it is done at the start of the page.
+            $rule->duplicate_rule($courseid);
+            echo $OUTPUT->notification(get_string('rulecopysuccess', 'tool_monitor'), 'notifysuccess');
+            break;
+        case 'delete':
+            if ($rule->can_manage_rule()) {
                $confirmurl = new moodle_url($CFG->wwwroot. '/admin/tool/monitor/managerules.php',
                    array('ruleid' => $ruleid, 'courseid' => $courseid, 'action' => 'delete',
                        'confirm' => true, 'sesskey' => sesskey()));
@@ -103,12 +104,12 @@ if (!empty($action) && $ruleid) {
                    echo $OUTPUT->footer();
                    exit();
                }
-                break;
-            default:
-        }
-    } else {
-        // User doesn't have permissions. Should never happen for real users.
-        throw new moodle_exception('rulenopermissions', 'tool_monitor', $manageurl, $action);
+            } else {
+                // User doesn't have permissions. Should never happen for real users.
+                throw new moodle_exception('rulenopermissions', 'tool_monitor', $manageurl, $action);
+            }
+            break;
+        default:
    }
 } else {
    echo $OUTPUT->header();
@@ -10,7 +10,7 @@ Feature: tool_monitor_rule
      | Course 1 | C1        |
    And the following "users" exist:
      | username | firstname | lastname | email |
-      | teacher1 | Teacher | 1 | teacher1@asd.com |
+      | teacher1 | Teacher | 1 | teacher1@example.com |
    And the following "course enrolments" exist:
      | user | course | role |
      | teacher1 | C1 | editingteacher |
@@ -97,7 +97,7 @@ Feature: tool_monitor_rule
    Given I log in as "teacher1"
    And I follow "Course 1"
    And I navigate to "Event monitoring rules" node in "Course administration > Reports"
-    When I click on "Duplicate rule" "link"
+    When I click on "Duplicate rule" "link" in the "New rule course level" "table_row"
    Then I should see "Rule successfully duplicated"
    And "#toolmonitorrules_r1" "css_element" should appear before "#toolmonitorrules_r2" "css_element"
    And I should see "New rule"
@@ -153,9 +153,10 @@ Feature: tool_monitor_rule
    And I should see "5 time(s) in 5 minute(s)"

  Scenario: Duplicate a rule on site level
-    Given I log in as "admin"
-    And I navigate to "Event monitoring rules" node in "Site administration > Reports"
-    When I click on "Duplicate rule" "link"
+    Given I log in as "teacher1"
+    And I follow "Course 1"
+    And I navigate to "Event monitoring rules" node in "Course administration > Reports"
+    When I click on "Duplicate rule" "link" in the "New rule site level" "table_row"
    Then I should see "Rule successfully duplicated"
    And "#toolmonitorrules_r2" "css_element" should appear after "#toolmonitorrules_r1" "css_element"
    And I should see "I want a rule to monitor posts created on a forum"
@@ -11,8 +11,8 @@ Feature: tool_monitor_subscriptions
      | Course 2 | C2        |
    And the following "users" exist:
      | username | firstname | lastname | email |
-      | teacher1 | Teacher | 1 | teacher1@asd.com |
-      | teacher2 | Teacher | 2 | teacher2@asd.com |
+      | teacher1 | Teacher | 1 | teacher1@example.com |
+      | teacher2 | Teacher | 2 | teacher2@example.com |
    And the following "course enrolments" exist:
      | user | course | role |
      | teacher1 | C1 | editingteacher |
@@ -150,8 +150,6 @@ Feature: tool_monitor_subscriptions
    And I should see "You can subscribe to rules from the Event monitoring page."
    And I click on "//a[text()='Event monitoring']" "xpath_element"
    And the field "courseid" matches value "Course 1"
-    And I set the field "courseid" to "Site"
-    And I should not see "You can manage rules from the Event monitoring rules page."
    And I log out
    And I log in as "teacher2"
    And I follow "Course 1"
@@ -404,12 +404,11 @@ class tool_monitor_eventobservers_testcase extends advanced_testcase {
     * Run adhoc tasks.
     */
    protected function run_adhock_tasks() {
-        ob_start();
        while ($task = \core\task\manager::get_next_adhoc_task(time())) {
            $task->execute();
            \core\task\manager::adhoc_task_complete($task);
        }
-        ob_clean(); // Suppress mtrace debugging info.
+        $this->expectOutputRegex("/^Sending message to the user with id \d+ for the subscription with id \d+\.\.\..Sent./ms");
    }

    /**
@@ -26,7 +26,7 @@
 $string['cannotfit'] = 'The replacement is longer than original and shortening is not allow, cannot continue.';
 $string['disclaimer'] = 'I understand the risks of this operation';
 $string['doit'] = 'Yes, do it!';
-$string['excludedtables'] = 'Several tables are not updated as part of the text replacement. This include configuration, log, events, and session tables.';
+$string['excludedtables'] = 'Several tables are not updated as part of the text replacement. These include configuration, log, events, and session tables.';
 $string['pageheader'] = 'Search and replace text throughout the whole database';
 $string['notifyfinished'] = '...finished';
 $string['notifyrebuilding'] = 'Rebuilding course cache...';
@@ -38,10 +38,15 @@ class tool_task_edit_scheduled_task_form extends moodleform {
        /** @var \core\task\scheduled_task $task */
        $task = $this->_customdata;

+        $plugininfo = core_plugin_manager::instance()->get_plugin_info($task->get_component());
+        $plugindisabled = $plugininfo && $plugininfo->is_enabled() === false && !$task->get_run_if_component_disabled();
+
        $lastrun = $task->get_last_run_time() ? userdate($task->get_last_run_time()) : get_string('never');
        $nextrun = $task->get_next_run_time();
-        if ($task->get_disabled()) {
-            $nextrun = get_string('disabled', 'tool_task');
+        if ($plugindisabled) {
+            $nextrun = get_string('plugindisabled', 'tool_task');
+        } else if ($task->get_disabled()) {
+            $nextrun = get_string('taskdisabled', 'tool_task');
        } else if ($nextrun > time()) {
            $nextrun = userdate($nextrun);
        } else {
@@ -92,5 +97,63 @@ class tool_task_edit_scheduled_task_form extends moodleform {
        // Do not use defaults for existing values, the set_data() is the correct way.
        $this->set_data(\core\task\manager::record_from_scheduled_task($task));
    }
+
+    /**
+     * Custom validations.
+     *
+     * @param array $data
+     * @param array $files
+     *
+     * @return array
+     */
+    public function validation($data, $files) {
+        $error = parent::validation($data, $files);
+        $fields = array('minute', 'hour', 'day', 'month', 'dayofweek');
+        foreach ($fields as $field) {
+            if (!self::validate_fields($field, $data[$field])) {
+                $error[$field] = get_string('invaliddata', 'core_error');
+            }
+        }
+        return $error;
+    }
+
+    /**
+     * Helper function that validates the submitted data.
+     *
+     * Explanation of the regex:-
+     *
+     * \A\*\z - matches *
+     * \A[0-5]?[0-9]\z - matches entries like 23
+     * \A\*\/[0-5]?[0-9]\z - matches entries like * / 5
+     * \A[0-5]?[0-9](,[0-5]?[0-9])*\z - matches entries like 1,2,3
+     * \A[0-5]?[0-9]-[0-5]?[0-9]\z - matches entries like 2-10
+     *
+     * @param string $field field to validate
+     * @param string $value value
+     *
+     * @return bool true if validation passes, false other wise.
+     */
+    public static function validate_fields($field, $value) {
+        switch ($field) {
+            case 'minute' :
+            case 'hour' :
+                $regex = "/\A\*\z|\A[0-5]?[0-9]\z|\A\*\/[0-5]?[0-9]\z|\A[0-5]?[0-9](,[0-5]?[0-9])*\z|\A[0-5]?[0-9]-[0-5]?[0-9]\z/";
+                break;
+            case 'day':
+                $regex = "/\A\*\z|\A([1-2]?[0-9]|3[0-1])\z|\A\*\/([1-2]?[0-9]|3[0-1])\z|";
+                $regex .= "\A([1-2]?[0-9]|3[0-1])(,([1-2]?[0-9]|3[0-1]))*\z|\A([1-2]?[0-9]|3[0-1])-([1-2]?[0-9]|3[0-1])\z/";
+                break;
+            case 'month':
+                $regex = "/\A\*\z|\A([0-9]|1[0-2])\z|\A\*\/([0-9]|1[0-2])\z|\A([0-9]|1[0-2])(,([0-9]|1[0-2]))*\z|";
+                $regex .= "\A([0-9]|1[0-2])-([0-9]|1[0-2])\z/";
+                break;
+            case 'dayofweek':
+                $regex = "/\A\*\z|\A[0-6]\z|\A\*\/[0-6]\z|\A[0-6](,[0-6])*\z|\A[0-6]-[0-6]\z/";
+                break;
+            default:
+                return false;
+        }
+        return (bool)preg_match($regex, $value);
+    }
 }

@@ -72,8 +72,13 @@ if ($options['list']) {
            . $task->get_day_of_week();
        $nextrun = $task->get_next_run_time();

-        if ($task->get_disabled()) {
-            $nextrun = get_string('disabled', 'tool_task');
+        $plugininfo = core_plugin_manager::instance()->get_plugin_info($task->get_component());
+        $plugindisabled = $plugininfo && $plugininfo->is_enabled() === false && !$task->get_run_if_component_disabled();
+
+        if ($plugindisabled) {
+            $nextrun = get_string('plugindisabled', 'tool_task');
+        } else if ($task->get_disabled()) {
+            $nextrun = get_string('taskdisabled', 'tool_task');
        } else if ($nextrun > time()) {
            $nextrun = userdate($nextrun);
        } else {
@@ -104,25 +109,30 @@ if ($execute = $options['execute']) {

    $predbqueries = $DB->perf_get_queries();
    $pretime = microtime(true);
+
+    mtrace("Scheduled task: " . $task->get_name());
+    // NOTE: it would be tricky to move this code to \core\task\manager class,
+    //       because we want to do detailed error reporting.
+    $cronlockfactory = \core\lock\lock_config::get_lock_factory('cron');
+    if (!$cronlock = $cronlockfactory->get_lock('core_cron', 10)) {
+        mtrace('Cannot obtain cron lock');
+        exit(129);
+    }
+    if (!$lock = $cronlockfactory->get_lock('\\' . get_class($task), 10)) {
+        $cronlock->release();
+        mtrace('Cannot obtain task lock');
+        exit(130);
+    }
+
+    $task->set_lock($lock);
+    if (!$task->is_blocking()) {
+        $cronlock->release();
+    } else {
+        $task->set_cron_lock($cronlock);
+    }
+
    try {
-        mtrace("Scheduled task: " . $task->get_name());
-        // NOTE: it would be tricky to move this code to \core\task\manager class,
-        //       because we want to do detailed error reporting.
-        $cronlockfactory = \core\lock\lock_config::get_lock_factory('cron');
-        if (!$cronlock = $cronlockfactory->get_lock('core_cron', 10)) {
-            mtrace('Cannot obtain cron lock');
-            exit(129);
-        }
-        if (!$lock = $cronlockfactory->get_lock('\\' . get_class($task), 10)) {
-            mtrace('Cannot obtain task lock');
-            exit(130);
-        }
-        $task->set_lock($lock);
-        if (!$task->is_blocking()) {
-            $cronlock->release();
-        } else {
-            $task->set_cron_lock($cronlock);
-        }
+        get_mailer('buffer');
        $task->execute();
        if (isset($predbqueries)) {
            mtrace("... used " . ($DB->perf_get_queries() - $predbqueries) . " dbqueries");
@@ -130,6 +140,7 @@ if ($execute = $options['execute']) {
        }
        mtrace("Task completed.");
        \core\task\manager::scheduled_task_complete($task);
+        get_mailer('close');
        exit(0);
    } catch (Exception $e) {
        if ($DB->is_transaction_started()) {
@@ -138,7 +149,16 @@ if ($execute = $options['execute']) {
        mtrace("... used " . ($DB->perf_get_queries() - $predbqueries) . " dbqueries");
        mtrace("... used " . (microtime(true) - $pretime) . " seconds");
        mtrace("Task failed: " . $e->getMessage());
+        if ($CFG->debugdeveloper) {
+            if (!empty($e->debuginfo)) {
+                mtrace("Debug info:");
+                mtrace($e->debuginfo);
+            }
+            mtrace("Backtrace:");
+            mtrace(format_backtrace($e->getTrace(), true));
+        }
        \core\task\manager::scheduled_task_failed($task);
+        get_mailer('close');
        exit(1);
    }
 }
@@ -33,11 +33,13 @@ $string['edittaskschedule'] = 'Edit task schedule: {$a}';
 $string['faildelay'] = 'Fail delay';
 $string['lastruntime'] = 'Last run';
 $string['nextruntime'] = 'Next run';
+$string['plugindisabled'] = 'Plugin disabled';
 $string['pluginname'] = 'Scheduled task configuration';
 $string['resettasktodefaults'] = 'Reset task schedule to defaults';
 $string['resettasktodefaults_help'] = 'This will discard any local changes and revert the schedule for this task back to its original settings.';
 $string['scheduledtasks'] = 'Scheduled tasks';
 $string['scheduledtaskchangesdisabled'] = 'Modifications to the list of scheduled tasks have been prevented in Moodle configuration';
+$string['taskdisabled'] = 'Task disabled';
 $string['taskscheduleday'] = 'Day';
 $string['taskscheduleday_help'] = 'Day of month field for task schedule. The field uses the same format as unix cron. Some examples are:<br/><ul><li><strong>*</strong> Every day</li><li><strong>*/2</strong> Every 2nd day</li><li><strong>1</strong> The first of every month</li><li><strong>1,15</strong> The first and fifteenth of every month</li></ul>';
 $string['taskscheduledayofweek'] = 'Day of week';
@@ -60,18 +60,10 @@ class tool_task_renderer extends plugin_renderer_base {
        $no = get_string('no');
        $never = get_string('never');
        $asap = get_string('asap', 'tool_task');
-        $disabled = get_string('disabled', 'tool_task');
+        $disabledstr = get_string('taskdisabled', 'tool_task');
+        $plugindisabledstr = get_string('plugindisabled', 'tool_task');
        foreach ($tasks as $task) {
            $customised = $task->is_customised() ? $no : $yes;
-            $lastrun = $task->get_last_run_time() ? userdate($task->get_last_run_time()) : $never;
-            $nextrun = $task->get_next_run_time();
-            if ($task->get_disabled()) {
-                $nextrun = $disabled;
-            } else if ($nextrun > time()) {
-                $nextrun = userdate($nextrun);
-            } else {
-                $nextrun = $asap;
-            }
            if (empty($CFG->preventscheduledtaskchanges)) {
                $configureurl = new moodle_url('/admin/tool/task/scheduledtasks.php', array('action'=>'edit', 'task' => get_class($task)));
                $editlink = $this->action_icon($configureurl, new pix_icon('t/edit', get_string('edittaskschedule', 'tool_task', $task->get_name())));
@@ -83,6 +75,7 @@ class tool_task_renderer extends plugin_renderer_base {
            $namecell->header = true;

            $component = $task->get_component();
+            $plugininfo = null;
            list($type, $plugin) = core_component::normalize_component($component);
            if ($type === 'core') {
                $componentcell = new html_table_cell(get_string('corecomponent', 'tool_task'));
@@ -95,6 +88,21 @@ class tool_task_renderer extends plugin_renderer_base {
                }
            }

+            $lastrun = $task->get_last_run_time() ? userdate($task->get_last_run_time()) : $never;
+            $nextrun = $task->get_next_run_time();
+            $disabled = false;
+            if ($plugininfo && $plugininfo->is_enabled() === false && !$task->get_run_if_component_disabled()) {
+                $disabled = true;
+                $nextrun = $plugindisabledstr;
+            } else if ($task->get_disabled()) {
+                $disabled = true;
+                $nextrun = $disabledstr;
+            } else if ($nextrun > time()) {
+                $nextrun = userdate($nextrun);
+            } else {
+                $nextrun = $asap;
+            }
+
            $row = new html_table_row(array(
                        $namecell,
                        $componentcell,
@@ -109,7 +117,7 @@ class tool_task_renderer extends plugin_renderer_base {
                        new html_table_cell($task->get_fail_delay()),
                        new html_table_cell($customised)));

-            if ($task->get_disabled()) {
+            if ($disabled) {
                $row->attributes['class'] = 'disabled';
            }
            $data[] = $row;
@@ -0,0 +1,53 @@
+@tool @tool_task @javascript
+Feature: Manage scheduled tasks
+  In order to configure scheduled tasks
+  As an admin
+  I need to be able to disable, enable, edit and reset to default scheduled tasks
+
+  Background:
+    Given I log in as "admin"
+    And I navigate to "Scheduled tasks" node in "Site administration > Server"
+
+  Scenario: Disable scheduled task
+    When I click on "Edit task schedule: Log table cleanup" "link" in the "Log table cleanup" "table_row"
+    Then I should see "Edit task schedule: Log table cleanup"
+    And I set the following fields to these values:
+      | disabled             | 1 |
+    And I press "Save changes"
+    Then I should see "Changes saved"
+    And I should see "Task disabled" in the "Log table cleanup" "table_row"
+
+  Scenario: Enable scheduled task
+    When I click on "Edit task schedule: Log table cleanup" "link" in the "Log table cleanup" "table_row"
+    Then I should see "Edit task schedule: Log table cleanup"
+    And I set the following fields to these values:
+      | disabled             | 0 |
+    And I press "Save changes"
+    Then I should see "Changes saved"
+    And I should not see "Task disabled" in the "Log table cleanup" "table_row"
+
+  Scenario: Edit scheduled task
+    When I click on "Edit task schedule: Log table cleanup" "link" in the "Log table cleanup" "table_row"
+    Then I should see "Edit task schedule: Log table cleanup"
+    And I set the following fields to these values:
+      | minute               | */5 |
+      | hour                 | 1   |
+      | day                  | 2   |
+      | month                | 3   |
+      | dayofweek            | 4   |
+    And I press "Save changes"
+    Then I should see "Changes saved"
+    And the following should exist in the "admintable" table:
+      | Component    | Minute | Hour | Day | Day of week | Month |
+      | Standard log | */5    | 1    | 2   | 4           | 3     |
+
+  Scenario: Reset scheduled task to default
+    When I click on "Edit task schedule: Log table cleanup" "link" in the "Log table cleanup" "table_row"
+    Then I should see "Edit task schedule: Log table cleanup"
+    And I set the following fields to these values:
+      | resettodefaults      | 1   |
+    And I press "Save changes"
+    Then I should see "Changes saved"
+    And the following should not exist in the "admintable" table:
+      | Name               | Component    | Minute | Hour | Day | Day of week | Month |
+      | Log table cleanup  | Standard log | */5    | 1    | 2   | 4           | 3     |
@@ -0,0 +1,275 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * File containing tests for the mform class.
+ *
+ * @package    tool_task
+ * @copyright  2014 onwards Ankit Agarwal <ankit.agrr@gmail.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+global $CFG;
+
+/**
+ * Mform test class.
+ *
+ * @package    tool_task
+ * @copyright  2014 onwards Ankit Agarwal <ankit.agrr@gmail.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or late
+ */
+class tool_task_form_testcase extends advanced_testcase {
+
+    /**
+     * Test validations for minute field.
+     */
+    public function test_validate_fields_minute() {
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '*');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '1');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '20');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '65');
+        $this->assertFalse($valid);
+
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '*/');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '*/1');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '*/20');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '*/65');
+        $this->assertFalse($valid);
+
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '1,2');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '2,20');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '20,30,45');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '65,20,30');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '25,75');
+        $this->assertFalse($valid);
+
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '1-2');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '2-20');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '20-30');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '65-20');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('minute', '25-75');
+        $this->assertFalse($valid);
+    }
+
+    /**
+     * Test validations for minute hour.
+     */
+    public function test_validate_fields_hour() {
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '*');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '1');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '20');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '65');
+        $this->assertFalse($valid);
+
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '*/');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '*/1');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '*/20');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '*/65');
+        $this->assertFalse($valid);
+
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '1,2');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '2,20');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '20,30,45');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '65,20,30');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '25,75');
+        $this->assertFalse($valid);
+
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '1-2');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '2-20');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '20-30');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '65-20');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('hour', '25-75');
+        $this->assertFalse($valid);
+    }
+
+    /**
+     * Test validations for day field.
+     */
+    public function test_validate_fields_day() {
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '*');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '1');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '20');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '65');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '35');
+        $this->assertFalse($valid);
+
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '*/');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '*/1');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '*/20');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '*/65');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '*/35');
+        $this->assertFalse($valid);
+
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '1,2');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '2,20');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '20,30,25');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '65,20,30');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '25,35');
+        $this->assertFalse($valid);
+
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '1-2');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '2-20');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '20-30');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '65-20');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('day', '25-35');
+        $this->assertFalse($valid);
+    }
+
+    /**
+     * Test validations for month field.
+     */
+    public function test_validate_fields_month() {
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '*');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '1');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '10');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '13');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '35');
+        $this->assertFalse($valid);
+
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '*/');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '*/1');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '*/12');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '*/13');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '*/35');
+        $this->assertFalse($valid);
+
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '1,2');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '2,11');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '2,10,12');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '65,2,13');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '25,35');
+        $this->assertFalse($valid);
+
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '1-2');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '2-12');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '3-6');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '65-2');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('month', '25-26');
+        $this->assertFalse($valid);
+    }
+
+    /**
+     * Test validations for dayofweek field.
+     */
+    public function test_validate_fields_dayofweek() {
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '*');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '0');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '1');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '6');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '7');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '20');
+        $this->assertFalse($valid);
+
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '*/');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '*/1');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '*/6');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '*/13');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '*/35');
+        $this->assertFalse($valid);
+
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '1,2');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '2,6');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '2,6,3');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '65,2,13');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '25,35');
+        $this->assertFalse($valid);
+
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '1-2');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '2-6');
+        $this->assertTrue($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '65-2');
+        $this->assertFalse($valid);
+        $valid = \tool_task_edit_scheduled_task_form::validate_fields('dayofweek', '3-7');
+        $this->assertFalse($valid);
+    }
+}
+
@@ -402,8 +402,13 @@ function uu_pre_process_custom_profile_data($data) {
 function uu_check_custom_profile_data(&$data) {
    global $CFG, $DB;
    $noerror = true;
-
-    // find custom profile fields and check if data needs to converted.
+    $testuserid = null;
+    if (!empty($data['username'])) {
+        if (preg_match('/id=(.*)"/i', $data['username'], $result)) {
+            $testuserid = $result[1];
+        }
+    }
+    // Find custom profile fields and check if data needs to converted.
    foreach ($data as $key => $value) {
        if (preg_match('/^profile_field_/', $key)) {
            $shortname = str_replace('profile_field_', '', $key);
@@ -413,13 +418,24 @@ function uu_check_custom_profile_data(&$data) {
                    $newfield = 'profile_field_'.$field->datatype;
                    $formfield = new $newfield($field->id, 0);
                    if (method_exists($formfield, 'convert_external_data') &&
-                            is_null($formfield->convert_external_data($value))) {
+                        is_null($formfield->convert_external_data($value))) {
                        $data['status'][] = get_string('invaliduserfield', 'error', $shortname);
                        $noerror = false;
                    }
+                    // Check for duplicate value.
+                    if (method_exists($formfield, 'edit_validate_field') ) {
+                        $testuser = new stdClass();
+                        $testuser->{$key} = $value;
+                        $testuser->id = $testuserid;
+                        $err = $formfield->edit_validate_field($testuser);
+                        if (!empty($err[$key])) {
+                            $data['status'][] = $err[$key].' ('.$key.')';
+                            $noerror = false;
+                        }
+                    }
                }
            }
        }
    }
    return $noerror;
-}
+}
@@ -0,0 +1,3 @@
+.path-admin-tool-xmldb a[name="lastused"] {
+    padding-top: 50px;
+}
@@ -24,7 +24,6 @@ $adminroot = admin_get_root(); // need all settings
 // now we'll deal with the case that the admin has submitted the form with new settings
 if ($data = data_submitted() and confirm_sesskey()) {
    $count = admin_write_settings($data);
-    $adminroot = admin_get_root(true); //reload tree
 }

 $newsettings = admin_output_new_settings_by_page($adminroot);
@@ -64,6 +63,8 @@ echo '<form action="upgradesettings.php" method="post" id="adminsettings">';
 echo '<div>';
 echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
 echo '<input type="hidden" name="return" value="'.$return.'" />';
+// HACK to prevent browsers from automatically inserting the user's password into the wrong fields.
+echo prevent_form_autofill_password();
 echo '<fieldset>';
 echo '<div class="clearer"><!-- --></div>';
 echo $newsettingshtml;
@@ -78,8 +78,12 @@
            echo $OUTPUT->header();
            $fullname = fullname($user, true);
            echo $OUTPUT->heading(get_string('deleteuser', 'admin'));
+
            $optionsyes = array('delete'=>$delete, 'confirm'=>md5($delete), 'sesskey'=>sesskey());
-            echo $OUTPUT->confirm(get_string('deletecheckfull', '', "'$fullname'"), new moodle_url($returnurl, $optionsyes), $returnurl);
+            $deleteurl = new moodle_url($returnurl, $optionsyes);
+            $deletebutton = new single_button($deleteurl, get_string('delete'), 'post');
+
+            echo $OUTPUT->confirm(get_string('deletecheckfull', '', "'$fullname'"), $deletebutton, $returnurl);
            echo $OUTPUT->footer();
            die;
        } else if (data_submitted() and !$user->deleted) {
@@ -190,9 +194,14 @@
    // We don't need to check the fullnamedisplay setting here as the fullname function call further down has
    // the override parameter set to true.
    $fullnamesetting = $CFG->alternativefullnameformat;
-    // If we are using language or it is empty, then retrieve all of the user's names.
+    // If we are using language or it is empty, then retrieve the default user names of just 'firstname' and 'lastname'.
    if ($fullnamesetting == 'language' || empty($fullnamesetting)) {
-        $fullnamesetting = implode(' ', $allusernamefields);
+        // Set $a variables to return 'firstname' and 'lastname'.
+        $a = new stdClass();
+        $a->firstname = 'firstname';
+        $a->lastname = 'lastname';
+        // Getting the fullname display will ensure that the order in the language file is maintained.
+        $fullnamesetting = get_string('fullnamedisplay', null, $a);
    }

    // Order in string will ensure that the name columns are in the correct order.
@@ -157,6 +157,13 @@ class external_service_form extends moodleform {

        $errors = parent::validation($data, $files);

+        // Add field validation check for duplicate name.
+        if ($webservice = $DB->get_record('external_services', array('name' => $data['name']))) {
+            if (empty($data['id']) || $webservice->id != $data['id']) {
+                $errors['name'] = get_string('nameexists', 'webservice');
+            }
+        }
+
        // Add field validation check for duplicate shortname.
        // Allow duplicated "empty" shortnames.
        if (!empty($data['shortname'])) {
@@ -113,6 +113,12 @@ class auth_plugin_cas extends auth_plugin_ldap {

        // If the multi-authentication setting is used, check for the param before connecting to CAS.
        if ($this->config->multiauth) {
+
+            // If there is an authentication error, stay on the default authentication page.
+            if (!empty($SESSION->loginerrormsg)) {
+                return;
+            }
+
            $authCAS = optional_param('authCAS', '', PARAM_RAW);
            if ($authCAS == 'NOCAS') {
                return;
@@ -181,7 +187,7 @@ class auth_plugin_cas extends auth_plugin_ldap {
        }

        // If Moodle is configured to use a proxy, phpCAS needs some curl options set.
-        if (!empty($CFG->proxyhost) && !is_proxybypass($this->config->hostname)) {
+        if (!empty($CFG->proxyhost) && !is_proxybypass(phpCAS::getServerLoginURL())) {
            phpCAS::setExtraCurlOption(CURLOPT_PROXY, $CFG->proxyhost);
            if (!empty($CFG->proxyport)) {
                phpCAS::setExtraCurlOption(CURLOPT_PROXYPORT, $CFG->proxyport);
@@ -55,5 +55,8 @@ function xmldb_auth_cas_upgrade($oldversion) {
    // Moodle v2.7.0 release upgrade line.
    // Put any upgrade step following this.

+    // Moodle v2.8.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -58,6 +58,11 @@ class auth_plugin_db extends auth_plugin_base {
    function user_login($username, $password) {
        global $CFG, $DB;

+        if ($this->is_configured() === false) {
+            debugging(get_string('auth_notconfigured', 'auth', $this->authtype));
+            return false;
+        }
+
        $extusername = core_text::convert($username, 'utf-8', $this->config->extencoding);
        $extpassword = core_text::convert($password, 'utf-8', $this->config->extencoding);

@@ -138,8 +143,13 @@ class auth_plugin_db extends auth_plugin_base {
     * Connect to external database.
     *
     * @return ADOConnection
+     * @throws moodle_exception
     */
    function db_init() {
+        if ($this->is_configured() === false) {
+            throw new moodle_exception('auth_dbcantconnect', 'auth_db');
+        }
+
        // Connect to the external database (forcing new connection).
        $authdb = ADONewConnection($this->config->type);
        if (!empty($this->config->debugauthdb)) {
@@ -193,18 +203,21 @@ class auth_plugin_db extends auth_plugin_base {
        if ($selectfields) {
            $select = array();
            foreach ($selectfields as $localname=>$externalname) {
-                $select[] = "$externalname AS $localname";
+                $select[] = "$externalname";
            }
            $select = implode(', ', $select);
            $sql = "SELECT $select
                      FROM {$this->config->table}
                     WHERE {$this->config->fielduser} = '".$this->ext_addslashes($extusername)."'";
+
            if ($rs = $authdb->Execute($sql)) {
                if (!$rs->EOF) {
-                    $fields_obj = $rs->FetchObj();
-                    $fields_obj = (object)array_change_key_case((array)$fields_obj , CASE_LOWER);
-                    foreach ($selectfields as $localname=>$externalname) {
-                        $result[$localname] = core_text::convert($fields_obj->{$localname}, $this->config->extencoding, 'utf-8');
+                    $fields = $rs->FetchRow();
+                    // Convert the associative array to an array of its values so we don't have to worry about the case of its keys.
+                    $fields = array_values($fields);
+                    foreach (array_keys($selectfields) as $index => $localname) {
+                        $value = $fields[$index];
+                        $result[$localname] = core_text::convert($value, $this->config->extencoding, 'utf-8');
                     }
                 }
                 $rs->Close();
@@ -463,15 +476,15 @@ class auth_plugin_db extends auth_plugin_base {
        $authdb = $this->db_init();

        // Fetch userlist.
-        $rs = $authdb->Execute("SELECT {$this->config->fielduser} AS username
+        $rs = $authdb->Execute("SELECT {$this->config->fielduser}
                                  FROM {$this->config->table} ");

        if (!$rs) {
            print_error('auth_dbcantconnect','auth_db');
        } else if (!$rs->EOF) {
            while ($rec = $rs->FetchRow()) {
-                $rec = (object)array_change_key_case((array)$rec , CASE_LOWER);
-                array_push($result, $rec->username);
+                $rec = array_change_key_case((array)$rec, CASE_LOWER);
+                array_push($result, $rec[strtolower($this->config->fielduser)]);
            }
        }

@@ -643,6 +656,18 @@ class auth_plugin_db extends auth_plugin_base {
        return ($this->config->passtype === 'internal');
    }

+    /**
+     * Returns false if this plugin is enabled but not configured.
+     *
+     * @return bool
+     */
+    public function is_configured() {
+        if (!empty($this->config->type)) {
+            return true;
+        }
+        return false;
+    }
+
    /**
     * Indicates if moodle should automatically update internal user
     * records with data from external sources using the information
@@ -139,12 +139,12 @@ class auth_plugin_email extends auth_plugin_base {
        $user = get_complete_user_data('username', $username);

        if (!empty($user)) {
-            if ($user->confirmed) {
-                return AUTH_CONFIRM_ALREADY;
-
-            } else if ($user->auth != $this->authtype) {
+            if ($user->auth != $this->authtype) {
                return AUTH_CONFIRM_ERROR;

+            } else if ($user->secret == $confirmsecret && $user->confirmed) {
+                return AUTH_CONFIRM_ALREADY;
+
            } else if ($user->secret == $confirmsecret) {   // They have provided the secret key to get in
                $DB->set_field("user", "confirmed", 1, array("id"=>$user->id));
                if ($user->firstaccess == 0) {
@@ -24,7 +24,7 @@

 $string['auth_emaildescription'] = '<p>Email-based self-registration enables a user to create their own account via a \'Create new account\' button on the login page. The user then receives an email containing a secure link to a page where they can confirm their account. Future logins just check the username and password against the stored values in the Moodle database.</p><p>Note: In addition to enabling the plugin, email-based self-registration must also be selected from the self registration drop-down menu on the \'Manage authentication\' page.</p>';
 $string['auth_emailnoemail'] = 'Tried to send you an email but failed!';
-$string['auth_emailrecaptcha'] = 'Adds a visual/audio confirmation form element to the signup page for email self-registering users. This protects your site against spammers and contributes to a worthwhile cause. See http://www.google.com/recaptcha/learnmore for more details. <br /><em>PHP cURL extension is required.</em>';
+$string['auth_emailrecaptcha'] = 'Adds a visual/audio confirmation form element to the sign-up page for email self-registering users. This protects your site against spammers and contributes to a worthwhile cause. See http://www.google.com/recaptcha for more details.';
 $string['auth_emailrecaptcha_key'] = 'Enable reCAPTCHA element';
 $string['auth_emailsettings'] = 'Settings';
 $string['pluginname'] = 'Email-based self-registration';
@@ -534,6 +534,7 @@ class auth_plugin_ldap extends auth_plugin_base {
     *
     * @param object $user new user object
     * @param boolean $notify print notice with link and terminate
+     * @return boolean success
     */
    function user_signup($user, $notify=true) {
        global $CFG, $DB, $PAGE, $OUTPUT;
@@ -604,12 +605,12 @@ class auth_plugin_ldap extends auth_plugin_base {
        $user = get_complete_user_data('username', $username);

        if (!empty($user)) {
-            if ($user->confirmed) {
-                return AUTH_CONFIRM_ALREADY;
-
-            } else if ($user->auth != $this->authtype) {
+            if ($user->auth != $this->authtype) {
                return AUTH_CONFIRM_ERROR;

+            } else if ($user->secret == $confirmsecret && $user->confirmed) {
+                return AUTH_CONFIRM_ALREADY;
+
            } else if ($user->secret == $confirmsecret) {   // They have provided the secret key to get in
                if (!$this->user_activate($username)) {
                    return AUTH_CONFIRM_FAIL;
@@ -742,7 +743,7 @@ class auth_plugin_ldap extends auth_plugin_base {
                    } while ($entry = ldap_next_entry($ldapconnection, $entry));
                }
                unset($ldap_result); // Free mem.
-            } while ($ldap_pagedresults && !empty($ldap_cookie));
+            } while ($ldap_pagedresults && $ldap_cookie !== null && $ldap_cookie != '');
        }

        // If LDAP paged results were used, the current connection must be completely
@@ -889,7 +890,7 @@ class auth_plugin_ldap extends auth_plugin_base {

                foreach ($users as $user) {
                    echo "\t"; print_string('auth_dbupdatinguser', 'auth_db', array('name'=>$user->username, 'id'=>$user->id));
-                    if (!$this->update_user_record($user->username, $updatekeys)) {
+                    if (!$this->update_user_record($user->username, $updatekeys, true)) {
                        echo ' - '.get_string('skipped');
                    }
                    echo "\n";
@@ -987,8 +988,11 @@ class auth_plugin_ldap extends auth_plugin_base {
     *
     * @param string $username username
     * @param boolean $updatekeys true to update the local record with the external LDAP values.
+     * @param bool $triggerevent set false if user_updated event should not be triggered.
+     *             This will not affect user_password_updated event triggering.
+     * @return stdClass|bool updated user record or false if there is no new info to update.
     */
-    function update_user_record($username, $updatekeys = false) {
+    function update_user_record($username, $updatekeys = false, $triggerevent = false) {
        global $CFG, $DB;

        // Just in case check text case
@@ -1030,7 +1034,7 @@ class auth_plugin_ldap extends auth_plugin_base {
                        }
                    }
                }
-                user_update_user($newuser, false, false);
+                user_update_user($newuser, false, $triggerevent);
            }
        } else {
            return false;
@@ -1638,7 +1642,7 @@ class auth_plugin_ldap extends auth_plugin_base {

        if (($_SERVER['REQUEST_METHOD'] === 'GET'         // Only on initial GET of loginpage
             || ($_SERVER['REQUEST_METHOD'] === 'POST'
-                 && (get_referer() != strip_querystring(qualified_me()))))
+                 && (get_local_referer() != strip_querystring(qualified_me()))))
                                                          // Or when POSTed from another place
                                                          // See MDL-14071
            && !empty($this->config->ntlmsso_enabled)     // SSO enabled
@@ -1649,12 +1653,15 @@ class auth_plugin_ldap extends auth_plugin_base {

            // First, let's remember where we were trying to get to before we got here
            if (empty($SESSION->wantsurl)) {
-                $SESSION->wantsurl = (array_key_exists('HTTP_REFERER', $_SERVER) &&
-                                      $_SERVER['HTTP_REFERER'] != $CFG->wwwroot &&
-                                      $_SERVER['HTTP_REFERER'] != $CFG->wwwroot.'/' &&
-                                      $_SERVER['HTTP_REFERER'] != $CFG->httpswwwroot.'/login/' &&
-                                      $_SERVER['HTTP_REFERER'] != $CFG->httpswwwroot.'/login/index.php')
-                    ? $_SERVER['HTTP_REFERER'] : NULL;
+                $SESSION->wantsurl = null;
+                $referer = get_local_referer(false);
+                if ($referer &&
+                        $referer != $CFG->wwwroot &&
+                        $referer != $CFG->wwwroot . '/' &&
+                        $referer != $CFG->httpswwwroot . '/login/' &&
+                        $referer != $CFG->httpswwwroot . '/login/index.php') {
+                    $SESSION->wantsurl = $referer;
+                }
            }

            // Now start the whole NTLM machinery.
@@ -1679,7 +1686,7 @@ class auth_plugin_ldap extends auth_plugin_base {
        // we don't want to use at all. As we can't get rid of it, just point
        // $SESSION->wantsurl to $CFG->wwwroot (after all, we came from there).
        if (empty($SESSION->wantsurl)
-            && (get_referer() == $CFG->httpswwwroot.'/auth/ldap/ntlmsso_finish.php')) {
+            && (get_local_referer() == $CFG->httpswwwroot.'/auth/ldap/ntlmsso_finish.php')) {

            $SESSION->wantsurl = $CFG->wwwroot;
        }
@@ -45,5 +45,8 @@ function xmldb_auth_ldap_upgrade($oldversion) {
    // Moodle v2.7.0 release upgrade line.
    // Put any upgrade step following this.

+    // Moodle v2.8.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -47,7 +47,7 @@ $string['auth_ldap_expiration_desc'] = 'Select No to disable expired password ch
 $string['auth_ldap_expiration_key'] = 'Expiration';
 $string['auth_ldap_expiration_warning_desc'] = 'Number of days before password expiration warning is issued.';
 $string['auth_ldap_expiration_warning_key'] = 'Expiration warning';
-$string['auth_ldap_expireattr_desc'] = 'Optional: overrides ldap-attribute that stores password expiration time';
+$string['auth_ldap_expireattr_desc'] = 'Optional: Overrides the LDAP attribute that stores password expiration time.';
 $string['auth_ldap_expireattr_key'] = 'Expiration attribute';
 $string['auth_ldapextrafields'] = 'These fields are optional.  You can choose to pre-fill some Moodle user fields with information from the <b>LDAP fields</b> that you specify here. <p>If you leave these fields blank, then nothing will be transferred from LDAP and Moodle defaults will be used instead.</p><p>In either case, the user will be able to edit all of these fields after they log in.</p>';
 $string['auth_ldap_graceattr_desc'] = 'Optional: Overrides  gracelogin attribute';
@@ -71,7 +71,7 @@ $string['auth_ldap_noconnect_all'] = 'LDAP-module cannot connect to any servers:
 $string['auth_ldap_noextension'] = '<em>The PHP LDAP module does not seem to be present. Please ensure it is installed and enabled if you want to use this authentication plugin.</em>';
 $string['auth_ldap_no_mbstring'] = 'You need the mbstring extension to create users in Active Directory.';
 $string['auth_ldapnotinstalled'] = 'Cannot use LDAP authentication. The PHP LDAP module is not installed.';
-$string['auth_ldap_objectclass'] = 'Optional: Overrides objectClass used to name/search users on ldap_user_type. Usually you dont need to chage this.';
+$string['auth_ldap_objectclass'] = 'Optional: Overrides objectClass used to name/search users on ldap_user_type. Usually you don\'t need to change this.';
 $string['auth_ldap_objectclass_key'] = 'Object class';
 $string['auth_ldap_opt_deref'] = 'Determines how aliases are handled during search. Select one of the following values: "No" (LDAP_DEREF_NEVER) or "Yes" (LDAP_DEREF_ALWAYS)';
 $string['auth_ldap_opt_deref_key'] = 'Dereference aliases';
@@ -79,7 +79,7 @@ $string['auth_ldap_passtype'] = 'Specify the format of new or changed passwords
 $string['auth_ldap_passtype_key'] = 'Password format';
 $string['auth_ldap_passwdexpire_settings'] = 'LDAP password expiration settings.';
 $string['auth_ldap_preventpassindb'] = 'Select yes to prevent passwords from being stored in Moodle\'s DB.';
-$string['auth_ldap_preventpassindb_key'] = 'Cache passwords';
+$string['auth_ldap_preventpassindb_key'] = 'Don\'t cache passwords';
 $string['auth_ldap_search_sub'] = 'Search users from subcontexts.';
 $string['auth_ldap_search_sub_key'] = 'Search subcontexts';
 $string['auth_ldap_server_settings'] = 'LDAP server settings';
@@ -136,9 +136,25 @@ class auth_ldap_plugin_testcase extends advanced_testcase {
        $auth = get_auth_plugin('ldap');

        ob_start();
+        $sink = $this->redirectEvents();
        $auth->sync_users(true);
+        $events = $sink->get_events();
+        $sink->close();
        ob_end_clean();

+        // Check events, 5 users created with 2 users having roles.
+        $this->assertCount(7, $events);
+        foreach ($events as $index => $event) {
+            $usercreatedindex = array(0, 2, 4, 5, 6);
+            $roleassignedindex = array (1, 3);
+            if (in_array($index, $usercreatedindex)) {
+                $this->assertInstanceOf('\core\event\user_created', $event);
+            }
+            if (in_array($index, $roleassignedindex)) {
+                $this->assertInstanceOf('\core\event\role_assigned', $event);
+            }
+        }
+
        $this->assertEquals(5, $DB->count_records('user', array('auth'=>'ldap')));
        $this->assertEquals(2, $DB->count_records('role_assignments'));
        $this->assertEquals(2, $DB->count_records('role_assignments', array('roleid'=>$creatorrole->id)));
@@ -150,9 +166,15 @@ class auth_ldap_plugin_testcase extends advanced_testcase {
        $this->delete_ldap_user($connection, $topdn, 1);

        ob_start();
+        $sink = $this->redirectEvents();
        $auth->sync_users(true);
+        $events = $sink->get_events();
+        $sink->close();
        ob_end_clean();

+        // Check events, no new event.
+        $this->assertCount(0, $events);
+
        $this->assertEquals(5, $DB->count_records('user', array('auth'=>'ldap')));
        $this->assertEquals(0, $DB->count_records('user', array('suspended'=>1)));
        $this->assertEquals(0, $DB->count_records('user', array('deleted'=>1)));
@@ -166,9 +188,17 @@ class auth_ldap_plugin_testcase extends advanced_testcase {
        $auth = get_auth_plugin('ldap');

        ob_start();
+        $sink = $this->redirectEvents();
        $auth->sync_users(true);
+        $events = $sink->get_events();
+        $sink->close();
        ob_end_clean();

+        // Check events, 1 user got updated.
+        $this->assertCount(1, $events);
+        $event = reset($events);
+        $this->assertInstanceOf('\core\event\user_updated', $event);
+
        $this->assertEquals(5, $DB->count_records('user', array('auth'=>'ldap')));
        $this->assertEquals(0, $DB->count_records('user', array('auth'=>'nologin', 'username'=>'username1')));
        $this->assertEquals(1, $DB->count_records('user', array('auth'=>'ldap', 'suspended'=>'1', 'username'=>'username1')));
@@ -179,9 +209,17 @@ class auth_ldap_plugin_testcase extends advanced_testcase {
        $this->create_ldap_user($connection, $topdn, 1);

        ob_start();
+        $sink = $this->redirectEvents();
        $auth->sync_users(true);
+        $events = $sink->get_events();
+        $sink->close();
        ob_end_clean();

+        // Check events, 1 user got updated.
+        $this->assertCount(1, $events);
+        $event = reset($events);
+        $this->assertInstanceOf('\core\event\user_updated', $event);
+
        $this->assertEquals(5, $DB->count_records('user', array('auth'=>'ldap')));
        $this->assertEquals(0, $DB->count_records('user', array('suspended'=>1)));
        $this->assertEquals(0, $DB->count_records('user', array('deleted'=>1)));
@@ -191,9 +229,17 @@ class auth_ldap_plugin_testcase extends advanced_testcase {
        $DB->set_field('user', 'auth', 'nologin', array('username'=>'username1'));

        ob_start();
+        $sink = $this->redirectEvents();
        $auth->sync_users(true);
+        $events = $sink->get_events();
+        $sink->close();
        ob_end_clean();

+        // Check events, 1 user got updated.
+        $this->assertCount(1, $events);
+        $event = reset($events);
+        $this->assertInstanceOf('\core\event\user_updated', $event);
+
        $this->assertEquals(5, $DB->count_records('user', array('auth'=>'ldap')));
        $this->assertEquals(0, $DB->count_records('user', array('suspended'=>1)));
        $this->assertEquals(0, $DB->count_records('user', array('deleted'=>1)));
@@ -208,9 +254,19 @@ class auth_ldap_plugin_testcase extends advanced_testcase {
        $this->delete_ldap_user($connection, $topdn, 1);

        ob_start();
+        $sink = $this->redirectEvents();
        $auth->sync_users(true);
+        $events = $sink->get_events();
+        $sink->close();
        ob_end_clean();

+        // Check events, 2 events role_unassigned and user_deleted.
+        $this->assertCount(2, $events);
+        $event = array_pop($events);
+        $this->assertInstanceOf('\core\event\user_deleted', $event);
+        $event = array_pop($events);
+        $this->assertInstanceOf('\core\event\role_unassigned', $event);
+
        $this->assertEquals(5, $DB->count_records('user', array('auth'=>'ldap')));
        $this->assertEquals(0, $DB->count_records('user', array('username'=>'username1')));
        $this->assertEquals(0, $DB->count_records('user', array('suspended'=>1)));
@@ -221,9 +277,19 @@ class auth_ldap_plugin_testcase extends advanced_testcase {
        $this->create_ldap_user($connection, $topdn, 1);

        ob_start();
+        $sink = $this->redirectEvents();
        $auth->sync_users(true);
+        $events = $sink->get_events();
+        $sink->close();
        ob_end_clean();

+        // Check events, 2 events role_assigned and user_created.
+        $this->assertCount(2, $events);
+        $event = array_pop($events);
+        $this->assertInstanceOf('\core\event\role_assigned', $event);
+        $event = array_pop($events);
+        $this->assertInstanceOf('\core\event\user_created', $event);
+
        $this->assertEquals(6, $DB->count_records('user', array('auth'=>'ldap')));
        $this->assertEquals(1, $DB->count_records('user', array('username'=>'username1')));
        $this->assertEquals(0, $DB->count_records('user', array('suspended'=>1)));
@@ -296,7 +362,7 @@ class auth_ldap_plugin_testcase extends advanced_testcase {
            'lastnamephonetic' => '最後のお名前のテスト一号',
            'firstnamephonetic' => 'お名前のテスト一号',
            'alternatename' => 'Alternate Name User Test 1',
-            'email' => 'usersignuptest1@email.com',
+            'email' => 'usersignuptest1@example.com',
            'description' => 'This is a description for user 1',
            'city' => 'Perth',
            'country' => 'au',
@@ -0,0 +1,4 @@
+This files describes API changes in the auth_ldap code.
+=== 2.8.7 ===
+* auth_plugin_ldap::update_user_record() accepts an additional (optional) param
+  to trigger update event.
@@ -50,5 +50,8 @@ function xmldb_auth_manual_upgrade($oldversion) {
    // Moodle v2.7.0 release upgrade line.
    // Put any upgrade step following this.

+    // Moodle v2.8.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -50,5 +50,8 @@ function xmldb_auth_mnet_upgrade($oldversion) {
    // Moodle v2.7.0 release upgrade line.
    // Put any upgrade step following this.

+    // Moodle v2.8.0 release upgrade line.
+    // Put any upgrade step following this.
+
    return true;
 }
@@ -60,7 +60,7 @@ if (!isset($config->changepasswordurl)) {
 </tr>

 <tr valign="top" >
-    <td align="right"><?php echo html_writer::label(get_string('auth_radiustype_key', 'auth_radius'), 'menuradiustype'); ?>: </td>
+    <td align="right"><?php echo html_writer::label(get_string('auth_radiustype_key', 'auth_radius') . ':', 'menuradiustype'); ?> </td>
    <td>
 <?php

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