Moodle release 2.8.3

The result from this function is used in send_file calls and if unclean
(windows dir separators, or .. path components) it could expose sensitive
files (e.g. .php files). Now we always clean the result from this function
even if it means double cleaning.

I also fixed the unit test for this function and added a new test for this cleaning.

I also updated the comments to point to get_file_argument as the full version of
min_get_slash_argument.

.csslintrc

@@ -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/

admin/category.php

@@ -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();

admin/roles/classes/existing_role_holders.php

@@ -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)) {

admin/roles/usersroles.php

@@ -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.

admin/search.php

@@ -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,9 @@ 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).'" />';
 echo '</div>';
 echo '<fieldset>';
 echo '<div class="clearer"><!-- --></div>';

admin/settings.php

@@ -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);
 }
 

admin/tool/customlang/db/upgrade.php

@@ -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;
 }

admin/tool/langimport/classes/task/update_langpacks_task.php

@@ -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) {

admin/tool/log/classes/log/manager.php

@@ -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);
         }
     }
 }

admin/tool/log/db/upgrade.php

@@ -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;
 }

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

@@ -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;
 }

admin/tool/log/store/legacy/classes/log/store.php

@@ -143,8 +143,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 +174,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 {

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

@@ -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;
 }

admin/tool/messageinbound/classes/edit_handler_form.php

@@ -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.
+        }
+    }
 }

admin/tool/messageinbound/classes/manager.php

@@ -291,6 +291,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 +368,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 +411,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 +465,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 +493,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 +612,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 +646,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 +735,43 @@ class manager {
         return in_array($flag, $flags);
     }
 
+    /**
+     * 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 +794,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

admin/tool/messageinbound/classes/message/inbound/invalid_recipient_handler.php

@@ -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;
     }
 

admin/tool/messageinbound/index.php

@@ -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);

admin/tool/monitor/classes/output/managerules/renderable.php

@@ -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;
     }
 

admin/tool/monitor/db/upgrade.php

@@ -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;
 }

admin/tool/monitor/managerules.php

@@ -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();

admin/tool/monitor/tests/behat/rule.feature

@@ -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"

admin/tool/monitor/tests/eventobservers_test.php

@@ -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");
     }
 
     /**

admin/tool/replace/lang/en/tool_replace.php

@@ -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...';

admin/tool/task/classes/edit_scheduled_task_form.php

@@ -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 {
@@ -53,22 +58,27 @@ class tool_task_edit_scheduled_task_form extends moodleform {
         $mform->addElement('text', 'minute', get_string('taskscheduleminute', 'tool_task'));
         $mform->setType('minute', PARAM_RAW);
         $mform->addHelpButton('minute', 'taskscheduleminute', 'tool_task');
+        $mform->addRule('minute', get_string('required'), 'required');
 
         $mform->addElement('text', 'hour', get_string('taskschedulehour', 'tool_task'));
         $mform->setType('hour', PARAM_RAW);
         $mform->addHelpButton('hour', 'taskschedulehour', 'tool_task');
+        $mform->addRule('hour', get_string('required'), 'required');
 
         $mform->addElement('text', 'day', get_string('taskscheduleday', 'tool_task'));
         $mform->setType('day', PARAM_RAW);
         $mform->addHelpButton('day', 'taskscheduleday', 'tool_task');
+        $mform->addRule('day', get_string('required'), 'required');
 
         $mform->addElement('text', 'month', get_string('taskschedulemonth', 'tool_task'));
         $mform->setType('month', PARAM_RAW);
         $mform->addHelpButton('month', 'taskschedulemonth', 'tool_task');
+        $mform->addRule('month', get_string('required'), 'required');
 
         $mform->addElement('text', 'dayofweek', get_string('taskscheduledayofweek', 'tool_task'));
         $mform->setType('dayofweek', PARAM_RAW);
         $mform->addHelpButton('dayofweek', 'taskscheduledayofweek', 'tool_task');
+        $mform->addRule('dayofweek', get_string('required'), 'required');
 
         $mform->addElement('advcheckbox', 'disabled', get_string('disabled', 'tool_task'));
         $mform->addHelpButton('disabled', 'disabled', 'tool_task');
@@ -92,5 +102,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);
+    }
 }
 

admin/tool/task/cli/schedule_task.php

@@ -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 {
@@ -123,6 +128,7 @@ if ($execute = $options['execute']) {
         } else {
             $task->set_cron_lock($cronlock);
         }
+        get_mailer('buffer');
         $task->execute();
         if (isset($predbqueries)) {
             mtrace("... used " . ($DB->perf_get_queries() - $predbqueries) . " dbqueries");
@@ -130,6 +136,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()) {
@@ -139,6 +146,7 @@ if ($execute = $options['execute']) {
         mtrace("... used " . (microtime(true) - $pretime) . " seconds");
         mtrace("Task failed: " . $e->getMessage());
         \core\task\manager::scheduled_task_failed($task);
+        get_mailer('close');
         exit(1);
     }
 }

admin/tool/task/lang/en/tool_task.php

@@ -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';

admin/tool/task/renderer.php

@@ -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;

admin/tool/task/tests/form_test.php

@@ -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);
+    }
+}
+

admin/tool/xmldb/styles_bootstrapbase.css

@@ -0,0 +1,3 @@
+.path-admin-tool-xmldb a[name="lastused"] {
+    padding-top: 50px;
+}

admin/upgradesettings.php

@@ -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);

auth/cas/auth.php

@@ -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;

auth/cas/db/upgrade.php

@@ -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;
 }

auth/ldap/auth.php

@@ -742,7 +742,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

auth/ldap/db/upgrade.php

@@ -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;
 }

auth/ldap/lang/en/auth_ldap.php

@@ -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';

auth/manual/db/upgrade.php

@@ -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;
 }

auth/mnet/db/upgrade.php

@@ -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;
 }

auth/shibboleth/README.txt

@@ -61,8 +61,8 @@ Moodle Configuration with Dual login
 --
 
    Also see:
-   https://spaces.internet2.edu/display/SHIB2/NativeSPRequestMapper and
-   https://spaces.internet2.edu/display/SHIB2/NativeSPAccessControl
+   https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPRequestMapper and
+   https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPAccessControl
 
 2. As Moodle admin, go to the 'Administrations >> Users >> Authentication' and
    click on the the 'Shibboleth' settings.
@@ -101,8 +101,8 @@ Moodle Configuration with Dual login
     to the same host. If no SessionInitiator URL is given, the default one
     '/Shibboleth.sso' (only works for Shibboleth 1.3.x) will be used. For
     Shibboleth 2.x you have to add '/Shibboleth.sso/DS' as a SessionInitiator.
-    Also see https://spaces.internet2.edu/display/SHIB/SessionInitiator
-    and https://spaces.internet2.edu/display/SHIB2/NativeSPSessionInitiator
+    Also see https://wiki.shibboleth.net/confluence/display/SHIB/SessionInitiator
+    and https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPSessionInitiator
 
     Important Note: If you upgraded from a previous version of Moodle and now
                     want to use the integrated WAYF, you have to make sure that
@@ -324,8 +324,8 @@ logout. Hopefully, the Moodle logout helps to motivate the developers to
 implement SLO. On the other hand, the easiest and safest way to log out
 still is to tell users to quit their web browsers :)
 
-Also see https://spaces.internet2.edu/display/SHIB2/SLOIssues and
-https://spaces.internet2.edu/display/SHIB2/NativeSPLogoutInitiator for some
+Also see https://wiki.shibboleth.net/confluence/display/SHIB2/SLOIssues and
+https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPLogoutInitiator for some
 background information on this topic.
 
 --------------------------------------------------------------------------------

auth/shibboleth/logout.php

@@ -1,13 +1,15 @@
 <?php
 
 // Implements logout for Shibboleth authenticated users according to:
-// - https://spaces.internet2.edu/display/SHIB2/NativeSPLogoutInitiator
-// - https://spaces.internet2.edu/display/SHIB2/NativeSPNotify
+// - https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPLogoutInitiator
+// - https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPNotify
 
 require_once("../../config.php");
 
 require_once($CFG->dirroot."/auth/shibboleth/auth.php");
 
+$action = optional_param('action', '', PARAM_ALPHA);
+$redirect = optional_param('return', '', PARAM_URL);
 
 // Find out whether host supports https
 $protocol = 'http://';
@@ -15,38 +17,32 @@ if (is_https()) {
     $protocol = 'https://';
 }
 
-// Front channel logout
-if (
-        isset($_GET['return'])
-        && isset($_GET['action'])
-        && $_GET['action'] == 'logout'
-   ){
-
-    // Logout out user from application
-    // E.g. destroy application session/cookie etc
-    require_logout();
-
-    // Finally, send user to the return URL
-    redirect($_GET['return']);
+// If the shibboleth plugin is not enable, throw an exception.
+if (!is_enabled_auth('shibboleth')) {
+    throw new moodle_exception(get_string('pluginnotenabled', 'auth', 'shibboleth'));
 }
 
-// Back channel logout
-elseif (!empty($HTTP_RAW_POST_DATA)) {
+// Front channel logout.
+if ($action == 'logout' && !empty($redirect)) {
 
-    // Requires PHP 5
+    if ($USER->auth == 'shibboleth') {
+        // Logout out user from application.
+        require_logout();
+         // Finally, send user to the return URL.
+        redirect($redirect);
+    }
 
+} else if (!empty($HTTP_RAW_POST_DATA)) {
 
-    // Set SOAP header
+    // Back channel logout.
+    // Set SOAP header.
     $server = new SoapServer($protocol.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'].'/LogoutNotification.wsdl');
-
-
     $server->addFunction("LogoutNotification");
     $server->handle();
-}
 
-// Return WSDL
-else {
+} else {
 
+    // Return WSDL.
     header('Content-Type: text/xml');
 
     echo <<<WSDL
@@ -66,8 +62,8 @@ Because neither of these two variants seems to be the case, the WSDL file for
 the web service is returned.
 
 For more information see:
-- https://spaces.internet2.edu/display/SHIB2/NativeSPLogoutInitiator
-- https://spaces.internet2.edu/display/SHIB2/NativeSPNotify
+- https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPLogoutInitiator
+- https://wiki.shibboleth.net/confluence/display/SHIB2/NativeSPNotify
 -->
 
     <types>
@@ -119,9 +115,7 @@ For more information see:
 </definitions>
 WSDL;
     exit;
-
 }
-
 /******************************************************************************/
 
 function LogoutNotification($SessionID){

availability/classes/info.php

@@ -608,17 +608,39 @@ abstract class info {
         }
         $tree = $this->get_availability_tree();
         $checker = new capability_checker($this->get_context());
+
+        // Filter using availability tree.
         $this->modinfo = get_fast_modinfo($this->get_course());
-        $result = $tree->filter_user_list($users, false, $this, $checker);
+        $filtered = $tree->filter_user_list($users, false, $this, $checker);
         $this->modinfo = null;
+
+        // Include users in the result if they're either in the filtered list,
+        // or they have viewhidden. This logic preserves ordering of the
+        // passed users array.
+        $result = array();
+        $canviewhidden = $checker->get_users_by_capability($this->get_view_hidden_capability());
+        foreach ($users as $userid => $data) {
+            if (array_key_exists($userid, $filtered) || array_key_exists($userid, $canviewhidden)) {
+                $result[$userid] = $users[$userid];
+            }
+        }
+
         return $result;
     }
 
