Moodle release 2.1.10

Similar to the issue which allowed teachers to create site-wide scales by editing a course-specific scale (MDL-24682), teachers could also promote a course-specific scale to a site-wide (standard) by editing it.  As with MDL-24682, removing the course ID check (leaving just the capability check) prevents this unauthorised creation of site-wide (standard) outcomes.

.gitignore

@@ -0,0 +1,27 @@
+# This file specifies intentionally untracked files that all Moodle git
+# repositories should ignore. It is recommended not to modify this file in your
+# local clone. Instead, use .git/info/exclude and add new records there as
+# needed.
+#
+# Example: if you deploy a contributed plugin mod/foobar into your site, put
+# the following line into .git/info/exclude file in your Moodle clone:
+# /mod/foobar/
+#
+# See gitignore(5) man page for more details
+#
+/config.php
+/lib/editor/tinymce/extra/tools/temp/
+*~
+*.swp
+/tags
+/TAGS
+/cscope.*
+/.patches/
+/.idea/
+/nbproject/
+CVS
+.DS_Store
+/.settings/
+/.project
+/.buildpath
+/.cache

admin/blocks.php

@@ -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);
@@ -91,6 +126,7 @@
             // Remove event handlers and dequeue pending events
             events_uninstall('block/'.$block->name);
 
+            $a = new stdClass();
             $a->block = $strblockname;
             $a->directory = $CFG->dirroot.'/blocks/'.$block->name;
             notice(get_string('blockdeletefiles', '', $a), 'blocks.php');
