Moodle 2.1.7 release

This is a modified version of fix by Luke Tucker at NetSpot - thanks.

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

@@ -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/install.php

@@ -79,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)) {
@@ -96,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.
@@ -115,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
@@ -130,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;
@@ -178,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_',
@@ -265,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 {
@@ -376,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));
         }
     }
 }
@@ -525,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

@@ -93,8 +93,12 @@ if ($version < $CFG->version) {
 $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) {

admin/cron.php

@@ -36,6 +36,12 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
+
+if (defined('STDIN')) {
+    fwrite(STDERR, "ERROR: This script no longer supports CLI, please use admin/cli/cron.php instead\n");
+    exit(1);
+}
+
 // This is a fake CLI script, it is a really ugly hack which emulates
 // CLI via web interface, please do not use this hack elsewhere
 define('CLI_SCRIPT', true);

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)
 
 */
 

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" />
@@ -328,4 +324,335 @@
       </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,11 +30,11 @@ if (!file_exists('../config.php')) {
 }
 
 // Check that PHP is of a sufficient version as soon as possible
-if (version_compare(phpversion(), '5.2.0') < 0) {
+if (version_compare(phpversion(), '5.3.2') < 0) {
     $phpversion = phpversion();
     // do NOT localise - lang strings would not work here and we CAN NOT move it to later place
-    echo "Sorry, Moodle 2.0 requires PHP 5.2.8 or later (currently using version $phpversion). ";
-    echo "Please upgrade your server software or use latest Moodle 1.9.x instead.";
+    echo "Moodle 2.1 or later requires at least PHP 5.3.2 (currently using version $phpversion).<br />";
+    echo "Please upgrade your server software or install older Moodle version.";
     die;
 }
 
@@ -48,6 +48,7 @@ $id             = optional_param('id', '', PARAM_TEXT);
 $confirmupgrade = optional_param('confirmupgrade', 0, PARAM_BOOL);
 $confirmrelease = optional_param('confirmrelease', 0, PARAM_BOOL);
 $confirmplugins = optional_param('confirmplugincheck', 0, PARAM_BOOL);
+$showallplugins = optional_param('showallplugins', 0, PARAM_BOOL);
 $agreelicense   = optional_param('agreelicense', 0, PARAM_BOOL);
 
 // Check some PHP server settings
@@ -123,7 +124,7 @@ if (!core_tables_exist()) {
         echo $OUTPUT->box($copyrightnotice, 'copyrightnotice');
         echo '<br />';
         $continue = new single_button(new moodle_url('/admin/index.php', array('lang'=>$CFG->lang, 'agreelicense'=>1)), get_string('continue'), 'get');
-        echo $OUTPUT->confirm(get_string('doyouagree'), $continue, "http://docs.moodle.org/en/License");
+        echo $OUTPUT->confirm(get_string('doyouagree'), $continue, "http://docs.moodle.org/dev/License");
         echo $OUTPUT->footer();
         die;
     }
@@ -147,12 +148,12 @@ if (!core_tables_exist()) {
             }
         }
 
-        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes');
+        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases');
         $releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
         echo $OUTPUT->box($releasenoteslink, 'generalbox releasenoteslink');
 
         require_once($CFG->libdir.'/environmentlib.php');