+    /**
+     * Gets the capability used to view hidden activities/sections (as
+     * appropriate).
+     *
+     * @return string Name of capability used to view hidden items of this type
+     */
+    protected abstract function get_view_hidden_capability();
+
     /**
      * Obtains SQL that returns a list of enrolled users that has been filtered
      * by the conditions applied in the availability API, similar to calling
      * get_enrolled_users and then filter_user_list. As for filter_user_list,
-     * this ONLY filteres out users with conditions that are marked as applying
+     * this ONLY filters out users with conditions that are marked as applying
      * to user lists. For example, group conditions are included but date
      * conditions are not included.
      *
@@ -640,8 +662,22 @@ abstract class info {
         if (is_null($this->availability) || !$CFG->enableavailability) {
             return array('', array());
         }
+
+        // Get SQL for the availability filter.
         $tree = $this->get_availability_tree();
-        return $tree->get_user_list_sql(false, $this, $onlyactive);
+        list ($filtersql, $filterparams) = $tree->get_user_list_sql(false, $this, $onlyactive);
+        if ($filtersql === '') {
+            // No restrictions, so return empty query.
+            return array('', array());
+        }
+
+        // Get SQL for the view hidden list.
+        list ($viewhiddensql, $viewhiddenparams) = get_enrolled_sql(
+                $this->get_context(), $this->get_view_hidden_capability(), 0, $onlyactive);
+
+        // Result is a union of the two.
+        return array('(' . $filtersql . ') UNION (' . $viewhiddensql . ')',
+                array_merge($filterparams, $viewhiddenparams));
     }
 
     /**

availability/classes/info_module.php

@@ -109,6 +109,10 @@ class info_module extends info {
         return parent::filter_user_list($filtered);
     }
 
+    protected function get_view_hidden_capability() {
+        return 'moodle/course:viewhiddenactivities';
+    }
+
     public function get_user_list_sql($onlyactive = true) {
         global $CFG, $DB;
         if (!$CFG->enableavailability) {
@@ -180,7 +184,12 @@ class info_module extends info {
             if (is_object($cmorid)) {
                 $cmorid = $cmorid->id;
             }
-            $cm = $DB->get_record('course_modules', array('id' => $cmorid), '*', MUST_EXIST);
+            $cm = $DB->get_record('course_modules', array('id' => $cmorid));
+            if (!$cm) {
+                // In some error cases, the course module may not exist.
+                debugging('info_module::is_user_visible called with invalid cmid ' . $cmorid, DEBUG_DEVELOPER);
+                return false;
+            }
         }
 
         // If requested, check user can access the course.

availability/classes/info_section.php

@@ -56,6 +56,10 @@ class info_section extends info {
         return \context_course::instance($this->get_course()->id);
     }
 
+    protected function get_view_hidden_capability() {
+        return 'moodle/course:viewhiddensections';
+    }
+
     protected function set_in_database($availability) {
         global $DB;
         $DB->set_field('course_sections', 'availability', $availability,

availability/classes/tree_node.php

@@ -139,7 +139,8 @@ abstract class tree_node {
 
     /**
      * Tests this condition against a user list. Users who do not meet the
-     * condition will be removed from the list.
+     * condition will be removed from the list, unless they have the ability
+     * to view hidden activities/sections.
      *
      * This function must be implemented if is_applied_to_user_lists returns
      * true. Otherwise it will not be called.
@@ -150,6 +151,10 @@ abstract class tree_node {
      * Within this function, if you need to check capabilities, please use
      * the provided checker which caches results where possible.
      *
+     * Conditions do not need to check the viewhiddenactivities or
+     * viewhiddensections capabilities. These are handled by
+     * core_availability\info::filter_user_list.
+     *
      * @param array $users Array of userid => object
      * @param bool $not True if this condition is applying in negative mode
      * @param \core_availability\info $info Item we're checking
@@ -167,7 +172,7 @@ abstract class tree_node {
      * Obtains SQL that returns a list of enrolled users that has been filtered
      * by the conditions applied in the availability API, similar to calling
      * get_enrolled_users and then filter_user_list. As for filter_user_list,
-     * this ONLY filteres out users with conditions that are marked as applying
+     * this ONLY filters out users with conditions that are marked as applying
      * to user lists. For example, group conditions are included but date
      * conditions are not included.
      *
@@ -180,6 +185,10 @@ abstract class tree_node {
      *
      * If there are no conditions, the returned result is array('', array()).
      *
+     * Conditions do not need to check the viewhiddenactivities or
+     * viewhiddensections capabilities. These are handled by
+     * core_availability\info::get_user_list_sql.
+     *
      * @param bool $not True if this condition is applying in negative mode
      * @param \core_availability\info $info Item we're checking
      * @param bool $onlyactive If true, only returns active enrolments

availability/condition/grade/classes/frontend.php

@@ -55,7 +55,7 @@ class frontend extends \core_availability\frontend {
                     && $item->itemtype == 'mod') {
                 continue;
             }
-            $gradeoptions[$id] = $item->get_name();
+            $gradeoptions[$id] = $item->get_name(true);
         }
         \core_collator::asort($gradeoptions);
 

availability/tests/fixtures/mock_info.php

@@ -60,6 +60,10 @@ class mock_info extends info {
         return \context_course::instance($this->get_course()->id);
     }
 
+    protected function get_view_hidden_capability() {
+        return 'moodle/course:viewhiddensections';
+    }
+
     protected function set_in_database($availability) {
     }
 

availability/tests/info_test.php

@@ -407,11 +407,14 @@ class info_testcase extends \advanced_testcase {
         $u1 = $generator->create_user();
         $u2 = $generator->create_user();
         $u3 = $generator->create_user();
+        $studentroleid = $DB->get_field('role', 'id', array('shortname' => 'student'), MUST_EXIST);
         $allusers = array($u1->id => $u1, $u2->id => $u2, $u3->id => $u3);
-        $generator->enrol_user($u1->id, $course->id);
-        $generator->enrol_user($u2->id, $course->id);
-        $generator->enrol_user($u3->id, $course->id);
+        $generator->enrol_user($u1->id, $course->id, $studentroleid);
+        $generator->enrol_user($u2->id, $course->id, $studentroleid);
+        $generator->enrol_user($u3->id, $course->id, $studentroleid);
 
+        // Page 2 allows access to users 2 and 3, while section 2 allows access
+        // to users 1 and 2.
         $pagegen = $generator->get_plugin_generator('mod_page');
         $page = $pagegen->create_instance(array('course' => $course));
         $page2 = $pagegen->create_instance(array('course' => $course,
@@ -483,5 +486,27 @@ class info_testcase extends \advanced_testcase {
         $result = $DB->get_fieldset_sql($sql, $params);
         sort($result);
         $this->assertEquals($expected, $result);
+
+        // If the students have viewhiddenactivities, they get past the module
+        // restriction.
+        role_change_permission($studentroleid, context_module::instance($page2->cmid),
+                'moodle/course:viewhiddenactivities', CAP_ALLOW);
+        $expected = array($u1->id, $u2->id);
+        $this->assertEquals($expected, array_keys($info->filter_user_list($allusers)));
+        list ($sql, $params) = $info->get_user_list_sql(true);
+        $result = $DB->get_fieldset_sql($sql, $params);
+        sort($result);
+        $this->assertEquals($expected, $result);
+
+        // If they have viewhiddensections, they also get past the section
+        // restriction.
+        role_change_permission($studentroleid, context_course::instance($course->id),
+                'moodle/course:viewhiddensections', CAP_ALLOW);
+        $expected = array($u1->id, $u2->id, $u3->id);
+        $this->assertEquals($expected, array_keys($info->filter_user_list($allusers)));
+        list ($sql, $params) = $info->get_user_list_sql(true);
+        $result = $DB->get_fieldset_sql($sql, $params);
+        sort($result);
+        $this->assertEquals($expected, $result);
     }
 }

backup/moodle2/backup_course_task.class.php

@@ -80,6 +80,9 @@ class backup_course_task extends backup_task {
             $this->add_step(new backup_enrolments_structure_step('course_enrolments', 'enrolments.xml'));
         }
 
+        // Annotate enrolment custom fields.
+        $this->add_step(new backup_enrolments_execution_step('annotate_enrol_custom_fields'));
+
         // Annotate all the groups and groupings belonging to the course
         $this->add_step(new backup_annotate_course_groups_and_groupings('annotate_course_groups'));
 

backup/moodle2/backup_enrol_plugin.class.php

@@ -0,0 +1,39 @@
+<?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/>.
+
+/**
+ * Defines backup_enrol_plugin class.
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2014 University of Wisconsin
+ * @author      Matt petro
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Base class for enrol backup plugins.
+ *
+ * @package   core_backup
+ * @copyright 2014 University of Wisconsin
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+abstract class backup_enrol_plugin extends backup_plugin {
+    // Use default parent behaviour.
+}

backup/moodle2/backup_plan_builder.class.php

@@ -44,6 +44,7 @@ require_once($CFG->dirroot . '/backup/moodle2/backup_theme_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_report_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_coursereport_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_plagiarism_plugin.class.php');
+require_once($CFG->dirroot . '/backup/moodle2/backup_enrol_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_subplugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_settingslib.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_stepslib.php');

backup/moodle2/backup_root_task.class.php

@@ -129,11 +129,10 @@ class backup_root_task extends backup_task {
         $activities->add_dependency($badges);
         $users->add_dependency($badges);
 
-        // Define calendar events (dependent of users)
+        // Define calendar events.
         $events = new backup_calendarevents_setting('calendarevents', base_setting::IS_BOOLEAN, true);
         $events->set_ui(new backup_setting_ui_checkbox($events, get_string('rootsettingcalendarevents', 'backup')));
         $this->add_setting($events);
-        $users->add_dependency($events);
 
         // Define completion (dependent of users)
         $completion = new backup_userscompletion_setting('userscompletion', base_setting::IS_BOOLEAN, true);

backup/moodle2/backup_stepslib.php

@@ -547,7 +547,8 @@ class backup_enrolments_structure_step extends backup_structure_step {
 
         $enrol->annotate_ids('role', 'roleid');
 
-        //TODO: let plugins annotate custom fields too and add more children
+        // Add enrol plugin structure.
+        $this->add_plugin_structure('enrol', $enrol, false);
 
         return $enrolments;
     }
@@ -1742,9 +1743,23 @@ class backup_zip_contents extends backup_execution_step implements file_progress
         // Get the zip packer
         $zippacker = get_file_packer('application/vnd.moodle.backup');
 
+        // Track overall progress for the 2 long-running steps (archive to
+        // pathname, get backup information).
+        $reporter = $this->task->get_progress();
+        $reporter->start_progress('backup_zip_contents', 2);
+
         // Zip files
         $result = $zippacker->archive_to_pathname($files, $zipfile, true, $this);
 
+        // If any sub-progress happened, end it.
+        if ($this->startedprogress) {
+            $this->task->get_progress()->end_progress();
+            $this->startedprogress = false;
+        } else {
+            // No progress was reported, manually move it on to the next overall task.
+            $reporter->progress(1);
+        }
+
         // Something went wrong.
         if ($result === false) {
             @unlink($zipfile);
@@ -1752,16 +1767,20 @@ class backup_zip_contents extends backup_execution_step implements file_progress
         }
         // Read to make sure it is a valid backup. Refer MDL-37877 . Delete it, if found not to be valid.
         try {
-            backup_general_helper::get_backup_information_from_mbz($zipfile);
+            backup_general_helper::get_backup_information_from_mbz($zipfile, $this);
         } catch (backup_helper_exception $e) {
             @unlink($zipfile);
             throw new backup_step_exception('error_zip_packing', '', $e->debuginfo);
         }
 
-            // If any progress happened, end it.
+        // If any sub-progress happened, end it.
         if ($this->startedprogress) {
             $this->task->get_progress()->end_progress();
+            $this->startedprogress = false;
+        } else {
+            $reporter->progress(2);
         }
+        $reporter->end_progress();
     }
 
     /**
@@ -1830,6 +1849,47 @@ class backup_activity_grade_items_to_ids extends backup_execution_step {
     }
 }
 
+
+/**
+ * This step allows enrol plugins to annotate custom fields.
+ *
+ * @package   core_backup
+ * @copyright 2014 University of Wisconsin
+ * @author    Matt Petro
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class backup_enrolments_execution_step extends backup_execution_step {
+
+    /**
+     * Function that will contain all the code to be executed.
+     */
+    protected function define_execution() {
+        global $DB;
+
+        $plugins = enrol_get_plugins(true);
+        $enrols = $DB->get_records('enrol', array(
+                'courseid' => $this->task->get_courseid()));
+
+        // Allow each enrol plugin to add annotations.
+        foreach ($enrols as $enrol) {
+            if (isset($plugins[$enrol->enrol])) {
+                $plugins[$enrol->enrol]->backup_annotate_custom_fields($this, $enrol);
+            }
+        }
+    }
+
+    /**
+     * Annotate a single name/id pair.
+     * This can be called from {@link enrol_plugin::backup_annotate_custom_fields()}.
+     *
+     * @param string $itemname
+     * @param int $itemid
+     */
+    public function annotate_id($itemname, $itemid) {
+        backup_structure_dbops::insert_backup_ids_record($this->get_backupid(), $itemname, $itemid);
+    }
+}
+
 /**
  * This step will annotate all the groups and groupings belonging to the course
  */