@@ -114,11 +150,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;
@@ -147,7 +184,11 @@
 
         $settings = ''; // By default, no configuration
         if ($blockobject and $blockobject->has_config()) {
-            if (file_exists($CFG->dirroot.'/blocks/'.$block->name.'/settings.php')) {
+            $blocksettings = admin_get_root()->locate('blocksetting' . $block->name);
+
+            if ($blocksettings instanceof admin_externalpage) {
+                $settings = '<a href="' . $blocksettings->url .  '">' . get_string('settings') . '</a>';
+            } else if ($blocksettings instanceof admin_settingpage) {
                 $settings = '<a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/settings.php?section=blocksetting'.$block->name.'">'.$strsettings.'</a>';
             } else {
                 $settings = '<a href="block.php?block='.$blockid.'">'.$strsettings.'</a>';
@@ -187,15 +228,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();

admin/bloglevelupgrade.php

@@ -1,6 +1,8 @@
 <?php
       /// Create "blog" forums in each course and copy blog entries from these courses' participants in these forums
 
+define('NO_OUTPUT_BUFFERING', true);
+
 require_once('../config.php');
 require_once($CFG->dirroot.'/course/lib.php');
 require_once($CFG->dirroot.'/blog/lib.php');
@@ -28,9 +30,7 @@ echo $OUTPUT->box_start();
 
 /// Turn off time limits, sometimes upgrades can be slow.
 
-@set_time_limit(0);
-@ob_implicit_flush(true);
-while(@ob_end_flush());
+set_time_limit(0);
 
 $i = 0;
 
@@ -88,9 +88,9 @@ function bloglevelupgrade_entries($blogentries, $forum, $cm, $groupid=-1) {
         $discussion->course = $forum->course;
         $discussion->forum = $forum->id;
         $discussion->name = $blogentry->subject;
-        $discussion->intro = $blogentry->summary;
         $discussion->assessed = $forum->assessed;
-        $discussion->messageformat = $forum->introformat;
+        $discussion->message = $blogentry->summary;
+        $discussion->messageformat = $blogentry->summaryformat;
         $discussion->messagetrust = 0;
         $discussion->attachments = 0;
         $discussion->mailnow = false;
@@ -99,7 +99,7 @@ function bloglevelupgrade_entries($blogentries, $forum, $cm, $groupid=-1) {
         $discussion->groupid = $groupid;
         $message = '';
 
-        $discussionid = forum_add_discussion($discussion, null, $message);
+        $discussionid = forum_add_discussion($discussion, null, $message, $blogentry->userid);
 
         // Copy file attachment records
         $fs = get_file_storage();

admin/cli/automated_backups.php

@@ -92,7 +92,7 @@ mtrace("Server Time: ".date('r',$timenow)."\n\n");
 // Run automated backups if required.
 require_once($CFG->dirroot.'/backup/util/includes/backup_includes.php');
 require_once($CFG->dirroot.'/backup/util/helper/backup_cron_helper.class.php');
-backup_cron_automated_helper::run_automated_backup(backup_cron_automated_helper::RUN_IMMEDIATLY);
+backup_cron_automated_helper::run_automated_backup(backup_cron_automated_helper::RUN_IMMEDIATELY);
 
 mtrace("Automated cron backups completed correctly");
 

admin/cli/install.php

@@ -70,6 +70,8 @@ Options:
                       problem encountered.
 --agree-license       Indicates agreement with software license,
                       required in non-interactive mode.
+--allow-unstable      Install even if the version is not marked as stable yet,
+                      required in non-interactive mode.
 -h, --help            Print out this help
 
 Example:
@@ -77,6 +79,16 @@ Example:
 "; //TODO: localize, mark as needed in install - to be translated later when everything is finished
 
 
+// distro specific customisation
+$distrolibfile = dirname(dirname(dirname(__FILE__))).'/install/distrolib.php';
+$distro = null;
+if (file_exists($distrolibfile)) {
+    require_once($distrolibfile);
+    if (function_exists('distro_get_config')) {
+        $distro = distro_get_config();
+    }
+}
+
 // Nothing to do if config.php exists
 $configfile = dirname(dirname(dirname(__FILE__))).'/config.php';
 if (file_exists($configfile)) {
@@ -94,7 +106,7 @@ if (file_exists($configfile)) {
 
 $olddir = getcwd();
 
-// change directory so that includes bellow work properly
+// change directory so that includes below work properly
 chdir(dirname($_SERVER['argv'][0]));
 
 // Servers should define a default timezone in php.ini, but if they don't then make sure something is defined.
@@ -113,12 +125,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
@@ -128,7 +140,7 @@ $CFG->dirroot              = dirname(dirname(dirname(__FILE__)));
 $CFG->libdir               = "$CFG->dirroot/lib";
 $CFG->wwwroot              = "http://localhost";
 $CFG->httpswwwroot         = $CFG->wwwroot;
-$CFG->dataroot             = str_replace('\\', '/', dirname(dirname(dirname(dirname(__FILE__)))).'/moodledata');
+$CFG->dataroot             = empty($distro->dataroot) ? str_replace('\\', '/', dirname(dirname(dirname(dirname(__FILE__)))).'/moodledata'): $distro->dataroot; // initialised later after including libs or by distro
 $CFG->docroot              = 'http://docs.moodle.org';
 $CFG->running_installer    = true;
 $CFG->early_install_lang   = true;
@@ -136,9 +148,6 @@ $CFG->early_install_lang   = true;
 $parts = explode('/', str_replace('\\', '/', dirname(dirname(__FILE__))));
 $CFG->admin                = array_pop($parts);
 
-require($CFG->dirroot.'/version.php');
-$CFG->target_release = $release;
-
 //point pear include path to moodles lib/pear so that includes and requires will search there for files before anywhere else
 //the problem is that we need specific version of quickforms and hacked excel files :-(
 ini_set('include_path', $CFG->libdir.'/pear' . PATH_SEPARATOR . ini_get('include_path'));
@@ -154,6 +163,9 @@ require_once($CFG->libdir.'/deprecatedlib.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/componentlib.class.php');
 
+require($CFG->dirroot.'/version.php');
+$CFG->target_release = $release;
+
 //Database types
 $databases = array('mysqli' => moodle_database::get_driver_instance('mysqli', 'native'),
                    'pgsql'  => moodle_database::get_driver_instance('pgsql',  'native'),
@@ -176,14 +188,14 @@ if (empty($databases)) {
 // now get cli options
 list($options, $unrecognized) = cli_get_params(
     array(
-        'chmod'             => '2777',
+        'chmod'             => isset($distro->directorypermissions) ? sprintf('%04o',$distro->directorypermissions) : '2777', // let distros set dir permissions
         'lang'              => $CFG->lang,
         'wwwroot'           => '',
         'dataroot'          => $CFG->dataroot,
-        'dbtype'            => $defaultdb,
-        'dbhost'            => 'localhost',
+        'dbtype'            => empty($distro->dbtype) ? $defaultdb : $distro->dbtype, // let distro skip dbtype selection
+        'dbhost'            => empty($distro->dbhost) ? 'localhost' : $distro->dbhost, // let distros set dbhost
         'dbname'            => 'moodle',
-        'dbuser'            => 'root',
+        'dbuser'            => empty($distro->dbuser) ? 'root' : $distro->dbuser, // let distros set dbuser
         'dbpass'            => '',
         'dbsocket'          => false,
         'prefix'            => 'mdl_',
@@ -193,6 +205,7 @@ list($options, $unrecognized) = cli_get_params(
         'adminpass'         => '',
         'non-interactive'   => false,
         'agree-license'     => false,
+        'allow-unstable'    => false,
         'help'              => false
     ),
     array(
@@ -262,7 +275,7 @@ if ($interactive) {
 $chmod = octdec(clean_param($options['chmod'], PARAM_INT));
 if ($interactive) {
     cli_separator();
-    cli_heading('Data directories permission'); // todo localize
+    cli_heading(get_string('datarootpermission', 'install'));
     $prompt = get_string('clitypevaluedefault', 'admin', decoct($chmod));
     $error = '';
     do {
@@ -373,25 +386,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));
         }
     }
 }
@@ -402,6 +406,28 @@ $CFG->langotherroot      = $CFG->dataroot.'/lang';
 $CFG->langlocalroot      = $CFG->dataroot.'/lang';
 get_string_manager(true);
 
+// make sure we are installing stable release or require a confirmation
+if (isset($maturity)) {
+    if (($maturity < MATURITY_STABLE) and !$options['allow-unstable']) {
+        $maturitylevel = get_string('maturity'.$maturity, 'admin');
+
+        if ($interactive) {
+            cli_separator();
+            cli_heading(get_string('notice'));
+            echo get_string('maturitycorewarning', 'admin', $maturitylevel) . PHP_EOL;
+            echo get_string('morehelp') . ': ' . get_docs_url('admin/versions') . PHP_EOL;
+            echo get_string('continue') . PHP_EOL;
+            $prompt = get_string('cliyesnoprompt', 'admin');
+            $input = cli_input($prompt, '', array(get_string('clianswerno', 'admin'), get_string('cliansweryes', 'admin')));
+            if ($input == get_string('clianswerno', 'admin')) {
+                exit(1);
+            }
+        } else {
+            cli_error(get_string('maturitycorewarning', 'admin'));
+        }
+    }
+}
+
 // ask for db type - show only drivers available
 if ($interactive) {
     $options['dbtype'] = strtolower($options['dbtype']);
@@ -500,6 +526,9 @@ if ($interactive) {
         }
 
         $CFG->dbpass = cli_input($prompt, $options['dbpass']);
+        if (function_exists('distro_pre_create_db')) { // Hook for distros needing to do something before DB creation
+            $distro = distro_pre_create_db($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbsocket'=>$options['dbsocket']), $distro);
+        }
         $hint_database = install_db_validate($database, $CFG->dbhost, $CFG->dbuser, $CFG->dbpass, $CFG->dbname, $CFG->prefix, array('dbpersist'=>0, 'dbsocket'=>$options['dbsocket']));
     } while ($hint_database !== '');
 

admin/cli/install_database.php

@@ -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=STRING     Name of the site
+--shortname=STRING    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));
         }
     }
 }

admin/cli/mysql_engine.php

@@ -76,7 +76,7 @@ if (!empty($options['engine'])) {
         }
         echo str_pad($table->name, 40). " - ";
 
-        $DB->change_database_structure("ALTER TABLE {$table->name} TYPE = $engine");
+        $DB->change_database_structure("ALTER TABLE {$table->name} ENGINE = $engine");
         echo "DONE\n";
         $converted++;
     }

admin/cli/upgrade.php

@@ -40,8 +40,16 @@ require_once($CFG->libdir.'/environmentlib.php');
 
 
 // now get cli options
-list($options, $unrecognized) = cli_get_params(array('non-interactive'=>false, 'help'=>false),
-                                               array('h'=>'help'));
+list($options, $unrecognized) = cli_get_params(
+    array(
+        'non-interactive'   => false,
+        'allow-unstable'    => false,
+        'help'              => false
+    ),
+    array(
+        'h' => 'help'
+    )
+);
 
 $interactive = empty($options['non-interactive']);
 
@@ -59,6 +67,8 @@ Site defaults may be changed via local/defaults.php.
 
 Options:
 --non-interactive     No interactive questions or confirmations
+--allow-unstable      Upgrade even if the version is not marked as stable yet,
+                      required in non-interactive mode.
 -h, --help            Print out this help
 
 Example:
@@ -73,17 +83,22 @@ if (empty($CFG->version)) {
     cli_error(get_string('missingconfigversion', 'debug'));
 }
 
-require("$CFG->dirroot/version.php");       // defines $version and $release
+require("$CFG->dirroot/version.php");       // defines $version, $release and $maturity
 $CFG->target_release = $release;            // used during installation and upgrades
 
 if ($version < $CFG->version) {
     cli_error(get_string('downgradedcore', 'error'));
 }
 
+$oldversion = "$CFG->release ($CFG->version)";
 $newversion = "$release ($version)";
 
+if (!moodle_needs_upgrading()) {
+    cli_error(get_string('cliupgradenoneed', 'core_admin', $newversion), 0);
+}
+
 // 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) {
@@ -93,6 +108,30 @@ if (!check_moodle_environment($version, $environment_results, false, ENV_SELECT_
     exit(1);
 }
 
+if ($interactive) {
+    $a = new stdClass();
+    $a->oldversion = $oldversion;
+    $a->newversion = $newversion;
+    echo cli_heading(get_string('databasechecking', '', $a)) . PHP_EOL;
+}
+
+// make sure we are upgrading to a stable release or display a warning
+if (isset($maturity)) {
+    if (($maturity < MATURITY_STABLE) and !$options['allow-unstable']) {
+        $maturitylevel = get_string('maturity'.$maturity, 'admin');
+
+        if ($interactive) {
+            cli_separator();
+            cli_heading(get_string('notice'));
+            echo get_string('maturitycorewarning', 'admin', $maturitylevel) . PHP_EOL;
+            echo get_string('morehelp') . ': ' . get_docs_url('admin/versions') . PHP_EOL;
+            cli_separator();
+        } else {
+            cli_error(get_string('maturitycorewarning', 'admin', $maturitylevel));
+        }
+    }
+}
+
 if ($interactive) {
     echo html_to_text(get_string('upgradesure', 'admin', $newversion))."\n";
     $prompt = get_string('cliyesnoprompt', 'admin');

admin/cron.php

@@ -36,28 +36,22 @@
  * @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);
 define('WEB_CRON_EMULATED_CLI', 'defined'); // ugly ugly hack, do not use elsewhere please
+define('NO_OUTPUT_BUFFERING', true);
 
 require('../config.php');
 require_once($CFG->libdir.'/clilib.php');
 require_once($CFG->libdir.'/cronlib.php');
 
-// disable compression, it would prevent closing of buffers
-if (ini_get('zlib.output_compression')) {
-    ini_set('zlib.output_compression', 'Off');
-}
-// no more headers and buffers
-ob_implicit_flush(true);
-while(ob_get_level()) {
-    if (!ob_end_clean()) {
-        // prevent infinite loop
-        break;
-    }
-}
-
 // extra safety
 session_get_instance()->write_close();
 

admin/dbtransfer/lib.php

@@ -13,7 +13,7 @@ TODO:
     (user would need file access to dataroot which might prevent various "accidents")
   - implement "Export/import running" notification in lib/setup.php (similar to new upgrade flag in config table)
   - gzip compression when storing xml file - the xml is very verbose and full of repeated tags (zip is not suitable here at all)
-    this could help us keep the files bellow 2G (expected ratio is > 10:1)
+    this could help us keep the files below 2G (expected ratio is > 10:1)
 
 */
 
@@ -26,7 +26,7 @@ function dbtransfer_export_xml_database($description, $mdb) {
 
     session_get_instance()->write_close(); // release session
 
-    header('Content-Type: application/xhtml+xml');
+    header('Content-Type: application/xhtml+xml; charset=utf-8');
     header('Content-Disposition: attachment; filename=database.xml');
     header('Expires: 0');
     header('Cache-Control: must-revalidate,post-check=0,pre-check=0');

admin/enrol.php

@@ -31,6 +31,7 @@ $enrol   = required_param('enrol', PARAM_SAFEDIR);
 $confirm = optional_param('confirm', 0, PARAM_BOOL);
 
 $PAGE->set_url('/admin/enrol.php');
+$PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));
 
 require_login();
 require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
@@ -107,6 +108,7 @@ switch ($action) {
         } else {  // Delete everything!!
             uninstall_plugin('enrol', $enrol);
 
+            $a = new stdClass();
             $a->plugin = $strplugin;
             $a->directory = "$CFG->dirroot/enrol/$enrol";
             echo $OUTPUT->notification(get_string('uninstalldeletefiles', 'enrol', $a), 'notifysuccess');
@@ -117,4 +119,4 @@ switch ($action) {
 }
 
 
-redirect($return);
+redirect($return);

admin/environment.xml

@@ -214,11 +214,7 @@
       </FEEDBACK>
     </UNICODE>
     <DATABASE level="required">
-      <VENDOR name="mysql" version="5.0.25">
-        <FEEDBACK>
-          <ON_ERROR message="mysql416required" />
-        </FEEDBACK>
-      </VENDOR>
+      <VENDOR name="mysql" version="5.0.25" />
       <VENDOR name="postgres" version="8.3" />
       <VENDOR name="mssql" version="9.0" />
       <VENDOR name="odbc_mssql" version="9.0" />
@@ -321,6 +317,342 @@
       </PHP_SETTING>
     </PHP_SETTINGS>
     <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/customcheckslib.php" function="php_check_php533" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="php533warning" />
+        </FEEDBACK>
+      </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" />
+      <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>
+  <MOODLE version="2.2" requires="1.9">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="5.0.25" />
+      <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>
+  <MOODLE version="2.3" requires="2.2">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mysql" version="5.1.33" />
+      <VENDOR name="postgres" version="8.3" />
+      <VENDOR name="mssql" version="9.0" />
+      <VENDOR name="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_EXTENSION name="hash" level="required"/>
+    </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>

admin/generator.php

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

admin/handlevirus.php

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

admin/health.php

@@ -2,13 +2,7 @@
 
     ob_start(); //for whitespace test
     require_once('../config.php');
-
-    // extra whitespace test - intentionally breaks cookieless mode
-    $extraws = '';
-    while (ob_get_level()) {
-        $extraws .= ob_get_contents();
-        ob_end_clean();
-    }
+    $extraws = ob_get_clean();
 
     require_once($CFG->libdir.'/adminlib.php');
 

admin/index.php

@@ -30,27 +30,15 @@ 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;
 }
 
-// disable compression, it would prevent closing of buffers
-if (ini_get('zlib.output_compression')) {
-    ini_set('zlib.output_compression', 'Off');
-}
-
-// try to flush everything all the time
-ob_implicit_flush(true);
-while(ob_get_level()) {
-    if (!ob_end_clean()) {
-        // prevent infinite loop
-        break;
-    }
-}
+define('NO_OUTPUT_BUFFERING', true);
 
 require('../config.php');
 require_once($CFG->libdir.'/adminlib.php');    // various admin-only functions
@@ -60,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
@@ -98,7 +87,7 @@ if (!isset($CFG->version)) {
 
 $version = null;
 $release = null;
-require("$CFG->dirroot/version.php");       // defines $version and $release
+require("$CFG->dirroot/version.php");       // defines $version, $release and $maturity
 $CFG->target_release = $release;            // used during installation and upgrades
 
 if (!$version or !$release) {
@@ -135,24 +124,36 @@ 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;
     }
     if (empty($confirmrelease)) {
         $strcurrentrelease = get_string('currentrelease');
         $PAGE->navbar->add($strcurrentrelease);
-        $PAGE->set_title($strinstallation.' - Moodle '.$CFG->target_release);
-        $PAGE->set_heading($strinstallation);
+        $PAGE->set_title($strinstallation);
+        $PAGE->set_heading($strinstallation . ' - Moodle ' . $CFG->target_release);
         $PAGE->set_cacheable(false);
         echo $OUTPUT->header();
         echo $OUTPUT->heading("Moodle $release");
-        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes');
+
+        if (isset($maturity)) {
+            // main version.php declares moodle code maturity
+            if ($maturity < MATURITY_STABLE) {
+                $maturitylevel = get_string('maturity'.$maturity, 'admin');
+                echo $OUTPUT->box(
+                    $OUTPUT->container(get_string('maturitycorewarning', 'admin', $maturitylevel)) .
+                    $OUTPUT->container($OUTPUT->doc_link('admin/versions', get_string('morehelp'))),
+                    'generalbox maturitywarning');
+            }
+        }
+
+        $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 boxaligncenter boxwidthwide');
+        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);
 
@@ -201,11 +203,20 @@ if ($version > $CFG->version) {  // upgrade
     $strdatabasechecking = get_string('databasechecking', '', $a);
 
     if (empty($confirmupgrade)) {
-        $PAGE->navbar->add($strdatabasechecking);
-        $PAGE->set_title($strdatabasechecking);
-        $PAGE->set_heading($stradministration);
+        $PAGE->set_title($stradministration);
+        $PAGE->set_heading($strdatabasechecking);
         $PAGE->set_cacheable(false);
         echo $OUTPUT->header();
+        if (isset($maturity)) {
+            // main version.php declares moodle code maturity
+            if ($maturity < MATURITY_STABLE) {
+                $maturitylevel = get_string('maturity'.$maturity, 'admin');
+                echo $OUTPUT->box(
+                    $OUTPUT->container(get_string('maturitycorewarning', 'admin', $maturitylevel)) .
+                    $OUTPUT->container($OUTPUT->doc_link('admin/versions', get_string('morehelp'))),
+                    'generalbox maturitywarning');
+}
+        }
         $continueurl = new moodle_url('index.php', array('confirmupgrade' => 1));
         $cancelurl = new moodle_url('index.php');
         echo $OUTPUT->confirm(get_string('upgradesure', 'admin', $a->newversion), $continueurl, $cancelurl);
@@ -220,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);
 
@@ -246,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 {
@@ -284,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();
         }
     }
@@ -330,8 +345,8 @@ if (during_initial_install()) {
         }
     }
 
-    // at this stage there can be only one admin - users may change username, so do not rely on that
-    $adminuser = get_complete_user_data('id', $CFG->siteadmins);
+    // at this stage there can be only one admin unless more were added by install - users may change username, so do not rely on that
+    $adminuser = get_complete_user_data('id', reset(explode(',', $CFG->siteadmins)));
 
     if ($adminuser->password === 'adminsetuppending') {
         // prevent installation hijacking
@@ -340,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
 
@@ -393,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) {
@@ -431,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');
 //////////////////////////////////////////////////////////////////////////////////////////////////
 

admin/innodb.php

@@ -26,7 +26,7 @@
             $DB->set_debug(true);
             foreach ($tables as $table) {
                 $fulltable = $DB->get_prefix().$table;
-                $DB->change_database_structure("ALTER TABLE $fulltable TYPE=INNODB");
+                $DB->change_database_structure("ALTER TABLE $fulltable ENGINE=INNODB");
             }
             $DB->set_debug(false);
         }

admin/langimport.php

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

admin/lib.php

@@ -0,0 +1,50 @@
+<?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')
+    );
+    // Add the missing * (any page) option for them. MDL-30340
+    // TODO: These pages are really 'pagetype-varying' - MDL-30564 -
+    // and some day we should stop behaving that way, so proper pagetypes
+    // can be specified for it (like course-category-* or so).
+    // Luckly... the option we are introducing '*' is independent
+    // of that varying behavior, so will work.
+    if ($pagetype == 'admin-course-category') {
+        $array += array(
+            '*' => get_string('page-x', 'pagetype')
+        );
+    }
+    return $array;
+}

admin/localplugins.php

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

admin/message.php

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

admin/mnet/peer_forms.php

@@ -38,9 +38,10 @@ class mnet_simple_host_form extends moodleform {
 
         $mform = $this->_form;
 
-        $mform->addElement('text', 'wwwroot', get_string('hostname', 'mnet'));
+        $mform->addElement('text', 'wwwroot', get_string('hostname', 'mnet'), array('maxlength' => 255, 'size' => 50));
         $mform->setType('wwwroot', PARAM_URL);
         $mform->addRule('wwwroot', null, 'required', null, 'client');
+        $mform->addRule('wwwroot', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
 
         $mform->addElement('select', 'applicationid', get_string('applicationtype', 'mnet'),
                            $DB->get_records_menu('mnet_application', array(), 'id,display_name'));
@@ -49,7 +50,7 @@ class mnet_simple_host_form extends moodleform {
         $this->add_action_buttons(false, get_string('addhost', 'mnet'));
     }
 
-    function validation($data) {
+    function validation($data, $files) {
         global $DB;
 
         $wwwroot = $data['wwwroot'];
@@ -81,11 +82,13 @@ class mnet_review_host_form extends moodleform {
         $mform->addElement('hidden', 'applicationid');
         $mform->addElement('hidden', 'oldpublickey');
 
-        $mform->addElement('text', 'name', get_string('site'));
+        $mform->addElement('text', 'name', get_string('site'), array('maxlength' => 80, 'size' => 50));
         $mform->setType('name', PARAM_NOTAGS);
+        $mform->addRule('name', get_string('maximumchars', '', 80), 'maxlength', 80, 'client');
 
-        $mform->addElement('text', 'wwwroot', get_string('hostname', 'mnet'));
+        $mform->addElement('text', 'wwwroot', get_string('hostname', 'mnet'), array('maxlength' => 255, 'size' => 50));
         $mform->setType('wwwroot', PARAM_URL);
+        $mform->addRule('wwwroot', get_string('maximumchars', '', 255), 'maxlength', 255, 'client');
 
         $themes = array('' => get_string('forceno'));
         foreach (array_keys(get_plugin_list('theme')) as $themename) {
@@ -95,15 +98,7 @@ class mnet_review_host_form extends moodleform {
 
         $mform->addElement('textarea', 'public_key', get_string('publickey', 'mnet'), array('rows' => 17, 'cols' => 100, 'class' => 'smalltext'));
         $mform->setType('public_key', PARAM_PEM);
-
-        if ($mnet_peer && !empty($mnet_peer->deleted)) {
-            $radioarray = array();
-            $radioarray[] = MoodleQuickForm::createElement('radio', 'deleted', '', get_string('yes'), 1);
-            $radioarray[] = MoodleQuickForm::createElement('radio', 'deleted', '', get_string('no'), 0);
-            $mform->addGroup($radioarray, 'radioar', get_string('deleted'), array(' '), false);
-        } else {
-            $mform->addElement('hidden', 'deleted');
-        }
+        $mform->addRule('public_key', get_string('required'), 'required');
 
         // finished with form controls, now the static informational stuff
         if ($mnet_peer && !empty($mnet_peer->bootstrapped)) {
@@ -140,21 +135,35 @@ class mnet_review_host_form extends moodleform {
                 }
             }
 
-            $mform->addElement('static', 'certdetails', get_string('certdetails', 'mnet'), $OUTPUT->box('<pre>' . $credstr . '</pre>'));
+            $mform->addElement('static', 'certdetails', get_string('certdetails', 'mnet'),
+                $OUTPUT->box('<pre>' . $credstr . '</pre>', 'generalbox certdetails'));
+        }
+
+        if ($mnet_peer && !empty($mnet_peer->deleted)) {
+            $radioarray = array();
+            $radioarray[] = MoodleQuickForm::createElement('static', 'deletedinfo', '',
+                $OUTPUT->container(get_string('deletedhostinfo', 'mnet'), 'deletedhostinfo'));
+            $radioarray[] = MoodleQuickForm::createElement('radio', 'deleted', '', get_string('yes'), 1);
+            $radioarray[] = MoodleQuickForm::createElement('radio', 'deleted', '', get_string('no'), 0);
+            $mform->addGroup($radioarray, 'radioar', get_string('deleted'), array(' ', ' '), false);
+        } else {
+            $mform->addElement('hidden', 'deleted');
         }
 
         // finished with static stuff, print save button
         $this->add_action_buttons(false);
     }
 
-    function validation($data) {
+    function validation($data, $files) {
         $errors = array();
         if ($data['oldpublickey'] == $data['public_key']) {
             return;
         }
         $mnet_peer = new mnet_peer(); // idiotic api
         $mnet_peer->wwwroot = $data['wwwroot']; // just hard-set this rather than bootstrap the object
-        if (!$credentials = $mnet_peer->check_credentials($data['public_key'])) {
+        if (empty($data['public_key'])) {
+            $errors['public_key'] = get_string('publickeyrequired', 'mnet');
+        } else if (!$credentials = $mnet_peer->check_credentials($data['public_key'])) {
             $errmsg = '';
             foreach ($mnet_peer->error as $err) {
                 $errmsg .= $err['code'] . ': ' . $err['text'].'<br />';

admin/mnet/peers.php

@@ -190,7 +190,7 @@ if ($formdata = $reviewform->get_data()) {
 
 // normal flow - just display all hosts with links
 echo $OUTPUT->header();
-$hosts = mnet_get_hosts();
+$hosts = mnet_get_hosts(true);
 
 // print the table to display the register all hosts setting
 $table = new html_table();
@@ -231,28 +231,43 @@ $table->head = array(
 );
 $table->wrap = array('nowrap', 'nowrap', 'nowrap', 'nowrap');
 $baseurl = new moodle_url('/admin/mnet/peers.php');
+$deleted = array();
 foreach($hosts as $host) {
     $hosturl = new moodle_url($baseurl, array('hostid' => $host->id));
+    if (trim($host->name) === '') {
+        // should not happen but...
+        $host->name = '???';
+    }
     // process all hosts first since it's the easiest
     if ($host->id == $CFG->mnet_all_hosts_id) {
-        $table->data[] = array(html_writer::tag('a', $host->name, array('href'=>$hosturl)), '', '', '');
+        $table->data[] = array(html_writer::link($hosturl, get_string('allhosts', 'core_mnet')), '*', '', '');
+        continue;
+    }
+
+    // populate the list of deleted hosts
+    if ($host->deleted) {
+        $deleted[] = html_writer::link($hosturl, $host->name);
         continue;
     }
 
     if ($host->last_connect_time == 0) {
         $last_connect = get_string('never');
     } else {
-        $last_connect = date('H:i:s d/m/Y', $host->last_connect_time);
+        $last_connect = userdate($host->last_connect_time, get_string('strftimedatetime', 'core_langconfig'));
     }
     $table->data[] = array(
         html_writer::link($hosturl, $host->name),
-        html_writer::link($hosturl, $host->wwwroot),
+        html_writer::link($host->wwwroot, $host->wwwroot),
         $last_connect,
         $OUTPUT->single_button(new moodle_url('/admin/mnet/delete.php', array('hostid' => $host->id)), get_string('delete'))
     );
 }
 echo html_writer::table($table);
 
+if ($deleted) {
+    echo $OUTPUT->box(get_string('deletedhosts', 'core_mnet', join(', ', $deleted)), 'deletedhosts');
+}
+
 // finally, print the initial form to add a new host
 echo $OUTPUT->box_start();
 echo $OUTPUT->heading(get_string('addnewhost', 'mnet'), 3);

admin/mnet/profilefields_form.php

@@ -39,6 +39,15 @@ class mnet_profile_form extends moodleform {
         global $CFG;
         $mform =& $this->_form;
 
+        $mnetprofileimportfields = '';
+        if (isset($CFG->mnetprofileimportfields)) {
+            $mnetprofileimportfields = str_replace(',', ', ', $CFG->mnetprofileimportfields);
+        }
+
+        $mnetprofileexportfields = '';
+        if (isset($CFG->mnetprofileexportfields)) {
+            $mnetprofileexportfields = str_replace(',', ', ', $CFG->mnetprofileexportfields);
+        }
 
         $mform->addElement('hidden', 'hostid', $this->_customdata['hostid']);
         $fields = mnet_profile_field_options();
@@ -49,7 +58,7 @@ class mnet_profile_form extends moodleform {
         $select = $mform->addElement('select', 'importfields', get_string('importfields', 'mnet'), $fields['optional']);
         $select->setMultiple(true);
 
-        $mform->addElement('checkbox', 'importdefault', get_string('leavedefault', 'mnet'), str_replace(',', ', ', $CFG->mnetprofileimportfields));
+        $mform->addElement('checkbox', 'importdefault', get_string('leavedefault', 'mnet'), $mnetprofileimportfields);
 
         // Fields to export ----------------------------------------------------
         $mform->addElement('header', 'export', get_string('exportfields', 'mnet'));
@@ -57,7 +66,7 @@ class mnet_profile_form extends moodleform {
         $select = $mform->addElement('select', 'exportfields', get_string('exportfields', 'mnet'), $fields['optional']);
         $select->setMultiple(true);
 
-        $mform->addElement('checkbox', 'exportdefault', get_string('leavedefault', 'mnet'), str_replace(',', ', ', $CFG->mnetprofileexportfields));
+        $mform->addElement('checkbox', 'exportdefault', get_string('leavedefault', 'mnet'), $mnetprofileexportfields);
 
         $this->add_action_buttons();
     }

admin/mnet/services_form.php

@@ -36,7 +36,7 @@ class mnet_services_form extends moodleform {
     function definition() {
         $mform =& $this->_form;
         $mnet_peer =& $this->_customdata['peer'];
-        $myservices =& mnet_get_service_info($mnet_peer);
+        $myservices = mnet_get_service_info($mnet_peer);
 
         $mform->addElement('hidden', 'hostid', $mnet_peer->id);
 
@@ -60,13 +60,13 @@ class mnet_services_form extends moodleform {
             if (!empty($version['hostsubscribes'])) {
                 $pubstr .= ' <a class="notifysuccess" title="'.s(get_string('issubscribed','mnet', $mnet_peer->name)).'">&radic;</a> ';
             }
-            $mform->addElement('checkbox', 'publish[' . $version['serviceid'] . ']', $pubstr);
+            $mform->addElement('advcheckbox', 'publish[' . $version['serviceid'] . ']', $pubstr);
 
             $substr = get_string('subscribe','mnet');
             if (!empty($version['hostpublishes'])) {
                 $substr .= ' <a class="notifysuccess" title="'.s(get_string('ispublished','mnet', $mnet_peer->name)).'">&radic;</a> ';
             }
-            $mform->addElement('checkbox', 'subscribe[' . $version['serviceid']. ']', $substr);
+            $mform->addElement('advcheckbox', 'subscribe[' . $version['serviceid']. ']', $substr);
             $count++;
         }
         $this->add_action_buttons();

admin/modules.php

@@ -92,6 +92,7 @@
             }
 
             uninstall_plugin('mod', $delete);
+            $a = new stdClass();
             $a->module = $strmodulename;
             $a->directory = "$CFG->dirroot/mod/$delete";
             echo $OUTPUT->notification(get_string("moduledeletefiles", "", $a), 'notifysuccess');
@@ -141,12 +142,17 @@
             $settings = "";
         }
 
-        $count = $DB->count_records_select($module->name, "course<>0");
+        try {
+            $count = $DB->count_records_select($module->name, "course<>0");
+        } catch (dml_exception $e) {
+            $count = -1;
+        }
         if ($count>0) {
             $countlink = "<a href=\"{$CFG->wwwroot}/course/search.php?modulelist=$module->name" .
                 "&amp;sesskey=".sesskey()."\" title=\"$strshowmodulecourse\">$count</a>";
-        }
-        else {
+        } else if ($count < 0) {
+            $countlink = get_string('error');
+        } else {
             $countlink = "$count";
         }
 

admin/multilangupgrade.php

@@ -1,6 +1,8 @@
 <?php
       /// Search and replace strings throughout all texts in the whole database
 
+define('NO_OUTPUT_BUFFERING', true);
+
 require_once('../config.php');
 require_once($CFG->dirroot.'/course/lib.php');
 require_once($CFG->libdir.'/adminlib.php');
@@ -33,8 +35,6 @@ echo $OUTPUT->box_start();
 /// Turn off time limits, sometimes upgrades can be slow.
 
 @set_time_limit(0);
-@ob_implicit_flush(true);
-while(@ob_end_flush());
 
 echo '<strong>Progress:</strong>';
 $i = 0;
@@ -56,35 +56,34 @@ foreach ($tables as $table) {
             if (in_array($data->type, array('text','mediumtext','longtext','varchar'))) {  // Text stuff only
                 // first find candidate records
                 $sql = "SELECT id, $column FROM $fulltable WHERE $column LIKE '%</lang>%' OR $column LIKE '%<span lang=%'";
-                if ($rs = $DB->get_recordset_sql($sql)) {
-                    foreach ($rs as $data) {
-                        $text = $data->$column;
-                        $id   = $data->id;
-                        if ($i % 600 == 0) {
-                            echo '<br />';
-                        }
-                        if ($i % 10 == 0) {
-                            echo '.';
-                        }
-                        $i++;
-
-                        if (empty($text) or is_numeric($text)) {
-                            continue; // nothing to do
-                        }
-
-                        $search = '/(<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)(\s*<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)+/is';
-                        $newtext = preg_replace_callback($search, 'multilangupgrade_impl', $text);
-
-                        if (is_null($newtext)) {
-                            continue; // regex error
-                        }
-
-                        if ($newtext != $text) {
-                            $DB->execute("UPDATE $fulltable SET $column=? WHERE id=?", array($newtext, $id));
-                        }
+                $rs = $DB->get_recordset_sql($sql);
+                foreach ($rs as $data) {
+                    $text = $data->$column;
+                    $id   = $data->id;
+                    if ($i % 600 == 0) {
+                        echo '<br />';
+                    }
+                    if ($i % 10 == 0) {
+                        echo '.';
+                    }
+                    $i++;
+
+                    if (empty($text) or is_numeric($text)) {
+                        continue; // nothing to do
+                    }
+
+                    $search = '/(<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)(\s*<(?:lang|span) lang="[a-zA-Z0-9_-]*".*?>.+?<\/(?:lang|span)>)+/is';
+                    $newtext = preg_replace_callback($search, 'multilangupgrade_impl', $text);
+
+                    if (is_null($newtext)) {
+                        continue; // regex error
+                    }
+
+                    if ($newtext != $text) {
+                        $DB->execute("UPDATE $fulltable SET $column=? WHERE id=?", array($newtext, $id));
                     }
-                    $rs->close();
                 }
+                $rs->close();
             }
         }
     }

admin/oacleanup.php

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

admin/plugins.php

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

admin/qbehaviours.php

@@ -0,0 +1,304 @@
+<?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['missing'] += $count;
+    }
+}
+$needed['missing'] = true;
+
+// 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 = array_keys($sortedbehaviours);
+    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 = new stdClass();
+    $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 select this behaviour?
+    $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)) . ' ';
+}
+

admin/qtypes.php

@@ -1,289 +1,313 @@
 <?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.
-        if (file_exists($qtype->plugin_dir() . '/settings.php')) {
-            $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 = new stdClass();
+    $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)) . ' ';
 }
 

admin/registration/confirmregistration.php

@@ -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');
 }
 
@@ -65,11 +65,17 @@ if (!empty($registeredhub) and $registeredhub->token == $token) {
     $registeredhub->hubname = $hubname;
     $registrationmanager->update_registeredhub($registeredhub);
 
+    //display notficiation message
     $notificationmessage = $OUTPUT->notification(
             get_string('registrationconfirmedon', 'hub', $hublink), 'notifysuccess');
-
     echo $notificationmessage;
 
+    //display continue button
+    $registrationpage = new moodle_url('/admin/registration/index.php');
+    $continuebutton = $OUTPUT->render(new single_button($registrationpage, get_string('continue', 'hub')));
+    $continuebutton = html_writer::tag('div', $continuebutton, array('class' => 'mdl-align'));
+    echo $continuebutton;
+
     if (!extension_loaded('xmlrpc')) {
         //display notice about xmlrpc
         $xmlrpcnotification = $OUTPUT->doc_link('admin/environment/php_extension/xmlrpc', '');
@@ -79,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');
 }
 

admin/registration/forms.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) {
@@ -368,8 +368,8 @@ class site_registration_form extends moodleform {
         $questioncount = $DB->count_records('question');
         $resourcecount = $DB->count_records('resource');
         require_once($CFG->dirroot . "/course/lib.php");
-        $participantnumberaverage = average_number_of_participants();
-        $modulenumberaverage = average_number_of_courses_modules();
+        $participantnumberaverage = number_format(average_number_of_participants(), 2);
+        $modulenumberaverage = number_format(average_number_of_courses_modules(), 2);
 
         if (HUB_MOODLEORGHUBURL != $huburl) {
             $mform->addElement('checkbox', 'courses', get_string('sendfollowinginfo', 'hub'),

admin/registration/index.php

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

admin/registration/lib.php

@@ -84,6 +84,33 @@ class registration_manager {
         }
     }
 
+    /**
+     * Return the site secret for a given hub
+     * site identifier is assigned to Mooch
+     * each hub has a unique and personal site secret.
+     * @param string $huburl
+     * @return string site secret
+     */
+    public function get_site_secret_for_hub($huburl) {
+        global $DB;
+
+        $existingregistration = $DB->get_record('registration_hubs',
+                    array('huburl' => $huburl));
+
+        if (!empty($existingregistration)) {
+            return $existingregistration->secret;
+        }
+
+        if ($huburl == HUB_MOODLEORGHUBURL) {
+            $siteidentifier =  get_site_identifier();
+        } else {
+            $siteidentifier = random_string(32) . $_SERVER['HTTP_HOST'];
+        }
+
+        return $siteidentifier;
+
+    }
+
     /**
      * When the site register on a hub, he must call this function
      * @param object $hub where the site is registered on

admin/registration/register.php

@@ -49,21 +49,6 @@ if (!confirm_sesskey()) {
     throw new moodle_exception('missingparameter');
 }
 
-/* TO DO
-  if DB config plugin table is not good for dealing with token reference and token confirmation
-  => create other DB table
-  -----------------------------------------------------------------------------
-  Local Type | Token | Local WS | Remote Type | Remote URL        | Confirmed
-  -----------------------------------------------------------------------------
-  HUB        4er4e   server    HUB-DIRECTORY  http...moodle.org      Yes
-  HUB        73j53   client    HUB-DIRECTORY  http...moodle.org      Yes
-  SITE       dfsd7   server    HUB            http...hub             Yes
-  SITE       fd8fd   client    HUB            http...hub             Yes
-  HUB        ds78s   server    SITE           http...site.com        Yes
-  HUB-DIR.   d7d8s   server    HUB            http...hub             Yes
-  -----------------------------------------------------------------------------
- */
-
 $registrationmanager = new registration_manager();
 
 $registeredhub = $registrationmanager->get_registeredhub($huburl);
@@ -132,7 +117,8 @@ if (!empty($fromform) and empty($update) and confirm_sesskey()) {
         if (empty($unconfirmedhub)) {
             //we save the token into the communication table in order to have a reference
             $unconfirmedhub = new stdClass();
-            $unconfirmedhub->token = get_site_identifier();
+            $unconfirmedhub->token = $registrationmanager->get_site_secret_for_hub($huburl);
+            $unconfirmedhub->secret = $unconfirmedhub->token;
             $unconfirmedhub->huburl = $huburl;
             $unconfirmedhub->hubname = $hubname;
             $unconfirmedhub->confirmed = 0;

admin/registration/renewregistration.php

@@ -0,0 +1,76 @@
+<?php
+
+///////////////////////////////////////////////////////////////////////////
+//                                                                       //
+// This file is part of Moodle - http://moodle.org/                      //
+// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
+//                                                                       //
+// 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    moodle
+ * @subpackage registration
+ * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
+ * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
+ *
+ * The administrator is redirect to this page from the hub to renew a registration
+ * process because
+ */
+
+require('../../config.php');
+require_once($CFG->libdir . '/adminlib.php');
+require_once($CFG->dirroot . '/' . $CFG->admin . '/registration/lib.php');
+
+$url = optional_param('url', '', PARAM_URL);
+$hubname = optional_param('hubname', '', PARAM_TEXT);
+$token = optional_param('token', '', PARAM_TEXT);
+
+admin_externalpage_setup('registrationindex');
+
+//check that we are waiting a confirmation from this hub, and check that the token is correct
+$registrationmanager = new registration_manager();
+$registeredhub = $registrationmanager->get_unconfirmedhub($url);
+if (!empty($registeredhub) and $registeredhub->token == $token) {
+
+    echo $OUTPUT->header();
+    echo $OUTPUT->heading(get_string('renewregistration', 'hub'), 3, 'main');
+    $hublink = html_writer::tag('a', $hubname, array('href' => $url));
+
+    $registrationmanager->delete_registeredhub($url);
+
+    //Mooch case, need to recreate the siteidentifier
+    if ($url == HUB_MOODLEORGHUBURL) {
+        $CFG->siteidentifier = null;
+        get_site_identifier();
+    }
+
+    $deletedregmsg = get_string('previousregistrationdeleted', 'hub', $hublink);
+
+    $button = new single_button(new moodle_url('/admin/registration/index.php'),
+                    get_string('restartregistration', 'hub'));
+    $button->class = 'restartregbutton';
+
+    echo html_writer::tag('div', $deletedregmsg . $OUTPUT->render($button),
+            array('class' => 'mdl-align'));
+
+    echo $OUTPUT->footer();
+} else {
+    throw new moodle_exception('wrongtoken', 'hub',
+            $CFG->wwwroot . '/' . $CFG->admin . '/registration/index.php');
+}
+
+

admin/renderer.php

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

admin/replace.php

@@ -1,36 +1,42 @@
 <?php
       /// Search and replace strings throughout all texts in the whole database
 
+define('NO_OUTPUT_BUFFERING', true);
+
 require_once('../config.php');
 require_once($CFG->dirroot.'/course/lib.php');
 require_once($CFG->libdir.'/adminlib.php');
 
-// workaround for problems with compression
-if (ini_get('zlib.output_compression')) {
-    @ini_set('zlib.output_compression', 'Off');
-}
-
 admin_externalpage_setup('replace');
 
 $search  = optional_param('search', '', PARAM_RAW);
 $replace = optional_param('replace', '', PARAM_RAW);
+$sure    = optional_param('sure', 0, PARAM_BOOL);
 
 ###################################################################
 echo $OUTPUT->header();
 
 echo $OUTPUT->heading('Search and replace text throughout the whole database');
 
+if ($DB->get_dbfamily() !== 'mysql' and $DB->get_dbfamily() !== 'postgres') {
+    //TODO: add $DB->text_replace() to DML drivers
+    echo $OUTPUT->notification('Sorry, this feature is implemented only for MySQL and PostgreSQL databases.');
+    echo $OUTPUT->footer();
+    die;
+}
 
-if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) {   /// Print a form
+if (!data_submitted() or !$search or !$replace or !confirm_sesskey() or !$sure) {   /// Print a form
+    echo $OUTPUT->notification('This script is not supported, always make complete backup before proceeding!<br />This operation can not be reverted!');
 
     echo $OUTPUT->box_start();
     echo '<div class="mdl-align">';
-    echo '<form action="replace.php" method="post">';
+    echo '<form action="replace.php" method="post"><div>';
     echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
-    echo 'Search whole database for: <input type="text" name="search" /><br />';
-    echo 'Replace with this string: <input type="text" name="replace" /><br />';
-    echo '<input type="submit" value="Yes, do it now" /><br />';
-    echo '</form>';
+    echo '<div><label for="search">Search whole database for: </label><input id="search" type="text" name="search" size="40" /> (usually previous server URL)</div>';
+    echo '<div><label for="replace">Replace with this string: </label><input type="text" id="replace" name="replace" size="40" /> (usually new server URL)</div>';
+    echo '<div><label for="sure">I understand the risks of this operation: </label><input type="checkbox" id="sure" name="sure" value="1" /></div>';
+    echo '<div class="buttons"><input type="submit" class="singlebutton" value="Yes, do it now" /></div>';
+    echo '</div></form>';
     echo '</div>';
     echo $OUTPUT->box_end();
     echo $OUTPUT->footer();
@@ -38,23 +44,9 @@ if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) {   /// Pr
 }
 
 echo $OUTPUT->box_start();
-
-if (!db_replace($search, $replace)) {
-    print_error('erroroccur', debug);
-}
-
+db_replace($search, $replace);
 echo $OUTPUT->box_end();
 
-/// Try to replace some well-known serialised contents (html blocks)
-echo $OUTPUT->notification('Replacing in html blocks...');
-$instances = $DB->get_recordset('block_instances', array('blockname' => 'html'));
-foreach ($instances as $instance) {
-    $blockobject = block_instance('html', $instance);
-    $blockobject->config->text = str_replace($search, $replace, $blockobject->config->text);
-    $blockobject->instance_config_commit();
-}
-$instances->close();
-
 /// Rebuild course cache which might be incorrect now
 echo $OUTPUT->notification('Rebuilding course cache...', 'notifysuccess');
 rebuild_course_cache();

admin/report/backups/index.php

@@ -7,7 +7,7 @@
 
     $courseid = optional_param('courseid', 0, PARAM_INT);
 
-    admin_externalpage_setup('reportbackups');
+    admin_externalpage_setup('reportbackups', '', null, '', array('pagelayout'=>'report'));
     echo $OUTPUT->header();
 
 /// Automated backups aren't active by the site admin

admin/report/configlog/index.php

@@ -9,7 +9,7 @@ $perpage = optional_param('perpage', 30, PARAM_INT);    // how many per page
 $sort    = optional_param('sort', 'timemodified', PARAM_ALPHA);
 $dir     = optional_param('dir', 'DESC', PARAM_ALPHA);
 
-admin_externalpage_setup('reportconfiglog');
+admin_externalpage_setup('reportconfiglog', '', null, '', array('pagelayout'=>'report'));
 echo $OUTPUT->header();
 
 echo $OUTPUT->heading(get_string('configlog', 'report_configlog'));

admin/report/courseoverview/index.php

@@ -8,9 +8,6 @@
     $time       = optional_param('time', 0, PARAM_INT);
     $numcourses = optional_param('numcourses', 20, PARAM_INT);
 
-    admin_externalpage_setup('reportcourseoverview');
-    echo $OUTPUT->header();
-
     if (empty($CFG->enablestats)) {
         if (has_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM))) {
             redirect("$CFG->wwwroot/$CFG->admin/settings.php?section=stats", get_string('mustenablestats', 'admin'), 3);
@@ -19,6 +16,9 @@
         }
     }
 
+    admin_externalpage_setup('reportcourseoverview', '', null, '', array('pagelayout'=>'report'));
+    echo $OUTPUT->header();
+
     $course = get_site();
     stats_check_uptodate($course->id);
 
@@ -27,9 +27,9 @@
 
     $reportoptions = stats_get_report_options($course->id,STATS_MODE_RANKED);
 
-    $earliestday = $DB->get_field_sql('SELECT timeend FROM {stats_daily} ORDER BY timeend');
-    $earliestweek = $DB->get_field_sql('SELECT timeend FROM {stats_weekly} ORDER BY timeend');
-    $earliestmonth = $DB->get_field_sql('SELECT timeend FROM {stats_monthly} ORDER BY timeend');
+    $earliestday = $DB->get_field_sql('SELECT MIN(timeend) FROM {stats_daily}');
+    $earliestweek = $DB->get_field_sql('SELECT MIN(timeend) FROM {stats_weekly}');
+    $earliestmonth = $DB->get_field_sql('SELECT MIN(timeend) FROM {stats_monthly}');
 
     if (empty($earliestday)) $earliestday = time();
     if (empty($earliestweek)) $earliestweek = time();
@@ -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)) {

admin/report/courseoverview/reportsgraph.php

@@ -27,7 +27,7 @@
               ORDER BY $param->orderby";
     }
 
-    $courses = $DB->get_records_sql($sql, $param->$params, 0, $numcourses);
+    $courses = $DB->get_records_sql($sql, $param->params, 0, $numcourses);
 
     if (empty($courses)) {
         $PAGE->set_url('/admin/report/courseoverview/index.php');

admin/report/customlang/db/install.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="admin/report/customlang/db" VERSION="20101112" 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"
 >
@@ -20,17 +20,17 @@
       </FIELDS>
       <KEYS>
         <KEY NAME="primary" TYPE="primary" FIELDS="id" NEXT="fk_component"/>
-        <KEY NAME="fk_component" TYPE="foreign" FIELDS="componentid" REFTABLE="customlang_components" REFFIELDS="id" PREVIOUS="primary"/>
+        <KEY NAME="fk_component" TYPE="foreign" FIELDS="componentid" REFTABLE="report_customlang_components" REFFIELDS="id" PREVIOUS="primary"/>
       </KEYS>
       <INDEXES>
         <INDEX NAME="uq_lang_component_string" UNIQUE="true" FIELDS="lang, componentid, stringid" COMMENT="For a given language and component, string identifiers must be unique"/>
       </INDEXES>
     </TABLE>
-    <TABLE NAME="report_customlang_components" COMMENT="Contains the list of all installed plugins that provide their own language pack " PREVIOUS="report_customlang">
+    <TABLE NAME="report_customlang_components" COMMENT="Contains the list of all installed plugins that provide their own language pack" PREVIOUS="report_customlang">
       <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"/>

admin/report/customlang/db/upgrade.php

@@ -43,5 +43,32 @@ function xmldb_report_customlang_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2010111200, 'report', 'customlang');
     }
 
+    /**
+     * Regenerate the foreign key after the tables rename
+     */
+    if ($oldversion < 2010111500) {
+        $table = new xmldb_table('report_customlang');
+        $oldkey = new xmldb_key('fk_component', XMLDB_KEY_FOREIGN, array('componentid'), 'customlang_components', array('id'));
+        $newkey = new xmldb_key('fk_component', XMLDB_KEY_FOREIGN, array('componentid'), 'report_customlang_components', array('id'));
+
+        $dbman->drop_key($table, $oldkey);
+        $dbman->add_key($table, $newkey);
+
+        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;
 }

admin/report/customlang/edit.php

@@ -38,7 +38,7 @@ $PAGE->set_url('/admin/report/customlang/edit.php', array('lng' => $lng));
 navigation_node::override_active_url(new moodle_url('/admin/report/customlang/index.php'));
 $PAGE->set_title(get_string('pluginname', 'report_customlang'));
 $PAGE->set_heading(get_string('pluginname', 'report_customlang'));
-//$PAGE->requires->js_init_call('M.report_customlang.init_translator', array(), true);
+$PAGE->requires->js_init_call('M.report_customlang.init_editor', array(), true);
 
 if (empty($lng)) {
     // PARAM_LANG validation failed

admin/report/customlang/index.php

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

admin/report/customlang/lang/en/report_customlang.php

@@ -26,34 +26,36 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$string['checkin'] = 'Check in strings into disk';
-$string['checkout'] = 'Check out strings into 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['checkin'] = 'Save strings to language pack';
+$string['checkout'] = 'Open language pack for editing';
+$string['checkoutdone'] = 'Language pack loaded';
+$string['checkoutinprogress'] = 'Loading language pack';
+$string['confirmcheckin'] = 'You are about to save modifications to your local language pack. This will export the customised strings from the translator into you Moodle data directory and Moodle will start using the modified strings. Press \'Continue\' to proceed with saving.';
 $string['customlang:edit'] = 'Edit local translation';
 $string['customlang:view'] = 'View local translation';
 $string['filter'] = 'Filter strings';
 $string['filtercomponent'] = 'Show strings of these components';
-$string['filtercustomized'] = 'Customized only';
+$string['filtercustomized'] = 'Customised only';
 $string['filtermodified'] = 'Modified only';
 $string['filteronlyhelps'] = 'Help only';
 $string['filtershowstrings'] = 'Show strings';
 $string['filterstringid'] = 'String identifier';
 $string['filtersubstring'] = 'Only strings containing';
 $string['headingcomponent'] = 'Component';
-$string['headinglocal'] = 'Local customization';
+$string['headinglocal'] = 'Local customisation';
 $string['headingstandard'] = 'Standard text';
 $string['headingstringid'] = 'String';
-$string['markinguptodate'] = 'Marking the customization as up-to-date';
-$string['markinguptodate_help'] = 'The customized translation may get outdated if either the English original or the master translation has modified since the string was customized on your site. Review the customized translation. If you find it up-to-date, click the checkbox. Edit it otherwise.';
+$string['markinguptodate'] = 'Marking the customisation as up-to-date';
+$string['markinguptodate_help'] = 'The customised translation may get outdated if either the English original or the master translation has modified since the string was customised on your site. Review the customised translation. If you find it up-to-date, click the checkbox. Edit it otherwise.';
 $string['markuptodate'] = 'mark as up-to-date';
-$string['modifiedno'] = 'There are no modified strings to check in.';
-$string['modifiednum'] = 'There are {$a} modified strings. You must check in them into disk to store them permanently.';
+$string['modifiedno'] = 'There are no modified strings to save.';
+$string['modifiednum'] = 'There are {$a} modified strings. Do you wish to save these changes to your local language pack?';
 $string['nostringsfound'] = 'No strings found, please modify the filter settings';
 $string['placeholder'] = 'Placeholders';
 $string['placeholder_help'] = 'Placeholders are special statements like `{$a}` or `{$a->something}` within the string. They are replaced with a value when the string is actually printed.
 
 It is important to copy them exactly as they are in the original string. Do not translate them nor change their left-to-right orientation.';
 $string['placeholderwarning'] = 'string contains a placeholder';
-$string['pluginname'] = 'Language customization';
-$string['savecheckin'] = 'Save and check in strings into files';
-$string['savecontinue'] = 'Save and continue editing';
+$string['pluginname'] = 'Language customisation';
+$string['savecheckin'] = 'Save changes to the language pack';
+$string['savecontinue'] = 'Apply changes and continue editing';

admin/report/customlang/locallib.php

@@ -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'));
+        }
     }
 
     /**
@@ -257,9 +278,6 @@ class report_customlang_utils {
             $packageinfo .= "\n * @subpackage $subpackage";
         }
         $filepath = self::get_localpack_location($lang);
-        if ($filepath !== clean_param($filepath, PARAM_SAFEPATH)) {
-            throw new coding_exception('Incorrect file location '.s($filepath));
-        }
         $filepath = $filepath.'/'.$filename;
         if (!is_dir(dirname($filepath))) {
             check_dir_exists(dirname($filepath));

admin/report/customlang/module.js

@@ -0,0 +1,45 @@
+// 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    report
+ * @subpackage customlang
+ * @copyright  2010 David Mudrak <david@moodle.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * @namespace
+ */
+M.report_customlang = M.report_customlang || {};
+
+/**
+ * YUI instance holder
+ */
+M.report_customlang.Y = {};
+
+/**
+ * Initialize JS support for the edit.php
+ *
+ * @param {Object} Y YUI instance
+ */
+M.report_customlang.init_editor = function(Y) {
+    M.report_customlang.Y = Y;
+
+    Y.all('#translator .local textarea').each(function (textarea) {
+        var cell = textarea.get('parentNode');
+        textarea.setStyle('height', cell.getComputedStyle('height'));
+    });
+}

admin/report/customlang/renderer.php

@@ -76,6 +76,7 @@ class report_customlang_renderer extends plugin_renderer_base {
             $cells[1]->attributes['class'] = 'stringid';
             // master translation of the string
             $master = html_writer::tag('div', s($string->master), array('class' => 'preformatted'));
+            $minheight = strlen($string->master) / 200;
             if (preg_match('/\{\$a(->.+)?\}/', $string->master)) {
                 $master .= html_writer::tag('div', $this->help_icon('placeholder', 'report_customlang',
                         get_string('placeholderwarning', 'report_customlang')), array('class' => 'placeholderinfo'));
@@ -83,7 +84,11 @@ class report_customlang_renderer extends plugin_renderer_base {
             $cells[2] = new html_table_cell($master);
             $cells[2]->attributes['class'] = 'standard master';
             // local customization of the string
-            $textarea = html_writer::tag('textarea', s($string->local), array('name'=>'cust['.$string->id.']'));
+            $textareaattributes = array('name'=>'cust['.$string->id.']', 'cols'=>40, 'rows'=>3);
+            if ($minheight>1) {
+               $textareaattributes['style'] = 'min-height:' . (int) 4*$minheight . 'em;';
+            }
+            $textarea = html_writer::tag('textarea', s($string->local), $textareaattributes);
             $cells[3] = new html_table_cell($textarea);
             if (!is_null($string->local) and $string->outdated) {
                 $mark  = html_writer::empty_tag('input', array('type' => 'checkbox', 'id' => 'update_' . $string->id,

admin/report/customlang/styles.css

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

admin/report/customlang/version.php

@@ -24,5 +24,5 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version  = 2010111200;
-$plugin->requires = 2010111002;
+$plugin->version  = 2011041900;
+$plugin->requires = 2010120700;

admin/report/profiling/index.php

@@ -0,0 +1,186 @@
+<?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 profiling
+ * @copyright  2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+// TODO: Move all the DB stuff to profiling_db_xxxx() function in xhprof_moodle.php
+
+require_once(dirname(__FILE__).'/../../../config.php');
+require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir . '/xhprof/xhprof_moodle.php');
+
+define('PROFILING_RUNSPERPAGE', 50);
+
+// page parameters
+$script   = optional_param('script', null, PARAM_PATH);
+$runid    = optional_param('runid', null, PARAM_ALPHANUM);
+$runid2   = optional_param('runid2', null, PARAM_ALPHANUM);
+$listurl  = optional_param('listurl', null, PARAM_PATH);
+$runreference= optional_param('runreference', 0, PARAM_INT);
+$runcomment  = optional_param('runcomment', null, PARAM_TEXT);
+
+$dbfields = 'runid, url, totalexecutiontime, totalcputime, ' .
+            'totalcalls, totalmemory, runreference, runcomment, timecreated';
+
+admin_externalpage_setup('reportprofiling');
+
+// Always add listurl if available
+if ($listurl) {
+    $listurlnav = new moodle_url('/admin/report/profiling/index.php', array('listurl' => $listurl));
+    $PAGE->navbar->add($listurl, $listurlnav);
+}
+
+// Header
+echo $OUTPUT->header();
+
+// We have requested the last available run for one script
+if (isset($script)) {
+    // Get the last available run for the given script
+    $run = $DB->get_record_sql("SELECT $dbfields
+                                 FROM {profiling}
+                                WHERE url = ?
+                                  AND id = (SELECT MAX(id)
+                                              FROM {profiling}
+                                             WHERE url = ?)",
+                              array($script, $script), IGNORE_MISSING);
+
+    // No run found for script, warn and exit
+    if (!$run) {
+        notice(get_string('cannotfindanyrunforurl', 'report_profiling', $script), 'index.php');
+    }
+
+    // Check if there is any previous run marked as reference one
+    $prevreferences = $DB->get_records_select('profiling',
+                                              'url = ? AND runreference = 1 AND timecreated < ?',
+                                              array($run->url, $run->timecreated),
+                                              'timecreated DESC', 'runid', 0, 1);
+    $prevrunid = $prevreferences ? reset($prevreferences)->runid : false;
+    echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter');
+    $header = get_string('lastrunof', 'report_profiling', $script);
+    echo $OUTPUT->heading($header);
+    $table = profiling_print_run($run, $prevrunid);
+    echo $table;
+    echo $OUTPUT->box_end();
+
+
+// We have requested the diff between 2 runs
+} else if (isset($runid) && isset($runid2)) {
+    $run1 = $DB->get_record('profiling', array('runid'=>$runid), $dbfields, MUST_EXIST);
+    $run2 = $DB->get_record('profiling', array('runid'=>$runid2), $dbfields, MUST_EXIST);
+    if ($run1->url == $run2->url && $run1->runid != $run2->runid) {
+        if ($run2->timecreated < $run1->timecreated) {
+            $runtemp = $run1;
+            $run1 = $run2;
+            $run2 = $runtemp;
+        }
+        echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter');
+        $header = get_string('differencesbetween2runsof', 'report_profiling', $run1->url);
+        echo $OUTPUT->heading($header);
+        $table = profiling_print_rundiff($run1, $run2);
+        echo $table;
+        echo $OUTPUT->box_end();
+    }
+
+
+// We have requested one run, invoke it
+} else if (isset($runid)) {
+    // Check if we are trying to update the runreference/runcomment for the run
+    if (isset($runcomment) && confirm_sesskey()) {
+        $id = $DB->get_field('profiling', 'id', array('runid' => $runid), MUST_EXIST);
+        $rec = new stdClass();
+        $rec->id = $id;
+        $rec->runreference = (bool)$runreference;
+        $rec->runcomment   = $runcomment;
+        $DB->update_record('profiling', $rec);
+    }
+    // Get the requested runid
+    $run = $DB->get_record('profiling', array('runid'=>$runid), $dbfields, IGNORE_MISSING);
+
+    // No run found for runid, warn and exit
+    if (!$run) {
+        notice(get_string('cannotfindanyrunforrunid', 'report_profiling', $runid), 'index.php');
+    }
+
+    // Check if there is any previous run marked as reference one
+    $prevreferences = $DB->get_records_select('profiling',
+                                              'url = ? AND runreference = 1 AND timecreated < ?',
+                                              array($run->url, $run->timecreated),
+                                              'timecreated DESC', 'runid', 0, 1);
+    $prevrunid = $prevreferences ? reset($prevreferences)->runid : false;
+    echo $OUTPUT->box_start('generalbox boxwidthwide boxaligncenter');
+    $header = get_string('summaryof', 'report_profiling', $run->url);
+    echo $OUTPUT->heading($header);
+    $table = profiling_print_run($run, $prevrunid);
+    echo $table;
+    echo $OUTPUT->box_end();
+
+
+// Default: List one page of runs
+} else {
+
+    // The flexitable that will root listings
+    $table = new xhprof_table_sql('profiling-list-table');
+    $baseurl = $CFG->wwwroot . '/admin/report/profiling/index.php';
+
+    // Check if we are listing all or some URL ones
+    $sqlconditions = '';
+    $sqlparams = array();
+    if (!isset($listurl)) {
+        $header = get_string('pluginname', 'report_profiling');
+        $sqlconditions = '1 = 1';
+        $table->set_listurlmode(false);
+    } else {
+        $header =  get_string('profilingrunsfor', 'report_profiling', $listurl);
+        $sqlconditions = 'url = :url';
+        $sqlparams['url'] = $listurl;
+        $table->set_listurlmode(true);
+        $baseurl .= '?listurl=' . urlencode($listurl);
+    }
+
+    echo $OUTPUT->heading($header);
+
+    // TODO: Fix flexitable to validate tsort/thide/tshow/tifirs/tilast/page
+    // TODO: Fix table_sql to allow it to work without WHERE clause
+    // add silly condition (1 = 1) because of table_sql bug
+    $table->set_sql($dbfields, '{profiling}', $sqlconditions, $sqlparams);
+    $table->set_count_sql("SELECT COUNT(*) FROM {profiling} WHERE $sqlconditions", $sqlparams);
+    $columns = array(
+        'url', 'timecreated', 'totalexecutiontime', 'totalcputime',
+        'totalcalls', 'totalmemory', 'runcomment');
+    $headers = array(
+        get_string('url'), get_string('date'), get_string('executiontime', 'report_profiling'),
+        get_string('cputime', 'report_profiling'), get_string('calls', 'report_profiling'),
+        get_string('memory', 'report_profiling'), get_string('comment', 'report_profiling'));
+    $table->define_columns($columns);
+    $table->define_headers($headers);
+    $table->sortable(true, 'timecreated', SORT_DESC);
+    $table->define_baseurl($baseurl);
+    $table->column_suppress('url');
+    $table->out(PROFILING_RUNSPERPAGE, true);
+
+    // Print the controller block with different options
+    echo profiling_list_controls($listurl);
+}
+
+// Footer.
+echo $OUTPUT->footer();
+

admin/report/profiling/lang/en/report_profiling.php

@@ -0,0 +1,45 @@
+<?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/>.
+
+/**
+ * Strings for component 'report_profiling', language 'en', branch 'MOODLE_20_STABLE'
+ *
+ * @package   report_profiling
+ * @copyright 2010 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+$string['calls'] = 'Function calls';
+$string['cannotfindanyrunforurl'] = 'Sorry, cannot find any profiling run for the \'{$a}\' URL';
+$string['cannotfindanyrunforrunid'] = 'Sorry, cannot find the \'{$a}\' profiling run';
+$string['comment'] = 'Comment';
+$string['differencesbetween2runsof'] = 'Differences between 2 runs of {$a}';
+$string['executiontime'] = 'Execution time';
+$string['cputime'] = 'CPU time';
+$string['lastrunof'] = 'Summary of last run of {$a}';
+$string['markreferencerun'] = 'Mark as reference run/comment';
+$string['memory'] = 'Memory used';
+$string['pluginname'] = 'Profiling runs';
+$string['profilingfocusscript'] = 'Focus on profiling runs for the script: {$a}';
+$string['profilingruns'] = 'Profiling runs';
+$string['profilingrunsfor'] = 'Profiling runs for {$a}';
+$string['referencerun'] = 'Reference run/comment';
+$string['runid'] = 'Run ID';
+$string['summaryof'] = 'Summary of {$a}';
+$string['viewdetails'] = 'View profiling details';
+$string['viewdiff'] = 'View profiling differences with last reference run';
+$string['viewdiffdetails'] = 'View profiling diff details';

admin/report/profiling/settings.php

@@ -0,0 +1,8 @@
+<?php
+
+defined('MOODLE_INTERNAL') || die;
+
+// profiling report, added to development
+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'));
+}

admin/report/profiling/styles.css

@@ -0,0 +1,25 @@
+/* report_profiling styles */
+
+.path-admin-report-profiling .profilingruntable .label {
+    font-weight: bold;
+}
+.path-admin-report-profiling .profiling_worse {
+    color: red;
+}
+.path-admin-report-profiling .profiling_better {
+    color: green;
+}
+.path-admin-report-profiling .profiling_same {
+    color: dimgrey;
+}
+.path-admin-report-profiling .profiling_important,
+.path-admin-report-profiling .flexible .referencerun {
+    font-weight: bold;
+}
+.path-admin-report-profiling .flexible .r1 .cell {
+    background-color: whitesmoke;
+}
+.path-admin-report-profiling .flexible {
+    margin-left:auto;
+    margin-right:auto
+}

admin/report/questioninstances/index.php

@@ -15,15 +15,16 @@ require_once($CFG->libdir.'/questionlib.php');
 $requestedqtype = optional_param('qtype', '', PARAM_SAFEDIR);
 
 // Print the header & check permissions.
-admin_externalpage_setup('reportquestioninstances');
+admin_externalpage_setup('reportquestioninstances', '', null, '', array('pagelayout'=>'report'));
 echo $OUTPUT->header();
 
 // Log.
 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

admin/report/security/index.php

@@ -23,6 +23,8 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
+define('NO_OUTPUT_BUFFERING', true);
+
 require_once('../../../config.php');
 require_once($CFG->dirroot.'/'.$CFG->admin.'/report/security/lib.php');
 require_once($CFG->libdir.'/adminlib.php');
@@ -43,14 +45,12 @@ raise_memory_limit(MEMORY_EXTRA);
 @set_time_limit(0);
 
 // Print the header.
-admin_externalpage_setup('reportsecurity');
+admin_externalpage_setup('reportsecurity', '', null, '', array('pagelayout'=>'report'));
 echo $OUTPUT->header();
 
 echo $OUTPUT->heading(get_string('pluginname', 'report_security'));
 
 echo '<div id="timewarning">'.get_string('timewarning', 'report_security').'</div>';
-while(@ob_end_flush());
-@flush();
 
 $strok       = '<span class="statusok">'.get_string('statusok', 'report_security').'</span>';
 $strinfo     = '<span class="statusinfo">'.get_string('statusinfo', 'report_security').'</span>';

admin/report/spamcleaner/index.php

@@ -40,7 +40,7 @@ $reset = optional_param('reset', '', PARAM_RAW);
 $id = optional_param('id', '', PARAM_INT);
 
 require_login();
-admin_externalpage_setup('reportspamcleaner');
+admin_externalpage_setup('reportspamcleaner', '', null, '', array('pagelayout'=>'report'));
 
 // Delete one user
 if (!empty($del) && confirm_sesskey() && ($id != $USER->id)) {
@@ -151,25 +151,60 @@ 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%";
+        $keywordfull3[] = $DB->sql_like('p.subject', ':subpat'.$i, false);
+        $params['subpat'.$i] = "%$keyword%";
+        $keywordfull4[] = $DB->sql_like('c.content', ':contpat'.$i, false);
+        $params['contpat'.$i] = "%$keyword%";
+        $keywordfull5[] = $DB->sql_like('m.fullmessage', ':msgpat'.$i, false);
+        $params['msgpat'.$i] = "%$keyword%";
+        $keywordfull6[] = $DB->sql_like('fp.message', ':forumpostpat'.$i, false);
+        $params['forumpostpat'.$i] = "%$keyword%";
+        $keywordfull7[] = $DB->sql_like('fp.subject', ':forumpostsubpat'.$i, false);
+        $params['forumpostsubpat'.$i] = "%$keyword%";
+        $i++;
     }
     $conditions = '( '.implode(' OR ', $keywordfull).' )';
     $conditions2 = '( '.implode(' OR ', $keywordfull2).' )';
+    $conditions3 = '( '.implode(' OR ', $keywordfull3).' )';
+    $conditions4 = '( '.implode(' OR ', $keywordfull4).' )';
+    $conditions5 = '( '.implode(' OR ', $keywordfull5).' )';
+    $conditions6 = '( '.implode(' OR ', $keywordfull6).' )';
+    $conditions7 = '( '.implode(' OR ', $keywordfull7).' )';
 
     $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);
+    $sql3 = "SELECT u.*, p.subject as postsubject FROM {user} AS u, {post} AS p WHERE $conditions3 AND u.deleted = 0 AND u.id=p.userid AND u.id <> :userid";
+    $sql4 = "SELECT u.*, c.content FROM {user} AS u, {comments} AS c WHERE $conditions4 AND u.deleted = 0 AND u.id=c.userid AND u.id <> :userid";
+    $sql5 = "SELECT u.*, m.fullmessage FROM {user} AS u, {message} AS m WHERE $conditions5 AND u.deleted = 0 AND u.id=m.useridfrom AND u.id <> :userid";
+    $sql6 = "SELECT u.*, fp.message FROM {user} AS u, {forum_posts} AS fp WHERE $conditions6 AND u.deleted = 0 AND u.id=fp.userid AND u.id <> :userid";
+    $sql7 = "SELECT u.*, fp.subject FROM {user} AS u, {forum_posts} AS fp WHERE $conditions7 AND u.deleted = 0 AND u.id=fp.userid AND u.id <> :userid";
+
+    $spamusers_desc = $DB->get_recordset_sql($sql, $params);
+    $spamusers_blog = $DB->get_recordset_sql($sql2, $params);
+    $spamusers_blogsub = $DB->get_recordset_sql($sql3, $params);
+    $spamusers_comment = $DB->get_recordset_sql($sql4, $params);
+    $spamusers_message = $DB->get_recordset_sql($sql5, $params);
+    $spamusers_forumpost = $DB->get_recordset_sql($sql6, $params);
+    $spamusers_forumpostsub = $DB->get_recordset_sql($sql7, $params);
 
     $keywordlist = implode(', ', $keywords);
     echo $OUTPUT->box(get_string('spamresult', 'report_spamcleaner').s($keywordlist)).' ...';
 
-    print_user_list(array($spamusers_desc, $spamusers_blog), $keywords);
-
+    print_user_list(array($spamusers_desc,
+                          $spamusers_blog,
+                          $spamusers_blogsub,
+                          $spamusers_comment,
+                          $spamusers_message,
+                          $spamusers_forumpost,
+                          $spamusers_forumpostsub
+                         ),
+                         $keywords);
 }
 
 
@@ -210,7 +245,23 @@ function filter_user($user, $keywords, $count) {
     if (isset($user->summary)) {
         $user->description = '<h3>'.get_string('spamfromblog', 'report_spamcleaner').'</h3>'.$user->summary;
         unset($user->summary);
+    } else if (isset($user->postsubject)) {
+        $user->description = '<h3>'.get_string('spamfromblog', 'report_spamcleaner').'</h3>'.$user->postsubject;
+        unset($user->postsubject);
+    } else if (isset($user->content)) {
+        $user->description = '<h3>'.get_string('spamfromcomments', 'report_spamcleaner').'</h3>'.$user->content;
+        unset($user->content);
+    } else if (isset($user->fullmessage)) {
+        $user->description = '<h3>'.get_string('spamfrommessages', 'report_spamcleaner').'</h3>'.$user->fullmessage;
+        unset($user->fullmessage);
+    } else if (isset($user->message)) {
+        $user->description = '<h3>'.get_string('spamfromforumpost', 'report_spamcleaner').'</h3>'.$user->message;
+        unset($user->message);
+    } else if (isset($user->subject)) {
+        $user->description = '<h3>'.get_string('spamfromforumpost', 'report_spamcleaner').'</h3>'.$user->subject;
+        unset($user->subject);
     }
+
     if (preg_match('#<img.*src=[\"\']('.$CFG->wwwroot.')#', $user->description, $matches)
         && $image_search) {
         $result = false;

admin/report/spamcleaner/lang/en/report_spamcleaner.php

@@ -34,6 +34,9 @@ $string['spamdeleteconfirm'] = 'Are you sure you want to delete this entry?  You
 $string['spamdesc'] = 'Description';
 $string['spameg'] = 'eg:  casino, porn, xxx';
 $string['spamfromblog'] = 'From blog post:';
+$string['spamfromcomments'] = 'From comments:';
+$string['spamfrommessages'] = 'From messages:';
+$string['spamfromforumpost'] = 'From forum post:';
 $string['spaminvalidresult'] = 'Unknown but invalid result';
 $string['spamoperation'] = 'Operation';
 $string['spamresult'] = 'Results of searching user profiles containing:';

admin/report/spamcleaner/module.js

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

admin/report/unittest/dbtest.php

@@ -4,7 +4,8 @@
  * @package SimpleTestEx
  */
 
-/** */
+define('NO_OUTPUT_BUFFERING', true);
+
 require_once(dirname(__FILE__).'/../../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/simpletestcoveragelib.php');
@@ -68,9 +69,6 @@ for ($i=1; $i<=10; $i++) {
 }
 
 if (!empty($tests)) {
-    @ob_implicit_flush(true);
-    while(@ob_end_flush());
-
     $covreporter = new moodle_coverage_reporter('Functional DB Tests Code Coverage Report', 'dbtest');
     $covrecorder = new moodle_coverage_recorder($covreporter);
 

admin/report/unittest/ex_reporter.php

@@ -273,4 +273,9 @@ class ExHtmlReporter extends HtmlReporter {
     function get_string($identifier, $a = NULL) {
         return get_string($identifier, 'simpletest', $a);
     }
+
+    function _htmlEntities($message) {
+        // Override subclass message that breaks UTF8.
+        return s($message);
+    }
 }

admin/report/unittest/index.php

@@ -8,7 +8,8 @@
  * @package SimpleTestEx
  */
 
-/** */
+define('NO_OUTPUT_BUFFERING', true);
+
 require_once(dirname(__FILE__).'/../../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 require_once($CFG->libdir.'/simpletestcoveragelib.php');

admin/repositoryinstance.php

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

admin/roles/assign.php

@@ -232,7 +232,8 @@ $assignurl = new moodle_url($PAGE->url, array('roleid'=>$roleid));
     $select = new single_select($PAGE->url, 'roleid', $nameswithcounts, $roleid, null);
     $select->label = get_string('assignanotherrole', 'role');
     echo $OUTPUT->render($select);
-    echo '<p><a href="' . $PAGE->url . '">' . get_string('backtoallroles', 'role') . '</a></p>';
+    $backurl = new moodle_url('/admin/roles/assign.php', array('contextid' => $contextid));
+    echo '<p><a href="' . $backurl->out() . '">' . get_string('backtoallroles', 'role') . '</a></p>';
     echo '</div>';
 
 } else if (empty($assignableroles)) {

admin/roles/lib.php

@@ -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) {
@@ -780,8 +779,8 @@ class define_role_table_advanced extends capability_table_with_risks {
         global $OUTPUT;
         // Extra fields at the top of the page.
         echo '<div class="topfields clearfix">';
-        $this->print_field('name', get_string('name'), $this->get_name_field('name'));
-        $this->print_field('shortname', get_string('shortname'), $this->get_shortname_field('shortname'));
+        $this->print_field('name', get_string('rolefullname', 'role'), $this->get_name_field('name'));
+        $this->print_field('shortname', get_string('roleshortname', 'role'), $this->get_shortname_field('shortname'));
         $this->print_field('edit-description', get_string('description'), $this->get_description_field('description'));
         $this->print_field('menuarchetype', get_string('archetype', 'role').'&nbsp;'.$OUTPUT->help_icon('archetype', 'role'), $this->get_archetype_field('archetype'));
         $this->print_field('', get_string('maybeassignedin', 'role'), $this->get_assignable_levels_control());
@@ -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();
     }
 
     /**

admin/roles/manage.php

@@ -194,7 +194,7 @@
     $table->head = array(
         get_string('role') . ' ' . $OUTPUT->help_icon('roles', 'role'),
         get_string('description'),
-        get_string('shortname'),
+        get_string('roleshortname', 'role'),
         get_string('edit')
     );
 

admin/roles/module.js

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

admin/roles/override.php

@@ -50,8 +50,10 @@ if ($course) {
 
 // security first
 require_login($course, false, $cm);
+$safeoverridesonly = false;
 if (!has_capability('moodle/role:override', $context)) {
     require_capability('moodle/role:safeoverride', $context);
+    $safeoverridesonly = true;
 }
 $PAGE->set_url($url);
 $PAGE->set_context($context);
@@ -119,7 +121,7 @@ if (empty($overridableroles[$roleid])) {
 }
 
 // If we are actually overriding a role, create the table object, and save changes if appropriate.
-$overridestable = new override_permissions_table_advanced($context, $roleid, false);
+$overridestable = new override_permissions_table_advanced($context, $roleid, $safeoverridesonly);
 $overridestable->read_submitted_permissions();
 
 if (optional_param('savechanges', false, PARAM_BOOL) && confirm_sesskey()) {

admin/roles/usersroles.php

@@ -54,6 +54,17 @@ if (!$canview) {
     print_error('nopermissions', 'error', '', get_string('checkpermissions', 'role'));
 }
 
+if ($userid != $USER->id) {
+    // If its not the current user we need to extend the navigation for that user to ensure
+    // their navigation is loaded and this page found upon it.
+    $PAGE->navigation->extend_for_user($user);
+}
+if ($course->id != $SITE->id || $userid != $USER->id) {
+    // If we're within a course OR if we're viewing another user then we need to include the
+    // settings base on the navigation to ensure that the navbar will contain the users name.
+    $PAGE->navbar->includesettingsbase = true;
+}
+
 /// Now get the role assignments for this user.
 $sql = "SELECT
         ra.id, ra.userid, ra.contextid, ra.roleid, ra.component, ra.itemid,
@@ -119,14 +130,9 @@ $title = get_string('xroleassignments', 'role', $fullname);
 $PAGE->set_title($title);
 if ($courseid != SITEID) {
     $PAGE->set_heading($fullname);
-    if (has_capability('moodle/course:viewparticipants', $coursecontext)) {
-        $PAGE->navbar->add(get_string('participants'),new moodle_url('/user/index.php', array('id'=>$courseid)));
-    }
 } else {
     $PAGE->set_heading($course->fullname);
 }
-$PAGE->navbar->add($fullname, new moodle_url("$CFG->wwwroot/user/view.php", array('id'=>$userid,'course'=>$courseid)));
-$PAGE->navbar->add($straction);
 echo $OUTPUT->header();
 echo $OUTPUT->heading($title, 3);
 echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal');

admin/settings.php

@@ -98,13 +98,13 @@ if (empty($SITE->fullname)) {
             $url->param('adminedit', 'on');
         }
         $buttons = $OUTPUT->single_button($url, $caption, 'get');
+        $PAGE->set_button($buttons);
     }
 
     $visiblepathtosection = array_reverse($settingspage->visiblepath);
 
     $PAGE->set_title("$SITE->shortname: " . implode(": ",$visiblepathtosection));
     $PAGE->set_heading($SITE->fullname);
-    $PAGE->set_button($buttons);
     echo $OUTPUT->header();
 
     if ($errormsg !== '') {

admin/settings/appearance.php

@@ -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'));
 
@@ -54,8 +56,16 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
             6 => get_string('saturday', 'calendar')
         )));
     $temp->add(new admin_setting_special_calendar_weekend());
-    $temp->add(new admin_setting_configtext('calendar_lookahead',get_string('configlookahead','admin'),get_string('helpupcominglookahead', 'admin'),21,PARAM_INT));
-    $temp->add(new admin_setting_configtext('calendar_maxevents',get_string('configmaxevents','admin'),get_string('helpupcomingmaxevents', 'admin'),10,PARAM_INT));
+    $options = array();
+    for ($i=1; $i<=99; $i++) {
+        $options[$i] = $i;
+    }
+    $temp->add(new admin_setting_configselect('calendar_lookahead',get_string('configlookahead','admin'),get_string('helpupcominglookahead', 'admin'),21,$options));
+    $options = array();
+    for ($i=1; $i<=20; $i++) {
+        $options[$i] = $i;
+    }
+    $temp->add(new admin_setting_configselect('calendar_maxevents',get_string('configmaxevents','admin'),get_string('helpupcomingmaxevents', 'admin'),10,$options));
     $temp->add(new admin_setting_configcheckbox('enablecalendarexport', get_string('enablecalendarexport', 'admin'), get_string('configenablecalendarexport','admin'), 1));
     $temp->add(new admin_setting_configtext('calendar_exportsalt', get_string('calendarexportsalt','admin'), get_string('configcalendarexportsalt', 'admin'), random_string(60)));
     $ADMIN->add('appearance', $temp);
@@ -63,10 +73,10 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     // blog
     $temp = new admin_settingpage('blog', get_string('blog','blog'));
     $temp->add(new admin_setting_configcheckbox('useblogassociations', get_string('useblogassociations', 'blog'), get_string('configuseblogassociations','blog'), 1));
-    $temp->add(new admin_setting_bloglevel('bloglevel', get_string('bloglevel', 'admin'), get_string('configbloglevel', 'admin'), 4, array(5 => get_string('worldblogs','blog'),
-                                                                                                                                              4 => get_string('siteblogs','blog'),
-                                                                                                                                              1 => get_string('personalblogs','blog'),
-                                                                                                                                              0 => get_string('disableblogs','blog'))));
+    $temp->add(new admin_setting_bloglevel('bloglevel', get_string('bloglevel', 'admin'), get_string('configbloglevel', 'admin'), 4, array(BLOG_GLOBAL_LEVEL => get_string('worldblogs','blog'),
+                                                                                                                                           BLOG_SITE_LEVEL => get_string('siteblogs','blog'),
+                                                                                                                                           BLOG_USER_LEVEL => get_string('personalblogs','blog'),
+                                                                                                                                           0 => get_string('disableblogs','blog'))));
     $temp->add(new admin_setting_configcheckbox('useexternalblogs', get_string('useexternalblogs', 'blog'), get_string('configuseexternalblogs','blog'), 1));
     $temp->add(new admin_setting_configselect('externalblogcrontime', get_string('externalblogcrontime', 'blog'), get_string('configexternalblogcrontime', 'blog'), 86400,
         array(43200 => get_string('numhours', '', 12),
@@ -131,5 +141,12 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     // link to tag management interface
     $ADMIN->add('appearance', new admin_externalpage('managetags', get_string('managetags', 'tag'), "$CFG->wwwroot/tag/manage.php"));
 
+    $temp = new admin_settingpage('additionalhtml', get_string('additionalhtml', 'admin'));
+    $temp->add(new admin_setting_heading('additionalhtml_heading', get_string('additionalhtml_heading', 'admin'), get_string('additionalhtml_desc', 'admin')));
+    $temp->add(new admin_setting_configtextarea('additionalhtmlhead', get_string('additionalhtmlhead', 'admin'), get_string('additionalhtmlhead_desc', 'admin'), '', PARAM_RAW));
+    $temp->add(new admin_setting_configtextarea('additionalhtmltopofbody', get_string('additionalhtmltopofbody', 'admin'), get_string('additionalhtmltopofbody_desc', 'admin'), '', PARAM_RAW));
+    $temp->add(new admin_setting_configtextarea('additionalhtmlfooter', get_string('additionalhtmlfooter', 'admin'), get_string('additionalhtmlfooter_desc', 'admin'), '', PARAM_RAW));
+    $ADMIN->add('appearance', $temp);
+
 } // end of speedup
 

admin/settings/courses.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));
@@ -92,12 +92,32 @@ if ($hassiteconfig
     // Add a category for backups
     $ADMIN->add('courses', new admin_category('backups', get_string('backups','admin')));
 
-    // Create a page for general backup defaults
+    // Create a page for general backups configuration and defaults.
     $temp = new admin_settingpage('backupgeneralsettings', get_string('generalbackdefaults', 'backup'), 'moodle/backup:backupcourse');
+
+    // General configuration section.
+    $temp->add(new admin_setting_configselect('backup/loglifetime', get_string('loglifetime', 'backup'), get_string('configloglifetime', 'backup'), 30, array(
+        1   => get_string('numdays', '', 1),
+        2   => get_string('numdays', '', 2),
+        3   => get_string('numdays', '', 3),
+        5   => get_string('numdays', '', 5),
+        7   => get_string('numdays', '', 7),
+        10  => get_string('numdays', '', 10),
+        14  => get_string('numdays', '', 14),
+        20  => get_string('numdays', '', 20),
+        30  => get_string('numdays', '', 30),
+        60  => get_string('numdays', '', 60),
+        90  => get_string('numdays', '', 90),
+        120 => get_string('numdays', '', 120),
+        180 => get_string('numdays', '', 180),
+        365 => get_string('numdays', '', 365)
+    )));
+
+    // General defaults section.
+    $temp->add(new admin_setting_heading('generalsettings', get_string('generalsettings', 'backup'), ''));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_users', get_string('generalusers','backup'), get_string('configgeneralusers','backup'), array('value'=>1, 'locked'=>0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_anonymize', get_string('generalanonymize','backup'), get_string('configgeneralanonymize','backup'), array('value'=>0, 'locked'=>0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_role_assignments', get_string('generalroleassignments','backup'), get_string('configgeneralroleassignments','backup'), array('value'=>1, 'locked'=>0)));
-    $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_user_files', get_string('generaluserfiles','backup'), get_string('configgeneraluserfiles','backup'), array('value'=>1, 'locked'=>0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_activities', get_string('generalactivities','backup'), get_string('configgeneralactivities','backup'), array('value'=>1, 'locked'=>0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_blocks', get_string('generalblocks','backup'), get_string('configgeneralblocks','backup'), array('value'=>1, 'locked'=>0)));
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_filters', get_string('generalfilters','backup'), get_string('configgeneralfilters','backup'), array('value'=>1, 'locked'=>0)));
@@ -107,8 +127,10 @@ if ($hassiteconfig
     $temp->add(new admin_setting_configcheckbox_with_lock('backup/backup_general_histories', get_string('generalhistories','backup'), get_string('configgeneralhistories','backup'), array('value'=>0, 'locked'=>0)));
     $ADMIN->add('backups', $temp);
 
-/// "backups" settingpage
+    // Create a page for automated backups configuration and defaults.
     $temp = new admin_settingpage('automated', get_string('automatedsetup','backup'), 'moodle/backup:backupcourse');
+
+    // Automated configuration section.
     $temp->add(new admin_setting_configselect('backup/backup_auto_active', get_string('active'),  get_string('autoactivedescription', 'backup'), 0, array(
         0 => get_string('autoactivedisabled', 'backup'),
         1 => get_string('autoactiveenabled', 'backup'),
@@ -139,21 +161,21 @@ 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_configcheckbox('backup/backup_shortname', get_string('backup_shortname', 'admin'), get_string('backup_shortnamehelp', 'admin'), 0));
 
+    // Automated defaults section.
     $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));
     $temp->add(new admin_setting_configcheckbox('backup/backup_auto_blocks', get_string('generalblocks','backup'), get_string('configgeneralblocks','backup'), 1));
     $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));
 

admin/settings/development.php

@@ -12,17 +12,16 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $englobalsearch = new admin_setting_configcheckbox('enableglobalsearch', get_string('enableglobalsearch', 'admin'), get_string('configenableglobalsearch', 'admin'), 0);
     $englobalsearch->set_updatedcallback('search_updatedcallback');
     $temp->add($englobalsearch);
-
-    $temp->add(new admin_setting_configcheckbox('experimentalsplitrestore', get_string('experimentalsplitrestore', 'admin'), get_string('configexperimentalsplitrestore', 'admin'), 0));
-    $temp->add(new admin_setting_configcheckbox('enableimsccimport', get_string('enable_cc_import', 'imscc'), get_string('enable_cc_import_description', 'imscc'), 0));
+    //TODO: Re-enable cc-import once re-implemented in 2.0.x
+    //$temp->add(new admin_setting_configcheckbox('enableimsccimport', get_string('enable_cc_import', 'imscc'), get_string('enable_cc_import_description', 'imscc'), 0));
     $temp->add(new admin_setting_configcheckbox('enablesafebrowserintegration', get_string('enablesafebrowserintegration', 'admin'), get_string('configenablesafebrowserintegration', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('enablegroupmembersonly', get_string('enablegroupmembersonly', 'admin'), get_string('configenablegroupmembersonly', 'admin'), 0));
 
     $ADMIN->add('experimental', $temp);
 
     // DB transfer related pages
-    $ADMIN->add('experimental', new admin_externalpage('dbtransfer', get_string('dbtransfer', 'dbtransfer'), $CFG->wwwroot.'/'.$CFG->admin.'/dbtransfer/index.php', 'moodle/site:config'));
-    $ADMIN->add('experimental', new admin_externalpage('dbexport', get_string('dbexport', 'dbtransfer'), $CFG->wwwroot.'/'.$CFG->admin.'/dbtransfer/dbexport.php', 'moodle/site:config'));
+    $ADMIN->add('experimental', new admin_externalpage('dbtransfer', get_string('dbtransfer', 'dbtransfer'), $CFG->wwwroot.'/'.$CFG->admin.'/dbtransfer/index.php', 'moodle/site:config', true));
+    $ADMIN->add('experimental', new admin_externalpage('dbexport', get_string('dbexport', 'dbtransfer'), $CFG->wwwroot.'/'.$CFG->admin.'/dbtransfer/dbexport.php', 'moodle/site:config', true));
 
     // "debugging" settingpage
     $temp = new admin_settingpage('debugging', get_string('debugging', 'admin'));
@@ -36,6 +35,44 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add(new admin_setting_configcheckbox('debugpageinfo', get_string('debugpageinfo', 'admin'), get_string('configdebugpageinfo', 'admin'), 0));
     $ADMIN->add('development', $temp);
 
+    // "profiling" settingpage (conditionally if the 'xhprof' extension is available only)
+    if (extension_loaded('xhprof') && function_exists('xhprof_enable')) {
+        $temp = new admin_settingpage('profiling', get_string('profiling', 'admin'));
+        // Main profiling switch
+        $temp->add(new admin_setting_configcheckbox('profilingenabled', get_string('profilingenabled', 'admin'), get_string('profilingenabled_help', 'admin'), false));
+        // List of URLs that will be automatically profiled
+        $temp->add(new admin_setting_configtextarea('profilingincluded', get_string('profilingincluded', 'admin'), get_string('profilingincluded_help', 'admin'), ''));
+        // List of URLs that won't be profiled ever
+        $temp->add(new admin_setting_configtextarea('profilingexcluded', get_string('profilingexcluded', 'admin'), get_string('profilingexcluded_help', 'admin'), ''));
+        // Allow random profiling each XX requests
+        $temp->add(new admin_setting_configtext('profilingautofrec', get_string('profilingautofrec', 'admin'), get_string('profilingautofrec_help', 'admin'), 0, PARAM_INT));
+        // Allow PROFILEME/DONTPROFILEME GPC
+        $temp->add(new admin_setting_configcheckbox('profilingallowme', get_string('profilingallowme', 'admin'), get_string('profilingallowme_help', 'admin'), false));
+        // Allow PROFILEALL/PROFILEALLSTOP GPC
+        $temp->add(new admin_setting_configcheckbox('profilingallowall', get_string('profilingallowall', 'admin'), get_string('profilingallowall_help', 'admin'), false));
+        // TODO: Allow to skip PHP functions (XHPROF_FLAGS_NO_BUILTINS)
+        // TODO: Allow to skip call_user functions (ignored_functions array)
+        // Specify the life time (in minutes) of profiling runs
+        $temp->add(new admin_setting_configselect('profilinglifetime', get_string('profilinglifetime', 'admin'), get_string('profilinglifetime_help', 'admin'), 24*60, array(
+             0 => get_string('neverdeleteruns', 'admin'),
+      30*24*60 => get_string('numdays', '', 30),
+      15*24*60 => get_string('numdays', '', 15),
+       7*24*60 => get_string('numdays', '', 7),
+       4*24*60 => get_string('numdays', '', 4),
+       2*24*60 => get_string('numdays', '', 2),
+         24*60 => get_string('numhours', '', 24),
+         16*80 => get_string('numhours', '', 16),
+          8*60 => get_string('numhours', '', 8),
+          4*60 => get_string('numhours', '', 4),
+          2*60 => get_string('numhours', '', 2),
+            60 => get_string('numminutes', '', 60),
+            30 => get_string('numminutes', '', 30),
+            15 => get_string('numminutes', '', 15))));
+
+        // Add the 'profiling' page to admin block
+        $ADMIN->add('development', $temp);
+    }
+
 
     // XMLDB editor
     $ADMIN->add('development', new admin_externalpage('xmldbeditor', get_string('xmldbeditor'), "$CFG->wwwroot/$CFG->admin/xmldb/"));

admin/settings/frontpage.php

@@ -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);
 
@@ -68,7 +77,7 @@ if (!during_initial_install()) { //do not use during installation
 
         $ADMIN->add('frontpage', new admin_externalpage('frontpagebackup', get_string('frontpagebackup', 'admin'), $CFG->wwwroot.'/backup/backup.php?id='.SITEID, 'moodle/backup:backupcourse', false, $frontpagecontext));
 
-        $ADMIN->add('frontpage', new admin_externalpage('frontpagerestore', get_string('frontpagerestore', 'admin'), $CFG->wwwroot.'/files/index.php?id='.SITEID.'&wdir=/backupdata', 'moodle/restore:restorecourse', false, $frontpagecontext));
+        $ADMIN->add('frontpage', new admin_externalpage('frontpagerestore', get_string('frontpagerestore', 'admin'), $CFG->wwwroot.'/backup/restorefile.php?contextid='.$frontpagecontext->id, 'moodle/restore:restorecourse', false, $frontpagecontext));
 
         $questioncapabilities = array(
                 'moodle/question:add',

admin/settings/language.php

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

admin/settings/location.php

@@ -10,6 +10,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $options[99] = get_string('timezonenotforced', 'admin');
     $temp->add(new admin_setting_configselect('forcetimezone', get_string('forcetimezone', 'admin'), get_string('helpforcetimezone', 'admin'), 99, $options));
     $temp->add(new admin_settings_country_select('country', get_string('country', 'admin'), get_string('configcountry', 'admin'), 0));
+    $temp->add(new admin_setting_configtext('defaultcity', get_string('defaultcity', 'admin'), get_string('defaultcity_help', 'admin'), ''));
 
     $temp->add(new admin_setting_heading('iplookup', get_string('iplookup', 'admin'), get_string('iplookupinfo', 'admin')));
     $temp->add(new admin_setting_configfile('geoipfile', get_string('geoipfile', 'admin'), get_string('configgeoipfile', 'admin', $CFG->dataroot.'/geoip/'), $CFG->dataroot.'/geoip/GeoLiteCity.dat'));

admin/settings/mnet.php

@@ -22,6 +22,9 @@ if (isset($CFG->mnet_dispatcher_mode) and $CFG->mnet_dispatcher_mode !== 'off')
 
     $hosts = mnet_get_hosts();
     foreach ($hosts as $host) {
+        if ($host->id == $CFG->mnet_all_hosts_id) {
+            $host->name = get_string('allhosts', 'core_mnet');
+        }
         $ADMIN->add('mnetpeercat',
             new admin_externalpage(
                 'mnetpeer' . $host->id,

admin/settings/plugins.php

@@ -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);
@@ -367,18 +396,21 @@ if ($hassiteconfig) {
     }
     $ADMIN->add('webservicesettings', $temp);
 
-
+// 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());
-    require_once($CFG->libdir . '/questionlib.php');
-    global $QTYPES;
-    foreach ($QTYPES as $qtype) {
-        $settingsfile = $qtype->plugin_dir() . '/settings.php';
+    $qtypes = get_plugin_list('qtype');
+    foreach ($qtypes as $qtype => $path) {
+        $settingsfile = $path . '/settings.php';
         if (file_exists($settingsfile)) {
-            $settings = new admin_settingpage('qtypesetting' . $qtype->name(),
-                    $qtype->local_name(), 'moodle/question:config');
+            $settings = new admin_settingpage('qtypesetting' . $qtype,
+                    get_string('pluginname', 'qtype_' . $qtype), 'moodle/question:config');
             include($settingsfile);
             if ($settings) {
                 $ADMIN->add('qtypesettings', $settings);
@@ -386,6 +418,8 @@ if ($hassiteconfig || has_capability('moodle/question:config', $systemcontext))
         }
     }
 }
+
+// Plagiarism plugin settings
 if ($hassiteconfig && !empty($CFG->enableplagiarism)) {
     $ADMIN->add('modules', new admin_category('plagiarism', get_string('plagiarism', 'plagiarism')));
     $temp = new admin_settingpage('plagiarismsettings', get_string('plagiarismsettings', 'plagiarism'));
@@ -398,8 +432,31 @@ if ($hassiteconfig && !empty($CFG->enableplagiarism)) {
     }
 }
 $ADMIN->add('reports', new admin_externalpage('comments', get_string('comments'), $CFG->wwwroot.'/comment/', 'moodle/site:viewreports'));
-/// Now add reports
 
+// Course reports settings
+if ($hassiteconfig) {
+    $pages = array();
+    foreach (get_plugin_list('coursereport') as $report => $path) {
+        $file = $CFG->dirroot . '/course/report/' . $report . '/settings.php';
+        if (file_exists($file)) {
+            $settings = new admin_settingpage('coursereport' . $report,
+                    get_string('pluginname', 'coursereport_' . $report), 'moodle/site:config');
+            // settings.php may create a subcategory or unset the settings completely
+            include($file);
+            if ($settings) {
+                $pages[] = $settings;
+            }
+        }
+    }
+    if (!empty($pages)) {
+        $ADMIN->add('modules', new admin_category('coursereports', get_string('coursereports')));
+        foreach ($pages as $page) {
+            $ADMIN->add('coursereports', $page);
+        }
+    }
+}
+
+// Now add reports
 foreach (get_plugin_list('report') as $plugin => $plugindir) {
     $settings_path = "$plugindir/settings.php";
     if (file_exists($settings_path)) {

admin/settings/security.php

@@ -16,6 +16,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add(new admin_setting_configcheckbox('protectusernames', get_string('protectusernames', 'admin'), get_string('configprotectusernames', 'admin'), 1));
     $temp->add(new admin_setting_configcheckbox('forcelogin', get_string('forcelogin', 'admin'), get_string('configforcelogin', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('forceloginforprofiles', get_string('forceloginforprofiles', 'admin'), get_string('configforceloginforprofiles', 'admin'), 1));
+    $temp->add(new admin_setting_configcheckbox('forceloginforprofileimage', get_string('forceloginforprofileimage', 'admin'), get_string('forceloginforprofileimage_help', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('opentogoogle', get_string('opentogoogle', 'admin'), get_string('configopentogoogle', 'admin'), 0));
     $temp->add(new admin_setting_pickroles('profileroles',
         get_string('profileroles','admin'),
@@ -71,6 +72,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);
 
 
@@ -82,6 +84,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $temp->add(new admin_setting_configcheckbox('cookiesecure', get_string('cookiesecure', 'admin'), get_string('configcookiesecure', 'admin'), 0));
     $temp->add(new admin_setting_configcheckbox('cookiehttponly', get_string('cookiehttponly', 'admin'), get_string('configcookiehttponly', 'admin'), 0));
     $temp->add(new admin_setting_configtext('excludeoldflashclients', get_string('excludeoldflashclients', 'admin'), get_string('configexcludeoldflashclients', 'admin'), '10.0.12', PARAM_TEXT));
+    $temp->add(new admin_setting_configcheckbox('loginpasswordautocomplete', get_string('loginpasswordautocomplete', 'admin'), get_string('loginpasswordautocomplete_help', 'admin'), 0));
     $ADMIN->add('security', $temp);
 
 
@@ -91,14 +94,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);
 
 

admin/settings/server.php

@@ -12,50 +12,13 @@ $temp->add(new admin_setting_configselect('gdversion', get_string('gdversion','a
                                                                                                                                                           '2' => get_string('gd2'))));
 $temp->add(new admin_setting_configexecutable('pathtodu', get_string('pathtodu', 'admin'), get_string('configpathtodu', 'admin'), ''));
 $temp->add(new admin_setting_configexecutable('aspellpath', get_string('aspellpath', 'admin'), get_string('edhelpaspellpath'), ''));
+$temp->add(new admin_setting_configexecutable('pathtodot', get_string('pathtodot', 'admin'), get_string('pathtodot_help', 'admin'), ''));
 $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;
@@ -72,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));
@@ -226,6 +178,8 @@ $ADMIN->add('server', new admin_externalpage('phpinfo', get_string('phpinfo'), "
 // "performance" settingpage
 $temp = new admin_settingpage('performance', get_string('performance', 'admin'));
 
+$temp->add(new admin_setting_configtext('numcoursesincombo', get_string('numcoursesincombo', 'admin'), get_string('numcoursesincombo_help', 'admin'), 500));
+
 $temp->add(new admin_setting_configselect('extramemorylimit', get_string('extramemorylimit', 'admin'),
                                           get_string('configextramemorylimit', 'admin'), '512M',
                                           // if this option is set to 0, default 128M will be used
@@ -238,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'), '',
@@ -265,5 +221,6 @@ $ADMIN->add('server', $temp);
 
 
 $ADMIN->add('server', new admin_externalpage('adminregistration', get_string('registration','admin'), "$CFG->wwwroot/$CFG->admin/registration/index.php"));
+$ADMIN->add('root', new admin_externalpage('bloglevelupgrade', get_string('bloglevelupgrade', 'admin'), $CFG->wwwroot.'/'.$CFG->admin.'/blocklevelupgrade.php', 'moodle/site:config', true));
 
 } // end of speedup

admin/settings/subsystems.php

@@ -37,13 +37,10 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
     $optionalsubsystems->add(new admin_setting_configcheckbox('enablecompletion',
         get_string('enablecompletion','completion'),
         get_string('configenablecompletion','completion'), 0));
-    $optionalsubsystems->add(new admin_setting_pickroles('progresstrackedroles',
-        get_string('progresstrackedroles','completion'),
-        get_string('configprogresstrackedroles', 'completion'),
-        array('student')));
-    $optionalsubsystems->add(new admin_setting_configcheckbox('enableavailability',
+    $optionalsubsystems->add($checkbox = new admin_setting_configcheckbox('enableavailability',
         get_string('enableavailability','condition'),
         get_string('configenableavailability','condition'), 0));
+    $checkbox->set_affects_modinfo(true);
 
     $optionalsubsystems->add(new admin_setting_configcheckbox('enableplagiarism', get_string('enableplagiarism','plagiarism'), get_string('configenableplagiarism','plagiarism'), 0));
 }

admin/settings/users.php

@@ -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('configcreatornewroleid', 'admin'), $defaultteacherid, $creatornewroles));
+                          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));

admin/timezone.php

@@ -9,6 +9,9 @@
          $zone = clean_param($zone, PARAM_PATH);
     }
 
+    $PAGE->set_url('/admin/timezone.php');
+    $PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));
+
     require_login();
 
     require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
@@ -18,7 +21,6 @@
     $strusers = get_string("users");
     $strall = get_string("all");
 
-    $PAGE->set_url('/admin/timezone.php');
     $PAGE->set_title($strtimezone);
     $PAGE->set_heading($strtimezone);
     $PAGE->navbar->add($strtimezone);

admin/timezoneimport.php

@@ -89,7 +89,7 @@
 /// That's it!
 
     if ($importdone) {
-        $a = null;
+        $a = new stdClass();
         $a->count = count($timezones);
         $a->source  = $importdone;
         echo $OUTPUT->heading(get_string('importtimezonescount', 'admin', $a), 3);

admin/uploaduser_form.php

@@ -1,16 +1,44 @@
 <?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/>.
 
-if (!defined('MOODLE_INTERNAL')) {
-    die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
-}
+/**
+ * Bulk user upload forms
+ *
+ * @package    core
+ * @subpackage admin
+ * @copyright  2007 Dan Poltawski
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
 
 require_once $CFG->libdir.'/formslib.php';
 
-class admin_uploaduser_form1 extends moodleform {
-    function definition (){
-        global $CFG, $USER;
 
-        $mform =& $this->_form;
+/**
+ * Upload a file CVS file with user information.
+ *
+ * @package    core
+ * @subpackage admin
+ * @copyright  2007 Petr Skoda  {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class admin_uploaduser_form1 extends moodleform {
+    function definition () {
+        $mform = $this->_form;
 
         $mform->addElement('header', 'settingsheader', get_string('upload'));
 
@@ -36,69 +64,90 @@ class admin_uploaduser_form1 extends moodleform {
         $mform->addElement('select', 'previewrows', get_string('rowpreviewnum', 'admin'), $choices);
         $mform->setType('previewrows', PARAM_INT);
 
-        $choices = array(UU_ADDNEW    => get_string('uuoptype_addnew', 'admin'),
-                         UU_ADDINC    => get_string('uuoptype_addinc', 'admin'),
-                         UU_ADD_UPDATE => get_string('uuoptype_addupdate', 'admin'),
-                         UU_UPDATE     => get_string('uuoptype_update', 'admin'));
-        $mform->addElement('select', 'uutype', get_string('uuoptype', 'admin'), $choices);
-
         $this->add_action_buttons(false, get_string('uploadusers', 'admin'));
     }
 }
 
+
+/**
+ * Specify user upload details
+ *
+ * @package    core
+ * @subpackage admin
+ * @copyright  2007 Petr Skoda  {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 class admin_uploaduser_form2 extends moodleform {
-    function definition (){
+    function definition () {
         global $CFG, $USER;
 
-        $mform   =& $this->_form;
-        $columns =& $this->_customdata;
+        $mform   = $this->_form;
+        $columns = $this->_customdata['columns'];
+        $data    = $this->_customdata['data'];
 
         // I am the template user, why should it be the administrator? we have roles now, other ppl may use this script ;-)
         $templateuser = $USER;
 
         // upload settings and file
         $mform->addElement('header', 'settingsheader', get_string('settings'));
-        $mform->addElement('static', 'uutypelabel', get_string('uuoptype', 'admin') );
+
+        $choices = array(UU_USER_ADDNEW     => get_string('uuoptype_addnew', 'admin'),
+                         UU_USER_ADDINC     => get_string('uuoptype_addinc', 'admin'),
+                         UU_USER_ADD_UPDATE => get_string('uuoptype_addupdate', 'admin'),
+                         UU_USER_UPDATE     => get_string('uuoptype_update', 'admin'));
+        $mform->addElement('select', 'uutype', get_string('uuoptype', 'admin'), $choices);
 
         $choices = array(0 => get_string('infilefield', 'auth'), 1 => get_string('createpasswordifneeded', 'auth'));
         $mform->addElement('select', 'uupasswordnew', get_string('uupasswordnew', 'admin'), $choices);
         $mform->setDefault('uupasswordnew', 1);
-        $mform->disabledIf('uupasswordnew', 'uutype', 'eq', UU_UPDATE);
+        $mform->disabledIf('uupasswordnew', 'uutype', 'eq', UU_USER_UPDATE);
 
-        $choices = array(0 => get_string('nochanges', 'admin'),
-                         1 => get_string('uuupdatefromfile', 'admin'),
-                         2 => get_string('uuupdateall', 'admin'),
-                         3 => get_string('uuupdatemissing', 'admin'));
+        $choices = array(UU_UPDATE_NOCHANGES    => get_string('nochanges', 'admin'),
+                         UU_UPDATE_FILEOVERRIDE => get_string('uuupdatefromfile', 'admin'),
+                         UU_UPDATE_ALLOVERRIDE  => get_string('uuupdateall', 'admin'),
+                         UU_UPDATE_MISSING      => get_string('uuupdatemissing', 'admin'));
         $mform->addElement('select', 'uuupdatetype', get_string('uuupdatetype', 'admin'), $choices);
-        $mform->setDefault('uuupdatetype', 0);
-        $mform->disabledIf('uuupdatetype', 'uutype', 'eq', UU_ADDNEW);
-        $mform->disabledIf('uuupdatetype', 'uutype', 'eq', UU_ADDINC);
+        $mform->setDefault('uuupdatetype', UU_UPDATE_NOCHANGES);
+        $mform->disabledIf('uuupdatetype', 'uutype', 'eq', UU_USER_ADDNEW);
+        $mform->disabledIf('uuupdatetype', 'uutype', 'eq', UU_USER_ADDINC);
 
         $choices = array(0 => get_string('nochanges', 'admin'), 1 => get_string('update'));
         $mform->addElement('select', 'uupasswordold', get_string('uupasswordold', 'admin'), $choices);
         $mform->setDefault('uupasswordold', 0);
-        $mform->disabledIf('uupasswordold', 'uutype', 'eq', UU_ADDNEW);
-        $mform->disabledIf('uupasswordold', 'uutype', 'eq', UU_ADDINC);
+        $mform->disabledIf('uupasswordold', 'uutype', 'eq', UU_USER_ADDNEW);
+        $mform->disabledIf('uupasswordold', 'uutype', 'eq', UU_USER_ADDINC);
         $mform->disabledIf('uupasswordold', 'uuupdatetype', 'eq', 0);
         $mform->disabledIf('uupasswordold', 'uuupdatetype', 'eq', 3);
 
+        $choices = array(UU_PWRESET_WEAK => get_string('usersweakpassword', 'admin'),
+                         UU_PWRESET_NONE => get_string('none'),
+                         UU_PWRESET_ALL  => get_string('all'));
+        if (empty($CFG->passwordpolicy)) {
+            unset($choices[UU_PWRESET_WEAK]);
+        }
+        $mform->addElement('select', 'uuforcepasswordchange', get_string('forcepasswordchange', 'core'), $choices);
+
+
         $mform->addElement('selectyesno', 'uuallowrenames', get_string('allowrenames', 'admin'));
         $mform->setDefault('uuallowrenames', 0);
-        $mform->disabledIf('uuallowrenames', 'uutype', 'eq', UU_ADDNEW);
-        $mform->disabledIf('uuallowrenames', 'uutype', 'eq', UU_ADDINC);
+        $mform->disabledIf('uuallowrenames', 'uutype', 'eq', UU_USER_ADDNEW);
+        $mform->disabledIf('uuallowrenames', 'uutype', 'eq', UU_USER_ADDINC);
 
         $mform->addElement('selectyesno', 'uuallowdeletes', get_string('allowdeletes', 'admin'));
         $mform->setDefault('uuallowdeletes', 0);
-        $mform->disabledIf('uuallowdeletes', 'uutype', 'eq', UU_ADDNEW);
-        $mform->disabledIf('uuallowdeletes', 'uutype', 'eq', UU_ADDINC);
+        $mform->disabledIf('uuallowdeletes', 'uutype', 'eq', UU_USER_ADDNEW);
+        $mform->disabledIf('uuallowdeletes', 'uutype', 'eq', UU_USER_ADDINC);
 
         $mform->addElement('selectyesno', 'uunoemailduplicates', get_string('uunoemailduplicates', 'admin'));
         $mform->setDefault('uunoemailduplicates', 1);
 
-        $choices = array(0 => get_string('no'),
-                         1 => get_string('uubulknew', 'admin'),
-                         2 => get_string('uubulkupdated', 'admin'),
-                         3 => get_string('uubulkall', 'admin'));
+        $mform->addElement('selectyesno', 'uustandardusernames', get_string('uustandardusernames', 'admin'));
+        $mform->setDefault('uustandardusernames', 1);
+
+        $choices = array(UU_BULK_NONE    => get_string('no'),
+                         UU_BULK_NEW     => get_string('uubulknew', 'admin'),
+                         UU_BULK_UPDATED => get_string('uubulkupdated', 'admin'),
+                         UU_BULK_ALL     => get_string('uubulkall', 'admin'));
         $mform->addElement('select', 'uubulk', get_string('uubulk', 'admin'), $choices);
         $mform->setDefault('uubulk', 0);
 
@@ -152,18 +201,22 @@ class admin_uploaduser_form2 extends moodleform {
         // default values
         $mform->addElement('header', 'defaultheader', get_string('defaultvalues', 'admin'));
 
-        $mform->addElement('text', 'username', get_string('username'), 'size="20"');
+        $mform->addElement('text', 'username', get_string('uuusernametemplate', 'admin'), 'size="20"');
         $mform->addRule('username', get_string('requiredtemplate', 'admin'), 'required', null, 'client');
+        $mform->disabledIf('username', 'uutype', 'eq', UU_USER_ADD_UPDATE);
+        $mform->disabledIf('username', 'uutype', 'eq', UU_USER_UPDATE);
+
+        $mform->addElement('text', 'email', get_string('email'), 'maxlength="100" size="30"');
+        $mform->disabledIf('email', 'uutype', 'eq', UU_USER_ADD_UPDATE);
+        $mform->disabledIf('email', 'uutype', 'eq', UU_USER_UPDATE);
 
         // only enabled and known to work plugins
-        $choices = uu_allowed_auths();
+        $choices = uu_supported_auths();
         $mform->addElement('select', 'auth', get_string('chooseauthmethod','auth'), $choices);
         $mform->setDefault('auth', 'manual'); // manual is a sensible backwards compatible default
         $mform->addHelpButton('auth', 'chooseauthmethod', 'auth');
         $mform->setAdvanced('auth');
 
-        $mform->addElement('text', 'email', get_string('email'), 'maxlength="100" size="30"');
-
         $choices = array(0 => get_string('emaildisplayno'), 1 => get_string('emaildisplayyes'), 2 => get_string('emaildisplaycourse'));
         $mform->addElement('select', 'maildisplay', get_string('emaildisplay'), $choices);
         $mform->setDefault('maildisplay', 2);
@@ -178,7 +231,7 @@ class admin_uploaduser_form2 extends moodleform {
         $mform->setDefault('maildigest', 0);
         $mform->setAdvanced('maildigest');
 
-        $choices = array(0 => get_string('autosubscribeyes'), 1 => get_string('autosubscribeno'));
+        $choices = array(1 => get_string('autosubscribeyes'), 0 => get_string('autosubscribeno'));
         $mform->addElement('select', 'autosubscribe', get_string('autosubscribe'), $choices);
         $mform->setDefault('autosubscribe', 1);
 
@@ -206,10 +259,19 @@ class admin_uploaduser_form2 extends moodleform {
 
         $mform->addElement('text', 'city', get_string('city'), 'maxlength="100" size="25"');
         $mform->setType('city', PARAM_MULTILANG);
-        $mform->setDefault('city', $templateuser->city);
+        if (empty($CFG->defaultcity)) {
+            $mform->setDefault('city', $templateuser->city);
+        } 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());
-        $mform->setDefault('country', $templateuser->country);
+        if (empty($CFG->country)) {
+            $mform->setDefault('country', $templateuser->country);
+        } else {
+            $mform->setDefault('country', $CFG->country);
+        }
         $mform->setAdvanced('country');
 
         $choices = get_list_of_timezones();
@@ -264,27 +326,30 @@ class admin_uploaduser_form2 extends moodleform {
         $mform->addElement('hidden', 'previewrows');
         $mform->setType('previewrows', PARAM_INT);
 
-        $mform->addElement('hidden', 'readcount');
-        $mform->setType('readcount', PARAM_INT);
-
-        $mform->addElement('hidden', 'uutype');
-        $mform->setType('uutype', PARAM_INT);
-
         $this->add_action_buttons(true, get_string('uploadusers', 'admin'));
+
+        $this->set_data($data);
     }
 
     /**
      * Form tweaks that depend on current data.
      */
     function definition_after_data() {
-        $mform   =& $this->_form;
-        $columns =& $this->_customdata;
+        $mform   = $this->_form;
+        $columns = $this->_customdata['columns'];
 
         foreach ($columns as $column) {
             if ($mform->elementExists($column)) {
                 $mform->removeElement($column);
             }
         }
+
+        if (!in_array('password', $columns)) {
+            // password resetting makes sense only if password specified in csv file
+            if ($mform->elementExists('uuforcepasswordchange')) {
+                $mform->removeElement('uuforcepasswordchange');
+            }
+        }
     }
 
     /**
@@ -292,19 +357,19 @@ class admin_uploaduser_form2 extends moodleform {
      */
     function validation($data, $files) {
         $errors = parent::validation($data, $files);
-        $columns =& $this->_customdata;
+        $columns = $this->_customdata['columns'];
         $optype  = $data['uutype'];
 
         // detect if password column needed in file
         if (!in_array('password', $columns)) {
             switch ($optype) {
-                case UU_UPDATE:
+                case UU_USER_UPDATE:
                     if (!empty($data['uupasswordold'])) {
                         $errors['uupasswordold'] = get_string('missingfield', 'error', 'password');
                     }
                     break;
 
-                case UU_ADD_UPDATE:
+                case UU_USER_ADD_UPDATE:
                     if (empty($data['uupasswordnew'])) {
                         $errors['uupasswordnew'] = get_string('missingfield', 'error', 'password');
                     }
@@ -313,12 +378,12 @@ class admin_uploaduser_form2 extends moodleform {
                     }
                     break;
 
-                case UU_ADDNEW:
+                case UU_USER_ADDNEW:
                     if (empty($data['uupasswordnew'])) {
                         $errors['uupasswordnew'] = get_string('missingfield', 'error', 'password');
                     }
                     break;
-                case UU_ADDINC:
+                case UU_USER_ADDINC:
                     if (empty($data['uupasswordnew'])) {
                         $errors['uupasswordnew'] = get_string('missingfield', 'error', 'password');
                     }
@@ -327,7 +392,7 @@ class admin_uploaduser_form2 extends moodleform {
         }
 
         // look for other required data
-        if ($optype != UU_UPDATE) {
+        if ($optype != UU_USER_UPDATE) {
             if (!in_array('firstname', $columns)) {
                 $errors['uutype'] = get_string('missingfield', 'error', 'firstname');
             }
@@ -344,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;
@@ -361,7 +422,7 @@ class admin_uploaduser_form2 extends moodleform {
     function get_data() {
         $data = parent::get_data();
 
-        if ($data !== null) {
+        if ($data !== null and isset($data->description)) {
             $data->descriptionformat = $data->description['format'];
             $data->description = $data->description['text'];
         }
@@ -369,11 +430,3 @@ class admin_uploaduser_form2 extends moodleform {
         return $data;
     }
 }
-
-class admin_uploaduser_form3 extends moodleform {
-    function definition (){
-        global $CFG, $USER;
-        $mform =& $this->_form;
-        $this->add_action_buttons(false, get_string('uploadnewfile'));
-    }
-}

admin/uploaduserlib.php

@@ -0,0 +1,368 @@
+<?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/>.
+
+/**
+ * Bulk user registration functions
+ *
+ * @package    core
+ * @subpackage admin
+ * @copyright  2004 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+defined('MOODLE_INTERNAL') || die();
+
+define('UU_USER_ADDNEW', 0);
+define('UU_USER_ADDINC', 1);
+define('UU_USER_ADD_UPDATE', 2);
+define('UU_USER_UPDATE', 3);
+
+define('UU_UPDATE_NOCHANGES', 0);
+define('UU_UPDATE_FILEOVERRIDE', 1);
+define('UU_UPDATE_ALLOVERRIDE', 2);
+define('UU_UPDATE_MISSING', 3);
+
+define('UU_BULK_NONE', 0);
+define('UU_BULK_NEW', 1);
+define('UU_BULK_UPDATED', 2);
+define('UU_BULK_ALL', 3);
+
+define('UU_PWRESET_NONE', 0);
+define('UU_PWRESET_WEAK', 1);
+define('UU_PWRESET_ALL', 2);
+
+/**
+ * Tracking of processed users.
+ *
+ * This class prints user information into a html table.
+ *
+ * @package    core
+ * @subpackage admin
+ * @copyright  2007 Petr Skoda  {@link http://skodak.org}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class uu_progress_tracker {
+    private $_row;
+    public $columns = array('status', 'line', 'id', 'username', 'firstname', 'lastname', 'email', 'password', 'auth', 'enrolments', 'deleted');
+
+    /**
+     * Print table header.
+     * @return void
+     */
+    public function start() {
+        $ci = 0;
+        echo '<table id="uuresults" class="generaltable boxaligncenter flexible-wrap" summary="'.get_string('uploadusersresult', 'admin').'">';
+        echo '<tr class="heading r0">';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('status').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('uucsvline', 'admin').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">ID</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('username').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('firstname').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('lastname').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('email').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('password').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('authentication').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('enrolments', 'enrol').'</th>';
+        echo '<th class="header c'.$ci++.'" scope="col">'.get_string('delete').'</th>';
+        echo '</tr>';
+        $this->_row = null;
+    }
+
+    /**
+     * Flush previous line and start a new one.
+     * @return void
+     */
+    public function flush() {
+        if (empty($this->_row) or empty($this->_row['line']['normal'])) {
+            // Nothing to print - each line has to have at least number
+            $this->_row = array();
+            foreach ($this->columns as $col) {
+                $this->_row[$col] = array('normal'=>'', 'info'=>'', 'warning'=>'', 'error'=>'');
+            }
+            return;
+        }
+        $ci = 0;
+        $ri = 1;
+        echo '<tr class="r'.$ri.'">';
+        foreach ($this->_row as $key=>$field) {
+            foreach ($field as $type=>$content) {
+                if ($field[$type] !== '') {
+                    $field[$type] = '<span class="uu'.$type.'">'.$field[$type].'</span>';
+                } else {
+                    unset($field[$type]);
+                }
+            }
+            echo '<td class="cell c'.$ci++.'">';
+            if (!empty($field)) {
+                echo implode('<br />', $field);
+            } else {
+                echo '&nbsp;';
+            }
+            echo '</td>';
+        }
+        echo '</tr>';
+        foreach ($this->columns as $col) {
+            $this->_row[$col] = array('normal'=>'', 'info'=>'', 'warning'=>'', 'error'=>'');
+        }
+    }
+
+    /**
+     * Add tracking info
+     * @param string $col name of column
+     * @param string $msg message
+     * @param string $level 'normal', 'warning' or 'error'
+     * @param bool $merge true means add as new line, false means override all previous text of the same type
+     * @return void
+     */
+    public function track($col, $msg, $level = 'normal', $merge = true) {
+        if (empty($this->_row)) {
+            $this->flush(); //init arrays
+        }
+        if (!in_array($col, $this->columns)) {
+            debugging('Incorrect column:'.$col);
+            return;
+        }
+        if ($merge) {
+            if ($this->_row[$col][$level] != '') {
+                $this->_row[$col][$level] .='<br />';
+            }
+            $this->_row[$col][$level] .= $msg;
+        } else {
+            $this->_row[$col][$level] = $msg;
+        }
+    }
+
+    /**
+     * Print the table end
+     * @return void
+     */
+    public function close() {
+        $this->flush();
+        echo '</table>';
+    }
+}
+
+/**
+ * Validation callback function - verified the column line of csv file.
+ * Converts standard column names to lowercase.
+ * @param csv_import_reader $cir
+ * @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, $profilefields, moodle_url $returnurl) {
+    $columns = $cir->get_columns();
+
+    if (empty($columns)) {
+        $cir->close();
+        $cir->cleanup();
+        print_error('cannotreadtmpfile', 'error', $returnurl);
+    }
+    if (count($columns) < 2) {
+        $cir->close();
+        $cir->cleanup();
+        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 = $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('invalidfieldname', 'error', $returnurl, $field);
+        }
+        if (in_array($newfield, $processed)) {
+            $cir->close();
+            $cir->cleanup();
+            print_error('duplicatefieldname', 'error', $returnurl, $newfield);
+        }
+        $processed[$key] = $newfield;
+    }
+
+    return $processed;
+}
+
+/**
+ * Increments username - increments trailing number or adds it if not present.
+ * Varifies that the new username does not exist yet
+ * @param string $username
+ * @return incremented username which does not exist yet
+ */
+function uu_increment_username($username) {
+    global $DB, $CFG;
+
+    if (!preg_match_all('/(.*?)([0-9]+)$/', $username, $matches)) {
+        $username = $username.'2';
+    } else {
+        $username = $matches[1][0].($matches[2][0]+1);
+    }
+
+    if ($DB->record_exists('user', array('username'=>$username, 'mnethostid'=>$CFG->mnet_localhost_id))) {
+        return uu_increment_username($username);
+    } else {
+        return $username;
+    }
+}
+
+/**
+ * Check if default field contains templates and apply them.
+ * @param string template - potential tempalte string
+ * @param object user object- we need username, firstname and lastname
+ * @return string field value
+ */
+function uu_process_template($template, $user) {
+    if (is_array($template)) {
+        // hack for for support of text editors with format
+        $t = $template['text'];
+    } else {
+        $t = $template;
+    }
+    if (strpos($t, '%') === false) {
+        return $template;
+    }
+
+    $username  = isset($user->username)  ? $user->username  : '';
+    $firstname = isset($user->firstname) ? $user->firstname : '';
+    $lastname  = isset($user->lastname)  ? $user->lastname  : '';
+
+    $callback = partial('uu_process_template_callback', $username, $firstname, $lastname);
+
+    $result = preg_replace_callback('/(?<!%)%([+-~])?(\d)*([flu])/', $callback, $t);
+
+    if (is_null($result)) {
+        return $template; //error during regex processing??
+    }
+
+    if (is_array($template)) {
+        $template['text'] = $result;
+        return $t;
+    } else {
+        return $result;
+    }
+}
+
+/**
+ * Internal callback function.
+ */
+function uu_process_template_callback($username, $firstname, $lastname, $block) {
+    $textlib = textlib_get_instance();
+
+    switch ($block[3]) {
+        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;
+    }
+
+    if (!empty($block[2])) {
+        $repl = $textlib->substr($repl, 0 , $block[2]);
+    }
+
+    return $repl;
+}
+
+/**
+ * Returns list of auth plugins that are enabled and known to work.
+ *
+ * If ppl want to use some other auth type they have to include it
+ * in the CSV file next on each line.
+ *
+ * @return array type=>name
+ */
+function uu_supported_auths() {
+    // only following plugins are guaranteed to work properly
+    $whitelist = array('manual', 'nologin', 'none', 'email');
+    $plugins = get_enabled_auth_plugins();
+    $choices = array();
+    foreach ($plugins as $plugin) {
+        if (!in_array($plugin, $whitelist)) {
+            continue;
+        }
+        $choices[$plugin] = get_string('pluginname', "auth_{$plugin}");
+    }
+
+    return $choices;
+}
+
+/**
+ * Returns list of roles that are assignable in courses
+ * @return array
+ */
+function uu_allowed_roles() {
+    // let's cheat a bit, frontpage is guaranteed to exist and has the same list of roles ;-)
+    $roles = get_assignable_roles(get_context_instance(CONTEXT_COURSE, SITEID), ROLENAME_ORIGINALANDSHORT);
+    return array_reverse($roles, true);
+}
+
+/**
+ * Returns mapping of all roles using short role name as index.
+ * @return array
+ */
+function uu_allowed_roles_cache() {
+    $allowedroles = get_assignable_roles(get_context_instance(CONTEXT_COURSE, SITEID), ROLENAME_SHORT);
+    foreach ($allowedroles as $rid=>$rname) {
+        $rolecache[$rid] = new stdClass();
+        $rolecache[$rid]->id   = $rid;
+        $rolecache[$rid]->name = $rname;
+        if (!is_numeric($rname)) { // only non-numeric shortnames are supported!!!
+            $rolecache[$rname] = new stdClass();
+            $rolecache[$rname]->id   = $rid;
+            $rolecache[$rname]->name = $rname;
+        }
+    }
+    return $rolecache;
+}

admin/user.php

@@ -149,7 +149,7 @@
     list($extrasql, $params) = $ufiltering->get_sql_filter();
     $users = get_users_listing($sort, $dir, $page*$perpage, $perpage, '', '', '', $extrasql, $params);
     $usercount = get_users(false);
-    $usersearchcount = get_users(false, '', true, null, "", '', '', '', '', '*', $extrasql, $params);
+    $usersearchcount = get_users(false, '', false, null, "", '', '', '', '', '*', $extrasql, $params);
 
     if ($extrasql !== '') {
         echo $OUTPUT->heading("$usersearchcount / $usercount ".get_string('users'));
@@ -180,7 +180,7 @@
         }
 
         foreach ($users as $key => $user) {
-            if (!empty($user->country)) {
+            if (isset($countries[$user->country])) {
                 $users[$key]->country = $countries[$user->country];
             }
         }

admin/user/lib.php

@@ -11,14 +11,13 @@ function add_selection_all($ufiltering) {
 
     list($sqlwhere, $params) = $ufiltering->get_sql_filter("id<>:exguest AND deleted <> 1", array('exguest'=>$CFG->siteguest));
 
-    if ($rs = $DB->get_recordset_select('user', $sqlwhere, $params, 'fullname', 'id,'.$DB->sql_fullname().' AS fullname')) {
-        foreach ($rs as $user) {
-            if (!isset($SESSION->bulk_users[$user->id])) {
-                $SESSION->bulk_users[$user->id] = $user->id;
-            }
+    $rs = $DB->get_recordset_select('user', $sqlwhere, $params, 'fullname', 'id,'.$DB->sql_fullname().' AS fullname');
+    foreach ($rs as $user) {
+        if (!isset($SESSION->bulk_users[$user->id])) {
+            $SESSION->bulk_users[$user->id] = $user->id;
         }
-        $rs->close();
     }
+    $rs->close();
 }
 
 function get_selection_data($ufiltering) {

admin/user/user_bulk_confirm.php

@@ -24,19 +24,18 @@ echo $OUTPUT->header();
 
 if ($confirm and confirm_sesskey()) {
     list($in, $params) = $DB->get_in_or_equal($SESSION->bulk_users);
-    if ($rs = $DB->get_recordset_select('user', "id $in", $params, '', 'id, username, secret, confirmed, auth, firstname, lastname')) {
-        foreach ($rs as $user) {
-            if ($user->confirmed) {
-                continue;
-            }
-            $auth = get_auth_plugin($user->auth);
-            $result = $auth->user_confirm($user->username, $user->secret);
-            if ($result != AUTH_CONFIRM_OK && $result != AUTH_CONFIRM_ALREADY) {
-                echo $OUTPUT->notification(get_string('usernotconfirmed', '', fullname($user, true)));
-            }
+    $rs = $DB->get_recordset_select('user', "id $in", $params, '', 'id, username, secret, confirmed, auth, firstname, lastname');
+    foreach ($rs as $user) {
+        if ($user->confirmed) {
+            continue;
+        }
+        $auth = get_auth_plugin($user->auth);
+        $result = $auth->user_confirm($user->username, $user->secret);
+        if ($result != AUTH_CONFIRM_OK && $result != AUTH_CONFIRM_ALREADY) {
+            echo $OUTPUT->notification(get_string('usernotconfirmed', '', fullname($user, true)));
         }
-        $rs->close();
     }
+    $rs->close();
     redirect($return, get_string('changessaved'));
 
 } else {