Moodle release 2.5.2

Merge branch 'install_25_STABLE' of git://git.moodle.org/moodle-install into MOODLE_25_STABLE
MDL-41623 rss: clean output rss content
2013-09-07 14:27:18 +02:00 · 2013-09-07 14:11:59 +02:00 · 2013-09-07 10:41:37 +08:00 · 2013-09-07 04:05:38 +02:00 · 2013-09-07 00:43:08 +00:00 · 2013-09-06 00:47:47 +00:00
756 changed files with 16818 additions and 3481 deletions
@@ -0,0 +1,91 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This script fixed incorrectly deleted users.
+ *
+ * @package    core
+ * @subpackage cli
+ * @copyright  2013 Petr Skoda (http://skodak.org)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+define('CLI_SCRIPT', true);
+
+require(__DIR__.'/../../config.php');
+require_once($CFG->libdir.'/clilib.php');
+
+
+// Now get cli options.
+list($options, $unrecognized) = cli_get_params(array('help'=>false),
+    array('h'=>'help'));
+
+if ($unrecognized) {
+    $unrecognized = implode("\n  ", $unrecognized);
+    cli_error(get_string('cliunknowoption', 'admin', $unrecognized));
+}
+
+if ($options['help']) {
+    $help =
+        "Fix incorrectly deleted users.
+
+        This scripts detects users that are marked as deleted instead
+        of calling delete_user().
+
+        Deleted users do not have original username, idnumber or email,
+        we must also delete all roles, enrolments, group memberships, etc.
+
+        Please note this script does not delete any public information
+        such as forum posts.
+
+        Options:
+        -h, --help            Print out this help
+
+        Example:
+        \$sudo -u www-data /usr/bin/php admin/cli/fix_deleted_users.php
+        ";
+
+    echo $help;
+    die;
+}
+
+cli_heading('Looking for sloppy user deletes');
+
+// Look for sloppy deleted users where somebody only flipped the deleted flag.
+$sql = "SELECT *
+          FROM {user}
+         WHERE deleted = 1 AND email LIKE '%@%' AND username NOT LIKE '%@%'";
+$rs = $DB->get_recordset_sql($sql);
+foreach ($rs as $user) {
+    echo "Redeleting user $user->id: $user->username ($user->email)\n";
+    delete_user($user);
+}
+
+cli_heading('Deleting all leftovers');
+
+$DB->set_field('user', 'idnumber', '', array('deleted'=>1));
+
+$DB->delete_records_select('role_assignments', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
+$DB->delete_records_select('cohort_members', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
+$DB->delete_records_select('groups_members', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
+$DB->delete_records_select('user_enrolments', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
+$DB->delete_records_select('user_preferences', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
+$DB->delete_records_select('user_info_data', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
+$DB->delete_records_select('user_lastaccess', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
+$DB->delete_records_select('external_tokens', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
+$DB->delete_records_select('external_services_users', "userid IN (SELECT id FROM {user} WHERE deleted = 1)");
+
+exit(0);
@@ -892,4 +892,119 @@
      </PHP_SETTING>
    </PHP_SETTINGS>
  </MOODLE>
+  <MOODLE version="2.6" requires="2.2">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="5.1.33" />
+      <VENDOR name="postgres" version="8.3" />
+      <VENDOR name="mssql" version="9.0" />
+      <VENDOR name="oracle" version="10.2" />
+    </DATABASE>
+    <PHP version="5.3.3" level="required">
+    </PHP>
+    <PCREUNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="pcreunicodewarning" />
+      </FEEDBACK>
+    </PCREUNICODE>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="mbstringrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opensslrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlrpc" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="xmlrpcrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zlib" level="optional">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="gdrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="intlrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" level="required"/>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="64M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="safe_mode" value="0" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingsafemode" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>
@@ -47,10 +47,11 @@ if (!function_exists('iconv')) {

 define('NO_OUTPUT_BUFFERING', true);

-if (empty($_GET['cache']) and empty($_POST['cache'])) {
+if (empty($_GET['cache']) and empty($_POST['cache']) and empty($_GET['sesskey']) and empty($_POST['sesskey'])) {
    // Prevent caching at all cost when visiting this page directly,
    // we redirect to self once we known no upgrades are necessary.
    // Note: $_GET and $_POST are used here intentionally because our param cleaning is not loaded yet.
+    // Note2: the sesskey is present in all block editing hacks, we can not redirect there, so enable caching.
    define('CACHE_DISABLE_ALL', true);
 }

@@ -443,7 +444,7 @@ if (during_initial_install()) {

 // Now we can be sure everything was upgraded and caches work fine,
 // redirect if necessary to make sure caching is enabled.
-if (!$cache) {
+if (!$cache and !optional_param('sesskey', '', PARAM_RAW)) {
    redirect(new moodle_url($PAGE->url, array('cache' => 1)));
 }

@@ -27,37 +27,37 @@ require_once('../config.php');
 require_once($CFG->libdir.'/adminlib.php');

 $confirm = optional_param('confirm', 0, PARAM_BOOL);
+$returnurl = optional_param('returnurl', null, PARAM_LOCALURL);

+// If we have got here as a confirmed aciton, do it.
+if ($confirm && isloggedin() && confirm_sesskey()) {
+    require_capability('moodle/site:config', context_system::instance());
+
+    // Valid request. Purge, and redirect the user back to where they came from.
+    purge_all_caches();
+
+    if ($returnurl) {
+        $returnurl = $CFG->wwwroot . $returnurl;
+    } else {
+        $returnurl = new moodle_url('/admin/purgecaches.php');
+    }
+    redirect($returnurl, get_string('purgecachesfinished', 'admin'));
+}
+
+// Otherwise, show a button to actually purge the caches.
 admin_externalpage_setup('purgecaches');

-require_login();
-require_capability('moodle/site:config', context_system::instance());
-
-if ($confirm) {
-    require_sesskey();
-
-    // Valid request. Purge, and redisplay the form so it is easy to purge again
-    // in the near future.
-    purge_all_caches();
-    redirect(new moodle_url('/admin/purgecaches.php'), get_string('purgecachesfinished', 'admin'));
-
-} else {
-    // Show a confirm form.
-    echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('purgecaches', 'admin'));
-
-    $url = new moodle_url('/admin/purgecaches.php', array('sesskey'=>sesskey(), 'confirm'=>1));
-    $button = new single_button($url, get_string('purgecaches','admin'), 'post');
-
-    // Cancel button takes them back to the page the were on, if possible,
-    // otherwise to the site home page.
-    $return = new moodle_url('/');
-    if (isset($_SERVER['HTTP_REFERER']) and !empty($_SERVER['HTTP_REFERER'])) {
-        if ($_SERVER['HTTP_REFERER'] !== "$CFG->wwwroot/$CFG->admin/purgecaches.php") {
-            $return = $_SERVER['HTTP_REFERER'];
-        }
-    }
-
-    echo $OUTPUT->confirm(get_string('purgecachesconfirm', 'admin'), $button, $return);
-    echo $OUTPUT->footer();
+$actionurl = new moodle_url('/admin/purgecaches.php', array('sesskey'=>sesskey(), 'confirm'=>1));
+if ($returnurl) {
+    $actionurl->param('returnurl', $returnurl);
 }
+
+echo $OUTPUT->header();
+echo $OUTPUT->heading(get_string('purgecaches', 'admin'));
+
+echo $OUTPUT->box_start('generalbox', 'notice');
+echo html_writer::tag('p', get_string('purgecachesconfirm', 'admin'));
+echo $OUTPUT->single_button($actionurl, get_string('purgecaches', 'admin'), 'post');
+echo $OUTPUT->box_end();
+
+echo $OUTPUT->footer();
@@ -1001,9 +1001,11 @@ class core_admin_renderer extends plugin_renderer_base {
            } else {
                $str = 'otherplugin';
            }
+            $componenturl = new moodle_url('https://moodle.org/plugins/view.php?plugin='.$component);
+            $componenturl = html_writer::tag('a', $component, array('href' => $componenturl->out()));
            $requires[] = html_writer::tag('li',
                    get_string($str, 'core_plugin',
-                            array('component' => $component, 'version' => $requiredversion)),
+                            array('component' => $componenturl, 'version' => $requiredversion)),
                    array('class' => $class));
        }

@@ -143,8 +143,10 @@ if (($action == 'edit') || ($action == 'new')) {
            $success = $repositorytype->update_options($settings);
        } else {
            $type = new repository_type($plugin, (array)$fromform, $visible);
-            $type->create();
            $success = true;
+            if (!$repoid = $type->create()) {
+                $success = false;
+            }
            $data = data_submitted();
        }
        if ($success) {
@@ -158,6 +158,7 @@ if ($hassiteconfig
    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_blocks', new lang_string('generalblocks','backup'), new lang_string('configgeneralblocks','backup'), array('value'=>1, 'locked'=>0)));
    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_filters', new lang_string('generalfilters','backup'), new lang_string('configgeneralfilters','backup'), array('value'=>1, 'locked'=>0)));
    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_comments', new lang_string('generalcomments','backup'), new lang_string('configgeneralcomments','backup'), array('value'=>1, 'locked'=>0)));
+    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_badges', new lang_string('generalbadges','backup'), new lang_string('configgeneralbadges','backup'), array('value'=>1,'locked'=>0)));
    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_userscompletion', new lang_string('generaluserscompletion','backup'), new lang_string('configgeneraluserscompletion','backup'), array('value'=>1, 'locked'=>0)));
    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_logs', new lang_string('generallogs','backup'), new lang_string('configgenerallogs','backup'), array('value'=>0, 'locked'=>0)));
    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_histories', new lang_string('generalhistories','backup'), new lang_string('configgeneralhistories','backup'), array('value'=>0, 'locked'=>0)));
@@ -231,6 +232,7 @@ if ($hassiteconfig
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_blocks', new lang_string('generalblocks','backup'), new lang_string('configgeneralblocks','backup'), 1));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_filters', new lang_string('generalfilters','backup'), new lang_string('configgeneralfilters','backup'), 1));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_comments', new lang_string('generalcomments','backup'), new lang_string('configgeneralcomments','backup'), 1));
+    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_badges', new lang_string('generalbadges','backup'), new lang_string('configgeneralbadges','backup'), 1));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_userscompletion', new lang_string('generaluserscompletion','backup'), new lang_string('configgeneraluserscompletion','backup'), 1));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_logs', new lang_string('generallogs', 'backup'), new lang_string('configgenerallogs', 'backup'), 0));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_histories', new lang_string('generalhistories','backup'), new lang_string('configgeneralhistories','backup'), 0));
@@ -65,6 +65,10 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
            60 => new lang_string('numminutes', '', 60),
            30 => new lang_string('numminutes', '', 30),
            15 => new lang_string('numminutes', '', 15))));
+        // Define the prefix to be added to imported profiling runs.
+        $temp->add(new admin_setting_configtext('profilingimportprefix',
+                new lang_string('profilingimportprefix', 'admin'),
+                new lang_string('profilingimportprefix_desc', 'admin'), '(I)', PARAM_TAG, 10));

        // Add the 'profiling' page to admin block
        $ADMIN->add('development', $temp);
@@ -62,7 +62,7 @@ class behat_admin extends behat_base {
            }

            // Search by label.
-            $searchbox = $this->find_field('Search in settings');
+            $searchbox = $this->find_field(get_string('searchinsettings', 'admin'));
            $searchbox->setValue($label);
            $submitsearch = $this->find('css', 'form.adminsearchform input[type=submit]');
            $submitsearch->press();
@@ -72,8 +72,12 @@ class behat_admin extends behat_base {
            // Admin settings does not use the same DOM structure than other moodle forms
            // but we also need to use lib/behat/form_field/* to deal with the different moodle form elements.
            $exception = new ElementNotFoundException($this->getSession(), '"' . $label . '" administration setting ');
+
+            // The argument should be converted to an xpath literal.
+            $label = $this->getSession()->getSelectorsHandler()->xpathLiteral($label);
+
            $fieldxpath = "//*[self::input | self::textarea | self::select][not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]" .
-                "[@id=//label[contains(normalize-space(string(.)), '" . $label . "')]/@for]";
+                "[@id=//label[contains(normalize-space(.), $label)]/@for]";
            $fieldnode = $this->find('xpath', $fieldxpath, $exception);
            $formfieldtypenode = $this->find('xpath', $fieldxpath . "/ancestor::div[@class='form-setting']" .
                "/child::div[contains(concat(' ', @class, ' '),  ' form-')]/child::*/parent::div");
@@ -90,7 +94,7 @@ class behat_admin extends behat_base {
            $field = behat_field_manager::get_field_instance($type, $fieldnode, $this->getSession());
            $field->set_value($value);

-            $this->find_button('Save changes')->press();
+            $this->find_button(get_string('savechanges'))->press();
        }
    }

@@ -15,7 +15,7 @@ Feature: Display extended course names
    And I should not see "C_shortname Course fullname"

  Scenario: Courses list with extended course names
-    Given I click on "Courses" "link" in the "//div[@id='settingsnav']//descendant::li[contains(concat(' ', @class, ' '), ' type_setting ')][not(contains(., 'Site administration'))][contains(., 'Appearance')]" "xpath_element"
+    Given I click on "Courses" "link" in the "//div[@id='settingsnav']/descendant::li[contains(concat(' ', normalize-space(@class), ' '), ' type_setting ')][not(contains(., 'Site administration'))][contains(., 'Appearance')]" "xpath_element"
    And I check "Display extended course names"
    When I press "Save changes"
    And I am on homepage
@@ -14,7 +14,7 @@ Feature: Upload users
      | Section 1 | math102 | S1 |
      | Section 3 | math102 | S3 |
    And I log in as "admin"
-    And I expand "Front page settings" node
+    And I collapse "Front page settings" node
    And I expand "Site administration" node
    And I expand "Users" node
    And I expand "Accounts" node
@@ -142,6 +142,9 @@ foreach ($vars as $var) {
    $CFG->{$var} = $CFG->{'behat_' . $var};
 }

+// Clean $CFG extra values before performing any action.
+behat_clean_init_config();
+
 $CFG->noemailever = true;
 $CFG->passwordsaltmain = 'moodle';

@@ -22,8 +22,10 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

+$string['aim'] = 'This administration tool helps developers and test writers to create .feature files describing Moodle\'s functionalities and run them automatically.';
 $string['allavailablesteps'] = 'All the available steps definitions';
 $string['giveninfo'] = 'Given. Processes to set up the environment';
+$string['infoheading'] = 'Info';
 $string['installinfo'] = 'Read {$a} for installation and tests execution info';
 $string['moreinfoin'] = 'More info in {$a}';
 $string['newstepsinfo'] = 'Read {$a} for info about how to add new steps definitions';
@@ -39,6 +41,5 @@ $string['theninfo'] = 'Then. Checkings to ensure the outcomes are the expected o
 $string['viewsteps'] = 'Filter';
 $string['wheninfo'] = 'When. Actions that provokes an event';
 $string['wrongbehatsetup'] = 'Something is wrong with behat setup, ensure:<ul>
-<li>You ran "curl http://getcomposer.org/installer | php"</li>
-<li>You ran "php composer.phar install --dev"</li>
+<li>You ran "php admin/tool/behat/cli/init.php" from your moodle root directory</li>
 <li>vendor/bin/behat file has execution permissions</li></ul>';
@@ -25,7 +25,7 @@
 defined('MOODLE_INTERNAL') || die();

 global $CFG;
-require_once($CFG->libdir . '/behat/classes/behat_command.php');
+require_once($CFG->libdir . '/behat/classes/behat_selectors.php');

 /**
 * Renderer for behat tool web features
@@ -64,9 +64,10 @@ class tool_behat_renderer extends plugin_renderer_base {
            get_string('newstepsinfo', 'tool_behat', $writestepslink)
        );

-        // List of steps
+        // List of steps.
        $html .= $this->output->box_start();
-        $html .= html_writer::tag('h1', 'Info');
+        $html .= html_writer::tag('h1', get_string('infoheading', 'tool_behat'));
+        $html .= html_writer::tag('div', get_string('aim', 'tool_behat'));
        $html .= html_writer::empty_tag('div');
        $html .= html_writer::empty_tag('ul');
        $html .= html_writer::empty_tag('li');
@@ -91,7 +92,7 @@ class tool_behat_renderer extends plugin_renderer_base {
            // Replace text selector type arguments with a user-friendly select.
            $stepsdefinitions = preg_replace_callback('/(TEXT_SELECTOR\d?_STRING)/',
                function ($matches) {
-                    return html_writer::select(behat_command::$allowedtextselectors, uniqid());
+                    return html_writer::select(behat_selectors::get_allowed_text_selectors(), uniqid());
                },
                $stepsdefinitions
            );
@@ -99,7 +100,7 @@ class tool_behat_renderer extends plugin_renderer_base {
            // Replace selector type arguments with a user-friendly select.
            $stepsdefinitions = preg_replace_callback('/(SELECTOR\d?_STRING)/',
                function ($matches) {
-                    return html_writer::select(behat_command::$allowedselectors, uniqid());
+                    return html_writer::select(behat_selectors::get_allowed_selectors(), uniqid());
                },
                $stepsdefinitions
            );
@@ -35,9 +35,9 @@ Feature: Page contents assertions
      | Course 1 | C1 | 0 |
    And I log in as "admin"
    And I follow "Course 1"
-    When I click on "Move this to the dock" "button" in the ".block_settings" "css_element"
+    When I click on "Move this to the dock" "button" in the "Administration" "block"
    Then I should not see "Question bank"
-    And I click on "//div[@id='dock']/descendant::*[contains(., 'Administration')]/h2" "xpath_element"
+    And I click on "//div[@id='dock']/descendant::h2[normalize-space(.)='Administration']" "xpath_element"

  @javascript
  Scenario: Locators inside specific DOM nodes using XPath
@@ -45,5 +45,5 @@ Feature: Page contents assertions
      | fullname | shortname | category |
      | Course 1 | C1 | 0 |
    And I log in as "admin"
-    When I click on "Move this to the dock" "button" in the "//*[contains(concat(' ', normalize-space(@class), ' '), ' block_settings ')]" "xpath_element"
+    When I click on "Move this to the dock" "button" in the "Administration" "block"
    Then I should not see "Turn editing on"
@@ -30,6 +30,17 @@ Feature: Set up contextual data for tests
    Then I should see "Course 1"
    And I should see "Course 2"
    And I should see "Course 3"
+    And I go to the courses management page
+    And I follow "Cat 1"
+    And I should see "Cat 2"
+    And I should see "Cat 3"
+    And I follow "Cat 3"
+    And I should see "Course 1"
+    And I should see "Course 2"
+    And I select "Cat 1 / Cat 2" from "Course categories:"
+    And I should see "No courses in this category"
+    And I select "Miscellaneous" from "Course categories:"
+    And I should see "Course 3"

  @javascript
  Scenario: Add a bunch of groups and groupings
@@ -38,5 +38,9 @@ function xmldb_tool_customlang_upgrade($oldversion) {
    // Put any upgrade step following this


+    // Moodle v2.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
+
    return true;
 }
@@ -32,7 +32,7 @@ $lng                    = required_param('lng', PARAM_LANG);
 $currentpage            = optional_param('p', 0, PARAM_INT);
 $translatorsubmitted    = optional_param('translatorsubmitted', 0, PARAM_BOOL);

-$PAGE->set_pagelayout('standard');
+$PAGE->set_pagelayout('report'); // Allows for wide page contents.
 $PAGE->set_url('/admin/tool/customlang/edit.php', array('lng' => $lng));
 navigation_node::override_active_url(new moodle_url('/admin/tool/customlang/index.php'));
 $PAGE->set_title(get_string('pluginname', 'tool_customlang'));
@@ -23,7 +23,7 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

-$string['install'] = 'Install selected language pack';
+$string['install'] = 'Install selected language pack(s)';
 $string['installedlangs'] = 'Installed language packs';
 $string['langimport'] = 'Language import utility';
 $string['langimportdisabled'] = 'Language import feature has been disabled. You have to update your language packs manually at the file-system level. Do not forget to purge string caches after you do so.';
@@ -37,8 +37,8 @@ $string['missinglangparent'] = 'Missing parent language <em>{$a->parent}</em> of
 $string['nolangupdateneeded'] = 'All your language packs are up to date, no update is needed';
 $string['pluginname'] = 'Language packs';
 $string['purgestringcaches'] = 'Purge string caches';
-$string['remotelangnotavailable'] = 'Because Moodle can not connect to download.moodle.org, we are unable to do language pack installation automatically. Please download the appropriate zip file(s) from http://download.moodle.org, copy them to your {$a} directory and unzip them manually.';
-$string['uninstall'] = 'Uninstall selected language pack';
+$string['remotelangnotavailable'] = 'Because Moodle cannot connect to download.moodle.org, it is not possible for language packs to be installed automatically. Please download the appropriate ZIP file(s) from <a href="http://download.moodle.org/langpack/">download.moodle.org/langpack</a>, copy them to your {$a} directory and unzip them manually.';
+$string['uninstall'] = 'Uninstall selected language pack(s)';
 $string['uninstallconfirm'] = 'You are about to completely uninstall language pack {$a}, are you sure?';
 $string['updatelangs'] = 'Update all installed language packs';

@@ -0,0 +1,56 @@
+<?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/>.
+
+/**
+ * Profiling tool export utility.
+ *
+ * @package    tool_profiling
+ * @copyright  2013 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once(dirname(__FILE__) . '/../../../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir . '/xhprof/xhprof_moodle.php');
+
+// Page parameters.
+$runid = required_param('runid', PARAM_ALPHANUM);
+$listurl = required_param('listurl', PARAM_PATH);
+
+admin_externalpage_setup('toolprofiling');
+
+$PAGE->navbar->add(get_string('export', 'tool_profiling'));
+
+// Calculate export variables.
+$tempdir = 'profiling';
+make_temp_directory($tempdir);
+$runids = array($runid);
+$filename = $runid . '.mpr';
+$filepath = $CFG->tempdir . '/' . $tempdir . '/' . $filename;
+
+// Generate the mpr file and send it.
+if (profiling_export_runs($runids, $filepath)) {
+    send_file($filepath, $filename, 0, 0, false, false, '', true);
+    unlink($filepath); // Delete once sent.
+    die;
+}
+
+// Something wrong happened, notice it and done.
+$urlparams = array(
+        'runid' => $runid,
+        'listurl' => $listurl);
+$url = new moodle_url('/admin/tool/profiling/index.php', $urlparams);
+notice(get_string('exportproblem', 'tool_profiling', $urlparams), $url);
@@ -0,0 +1,70 @@
+<?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/>.
+
+/**
+ * Profiling tool import utility.
+ *
+ * @package    tool_profiling
+ * @copyright  2013 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once(dirname(__FILE__) . '/../../../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir . '/xhprof/xhprof_moodle.php');
+require_once(dirname(__FILE__) . '/import_form.php');
+
+admin_externalpage_setup('toolprofiling');
+
+$PAGE->navbar->add(get_string('import', 'tool_profiling'));
+
+// Calculate export variables.
+$tempdir = 'profiling';
+make_temp_directory($tempdir);
+
+// URL where we'll end, both on success and failure.
+$url = new moodle_url('/admin/tool/profiling/index.php');
+
+// Instantiate the upload profiling runs form.
+$mform = new profiling_import_form();
+
+// If there is any file to import.
+if ($data = $mform->get_data()) {
+    $filename = $mform->get_new_filename('mprfile');
+    $file = $CFG->tempdir . '/' . $tempdir . '/' . $filename;
+    $status = $mform->save_file('mprfile', $file);
+    if ($status) {
+        // File saved properly, let's import it.
+        $status = profiling_import_runs($file, $data->importprefix);
+    }
+    // Delete the temp file, not needed anymore.
+    if (file_exists($file)) {
+        unlink($file);
+    }
+    if ($status) {
+        // Import ended ok, let's redirect to main profiling page.
+        redirect($url, get_string('importok', 'tool_profiling', $filename));
+    }
+} else {
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('import', 'tool_profiling'));
+    $mform->display();
+    echo $OUTPUT->footer();
+    die;
+}
+
+// Something wrong happened, notice it and done.
+notice(get_string('importproblem', 'tool_profiling', $filename), $url);
@@ -0,0 +1,47 @@
+<?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/>.
+
+/**
+ * Profiling tool import utility form.
+ *
+ * @package    tool_profiling
+ * @copyright  2013 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->libdir . '/formslib.php');
+
+class profiling_import_form extends moodleform {
+    public function definition () {
+        global $CFG;
+
+        $mform = $this->_form;
+
+        $mform->addElement('header', 'settingsheader', get_string('upload'));
+
+        $mform->addElement('filepicker', 'mprfile', get_string('file'), null, array('accepted_types' => array('.mpr', '.zip')));
+        $mform->addRule('mprfile', null, 'required');
+
+        $mform->addElement('text', 'importprefix',
+                get_string('importprefix', 'tool_profiling'), array('size' => 10));
+        $mform->setDefault('importprefix', $CFG->profilingimportprefix);
+        $mform->setType('importprefix', PARAM_TAG);
+
+        $this->add_action_buttons(false, get_string('import', 'tool_profiling'));
+    }
+}
@@ -17,8 +17,7 @@
 /**
 * Profiling tool.
 *
- * @package    tool
- * @subpackage profiling
+ * @package    tool_profiling
 * @copyright  2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */
@@ -75,12 +74,11 @@ if (isset($script)) {
    $prevreferences = $DB->get_records_select('profiling',
                                              'url = ? AND runreference = 1 AND timecreated < ?',
                                              array($run->url, $run->timecreated),
-                                              'timecreated DESC', 'runid', 0, 1);
-    $prevrunid = $prevreferences ? reset($prevreferences)->runid : false;
+                                              'timecreated DESC', 'runid, runcomment, timecreated', 0, 10);
    echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter');
    $header = get_string('lastrunof', 'tool_profiling', $script);
    echo $OUTPUT->heading($header);
-    $table = profiling_print_run($run, $prevrunid);
+    $table = profiling_print_run($run, $prevreferences);
    echo $table;
    echo $OUTPUT->box_end();

@@ -127,12 +125,11 @@ if (isset($script)) {
    $prevreferences = $DB->get_records_select('profiling',
                                              'url = ? AND runreference = 1 AND timecreated < ?',
                                              array($run->url, $run->timecreated),
-                                              'timecreated DESC', 'runid', 0, 1);
-    $prevrunid = $prevreferences ? reset($prevreferences)->runid : false;
+                                              'timecreated DESC', 'runid, runcomment, timecreated', 0, 10);
    echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter');
    $header = get_string('summaryof', 'tool_profiling', $run->url);
    echo $OUTPUT->heading($header);
-    $table = profiling_print_run($run, $prevrunid);
+    $table = profiling_print_run($run, $prevreferences);
    echo $table;
    echo $OUTPUT->box_end();

@@ -161,6 +158,9 @@ if (isset($script)) {

    echo $OUTPUT->heading($header);

+    // Print the controller block with different options.
+    echo profiling_list_controls($listurl);
+
    // TODO: Fix flexitable to validate tsort/thide/tshow/tifirs/tilast/page
    // TODO: Fix table_sql to allow it to work without WHERE clause
    // add silly condition (1 = 1) because of table_sql bug
@@ -179,9 +179,6 @@ if (isset($script)) {
    $table->define_baseurl($baseurl);
    $table->column_suppress('url');
    $table->out(PROFILING_RUNSPERPAGE, true);
-
-    // Print the controller block with different options
-    echo profiling_list_controls($listurl);
 }

 // Footer.
@@ -24,13 +24,22 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

+defined('MOODLE_INTERNAL') || die();
+
 $string['calls'] = 'Function calls';
 $string['cannotfindanyrunforurl'] = 'Sorry, cannot find any profiling run for the \'{$a}\' URL';
 $string['cannotfindanyrunforrunid'] = 'Sorry, cannot find the \'{$a}\' profiling run';
 $string['comment'] = 'Comment';
+$string['cputime'] = 'CPU time';
 $string['differencesbetween2runsof'] = 'Differences between 2 runs of {$a}';
 $string['executiontime'] = 'Execution time';
-$string['cputime'] = 'CPU time';
+$string['export'] = 'Export';
+$string['exportproblem'] = 'Some problem happened exporting the profile run "{$a->runid}" corresponding to the request "{$a->listurl}".';
+$string['exportthis'] = 'Export this profiling run';
+$string['import'] = 'Import';
+$string['importok'] = 'File "{$a}" imported successfully.';
+$string['importprefix'] = 'Import prefix';
+$string['importproblem'] = 'Some problem happened importing the file "{$a}".';
 $string['lastrunof'] = 'Summary of last run of {$a}';
 $string['markreferencerun'] = 'Mark as reference run/comment';
 $string['memory'] = 'Memory used';
@@ -42,5 +51,5 @@ $string['referencerun'] = 'Reference run/comment';
 $string['runid'] = 'Run ID';
 $string['summaryof'] = 'Summary of {$a}';
 $string['viewdetails'] = 'View profiling details';
-$string['viewdiff'] = 'View profiling differences with last reference run';
+$string['viewdiff'] = 'View profiling differences with:';
 $string['viewdiffdetails'] = 'View profiling diff details';
@@ -17,14 +17,13 @@
 /**
 * Version details.
 *
- * @package    tool
- * @subpackage profiling
+ * @package    tool_profiling
 * @copyright  2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

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

-$plugin->version   = 2013050100; // The current plugin version (Date: YYYYMMDDXX)
+$plugin->version   = 2013050200; // The current plugin version (Date: YYYYMMDDXX)
 $plugin->requires  = 2013050100; // Requires this Moodle version
 $plugin->component = 'tool_profiling'; // Full name of the plugin (used for diagnostics)
@@ -321,8 +321,8 @@ function uu_process_template_callback($username, $firstname, $lastname, $block)
 * @return array type=>name
 */
 function uu_supported_auths() {
-    // only following plugins are guaranteed to work properly
-    $whitelist = array('manual', 'nologin', 'none', 'email');
+    // Only the following plugins are guaranteed to work properly.
+    $whitelist = array('email', 'ldap', 'manual', 'nologin', 'none');
    $plugins = get_enabled_auth_plugins();
    $choices = array();
    foreach ($plugins as $plugin) {
@@ -118,7 +118,8 @@ class create_xml_file extends XMLDBAction {
    function get_plugin_type($dirpath) {
        global $CFG;
        $dirpath = $CFG->dirroot.$dirpath;
-        $plugintypes = get_plugin_types();
+        // Reverse order so that we get subplugin matches.
+        $plugintypes = array_reverse(get_plugin_types());
        foreach ($plugintypes as $plugintype => $pluginbasedir) {
            if (substr($dirpath, 0, strlen($pluginbasedir)) == $pluginbasedir) {
                return $plugintype;
@@ -33,24 +33,38 @@ $string['confirmdeleteindex'] = 'Are you absolutely sure that you want to delete
 $string['confirmdeletekey'] = 'Are you absolutely sure that you want to delete the key:';
 $string['confirmdeletetable'] = 'Are you absolutely sure that you want to delete the table:';
 $string['confirmdeletexmlfile'] = 'Are you absolutely sure that you want to delete the file:';
-$string['confirmcheckbigints'] = 'This functionality will search for <a href="http://tracker.moodle.org/browse/MDL-11038">potential wrong integer fields</a> in your Moodle server, generating (but not executing!) automatically the needed SQL statements to have all the integers in your DB properly defined.<br /><br />
-Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).<br /><br />
-It\'s highly recommended to be running the latest (+ version) available of your Moodle release (1.8, 1.9, 2.x ...) before executing the search of wrong integers.<br /><br />
+$string['confirmcheckbigints'] = 'This functionality will search for <a href="http://tracker.moodle.org/browse/MDL-11038">potential wrong integer fields</a> in your Moodle server, generating (but not executing!) automatically the needed SQL statements to have all the integers in your DB properly defined.
+
+Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).
+
+It\'s highly recommended to be running the latest (+ version) available of your Moodle release before executing the search of wrong integers.
+
 This functionality doesn\'t perform any action against the DB (just reads from it), so can be safely executed at any moment.';
-$string['confirmcheckdefaults'] = 'This functionality will search for inconsistent default values in your Moodle server, generating (but not executing!) the needed SQL statements to have all the default values properly defined.<br /><br />
-Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).<br /><br />
-It\'s highly recommended to be running the latest (+ version) available of your Moodle release (1.8, 1.9, 2.x ...) before executing the search of inconsistent default values.<br /><br />
+$string['confirmcheckdefaults'] = 'This functionality will search for inconsistent default values in your Moodle server, generating (but not executing!) the needed SQL statements to have all the default values properly defined.
+
+Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).
+
+It\'s highly recommended to be running the latest (+ version) available of your Moodle release before executing the search of inconsistent default values.
+
 This functionality doesn\'t perform any action against the DB (just reads from it), so can be safely executed at any moment.';
-$string['confirmcheckforeignkeys'] = 'This functionality will search for potential violations of the foreign keys defined in the install.xml definitions. (Moodle does not currently generate actual foreign key constraints in the database, which is why invalid data may be present.)<br /><br />
-It\'s highly recommended to be running the latest (+ version) available of your Moodle release (1.8, 1.9, 2.x ...) before executing the search of missing indexes.<br /><br />
+$string['confirmcheckforeignkeys'] = 'This functionality will search for potential violations of the foreign keys defined in the install.xml definitions. (Moodle does not currently generate actual foreign key constraints in the database, which is why invalid data may be present.)
+
+It\'s highly recommended to be running the latest (+ version) available of your Moodle release before executing the search of missing indexes.
+
 This functionality doesn\'t perform any action against the DB (just reads from it), so can be safely executed at any moment.';
-$string['confirmcheckindexes'] = 'This functionality will search for potential missing indexes in your Moodle server, generating (but not executing!) automatically the needed SQL statements to keep everything updated.<br /><br />
-Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).<br /><br />
-It\'s highly recommended to be running the latest (+ version) available of your Moodle release (1.8, 1.9, 2.x ...) before executing the search of missing indexes.<br /><br />
+$string['confirmcheckindexes'] = 'This functionality will search for potential missing indexes in your Moodle server, generating (but not executing!) automatically the needed SQL statements to keep everything updated.
+
+Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).
+
+It\'s highly recommended to be running the latest (+ version) available of your Moodle release before executing the search of missing indexes.
+
 This functionality doesn\'t perform any action against the DB (just reads from it), so can be safely executed at any moment.';
-$string['confirmcheckoraclesemantics'] = 'This functionality will search for <a href="http://tracker.moodle.org/browse/MDL-29322">Oracle varchar2 columns using BYTE semantics</a> in your Moodle server, generating (but not executing!) automatically the needed SQL statements to have all the columns converted to use CHAR semantics instead (better for cross-db compatibility and increased contents max. length).<br /><br />
-Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).<br /><br />
-It\'s highly recommended to be running the latest (+ version) available of your Moodle release (2.2, 2.3, 2.x ...) before executing the search of BYTE semantics.<br /><br />
+$string['confirmcheckoraclesemantics'] = 'This functionality will search for <a href="http://tracker.moodle.org/browse/MDL-29322">Oracle varchar2 columns using BYTE semantics</a> in your Moodle server, generating (but not executing!) automatically the needed SQL statements to have all the columns converted to use CHAR semantics instead (better for cross-db compatibility and increased contents max. length).
+
+Once generated you can copy such statements and execute them safely with your favourite SQL interface (don\'t forget to backup your data before doing that).
+
+It\'s highly recommended to be running the latest (+ version) available of your Moodle release before executing the search of BYTE semantics.
+
 This functionality doesn\'t perform any action against the DB (just reads from it), so can be safely executed at any moment.';
 $string['confirmrevertchanges'] = 'Are you absolutely sure that you want to revert changes performed over:';
 $string['create'] = 'Create';
@@ -23,6 +23,7 @@ echo $OUTPUT->header();
 //TODO: add support for large number of users

 if ($confirm and confirm_sesskey()) {
+    $notifications = '';
    list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users);
    $rs = $DB->get_recordset_select('user', "id $in", $params, '', 'id, username, secret, confirmed, auth, firstname, lastname');
    foreach ($rs as $user) {
@@ -32,12 +33,19 @@ if ($confirm and confirm_sesskey()) {
        $auth = get_auth_plugin($user->auth);
        $result = $auth->user_confirm($user->username, $user->secret);
        if ($result != AUTH_CONFIRM_OK && $result != AUTH_CONFIRM_ALREADY) {
-            echo $OUTPUT->notification(get_string('usernotconfirmed', '', fullname($user, true)));
+            $notifications .= $OUTPUT->notification(get_string('usernotconfirmed', '', fullname($user, true)));
        }
    }
    $rs->close();
-    redirect($return, get_string('changessaved'));
-
+    echo $OUTPUT->box_start('generalbox', 'notice');
+    if (!empty($notifications)) {
+        echo $notifications;
+    } else {
+        echo $OUTPUT->notification(get_string('changessaved'), 'notifysuccess');
+    }
+    $continue = new single_button(new moodle_url($return), get_string('continue'), 'post');
+    echo $OUTPUT->render($continue);
+    echo $OUTPUT->box_end();
 } else {
    list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users);
    $userlist = $DB->get_records_select_menu('user', "id $in", $params, 'fullname', 'id,'.$DB->sql_fullname().' AS fullname');
@@ -23,20 +23,27 @@ echo $OUTPUT->header();
 //TODO: add support for large number of users

 if ($confirm and confirm_sesskey()) {
-
+    $notifications = '';
    list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users);
    $rs = $DB->get_recordset_select('user', "id $in", $params);
    foreach ($rs as $user) {
        if (!is_siteadmin($user) and $USER->id != $user->id and delete_user($user)) {
            unset($SESSION->bulk_users[$user->id]);
        } else {
-            echo $OUTPUT->notification(get_string('deletednot', '', fullname($user, true)));
+            $notifications .= $OUTPUT->notification(get_string('deletednot', '', fullname($user, true)));
        }
    }
    $rs->close();
    session_gc(); // remove stale sessions
-    redirect($return, get_string('changessaved'));
-
+    echo $OUTPUT->box_start('generalbox', 'notice');
+    if (!empty($notifications)) {
+        echo $notifications;
+    } else {
+        echo $OUTPUT->notification(get_string('changessaved'), 'notifysuccess');
+    }
+    $continue = new single_button(new moodle_url($return), get_string('continue'), 'post');
+    echo $OUTPUT->render($continue);
+    echo $OUTPUT->box_end();
 } else {
    list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users);
    $userlist = $DB->get_records_select_menu('user', "id $in", $params, 'fullname', 'id,'.$DB->sql_fullname().' AS fullname');
@@ -174,7 +174,7 @@ class auth_plugin_cas extends auth_plugin_ldap {
     *
     */
    function connectCAS() {
-        global $PHPCAS_CLIENT;
+        global $CFG, $PHPCAS_CLIENT;

        if (!is_object($PHPCAS_CLIENT)) {
            // Make sure phpCAS doesn't try to start a new PHP session when connecting to the CAS server.
@@ -185,6 +185,27 @@ class auth_plugin_cas extends auth_plugin_ldap {
            }
        }

+        // If Moodle is configured to use a proxy, phpCAS needs some curl options set.
+        if (!empty($CFG->proxyhost) && !is_proxybypass($this->config->hostname)) {
+            phpCAS::setExtraCurlOption(CURLOPT_PROXY, $CFG->proxyhost);
+            if (!empty($CFG->proxyport)) {
+                phpCAS::setExtraCurlOption(CURLOPT_PROXYPORT, $CFG->proxyport);
+            }
+            if (!empty($CFG->proxytype)) {
+                // Only set CURLOPT_PROXYTYPE if it's something other than the curl-default http
+                if ($CFG->proxytype == 'SOCKS5') {
+                    phpCAS::setExtraCurlOption(CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
+                }
+            }
+            if (!empty($CFG->proxyuser) and !empty($CFG->proxypassword)) {
+                phpCAS::setExtraCurlOption(CURLOPT_PROXYUSERPWD, $CFG->proxyuser.':'.$CFG->proxypassword);
+                if (defined('CURLOPT_PROXYAUTH')) {
+                    // any proxy authentication if PHP 5.1
+                    phpCAS::setExtraCurlOption(CURLOPT_PROXYAUTH, CURLAUTH_BASIC | CURLAUTH_NTLM);
+                }
+            }
+        }
+
        if($this->config->certificate_check && $this->config->certificate_path){
            phpCAS::setCasServerCACert($this->config->certificate_path);
        }else{
@@ -0,0 +1,43 @@
+<?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/>.
+
+/**
+ * CAS authentication plugin upgrade code
+ *
+ * @package    auth_cas
+ * @copyright  2013 Iñaki Arenaza
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * @param int $oldversion the version we are upgrading from
+ * @return bool result
+ */
+function xmldb_auth_cas_upgrade($oldversion) {
+
+    // Moodle v2.5.0 release upgrade line
+    // Put any upgrade step following this
+
+    // MDL-39323 New setting in 2.5, make sure it's defined.
+    if ($oldversion < 2013052100) {
+        if (get_config('start_tls', 'auth/cas') === false) {
+            set_config('start_tls', 0, 'auth/cas');
+        }
+        upgrade_plugin_savepoint(true, 2013052100, 'auth', 'cas');
+    }
+
+    return true;
+}
@@ -26,6 +26,6 @@

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

-$plugin->version   = 2013050100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->version   = 2013052100;        // The current plugin version (Date: YYYYMMDDXX)
 $plugin->requires  = 2013050100;        // Requires this Moodle version
 $plugin->component = 'auth_cas';        // Full name of the plugin (used for diagnostics)
@@ -598,6 +598,8 @@ class auth_plugin_ldap extends auth_plugin_base {
                if ($user->firstaccess == 0) {
                    $DB->set_field('user', 'firstaccess', time(), array('id'=>$user->id));
                }
+                $euser = $DB->get_record('user', array('id' => $user->id));
+                events_trigger('user_updated', $euser);
                return AUTH_CONFIRM_OK;
            }
        } else {
@@ -770,6 +772,8 @@ class auth_plugin_ldap extends auth_plugin_base {
                        $updateuser->auth = 'nologin';
                        $DB->update_record('user', $updateuser);
                        echo "\t"; print_string('auth_dbsuspenduser', 'auth_db', array('name'=>$user->username, 'id'=>$user->id)); echo "\n";
+                        $euser = $DB->get_record('user', array('id' => $user->id));
+                        events_trigger('user_updated', $euser);
                    }
                }
            } else {
@@ -795,6 +799,8 @@ class auth_plugin_ldap extends auth_plugin_base {
                    $updateuser->auth = $this->authtype;
                    $DB->update_record('user', $updateuser);
                    echo "\t"; print_string('auth_dbreviveduser', 'auth_db', array('name'=>$user->username, 'id'=>$user->id)); echo "\n";
+                    $euser = $DB->get_record('user', array('id' => $user->id));
+                    events_trigger('user_updated', $euser);
                }
            } else {
                print_string('nouserentriestorevive', 'auth_ldap');
@@ -908,6 +914,8 @@ class auth_plugin_ldap extends auth_plugin_base {

                $id = $DB->insert_record('user', $user);
                echo "\t"; print_string('auth_dbinsertuser', 'auth_db', array('name'=>$user->username, 'id'=>$id)); echo "\n";
+                $euser = $DB->get_record('user', array('id' => $id));
+                events_trigger('user_created', $euser);
                if (!empty($this->config->forcechangepassword)) {
                    set_user_preference('auth_forcepasswordchange', 1, $id);
                }
@@ -978,6 +986,10 @@ class auth_plugin_ldap extends auth_plugin_base {
                    }
                }
            }
+            if (!empty($updatekeys)) {
+                $euser = $DB->get_record('user', array('id' => $userid));
+                events_trigger('user_updated', $euser);
+            }
        } else {
            return false;
        }
@@ -0,0 +1,43 @@
+<?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/>.
+
+/**
+ * LDAP authentication plugin upgrade code
+ *
+ * @package    auth_ldap
+ * @copyright  2013 Iñaki Arenaza
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * @param int $oldversion the version we are upgrading from
+ * @return bool result
+ */
+function xmldb_auth_ldap_upgrade($oldversion) {
+
+    // Moodle v2.5.0 release upgrade line
+    // Put any upgrade step following this
+
+    // MDL-39323 New setting in 2.5, make sure it's defined.
+    if ($oldversion < 2013052100) {
+        if (get_config('start_tls', 'auth/ldap') === false) {
+            set_config('start_tls', 0, 'auth/ldap');
+        }
+        upgrade_plugin_savepoint(true, 2013052100, 'auth', 'ldap');
+    }
+
+    return true;
+}
@@ -25,6 +25,6 @@

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

-$plugin->version   = 2013050100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->version   = 2013052100;        // The current plugin version (Date: YYYYMMDDXX)
 $plugin->requires  = 2013050100;        // Requires this Moodle version
 $plugin->component = 'auth_ldap';       // Full name of the plugin (used for diagnostics)
@@ -40,5 +40,9 @@ function xmldb_auth_manual_upgrade($oldversion) {
    // Put any upgrade step following this


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


+    // Moodle v2.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
+
    return true;
 }
@@ -49,10 +49,10 @@ class behat_auth extends behat_base {
    public function i_log_in_as($username) {

        return array(new Given('I am on homepage'),
-            new Given('I follow "Login"'),
-            new Given('I fill in "Username" with "'.$username.'"'),
-            new Given('I fill in "Password" with "'.$username.'"'),
-            new Given('I press "Login"')
+            new Given('I follow "' . get_string('login') . '"'),
+            new Given('I fill in "' . get_string('username') . '" with "' . $this->escape($username) . '"'),
+            new Given('I fill in "' . get_string('password') . '" with "'. $this->escape($username) . '"'),
+            new Given('I press "' . get_string('login') . '"')
        );
    }

@@ -62,7 +62,7 @@ class behat_auth extends behat_base {
     * @Given /^I log out$/
     */
    public function i_log_out() {
-        return new When('I follow "Logout"');
+        return new When('I follow "' . get_string('logout') . '"');
    }

 }
@@ -1,6 +1,11 @@
 This files describes API changes in /auth/* - plugins,
 information provided here is intended especially for developers.

+=== 2.5.2 ===
+
+* can_be_manually_set() - This function was introduced in the base class and returns false by default. If overriden by
+  an authentication plugin to return true, the authentication plugin will be able to be manually set for users. For example,
+  when bulk uploading users you will be able to select it as the authentication method they use.

 === 2.4 ===

@@ -109,7 +109,7 @@ abstract class backup implements checksumable {
    const OPERATION_RESTORE ='restore';// We are performing one restore

    // Version (to keep CFG->backup_version (and release) updated automatically)
-    const VERSION = 2013050100;
+    const VERSION = 2013051400;
    const RELEASE = '2.5';
 }

@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -24,16 +23,32 @@
 require_once($CFG->libdir.'/formslib.php');

 class backup_files_edit_form extends moodleform {
-    function definition() {
+
+    /**
+     * Form definition.
+     */
+    public function definition() {
        $mform =& $this->_form;
-        $contextid = $this->_customdata['contextid'];
-        $options = array('subdirs'=>0, 'maxfiles'=>-1, 'accepted_types'=>'*', 'return_types'=>FILE_INTERNAL | FILE_REFERENCE);
+
+        $options = array('subdirs' => 0, 'maxfiles' => -1, 'accepted_types' => '*', 'return_types' => FILE_INTERNAL | FILE_REFERENCE);
+
        $mform->addElement('filemanager', 'files_filemanager', get_string('files'), null, $options);
+
        $mform->addElement('hidden', 'contextid', $this->_customdata['contextid']);
+        $mform->setType('contextid', PARAM_INT);
+
        $mform->addElement('hidden', 'currentcontext', $this->_customdata['currentcontext']);
+        $mform->setType('currentcontext', PARAM_INT);
+
        $mform->addElement('hidden', 'filearea', $this->_customdata['filearea']);
+        $mform->setType('filearea', PARAM_AREA);
+
        $mform->addElement('hidden', 'component', $this->_customdata['component']);
+        $mform->setType('component', PARAM_COMPONENT);
+
        $mform->addElement('hidden', 'returnurl', $this->_customdata['returnurl']);
+        $mform->setType('returnurl', PARAM_URL);
+
        $this->add_action_buttons(true, get_string('savechanges'));
        $this->set_data($this->_customdata['data']);
    }
@@ -113,31 +113,46 @@ if ($backup->get_stage() == backup_ui::STAGE_FINAL) {
    // Mark the UI finished.
    $rc->finish_ui();
    // Execute prechecks
+    $warnings = false;
    if (!$rc->execute_precheck()) {
        $precheckresults = $rc->get_precheck_results();
-        if (is_array($precheckresults) && !empty($precheckresults['errors'])) {
-            fulldelete($tempdestination);
+        if (is_array($precheckresults)) {
+            if (!empty($precheckresults['errors'])) { // If errors are found, terminate the import.
+                fulldelete($tempdestination);

-            echo $OUTPUT->header();
-            echo $renderer->precheck_notices($precheckresults);
-            echo $OUTPUT->continue_button(new moodle_url('/course/view.php', array('id'=>$course->id)));
-            echo $OUTPUT->footer();
-            die();
+                echo $OUTPUT->header();
+                echo $renderer->precheck_notices($precheckresults);
+                echo $OUTPUT->continue_button(new moodle_url('/course/view.php', array('id'=>$course->id)));
+                echo $OUTPUT->footer();
+                die();
+            }
+            if (!empty($precheckresults['warnings'])) { // If warnings are found, go ahead but display warnings later.
+                $warnings = $precheckresults['warnings'];
+            }
        }
-    } else {
-        if ($restoretarget == backup::TARGET_CURRENT_DELETING || $restoretarget == backup::TARGET_EXISTING_DELETING) {
-            restore_dbops::delete_course_content($course->id);
-        }
-        // Execute the restore
-        $rc->execute_plan();
    }
+    if ($restoretarget == backup::TARGET_CURRENT_DELETING || $restoretarget == backup::TARGET_EXISTING_DELETING) {
+        restore_dbops::delete_course_content($course->id);
+    }
+    // Execute the restore.
+    $rc->execute_plan();

    // Delete the temp directory now
    fulldelete($tempdestination);

    // Display a notification and a continue button
    echo $OUTPUT->header();
-    echo $OUTPUT->notification(get_string('importsuccess', 'backup'),'notifysuccess');
+    if ($warnings) {
+        echo $OUTPUT->box_start();
+        echo $OUTPUT->notification(get_string('warning'), 'notifywarning');
+        echo html_writer::start_tag('ul', array('class'=>'list'));
+        foreach ($warnings as $warning) {
+            echo html_writer::tag('li', $warning);
+        }
+        echo html_writer::end_tag('ul');
+        echo $OUTPUT->box_end();
+    }
+    echo $OUTPUT->notification(get_string('importsuccess', 'backup'), 'notifysuccess');
    echo $OUTPUT->continue_button(new moodle_url('/course/view.php', array('id'=>$course->id)));
    echo $OUTPUT->footer();

@@ -92,6 +92,11 @@ class backup_final_task extends backup_task {
        // Generate the course completion
        $this->add_step(new backup_course_completion_structure_step('course_completion', 'completion.xml'));

+        // Conditionally generate the badges file.
+        if ($this->get_setting_value('badges')) {
+            $this->add_step(new backup_badges_structure_step('course_badges', 'badges.xml'));
+        }
+
        // Generate the scales file with all the (final) annotated scales
        $this->add_step(new backup_final_scales_structure_step('scaleslist', 'scales.xml'));

@@ -122,6 +122,13 @@ class backup_root_task extends backup_task {
        $this->add_setting($comments);
        $users->add_dependency($comments);

+        // Define badges (dependent of activities).
+        $badges = new backup_badges_setting('badges', base_setting::IS_BOOLEAN, true);
+        $badges->set_ui(new backup_setting_ui_checkbox($badges, get_string('rootsettingbadges', 'backup')));
+        $this->add_setting($badges);
+        $activities->add_dependency($badges);
+        $users->add_dependency($badges);
+
        // Define calendar events (dependent of users)
        $events = new backup_calendarevents_setting('calendarevents', base_setting::IS_BOOLEAN, true);
        $events->set_ui(new backup_setting_ui_checkbox($events, get_string('rootsettingcalendarevents', 'backup')));
@@ -101,6 +101,12 @@ class backup_logs_setting extends backup_anonymize_setting {}
 */
 class backup_comments_setting extends backup_anonymize_setting {}

+/**
+ * root setting to control if backup will include badges or not,
+ * depends on @backup_activities_setting
+ */
+class backup_badges_setting extends backup_generic_setting {}
+
 /**
 * root setting to control if backup will include
 * calender events or no (any level), depends of @backup_users_setting
@@ -812,6 +812,83 @@ class backup_comments_structure_step extends backup_structure_step {
    }
 }

+/**
+ * structure step in charge of constructing the badges.xml file for all the badges found
+ * in a given context
+ */
+class backup_badges_structure_step extends backup_structure_step {
+
+    protected function execute_condition() {
+        // Check that all activities have been included.
+        if ($this->task->is_excluding_activities()) {
+            return false;
+        }
+        return true;
+    }
+
+    protected function define_structure() {
+
+        // Define each element separated.
+
+        $badges = new backup_nested_element('badges');
+        $badge = new backup_nested_element('badge', array('id'), array('name', 'description',
+                'timecreated', 'timemodified', 'usercreated', 'usermodified', 'issuername',
+                'issuerurl', 'issuercontact', 'expiredate', 'expireperiod', 'type', 'courseid',
+                'message', 'messagesubject', 'attachment', 'notification', 'status', 'nextcron'));
+
+        $criteria = new backup_nested_element('criteria');
+        $criterion = new backup_nested_element('criterion', array('id'), array('badgeid',
+                'criteriatype', 'method'));
+
+        $parameters = new backup_nested_element('parameters');
+        $parameter = new backup_nested_element('parameter', array('id'), array('critid',
+                'name', 'value', 'criteriatype'));
+
+        $manual_awards = new backup_nested_element('manual_awards');
+        $manual_award = new backup_nested_element('manual_award', array('id'), array('badgeid',
+                'recipientid', 'issuerid', 'issuerrole', 'datemet'));
+
+        // Build the tree.
+
+        $badges->add_child($badge);
+        $badge->add_child($criteria);
+        $criteria->add_child($criterion);
+        $criterion->add_child($parameters);
+        $parameters->add_child($parameter);
+        $badge->add_child($manual_awards);
+        $manual_awards->add_child($manual_award);
+
+        // Define sources.
+
+        $badge->set_source_table('badge', array('courseid' => backup::VAR_COURSEID));
+        $criterion->set_source_table('badge_criteria', array('badgeid' => backup::VAR_PARENTID));
+
+        $parametersql = 'SELECT cp.*, c.criteriatype
+                             FROM {badge_criteria_param} cp JOIN {badge_criteria} c
+                                 ON cp.critid = c.id
+                             WHERE critid = :critid';
+        $parameterparams = array('critid' => backup::VAR_PARENTID);
+        $parameter->set_source_sql($parametersql, $parameterparams);
+
+        $manual_award->set_source_table('badge_manual_award', array('badgeid' => backup::VAR_PARENTID));
+
+        // Define id annotations.
+
+        $badge->annotate_ids('user', 'usercreated');
+        $badge->annotate_ids('user', 'usermodified');
+        $criterion->annotate_ids('badge', 'badgeid');
+        $parameter->annotate_ids('criterion', 'critid');
+        $badge->annotate_files('badges', 'badgeimage', 'id');
+        $manual_award->annotate_ids('badge', 'badgeid');
+        $manual_award->annotate_ids('user', 'recipientid');
+        $manual_award->annotate_ids('user', 'issuerid');
+        $manual_award->annotate_ids('role', 'issuerrole');
+
+        // Return the root element ($badges).
+        return $badges;
+    }
+}
+
 /**
 * structure step in charge of constructing the calender.xml file for all the events found
 * in a given context
@@ -73,8 +73,20 @@ class restore_course_task extends restore_task {

        $this->add_step(new restore_course_legacy_files_step('legacy_files'));

-        // Restore course enrolments (plugins and membership). Conditionally prevented for any IMPORT/HUB operation
-        if ($this->plan->get_mode() != backup::MODE_IMPORT && $this->plan->get_mode() != backup::MODE_HUB) {
+        // Deal with enrolment methods and user enrolments.
+        if ($this->plan->get_mode() == backup::MODE_IMPORT) {
+            // No need to do anything with enrolments.
+
+        } else if (!$this->get_setting_value('users') or $this->plan->get_mode() == backup::MODE_HUB) {
+            if ($this->get_target() == backup::TARGET_CURRENT_ADDING or $this->get_target() == backup::TARGET_EXISTING_ADDING) {
+                // Keep current enrolments unchanged.
+            } else {
+                // If no instances yet add default enrol methods the same way as when creating new course in UI.
+                $this->add_step(new restore_default_enrolments_step('default_enrolments'));
+            }
+
+        } else {
+            // Restore course enrolment data.
            $this->add_step(new restore_enrolments_structure_step('course_enrolments', 'enrolments.xml'));
        }

@@ -66,6 +66,11 @@ class restore_final_task extends restore_task {
            $this->add_step(new restore_course_completion_structure_step('course_completion', 'completion.xml'));
        }

+        // Conditionally restore course badges.
+        if ($this->get_setting_value('badges')) {
+            $this->add_step(new restore_badges_structure_step('course_badges', 'badges.xml'));
+        }
+
        // Review all the module_availability records in backup_ids in order
        // to match them with existing modules / grade items.
        $this->add_step(new restore_process_course_modules_availability('process_modules_availability'));
@@ -143,6 +148,9 @@ class restore_final_task extends restore_task {
        $rules[] = new restore_log_rule('course', 'report stats', 'report/stats/index.php?id={course}', '{course}');
        $rules[] = new restore_log_rule('course', 'view section', 'view.php?id={course}&sectionid={course_section}', '{course_section}');

+        // module 'grade' rules
+        $rules[] = new restore_log_rule('grade', 'update', 'report/grader/index.php?id={course}', null);
+
        // module 'user' rules
        $rules[] = new restore_log_rule('user', 'view', 'view.php?id={user}&course={course}', '{user}');
        $rules[] = new restore_log_rule('user', 'change password', 'view.php?id={user}&course={course}', '{user}');
@@ -35,6 +35,18 @@ defined('MOODLE_INTERNAL') || die();
 */
 abstract class restore_qtype_plugin extends restore_plugin {

+    /*
+     * A simple answer to id cache for a single questions answers.
+     * @var array
+     */
+    private $questionanswercache = array();
+
+    /*
+     * The id of the current question in the questionanswercache.
+     * @var int
+     */
+    private $questionanswercacheid = null;
+
    /**
     * Add to $paths the restore_path_elements needed
     * to handle question_answers for a given question
@@ -147,38 +159,32 @@ abstract class restore_qtype_plugin extends restore_plugin {

        // The question existed, we need to map the existing question_answers
        } else {
-            // Look in question_answers by answertext matching
-            $sql = 'SELECT id
-                      FROM {question_answers}
-                     WHERE question = ?
-                       AND ' . $DB->sql_compare_text('answer', 255) . ' = ' . $DB->sql_compare_text('?', 255);
-            $params = array($newquestionid, $data->answertext);
-            $newitemid = $DB->get_field_sql($sql, $params);
-
-            // Not able to find the answer, let's try cleaning the answertext
-            // of all the question answers in DB as slower fallback. MDL-30018.
-            if (!$newitemid) {
+            // Have we cached the current question?
+            if ($this->questionanswercacheid !== $newquestionid) {
+                // The question changed, purge and start again!
+                $this->questionanswercache = array();
                $params = array('question' => $newquestionid);
                $answers = $DB->get_records('question_answers', $params, '', 'id, answer');
+                $this->questionanswercacheid = $newquestionid;
+                // Cache all cleaned answers for a simple text match.
                foreach ($answers as $answer) {
-                    // Clean in the same way than {@link xml_writer::xml_safe_utf8()}.
+                    // MDL-30018: Clean in the same way as {@link xml_writer::xml_safe_utf8()}.
                    $clean = preg_replace('/[\x-\x8\xb-\xc\xe-\x1f\x7f]/is','', $answer->answer); // Clean CTRL chars.
                    $clean = preg_replace("/\r\n|\r/", "\n", $clean); // Normalize line ending.
-                    if ($clean === $data->answertext) {
-                        $newitemid = $data->id;
-                    }
+                    $this->questionanswercache[$clean] = $answer->id;
                }
            }

-            // If we haven't found the newitemid, something has gone really wrong, question in DB
-            // is missing answers, exception
-            if (!$newitemid) {
+            if (!isset($this->questionanswercache[$data->answertext])) {
+                // If we haven't found the matching answer, something has gone really wrong, the question in the DB
+                // is missing answers, throw an exception.
                $info = new stdClass();
                $info->filequestionid = $oldquestionid;
                $info->dbquestionid   = $newquestionid;
                $info->answer         = $data->answertext;
                throw new restore_step_exception('error_question_answers_missing_in_db', $info);
            }
+            $newitemid = $this->questionanswercache[$data->answertext];
        }
        // Create mapping (we'll use this intensively when restoring question_states. And also answerfeedback files)
        $this->set_mapping('question_answer', $oldid, $newitemid);
@@ -115,6 +115,7 @@ class restore_root_task extends restore_task {
        $rootenrolmanual = new restore_users_setting('enrol_migratetomanual', base_setting::IS_BOOLEAN, false);
        $rootenrolmanual->set_ui(new backup_setting_ui_checkbox($rootenrolmanual, get_string('rootenrolmanual', 'backup')));
        $rootenrolmanual->get_ui()->set_changeable(enrol_is_enabled('manual'));
+        $rootenrolmanual->get_ui()->set_changeable($changeable);
        $this->add_setting($rootenrolmanual);
        $users->add_dependency($rootenrolmanual);

@@ -180,6 +181,20 @@ class restore_root_task extends restore_task {
        $this->add_setting($comments);
        $users->add_dependency($comments);

+        // Define badges (dependent of activities).
+        $defaultvalue = false;                      // Safer default.
+        $changeable = false;
+        if (isset($rootsettings['badges']) && $rootsettings['badges']) { // Only enabled when available.
+            $defaultvalue = true;
+            $changeable = true;
+        }
+        $badges = new restore_badges_setting('badges', base_setting::IS_BOOLEAN, $defaultvalue);
+        $badges->set_ui(new backup_setting_ui_checkbox($badges, get_string('rootsettingbadges', 'backup')));
+        $badges->get_ui()->set_changeable($changeable);
+        $this->add_setting($badges);
+        $activities->add_dependency($badges);
+        $users->add_dependency($badges);
+
        // Define Calendar events (dependent of users)
        $defaultvalue = false;                      // Safer default
        $changeable = false;
@@ -63,6 +63,12 @@ class restore_activities_setting extends restore_generic_setting {}
 */
 class restore_comments_setting extends restore_role_assignments_setting {}

+/**
+ * root setting to control if restore will create badges or not,
+ * depends on @restore_activities_setting
+ */
+class restore_badges_setting extends restore_generic_setting {}
+
 /**
 * root setting to control if restore will create
 * events or no, depends of @restore_users_setting
@@ -477,6 +477,8 @@ class restore_rebuild_course_cache extends restore_execution_step {

        // Rebuild cache now that all sections are in place
        rebuild_course_cache($this->get_courseid());
+        cache_helper::purge_by_event('changesincourse');
+        cache_helper::purge_by_event('changesincoursecat');
    }
 }

@@ -631,7 +633,7 @@ class restore_load_included_files extends restore_structure_step {
        // TODO: qtype_xxx should be replaced by proper backup_qtype_plugin::get_components_and_fileareas() use,
        //       but then we'll need to change it to load plugins itself (because this is executed too early in restore)
        $isfileref   = restore_dbops::get_backup_ids_record($this->get_restoreid(), 'fileref', $data->id);
-        $iscomponent = ($data->component == 'user' || $data->component == 'group' ||
+        $iscomponent = ($data->component == 'user' || $data->component == 'group' || $data->component == 'badges' ||
                        $data->component == 'grouping' || $data->component == 'grade' ||
                        $data->component == 'question' || substr($data->component, 0, 5) == 'qtype');
        if ($isfileref || $iscomponent) {
@@ -1623,6 +1625,29 @@ class restore_ras_and_caps_structure_step extends restore_structure_step {
    }
 }

+/**
+ * If no instances yet add default enrol methods the same way as when creating new course in UI.
+ */
+class restore_default_enrolments_step extends restore_execution_step {
+    public function define_execution() {
+        global $DB;
+
+        $course = $DB->get_record('course', array('id'=>$this->get_courseid()), '*', MUST_EXIST);
+
+        if ($DB->record_exists('enrol', array('courseid'=>$this->get_courseid(), 'enrol'=>'manual'))) {
+            // Something already added instances, do not add default instances.
+            $plugins = enrol_get_plugins(true);
+            foreach ($plugins as $plugin) {
+                $plugin->restore_sync_course($course);
+            }
+
+        } else {
+            // Looks like a newly created course.
+            enrol_course_updated(true, $course, null);
+        }
+    }
+}
+
 /**
 * This structure steps restores the enrol plugins and their underlying
 * enrolments, performing all the mappings and/or movements required
@@ -1930,6 +1955,178 @@ class restore_comments_structure_step extends restore_structure_step {
    }
 }

+/**
+ * This structure steps restores the badges and their configs
+ */
+class restore_badges_structure_step extends restore_structure_step {
+
+    /**
+     * Conditionally decide if this step should be executed.
+     *
+     * This function checks the following parameters:
+     *
+     *   1. Badges and course badges are enabled on the site.
+     *   2. The course/badges.xml file exists.
+     *   3. All modules are restorable.
+     *   4. All modules are marked for restore.
+     *
+     * @return bool True is safe to execute, false otherwise
+     */
+    protected function execute_condition() {
+        global $CFG;
+
+        // First check is badges and course level badges are enabled on this site.
+        if (empty($CFG->enablebadges) || empty($CFG->badges_allowcoursebadges)) {
+            // Disabled, don't restore course badges.
+            return false;
+        }
+
+        // Check if badges.xml is included in the backup.
+        $fullpath = $this->task->get_taskbasepath();
+        $fullpath = rtrim($fullpath, '/') . '/' . $this->filename;
+        if (!file_exists($fullpath)) {
+            // Not found, can't restore course badges.
+            return false;
+        }
+
+        // Check we are able to restore all backed up modules.
+        if ($this->task->is_missing_modules()) {
+            return false;
+        }
+
+        // Finally check all modules within the backup are being restored.
+        if ($this->task->is_excluding_activities()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    protected function define_structure() {
+        $paths = array();
+        $paths[] = new restore_path_element('badge', '/badges/badge');
+        $paths[] = new restore_path_element('criterion', '/badges/badge/criteria/criterion');
+        $paths[] = new restore_path_element('parameter', '/badges/badge/criteria/criterion/parameters/parameter');
+        $paths[] = new restore_path_element('manual_award', '/badges/badge/manual_awards/manual_award');
+
+        return $paths;
+    }
+
+    public function process_badge($data) {
+        global $DB, $CFG;
+
+        require_once($CFG->libdir . '/badgeslib.php');
+
+        $data = (object)$data;
+        $data->usercreated = $this->get_mappingid('user', $data->usercreated);
+        $data->usermodified = $this->get_mappingid('user', $data->usermodified);
+
+        // We'll restore the badge image.
+        $restorefiles = true;
+
+        $courseid = $this->get_courseid();
+
+        $params = array(
+                'name'           => $data->name,
+                'description'    => $data->description,
+                'image'          => 0,
+                'timecreated'    => $this->apply_date_offset($data->timecreated),
+                'timemodified'   => $this->apply_date_offset($data->timemodified),
+                'usercreated'    => $data->usercreated,
+                'usermodified'   => $data->usermodified,
+                'issuername'     => $data->issuername,
+                'issuerurl'      => $data->issuerurl,
+                'issuercontact'  => $data->issuercontact,
+                'expiredate'     => $this->apply_date_offset($data->expiredate),
+                'expireperiod'   => $data->expireperiod,
+                'type'           => BADGE_TYPE_COURSE,
+                'courseid'       => $courseid,
+                'message'        => $data->message,
+                'messagesubject' => $data->messagesubject,
+                'attachment'     => $data->attachment,
+                'notification'   => $data->notification,
+                'status'         => BADGE_STATUS_INACTIVE,
+                'nextcron'       => $this->apply_date_offset($data->nextcron)
+        );
+
+        $newid = $DB->insert_record('badge', $params);
+        $this->set_mapping('badge', $data->id, $newid, $restorefiles);
+    }
+
+    public function process_criterion($data) {
+        global $DB;
+
+        $data = (object)$data;
+
+        $params = array(
+                'badgeid'      => $this->get_new_parentid('badge'),
+                'criteriatype' => $data->criteriatype,
+                'method'       => $data->method
+        );
+        $newid = $DB->insert_record('badge_criteria', $params);
+        $this->set_mapping('criterion', $data->id, $newid);
+    }
+
+    public function process_parameter($data) {
+        global $DB, $CFG;
+
+        require_once($CFG->libdir . '/badgeslib.php');
+
+        $data = (object)$data;
+        $criteriaid = $this->get_new_parentid('criterion');
+
+        // Parameter array that will go to database.
+        $params = array();
+        $params['critid'] = $criteriaid;
+
+        $oldparam = explode('_', $data->name);
+
+        if ($data->criteriatype == BADGE_CRITERIA_TYPE_ACTIVITY) {
+            $module = $this->get_mappingid('course_module', $oldparam[1]);
+            $params['name'] = $oldparam[0] . '_' . $module;
+            $params['value'] = $oldparam[0] == 'module' ? $module : $data->value;
+        } else if ($data->criteriatype == BADGE_CRITERIA_TYPE_COURSE) {
+            $params['name'] = $oldparam[0] . '_' . $this->get_courseid();
+            $params['value'] = $oldparam[0] == 'course' ? $this->get_courseid() : $data->value;
+        } else if ($data->criteriatype == BADGE_CRITERIA_TYPE_MANUAL) {
+            $role = $this->get_mappingid('role', $data->value);
+            if (!empty($role)) {
+                $params['name'] = 'role_' . $role;
+                $params['value'] = $role;
+            } else {
+                return;
+            }
+        }
+
+        if (!$DB->record_exists('badge_criteria_param', $params)) {
+            $DB->insert_record('badge_criteria_param', $params);
+        }
+    }
+
+    public function process_manual_award($data) {
+        global $DB;
+
+        $data = (object)$data;
+        $role = $this->get_mappingid('role', $data->issuerrole);
+
+        if (!empty($role)) {
+            $award = array(
+                'badgeid'     => $this->get_new_parentid('badge'),
+                'recipientid' => $this->get_mappingid('user', $data->recipientid),
+                'issuerid'    => $this->get_mappingid('user', $data->issuerid),
+                'issuerrole'  => $role,
+                'datemet'     => $this->apply_date_offset($data->datemet)
+            );
+            $DB->insert_record('badge_manual_award', $award);
+        }
+    }
+
+    protected function after_execute() {
+        // Add related files.
+        $this->add_related_files('badges', 'badgeimage', 'badge');
+    }
+}
+
 /**
 * This structure steps restores the calendar events
 */
@@ -483,6 +483,7 @@ abstract class backup_controller_dbops extends backup_dbops {
            'backup_general_blocks'             => 'blocks',
            'backup_general_filters'            => 'filters',
            'backup_general_comments'           => 'comments',
+            'backup_general_badges'             => 'badges',
            'backup_general_userscompletion'    => 'userscompletion',
            'backup_general_logs'               => 'logs',
            'backup_general_histories'          => 'grade_histories'
@@ -614,13 +614,20 @@ abstract class restore_dbops {
                } else {
                    self::set_backup_ids_record($restoreid, 'question_category', $category->id, $matchcat->id, $targetcontext->id);
                    $questions = self::restore_get_questions($restoreid, $category->id);
+
+                    // Collect all the questions for this category into memory so we only talk to the DB once.
+                    $questioncache = $DB->get_records_sql_menu("SELECT ".$DB->sql_concat('stamp', "' '", 'version').", id
+                                                                  FROM {question}
+                                                                 WHERE category = ?", array($matchcat->id));
+
                    foreach ($questions as $question) {
-                        $matchq = $DB->get_record('question', array(
-                                      'category' => $matchcat->id,
-                                      'stamp' => $question->stamp,
-                                      'version' => $question->version));
+                        if (isset($questioncache[$question->stamp." ".$question->version])) {
+                            $matchqid = $questioncache[$question->stamp." ".$question->version];
+                        } else {
+                            $matchqid = false;
+                        }
                        // 5a) No match, check if user can add q
-                        if (!$matchq) {
+                        if (!$matchqid) {
                            // 6a) User can, mark the q to be created
                            if ($canadd) {
                                // Nothing to mark, newitemid means create
@@ -645,7 +652,7 @@ abstract class restore_dbops {

                        // 5b) Match, mark q to be mapped
                        } else {
-                            self::set_backup_ids_record($restoreid, 'question', $question->id, $matchq->id);
+                            self::set_backup_ids_record($restoreid, 'question', $question->id, $matchqid);
                        }
                    }
                }
@@ -26,101 +26,6 @@ defined('MOODLE_INTERNAL') || die();
 // Include all the needed stuff
 global $CFG;
 require_once($CFG->dirroot . '/backup/util/includes/backup_includes.php');
-require_once($CFG->dirroot . '/backup/util/includes/restore_includes.php');
-
-/**
- * Restore dbops tests (all).
- */
-class restore_dbops_testcase extends advanced_testcase {
-
-    /**
-     * Verify the xxx_ids_cached (in-memory backup_ids cache) stuff works as expected.
-     *
-     * Note that those private implementations are tested here by using the public
-     * backup_ids API and later performing low-level tests.
-     */
-    public function test_backup_ids_cached() {
-        global $DB;
-        $dbman = $DB->get_manager(); // We are going to use database_manager services.
-
-        $this->resetAfterTest(true); // Playing with temp tables, better reset once finished.
-
-        // Some variables and objects for testing.
-        $restoreid = 'testrestoreid';
-
-        $mapping = new stdClass();
-        $mapping->itemname = 'user';
-        $mapping->itemid = 1;
-        $mapping->newitemid = 2;
-        $mapping->parentitemid = 3;
-        $mapping->info = 'info';
-
-        // Create the backup_ids temp tables used by restore.
-        restore_controller_dbops::create_restore_temp_tables($restoreid);
-
-        // Send one mapping using the public api with defaults.
-        restore_dbops::set_backup_ids_record($restoreid, $mapping->itemname, $mapping->itemid);
-        // Get that mapping and verify everything is returned as expected.
-        $result = restore_dbops::get_backup_ids_record($restoreid, $mapping->itemname, $mapping->itemid);
-        $this->assertSame($mapping->itemname, $result->itemname);
-        $this->assertSame($mapping->itemid, $result->itemid);
-        $this->assertSame(0, $result->newitemid);
-        $this->assertSame(null, $result->parentitemid);
-        $this->assertSame(null, $result->info);
-
-        // Drop the backup_xxx_temp temptables manually, so memory cache won't be invalidated.
-        $dbman->drop_table(new xmldb_table('backup_ids_temp'));
-        $dbman->drop_table(new xmldb_table('backup_files_temp'));
-
-        // Verify the mapping continues returning the same info,
-        // now from cache (the table does not exist).
-        $result = restore_dbops::get_backup_ids_record($restoreid, $mapping->itemname, $mapping->itemid);
-        $this->assertSame($mapping->itemname, $result->itemname);
-        $this->assertSame($mapping->itemid, $result->itemid);
-        $this->assertSame(0, $result->newitemid);
-        $this->assertSame(null, $result->parentitemid);
-        $this->assertSame(null, $result->info);
-
-        // Recreate the temp table, just to drop it using the restore API in
-        // order to check that, then, the cache becomes invalid for the same request.
-        restore_controller_dbops::create_restore_temp_tables($restoreid);
-        restore_controller_dbops::drop_restore_temp_tables($restoreid);
-
-        // No cached info anymore, so the mapping request will arrive to
-        // DB leading to error (temp table does not exist).
-        try {
-            $result = restore_dbops::get_backup_ids_record($restoreid, $mapping->itemname, $mapping->itemid);
-            $this->fail('Expecting an exception, none occurred');
-        } catch (Exception $e) {
-            $this->assertTrue($e instanceof dml_exception);
-            $this->assertSame('Table "backup_ids_temp" does not exist', $e->getMessage());
-        }
-
-        // Create the backup_ids temp tables once more.
-        restore_controller_dbops::create_restore_temp_tables($restoreid);
-
-        // Send one mapping using the public api with complete values.
-        restore_dbops::set_backup_ids_record($restoreid, $mapping->itemname, $mapping->itemid,
-                $mapping->newitemid, $mapping->parentitemid, $mapping->info);
-        // Get that mapping and verify everything is returned as expected.
-        $result = restore_dbops::get_backup_ids_record($restoreid, $mapping->itemname, $mapping->itemid);
-        $this->assertSame($mapping->itemname, $result->itemname);
-        $this->assertSame($mapping->itemid, $result->itemid);
-        $this->assertSame($mapping->newitemid, $result->newitemid);
-        $this->assertSame($mapping->parentitemid, $result->parentitemid);
-        $this->assertSame($mapping->info, $result->info);
-
-        // Finally, drop the temp tables properly and get the DB error again (memory caches empty).
-        restore_controller_dbops::drop_restore_temp_tables($restoreid);
-        try {
-            $result = restore_dbops::get_backup_ids_record($restoreid, $mapping->itemname, $mapping->itemid);
-            $this->fail('Expecting an exception, none occurred');
-        } catch (Exception $e) {
-            $this->assertTrue($e instanceof dml_exception);
-            $this->assertSame('Table "backup_ids_temp" does not exist', $e->getMessage());
-        }
-    }
-}

 /**
 * Backup dbops tests (all).
@@ -0,0 +1,122 @@
+<?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/>.
+
+/**
+ * @package    core_backup
+ * @category   phpunit
+ * @copyright  2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+// Include all the needed stuff
+global $CFG;
+require_once($CFG->dirroot . '/backup/util/includes/restore_includes.php');
+
+/**
+ * Restore dbops tests (all).
+ */
+class restore_dbops_testcase extends advanced_testcase {
+
+    /**
+     * Verify the xxx_ids_cached (in-memory backup_ids cache) stuff works as expected.
+     *
+     * Note that those private implementations are tested here by using the public
+     * backup_ids API and later performing low-level tests.
+     */
+    public function test_backup_ids_cached() {
+        global $DB;
+        $dbman = $DB->get_manager(); // We are going to use database_manager services.
+
+        $this->resetAfterTest(true); // Playing with temp tables, better reset once finished.
+
+        // Some variables and objects for testing.
+        $restoreid = 'testrestoreid';
+
+        $mapping = new stdClass();
+        $mapping->itemname = 'user';
+        $mapping->itemid = 1;
+        $mapping->newitemid = 2;
+        $mapping->parentitemid = 3;
+        $mapping->info = 'info';
+
+        // Create the backup_ids temp tables used by restore.
+        restore_controller_dbops::create_restore_temp_tables($restoreid);
+
+        // Send one mapping using the public api with defaults.
+        restore_dbops::set_backup_ids_record($restoreid, $mapping->itemname, $mapping->itemid);
+        // Get that mapping and verify everything is returned as expected.
+        $result = restore_dbops::get_backup_ids_record($restoreid, $mapping->itemname, $mapping->itemid);
+        $this->assertSame($mapping->itemname, $result->itemname);
+        $this->assertSame($mapping->itemid, $result->itemid);
+        $this->assertSame(0, $result->newitemid);
+        $this->assertSame(null, $result->parentitemid);
+        $this->assertSame(null, $result->info);
+
+        // Drop the backup_xxx_temp temptables manually, so memory cache won't be invalidated.
+        $dbman->drop_table(new xmldb_table('backup_ids_temp'));
+        $dbman->drop_table(new xmldb_table('backup_files_temp'));
+
+        // Verify the mapping continues returning the same info,
+        // now from cache (the table does not exist).
+        $result = restore_dbops::get_backup_ids_record($restoreid, $mapping->itemname, $mapping->itemid);
+        $this->assertSame($mapping->itemname, $result->itemname);
+        $this->assertSame($mapping->itemid, $result->itemid);
+        $this->assertSame(0, $result->newitemid);
+        $this->assertSame(null, $result->parentitemid);
+        $this->assertSame(null, $result->info);
+
+        // Recreate the temp table, just to drop it using the restore API in
+        // order to check that, then, the cache becomes invalid for the same request.
+        restore_controller_dbops::create_restore_temp_tables($restoreid);
+        restore_controller_dbops::drop_restore_temp_tables($restoreid);
+
+        // No cached info anymore, so the mapping request will arrive to
+        // DB leading to error (temp table does not exist).
+        try {
+            $result = restore_dbops::get_backup_ids_record($restoreid, $mapping->itemname, $mapping->itemid);
+            $this->fail('Expecting an exception, none occurred');
+        } catch (Exception $e) {
+            $this->assertTrue($e instanceof dml_exception);
+            $this->assertSame('Table "backup_ids_temp" does not exist', $e->getMessage());
+        }
+
+        // Create the backup_ids temp tables once more.
+        restore_controller_dbops::create_restore_temp_tables($restoreid);
+
+        // Send one mapping using the public api with complete values.
+        restore_dbops::set_backup_ids_record($restoreid, $mapping->itemname, $mapping->itemid,
+                $mapping->newitemid, $mapping->parentitemid, $mapping->info);
+        // Get that mapping and verify everything is returned as expected.
+        $result = restore_dbops::get_backup_ids_record($restoreid, $mapping->itemname, $mapping->itemid);
+        $this->assertSame($mapping->itemname, $result->itemname);
+        $this->assertSame($mapping->itemid, $result->itemid);
+        $this->assertSame($mapping->newitemid, $result->newitemid);
+        $this->assertSame($mapping->parentitemid, $result->parentitemid);
+        $this->assertSame($mapping->info, $result->info);
+
+        // Finally, drop the temp tables properly and get the DB error again (memory caches empty).
+        restore_controller_dbops::drop_restore_temp_tables($restoreid);
+        try {
+            $result = restore_dbops::get_backup_ids_record($restoreid, $mapping->itemname, $mapping->itemid);
+            $this->fail('Expecting an exception, none occurred');
+        } catch (Exception $e) {
+            $this->assertTrue($e instanceof dml_exception);
+            $this->assertSame('Table "backup_ids_temp" does not exist', $e->getMessage());
+        }
+    }
+}
@@ -383,6 +383,7 @@ abstract class backup_cron_automated_helper {
                'blocks' => 'backup_auto_blocks',
                'filters' => 'backup_auto_filters',
                'comments' => 'backup_auto_comments',
+                'badges' => 'backup_auto_badges',
                'completion_information' => 'backup_auto_userscompletion',
                'logs' => 'backup_auto_logs',
                'histories' => 'backup_auto_histories'
@@ -59,7 +59,13 @@ class database_logger extends base_logger {
        if ($this->levelcol) {
            $columns[$this->levelcol] = $level;
        }
-        $columns[$this->messagecol] = $message; //TODO: should this be cleaned?
+        $message = clean_param($message, PARAM_NOTAGS);
+        // Check if the message exceeds the 255 character limit in the database,
+        // if it does, shorten it so that it can be inserted successfully.
+        if (textlib::strlen($message) > 255) {
+            $message = textlib::substr($message, 0, 252) . '...';
+        }
+        $columns[$this->messagecol] = $message;
        return $this->insert_log_record($this->logtable, $columns);
    }

@@ -69,6 +75,6 @@ class database_logger extends base_logger {
        // to preserve DB logs if the whole backup/restore transaction is
        // rollback
        global $DB;
-        return $DB->insert_record($this->logtable, $columns, false); // Don't return inserted id
+        return $DB->insert_record($table, $columns, false); // Don't return inserted id
    }
 }
@@ -69,7 +69,7 @@ class backup_base_optigroup_testcase extends basic_testcase {
    /**
     * Incorrect creation tests (attributes and final elements)
     */
-    function itest_wrong_creation() {
+    function test_wrong_creation() {

        // Create instance with invalid name
        try {
@@ -140,7 +140,7 @@ class core_backup_renderer extends plugin_renderer_base {
                    }
                    if (empty($table)) {
                        $table = new html_table();
-                        $table->head = array('Module', 'Title', 'Userinfo');
+                        $table->head = array(get_string('module','backup'), get_string('title','backup'), get_string('userinfo','backup'));
                        $table->colclasses = array('modulename', 'moduletitle', 'userinfoincluded');
                        $table->align = array('left','left', 'center');
                        $table->attributes = array('class'=>'activitytable generaltable');
@@ -13,8 +13,9 @@ Feature: Backup Moodle courses
  @javascript
  Scenario: Backup a course providing options
    When I backup "Course 1" course using this options:
+      | Filename | test_backup.mbz |
    Then I should see "Restore"
-    And I click on "Restore" "link" in the ".backup-files-table" "css_element"
+    And I click on "Restore" "link" in the "test_backup.mbz" "table_row"
    And I should see "URL of backup"
    And I should see "Anonymize user information"

@@ -27,11 +28,11 @@ Feature: Backup Moodle courses
      | setting_section_section_5_userinfo | 0 |
      | setting_section_section_5_included | 0 |
    Then I should see "Restore"
-    And I click on "Restore" "link" in the ".backup-files-table" "css_element"
+    And I click on "Restore" "link" in the "test_backup.mbz" "table_row"
    And I should not see "Section 3"
    And I press "Continue"
    And I click on "Continue" "button" in the ".bcs-current-course" "css_element"
-    And I click on "//div[contains(concat(' ', @class, ' '), ' fitem ')][contains(., 'Include calendar events')]/descendant::img" "xpath_element"
-    And I click on "setting_root_logs" "checkbox" in the "//div[contains(@class, 'fitem')][contains(., 'Include course logs')]" "xpath_element"
+    And "//div[contains(concat(' ', normalize-space(@class), ' '), ' fitem ')][contains(., 'Include calendar events')]/descendant::img" "xpath_element" should exists
+    And I check "Include course logs"
    And I press "Cancel"
-    And I click on "Cancel" "button" in the ".confirmation-dialogue" "css_element"
+    And I click on "Cancel" "button" in the "Cancel backup" "dialogue"
@@ -61,25 +61,25 @@ class behat_backup extends behat_base {
        $this->find_link($backupcourse)->click();

        // Click the backup link.
-        $this->find_link('Backup')->click();
+        $this->find_link(get_string('backup'))->click();

        // Initial settings.
        $this->fill_backup_restore_form($options);
-        $this->find_button('Next')->press();
+        $this->find_button(get_string('backupstage1action', 'backup'))->press();

        // Schema settings.
        $this->fill_backup_restore_form($options);
-        $this->find_button('Next')->press();
+        $this->find_button(get_string('backupstage2action', 'backup'))->press();

        // Confirmation and review, backup filename can also be specified.
        $this->fill_backup_restore_form($options);
-        $this->find_button('Perform backup')->press();
+        $this->find_button(get_string('backupstage4action', 'backup'))->press();

        // Waiting for it to finish.
        $this->wait(10);

        // Last backup continue button.
-        $this->find_button('Continue')->press();
+        $this->find_button(get_string('backupstage16action', 'backup'))->press();
    }

    /**
@@ -105,36 +105,37 @@ class behat_backup extends behat_base {
        // Click the course link.
        $this->find_link($tocourse)->click();

-        // Click the backup link.
-        $this->find_link('Import')->click();
+        // Click the import link.
+        $this->find_link(get_string('import'))->click();

        // Select the course.
        $exception = new ExpectationException('"' . $fromcourse . '" course not found in the list of courses to import from', $this->getSession());

-        $fromcourse = str_replace("'", "\'", $fromcourse);
-        $xpath = "//div[contains(concat(' ', @class, ' '), ' ics-results ')]" .
-            "/descendant::tr[contains(., '" . $fromcourse . "')]" .
+        // The argument should be converted to an xpath literal.
+        $fromcourse = $this->getSession()->getSelectorsHandler()->xpathLiteral($fromcourse);
+        $xpath = "//div[contains(concat(' ', normalize-space(@class), ' '), ' ics-results ')]" .
+            "/descendant::tr[contains(., $fromcourse)]" .
            "/descendant::input[@type='radio']";
        $radionode = $this->find('xpath', $xpath, $exception);
        $radionode->check();
        $radionode->click();

-        $this->find_button('Continue')->press();
+        $this->find_button(get_string('continue'))->press();

        // Initial settings.
        $this->fill_backup_restore_form($options);
-        $this->find_button('Next')->press();
+        $this->find_button(get_string('importbackupstage1action', 'backup'))->press();

        // Schema settings.
        $this->fill_backup_restore_form($options);
-        $this->find_button('Next')->press();
+        $this->find_button(get_string('importbackupstage2action', 'backup'))->press();

        // Run it.
-        $this->find_button('Perform import')->press();
+        $this->find_button(get_string('importbackupstage4action', 'backup'))->press();
        $this->wait();

        // Continue and redirect to 'to' course.
-        $this->find_button('Continue')->press();
+        $this->find_button(get_string('continue'))->press();
    }

    /**
@@ -150,17 +151,20 @@ class behat_backup extends behat_base {
        // Confirm restore.
        $this->select_backup($backupfilename);

+        // The argument should be converted to an xpath literal.
+        $existingcourse = $this->getSession()->getSelectorsHandler()->xpathLiteral($existingcourse);
+
        // Selecting the specified course (we can not call behat_forms::select_radio here as is in another behat subcontext).
-        $existingcourse = str_replace("'", "\'", $existingcourse);
-        $radionode = $this->find('xpath', "//div[contains(@class, 'bcs-existing-course')]" .
+        $radionode = $this->find('xpath', "//div[contains(concat(' ', normalize-space(@class), ' '), ' bcs-existing-course ')]" .
            "/descendant::div[@class='restore-course-search']" .
-            "/descendant::tr[contains(., '" . $existingcourse . "')]" .
+            "/descendant::tr[contains(., $existingcourse)]" .
            "/descendant::input[@type='radio']");
        $radionode->check();
        $radionode->click();

        // Pressing the continue button of the restore into an existing course section.
-        $continuenode = $this->find('xpath', "//div[contains(@class, 'bcs-existing-course')]/descendant::input[@type='submit'][@value='Continue']");
+        $continuenode = $this->find('xpath', "//div[contains(concat(' ', normalize-space(@class), ' '), ' bcs-existing-course ')]" .
+            "/descendant::input[@type='submit'][@value='" . get_string('continue') . "']");
        $continuenode->click();
        $this->wait();

@@ -181,14 +185,15 @@ class behat_backup extends behat_base {
        $this->select_backup($backupfilename);

        // The first category in the list.
-        $radionode = $this->find('xpath', "//div[contains(@class, 'bcs-new-course')]" .
+        $radionode = $this->find('xpath', "//div[contains(concat(' ', normalize-space(@class), ' '), ' bcs-new-course ')]" .
            "/descendant::div[@class='restore-course-search']" .
            "/descendant::input[@type='radio']");
        $radionode->check();
        $radionode->click();

        // Pressing the continue button of the restore into an existing course section.
-        $continuenode = $this->find('xpath', "//div[contains(@class, 'bcs-new-course')]/descendant::input[@type='submit'][@value='Continue']");
+        $continuenode = $this->find('xpath', "//div[contains(concat(' ', normalize-space(@class), ' '), ' bcs-new-course ')]" .
+            "/descendant::input[@type='submit'][@value='" . get_string('continue') . "']");
        $continuenode->click();
        $this->wait();

@@ -209,14 +214,14 @@ class behat_backup extends behat_base {
        $this->select_backup($backupfilename);

        // Merge without deleting radio option.
-        $radionode = $this->find('xpath', "//div[contains(@class, 'bcs-current-course')]" .
+        $radionode = $this->find('xpath', "//div[contains(concat(' ', normalize-space(@class), ' '), 'bcs-current-course')]" .
            "/descendant::input[@type='radio'][@name='target'][@value='1']");
        $radionode->check();
        $radionode->click();

        // Pressing the continue button of the restore merging section.
-        $continuenode = $this->find('xpath', "//div[contains(@class, 'bcs-current-course')]" .
-            "/descendant::input[@type='submit'][@value='Continue']");
+        $continuenode = $this->find('xpath', "//div[contains(concat(' ', normalize-space(@class), ' '), 'bcs-current-course')]" .
+            "/descendant::input[@type='submit'][@value='" . get_string('continue') . "']");
        $continuenode->click();
        $this->wait();

@@ -237,14 +242,14 @@ class behat_backup extends behat_base {
        $this->select_backup($backupfilename);

        // Delete contents radio option.
-        $radionode = $this->find('xpath', "//div[contains(@class, 'bcs-current-course')]" .
+        $radionode = $this->find('xpath', "//div[contains(concat(' ', normalize-space(@class), ' '), 'bcs-current-course')]" .
            "/descendant::input[@type='radio'][@name='target'][@value='0']");
        $radionode->check();
        $radionode->click();

        // Pressing the continue button of the restore merging section.
-        $continuenode = $this->find('xpath', "//div[contains(@class, 'bcs-current-course')]" .
-            "/descendant::input[@type='submit'][@value='Continue']");
+        $continuenode = $this->find('xpath', "//div[contains(concat(' ', normalize-space(@class), ' '), 'bcs-current-course')]" .
+            "/descendant::input[@type='submit'][@value='" . get_string('continue') . "']");
        $continuenode->click();
        $this->wait();

@@ -263,12 +268,16 @@ class behat_backup extends behat_base {

        // Using xpath as there are other restore links before this one.
        $exception = new ExpectationException('The "' . $backupfilename . '" backup file can not be found in this page', $this->getSession());
-        $xpath = "//tr[contains(., '" . $backupfilename . "')]/descendant::a[contains(., 'Restore')]";
+
+        // The argument should be converted to an xpath literal.
+        $backupfilename = $this->getSession()->getSelectorsHandler()->xpathLiteral($backupfilename);
+
+        $xpath = "//tr[contains(., $backupfilename)]/descendant::a[contains(., '" . get_string('restore') . "')]";
        $restorelink = $this->find('xpath', $xpath, $exception);
        $restorelink->click();

        // Confirm the backup contents.
-        $restore = $this->find_button('Continue')->press();
+        $restore = $this->find_button(get_string('continue'))->press();
    }

    /**
@@ -284,18 +293,18 @@ class behat_backup extends behat_base {

        // Settings.
        $this->fill_backup_restore_form($options);
-        $this->find_button('Next')->press();
+        $this->find_button(get_string('restorestage4action', 'backup'))->press();

        // Schema.
        $this->fill_backup_restore_form($options);
-        $this->find_button('Next')->press();
+        $this->find_button(get_string('restorestage8action', 'backup'))->press();

        // Review, no options here.
-        $this->find_button('Perform restore')->press();
+        $this->find_button(get_string('restorestage16action', 'backup'))->press();
        $this->wait(10);

        // Last restore continue button, redirected to restore course after this.
-        $this->find_button('Continue')->press();
+        $this->find_button(get_string('restorestage32action', 'backup'))->press();
    }

    /**
@@ -322,7 +331,7 @@ class behat_backup extends behat_base {

            try {
                $fieldnode = $this->find_field($locator);
-                $field = behat_field_manager::get_field($fieldnode, $locator, $this->getSession());
+                $field = behat_field_manager::get_form_field($fieldnode, $this->getSession());
                $field->set_value($value);

            } catch (ElementNotFoundException $e) {
@@ -339,6 +348,10 @@ class behat_backup extends behat_base {
     */
    protected function wait($timeout = false) {

+        if (!$this->running_javascript()) {
+            return;
+        }
+
        if (!$timeout) {
            $timeout = self::TIMEOUT;
        }
@@ -43,6 +43,18 @@ abstract class grouped_parser_processor extends simplified_parser_processor {
    protected $groupedpaths; // Paths we are requesting grouped
    protected $currentdata;  // Where we'll be acummulating data

+    /**
+     * Keep cache of parent directory paths for XML parsing.
+     * @var array
+     */
+    protected $parentcache = array();
+
+    /**
+     * Remaining space for parent directory paths.
+     * @var integer
+     */
+    protected $parentcacheavailablesize = 2048;
+
    public function __construct(array $paths = array()) {
        $this->groupedpaths = array();
        $this->currentdata = null;
@@ -65,7 +77,7 @@ abstract class grouped_parser_processor extends simplified_parser_processor {
                $a->child = $found;
                throw new progressive_parser_exception('xml_grouped_child_found', $a);
            }
-            $this->groupedpaths[] = $path;
+            $this->groupedpaths[$path] = true;
        }
        parent::add_path($path);
    }
@@ -141,7 +153,7 @@ abstract class grouped_parser_processor extends simplified_parser_processor {
    }

    protected function path_is_grouped($path) {
-        return in_array($path, $this->groupedpaths);
+        return isset($this->groupedpaths[$path]);
    }

    /**
@@ -150,16 +162,41 @@ abstract class grouped_parser_processor extends simplified_parser_processor {
     * false if not
     */
    protected function grouped_parent_exists($path) {
-        $parentpath = progressive_parser::dirname($path);
+        $parentpath = $this->get_parent_path($path);
+
        while ($parentpath != '/') {
            if ($this->path_is_grouped($parentpath)) {
                return $parentpath;
            }
-            $parentpath = progressive_parser::dirname($parentpath);
+            $parentpath = $this->get_parent_path($parentpath);
        }
        return false;
    }

+    /**
+     * Get the parent path using a local cache for performance.
+     *
+     * @param $path string The pathname you wish to obtain the parent name for.
+     * @return string The parent pathname.
+     */
+    protected function get_parent_path($path) {
+        if (!isset($this->parentcache[$path])) {
+            $this->parentcache[$path] = progressive_parser::dirname($path);
+            $this->parentcacheavailablesize--;
+            if ($this->parentcacheavailablesize < 0) {
+                // Older first is cheaper than LRU.  We use 10% as items are grouped together and the large quiz
+                // restore from MDL-40585 used only 600 parent paths. This is an XML heirarchy, so common paths
+                // are grouped near each other. eg; /question_bank/question_category/question/element. After keeping
+                // question_bank paths in the cache when we move to another area and the question_bank cache is not
+                // useful any longer.
+                $this->parentcache = array_slice($this->parentcache, 200, null, true);
+                $this->parentcacheavailablesize += 200;
+            }
+        }
+        return $this->parentcache[$path];
+    }
+
+
    /**
     * Function that will look for any grouped
     * child for the given path, returning it if found,
@@ -167,7 +204,7 @@ abstract class grouped_parser_processor extends simplified_parser_processor {
     */
    protected function grouped_child_exists($path) {
        $childpath = $path . '/';
-        foreach ($this->groupedpaths as $groupedpath) {
+        foreach ($this->groupedpaths as $groupedpath => $set) {
            if (strpos($groupedpath, $childpath) === 0) {
                return $groupedpath;
            }
@@ -89,22 +89,31 @@ if (count($acceptedroles) > 1) {
        $roleids = array_map(create_function('$o', 'return $o->roleid;'), $roles);
        $selection = array_intersect($acceptedroles, $roleids);
    }
-    list($usertest, $userparams) = $DB->get_in_or_equal($selection, SQL_PARAMS_NAMED, 'existing', true);
-    $options = $DB->get_records_sql('SELECT * FROM {role} WHERE id ' . $usertest, $userparams);
-    foreach ($options as $p) {
-        $select[$p->id] = role_get_name($p);
-    }
-    if (!$role) {
-        $pageurl = new moodle_url('/badges/award.php', array('id' => $badgeid));
+
+    if (!empty($selection)) {
+        list($usertest, $userparams) = $DB->get_in_or_equal($selection, SQL_PARAMS_NAMED, 'existing', true);
+        $options = $DB->get_records_sql('SELECT * FROM {role} WHERE id ' . $usertest, $userparams);
+        foreach ($options as $p) {
+            $select[$p->id] = role_get_name($p);
+        }
+        if (!$role) {
+            $pageurl = new moodle_url('/badges/award.php', array('id' => $badgeid));
+            echo $OUTPUT->header();
+            echo $OUTPUT->box(get_string('selectaward', 'badges') . $OUTPUT->single_select(new moodle_url($pageurl), 'role', $select));
+            echo $OUTPUT->footer();
+            die();
+        } else {
+            $pageurl = new moodle_url('/badges/award.php', array('id' => $badgeid));
+            $issuerrole = new stdClass();
+            $issuerrole->roleid = $role;
+            $roleselect = get_string('selectaward', 'badges') . $OUTPUT->single_select(new moodle_url($pageurl), 'role', $select, $role);
+        }
+    } else {
        echo $OUTPUT->header();
-        echo $OUTPUT->box(get_string('selectaward', 'badges') . $OUTPUT->single_select(new moodle_url($pageurl), 'role', $select));
+        $return = html_writer::link(new moodle_url('recipients.php', array('id' => $badge->id)), $strrecipients);
+        echo $OUTPUT->notification(get_string('notacceptedrole', 'badges', $return));
        echo $OUTPUT->footer();
        die();
-    } else {
-        $pageurl = new moodle_url('/badges/award.php', array('id' => $badgeid));
-        $issuerrole = new stdClass();
-        $issuerrole->roleid = $role;
-        $roleselect = get_string('selectaward', 'badges') . $OUTPUT->single_select(new moodle_url($pageurl), 'role', $select, $role);
    }
 } else {
    // User has to be an admin or the one with the required role.
@@ -112,8 +121,8 @@ if (count($acceptedroles) > 1) {
    $usersids = array_keys($users);
    if (!$isadmin && !in_array($USER->id, $usersids)) {
        echo $OUTPUT->header();
-        $rlink = html_writer::link(new moodle_url('recipients.php', array('id' => $badge->id)), get_string('recipients', 'badges'));
-        echo $OUTPUT->notification(get_string('notacceptedrole', 'badges', $rlink));
+        $return = html_writer::link(new moodle_url('recipients.php', array('id' => $badge->id)), $strrecipients);
+        echo $OUTPUT->notification(get_string('notacceptedrole', 'badges', $return));
        echo $OUTPUT->footer();
        die();
    } else {
@@ -2,7 +2,20 @@
 * Push badges to backpack.
 */
 function addtobackpack(event, args) {
-    OpenBadges.issue([args.assertion], function(errors, successes) { });
+    var badgetable = Y.one('#issued-badge-table');
+    var errordiv = Y.one('#addtobackpack-error');
+    var errortext = M.util.get_string('error:backpackproblem', 'badges');
+    var errorhtml = '<div id="addtobackpack-error" class="box boxaligncenter notifyproblem">' + errortext + '</div>';
+
+    if (typeof OpenBadges !== 'undefined') {
+        OpenBadges.issue([args.assertion], function(errors, successes) { });
+    } else {
+        // Add error div if it doesn't exist yet.
+        if (!errordiv) {
+            var badgerror = Y.Node.create(errorhtml);
+            badgetable.insert(badgerror, 'before');
+        }
+    }
 }

 /**
@@ -56,10 +56,8 @@ if (isloggedin()) {
    navigation_node::override_active_url($url);
 }

-// TODO: Better way of pushing badges to Mozilla backpack?
-if (!empty($CFG->badges_allowexternalbackpack)) {
-    $PAGE->requires->js(new moodle_url('http://backpack.openbadges.org/issuer.js'), true);
-}
+// Include JS files for backpack support.
+badges_setup_backpack_js();

 echo $OUTPUT->header();

@@ -168,6 +168,7 @@ abstract class award_criteria {
            if (in_array('grade', $this->optional_params)) {
                $parameter[] =& $mform->createElement('static', 'mgrade_' . $param['id'], null, get_string('mingrade', 'badges'));
                $parameter[] =& $mform->createElement('text', 'grade_' . $param['id'], '', array('size' => '5'));
+                $mform->setType('grade_' . $param['id'], PARAM_INT);
            }

            if (in_array('bydate', $this->optional_params)) {
@@ -119,6 +119,7 @@ class award_criteria_course extends award_criteria {
            $parameter[] =& $mform->createElement('text', 'grade_' . $param['course'], '', array('size' => '5'));
            $parameter[] =& $mform->createElement('static', 'complby_' . $param['course'], null, get_string('bydate', 'badges'));
            $parameter[] =& $mform->createElement('date_selector', 'bydate_' . $param['course'], '', array('optional' => true));
+            $mform->setType('grade_' . $param['course'], PARAM_INT);
            $mform->addGroup($parameter, 'param_' . $param['course'], '', array(' '), false);

            $mform->disabledIf('bydate_' . $param['course'] . '[day]', 'bydate_' . $param['course'] . '[enabled]', 'notchecked');
@@ -27,14 +27,59 @@
 require_once(dirname(dirname(__FILE__)) . '/config.php');
 require_once($CFG->libdir . '/badgeslib.php');

-$json = required_param('badge', PARAM_RAW);
+$json = optional_param('badge', null, PARAM_RAW);
+// Redirect to homepage if users are trying to access external badge through old url.
+if ($json) {
+    redirect($CFG->wwwroot, get_string('invalidrequest', 'error'), 3);
+}
+
+$hash = required_param('hash', PARAM_ALPHANUM);
+$userid = required_param('user', PARAM_INT);
+
+$PAGE->set_url(new moodle_url('/badges/external.php', array('hash' => $hash, 'user' => $userid)));
+
+// Using the same setting as user profile page.
+if (!empty($CFG->forceloginforprofiles)) {
+    require_login();
+    if (isguestuser()) {
+        $SESSION->wantsurl = $PAGE->url->out(false);
+        redirect(get_login_url());
+    }
+} else if (!empty($CFG->forcelogin)) {
+    require_login();
+}
+
+// Get all external badges of a user.
+$out = get_backpack_settings($userid);
+
+// If we didn't find any badges then print an error.
+if (is_null($out)) {
+    print_error('error:externalbadgedoesntexist', 'badges');
+}
+
+$badges = $out->badges;
+
+// The variable to store the badge we want.
+$badge = '';
+
+// Loop through the badges and check if supplied badge hash exists in user external badges.
+foreach ($badges as $b) {
+    if ($hash == hash("md5", $b->hostedUrl)) {
+        $badge = $b;
+        break;
+    }
+}
+
+// If we didn't find the badge a user might be trying to replace the userid parameter.
+if (empty($badge)) {
+    print_error('error:externalbadgedoesntexist', 'badges');
+}

 $PAGE->set_context(context_system::instance());
 $output = $PAGE->get_renderer('core', 'badges');

-$badge = new external_badge(unserialize($json));
+$badge = new external_badge($badge, $userid);

-$PAGE->set_url('/badges/external.php');
 $PAGE->set_pagelayout('base');
 $PAGE->set_title(get_string('issuedbadge', 'badges'));

@@ -191,8 +191,11 @@ if ($totalcount) {
    echo $output->render($badges);
 } else {
    echo $output->notification(get_string('nobadges', 'badges'));
-    echo $OUTPUT->single_button(new moodle_url('newbadge.php', array('type' => $type, 'id' => $courseid)),
+
+    if (has_capability('moodle/badges:createbadge', $PAGE->context)) {
+        echo $OUTPUT->single_button(new moodle_url('newbadge.php', array('type' => $type, 'id' => $courseid)),
            get_string('newbadge', 'badges'));
+    }
 }

 echo $OUTPUT->footer();
@@ -26,7 +26,6 @@

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

-require_once(dirname(dirname(dirname(__FILE__))) . '/config.php');
 require_once($CFG->libdir . '/badgeslib.php');
 require_once($CFG->dirroot . '/user/selector/lib.php');

@@ -60,10 +60,11 @@ class OpenBadgesBackpackHandler {
        }

        $options = array(
-            'FRESH_CONNECT' => true,
+            'FRESH_CONNECT'  => true,
            'RETURNTRANSFER' => true,
-            'FORBID_REUSE' => true,
-            'HEADER' => 0,
+            'FORBID_REUSE'   => true,
+            'HEADER'         => 0,
+            'HTTPHEADER'     => array('Expect:'),
            'CONNECTTIMEOUT' => 3,
        );

@@ -53,11 +53,13 @@ $PAGE->set_heading($title);
 $PAGE->set_pagelayout('mydashboard');

 $backpack = $DB->get_record('badge_backpack', array('userid' => $USER->id));
+$badgescache = cache::make('core', 'externalbadges');

 if ($disconnect && $backpack) {
    require_sesskey();
    $DB->delete_records('badge_external', array('backpackid' => $backpack->id));
    $DB->delete_records('badge_backpack', array('userid' => $USER->id));
+    $badgescache->delete($USER->id);
    redirect(new moodle_url('/badges/mybackpack.php'));
 }

@@ -103,6 +105,7 @@ if ($backpack) {
                $DB->insert_record('badge_external', $obj);
            }
        }
+        $badgescache->delete($USER->id);
        redirect(new moodle_url('/badges/mybadges.php'));
    }
 } else {
@@ -90,11 +90,8 @@ $PAGE->set_title($title);
 $PAGE->set_heading($title);
 $PAGE->set_pagelayout('mydashboard');

-// TODO: Better way of pushing badges to Mozilla backpack?
-if (!empty($CFG->badges_allowexternalbackpack)) {
-    $PAGE->requires->js(new moodle_url('http://backpack.openbadges.org/issuer.js'), true);
-    $PAGE->requires->js('/badges/backpack.js', true);
-}
+// Include JS files for backpack support.
+badges_setup_backpack_js();

 $output = $PAGE->get_renderer('core', 'badges');
 $badges = badges_get_user_badges($USER->id);
@@ -26,7 +26,6 @@

 require_once($CFG->libdir . '/badgeslib.php');
 require_once($CFG->libdir . '/tablelib.php');
-require_once($CFG->dirroot . '/user/filters/lib.php');

 /**
 * Standard HTML output renderer for badges
@@ -82,9 +81,10 @@ class core_badges_renderer extends plugin_renderer_base {
                $url = new moodle_url('badge.php', array('hash' => $badge->uniquehash));
            } else {
                if (!$external) {
-                    $url = new moodle_url($CFG->wwwroot . '/badges/badge.php', array('hash' => $badge->uniquehash));
+                    $url = new moodle_url('/badges/badge.php', array('hash' => $badge->uniquehash));
                } else {
-                    $url = new moodle_url($CFG->wwwroot . '/badges/external.php', array('badge' => serialize($badge)));
+                    $hash = hash('md5', $badge->hostedUrl);
+                    $url = new moodle_url('/badges/external.php', array('hash' => $hash, 'user' => $userid));
                }
            }
            $actions = html_writer::tag('div', $push . $download . $status, array('class' => 'badge-actions'));
@@ -277,16 +277,18 @@ class core_badges_renderer extends plugin_renderer_base {
    protected function render_issued_badge(issued_badge $ibadge) {
        global $USER, $CFG, $DB;
        $issued = $ibadge->issued;
+        $userinfo = $ibadge->recipient;
        $badge = new badge($ibadge->badgeid);
        $today_date = date('Y-m-d');
        $today = strtotime($today_date);

        $table = new html_table();
+        $table->id = 'issued-badge-table';

        $imagetable = new html_table();
        $imagetable->attributes = array('class' => 'clearfix badgeissuedimage');
        $imagetable->data[] = array(html_writer::empty_tag('img', array('src' => $issued['badge']['image'])));
-        if ($USER->id == $ibadge->recipient && !empty($CFG->enablebadges)) {
+        if ($USER->id == $userinfo->id && !empty($CFG->enablebadges)) {
            $imagetable->data[] = array($this->output->single_button(
                        new moodle_url('/badges/badge.php', array('hash' => $ibadge->hash, 'bake' => true)),
                        get_string('download'),
@@ -294,22 +296,33 @@ class core_badges_renderer extends plugin_renderer_base {
            $expiration = isset($issued['expires']) ? strtotime($issued['expires']) : $today + 1;
            if (!empty($CFG->badges_allowexternalbackpack) && ($expiration > $today) && badges_user_has_backpack($USER->id)) {
                $assertion = new moodle_url('/badges/assertion.php', array('b' => $ibadge->hash));
+                $action = new component_action('click', 'addtobackpack', array('assertion' => $assertion->out(false)));
                $attributes = array(
-                        'type' => 'button',
-                        'value' => get_string('addtobackpack', 'badges'),
-                        'onclick' => 'OpenBadges.issue(["' . $assertion->out(false) . '"], function(errors, successes) { })');
+                        'type'  => 'button',
+                        'id'    => 'addbutton',
+                        'value' => get_string('addtobackpack', 'badges'));
                $tobackpack = html_writer::tag('input', '', $attributes);
+                $this->output->add_action_handler($action, 'addbutton');
                $imagetable->data[] = array($tobackpack);
            }
        }
        $datatable = new html_table();
        $datatable->attributes = array('class' => 'badgeissuedinfo');
        $datatable->colclasses = array('bfield', 'bvalue');
+
+        // Recipient information.
+        $datatable->data[] = array($this->output->heading(get_string('recipientdetails', 'badges'), 3), '');
+        $datatable->data[] = array(get_string('name'), fullname($userinfo));
+        if (empty($userinfo->backpackemail)) {
+            $datatable->data[] = array(get_string('email'), obfuscate_mailto($userinfo->accountemail));
+        } else {
+            $datatable->data[] = array(get_string('email'), obfuscate_mailto($userinfo->backpackemail));
+        }
+
        $datatable->data[] = array($this->output->heading(get_string('issuerdetails', 'badges'), 3), '');
        $datatable->data[] = array(get_string('issuername', 'badges'), $badge->issuername);
        if (isset($badge->issuercontact) && !empty($badge->issuercontact)) {
-            $datatable->data[] = array(get_string('contact', 'badges'),
-                html_writer::tag('a', $badge->issuercontact, array('href' => 'mailto:' . $badge->issuercontact)));
+            $datatable->data[] = array(get_string('contact', 'badges'), obfuscate_mailto($badge->issuercontact));
        }
        $datatable->data[] = array($this->output->heading(get_string('badgedetails', 'badges'), 3), '');
        $datatable->data[] = array(get_string('name'), $badge->name);
@@ -345,7 +358,7 @@ class core_badges_renderer extends plugin_renderer_base {

        // Print evidence.
        $agg = $badge->get_aggregation_methods();
-        $evidence = $badge->get_criteria_completions($ibadge->recipient);
+        $evidence = $badge->get_criteria_completions($userinfo->id);
        $eids = array_map(create_function('$o', 'return $o->critid;'), $evidence);
        unset($badge->criteria[BADGE_CRITERIA_TYPE_OVERALL]);

@@ -376,6 +389,7 @@ class core_badges_renderer extends plugin_renderer_base {
        $issued = $ibadge->issued;
        $assertion = $issued->assertion;
        $issuer = $assertion->badge->issuer;
+        $userinfo = $ibadge->recipient;
        $table = new html_table();

        $imagetable = new html_table();
@@ -385,13 +399,29 @@ class core_badges_renderer extends plugin_renderer_base {
        $datatable = new html_table();
        $datatable->attributes = array('class' => 'badgeissuedinfo');
        $datatable->colclasses = array('bfield', 'bvalue');
+
+        // Recipient information.
+        $datatable->data[] = array($this->output->heading(get_string('recipientdetails', 'badges'), 3), '');
+        // Technically, we should alway have a user at this point, but added an extra check just in case.
+        if ($userinfo) {
+            $datatable->data[] = array(get_string('name'), fullname($userinfo));
+            if (!$ibadge->valid) {
+                $notify = $this->output->notification(get_string('recipientvalidationproblem', 'badges'), 'notifynotice');
+                $datatable->data[] = array(get_string('email'), obfuscate_mailto($userinfo->email) . $notify);
+            } else {
+                $datatable->data[] = array(get_string('email'), obfuscate_mailto($userinfo->email));
+            }
+        } else {
+            $notify = $this->output->notification(get_string('recipientidentificationproblem', 'badges'), 'notifynotice');
+            $datatable->data[] = array(get_string('name'), $notify);
+        }
+
        $datatable->data[] = array($this->output->heading(get_string('issuerdetails', 'badges'), 3), '');
        $datatable->data[] = array(get_string('issuername', 'badges'), $issuer->name);
        $datatable->data[] = array(get_string('issuerurl', 'badges'),
                html_writer::tag('a', $issuer->origin, array('href' => $issuer->origin)));
        if (isset($issuer->contact)) {
-            $datatable->data[] = array(get_string('contact', 'badges'),
-                html_writer::tag('a', $issuer->contact, array('href' => 'mailto:' . $issuer->contact)));
+            $datatable->data[] = array(get_string('contact', 'badges'), obfuscate_mailto($issuer->contact));
        }
        $datatable->data[] = array($this->output->heading(get_string('badgedetails', 'badges'), 3), '');
        $datatable->data[] = array(get_string('name'), $assertion->badge->name);
@@ -459,7 +489,7 @@ class core_badges_renderer extends plugin_renderer_base {
                    get_string('downloadall'), 'POST', array('class' => 'activatebadge'));

        // Local badges.
-        $localhtml = html_writer::start_tag('fieldset', array('class' => 'generalbox'));
+        $localhtml = html_writer::start_tag('fieldset', array('id' => 'issued-badge-table', 'class' => 'generalbox'));
        $localhtml .= html_writer::tag('legend',
                    $this->output->heading_with_help(get_string('localbadges', 'badges', $SITE->fullname), 'localbadgesh', 'badges'));
        if ($badges->badges) {
@@ -549,9 +579,12 @@ class core_badges_renderer extends plugin_renderer_base {
        $paging = new paging_bar($badges->totalcount, $badges->page, $badges->perpage, $this->page->url, 'page');

        // New badge button.
-        $n['type'] = $this->page->url->get_param('type');
-        $n['id'] = $this->page->url->get_param('id');
-        $htmlnew = $this->output->single_button(new moodle_url('newbadge.php', $n), get_string('newbadge', 'badges'));
+        $htmlnew = '';
+        if (has_capability('moodle/badges:createbadge', $this->page->context)) {
+            $n['type'] = $this->page->url->get_param('type');
+            $n['id'] = $this->page->url->get_param('id');
+            $htmlnew = $this->output->single_button(new moodle_url('newbadge.php', $n), get_string('newbadge', 'badges'));
+        }

        $htmlpagingbar = $this->render($paging);
        $table = new html_table();
@@ -870,7 +903,7 @@ class issued_badge implements renderable {
    public $issued;

    /** @var badge recipient */
-    public $recipient = 0;
+    public $recipient;

    /** @var badge visibility to others */
    public $visible = 0;
@@ -896,7 +929,12 @@ class issued_badge implements renderable {
                WHERE ' . $DB->sql_compare_text('uniquehash', 40) . ' = ' . $DB->sql_compare_text(':hash', 40),
                array('hash' => $hash), IGNORE_MISSING);
        if ($rec) {
-            $this->recipient = $rec->userid;
+            // Get a recipient from database.
+            $user = $DB->get_record_sql('SELECT u.id, u.lastname, u.firstname,
+                                                u.email AS accountemail, b.email AS backpackemail
+                        FROM {user} u LEFT JOIN {badge_backpack} b ON u.id = b.userid
+                        WHERE u.id = :userid', array('userid' => $rec->userid));
+            $this->recipient = $user;
            $this->visible = $rec->visible;
            $this->badgeid = $rec->badgeid;
        }
@@ -910,13 +948,51 @@ class external_badge implements renderable {
    /** @var issued badge */
    public $issued;

+    /** @var User ID */
+    public $recipient;
+
+    /** @var validation of external badge */
+    public $valid = true;
+
    /**
     * Initializes the badge to display
     *
-     * @param string $json External badge information.
+     * @param object $badge External badge information.
+     * @param int $recipient User id.
     */
-    public function __construct($json) {
-        $this->issued = $json;
+    public function __construct($badge, $recipient) {
+        global $DB;
+        // At this point a user has connected a backpack. So, we are going to get
+        // their backpack email rather than their account email.
+        $user = $DB->get_record_sql('SELECT u.lastname, u.firstname, b.email
+                    FROM {user} u INNER JOIN {badge_backpack} b ON u.id = b.userid
+                    WHERE userid = :userid', array('userid' => $recipient), IGNORE_MISSING);
+
+        $this->issued = $badge;
+        $this->recipient = $user;
+
+        // Check if recipient is valid.
+        // There is no way to be 100% sure that a badge belongs to a user.
+        // Backpack does not return any recipient information.
+        // All we can do is compare that backpack email hashed using salt
+        // provided in the assertion matches a badge recipient from the assertion.
+        if ($user) {
+            if (validate_email($badge->assertion->recipient) && $badge->assertion->recipient == $user->email) {
+                // If we have email, compare emails.
+                $this->valid = true;
+            } else if ($badge->assertion->recipient == 'sha256$' . hash('sha256', $user->email)) {
+                // If recipient is hashed, but no salt, compare hashes without salt.
+                $this->valid = true;
+            } else if ($badge->assertion->recipient == 'sha256$' . hash('sha256', $user->email . $badge->assertion->salt)) {
+                // If recipient is hashed, compare hashes.
+                $this->valid = true;
+            } else {
+                // Otherwise, we cannot be sure that this user is a recipient.
+                $this->valid = false;
+            }
+        } else {
+            $this->valid = false;
+        }
    }
 }

@@ -1011,7 +1087,7 @@ class badge_user_collection extends badge_collection implements renderable {
        parent::__construct($badges);

        if (!empty($CFG->badges_allowexternalbackpack)) {
-            $this->backpack = get_backpack_settings($userid);
+            $this->backpack = get_backpack_settings($userid, true);
        }
    }
 }
@@ -52,7 +52,7 @@ class block_badges extends block_base {
        return array(
                'admin' => false,
                'site-index' => true,
-                'course-view' => false,
+                'course-view' => true,
                'mod' => false,
                'my' => true
        );
@@ -88,8 +88,16 @@ class block_badges extends block_base {

        if (empty($CFG->enablebadges)) {
            $this->content->text .= get_string('badgesdisabled', 'badges');
-        } else if ($badges = badges_get_user_badges($USER->id, null, 0, $this->config->numberofbadges)) {
-            $output = $PAGE->get_renderer('core', 'badges');
+            return $this->content;
+        }
+
+        $courseid = $this->page->course->id;
+        if ($courseid == SITEID) {
+            $courseid = null;
+        }
+
+        if ($badges = badges_get_user_badges($USER->id, $courseid, 0, $this->config->numberofbadges)) {
+            $output = $this->page->get_renderer('core', 'badges');
            $this->content->text = $output->print_badges_list($badges, $USER->id, true);
        } else {
            $this->content->text .= get_string('nothingtodisplay', 'block_badges');
@@ -26,11 +26,11 @@

 $capabilities = array(
        'block/badges:addinstance' => array(
-                'riskbitmask'  => RISK_PERSONAL,
                'captype'      => 'read',
-                'contextlevel' => CONTEXT_SYSTEM,
-                'archetypes'   => array(
-                    'user' => CAP_ALLOW,
+                'contextlevel' => CONTEXT_BLOCK,
+                'archetypes' => array(
+                    'editingteacher' => CAP_ALLOW,
+                    'manager' => CAP_ALLOW
                ),
                'clonepermissionsfrom' => 'moodle/site:manageblocks'
        ),
@@ -25,6 +25,6 @@

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

-$plugin->version   = 2013050100;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->version   = 2013050101;        // The current plugin version (Date: YYYYMMDDXX).
 $plugin->requires  = 2013050100;        // Requires this Moodle version.
 $plugin->component = 'block_badges';
@@ -63,7 +63,7 @@ class behat_block_comments extends behat_base {
            $commentstextarea = $this->find('css', '.comment-area textarea', $exception);
            $commentstextarea->setValue($comment);

-            $this->find_link('Save comment')->click();
+            $this->find_link(get_string('savecomment'))->click();

            // Wait for the AJAX request.
            $this->getSession()->wait(4 * 1000, false);
@@ -91,8 +91,11 @@ class behat_block_comments extends behat_base {

        $exception = new ElementNotFoundException($this->getSession(), '"' . $comment . '" comment ');

-        $commentxpath = "//div[contains(concat(' ', @class, ' '), ' block_comments ')]" .
-            "/descendant::div[@class='comment-message'][contains(., '" . $comment . "')]";
+        // Using xpath liternal to avoid possible problems with comments containing quotes.
+        $commentliteral = $this->getSession()->getSelectorsHandler()->xpathLiteral($comment);
+
+        $commentxpath = "//div[contains(concat(' ', normalize-space(@class), ' '), ' block_comments ')]" .
+            "/descendant::div[@class='comment-message'][contains(., $commentliteral)]";
        $commentnode = $this->find('xpath', $commentxpath, $exception);

        // Click on delete icon.
@@ -100,10 +103,6 @@ class behat_block_comments extends behat_base {
        $deleteicon = $this->find('css', '.comment-delete a img', $deleteexception, $commentnode);
        $deleteicon->click();

-        // Yes confirm.
-        $confirmnode = $this->find('xpath', "//div[@class='comment-delete-confirm']/descendant::a[contains(., 'Yes')]");
-        $confirmnode->click();
-
        // Wait for the AJAX request.
        $this->getSession()->wait(4 * 1000, false);
    }
@@ -54,5 +54,9 @@ function xmldb_block_community_upgrade($oldversion) {
    // Put any upgrade step following this


+    // Moodle v2.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
+
    return true;
 }
@@ -60,5 +60,9 @@ function xmldb_block_completionstatus_upgrade($oldversion, $block) {
        // Savepoint reached.
        upgrade_block_savepoint(true, 2012112901, 'completionstatus');
    }
+    // Moodle v2.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
+
    return true;
 }
@@ -210,12 +210,12 @@ if (empty($completions)) {
                $agg = $info->get_aggregation_method($row['type']);
                echo '('. html_writer::start_tag('i');
                if ($agg == COMPLETION_AGGREGATION_ALL) {
-                    echo strtolower(get_string('all', 'completion'));
+                    echo textlib::strtolower(get_string('all', 'completion'));
                } else {
-                    echo strtolower(get_string('any', 'completion'));
+                    echo textlib::strtolower(get_string('any', 'completion'));
                }

-                echo html_writer::end_tag('i') .strtolower(get_string('required')).')';
+                echo html_writer::end_tag('i') .textlib::strtolower(get_string('required')).')';
                $agg_type = false;
            }
        }
@@ -26,9 +26,9 @@
 $string['adminview'] = 'Admin view';
 $string['allcourses'] = 'Admin user sees all courses';
 $string['configadminview'] = 'What should the admin see in the course list block?';
-$string['confighideallcourseslink'] = 'Hide "All courses" link at the bottom of the block. Link hiding does not affects Admin\'s view';
+$string['confighideallcourseslink'] = 'Remove the \'All courses\' link under the list of courses. (This setting does not affect the admin view.)';
 $string['course_list:addinstance'] = 'Add a new courses block';
 $string['course_list:myaddinstance'] = 'Add a new courses block to My home';
-$string['hideallcourseslink'] = 'Hide All courses link';
+$string['hideallcourseslink'] = 'Hide \'All courses\' link';
 $string['owncourses'] = 'Admin user sees own courses';
 $string['pluginname'] = 'Courses';
@@ -34,5 +34,17 @@ $capabilities = array(
        ),

        'clonepermissionsfrom' => 'moodle/my:manageblocks'
+    ),
+
+    'block/course_overview:addinstance' => array(
+        'riskbitmask' => RISK_SPAM | RISK_XSS,
+
+        'captype' => 'write',
+        'contextlevel' => CONTEXT_BLOCK,
+        'archetypes' => array(
+            'manager' => CAP_ALLOW
+        ),
+
+        'clonepermissionsfrom' => 'moodle/site:manageblocks'
    )
 );
@@ -27,6 +27,7 @@ $string['alwaysshowall'] = 'Always Show All';
 $string['collapseall'] = 'Collapse All Course Lists';
 $string['configotherexpanded'] = 'If enabled, Other Courses will be expanded by default unless overriden by user preferences.';
 $string['configpreservestates'] = 'If enabled, the collapsed/expanded states set by the user are stored and used on each load.';
+$string['course_overview:addinstance'] = 'Add a new course overview block';
 $string['course_overview:myaddinstance'] = 'Add a new course overview block to My home';
 $string['defaultmaxcourses'] = 'Default maximum courses';
 $string['defaultmaxcoursesdesc'] = 'Maximum courses which should be displayed on course overview block, 0 will show all courses';
@@ -31,8 +31,17 @@
 function block_course_overview_get_overviews($courses) {
    $htmlarray = array();
    if ($modules = get_plugin_list_with_function('mod', 'print_overview')) {
-        foreach ($modules as $fname) {
-            $fname($courses,$htmlarray);
+        // Split courses list into batches with no more than MAX_MODINFO_CACHE_SIZE courses in one batch.
+        // Otherwise we exceed the cache limit in get_fast_modinfo() and rebuild it too often.
+        if (defined('MAX_MODINFO_CACHE_SIZE') && MAX_MODINFO_CACHE_SIZE > 0 && count($courses) > MAX_MODINFO_CACHE_SIZE) {
+            $batches = array_chunk($courses, MAX_MODINFO_CACHE_SIZE, true);
+        } else {
+            $batches = array($courses);
+        }
+        foreach ($batches as $courses) {
+            foreach ($modules as $fname) {
+                $fname($courses, $htmlarray);
+            }
        }
    }
    return $htmlarray;
@@ -104,6 +104,9 @@ class block_course_overview_renderer extends plugin_renderer_base {
            // No need to pass title through s() here as it will be done automatically by html_writer.
            $attributes = array('title' => $course->fullname);
            if ($course->id > 0) {
+                if (empty($course->visible)) {
+                    $attributes['class'] = 'dimmed';
+                }
                $courseurl = new moodle_url('/course/view.php', array('id' => $course->id));
                $coursefullname = format_string($course->fullname, true, $course->id);
                $link = html_writer::link($courseurl, $coursefullname, $attributes);
@@ -24,6 +24,6 @@

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

-$plugin->version   = 2013050100;        // The current plugin version (Date: YYYYMMDDXX)
+$plugin->version   = 2013050101;        // The current plugin version (Date: YYYYMMDDXX)
 $plugin->requires  = 2013050100;        // Requires this Moodle version
 $plugin->component = 'block_course_overview'; // Full name of the plugin (used for diagnostics)
@@ -65,5 +65,9 @@ function xmldb_block_course_summary_upgrade($oldversion, $block) {
    }


+    // Moodle v2.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
+
    return true;
 }
@@ -836,8 +836,15 @@ M.core_dock.genericblock.prototype = {
        }

        // Must set the image src seperatly of we get an error with XML strict headers
-        var moveto = Y.Node.create('<input type="image" class="moveto customcommand requiresjs" alt="'+M.str.block.addtodock+'" title="'+
-            Y.Escape.html(M.util.get_string('dockblock', 'block', node.one('.header .title h2').getHTML())) +'" />');
+        var moveto = Y.Node.create('<input type="image" class="moveto customcommand requiresjs" />');
+        var header = node.one('.header .title h2');
+        moveto.setAttribute('alt', Y.Escape.html(M.util.get_string('addtodock', 'block')));
+        if (header) {
+            moveto.setAttribute('title', Y.Escape.html(M.util.get_string('dockblock', 'block', header.getHTML())));
+        } else {
+            moveto.setAttribute('title', Y.Escape.html(M.util.get_string('addtodock', 'block')));
+        }
+
        var icon = 't/block_to_dock';
        if (right_to_left()) {
            icon = 't/block_to_dock_rtl';
@@ -40,5 +40,9 @@ function xmldb_block_html_upgrade($oldversion) {
    // Put any upgrade step following this


+    // Moodle v2.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
+
    return true;
 }
@@ -340,7 +340,7 @@ class block_base {

    /**
     * Subclasses should override this and return true if the
-     * subclass block has a config_global.html file.
+     * subclass block has a settings.php file.
     *
     * @return boolean
     */
@@ -66,5 +66,9 @@ function xmldb_block_navigation_upgrade($oldversion, $block) {
    // Put any upgrade step following this


+    // Moodle v2.5.0 release upgrade line.
+    // Put any upgrade step following this.
+
+
    return true;
 }
@@ -105,7 +105,9 @@ class block_navigation_renderer extends plugin_renderer_base {
            if ($item->hidden) {
                $attributes['class'] = 'dimmed_text';
            }
-            if (is_string($item->action) || empty($item->action) || ($item->type === navigation_node::TYPE_CATEGORY && empty($options['linkcategories']))) {
+            if (is_string($item->action) || empty($item->action) ||
+                    (($item->type === navigation_node::TYPE_CATEGORY || $item->type === navigation_node::TYPE_MY_CATEGORY) &&
+                    empty($options['linkcategories']))) {
                $attributes['tabindex'] = '0'; //add tab support to span but still maintain character stream sequence.
                $content = html_writer::tag('span', $content, $attributes);
            } else if ($item->action instanceof action_link) {
@@ -0,0 +1,71 @@
+@block @block_navigation
+Feature: View my courses in navigation block
+  In order to navigate to my courses
+  As a student
+  I need my courses displayed in the navigation block
+
+  Background:
+    Given the following "users" exists:
+      | username | firstname | lastname | email |
+      | student1 | Student | 1 | student1@asd.com |
+    And the following "categories" exists:
+      | name  | category | idnumber |
+      | cat1  | 0        | cat1     |
+      | cat2  | 0        | cat2     |
+      | cat3  | 0        | cat3     |
+      | cat31 | cat3     | cat31    |
+      | cat32 | cat3     | cat32    |
+      | cat33 | cat3     | cat33    |
+    And the following "courses" exists:
+      | fullname | shortname | category |
+      | Course1  | c1        | cat1     |
+      | Course2  | c2        | cat2     |
+      | Course31 | c31       | cat31    |
+      | Course32 | c32       | cat32    |
+      | Course331| c331      | cat33    |
+      | Course332| c332      | cat33    |
+    And the following "course enrolments" exists:
+      | user     | course | role    |
+      | student1 | c1     | student |
+      | student1 | c31    | student |
+      | student1 | c331   | student |
+    And I log in as "admin"
+
+  @javascript
+  Scenario: The plain list of enrolled courses is shown
+    Given I set the following administration settings values:
+      | Show my course categories | 0 |
+    And I log out
+    And I log in as "student1"
+    When I follow "My home"
+    Then I should not see "cat1" in the "Navigation" "block"
+    And I should not see "cat2" in the "Navigation" "block"
+    And I should see "c1" in the "Navigation" "block"
+    And I should see "c31" in the "Navigation" "block"
+    And I should see "c331" in the "Navigation" "block"
+    And I should not see "c2" in the "Navigation" "block"
+    And I should not see "c32" in the "Navigation" "block"
+    And I should not see "c332" in the "Navigation" "block"
+
+  @javascript
+  Scenario: The nested list of enrolled courses is shown
+    Given I set the following administration settings values:
+      | Show my course categories | 1 |
+    And I log out
+    And I log in as "student1"
+    When I follow "My home"
+    Then I should see "cat1" in the "Navigation" "block"
+    And I should see "cat3" in the "Navigation" "block"
+    And I should not see "cat2" in the "Navigation" "block"
+    And I expand "cat3" node
+    And I wait "2" seconds
+    And I should see "cat31" in the "Navigation" "block"
+    And I should see "cat33" in the "Navigation" "block"
+    And I should not see "cat32" in the "Navigation" "block"
+    And I expand "cat31" node
+    And I wait "2" seconds
+    And I should see "c31" in the "Navigation" "block"
+    And I expand "cat33" node
+    And I wait "2" seconds
+    And I should see "c331" in the "Navigation" "block"
+    And I should not see "c332" in the "Navigation" "block"
@@ -391,11 +391,15 @@ BRANCH.prototype = {
    },
    /**
     * Attaches required events to the branch structure.
+     *
+     * @chainable
+     * @method wire
+     * @return {BRANCH} This function is chainable, it always returns itself.
     */
    wire : function() {
        this.node = this.node || Y.one('#'+this.get('id'));
        if (!this.node) {
-            return false;
+            return this;
        }
        if (this.get('expandable')) {
            this.node.setAttribute('data-expandable', '1');
@@ -391,11 +391,15 @@ BRANCH.prototype = {
    },
    /**
     * Attaches required events to the branch structure.
+     *
+     * @chainable
+     * @method wire
+     * @return {BRANCH} This function is chainable, it always returns itself.
     */
    wire : function() {
        this.node = this.node || Y.one('#'+this.get('id'));
        if (!this.node) {
-            return false;
+            return this;
        }
        if (this.get('expandable')) {
            this.node.setAttribute('data-expandable', '1');
@@ -389,11 +389,15 @@ BRANCH.prototype = {
    },
    /**
     * Attaches required events to the branch structure.
+     *
+     * @chainable
+     * @method wire
+     * @return {BRANCH} This function is chainable, it always returns itself.
     */
    wire : function() {
        this.node = this.node || Y.one('#'+this.get('id'));
        if (!this.node) {
-            return false;
+            return this;
        }
        if (this.get('expandable')) {
            this.node.setAttribute('data-expandable', '1');
--- a/Show More
+++ b/Show More