@@ -1925,13 +1985,22 @@ class backup_annotate_all_question_files extends backup_execution_step {
         $components = backup_qtype_plugin::get_components_and_fileareas();
         // Let's loop
         foreach($rs as $record) {
-            // We don't need to specify filearea nor itemid as far as by
-            // component and context it's enough to annotate the whole bank files
-            // This backups "questiontext", "generalfeedback" and "answerfeedback" fileareas (all them
-            // belonging to the "question" component
-            backup_structure_dbops::annotate_files($this->get_backupid(), $record->contextid, 'question', null, null);
-            // Again, it is enough to pick files only by context and component
-            // Do it for qtype specific components
+            // Backup all the file areas the are managed by the core question component.
+            // That is, by the question_type base class. In particular, we don't want
+            // to include files belonging to responses here.
+            backup_structure_dbops::annotate_files($this->get_backupid(), $record->contextid, 'question', 'questiontext', null);
+            backup_structure_dbops::annotate_files($this->get_backupid(), $record->contextid, 'question', 'generalfeedback', null);
+            backup_structure_dbops::annotate_files($this->get_backupid(), $record->contextid, 'question', 'answer', null);
+            backup_structure_dbops::annotate_files($this->get_backupid(), $record->contextid, 'question', 'answerfeedback', null);
+            backup_structure_dbops::annotate_files($this->get_backupid(), $record->contextid, 'question', 'hint', null);
+            backup_structure_dbops::annotate_files($this->get_backupid(), $record->contextid, 'question', 'correctfeedback', null);
+            backup_structure_dbops::annotate_files($this->get_backupid(), $record->contextid, 'question', 'partiallycorrectfeedback', null);
+            backup_structure_dbops::annotate_files($this->get_backupid(), $record->contextid, 'question', 'incorrectfeedback', null);
+
+            // For files belonging to question types, we make the leap of faith that
+            // all the files belonging to the question type are part of the question definition,
+            // so we can just backup all the files in bulk, without specifying each
+            // file area name separately.
             foreach ($components as $component => $fileareas) {
                 backup_structure_dbops::annotate_files($this->get_backupid(), $record->contextid, $component, null, null);
             }
@@ -2299,7 +2368,8 @@ class backup_course_completion_structure_step extends backup_structure_step {
         $cc = new backup_nested_element('course_completion');
 
         $criteria = new backup_nested_element('course_completion_criteria', array('id'), array(
-            'course','criteriatype', 'module', 'moduleinstance', 'courseinstanceshortname', 'enrolperiod', 'timeend', 'gradepass', 'role'
+            'course', 'criteriatype', 'module', 'moduleinstance', 'courseinstanceshortname', 'enrolperiod',
+            'timeend', 'gradepass', 'role', 'roleshortname'
         ));
 
         $criteriacompletions = new backup_nested_element('course_completion_crit_completions');
@@ -2322,12 +2392,15 @@ class backup_course_completion_structure_step extends backup_structure_step {
         $cc->add_child($coursecompletions);
         $cc->add_child($aggregatemethod);
 
-        // We need to get the courseinstances shortname rather than an ID for restore
-        $criteria->set_source_sql("SELECT ccc.*, c.shortname AS courseinstanceshortname
-                                   FROM {course_completion_criteria} ccc
-                                   LEFT JOIN {course} c ON c.id = ccc.courseinstance
-                                   WHERE ccc.course = ?", array(backup::VAR_COURSEID));
-
+        // We need some extra data for the restore.
+        // - courseinstances shortname rather than an ID.
+        // - roleshortname in case restoring on a different site.
+        $sourcesql = "SELECT ccc.*, c.shortname AS courseinstanceshortname, r.shortname AS roleshortname
+                        FROM {course_completion_criteria} ccc
+                   LEFT JOIN {course} c ON c.id = ccc.courseinstance
+                   LEFT JOIN {role} r ON r.id = ccc.role
+                       WHERE ccc.course = ?";
+        $criteria->set_source_sql($sourcesql, array(backup::VAR_COURSEID));
 
         $aggregatemethod->set_source_table('course_completion_aggr_methd', array('course' => backup::VAR_COURSEID));
 

backup/moodle2/restore_enrol_plugin.class.php

@@ -0,0 +1,39 @@
+<?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/>.
+
+/**
+ * Defines restore_enrol_plugin class.
+ *
+ * @package     core_backup
+ * @subpackage  moodle2
+ * @category    backup
+ * @copyright   2014 University of Wisconsin
+ * @author      Matt petro
+ * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Base class for enrol backup plugins.
+ *
+ * @package   core_backup
+ * @copyright 2014 University of Wisconsin
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+abstract class restore_enrol_plugin extends restore_plugin {
+    // Use default parent behaviour.
+}

backup/moodle2/restore_plan_builder.class.php

@@ -43,6 +43,7 @@ require_once($CFG->dirroot . '/backup/moodle2/restore_report_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/restore_coursereport_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/restore_plagiarism_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/restore_gradingform_plugin.class.php');
+require_once($CFG->dirroot . '/backup/moodle2/restore_enrol_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_qtype_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_format_plugin.class.php');
@@ -52,6 +53,7 @@ require_once($CFG->dirroot . '/backup/moodle2/backup_report_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_coursereport_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_plagiarism_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_gradingform_plugin.class.php');
+require_once($CFG->dirroot . '/backup/moodle2/backup_enrol_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/restore_subplugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/restore_settingslib.php');
 require_once($CFG->dirroot . '/backup/moodle2/restore_stepslib.php');

backup/moodle2/restore_root_task.class.php

@@ -195,7 +195,7 @@ class restore_root_task extends restore_task {
         $activities->add_dependency($badges);
         $users->add_dependency($badges);
 
-        // Define Calendar events (dependent of users)
+        // Define Calendar events.
         $defaultvalue = false;                      // Safer default
         $changeable = false;
         if (isset($rootsettings['calendarevents']) && $rootsettings['calendarevents']) { // Only enabled when available
@@ -206,7 +206,6 @@ class restore_root_task extends restore_task {
         $events->set_ui(new backup_setting_ui_checkbox($events, get_string('rootsettingcalendarevents', 'backup')));
         $events->get_ui()->set_changeable($changeable);
         $this->add_setting($events);
-        $users->add_dependency($events);
 
         // Define completion (dependent of users)
         $defaultvalue = false;                      // Safer default

backup/moodle2/restore_stepslib.php

@@ -1866,12 +1866,12 @@ class restore_enrolments_structure_step extends restore_structure_step {
 
     protected function define_structure() {
 
-        $paths = array();
+        $enrol = new restore_path_element('enrol', '/enrolments/enrols/enrol');
+        $enrolment = new restore_path_element('enrolment', '/enrolments/enrols/enrol/user_enrolments/enrolment');
+        // Attach local plugin stucture to enrol element.
+        $this->add_plugin_structure('enrol', $enrol);
 
-        $paths[] = new restore_path_element('enrol', '/enrolments/enrols/enrol');
-        $paths[] = new restore_path_element('enrolment', '/enrolments/enrols/enrol/user_enrolments/enrolment');
-
-        return $paths;
+        return array($enrol, $enrolment);
     }
 
     /**
@@ -2337,15 +2337,17 @@ class restore_calendarevents_structure_step extends restore_structure_step {
     }
 
     public function process_calendarevents($data) {
-        global $DB, $SITE;
+        global $DB, $SITE, $USER;
 
         $data = (object)$data;
         $oldid = $data->id;
         $restorefiles = true; // We'll restore the files
-        // Find the userid and the groupid associated with the event. Return if not found.
+        // Find the userid and the groupid associated with the event.
         $data->userid = $this->get_mappingid('user', $data->userid);
         if ($data->userid === false) {
-            return;
+            // Blank user ID means that we are dealing with module generated events such as quiz starting times.
+            // Use the current user ID for these events.
+            $data->userid = $USER->id;
         }
         if (!empty($data->groupid)) {
             $data->groupid = $this->get_mappingid('group', $data->groupid);
@@ -2502,18 +2504,42 @@ class restore_course_completion_structure_step extends restore_structure_step {
         $data->timeend = $this->apply_date_offset($data->timeend);
 
         // Map the role from the criteria
-        if (!empty($data->role)) {
-            $data->role = $this->get_mappingid('role', $data->role);
-        }
+        if (isset($data->role) && $data->role != '') {
+            // Newer backups should include roleshortname, which makes this much easier.
+            if (!empty($data->roleshortname)) {
+                $roleinstanceid = $DB->get_field('role', 'id', array('shortname' => $data->roleshortname));
+                if (!$roleinstanceid) {
+                    $this->log(
+                        'Could not match the role shortname in course_completion_criteria, so skipping',
+                        backup::LOG_DEBUG
+                    );
+                    return;
+                }
+                $data->role = $roleinstanceid;
+            } else {
+                $data->role = $this->get_mappingid('role', $data->role);
+            }
 
-        $skipcriteria = false;
+            // Check we have an id, otherwise it causes all sorts of bugs.
+            if (!$data->role) {
+                $this->log(
+                    'Could not match role in course_completion_criteria, so skipping',
+                    backup::LOG_DEBUG
+                );
+                return;
+            }
+        }
 
         // If the completion criteria is for a module we need to map the module instance
         // to the new module id.
         if (!empty($data->moduleinstance) && !empty($data->module)) {
             $data->moduleinstance = $this->get_mappingid('course_module', $data->moduleinstance);
             if (empty($data->moduleinstance)) {
-                $skipcriteria = true;
+                $this->log(
+                    'Could not match the module instance in course_completion_criteria, so skipping',
+                    backup::LOG_DEBUG
+                );
+                return;
             }
         } else {
             $data->module = null;
@@ -2524,28 +2550,30 @@ class restore_course_completion_structure_step extends restore_structure_step {
         if (!empty($data->courseinstanceshortname)) {
             $courseinstanceid = $DB->get_field('course', 'id', array('shortname'=>$data->courseinstanceshortname));
             if (!$courseinstanceid) {
-                $skipcriteria = true;
+                $this->log(
+                    'Could not match the course instance in course_completion_criteria, so skipping',
+                    backup::LOG_DEBUG
+                );
+                return;
             }
         } else {
             $courseinstanceid = null;
         }
         $data->courseinstance = $courseinstanceid;
 
-        if (!$skipcriteria) {
-            $params = array(
-                'course'         => $data->course,
-                'criteriatype'   => $data->criteriatype,
-                'enrolperiod'    => $data->enrolperiod,
-                'courseinstance' => $data->courseinstance,
-                'module'         => $data->module,
-                'moduleinstance' => $data->moduleinstance,
-                'timeend'        => $data->timeend,
-                'gradepass'      => $data->gradepass,
-                'role'           => $data->role
-            );
-            $newid = $DB->insert_record('course_completion_criteria', $params);
-            $this->set_mapping('course_completion_criteria', $data->id, $newid);
-        }
+        $params = array(
+            'course'         => $data->course,
+            'criteriatype'   => $data->criteriatype,
+            'enrolperiod'    => $data->enrolperiod,
+            'courseinstance' => $data->courseinstance,
+            'module'         => $data->module,
+            'moduleinstance' => $data->moduleinstance,
+            'timeend'        => $data->timeend,
+            'gradepass'      => $data->gradepass,
+            'role'           => $data->role
+        );
+        $newid = $DB->insert_record('course_completion_criteria', $params);
+        $this->set_mapping('course_completion_criteria', $data->id, $newid);
     }
 
     /**
@@ -2605,7 +2633,21 @@ class restore_course_completion_structure_step extends restore_structure_step {
                 'timecompleted' => $this->apply_date_offset($data->timecompleted),
                 'reaggregate' => $data->reaggregate
             );
-            $DB->insert_record('course_completions', $params);
+
+            $existing = $DB->get_record('course_completions', array(
+                'userid' => $data->userid,
+                'course' => $data->course
+            ));
+
+            // MDL-46651 - If cron writes out a new record before we get to it
+            // then we should replace it with the Truth data from the backup.
+            // This may be obsolete after MDL-48518 is resolved
+            if ($existing) {
+                $params['id'] = $existing->id;
+                $DB->update_record('course_completions', $params);
+            } else {
+                $DB->insert_record('course_completions', $params);
+            }
         }
     }
 
@@ -2723,7 +2765,7 @@ class restore_course_logs_structure_step extends restore_structure_step {
             $manager = get_log_manager();
             if (method_exists($manager, 'legacy_add_to_log')) {
                 $manager->legacy_add_to_log($data->course, $data->module, $data->action, $data->url,
-                    $data->info, $data->cmid, $data->userid);
+                    $data->info, $data->cmid, $data->userid, $data->ip, $data->time);
             }
         }
     }
@@ -2772,7 +2814,7 @@ class restore_activity_logs_structure_step extends restore_course_logs_structure
             $manager = get_log_manager();
             if (method_exists($manager, 'legacy_add_to_log')) {
                 $manager->legacy_add_to_log($data->course, $data->module, $data->action, $data->url,
-                    $data->info, $data->cmid, $data->userid);
+                    $data->info, $data->cmid, $data->userid, $data->ip, $data->time);
             }
         }
     }
@@ -3145,11 +3187,52 @@ class restore_block_instance_structure_step extends restore_structure_step {
         }
 
         if (!$bi->instance_allow_multiple()) {
-            if ($DB->record_exists_sql("SELECT bi.id
-                                          FROM {block_instances} bi
-                                          JOIN {block} b ON b.name = bi.blockname
-                                         WHERE bi.parentcontextid = ?
-                                           AND bi.blockname = ?", array($data->parentcontextid, $data->blockname))) {
+            // The block cannot be added twice, so we will check if the same block is already being
+            // displayed on the same page. For this, rather than mocking a page and using the block_manager
+            // we use a similar query to the one in block_manager::load_blocks(), this will give us
+            // a very good idea of the blocks already displayed in the context.
+            $params =  array(
+                'blockname' => $data->blockname
+            );
+
+            // Context matching test.
+            $context = context::instance_by_id($data->parentcontextid);
+            $contextsql = 'bi.parentcontextid = :contextid';
+            $params['contextid'] = $context->id;
+
+            $parentcontextids = $context->get_parent_context_ids();
+            if ($parentcontextids) {
+                list($parentcontextsql, $parentcontextparams) =
+                        $DB->get_in_or_equal($parentcontextids, SQL_PARAMS_NAMED);
+                $contextsql = "($contextsql OR (bi.showinsubcontexts = 1 AND bi.parentcontextid $parentcontextsql))";
+                $params = array_merge($params, $parentcontextparams);
+            }
+
+            // Page type pattern test.
+            $pagetypepatterns = matching_page_type_patterns_from_pattern($data->pagetypepattern);
+            list($pagetypepatternsql, $pagetypepatternparams) =
+                $DB->get_in_or_equal($pagetypepatterns, SQL_PARAMS_NAMED);
+            $params = array_merge($params, $pagetypepatternparams);
+
+            // Sub page pattern test.
+            $subpagepatternsql = 'bi.subpagepattern IS NULL';
+            if ($data->subpagepattern !== null) {
+                $subpagepatternsql = "($subpagepatternsql OR bi.subpagepattern = :subpagepattern)";
+                $params['subpagepattern'] = $data->subpagepattern;
+            }
+
+            $exists = $DB->record_exists_sql("SELECT bi.id
+                                                FROM {block_instances} bi
+                                                JOIN {block} b ON b.name = bi.blockname
+                                               WHERE bi.blockname = :blockname
+                                                 AND $contextsql
+                                                 AND bi.pagetypepattern $pagetypepatternsql
+                                                 AND $subpagepatternsql", $params);
+            if ($exists) {
+                // There is at least one very similar block visible on the page where we
+                // are trying to restore the block. In these circumstances the block API
+                // would not allow the user to add another instance of the block, so we
+                // apply the same rule here.
                 return false;
             }
         }

backup/restore.php

@@ -6,6 +6,7 @@ require_once($CFG->dirroot . '/backup/util/includes/restore_includes.php');
 
 $contextid   = required_param('contextid', PARAM_INT);
 $stage       = optional_param('stage', restore_ui::STAGE_CONFIRM, PARAM_INT);
+$cancel      = optional_param('cancel', '', PARAM_ALPHA);
 
 list($context, $course, $cm) = get_context_info_array($contextid);
 
@@ -30,7 +31,10 @@ $PAGE->set_title($courseshortname . ': ' . get_string('restore'));
 $PAGE->set_heading($coursefullname);
 
 $renderer = $PAGE->get_renderer('core','backup');
-echo $OUTPUT->header();
+if (empty($cancel)) {
+    // Do not print the header if user cancelled the process, as we are going to redirect the user.
+    echo $OUTPUT->header();
+}
 
 // Prepare a progress bar which can display optionally during long-running
 // operations while setting up the UI.

backup/util/helper/backup_cron_helper.class.php

@@ -396,18 +396,36 @@ abstract class backup_cron_automated_helper {
             $results = $bc->get_results();
             $outcome = self::outcome_from_results($results);
             $file = $results['backup_destination']; // May be empty if file already moved to target location.
-            if (!file_exists($dir) || !is_dir($dir) || !is_writable($dir)) {
+
+            if (empty($dir) && $storage !== 0) {
+                // This is intentionally left as a warning instead of an error because of the current behaviour of backup settings.
+                // See MDL-48266 for details.
+                $bc->log('No directory specified for automated backups',
+                        backup::LOG_WARNING);
+                $outcome = self::BACKUP_STATUS_WARNING;
+            } else if ($storage !== 0 && (!file_exists($dir) || !is_dir($dir) || !is_writable($dir))) {
+                // If we need to copy the backup file to an external dir and it is not writable, change status to error.
+                $bc->log('Specified backup directory is not writable - ',
+                        backup::LOG_ERROR, $dir);
                 $dir = null;
+                $outcome = self::BACKUP_STATUS_ERROR;
             }
+
             // Copy file only if there was no error.
             if ($file && !empty($dir) && $storage !== 0 && $outcome != self::BACKUP_STATUS_ERROR) {
                 $filename = backup_plan_dbops::get_default_backup_filename($format, $type, $course->id, $users, $anonymised,
                         !$config->backup_shortname);
                 if (!$file->copy_content_to($dir.'/'.$filename)) {
+                    $bc->log('Attempt to copy backup file to the specified directory failed - ',
+                            backup::LOG_ERROR, $dir);
                     $outcome = self::BACKUP_STATUS_ERROR;
                 }
                 if ($outcome != self::BACKUP_STATUS_ERROR && $storage === 1) {
-                    $file->delete();
+                    if (!$file->delete()) {
+                        $outcome = self::BACKUP_STATUS_WARNING;
+                        $bc->log('Attempt to delete the backup file from course automated backup area failed - ',
+                                backup::LOG_WARNING, $file->get_filename());
+                    }
                 }
             }
 
@@ -556,9 +574,6 @@ abstract class backup_cron_automated_helper {
             return true;
         }
 
-        $backupword = str_replace(' ', '_', core_text::strtolower(get_string('backupfilename')));
-        $backupword = trim(clean_filename($backupword), '_');
-
         if (!file_exists($dir) || !is_dir($dir) || !is_writable($dir)) {
             $dir = null;
         }
@@ -573,9 +588,6 @@ abstract class backup_cron_automated_helper {
             $files = array();
             // Store all the matching files into timemodified => stored_file array.
             foreach ($fs->get_area_files($context->id, $component, $filearea, $itemid) as $file) {
-                if (strpos($file->get_filename(), $backupword) !== 0) {
-                    continue;
-                }
                 $files[$file->get_timemodified()] = $file;
             }
             if (count($files) <= $keep) {
@@ -595,8 +607,8 @@ abstract class backup_cron_automated_helper {
         if (!empty($dir) && ($storage == 1 || $storage == 2)) {
             // Calculate backup filename regex, ignoring the date/time/info parts that can be
             // variable, depending of languages, formats and automated backup settings.
-            $filename = $backupword . '-' . backup::FORMAT_MOODLE . '-' . backup::TYPE_1COURSE . '-' . $course->id . '-';
-            $regex = '#^'.preg_quote($filename, '#').'.*\.mbz$#';
+            $filename = backup::FORMAT_MOODLE . '-' . backup::TYPE_1COURSE . '-' . $course->id . '-';
+            $regex = '#' . preg_quote($filename, '#') . '.*\.mbz$#';
 
             // Store all the matching files into filename => timemodified array.
             $files = array();

backup/util/helper/backup_general_helper.class.php

@@ -230,11 +230,15 @@ abstract class backup_general_helper extends backup_helper {
      * This will only extract the moodle_backup.xml file from an MBZ
      * file and then call {@link self::get_backup_information()}.
      *
+     * This can be a long-running (multi-minute) operation for large backups.
+     * Pass a $progress value to receive progress updates.
+     *
      * @param string $filepath absolute path to the MBZ file.
+     * @param file_progress $progress Progress updates
      * @return stdClass containing information.
      * @since Moodle 2.4
      */
-    public static function get_backup_information_from_mbz($filepath) {
+    public static function get_backup_information_from_mbz($filepath, file_progress $progress = null) {
         global $CFG;
         if (!is_readable($filepath)) {
             throw new backup_helper_exception('missing_moodle_backup_file', $filepath);
@@ -245,7 +249,7 @@ abstract class backup_general_helper extends backup_helper {
         $tmpdir = $CFG->tempdir . '/backup/' . $tmpname;
         $fp = get_file_packer('application/vnd.moodle.backup');
 
-        $extracted = $fp->extract_to_pathname($filepath, $tmpdir, array('moodle_backup.xml'));
+        $extracted = $fp->extract_to_pathname($filepath, $tmpdir, array('moodle_backup.xml'), $progress);
         $moodlefile =  $tmpdir . '/' . 'moodle_backup.xml';
         if (!$extracted || !is_readable($moodlefile)) {
             throw new backup_helper_exception('missing_moodle_backup_xml_file', $moodlefile);

backup/util/helper/backup_helper.class.php

@@ -298,6 +298,10 @@ abstract class backup_helper {
                     @chmod($filedest, $CFG->filepermissions); // may fail because the permissions may not make sense outside of dataroot
                     unlink($filepath);
                     return null;
+                } else {
+                    $bc = backup_controller::load_controller($backupid);
+                    $bc->log('Attempt to copy backup file to the specified directory using filesystem failed - ',
+                            backup::LOG_WARNING, $dir);
                 }
                 // bad luck, try to deal with the file the old way - keep backup in file area if we can not copy to ext system
             }

backup/util/helper/tests/cronhelper_test.php

@@ -33,6 +33,19 @@ require_once($CFG->dirroot . '/backup/util/helper/backup_cron_helper.class.php')
  */
 class backup_cron_helper_testcase extends advanced_testcase {
 
+    /**
+     * @var String keep system default timezone.
+     */
+    protected $systemdefaulttimezone;
+
+    /**
+     * Setup.
+     */
+    protected function setUp() {
+        parent::setUp();
+        $this->systemdefaulttimezone = date_default_timezone_get();
+    }
+
     /**
      * Test {@link backup_cron_automated_helper::calculate_next_automated_backup}.
      */
@@ -457,4 +470,12 @@ class backup_cron_helper_testcase extends advanced_testcase {
         $this->assertEquals($expected, date('w-H:i', $next));
 
     }
+
+    /**
+     * Set timezone back to default.
+     */
+    protected function tearDown() {
+        date_default_timezone_set($this->systemdefaulttimezone);
+        parent::tearDown();
+    }
 }

backup/util/ui/renderer.php

@@ -301,6 +301,11 @@ class core_backup_renderer extends plugin_renderer_base {
             $html .= html_writer::end_tag('form');
         }
 
+        // If we are restoring an activity, then include the current course.
+        if (!$wholecourse) {
+            $courses->invalidate_results(); // Clean list of courses.
+            $courses->set_include_currentcourse();
+        }
         if (!empty($courses) && ($courses->get_count() > 0 || $courses->get_search())) {
             // Existing course
             $hasrestoreoption = true;
@@ -311,10 +316,7 @@ class core_backup_renderer extends plugin_renderer_base {
                 $html .= $this->backup_detail_input(get_string('restoretoexistingcourseadding', 'backup'), 'radio', 'target', backup::TARGET_EXISTING_ADDING, array('checked'=>'checked'));
                 $html .= $this->backup_detail_input(get_string('restoretoexistingcoursedeleting', 'backup'), 'radio', 'target', backup::TARGET_EXISTING_DELETING);
             } else {
-                // We only allow restore adding to existing for now. Enforce it here.
                 $html .= html_writer::empty_tag('input', array('type'=>'hidden', 'name'=>'target', 'value'=>backup::TARGET_EXISTING_ADDING));
-                $courses->invalidate_results(); // Clean list of courses
-                $courses->set_include_currentcourse(); // Show current course in the list
             }
             $selectacoursehtml = $this->backup_detail_pair(get_string('selectacourse', 'backup'), $this->render($courses));
             // Display the course selection as required if the form was submitted but this data was not supplied.

badges/criteria/award_criteria.php

@@ -223,7 +223,7 @@ abstract class award_criteria {
         if (!empty($this->params)) {
             if (count($this->params) > 1) {
                 echo $OUTPUT->box(get_string('criteria_descr_' . $this->criteriatype, 'badges',
-                        strtoupper($agg[$data->get_aggregation_method($this->criteriatype)])), array('clearfix'));
+                        core_text::strtoupper($agg[$data->get_aggregation_method($this->criteriatype)])), array('clearfix'));
             } else {
                 echo $OUTPUT->box(get_string('criteria_descr_single_' . $this->criteriatype , 'badges'), array('clearfix'));
             }

badges/criteria/award_criteria_overall.php

@@ -60,7 +60,7 @@ class award_criteria_overall extends award_criteria {
                 echo html_writer::table($table);
             } else {
                 echo $OUTPUT->box(get_string('criteria_descr_' . $this->criteriatype, 'badges',
-                        strtoupper($agg[$data->get_aggregation_method()])), 'clearfix');
+                        core_text::strtoupper($agg[$data->get_aggregation_method()])), 'clearfix');
             }
             echo $OUTPUT->box_end();
         }

badges/renderer.php

@@ -140,7 +140,7 @@ class core_badges_renderer extends plugin_renderer_base {
         $dl = array();
         $dl[get_string('name')] = $badge->name;
         $dl[get_string('description', 'badges')] = $badge->description;
-        $dl[get_string('createdon', 'search')] = $badge->timecreated;
+        $dl[get_string('createdon', 'search')] = userdate($badge->timecreated);
         $dl[get_string('badgeimage', 'badges')] = print_badge_image($badge, $context, 'large');
         $display .= $this->definition_list($dl);
 
@@ -362,7 +362,7 @@ class core_badges_renderer extends plugin_renderer_base {
                     $items[] = get_string('criteria_descr_single_' . $type , 'badges') . $c->get_details();
                 } else {
                     $items[] = get_string('criteria_descr_' . $type , 'badges',
-                            strtoupper($agg[$badge->get_aggregation_method($type)])) . $c->get_details();
+                            core_text::strtoupper($agg[$badge->get_aggregation_method($type)])) . $c->get_details();
                 }
             }
         }
@@ -716,7 +716,7 @@ class core_badges_renderer extends plugin_renderer_base {
             }
         } else {
             $output .= get_string('criteria_descr_' . $short . BADGE_CRITERIA_TYPE_OVERALL, 'badges',
-                                    strtoupper($agg[$badge->get_aggregation_method()]));
+                                    core_text::strtoupper($agg[$badge->get_aggregation_method()]));
         }
         $items = array();
         unset($badge->criteria[BADGE_CRITERIA_TYPE_OVERALL]);
@@ -725,7 +725,7 @@ class core_badges_renderer extends plugin_renderer_base {
                 $items[] = get_string('criteria_descr_single_' . $short . $type , 'badges') . $c->get_details($short);
             } else {
                 $items[] = get_string('criteria_descr_' . $short . $type , 'badges',
-                        strtoupper($agg[$badge->get_aggregation_method($type)])) . $c->get_details($short);
+                        core_text::strtoupper($agg[$badge->get_aggregation_method($type)])) . $c->get_details($short);
             }
         }
         $output .= html_writer::alist($items, array(), 'ul');

badges/tests/badgeslib_test.php

@@ -180,6 +180,95 @@ class core_badges_badgeslib_testcase extends advanced_testcase {
         $this->assertCount(2, $badge->get_awards());
     }
 
+    /**
+     * Test the {@link badges_get_user_badges()} function in lib/badgeslib.php
+     */
+    public function test_badges_get_user_badges() {
+        global $DB;
+
+        // Messaging is not compatible with transactions.
+        $this->preventResetByRollback();
+
+        $badges = array();
+        $user1 = $this->getDataGenerator()->create_user();
+        $user2 = $this->getDataGenerator()->create_user();
+
+        // Record the current time, we need to be precise about a couple of things.
+        $now = time();
+        // Create 11 badges with which to test.
+        for ($i = 1; $i <= 11; $i++) {
+            // Mock up a badge.
+            $badge = new stdClass();
+            $badge->id = null;
+            $badge->name = "Test badge $i";
+            $badge->description = "Testing badges $i";
+            $badge->timecreated = $now - 12;
+            $badge->timemodified = $now - 12;
+            $badge->usercreated = $user1->id;
+            $badge->usermodified = $user1->id;
+            $badge->issuername = "Test issuer";
+            $badge->issuerurl = "http://issuer-url.domain.co.nz";
+            $badge->issuercontact = "issuer@example.com";
+            $badge->expiredate = null;
+            $badge->expireperiod = null;
+            $badge->type = BADGE_TYPE_SITE;
+            $badge->courseid = null;
+            $badge->messagesubject = "Test message subject for badge $i";
+            $badge->message = "Test message body for badge $i";
+            $badge->attachment = 1;
+            $badge->notification = 0;
+            $badge->status = BADGE_STATUS_INACTIVE;
+
+            $badgeid = $DB->insert_record('badge', $badge, true);
+            $badges[$badgeid] = new badge($badgeid);
+            $badges[$badgeid]->issue($user2->id, true);
+            // Check it all actually worked.
+            $this->assertCount(1, $badges[$badgeid]->get_awards());
+
+            // Hack the database to adjust the time each badge was issued.
+            // The alternative to this is sleep which is a no-no in unit tests.
+            $DB->set_field('badge_issued', 'dateissued', $now - 11 + $i, array('userid' => $user2->id, 'badgeid' => $badgeid));
+        }
+
+        // Make sure the first user has no badges.
+        $result = badges_get_user_badges($user1->id);
+        $this->assertInternalType('array', $result);
+        $this->assertCount(0, $result);
+
+        // Check that the second user has the expected 11 badges.
+        $result = badges_get_user_badges($user2->id);
+        $this->assertCount(11, $result);
+
+        // Test pagination.
+        // Ordering is by time issued desc, so things will come out with the last awarded badge first.
+        $result = badges_get_user_badges($user2->id, 0, 0, 4);
+        $this->assertCount(4, $result);
+        $lastbadgeissued = reset($result);
+        $this->assertSame('Test badge 11', $lastbadgeissued->name);
+        // Page 2. Expecting 4 results again.
+        $result = badges_get_user_badges($user2->id, 0, 1, 4);
+        $this->assertCount(4, $result);
+        $lastbadgeissued = reset($result);
+        $this->assertSame('Test badge 7', $lastbadgeissued->name);
+        // Page 3. Expecting just three results here.
+        $result = badges_get_user_badges($user2->id, 0, 2, 4);
+        $this->assertCount(3, $result);
+        $lastbadgeissued = reset($result);
+        $this->assertSame('Test badge 3', $lastbadgeissued->name);
+        // Page 4.... there is no page 4.
+        $result = badges_get_user_badges($user2->id, 0, 3, 4);
+        $this->assertCount(0, $result);
+
+        // Test search.
+        $result = badges_get_user_badges($user2->id, 0, 0, 0, 'badge 1');
+        $this->assertCount(3, $result);
+        $lastbadgeissued = reset($result);
+        $this->assertSame('Test badge 11', $lastbadgeissued->name);
+        // The term Totara doesn't appear anywhere in the badges.
+        $result = badges_get_user_badges($user2->id, 0, 0, 0, 'Totara');
+        $this->assertCount(0, $result);
+    }
+
     public function data_for_message_from_template() {
         return array(
             array(

blocks/badges/db/upgrade.php

@@ -73,5 +73,8 @@ function xmldb_block_badges_upgrade($oldversion, $block) {
         upgrade_block_savepoint(true, 2014062600, $blockname);
     }
 
+    // Moodle v2.8.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

blocks/calendar_month/db/upgrade.php

@@ -73,5 +73,8 @@ function xmldb_block_calendar_month_upgrade($oldversion, $block) {
         upgrade_block_savepoint(true, 2014062600, $blockname);
     }
 
+    // Moodle v2.8.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

blocks/calendar_upcoming/db/upgrade.php

@@ -73,5 +73,8 @@ function xmldb_block_calendar_upcoming_upgrade($oldversion, $block) {
         upgrade_block_savepoint(true, 2014062600, $blockname);
     }
 
+    // Moodle v2.8.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }

blocks/comments/block_comments.php

@@ -78,6 +78,7 @@ class block_comments extends block_base {
         $args->displaycancel = false;
         $comment = new comment($args);
         $comment->set_view_permission(true);
+        $comment->set_fullwidth();
 
         $this->content = new stdClass();
         $this->content->text = $comment->output(true);

blocks/community/db/upgrade.php

@@ -63,5 +63,8 @@ function xmldb_block_community_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;
 }

blocks/completionstatus/block_completionstatus.php

@@ -57,6 +57,8 @@ class block_completionstatus extends block_base {
 
         // Create empty content.
         $this->content = new stdClass();
+        $this->content->text = '';
+        $this->content->footer = '';
 
         // Can edit settings?
         $can_edit = has_capability('moodle/course:update', $context);
@@ -67,13 +69,13 @@ class block_completionstatus extends block_base {
         // Don't display if completion isn't enabled!
         if (!completion_info::is_enabled_for_site()) {
             if ($can_edit) {
-                $this->content->text = get_string('completionnotenabledforsite', 'completion');
+                $this->content->text .= get_string('completionnotenabledforsite', 'completion');
             }
             return $this->content;
 
         } else if (!$info->is_enabled()) {
             if ($can_edit) {
-                $this->content->text = get_string('completionnotenabledforcourse', 'completion');
+                $this->content->text .= get_string('completionnotenabledforcourse', 'completion');
             }
             return $this->content;
         }
@@ -84,7 +86,7 @@ class block_completionstatus extends block_base {
         // Check if this course has any criteria.
         if (empty($completions)) {
             if ($can_edit) {
-                $this->content->text = get_string('nocriteriaset', 'completion');
+                $this->content->text .= get_string('nocriteriaset', 'completion');
             }
             return $this->content;
         }
@@ -230,11 +232,11 @@ class block_completionstatus extends block_base {
             $rows = array_merge($rows, $srows);
 
             $table->data = $rows;
-            $this->content->text = html_writer::table($table);
+            $this->content->text .= html_writer::table($table);
 
             // Display link to detailed view.
             $details = new moodle_url('/blocks/completionstatus/details.php', array('course' => $course->id));
-            $this->content->footer = html_writer::link($details, get_string('moredetails', 'completion'));
+            $this->content->footer .= html_writer::link($details, get_string('moredetails', 'completion'));
         } else {
             // If user is not enrolled, show error.
             $this->content->text = get_string('nottracked', 'completion');

blocks/completionstatus/db/upgrade.php

@@ -70,5 +70,8 @@ function xmldb_block_completionstatus_upgrade($oldversion, $block) {
     // 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;
 }

blocks/course_summary/db/upgrade.php

@@ -74,5 +74,8 @@ function xmldb_block_course_summary_upgrade($oldversion, $block) {
     // 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;
 }

blocks/edit_form.php

@@ -84,6 +84,12 @@ class block_edit_form extends moodleform {
         $weightoptions[$last] = get_string('bracketlast', 'block', $last);
 
         $regionoptions = $this->page->theme->get_all_block_regions();
+        foreach ($this->page->blocks->get_regions() as $region) {
+            // Make sure to add all custom regions of this particular page too.
+            if (!isset($regionoptions[$region])) {
+                $regionoptions[$region] = $region;
+            }
+        }
 
         $parentcontext = context::instance_by_id($this->block->instance->parentcontextid);
         $mform->addElement('hidden', 'bui_parentcontextid', $parentcontext->id);

blocks/html/db/upgrade.php

@@ -50,5 +50,8 @@ function xmldb_block_html_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;
 }

blocks/navigation/db/upgrade.php

@@ -75,5 +75,8 @@ function xmldb_block_navigation_upgrade($oldversion, $block) {
     // 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;
 }

blocks/recent_activity/db/upgrade.php

@@ -84,5 +84,8 @@ function xmldb_block_recent_activity_upgrade($oldversion, $block) {
     // 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;
 }

blocks/rss_client/block_rss_client.php

@@ -142,7 +142,7 @@
             $feed->set_cache_duration($CFG->block_rss_client_timeout*60);
         }
 
-        if(debugging() && $feed->error()){
+        if ($CFG->debugdeveloper && $feed->error()) {
             return '<p>'. $feedrecord->url .' Failed with code: '.$feed->error().'</p>';
         }
 
@@ -314,8 +314,7 @@
             $feed->init();
 
             if ($feed->error()) {
-                mtrace ('error');
-                mtrace ('SimplePie failed with error:'.$feed->error());
+                mtrace('Error: could not load/find the RSS feed');
                 $status = false;
             } else {
                 mtrace ('ok');

blocks/rss_client/editfeed.php

@@ -89,7 +89,7 @@ class feed_edit_form extends moodleform {
         $rss->init();
 
         if ($rss->error()) {
-            $errors['url'] = get_string('errorloadingfeed', 'block_rss_client', $rss->error());
+            $errors['url'] = get_string('couldnotfindloadrssfeed', 'block_rss_client');
         } else {
             $this->title = $rss->get_title();
             $this->description = $rss->get_description();

blocks/rss_client/lang/en/block_rss_client.php

@@ -33,6 +33,7 @@ $string['clientshowchannellinklabel'] = 'Should a link to the original site (cha
 $string['clientshowimagelabel'] = 'Show channel image if available :';
 $string['configblock'] = 'Configure this block';
 $string['couldnotfindfeed'] = 'Could not find feed with id';
+$string['couldnotfindloadrssfeed'] = 'Could not find or load the RSS feed.';
 $string['customtitlelabel'] = 'Custom title (leave blank to use title supplied by feed):';
 $string['deletefeedconfirm'] = 'Are you sure you want to delete this feed?';
 $string['disabledrssfeeds'] = 'RSS feeds are disabled';

blocks/section_links/db/upgrade.php

@@ -86,5 +86,8 @@ function xmldb_block_section_links_upgrade($oldversion, $block) {
     // 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;
 }

blocks/selfcompletion/db/upgrade.php

@@ -74,5 +74,8 @@ function xmldb_block_selfcompletion_upgrade($oldversion, $block) {
     // 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;
 }

blocks/settings/db/upgrade.php

@@ -75,5 +75,8 @@ function xmldb_block_settings_upgrade($oldversion, $block) {
     // 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;
 }

blocks/tests/behat/configure_block_throughout_site.feature

@@ -32,3 +32,27 @@ Feature: Add and configure blocks throughout the site
     And I follow "Course 1"
     # The first block matching the pattern should be top-left block
     And I should see "Comments" in the "//*[@id='region-pre' or @id='block-region-side-pre']/descendant::div[contains(concat(' ', normalize-space(@class), ' '), ' block ')]" "xpath_element"
+
+  Scenario: My home does not allow assignation of roles on blocks
+    Given the following "users" exist:
+      | username | firstname | lastname | email |
+      | manager1 | Manager | 1 | manager1@asd.com |
+    And I log in as "manager1"
+    And I click on "My home" "link" in the "Navigation" "block"
+    When I press "Customise this page"
+    Then I should not see "Assign roles in Navigation block"
+
+  Scenario: Blocks on courses can have roles assigned to them
+    Given the following "courses" exist:
+      | fullname | shortname | category |
+      | Course 1 | C1 | 0 |
+    And the following "users" exist:
+      | username | firstname | lastname | email               |
+      | teacher1 | teacher   | 1        | teacher@example.com |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+    And I log in as "teacher1"
+    And I follow "Course 1"
+    And I follow "Turn editing on"
+    Then I should see "Assign roles in Search forums block"

blog/upgrade.txt

@@ -1,4 +1,4 @@
 === 2.7 ===
 
-* blog_entry->add_association() does not accept any params.
-* blog_entry->add_associations() accepts only one param.
+* blog_entry->add_associations() does not accept any params.
+* blog_entry->add_association() accepts only one param.

cache/README.md

@@ -236,36 +236,36 @@ The second method is a lot more intensive for the system. There are defined inva
 When you invalidate by event the cache API finds all of the definitions that subscribe to the event, it then loads the stores for each of those definitions and purges the keys from each store.
 This is obviously a recursive, and therefore, intense process.
 
-### Unit tests
-Both the cache API and the cache stores have unit tests.
-Please be aware that several of the cache stores require configuration in order to be able operate in the unit tests.
-Tests for stores requiring configuration that havn't been configured will be skipped.
+### Testing
+Both the cache API and the cache stores have tests.
+Please be aware that several of the cache stores require configuration in order to be able operate in the tests.
+Tests for stores requiring configuration that haven't been configured will be skipped.
 All configuration is done in your sites config.php through definitions.
-The following snippet illustates how to configure the three core cache stores that require configuration.
+The following snippet illustrates how to configure the three core cache stores that require configuration.
 
     define('TEST_CACHESTORE_MEMCACHE_TESTSERVERS', '127.0.0.1:11211');
     define('TEST_CACHESTORE_MEMCACHED_TESTSERVERS', '127.0.0.1:11211');
     define('TEST_CACHESTORE_MONGODB_TESTSERVER', 'mongodb://localhost:27017');
 
-As of Moodle 2.8 it is also possible to set the default cache stores used when running unit tests.
+As of Moodle 2.8 it is also possible to set the default cache stores used when running tests.
 You can do this by adding the following define to your config.php file:
 
-    // xxx is one of Memcache, Memecached, mongodb or other cachestore with a test define.
+    // xxx is one of Memcache, Memcached, mongodb or other cachestore with a test define.
     define('TEST_CACHE_USING_APPLICATION_STORE', 'xxx');
 
 This allows you to run tests against a defined test store. It uses the defined value to identify a store to test against with a matching TEST_CACHESTORE define.
-Alternatively you can also run unit tests against an actual cache config.
+Alternatively you can also run tests against an actual cache config.
 To do this you must add the following to your config.php file:
 
     define('TEST_CACHE_USING_ALT_CACHE_CONFIG_PATH', true');
     $CFG->altcacheconfigpath = '/a/temp/directory/yoursite.php'
 
-This tells Moodle to use the config at $CFG->altcacheconfigpath when running unit tests.
+This tells Moodle to use the config at $CFG->altcacheconfigpath when running tests.
 There are a couple of considerations to using this method:
-* By setting $CFG->altcacheconfigpath your site will store the cache config in the specified path, not just the unit test cache config but your site config as well.
+* By setting $CFG->altcacheconfigpath your site will store the cache config in the specified path, not just the test cache config but your site config as well.
 * If you have configured your cache before setting $CFG->altcacheconfigpath you will need to copy it from moodledata/muc/config.php to the destination you specified.
 * This allows you to share a cache config between sites.
-* It also allows you to use unit tests to test your sites cache config.
+* It also allows you to use tests to test your sites cache config.
 
 Please be aware that if you are using Memcache or Memcached it is recommended to use dedicated Memcached servers.
 When caches get purged the memcached servers you have configured get purged, any data stored within them whether it belongs to Moodle or not will be removed.

cache/classes/definition.php

@@ -242,7 +242,8 @@ class cache_definition {
     protected $datasourcefile = null;
 
     /**
-     * The data source class aggregate to use. This is a super advanced setting.
+     * Deprecated - this is completely unused.
+     * @deprecated since 2.8.2
      * @var string
      */
     protected $datasourceaggregate = null;
@@ -324,11 +325,11 @@ class cache_definition {
      *
      * @param string $id
      * @param array $definition
-     * @param string $datasourceaggregate
+     * @param string $unused Used to be datasourceaggregate but that was removed and this is now unused.
      * @return cache_definition
      * @throws coding_exception
      */
-    public static function load($id, array $definition, $datasourceaggregate = null) {
+    public static function load($id, array $definition, $unused = null) {
         global $CFG;
 
         if (!array_key_exists('mode', $definition)) {
@@ -520,7 +521,6 @@ class cache_definition {
         $cachedefinition->overrideclassfile = $overrideclassfile;
         $cachedefinition->datasource = $datasource;
         $cachedefinition->datasourcefile = $datasourcefile;
-        $cachedefinition->datasourceaggregate = $datasourceaggregate;
         $cachedefinition->staticacceleration = $staticacceleration;
         $cachedefinition->staticaccelerationsize = $staticaccelerationsize;
         $cachedefinition->ttl = $ttl;

cache/classes/factory.php

@@ -126,8 +126,8 @@ class cache_factory {
                 // situation. It will use disabled alternatives where available.
                 require_once($CFG->dirroot.'/cache/disabledlib.php');
                 self::$instance = new cache_factory_disabled();
-            } else if (defined('PHPUNIT_TEST') && PHPUNIT_TEST) {
-                // We're using the regular factory.
+            } else if ((defined('PHPUNIT_TEST') && PHPUNIT_TEST) || defined('BEHAT_SITE_RUNNING')) {
+                // We're using the test factory.
                 require_once($CFG->dirroot.'/cache/tests/fixtures/lib.php');
                 self::$instance = new cache_phpunit_factory();
                 if (defined('CACHE_DISABLE_STORES') && CACHE_DISABLE_STORES !== false) {
@@ -186,17 +186,17 @@ class cache_factory {
      * @param string $component
      * @param string $area
      * @param array $identifiers
-     * @param string $aggregate
+     * @param string $unused Used to be data source aggregate however that was removed and this is now unused.
      * @return cache_application|cache_session|cache_request
      */
-    public function create_cache_from_definition($component, $area, array $identifiers = array(), $aggregate = null) {
+    public function create_cache_from_definition($component, $area, array $identifiers = array(), $unused = null) {
         $definitionname = $component.'/'.$area;
         if (isset($this->cachesfromdefinitions[$definitionname])) {
             $cache = $this->cachesfromdefinitions[$definitionname];
             $cache->set_identifiers($identifiers);
             return $cache;
         }
-        $definition = $this->create_definition($component, $area, $aggregate);
+        $definition = $this->create_definition($component, $area);
         $definition->set_identifiers($identifiers);
         $cache = $this->create_cache($definition, $identifiers);
         // Loaders are always held onto to speed up subsequent requests.
@@ -335,16 +335,17 @@ class cache_factory {
 
         // The class to use.
         $class = 'cache_config';
-        $unittest = defined('PHPUNIT_TEST') && PHPUNIT_TEST;
+        // Are we running tests of some form?
+        $testing = (defined('PHPUNIT_TEST') && PHPUNIT_TEST) || defined('BEHAT_SITE_RUNNING');
 
         // Check if this is a PHPUnit test and redirect to the phpunit config classes if it is.
-        if ($unittest) {
+        if ($testing) {
             require_once($CFG->dirroot.'/cache/locallib.php');
             require_once($CFG->dirroot.'/cache/tests/fixtures/lib.php');
             // We have just a single class for PHP unit tests. We don't care enough about its
             // performance to do otherwise and having a single method allows us to inject things into it
             // while testing.
-            $class = 'cache_config_phpunittest';
+            $class = 'cache_config_testing';
         }
 
         // Check if we need to create a config file with defaults.
@@ -352,7 +353,7 @@ class cache_factory {
 
         if ($writer || $needtocreate) {
             require_once($CFG->dirroot.'/cache/locallib.php');
-            if (!$unittest) {
+            if (!$testing) {
                 $class .= '_writer';
             }
         }
@@ -392,14 +393,13 @@ class cache_factory {
      * Creates a definition instance or returns the existing one if it has already been created.
      * @param string $component
      * @param string $area
-     * @param string $aggregate
+     * @param string $unused This used to be data source aggregate - however that functionality has been removed and
+     *        this argument is now unused.
      * @return cache_definition
+     * @throws coding_exception If the definition cannot be found.
      */
-    public function create_definition($component, $area, $aggregate = null) {
+    public function create_definition($component, $area, $unused = null) {
         $id = $component.'/'.$area;
-        if ($aggregate) {
-            $id .= '::'.$aggregate;
-        }
         if (!isset($this->definitions[$id])) {
             // This is the first time this definition has been requested.
             if ($this->is_initialising()) {
@@ -421,13 +421,6 @@ class cache_factory {
                         // To serve this purpose and avoid errors we are going to make use of an ad-hoc cache rather than
                         // search for the definition which would possibly cause an infitite loop trying to initialise the cache.
                         $definition = cache_definition::load_adhoc(cache_store::MODE_REQUEST, $component, $area);
-                        if ($aggregate !== null) {
-                            // If you get here you deserve a warning. We have to use an ad-hoc cache here, so we can't find the definition and therefor
-                            // can't find any information about the datasource or any of its aggregated.
-                            // Best of luck.
-                            debugging('An unknown cache was requested during development with an aggregate that could not be loaded. Ad-hoc cache used instead.', DEBUG_DEVELOPER);
-                            $aggregate = null;
-                        }
                     } else {
                         // Either a typo of the developer has just created the definition and is using it for the first time.
                         $this->reset();
@@ -440,10 +433,10 @@ class cache_factory {
                             debugging('Cache definitions reparsed causing cache reset in order to locate definition.
                                 You should bump the version number to ensure definitions are reprocessed.', DEBUG_DEVELOPER);
                         }
-                        $definition = cache_definition::load($id, $definition, $aggregate);
+                        $definition = cache_definition::load($id, $definition);
                     }
                 } else {
-                    $definition = cache_definition::load($id, $definition, $aggregate);
+                    $definition = cache_definition::load($id, $definition);
                 }
             }
             $this->definitions[$id] = $definition;

cache/classes/helper.php

@@ -280,13 +280,6 @@ class cache_helper {
     /**
      * Purges the cache for a specific definition.
      *
-     * If you need to purge a definition that requires identifiers or an aggregate and you don't
-     * know the details of those please use cache_helper::purge_stores_used_by_definition instead.
-     * It is a more aggressive purge and will purge all data within the store, not just the data
-     * belonging to the given definition.
-     *
-     * @todo MDL-36660: Change the signature: $aggregate must be added.
-     *
      * @param string $component
      * @param string $area
      * @param array $identifiers
@@ -298,7 +291,6 @@ class cache_helper {
         // Initialise, in case of a store.
         if ($cache instanceof cache_store) {
             $factory = cache_factory::instance();
-            // TODO MDL-36660: Providing $aggregate is required for purging purposes: $definition->get_id()
             $definition = $factory->create_definition($component, $area, null);
             $definition->set_identifiers($identifiers);
             $cache->initialise($definition);

cache/classes/loaders.php

@@ -166,12 +166,12 @@ class cache implements cache_loader {
      * @param string $component The component for the definition
      * @param string $area The area for the definition
      * @param array $identifiers Any additional identifiers that should be provided to the definition.
-     * @param string $aggregate Super advanced feature. More docs later.
+     * @param string $unused Used to be datasourceaggregate but that was removed and this is now unused.
      * @return cache_application|cache_session|cache_store
      */
-    public static function make($component, $area, array $identifiers = array(), $aggregate = null) {
+    public static function make($component, $area, array $identifiers = array(), $unused = null) {
         $factory = cache_factory::instance();
-        return $factory->create_cache_from_definition($component, $area, $identifiers, $aggregate);
+        return $factory->create_cache_from_definition($component, $area, $identifiers);
     }
 
     /**

cache/classes/store.php

@@ -377,4 +377,16 @@ abstract class cache_store implements cache_store_interface {
     public function get_warnings() {
         return array();
     }
+
+    /**
+     * Returns true if this cache store instance is both suitable for testing, and ready for testing.
+     *
+     * Cache stores that support being used as the default store for unit and acceptance testing should
+     * override this function and return true if there requirements have been met.
+     *
+     * @return bool
+     */
+    public static function ready_to_be_used_for_testing() {
+        return false;
+    }
 }

cache/disabledlib.php

@@ -184,10 +184,10 @@ class cache_factory_disabled extends cache_factory {
      *
      * @param string $component
      * @param string $area
-     * @param string $aggregate Unused.
+     * @param string $unused Used to be datasourceaggregate but that was removed and this is now unused.
      * @return cache_definition
      */
-    public function create_definition($component, $area, $aggregate = null) {
+    public function create_definition($component, $area, $unused = null) {
         return cache_definition::load_adhoc(cache_store::MODE_REQUEST, $component, $area);
     }
 
@@ -208,11 +208,11 @@ class cache_factory_disabled extends cache_factory {
      * @param string $component
      * @param string $area
      * @param array $identifiers
-     * @param string $aggregate
+     * @param string $unused Used to be datasourceaggregate but that was removed and this is now unused.
      * @return cache_application|cache_session|cache_request
      */
-    public function create_cache_from_definition($component, $area, array $identifiers = array(), $aggregate = null) {
-        $definition = $this->create_definition($component, $area, $aggregate);
+    public function create_cache_from_definition($component, $area, array $identifiers = array(), $unused = null) {
+        $definition = $this->create_definition($component, $area);
         $cache = $this->create_cache($definition, $identifiers);
         return $cache;
     }

cache/stores/memcache/lang/en/cachestore_memcache.php

@@ -66,5 +66,5 @@ ipaddress:port
 </pre>';
 $string['sessionhandlerconflict'] = 'Warning: A memcache instance ({$a}) has being configured to use the same memcached server as sessions. Purging all caches will lead to sessions also being purged.';
 $string['testservers'] = 'Test servers';
-$string['testservers_desc'] = 'The test servers get used for unit tests and for performance tests. It is entirely optional to set up test servers. Servers should be defined one per line and consist of a server address and optionally a port and weight.
-If no port is provided then the default port (11211) is used.';
+$string['testservers_desc'] = 'One or more connection strings for memcache servers to test against. If a test server has been specified then memcache performance can be tested using the cache performance page in the administration block.
+As an example: 127.0.0.1:11211';

cache/stores/memcache/lib.php

@@ -633,4 +633,16 @@ class cachestore_memcache extends cache_store implements cache_is_configurable {
         }
         return $warnings;
     }
+
+    /**
+     * Returns true if this cache store instance is both suitable for testing, and ready for testing.
+     *
+     * Cache stores that support being used as the default store for unit and acceptance testing should
+     * override this function and return true if there requirements have been met.
+     *
+     * @return bool
+     */
+    public static function ready_to_be_used_for_testing() {
+        return defined('TEST_CACHESTORE_MEMCACHE_TESTSERVERS');
+    }
 }

cache/stores/memcached/lang/en/cachestore_memcached.php

@@ -80,11 +80,11 @@ ipaddress:port
 </pre>';
 $string['sessionhandlerconflict'] = 'Warning: A memcached instance ({$a}) has being configured to use the same memcached server as sessions. Purging all caches will lead to sessions also being purged.';
 $string['testservers'] = 'Test servers';
-$string['testservers_desc'] = 'The test servers get used for unit tests and for performance tests. It is entirely optional to set up test servers. Servers should be defined one per line and consist of a server address and optionally a port and weight.
-If no port is provided then the default port (11211) is used.';
+$string['testservers_desc'] = 'One or more connection strings for memcached servers to test against. If a test server has been specified then memcached performance can be tested using the cache performance page in the administration block.
+As an example: 127.0.0.1:11211';
 $string['usecompression'] = 'Use compression';
 $string['usecompression_help'] = 'Enables or disables payload compression. When enabled, item values longer than a certain threshold (currently 100 bytes) will be compressed during storage and decompressed during retrieval transparently.';
 $string['useserialiser'] = 'Use serialiser';
 $string['useserialiser_help'] = 'Specifies the serializer to use for serializing non-scalar values.
 The valid serializers are Memcached::SERIALIZER_PHP or Memcached::SERIALIZER_IGBINARY.
-The latter is supported only when memcached is configured with --enable-memcached-igbinary option and the igbinary extension is loaded.';
+The latter is supported only when memcached is configured with --enable-memcached-igbinary option and the igbinary extension is loaded.';

cache/stores/memcached/lib.php

@@ -696,4 +696,16 @@ class cachestore_memcached extends cache_store implements cache_is_configurable
         }
         return $warnings;
     }
+
+    /**
+     * Returns true if this cache store instance is both suitable for testing, and ready for testing.
+     *
+     * Cache stores that support being used as the default store for unit and acceptance testing should
+     * override this function and return true if there requirements have been met.
+     *
+     * @return bool
+     */
+    public static function ready_to_be_used_for_testing() {
+        return defined('TEST_CACHESTORE_MEMCACHED_TESTSERVERS');
+    }
 }

cache/stores/mongodb/lang/en/cachestore_mongodb.php

@@ -35,7 +35,8 @@ $string['replicaset_help'] = 'The name of the replica set to connect to. If this
 $string['server'] = 'Server';
 $string['server_help'] = 'This is the connection string for the server you want to use. Multiple servers can be specified using a comma-separated list.';
 $string['testserver'] = 'Test server';
-$string['testserver_desc'] = 'This is the connection string for the test server you want to use. Test servers are entirely optional, by specifiying a test server you can run PHPunit tests for this store and can run the performance tests.';
+$string['testserver_desc'] = 'The connection string for a server to use for testing. If a test server has been specified then MongoDB performance can be tested using the cache performance page in the administration block.
+As an example: mongodb://127.0.0.1:27017';
 $string['username'] = 'Username';
 $string['username_help'] = 'The username to use when making a connection.';
 $string['usesafe'] = 'Use safe';

cache/stores/mongodb/lib.php

@@ -85,7 +85,7 @@ class cachestore_mongodb extends cache_store implements cache_is_configurable {
      * Determines if and what safe setting is to be used.
      * @var bool|int
      */
-    protected $usesafe = false;
+    protected $usesafe = true;
 
     /**
      * If set to true then multiple identifiers will be requested and used.
@@ -599,4 +599,16 @@ class cachestore_mongodb extends cache_store implements cache_is_configurable {
     public function my_name() {
         return $this->name;
     }
+
+    /**
+     * Returns true if this cache store instance is both suitable for testing, and ready for testing.
+     *
+     * Cache stores that support being used as the default store for unit and acceptance testing should
+     * override this function and return true if there requirements have been met.
+     *
+     * @return bool
+     */
+    public static function ready_to_be_used_for_testing() {
+        return defined('TEST_CACHESTORE_MONGODB_TESTSERVER');
+    }
 }

cache/stores/session/tests/session_test.php

@@ -49,7 +49,7 @@ class cachestore_session_test extends cachestore_tests {
      * Test the maxsize option.
      */
     public function test_maxsize() {
-        $config = cache_config_phpunittest::instance();
+        $config = cache_config_testing::instance();
         $config->phpunit_add_definition('phpunit/one', array(
             'mode' => cache_store::MODE_SESSION,
             'component' => 'phpunit',
@@ -171,7 +171,7 @@ class cachestore_session_test extends cachestore_tests {
     }
 
     public function test_ttl() {
-        $config = cache_config_phpunittest::instance();
+        $config = cache_config_testing::instance();
         $config->phpunit_add_definition('phpunit/three', array(
             'mode' => cache_store::MODE_SESSION,
             'component' => 'phpunit',

cache/stores/static/tests/static_test.php

@@ -50,7 +50,7 @@ class cachestore_static_test extends cachestore_tests {
      */
     public function test_maxsize() {
         $defid = 'phpunit/testmaxsize';
-        $config = cache_config_phpunittest::instance();
+        $config = cache_config_testing::instance();
         $config->phpunit_add_definition($defid, array(
             'mode' => cache_store::MODE_REQUEST,
             'component' => 'phpunit',