Moodle release 2.1.2

weekly release 2.1.1+
fix permissions
2011-10-09 00:49:42 +02:00 · 2011-10-07 00:11:22 +02:00 · 2011-10-07 00:06:23 +02:00 · 2011-10-07 00:05:07 +02:00 · 2011-10-06 00:55:37 +00:00 · 2011-10-05 14:52:45 +08:00
2336 changed files with 159721 additions and 70556 deletions
@@ -12,6 +12,8 @@
    $hide     = optional_param('hide', 0, PARAM_INT);
    $show     = optional_param('show', 0, PARAM_INT);
    $delete   = optional_param('delete', 0, PARAM_INT);
+    $unprotect = optional_param('unprotect', 0, PARAM_INT);
+    $protect = optional_param('protect', 0, PARAM_INT);

 /// Print headings

@@ -24,6 +26,9 @@
    $strcourses = get_string('blockinstances', 'admin');
    $strname = get_string('name');
    $strshowblockcourse = get_string('showblockcourse');
+    $strprotecthdr = get_string('blockprotect', 'admin'). $OUTPUT->help_icon('blockprotect','admin');
+    $strprotect = get_string('blockprotect', 'admin');
+    $strunprotect = get_string('blockunprotect', 'admin');

 /// If data submitted, then process and store.

@@ -43,6 +48,36 @@
        admin_get_root(true, false);  // settings not required - only pages
    }

+    if (!isset($CFG->undeletableblocktypes) || (!is_array($CFG->undeletableblocktypes) && !is_string($CFG->undeletableblocktypes))) {
+        $undeletableblocktypes = array('navigation', 'settings');
+    } else if (is_string($CFG->undeletableblocktypes)) {
+        $undeletableblocktypes = explode(',', $CFG->undeletableblocktypes);
+    } else {
+        $undeletableblocktypes = $CFG->undeletableblocktypes;
+    }
+
+    if (!empty($protect) && confirm_sesskey()) {
+        if (!$block = $DB->get_record('block', array('id'=>$protect))) {
+            print_error('blockdoesnotexist', 'error');
+        }
+        if (!in_array($block->name, $undeletableblocktypes)) {
+            $undeletableblocktypes[] = $block->name;
+            set_config('undeletableblocktypes', implode(',', $undeletableblocktypes));
+        }
+        admin_get_root(true, false);  // settings not required - only pages
+    }
+
+    if (!empty($unprotect) && confirm_sesskey()) {
+        if (!$block = $DB->get_record('block', array('id'=>$unprotect))) {
+            print_error('blockdoesnotexist', 'error');
+        }
+        if (in_array($block->name, $undeletableblocktypes)) {
+            $undeletableblocktypes = array_diff($undeletableblocktypes, array($block->name));
+            set_config('undeletableblocktypes', implode(',', $undeletableblocktypes));
+        }
+        admin_get_root(true, false);  // settings not required - only pages
+    }
+
    if (!empty($delete) && confirm_sesskey()) {
        echo $OUTPUT->header();
        echo $OUTPUT->heading($strmanageblocks);
@@ -114,11 +149,12 @@

    $table = new flexible_table('admin-blocks-compatible');

-    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'delete', 'settings'));
-    $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strdelete, $strsettings));
+    $table->define_columns(array('name', 'instances', 'version', 'hideshow', 'undeletable', 'delete', 'settings'));
+    $table->define_headers(array($strname, $strcourses, $strversion, $strhide.'/'.$strshow, $strprotecthdr, $strdelete, $strsettings));
    $table->define_baseurl($CFG->wwwroot.'/'.$CFG->admin.'/blocks.php');
    $table->set_attribute('class', 'compatibleblockstable blockstable generaltable');
    $table->setup();
+    $tablerows = array();

    foreach ($blocks as $blockid=>$block) {
        $blockname = $block->name;
@@ -191,15 +227,32 @@
            $version = "$block->version ($plugin->version)";
        }

+        if (!$blockobject) {
+            // ignore
+            $undeletable = '';
+        } else if (in_array($blockname, $undeletableblocktypes)) {
+            $undeletable = '<a href="blocks.php?unprotect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strunprotect.'">'.
+                       '<img src="'.$OUTPUT->pix_url('t/unlock') . '" class="icon" alt="'.$strunprotect.'" /></a>';
+        } else {
+            $undeletable = '<a href="blocks.php?protect='.$blockid.'&amp;sesskey='.sesskey().'" title="'.$strprotect.'">'.
+                       '<img src="'.$OUTPUT->pix_url('t/unlock_gray') . '" class="icon" alt="'.$strprotect.'" /></a>';
+        }

-        $table->add_data(array(
+        $row = array(
            '<span'.$class.'>'.$strblockname.'</span>',
            $blocklist,
            '<span'.$class.'>'.$version.'</span>',
            $visible,
+            $undeletable,
            $delete,
            $settings
-        ));
+        );
+        $tablerows[] = array(strip_tags($strblockname), $row); // first element will be used for sorting
+    }
+
+    textlib_get_instance()->asort($tablerows);
+    foreach ($tablerows as $row) {
+        $table->add_data($row[1]);
    }

    $table->print_html();