-        if (!check_moodle_environment($release, $environment_results, true, ENV_SELECT_RELEASE)) {
+        if (!check_moodle_environment(normalize_version($release), $environment_results, true, ENV_SELECT_RELEASE)) {
             print_upgrade_reload("index.php?agreelicense=1&amp;lang=$CFG->lang");
         } else {
             echo $OUTPUT->notification(get_string('environmentok', 'admin'), 'notifysuccess');
@@ -193,6 +194,7 @@ if (empty($CFG->version)) {
 }
 
 if ($version > $CFG->version) {  // upgrade
+    purge_all_caches();
     $PAGE->set_pagelayout('maintenance');
     $PAGE->set_popup_notification_allowed(false);
 
@@ -229,7 +231,7 @@ if ($version > $CFG->version) {  // upgrade
         $PAGE->set_cacheable(false);
         echo $OUTPUT->header();
         echo $OUTPUT->heading("Moodle $release");
-        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/en/Release_Notes');
+        $releasenoteslink = get_string('releasenoteslink', 'admin', 'http://docs.moodle.org/dev/Releases');
         $releasenoteslink = str_replace('target="_blank"', 'onclick="this.target=\'_blank\'"', $releasenoteslink); // extremely ugly validation hack
         echo $OUTPUT->box($releasenoteslink);
 
@@ -255,17 +257,19 @@ if ($version > $CFG->version) {  // upgrade
         $PAGE->set_title($strplugincheck);
         $PAGE->set_heading($strplugincheck);
         $PAGE->set_cacheable(false);
-        echo $OUTPUT->header();
-        echo $OUTPUT->heading($strplugincheck);
-        echo $OUTPUT->box_start('generalbox', 'notice');
-        print_string('pluginchecknotice');
-        echo $OUTPUT->box_end();
-        print_plugin_tables();
+        $output = $PAGE->get_renderer('core', 'admin');
+        $pluginman = plugin_manager::instance();
+
+        echo $output->header();
+        echo $output->box_start('generalbox');
+        echo $output->container(get_string('pluginchecknotice', 'core_plugin'), 'generalbox', 'notice');
+        echo $output->plugins_check($pluginman->get_plugins(), array('full' => $showallplugins));
+        echo $output->box_end();
         print_upgrade_reload('index.php?confirmupgrade=1&amp;confirmrelease=1');
         $button = new single_button(new moodle_url('index.php', array('confirmupgrade'=>1, 'confirmrelease'=>1, 'confirmplugincheck'=>1)), get_string('upgradestart', 'admin'), 'get');
         $button->class = 'continuebutton';
-        echo $OUTPUT->render($button);
-        echo $OUTPUT->footer();
+        echo $output->render($button);
+        echo $output->footer();
         die();
 
     } else {
@@ -293,17 +297,19 @@ if (moodle_needs_upgrading()) {
             $PAGE->set_title($strplugincheck);
             $PAGE->set_heading($strplugincheck);
             $PAGE->set_cacheable(false);
-            echo $OUTPUT->header();
-            echo $OUTPUT->heading($strplugincheck);
-            echo $OUTPUT->box_start('generalbox', 'notice');
-            print_string('pluginchecknotice');
-            echo $OUTPUT->box_end();
-            print_plugin_tables();
+            $output = $PAGE->get_renderer('core', 'admin');
+            $pluginman = plugin_manager::instance();
+
+            echo $output->header();
+            echo $output->box_start('generalbox');
+            echo $output->container(get_string('pluginchecknotice', 'core_plugin'), 'generalbox', 'notice');
+            echo $output->plugins_check($pluginman->get_plugins(), array('full' => $showallplugins));
+            echo $output->box_end();
             print_upgrade_reload('index.php');
             $button = new single_button(new moodle_url('index.php', array('confirmplugincheck'=>1)), get_string('upgradestart', 'admin'), 'get');
             $button->class = 'continuebutton';
-            echo $OUTPUT->render($button);
-            echo $OUTPUT->footer();
+            echo $output->render($button);
+            echo $output->footer();
             die();
         }
     }
@@ -339,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
@@ -349,7 +355,6 @@ if (during_initial_install()) {
         }
         // login user and let him set password and admin details
         $adminuser->newadminuser = 1;
-        message_set_default_message_preferences($adminuser);
         complete_user_login($adminuser, false);
         redirect("$CFG->wwwroot/user/editadvanced.php?id=$adminuser->id"); // Edit thyself
 
@@ -402,6 +407,17 @@ if (any_new_admin_settings($adminroot)){
 admin_externalpage_setup('adminnotifications');
 echo $OUTPUT->header();
 
+// Unstable code warning
+if (isset($maturity)) {
+    if ($maturity < MATURITY_STABLE) {
+        $maturitylevel = get_string('maturity'.$maturity, 'admin');
+        echo $OUTPUT->box(
+            get_string('maturitycoreinfo', 'admin', $maturitylevel) . ' ' .
+            $OUTPUT->doc_link('admin/versions', get_string('morehelp')),
+            'generalbox adminwarning maturityinfo');
+    }
+}
+
 if ($insecuredataroot == INSECURE_DATAROOT_WARNING) {
     echo $OUTPUT->box(get_string('datarootsecuritywarning', 'admin', $CFG->dataroot), 'generalbox adminwarning');
 } else if ($insecuredataroot == INSECURE_DATAROOT_ERROR) {
@@ -440,10 +456,10 @@ if (!empty($CFG->maintenance_enabled)) {
 //////////////////////////////////////////////////////////////////////////////////////////////////
 ////  IT IS ILLEGAL AND A VIOLATION OF THE GPL TO HIDE, REMOVE OR MODIFY THIS COPYRIGHT NOTICE ///
 $copyrighttext = '<a href="http://moodle.org/">Moodle</a> '.
-                 '<a href="http://docs.moodle.org/en/Release" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
+                 '<a href="http://docs.moodle.org/dev/Releases" title="'.$CFG->version.'">'.$CFG->release.'</a><br />'.
                  'Copyright &copy; 1999 onwards, Martin Dougiamas<br />'.
-                 'and <a href="http://docs.moodle.org/en/Credits">many other contributors</a>.<br />'.
-                 '<a href="http://docs.moodle.org/en/License">GNU Public License</a>';
+                 'and <a href="http://docs.moodle.org/dev/Credits">many other contributors</a>.<br />'.
+                 '<a href="http://docs.moodle.org/dev/License">GNU Public License</a>';
 echo $OUTPUT->box($copyrighttext, 'copyright');
 //////////////////////////////////////////////////////////////////////////////////////////////////
 

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

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

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,293 +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.
-        $settings = admin_get_root()->locate('qtypesetting' . $qtypename);
-        if ($settings instanceof admin_externalpage) {
-            $row[] = '<a href="' . $settings->url .
-                    '">' . get_string('settings') . '</a>';
-        } else if ($settings instanceof admin_settingpage) {
-            $row[] = '<a href="' . admin_url('settings.php?section=qtypesetting' . $qtypename) .
-                    '">' . get_string('settings') . '</a>';
-        } else {
-            $row[] = '';
-        }
-
-        $table->add_data($row, $rowclass);
+    // Delete any configuration records.
+    if (!unset_all_config_for_plugin('qtype_' . $delete)) {
+        echo $OUTPUT->notification(get_string('errordeletingconfig', 'admin', 'qtype_' . $delete));
     }
+    unset_config($delete . '_disabled', 'question');
+    unset_config($delete . '_sortorder', 'question');
 
-    $table->finish_output();
+    // Then the tables themselves
+    drop_plugin_tables($delete, $qtypes[$delete]->plugin_dir() . '/db/install.xml', false);
 
+    // Remove event handlers and dequeue pending events
+    events_uninstall('qtype_' . $delete);
+
+    $a = 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');
 }
 
@@ -85,7 +85,7 @@ if (!empty($registeredhub) and $registeredhub->token == $token) {
 
     echo $OUTPUT->footer();
 } else {
-    throw new moodle_exception('wrongtoken', 'hub', 
+    throw new moodle_exception('wrongtoken', 'hub',
             $CFG->wwwroot . '/' . $CFG->admin . '/registration/index.php');
 }
 

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

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

@@ -16,7 +16,7 @@
         }
     }
 
-    admin_externalpage_setup('reportcourseoverview');
+    admin_externalpage_setup('reportcourseoverview', '', null, '', array('pagelayout'=>'report'));
     echo $OUTPUT->header();
 
     $course = get_site();
@@ -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/customlang/db/install.xml

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

admin/report/customlang/db/upgrade.php

@@ -57,5 +57,18 @@ function xmldb_report_customlang_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2010111500, 'report', 'customlang');
     }
 
+    /**
+     * Change the version field from integer to varchar
+     */
+    if ($oldversion < 2011041900) {
+        $table = new xmldb_table('report_customlang_components');
+        $field = new xmldb_field('version', XMLDB_TYPE_CHAR, '255', null, null, null, null, 'name');
+
+        $dbman->change_field_type($table, $field);
+
+        upgrade_plugin_savepoint(true, 2011041900, 'report', 'customlang');
+    }
+
+
     return $result;
 }

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'));
+        }
     }
 
     /**

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  = 2010120900;
+$plugin->version  = 2011041900;
 $plugin->requires = 2010120700;

admin/report/profiling/settings.php

@@ -3,6 +3,6 @@
 defined('MOODLE_INTERNAL') || die;
 
 // profiling report, added to development
-if (extension_loaded('xhprof') && function_exists('xhprof_enable') && !empty($CFG->profilingenabled)) {
+if (extension_loaded('xhprof') && function_exists('xhprof_enable') && (!empty($CFG->profilingenabled) || !empty($CFG->earlyprofilingenabled))) {
     $ADMIN->add('development', new admin_externalpage('reportprofiling', get_string('pluginname', 'report_profiling'), "$CFG->wwwroot/$CFG->admin/report/profiling/index.php", 'moodle/site:config'));
 }

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

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

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

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

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/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);
@@ -369,6 +398,10 @@ if ($hassiteconfig) {
 
 // Question type settings
 if ($hassiteconfig || has_capability('moodle/question:config', $systemcontext)) {
+    // Question behaviour settings.
+    $ADMIN->add('modules', new admin_category('qbehavioursettings', get_string('questionbehaviours', 'admin')));
+    $ADMIN->add('qbehavioursettings', new admin_page_manageqbehaviours());
+
     // Question type settings.
     $ADMIN->add('modules', new admin_category('qtypesettings', get_string('questiontypes', 'admin')));
     $ADMIN->add('qtypesettings', new admin_page_manageqtypes());

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

@@ -17,46 +17,8 @@ $ADMIN->add('server', $temp);
 
 
 
-// "email" settingpage
-$temp = new admin_settingpage('mail', get_string('mail','admin'));
-$temp->add(new admin_setting_configtext('smtphosts', get_string('smtphosts', 'admin'), get_string('configsmtphosts', 'admin'), '', PARAM_RAW));
-$temp->add(new admin_setting_configtext('smtpuser', get_string('smtpuser', 'admin'), get_string('configsmtpuser', 'admin'), '', PARAM_NOTAGS));
-$temp->add(new admin_setting_configpasswordunmask('smtppass', get_string('smtppass', 'admin'), get_string('configsmtpuser', 'admin'), ''));
-$temp->add(new admin_setting_configtext('smtpmaxbulk', get_string('smtpmaxbulk', 'admin'), get_string('configsmtpmaxbulk', 'admin'), 1, PARAM_INT));
-$temp->add(new admin_setting_configtext('noreplyaddress', get_string('noreplyaddress', 'admin'), get_string('confignoreplyaddress', 'admin'), 'noreply@' . get_host_from_url($CFG->wwwroot), PARAM_NOTAGS));
-$temp->add(new admin_setting_configselect('digestmailtime', get_string('digestmailtime', 'admin'), get_string('configdigestmailtime', 'admin'), 17, array('00' => '00',
-                                                                                                                                                          '01' => '01',
-                                                                                                                                                          '02' => '02',
-                                                                                                                                                          '03' => '03',
-                                                                                                                                                          '04' => '04',
-                                                                                                                                                          '05' => '05',
-                                                                                                                                                          '06' => '06',
-                                                                                                                                                          '07' => '07',
-                                                                                                                                                          '08' => '08',
-                                                                                                                                                          '09' => '09',
-                                                                                                                                                          '10' => '10',
-                                                                                                                                                          '11' => '11',
-                                                                                                                                                          '12' => '12',
-                                                                                                                                                          '13' => '13',
-                                                                                                                                                          '14' => '14',
-                                                                                                                                                          '15' => '15',
-                                                                                                                                                          '16' => '16',
-                                                                                                                                                          '17' => '17',
-                                                                                                                                                          '18' => '18',
-                                                                                                                                                          '19' => '19',
-                                                                                                                                                          '20' => '20',
-                                                                                                                                                          '21' => '21',
-                                                                                                                                                          '22' => '22',
-                                                                                                                                                          '23' => '23')));
-$charsets = get_list_of_charsets();
-unset($charsets['UTF-8']); // not needed here
-$options = array();
-$options['0'] = 'UTF-8';
-$options = array_merge($options, $charsets);
-$temp->add(new admin_setting_configselect('sitemailcharset', get_string('sitemailcharset', 'admin'), get_string('configsitemailcharset','admin'), '0', $options));
-$temp->add(new admin_setting_configcheckbox('allowusermailcharset', get_string('allowusermailcharset', 'admin'), get_string('configallowusermailcharset', 'admin'), 0));
-$options = array('LF'=>'LF', 'CRLF'=>'CRLF');
-$temp->add(new admin_setting_configselect('mailnewline', get_string('mailnewline', 'admin'), get_string('configmailnewline','admin'), 'LF', $options));
+// "supportcontact" settingpage
+$temp = new admin_settingpage('supportcontact', get_string('supportcontact','admin'));
 if (isloggedin()) {
     global $USER;
     $primaryadminemail = $USER->email;
@@ -73,17 +35,6 @@ $temp->add(new admin_setting_configtext('supportpage', get_string('supportpage',
 $ADMIN->add('server', $temp);
 
 
-// Jabber settingpage
-$temp = new admin_settingpage('jabber', get_string('jabber', 'admin'));
-$temp->add(new admin_setting_configtext('jabberhost', get_string('jabberhost', 'admin'), get_string('configjabberhost', 'admin'), '', PARAM_RAW));
-$temp->add(new admin_setting_configtext('jabberserver', get_string('jabberserver', 'admin'), get_string('configjabberserver', 'admin'), '', PARAM_RAW));
-$temp->add(new admin_setting_configtext('jabberusername', get_string('jabberusername', 'admin'), get_string('configjabberusername', 'admin'), '', PARAM_RAW));
-$temp->add(new admin_setting_configpasswordunmask('jabberpassword', get_string('jabberpassword', 'admin'), get_string('configjabberpassword', 'admin'), ''));
-$temp->add(new admin_setting_configtext('jabberport', get_string('jabberport', 'admin'), get_string('configjabberport', 'admin'), 5222, PARAM_INT));
-$ADMIN->add('server', $temp);
-
-
-
 // "sessionhandling" settingpage
 $temp = new admin_settingpage('sessionhandling', get_string('sessionhandling', 'admin'));
 $temp->add(new admin_setting_configcheckbox('dbsessions', get_string('dbsessions', 'admin'), get_string('configdbsessions', 'admin'), 1));
@@ -241,6 +192,8 @@ $temp->add(new admin_setting_configselect('extramemorylimit', get_string('extram
 $temp->add(new admin_setting_configtext('curlcache', get_string('curlcache', 'admin'),
                                         get_string('configcurlcache', 'admin'), 120, PARAM_INT));
 
+$temp->add(new admin_setting_configtext('curltimeoutkbitrate', get_string('curltimeoutkbitrate', 'admin'),
+                                        get_string('curltimeoutkbitrate_help', 'admin'), 56, PARAM_INT));
 /* //TODO: we need to fix code instead of relying on slow rcache, enable this once we have some code that is actually using it
 $temp->add(new admin_setting_special_selectsetup('cachetype', get_string('cachetype', 'admin'),
                                           get_string('configcachetype', 'admin'), '',

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('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.php

@@ -231,7 +231,7 @@ if ($formdata = $mform2->is_cancelled()) {
             }
         }
         if (!isset($user->username)) {
-            // prevent warnings bellow
+            // prevent warnings below
             $user->username = '';
         }
 
@@ -307,6 +307,9 @@ if ($formdata = $mform2->is_cancelled()) {
                 // process templates
                 $user->$field = uu_process_template($formdata->$field, $user);
                 $formdefaults[$field] = true;
+                if (in_array($field, $upt->columns)) {
+                    $upt->track($field, s($user->$field), 'normal');
+                }
             }
         }
         foreach ($PRF_FIELDS as $field) {
@@ -465,6 +468,7 @@ if ($formdata = $mform2->is_cancelled()) {
                     if (!isset($supportedauths[$user->auth])) {
                         $upt->track('auth', $struserauthunsupported, 'warning');
                     }
+                    $doupdate = true;
                 }
                 $allcolumns = array_merge($STD_FIELDS, $PRF_FIELDS);
                 foreach ($allcolumns as $column) {
@@ -614,7 +618,13 @@ if ($formdata = $mform2->is_cancelled()) {
 
             $isinternalauth = $auth->is_internal();
 
-            if ($DB->record_exists('user', array('email'=>$user->email))) {
+            if (empty($user->email)) {
+                $upt->track('email', get_string('invalidemail'), 'error');
+                $upt->track('status', $strusernotaddederror, 'error');
+                $userserrors++;
+                continue;
+
+            } else if ($DB->record_exists('user', array('email'=>$user->email))) {
                 if ($noemailduplicates) {
                     $upt->track('email', $stremailduplicate, 'error');
                     $upt->track('status', $strusernotaddederror, 'error');
@@ -765,7 +775,7 @@ if ($formdata = $mform2->is_cancelled()) {
                         }
                     }
 
-                    $manual->enrol_user($manualcache[$courseid], $user->id, $rid, $today, $timeend, true);
+                    $manual->enrol_user($manualcache[$courseid], $user->id, $rid, $today, $timeend);
 
                     $a = new stdClass();
                     $a->course = $shortname;
@@ -898,12 +908,22 @@ while ($linenum <= $previewrows and $fields = $cir->next()) {
         $rowcols['status'][] = get_string('missingusername');
     }
 
-    if (!validate_email($rowcols['email'])) {
-        $rowcols['status'][] = get_string('invalidemail');
+    if (isset($rowcols['email'])) {
+        if (!validate_email($rowcols['email'])) {
+            $rowcols['status'][] = get_string('invalidemail');
+        }
+        if ($DB->record_exists('user', array('email'=>$rowcols['email']))) {
+            $rowcols['status'][] = $stremailduplicate;
+        }
     }
-    if ($DB->record_exists('user', array('email'=>$rowcols['email']))) {
-        $rowcols['status'][] = $stremailduplicate;
+
+    if (isset($rowcols['city'])) {
+        $rowcols['city'] = trim($rowcols['city']);
+        if (empty($rowcols['city'])) {
+            $rowcols['status'][] = get_string('fieldrequired', 'error', 'city');
+        }
     }
+
     $rowcols['status'] = implode('<br />', $rowcols['status']);
     $data[] = $rowcols;
 }

admin/uploaduser_form.php

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

admin/uploaduserlib.php

@@ -157,14 +157,14 @@ class uu_progress_tracker {
 
 /**
  * Validation callback function - verified the column line of csv file.
- * Converts column names to lowercase too.
+ * Converts standard column names to lowercase.
  * @param csv_import_reader $cir
- * @param array standard user fields
- * @param array custom profile fields
+ * @param array $stdfields standard user fields
+ * @param array $profilefields custom profile fields
  * @param moodle_url $returnurl return url in case of any error
  * @return array list of fields
  */