@@ -115,12 +115,12 @@ if (function_exists('date_default_timezone_set') and function_exists('date_defau
 define('MOODLE_INTERNAL', true);

 // Check that PHP is of a sufficient version
-if (version_compare(phpversion(), "5.2.8") < 0) {
+if (version_compare(phpversion(), "5.3.2") < 0) {
    $phpversion = phpversion();
    // do NOT localise - lang strings would not work here and we CAN NOT move it after installib
-    echo "Sorry, Moodle 2.0 requires PHP 5.2.8 or later (currently using version $phpversion).\n";
-    echo "Please upgrade your server software or install latest Moodle 1.9.x instead.";
-    die;
+    fwrite(STDERR, "Moodle 2.1 or later requires at least PHP 5.3.2 (currently using version $phpversion).\n");
+    fwrite(STDERR, "Please upgrade your server software or install older Moodle version.\n");
+    exit(1);
 }

 // set up configuration
@@ -376,25 +376,16 @@ if ($interactive) {
    }
 }

-//download lang pack with optional notification
-if ($CFG->lang != 'en') {
-    if ($cd = new component_installer('http://download.moodle.org', 'langpack/2.0', $CFG->lang.'.zip', 'languages.md5', 'lang')) {
-        if ($cd->install() == COMPONENT_ERROR) {
-            if ($cd->get_error() == 'remotedownloaderror') {
-                $a = new stdClass();
-                $a->url  = 'http://download.moodle.org/langpack/2.0/'.$CFG->lang.'.zip';
-                $a->dest = $CFG->dataroot.'/lang';
-                cli_problem(get_string($cd->get_error(), 'error', $a));
-            } else {
-                cli_problem(get_string($cd->get_error(), 'error'));
-            }
-        } else {
-            // install parent lang if defined
-            if ($parentlang = get_parent_language()) {
-                if ($cd = new component_installer('http://download.moodle.org', 'langpack/2.0', $parentlang.'.zip', 'languages.md5', 'lang')) {
-                    $cd->install();
-                }
-            }
+// download required lang packs
+if ($CFG->lang !== 'en') {
+    $installer = new lang_installer($CFG->lang);
+    $results = $installer->run();
+    foreach ($results as $langcode => $langstatus) {
+        if ($langstatus === lang_installer::RESULT_DOWNLOADERROR) {
+            $a       = new stdClass();
+            $a->url  = $installer->lang_pack_url($langcode);
+            $a->dest = $CFG->dataroot.'/lang';
+            cli_problem(get_string('remotedownloaderror', 'error', $a));
        }
    }
 }
@@ -46,6 +46,8 @@ Options:
 --adminuser=USERNAME  Username for the moodle admin account. Default is admin.
 --adminpass=PASSWORD  Password for the moodle admin account.
 --agree-license       Indicates agreement with software license.
+--fullname            Name of the site
+--shortname           Name of the site
 -h, --help            Print out this help

 Example:
@@ -53,12 +55,12 @@ Example:
 ";

 // Check that PHP is of a sufficient version
-if (version_compare(phpversion(), "5.2.8") < 0) {
+if (version_compare(phpversion(), "5.3.2") < 0) {
    $phpversion = phpversion();
    // do NOT localise - lang strings would not work here and we CAN NOT move it after installib
-    fwrite(STDERR, "Sorry, Moodle 2.0 requires PHP 5.2.8 or later (currently using version $phpversion).\n");
-    fwrite(STDERR, "Please upgrade your server software or install latest Moodle 1.9.x instead.\n");
-    die(1);
+    fwrite(STDERR, "Moodle 2.1 or later requires at least PHP 5.3.2 (currently using version $phpversion).\n");
+    fwrite(STDERR, "Please upgrade your server software or install older Moodle version.\n");
+    exit(1);
 }

 // Nothing to do if config.php does not exist
@@ -66,7 +68,7 @@ $configfile = dirname(dirname(dirname(__FILE__))).'/config.php';
 if (!file_exists($configfile)) {
    fwrite(STDERR, 'config.php does not exist, can not continue'); // do not localize
    fwrite(STDERR, "\n");
-    die(1);
+    exit(1);
 }

 // Include necessary libs
@@ -93,6 +95,8 @@ list($options, $unrecognized) = cli_get_params(
        'lang'              => 'en',
        'adminuser'         => 'admin',
        'adminpass'         => '',
+        'fullname'          => '',
+        'shortname'         => '',
        'agree-license'     => false,
        'help'              => false
    ),
@@ -121,26 +125,17 @@ if (!file_exists($CFG->dirroot.'/install/lang/'.$options['lang'])) {
 }
 $CFG->lang = $options['lang'];

-//download lang pack with optional notification
-if ($CFG->lang != 'en') {
+// download required lang packs
+if ($CFG->lang !== 'en') {
    make_upload_directory('lang');
-    if ($cd = new component_installer('http://download.moodle.org', 'langpack/2.0', $CFG->lang.'.zip', 'languages.md5', 'lang')) {
-        if ($cd->install() == COMPONENT_ERROR) {
-            if ($cd->get_error() == 'remotedownloaderror') {
-                $a = new stdClass();
-                $a->url  = 'http://download.moodle.org/langpack/2.0/'.$CFG->lang.'.zip';
-                $a->dest = $CFG->dataroot.'/lang';
-                cli_problem(get_string($cd->get_error(), 'error', $a));
-            } else {
-                cli_problem(get_string($cd->get_error(), 'error'));
-            }
-        } else {
-            // install parent lang if defined
-            if ($parentlang = get_parent_language()) {
-                if ($cd = new component_installer('http://download.moodle.org', 'langpack/2.0', $parentlang.'.zip', 'languages.md5', 'lang')) {
-                    $cd->install();
-                }
-            }
+    $installer = new lang_installer($CFG->lang);
+    $results = $installer->run();
+    foreach ($results as $langcode => $langstatus) {
+        if ($langstatus === lang_installer::RESULT_DOWNLOADERROR) {
+            $a       = new stdClass();
+            $a->url  = $installer->lang_pack_url($langcode);
+            $a->dest = $CFG->dataroot.'/lang';
+            cli_problem(get_string('remotedownloaderror', 'error', $a));
        }
    }
 }
@@ -94,7 +94,7 @@ $oldversion = "$CFG->release ($CFG->version)";
 $newversion = "$release ($version)";

 // test environment first
-if (!check_moodle_environment($version, $environment_results, false, ENV_SELECT_RELEASE)) {
+if (!check_moodle_environment(normalize_version($release), $environment_results, false, ENV_SELECT_RELEASE)) {
    $errors = environment_get_errors($environment_results);
    cli_heading(get_string('environment', 'admin'));
    foreach ($errors as $error) {
@@ -36,6 +36,12 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

+
+if (defined('STDIN')) {
+    fwrite(STDERR, "ERROR: This script no longer supports CLI, please use admin/cli/cron.php instead\n");
+    exit(1);
+}
+
 // This is a fake CLI script, it is a really ugly hack which emulates
 // CLI via web interface, please do not use this hack elsewhere
 define('CLI_SCRIPT', true);
@@ -328,4 +328,118 @@
      </CUSTOM_CHECK>
    </CUSTOM_CHECKS>
  </MOODLE>
+  <MOODLE version="2.1" requires="1.9">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="5.0.25">
+        <FEEDBACK>
+          <ON_ERROR message="mysql416required" />
+        </FEEDBACK>
+      </VENDOR>
+      <VENDOR name="postgres" version="8.3" />
+      <VENDOR name="mssql" version="9.0" />
+      <VENDOR name="odbc_mssql" version="9.0" />
+      <VENDOR name="mssql_n" version="9.0" />
+      <VENDOR name="oracle" version="10.2" />
+      <VENDOR name="sqlite" version="2.0" />
+    </DATABASE>
+    <PHP version="5.3.2" level="required">
+    </PHP>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_CHECK 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_CHECK 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="gd" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="gdrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_CHECK message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_CHECK 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_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="40M" 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>
@@ -387,10 +387,10 @@ class generator {
            .$this->get('number_of_modules')." modules in each section, for each course...");

        list($modules_list_sql, $modules_params) =
-            $DB->get_in_or_equal($this->get('modules_list'), SQL_PARAMS_NAMED, 'param0000', true);
+            $DB->get_in_or_equal($this->get('modules_list'), SQL_PARAMS_NAMED, 'mod', true);

        list($modules_ignored_sql, $ignore_params) =
-            $DB->get_in_or_equal($this->modules_to_ignore, SQL_PARAMS_NAMED, 'param2000', false);
+            $DB->get_in_or_equal($this->modules_to_ignore, SQL_PARAMS_NAMED, 'ignore', false);

        $wheresql = "name $modules_list_sql AND name $modules_ignored_sql";
        $modules = $DB->get_records_select('modules', $wheresql, array_merge($modules_params, $ignore_params));
@@ -622,7 +622,7 @@ class generator {
            require_once($CFG->libdir .'/questionlib.php');
            require_once($CFG->dirroot .'/mod/quiz/editlib.php');
            $questions = array();
-            $questionsmenu = question_type_menu();
+            $questionsmenu = question_bank::get_creatable_qtypes();
            $questiontypes = array();
            foreach ($questionsmenu as $qtype => $qname) {
                $questiontypes[] = $qtype;
@@ -39,13 +39,17 @@ while(!feof($fd)) {
    $action = clam_handle_infected_file($file,$log->userid,true);
    clam_replace_infected_file($file);

+    list($ctxselect, $ctxjoin) = context_instance_preload_sql('c.id', CONTEXT_COURSE, 'ctx');
+    $sql = "SELECT c.id, c.fullname $ctxselect FROM {course} c $ctxjoin WHERE c.id = :courseid";
+    $course = $DB->get_record_sql($sql, array('courseid' => $log->course));
+    context_instance_preload($course);
+
    $user = $DB->get_record("user", array("id"=>$log->userid));
-    $course = $DB->get_record("course", array("id"=>$log->course));
    $subject = get_string('virusfoundsubject','moodle',format_string($site->fullname));
    $a->date = userdate($log->time);

    $a->action = $action;
-    $a->course = $course->fullname;
+    $a->course = format_string($course->fullname, true, array('context' => get_context_instance(CONTEXT_COURSE, $course->id)));
    $a->user = fullname($user);

    notify_user($user,$subject,$a);
@@ -30,11 +30,11 @@ if (!file_exists('../config.php')) {
 }

 // Check that PHP is of a sufficient version as soon as possible
-if (version_compare(phpversion(), '5.2.0') < 0) {
+if (version_compare(phpversion(), '5.3.2') < 0) {
    $phpversion = phpversion();
    // do NOT localise - lang strings would not work here and we CAN NOT move it to later place
-    echo "Sorry, Moodle 2.0 requires PHP 5.2.8 or later (currently using version $phpversion). ";
-    echo "Please upgrade your server software or use latest Moodle 1.9.x instead.";
+    echo "Moodle 2.1 or later requires at least PHP 5.3.2 (currently using version $phpversion).<br />";
+    echo "Please upgrade your server software or install older Moodle version.";
    die;
 }

@@ -48,6 +48,7 @@ $id             = optional_param('id', '', PARAM_TEXT);
 $confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL);
 $confirmrelease = optional_param('confirmrelease', 0, PARAM_BOOL);
 $confirmplugins = optional_param('confirmplugincheck', 0, PARAM_BOOL);
+$showallplugins = optional_param('showallplugins', 0, PARAM_BOOL);
 $agreelicense   = optional_param('agreelicense', 0, PARAM_BOOL);

 // Check some PHP server settings
@@ -123,7 +124,7 @@ if (!core_tables_exist()) {
        echo $OUTPUT->box($copyrightnotice, 'copyrightnotice');
        echo '<br />';
        $continue = new single_button(new moodle_url('/admin/index.php', array('lang'=>$CFG->lang, 'agreelicense'=>1)), get_string('continue'), 'get');
-        echo $OUTPUT->confirm(get_string('doyouagree'), $continue, "http://docs.moodle.org/en/License");
+        echo $OUTPUT->confirm(get_string('doyouagree'), $continue, "http://docs.moodle.org/dev/License");
        echo $OUTPUT->footer();
        die;
    }
@@ -147,12 +148,12 @@ if (!core_tables_exist()) {
            }
        }

-        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes');
+        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases');
        $releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
        echo $OUTPUT->box($releasenoteslink, 'generalbox releasenoteslink');

        require_once($CFG->libdir.'/environmentlib.php');
-        if (!check_moodle_environment($release, $environment_results, true, ENV_SELECT_RELEASE)) {
+        if (!check_moodle_environment(normalize_version($release), $environment_results, true, ENV_SELECT_RELEASE)) {
            print_upgrade_reload("index.php?agreelicense=1&amp;lang=$CFG->lang");
        } else {
            echo $OUTPUT->notification(get_string('environmentok', 'admin'), 'notifysuccess');
@@ -193,6 +194,7 @@ if (empty($CFG->version)) {
 }

 if ($version > $CFG->version) {  // upgrade
+    purge_all_caches();
    $PAGE->set_pagelayout('maintenance');
    $PAGE->set_popup_notification_allowed(false);

@@ -229,7 +231,7 @@ if ($version > $CFG->version) {  // upgrade
        $PAGE->set_cacheable(false);
        echo $OUTPUT->header();
        echo $OUTPUT->heading("Moodle $release");
-        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes');
+        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases');
        $releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
        echo $OUTPUT->box($releasenoteslink);

@@ -255,17 +257,19 @@ if ($version > $CFG->version) {  // upgrade
        $PAGE->set_title($strplugincheck);
        $PAGE->set_heading($strplugincheck);
        $PAGE->set_cacheable(false);
-        echo $OUTPUT->header();
-        echo $OUTPUT->heading($strplugincheck);
-        echo $OUTPUT->box_start('generalbox', 'notice');
-        print_string('pluginchecknotice');
-        echo $OUTPUT->box_end();
-        print_plugin_tables();
+        $output = $PAGE->get_renderer('core', 'admin');
+        $pluginman = plugin_manager::instance();
+
+        echo $output->header();
+        echo $output->box_start('generalbox');
+        echo $output->container(get_string('pluginchecknotice', 'core_plugin'), 'generalbox', 'notice');
+        echo $output->plugins_check($pluginman->get_plugins(), array('full' => $showallplugins));
+        echo $output->box_end();
        print_upgrade_reload('index.php?confirmupgrade=1&amp;confirmrelease=1');
        $button = new single_button(new moodle_url('index.php', array('confirmupgrade'=>1, 'confirmrelease'=>1, 'confirmplugincheck'=>1)), get_string('upgradestart', 'admin'), 'get');
        $button->class = 'continuebutton';
-        echo $OUTPUT->render($button);
-        echo $OUTPUT->footer();
+        echo $output->render($button);
+        echo $output->footer();
        die();

    } else {
@@ -293,17 +297,19 @@ if (moodle_needs_upgrading()) {
            $PAGE->set_title($strplugincheck);
            $PAGE->set_heading($strplugincheck);
            $PAGE->set_cacheable(false);
-            echo $OUTPUT->header();
-            echo $OUTPUT->heading($strplugincheck);
-            echo $OUTPUT->box_start('generalbox', 'notice');
-            print_string('pluginchecknotice');
-            echo $OUTPUT->box_end();
-            print_plugin_tables();
+            $output = $PAGE->get_renderer('core', 'admin');
+            $pluginman = plugin_manager::instance();
+
+            echo $output->header();
+            echo $output->box_start('generalbox');
+            echo $output->container(get_string('pluginchecknotice', 'core_plugin'), 'generalbox', 'notice');
+            echo $output->plugins_check($pluginman->get_plugins(), array('full' => $showallplugins));
+            echo $output->box_end();
            print_upgrade_reload('index.php');
            $button = new single_button(new moodle_url('index.php', array('confirmplugincheck'=>1)), get_string('upgradestart', 'admin'), 'get');
            $button->class = 'continuebutton';
-            echo $OUTPUT->render($button);
-            echo $OUTPUT->footer();
+            echo $output->render($button);
+            echo $output->footer();
            die();
        }
    }
@@ -349,7 +355,6 @@ if (during_initial_install()) {
        }
        // login user and let him set password and admin details
        $adminuser->newadminuser = 1;
-        message_set_default_message_preferences($adminuser);
        complete_user_login($adminuser, false);
        redirect("$CFG->wwwroot/user/editadvanced.php?id=$adminuser->id"); // Edit thyself

@@ -402,6 +407,17 @@ if (any_new_admin_settings($adminroot)){
 admin_externalpage_setup('adminnotifications');
 echo $OUTPUT->header();

+// Unstable code warning
+if (isset($maturity)) {
+    if ($maturity < MATURITY_STABLE) {
+        $maturitylevel = get_string('maturity'.$maturity, 'admin');
+        echo $OUTPUT->box(
+            get_string('maturitycoreinfo', 'admin', $maturitylevel) . ' ' .
+            $OUTPUT->doc_link('admin/versions', get_string('morehelp')),
+            'generalbox adminwarning maturityinfo');
+    }
+}
+
 if ($insecuredataroot == INSECURE_DATAROOT_WARNING) {
    echo $OUTPUT->box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'generalbox adminwarning');
 } else if ($insecuredataroot == INSECURE_DATAROOT_ERROR) {
@@ -440,10 +456,10 @@ if (!empty($CFG->maintenance_enabled)) {
 //////////////////////////////////////////////////////////////////////////////////////////////////
 ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
 $copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
-                 '<a href="http://docs.moodle.org/en/Release" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
+                 '<a href="http://docs.moodle.org/dev/Releases" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
                 'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'.
-                 'and <a href="http://docs.moodle.org/en/Credits">many other contributors</a>.<br />'.
-                 '<a href="http://docs.moodle.org/en/License">GNU Public License</a>';
+                 'and <a href="http://docs.moodle.org/dev/Credits">many other contributors</a>.<br />'.
+                 '<a href="http://docs.moodle.org/dev/License">GNU Public License</a>';
 echo $OUTPUT->box($copyrighttext, 'copyright');
 //////////////////////////////////////////////////////////////////////////////////////////////////

@@ -18,7 +18,7 @@
 /**
 * Fetches language packages from download.moodle.org server
 *
- * Language packages are available at http://download.moodle.org/langpack/2.0/
+ * Language packages are available at http://download.moodle.org/langpack/
 * in ZIP format together with a file languages.md5 containing their hashes
 * and meta info.
 * Locally, language packs are saved into $CFG->dataroot/lang/
@@ -33,8 +33,6 @@ require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/filelib.php');
 require_once($CFG->libdir.'/componentlib.class.php');

-$thisversion = '2.0'; // TODO this information should be taken from version.php or similar source
-
 admin_externalpage_setup('langimport');

 if (!empty($CFG->skiplangupgrade)) {
@@ -53,11 +51,6 @@ define('INSTALLATION_OF_SELECTED_LANG', 2);
 define('DELETION_OF_SELECTED_LANG', 4);
 define('UPDATE_ALL_LANG', 5);

-//reset and diagnose lang cache permissions
-remove_dir($CFG->dataroot.'/cache/languages');
-if (file_exists($CFG->dataroot.'/cache/languages')) {
-    print_error('cannotdeletelangcache', 'error');
-}
 get_string_manager()->reset_caches();

 $notice_ok    = array();
@@ -68,41 +61,22 @@ if (($mode == INSTALLATION_OF_SELECTED_LANG) and confirm_sesskey() and !empty($p
    make_upload_directory('temp');
    make_upload_directory('lang');

-    if (is_array($pack)) {
-        $packs = $pack;
-    } else {
-        $packs = array($pack);
-    }
-
-    foreach ($packs as $pack) {
-        if ($cd = new component_installer('http://download.moodle.org', 'langpack/'.$thisversion, $pack.'.zip', 'languages.md5', 'lang')) {
-            $status = $cd->install();
-            switch ($status) {
-            case COMPONENT_ERROR:
-                if ($cd->get_error() == 'remotedownloaderror') {
-                    $a = new stdClass();
-                    $a->url = 'http://download.moodle.org/langpack/'.$thisversion.'/'.$pack.'.zip';
-                    $a->dest = $CFG->dataroot.'/lang';
-                    print_error($cd->get_error(), 'error', 'langimport.php', $a);
-                } else {
-                    print_error($cd->get_error(), 'error', 'langimport.php');
-                }
-                break;
-            case COMPONENT_INSTALLED:
-                $notice_ok[] = get_string('langpackinstalled','admin',$pack);
-                if ($parentlang = get_parent_language($pack)) {
-                    // install also parent pack if specified
-                    if ($cd = new component_installer('http://download.moodle.org', 'langpack/'.$thisversion,
-                            $parentlang.'.zip', 'languages.md5', 'lang')) {
-                        $cd->install();
-                    }
-                }
-                break;
-            case COMPONENT_UPTODATE:
-                break;
-            }
-        } else {
-            echo $OUTPUT->notification('Had an unspecified error with the component installer, sorry.');
+    $installer = new lang_installer($pack);
+    $results = $installer->run();
+    foreach ($results as $langcode => $langstatus) {
+        switch ($langstatus) {
+        case lang_installer::RESULT_DOWNLOADERROR:
+            $a       = new stdClass();
+            $a->url  = $installer->lang_pack_url($langcode);
+            $a->dest = $CFG->dataroot.'/lang';
+            print_error('remotedownloaderror', 'error', 'langimport.php', $a);
+            break;
+        case lang_installer::RESULT_INSTALLED:
+            $notice_ok[] = get_string('langpackinstalled', 'admin', $langcode);
+            break;
+        case lang_installer::RESULT_UPTODATE:
+            $notice_ok[] = get_string('langpackuptodate', 'admin', $langcode);
+            break;
        }
    }
 }
@@ -141,7 +115,9 @@ if ($mode == DELETION_OF_SELECTED_LANG and !empty($uninstalllang)) {
 if ($mode == UPDATE_ALL_LANG) {
    set_time_limit(0);

-    if (!$availablelangs = get_remote_list_of_languages()) {
+    $installer = new lang_installer();
+
+    if (!$availablelangs = $installer->get_remote_list_of_languages()) {
        print_error('cannotdownloadlanguageupdatelist', 'error');
    }
    $md5array = array();    // (string)langcode => (string)md5
@@ -176,8 +152,8 @@ if ($mode == UPDATE_ALL_LANG) {
    make_upload_directory('temp');
    make_upload_directory('lang');

-    $updated = false;       // any packs updated?
-    foreach ($neededlangs as $pack) {
+    // clean-up currently installed versions of the packs
+    foreach ($neededlangs as $packindex => $pack) {
        if ($pack == 'en') {
            continue;
        }
@@ -190,41 +166,38 @@ if ($mode == UPDATE_ALL_LANG) {
        if (file_exists($dest1)) {
            if (!remove_dir($dest1)) {
                $notice_error[] = 'Could not delete old directory '.$dest1.', update of '.$pack.' failed, please check permissions.';
+                unset($neededlangs[$packindex]);
                continue;
            }
        }
        if (file_exists($dest2)) {
            if (!remove_dir($dest2)) {
                $notice_error[] = 'Could not delete old directory '.$dest2.', update of '.$pack.' failed, please check permissions.';
+                unset($neededlangs[$packindex]);
                continue;
            }
        }
+    }

-        // copy and unzip new version
-        if ($cd = new component_installer('http://download.moodle.org', 'langpack/'.$thisversion, $pack.'.zip', 'languages.md5', 'lang')) {
-        $status = $cd->install();
-        switch ($status) {
-
-            case COMPONENT_ERROR:
-                if ($cd->get_error() == 'remotedownloaderror') {
-                    $a = new stdClass();
-                    $a->url = 'http://download.moodle.org/langpack/'.$thisversion.'/'.$pack.'.zip';
-                    $a->dest = $CFG->dataroot.'/lang';
-                    print_error($cd->get_error(), 'error', 'langimport.php', $a);
-                } else {
-                    print_error($cd->get_error(), 'error', 'langimport.php');
-                }
-                break;
-
-            case COMPONENT_UPTODATE:
-                // should not get here
-                break;
-
-            case COMPONENT_INSTALLED:
-                $notice_ok[] = get_string('langpackupdated', 'admin', $pack);
-                $updated = true;
-                break;
-            }
+    // install all needed language packs
+    $installer->set_queue($neededlangs);
+    $results = $installer->run();
+    $updated = false;    // any packs updated?
+    foreach ($results as $langcode => $langstatus) {
+        switch ($langstatus) {
+        case lang_installer::RESULT_DOWNLOADERROR:
+            $a       = new stdClass();
+            $a->url  = $installer->lang_pack_url($langcode);
+            $a->dest = $CFG->dataroot.'/lang';
+            print_error('remotedownloaderror', 'error', 'langimport.php', $a);
+            break;
+        case lang_installer::RESULT_INSTALLED:
+            $updated = true;
+            $notice_ok[] = get_string('langpackinstalled', 'admin', $langcode);
+            break;
+        case lang_installer::RESULT_UPTODATE:
+            $notice_ok[] = get_string('langpackuptodate', 'admin', $langcode);
+            break;
        }
    }

@@ -233,6 +206,8 @@ if ($mode == UPDATE_ALL_LANG) {
    } else {
        $notice_ok[] = get_string('nolangupdateneeded','admin');
    }
+
+    unset($installer);
 }
 get_string_manager()->reset_caches();

@@ -244,7 +219,7 @@ $installedlangs = get_string_manager()->get_list_of_translations(true);
 $missingparents = array();
 foreach ($installedlangs as $installedlang => $unused) {
    $parent = get_parent_language($installedlang);
-    if (empty($parent) or ($parent === 'en')) {
+    if (empty($parent)) {
        continue;
    }
    if (!isset($installedlangs[$parent])) {
@@ -252,7 +227,9 @@ foreach ($installedlangs as $installedlang => $unused) {
    }
 }

-if ($availablelangs = get_remote_list_of_languages()) {
+$installer = new lang_installer();
+
+if ($availablelangs = $installer->get_remote_list_of_languages()) {
    $remote = true;
 } else {
    $remote = false;
@@ -362,26 +339,3 @@ function is_installed_lang($lang, $md5check) {
    }
    return false;
 }
-
-/**
- * Returns the list of available language packs from download.moodle.org
- *
- * @return array|bool false if can not download
- */
-function get_remote_list_of_languages() {
-    $source = 'http://download.moodle.org/langpack/2.0/languages.md5';
-    $availablelangs = array();
-
-    if ($content = download_file_content($source)) {
-        $alllines = explode("\n", $content);
-        foreach($alllines as $line) {
-            if (!empty($line)){
-                $availablelangs[] = explode(',', $line);
-            }
-        }
-        return $availablelangs;
-
-    } else {
-        return false;
-    }
-}
@@ -0,0 +1,39 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This file contains functions used by the admin pages
+ *
+ * @since 2.1
+ * @package admin
+ * @copyright 2011 Andrew Davis
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * Return a list of page types
+ * @param string $pagetype current page type
+ * @param stdClass $parentcontext Block's parent context
+ * @param stdClass $currentcontext Current context of block
+ */
+function admin_page_type_list($pagetype, $parentcontext, $currentcontext) {
+    $array = array(
+        'admin-*' => get_string('page-admin-x', 'pagetype'),
+        $pagetype => get_string('page-admin-current', 'pagetype')
+    );
+    return $array;
+}
@@ -21,7 +21,7 @@
 * Displays the list of found local plugins, their version (if found) and
 * a link to delete the local plugin.
 *
- * @see       http://docs.moodle.org/en/Development:Local_customisation
+ * @see       http://docs.moodle.org/dev/Local_customisation
 * @package   admin
 * @copyright 2010 David Mudrak <david.mudrak@gmail.com>
 * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -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/>.
+
+/**
+ * Message outputs configuration page
+ *
+ * @package    message
+ * @copyright  2011 Lancaster University Network Services Limited
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+require_once(dirname(__FILE__) . '/../config.php');
+require_once($CFG->dirroot . '/message/lib.php');
+require_once($CFG->libdir.'/adminlib.php');
+
+// This is an admin page
+admin_externalpage_setup('managemessageoutputs');
+
+// Require site configuration capability
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+
+// Get the submitted params
+$disable    = optional_param('disable', 0, PARAM_INT);
+$enable     = optional_param('enable', 0, PARAM_INT);
+
+if (!empty($disable) && confirm_sesskey()) {
+    if (!$processor = $DB->get_record('message_processors', array('id'=>$disable))) {
+        print_error('outputdoesnotexist', 'message');
+    }
+    $DB->set_field('message_processors', 'enabled', '0', array('id'=>$processor->id));      // Disable output
+}
+
+if (!empty($enable) && confirm_sesskey() ) {
+    if (!$processor = $DB->get_record('message_processors', array('id'=>$enable))) {
+        print_error('outputdoesnotexist', 'message');
+    }
+    $DB->set_field('message_processors', 'enabled', '1', array('id'=>$processor->id));      // Enable output
+}
+
+if ($disable || $enable) {
+    $url = new moodle_url('message.php');
+    redirect($url);
+}
+// Page settings
+$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));
+
+// Grab the renderer
+$renderer = $PAGE->get_renderer('core', 'message');
+
+// Display the manage message outputs interface
+$processors = get_message_processors();
+$messageoutputs = $renderer->manage_messageoutputs($processors);
+
+// Display the page
+echo $OUTPUT->header();
+echo $OUTPUT->heading(get_string('managemessageoutputs', 'message'));
+echo $messageoutputs;
+echo $OUTPUT->footer();
@@ -42,12 +42,20 @@ function online_assignment_cleanup($output=false) {


    /// get a list of all courses on this site
-    $courses = $DB->get_records('course');
+    list($ctxselect, $ctxjoin) = context_instance_preload_sql('c.id', CONTEXT_COURSE, 'ctx');
+    $sql = "SELECT c.* $ctxselect FROM {course} c $ctxjoin";
+    $courses = $DB->get_records_sql($sql);

    /// cycle through each course
    foreach ($courses as $course) {
+        context_instance_preload($course);
+        $context = get_context_instance(CONTEXT_COURSE, $course->id);

-        $fullname = empty($course->fullname) ? 'Course: '.$course->id : $course->fullname;
+        if (empty($course->fullname)) {
+            $fullname = get_string('course').': '.$course->id;
+        } else {
+            $fullname = format_string($course->fullname, true, array('context' => $context));
+        }
        if ($output) echo $OUTPUT->heading($fullname);

        /// retrieve a list of sections beyond what is currently being shown
@@ -96,7 +104,9 @@ function online_assignment_cleanup($output=false) {

                        /// grab the section record
                        if (!($section = $DB->get_record('course_sections', array('id'=>$newsection)))) {
-                            if ($output) echo 'Serious error: Cannot retrieve section: '.$newsection.' for course: '. format_string($course->fullname) .'<br />';
+                            if ($output) {
+                                echo 'Serious error: Cannot retrieve section: '.$newsection.' for course: '. $fullname .'<br />';
+                            }
                            continue;
                        }

@@ -117,7 +127,7 @@ function online_assignment_cleanup($output=false) {

                        /// grab the old section record
                        if (!($section = $DB->get_record('course_sections', array('id'=>$xsection->id)))) {
-                            if ($output) echo 'Serious error: Cannot retrieve old section: '.$xsection->id.' for course: '.$course->fullname.'<br />';
+                            if ($output) echo 'Serious error: Cannot retrieve old section: '.$xsection->id.' for course: '.$fullname.'<br />';
                            continue;
                        }

@@ -0,0 +1,41 @@
+<?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/>.
+
+/**
+ * UI for general plugins management
+ *
+ * @package    core
+ * @subpackage admin
+ * @copyright  2011 David Mudrak <david@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+require_once(dirname(dirname(__FILE__)) . '/config.php');
+require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->libdir . '/pluginlib.php');
+
+require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
+admin_externalpage_setup('pluginsoverview');
+$output = $PAGE->get_renderer('core', 'admin');
+$pluginman = plugin_manager::instance();
+
+echo $output->header();
+echo $output->heading(get_string('pluginsoverview', 'core_admin'));
+echo $output->box_start('generalbox');
+echo $output->plugins_control_panel($pluginman->get_plugins());
+echo $output->box_end();
+echo $output->footer();
@@ -0,0 +1,302 @@
+<?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/>.
+
+/**
+ * Allows the admin to manage question behaviours.
+ *
+ * @package    moodlecore
+ * @subpackage questionengine
+ * @copyright  2011 The Open University
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+
+require_once(dirname(__FILE__) . '/../config.php');
+require_once($CFG->libdir . '/questionlib.php');
+require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->libdir . '/tablelib.php');
+
+// Check permissions.
+require_login();
+$systemcontext = get_context_instance(CONTEXT_SYSTEM);
+require_capability('moodle/question:config', $systemcontext);
+
+admin_externalpage_setup('manageqbehaviours');
+$thispageurl = new moodle_url('/admin/qbehaviours.php');
+
+$behaviours = get_plugin_list('qbehaviour');
+
+// Get some data we will need - question counts and which types are needed.
+$counts = $DB->get_records_sql_menu("
+        SELECT behaviour, COUNT(1)
+        FROM {question_attempts} GROUP BY behaviour");
+$needed = array();
+$archetypal = array();
+foreach ($behaviours as $behaviour => $notused) {
+    if (!array_key_exists($behaviour, $counts)) {
+        $counts[$behaviour] = 0;
+    }
+    $needed[$behaviour] = $counts[$behaviour] > 0;
+    $archetypal[$behaviour] = question_engine::is_behaviour_archetypal($behaviour);
+}
+
+foreach ($behaviours as $behaviour => $notused) {
+    foreach (question_engine::get_behaviour_required_behaviours($behaviour) as $reqbehaviour) {
+        $needed[$reqbehaviour] = true;
+    }
+}
+foreach ($counts as $behaviour => $count) {
+    if (!array_key_exists($behaviour, $behaviours)) {
+        $counts['missingtype'] += $count;
+    }
+}
+
+// Work of the correct sort order.
+$config = get_config('question');
+$sortedbehaviours = array();
+foreach ($behaviours as $behaviour => $notused) {
+    $sortedbehaviours[$behaviour] = question_engine::get_behaviour_name($behaviour);
+}
+if (!empty($config->behavioursortorder)) {
+    $sortedbehaviours = question_engine::sort_behaviours($sortedbehaviours,
+            $config->behavioursortorder, '');
+}
+
+if (!empty($config->disabledbehaviours)) {
+    $disabledbehaviours = explode(',', $config->disabledbehaviours);
+} else {
+    $disabledbehaviours = array();
+}
+
+// Process actions ============================================================
+
+// Disable.
+if (($disable = optional_param('disable', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
+    if (!isset($behaviours[$disable])) {
+        print_error('unknownbehaviour', 'question', $thispageurl, $disable);
+    }
+
+    if (array_search($disable, $disabledbehaviours) === false) {
+        $disabledbehaviours[] = $disable;
+        set_config('disabledbehaviours', implode(',', $disabledbehaviours), 'question');
+    }
+    redirect($thispageurl);
+}
+
+// Enable.
+if (($enable = optional_param('enable', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
+    if (!isset($behaviours[$enable])) {
+        print_error('unknownbehaviour', 'question', $thispageurl, $enable);
+    }
+
+    if (!$archetypal[$enable]) {
+        print_error('cannotenablebehaviour', 'question', $thispageurl, $enable);
+    }
+
+    if (($key = array_search($enable, $disabledbehaviours)) !== false) {
+        unset($disabledbehaviours[$key]);
+        set_config('disabledbehaviours', implode(',', $disabledbehaviours), 'question');
+    }
+    redirect($thispageurl);
+}
+
+// Move up in order.
+if (($up = optional_param('up', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
+    if (!isset($behaviours[$up])) {
+        print_error('unknownbehaviour', 'question', $thispageurl, $up);
+    }
+
+    // This function works fine for behaviours, as well as qtypes.
+    $neworder = question_reorder_qtypes($sortedbehaviours, $up, -1);
+    set_config('behavioursortorder', implode(',', $neworder), 'question');
+    redirect($thispageurl);
+}
+
+// Move down in order.
+if (($down = optional_param('down', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
+    if (!isset($behaviours[$down])) {
+        print_error('unknownbehaviour', 'question', $thispageurl, $down);
+    }
+
+    // This function works fine for behaviours, as well as qtypes.
+    $neworder = question_reorder_qtypes($sortedbehaviours, $down, +1);
+    set_config('behavioursortorder', implode(',', $neworder), 'question');
+    redirect($thispageurl);
+}
+
+// Delete.
+if (($delete = optional_param('delete', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
+    // Check it is OK to delete this question type.
+    if ($delete == 'missing') {
+        print_error('cannotdeletemissingbehaviour', 'question', $thispageurl);
+    }
+
+    if (!isset($behaviours[$delete])) {
+        print_error('unknownbehaviour', 'question', $thispageurl, $delete);
+    }
+
+    $behaviourname = $sortedbehaviours[$delete];
+    if ($counts[$delete] > 0) {
+        print_error('cannotdeletebehaviourinuse', 'question', $thispageurl, $behaviourname);
+    }
+    if ($needed[$delete] > 0) {
+        print_error('cannotdeleteneededbehaviour', 'question', $thispageurl, $behaviourname);
+    }
+
+    // If not yet confirmed, display a confirmation message.
+    if (!optional_param('confirm', '', PARAM_BOOL)) {
+        echo $OUTPUT->header();
+        echo $OUTPUT->heading(get_string('deletebehaviourareyousure', 'question', $behaviourname));
+        echo $OUTPUT->confirm(
+                get_string('deletebehaviourareyousuremessage', 'question', $behaviourname),
+                new moodle_url($thispageurl, array('delete' => $delete, 'confirm' => 1)),
+                $thispageurl);
+        echo $OUTPUT->footer();
+        exit;
+    }
+
+    // Do the deletion.
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('deletingbehaviour', 'question', $behaviourname));
+
+    // Delete any configuration records.
+    if (!unset_all_config_for_plugin('qbehaviour_' . $delete)) {
+        echo $OUTPUT->notification(get_string('errordeletingconfig', 'admin', 'qbehaviour_' . $delete));
+    }
+    if (($key = array_search($delete, $disabledbehaviours)) !== false) {
+        unset($disabledbehaviours[$key]);
+        set_config('disabledbehaviours', implode(',', $disabledbehaviours), 'question');
+    }
+    $behaviourorder = explode(',', $config->behavioursortorder);
+    if (($key = array_search($delete, $behaviourorder)) !== false) {
+        unset($behaviourorder[$key]);
+        set_config('behavioursortorder', implode(',', $behaviourorder), 'question');
+    }
+
+    // Then the tables themselves
+    drop_plugin_tables($delete, get_plugin_directory('qbehaviour', $delete) . '/db/install.xml', false);
+
+    // Remove event handlers and dequeue pending events
+    events_uninstall('qbehaviour_' . $delete);
+
+    $a->behaviour = $behaviourname;
+    $a->directory = get_plugin_directory('qbehaviour', $delete);
+    echo $OUTPUT->box(get_string('qbehaviourdeletefiles', 'question', $a), 'generalbox', 'notice');
+    echo $OUTPUT->continue_button($thispageurl);
+    echo $OUTPUT->footer();
+    exit;
+}
+
+// End of process actions ==================================================
+
+// Print the page heading.
+echo $OUTPUT->header();
+echo $OUTPUT->heading(get_string('manageqbehaviours', 'admin'));
+
+// Set up the table.
+$table = new flexible_table('qbehaviouradmintable');
+$table->define_baseurl($thispageurl);
+$table->define_columns(array('behaviour', 'numqas', 'version', 'requires',
+        'available', 'delete'));
+$table->define_headers(array(get_string('behaviour', 'question'), get_string('numqas', 'question'),
+        get_string('version'), get_string('requires', 'admin'),
+        get_string('availableq', 'question'), get_string('delete')));
+$table->set_attribute('id', 'qbehaviours');
+$table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
+$table->setup();
+
+// Add a row for each question type.
+foreach ($sortedbehaviours as $behaviour => $behaviourname) {
+    $row = array();
+
+    // Question icon and name.
+    $row[] = $behaviourname;
+
+    // Count
+    $row[] = $counts[$behaviour];
+
+    // Question version number.
+    $version = get_config('qbehaviour_' . $behaviour, 'version');
+    if ($version) {
+        $row[] = $version;
+    } else {
+        $row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'disabled'));
+    }
+
+    // Other question types required by this one.
+    $requiredbehaviours = question_engine::get_behaviour_required_behaviours($behaviour);
+    if (!empty($requiredbehaviours)) {
+        $strrequiredbehaviours = array();
+        foreach ($requiredbehaviours as $required) {
+            $strrequiredbehaviours[] = $sortedbehaviours[$required];
+        }
+        $row[] = implode(', ', $strrequiredbehaviours);
+    } else {
+        $row[] = '';
+    }
+
+    // Are people allowed to create new questions of this type?
+    $rowclass = '';
+    if ($archetypal[$behaviour]) {
+        $enabled = array_search($behaviour, $disabledbehaviours) === false;
+        $icons = question_behaviour_enable_disable_icons($behaviour, $enabled);
+        if (!$enabled) {
+            $rowclass = 'dimmed_text';
+        }
+    } else {
+        $icons = $OUTPUT->spacer() . ' ';
+    }
+
+    // Move icons.
+    $icons .= question_behaviour_icon_html('up', $behaviour, 't/up', get_string('up'), null);
+    $icons .= question_behaviour_icon_html('down', $behaviour, 't/down', get_string('down'), null);
+    $row[] = $icons;
+
+    // Delete link, if available.
+    if ($needed[$behaviour]) {
+        $row[] = '';
+    } else {
+        $row[] = html_writer::link(new moodle_url($thispageurl,
+                array('delete' => $behaviour, 'sesskey' => sesskey())), get_string('delete'),
+                array('title' => get_string('uninstallbehaviour', 'question')));
+    }
+
+    $table->add_data($row, $rowclass);
+}
+
+$table->finish_output();
+
+echo $OUTPUT->footer();
+
+function question_behaviour_enable_disable_icons($behaviour, $enabled) {
+    if ($enabled) {
+        return question_behaviour_icon_html('disable', $behaviour, 'i/hide',
+                get_string('enabled', 'question'), get_string('disable'));
+    } else {
+        return question_behaviour_icon_html('enable', $behaviour, 'i/show',
+                get_string('disabled', 'question'), get_string('enable'));
+    }
+}
+
+function question_behaviour_icon_html($action, $behaviour, $icon, $alt, $tip) {
+    global $OUTPUT;
+    return $OUTPUT->action_icon(new moodle_url('/admin/qbehaviours.php',
+            array($action => $behaviour, 'sesskey' => sesskey())),
+            new pix_icon($icon, $alt, 'moodle', array('title' => '')),
+            null, array('title' => $tip)) . ' ';
+}
+
@@ -1,293 +1,312 @@
 <?php
-// Allows the admin to manage question types.

-    require_once(dirname(__FILE__) . '/../config.php');
-    require_once($CFG->libdir . '/questionlib.php');
-    require_once($CFG->libdir . '/adminlib.php');
-    require_once($CFG->libdir . '/tablelib.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/>.

-/// Check permissions.
-    require_login();
-    $systemcontext = get_context_instance(CONTEXT_SYSTEM);
-    require_capability('moodle/question:config', $systemcontext);
-    $canviewreports = has_capability('report/questioninstances:view', $systemcontext);
+/**
+ * Allows the admin to manage question types.
+ *
+ * @package    moodlecore
+ * @subpackage questionbank
+ * @copyright  2008 Tim Hunt
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */

-    admin_externalpage_setup('manageqtypes');

-/// Get some data we will need - question counts and which types are needed.
-    $counts = $DB->get_records_sql("
-            SELECT qtype, COUNT(1) as numquestions, SUM(hidden) as numhidden
-            FROM {question} GROUP BY qtype", array());
-    $needed = array();
-    foreach ($QTYPES as $qtypename => $qtype) {
-        if (!isset($counts[$qtypename])) {
-            $counts[$qtypename] = new stdClass;
-            $counts[$qtypename]->numquestions = 0;
-            $counts[$qtypename]->numhidden = 0;
-        }
-        $needed[$qtypename] = $counts[$qtypename]->numquestions > 0;
-        $counts[$qtypename]->numquestions -= $counts[$qtypename]->numhidden;
+require_once(dirname(__FILE__) . '/../config.php');
+require_once($CFG->libdir . '/questionlib.php');
+require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->libdir . '/tablelib.php');
+
+// Check permissions.
+require_login();
+$systemcontext = get_context_instance(CONTEXT_SYSTEM);
+require_capability('moodle/question:config', $systemcontext);
+$canviewreports = has_capability('report/questioninstances:view', $systemcontext);
+
+admin_externalpage_setup('manageqtypes');
+$thispageurl = new moodle_url('/admin/qtypes.php');
+
+$qtypes = question_bank::get_all_qtypes();
+
+// Get some data we will need - question counts and which types are needed.
+$counts = $DB->get_records_sql("
+        SELECT qtype, COUNT(1) as numquestions, SUM(hidden) as numhidden
+        FROM {question} GROUP BY qtype", array());
+$needed = array();
+foreach ($qtypes as $qtypename => $qtype) {
+    if (!isset($counts[$qtypename])) {
+        $counts[$qtypename] = new stdClass;
+        $counts[$qtypename]->numquestions = 0;
+        $counts[$qtypename]->numhidden = 0;
    }
-    $needed['missingtype'] = true; // The system needs the missing question type.
-    foreach ($QTYPES as $qtypename => $qtype) {
-        foreach ($qtype->requires_qtypes() as $reqtype) {
-            $needed[$reqtype] = true;
-        }
+    $needed[$qtypename] = $counts[$qtypename]->numquestions > 0;
+    $counts[$qtypename]->numquestions -= $counts[$qtypename]->numhidden;
+}
+$needed['missingtype'] = true; // The system needs the missing question type.
+foreach ($qtypes as $qtypename => $qtype) {
+    foreach ($qtype->requires_qtypes() as $reqtype) {
+        $needed[$reqtype] = true;
    }
-    foreach ($counts as $qtypename => $count) {
-        if (!isset($QTYPES[$qtypename])) {
-            $counts['missingtype']->numquestions += $count->numquestions - $count->numhidden;
-            $counts['missingtype']->numhidden += $count->numhidden;
-        }
+}
+foreach ($counts as $qtypename => $count) {
+    if (!isset($qtypes[$qtypename])) {
+        $counts['missingtype']->numquestions += $count->numquestions - $count->numhidden;
+        $counts['missingtype']->numhidden += $count->numhidden;
+    }
+}
+
+// Work of the correct sort order.
+$config = get_config('question');
+$sortedqtypes = array();
+foreach ($qtypes as $qtypename => $qtype) {
+    $sortedqtypes[$qtypename] = $qtype->local_name();
+}
+$sortedqtypes = question_bank::sort_qtype_array($sortedqtypes, $config);
+
+// Process actions ============================================================
+
+// Disable.
+if (($disable = optional_param('disable', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
+    if (!isset($qtypes[$disable])) {
+        print_error('unknownquestiontype', 'question', $thispageurl, $disable);
    }

-/// Work of the correct sort order.
-    $config = get_config('question');
-    $sortedqtypes = array();
-    foreach ($QTYPES as $qtypename => $qtype) {
-        $sortedqtypes[$qtypename] = $qtype->local_name();
-    }
-    $sortedqtypes = question_sort_qtype_array($sortedqtypes, $config);
+    set_config($disable . '_disabled', 1, 'question');
+    redirect($thispageurl);
+}

-/// Process actions ============================================================
-
-    // Disable.
-    if (($disable = optional_param('disable', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
-        if (!isset($QTYPES[$disable])) {
-            print_error('unknownquestiontype', 'question', admin_url('qtypes.php'), $disable);
-        }
-
-        set_config($disable . '_disabled', 1, 'question');
-        redirect(admin_url('qtypes.php'));
+// Enable.
+if (($enable = optional_param('enable', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
+    if (!isset($qtypes[$enable])) {
+        print_error('unknownquestiontype', 'question', $thispageurl, $enable);
    }

-    // Enable.
-    if (($enable = optional_param('enable', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
-        if (!isset($QTYPES[$enable])) {
-            print_error('unknownquestiontype', 'question', admin_url('qtypes.php'), $enable);
-        }
-
-        if (!$QTYPES[$enable]->menu_name()) {
-            print_error('cannotenable', 'question', admin_url('qtypes.php'), $enable);
-        }
-
-        unset_config($enable . '_disabled', 'question');
-        redirect(admin_url('qtypes.php'));
+    if (!$qtypes[$enable]->menu_name()) {
+        print_error('cannotenable', 'question', $thispageurl, $enable);
    }

-    // Move up in order.
-    if (($up = optional_param('up', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
-        if (!isset($QTYPES[$up])) {
-            print_error('unknownquestiontype', 'question', admin_url('qtypes.php'), $up);
-        }
+    unset_config($enable . '_disabled', 'question');
+    redirect($thispageurl);
+}

-        $neworder = question_reorder_qtypes($sortedqtypes, $up, -1);
-        question_save_qtype_order($neworder, $config);
-        redirect(admin_url('qtypes.php'));
+// Move up in order.
+if (($up = optional_param('up', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
+    if (!isset($qtypes[$up])) {
+        print_error('unknownquestiontype', 'question', $thispageurl, $up);
    }

-    // Move down in order.
-    if (($down = optional_param('down', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
-        if (!isset($QTYPES[$down])) {
-            print_error('unknownquestiontype', 'question', admin_url('qtypes.php'), $down);
-        }
+    $neworder = question_reorder_qtypes($sortedqtypes, $up, -1);
+    question_save_qtype_order($neworder, $config);
+    redirect($thispageurl);
+}

-        $neworder = question_reorder_qtypes($sortedqtypes, $down, +1);
-        question_save_qtype_order($neworder, $config);
-        redirect(admin_url('qtypes.php'));
+// Move down in order.
+if (($down = optional_param('down', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
+    if (!isset($qtypes[$down])) {
+        print_error('unknownquestiontype', 'question', $thispageurl, $down);
    }

-    // Delete.
-    if (($delete = optional_param('delete', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
-        // Check it is OK to delete this question type.
-        if ($delete == 'missingtype') {
-            print_error('cannotdeletemissingqtype', 'admin', admin_url('qtypes.php'));
-        }
+    $neworder = question_reorder_qtypes($sortedqtypes, $down, +1);
+    question_save_qtype_order($neworder, $config);
+    redirect($thispageurl);
+}

-        if (!isset($QTYPES[$delete])) {
-            print_error('unknownquestiontype', 'question', admin_url('qtypes.php'), $delete);
-        }
+// Delete.
+if (($delete = optional_param('delete', '', PARAM_SAFEDIR)) && confirm_sesskey()) {
+    // Check it is OK to delete this question type.
+    if ($delete == 'missingtype') {
+        print_error('cannotdeletemissingqtype', 'question', $thispageurl);
+    }

-        $qtypename = $QTYPES[$delete]->local_name();
-        if ($counts[$delete]->numquestions + $counts[$delete]->numhidden > 0) {
-            print_error('cannotdeleteqtypeinuse', 'admin', admin_url('qtypes.php'), $qtypename);
-        }
+    if (!isset($qtypes[$delete])) {
+        print_error('unknownquestiontype', 'question', $thispageurl, $delete);
+    }

-        if ($needed[$delete] > 0) {
-            print_error('cannotdeleteqtypeneeded', 'admin', admin_url('qtypes.php'), $qtypename);
-        }
+    $qtypename = $qtypes[$delete]->local_name();
+    if ($counts[$delete]->numquestions + $counts[$delete]->numhidden > 0) {
+        print_error('cannotdeleteqtypeinuse', 'question', $thispageurl, $qtypename);
+    }

-        // If not yet confirmed, display a confirmation message.
-        if (!optional_param('confirm', '', PARAM_BOOL)) {
-            $qtypename = $QTYPES[$delete]->local_name();
-            echo $OUTPUT->header();
-            echo $OUTPUT->heading(get_string('deleteqtypeareyousure', 'admin', $qtypename));
-            echo $OUTPUT->confirm(get_string('deleteqtypeareyousuremessage', 'admin', $qtypename),
-                    admin_url('qtypes.php?delete=' . $delete . '&confirm=1'),
-                    admin_url('qtypes.php'));
-            echo $OUTPUT->footer();
-            exit;
-        }
+    if ($needed[$delete] > 0) {
+        print_error('cannotdeleteqtypeneeded', 'question', $thispageurl, $qtypename);
+    }

-        // Do the deletion.
+    // If not yet confirmed, display a confirmation message.
+    if (!optional_param('confirm', '', PARAM_BOOL)) {
+        $qtypename = $qtypes[$delete]->local_name();
        echo $OUTPUT->header();
-        echo $OUTPUT->heading(get_string('deletingqtype', 'admin', $qtypename));
-
-        // Delete any configuration records.
-        if (!unset_all_config_for_plugin('qtype_' . $delete)) {
-            echo $OUTPUT->notification(get_string('errordeletingconfig', 'admin', 'qtype_' . $delete));
-        }
-        unset_config($delete . '_disabled', 'question');
-        unset_config($delete . '_sortorder', 'question');
-
-        // Then the tables themselves
-        drop_plugin_tables($delete, $QTYPES[$delete]->plugin_dir() . '/db/install.xml', false);
-
-        // Remove event handlers and dequeue pending events
-        events_uninstall('qtype/' . $delete);
-
-        $a->qtype = $qtypename;
-        $a->directory = $QTYPES[$delete]->plugin_dir();
-        echo $OUTPUT->box(get_string('qtypedeletefiles', 'admin', $a), 'generalbox', 'notice');
-        echo $OUTPUT->continue_button(admin_url('qtypes.php'));
+        echo $OUTPUT->heading(get_string('deleteqtypeareyousure', 'question', $qtypename));
+        echo $OUTPUT->confirm(get_string('deleteqtypeareyousuremessage', 'question', $qtypename),
+                new moodle_url($thispageurl, array('delete' => $delete, 'confirm' => 1)),
+                $thispageurl);
        echo $OUTPUT->footer();
        exit;
    }

-    // End of process actions ==================================================
-
-/// Print the page heading.
+    // Do the deletion.
    echo $OUTPUT->header();
-    echo $OUTPUT->heading(get_string('manageqtypes', 'admin'));
+    echo $OUTPUT->heading(get_string('deletingqtype', 'question', $qtypename));

-/// Set up the table.
-    $table = new flexible_table('qtypeadmintable');
-    $table->define_columns(array('questiontype', 'numquestions', 'version', 'requires',
-            'availableto', 'delete', 'settings'));
-    $table->define_headers(array(get_string('questiontype', 'admin'), get_string('numquestions', 'admin'),
-            get_string('version'), get_string('requires', 'admin'), get_string('availableq', 'question'),
-            get_string('delete'), get_string('settings')));
-    $table->set_attribute('id', 'qtypes');
-    $table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
-    $table->setup();
-
-/// Add a row for each question type.
-    $createabletypes = question_type_menu();
-    foreach ($sortedqtypes as $qtypename => $localname) {
-        $qtype = $QTYPES[$qtypename];
-        $row = array();
-
-        // Question icon and name.
-        $fakequestion = new stdClass;
-        $fakequestion->qtype = $qtypename;
-        $icon = print_question_icon($fakequestion, true);
-        $row[] = $icon . ' ' . $localname;
-
-        // Number of questions of this type.
-        if ($counts[$qtypename]->numquestions + $counts[$qtypename]->numhidden > 0) {
-            if ($counts[$qtypename]->numhidden > 0) {
-                $strcount = get_string('numquestionsandhidden', 'admin', $counts[$qtypename]);
-            } else {
-                $strcount = $counts[$qtypename]->numquestions;
-            }
-            if ($canviewreports) {
-                $row[] = '<a href="' . admin_url('/report/questioninstances/index.php?qtype=' . $qtypename) .
-                        '" title="' . get_string('showdetails', 'admin') . '">' . $strcount . '</a>';
-            } else {
-                $strcount;
-            }
-        } else {
-            $row[] = 0;
-        }
-
-        // Question version number.
-        $version = get_config('qtype_' . $qtypename, 'version');
-        if ($version) {
-            $row[] = $version;
-        } else {
-            $row[] = '<span class="disabled">' . get_string('nodatabase', 'admin') . '</span>';
-        }
-
-        // Other question types required by this one.
-        $requiredtypes = $qtype->requires_qtypes();
-        $strtypes = array();
-        if (!empty($requiredtypes)) {
-            foreach ($requiredtypes as $required) {
-                $strtypes[] = $QTYPES[$required]->local_name();
-            }
-            $row[] = implode(', ', $strtypes);
-        } else {
-            $row[] = '';
-        }
-
-        // Are people allowed to create new questions of this type?
-        $rowclass = '';
-        if ($qtype->menu_name()) {
-            $createable = isset($createabletypes[$qtypename]);
-            $icons = enable_disable_button($qtypename, $createable);
-            if (!$createable) {
-                $rowclass = 'dimmed_text';
-            }
-        } else {
-            $icons = '<img src="' . $OUTPUT->pix_url('spacer') . '" alt="" class="spacer" />';
-        }
-
-        // Move icons.
-        $icons .= icon_html('up', $qtypename, 't/up', get_string('up'), '');
-        $icons .= icon_html('down', $qtypename, 't/down', get_string('down'), '');
-        $row[] = $icons;
-
-        // Delete link, if available.
-        if ($needed[$qtypename]) {
-            $row[] = '';
-        } else {
-            $row[] = '<a href="' . admin_url('qtypes.php?delete=' . $qtypename .
-                    '&amp;sesskey=' . sesskey()) . '" title="' .
-                    get_string('uninstallqtype', 'admin') . '">' . get_string('delete') . '</a>';
-        }
-
-        // Settings link, if available.
-        $settings = admin_get_root()->locate('qtypesetting' . $qtypename);
-        if ($settings instanceof admin_externalpage) {
-            $row[] = '<a href="' . $settings->url .
-                    '">' . get_string('settings') . '</a>';
-        } else if ($settings instanceof admin_settingpage) {
-            $row[] = '<a href="' . admin_url('settings.php?section=qtypesetting' . $qtypename) .
-                    '">' . get_string('settings') . '</a>';
-        } else {
-            $row[] = '';
-        }
-
-        $table->add_data($row, $rowclass);
+    // Delete any configuration records.
+    if (!unset_all_config_for_plugin('qtype_' . $delete)) {
+        echo $OUTPUT->notification(get_string('errordeletingconfig', 'admin', 'qtype_' . $delete));
    }
+    unset_config($delete . '_disabled', 'question');
+    unset_config($delete . '_sortorder', 'question');

-    $table->finish_output();
+    // Then the tables themselves
+    drop_plugin_tables($delete, $qtypes[$delete]->plugin_dir() . '/db/install.xml', false);

+    // Remove event handlers and dequeue pending events
+    events_uninstall('qtype_' . $delete);
+
+    $a->qtype = $qtypename;
+    $a->directory = $qtypes[$delete]->plugin_dir();
+    echo $OUTPUT->box(get_string('qtypedeletefiles', 'question', $a), 'generalbox', 'notice');
+    echo $OUTPUT->continue_button($thispageurl);
    echo $OUTPUT->footer();
-
-function admin_url($endbit) {
-    global $CFG;
-    return $CFG->wwwroot . '/' . $CFG->admin . '/' . $endbit;
+    exit;
 }

-function enable_disable_button($qtypename, $createable) {
-    if ($createable) {
-        return icon_html('disable', $qtypename, 'i/hide', get_string('enabled', 'question'), get_string('disable'));
+// End of process actions ==================================================
+
+// Print the page heading.
+echo $OUTPUT->header();
+echo $OUTPUT->heading(get_string('manageqtypes', 'admin'));
+
+// Set up the table.
+$table = new flexible_table('qtypeadmintable');
+$table->define_baseurl($thispageurl);
+$table->define_columns(array('questiontype', 'numquestions', 'version', 'requires',
+        'availableto', 'delete', 'settings'));
+$table->define_headers(array(get_string('questiontype', 'question'), get_string('numquestions', 'question'),
+        get_string('version'), get_string('requires', 'admin'), get_string('availableq', 'question'),
+        get_string('delete'), get_string('settings')));
+$table->set_attribute('id', 'qtypes');
+$table->set_attribute('class', 'generaltable generalbox boxaligncenter boxwidthwide');
+$table->setup();
+
+// Add a row for each question type.
+$createabletypes = question_bank::get_creatable_qtypes();
+foreach ($sortedqtypes as $qtypename => $localname) {
+    $qtype = $qtypes[$qtypename];
+    $row = array();
+
+    // Question icon and name.
+    $fakequestion = new stdClass;
+    $fakequestion->qtype = $qtypename;
+    $icon = print_question_icon($fakequestion, true);
+    $row[] = $icon . ' ' . $localname;
+
+    // Number of questions of this type.
+    if ($counts[$qtypename]->numquestions + $counts[$qtypename]->numhidden > 0) {
+        if ($counts[$qtypename]->numhidden > 0) {
+            $strcount = get_string('numquestionsandhidden', 'question', $counts[$qtypename]);
+        } else {
+            $strcount = $counts[$qtypename]->numquestions;
+        }
+        if ($canviewreports) {
+            $row[] = html_writer::link(new moodle_url('/admin/report/questioninstances/index.php',
+                    array('qtype' => $qtypename)), $strcount, array('title' => get_string('showdetails', 'admin')));
+        } else {
+            $strcount;
+        }
    } else {
-        return icon_html('enable', $qtypename, 'i/show', get_string('disabled', 'question'), get_string('enable'));
+        $row[] = 0;
+    }
+
+    // Question version number.
+    $version = get_config('qtype_' . $qtypename, 'version');
+    if ($version) {
+        $row[] = $version;
+    } else {
+        $row[] = html_writer::tag('span', get_string('nodatabase', 'admin'), array('class' => 'disabled'));
+    }
+
+    // Other question types required by this one.
+    $requiredtypes = $qtype->requires_qtypes();
+    $strtypes = array();
+    if (!empty($requiredtypes)) {
+        foreach ($requiredtypes as $required) {
+            $strtypes[] = $qtypes[$required]->local_name();
+        }
+        $row[] = implode(', ', $strtypes);
+    } else {
+        $row[] = '';
+    }
+
+    // Are people allowed to create new questions of this type?
+    $rowclass = '';
+    if ($qtype->menu_name()) {
+        $createable = isset($createabletypes[$qtypename]);
+        $icons = question_types_enable_disable_icons($qtypename, $createable);
+        if (!$createable) {
+            $rowclass = 'dimmed_text';
+        }
+    } else {
+        $icons = $OUTPUT->spacer() . ' ';
+    }
+
+    // Move icons.
+    $icons .= question_type_icon_html('up', $qtypename, 't/up', get_string('up'), '');
+    $icons .= question_type_icon_html('down', $qtypename, 't/down', get_string('down'), '');
+    $row[] = $icons;
+
+    // Delete link, if available.
+    if ($needed[$qtypename]) {
+        $row[] = '';
+    } else {
+        $row[] = html_writer::link(new moodle_url($thispageurl,
+                array('delete' => $qtypename, 'sesskey' => sesskey())), get_string('delete'),
+                array('title' => get_string('uninstallqtype', 'question')));
+    }
+
+    // Settings link, if available.
+    $settings = admin_get_root()->locate('qtypesetting' . $qtypename);
+    if ($settings instanceof admin_externalpage) {
+        $row[] = html_writer::link($settings->url, get_string('settings'));
+    } else if ($settings instanceof admin_settingpage) {
+        $row[] = html_writer::link(new moodle_url('/admin/settings.php',
+                array('section' => 'qtypesetting' . $qtypename)), get_string('settings'));
+    } else {
+        $row[] = '';
+    }
+
+    $table->add_data($row, $rowclass);
+}
+
+$table->finish_output();
+
+echo $OUTPUT->footer();
+
+function question_types_enable_disable_icons($qtypename, $createable) {
+    if ($createable) {
+        return question_type_icon_html('disable', $qtypename, 'i/hide',
+                get_string('enabled', 'question'), get_string('disable'));
+    } else {
+        return question_type_icon_html('enable', $qtypename, 'i/show',
+                get_string('disabled', 'question'), get_string('enable'));
    }
 }

-function icon_html($action, $qtypename, $icon, $alt, $tip) {
+function question_type_icon_html($action, $qtypename, $icon, $alt, $tip) {
    global $OUTPUT;
-    if ($tip) {
-        $tip = 'title="' . $tip . '" ';
-    }
-    $html = ' <form action="' . admin_url('qtypes.php') . '" method="post"><div>';
-    $html .= '<input type="hidden" name="sesskey" value="' . sesskey() . '" />';
-    $html .= '<input type="image" name="' . $action . '" value="' . $qtypename .
-            '" src="' . $OUTPUT->pix_url($icon) . '" alt="' . $alt . '" ' . $tip . '/>';
-    $html .= '</div></form>';
-    return $html;
+    return $OUTPUT->action_icon(new moodle_url('/admin/qtypes.php',
+            array($action => $qtypename, 'sesskey' => sesskey())),
+            new pix_icon($icon, $alt, 'moodle', array('title' => '')),
+            null, array('title' => $tip)) . ' ';
 }

@@ -47,7 +47,7 @@ $error = optional_param('error', '', PARAM_ALPHANUM);
 admin_externalpage_setup('registrationindex');

 if (!empty($error) and $error == 'urlalreadyexist') {
-    throw new moodle_exception('urlalreadyregistered', 'hub', 
+    throw new moodle_exception('urlalreadyregistered', 'hub',
            $CFG->wwwroot . '/' . $CFG->admin . '/registration/index.php');
 }

@@ -85,7 +85,7 @@ if (!empty($registeredhub) and $registeredhub->token == $token) {

    echo $OUTPUT->footer();
 } else {
-    throw new moodle_exception('wrongtoken', 'hub', 
+    throw new moodle_exception('wrongtoken', 'hub',
            $CFG->wwwroot . '/' . $CFG->admin . '/registration/index.php');
 }

@@ -203,7 +203,7 @@ class site_registration_form extends moodleform {
        $cleanhuburl = clean_param($huburl, PARAM_ALPHANUMEXT);
        $sitename = get_config('hub', 'site_name_' . $cleanhuburl);
        if ($sitename === false) {
-            $sitename = $site->fullname;
+            $sitename = format_string($site->fullname, true, array('context' => get_context_instance(CONTEXT_COURSE, SITEID)));
        }
        $sitedescription = get_config('hub', 'site_description_' . $cleanhuburl);
        if ($sitedescription === false) {
@@ -148,12 +148,12 @@ if (empty($cancel) and $unregistration and !$confirm) {
    $moodleorghub = $registrationmanager->get_registeredhub(HUB_MOODLEORGHUBURL);
    if (!empty($moodleorghub)) {
        $registeredonmoodleorg = true;
-    } 
+    }

    echo $OUTPUT->heading(get_string('registeron', 'hub'), 3, 'main');
    echo $renderer->registrationselector($registeredonmoodleorg);

-    if (extension_loaded('xmlrpc')) {     
+    if (extension_loaded('xmlrpc')) {
        $hubs = $registrationmanager->get_registered_on_hubs();
        if (!empty($hubs)) {
            echo $OUTPUT->heading(get_string('registeredon', 'hub'), 3, 'main');
@@ -0,0 +1,296 @@
+<?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/>.
+
+/**
+ * Renderer for core_admin subsystem
+ *
+ * @package    core
+ * @subpackage admin
+ * @copyright  2011 David Mudrak <david@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->libdir . '/pluginlib.php');
+
+/**
+ * Standard HTML output renderer for core_admin subsystem
+ */
+class core_admin_renderer extends plugin_renderer_base {
+
+    /**
+     * Displays all known plugins and information about their installation or upgrade
+     *
+     * This default implementation renders all plugins into one big table. The rendering
+     * options support:
+     *     (bool)full = false: whether to display up-to-date plugins, too
+     *
+     * @param array $plugininfo as returned by {@see plugin_manager::get_plugins()}
+     * @param array $options rendering options
+     * @return string HTML code
+     */
+    public function plugins_check(array $plugininfo, array $options = null) {
+
+        if (empty($plugininfo)) {
+            return '';
+        }
+
+        if (empty($options)) {
+            $options = array(
+                'full' => false,
+            );
+        }
+
+        $pluginman = plugin_manager::instance();
+
+        $table = new html_table();
+        $table->id = 'plugins-check';
+        $table->head = array(
+            get_string('displayname', 'core_plugin'),
+            get_string('rootdir', 'core_plugin'),
+            get_string('source', 'core_plugin'),
+            get_string('versiondb', 'core_plugin'),
+            get_string('versiondisk', 'core_plugin'),
+            get_string('status', 'core_plugin'),
+        );
+        $table->colclasses = array(
+            'displayname', 'rootdir', 'source', 'versiondb', 'versiondisk', 'status',
+        );
+        $table->data = array();
+
+        $numofhighlighted = array();    // number of highlighted rows per this subsection
+
+        foreach ($plugininfo as $type => $plugins) {
+
+            $header = new html_table_cell($pluginman->plugintype_name_plural($type));
+            $header->header = true;
+            $header->colspan = count($table->head);
+            $header = new html_table_row(array($header));
+            $header->attributes['class'] = 'plugintypeheader type-' . $type;
+
+            $numofhighlighted[$type] = 0;
+
+            if (empty($plugins) and $options['full']) {
+                $msg = new html_table_cell(get_string('noneinstalled', 'core_plugin'));
+                $msg->colspan = count($table->head);
+                $row = new html_table_row(array($msg));
+                $row->attributes['class'] .= 'msg msg-noneinstalled';
+                $table->data[] = $header;
+                $table->data[] = $row;
+                continue;
+            }
+
+            $plugintyperows = array();
+
+            foreach ($plugins as $name => $plugin) {
+                $row = new html_table_row();
+                $row->attributes['class'] = 'type-' . $plugin->type . ' name-' . $plugin->type . '_' . $plugin->name;
+
+                if ($this->page->theme->resolve_image_location('icon', $plugin->type . '_' . $plugin->name)) {
+                    $icon = $this->output->pix_icon('icon', '', $plugin->type . '_' . $plugin->name, array('class' => 'smallicon pluginicon'));
+                } else {
+                    $icon = $this->output->pix_icon('spacer', '', 'moodle', array('class' => 'smallicon pluginicon noicon'));
+                }
+                $displayname  = $icon . ' ' . $plugin->displayname;
+                $displayname = new html_table_cell($displayname);
+
+                $rootdir = new html_table_cell($plugin->get_dir());
+
+                if ($isstandard = $plugin->is_standard()) {
+                    $row->attributes['class'] .= ' standard';
+                    $source = new html_table_cell(get_string('sourcestd', 'core_plugin'));
+                } else {
+                    $row->attributes['class'] .= ' extension';
+                    $source = new html_table_cell(get_string('sourceext', 'core_plugin'));
+                }
+
+                $versiondb = new html_table_cell($plugin->versiondb);
+                $versiondisk = new html_table_cell($plugin->versiondisk);
+
+                $statuscode = $plugin->get_status();
+                $row->attributes['class'] .= ' status-' . $statuscode;
+
+                $status = new html_table_cell(get_string('status_' . $statuscode, 'core_plugin'));
+
+                if ($isstandard and in_array($statuscode, array(plugin_manager::PLUGIN_STATUS_NODB, plugin_manager::PLUGIN_STATUS_UPTODATE))) {
+                    if (empty($options['full'])) {
+                        continue;
+                    }
+                } else {
+                    $numofhighlighted[$type]++;
+                }
+
+                $row->cells = array($displayname, $rootdir, $source, $versiondb, $versiondisk, $status);
+                $plugintyperows[] = $row;
+            }
+
+            if (empty($numofhighlighted[$type]) and empty($options['full'])) {
+                continue;
+            }
+
+            $table->data[] = $header;
+            $table->data = array_merge($table->data, $plugintyperows);
+        }
+
+        $sumofhighlighted = array_sum($numofhighlighted);
+
+        if ($sumofhighlighted == 0) {
+            $out  = $this->output->container_start('nonehighlighted', 'plugins-check-info');
+            $out .= $this->output->heading(get_string('nonehighlighted', 'core_plugin'));
+            if (empty($options['full'])) {
+                $out .= html_writer::link(new moodle_url('/admin/index.php',
+                    array('confirmupgrade' => 1, 'confirmrelease' => 1, 'showallplugins' => 1)),
+                    get_string('nonehighlightedinfo', 'core_plugin'));
+            }
+            $out .= $this->output->container_end();
+
+        } else {
+            $out  = $this->output->container_start('somehighlighted', 'plugins-check-info');
+            $out .= $this->output->heading(get_string('somehighlighted', 'core_plugin', $sumofhighlighted));
+            if (empty($options['full'])) {
+                $out .= html_writer::link(new moodle_url('/admin/index.php',
+                    array('confirmupgrade' => 1, 'confirmrelease' => 1, 'showallplugins' => 1)),
+                    get_string('somehighlightedinfo', 'core_plugin'));
+            }
+            $out .= $this->output->container_end();
+        }
+
+        if ($sumofhighlighted > 0 or $options['full']) {
+            $out .= html_writer::table($table);
+        }
+
+        return $out;
+    }
+
+    /**
+     * Displays all known plugins and links to manage them
+     *
+     * This default implementation renders all plugins into one big table.
+     *
+     * @param array $plugininfo as returned by {@see plugin_manager::get_plugins()}
+     * @return string HTML code
+     */
+    public function plugins_control_panel(array $plugininfo) {
+
+        if (empty($plugininfo)) {
+            return '';
+        }
+
+        $pluginman = plugin_manager::instance();
+
+        $table = new html_table();
+        $table->id = 'plugins-control-panel';
+        $table->head = array(
+            get_string('displayname', 'core_plugin'),
+            get_string('systemname', 'core_plugin'),
+            get_string('source', 'core_plugin'),
+            get_string('version', 'core_plugin'),
+            get_string('availability', 'core_plugin'),
+            get_string('settings', 'core_plugin'),
+            get_string('uninstall','core_plugin'),
+        );
+        $table->colclasses = array(
+            'displayname', 'systemname', 'source', 'version', 'availability', 'settings', 'uninstall',
+        );
+
+        foreach ($plugininfo as $type => $plugins) {
+
+            $header = new html_table_cell($pluginman->plugintype_name_plural($type));
+            $header->header = true;
+            $header->colspan = count($table->head);
+            $header = new html_table_row(array($header));
+            $header->attributes['class'] = 'plugintypeheader type-' . $type;
+            $table->data[] = $header;
+
+            if (empty($plugins)) {
+                $msg = new html_table_cell(get_string('noneinstalled', 'core_plugin'));
+                $msg->colspan = count($table->head);
+                $row = new html_table_row(array($msg));
+                $row->attributes['class'] .= 'msg msg-noneinstalled';
+                $table->data[] = $row;
+                continue;
+            }
+
+            foreach ($plugins as $name => $plugin) {
+                $row = new html_table_row();
+                $row->attributes['class'] = 'type-' . $plugin->type . ' name-' . $plugin->type . '_' . $plugin->name;
+
+                if ($this->page->theme->resolve_image_location('icon', $plugin->type . '_' . $plugin->name)) {
+                    $icon = $this->output->pix_icon('icon', '', $plugin->type . '_' . $plugin->name, array('class' => 'smallicon pluginicon'));
+                } else {
+                    $icon = $this->output->pix_icon('spacer', '', 'moodle', array('class' => 'smallicon pluginicon noicon'));
+                }
+                if ($plugin->get_status() === plugin_manager::PLUGIN_STATUS_MISSING) {
+                    $msg = html_writer::tag('span', get_string('status_missing', 'core_plugin'), array('class' => 'notifyproblem'));
+                    $row->attributes['class'] .= ' missingfromdisk';
+                } else {
+                    $msg = '';
+                }
+                $displayname  = $icon . ' ' . $plugin->displayname . ' ' . $msg;
+                $displayname = new html_table_cell($displayname);
+
+                $systemname = new html_table_cell($plugin->type . '_' . $plugin->name);
+
+                if ($plugin->is_standard()) {
+                    $row->attributes['class'] .= ' standard';
+                    $source = new html_table_cell(get_string('sourcestd', 'core_plugin'));
+                } else {
+                    $row->attributes['class'] .= ' extension';
+                    $source = new html_table_cell(get_string('sourceext', 'core_plugin'));
+                }
+
+                $version = new html_table_cell($plugin->versiondb);
+
+                $isenabled = $plugin->is_enabled();
+                if (is_null($isenabled)) {
+                    $availability = new html_table_cell('');
+                } else if ($isenabled) {
+                    $row->attributes['class'] .= ' enabled';
+                    $icon = $this->output->pix_icon('i/hide', get_string('pluginenabled', 'core_plugin'));
+                    $availability = new html_table_cell($icon . ' ' . get_string('pluginenabled', 'core_plugin'));
+                } else {
+                    $row->attributes['class'] .= ' disabled';
+                    $icon = $this->output->pix_icon('i/show', get_string('plugindisabled', 'core_plugin'));
+                    $availability = new html_table_cell($icon . ' ' . get_string('plugindisabled', 'core_plugin'));
+                }
+
+                $settingsurl = $plugin->get_settings_url();
+                if (is_null($settingsurl)) {
+                    $settings = new html_table_cell('');
+                } else {
+                    $settings = html_writer::link($settingsurl, get_string('settings', 'core_plugin'));
+                    $settings = new html_table_cell($settings);
+                }
+
+                $uninstallurl = $plugin->get_uninstall_url();
+                if (is_null($uninstallurl)) {
+                    $uninstall = new html_table_cell('');
+                } else {
+                    $uninstall = html_writer::link($uninstallurl, get_string('uninstall', 'core_plugin'));
+                    $uninstall = new html_table_cell($uninstall);
+                }
+
+                $row->cells = array(
+                    $displayname, $systemname, $source, $version, $availability, $settings, $uninstall
+                );
+                $table->data[] = $row;
+            }
+        }
+
+        return html_writer::table($table);
+    }
+}
@@ -79,13 +79,12 @@
                           $param->extras
                  ORDER BY $param->orderby";
        }
-        //error_log($sql);

        $courses = $DB->get_records_sql($sql, $param->params, 0, $numcourses);

        if (empty($courses)) {
            echo $OUTPUT->notification(get_string('statsnodata'));
-            echo '</td></tr></table>';echo '<p>after notify</p>';
+            echo '</td></tr></table>';

        } else {
            if (empty($CFG->gdversion)) {
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="admin/report/customlang/db" VERSION="20101115" COMMENT="XMLDB file for Moodle admin/report/customlang"
+<XMLDB PATH="admin/report/customlang/db" VERSION="20110419" COMMENT="XMLDB file for Moodle admin/report/customlang"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xsi:noNamespaceSchemaLocation="../../../../lib/xmldb/xmldb.xsd"
 >
@@ -30,11 +30,11 @@
      <FIELDS>
        <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" NEXT="name"/>
        <FIELD NAME="name" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false" COMMENT="The normalized name of the plugin" PREVIOUS="id" NEXT="version"/>
-        <FIELD NAME="version" TYPE="int" LENGTH="10" NOTNULL="false" UNSIGNED="true" SEQUENCE="false" COMMENT="The checked out version of the plugin, null of the version is unknown" PREVIOUS="name"/>
+        <FIELD NAME="version" TYPE="char" LENGTH="255" NOTNULL="false" SEQUENCE="false" COMMENT="The checked out version of the plugin, null if the version is unknown" PREVIOUS="name"/>
      </FIELDS>
      <KEYS>
        <KEY NAME="primary" TYPE="primary" FIELDS="id"/>
      </KEYS>
    </TABLE>
  </TABLES>
-</XMLDB>
+</XMLDB>
@@ -57,5 +57,18 @@ function xmldb_report_customlang_upgrade($oldversion) {
        upgrade_plugin_savepoint(true, 2010111500, 'report', 'customlang');
    }

+    /**
+     * Change the version field from integer to varchar
+     */
+    if ($oldversion < 2011041900) {
+        $table = new xmldb_table('report_customlang_components');
+        $field = new xmldb_field('version', XMLDB_TYPE_CHAR, '255', null, null, null, null, 'name');
+
+        $dbman->change_field_type($table, $field);
+
+        upgrade_plugin_savepoint(true, 2011041900, 'report', 'customlang');
+    }
+
+
    return $result;
 }
@@ -24,6 +24,8 @@
 * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
 */

+define('NO_OUTPUT_BUFFERING', true); // progress bar is used here
+
 require(dirname(dirname(dirname(dirname(__FILE__)))).'/config.php');
 require_once($CFG->dirroot.'/'.$CFG->admin.'/report/customlang/locallib.php');
 require_once($CFG->libdir.'/adminlib.php');
@@ -45,8 +47,22 @@ if ($action === 'checkout') {
    if (empty($lng)) {
        print_error('missingparameter');
    }
-    report_customlang_utils::checkout($lng);
-    redirect(new moodle_url('/admin/report/customlang/edit.php', array('lng' => $lng)));
+
+    $PAGE->set_cacheable(false);    // progress bar is used here
+    $output = $PAGE->get_renderer('report_customlang');
+    echo $output->header();
+    echo $output->heading(get_string('pluginname', 'report_customlang'));
+    $progressbar = new progress_bar();
+    $progressbar->create();         // prints the HTML code of the progress bar
+
+    // we may need a bit of extra execution time and memory here
+    @set_time_limit(HOURSECS);
+    raise_memory_limit(MEMORY_EXTRA);
+    report_customlang_utils::checkout($lng, $progressbar);
+
+    echo $output->continue_button(new moodle_url('/admin/report/customlang/edit.php', array('lng' => $lng)), 'get');
+    echo $output->footer();
+    exit;
 }

 if ($action === 'checkin') {
@@ -27,7 +27,9 @@
 defined('MOODLE_INTERNAL') || die();

 $string['checkin'] = 'Check in strings into disk';
-$string['checkout'] = 'Check out strings into translator';
+$string['checkout'] = 'Check out strings into the translator';
+$string['checkoutdone'] = 'Strings checked out successfully into the translator';
+$string['checkoutinprogress'] = 'Checking out strings into the translator';
 $string['confirmcheckin'] = 'You are about to check in modified strings into your local language pack. This will export the customized strings from the translator into the data directory and Moodle will start using the modified strings. Press \'Continue\' button to proceed check in.';
 $string['customlang:edit'] = 'Edit local translation';
 $string['customlang:view'] = 'View local translation';
@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.

 /**
- * Definition of classes used by Langugae customization admin report
+ * Definition of classes used by language customization admin report
 *
 * @package    report
 * @subpackage customlang
@@ -33,6 +33,12 @@ defined('MOODLE_INTERNAL') || die();
 */
 class report_customlang_utils {

+    /**
+     * Rough number of strings that are being processed during a full checkout.
+     * This is used to estimate the progress of the checkout.
+     */
+    const ROUGH_NUMBER_OF_STRINGS = 16500;
+
    /** @var array cache of {@link self::list_components()} results */
    protected static $components = null;

@@ -83,8 +89,9 @@ class report_customlang_utils {
     * This should be executed each time before going to the translation page
     *
     * @param string $lang language code to checkout
+     * @param progress_bar $progressbar optionally, the given progress bar can be updated
     */
-    public static function checkout($lang) {
+    public static function checkout($lang, progress_bar $progressbar = null) {
        global $DB;

        // make sure that all components are registered
@@ -107,6 +114,10 @@ class report_customlang_utils {
        }
        unset($current);

+        // initialize the progress counter - stores the number of processed strings
+        $done = 0;
+        $strinprogress = get_string('checkoutinprogress', 'report_customlang');
+
        // reload components and fetch their strings
        $stringman  = get_string_manager();
        $components = $DB->get_records('report_customlang_components');
@@ -129,6 +140,12 @@ class report_customlang_utils {
                $stringlocal = isset($local[$stringid]) ? $local[$stringid] : null;
                $now = time();

+                if (!is_null($progressbar)) {
+                    $done++;
+                    $donepercent = floor(min($done, self::ROUGH_NUMBER_OF_STRINGS) / self::ROUGH_NUMBER_OF_STRINGS * 100);
+                    $progressbar->update_full($donepercent, $strinprogress);
+                }
+
                if (isset($current[$stringid])) {
                    $needsupdate     = false;
                    $currentoriginal = $current[$stringid]->original;
@@ -175,6 +192,10 @@ class report_customlang_utils {
                }
            }
        }
+
+        if (!is_null($progressbar)) {
+            $progressbar->update_full(100, get_string('checkoutdone', 'report_customlang'));
+        }
    }

    /**
@@ -63,3 +63,7 @@
    background-color: #f6f6f6;
    margin-top: 0.5em;
 }
+
+#page-admin-report-customlang-index .continuebutton {
+    margin-top: 1em;
+}
@@ -24,5 +24,5 @@

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

-$plugin->version  = 2010120900;
+$plugin->version  = 2011041900;
 $plugin->requires = 2010120700;
@@ -3,6 +3,6 @@
 defined('MOODLE_INTERNAL') || die;

 // profiling report, added to development
-if (extension_loaded('xhprof') && function_exists('xhprof_enable') && !empty($CFG->profilingenabled)) {
+if (extension_loaded('xhprof') && function_exists('xhprof_enable') && (!empty($CFG->profilingenabled) || !empty($CFG->earlyprofilingenabled))) {
    $ADMIN->add('development', new admin_externalpage('reportprofiling', get_string('pluginname', 'report_profiling'), "$CFG->wwwroot/$CFG->admin/report/profiling/index.php", 'moodle/site:config'));
 }
@@ -22,8 +22,9 @@ echo $OUTPUT->header();
 add_to_log(SITEID, "admin", "report questioninstances", "report/questioninstances/index.php?qtype=$requestedqtype", $requestedqtype);

 // Prepare the list of capabilities to choose from
+$qtypes = question_bank::get_all_qtypes();
 $qtypechoices = array();
-foreach ($QTYPES as $qtype) {
+foreach ($qtypes as $qtype) {
    $qtypechoices[$qtype->name()] = $qtype->local_name();
 }

@@ -45,7 +46,7 @@ if ($requestedqtype) {

    // Work out the bits needed for the SQL WHERE clauses.
    if ($requestedqtype == 'missingtype') {
-        $othertypes = array_keys($QTYPES);
+        $othertypes = array_keys($qtypes);
        $key = array_search('missingtype', $othertypes);
        unset($othertypes[$key]);
        list($sqlqtypetest, $params) = $DB->get_in_or_equal($othertypes, SQL_PARAMS_QM, '', false);
@@ -58,7 +59,8 @@ if ($requestedqtype) {
    } else {
        $sqlqtypetest = 'WHERE qtype = ?';
        $params = array($requestedqtype);
-        $title = get_string('reportforqtype', 'report_questioninstances', $QTYPES[$requestedqtype]->local_name());
+        $title = get_string('reportforqtype', 'report_questioninstances',
+                question_bank::get_qtype($requestedqtype)->local_name());
    }

    // Get the question counts, and all the context information, for each
@@ -151,19 +151,21 @@ function search_spammers($keywords) {
    $params = array('userid'=>$USER->id);

    $keywordfull = array();
+    $i = 0;
    foreach ($keywords as $keyword) {
-        $keywordfull[] = $DB->sql_like('description', ':descpat', false);
-        $params['descpat'] = "%$keyword%";
-        $keywordfull2[] = $DB->sql_like('p.summary', ':sumpat', false);
-        $params['sumpat'] = "%$keyword%";
+        $keywordfull[] = $DB->sql_like('description', ':descpat'.$i, false);
+        $params['descpat'.$i] = "%$keyword%";
+        $keywordfull2[] = $DB->sql_like('p.summary', ':sumpat'.$i, false);
+        $params['sumpat'.$i] = "%$keyword%";
+        $i++;
    }
    $conditions = '( '.implode(' OR ', $keywordfull).' )';
    $conditions2 = '( '.implode(' OR ', $keywordfull2).' )';

    $sql  = "SELECT * FROM {user} WHERE deleted = 0 AND id <> :userid AND $conditions";  // Exclude oneself
    $sql2 = "SELECT u.*, p.summary FROM {user} AS u, {post} AS p WHERE $conditions2 AND u.deleted = 0 AND u.id=p.userid AND u.id <> :userid";
-    $spamusers_desc = $DB->get_recordset_sql($sql);
-    $spamusers_blog = $DB->get_recordset_sql($sql2);
+    $spamusers_desc = $DB->get_recordset_sql($sql, $params);
+    $spamusers_blog = $DB->get_recordset_sql($sql2, $params);

    $keywordlist = implode(', ', $keywords);
    echo $OUTPUT->box(get_string('spamresult', 'report_spamcleaner').s($keywordlist)).' ...';
@@ -108,7 +108,7 @@ M.report_spamcleaner = {
            context.Y = Y;
            context.me = me;
            if (Y.one("#removeall_btn")) {
-            	Y.on("click", context.del_all, "#removeall_btn");
+                Y.on("click", context.del_all, "#removeall_btn");
            }
        });
    }
@@ -68,7 +68,11 @@ if (!empty($edit) || !empty($new)) {
            $settings['name'] = $fromform->name;
            if (!$instance->readonly) {
                foreach($configs as $config) {
-                    $settings[$config] = $fromform->$config;
+                    if (isset($fromform->$config)) {
+                        $settings[$config] = $fromform->$config;
+                    } else {
+                        $settings[$config] = null;
+                    }
                }
            }
            $success = $instance->set_option($settings);
@@ -628,7 +628,7 @@ class define_role_table_advanced extends capability_table_with_risks {

        // Legacy type.
        $archetype = optional_param('archetype', null, PARAM_RAW);
-        if ($archetype) {
+        if (isset($archetype)) {
            $archetypes = get_role_archetypes();
            if (isset($archetypes[$archetype])){
                $this->role->archetype = $archetype;
@@ -716,7 +716,6 @@ class define_role_table_advanced extends capability_table_with_risks {
    }

    protected function get_archetype_field($id) {
-        global $OUTPUT;
        $options = array();
        $options[''] = get_string('none');
        foreach(get_role_archetypes() as $type) {
@@ -1143,7 +1142,7 @@ class existing_role_holders extends role_assign_user_selector_base {
        global $DB;

        list($wherecondition, $params) = $this->search_sql($search, 'u');
-        list($ctxcondition, $ctxparams) = $DB->get_in_or_equal(get_parent_contexts($this->context, true), SQL_PARAMS_NAMED, 'ctx00');
+        list($ctxcondition, $ctxparams) = $DB->get_in_or_equal(get_parent_contexts($this->context, true), SQL_PARAMS_NAMED, 'ctx');
        $params = array_merge($params, $ctxparams);
        $params['roleid'] = $this->roleid;

@@ -1317,6 +1316,7 @@ abstract class role_allow_role_page {
        foreach ($rs as $allow) {
            $this->allowed[$allow->roleid][$allow->{$this->targetcolname}] = true;
        }
+        $rs->close();
    }

    /**
@@ -138,7 +138,7 @@ M.core_role.init_cap_table_filter = function(Y, tableid, contextid) {
                lastheading = null;

            this.setFilterCookieValue(filtertext);
-            
+
            this.button.set('disabled', (filtertext == ''));

            this.table.all('tr').each(function(row){
@@ -18,6 +18,8 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
    $temp->add(new admin_setting_configcheckbox('allowuserblockhiding', get_string('allowuserblockhiding', 'admin'), get_string('configallowuserblockhiding', 'admin'), 1));
    $temp->add(new admin_setting_configcheckbox('allowblockstodock', get_string('allowblockstodock', 'admin'), get_string('configallowblockstodock', 'admin'), 1));
    $temp->add(new admin_setting_configtextarea('custommenuitems', get_string('custommenuitems', 'admin'), get_string('configcustommenuitems', 'admin'), '', PARAM_TEXT, '50', '10'));
+    $temp->add(new admin_setting_configcheckbox('enabledevicedetection', get_string('enabledevicedetection', 'admin'), get_string('configenabledevicedetection', 'admin'), 1));
+    $temp->add(new admin_setting_devicedetectregex('devicedetectregex', get_string('devicedetectregex', 'admin'), get_string('devicedetectregex_desc', 'admin'), ''));
    $ADMIN->add('themes', $temp);
    $ADMIN->add('themes', new admin_externalpage('themeselector', get_string('themeselector','admin'), $CFG->wwwroot . '/theme/index.php'));

@@ -21,10 +21,11 @@ if ($hassiteconfig
        $formcourseformats[$courseformat] = get_string('pluginname', "format_$courseformat");
    }
    $temp->add(new admin_setting_configselect('moodlecourse/format', get_string('format'), get_string('coursehelpformat'), 'weeks',$formcourseformats));
-    for ($i=1; $i<=52; $i++) {
-        $sectionmenu[$i] = "$i";
-    }
-    $temp->add(new admin_setting_configselect('moodlecourse/numsections', get_string('numberweeks'), get_string('coursehelpnumberweeks'), 10,$sectionmenu));
+
+    $temp->add(new admin_setting_configtext('moodlecourse/maxsections', get_string('maxnumberweeks'), get_string('maxnumberweeks_desc'), 52));
+
+    $temp->add(new admin_settings_num_course_sections('moodlecourse/numsections', get_string('numberweeks'), get_string('coursehelpnumberweeks'), 10));
+
    $choices = array();
    $choices['0'] = get_string('hiddensectionscollapsed');
    $choices['1'] = get_string('hiddensectionsinvisible');
@@ -33,15 +34,14 @@ if ($hassiteconfig
    $temp->add(new admin_setting_configselect('moodlecourse/newsitems', get_string('newsitemsnumber'), get_string('coursehelpnewsitemsnumber'), 5,$options));
    $temp->add(new admin_setting_configselect('moodlecourse/showgrades', get_string('showgrades'), get_string('coursehelpshowgrades'), 1,array(0 => get_string('no'), 1 => get_string('yes'))));
    $temp->add(new admin_setting_configselect('moodlecourse/showreports', get_string('showreports'), '', 0,array(0 => get_string('no'), 1 => get_string('yes'))));
+
    if (isset($CFG->maxbytes)) {
        $choices = get_max_upload_sizes($CFG->maxbytes);
    } else {
        $choices = get_max_upload_sizes();
    }
-
    $temp->add(new admin_setting_configselect('moodlecourse/maxbytes', get_string('maximumupload'), get_string('coursehelpmaximumupload'), key($choices), $choices));

-
    if (!empty($CFG->legacyfilesinnewcourses)) {
        $choices = array('0'=>get_string('no'), '2'=>get_string('yes'));
        $temp->add(new admin_setting_configselect('moodlecourse/legacyfiles', get_string('courselegacyfiles'), get_string('courselegacyfiles_help'), key($choices), $choices));
@@ -139,10 +139,10 @@ if ($hassiteconfig
        400 => '400',
        500 => '500');
    $temp->add(new admin_setting_configselect('backup/backup_auto_keep', get_string('keep'), get_string('backupkeephelp'), 1, $keepoptoins));
-   
+

    $temp->add(new admin_setting_heading('automatedsettings', get_string('automatedsettings','backup'), ''));
-    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_users', get_string('users'), get_string('backupusershelp'), 1));
+    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_users', get_string('generalusers', 'backup'), get_string('configgeneralusers', 'backup'), 1));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_role_assignments', get_string('generalroleassignments','backup'), get_string('configgeneralroleassignments','backup'), 1));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_user_files', get_string('generaluserfiles', 'backup'), get_string('configgeneraluserfiles','backup'), 1));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_activities', get_string('generalactivities','backup'), get_string('configgeneralactivities','backup'), 1));
@@ -150,10 +150,10 @@ if ($hassiteconfig
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_filters', get_string('generalfilters','backup'), get_string('configgeneralfilters','backup'), 1));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_comments', get_string('generalcomments','backup'), get_string('configgeneralcomments','backup'), 1));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_userscompletion', get_string('generaluserscompletion','backup'), get_string('configgeneraluserscompletion','backup'), 1));
-    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_logs', get_string('logs'), get_string('backuplogshelp'), 0));
+    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_logs', get_string('generallogs', 'backup'), get_string('configgenerallogs', 'backup'), 0));
    $temp->add(new admin_setting_configcheckbox('backup/backup_auto_histories', get_string('generalhistories','backup'), get_string('configgeneralhistories','backup'), 0));
-    
-    
+
+
    //$temp->add(new admin_setting_configcheckbox('backup/backup_auto_messages', get_string('messages', 'message'), get_string('backupmessageshelp','message'), 0));
    //$temp->add(new admin_setting_configcheckbox('backup/backup_auto_blogs', get_string('blogs', 'blog'), get_string('backupblogshelp','blog'), 0));

@@ -52,13 +52,22 @@ if (!during_initial_install()) { //do not use during installation
        $temp->add(new admin_setting_configtext('coursesperpage', get_string('coursesperpage', 'admin'), get_string('configcoursesperpage', 'admin'), 20, PARAM_INT));

        // front page default role
-        $roleoptions = array(0=>get_string('none')); // roles to choose from
-        if ($roles = get_all_roles()) {
-            foreach ($roles as $role) {
-                $roleoptions[$role->id] = strip_tags(format_string($role->name, true));
+        $options = array(0=>get_string('none')); // roles to choose from
+        $defaultfrontpageroleid = 0;
+        foreach (get_all_roles() as $role) {
+            if (empty($role->archetype) or $role->archetype === 'guest' or $role->archetype === 'frontpage' or $role->archetype === 'student') {
+                $options[$role->id] = strip_tags(format_string($role->name)) . ' ('. $role->shortname . ')';
+                if ($role->archetype === 'frontpage') {
+                    $defaultfrontpageroleid = $role->id;
+                }
            }
        }
-        $temp->add(new admin_setting_configselect('defaultfrontpageroleid', get_string('frontpagedefaultrole', 'admin'), '', 0, $roleoptions));
+        if ($defaultfrontpageroleid and (!isset($CFG->defaultfrontpageroleid) or $CFG->defaultfrontpageroleid)) {
+            //frotpage role may not exist in old upgraded sites
+            unset($options[0]);
+        }
+        $temp->add(new admin_setting_configselect('defaultfrontpageroleid', get_string('frontpagedefaultrole', 'admin'), '', $defaultfrontpageroleid, $options));
+

        $ADMIN->add('frontpage', $temp);

@@ -10,7 +10,7 @@ if ($hassiteconfig) {
    $temp->add(new admin_setting_configselect('lang', get_string('lang', 'admin'), get_string('configlang', 'admin'), current_language(), get_string_manager()->get_list_of_translations())); // $CFG->lang might be set in installer already, default en is in setup.php
    $temp->add(new admin_setting_configcheckbox('langmenu', get_string('langmenu', 'admin'), get_string('configlangmenu', 'admin'), 1));
    $temp->add(new admin_setting_langlist());
-    $temp->add(new admin_setting_configcheckbox('langcache', get_string('langcache', 'admin'), get_string('configlangcache', 'admin'), 1));
+    $temp->add(new admin_setting_configcheckbox('langcache', get_string('langcache', 'admin'), get_string('langcache_desc', 'admin'), 1));
    $temp->add(new admin_setting_configcheckbox('langstringcache', get_string('langstringcache', 'admin'), get_string('configlangstringcache', 'admin'), 1));
    $temp->add(new admin_setting_configtext('locale', get_string('localetext', 'admin'), get_string('configlocale', 'admin'), '', PARAM_FILE));
    $temp->add(new admin_setting_configselect('latinexcelexport', get_string('latinexcelexport', 'admin'), get_string('configlatinexcelexport', 'admin'), '0', array('0'=>'Unicode','1'=>'Latin')));
@@ -5,6 +5,7 @@
 */

 if ($hassiteconfig) {
+    $ADMIN->add('modules', new admin_page_pluginsoverview());
    $ADMIN->add('modules', new admin_category('modsettings', get_string('activitymodules')));
    $ADMIN->add('modsettings', new admin_page_managemods());
    $modules = $DB->get_records('modules', array(), "name ASC");
@@ -45,6 +46,27 @@ if ($hassiteconfig) {
        }
    }

+    // message outputs
+    $ADMIN->add('modules', new admin_category('messageoutputs', get_string('messageoutputs', 'message')));
+    $ADMIN->add('messageoutputs', new admin_page_managemessageoutputs());
+    $ADMIN->add('messageoutputs', new admin_page_defaultmessageoutputs());
+    require_once($CFG->dirroot.'/message/lib.php');
+    $processors = get_message_processors();
+    foreach ($processors as $processor) {
+        $processorname = $processor->name;
+        if (!$processor->available) {
+            continue;
+        }
+        if ($processor->hassettings) {
+            $strprocessorname = get_string('pluginname', 'message_'.$processorname);
+            $settings = new admin_settingpage('messagesetting'.$processorname, $strprocessorname, 'moodle/site:config', !$processor->enabled);
+            include($CFG->dirroot.'/message/output/'.$processor->name.'/settings.php');
+            if ($settings) {
+                $ADMIN->add('messageoutputs', $settings);
+            }
+        }
+    }
+
    // authentication plugins
    $ADMIN->add('modules', new admin_category('authsettings', get_string('authentication', 'admin')));

@@ -52,6 +74,8 @@ if ($hassiteconfig) {
    $temp->add(new admin_setting_manageauths());
    $temp->add(new admin_setting_heading('manageauthscommonheading', get_string('commonsettings', 'admin'), ''));
    $temp->add(new admin_setting_special_registerauth());
+    $temp->add(new admin_setting_configcheckbox('authpreventaccountcreation', get_string('authpreventaccountcreation', 'admin'), get_string('authpreventaccountcreation_help', 'admin'), 0));
+    $temp->add(new admin_setting_configcheckbox('loginpageautofocus', get_string('loginpageautofocus', 'admin'), get_string('loginpageautofocus_help', 'admin'), 0));
    $temp->add(new admin_setting_configselect('guestloginbutton', get_string('guestloginbutton', 'auth'),
                                              get_string('showguestlogin', 'auth'), '1', array('0'=>get_string('hide'), '1'=>get_string('show'))));
    $temp->add(new admin_setting_configtext('alternateloginurl', get_string('alternateloginurl', 'auth'),
@@ -321,8 +345,13 @@ if ($hassiteconfig) {
    $temp = new admin_settingpage('webservicesoverview', get_string('webservicesoverview', 'webservice'));
    $temp->add(new admin_setting_webservicesoverview());
    $ADMIN->add('webservicesettings', $temp);
+    //API documentation
+    $ADMIN->add('webservicesettings', new admin_externalpage('webservicedocumentation', get_string('wsdocapi', 'webservice'), "$CFG->wwwroot/$CFG->admin/webservice/documentation.php", 'moodle/site:config', false));
    /// manage service
    $temp = new admin_settingpage('externalservices', get_string('externalservices', 'webservice'));
+    $enablemobiledocurl = new moodle_url(get_docs_url('Enable_mobile_web_services'));
+    $enablemobiledoclink = html_writer::link($enablemobiledocurl, get_string('documentation'));
+    $temp->add(new admin_setting_enablemobileservice('enablemobilewebservice', get_string('enablemobilewebservice', 'admin'), get_string('configenablemobilewebservice', 'admin', $enablemobiledoclink), 0));
    $temp->add(new admin_setting_heading('manageserviceshelpexplaination', get_string('information', 'webservice'), get_string('servicehelpexplanation', 'webservice')));
    $temp->add(new admin_setting_manageexternalservices());
    $ADMIN->add('webservicesettings', $temp);
@@ -369,6 +398,10 @@ if ($hassiteconfig) {

 // Question type settings
 if ($hassiteconfig || has_capability('moodle/question:config', $systemcontext)) {
+    // Question behaviour settings.
+    $ADMIN->add('modules', new admin_category('qbehavioursettings', get_string('questionbehaviours', 'admin')));
+    $ADMIN->add('qbehavioursettings', new admin_page_manageqbehaviours());
+
    // Question type settings.
    $ADMIN->add('modules', new admin_category('qtypesettings', get_string('questiontypes', 'admin')));
    $ADMIN->add('qtypesettings', new admin_page_manageqtypes());
@@ -71,6 +71,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
    $temp->add(new admin_setting_configcheckbox('groupenrolmentkeypolicy', get_string('groupenrolmentkeypolicy', 'admin'), get_string('groupenrolmentkeypolicy_desc', 'admin'), 1));
    $temp->add(new admin_setting_configcheckbox('disableuserimages', get_string('disableuserimages', 'admin'), get_string('configdisableuserimages', 'admin'), 0));
    $temp->add(new admin_setting_configcheckbox('emailchangeconfirmation', get_string('emailchangeconfirmation', 'admin'), get_string('configemailchangeconfirmation', 'admin'), 1));
+    $temp->add(new admin_setting_configcheckbox('strictformsrequired', get_string('strictformsrequired', 'admin'), get_string('configstrictformsrequired', 'admin'), 0));
    $ADMIN->add('security', $temp);


@@ -91,14 +92,9 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
                                                                                                                                                                              'all' => get_string('fulllistofcourses'),
                                                                                                                                                                              'requested' => get_string('requestedcourses'))));
    $temp->add(new admin_setting_configcheckbox('restrictbydefault', get_string('restrictbydefault', 'admin'), get_string('configrestrictbydefault', 'admin'), 0));
-    if (!$options = $DB->get_records('modules')) {
-        $options = array();
-    }
-    $options2 = array();
-    foreach ($options as $option) {
-        $options2[$option->id] = $option->name;
-    }
-    $temp->add(new admin_setting_configmultiselect('defaultallowedmodules', get_string('defaultallowedmodules', 'admin'), get_string('configdefaultallowedmodules', 'admin'), array(), $options2));
+    $temp->add(new admin_setting_configmultiselect_modules('defaultallowedmodules',
+            get_string('defaultallowedmodules', 'admin'),
+            get_string('configdefaultallowedmodules', 'admin')));
    $ADMIN->add('security', $temp);


@@ -17,46 +17,8 @@ $ADMIN->add('server', $temp);



-// "email" settingpage
-$temp = new admin_settingpage('mail', get_string('mail','admin'));
-$temp->add(new admin_setting_configtext('smtphosts', get_string('smtphosts', 'admin'), get_string('configsmtphosts', 'admin'), '', PARAM_RAW));
-$temp->add(new admin_setting_configtext('smtpuser', get_string('smtpuser', 'admin'), get_string('configsmtpuser', 'admin'), '', PARAM_NOTAGS));
-$temp->add(new admin_setting_configpasswordunmask('smtppass', get_string('smtppass', 'admin'), get_string('configsmtpuser', 'admin'), ''));
-$temp->add(new admin_setting_configtext('smtpmaxbulk', get_string('smtpmaxbulk', 'admin'), get_string('configsmtpmaxbulk', 'admin'), 1, PARAM_INT));
-$temp->add(new admin_setting_configtext('noreplyaddress', get_string('noreplyaddress', 'admin'), get_string('confignoreplyaddress', 'admin'), 'noreply@' . get_host_from_url($CFG->wwwroot), PARAM_NOTAGS));
-$temp->add(new admin_setting_configselect('digestmailtime', get_string('digestmailtime', 'admin'), get_string('configdigestmailtime', 'admin'), 17, array('00' => '00',
-                                                                                                                                                          '01' => '01',
-                                                                                                                                                          '02' => '02',
-                                                                                                                                                          '03' => '03',
-                                                                                                                                                          '04' => '04',
-                                                                                                                                                          '05' => '05',
-                                                                                                                                                          '06' => '06',
-                                                                                                                                                          '07' => '07',
-                                                                                                                                                          '08' => '08',
-                                                                                                                                                          '09' => '09',
-                                                                                                                                                          '10' => '10',
-                                                                                                                                                          '11' => '11',
-                                                                                                                                                          '12' => '12',
-                                                                                                                                                          '13' => '13',
-                                                                                                                                                          '14' => '14',
-                                                                                                                                                          '15' => '15',
-                                                                                                                                                          '16' => '16',
-                                                                                                                                                          '17' => '17',
-                                                                                                                                                          '18' => '18',
-                                                                                                                                                          '19' => '19',
-                                                                                                                                                          '20' => '20',
-                                                                                                                                                          '21' => '21',
-                                                                                                                                                          '22' => '22',
-                                                                                                                                                          '23' => '23')));
-$charsets = get_list_of_charsets();
-unset($charsets['UTF-8']); // not needed here
-$options = array();
-$options['0'] = 'UTF-8';
-$options = array_merge($options, $charsets);
-$temp->add(new admin_setting_configselect('sitemailcharset', get_string('sitemailcharset', 'admin'), get_string('configsitemailcharset','admin'), '0', $options));
-$temp->add(new admin_setting_configcheckbox('allowusermailcharset', get_string('allowusermailcharset', 'admin'), get_string('configallowusermailcharset', 'admin'), 0));
-$options = array('LF'=>'LF', 'CRLF'=>'CRLF');
-$temp->add(new admin_setting_configselect('mailnewline', get_string('mailnewline', 'admin'), get_string('configmailnewline','admin'), 'LF', $options));
+// "supportcontact" settingpage
+$temp = new admin_settingpage('supportcontact', get_string('supportcontact','admin'));
 if (isloggedin()) {
    global $USER;
    $primaryadminemail = $USER->email;
@@ -73,17 +35,6 @@ $temp->add(new admin_setting_configtext('supportpage', get_string('supportpage',
 $ADMIN->add('server', $temp);


-// Jabber settingpage
-$temp = new admin_settingpage('jabber', get_string('jabber', 'admin'));
-$temp->add(new admin_setting_configtext('jabberhost', get_string('jabberhost', 'admin'), get_string('configjabberhost', 'admin'), '', PARAM_RAW));
-$temp->add(new admin_setting_configtext('jabberserver', get_string('jabberserver', 'admin'), get_string('configjabberserver', 'admin'), '', PARAM_RAW));
-$temp->add(new admin_setting_configtext('jabberusername', get_string('jabberusername', 'admin'), get_string('configjabberusername', 'admin'), '', PARAM_RAW));
-$temp->add(new admin_setting_configpasswordunmask('jabberpassword', get_string('jabberpassword', 'admin'), get_string('configjabberpassword', 'admin'), ''));
-$temp->add(new admin_setting_configtext('jabberport', get_string('jabberport', 'admin'), get_string('configjabberport', 'admin'), 5222, PARAM_INT));
-$ADMIN->add('server', $temp);
-
-
-
 // "sessionhandling" settingpage
 $temp = new admin_settingpage('sessionhandling', get_string('sessionhandling', 'admin'));
 $temp->add(new admin_setting_configcheckbox('dbsessions', get_string('dbsessions', 'admin'), get_string('configdbsessions', 'admin'), 1));
@@ -241,6 +192,8 @@ $temp->add(new admin_setting_configselect('extramemorylimit', get_string('extram
 $temp->add(new admin_setting_configtext('curlcache', get_string('curlcache', 'admin'),
                                        get_string('configcurlcache', 'admin'), 120, PARAM_INT));

+$temp->add(new admin_setting_configtext('curltimeoutkbitrate', get_string('curltimeoutkbitrate', 'admin'),
+                                        get_string('curltimeoutkbitrate_help', 'admin'), 56, PARAM_INT));
 /* //TODO: we need to fix code instead of relying on slow rcache, enable this once we have some code that is actually using it
 $temp->add(new admin_setting_special_selectsetup('cachetype', get_string('cachetype', 'admin'),
                                          get_string('configcachetype', 'admin'), '',
@@ -38,17 +38,18 @@ if ($hassiteconfig
    if ($ADMIN->fulltree) {
        if (!during_initial_install()) {
            $context = get_context_instance(CONTEXT_SYSTEM);
-            $allroles        = array();
-            $generalroles    = array();
+
+            $otherroles      = array();
            $guestroles      = array();
            $userroles       = array();
-            $studentroles    = array();
-            $teacherroles    = array();
            $creatornewroles = array();

+            $defaultteacherid = null;
+            $defaultuserid    = null;
+            $defaultguestid   = null;
+
            foreach (get_all_roles() as $role) {
                $rolename = strip_tags(format_string($role->name)) . ' ('. $role->shortname . ')';
-                $allroles[$role->id] = $rolename;
                switch ($role->archetype) {
                    case 'manager':
                        $creatornewroles[$role->id] = $rolename;
@@ -56,58 +57,55 @@ if ($hassiteconfig
                    case 'coursecreator':
                        break;
                    case 'editingteacher':
-                        $teacherroles[$role->id] = $rolename;
+                        $defaultteacherid = isset($defaultteacherid) ? $defaultteacherid : $role->id;
                        $creatornewroles[$role->id] = $rolename;
                        break;
                    case 'teacher':
                        $creatornewroles[$role->id] = $rolename;
                        break;
                    case 'student':
-                        $studentroles[$role->id] = $rolename;
                        break;
                    case 'guest':
+                        $defaultguestid = isset($defaultguestid) ? $defaultguestid : $role->id;
                        $guestroles[$role->id] = $rolename;
                        break;
                    case 'user':
+                        $defaultuserid = isset($defaultuserid) ? $defaultuserid : $role->id;
                        $userroles[$role->id] = $rolename;
                        break;
                    case 'frontpage':
                        break;
                    default:
                        $creatornewroles[$role->id] = $rolename;
-                        $generalroles[$role->id] = $rolename;
+                        $otherroles[$role->id] = $rolename;
                        break;
                }
            }

-            reset($guestroles);
-            $defaultguestid = key($guestroles);
-            reset($studentroles);
-            $defaultstudentid = key($studentroles);
-            reset($teacherroles);
-            $defaultteacherid = key($teacherroles);
+            if (empty($guestroles)) {
+                $guestroles[0] = get_string('none');
+                $defaultguestid = 0;
+            }

-            if ($userroles) {
-                reset($userroles);
-                $defaultuserid = key($userroles);
-            } else {
-                $userroles = array('0'=>get_string('none'));
+            if (empty($userroles)) {
+                $userroles[0] = get_string('none');
                $defaultuserid = 0;
            }

            $temp->add(new admin_setting_configselect('notloggedinroleid', get_string('notloggedinroleid', 'admin'),
-                          get_string('confignotloggedinroleid', 'admin'), $defaultguestid, ($guestroles + $generalroles)));
+                          get_string('confignotloggedinroleid', 'admin'), $defaultguestid, ($guestroles + $otherroles)));
            $temp->add(new admin_setting_configselect('guestroleid', get_string('guestroleid', 'admin'),
-                          get_string('guestroleid_help', 'admin'), $defaultguestid, ($guestroles + $generalroles)));
+                          get_string('guestroleid_help', 'admin'), $defaultguestid, ($guestroles + $otherroles)));
            $temp->add(new admin_setting_configselect('defaultuserroleid', get_string('defaultuserroleid', 'admin'),
-                          get_string('configdefaultuserroleid', 'admin'), $defaultuserid, ($userroles + $generalroles)));
-        }
-
-        $temp->add(new admin_setting_configcheckbox('nodefaultuserrolelists', get_string('nodefaultuserrolelists', 'admin'), get_string('confignodefaultuserrolelists', 'admin'), 0));
-
-        if (!during_initial_install()) {
+                          get_string('configdefaultuserroleid', 'admin'), $defaultuserid, ($userroles + $otherroles)));
            $temp->add(new admin_setting_configselect('creatornewroleid', get_string('creatornewroleid', 'admin'),
                          get_string('creatornewroleid_help', 'admin'), $defaultteacherid, $creatornewroles));
+
+            // release memory
+            unset($otherroles);
+            unset($guestroles);
+            unset($userroles);
+            unset($creatornewroles);
        }

        $temp->add(new admin_setting_configcheckbox('autologinguests', get_string('autologinguests', 'admin'), get_string('configautologinguests', 'admin'), 0));
@@ -307,6 +307,9 @@ if ($formdata = $mform2->is_cancelled()) {
                // process templates
                $user->$field = uu_process_template($formdata->$field, $user);
                $formdefaults[$field] = true;
+                if (in_array($field, $upt->columns)) {
+                    $upt->track($field, s($user->$field), 'normal');
+                }
            }
        }
        foreach ($PRF_FIELDS as $field) {
@@ -465,6 +468,7 @@ if ($formdata = $mform2->is_cancelled()) {
                    if (!isset($supportedauths[$user->auth])) {
                        $upt->track('auth', $struserauthunsupported, 'warning');
                    }
+                    $doupdate = true;
                }
                $allcolumns = array_merge($STD_FIELDS, $PRF_FIELDS);
                foreach ($allcolumns as $column) {
@@ -614,7 +618,13 @@ if ($formdata = $mform2->is_cancelled()) {

            $isinternalauth = $auth->is_internal();

-            if ($DB->record_exists('user', array('email'=>$user->email))) {
+            if (empty($user->email)) {
+                $upt->track('email', get_string('invalidemail'), 'error');
+                $upt->track('status', $strusernotaddederror, 'error');
+                $userserrors++;
+                continue;
+
+            } else if ($DB->record_exists('user', array('email'=>$user->email))) {
                if ($noemailduplicates) {
                    $upt->track('email', $stremailduplicate, 'error');
                    $upt->track('status', $strusernotaddederror, 'error');
@@ -765,7 +775,7 @@ if ($formdata = $mform2->is_cancelled()) {
                        }
                    }

-                    $manual->enrol_user($manualcache[$courseid], $user->id, $rid, $today, $timeend, true);
+                    $manual->enrol_user($manualcache[$courseid], $user->id, $rid, $today, $timeend);

                    $a = new stdClass();
                    $a->course = $shortname;
@@ -898,12 +908,22 @@ while ($linenum <= $previewrows and $fields = $cir->next()) {
        $rowcols['status'][] = get_string('missingusername');
    }

-    if (!validate_email($rowcols['email'])) {
-        $rowcols['status'][] = get_string('invalidemail');
+    if (isset($rowcols['email'])) {
+        if (!validate_email($rowcols['email'])) {
+            $rowcols['status'][] = get_string('invalidemail');
+        }
+        if ($DB->record_exists('user', array('email'=>$rowcols['email']))) {
+            $rowcols['status'][] = $stremailduplicate;
+        }
    }
-    if ($DB->record_exists('user', array('email'=>$rowcols['email']))) {
-        $rowcols['status'][] = $stremailduplicate;
+
+    if (isset($rowcols['city'])) {
+        $rowcols['city'] = trim($rowcols['city']);
+        if (empty($rowcols['city'])) {
+            $rowcols['status'][] = get_string('fieldrequired', 'error', 'city');
+        }
    }
+
    $rowcols['status'] = implode('<br />', $rowcols['status']);
    $data[] = $rowcols;
 }
@@ -264,6 +264,7 @@ class admin_uploaduser_form2 extends moodleform {
        } else {
            $mform->setDefault('city', $CFG->defaultcity);
        }
+        $mform->addRule('city', get_string('required'), 'required');

        $mform->addElement('select', 'country', get_string('selectacountry'), get_string_manager()->get_list_of_countries());
        if (empty($CFG->country)) {
@@ -408,10 +409,6 @@ class admin_uploaduser_form2 extends moodleform {
            if (!in_array('email', $columns) and empty($data['email'])) {
                $errors['email'] = get_string('requiredtemplate', 'admin');
            }
-
-            if (!in_array('city', $columns) and empty($data['city'])) {
-                $errors['city'] = get_string('required');
-            }
        }

        return $errors;
@@ -157,14 +157,14 @@ class uu_progress_tracker {

 /**
 * Validation callback function - verified the column line of csv file.
- * Converts column names to lowercase too.
+ * Converts standard column names to lowercase.
 * @param csv_import_reader $cir
- * @param array standard user fields
- * @param array custom profile fields
+ * @param array $stdfields standard user fields
+ * @param array $profilefields custom profile fields
 * @param moodle_url $returnurl return url in case of any error
 * @return array list of fields
 */
-function uu_validate_user_upload_columns(csv_import_reader $cir, $stdfields, $frofilefields, moodle_url $returnurl) {
+function uu_validate_user_upload_columns(csv_import_reader $cir, $stdfields, $profilefields, moodle_url $returnurl) {
    $columns = $cir->get_columns();

    if (empty($columns)) {
@@ -178,22 +178,40 @@ function uu_validate_user_upload_columns(csv_import_reader $cir, $stdfields, $fr
        print_error('csvfewcolumns', 'error', $returnurl);
    }

+    $textlib = textlib_get_instance(); // profile fields may contain unicode chars
+
    // test columns
    $processed = array();
    foreach ($columns as $key=>$unused) {
-        $field = strtolower($columns[$key]); // no unicode expected here, ignore case
-        if (!in_array($field, $stdfields) && !in_array($field, $frofilefields) &&// if not a standard field and not an enrolment field, then we have an error
-            !preg_match('/^course\d+$/', $field) && !preg_match('/^group\d+$/', $field) &&
-            !preg_match('/^type\d+$/', $field) && !preg_match('/^role\d+$/', $field) &&
-            !preg_match('/^enrolperiod\d+$/', $field)) {
-            print_error('invalidfieldname', 'error', $returnurl, $field);
-        }
-        if (in_array($field, $processed)) {
+        $field = $columns[$key];
+        $lcfield = $textlib->strtolower($field);
+        if (in_array($field, $stdfields) or in_array($lcfield, $stdfields)) {
+            // standard fields are only lowercase
+            $newfield = $lcfield;
+
+        } else if (in_array($field, $profilefields)) {
+            // exact profile field name match - these are case sensitive
+            $newfield = $field;
+
+        } else if (in_array($lcfield, $profilefields)) {
+            // hack: somebody wrote uppercase in csv file, but the system knows only lowercase profile field
+            $newfield = $lcfield;
+
+        } else if (preg_match('/^(course|group|type|role|enrolperiod)\d+$/', $lcfield)) {
+            // special fields for enrolments
+            $newfield = $lcfield;
+
+        } else {
            $cir->close();
            $cir->cleanup();
-            print_error('duplicatefieldname', 'error', $returnurl, $field);
+            print_error('invalidfieldname', 'error', $returnurl, $field);
        }
-        $processed[$key] = $field;
+        if (in_array($newfield, $processed)) {
+            $cir->close();
+            $cir->cleanup();
+            print_error('duplicatefieldname', 'error', $returnurl, $newfield);
+        }
+        $processed[$key] = $newfield;
    }

    return $processed;
@@ -248,33 +266,48 @@ function uu_process_template($template, $user) {

    if (is_null($result)) {
        return $template; //error during regex processing??
+    }
+
+    if (is_array($template)) {
+        $template['text'] = $result;
+        return $t;
    } else {
-        if (array($template)) {
-            $template['text'] = $t;
-            return $t;
-        } else {
-            return $t;
-        }
+        return $result;
    }
 }

 /**
 * Internal callback function.
 */
-function uu_process_template_callback($block, $username, $firstname, $lastname) {
+function uu_process_template_callback($username, $firstname, $lastname, $block) {
    $textlib = textlib_get_instance();
-    $repl = $block[0];

    switch ($block[3]) {
-        case 'u': $repl = $username; break;
-        case 'f': $repl = $firstname; break;
-        case 'l': $repl = $lastname; break;
+        case 'u':
+            $repl = $username;
+            break;
+        case 'f':
+            $repl = $firstname;
+            break;
+        case 'l':
+            $repl = $lastname;
+            break;
+        default:
+            return $block[0];
    }
+
    switch ($block[1]) {
-        case '+': $repl = $textlib->strtoupper($repl); break;
-        case '-': $repl = $textlib->strtolower($repl); break;
-        case '~': $repl = $textlib->strtotitle($repl); break;
+        case '+':
+            $repl = $textlib->strtoupper($repl);
+            break;
+        case '-':
+            $repl = $textlib->strtolower($repl);
+            break;
+        case '~':
+            $repl = $textlib->strtotitle($repl);
+            break;
    }
+
    if (!empty($block[2])) {
        $repl = $textlib->substr($repl, 0 , $block[2]);
    }
@@ -0,0 +1,61 @@
+<?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/>.
+
+/**
+ * Web services API documentation
+ *
+ * @package   webservice
+ * @copyright 2011 Moodle Pty Ltd (http://moodle.com)
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @author Jerome Mouneyrac
+ */
+require_once('../../config.php');
+require_once($CFG->libdir . '/adminlib.php');
+require($CFG->dirroot . '/webservice/lib.php');
+
+admin_externalpage_setup('webservicedocumentation');
+
+// get all the function descriptions
+$functions = $DB->get_records('external_functions', array(), 'name');
+$functiondescs = array();
+foreach ($functions as $function) {
+    $functiondescs[$function->name] = external_function_info($function);
+}
+
+//display the documentation for all documented protocols,
+//regardless if they are activated or not
+$protocols = array();
+$protocols['rest'] = true;
+$protocols['xmlrpc'] = true;
+
+/// Check if we are in printable mode
+$printableformat = optional_param('print', false, PARAM_BOOL);
+
+/// OUTPUT
+echo $OUTPUT->header();
+
+$renderer = $PAGE->get_renderer('core', 'webservice');
+echo $renderer->documentation_html($functiondescs,
+        $printableformat, $protocols, array(), $PAGE->url);
+
+/// trigger browser print operation
+if (!empty($printableformat)) {
+    $PAGE->requires->js_function_call('window.print', array());
+}
+
+echo $OUTPUT->footer();
+
@@ -33,7 +33,7 @@ $userid = required_param('userid', PARAM_INT);
 admin_externalpage_setup('externalserviceusersettings');

 //define nav bar
-$PAGE->set_url('/' . $CFG->admin . '/webservice/service_user_settings.php', 
+$PAGE->set_url('/' . $CFG->admin . '/webservice/service_user_settings.php',
        array('id' => $serviceid, 'userid'  => $userid));
 $node = $PAGE->settingsnav->find('externalservices', navigation_node::TYPE_SETTING);
 if ($node) {
@@ -62,7 +62,7 @@ if ($usersettingsform->is_cancelled()) {
    $serviceuserinfo->id = $serviceuser->serviceuserid;
    $serviceuserinfo->iprestriction = $settingsformdata->iprestriction;
    $serviceuserinfo->validuntil = $settingsformdata->validuntil;
-    
+
    $webservicemanager->update_ws_authorised_user($serviceuserinfo);

    //TODO: assign capability
@@ -37,7 +37,7 @@ $PAGE->set_url('/' . $CFG->admin . '/webservice/testclient.php');
 $PAGE->navbar->ignore_active(true);
 $PAGE->navbar->add(get_string('administrationsite'));
 $PAGE->navbar->add(get_string('development', 'admin'));
-$PAGE->navbar->add(get_string('testclient', 'webservice'), 
+$PAGE->navbar->add(get_string('testclient', 'webservice'),
        new moodle_url('/' . $CFG->admin . '/webservice/testclient.php'));
 if (!empty($function)) {
    $PAGE->navbar->add($function);
@@ -169,4 +169,4 @@ if ($mform->is_cancelled()) {
    $mform->display();
    echo $OUTPUT->footer();
    die;
-}
+}
@@ -94,7 +94,7 @@ switch ($action) {
        die;
        break;

-    case 'delete':        
+    case 'delete':
        $token = $webservicemanager->get_created_by_user_ws_token($USER->id, $tokenid);

        //Delete the token
@@ -290,7 +290,7 @@ class main_view extends XMLDBAction {
                                                $o .= ' that seems to be active (true). ENUMs support has been dropped in Moodle 2.0, '  .
                                                      ' the XMLDB Editor will delete any ENUM reference next time you save this file' .
                                                      ' and you MUST provide  one upgrade block in your code to drop them from DB. See' .
-                                                      ' <a href="http://docs.moodle.org/en/Development:DB_layer_2.0_migration_docs#The_changes">' .
+                                                      ' <a href="http://docs.moodle.org/dev/DB_layer_2.0_migration_docs#The_changes">' .
                                                      ' Moodle Docs</a> for more info and examples.';
                                            } else {
                                                $o .= ' that seem to be inactive (false). ENUMs support has been dropped in Moodle 2.0,' .
@@ -360,7 +360,7 @@ class auth_plugin_cas extends auth_plugin_ldap {
     * @return boolean result
     */
    function iscreator($username) {
-        if ((empty($this->config->attrcreators) && empty($this->config->groupecreators)) or empty($this->config->memberattribute)) {
+        if (empty($this->config->host_url) or (empty($this->config->attrcreators) && empty($this->config->groupecreators)) or empty($this->config->memberattribute)) {
            return false;
        }

@@ -405,4 +405,39 @@ class auth_plugin_cas extends auth_plugin_ldap {

        return false;
    }
+
+    /**
+     * Reads user information from LDAP and returns it as array()
+     *
+     * If no LDAP servers are configured, user information has to be
+     * provided via other methods (CSV file, manually, etc.). Return
+     * an empty array so existing user info is not lost. Otherwise,
+     * calls parent class method to get user info.
+     *
+     * @param string $username username
+     * @return mixed array with no magic quotes or false on error
+     */
+    function get_userinfo($username) {
+        if (empty($this->config->host_url)) {
+            return array();
+        }
+        return parent::get_userinfo($username);
+    }
+
+    /**
+     * Syncronizes users from LDAP server to moodle user table.
+     *
+     * If no LDAP servers are configured, simply return. Otherwise,
+     * call parent class method to do the work.
+     *
+     * @param bool $do_updates will do pull in data updates from LDAP if relevant
+     * @return nothing
+     */
+    function sync_users($do_updates=true) {
+        if (empty($this->config->host_url)) {
+            error_log('[AUTH CAS] '.get_string('noldapserver', 'auth_cas'));
+            return;
+        }
+        parent::sync_users($do_updates);
+    }
 }
@@ -61,4 +61,5 @@ $string['auth_cas_text'] = 'Secure connection';
 $string['auth_cas_use_cas'] = 'Use CAS';
 $string['auth_cas_version'] = 'Version of CAS';
 $string['CASform'] = 'Authentication choice';
+$string['noldapserver'] = 'No LDAP server configured for CAS! Syncing disabled.';
 $string['pluginname'] = 'CAS server (SSO)';
@@ -228,17 +228,17 @@ class auth_plugin_db extends auth_plugin_base {

            // find obsolete users
            if (count($userlist)) {
-        		list($notin_sql, $params) = $DB->get_in_or_equal($userlist, SQL_PARAMS_NAMED, 'u0000', false);
-        		$params['authtype'] = $this->authtype;
-            	$sql = "SELECT u.id, u.username, u.email, u.auth
+                list($notin_sql, $params) = $DB->get_in_or_equal($userlist, SQL_PARAMS_NAMED, 'u', false);
+                $params['authtype'] = $this->authtype;
+                $sql = "SELECT u.*
                          FROM {user} u
                         WHERE u.auth=:authtype AND u.deleted=0 AND u.username $notin_sql";
            } else {
-                $sql = "SELECT u.id, u.username, u.email, u.auth
+                $sql = "SELECT u.*
                          FROM {user} u
                         WHERE u.auth=:authtype AND u.deleted=0";
                $params = array();
-        		$params['authtype'] = $this->authtype;
+                $params['authtype'] = $this->authtype;
            }
            $remove_users = $DB->get_records_sql($sql, $params);

@@ -290,7 +290,7 @@ class auth_plugin_db extends auth_plugin_base {
            // only go ahead if we actually
            // have fields to update locally
            if (!empty($updatekeys)) {
-            	list($in_sql, $params) = $DB->get_in_or_equal($userlist, SQL_PARAMS_NAMED, 'u0000', true);
+                list($in_sql, $params) = $DB->get_in_or_equal($userlist, SQL_PARAMS_NAMED, 'u', true);
                $params['authtype'] = $this->authtype;
                $sql = "SELECT u.id, u.username
                          FROM {user} u
@@ -24,23 +24,8 @@
 */

 $string['auth_emaildescription'] = 'Email confirmation is the default authentication method.  When the user signs up, choosing their own new username and password, a confirmation email is sent to the user\'s email address.  This email contains a secure link to a page where the user can confirm their account. Future logins just check the username and password against the stored values in the Moodle database.';
-$string['auth_emailchangecancel'] = 'Cancel email change';
-$string['auth_emailchangepending'] = 'Change pending. Open the link sent to you at {$a->preference_newemail}.';
 $string['auth_emailnoemail'] = 'Tried to send you an email but failed!';
-$string['auth_emailnoinsert'] = 'Could not add your record to the database!';
-$string['auth_emailnowexists'] = 'The email address you tried to assign to your profile has been assigned to someone else since your original request. Your request for change of email address is hereby cancelled, but you may try again with a different address.';
-$string['auth_emailrecaptcha'] = 'Adds a visual/audio confirmation form element to the signup page for email self-registering users. This protects your site against spammers and contributes to a worthwhile cause. See http://recaptcha.net/learnmore.html for more details. <br /><em>PHP cURL extension is required.</em>';
+$string['auth_emailrecaptcha'] = 'Adds a visual/audio confirmation form element to the signup page for email self-registering users. This protects your site against spammers and contributes to a worthwhile cause. See http://www.google.com/recaptcha/learnmore for more details. <br /><em>PHP cURL extension is required.</em>';
 $string['auth_emailrecaptcha_key'] = 'Enable reCAPTCHA element';
 $string['auth_emailsettings'] = 'Settings';
-$string['auth_emailupdate'] = 'Email address update';
-$string['auth_emailupdatemessage'] = 'Dear {$a->fullname},
-
-You have requested a change of your email address for your user account at {$a->site}. Please open the following URL in your browser in order to confirm this change.
-
-{$a->url}';
-$string['auth_emailupdatesuccess'] = 'Email address of user <em>{$a->fullname}</em> was successfully updated to <em>{$a->email}</em>.';
-$string['auth_emailupdatetitle'] = 'Confirmation of email update at {$a->site}';
-$string['auth_changingemailaddress'] = 'You have requested a change of email address, from {$a->oldemail} to {$a->newemail}. For security reasons, we are sending you an email message at the new address to confirm that it belongs to you. Your email address will be updated as soon as you open the URL sent to you in that message.';
-$string['auth_invalidnewemailkey'] = 'Error: if you are trying to confirm a change of email address, you may have made a mistake in copying the URL we sent you by email. Please copy the address and try again.';
-$string['auth_outofnewemailupdateattempts'] = 'You have run out of allowed attempts to update your email address. Your update request has been cancelled.';
 $string['pluginname'] = 'Email-based self-registration';
@@ -1,3 +1,3 @@
 LDAP-module README

-Please read comments from lib.php
+Please read comments from auth.php in this directory.
@@ -502,7 +502,7 @@ class auth_plugin_ldap extends auth_plugin_base {
        events_trigger('user_created', $user);

        if (! send_confirmation_email($user)) {
-            print_error('auth_emailnoemail', 'auth_email');
+            print_error('noemail', 'auth_ldap');
        }

        if ($notify) {
@@ -579,16 +579,17 @@ class auth_plugin_ldap extends auth_plugin_base {
        $sr = ldap_read($ldapconnection, $user_dn, '(objectClass=*)', $search_attribs);
        if ($sr)  {
            $info = ldap_get_entries_moodle($ldapconnection, $sr);
-            $info = array_change_key_case($info, CASE_LOWER);
-            if (!empty ($info) and !empty($info[0][$this->config->expireattr][0])) {
-                $expiretime = $this->ldap_expirationtime2unix($info[0][$this->config->expireattr][0], $ldapconnection, $user_dn);
-                if ($expiretime != 0) {
-                    $now = time();
-                    if ($expiretime > $now) {
-                        $result = ceil(($expiretime - $now) / DAYSECS);
-                    }
-                    else {
-                        $result = floor(($expiretime - $now) / DAYSECS);
+            if (!empty ($info)) {
+                $info = array_change_key_case($info[0], CASE_LOWER);
+                if (!empty($info[$this->config->expireattr][0])) {
+                    $expiretime = $this->ldap_expirationtime2unix($info[$this->config->expireattr][0], $ldapconnection, $user_dn);
+                    if ($expiretime != 0) {
+                        $now = time();
+                        if ($expiretime > $now) {
+                            $result = ceil(($expiretime - $now) / DAYSECS);
+                        } else {
+                            $result = floor(($expiretime - $now) / DAYSECS);
+                        }
                    }
                }
            }
@@ -689,7 +690,7 @@ class auth_plugin_ldap extends auth_plugin_base {
        // Find users in DB that aren't in ldap -- to be removed!
        // this is still not as scalable (but how often do we mass delete?)
        if ($this->config->removeuser !== AUTH_REMOVEUSER_KEEP) {
-            $sql = 'SELECT u.id, u.username, u.email, u.auth
+            $sql = 'SELECT u.*
                      FROM {user} u
                      LEFT JOIN {tmp_extuser} e ON (u.username = e.username AND u.mnethostid = e.mnethostid)
                     WHERE u.auth = ?
@@ -1385,7 +1386,7 @@ class auth_plugin_ldap extends auth_plugin_base {
                }
            }
        }
-        $moodleattributes['username'] = $this->config->user_attribute;
+        $moodleattributes['username'] = moodle_strtolower(trim($this->config->user_attribute));
        return $moodleattributes;
    }

@@ -114,6 +114,7 @@ $string['morethanoneuser'] = 'Strange! More than one user record found in ldap.
 $string['needbcmath'] = 'You need the BCMath extension to use grace logins with Active Directory';
 $string['needmbstring'] = 'You need the mbstring extension to change passwords in Active Directory';
 $string['nodnforusername'] = 'Error in user_update_password(). No DN for: {$a->username}';
+$string['noemail'] = 'Tried to send you an email but failed!';
 $string['notcalledfromserver'] = 'Should not be called from the web server!';
 $string['noupdatestobedone'] = "No updates to be done\n";
 $string['nouserentriestoremove'] = "No user entries to be removed\n";
@@ -45,5 +45,8 @@ function xmldb_auth_manual_upgrade($oldversion) {
        upgrade_plugin_savepoint(true, 2011022700, 'auth', 'manual');
    }

+    // Moodle v2.1.0 release upgrade line
+    // Put any upgrade step following this
+
    return true;
 }
@@ -276,6 +276,7 @@ class auth_plugin_mnet extends auth_plugin_base {
            */
            $remoteuser->mnethostid = $remotehost->id;
            $remoteuser->firstaccess = time(); // First time user in this server, grab it here
+            $remoteuser->confirmed = 1;

            $remoteuser->id = $DB->insert_record('user', $remoteuser);
            $firsttime = true;
@@ -889,8 +890,6 @@ class auth_plugin_mnet extends auth_plugin_base {
        global $CFG, $DB;
        $remoteclient = get_mnet_remote_client();

-        $CFG->usesid = true;
-
        // We don't want to output anything to the client machine
        $start = ob_start();

@@ -43,5 +43,8 @@ function xmldb_auth_mnet_upgrade($oldversion) {
        upgrade_plugin_savepoint(true, 2010071300, 'auth', 'mnet');
    }

+    // Moodle v2.1.0 release upgrade line
+    // Put any upgrade step following this
+
    return true;
 }
@@ -193,18 +193,13 @@ class auth_plugin_shibboleth extends auth_plugin_base {
     *
     */
    function logoutpage_hook() {
-        global $redirect;
+        global $SESSION, $redirect;

-        // Only do this if logout handler is defined
-        if (
-              isset($this->config->logout_handler)
-              && !empty($this->config->logout_handler)
-           ){
+        // Only do this if logout handler is defined, and if the user is actually logged in via Shibboleth
+        $logouthandlervalid = isset($this->config->logout_handler) && !empty($this->config->logout_handler);
+        if (isset($SESSION->shibboleth_session_id) && $logouthandlervalid ) {
            // Check if there is an alternative logout return url defined
-            if (
-                  isset($this->config->logout_return_url)
-                  && !empty($this->config->logout_return_url)
-               ){
+            if (isset($this->config->logout_return_url) && !empty($this->config->logout_return_url)) {
                // Set temp_redirect to alternative return url
                $temp_redirect = $this->config->logout_return_url;
            } else {
@@ -54,6 +54,7 @@ abstract class backup implements checksumable {
    const MODE_HUB       = 30;
    const MODE_SAMESITE  = 40;
    const MODE_AUTOMATED = 50;
+    const MODE_CONVERTED = 60;

    // Target (new/existing/current/adding/deleting)
    const TARGET_CURRENT_DELETING = 0;
@@ -107,8 +108,8 @@ 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 = 2010111800;
-    const RELEASE = '2.0';
+    const VERSION = 2011063000;
+    const RELEASE = '2.1';
 }

 /*
@@ -117,6 +118,6 @@ abstract class backup implements checksumable {
 abstract class backup_exception extends moodle_exception {

    public function __construct($errorcode, $a=NULL, $debuginfo=null) {
-        parent::__construct($errorcode, 'error', '', $a, null, $debuginfo);
+        parent::__construct($errorcode, 'error', '', $a, $debuginfo);
    }
 }
@@ -60,10 +60,12 @@ switch ($type) {
        $heading = get_string('backupcourse', 'backup', $course->shortname);
        break;
    case backup::TYPE_1SECTION :
-        require_capability('moodle/backup:backupsection', get_context_instance(CONTEXT_COURSE, $course->id));
+        $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+        require_capability('moodle/backup:backupsection', $coursecontext);
        if (!empty($section->name)) {
-            $heading = get_string('backupsection', 'backup', $section->name);
-            $PAGE->navbar->add($section->name);
+            $sectionname = format_string($section->name, true, array('context' => $coursecontext));
+            $heading = get_string('backupsection', 'backup', $sectionname);
+            $PAGE->navbar->add($sectionname);
        } else {
            $heading = get_string('backupsection', 'backup', $section->section);
            $PAGE->navbar->add(get_string('section').' '.$section->section);
@@ -194,7 +194,7 @@ function schedule_backup_cron() {

        //Build the message subject
        $site = get_site();
-        $prefix = $site->shortname.": ";
+        $prefix = format_string($site->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, SITEID))).": ";
        if ($count_error != 0 || $count_unfinished != 0) {
            $prefix .= "[".strtoupper(get_string('error'))."] ";
        }
@@ -92,5 +92,3 @@ define('MOODLE_QUIZ_MULTIPLE_RESPONSE', 'multichoice');
 define('MOODLE_QUIZ_MACHT', 'match');
 define('MOODLE_QUIZ_ESSAY', 'essay');
 define('MOODLE_QUIZ_SHORTANSWER', 'shortanswer');
-
-?>
@@ -290,6 +290,9 @@ class backup_controller extends backup implements loggable {
     * @return void Throws and exception of completes
     */
    public function execute_plan() {
+        // Basic/initial prevention against time/memory limits
+        set_time_limit(1 * 60 * 60); // 1 hour for 1 course initially granted
+        raise_memory_limit(MEMORY_EXTRA);
        return $this->plan->execute();
    }

@@ -336,7 +339,7 @@ class backup_controller extends backup implements loggable {

    protected function apply_defaults() {
        $this->log('applying plan defaults', backup::LOG_DEBUG);
-        backup_controller_dbops::apply_general_config_defaults($this);
+        backup_controller_dbops::apply_config_defaults($this);
        $this->set_status(backup::STATUS_CONFIGURED);
    }
 }
@@ -296,6 +296,9 @@ class restore_controller extends backup implements loggable {
    }

    public function execute_plan() {
+        // Basic/initial prevention against time/memory limits
+        set_time_limit(1 * 60 * 60); // 1 hour for 1 course initially granted
+        raise_memory_limit(MEMORY_EXTRA);
        return $this->plan->execute();
    }

@@ -377,38 +380,44 @@ class restore_controller extends backup implements loggable {
    }

    /**
-     * convert from current format to backup::MOODLE format
+     * Converts from current format to backup::MOODLE format
     */
    public function convert() {
+        global $CFG;
+        require_once($CFG->dirroot . '/backup/util/helper/convert_helper.class.php');
+
+        // Basic/initial prevention against time/memory limits
+        set_time_limit(1 * 60 * 60); // 1 hour for 1 course initially granted
+        raise_memory_limit(MEMORY_EXTRA);
+
        if ($this->status != backup::STATUS_REQUIRE_CONV) {
            throw new restore_controller_exception('cannot_convert_not_required_status');
        }
-        if ($this->format == backup::FORMAT_UNKNOWN) {
-            throw new restore_controller_exception('cannot_convert_from_unknown_format');
-        }
-        if ($this->format == backup::FORMAT_MOODLE1) {
-            // TODO: Implement moodle1 => moodle2 conversion
-            throw new restore_controller_exception('cannot_convert_yet_from_moodle1_format');
+
+        $this->log('backup format conversion required', backup::LOG_INFO);
+
+        // Run conversion to the proper format
+        if (!convert_helper::to_moodle2_format($this->get_tempdir(), $this->format, $this->get_logger())) {
+            // todo - unable to find the conversion path, what to do now?
+            // throwing the exception as a temporary solution
+            throw new restore_controller_exception('unable_to_find_conversion_path');
        }

-        // Once conversions have finished, we check again the format
-        $newformat = backup_general_helper::detect_backup_format($tempdir);
+        $this->log('backup format conversion successful', backup::LOG_INFO);

-        // If format is moodle2, load plan, apply security and set status based on interactivity
-        if ($newformat === backup::FORMAT_MOODLE) {
-            // Load plan
-            $this->load_plan();
+        // If no exceptions were thrown, then we are in the proper format
+        $this->format = backup::FORMAT_MOODLE;

-            // Perform all initial security checks and apply (2nd param) them to settings automatically
-            restore_check::check_security($this, true);
+        // Load plan, apply security and set status based on interactivity
+        $this->load_plan();

-            if ($this->interactive == backup::INTERACTIVE_YES) {
-                $this->set_status(backup::STATUS_SETTING_UI);
-            } else {
-                $this->set_status(backup::STATUS_NEED_PRECHECK);
-            }
+        // Perform all initial security checks and apply (2nd param) them to settings automatically
+        restore_check::check_security($this, true);
+
+        if ($this->interactive == backup::INTERACTIVE_YES) {
+            $this->set_status(backup::STATUS_SETTING_UI);
        } else {
-            throw new restore_controller_exception('conversion_ended_with_wrong_format', $newformat);
+            $this->set_status(backup::STATUS_NEED_PRECHECK);
        }
    }

@@ -0,0 +1,286 @@
+<?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/>.
+
+/**
+ * Provides base converter classes
+ *
+ * @package    core
+ * @subpackage backup-convert
+ * @copyright  2011 Mark Nielsen <mark@moodlerooms.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->dirroot . '/backup/util/includes/convert_includes.php');
+
+/**
+ * Base converter class
+ *
+ * All Moodle backup converters are supposed to extend this base class.
+ *
+ * @throws convert_exception
+ */
+abstract class base_converter implements loggable {
+
+    /** @var string unique identifier of this converter instance */
+    protected $id;
+
+    /** @var string the name of the directory containing the unpacked backup being converted */
+    protected $tempdir;
+
+    /** @var string the name of the directory where the backup is converted to */
+    protected $workdir;
+
+    /** @var null|base_logger logger to use during the conversion */
+    protected $logger = null;
+
+    /**
+     * Constructor
+     *
+     * @param string $tempdir the relative path to the directory containing the unpacked backup to convert
+     * @param null|base_logger logger to use during the conversion
+     */
+    public function __construct($tempdir, $logger = null) {
+
+        $this->tempdir  = $tempdir;
+        $this->id       = convert_helper::generate_id($tempdir);
+        $this->workdir  = $tempdir . '_' . $this->get_name() . '_' . $this->id;
+        $this->set_logger($logger);
+        $this->log('instantiating '.$this->get_name().' converter '.$this->get_id(), backup::LOG_DEBUG);
+        $this->log('conversion source directory', backup::LOG_DEBUG, $this->tempdir);
+        $this->log('conversion target directory', backup::LOG_DEBUG, $this->workdir);
+        $this->init();
+    }
+
+    /**
+     * Sets the logger to use during the conversion
+     *
+     * @param null|base_logger $logger
+     */
+    public function set_logger($logger) {
+        if (is_null($logger) or ($logger instanceof base_logger)) {
+            $this->logger = $logger;
+        }
+    }
+
+    /**
+     * If the logger was set for the converter, log the message
+     *
+     * If the $display is enabled, the spaces in the $message text are removed
+     * and the text is used as a string identifier in the core_backup language file.
+     *
+     * @see backup_helper::log()
+     * @param string $message message text
+     * @param int $level message level {@example backup::LOG_WARNING}
+     * @param null|mixed $a additional information
+     * @param null|int $depth the message depth
+     * @param bool $display whether the message should be sent to the output, too
+     */
+    public function log($message, $level, $a = null, $depth = null, $display = false) {
+        if ($this->logger instanceof base_logger) {
+            backup_helper::log($message, $level, $a, $depth, $display, $this->logger);
+        }
+    }
+
+    /**
+     * Get instance identifier
+     *
+     * @return string the unique identifier of this converter instance
+     */
+    public function get_id() {
+        return $this->id;
+    }
+
+    /**
+     * Get converter name
+     *
+     * @return string the system name of the converter
+     */
+    public function get_name() {
+        return array_shift(explode('_', get_class($this)));
+    }
+
+    /**
+     * Converts the backup directory
+     */
+    public function convert() {
+
+        try {
+            $this->log('creating the target directory', backup::LOG_DEBUG);
+            $this->create_workdir();
+
+            $this->log('executing the conversion', backup::LOG_DEBUG);
+            $this->execute();
+
+            $this->log('replacing the source directory with the converted version', backup::LOG_DEBUG);
+            $this->replace_tempdir();
+        } catch (Exception $e) {
+        }
+
+        // clean-up stuff if needed
+        $this->destroy();
+
+        // eventually re-throw the execution exception
+        if (isset($e) and ($e instanceof Exception)) {
+            throw $e;
+        }
+    }
+
+    /**
+     * @return string the full path to the working directory
+     */
+    public function get_workdir_path() {
+        global $CFG;
+
+        return "$CFG->dataroot/temp/backup/$this->workdir";
+    }
+
+    /**
+     * @return string the full path to the directory with the source backup
+     */
+    public function get_tempdir_path() {
+        global $CFG;
+
+        return "$CFG->dataroot/temp/backup/$this->tempdir";
+    }
+
+    /// public static methods //////////////////////////////////////////////////
+
+    /**
+     * Makes sure that this converter is available at this site
+     *
+     * This is intended for eventual PHP extensions check, environment check etc.
+     * All checks that do not depend on actual backup data should be done here.
+     *
+     * @return boolean true if this converter should be considered as available
+     */
+    public static function is_available() {
+        return true;
+    }
+
+    /**
+     * Detects the format of the backup directory
+     *
+     * Moodle 2.x format is being detected by the core itself. The converters are
+     * therefore supposed to detect the source format. Eventually, if the target
+     * format os not {@link backup::FORMAT_MOODLE} then they should be able to
+     * detect both source and target formats.
+     *
+     * @param string $tempdir the name of the backup directory
+     * @return null|string null if not recognized, backup::FORMAT_xxx otherwise
+     */
+    public static function detect_format($tempdir) {
+        return null;
+    }
+
+    /**
+     * Returns the basic information about the converter
+     *
+     * The returned array must contain the following keys:
+     * 'from' - the supported source format, eg. backup::FORMAT_MOODLE1
+     * 'to'   - the supported target format, eg. backup::FORMAT_MOODLE
+     * 'cost' - the cost of the conversion, non-negative non-zero integer
+     */
+    public static function description() {
+
+        return array(
+            'from'  => null,
+            'to'    => null,
+            'cost'  => null,
+        );
+    }
+
+    /// end of public API //////////////////////////////////////////////////////
+
+    /**
+     * Initialize the instance if needed, called by the constructor
+     */
+    protected function init() {
+    }
+
+    /**
+     * Converts the contents of the tempdir into the target format in the workdir
+     */
+    protected abstract function execute();
+
+    /**
+     * Prepares a new empty working directory
+     */
+    protected function create_workdir() {
+
+        fulldelete($this->get_workdir_path());
+        if (!check_dir_exists($this->get_workdir_path())) {
+            throw new convert_exception('failed_create_workdir');
+        }
+    }
+
+    /**
+     * Replaces the source backup directory with the converted version
+     *
+     * If $CFG->keeptempdirectoriesonbackup is defined, the original source
+     * source backup directory is kept for debugging purposes.
+     */
+    protected function replace_tempdir() {
+        global $CFG;
+
+        if (empty($CFG->keeptempdirectoriesonbackup)) {
+            fulldelete($this->get_tempdir_path());
+        } else {
+            if (!rename($this->get_tempdir_path(), $this->get_tempdir_path()  . '_' . $this->get_name() . '_' . $this->id . '_source')) {
+                throw new convert_exception('failed_rename_source_tempdir');
+            }
+        }
+
+        if (!rename($this->get_workdir_path(), $this->get_tempdir_path())) {
+            throw new convert_exception('failed_move_converted_into_place');
+        }
+    }
+
+    /**
+     * Cleans up stuff after the execution
+     *
+     * Note that we do not know if the execution was successful or not.
+     * An exception might have been thrown.
+     */
+    protected function destroy() {
+        global $CFG;
+
+        if (empty($CFG->keeptempdirectoriesonbackup)) {
+            fulldelete($this->get_workdir_path());
+        }
+    }
+}
+
+/**
+ * General convert-related exception
+ *
+ * @author David Mudrak <david@moodle.com>
+ */
+class convert_exception extends moodle_exception {
+
+    /**
+     * Constructor
+     *
+     * @param string $errorcode key for the corresponding error string
+     * @param object $a extra words and phrases that might be required in the error string
+     * @param string $debuginfo optional debugging information
+     */
+    public function __construct($errorcode, $a = null, $debuginfo = null) {
+        parent::__construct($errorcode, '', '', $a, $debuginfo);
+    }
+}
@@ -0,0 +1,602 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MOODLE_BACKUP>
+  <INFO>
+    <NAME>restore.zip</NAME>
+    <MOODLE_VERSION>2007101520</MOODLE_VERSION>
+    <MOODLE_RELEASE>1.9.2 (Build: 20080711)</MOODLE_RELEASE>
+    <BACKUP_VERSION>2008030300</BACKUP_VERSION>
+    <BACKUP_RELEASE>1.9</BACKUP_RELEASE>
+    <DATE>1299774017</DATE>
+    <ORIGINAL_WWWROOT>http://elearning-testadam.uss.lsu.edu/moodle</ORIGINAL_WWWROOT>
+    <ZIP_METHOD>internal</ZIP_METHOD>
+    <DETAILS>
+      <MOD>
+        <NAME>forum</NAME>
+        <INCLUDED>true</INCLUDED>
+        <USERINFO>false</USERINFO>
+        <INSTANCES>
+          <INSTANCE>
+          <ID>57</ID>
+          <NAME>News forum</NAME>
+          <INCLUDED>true</INCLUDED>
+          <USERINFO>false</USERINFO>
+          </INSTANCE>
+        </INSTANCES>
+      </MOD>
+      <METACOURSE>false</METACOURSE>
+      <USERS>course</USERS>
+      <LOGS>false</LOGS>
+      <USERFILES>true</USERFILES>
+      <COURSEFILES>true</COURSEFILES>
+      <SITEFILES>true</SITEFILES>
+      <GRADEBOOKHISTORIES>false</GRADEBOOKHISTORIES>
+      <MESSAGES>false</MESSAGES>
+      <BLOGS>false</BLOGS>
+      <BLOCKFORMAT>instances</BLOCKFORMAT>
+    </DETAILS>
+  </INFO>
+  <ROLES>
+  </ROLES>
+  <COURSE>
+    <HEADER>
+      <ID>33</ID>
+      <CATEGORY>
+        <ID>1</ID>
+        <NAME>Miscellaneous</NAME>
+      </CATEGORY>
+      <PASSWORD></PASSWORD>
+      <FULLNAME>Moodle 2.0 Test Restore</FULLNAME>
+      <SHORTNAME>M2TR</SHORTNAME>
+      <IDNUMBER></IDNUMBER>
+      <SUMMARY>Cazzin'</SUMMARY>
+      <FORMAT>weeks</FORMAT>
+      <SHOWGRADES>1</SHOWGRADES>
+      <NEWSITEMS>5</NEWSITEMS>
+      <TEACHER>Teacher</TEACHER>
+      <TEACHERS>Teachers</TEACHERS>
+      <STUDENT>Student</STUDENT>
+      <STUDENTS>Students</STUDENTS>
+      <GUEST>0</GUEST>
+      <STARTDATE>1299823200</STARTDATE>
+      <NUMSECTIONS>10</NUMSECTIONS>
+      <MAXBYTES>52428800</MAXBYTES>
+      <SHOWREPORTS>0</SHOWREPORTS>
+      <GROUPMODE>0</GROUPMODE>
+      <GROUPMODEFORCE>0</GROUPMODEFORCE>
+      <DEFAULTGROUPINGID>0</DEFAULTGROUPINGID>
+      <LANG></LANG>
+      <THEME></THEME>
+      <COST></COST>
+      <CURRENCY>USD</CURRENCY>
+      <MARKER>0</MARKER>
+      <VISIBLE>1</VISIBLE>
+      <HIDDENSECTIONS>0</HIDDENSECTIONS>
+      <TIMECREATED>1299773769</TIMECREATED>
+      <TIMEMODIFIED>1299773769</TIMEMODIFIED>
+      <METACOURSE>0</METACOURSE>
+      <EXPIRENOTIFY>0</EXPIRENOTIFY>
+      <NOTIFYSTUDENTS>0</NOTIFYSTUDENTS>
+      <EXPIRYTHRESHOLD>864000</EXPIRYTHRESHOLD>
+      <ENROLLABLE>1</ENROLLABLE>
+      <ENROLSTARTDATE>0</ENROLSTARTDATE>
+      <ENROLENDDATE>0</ENROLENDDATE>
+      <ENROLPERIOD>0</ENROLPERIOD>
+      <ROLES_OVERRIDES>
+      </ROLES_OVERRIDES>
+      <ROLES_ASSIGNMENTS>
+      </ROLES_ASSIGNMENTS>
+    </HEADER>
+    <BLOCKS>
+      <BLOCK>
+        <ID>314</ID>
+        <NAME>participants</NAME>
+        <PAGEID>33</PAGEID>
+        <PAGETYPE>course-view</PAGETYPE>
+        <POSITION>l</POSITION>
+        <WEIGHT>0</WEIGHT>
+        <VISIBLE>1</VISIBLE>
+        <CONFIGDATA>Tjs=</CONFIGDATA>
+        <ROLES_OVERRIDES>
+        </ROLES_OVERRIDES>
+        <ROLES_ASSIGNMENTS>
+        </ROLES_ASSIGNMENTS>
+      </BLOCK>
+      <BLOCK>
+        <ID>315</ID>
+        <NAME>activity_modules</NAME>
+        <PAGEID>33</PAGEID>
+        <PAGETYPE>course-view</PAGETYPE>
+        <POSITION>l</POSITION>
+        <WEIGHT>1</WEIGHT>
+        <VISIBLE>1</VISIBLE>
+        <CONFIGDATA>Tjs=</CONFIGDATA>
+        <ROLES_OVERRIDES>
+        </ROLES_OVERRIDES>
+        <ROLES_ASSIGNMENTS>
+        </ROLES_ASSIGNMENTS>
+      </BLOCK>
+      <BLOCK>
+        <ID>316</ID>
+        <NAME>search_forums</NAME>
+        <PAGEID>33</PAGEID>
+        <PAGETYPE>course-view</PAGETYPE>
+        <POSITION>l</POSITION>
+        <WEIGHT>2</WEIGHT>
+        <VISIBLE>1</VISIBLE>
+        <CONFIGDATA>Tjs=</CONFIGDATA>
+        <ROLES_OVERRIDES>
+        </ROLES_OVERRIDES>
+        <ROLES_ASSIGNMENTS>
+        </ROLES_ASSIGNMENTS>
+      </BLOCK>
+      <BLOCK>
+        <ID>317</ID>
+        <NAME>admin</NAME>
+        <PAGEID>33</PAGEID>
+        <PAGETYPE>course-view</PAGETYPE>
+        <POSITION>l</POSITION>
+        <WEIGHT>3</WEIGHT>
+        <VISIBLE>1</VISIBLE>
+        <CONFIGDATA>Tjs=</CONFIGDATA>
+        <ROLES_OVERRIDES>
+        </ROLES_OVERRIDES>
+        <ROLES_ASSIGNMENTS>
+        </ROLES_ASSIGNMENTS>
+      </BLOCK>
+      <BLOCK>
+        <ID>318</ID>
+        <NAME>course_list</NAME>
+        <PAGEID>33</PAGEID>
+        <PAGETYPE>course-view</PAGETYPE>
+        <POSITION>l</POSITION>
+        <WEIGHT>4</WEIGHT>
+        <VISIBLE>1</VISIBLE>
+        <CONFIGDATA>Tjs=</CONFIGDATA>
+        <ROLES_OVERRIDES>
+        </ROLES_OVERRIDES>
+        <ROLES_ASSIGNMENTS>
+        </ROLES_ASSIGNMENTS>
+      </BLOCK>
+      <BLOCK>
+        <ID>319</ID>
+        <NAME>news_items</NAME>
+        <PAGEID>33</PAGEID>
+        <PAGETYPE>course-view</PAGETYPE>
+        <POSITION>r</POSITION>
+        <WEIGHT>0</WEIGHT>
+        <VISIBLE>1</VISIBLE>
+        <CONFIGDATA>Tjs=</CONFIGDATA>
+        <ROLES_OVERRIDES>
+        </ROLES_OVERRIDES>
+        <ROLES_ASSIGNMENTS>
+        </ROLES_ASSIGNMENTS>
+      </BLOCK>
+      <BLOCK>
+        <ID>320</ID>
+        <NAME>calendar_upcoming</NAME>
+        <PAGEID>33</PAGEID>
+        <PAGETYPE>course-view</PAGETYPE>
+        <POSITION>r</POSITION>
+        <WEIGHT>1</WEIGHT>
+        <VISIBLE>1</VISIBLE>
+        <CONFIGDATA>Tjs=</CONFIGDATA>
+        <ROLES_OVERRIDES>
+        </ROLES_OVERRIDES>
+        <ROLES_ASSIGNMENTS>
+        </ROLES_ASSIGNMENTS>
+      </BLOCK>
+      <BLOCK>
+        <ID>321</ID>
+        <NAME>recent_activity</NAME>
+        <PAGEID>33</PAGEID>
+        <PAGETYPE>course-view</PAGETYPE>
+        <POSITION>r</POSITION>
+        <WEIGHT>2</WEIGHT>
+        <VISIBLE>1</VISIBLE>
+        <CONFIGDATA>Tjs=</CONFIGDATA>
+        <ROLES_OVERRIDES>
+        </ROLES_OVERRIDES>
+        <ROLES_ASSIGNMENTS>
+        </ROLES_ASSIGNMENTS>
+      </BLOCK>
+    </BLOCKS>
+    <SECTIONS>
+      <SECTION>
+        <ID>436</ID>
+        <NUMBER>0</NUMBER>
+        <SUMMARY>$@NULL@$</SUMMARY>
+        <VISIBLE>1</VISIBLE>
+        <MODS>
+          <MOD>
+            <ID>250</ID>
+            <TYPE>forum</TYPE>
+            <INSTANCE>57</INSTANCE>
+            <ADDED>1299773780</ADDED>
+            <SCORE>0</SCORE>
+            <INDENT>0</INDENT>
+            <VISIBLE>1</VISIBLE>
+            <GROUPMODE>0</GROUPMODE>
+            <GROUPINGID>0</GROUPINGID>
+            <GROUPMEMBERSONLY>0</GROUPMEMBERSONLY>
+            <IDNUMBER>$@NULL@$</IDNUMBER>
+            <ROLES_OVERRIDES>
+            </ROLES_OVERRIDES>
+            <ROLES_ASSIGNMENTS>
+            </ROLES_ASSIGNMENTS>
+          </MOD>
+        </MODS>
+      </SECTION>
+      <SECTION>
+        <ID>437</ID>
+        <NUMBER>1</NUMBER>
+        <SUMMARY></SUMMARY>
+        <VISIBLE>1</VISIBLE>
+      </SECTION>
+      <SECTION>
+        <ID>438</ID>
+        <NUMBER>2</NUMBER>
+        <SUMMARY></SUMMARY>
+        <VISIBLE>1</VISIBLE>
+      </SECTION>
+      <SECTION>
+        <ID>439</ID>
+        <NUMBER>3</NUMBER>
+        <SUMMARY></SUMMARY>
+        <VISIBLE>1</VISIBLE>
+      </SECTION>
+      <SECTION>
+        <ID>440</ID>
+        <NUMBER>4</NUMBER>
+        <SUMMARY></SUMMARY>
+        <VISIBLE>1</VISIBLE>
+      </SECTION>
+      <SECTION>
+        <ID>441</ID>
+        <NUMBER>5</NUMBER>
+        <SUMMARY></SUMMARY>
+        <VISIBLE>1</VISIBLE>
+      </SECTION>
+      <SECTION>
+        <ID>442</ID>
+        <NUMBER>6</NUMBER>
+        <SUMMARY></SUMMARY>
+        <VISIBLE>1</VISIBLE>
+      </SECTION>
+      <SECTION>
+        <ID>443</ID>
+        <NUMBER>7</NUMBER>
+        <SUMMARY></SUMMARY>
+        <VISIBLE>1</VISIBLE>
+      </SECTION>
+      <SECTION>
+        <ID>444</ID>
+        <NUMBER>8</NUMBER>
+        <SUMMARY></SUMMARY>
+        <VISIBLE>1</VISIBLE>
+      </SECTION>
+      <SECTION>
+        <ID>445</ID>
+        <NUMBER>9</NUMBER>
+        <SUMMARY></SUMMARY>
+        <VISIBLE>1</VISIBLE>
+      </SECTION>
+      <SECTION>
+        <ID>446</ID>
+        <NUMBER>10</NUMBER>
+        <SUMMARY></SUMMARY>
+        <VISIBLE>1</VISIBLE>
+      </SECTION>
+    </SECTIONS>
+    <USERS>
+      <USER>
+        <ID>2</ID>
+        <AUTH>manual</AUTH>
+        <CONFIRMED>1</CONFIRMED>
+        <POLICYAGREED>0</POLICYAGREED>
+        <DELETED>0</DELETED>
+        <USERNAME>admin</USERNAME>
+        <PASSWORD>ea557cf33bda866d97b07465f1ea3867</PASSWORD>
+        <IDNUMBER>891220979</IDNUMBER>
+        <FIRSTNAME>Admin</FIRSTNAME>
+        <LASTNAME>User</LASTNAME>
+        <EMAIL>adamzap@gmail.com</EMAIL>
+        <EMAILSTOP>0</EMAILSTOP>
+        <ICQ></ICQ>
+        <SKYPE></SKYPE>
+        <YAHOO></YAHOO>
+        <AIM></AIM>
+        <MSN></MSN>
+        <PHONE1></PHONE1>
+        <PHONE2></PHONE2>
+        <INSTITUTION></INSTITUTION>
+        <DEPARTMENT></DEPARTMENT>
+        <ADDRESS></ADDRESS>
+        <CITY>br</CITY>
+        <COUNTRY>US</COUNTRY>
+        <LANG>en_utf8</LANG>
+        <THEME></THEME>
+        <TIMEZONE>99</TIMEZONE>
+        <FIRSTACCESS>0</FIRSTACCESS>
+        <LASTACCESS>1265755409</LASTACCESS>
+        <LASTLOGIN>1265658108</LASTLOGIN>
+        <CURRENTLOGIN>1265741271</CURRENTLOGIN>
+        <LASTIP>130.39.194.172</LASTIP>
+        <SECRET>lknsJoSw0S6myJA</SECRET>
+        <PICTURE>1</PICTURE>
+        <URL></URL>
+        <DESCRIPTION></DESCRIPTION>
+        <MAILFORMAT>1</MAILFORMAT>
+        <MAILDIGEST>0</MAILDIGEST>
+        <MAILDISPLAY>1</MAILDISPLAY>
+        <HTMLEDITOR>1</HTMLEDITOR>
+        <AJAX>1</AJAX>
+        <AUTOSUBSCRIBE>1</AUTOSUBSCRIBE>
+        <TRACKFORUMS>0</TRACKFORUMS>
+        <TIMEMODIFIED>1265216036</TIMEMODIFIED>
+        <ROLES>
+          <ROLE>
+            <TYPE>needed</TYPE>
+          </ROLE>
+        </ROLES>
+        <USER_PREFERENCES>
+          <USER_PREFERENCE>
+            <NAME>email_bounce_count</NAME>
+            <VALUE>1</VALUE>
+          </USER_PREFERENCE>
+          <USER_PREFERENCE>
+            <NAME>email_send_count</NAME>
+            <VALUE>1</VALUE>
+          </USER_PREFERENCE>
+          <USER_PREFERENCE>
+            <NAME>user_editadvanced_form_showadvanced</NAME>
+            <VALUE>1</VALUE>
+          </USER_PREFERENCE>
+        </USER_PREFERENCES>
+        <ROLES_OVERRIDES>
+        </ROLES_OVERRIDES>
+        <ROLES_ASSIGNMENTS>
+        </ROLES_ASSIGNMENTS>
+      </USER>
+      <USER>
+        <ID>3</ID>
+        <AUTH>cas</AUTH>
+        <CONFIRMED>1</CONFIRMED>
+        <POLICYAGREED>0</POLICYAGREED>
+        <DELETED>0</DELETED>
+        <USERNAME>azaple1</USERNAME>
+        <PASSWORD>fb005bdc5fb1b23ea95d238fb5ecb9e2</PASSWORD>
+        <IDNUMBER>891111111</IDNUMBER>
+        <FIRSTNAME>Adam</FIRSTNAME>
+        <LASTNAME>Zapletal</LASTNAME>
+        <EMAIL>azaple1@lsu.edu</EMAIL>
+        <EMAILSTOP>0</EMAILSTOP>
+        <ICQ></ICQ>
+        <SKYPE></SKYPE>
+        <YAHOO></YAHOO>
+        <AIM></AIM>
+        <MSN></MSN>
+        <PHONE1></PHONE1>
+        <PHONE2></PHONE2>
+        <INSTITUTION></INSTITUTION>
+        <DEPARTMENT></DEPARTMENT>
+        <ADDRESS></ADDRESS>
+        <CITY>asdf</CITY>
+        <COUNTRY>AL</COUNTRY>
+        <LANG>en_utf8</LANG>
+        <THEME></THEME>
+        <TIMEZONE>99</TIMEZONE>
+        <FIRSTACCESS>0</FIRSTACCESS>
+        <LASTACCESS>1299774054</LASTACCESS>
+        <LASTLOGIN>1297979000</LASTLOGIN>
+        <CURRENTLOGIN>1299773727</CURRENTLOGIN>
+        <LASTIP>173.253.129.223</LASTIP>
+        <SECRET></SECRET>
+        <PICTURE>1</PICTURE>
+        <URL></URL>
+        <DESCRIPTION></DESCRIPTION>
+        <MAILFORMAT>1</MAILFORMAT>
+        <MAILDIGEST>0</MAILDIGEST>
+        <MAILDISPLAY>2</MAILDISPLAY>
+        <HTMLEDITOR>1</HTMLEDITOR>
+        <AJAX>1</AJAX>
+        <AUTOSUBSCRIBE>1</AUTOSUBSCRIBE>
+        <TRACKFORUMS>0</TRACKFORUMS>
+        <TIMEMODIFIED>1288033285</TIMEMODIFIED>
+        <ROLES>
+          <ROLE>
+            <TYPE>needed</TYPE>
+          </ROLE>
+        </ROLES>
+        <USER_PREFERENCES>
+          <USER_PREFERENCE>
+            <NAME>assignment_mailinfo</NAME>
+            <VALUE>1</VALUE>
+          </USER_PREFERENCE>
+          <USER_PREFERENCE>
+            <NAME>assignment_perpage</NAME>
+            <VALUE>10</VALUE>
+          </USER_PREFERENCE>
+          <USER_PREFERENCE>
+            <NAME>assignment_quickgrade</NAME>
+            <VALUE>0</VALUE>
+          </USER_PREFERENCE>
+          <USER_PREFERENCE>
+            <NAME>auth_forcepasswordchange</NAME>
+            <VALUE>0</VALUE>
+          </USER_PREFERENCE>
+          <USER_PREFERENCE>
+            <NAME>forum_displaymode</NAME>
+            <VALUE>3</VALUE>
+          </USER_PREFERENCE>
+          <USER_PREFERENCE>
+            <NAME>grader_report_preferences_form_showadvanced</NAME>
+            <VALUE>1</VALUE>
+          </USER_PREFERENCE>
+          <USER_PREFERENCE>
+            <NAME>grade_report_simple_aggregationview51</NAME>
+            <VALUE>0</VALUE>
+          </USER_PREFERENCE>
+          <USER_PREFERENCE>
+            <NAME>grade_report_simple_grader_collapsed_categories</NAME>
+            <VALUE>a:2:{s:14:&quot;aggregatesonly&quot;;a:4:{i:0;s:2:&quot;70&quot;;i:1;s:2:&quot;71&quot;;i:2;s:2:&quot;72&quot;;i:3;s:2:&quot;73&quot;;}s:10:&quot;gradesonly&quot;;a:0:{}}</VALUE>
+          </USER_PREFERENCE>
+          <USER_PREFERENCE>
+            <NAME>grade_report_simple_meanselection</NAME>
+            <VALUE>2</VALUE>
+          </USER_PREFERENCE>
+          <USER_PREFERENCE>
+            <NAME>grade_report_simple_showranges</NAME>
+            <VALUE>1</VALUE>
+          </USER_PREFERENCE>
+          <USER_PREFERENCE>
+            <NAME>grade_report_simple_showstickytab</NAME>
+            <VALUE>0</VALUE>
+          </USER_PREFERENCE>
+          <USER_PREFERENCE>
+            <NAME>lesson_view</NAME>
+            <VALUE>collapsed</VALUE>
+          </USER_PREFERENCE>
+          <USER_PREFERENCE>
+            <NAME>mod_resource_mod_form_showadvanced</NAME>
+            <VALUE>1</VALUE>
+          </USER_PREFERENCE>
+          <USER_PREFERENCE>
+            <NAME>user_editadvanced_form_showadvanced</NAME>
+            <VALUE>1</VALUE>
+          </USER_PREFERENCE>
+        </USER_PREFERENCES>
+        <ROLES_OVERRIDES>
+        </ROLES_OVERRIDES>
+        <ROLES_ASSIGNMENTS>
+        </ROLES_ASSIGNMENTS>
+      </USER>
+      <USER>
+        <ID>6</ID>
+        <AUTH>cas</AUTH>
+        <CONFIRMED>1</CONFIRMED>
+        <POLICYAGREED>0</POLICYAGREED>
+        <DELETED>0</DELETED>
+        <USERNAME>pcali1</USERNAME>
+        <PASSWORD>fb005bdc5fb1b23ea95d238fb5ecb9e2</PASSWORD>
+        <IDNUMBER></IDNUMBER>
+        <FIRSTNAME>Philip</FIRSTNAME>
+        <LASTNAME>Cali</LASTNAME>
+        <EMAIL>pcali1@lsu.edu</EMAIL>
+        <EMAILSTOP>0</EMAILSTOP>
+        <ICQ></ICQ>
+        <SKYPE></SKYPE>
+        <YAHOO></YAHOO>
+        <AIM></AIM>
+        <MSN></MSN>
+        <PHONE1></PHONE1>
+        <PHONE2></PHONE2>
+        <INSTITUTION></INSTITUTION>
+        <DEPARTMENT></DEPARTMENT>
+        <ADDRESS></ADDRESS>
+        <CITY></CITY>
+        <COUNTRY></COUNTRY>
+        <LANG>en_utf8</LANG>
+        <THEME></THEME>
+        <TIMEZONE>99</TIMEZONE>
+        <FIRSTACCESS>0</FIRSTACCESS>
+        <LASTACCESS>1268662392</LASTACCESS>
+        <LASTLOGIN>0</LASTLOGIN>
+        <CURRENTLOGIN>1268662284</CURRENTLOGIN>
+        <LASTIP>68.105.37.237</LASTIP>
+        <SECRET></SECRET>
+        <PICTURE>1</PICTURE>
+        <URL></URL>
+        <DESCRIPTION>$@NULL@$</DESCRIPTION>
+        <MAILFORMAT>1</MAILFORMAT>
+        <MAILDIGEST>0</MAILDIGEST>
+        <MAILDISPLAY>2</MAILDISPLAY>
+        <HTMLEDITOR>1</HTMLEDITOR>
+        <AJAX>1</AJAX>
+        <AUTOSUBSCRIBE>1</AUTOSUBSCRIBE>
+        <TRACKFORUMS>0</TRACKFORUMS>
+        <TIMEMODIFIED>1268662284</TIMEMODIFIED>
+        <ROLES>
+          <ROLE>
+            <TYPE>needed</TYPE>
+          </ROLE>
+        </ROLES>
+        <ROLES_OVERRIDES>
+        </ROLES_OVERRIDES>
+        <ROLES_ASSIGNMENTS>
+        </ROLES_ASSIGNMENTS>
+      </USER>
+    </USERS>
+    <GRADEBOOK>
+      <GRADE_CATEGORIES>
+        <GRADE_CATEGORY>
+          <ID>90</ID>
+          <PARENT>$@NULL@$</PARENT>
+          <FULLNAME>?</FULLNAME>
+          <AGGREGATION>11</AGGREGATION>
+          <KEEPHIGH>0</KEEPHIGH>
+          <DROPLOW>0</DROPLOW>
+          <AGGREGATEONLYGRADED>1</AGGREGATEONLYGRADED>
+          <AGGREGATEOUTCOMES>0</AGGREGATEOUTCOMES>
+          <AGGREGATESUBCATS>0</AGGREGATESUBCATS>
+          <TIMECREATED>1299774068</TIMECREATED>
+          <TIMEMODIFIED>1299774068</TIMEMODIFIED>
+        </GRADE_CATEGORY>
+      </GRADE_CATEGORIES>
+      <GRADE_ITEMS>
+        <GRADE_ITEM>
+          <ID>410</ID>
+          <CATEGORYID>$@NULL@$</CATEGORYID>
+          <ITEMNAME>$@NULL@$</ITEMNAME>
+          <ITEMTYPE>course</ITEMTYPE>
+          <ITEMMODULE>$@NULL@$</ITEMMODULE>
+          <ITEMINSTANCE>90</ITEMINSTANCE>
+          <ITEMNUMBER>$@NULL@$</ITEMNUMBER>
+          <ITEMINFO>$@NULL@$</ITEMINFO>
+          <IDNUMBER>$@NULL@$</IDNUMBER>
+          <CALCULATION>$@NULL@$</CALCULATION>
+          <GRADETYPE>1</GRADETYPE>
+          <GRADEMAX>100.00000</GRADEMAX>
+          <GRADEMIN>0.00000</GRADEMIN>
+          <SCALEID>$@NULL@$</SCALEID>
+          <OUTCOMEID>$@NULL@$</OUTCOMEID>
+          <GRADEPASS>0.00000</GRADEPASS>
+          <MULTFACTOR>1.00000</MULTFACTOR>
+          <PLUSFACTOR>0.00000</PLUSFACTOR>
+          <AGGREGATIONCOEF>1.00000</AGGREGATIONCOEF>
+          <DISPLAY>0</DISPLAY>
+          <DECIMALS>$@NULL@$</DECIMALS>
+          <HIDDEN>0</HIDDEN>
+          <LOCKED>0</LOCKED>
+          <LOCKTIME>0</LOCKTIME>
+          <NEEDSUPDATE>0</NEEDSUPDATE>
+          <TIMECREATED>1299774068</TIMECREATED>
+          <TIMEMODIFIED>1299774068</TIMEMODIFIED>
+        </GRADE_ITEM>
+      </GRADE_ITEMS>
+    </GRADEBOOK>
+    <MODULES>
+      <MOD>
+        <ID>57</ID>
+        <MODTYPE>forum</MODTYPE>
+        <TYPE>news</TYPE>
+        <NAME>News forum</NAME>
+        <INTRO>General news and announcements</INTRO>
+        <ASSESSED>0</ASSESSED>
+        <ASSESSTIMESTART>0</ASSESSTIMESTART>
+        <ASSESSTIMEFINISH>0</ASSESSTIMEFINISH>
+        <MAXBYTES>0</MAXBYTES>
+        <SCALE>0</SCALE>
+        <FORCESUBSCRIBE>1</FORCESUBSCRIBE>
+        <TRACKINGTYPE>1</TRACKINGTYPE>
+        <RSSTYPE>0</RSSTYPE>
+        <RSSARTICLES>0</RSSARTICLES>
+        <TIMEMODIFIED>1299773780</TIMEMODIFIED>
+        <WARNAFTER>0</WARNAFTER>
+        <BLOCKAFTER>0</BLOCKAFTER>
+        <BLOCKPERIOD>0</BLOCKPERIOD>
+      </MOD>
+    </MODULES>
+    <FORMATDATA>
+    </FORMATDATA>
+  </COURSE>
+</MOODLE_BACKUP>
@@ -0,0 +1,463 @@
+<?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/>.
+
+/**
+ * Unit tests for the moodle1 converter
+ *
+ * @package    core
+ * @subpackage backup-convert
+ * @copyright  2011 Mark Nielsen <mark@moodlerooms.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->dirroot . '/backup/converter/moodle1/lib.php');
+
+class moodle1_converter_test extends UnitTestCase {
+
+    public static $includecoverage = array();
+
+    /** @var string the name of the directory containing the unpacked Moodle 1.9 backup */
+    protected $tempdir;
+
+    public function setUp() {
+        global $CFG;
+
+        $this->tempdir = convert_helper::generate_id('simpletest');
+        check_dir_exists("$CFG->dataroot/temp/backup/$this->tempdir/course_files/sub1");
+        check_dir_exists("$CFG->dataroot/temp/backup/$this->tempdir/moddata/unittest/4/7");
+        copy(
+            "$CFG->dirroot/backup/converter/moodle1/simpletest/files/moodle.xml",
+            "$CFG->dataroot/temp/backup/$this->tempdir/moodle.xml"
+        );
+        copy(
+            "$CFG->dirroot/backup/converter/moodle1/simpletest/files/icon.gif",
+            "$CFG->dataroot/temp/backup/$this->tempdir/course_files/file1.gif"
+        );
+        copy(
+            "$CFG->dirroot/backup/converter/moodle1/simpletest/files/icon.gif",
+            "$CFG->dataroot/temp/backup/$this->tempdir/course_files/sub1/file2.gif"
+        );
+        copy(
+            "$CFG->dirroot/backup/converter/moodle1/simpletest/files/icon.gif",
+            "$CFG->dataroot/temp/backup/$this->tempdir/moddata/unittest/4/file1.gif"
+        );
+        copy(
+            "$CFG->dirroot/backup/converter/moodle1/simpletest/files/icon.gif",
+            "$CFG->dataroot/temp/backup/$this->tempdir/moddata/unittest/4/icon.gif"
+        );
+        copy(
+            "$CFG->dirroot/backup/converter/moodle1/simpletest/files/icon.gif",
+            "$CFG->dataroot/temp/backup/$this->tempdir/moddata/unittest/4/7/icon.gif"
+        );
+    }
+
+    public function tearDown() {
+        global $CFG;
+        if (empty($CFG->keeptempdirectoriesonbackup)) {
+            fulldelete("$CFG->dataroot/temp/backup/$this->tempdir");
+        }
+    }
+
+    public function test_detect_format() {
+        $detected = moodle1_converter::detect_format($this->tempdir);
+        $this->assertEqual(backup::FORMAT_MOODLE1, $detected);
+    }
+
+    public function test_convert_factory() {
+        $converter = convert_factory::get_converter('moodle1', $this->tempdir);
+        $this->assertIsA($converter, 'moodle1_converter');
+    }
+
+    public function test_stash_storage_not_created() {
+        $converter = convert_factory::get_converter('moodle1', $this->tempdir);
+        $this->expectException('moodle1_convert_storage_exception');
+        $converter->set_stash('tempinfo', 12);
+    }
+
+    public function test_stash_requiring_empty_stash() {
+        $converter = convert_factory::get_converter('moodle1', $this->tempdir);
+        $converter->create_stash_storage();
+        $converter->set_stash('tempinfo', 12);
+        $this->expectException('moodle1_convert_empty_storage_exception');
+        try {
+            $converter->get_stash('anothertempinfo');
+
+        } catch (moodle1_convert_empty_storage_exception $e) {
+            // we must drop the storage here so we are able to re-create it in the next test
+            $converter->drop_stash_storage();
+            throw new moodle1_convert_empty_storage_exception('rethrowing');
+        }
+    }
+
+    public function test_stash_storage() {
+        $converter = convert_factory::get_converter('moodle1', $this->tempdir);
+        $converter->create_stash_storage();
+
+        // no implicit stashes
+        $stashes = $converter->get_stash_names();
+        $this->assertIsA($stashes, 'array');
+        $this->assertTrue(empty($stashes));
+
+        // test stashes without itemid
+        $converter->set_stash('tempinfo1', 12);
+        $converter->set_stash('tempinfo2', array('a' => 2, 'b' => 3));
+        $stashes = $converter->get_stash_names();
+        $this->assertIsA($stashes, 'array');
+        $this->assertEqual(2, count($stashes));
+        $this->assertTrue(in_array('tempinfo1', $stashes));
+        $this->assertTrue(in_array('tempinfo2', $stashes));
+        $this->assertIdentical(12, $converter->get_stash('tempinfo1'));
+        $this->assertIdentical(array('a' => 2, 'b' => 3), $converter->get_stash('tempinfo2'));
+
+        // overwriting a stashed value is allowed
+        $converter->set_stash('tempinfo1', '13');
+        $this->assertNotIdentical(13, $converter->get_stash('tempinfo1'));
+        $this->assertIdentical('13', $converter->get_stash('tempinfo1'));
+
+        // repeated reading is allowed
+        $this->assertIdentical('13', $converter->get_stash('tempinfo1'));
+
+        // storing empty array
+        $converter->set_stash('empty_array_stash', array());
+        $restored = $converter->get_stash('empty_array_stash');
+        //$this->assertIsA($restored, 'array'); // todo return null now, this needs MDL-27713 to be fixed, then uncomment
+        $this->assertTrue(empty($restored));
+
+        // test stashes with itemid
+        $converter->set_stash('tempinfo', 'Hello', 1);
+        $converter->set_stash('tempinfo', 'World', 2);
+        $this->assertIdentical('Hello', $converter->get_stash('tempinfo', 1));
+        $this->assertIdentical('World', $converter->get_stash('tempinfo', 2));
+
+        // test get_stash_itemids()
+        $ids = $converter->get_stash_itemids('course_fileref');
+        $this->assertIsA($ids, 'array');
+        $this->assertTrue(empty($ids));
+
+        $converter->set_stash('course_fileref', null, 34);
+        $converter->set_stash('course_fileref', null, 52);
+        $ids = $converter->get_stash_itemids('course_fileref');
+        $this->assertEqual(2, count($ids));
+        $this->assertTrue(in_array(34, $ids));
+        $this->assertTrue(in_array(52, $ids));
+
+        $converter->drop_stash_storage();
+    }
+
+   public function test_get_stash_or_default() {
+        $converter = convert_factory::get_converter('moodle1', $this->tempdir);
+        $converter->create_stash_storage();
+
+        $this->assertTrue(is_null($converter->get_stash_or_default('stashname')));
+        $this->assertTrue(is_null($converter->get_stash_or_default('stashname', 7)));
+        $this->assertTrue('default' === $converter->get_stash_or_default('stashname', 0, 'default'));
+        $this->assertTrue(array('foo', 'bar') === $converter->get_stash_or_default('stashname', 42, array('foo', 'bar')));
+
+        //$converter->set_stash('stashname', 0);
+        //$this->assertFalse(is_null($converter->get_stash_or_default('stashname'))); // todo returns true now, this needs MDL-27713 to be fixed
+
+        //$converter->set_stash('stashname', '');
+        //$this->assertFalse(is_null($converter->get_stash_or_default('stashname'))); // todo returns true now, this needs MDL-27713 to be fixed
+
+        //$converter->set_stash('stashname', array());
+        //$this->assertFalse(is_null($converter->get_stash_or_default('stashname'))); // todo returns true now, this needs MDL-27713 to be fixed
+
+        $converter->set_stash('stashname', 42);
+        $this->assertTrue(42 === $converter->get_stash_or_default('stashname'));
+        $this->assertTrue(is_null($converter->get_stash_or_default('stashname', 1)));
+        $this->assertTrue(42 === $converter->get_stash_or_default('stashname', 0, 61));
+
+        $converter->set_stash('stashname', array(42 => (object)array('id' => 42)), 18);
+        $stashed = $converter->get_stash_or_default('stashname', 18, 1984);
+        $this->assertIsA($stashed, 'array');
+        $this->assertTrue(is_object($stashed[42]));
+        $this->assertTrue($stashed[42]->id === 42);
+
+        $converter->drop_stash_storage();
+    }
+
+    public function test_get_contextid() {
+        $converter = convert_factory::get_converter('moodle1', $this->tempdir);
+
+        // stash storage must be created in advance
+        $converter->create_stash_storage();
+
+        // ids are generated on the first call
+        $id1 = $converter->get_contextid(CONTEXT_BLOCK, 10);
+        $id2 = $converter->get_contextid(CONTEXT_BLOCK, 11);
+        $id3 = $converter->get_contextid(CONTEXT_MODULE, 10);
+
+        $this->assertNotEqual($id1, $id2);
+        $this->assertNotEqual($id1, $id3);
+        $this->assertNotEqual($id2, $id3);
+
+        // and then re-used if called with the same params
+        $this->assertEqual($id1, $converter->get_contextid(CONTEXT_BLOCK, 10));
+        $this->assertEqual($id2, $converter->get_contextid(CONTEXT_BLOCK, 11));
+        $this->assertEqual($id3, $converter->get_contextid(CONTEXT_MODULE, 10));
+
+        // for system and course level, the instance is irrelevant
+        // as we need only one system and one course
+        $id1 = $converter->get_contextid(CONTEXT_COURSE);
+        $id2 = $converter->get_contextid(CONTEXT_COURSE, 10);
+        $id3 = $converter->get_contextid(CONTEXT_COURSE, 14);
+
+        $this->assertEqual($id1, $id2);
+        $this->assertEqual($id1, $id3);
+
+        $id1 = $converter->get_contextid(CONTEXT_SYSTEM);
+        $id2 = $converter->get_contextid(CONTEXT_SYSTEM, 11);
+        $id3 = $converter->get_contextid(CONTEXT_SYSTEM, 15);
+
+        $this->assertEqual($id1, $id2);
+        $this->assertEqual($id1, $id3);
+
+        $converter->drop_stash_storage();
+    }
+
+    public function test_get_nextid() {
+        $converter = convert_factory::get_converter('moodle1', $this->tempdir);
+
+        $id1 = $converter->get_nextid();
+        $id2 = $converter->get_nextid();
+        $id3 = $converter->get_nextid();
+
+        $this->assertTrue(0 < $id1);
+        $this->assertTrue($id1 < $id2);
+        $this->assertTrue($id2 < $id3);
+    }
+
+    public function test_migrate_file() {
+        // set-up the file manager
+        $converter = convert_factory::get_converter('moodle1', $this->tempdir);
+        $converter->create_stash_storage();
+        $contextid = $converter->get_contextid(CONTEXT_MODULE, 32);
+        $fileman   = $converter->get_file_manager($contextid, 'mod_unittest', 'testarea');
+        // this fileman has not converted anything yet
+        $fileids = $fileman->get_fileids();
+        $this->assertIsA($fileids, 'array');
+        $this->assertEqual(0, count($fileids));
+        // try to migrate a non-existing directory
+        $returned = $fileman->migrate_directory('not/existing/directory');
+        $this->assertIsA($returned, 'array');
+        $this->assertEqual(0, count($returned));
+        $fileids = $fileman->get_fileids();
+        $this->assertIsA($fileids, 'array');
+        $this->assertEqual(0, count($fileids));
+        // migrate a single file
+        $fileman->itemid = 4;
+        $fileman->migrate_file('moddata/unittest/4/icon.gif');
+        $this->assertTrue(is_file($converter->get_workdir_path().'/files/4e/4ea114b0558f53e3af8dd9afc0e0810a95c2a724'));
+        // get the file id
+        $fileids = $fileman->get_fileids();
+        $this->assertIsA($fileids, 'array');
+        $this->assertEqual(1, count($fileids));
+        // migrate another single file into another file area
+        $fileman->filearea = 'anotherarea';
+        $fileman->itemid = 7;
+        $fileman->migrate_file('moddata/unittest/4/7/icon.gif', '/', 'renamed.gif');
+        // get the file records
+        $filerecordids = $converter->get_stash_itemids('files');
+        foreach ($filerecordids as $filerecordid) {
+            $filerecord = $converter->get_stash('files', $filerecordid);
+            $this->assertEqual('4ea114b0558f53e3af8dd9afc0e0810a95c2a724', $filerecord['contenthash']);
+            $this->assertEqual($contextid, $filerecord['contextid']);
+            $this->assertEqual('mod_unittest', $filerecord['component']);
+            if ($filerecord['filearea'] === 'testarea') {
+                $this->assertEqual(4, $filerecord['itemid']);
+                $this->assertEqual('icon.gif', $filerecord['filename']);
+            }
+        }
+        // explicitly clear the list of migrated files
+        $this->assertTrue(count($fileman->get_fileids()) > 0);
+        $fileman->reset_fileids();
+        $this->assertTrue(count($fileman->get_fileids()) == 0);
+        $converter->drop_stash_storage();
+    }
+
+    public function test_convert_path() {
+        $path = new convert_path('foo_bar', '/ROOT/THINGS/FOO/BAR');
+        $this->assertEqual('foo_bar', $path->get_name());
+        $this->assertEqual('/ROOT/THINGS/FOO/BAR', $path->get_path());
+        $this->assertEqual('process_foo_bar', $path->get_processing_method());
+        $this->assertEqual('on_foo_bar_start', $path->get_start_method());
+        $this->assertEqual('on_foo_bar_end', $path->get_end_method());
+    }
+
+    public function test_convert_path_implicit_recipes() {
+        $path = new convert_path('foo_bar', '/ROOT/THINGS/FOO/BAR');
+        $data = array(
+            'ID' => 76,
+            'ELOY' => 'stronk7',
+            'MARTIN' => 'moodler',
+            'EMPTY' => null,
+        );
+        // apply default recipes (converting keys to lowercase)
+        $data = $path->apply_recipes($data);
+        $this->assertEqual(4, count($data));
+        $this->assertEqual(76, $data['id']);
+        $this->assertEqual('stronk7', $data['eloy']);
+        $this->assertEqual('moodler', $data['martin']);
+        $this->assertIdentical(null, $data['empty']);
+    }
+
+    public function test_convert_path_explicit_recipes() {
+        $path = new convert_path(
+            'foo_bar', '/ROOT/THINGS/FOO/BAR',
+            array(
+                'newfields' => array(
+                    'david' => 'mudrd8mz',
+                    'petr'  => 'skodak',
+                ),
+                'renamefields' => array(
+                    'empty' => 'nothing',
+                ),
+                'dropfields' => array(
+                    'id'
+                ),
+            )
+        );
+        $data = array(
+            'ID' => 76,
+            'ELOY' => 'stronk7',
+            'MARTIN' => 'moodler',
+            'EMPTY' => null,
+        );
+        $data = $path->apply_recipes($data);
+
+        $this->assertEqual(5, count($data));
+        $this->assertFalse(array_key_exists('id', $data));
+        $this->assertEqual('stronk7', $data['eloy']);
+        $this->assertEqual('moodler', $data['martin']);
+        $this->assertEqual('mudrd8mz', $data['david']);
+        $this->assertEqual('skodak', $data['petr']);
+        $this->assertIdentical(null, $data['nothing']);
+    }
+
+    public function test_grouped_data_on_nongrouped_convert_path() {
+        // prepare some grouped data
+        $data = array(
+            'ID' => 77,
+            'NAME' => 'Pale lagers',
+            'BEERS' => array(
+                array(
+                    'BEER' => array(
+                        'ID' => 67,
+                        'NAME' => 'Pilsner Urquell',
+                    )
+                ),
+                array(
+                    'BEER' => array(
+                        'ID' => 34,
+                        'NAME' => 'Heineken',
+                    )
+                ),
+            )
+        );
+
+        // declare a non-grouped path
+        $path = new convert_path('beer_style', '/ROOT/BEER_STYLES/BEER_STYLE');
+
+        // an attempt to apply recipes throws exception because we do not expect grouped data
+        $this->expectException('convert_path_exception');
+        $data = $path->apply_recipes($data);
+    }
+
+    public function test_grouped_convert_path_with_recipes() {
+        // prepare some grouped data
+        $data = array(
+            'ID' => 77,
+            'NAME' => 'Pale lagers',
+            'BEERS' => array(
+                array(
+                    'BEER' => array(
+                        'ID' => 67,
+                        'NAME' => 'Pilsner Urquell',
+                    )
+                ),
+                array(
+                    'BEER' => array(
+                        'ID' => 34,
+                        'NAME' => 'Heineken',
+                    )
+                ),
+            )
+        );
+
+        // implict recipes work for grouped data if the path is declared as grouped
+        $path = new convert_path('beer_style', '/ROOT/BEER_STYLES/BEER_STYLE', array(), true);
+        $data = $path->apply_recipes($data);
+        $this->assertEqual('Heineken', $data['beers'][1]['beer']['name']);
+
+        // an attempt to provide explicit recipes on grouped elements throws exception
+        $this->expectException('convert_path_exception');
+        $path = new convert_path(
+            'beer_style', '/ROOT/BEER_STYLES/BEER_STYLE',
+            array(
+                'renamefields' => array(
+                    'name' => 'beername',   // note this is confusing recipe because the 'name' is used for both
+                                            // beer-style name ('Pale lagers') and beer name ('Pilsner Urquell')
+                )
+            ), true);
+    }
+
+    public function test_referenced_course_files() {
+
+        $text = 'This is a text containing links to file.php
+as it is parsed from the backup file. <br /><br /><img border="0" width="110" vspace="0" hspace="0" height="92" title="News" alt="News" src="$@FILEPHP@$$@SLASH@$pics$@SLASH@$news.gif" /><a href="$@FILEPHP@$$@SLASH@$pics$@SLASH@$news.gif$@FORCEDOWNLOAD@$">download image</a><br />
+    <br /><a href=\'$@FILEPHP@$$@SLASH@$MANUAL.DOC$@FORCEDOWNLOAD@$\'>download manual</a><br />';
+
+        $files = moodle1_converter::find_referenced_files($text);
+        $this->assertIsA($files, 'array');
+        $this->assertEqual(2, count($files));
+        $this->assertTrue(in_array('/pics/news.gif', $files));
+        $this->assertTrue(in_array('/MANUAL.DOC', $files));
+
+        $text = moodle1_converter::rewrite_filephp_usage($text, array('/pics/news.gif', '/another/file/notused.txt'), $files);
+        $this->assertEqual($text, 'This is a text containing links to file.php
+as it is parsed from the backup file. <br /><br /><img border="0" width="110" vspace="0" hspace="0" height="92" title="News" alt="News" src="@@PLUGINFILE@@/pics/news.gif" /><a href="@@PLUGINFILE@@/pics/news.gif?forcedownload=1">download image</a><br />
+    <br /><a href=\'$@FILEPHP@$$@SLASH@$MANUAL.DOC$@FORCEDOWNLOAD@$\'>download manual</a><br />');
+    }
+
+    public function test_question_bank_conversion() {
+        global $CFG;
+
+        copy(
+            "$CFG->dirroot/backup/converter/moodle1/simpletest/files/questions.xml",
+            "$CFG->dataroot/temp/backup/$this->tempdir/moodle.xml"
+        );
+        $converter = convert_factory::get_converter('moodle1', $this->tempdir);
+        $converter->convert();
+    }
+
+    public function test_convert_run_convert() {
+        $converter = convert_factory::get_converter('moodle1', $this->tempdir);
+        $converter->convert();
+    }
+
+    public function test_inforef_manager() {
+        $converter = convert_factory::get_converter('moodle1', $this->tempdir);
+        $inforef = $converter->get_inforef_manager('unittest');
+        $inforef->add_ref('file', 45);
+        $inforef->add_refs('file', array(46, 47));
+        // todo test the write_refs() via some dummy xml_writer
+        $this->expectException('coding_exception');
+        $inforef->add_ref('unknown_referenced_item_name', 76);
+    }
+}
@@ -72,11 +72,20 @@ class backup_course_task extends backup_task {
        // annotating some bits, tags and module restrictions
        $this->add_step(new backup_course_structure_step('course_info', 'course.xml'));

-        // Generate the enrolment file
-        $this->add_step(new backup_enrolments_structure_step('course_enrolments', 'enrolments.xml'));
+        // Generate the enrolment file (conditionally, prevent it in any IMPORT/HUB operation)
+        if ($this->plan->get_mode() != backup::MODE_IMPORT && $this->plan->get_mode() != backup::MODE_HUB) {
+            $this->add_step(new backup_enrolments_structure_step('course_enrolments', 'enrolments.xml'));
+        }

-        // Annotate the groups used in already annotated groupings
-        $this->add_step(new backup_annotate_groups_from_groupings('annotate_groups'));
+        // Annotate all the groups and groupings belonging to the course
+        $this->add_step(new backup_annotate_course_groups_and_groupings('annotate_course_groups'));
+
+        // Annotate the groups used in already annotated groupings (note this may be
+        // unnecessary now that we are annotating all the course groups and groupings in the
+        // step above. But we keep it working in case we decide, someday, to introduce one
+        // setting to transform the step above into an optional one. This is here to support
+        // course->defaultgroupingid
+        $this->add_step(new backup_annotate_groups_from_groupings('annotate_groups_from_groupings'));

        // Annotate the question_categories belonging to the course context
        $this->add_step(new backup_calculate_question_categories('course_question_categories'));
@@ -0,0 +1,34 @@
+<?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/>.
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Base class for course report backup plugins.
+ *
+ * NOTE: When you back up a course, it potentially may run backup for all
+ * course reports. In order to control whether a particular report gets
+ * backed up, a course report should make use of the second and third
+ * parameters in get_plugin_element().
+ *
+ * @package    moodlecore
+ * @subpackage backup-moodle2
+ * @copyright  2011 onwards The Open University
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+abstract class backup_coursereport_plugin extends backup_plugin {
+    // Use default parent behaviour
+}
@@ -36,6 +36,7 @@ require_once($CFG->dirroot . '/backup/moodle2/backup_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_qtype_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_format_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_theme_plugin.class.php');
+require_once($CFG->dirroot . '/backup/moodle2/backup_coursereport_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_plagiarism_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_subplugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_settingslib.php');
@@ -53,7 +53,12 @@ abstract class backup_qtype_plugin extends backup_plugin {
        $answers->add_child($answer);

        // Set the sources
-        $answer->set_source_table('question_answers', array('question' => backup::VAR_PARENTID));
+        $answer->set_source_sql('
+                SELECT *
+                FROM {question_answers}
+                WHERE question = :question
+                ORDER BY id',
+                array('question' => backup::VAR_PARENTID));

        // Aliases
        $answer->set_source_alias('answer', 'answertext');
@@ -82,7 +87,12 @@ abstract class backup_qtype_plugin extends backup_plugin {
        $units->add_child($unit);

        // Set the sources
-        $unit->set_source_table('question_numerical_units', array('question' => backup::VAR_PARENTID));
+        $unit->set_source_sql('
+                SELECT *
+                FROM {question_numerical_units}
+                WHERE question = :question
+                ORDER BY id',
+                array('question' => backup::VAR_PARENTID));

        // don't need to annotate ids nor files
    }
@@ -101,8 +111,7 @@ abstract class backup_qtype_plugin extends backup_plugin {
        // Define the elements
        $options = new backup_nested_element('numerical_options');
        $option = new backup_nested_element('numerical_option', array('id'), array(
-            'instructions', 'instructionsformat', 'showunits', 'unitsleft',
-            'unitgradingtype', 'unitpenalty'));
+            'showunits', 'unitsleft', 'unitgradingtype', 'unitpenalty'));

        // Build the tree
        $element->add_child($options);
@@ -174,78 +174,76 @@ abstract class backup_questions_activity_structure_step extends backup_activity_

    /**
     * Attach to $element (usually attempts) the needed backup structures
-     * for question_states for a given question_attempt
+     * for question_usages and all the associated data.
     */
-    protected function add_question_attempts_states($element, $questionattemptname) {
+    protected function add_question_usages($element, $usageidname) {
+        global $CFG;
+        require_once($CFG->dirroot . '/question/engine/lib.php');
+
        // Check $element is one nested_backup_element
        if (! $element instanceof backup_nested_element) {
            throw new backup_step_exception('question_states_bad_parent_element', $element);
        }
-        // Check that the $questionattemptname is final element in $element
-        if (! $element->get_final_element($questionattemptname)) {
-            throw new backup_step_exception('question_states_bad_question_attempt_element', $questionattemptname);
+        if (! $element->get_final_element($usageidname)) {
+            throw new backup_step_exception('question_states_bad_question_attempt_element', $usageidname);
        }

-        // TODO: Some day we should stop these "encrypted" state->answers and
-        // TODO: delegate to qtypes plugin to proper XML writting the needed info on each question
+        $quba = new backup_nested_element('question_usage', array('id'),
+                array('component', 'preferredbehaviour'));

-        // TODO: Should be doing here some introspection in the "answer" element, based on qtype,
-        // TODO: to know which real questions are being used (for randoms and other qtypes...)
-        // TODO: Not needed if consistency is guaranteed, but it isn't right now :-(
+        $qas = new backup_nested_element('question_attempts');
+        $qa = new backup_nested_element('question_attempt', array('id'), array(
+                'slot', 'behaviour', 'questionid', 'maxmark', 'minfraction',
+                'flagged', 'questionsummary', 'rightanswer', 'responsesummary',
+                'timemodified'));

-        // Define the elements
-        $states = new backup_nested_element('states');
-        $state = new backup_nested_element('state', array('id'), array(
-            'question', 'seq_number', 'answer', 'timestamp',
-            'event', 'grade', 'raw_grade', 'penalty'));
+        $steps = new backup_nested_element('steps');
+        $step = new backup_nested_element('step', array('id'), array(
+                'sequencenumber', 'state', 'fraction', 'timecreated', 'userid'));
+
+        $response = new backup_nested_element('response');
+        $variable = new backup_nested_element('variable', null,  array('name', 'value'));

        // Build the tree
-        $element->add_child($states);
-        $states->add_child($state);
+        $element->add_child($quba);
+        $quba->add_child($qas);
+        $qas->add_child($qa);
+        $qa->add_child($steps);
+        $steps->add_child($step);
+        $step->add_child($response);
+        $response->add_child($variable);

        // Set the sources
-        $state->set_source_table('question_states', array('attempt' => '../../' . $questionattemptname));
+        $quba->set_source_table('question_usages',
+                array('id'                => '../' . $usageidname));
+        $qa->set_source_sql('
+                SELECT *
+                FROM {question_attempts}
+                WHERE questionusageid = :questionusageid
+                ORDER BY slot',
+                array('questionusageid'   => backup::VAR_PARENTID));
+        $step->set_source_sql('
+                SELECT *
+                FROM {question_attempt_steps}
+                WHERE questionattemptid = :questionattemptid
+                ORDER BY sequencenumber',
+                array('questionattemptid' => backup::VAR_PARENTID));
+        $variable->set_source_table('question_attempt_step_data',
+                array('attemptstepid'     => backup::VAR_PARENTID));

        // Annotate ids
-        $state->annotate_ids('question', 'question');
-    }
-
-    /**
-     * Attach to $element (usually attempts) the needed backup structures
-     * for question_sessions for a given question_attempt
-     */
-    protected function add_question_attempts_sessions($element, $questionattemptname) {
-        // Check $element is one nested_backup_element
-        if (! $element instanceof backup_nested_element) {
-            throw new backup_step_exception('question_sessions_bad_parent_element', $element);
-        }
-        // Check that the $questionattemptname is final element in $element
-        if (! $element->get_final_element($questionattemptname)) {
-            throw new backup_step_exception('question_sessions_bad_question_attempt_element', $questionattemptname);
-        }
-
-        // Define the elements
-        $sessions = new backup_nested_element('sessions');
-        $session = new backup_nested_element('session', array('id'), array(
-            'questionid', 'newest', 'newgraded', 'sumpenalty',
-            'manualcomment', 'manualcommentformat', 'flagged'));
-
-        // Build the tree
-        $element->add_child($sessions);
-        $sessions->add_child($session);
-
-        // Set the sources
-        $session->set_source_table('question_sessions', array('attemptid' => '../../' . $questionattemptname));
-
-        // Annotate ids
-        $session->annotate_ids('question', 'questionid');
+        $qa->annotate_ids('question', 'questionid');
+        $step->annotate_ids('user', 'userid');

        // Annotate files
-        // Note: question_sessions haven't files associated. On purpose manualcomment is lacking
-        // support for them, so we don't need to annotated them here.
+        $fileareas = question_engine::get_all_response_file_areas();
+        foreach ($fileareas as $filearea) {
+            $step->annotate_files('question', $filearea, 'id');
+        }
    }
 }

+
 /**
 * backup structure step in charge of calculating the categories to be
 * included in backup, based in the context being backuped (module/course)
@@ -321,8 +319,9 @@ class backup_module_structure_step extends backup_structure_step {
        // attach format plugin structure to $module element, only one allowed
        $this->add_plugin_structure('format', $module, false);

-        // attach plagiarism plugin structure to $module element, only one allowed
-        $this->add_plugin_structure('plagiarism', $module, false);
+        // attach plagiarism plugin structure to $module element, there can be potentially
+        // many plagiarism plugins storing information about this course
+        $this->add_plugin_structure('plagiarism', $module, true);

        // Define the tree
        $module->add_child($availinfo);
@@ -419,8 +418,13 @@ class backup_course_structure_step extends backup_structure_step {
        // save course data (in case of user theme, legacy theme, etc)
        $this->add_plugin_structure('theme', $course, true);

-        // attach plagiarism plugin structure to $course element, only one allowed
-        $this->add_plugin_structure('plagiarism', $course, false);
+        // attach course report plugin structure to $course element; multiple
+        // course reports can save course data if required
+        $this->add_plugin_structure('coursereport', $course, true);
+
+        // attach plagiarism plugin structure to $course element, there can be potentially
+        // many plagiarism plugins storing information about this course
+        $this->add_plugin_structure('plagiarism', $course, true);

        // Build the tree

@@ -1560,6 +1564,32 @@ class backup_activity_grade_items_to_ids extends backup_execution_step {
    }
 }

+/**
+ * This step will annotate all the groups and groupings belonging to the course
+ */
+class backup_annotate_course_groups_and_groupings extends backup_execution_step {
+
+    protected function define_execution() {
+        global $DB;
+
+        // Get all the course groups
+        if ($groups = $DB->get_records('groups', array(
+                'courseid' => $this->task->get_courseid()))) {
+            foreach ($groups as $group) {
+                backup_structure_dbops::insert_backup_ids_record($this->get_backupid(), 'group', $group->id);
+            }
+        }
+
+        // Get all the course groupings
+        if ($groupings = $DB->get_records('groupings', array(
+                'courseid' => $this->task->get_courseid()))) {
+            foreach ($groupings as $grouping) {
+                backup_structure_dbops::insert_backup_ids_record($this->get_backupid(), 'grouping', $grouping->id);
+            }
+        }
+    }
+}
+
 /**
 * This step will annotate all the groups belonging to already annotated groupings
 */
@@ -1666,19 +1696,25 @@ class backup_questions_structure_step extends backup_structure_step {

        $question = new backup_nested_element('question', array('id'), array(
            'parent', 'name', 'questiontext', 'questiontextformat',
-            'generalfeedback', 'generalfeedbackformat', 'defaultgrade', 'penalty',
+            'generalfeedback', 'generalfeedbackformat', 'defaultmark', 'penalty',
            'qtype', 'length', 'stamp', 'version',
            'hidden', 'timecreated', 'timemodified', 'createdby', 'modifiedby'));

        // attach qtype plugin structure to $question element, only one allowed
        $this->add_plugin_structure('qtype', $question, false);

+        $qhints = new backup_nested_element('question_hints');
+
+        $qhint = new backup_nested_element('question_hint', array('id'), array(
+            'hint', 'hintformat', 'shownumcorrect', 'clearwrong', 'options'));
+
        // Build the tree

        $qcategories->add_child($qcategory);
        $qcategory->add_child($questions);
-
        $questions->add_child($question);
+        $question->add_child($qhints);
+        $qhints->add_child($qhint);

        // Define the sources

@@ -1692,6 +1728,13 @@ class backup_questions_structure_step extends backup_structure_step {

        $question->set_source_table('question', array('category' => backup::VAR_PARENTID));

+        $qhint->set_source_sql('
+                SELECT *
+                FROM {question_hints}
+                WHERE questionid = :questionid
+                ORDER BY id',
+                array('questionid' => backup::VAR_PARENTID));
+
        // don't need to annotate ids nor files
        // (already done by {@link backup_annotate_all_question_files}

@@ -34,6 +34,7 @@ abstract class restore_activity_task extends restore_task {
    protected $modulename;  // name of the module
    protected $moduleid;    // new (target) id of the course module
    protected $oldmoduleid; // old (original) id of the course module
+    protected $oldmoduleversion; // old (original) version of the module
    protected $contextid;   // new (target) context of the activity
    protected $oldcontextid;// old (original) context of the activity
    protected $activityid;  // new (target) id of the activity
@@ -43,11 +44,11 @@ abstract class restore_activity_task extends restore_task {
     * Constructor - instantiates one object of this class
     */
    public function __construct($name, $info, $plan = null) {
-
        $this->info = $info;
        $this->modulename = $this->info->modulename;
        $this->moduleid = 0;
        $this->oldmoduleid = $this->info->moduleid;
+        $this->oldmoduleversion = 0;
        $this->contextid = 0;
        $this->oldcontextid = 0;
        $this->activityid = 0;
@@ -66,6 +67,10 @@ abstract class restore_activity_task extends restore_task {
        $this->moduleid = $moduleid;
    }

+    public function set_old_moduleversion($oldmoduleversion) {
+        $this->oldmoduleversion = $oldmoduleversion;
+    }
+
    public function set_activityid($activityid) {
        $this->activityid = $activityid;
    }
@@ -90,6 +95,10 @@ abstract class restore_activity_task extends restore_task {
        return $this->moduleid;
    }

+    public function get_old_moduleversion() {
+        return $this->oldmoduleversion;
+    }
+
    public function get_activityid() {
        return $this->activityid;
    }
@@ -69,8 +69,10 @@ class restore_course_task extends restore_task {
        // Restore course role assignments and overrides (internally will observe the role_assignments setting)
        $this->add_step(new restore_ras_and_caps_structure_step('course_ras_and_caps', 'roles.xml'));

-        // Restore course enrolments (plugins and membership)
-        $this->add_step(new restore_enrolments_structure_step('course_enrolments', 'enrolments.xml'));
+        // 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) {
+            $this->add_step(new restore_enrolments_structure_step('course_enrolments', 'enrolments.xml'));
+        }

        // Restore course filters (conditionally)
        if ($this->get_setting_value('filters')) {
@@ -0,0 +1,29 @@
+<?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/>.
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Restore for course plugin: course report.
+ *
+ * @package    moodlecore
+ * @subpackage backup-moodle2
+ * @copyright 2011 The Open University
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+abstract class restore_coursereport_plugin extends restore_plugin {
+    // Use default parent behaviour
+}
@@ -41,6 +41,6 @@ abstract class restore_plagiarism_plugin extends restore_plugin {
        if (!array_key_exists($this->pluginname, $enabledplugins)) {
            return;
        }
-        parent::define_plugin_structure($connectionpoint);
+        return parent::define_plugin_structure($connectionpoint);
    }
 }
@@ -35,11 +35,13 @@ require_once($CFG->dirroot . '/backup/moodle2/restore_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/restore_qtype_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/restore_format_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/restore_theme_plugin.class.php');
+require_once($CFG->dirroot . '/backup/moodle2/restore_coursereport_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/restore_plagiarism_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_qtype_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_format_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_theme_plugin.class.php');
+require_once($CFG->dirroot . '/backup/moodle2/backup_coursereport_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/backup_plagiarism_plugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/restore_subplugin.class.php');
 require_once($CFG->dirroot . '/backup/moodle2/restore_settingslib.php');
@@ -80,6 +80,23 @@ abstract class restore_plugin {
        }
    }

+    /**
+     * after_restore dispatcher for any restore_plugin class
+     *
+     * This method will dispatch execution to the corresponding
+     * after_restore_xxx() method when available, with xxx
+     * being the connection point of the instance, so plugin
+     * classes with multiple connection points will support
+     * multiple after_restore methods, one for each connection point
+     */
+    public function launch_after_restore_methods() {
+        // Check if the after_restore method exists and launch it
+        $afterrestore = 'after_restore_' . basename($this->connectionpoint->get_path());
+        if (method_exists($this, $afterrestore)) {
+            $this->$afterrestore();
+        }
+    }
+
    /**
     * Returns one array with all the decode contents
     * to be processed by the links decoder
@@ -115,6 +115,23 @@ abstract class restore_qtype_plugin extends restore_plugin {
        $newquestionid   = $this->get_new_parentid('question');
        $questioncreated = $this->get_mappingid('question_created', $oldquestionid) ? true : false;

+        // In the past, there were some sloppily rounded fractions around. Fix them up.
+        $changes = array(
+            '-0.66666'  => '-0.6666667',
+            '-0.33333'  => '-0.3333333',
+            '-0.16666'  => '-0.1666667',
+            '-0.142857' => '-0.1428571',
+             '0.11111'  =>  '0.1111111',
+             '0.142857' =>  '0.1428571',
+             '0.16666'  =>  '0.1666667',
+             '0.33333'  =>  '0.3333333',
+             '0.333333' =>  '0.3333333',
+             '0.66666'  =>  '0.6666667',
+        );
+        if (array_key_exists($data->fraction, $changes)) {
+            $data->fraction = $changes[$data->fraction];
+        }
+
        // If the question has been created by restore, we need to create its question_answers too
        if ($questioncreated) {
            // Adjust some columns
@@ -298,9 +315,21 @@ abstract class restore_qtype_plugin extends restore_plugin {
    }

    /**
-     * Decode one question_states for this qtype (default impl)
+     * Do any re-coding necessary in the student response.
+     * @param int $questionid the new id of the question
+     * @param int $sequencenumber of the step within the qusetion attempt.
+     * @param array the response data from the backup.
+     * @return array the recoded response.
     */
-    public function recode_state_answer($state) {
+    public function recode_response($questionid, $sequencenumber, array $response) {
+        return $response;
+    }
+
+    /**
+     * Decode legacy question_states.answer for this qtype. Used when restoring
+     * 2.0 attempt data.
+     */
+    public function recode_legacy_state_answer($state) {
        // By default, return answer unmodified, qtypes needing recode will override this
        return $state->answer;
    }
@@ -146,12 +146,18 @@ class restore_gradebook_structure_step extends restore_structure_step {

        $data->courseid = $this->get_courseid();

-        //manual grade items store category id in categoryid
        if ($data->itemtype=='manual') {
+            // manual grade items store category id in categoryid
            $data->categoryid = $this->get_mappingid('grade_category', $data->categoryid, NULL);
-        } //course and category grade items store their category id in iteminstance
-        else if ($data->itemtype=='course' || $data->itemtype=='category') {
+        } else if ($data->itemtype=='course') {
+            // course grade item stores their category id in iteminstance
+            $coursecat = grade_category::fetch_course_category($this->get_courseid());
+            $data->iteminstance = $coursecat->id;
+        } else if ($data->itemtype=='category') {
+            // category grade items store their category id in iteminstance
            $data->iteminstance = $this->get_mappingid('grade_category', $data->iteminstance, NULL);
+        } else {
+            throw new restore_step_exception('unexpected_grade_item_type', $data->itemtype);
        }

        $data->scaleid   = $this->get_mappingid('scale', $data->scaleid, NULL);
@@ -236,6 +242,7 @@ class restore_gradebook_structure_step extends restore_structure_step {
            //get the already created course level grade category
            $category = new stdclass();
            $category->courseid = $this->get_courseid();
+            $category->parent = null;

            $coursecategory = $DB->get_record('grade_categories', (array)$category);
            if (!empty($coursecategory)) {
@@ -273,7 +280,9 @@ class restore_gradebook_structure_step extends restore_structure_step {
        //$this->set_mapping('grade_setting', $oldid, $newitemid);
    }

-    //put all activity grade items in the correct grade category and mark all for recalculation
+    /**
+     * put all activity grade items in the correct grade category and mark all for recalculation
+     */
    protected function after_execute() {
        global $DB;

@@ -284,23 +293,84 @@ class restore_gradebook_structure_step extends restore_structure_step {
        );
        $rs = $DB->get_recordset('backup_ids_temp', $conditions);

+        // We need this for calculation magic later on.
+        $mappings = array();
+
        if (!empty($rs)) {
            foreach($rs as $grade_item_backup) {
+
+                // Store the oldid with the new id.
+                $mappings[$grade_item_backup->itemid] = $grade_item_backup->newitemid;
+
                $updateobj = new stdclass();
                $updateobj->id = $grade_item_backup->newitemid;

                //if this is an activity grade item that needs to be put back in its correct category
                if (!empty($grade_item_backup->parentitemid)) {
-                    $updateobj->categoryid = $this->get_mappingid('grade_category', $grade_item_backup->parentitemid);
+                    $oldcategoryid = $this->get_mappingid('grade_category', $grade_item_backup->parentitemid, null);
+                    if (!is_null($oldcategoryid)) {
+                        $updateobj->categoryid = $oldcategoryid;
+                        $DB->update_record('grade_items', $updateobj);
+                    }
                } else {
                    //mark course and category items as needing to be recalculated
                    $updateobj->needsupdate=1;
+                    $DB->update_record('grade_items', $updateobj);
                }
-                $DB->update_record('grade_items', $updateobj);
            }
        }
        $rs->close();

+        // We need to update the calculations for calculated grade items that may reference old
+        // grade item ids using ##gi\d+##.
+        // $mappings can be empty, use 0 if so (won't match ever)
+        list($sql, $params) = $DB->get_in_or_equal(array_values($mappings), SQL_PARAMS_NAMED, 'param', true, 0);
+        $sql = "SELECT gi.id, gi.calculation
+                  FROM {grade_items} gi
+                 WHERE gi.id {$sql} AND
+                       calculation IS NOT NULL";
+        $rs = $DB->get_recordset_sql($sql, $params);
+        foreach ($rs as $gradeitem) {
+            // Collect all of the used grade item id references
+            if (preg_match_all('/##gi(\d+)##/', $gradeitem->calculation, $matches) < 1) {
+                // This calculation doesn't reference any other grade items... EASY!
+                continue;
+            }
+            // For this next bit we are going to do the replacement of id's in two steps:
+            // 1. We will replace all old id references with a special mapping reference.
+            // 2. We will replace all mapping references with id's
+            // Why do we do this?
+            // Because there potentially there will be an overlap of ids within the query and we
+            // we substitute the wrong id.. safest way around this is the two step system
+            $calculationmap = array();
+            $mapcount = 0;
+            foreach ($matches[1] as $match) {
+                // Check that the old id is known to us, if not it was broken to begin with and will
+                // continue to be broken.
+                if (!array_key_exists($match, $mappings)) {
+                    continue;
+                }
+                // Our special mapping key
+                $mapping = '##MAPPING'.$mapcount.'##';
+                // The old id that exists within the calculation now
+                $oldid = '##gi'.$match.'##';
+                // The new id that we want to replace the old one with.
+                $newid = '##gi'.$mappings[$match].'##';
+                // Replace in the special mapping key
+                $gradeitem->calculation = str_replace($oldid, $mapping, $gradeitem->calculation);
+                // And record the mapping
+                $calculationmap[$mapping] = $newid;
+                $mapcount++;
+            }
+            // Iterate all special mappings for this calculation and replace in the new id's
+            foreach ($calculationmap as $mapping => $newid) {
+                $gradeitem->calculation = str_replace($mapping, $newid, $gradeitem->calculation);
+            }
+            // Update the calculation now that its being remapped
+            $DB->update_record('grade_items', $gradeitem);
+        }
+        $rs->close();
+
        //need to correct the grade category path and parent
        $conditions = array(
            'courseid' => $this->get_courseid()
@@ -1010,6 +1080,9 @@ class restore_course_structure_step extends restore_structure_step {
        // Apply for 'theme' plugins optional paths at course level
        $this->add_plugin_structure('theme', $course);

+        // Apply for 'course report' plugins optional paths at course level
+        $this->add_plugin_structure('coursereport', $course);
+
        // Apply for plagiarism plugins optional paths at course level
        $this->add_plugin_structure('plagiarism', $course);

@@ -1218,6 +1291,28 @@ class restore_ras_and_caps_structure_step extends restore_structure_step {
 */
 class restore_enrolments_structure_step extends restore_structure_step {

+    /**
+     * Conditionally decide if this step should be executed.
+     *
+     * This function checks the following parameter:
+     *
+     *   1. the course/enrolments.xml file exists
+     *
+     * @return bool true is safe to execute, false otherwise
+     */
+    protected function execute_condition() {
+
+        // Check it is included in the backup
+        $fullpath = $this->task->get_taskbasepath();
+        $fullpath = rtrim($fullpath, '/') . '/' . $this->filename;
+        if (!file_exists($fullpath)) {
+            // Not found, can't restore enrolments info
+            return false;
+        }
+
+        return true;
+    }
+
    protected function define_structure() {

        $paths = array();
@@ -1676,7 +1771,7 @@ class restore_course_logs_structure_step extends restore_structure_step {
    /**
     * Conditionally decide if this step should be executed.
     *
-     * This function checks the following four parameters:
+     * This function checks the following parameter:
     *
     *   1. the course/logs.xml file exists
     *
@@ -1797,28 +1892,47 @@ class restore_activity_grades_structure_step extends restore_structure_step {
    }

    protected function process_grade_item($data) {
+        global $DB;

        $data = (object)($data);
        $oldid       = $data->id;        // We'll need these later
        $oldparentid = $data->categoryid;
+        $courseid = $this->get_courseid();

        // make sure top course category exists, all grade items will be associated
        // to it. Later, if restoring the whole gradebook, categories will be introduced
-        $coursecat = grade_category::fetch_course_category($this->get_courseid());
+        $coursecat = grade_category::fetch_course_category($courseid);
        $coursecatid = $coursecat->id; // Get the categoryid to be used

+        $idnumber = null;
+        if (!empty($data->idnumber)) {
+            // Don't get any idnumber from course module. Keep them as they are in grade_item->idnumber
+            // Reason: it's not clear what happens with outcomes->idnumber or activities with multiple items (workshop)
+            // so the best is to keep the ones already in the gradebook
+            // Potential problem: duplicates if same items are restored more than once. :-(
+            // This needs to be fixed in some way (outcomes & activities with multiple items)
+            // $data->idnumber     = get_coursemodule_from_instance($data->itemmodule, $data->iteminstance)->idnumber;
+            // In any case, verify always for uniqueness
+            $sql = "SELECT cm.id
+                      FROM {course_modules} cm
+                     WHERE cm.course = :courseid AND
+                           cm.idnumber = :idnumber AND
+                           cm.id <> :cmid";
+            $params = array(
+                'courseid' => $courseid,
+                'idnumber' => $data->idnumber,
+                'cmid' => $this->task->get_moduleid()
+            );
+            if (!$DB->record_exists_sql($sql, $params) && !$DB->record_exists('grade_items', array('courseid' => $courseid, 'idnumber' => $data->idnumber))) {
+                $idnumber = $data->idnumber;
+            }
+        }
+
        unset($data->id);
        $data->categoryid   = $coursecatid;
        $data->courseid     = $this->get_courseid();
        $data->iteminstance = $this->task->get_activityid();
-        // Don't get any idnumber from course module. Keep them as they are in grade_item->idnumber
-        // Reason: it's not clear what happens with outcomes->idnumber or activities with multiple items (workshop)
-        // so the best is to keep the ones already in the gradebook
-        // Potential problem: duplicates if same items are restored more than once. :-(
-        // This needs to be fixed in some way (outcomes & activities with multiple items)
-        // $data->idnumber     = get_coursemodule_from_instance($data->itemmodule, $data->iteminstance)->idnumber;
-        // In any case, verify always for uniqueness
-        $data->idnumber = grade_verify_idnumber($data->idnumber, $this->get_courseid()) ? $data->idnumber : null;
+        $data->idnumber     = $idnumber;
        $data->scaleid      = $this->get_mappingid('scale', $data->scaleid);
        $data->outcomeid    = $this->get_mappingid('outcome', $data->outcomeid);
        $data->timecreated  = $this->apply_date_offset($data->timecreated);
@@ -2022,6 +2136,8 @@ class restore_module_structure_step extends restore_structure_step {
        $data = (object)$data;
        $oldid = $data->id;

+        $this->task->set_old_moduleversion($data->version);
+
        $data->course = $this->task->get_courseid();
        $data->module = $DB->get_field('modules', 'id', array('name' => $data->modulename));
        // Map section (first try by course_section mapping match. Useful in course and section restores)
@@ -2109,6 +2225,7 @@ class restore_module_structure_step extends restore_structure_step {
 *  - Activity includes completion info (file_exists)
 */
 class restore_userscompletion_structure_step extends restore_structure_step {
+    private $done = array();

    /**
     * To conditionally decide if this step must be executed
@@ -2153,7 +2270,33 @@ class restore_userscompletion_structure_step extends restore_structure_step {
        $data->userid = $this->get_mappingid('user', $data->userid);
        $data->timemodified = $this->apply_date_offset($data->timemodified);

-        $DB->insert_record('course_modules_completion', $data);
+        // Check we didn't already insert one for this cmid and userid
+        // (there aren't supposed to be duplicates in that field, but
+        // it was possible until MDL-28021 was fixed).
+        $key = $data->coursemoduleid . ',' . $data->userid;
+        if (array_key_exists($key, $this->done)) {
+            // Find the existing record
+            $existing = $DB->get_record('course_modules_completion', array(
+                    'coursemoduleid' => $data->coursemoduleid,
+                    'userid' => $data->userid), 'id, timemodified');
+            // Update it to these new values, but only if the time is newer
+            if ($existing->timemodified < $data->timemodified) {
+                $data->id = $existing->id;
+                $DB->update_record('course_modules_completion', $data);
+            }
+        } else {
+            // Normal entry where it doesn't exist already
+            $DB->insert_record('course_modules_completion', $data);
+            // Remember this entry
+            $this->done[$key] = true;
+        }
+    }
+
+    protected function after_execute() {
+        // This gets called once per activity (according to my testing).
+        // Clearing the array isn't strictly required, but avoids using
+        // unnecessary memory.
+        $this->done = array();
    }
 }

@@ -2194,6 +2337,7 @@ abstract class restore_activity_structure_step extends restore_structure_step {
    /**
     * As far as activity restore steps are implementing restore_subplugin stuff, they need to
     * have the parent task available for wrapping purposes (get course/context....)
+     * @return restore_task
     */
    public function get_task() {
        return $this->task;
@@ -2249,11 +2393,13 @@ class restore_create_categories_and_questions extends restore_structure_step {

        $category = new restore_path_element('question_category', '/question_categories/question_category');
        $question = new restore_path_element('question', '/question_categories/question_category/questions/question');
+        $hint = new restore_path_element('question_hint',
+                '/question_categories/question_category/questions/question/question_hints/question_hint');

        // Apply for 'qtype' plugins optional paths at question level
        $this->add_plugin_structure('qtype', $question);

-        return array($category, $question);
+        return array($category, $question, $hint);
    }

    protected function process_question_category($data) {
@@ -2306,6 +2452,17 @@ class restore_create_categories_and_questions extends restore_structure_step {
        // we have loaded qcatids there for all parsed questions
        $data->category = $this->get_mappingid('question_category', $questionmapping->parentitemid);

+        // In the past, there were some very sloppy values of penalty. Fix them.
+        if ($data->penalty >= 0.33 && $data->penalty <= 0.34) {
+            $data->penalty = 0.3333333;
+        }
+        if ($data->penalty >= 0.66 && $data->penalty <= 0.67) {
+            $data->penalty = 0.6666667;
+        }
+        if ($data->penalty >= 1) {
+            $data->penalty = 1;
+        }
+
        $data->timecreated  = $this->apply_date_offset($data->timecreated);
        $data->timemodified = $this->apply_date_offset($data->timemodified);

@@ -2335,6 +2492,47 @@ class restore_create_categories_and_questions extends restore_structure_step {
        // step will be in charge of restoring all the question files
    }

+        protected function process_question_hint($data) {
+        global $DB;
+
+        $data = (object)$data;
+        $oldid = $data->id;
+
+        // Detect if the question is created or mapped
+        $oldquestionid   = $this->get_old_parentid('question');
+        $newquestionid   = $this->get_new_parentid('question');
+        $questioncreated = $this->get_mappingid('question_created', $oldquestionid) ? true : false;
+
+        // If the question has been created by restore, we need to create its question_answers too
+        if ($questioncreated) {
+            // Adjust some columns
+            $data->questionid = $newquestionid;
+            // Insert record
+            $newitemid = $DB->insert_record('question_hints', $data);
+
+        // The question existed, we need to map the existing question_hints
+        } else {
+            // Look in question_hints by hint text matching
+            $sql = 'SELECT id
+                      FROM {question_hints}
+                     WHERE questionid = ?
+                       AND ' . $DB->sql_compare_text('hint', 255) . ' = ' . $DB->sql_compare_text('?', 255);
+            $params = array($newquestionid, $data->hint);
+            $newitemid = $DB->get_field_sql($sql, $params);
+            // If we haven't found the newitemid, something has gone really wrong, question in DB
+            // is missing hints, exception
+            if (!$newitemid) {
+                $info = new stdClass();
+                $info->filequestionid = $oldquestionid;
+                $info->dbquestionid   = $newquestionid;
+                $info->hint           = $data->hint;
+                throw new restore_step_exception('error_question_hint_missing_in_db', $info);
+            }
+        }
+        // Create mapping (I'm not sure if this is really needed?)
+        $this->set_mapping('question_hint', $oldid, $newitemid);
+    }
+
    protected function after_execute() {
        global $DB;

@@ -2455,8 +2653,18 @@ class restore_create_question_files extends restore_execution_step {
                                              $oldctxid, $this->task->get_userid(), 'question_created', $question->itemid, $newctxid, true);
            restore_dbops::send_files_to_pool($this->get_basepath(), $this->get_restoreid(), 'question', 'generalfeedback',
                                              $oldctxid, $this->task->get_userid(), 'question_created', $question->itemid, $newctxid, true);
+            restore_dbops::send_files_to_pool($this->get_basepath(), $this->get_restoreid(), 'question', 'answer',
+                                              $oldctxid, $this->task->get_userid(), 'question_answer', null, $newctxid, true);
            restore_dbops::send_files_to_pool($this->get_basepath(), $this->get_restoreid(), 'question', 'answerfeedback',
                                              $oldctxid, $this->task->get_userid(), 'question_answer', null, $newctxid, true);
+            restore_dbops::send_files_to_pool($this->get_basepath(), $this->get_restoreid(), 'question', 'hint',
+                                              $oldctxid, $this->task->get_userid(), 'question_hint', null, $newctxid, true);
+            restore_dbops::send_files_to_pool($this->get_basepath(), $this->get_restoreid(), 'question', 'correctfeedback',
+                                              $oldctxid, $this->task->get_userid(), 'question_created', $question->itemid, $newctxid, true);
+            restore_dbops::send_files_to_pool($this->get_basepath(), $this->get_restoreid(), 'question', 'partiallycorrectfeedback',
+                                              $oldctxid, $this->task->get_userid(), 'question_created', $question->itemid, $newctxid, true);
+            restore_dbops::send_files_to_pool($this->get_basepath(), $this->get_restoreid(), 'question', 'incorrectfeedback',
+                                              $oldctxid, $this->task->get_userid(), 'question_created', $question->itemid, $newctxid, true);
            // Add qtype dependent files
            $components = backup_qtype_plugin::get_components_and_fileareas($question->qtype);
            foreach ($components as $component => $fileareas) {
@@ -2477,12 +2685,16 @@ class restore_create_question_files extends restore_execution_step {
 * (like the quiz module), to support qtype plugins, states and sessions
 */
 abstract class restore_questions_activity_structure_step extends restore_activity_structure_step {
+    /** @var array question_attempt->id to qtype. */
+    protected $qtypes = array();
+    /** @var array question_attempt->id to questionid. */
+    protected $newquestionids = array();

    /**
     * Attach below $element (usually attempts) the needed restore_path_elements
-     * to restore question_states
+     * to restore question_usages and all they contain.
     */
-    protected function add_question_attempts_states($element, &$paths) {
+    protected function add_question_usages($element, &$paths) {
        // Check $element is restore_path_element
        if (! $element instanceof restore_path_element) {
            throw new restore_step_exception('element_must_be_restore_path_element', $element);
@@ -2491,70 +2703,124 @@ abstract class restore_questions_activity_structure_step extends restore_activit
        if (!is_array($paths)) {
            throw new restore_step_exception('paths_must_be_array', $paths);
        }
-        $paths[] = new restore_path_element('question_state', $element->get_path() . '/states/state');
+        $paths[] = new restore_path_element('question_usage',
+                $element->get_path() . '/question_usage');
+        $paths[] = new restore_path_element('question_attempt',
+                $element->get_path() . '/question_usage/question_attempts/question_attempt');
+        $paths[] = new restore_path_element('question_attempt_step',
+                $element->get_path() . '/question_usage/question_attempts/question_attempt/steps/step',
+                true);
+        $paths[] = new restore_path_element('question_attempt_step_data',
+                $element->get_path() . '/question_usage/question_attempts/question_attempt/steps/step/response/variable');
    }

    /**
-     * Attach below $element (usually attempts) the needed restore_path_elements
-     * to restore question_sessions
+     * Process question_usages
     */
-    protected function add_question_attempts_sessions($element, &$paths) {
-        // Check $element is restore_path_element
-        if (! $element instanceof restore_path_element) {
-            throw new restore_step_exception('element_must_be_restore_path_element', $element);
-        }
-        // Check $paths is one array
-        if (!is_array($paths)) {
-            throw new restore_step_exception('paths_must_be_array', $paths);
-        }
-        $paths[] = new restore_path_element('question_session', $element->get_path() . '/sessions/session');
-    }
-
-    /**
-     * Process question_states
-     */
-    protected function process_question_state($data) {
+    protected function process_question_usage($data) {
        global $DB;

+        // Clear our caches.
+        $this->qtypes = array();
+        $this->newquestionids = array();
+
        $data = (object)$data;
        $oldid = $data->id;

-        // Get complete question mapping, we'll need info
-        $question = $this->get_mapping('question', $data->question);
-
-        // In the quiz_attempt mapping we are storing uniqueid
-        // and not id, so this gets the correct question_attempt to point to
-        $data->attempt  = $this->get_new_parentid('quiz_attempt');
-        $data->question = $question->newitemid;
-        $data->answer   = $this->restore_recode_answer($data, $question->info->qtype); // Delegate recoding of answer
-        $data->timestamp= $this->apply_date_offset($data->timestamp);
-
-        // Everything ready, insert and create mapping (needed by question_sessions)
-        $newitemid = $DB->insert_record('question_states', $data);
-        $this->set_mapping('question_state', $oldid, $newitemid);
-    }
-
-    /**
-     * Process question_sessions
-     */
-    protected function process_question_session($data) {
-        global $DB;
-
-        $data = (object)$data;
-        $oldid = $data->id;
-
-        // In the quiz_attempt mapping we are storing uniqueid
-        // and not id, so this gets the correct question_attempt to point to
-        $data->attemptid  = $this->get_new_parentid('quiz_attempt');
-        $data->questionid = $this->get_mappingid('question', $data->questionid);
-        $data->newest     = $this->get_mappingid('question_state', $data->newest);
-        $data->newgraded  = $this->get_mappingid('question_state', $data->newgraded);
+        $oldcontextid = $this->get_task()->get_old_contextid();
+        $data->contextid  = $this->get_mappingid('context', $this->task->get_old_contextid());

        // Everything ready, insert (no mapping needed)
-        $newitemid = $DB->insert_record('question_sessions', $data);
+        $newitemid = $DB->insert_record('question_usages', $data);

-        // Note: question_sessions haven't files associated. On purpose manualcomment is lacking
-        // support for them, so we don't need to handle them here.
+        $this->inform_new_usage_id($newitemid);
+
+        $this->set_mapping('question_usage', $oldid, $newitemid, false);
+    }
+
+    /**
+     * When process_question_usage creates the new usage, it calls this method
+     * to let the activity link to the new usage. For example, the quiz uses
+     * this method to set quiz_attempts.uniqueid to the new usage id.
+     * @param integer $newusageid
+     */
+    abstract protected function inform_new_usage_id($newusageid);
+
+    /**
+     * Process question_attempts
+     */
+    protected function process_question_attempt($data) {
+        global $DB;
+
+        $data = (object)$data;
+        $oldid = $data->id;
+        $question = $this->get_mapping('question', $data->questionid);
+
+        $data->questionusageid = $this->get_new_parentid('question_usage');
+        $data->questionid      = $question->newitemid;
+        $data->timemodified    = $this->apply_date_offset($data->timemodified);
+
+        $newitemid = $DB->insert_record('question_attempts', $data);
+
+        $this->set_mapping('question_attempt', $oldid, $newitemid);
+        $this->qtypes[$newitemid] = $question->info->qtype;
+        $this->newquestionids[$newitemid] = $data->questionid;
+    }
+
+    /**
+     * Process question_attempt_steps
+     */
+    protected function process_question_attempt_step($data) {
+        global $DB;
+
+        $data = (object)$data;
+        $oldid = $data->id;
+
+        // Pull out the response data.
+        $response = array();
+        if (!empty($data->response['variable'])) {
+            foreach ($data->response['variable'] as $variable) {
+                $response[$variable['name']] = $variable['value'];
+            }
+        }
+        unset($data->response);
+
+        $data->questionattemptid = $this->get_new_parentid('question_attempt');
+        $data->timecreated = $this->apply_date_offset($data->timecreated);
+        $data->userid      = $this->get_mappingid('user', $data->userid);
+
+        // Everything ready, insert and create mapping (needed by question_sessions)
+        $newitemid = $DB->insert_record('question_attempt_steps', $data);
+        $this->set_mapping('question_attempt_step', $oldid, $newitemid, true);
+
+        // Now process the response data.
+        $response = $this->questions_recode_response_data(
+                $this->qtypes[$data->questionattemptid],
+                $this->newquestionids[$data->questionattemptid],
+                $data->sequencenumber, $response);
+        foreach ($response as $name => $value) {
+            $row = new stdClass();
+            $row->attemptstepid = $newitemid;
+            $row->name = $name;
+            $row->value = $value;
+            $DB->insert_record('question_attempt_step_data', $row, false);
+        }
+    }
+
+    /**
+     * Recode the respones data for a particular step of an attempt at at particular question.
+     * @param string $qtype the question type.
+     * @param int $newquestionid the question id.
+     * @param int $sequencenumber the sequence number.
+     * @param array $response the response data to recode.
+     */
+    public function questions_recode_response_data(
+            $qtype, $newquestionid, $sequencenumber, array $response) {
+        $qtyperestorer = $this->get_qtype_restorer($qtype);
+        if ($qtyperestorer) {
+            $response = $qtyperestorer->recode_response($newquestionid, $sequencenumber, $response);
+        }
+        return $response;
    }

    /**
@@ -2577,25 +2843,195 @@ abstract class restore_questions_activity_structure_step extends restore_activit
    }

    /**
-     * Given one question_states record, return the answer
-     * recoded pointing to all the restored stuff
+     * Get the restore_qtype_plugin subclass for a specific question type.
+     * @param string $qtype e.g. multichoice.
+     * @return restore_qtype_plugin instance.
     */
-    public function restore_recode_answer($state, $qtype) {
+    protected function get_qtype_restorer($qtype) {
        // Build one static cache to store {@link restore_qtype_plugin}
        // while we are needing them, just to save zillions of instantiations
        // or using static stuff that will break our nice API
        static $qtypeplugins = array();

-        // If we haven't the corresponding restore_qtype_plugin for current qtype
-        // instantiate it and add to cache
        if (!isset($qtypeplugins[$qtype])) {
            $classname = 'restore_qtype_' . $qtype . '_plugin';
            if (class_exists($classname)) {
                $qtypeplugins[$qtype] = new $classname('qtype', $qtype, $this);
            } else {
-                $qtypeplugins[$qtype] = false;
+                $qtypeplugins[$qtype] = null;
            }
        }
-        return !empty($qtypeplugins[$qtype]) ? $qtypeplugins[$qtype]->recode_state_answer($state) : $state->answer;
+        return $qtypeplugins[$qtype];
+    }
+
+    protected function after_execute() {
+        parent::after_execute();
+
+        // Restore any files belonging to responses.
+        foreach (question_engine::get_all_response_file_areas() as $filearea) {
+            $this->add_related_files('question', $filearea, 'question_attempt_step');
+        }
+    }
+
+    /**
+     * Attach below $element (usually attempts) the needed restore_path_elements
+     * to restore question attempt data from Moodle 2.0.
+     *
+     * When using this method, the parent element ($element) must be defined with
+     * $grouped = true. Then, in that elements process method, you must call
+     * {@link process_legacy_attempt_data()} with the groupded data. See, for
+     * example, the usage of this method in {@link restore_quiz_activity_structure_step}.
+     * @param restore_path_element $element the parent element. (E.g. a quiz attempt.)
+     * @param array $paths the paths array that is being built to describe the
+     *      structure.
+     */
+    protected function add_legacy_question_attempt_data($element, &$paths) {
+        global $CFG;
+        require_once($CFG->dirroot . '/question/engine/upgrade/upgradelib.php');
+
+        // Check $element is restore_path_element
+        if (!($element instanceof restore_path_element)) {
+            throw new restore_step_exception('element_must_be_restore_path_element', $element);
+        }
+        // Check $paths is one array
+        if (!is_array($paths)) {
+            throw new restore_step_exception('paths_must_be_array', $paths);
+        }
+
+        $paths[] = new restore_path_element('question_state',
+                $element->get_path() . '/states/state');
+        $paths[] = new restore_path_element('question_session',
+                $element->get_path() . '/sessions/session');
+    }
+
+    protected function get_attempt_upgrader() {
+        if (empty($this->attemptupgrader)) {
+            $this->attemptupgrader = new question_engine_attempt_upgrader();
+            $this->attemptupgrader->prepare_to_restore();
+        }
+        return $this->attemptupgrader;
+    }
+
+    /**
+     * Process the attempt data defined by {@link add_legacy_question_attempt_data()}.
+     * @param object $data contains all the grouped attempt data ot process.
+     * @param pbject $quiz data about the activity the attempts belong to. Required
+     * fields are (basically this only works for the quiz module):
+     *      oldquestions => list of question ids in this activity - using old ids.
+     *      preferredbehaviour => the behaviour to use for questionattempts.
+     */
+    protected function process_legacy_quiz_attempt_data($data, $quiz) {
+        global $DB;
+        $upgrader = $this->get_attempt_upgrader();
+
+        $data = (object)$data;
+
+        $layout = explode(',', $data->layout);
+        $newlayout = $layout;
+
+        // Convert each old question_session into a question_attempt.
+        $qas = array();
+        foreach (explode(',', $quiz->oldquestions) as $questionid) {
+            if ($questionid == 0) {
+                continue;
+            }
+
+            $newquestionid = $this->get_mappingid('question', $questionid);
+            if (!$newquestionid) {
+                throw new restore_step_exception('questionattemptreferstomissingquestion',
+                        $questionid, $questionid);
+            }
+
+            $question = $upgrader->load_question($newquestionid, $quiz->id);
+
+            foreach ($layout as $key => $qid) {
+                if ($qid == $questionid) {
+                    $newlayout[$key] = $newquestionid;
+                }
+            }
+
+            list($qsession, $qstates) = $this->find_question_session_and_states(
+                    $data, $questionid);
+
+            if (empty($qsession) || empty($qstates)) {
+                throw new restore_step_exception('questionattemptdatamissing',
+                        $questionid, $questionid);
+            }
+
+            list($qsession, $qstates) = $this->recode_legacy_response_data(
+                    $question, $qsession, $qstates);
+
+            $data->layout = implode(',', $newlayout);
+            $qas[$newquestionid] = $upgrader->convert_question_attempt(
+                    $quiz, $data, $question, $qsession, $qstates);
+        }
+
+        // Now create a new question_usage.
+        $usage = new stdClass();
+        $usage->component = 'mod_quiz';
+        $usage->contextid = $this->get_mappingid('context', $this->task->get_old_contextid());
+        $usage->preferredbehaviour = $quiz->preferredbehaviour;
+        $usage->id = $DB->insert_record('question_usages', $usage);
+
+        $this->inform_new_usage_id($usage->id);
+
+        $data->uniqueid = $usage->id;
+        $upgrader->save_usage($quiz->preferredbehaviour, $data, $qas, $quiz->questions);
+    }
+
+    protected function find_question_session_and_states($data, $questionid) {
+        $qsession = null;
+        foreach ($data->sessions['session'] as $session) {
+            if ($session['questionid'] == $questionid) {
+                $qsession = (object) $session;
+                break;
+            }
+        }
+
+        $qstates = array();
+        foreach ($data->states['state'] as $state) {
+            if ($state['question'] == $questionid) {
+                // It would be natural to use $state['seq_number'] as the array-key
+                // here, but it seems that buggy behaviour in 2.0 and early can
+                // mean that that is not unique, so we use id, which is guaranteed
+                // to be unique.
+                $qstates[$state['id']] = (object) $state;
+            }
+        }
+        ksort($qstates);
+        $qstates = array_values($qstates);
+
+        return array($qsession, $qstates);
+    }
+
+    /**
+     * Recode any ids in the response data
+     * @param object $question the question data
+     * @param object $qsession the question sessions.
+     * @param array $qstates the question states.
+     */
+    protected function recode_legacy_response_data($question, $qsession, $qstates) {
+        $qsession->questionid = $question->id;
+
+        foreach ($qstates as &$state) {
+            $state->question = $question->id;
+            $state->answer = $this->restore_recode_legacy_answer($state, $question->qtype);
+        }
+
+        return array($qsession, $qstates);
+    }
+
+    /**
+     * Recode the legacy answer field.
+     * @param object $state the state to recode the answer of.
+     * @param string $qtype the question type.
+     */
+    public function restore_recode_legacy_answer($state, $qtype) {
+        $restorer = $this->get_qtype_restorer($qtype);
+        if ($restorer) {
+            return $restorer->recode_legacy_state_answer($state);
+        } else {
+            return $state->answer;
+        }
    }
 }
@@ -5,7 +5,7 @@ require_once('../config.php');
 require_once($CFG->dirroot . '/backup/util/includes/restore_includes.php');

 $contextid   = required_param('contextid', PARAM_INT);
-$stage      = optional_param('stage', restore_ui::STAGE_CONFIRM, PARAM_INT);
+$stage       = optional_param('stage', restore_ui::STAGE_CONFIRM, PARAM_INT);

 list($context, $course, $cm) = get_context_info_array($contextid);

@@ -30,9 +30,15 @@ if ($stage & restore_ui::STAGE_CONFIRM + restore_ui::STAGE_DESTINATION) {
        }
    }
    if ($rc) {
+        // check if the format conversion must happen first
+        if ($rc->get_status() == backup::STATUS_REQUIRE_CONV) {
+            $rc->convert();
+        }
+
        $restore = new restore_ui($rc, array('contextid'=>$context->id));
    }
 }
+
 $outcome = $restore->process();
 if (!$restore->is_independent()) {
    if ($restore->get_stage() == restore_ui::STAGE_PROCESS && !$restore->requires_substage()) {
@@ -102,45 +102,31 @@ abstract class backup_check {
        // Note: all the checks along the function MUST be performed for $userid, that
        // is the user who "requested" the course backup, not current $USER at all!!

-        // First of all, check the main backup[course|section|activity] principal caps
-        // Lacking the corresponding one makes this to break with exception always
+        // First of all, decide which caps/contexts are we going to check
+        // for common backups (general, automated...) based exclusively
+        // in the type (course, section, activity). And store them into
+        // one capability => context array structure
+        $typecapstocheck = array();
        switch ($type) {
            case backup::TYPE_1COURSE :
                $DB->get_record('course', array('id' => $id), '*', MUST_EXIST); // course exists
-                if (!has_capability('moodle/backup:backupcourse', $coursectx, $userid)) {
-                    $a = new stdclass();
-                    $a->userid = $userid;
-                    $a->courseid = $courseid;
-                    $a->capability = 'moodle/backup:backupcourse';
-                    throw new backup_controller_exception('backup_user_missing_capability', $a);
-                }
+                $typecapstocheck['moodle/backup:backupcourse'] = $coursectx;
                break;
            case backup::TYPE_1SECTION :
                $DB->get_record('course_sections', array('course' => $courseid, 'id' => $id), '*', MUST_EXIST); // sec exists
-                if (!has_capability('moodle/backup:backupsection', $coursectx, $userid)) {
-                    $a = new stdclass();
-                    $a->userid = $userid;
-                    $a->courseid = $courseid;
-                    $a->capability = 'moodle/backup:backupsection';
-                    throw new backup_controller_exception('backup_user_missing_capability', $a);
-                }
+                $typecapstocheck['moodle/backup:backupsection'] = $coursectx;
                break;
            case backup::TYPE_1ACTIVITY :
                get_coursemodule_from_id(null, $id, $courseid, false, MUST_EXIST); // cm exists
                $modulectx = get_context_instance(CONTEXT_MODULE, $id);
-                if (!has_capability('moodle/backup:backupactivity', $modulectx, $userid)) {
-                    $a = new stdclass();
-                    $a->userid = $userid;
-                    $a->cmid = $id;
-                    $a->capability = 'moodle/backup:backupactivity';
-                    throw new backup_controller_exception('backup_user_missing_capability', $a);
-                }
+                $typecapstocheck['moodle/backup:backupactivity'] = $modulectx;
                break;
            default :
-                print_error('unknownbackuptype');
+                throw new backup_controller_exception('backup_unknown_backup_type', $type);
        }

        // Now, if backup mode is hub or import, check userid has permissions for those modes
+        // other modes will perform common checks only (backupxxxx capabilities in $typecapstocheck)
        switch ($mode) {
            case backup::MODE_HUB:
                if (!has_capability('moodle/backup:backuptargethub', $coursectx, $userid)) {
@@ -160,6 +146,18 @@ abstract class backup_check {
                    throw new backup_controller_exception('backup_user_missing_capability', $a);
                }
                break;
+            // Common backup (general, automated...), let's check all the $typecapstocheck
+            // capability => context pairs
+            default:
+                foreach ($typecapstocheck as $capability => $context) {
+                    if (!has_capability($capability, $context, $userid)) {
+                        $a = new stdclass();
+                        $a->userid = $userid;
+                        $a->courseid = $courseid;
+                        $a->capability = $capability;
+                        throw new backup_controller_exception('backup_user_missing_capability', $a);
+                    }
+                }
        }

        // Now, enforce 'moodle/backup:userinfo' to 'users' setting, applying changes if allowed,
@@ -219,15 +217,19 @@ abstract class backup_check {
        }

        // Check the user has the ability to configure the backup. If not then we need
-        // to lock all settings by permission so that no changes can be made.
-        $hasconfigcap = has_capability('moodle/backup:configure', $coursectx, $userid);
-        if (!$hasconfigcap) {
-            $settings = $backup_controller->get_plan()->get_settings();
-            foreach ($settings as $setting) {
-                if ($setting->get_name()=='filename') {
-                    continue;
+        // to lock all settings by permission so that no changes can be made. This does
+        // not apply to the import facility, where the activities must be always enabled
+        // to be able to pick them
+        if ($mode != backup::MODE_IMPORT) {
+            $hasconfigcap = has_capability('moodle/backup:configure', $coursectx, $userid);
+            if (!$hasconfigcap) {
+                $settings = $backup_controller->get_plan()->get_settings();
+                foreach ($settings as $setting) {
+                    if ($setting->get_name() == 'filename') {
+                        continue;
+                    }
+                    $setting->set_status(base_setting::LOCKED_BY_PERMISSION);
                }
-                $setting->set_status(base_setting::LOCKED_BY_PERMISSION);
            }
        }

@@ -68,41 +68,27 @@ abstract class restore_check {
        // Note: all the checks along the function MUST be performed for $userid, that
        // is the user who "requested" the course restore, not current $USER at all!!

-        // First of all, check the main restore[course|section|activity] principal caps
-        // Lacking the corresponding one makes this to break with exception always
+        // First of all, decide which caps/contexts are we going to check
+        // for common backups (general, automated...) based exclusively
+        // in the type (course, section, activity). And store them into
+        // one capability => context array structure
+        $typecapstocheck = array();
        switch ($type) {
            case backup::TYPE_1COURSE :
-                if (!has_capability('moodle/restore:restorecourse', $coursectx, $userid)) {
-                    $a = new stdclass();
-                    $a->userid = $userid;
-                    $a->courseid = $courseid;
-                    $a->capability = 'moodle/restore:restorecourse';
-                    throw new restore_controller_exception('restore_user_missing_capability', $a);
-                }
+                $typecapstocheck['moodle/restore:restorecourse'] = $coursectx;
                break;
            case backup::TYPE_1SECTION :
-                if (!has_capability('moodle/restore:restoresection', $coursectx, $userid)) {
-                    $a = new stdclass();
-                    $a->userid = $userid;
-                    $a->courseid = $courseid;
-                    $a->capability = 'moodle/restore:restoresection';
-                    throw new restore_controller_exception('restore_user_missing_capability', $a);
-                }
+                $typecapstocheck['moodle/restore:restoresection'] = $coursectx;
                break;
            case backup::TYPE_1ACTIVITY :
-                if (!has_capability('moodle/restore:restoreactivity', $coursectx, $userid)) {
-                    $a = new stdclass();
-                    $a->userid = $userid;
-                    $a->courseid = $courseid;
-                    $a->capability = 'moodle/restore:restoreactivity';
-                    throw new restore_controller_exception('restore_user_missing_capability', $a);
-                }
+                $typecapstocheck['moodle/restore:restoreactivity'] = $coursectx;
                break;
            default :
-                print_error('unknownrestoretype');
+                throw new restore_controller_exception('restore_unknown_restore_type', $type);
        }

        // Now, if restore mode is hub or import, check userid has permissions for those modes
+        // other modes will perform common checks only (restorexxxx capabilities in $typecapstocheck)
        switch ($mode) {
            case backup::MODE_HUB:
                if (!has_capability('moodle/restore:restoretargethub', $coursectx, $userid)) {
@@ -122,6 +108,18 @@ abstract class restore_check {
                    throw new restore_controller_exception('restore_user_missing_capability', $a);
                }
                break;
+            // Common backup (general, automated...), let's check all the $typecapstocheck
+            // capability => context pairs
+            default:
+                foreach ($typecapstocheck as $capability => $context) {
+                    if (!has_capability($capability, $context, $userid)) {
+                        $a = new stdclass();
+                        $a->userid = $userid;
+                        $a->courseid = $courseid;
+                        $a->capability = $capability;
+                        throw new restore_controller_exception('restore_user_missing_capability', $a);
+                    }
+                }
        }

        // Now, enforce 'moodle/restore:userinfo' to 'users' setting, applying changes if allowed,
@@ -158,12 +156,16 @@ abstract class restore_check {
        }

        // Check the user has the ability to configure the restore. If not then we need
-        // to lock all settings by permission so that no changes can be made.
-        $hasconfigcap = has_capability('moodle/restore:configure', $coursectx, $userid);
-        if (!$hasconfigcap) {
-            $settings = $restore_controller->get_plan()->get_settings();
-            foreach ($settings as $setting) {
-                $setting->set_status(base_setting::LOCKED_BY_PERMISSION);
+        // to lock all settings by permission so that no changes can be made. This does
+        // not apply to the import facility, where all the activities (picked on backup)
+        // are restored automatically without restore UI
+        if ($mode != backup::MODE_IMPORT) {
+            $hasconfigcap = has_capability('moodle/restore:configure', $coursectx, $userid);
+            if (!$hasconfigcap) {
+                $settings = $restore_controller->get_plan()->get_settings();
+                foreach ($settings as $setting) {
+                    $setting->set_status(base_setting::LOCKED_BY_PERMISSION);
+                }
            }
        }

@@ -401,12 +401,40 @@ abstract class backup_controller_dbops extends backup_dbops {
        return $DB->get_record('course', array('id' => $courseid), 'fullname, shortname, startdate');
    }

+    /**
+     * Sets the default values for the settings in a backup operation
+     *
+     * Based on the mode of the backup it will delegate the process to
+     * other methods like {@link apply_general_config_defaults} ...
+     * to get proper defaults loaded
+     *
+     * @param backup_controller $controller
+     */
+    public static function apply_config_defaults(backup_controller $controller) {
+        // Based on the mode of the backup (general, automated, import, hub...)
+        // decide the action to perform to get defaults loaded
+        $mode = $controller->get_mode();
+
+        switch ($mode) {
+            case backup::MODE_GENERAL:
+                // Load the general defaults
+                self::apply_general_config_defaults($controller);
+                break;
+            case backup::MODE_AUTOMATED:
+                // TODO: Move the loading from automatic stuff to here
+                break;
+            default:
+                // Nothing to do for other modes (IMPORT/HUB...). Some day we
+                // can define defaults (admin UI...) for them if we want to
+        }
+    }
+
    /**
     * Sets the controller settings default values from the backup config.
     *
     * @param backup_controller $controller
     */
-    public static function apply_general_config_defaults(backup_controller $controller) {
+    private static function apply_general_config_defaults(backup_controller $controller) {
        $settings = array(
            // Config name                      => Setting name
            'backup_general_users'              => 'users',
@@ -214,6 +214,8 @@ abstract class backup_plan_dbops extends backup_dbops {
            switch ($type) {
                case backup::TYPE_1COURSE:
                    $shortname = $DB->get_field('course', 'shortname', array('id' => $id));
+                    $context = get_context_instance(CONTEXT_COURSE, $id);
+                    $shortname = format_string($shortname, true, array('context' => $context));
                    break;
                case backup::TYPE_1SECTION:
                    if (!$shortname = $DB->get_field('course_sections', 'name', array('id' => $id))) {
@@ -1340,7 +1340,8 @@ abstract class restore_dbops {
        $course->sortorder = 0;
        $course->timecreated  = time();
        $course->timemodified = $course->timecreated;
-        $course->visible = $category->visible;
+        // forcing skeleton courses to be hidden instead of going by $category->visible , until MDL-27790 is resolved.
+        $course->visible = 0;

        $courseid = $DB->insert_record('course', $course);

@@ -0,0 +1,60 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * @package    core
+ * @subpackage backup-convert
+ * @copyright  2011 Mark Nielsen <mark@moodlerooms.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Factory class to create new instances of backup converters
+ */
+abstract class convert_factory {
+
+    /**
+     * Instantinates the given converter operating on a given directory
+     *
+     * @throws coding_exception
+     * @param $name The converter name
+     * @param $tempdir The temp directory to operate on
+     * @param base_logger|null if the conversion should be logged, use this logger
+     * @return base_converter
+     */
+    public static function get_converter($name, $tempdir, $logger = null) {
+        global $CFG;
+
+        $name = clean_param($name, PARAM_SAFEDIR);
+
+        $classfile = "$CFG->dirroot/backup/converter/$name/lib.php";
+        $classname = "{$name}_converter";
+
+        if (!file_exists($classfile)) {
+            throw new coding_exception("Converter factory error: class file not found $classfile");
+        }
+        require_once($classfile);
+
+        if (!class_exists($classname)) {
+            throw new coding_exception("Converter factory error: class not found $classname");
+        }
+
+        return new $classname($tempdir, $logger);
+    }
+}
@@ -76,7 +76,7 @@ abstract class backup_cron_automated_helper {
        } else if ($state === backup_cron_automated_helper::STATE_RUNNING) {
            mtrace('RUNNING');
            if ($rundirective == self::RUN_IMMEDIATELY) {
-                mtrace('automated backups are already. If this script is being run by cron this constitues an error. You will need to increase the time between executions within cron.');
+                mtrace('Automated backups are already running. If this script is being run by cron this constitues an error. You will need to increase the time between executions within cron.');
            } else {
                mtrace("automated backup are already running. Execution delayed");
            }
@@ -123,14 +123,24 @@ abstract class backup_cron_automated_helper {
                    $backupcourse = $DB->get_record('backup_courses', array('courseid'=>$course->id));
                }

+                // Skip courses that do not yet need backup
+                $skipped = !(($backupcourse->nextstarttime >= 0 && $backupcourse->nextstarttime < $now) || $rundirective == self::RUN_IMMEDIATELY);
                // Skip backup of unavailable courses that have remained unmodified in a month
-                $skipped = false;
-                if (empty($course->visible) && ($now - $course->timemodified) > 31*24*60*60) {  //Hidden + unmodified last month
-                    $backupcourse->laststatus = backup_cron_automated_helper::BACKUP_STATUS_SKIPPED;
-                    $DB->update_record('backup_courses', $backupcourse);
-                    mtrace('Skipping unchanged course '.$course->fullname);
-                    $skipped = true;
-                } else if (($backupcourse->nextstarttime >= 0 && $backupcourse->nextstarttime < $now) || $rundirective == self::RUN_IMMEDIATELY) {
+                if (!$skipped && empty($course->visible) && ($now - $course->timemodified) > 31*24*60*60) {  //Hidden + settings were unmodified last month
+                    //Check log if there were any modifications to the course content
+                    $sqlwhere = "course=:courseid AND time>:time AND ". $DB->sql_like('action', ':action', false, true, true);
+                    $params = array('courseid' => $course->id, 'time' => $now-31*24*60*60, 'action' => '%view%');
+                    $logexists = $DB->record_exists_select('log', $sqlwhere, $params);
+                    if (!$logexists) {
+                        $backupcourse->laststatus = backup_cron_automated_helper::BACKUP_STATUS_SKIPPED;
+                        $backupcourse->nextstarttime = $nextstarttime;
+                        $DB->update_record('backup_courses', $backupcourse);
+                        mtrace('Skipping unchanged course '.$course->fullname);
+                        $skipped = true;
+                    }
+                }
+                //Now we backup every non-skipped course
+                if (!$skipped) {
                    mtrace('Backing up '.$course->fullname, '...');

                    //We have to send a email because we have included at least one backup
@@ -197,7 +207,7 @@ abstract class backup_cron_automated_helper {

            //Build the message subject
            $site = get_site();
-            $prefix = $site->shortname.": ";
+            $prefix = format_string($site->shortname, true, array('context' => get_context_instance(CONTEXT_COURSE, SITEID))).": ";
            if ($haserrors) {
                $prefix .= "[".strtoupper(get_string('error'))."] ";
            }
@@ -312,7 +322,7 @@ abstract class backup_cron_automated_helper {

            $settings = array(
                'users' => 'backup_auto_users',
-                'role_assignments' => 'backup_auto_users',
+                'role_assignments' => 'backup_auto_role_assignments',
                'user_files' => 'backup_auto_user_files',
                'activities' => 'backup_auto_activities',
                'blocks' => 'backup_auto_blocks',
@@ -401,10 +411,19 @@ abstract class backup_cron_automated_helper {
        if ($active === self::AUTO_BACKUP_DISABLED || ($rundirective == self::RUN_ON_SCHEDULE && $active === self::AUTO_BACKUP_MANUAL)) {
            return self::STATE_DISABLED;
        } else if (!empty($config->backup_auto_running)) {
-            // TODO: We should find some way of checking whether the automated
-            // backup has infact finished. In 1.9 this was being done by checking
-            // the log entries.
-            return self::STATE_RUNNING;
+            // Detect if the backup_auto_running semaphore is a valid one
+            // by looking for recent activity in the backup_controllers table
+            // for backups of type backup::MODE_AUTOMATED
+            $timetosee = 60 * 90; // Time to consider in order to clean the semaphore
+            $params = array( 'purpose'   => backup::MODE_AUTOMATED, 'timetolook' => (time() - $timetosee));
+            if ($DB->record_exists_select('backup_controllers',
+                "operation = 'backup' AND type = 'course' AND purpose = :purpose AND timemodified > :timetolook", $params)) {
+                return self::STATE_RUNNING; // Recent activity found, still running
+            } else {
+                // No recent activity found, let's clean the semaphore
+                mtrace('Automated backups activity not found in last ' . (int)$timetosee/60 . ' minutes. Cleaning running status');
+                backup_cron_automated_helper::set_state_running(false);
+            }
        }
        return self::STATE_OK;
    }
@@ -153,7 +153,9 @@ abstract class backup_general_helper extends backup_helper {
        $rolemappings->modified = false;
        $rolemappings->mappings = array();
        $info->role_mappings = $rolemappings;
-
+        // Some initially empty containers
+        $info->sections = array();
+        $info->activities = array();

        // Now the contents
        $contentsarr = $infoarr['contents'];
@@ -164,7 +166,6 @@ abstract class backup_general_helper extends backup_helper {
        }
        if (isset($contentsarr['sections']) && isset($contentsarr['sections']['section'])) {
            $sectionarr = $contentsarr['sections']['section'];
-            $sections = array();
            foreach ($sectionarr as $section) {
                $section = (object)$section;
                $section->settings = array();
@@ -174,7 +175,6 @@ abstract class backup_general_helper extends backup_helper {
        }
        if (isset($contentsarr['activities']) && isset($contentsarr['activities']['activity'])) {
            $activityarr = $contentsarr['activities']['activity'];
-            $activities = array();
            foreach ($activityarr as $activity) {
                $activity = (object)$activity;
                $activity->settings = array();
@@ -214,8 +214,10 @@ abstract class backup_general_helper extends backup_helper {
     * generated or no. Behavior of various parts of restore are
     * dependent of this.
     *
-     * Use site_identifier (hashed) and fallback to wwwroot, thought
-     * any 2.0 backup should have the former. See MDL-16614
+     * Backups created natively in 2.0 and later declare the hashed
+     * site identifier. Backups created by conversion from a 1.9
+     * backup do not declare such identifier, so there is a fallback
+     * to wwwroot comparison. See MDL-16614.
     */
    public static function backup_is_samesite($info) {
        global $CFG;
@@ -228,50 +230,34 @@ abstract class backup_general_helper extends backup_helper {
    }

    /**
-     * Given one temp/backup/xxx dir, detect its format
+     * Detects the format of the given unpacked backup directory
     *
-     * TODO: Move harcoded detection here to delegated classes under backup/format (moodle1, imscc..)
-     *       conversion code will be there too.
+     * @param string $tempdir the name of the backup directory
+     * @return string one of backup::FORMAT_xxx constants
     */
    public static function detect_backup_format($tempdir) {
        global $CFG;
-        $filepath = $CFG->dataroot . '/temp/backup/' . $tempdir . '/moodle_backup.xml';
+        require_once($CFG->dirroot . '/backup/util/helper/convert_helper.class.php');

-        // Does tempdir exist and is dir
-        if (!is_dir(dirname($filepath))) {
-            throw new backup_helper_exception('tmp_backup_directory_not_found', dirname($filepath));
+        if (convert_helper::detect_moodle2_format($tempdir)) {
+            return backup::FORMAT_MOODLE;
        }

-        // First look for MOODLE (moodle2) format
-        if (file_exists($filepath)) { // Looks promising, lets load some information
-            $handle = fopen ($filepath, "r");
-            $first_chars = fread($handle,200);
-            $status = fclose ($handle);
-            // Check if it has the required strings
-            if (strpos($first_chars,'<?xml version="1.0" encoding="UTF-8"?>') !== false &&
-                strpos($first_chars,'<moodle_backup>') !== false &&
-                strpos($first_chars,'<information>') !== false) {
-                    return backup::FORMAT_MOODLE;
+        // see if a converter can identify the format
+        $converters = convert_helper::available_converters();
+        foreach ($converters as $name) {
+            $classname = "{$name}_converter";
+            if (!class_exists($classname)) {
+                throw new coding_exception("available_converters() is supposed to load
+                    converter classes but class $classname not found");
+            }
+
+            $detected = call_user_func($classname .'::detect_format', $tempdir);
+            if (!empty($detected)) {
+                return $detected;
            }
        }

-        // Then look for MOODLE1 (moodle1) format
-        $filepath = $CFG->dataroot . '/temp/backup/' . $tempdir . '/moodle.xml';
-        if (file_exists($filepath)) { // Looks promising, lets load some information
-            $handle = fopen ($filepath, "r");
-            $first_chars = fread($handle,200);
-            $status = fclose ($handle);
-            // Check if it has the required strings
-            if (strpos($first_chars,'<?xml version="1.0" encoding="UTF-8"?>') !== false &&
-                strpos($first_chars,'<MOODLE_BACKUP>') !== false &&
-                strpos($first_chars,'<INFO>') !== false) {
-                    return backup::FORMAT_MOODLE1;
-            }
-        }
-
-        // Other formats
-
-        // Arrived here, unknown format
        return backup::FORMAT_UNKNOWN;
    }
 }
@@ -0,0 +1,340 @@
+<?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/>.
+
+/**
+ * Provides {@link convert_helper} and {@link convert_helper_exception} classes
+ *
+ * @package    core
+ * @subpackage backup-convert
+ * @copyright  2011 Mark Nielsen <mark@moodlerooms.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+require_once($CFG->dirroot . '/backup/util/includes/convert_includes.php');
+
+/**
+ * Provides various functionality via its static methods
+ */
+abstract class convert_helper {
+
+    /**
+     * @param string $entropy
+     * @return string random identifier
+     */
+    public static function generate_id($entropy) {
+        return md5(time() . '-' . $entropy . '-' . random_string(20));
+    }
+
+    /**
+     * Returns the list of all available converters and loads their classes
+     *
+     * Converter must be installed as a directory in backup/converter/ and its
+     * method is_available() must return true to get to the list.
+     *
+     * @see base_converter::is_available()
+     * @return array of strings
+     */
+    public static function available_converters() {
+        global $CFG;
+
+        $converters = array();
+        $plugins    = get_list_of_plugins('backup/converter');
+        foreach ($plugins as $name) {
+            $classfile = "$CFG->dirroot/backup/converter/$name/lib.php";
+            $classname = "{$name}_converter";
+
+            if (!file_exists($classfile)) {
+                throw new convert_helper_exception('converter_classfile_not_found', $classfile);
+            }
+            require_once($classfile);
+
+            if (!class_exists($classname)) {
+                throw new convert_helper_exception('converter_classname_not_found', $classname);
+            }
+
+            if (call_user_func($classname .'::is_available')) {
+                $converters[] = $name;
+            }
+        }
+
+        return $converters;
+    }
+
+    /**
+     * Detects if the given folder contains an unpacked moodle2 backup
+     *
+     * @param string $tempdir the name of the backup directory
+     * @return boolean true if moodle2 format detected, false otherwise
+     */
+    public static function detect_moodle2_format($tempdir) {
+        global $CFG;
+
+        $dirpath    = $CFG->dataroot . '/temp/backup/' . $tempdir;
+        $filepath   = $dirpath . '/moodle_backup.xml';
+
+        if (!is_dir($dirpath)) {
+            throw new convert_helper_exception('tmp_backup_directory_not_found', $dirpath);
+        }
+
+        if (!file_exists($filepath)) {
+            return false;
+        }
+
+        $handle     = fopen($filepath, 'r');
+        $firstchars = fread($handle, 200);
+        $status     = fclose($handle);
+
+        if (strpos($firstchars,'<?xml version="1.0" encoding="UTF-8"?>') !== false and
+            strpos($firstchars,'<moodle_backup>') !== false and
+            strpos($firstchars,'<information>') !== false) {
+                return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Converts the given directory with the backup into moodle2 format
+     *
+     * @param string $tempdir The directory to convert
+     * @param string $format The current format, if already detected
+     * @param base_logger|null if the conversion should be logged, use this logger
+     * @throws convert_helper_exception
+     * @return bool false if unable to find the conversion path, true otherwise
+     */
+    public static function to_moodle2_format($tempdir, $format = null, $logger = null) {
+
+        if (is_null($format)) {
+            $format = backup_general_helper::detect_backup_format($tempdir);
+        }
+
+        // get the supported conversion paths from all available converters
+        $converters   = self::available_converters();
+        $descriptions = array();
+        foreach ($converters as $name) {
+            $classname = "{$name}_converter";
+            if (!class_exists($classname)) {
+                throw new convert_helper_exception('class_not_loaded', $classname);
+            }
+            if ($logger instanceof base_logger) {
+                backup_helper::log('available converter', backup::LOG_DEBUG, $classname, 1, false, $logger);
+            }
+            $descriptions[$name] = call_user_func($classname .'::description');
+        }
+
+        // choose the best conversion path for the given format
+        $path = self::choose_conversion_path($format, $descriptions);
+
+        if (empty($path)) {
+            if ($logger instanceof base_logger) {
+                backup_helper::log('unable to find the conversion path', backup::LOG_ERROR, null, 0, false, $logger);
+            }
+            return false;
+        }
+
+        if ($logger instanceof base_logger) {
+            backup_helper::log('conversion path established', backup::LOG_INFO,
+                implode(' => ', array_merge($path, array('moodle2'))), 0, false, $logger);
+        }
+
+        foreach ($path as $name) {
+            if ($logger instanceof base_logger) {
+                backup_helper::log('running converter', backup::LOG_INFO, $name, 0, false, $logger);
+            }
+            $converter = convert_factory::get_converter($name, $tempdir, $logger);
+            $converter->convert();
+        }
+
+        // make sure we ended with moodle2 format
+        if (!self::detect_moodle2_format($tempdir)) {
+            throw new convert_helper_exception('conversion_failed');
+        }
+
+        return true;
+    }
+
+   /**
+    * Inserts an inforef into the conversion temp table
+    */
+    public static function set_inforef($contextid) {
+        global $DB;
+    }
+
+    public static function get_inforef($contextid) {
+    }
+
+    /// end of public API //////////////////////////////////////////////////////
+
+    /**
+     * Choose the best conversion path for the given format
+     *
+     * Given the source format and the list of available converters and their properties,
+     * this methods picks the most effective way how to convert the source format into
+     * the target moodle2 format. The method returns a list of converters that should be
+     * called, in order.
+     *
+     * This implementation uses Dijkstra's algorithm to find the shortest way through
+     * the oriented graph.
+     *
+     * @see http://en.wikipedia.org/wiki/Dijkstra's_algorithm
+     * @author David Mudrak <david@moodle.com>
+     * @param string $format the source backup format, one of backup::FORMAT_xxx
+     * @param array $descriptions list of {@link base_converter::description()} indexed by the converter name
+     * @return array ordered list of converter names to call (may be empty if not reachable)
+     */
+    protected static function choose_conversion_path($format, array $descriptions) {
+
+        // construct an oriented graph of conversion paths. backup formats are nodes
+        // and the the converters are edges of the graph.
+        $paths = array();   // [fromnode][tonode] => converter
+        foreach ($descriptions as $converter => $description) {
+            $from   = $description['from'];
+            $to     = $description['to'];
+            $cost   = $description['cost'];
+
+            if (is_null($from) or $from === backup::FORMAT_UNKNOWN or
+                is_null($to) or $to === backup::FORMAT_UNKNOWN or
+                is_null($cost) or $cost <= 0) {
+                    throw new convert_helper_exception('invalid_converter_description', $converter);
+            }
+
+            if (!isset($paths[$from][$to])) {
+                $paths[$from][$to] = $converter;
+            } else {
+                // if there are two converters available for the same conversion
+                // path, choose the one with the lowest cost. if there are more
+                // available converters with the same cost, the chosen one is
+                // undefined (depends on the order of processing)
+                if ($descriptions[$paths[$from][$to]]['cost'] > $cost) {
+                    $paths[$from][$to] = $converter;
+                }
+            }
+        }
+
+        if (empty($paths)) {
+            // no conversion paths available
+            return array();
+        }
+
+        // now use Dijkstra's algorithm and find the shortest conversion path
+
+        $dist = array(); // list of nodes and their distances from the source format
+        $prev = array(); // list of previous nodes in optimal path from the source format
+        foreach ($paths as $fromnode => $tonodes) {
+            $dist[$fromnode] = null; // infinitive distance, can't be reached
+            $prev[$fromnode] = null; // unknown
+            foreach ($tonodes as $tonode => $converter) {
+                $dist[$tonode] = null; // infinitive distance, can't be reached
+                $prev[$tonode] = null; // unknown
+            }
+        }
+
+        if (!array_key_exists($format, $dist)) {
+            return array();
+        } else {
+            $dist[$format] = 0;
+        }
+
+        $queue = array_flip(array_keys($dist));
+        while (!empty($queue)) {
+            // find the node with the smallest distance from the source in the queue
+            // in the first iteration, this will find the original format node itself
+            $closest = null;
+            foreach ($queue as $node => $undefined) {
+                if (is_null($dist[$node])) {
+                    continue;
+                }
+                if (is_null($closest) or ($dist[$node] < $dist[$closest])) {
+                    $closest = $node;
+                }
+            }
+
+            if (is_null($closest) or is_null($dist[$closest])) {
+                // all remaining nodes are inaccessible from source
+                break;
+            }
+
+            if ($closest === backup::FORMAT_MOODLE) {
+                // bingo we can break now
+                break;
+            }
+
+            unset($queue[$closest]);
+
+            // visit all neighbors and update distances to them eventually
+
+            if (!isset($paths[$closest])) {
+                continue;
+            }
+            $neighbors = array_keys($paths[$closest]);
+            // keep just neighbors that are in the queue yet
+            foreach ($neighbors as $ix => $neighbor) {
+                if (!array_key_exists($neighbor, $queue)) {
+                    unset($neighbors[$ix]);
+                }
+            }
+
+            foreach ($neighbors as $neighbor) {
+                // the alternative distance to the neighbor if we went thru the
+                // current $closest node
+                $alt = $dist[$closest] + $descriptions[$paths[$closest][$neighbor]]['cost'];
+
+                if (is_null($dist[$neighbor]) or $alt < $dist[$neighbor]) {
+                    // we found a shorter way to the $neighbor, remember it
+                    $dist[$neighbor] = $alt;
+                    $prev[$neighbor] = $closest;
+                }
+            }
+        }
+
+        if (is_null($dist[backup::FORMAT_MOODLE])) {
+            // unable to find a conversion path, the target format not reachable
+            return array();
+        }
+
+        // reconstruct the optimal path from the source format to the target one
+        $conversionpath = array();
+        $target         = backup::FORMAT_MOODLE;
+        while (isset($prev[$target])) {
+            array_unshift($conversionpath, $paths[$prev[$target]][$target]);
+            $target = $prev[$target];
+        }
+
+        return $conversionpath;
+    }
+}
+
+/**
+ * General convert_helper related exception
+ *
+ * @author David Mudrak <david@moodle.com>
+ */
+class convert_helper_exception extends moodle_exception {
+
+    /**
+     * Constructor
+     *
+     * @param string $errorcode key for the corresponding error string
+     * @param object $a extra words and phrases that might be required in the error string
+     * @param string $debuginfo optional debugging information
+     */
+    public function __construct($errorcode, $a = null, $debuginfo = null) {
+        parent::__construct($errorcode, '', '', $a, $debuginfo);
+    }
+}
@@ -53,4 +53,12 @@ class restore_inforef_parser_processor extends grouped_parser_processor {
        $itemid   = $data['tags']['id'];
        restore_dbops::set_backup_ids_record($this->restoreid, $itemname, $itemid);
    }
+
+    protected function notify_path_start($path) {
+        // nothing to do
+    }
+
+    protected function notify_path_end($path) {
+        // nothing to do
+    }
 }
--- a/Show More
+++ b/Show More