-function uu_validate_user_upload_columns(csv_import_reader $cir, $stdfields, $frofilefields, moodle_url $returnurl) {
+function uu_validate_user_upload_columns(csv_import_reader $cir, $stdfields, $profilefields, moodle_url $returnurl) {
     $columns = $cir->get_columns();
 
     if (empty($columns)) {
@@ -178,22 +178,40 @@ function uu_validate_user_upload_columns(csv_import_reader $cir, $stdfields, $fr
         print_error('csvfewcolumns', 'error', $returnurl);
     }
 
+    $textlib = textlib_get_instance(); // profile fields may contain unicode chars
+
     // test columns
     $processed = array();
     foreach ($columns as $key=>$unused) {
-        $field = strtolower($columns[$key]); // no unicode expected here, ignore case
-        if (!in_array($field, $stdfields) && !in_array($field, $frofilefields) &&// if not a standard field and not an enrolment field, then we have an error
-            !preg_match('/^course\d+$/', $field) && !preg_match('/^group\d+$/', $field) &&
-            !preg_match('/^type\d+$/', $field) && !preg_match('/^role\d+$/', $field) &&
-            !preg_match('/^enrolperiod\d+$/', $field)) {
-            print_error('invalidfieldname', 'error', $returnurl, $field);
-        }
-        if (in_array($field, $processed)) {
+        $field = $columns[$key];
+        $lcfield = $textlib->strtolower($field);
+        if (in_array($field, $stdfields) or in_array($lcfield, $stdfields)) {
+            // standard fields are only lowercase
+            $newfield = $lcfield;
+
+        } else if (in_array($field, $profilefields)) {
+            // exact profile field name match - these are case sensitive
+            $newfield = $field;
+
+        } else if (in_array($lcfield, $profilefields)) {
+            // hack: somebody wrote uppercase in csv file, but the system knows only lowercase profile field
+            $newfield = $lcfield;
+
+        } else if (preg_match('/^(course|group|type|role|enrolperiod)\d+$/', $lcfield)) {
+            // special fields for enrolments
+            $newfield = $lcfield;
+
+        } else {
             $cir->close();
             $cir->cleanup();
-            print_error('duplicatefieldname', 'error', $returnurl, $field);
+            print_error('invalidfieldname', 'error', $returnurl, $field);
         }
-        $processed[$key] = $field;
+        if (in_array($newfield, $processed)) {
+            $cir->close();
+            $cir->cleanup();
+            print_error('duplicatefieldname', 'error', $returnurl, $newfield);
+        }
+        $processed[$key] = $newfield;
     }
 
     return $processed;
@@ -248,33 +266,48 @@ function uu_process_template($template, $user) {
 
     if (is_null($result)) {
         return $template; //error during regex processing??
+    }
+
+    if (is_array($template)) {
+        $template['text'] = $result;
+        return $t;
     } else {
-        if (array($template)) {
-            $template['text'] = $t;
-            return $t;
-        } else {
-            return $t;
-        }
+        return $result;
     }
 }
 
 /**
  * Internal callback function.
  */
-function uu_process_template_callback($block, $username, $firstname, $lastname) {
+function uu_process_template_callback($username, $firstname, $lastname, $block) {
     $textlib = textlib_get_instance();
-    $repl = $block[0];
 
     switch ($block[3]) {
-        case 'u': $repl = $username; break;
-        case 'f': $repl = $firstname; break;
-        case 'l': $repl = $lastname; break;
+        case 'u':
+            $repl = $username;
+            break;
+        case 'f':
+            $repl = $firstname;
+            break;
+        case 'l':
+            $repl = $lastname;
+            break;
+        default:
+            return $block[0];
     }
+
     switch ($block[1]) {
-        case '+': $repl = $textlib->strtoupper($repl); break;
-        case '-': $repl = $textlib->strtolower($repl); break;
-        case '~': $repl = $textlib->strtotitle($repl); break;
+        case '+':
+            $repl = $textlib->strtoupper($repl);
+            break;
+        case '-':
+            $repl = $textlib->strtolower($repl);
+            break;
+        case '~':
+            $repl = $textlib->strtotitle($repl);
+            break;
     }
+
     if (!empty($block[2])) {
         $repl = $textlib->substr($repl, 0 , $block[2]);
     }

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

admin/webservice/documentation.php

@@ -0,0 +1,61 @@
+<?php
+
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Web services API documentation
+ *
+ * @package   webservice
+ * @copyright 2011 Moodle Pty Ltd (http://moodle.com)
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @author Jerome Mouneyrac
+ */
+require_once('../../config.php');
+require_once($CFG->libdir . '/adminlib.php');
+require($CFG->dirroot . '/webservice/lib.php');
+
+admin_externalpage_setup('webservicedocumentation');
+
+// get all the function descriptions
+$functions = $DB->get_records('external_functions', array(), 'name');
+$functiondescs = array();
+foreach ($functions as $function) {
+    $functiondescs[$function->name] = external_function_info($function);
+}
+
+//display the documentation for all documented protocols,
+//regardless if they are activated or not
+$protocols = array();
+$protocols['rest'] = true;
+$protocols['xmlrpc'] = true;
+
+/// Check if we are in printable mode
+$printableformat = optional_param('print', false, PARAM_BOOL);
+
+/// OUTPUT
+echo $OUTPUT->header();
+
+$renderer = $PAGE->get_renderer('core', 'webservice');
+echo $renderer->documentation_html($functiondescs,
+        $printableformat, $protocols, array(), $PAGE->url);
+
+/// trigger browser print operation
+if (!empty($printableformat)) {
+    $PAGE->requires->js_function_call('window.print', array());
+}
+
+echo $OUTPUT->footer();
+

admin/webservice/forms.php

@@ -63,6 +63,7 @@ class external_service_form extends moodleform {
 
         $mform->addElement('text', 'name', get_string('name'));
         $mform->addRule('name', get_string('required'), 'required', null, 'client');
+        $mform->setType('name', PARAM_TEXT);
         $mform->addElement('advcheckbox', 'enabled', get_string('enabled', 'webservice'));
         $mform->addElement('advcheckbox', 'restrictedusers',
                 get_string('restrictedusers', 'webservice'));
@@ -107,7 +108,7 @@ class external_service_form extends moodleform {
         $mform->setType('id', PARAM_INT);
 
         if (!empty($service->id)) {
-            $buttonlabel = get_string('editaservice', 'webservice');
+            $buttonlabel = get_string('savechanges');
         } else {
             $buttonlabel = get_string('addaservice', 'webservice');
         }
@@ -155,7 +156,7 @@ class external_service_functions_form extends moodleform {
             $functions[$functionid] = $function->name . ':' . $function->description;
         }
 
-        $mform->addElement('searchableselector', 'fid', get_string('name'),
+        $mform->addElement('searchableselector', 'fids', get_string('name'),
                 $functions, array('multiple'));
 
         $mform->addElement('hidden', 'id');
@@ -174,7 +175,7 @@ class external_service_functions_form extends moodleform {
 class web_service_token_form extends moodleform {
 
     function definition() {
-        global $USER, $DB;
+        global $USER, $DB, $CFG;
 
         $mform = $this->_form;
         $data = $this->_customdata;
@@ -182,16 +183,28 @@ class web_service_token_form extends moodleform {
         $mform->addElement('header', 'token', get_string('token', 'webservice'));
 
         if (empty($data->nouserselection)) {
-            //user searchable selector - get all users (admin and guest included)
-            $sql = "SELECT u.id, u.firstname, u.lastname
-            FROM {user} u
-            ORDER BY u.lastname";
-            $users = $DB->get_records_sql($sql, array());
-            $options = array();
-            foreach ($users as $userid => $user) {
-                $options[$userid] = $user->firstname . " " . $user->lastname;
+
+            //check if the number of user is reasonable to be displayed in a select box
+            $usertotal = $DB->count_records('user',
+                    array('deleted' => 0, 'suspended' => 0, 'confirmed' => 1));
+
+            if ($usertotal < 500) {
+                //user searchable selector - get all users (admin and guest included)
+                //user must be confirmed, not deleted, not suspended, not guest
+                $sql = "SELECT u.id, u.firstname, u.lastname
+                FROM {user} u
+                WHERE u.deleted = 0 AND u.confirmed = 1 AND u.suspended = 0 AND u.id != ?
+                ORDER BY u.lastname";
+                $users = $DB->get_records_sql($sql, array($CFG->siteguest));
+                $options = array();
+                foreach ($users as $userid => $user) {
+                    $options[$userid] = $user->firstname . " " . $user->lastname;
+                }
+                $mform->addElement('searchableselector', 'user', get_string('user'), $options);
+            } else {
+                //simple text box for username or user id (if two username exists, a form error is displayed)
+                $mform->addElement('text', 'user', get_string('usernameorid', 'webservice'));
             }
-            $mform->addElement('searchableselector', 'user', get_string('user'), $options);
             $mform->addRule('user', get_string('required'), 'required', null, 'client');
         }
 
@@ -225,8 +238,44 @@ class web_service_token_form extends moodleform {
         $this->set_data($data);
     }
 
-    function validation($data, $files) {
+    function get_data() {
+        global $DB;
+        $data = parent::get_data();
+
+        if (!empty($data) && !is_numeric($data->user)) {
+            //retrieve username
+            $user = $DB->get_record('user', array('username' => $data->user), 'id');
+            $data->user = $user->id;
+        }
+        return $data;
+    }
+
+    function validation(&$data, $files) {
+        global $DB;
+
         $errors = parent::validation($data, $files);
+
+        if (is_numeric($data['user'])) {
+            $searchtype = 'id';
+        } else {
+            $searchtype = 'username';
+            //check the username is valid
+            if (clean_param($data['user'], PARAM_USERNAME) != $data['user']) {
+                $errors['user'] = get_string('invalidusername');
+            }
+        }
+
+        if (!isset($errors['user'])) {
+            $users = $DB->get_records('user', array($searchtype => $data['user']), '', 'id');
+
+            //check that the user exists in the database
+            if (count($users) == 0) {
+                $errors['user'] = get_string('usernameoridnousererror', 'webservice');
+            } else if (count($users) > 1) { //can only be a username search as id are unique
+                $errors['user'] = get_string('usernameoridoccurenceerror', 'webservice');
+            }
+        }
+
         return $errors;
     }
 

admin/webservice/service_functions.php

@@ -36,7 +36,7 @@ $confirm = optional_param('confirm', 0, PARAM_BOOL);
 admin_externalpage_setup('externalservicefunctions');
 
 //define nav bar
-$PAGE->set_url('/' . $CFG->admin . '/websevice/service_functions.php', array('id' => $serviceid));
+$PAGE->set_url('/' . $CFG->admin . '/webservice/service_functions.php', array('id' => $serviceid));
 $node = $PAGE->settingsnav->find('externalservices', navigation_node::TYPE_SETTING);
 if ($node) {
     $node->make_active();
@@ -67,7 +67,7 @@ switch ($action) {
             //add the function to the service then redirect to function list page
             if ($data = $mform->get_data()) {
                 ignore_user_abort(true); // no interruption here!
-                foreach ($data->fid as $fid) {
+                foreach ($data->fids as $fid) {
                     $function = $webservicemanager->get_external_function_by_id(
                             $fid, MUST_EXIST);
                     // make sure the function is not there yet

admin/webservice/service_user_settings.php

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

admin/webservice/service_users.php

@@ -98,7 +98,7 @@ $usersmissingcaps = $webservicemanager->get_missing_capabilities_by_users($allow
 //add the missing capabilities to the allowed users object to be displayed by renderer
 foreach ($allowedusers as &$alloweduser) {
     if (!is_siteadmin($alloweduser->id) and key_exists($alloweduser->id, $usersmissingcaps)) {
-        $alloweduser->missingcapabilities = implode(',', $usersmissingcaps[$alloweduser->id]);
+        $alloweduser->missingcapabilities = implode(', ', $usersmissingcaps[$alloweduser->id]);
     }
 }
 

admin/webservice/testclient.php

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

admin/webservice/tokens.php

@@ -71,6 +71,12 @@ switch ($action) {
                 }
             }
 
+            //check if the user is deleted. unconfirmed, suspended or guest
+            $user = $DB->get_record('user', array('id' => $data->user));
+            if ($user->id == $CFG->siteguest or $user->deleted or !$user->confirmed or $user->suspended) {
+                throw new moodle_exception('forbiddenwsuser', 'webservice');
+            }
+
             //process the creation
             if (empty($errormsg)) {
                 //TODO improvement: either move this function from externallib.php to webservice/lib.php
@@ -94,7 +100,7 @@ switch ($action) {
         die;
         break;
 
-    case 'delete':        
+    case 'delete':
         $token = $webservicemanager->get_created_by_user_ws_token($USER->id, $tokenid);
 
         //Delete the token

admin/xmldb/actions/create_xml_file/create_xml_file.class.php

@@ -66,6 +66,7 @@ class create_xml_file extends XMLDBAction {
 
     /// Get the dir containing the file
         $dirpath = required_param('dir', PARAM_PATH);
+        $plugintype = $this->get_plugin_type($dirpath);
         $dirpath = $CFG->dirroot . $dirpath;
         $file = $dirpath . '/install.xml';
 
@@ -75,6 +76,9 @@ class create_xml_file extends XMLDBAction {
         $xmlcomment = 'XMLDB file for Moodle ' . dirname($xmlpath);
 
         $xmltable = strtolower(basename(dirname($xmlpath)));
+        if ($plugintype && $plugintype != 'mod') {
+            $xmltable = $plugintype.'_'.$xmltable;
+        }
 
     /// Initial contents
         $c = '<?xml version="1.0" encoding="UTF-8" ?>' . "\n";
@@ -104,5 +108,23 @@ class create_xml_file extends XMLDBAction {
     /// Return ok if arrived here
         return $result;
     }
+
+    /**
+     * From a given path, work out what type of plugin
+     * this belongs to
+     * @param string $dirpath Path to the db file for this plugin
+     * @return string the type of the plugin or null if not found
+     */
+    function get_plugin_type($dirpath) {
+        global $CFG;
+        $dirpath = $CFG->dirroot.$dirpath;
+        $plugintypes = get_plugin_types();
+        foreach ($plugintypes as $plugintype => $pluginbasedir) {
+            if (substr($dirpath, 0, strlen($pluginbasedir)) == $pluginbasedir) {
+                return $plugintype;
+            }
+        }
+        return null;
+    }
 }
 

admin/xmldb/actions/main_view/main_view.class.php

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

auth/cas/auth.php

@@ -360,7 +360,7 @@ class auth_plugin_cas extends auth_plugin_ldap {
      * @return boolean result
      */
     function iscreator($username) {
-        if ((empty($this->config->attrcreators) && empty($this->config->groupecreators)) or empty($this->config->memberattribute)) {
+        if (empty($this->config->host_url) or (empty($this->config->attrcreators) && empty($this->config->groupecreators)) or empty($this->config->memberattribute)) {
             return false;
         }
 
@@ -405,4 +405,39 @@ class auth_plugin_cas extends auth_plugin_ldap {
 
         return false;
     }
+
+    /**
+     * Reads user information from LDAP and returns it as array()
+     *
+     * If no LDAP servers are configured, user information has to be
+     * provided via other methods (CSV file, manually, etc.). Return
+     * an empty array so existing user info is not lost. Otherwise,
+     * calls parent class method to get user info.
+     *
+     * @param string $username username
+     * @return mixed array with no magic quotes or false on error
+     */
+    function get_userinfo($username) {
+        if (empty($this->config->host_url)) {
+            return array();
+        }
+        return parent::get_userinfo($username);
+    }
+
+    /**
+     * Syncronizes users from LDAP server to moodle user table.
+     *
+     * If no LDAP servers are configured, simply return. Otherwise,
+     * call parent class method to do the work.
+     *
+     * @param bool $do_updates will do pull in data updates from LDAP if relevant
+     * @return nothing
+     */
+    function sync_users($do_updates=true) {
+        if (empty($this->config->host_url)) {
+            error_log('[AUTH CAS] '.get_string('noldapserver', 'auth_cas'));
+            return;
+        }
+        parent::sync_users($do_updates);
+    }
 }

auth/cas/cas_form.html

@@ -1,11 +1,11 @@
 <div class="loginbox clearfix">
 <div class="loginpanel">
 <div>
-<a href="<?php echo $CFG->wwwroot.'/login/index.php?authCAS=CAS';?>"><?php print_string('accesCAS', 'auth_cas');?></a>
+<a href="<?php echo get_login_url() . '?authCAS=CAS';?>"><?php print_string('accesCAS', 'auth_cas');?></a>
 </div>
 <br/>
 <div>
-<a href="<?php echo $CFG->wwwroot.'/login/index.php?authCAS=NOCAS';?>"><?php print_string('accesNOCAS', 'auth_cas');?></a>
+<a href="<?php echo get_login_url() . '?authCAS=NOCAS';?>"><?php print_string('accesNOCAS', 'auth_cas');?></a>
 </div>
 </div>
 </div>

auth/cas/lang/en/auth_cas.php

@@ -30,8 +30,8 @@ $string['auth_cas_baseuri'] = 'URI of the server (nothing if no baseUri)<br />Fo
 $string['auth_cas_baseuri_key'] = 'Base URI';
 $string['auth_cas_broken_password'] = 'You cannot proceed without changing your password, however there is no available page for changing it. Please contact your Moodle Administrator.';
 $string['auth_cas_cantconnect'] = 'LDAP part of CAS-module cannot connect to server: {$a}';
-$string['auth_cas_casversion'] = 'Version';
-$string['auth_cas_certificate_check'] = 'Turn this to \'yes\' if you want to validate the server certificate';
+$string['auth_cas_casversion'] = 'CAS protocol version';
+$string['auth_cas_certificate_check'] = 'Select \'yes\' if you want to validate the server certificate';
 $string['auth_cas_certificate_path_empty'] = 'If you turn on Server validation, you need to specify a certificate path';
 $string['auth_cas_certificate_check_key'] = 'Server validation';
 $string['auth_cas_certificate_path'] = 'Path of the CA chain file (PEM Format) to validate the server certificate';
@@ -44,21 +44,22 @@ $string['auth_cas_hostname'] = 'Hostname of the CAS server <br />eg: host.domain
 $string['auth_cas_hostname_key'] = 'Hostname';
 $string['auth_cas_changepasswordurl'] = 'Password-change URL';
 $string['auth_cas_invalidcaslogin'] = 'Sorry, your login has failed - you could not be authorised';
-$string['auth_cas_language'] = 'Selected language';
+$string['auth_cas_language'] = 'Select language for authentication pages';
 $string['auth_cas_language_key'] = 'Language';
 $string['auth_cas_logincas'] = 'Secure connection access';
-$string['auth_cas_logoutcas'] = 'Turn this to \'yes\' if you want to logout from CAS when you disconnect from Moodle';
-$string['auth_cas_logoutcas_key'] = 'Logout CAS';
-$string['auth_cas_multiauth'] = 'Turn this to \'yes\' if you want to have multi-authentication (CAS + other authentication)';
+$string['auth_cas_logoutcas'] = 'Select \'yes\' if you want to logout from CAS when you disconnect from Moodle';
+$string['auth_cas_logoutcas_key'] = 'CAS logout option';
+$string['auth_cas_multiauth'] = 'Select \'yes\' if you want to have multi-authentication (CAS + other authentication)';
 $string['auth_cas_multiauth_key'] = 'Multi-authentication';
 $string['auth_casnotinstalled'] = 'Cannot use CAS authentication. The PHP LDAP module is not installed.';
 $string['auth_cas_port'] = 'Port of the CAS server';
 $string['auth_cas_port_key'] = 'Port';
-$string['auth_cas_proxycas'] = 'Turn this to \'yes\' if you use CASin proxy-mode';
+$string['auth_cas_proxycas'] = 'Select \'yes\' if you use CAS in proxy-mode';
 $string['auth_cas_proxycas_key'] = 'Proxy mode';
 $string['auth_cas_server_settings'] = 'CAS server configuration';
 $string['auth_cas_text'] = 'Secure connection';
 $string['auth_cas_use_cas'] = 'Use CAS';
-$string['auth_cas_version'] = 'Version of CAS';
+$string['auth_cas_version'] = 'CAS protocol version to use';
 $string['CASform'] = 'Authentication choice';
+$string['noldapserver'] = 'No LDAP server configured for CAS! Syncing disabled.';
 $string['pluginname'] = 'CAS server (SSO)';

auth/db/auth.php

@@ -228,17 +228,17 @@ class auth_plugin_db extends auth_plugin_base {
 
             // find obsolete users
             if (count($userlist)) {
-        		list($notin_sql, $params) = $DB->get_in_or_equal($userlist, SQL_PARAMS_NAMED, 'u0000', false);
-        		$params['authtype'] = $this->authtype;
-            	$sql = "SELECT u.id, u.username, u.email, u.auth
+                list($notin_sql, $params) = $DB->get_in_or_equal($userlist, SQL_PARAMS_NAMED, 'u', false);
+                $params['authtype'] = $this->authtype;
+                $sql = "SELECT u.*
                           FROM {user} u
                          WHERE u.auth=:authtype AND u.deleted=0 AND u.username $notin_sql";
             } else {
-                $sql = "SELECT u.id, u.username, u.email, u.auth
+                $sql = "SELECT u.*
                           FROM {user} u
                          WHERE u.auth=:authtype AND u.deleted=0";
                 $params = array();
-        		$params['authtype'] = $this->authtype;
+                $params['authtype'] = $this->authtype;
             }
             $remove_users = $DB->get_records_sql($sql, $params);
 
@@ -256,6 +256,7 @@ class auth_plugin_db extends auth_plugin_base {
                         $updateuser = new stdClass();
                         $updateuser->id   = $user->id;
                         $updateuser->auth = 'nologin';
+                        $updateuser->timemodified = time();
                         $DB->update_record('user', $updateuser);
                         echo "\t"; print_string('auth_dbsuspenduser', 'auth_db', array('name'=>$user->username, 'id'=>$user->id)); echo "\n";
                     }
@@ -290,7 +291,7 @@ class auth_plugin_db extends auth_plugin_base {
             // only go ahead if we actually
             // have fields to update locally
             if (!empty($updatekeys)) {
-            	list($in_sql, $params) = $DB->get_in_or_equal($userlist, SQL_PARAMS_NAMED, 'u0000', true);
+                list($in_sql, $params) = $DB->get_in_or_equal($userlist, SQL_PARAMS_NAMED, 'u', true);
                 $params['authtype'] = $this->authtype;
                 $sql = "SELECT u.id, u.username
                           FROM {user} u
@@ -343,7 +344,6 @@ class auth_plugin_db extends auth_plugin_base {
 
                 // prep a few params
                 $user->username   = $username;
-                $user->modified   = time();
                 $user->confirmed  = 1;
                 $user->auth       = $this->authtype;
                 $user->mnethostid = $CFG->mnet_localhost_id;
@@ -352,12 +352,15 @@ class auth_plugin_db extends auth_plugin_base {
                 }
 
                 // maybe the user has been deleted before
-                if ($old_user = $DB->get_record('user', array('username'=>$user->username, 'deleted'=>1, 'mnethostid'=>$user->mnethostid))) {
-                    $user->id = $old_user->id;
-                    $DB->set_field('user', 'deleted', 0, array('username'=>$user->username));
-                    echo "\t"; print_string('auth_dbreviveduser', 'auth_db', array('name'=>$user->username, 'id'=>$user->id)); echo "\n";
+                if ($old_user = $DB->get_record('user', array('username'=>$user->username, 'deleted'=>1, 'mnethostid'=>$user->mnethostid, 'auth'=>$user->auth))) {
+                    // note: this undeleting is deprecated and will be eliminated soon
+                    $DB->set_field('user', 'deleted', 0, array('id'=>$old_user->id));
+                    $DB->set_field('user', 'timemodified', time(), array('id'=>$old_user->id));
+                    echo "\t"; print_string('auth_dbreviveduser', 'auth_db', array('name'=>$old_user->username, 'id'=>$old_user->id)); echo "\n";
 
                 } else {
+                    $user->timecreated = time();
+                    $user->timemodified = $user->timecreated;
                     $id = $DB->insert_record ('user',$user); // it is truly a new user
                     echo "\t"; print_string('auth_dbinsertuser','auth_db',array('name'=>$user->username, 'id'=>$id)); echo "\n";
                     // if relevant, tag for password generation
@@ -463,6 +466,7 @@ class auth_plugin_db extends auth_plugin_base {
 
         // Ensure userid is not overwritten
         $userid = $user->id;
+        $updated = false;
 
         if ($newinfo = $this->get_userinfo($username)) {
             $newinfo = truncate_userinfo($newinfo);
@@ -481,10 +485,14 @@ class auth_plugin_db extends auth_plugin_base {
                 if (!empty($this->config->{'field_updatelocal_' . $key})) {
                     if (isset($user->{$key}) and $user->{$key} != $value) { // only update if it's changed
                         $DB->set_field('user', $key, $value, array('id'=>$userid));
+                        $updated = true;
                     }
                 }
             }
         }
+        if ($updated) {
+            $DB->set_field('user', 'timemodified', time(), array('id'=>$userid));
+        }
         return $DB->get_record('user', array('id'=>$userid, 'deleted'=>0));
     }
 

auth/db/lang/en/auth_db.php

@@ -57,7 +57,7 @@ $string['auth_dbsybasequoting'] = 'Use sybase quotes';
 $string['auth_dbsybasequotinghelp'] = 'Sybase style single quote escaping - needed for Oracle, MS SQL and some other databases. Do not use for MySQL!';
 $string['auth_dbtable'] = 'Name of the table in the database';
 $string['auth_dbtable_key'] = 'Table';
-$string['auth_dbtype'] = 'The database type (See the <a href="../lib/adodb/readme.htm#drivers">ADOdb documentation</a> for details)';
+$string['auth_dbtype'] = 'The database type (See the <a href="http://phplens.com/adodb/supported.databases.html" target="_blank">ADOdb documentation</a> for details)';
 $string['auth_dbtype_key'] = 'Database';
 $string['auth_dbupdatinguser'] = 'Updating user {$a->name} id {$a->id}';
 $string['auth_dbuser'] = 'Username with read access to the database';

auth/email/lang/en/auth_email.php

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

auth/ldap/README-LDAP

@@ -1,3 +1,3 @@
 LDAP-module README
 
-Please read comments from lib.php
+Please read comments from auth.php in this directory.

auth/ldap/auth.php

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

auth/ldap/config.html

@@ -520,7 +520,7 @@ $yesno = array(get_string('no'), get_string('yes'));
         <?php echo html_writer::select($yesno, 'ntlmsso_ie_fastpath', $config->ntlmsso_ie_fastpath, false); ?>
     </td>
     <td>
-	<?php print_string('auth_ntlmsso_ie_fastpath', 'auth_ldap') ?>
+    <?php print_string('auth_ntlmsso_ie_fastpath', 'auth_ldap') ?>
     </td>
 </tr>
 <tr valign="top">

auth/ldap/lang/en/auth_ldap.php

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

auth/ldap/ntlmsso_attempt.php

@@ -33,8 +33,9 @@ $PAGE->set_title("$site->fullname: $loginsite");
 $PAGE->set_heading($site->fullname);
 echo $OUTPUT->header();
 
+// $PAGE->https_required() up above takes care of what $CFG->httpswwwroot should be.
 $msg = '<p>'.get_string('ntlmsso_attempting', 'auth_ldap').'</p>'
     . '<img width="1", height="1" '
-    . ' src="' . $CFG->wwwroot . '/auth/ldap/ntlmsso_magic.php?sesskey='
+    . ' src="' . $CFG->httpswwwroot . '/auth/ldap/ntlmsso_magic.php?sesskey='
     . $sesskey . '" />';
-redirect($CFG->wwwroot . '/auth/ldap/ntlmsso_finish.php', $msg, 3);
+redirect($CFG->httpswwwroot . '/auth/ldap/ntlmsso_finish.php', $msg, 3);

auth/ldap/ntlmsso_magic.php

@@ -29,7 +29,8 @@ $file = $CFG->dirroot.'/pix/spacer.gif';
 if ($authplugin->ntlmsso_magic($sesskey) && file_exists($file)) {
     if (!empty($authplugin->config->ntlmsso_ie_fastpath)) {
         if (check_browser_version('MSIE')) {
-            redirect($CFG->wwwroot.'/auth/ldap/ntlmsso_finish.php');
+            // $PAGE->https_required() up above takes care of what $CFG->httpswwwroot should be.
+            redirect($CFG->httpswwwroot.'/auth/ldap/ntlmsso_finish.php');
         }
     }
 

auth/manual/db/upgrade.php

@@ -45,5 +45,8 @@ function xmldb_auth_manual_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2011022700, 'auth', 'manual');
     }
 
+    // Moodle v2.1.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

auth/mnet/auth.php

@@ -132,6 +132,10 @@ class auth_plugin_mnet extends auth_plugin_base {
         global $CFG, $USER, $DB;
         require_once $CFG->dirroot . '/mnet/xmlrpc/client.php';
 
+        if (session_is_loggedinas()) {
+            print_error('notpermittedtojumpas', 'mnet');
+        }
+
         // check remote login permissions
         if (! has_capability('moodle/site:mnetlogintoremote', get_system_context())
                 or is_mnet_remote_user($USER)
@@ -276,6 +280,7 @@ class auth_plugin_mnet extends auth_plugin_base {
             */
             $remoteuser->mnethostid = $remotehost->id;
             $remoteuser->firstaccess = time(); // First time user in this server, grab it here
+            $remoteuser->confirmed = 1;
 
             $remoteuser->id = $DB->insert_record('user', $remoteuser);
             $firsttime = true;
@@ -889,8 +894,6 @@ class auth_plugin_mnet extends auth_plugin_base {
         global $CFG, $DB;
         $remoteclient = get_mnet_remote_client();
 
-        $CFG->usesid = true;
-
         // We don't want to output anything to the client machine
         $start = ob_start();
 

auth/mnet/db/upgrade.php

@@ -43,5 +43,8 @@ function xmldb_auth_mnet_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2010071300, 'auth', 'mnet');
     }
 
+    // Moodle v2.1.0 release upgrade line
+    // Put any upgrade step following this
+
     return true;
 }

auth/mnet/jump.php

@@ -37,6 +37,13 @@ if (!is_enabled_auth('mnet')) {
 
 // If hostid hasn't been specified, try getting it using wwwroot
 if (!$hostid) {
+    $hostwwwroot = trim($hostwwwroot);
+    $hostwwwroot = rtrim($hostwwwroot, '/');
+
+    // ensure the wwwroot starts with a http or https prefix
+    if (strtolower(substr($hostwwwroot, 0, 4)) != 'http') {
+        $hostwwwroot = 'http://'.$hostwwwroot;
+    }
     $hostid = $DB->get_field('mnet_host', 'id', array('wwwroot' => $hostwwwroot));
 }
 

auth/shibboleth/README.txt

@@ -278,8 +278,8 @@ just before the <MetadataProvider> element.
 
 --
 <Notify
-	Channel="back"
-	Location="https://#YOUR_MOODLE_HOSTNAME#/moodle/auth/shibboleth/logout.php" />
+    Channel="back"
+    Location="https://#YOUR_MOODLE_HOSTNAME#/moodle/auth/shibboleth/logout.php" />
 --
 
 Then restart the Shibboleth daemon and check the log file for errors. If there
@@ -300,9 +300,9 @@ Requirements:
 
 --
 <Directory /path/to/moodle/auth/shibboleth/logout.php>
-	AuthType shibboleth
-	ShibRequireSession Off
-	require shibboleth
+    AuthType shibboleth
+    ShibRequireSession Off
+    require shibboleth
 </Directory>
 --
   When using IIS, the same can be achieved by something like:

auth/shibboleth/auth.php

@@ -193,18 +193,13 @@ class auth_plugin_shibboleth extends auth_plugin_base {
      *
      */
     function logoutpage_hook() {
-        global $redirect;
+        global $SESSION, $redirect;
 
-        // Only do this if logout handler is defined
-        if (
-              isset($this->config->logout_handler)
-              && !empty($this->config->logout_handler)
-           ){
+        // Only do this if logout handler is defined, and if the user is actually logged in via Shibboleth
+        $logouthandlervalid = isset($this->config->logout_handler) && !empty($this->config->logout_handler);
+        if (isset($SESSION->shibboleth_session_id) && $logouthandlervalid ) {
             // Check if there is an alternative logout return url defined
-            if (
-                  isset($this->config->logout_return_url)
-                  && !empty($this->config->logout_return_url)
-               ){
+            if (isset($this->config->logout_return_url) && !empty($this->config->logout_return_url)) {
                 // Set temp_redirect to alternative return url
                 $temp_redirect = $this->config->logout_return_url;
             } else {

auth/shibboleth/login.php

@@ -42,19 +42,19 @@ $PAGE->https_required();
         set_saml_cookie($selectedIdP);
 
         // Redirect to SessionInitiator with entityID as argument
-        if (isset($IdPs[$selectedIdP][1]) && !empty($IdPs[$selectedIdP][1])){
+        if (isset($IdPs[$selectedIdP][1]) && !empty($IdPs[$selectedIdP][1])) {
             // For Shibbolet 1.x Service Providers
-	    header('Location: '.$IdPs[$selectedIdP][1].'?providerId='. urlencode($selectedIdP) .'&target='. urlencode($CFG->wwwroot.'/auth/shibboleth/index.php'));
+            header('Location: '.$IdPs[$selectedIdP][1].'?providerId='. urlencode($selectedIdP) .'&target='. urlencode($CFG->httpswwwroot.'/auth/shibboleth/index.php'));
 
-	    // For Shibbolet 2.x Service Providers
-	    // header('Location: '.$IdPs[$selectedIdP][1].'?entityID='. urlencode($selectedIdP) .'&target='. urlencode($CFG->wwwroot.'/auth/shibboleth/index.php'));
+            // For Shibbolet 2.x Service Providers
+            // header('Location: '.$IdPs[$selectedIdP][1].'?entityID='. urlencode($selectedIdP) .'&target='. urlencode($CFG->httpswwwroot.'/auth/shibboleth/index.php'));
 
         } else {
             // For Shibbolet 1.x Service Providers
-            header('Location: /Shibboleth.sso?providerId='. urlencode($selectedIdP) .'&target='. urlencode($CFG->wwwroot.'/auth/shibboleth/index.php'));
+            header('Location: /Shibboleth.sso?providerId='. urlencode($selectedIdP) .'&target='. urlencode($CFG->httpswwwroot.'/auth/shibboleth/index.php'));
 
             // For Shibboleth 2.x Service Providers
-            // header('Location: /Shibboleth.sso/DS?entityID='. urlencode($selectedIdP) .'&target='. urlencode($CFG->wwwroot.'/auth/shibboleth/index.php'));
+            // header('Location: /Shibboleth.sso/DS?entityID='. urlencode($selectedIdP) .'&target='. urlencode($CFG->httpswwwroot.'/auth/shibboleth/index.php'));
         }
     } elseif (isset($_POST['idp']) && !isset($IdPs[$_POST['idp']]))  {
         $errormsg = get_string('auth_shibboleth_errormsg', 'auth_shibboleth');

backup/backup.class.php

@@ -54,6 +54,7 @@ abstract class backup implements checksumable {
     const MODE_HUB       = 30;
     const MODE_SAMESITE  = 40;
     const MODE_AUTOMATED = 50;
+    const MODE_CONVERTED = 60;
 
     // Target (new/existing/current/adding/deleting)
     const TARGET_CURRENT_DELETING = 0;
@@ -107,8 +108,8 @@ abstract class backup implements checksumable {
     const OPERATION_RESTORE ='restore';// We are performing one restore
 
     // Version (to keep CFG->backup_version (and release) updated automatically)
-    const VERSION = 2010111800;
-    const RELEASE = '2.0';
+    const VERSION = 2011063000;
+    const RELEASE = '2.1';
 }
 
 /*
@@ -117,6 +118,6 @@ abstract class backup implements checksumable {
 abstract class backup_exception extends moodle_exception {
 
     public function __construct($errorcode, $a=NULL, $debuginfo=null) {
-        parent::__construct($errorcode, 'error', '', $a, null, $debuginfo);
+        parent::__construct($errorcode, 'error', '', $a, $debuginfo);
     }
 }

backup/backup.php

@@ -60,10 +60,12 @@ switch ($type) {
         $heading = get_string('backupcourse', 'backup', $course->shortname);
         break;
     case backup::TYPE_1SECTION :
-        require_capability('moodle/backup:backupsection', get_context_instance(CONTEXT_COURSE, $course->id));
-        if (!empty($section->name)) {
-            $heading = get_string('backupsection', 'backup', $section->name);
-            $PAGE->navbar->add($section->name);
+        $coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);
+        require_capability('moodle/backup:backupsection', $coursecontext);
+        if ((string)$section->name !== '') {
+            $sectionname = format_string($section->name, true, array('context' => $coursecontext));
+            $heading = get_string('backupsection', 'backup', $sectionname);
+            $PAGE->navbar->add($sectionname);
         } else {
             $heading = get_string('backupsection', 'backup', $section->section);
             $PAGE->navbar->add(get_string('section').' '.$section->section);